IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7824 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. dfc4bc56a7cedddd74873511d3423a008a52abaf
by git＠ipfire.org 14 Jan '10

14 Jan '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 811a3438b186c5569ef25a9e52e5042d0442bfbf
by git＠ipfire.org 13 Jan '10

13 Jan '10

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 811a3438b186c5569ef25a9e52e5042d0442bfbf (commit) from f39d9777eb78d903333742d4e4c849a1e818281a (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 811a3438b186c5569ef25a9e52e5042d0442bfbf Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jan 13 06:45:36 2010 +0100 Fix ieee80211 enable instructions for prism (hostap) driver. ----------------------------------------------------------------------- Summary of changes: lfs/compat-wireless | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) Difference in files: diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 1cdff0e..4ac81d2 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -89,20 +89,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Rename ieee80211 modules Because the conflicts with compat-wireless -cd /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211 && rename .ko .off * - echo # If you want to use hostap (prism drivers) > /etc/modprobe.d/hostap - echo # you must rename the ieee80211 modules. Run: >> /etc/modprobe.d/hostap - echo # cd /lib/modules/$(uname -r)/kernel/net/ieee80211 && rename .off .ko >> /etc/modprobe.d/hostap - echo # depmod -a >> /etc/modprobe.d/hostap + echo "# If you want to use hostap (prism drivers)" > /etc/modprobe.d/hostap + echo "# you must rename the ieee80211 modules. Run:" >> /etc/modprobe.d/hostap + echo "# rename .off .ko /lib/modules/*/kernel/net/ieee80211/*" >> /etc/modprobe.d/hostap + echo "# depmod -a" >> /etc/modprobe.d/hostap echo >> /etc/modprobe.d/hostap - echo # additional you need to blacklist the orinoco modules >> /etc/modprobe.d/hostap - echo # by uncommenting following lines >> /etc/modprobe.d/hostap + echo "# additional you need to blacklist the orinoco modules" >> /etc/modprobe.d/hostap + echo "# by uncommenting following lines" >> /etc/modprobe.d/hostap echo >> /etc/modprobe.d/hostap - echo #blacklist orinoco >> /etc/modprobe.d/hostap - echo #blacklist orinoco_cs >> /etc/modprobe.d/hostap - echo #blacklist orinoco_plx >> /etc/modprobe.d/hostap - echo #blacklist orinoco_pci >> /etc/modprobe.d/hostap - echo #blacklist orinoco_tmd >> /etc/modprobe.d/hostap - echo #blacklist orinoco_nortel >> /etc/modprobe.d/hostap + echo "#blacklist orinoco" >> /etc/modprobe.d/hostap + echo "#blacklist orinoco_cs" >> /etc/modprobe.d/hostap + echo "#blacklist orinoco_plx" >> /etc/modprobe.d/hostap + echo "#blacklist orinoco_pci" >> /etc/modprobe.d/hostap + echo "#blacklist orinoco_tmd" >> /etc/modprobe.d/hostap + echo "#blacklist orinoco_nortel" >> /etc/modprobe.d/hostap -rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. f39d9777eb78d903333742d4e4c849a1e818281a
by git＠ipfire.org 12 Jan '10

12 Jan '10

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 f39d9777eb78d903333742d4e4c849a1e818281a (commit) from de20524ed3e6aaab52bb3009c807ae3602f8e273 (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 f39d9777eb78d903333742d4e4c849a1e818281a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 12 19:34:53 2010 +0100 Revert "Updated openswan (2.6.24)." This reverts commit 8993193ebd059723b85831d9a5ccc7904644d21f. Kernel Oops and ipsec unload. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/openswan | 4 +- config/rootfiles/core/35/exclude | 2 - config/rootfiles/core/35/filelists/openswan | 1 - .../rootfiles/core/35/filelists/openswan-modules | 2 - doc/packages-list.txt | 6 +- lfs/openswan | 6 +- ...noxmlto.patch => openswan-2.6.20_noxmlto.patch} | 48 ++++++++++---------- 7 files changed, 33 insertions(+), 36 deletions(-) delete mode 120000 config/rootfiles/core/35/filelists/openswan delete mode 100644 config/rootfiles/core/35/filelists/openswan-modules rename src/patches/{openswan-2.6.24_noxmlto.patch => openswan-2.6.20_noxmlto.patch} (72%) Difference in files: diff --git a/config/rootfiles/common/openswan b/config/rootfiles/common/openswan index 4883788..378792a 100644 --- a/config/rootfiles/common/openswan +++ b/config/rootfiles/common/openswan @@ -44,11 +44,14 @@ 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 @@ -182,7 +185,6 @@ 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 c58d738..e69de29 100644 --- a/config/rootfiles/core/35/exclude +++ b/config/rootfiles/core/35/exclude @@ -1,2 +0,0 @@ -etc/ipsec.conf -etc/ipsec.secrets diff --git a/config/rootfiles/core/35/filelists/openswan b/config/rootfiles/core/35/filelists/openswan deleted file mode 120000 index 2b72682..0000000 --- a/config/rootfiles/core/35/filelists/openswan +++ /dev/null @@ -1 +0,0 @@ -../../../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 deleted file mode 100644 index afee737..0000000 --- a/config/rootfiles/core/35/filelists/openswan-modules +++ /dev/null @@ -1,2 +0,0 @@ -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/doc/packages-list.txt b/doc/packages-list.txt index 0f59947..5780ff6 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.24 -* openswan-2.6.24-kmod-2.6.27.42-ipfire -* openswan-2.6.24-kmod-2.6.27.42-ipfire-xen +* 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 * openvpn-2.1_rc20 * p7zip_4.65 * pam_mysql-0.7RC1 diff --git a/lfs/openswan b/lfs/openswan index 05a0650..f3e3a2f 100644 --- a/lfs/openswan +++ b/lfs/openswan @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif -VER = 2.6.24 +VER = 2.6.23 THISAPP = openswan-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -51,7 +51,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1c76b6982c05392f7c360afb92699661 +$(DL_FILE)_MD5 = c83053471e639bf3b97e3cf7796b7e83 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.24_noxmlto.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/openswan-2.6.20_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 new file mode 100644 index 0000000..5898bd5 --- /dev/null +++ b/src/patches/openswan-2.6.20_noxmlto.patch @@ -0,0 +1,68 @@ +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 deleted file mode 100644 index dc0c30c..0000000 --- a/src/patches/openswan-2.6.24_noxmlto.patch +++ /dev/null @@ -1,68 +0,0 @@ -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

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. de20524ed3e6aaab52bb3009c807ae3602f8e273
by git＠ipfire.org 12 Jan '10

12 Jan '10

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 de20524ed3e6aaab52bb3009c807ae3602f8e273 (commit) via 11c4cfcea8f2176c7ee24faff3d34ccf6afdd5e2 (commit) from c791bb2a5982940068bcfdfe4845d233be283aa3 (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 de20524ed3e6aaab52bb3009c807ae3602f8e273 Merge: 11c4cfcea8f2176c7ee24faff3d34ccf6afdd5e2 c791bb2a5982940068bcfdfe4845d233be283aa3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jan 12 19:28:18 2010 +0100 Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x Conflicts: config/rootfiles/core/35/filelists/files commit 11c4cfcea8f2176c7ee24faff3d34ccf6afdd5e2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jan 11 23:48:05 2010 +0100 Add missing modules for intersil/prism (disabled) to core35. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/compat-wireless | 1 + config/rootfiles/core/35/filelists/files | 13 ++++++++++++- config/rootfiles/core/35/update.sh | 5 +++-- lfs/compat-wireless | 20 +++++++++++++++++--- 4 files changed, 33 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless index 8b56de8..7baef23 100644 --- a/config/rootfiles/common/compat-wireless +++ b/config/rootfiles/common/compat-wireless @@ -1 +1,2 @@ etc/modprobe.d/cfg80211 +etc/modprobe.d/hostap diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files index 0e5c74e..15fca78 100644 --- a/config/rootfiles/core/35/filelists/files +++ b/config/rootfiles/core/35/filelists/files @@ -1,4 +1,15 @@ etc/system-release srv/web/ipfire/cgi-bin/country.cgi +etc/modprobe.d/hostap +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211.off +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt.off +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_ccmp.off +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_tkip.off +lib/modules/2.6.27.42-ipfire/kernel/net/ieee80211/ieee80211_crypt_wep.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_ccmp.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_tkip.off +lib/modules/2.6.27.42-ipfire-xen/kernel/net/ieee80211/ieee80211_crypt_wep.off srv/web/ipfire/cgi-bin/outgoingfw.cgi -var/ipfire/outgoing/bin/outgoingfw.pl \ No newline at end of file +var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/config/rootfiles/core/35/update.sh b/config/rootfiles/core/35/update.sh index 377e2a1..6eaf629 100644 --- a/config/rootfiles/core/35/update.sh +++ b/config/rootfiles/core/35/update.sh @@ -37,8 +37,9 @@ extract_files perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" # -#Run depmod -a to rebuld module informations -depmod -a +#Run depmod to rebuld module informations +depmod 2.6.27.42-ipfire +depmod 2.6.27.42-ipfire-xen #Finish #Don't report the exitcode last command exit 0 diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 2c8d137..1cdff0e 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -86,9 +86,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db) echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211 - # Remove ieee80211 modules. Because the conflicts with compat-wireless - -rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211 + # Rename ieee80211 modules Because the conflicts with compat-wireless + -cd /lib/modules/$(KVER)-$(VERSUFIX)/kernel/net/ieee80211 && rename .ko .off * + + echo # If you want to use hostap (prism drivers) > /etc/modprobe.d/hostap + echo # you must rename the ieee80211 modules. Run: >> /etc/modprobe.d/hostap + echo # cd /lib/modules/$(uname -r)/kernel/net/ieee80211 && rename .off .ko >> /etc/modprobe.d/hostap + echo # depmod -a >> /etc/modprobe.d/hostap + echo >> /etc/modprobe.d/hostap + echo # additional you need to blacklist the orinoco modules >> /etc/modprobe.d/hostap + echo # by uncommenting following lines >> /etc/modprobe.d/hostap + echo >> /etc/modprobe.d/hostap + echo #blacklist orinoco >> /etc/modprobe.d/hostap + echo #blacklist orinoco_cs >> /etc/modprobe.d/hostap + echo #blacklist orinoco_plx >> /etc/modprobe.d/hostap + echo #blacklist orinoco_pci >> /etc/modprobe.d/hostap + echo #blacklist orinoco_tmd >> /etc/modprobe.d/hostap + echo #blacklist orinoco_nortel >> /etc/modprobe.d/hostap -rm -rf $(DIR_APP) @$(POSTBUILD) - hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c791bb2a5982940068bcfdfe4845d233be283aa3
by git＠ipfire.org 12 Jan '10

12 Jan '10

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 c791bb2a5982940068bcfdfe4845d233be283aa3 (commit) from deccc8e6da4d1ec2dad7c35b13a8939f1bc95e89 (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 c791bb2a5982940068bcfdfe4845d233be283aa3 Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Tue Jan 12 18:02:27 2010 +0100 Added GRE and ESP protocoll to outgoing fw. This enables using outgoing fw with ipsec connections. ----------------------------------------------------------------------- Summary of changes: config/outgoingfw/outgoingfw.pl | 8 +++++++- config/rootfiles/core/35/filelists/files | 2 ++ html/cgi-bin/outgoingfw.cgi | 14 +++++++++++--- 3 files changed, 20 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index ec89e87..4b86a8a 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -148,8 +148,14 @@ foreach $configentry (sort @configs) @proto = ("tcp"); } elsif ($configline[3] eq 'udp') { @proto = ("udp"); + } elsif ($configline[3] eq 'esp') { + @proto = ("esp"); + } elsif ($configline[3] eq 'gre') { + @proto = ("gre"); + } elsif ($configline[3] eq 'tcp&udp') { + @proto = ("tcp","udp"); } else { - @proto = ("tcp", "udp"); + @proto = ("all"); } foreach $PROTO (@proto) { diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files index 955ed67..0e5c74e 100644 --- a/config/rootfiles/core/35/filelists/files +++ b/config/rootfiles/core/35/filelists/files @@ -1,2 +1,4 @@ etc/system-release srv/web/ipfire/cgi-bin/country.cgi +srv/web/ipfire/cgi-bin/outgoingfw.cgi +var/ipfire/outgoing/bin/outgoingfw.pl \ No newline at end of file diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 9e62122..1632f90 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2009 Michael Tremer & Christian Schmidt # +# Copyright (C) 2010 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -458,7 +458,7 @@ END if ($outfwsettings{'POLICY'} eq 'MODE1'){ print <<END <tr bgcolor='$color{'color20'}'><form method='post' action='$ENV{'SCRIPT_NAME'}'> - <td align='center'>tcp&udp + <td align='center'>all <td align='center'>all <td align='center'>ALL <td align='center'>drop @@ -577,7 +577,15 @@ sub addrule <td width='20%' align='right' colspan='2'>$Lang::tr{'active'}: <td width='30%' align='left' colspan='2'><input type='checkbox' name='ENABLED' $selected{'ENABLED'} /> <tr><td width='20%' align='right'>$Lang::tr{'protocol'}: - <td width='30%' align='left'><select name='PROT'><option value='all' $selected{'PROT'}{'all'}>All</option><option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option><option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option><option value='udp' $selected{'PROT'}{'udp'}>UDP</option></select> + <td width='30%' align='left'> + <select name='PROT'> + <option value='all' $selected{'PROT'}{'all'}>All</option> + <option value='tcp' $selected{'PROT'}{'tcp'}>TCP</option> + <option value='udp' $selected{'PROT'}{'udp'}>UDP</option> + <option value='gre' $selected{'PROT'}{'gre'}>GRE</option> + <option value='esp' $selected{'PROT'}{'esp'}>ESP</option> + <option value='tcp&udp' $selected{'PROT'}{'tcp&udp'}>TCP & UDP</option> + </select> <td width='20%' align='right' colspan='2'>$Lang::tr{'policy'}: <td width='30%' align='left' colspan='2'> END hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. deccc8e6da4d1ec2dad7c35b13a8939f1bc95e89
by git＠ipfire.org 11 Jan '10

11 Jan '10

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(a)ipfire.org> Date: Mon Jan 11 02:35:05 2010 +0100 Run depmod -a at core35 installation. commit 8993193ebd059723b85831d9a5ccc7904644d21f Author: Arne Fitzenreiter <arne_f(a)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

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. af01fabe579dc4730e154755ad5f5c9fc500ab20
by git＠ipfire.org 09 Jan '10

09 Jan '10

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 af01fabe579dc4730e154755ad5f5c9fc500ab20 (commit) from 95fb58a3d7d29084ebfc011eb753b200c42cc0c0 (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 af01fabe579dc4730e154755ad5f5c9fc500ab20 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 9 23:45:26 2010 +0100 Updated ipfireseeder seed core34. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/ipfireseeder | 2 +- lfs/ipfireseeder | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder index fe7854f..11a172f 100644 --- a/config/rootfiles/packages/ipfireseeder +++ b/config/rootfiles/packages/ipfireseeder @@ -1,5 +1,5 @@ etc/rc.d/init.d/ipfireseeder #var/ipfire/seeder -var/ipfire/seeder/ipfire-2.5.i586-full-core33.iso.torrent +var/ipfire/seeder/ipfire-2.5.i586-full-core34.iso.torrent #var/log/seeder var/log/seeder/info diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index ec667ac..8f7e7cf 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -27,13 +27,13 @@ include Config VER = 1.00 THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.5.i586-full-core33.iso.torrent +DL_FILE = ipfire-2.5.i586-full-core34.iso.torrent DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 7 +PAK_VER = 8 DEPS = "rtorrent" @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 48c79391fb9bd6156f96f70c0d05d6af +$(DL_FILE)_MD5 = 699c8a8955975829516ec48745d8f03c install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 95fb58a3d7d29084ebfc011eb753b200c42cc0c0
by git＠ipfire.org 09 Jan '10

09 Jan '10

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 95fb58a3d7d29084ebfc011eb753b200c42cc0c0 (commit) from 98b5cc933bf940ece2985729689cd523a580b998 (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 95fb58a3d7d29084ebfc011eb753b200c42cc0c0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 9 18:58:33 2010 +0100 Fix countrycode list (thx to m.a.d). ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/35/filelists/files | 1 + html/cgi-bin/country.cgi | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) mode change 100755 => 100644 html/cgi-bin/credits.cgi Difference in files: diff --git a/config/rootfiles/core/35/filelists/files b/config/rootfiles/core/35/filelists/files index 0037af1..955ed67 100644 --- a/config/rootfiles/core/35/filelists/files +++ b/config/rootfiles/core/35/filelists/files @@ -1 +1,2 @@ etc/system-release +srv/web/ipfire/cgi-bin/country.cgi diff --git a/html/cgi-bin/country.cgi b/html/cgi-bin/country.cgi index 250915a..474d60c 100644 --- a/html/cgi-bin/country.cgi +++ b/html/cgi-bin/country.cgi @@ -23,7 +23,7 @@ use strict; use Locale::Country; -my $flagdir = '/home/httpd/html/images/flags'; +my $flagdir = '/srv/web/ipfire/html/images/flags'; my $lines = '1'; my $lines2 = ''; my @flaglist=(); diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi old mode 100755 new mode 100644 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] This git reposit keeps all the patches of the project. branch, master, updated. 22423e6830c1a96303361522c486eded40d9388d
by git＠ipfire.org 09 Jan '10

09 Jan '10

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 "This git reposit keeps all the patches of the project.". The branch, master has been updated via 22423e6830c1a96303361522c486eded40d9388d (commit) from 1ca4f6eb298080ba3f07dfcb9d480de88c347dbf (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 22423e6830c1a96303361522c486eded40d9388d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jan 9 16:32:36 2010 +0100 Imported perl-5.10.1-libc-1.patch ----------------------------------------------------------------------- Summary of changes: perl/perl-5.10.1-libc-1.patch | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) create mode 100644 perl/perl-5.10.1-libc-1.patch Difference in files: diff --git a/perl/perl-5.10.1-libc-1.patch b/perl/perl-5.10.1-libc-1.patch new file mode 100644 index 0000000..b075df8 --- /dev/null +++ b/perl/perl-5.10.1-libc-1.patch @@ -0,0 +1,31 @@ +Submitted By: Matt Burgess <matthew at linuxfromscratch dot org> +Date: 2009-08-25 +Initial Package Version: 5.10.1 +Origin: Not Submitted - LFS Specific +Description: This patch adapts some hard-wired paths to the C library. + It uses the $prefix variable to locate the correct libc. + +diff -Naur perl-5.10.1.orig/hints/linux.sh perl-5.10.1/hints/linux.sh +--- perl-5.10.1.orig/hints/linux.sh 2009-02-12 22:58:12.000000000 +0000 ++++ perl-5.10.1/hints/linux.sh 2009-08-25 18:31:06.000000000 +0000 +@@ -63,9 +63,9 @@ + # We don't use __GLIBC__ and __GLIBC_MINOR__ because they + # are insufficiently precise to distinguish things like + # libc-2.0.6 and libc-2.0.7. +-if test -L /lib/libc.so.6; then ++if test -L ${prefix}/lib/libc.so.6; then + libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'` +- libc=/lib/$libc ++ libc=${prefix}/lib/$libc + fi + + # Configure may fail to find lstat() since it's a static/inline +@@ -436,3 +436,8 @@ + libswanted="$libswanted pthread" + ;; + esac ++ ++locincpth="" ++loclibpth="" ++glibpth="${prefix}/lib" ++usrinc="${prefix}/include" hooks/post-receive -- This git reposit keeps all the patches of the project.

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 98b5cc933bf940ece2985729689cd523a580b998
by git＠ipfire.org 08 Jan '10

08 Jan '10

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 98b5cc933bf940ece2985729689cd523a580b998 (commit) via 87d924279c225ad0a9498634bbb430cf26d2246b (commit) via bb174ca0ff560cd43304e5ec127bdad1bb7ca246 (commit) from 071a0314faab8c833d812be3680fd94fff34381a (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 98b5cc933bf940ece2985729689cd523a580b998 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 8 02:05:00 2010 +0100 Manually force early load of ehcd_hci to fix usb 2.0 detection. commit 87d924279c225ad0a9498634bbb430cf26d2246b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 8 02:04:06 2010 +0100 Updated alsa-driver (1.0.22.1) to fix intel_hda detection. commit bb174ca0ff560cd43304e5ec127bdad1bb7ca246 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Jan 7 22:02:02 2010 +0100 Fix missing ncurses libs. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/ncurses | 14 +++++++------- config/rootfiles/core/34/filelists/mkinitcpio | 1 + config/rootfiles/core/34/filelists/ncurses | 1 + config/rootfiles/core/34/update.sh | 4 ++-- lfs/alsa | 4 ++-- lfs/mkinitcpio | 2 +- src/install+setup/install/main.c | 2 +- 7 files changed, 15 insertions(+), 13 deletions(-) create mode 120000 config/rootfiles/core/34/filelists/mkinitcpio create mode 120000 config/rootfiles/core/34/filelists/ncurses Difference in files: diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses index bf185ef..afe6e39 100644 --- a/config/rootfiles/common/ncurses +++ b/config/rootfiles/common/ncurses @@ -32,17 +32,17 @@ usr/bin/tput #usr/lib/libcursesw.a #usr/lib/libcursesw.so #usr/lib/libform.a -#usr/lib/libform.so +usr/lib/libform.so #usr/lib/libformw.a -#usr/lib/libformw.so -#usr/lib/libformw.so.5 -#usr/lib/libformw.so.5.5 +usr/lib/libformw.so +usr/lib/libformw.so.5 +usr/lib/libformw.so.5.5 #usr/lib/libmenu.a #usr/lib/libmenu.so #usr/lib/libmenuw.a -#usr/lib/libmenuw.so -#usr/lib/libmenuw.so.5 -#usr/lib/libmenuw.so.5.5 +usr/lib/libmenuw.so +usr/lib/libmenuw.so.5 +usr/lib/libmenuw.so.5.5 #usr/lib/libncurses++.a4 #usr/lib/libncurses++w.a #usr/lib/libncurses.a diff --git a/config/rootfiles/core/34/filelists/mkinitcpio b/config/rootfiles/core/34/filelists/mkinitcpio new file mode 120000 index 0000000..f9b3fde --- /dev/null +++ b/config/rootfiles/core/34/filelists/mkinitcpio @@ -0,0 +1 @@ +../../../common/mkinitcpio \ No newline at end of file diff --git a/config/rootfiles/core/34/filelists/ncurses b/config/rootfiles/core/34/filelists/ncurses new file mode 120000 index 0000000..512faef --- /dev/null +++ b/config/rootfiles/core/34/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/34/update.sh b/config/rootfiles/core/34/update.sh index 7e9b836..31f36c4 100644 --- a/config/rootfiles/core/34/update.sh +++ b/config/rootfiles/core/34/update.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2009 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -94,7 +94,7 @@ fi # echo echo Create new Initramdisks ... -cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf +cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org sed -i "s| autodetect | |g" /etc/mkinitcpio.conf mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf diff --git a/lfs/alsa b/lfs/alsa index 113eaca..b70d1e3 100644 --- a/lfs/alsa +++ b/lfs/alsa @@ -33,7 +33,7 @@ endif VER = 1.0.22 UVER = 1.0.22 FVER = 1.0.20 -DVER = 1.0.22 +DVER = 1.0.22.1 THISAPP = alsa-lib-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -65,7 +65,7 @@ alsa-driver-$(DVER).tar.bz2 = $(DL_FROM)/alsa-driver-$(DVER).tar.bz2 $(DL_FILE)_MD5 = b28a12348905fb6915bc41f0edb2ecce alsa-utils-$(UVER).tar.bz2_MD5 = f7180316188552ee1e6759a03f1fe98d alsa-firmware-$(FVER).tar.bz2_MD5 = 75fe079c35c091cac49f3a60876bc26a -alsa-driver-$(DVER).tar.bz2_MD5 = 3ad66ab5f3d0b7174a1ddacff38c8c70 +alsa-driver-$(DVER).tar.bz2_MD5 = 8e516f2dca30acd0c4527632ef3fb36e install : $(TARGET) diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio index c7dc4b6..6365894 100644 --- a/lfs/mkinitcpio +++ b/lfs/mkinitcpio @@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp $(DIR_SRC)/config/mkinitcpio/virtio /lib/initcpio/install/ sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata virtio filesystems"|g' /etc/mkinitcpio.conf - sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf + sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3 ehci_hcd"|g' /etc/mkinitcpio.conf sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide @rm -rf $(DIR_APP) diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 3e468d8..74f2974 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -117,9 +117,9 @@ int main(int argc, char *argv[]) mysystem("/sbin/modprobe ide-generic"); mysystem("/sbin/modprobe ide-cd"); mysystem("/sbin/modprobe ide-disk"); + mysystem("/sbin/modprobe ehci-hcd"); mysystem("/sbin/modprobe uhci-hcd"); mysystem("/sbin/modprobe ohci-hcd"); - mysystem("/sbin/modprobe ehci-hcd"); mysystem("/sbin/modprobe ohci1394"); mysystem("/sbin/modprobe sd_mod"); mysystem("/sbin/modprobe sr_mod"); hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM