[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. deccc8e6da4d1ec2dad7c35b13a8939f1bc95e89 - IPFire-SCM

11 Jan 2010

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, master has been updated
       via  deccc8e6da4d1ec2dad7c35b13a8939f1bc95e89 (commit)
       via  8993193ebd059723b85831d9a5ccc7904644d21f (commit)
      from  af01fabe579dc4730e154755ad5f5c9fc500ab20 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit deccc8e6da4d1ec2dad7c35b13a8939f1bc95e89
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Mon Jan 11 02:35:05 2010 +0100
Run depmod -a at core35 installation.
commit 8993193ebd059723b85831d9a5ccc7904644d21f
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Mon Jan 11 02:03:55 2010 +0100
Updated openswan (2.6.24).
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/openswan                   |    4 +-
 config/rootfiles/core/35/exclude                   |    2 +
 .../{oldcore/28 => core/35}/filelists/openswan     |    0 
 .../rootfiles/core/35/filelists/openswan-modules   |    2 +
 config/rootfiles/core/35/update.sh                 |    2 +
 doc/packages-list.txt                              |    6 +-
 lfs/openswan                                       |    6 +-
 ...noxmlto.patch => openswan-2.6.24_noxmlto.patch} |   48 ++++++++++----------
 8 files changed, 37 insertions(+), 33 deletions(-)
 copy config/rootfiles/{oldcore/28 => core/35}/filelists/openswan (100%)
 create mode 100644 config/rootfiles/core/35/filelists/openswan-modules
 rename src/patches/{openswan-2.6.20_noxmlto.patch => openswan-2.6.24_noxmlto.patch} (72%)
Difference in files:

diff --git a/config/rootfiles/common/openswan b/config/rootfiles/common/openswan
index 378792a..4883788 100644
--- a/config/rootfiles/common/openswan
+++ b/config/rootfiles/common/openswan
@@ -44,14 +44,11 @@ usr/lib/ipsec
 #usr/lib/ipsec/_realsetup
 #usr/lib/ipsec/_secretcensor
 #usr/lib/ipsec/_startklips
-#usr/lib/ipsec/_startklips.old
 #usr/lib/ipsec/_startnetkey
 #usr/lib/ipsec/_updown
 #usr/lib/ipsec/_updown.klips
-#usr/lib/ipsec/_updown.klips.old
 #usr/lib/ipsec/_updown.klips~
 #usr/lib/ipsec/_updown.mast
-#usr/lib/ipsec/_updown.mast.old
 #usr/lib/ipsec/_updown.netkey
 usr/libexec/ipsec
 #usr/libexec/ipsec/_pluto_adns
@@ -185,6 +182,7 @@ usr/sbin/ipsec
 #usr/share/doc/openswan/index.html
 #usr/share/doc/openswan/ipsec.8.html
 #usr/share/doc/openswan/ipsec.conf-sample
+#usr/share/doc/openswan/ipsec.conf.5.html
 #usr/share/doc/openswan/ipsec.secrets.5.html
 #usr/share/doc/openswan/ipsec__confread.8.html
 #usr/share/doc/openswan/ipsec__copyright.8.html
diff --git a/config/rootfiles/core/35/exclude b/config/rootfiles/core/35/exclude
index e69de29..c58d738 100644
--- a/config/rootfiles/core/35/exclude
+++ b/config/rootfiles/core/35/exclude
@@ -0,0 +1,2 @@
+etc/ipsec.conf
+etc/ipsec.secrets
diff --git a/config/rootfiles/core/35/filelists/openswan b/config/rootfiles/core/35/filelists/openswan
new file mode 120000
index 0000000..2b72682
--- /dev/null
+++ b/config/rootfiles/core/35/filelists/openswan
@@ -0,0 +1 @@
+../../../common/openswan
\ No newline at end of file
diff --git a/config/rootfiles/core/35/filelists/openswan-modules b/config/rootfiles/core/35/filelists/openswan-modules
new file mode 100644
index 0000000..afee737
--- /dev/null
+++ b/config/rootfiles/core/35/filelists/openswan-modules
@@ -0,0 +1,2 @@
+lib/modules/2.6.27.42-ipfire-xen/kernel/net/ipsec/ipsec.ko
+lib/modules/2.6.27.42-ipfire/kernel/net/ipsec/ipsec.ko
diff --git a/config/rootfiles/core/35/update.sh b/config/rootfiles/core/35/update.sh
index 057a6f4..377e2a1 100644
--- a/config/rootfiles/core/35/update.sh
+++ b/config/rootfiles/core/35/update.sh
@@ -37,6 +37,8 @@ extract_files
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#
+#Run depmod -a to rebuld module informations
+depmod -a
 #Finish
 #Don't report the exitcode last command
 exit 0
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 5780ff6..0f59947 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -258,9 +258,9 @@
 * openmailadmin-1.0.0
 * openssh-5.2p1
 * openssl-0.9.8k
-* openswan-2.6.23
-* openswan-2.6.23-kmod-2.6.27.42-ipfire
-* openswan-2.6.23-kmod-2.6.27.42-ipfire-xen
+* openswan-2.6.24
+* openswan-2.6.24-kmod-2.6.27.42-ipfire
+* openswan-2.6.24-kmod-2.6.27.42-ipfire-xen
 * openvpn-2.1_rc20
 * p7zip_4.65
 * pam_mysql-0.7RC1
diff --git a/lfs/openswan b/lfs/openswan
index f3e3a2f..05a0650 100644
--- a/lfs/openswan
+++ b/lfs/openswan
@@ -30,7 +30,7 @@ else
    VERSUFIX=ipfire
 endif
-VER        = 2.6.23
+VER        = 2.6.24
THISAPP    = openswan-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c83053471e639bf3b97e3cf7796b7e83
+$(DL_FILE)_MD5 = 1c76b6982c05392f7c360afb92699661
install : $(TARGET)
@@ -92,7 +92,7 @@ else
    	-e 's%^KLIPSCOMPILE.*$$%KLIPSCOMPILE=$(CFLAGS)%' \
    	-e 's%^XMLTO.*$$%#&%' Makefile.inc
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.20_noxmlto.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.24_noxmlto.patch
cd $(DIR_APP) && sed -i 's/-Werror//' programs/Makefile.program
    
diff --git a/src/patches/openswan-2.6.20_noxmlto.patch b/src/patches/openswan-2.6.20_noxmlto.patch
deleted file mode 100644
index 5898bd5..0000000
--- a/src/patches/openswan-2.6.20_noxmlto.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Nur openswan-2.6.20dr2.old/programs/pluto/Makefile openswan-2.6.20dr2/programs/pluto/Makefile
---- openswan-2.6.20dr2.old/programs/pluto/Makefile	2008-12-20 19:53:00.000000000 +0100
-+++ openswan-2.6.20dr2/programs/pluto/Makefile	2008-12-20 20:14:07.000000000 +0100
-@@ -171,7 +171,7 @@
- all: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT) 
- programs: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
- clean:	cleanall
--install: doinstall
-+install: doinstall doinstalldoc
- endif
- 
- doinstall: all
-@@ -187,6 +187,9 @@
- 	$(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
- 	#$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
- 	if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)  $(LIBEXECDIR) ; fi
-+
-+ifeq ($(findstring $(SUBDIRS),doc),doc)
-+doinstalldoc:
- 	( cd ${OPENSWANSRCDIR}/programs/pluto ; xmlto man pluto.8.xml ; mv ipsec_pluto.8 pluto.8; xmlto man ipsec.secrets.5.xml)
- 	$(INSTALL) $(INSTMANFLAGS) ${srcdir}pluto.8 $(PMANDIR)/ipsec_pluto.8
- 	sh ${OPENSWANSRCDIR}/packaging/utils/manlink ${srcdir}pluto.8 | \
-@@ -201,10 +204,7 @@
- 		 ln -s -f $$from $(FMANDIR)/$$to; \
- 		done
- 
--install_file_list:
--	@echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
--	@if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
--	@echo $(LIBEXECDIR)/$(BINNAMEWHACK)
-+install_file_listdoc:
- 	@echo $(PMANDIR)/ipsec_pluto.8
- 	@sh ${OPENSWANSRCDIR}/packaging/utils/manlink pluto.8 | \
- 		while read from to; \
-@@ -217,6 +217,15 @@
- 		do \
- 			echo $(FMANDIR)/$$to; \
- 		done
-+else
-+doinstalldoc:
-+install_file_listdoc:
-+endif
-+
-+install_file_list: install_file_listdoc
-+	@echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
-+	@if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
-+	@echo $(LIBEXECDIR)/$(BINNAMEWHACK)
- 
- alg_info_test: alg_info_test.o ike_alg.o constants.o defs.o log.o db_ops.o crypto.o $(LIBDESLITE) $(OPENSWANLIB)
- 	$(CC) -o $@ $^ $(LDFLAGS) $(LIBSPLUTO)
-diff -Nur openswan-2.6.20dr2.old/programs/_confread/Makefile openswan-2.6.20dr2/programs/_confread/Makefile
---- openswan-2.6.20dr2.old/programs/_confread/Makefile	2008-12-20 19:53:00.000000000 +0100
-+++ openswan-2.6.20dr2/programs/_confread/Makefile	2008-12-21 00:13:23.000000000 +0100
-@@ -16,7 +16,13 @@
- OPENSWANSRCDIR?=$(shell cd ../..; pwd)
- include ${OPENSWANSRCDIR}/Makefile.inc
- 
--EXTRA5MAN=ipsec.conf.5
-+SUBDIRS=doc lib programs testing
-+ifeq ($(findstring $(SUBDIRS),doc),doc)
-+  EXTRA5MAN=ipsec.conf.5
-+else
-+  EXTRA5MAN=
-+endif
-+
- CONFFILES=ipsec.conf
- EXCONFILES=ipsec.win2k.conf
- SOURCEDIR=_confread
diff --git a/src/patches/openswan-2.6.24_noxmlto.patch b/src/patches/openswan-2.6.24_noxmlto.patch
new file mode 100644
index 0000000..dc0c30c
--- /dev/null
+++ b/src/patches/openswan-2.6.24_noxmlto.patch
@@ -0,0 +1,68 @@
+diff -Naur openswan-2.6.24.org/programs/_confread/Makefile openswan-2.6.24/programs/_confread/Makefile
+--- openswan-2.6.24.org/programs/_confread/Makefile	2010-01-10 02:34:38.000000000 +0100
++++ openswan-2.6.24/programs/_confread/Makefile	2010-01-10 22:44:33.000000000 +0100
+@@ -16,7 +16,13 @@
+ OPENSWANSRCDIR?=$(shell cd ../..; pwd)
+ include ${OPENSWANSRCDIR}/Makefile.inc
+ 
+-EXTRA5MAN=ipsec.conf.5
++SUBDIRS=doc lib programs testing
++ifeq ($(findstring $(SUBDIRS),doc),doc)
++  EXTRA5MAN=ipsec.conf.5
++else
++  EXTRA5MAN=
++endif
++
+ CONFFILES=ipsec.conf
+ EXCONFILES=ipsec.win2k.conf
+ SOURCEDIR=_confread
+diff -Naur openswan-2.6.24.org/programs/pluto/Makefile openswan-2.6.24/programs/pluto/Makefile
+--- openswan-2.6.24.org/programs/pluto/Makefile	2010-01-10 02:34:38.000000000 +0100
++++ openswan-2.6.24/programs/pluto/Makefile	2010-01-10 22:51:15.000000000 +0100
+@@ -172,7 +172,7 @@
+ all: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT) 
+ programs: $(BINNAMEPLUTO) $(BINNAMEADNSIFNEEDED) $(BINNAMEWHACK) #$(BINNAMEWHACKINIT)
+ clean:	cleanall
+-install: doinstall
++install: doinstall doinstalldoc
+ endif
+ 
+ doinstall: all
+@@ -188,6 +188,9 @@
+ 	$(INSTALL) $(INSTBINFLAGS) $(BINNAMEPLUTO) $(BINNAMEWHACK) $(LIBEXECDIR)
+ 	#$(INSTALL) $(INSTSUIDFLAGS) $(BINNAMEWHACKINIT) $(LIBEXECDIR)
+ 	if $(USE_ADNS) ; then $(INSTALL) $(INSTBINFLAGS) $(BINNAMEADNS)  $(LIBEXECDIR) ; fi
++
++ifeq ($(findstring $(SUBDIRS),doc),doc)
++doinstalldoc:
+ 	$(INSTALL) $(INSTMANFLAGS) ${srcdir}pluto.8 $(PMANDIR)/ipsec_pluto.8
+ 	sh ${OPENSWANSRCDIR}/packaging/utils/manlink ${srcdir}pluto.8 | \
+ 		while read from to ; \
+@@ -201,10 +204,7 @@
+ 		 ln -s -f $$from $(FMANDIR)/$$to; \
+ 		done
+ 
+-install_file_list:
+-	@echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
+-	@if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
+-	@echo $(LIBEXECDIR)/$(BINNAMEWHACK)
++install_file_listdoc:
+ 	@echo $(PMANDIR)/ipsec_pluto.8
+ 	@sh ${OPENSWANSRCDIR}/packaging/utils/manlink pluto.8 | \
+ 		while read from to; \
+@@ -217,6 +217,15 @@
+ 		do \
+ 			echo $(FMANDIR)/$$to; \
+ 		done
++else
++doinstalldoc:
++install_file_listdoc:
++endif
++
++install_file_list: install_file_listdoc
++	@echo $(LIBEXECDIR)/$(BINNAMEPLUTO)
++	@if $(USE_ADNS) ; then echo $(LIBDIR)/$(BINNAMEADNS) ; fi
++	@echo $(LIBEXECDIR)/$(BINNAMEWHACK)
+ 
+ alg_info_test: alg_info_test.o ike_alg.o constants.o defs.o log.o db_ops.o crypto.o $(LIBDESLITE) $(OPENSWANLIB)
+ 	$(CC) -o $@ $^ $(LDFLAGS) $(LIBSPLUTO)
hooks/post-receive
--
IPFire 2.x development tree

    