[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop: [450] ipcop/trunk
From:       franck78 () users ! sourceforge ! net
Date:       2007-07-27 21:09:41
Message-ID: E1IEX49-0005oI-Ro () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]

Revision: 450
          http://ipcop.svn.sourceforge.net/ipcop/?rev=450&view=rev
Author:   franck78
Date:     2007-07-27 14:09:41 -0700 (Fri, 27 Jul 2007)

Log Message:
-----------
Fix version of openswan&iptables between lfs/kernel and lfs/{openswan,iptables} and \
made  repetition of 'versions number strings' two variables.

Note: I didn't look at iptables patches, this rev only allow full make.sh build to \
go.

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/iptables
    ipcop/trunk/lfs/linux

Modified: ipcop/trunk/config/rootfiles/common/iptables
===================================================================
--- ipcop/trunk/config/rootfiles/common/iptables	2007-07-27 21:01:22 UTC (rev 449)
+++ ipcop/trunk/config/rootfiles/common/iptables	2007-07-27 21:09:41 UTC (rev 450)
@@ -1,38 +1,19 @@
-## iptables-1.3.5
+## iptables-1.3.8
 ##
 #lib/iptables
-lib/iptables/libipt_CLASSIFY.so
-lib/iptables/libipt_CLUSTERIP.so
-lib/iptables/libipt_CONNMARK.so
-lib/iptables/libipt_DNAT.so
-lib/iptables/libipt_DSCP.so
-lib/iptables/libipt_ECN.so
-lib/iptables/libipt_LOG.so
-lib/iptables/libipt_MARK.so
-lib/iptables/libipt_MASQUERADE.so
-lib/iptables/libipt_MIRROR.so
-lib/iptables/libipt_NETMAP.so
-lib/iptables/libipt_NFLOG.so
-lib/iptables/libipt_NFQUEUE.so
-lib/iptables/libipt_NOTRACK.so
-lib/iptables/libipt_REDIRECT.so
-lib/iptables/libipt_REJECT.so
-lib/iptables/libipt_SAME.so
-lib/iptables/libipt_SNAT.so
-lib/iptables/libipt_TARPIT.so
-lib/iptables/libipt_TCPMSS.so
-lib/iptables/libipt_TOS.so
-lib/iptables/libipt_TTL.so
-lib/iptables/libipt_ULOG.so
 lib/iptables/libipt_addrtype.so
 lib/iptables/libipt_ah.so
+lib/iptables/libipt_CLASSIFY.so
 lib/iptables/libipt_comment.so
-lib/iptables/libipt_connbytes.so
+lib/iptables/libipt_connlimit.so
 lib/iptables/libipt_connmark.so
+lib/iptables/libipt_CONNMARK.so
 lib/iptables/libipt_conntrack.so
-lib/iptables/libipt_dccp.so
+lib/iptables/libipt_DNAT.so
 lib/iptables/libipt_dscp.so
+lib/iptables/libipt_DSCP.so
 lib/iptables/libipt_ecn.so
+lib/iptables/libipt_ECN.so
 lib/iptables/libipt_esp.so
 lib/iptables/libipt_hashlimit.so
 lib/iptables/libipt_helper.so
@@ -40,26 +21,40 @@
 lib/iptables/libipt_iprange.so
 lib/iptables/libipt_length.so
 lib/iptables/libipt_limit.so
+lib/iptables/libipt_LOG.so
 lib/iptables/libipt_mac.so
 lib/iptables/libipt_mark.so
+lib/iptables/libipt_MARK.so
+lib/iptables/libipt_MASQUERADE.so
+lib/iptables/libipt_MIRROR.so
 lib/iptables/libipt_multiport.so
+lib/iptables/libipt_NETMAP.so
+lib/iptables/libipt_NFQUEUE.so
+lib/iptables/libipt_NOTRACK.so
 lib/iptables/libipt_owner.so
 lib/iptables/libipt_physdev.so
 lib/iptables/libipt_pkttype.so
 lib/iptables/libipt_policy.so
-lib/iptables/libipt_quota.so
 lib/iptables/libipt_realm.so
-lib/iptables/libipt_recent.so
+lib/iptables/libipt_REDIRECT.so
+lib/iptables/libipt_REJECT.so
+lib/iptables/libipt_rpc.so
+lib/iptables/libipt_SAME.so
 lib/iptables/libipt_sctp.so
+lib/iptables/libipt_SNAT.so
 lib/iptables/libipt_standard.so
 lib/iptables/libipt_state.so
-lib/iptables/libipt_statistic.so
-lib/iptables/libipt_string.so
-lib/iptables/libipt_tcp.so
+lib/iptables/libipt_TARPIT.so
 lib/iptables/libipt_tcpmss.so
+lib/iptables/libipt_TCPMSS.so
+lib/iptables/libipt_tcp.so
 lib/iptables/libipt_tos.so
+lib/iptables/libipt_TOS.so
+lib/iptables/libipt_TRACE.so
 lib/iptables/libipt_ttl.so
+lib/iptables/libipt_TTL.so
 lib/iptables/libipt_udp.so
+lib/iptables/libipt_ULOG.so
 lib/iptables/libipt_unclean.so
 sbin/iptables
 #sbin/iptables-restore

Modified: ipcop/trunk/lfs/linux
===================================================================
--- ipcop/trunk/lfs/linux	2007-07-27 21:01:22 UTC (rev 449)
+++ ipcop/trunk/lfs/linux	2007-07-27 21:09:41 UTC (rev 450)
@@ -44,34 +44,36 @@
 CFLAGS     =
 CXXFLAGS   =
 TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+iptables   = iptables-1.3.8
+openswan   = openswan-2.4.9
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 objects =$(DL_FILE) \
-	openswan-2.4.7.tar.gz \
+	$(openswan).tar.gz \
 	openswan-2.4.7.kernel-2.6-natt.patch.gz \
 	openswan-2.4.7.kernel-2.6-klips.patch.gz \
-	iptables-1.3.7.tar.bz2 \
+	$(iptables).tar.bz2 \
 	patch-o-matic-ng-20070405.tar.bz2 \
 	grsecurity-2.1.10-2.6.19.2-200701222307.patch.gz \
 	squashfs3.2-r2.tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-openswan-2.4.7.tar.gz			= http://www.openswan.org/download/openswan-2.4.7.tar.gz
-openswan-2.4.7.kernel-2.6-natt.patch.gz	= \
http://www.openswan.org/download/openswan-2.4.7.kernel-2.6-natt.patch.gz \
+$(openswan).tar.gz				= http://www.openswan.org/download/$(openswan).tar.gz \
+openswan-2.4.7.kernel-2.6-natt.patch.gz		= \
http://www.openswan.org/download/openswan-2.4.7.kernel-2.6-natt.patch.gz  \
openswan-2.4.7.kernel-2.6-klips.patch.gz	= \
http://www.openswan.org/download/openswan-2.4.7.kernel-2.6-klips.patch.gz  \
patch-o-matic-ng-20070405.tar.bz2		= \
http://ftp.netfilter.org/pub/patch-o-matic-ng/snapshot/patch-o-matic-ng-20070405.tar.bz2
                
-iptables-1.3.7.tar.bz2				= \
http://ftp.netfilter.org/pub/iptables/iptables-1.3.7.tar.bz2 \
+$(iptables).tar.bz2				= http://ftp.netfilter.org/pub/iptables/$(iptables).tar.bz2  \
grsecurity-2.1.10-2.6.19.2-200701222307.patch.gz= \
http://www.grsecurity.net/grsecurity-2.1.10-2.6.19.2-200701222307.patch.gz  \
squashfs3.2-r2.tar.gz				= $(URL_SFNET)/squashfs/squashfs3.2-r2.tar.gz  
 $(DL_FILE)_MD5						= a28b78793cd368592f7873bf36cb38b0
-openswan-2.4.7.tar.gz_MD5				= 70f22e8adc39e07a165f75eccb7cd079
+$(openswan).tar.gz_MD5					= 845f12d80d443cfa1a52f2b53b987bee
 openswan-2.4.7.kernel-2.6-natt.patch.gz_MD5		= 980d8bbdb29a761b7f5aa852f373df62
 openswan-2.4.7.kernel-2.6-klips.patch.gz_MD5		= 5df0ffa2453488a407a23fc4ea4af879
 patch-o-matic-ng-20070405.tar.bz2_MD5			= 9474544764312b5eba9bd4013aecf902
-iptables-1.3.7.tar.bz2_MD5				= dd965bdacbb86ce2a6498829fddda6b7
+$(iptables).tar.bz2_MD5					= 0a9209f928002e5eee9cdff8fef4d4b3
 grsecurity-2.1.10-2.6.19.2-200701222307.patch.gz_MD5	= \
718ccce29ce12064673dbe8eb4752696  squashfs3.2-r2.tar.gz_MD5				= \
bf360b92eba9e6d5610196ce2e02fcd1  
@@ -121,10 +123,10 @@
 
 	# Openswan -- DEBUG -- skip kernel patches as they don't apply cleanly.  Needs work
 	#cd $(DIR_SRC) && rm -rf openswan-*
-	#cd $(DIR_SRC) && tar zxf $(DIR_DL)/openswan-2.4.7.tar.gz
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(openswan).tar.gz
 	#cd $(DIR_APP) && gzip -dc $(DIR_DL)/openswan-2.4.7.kernel-2.6-natt.patch.gz | \
patch -Np1  #cd $(DIR_APP) && gzip -dc \
                $(DIR_DL)/openswan-2.4.7.kernel-2.6-klips.patch.gz | patch -Np1
-	#cd $(DIR_SRC)/openswan-* && sed -i -e \
's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' Makefile.inc +	cd \
$(DIR_SRC)/openswan-* && sed -i -e 's/INC_USRLOCAL=\/usr\/local/INC_USRLOCAL=\/usr/' \
Makefile.inc  
 	# ATM Header fix
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/linux-2.6-atm-headers.patch
@@ -135,8 +137,8 @@
 
 	# Patch-o-matic
 	cd $(DIR_SRC) && rm -rf iptables-*
-	cd $(DIR_SRC) && tar jxf $(DIR_DL)/iptables-1.3.7.tar.bz2
-	cd $(DIR_SRC) && ln -snf iptables-1.3.7 iptables
+	cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(iptables).tar.bz2
+	cd $(DIR_SRC) && ln -snf $(iptables) iptables
 	cd $(DIR_SRC) && rm -rf patch-o-matic*
 	cd $(DIR_SRC) && tar jxf $(DIR_DL)/patch-o-matic-ng-20070405.tar.bz2
 
@@ -147,7 +149,7 @@
 	# rtsp-conntrack-nat quake3-conntrack-nat mms-conntrack-nat
 
 	# iptables
-	cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz iptables-1.3.7
+	cd $(DIR_SRC) && tar czf $(DIR_DL)/iptables-fixed.tar.gz $(iptables)
 
 	# Cleanup kernel source
 	cd $(DIR_APP) && make mrproper


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic