IPFire-SCM May 2011

ipfire-scm@lists.ipfire.org

1 participants
63 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. a91e42644cd1107f505c7abecfe963adb59721a1
by git＠ipfire.org 24 May '11

24 May '11

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. f793992b717349a28425642b3b61bc752fc53949
by git＠ipfire.org 24 May '11

24 May '11

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, next has been updated via f793992b717349a28425642b3b61bc752fc53949 (commit) from cc03d52ee45e30af94e909f2bab4b4a838369cb6 (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 f793992b717349a28425642b3b61bc752fc53949 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue May 24 21:17:50 2011 +0200 compat-wireless: update to 2.6.39-1-sn. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 10 +--------- config/kernel/kernel.config.i586-ipfire-pae | 10 +--------- config/kernel/kernel.config.i586-ipfire-xen | 10 +--------- config/rootfiles/common/compat-wireless | 1 - config/rootfiles/core/next/update.sh | 4 ++++ lfs/compat-wireless | 10 +++++----- .../compat-wireless-2.6.39_kfifo_module_info.patch | 14 ++++++++++++++ 7 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 src/patches/compat-wireless-2.6.39_kfifo_module_info.patch Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 3fd80c8..43bba22 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1729,15 +1729,7 @@ CONFIG_IPW2200=m # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set -# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y -CONFIG_IWL3945=m -# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 8c7cf4b..f37b655 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1747,15 +1747,7 @@ CONFIG_IPW2200=m # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set -# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y -CONFIG_IWL3945=m -# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen index e5122a9..fa50c95 100644 --- a/config/kernel/kernel.config.i586-ipfire-xen +++ b/config/kernel/kernel.config.i586-ipfire-xen @@ -1525,15 +1525,7 @@ CONFIG_IPW2200=m # CONFIG_IPW2200_DEBUG is not set CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set -CONFIG_IWLWIFI=m -# CONFIG_IWLWIFI_LEDS is not set -# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set -# CONFIG_IWLWIFI_DEBUG is not set -CONFIG_IWLAGN=m -CONFIG_IWL4965=y -CONFIG_IWL5000=y -CONFIG_IWL3945=m -# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set +# CONFIG_IWLWIFI is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless index adc4ab3..80018c8 100644 --- a/config/rootfiles/common/compat-wireless +++ b/config/rootfiles/common/compat-wireless @@ -1,3 +1,2 @@ -etc/modprobe.d/ralink_wireless etc/udev/rules.d/50-compat_firmware.rules lib/udev/compat_firmware.sh diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 070a12b..38a1f78 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -82,6 +82,10 @@ tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ --no-overwrite-dir # +# Enable ralink rt73 hardware encryption again +rm -f /etc/modprobe.d/ralink_wireless + +# # Start services # /etc/init.d/squid start diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 22223d7..71f3bc9 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -34,7 +34,7 @@ else endif endif -VER = 2.6.38-3-ns +VER = 2.6.39-1-sn THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 @@ -51,7 +51,7 @@ objects = $(DL_FILE) asix-3.5.0a.tar.bz2 $(DL_FILE) = $(DL_FROM)/$(DL_FILE) asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2 -$(DL_FILE)_MD5 = c4c78d1d41c28f0e9c48ab8098a0a9f2 +$(DL_FILE)_MD5 = ac2b20607d75de8ce2b30b74995383a6 asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7 install : $(TARGET) @@ -83,6 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE) + # kfifo has no license info and taints kernel + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch + # Copy USB-Net drivers from Kernel... mkdir $(DIR_APP)/drivers/net/usb/new cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new @@ -101,8 +104,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/ cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/ - # Disable hwcrypt on rt73 ... - echo "options rt73usb nohwcrypt=1" > /etc/modprobe.d/ralink_wireless - -rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch new file mode 100644 index 0000000..eb5d280 --- /dev/null +++ b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch @@ -0,0 +1,14 @@ +diff -Naur compat-wireless-2.6.39-1-sn.org/compat/kfifo.c compat-wireless-2.6.39-1-sn/compat/kfifo.c +--- compat-wireless-2.6.39-1-sn.org/compat/kfifo.c 2011-05-24 01:43:48.000000000 +0200 ++++ compat-wireless-2.6.39-1-sn/compat/kfifo.c 2011-05-24 17:20:06.956818313 +0200 +@@ -27,6 +27,10 @@ + #include <linux/uaccess.h> + #include <linux/kfifo.h> + ++MODULE_LICENSE("GPL"); ++MODULE_AUTHOR("Stefani Seibold <stefani(a)seibold.net>"); ++MODULE_DESCRIPTION("A generic kernel FIFO implementation"); ++ + /* + * internal helper to calculate the unused elements in a fifo + */ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 71e2498cf854aa0376861641704cd41cf3c12ca1
by git＠ipfire.org 24 May '11

24 May '11

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 3.x development tree". The branch, master has been updated via 71e2498cf854aa0376861641704cd41cf3c12ca1 (commit) via e8ba3704cae27c876e4a5bb4501a98d5a0b75507 (commit) from d57285ab9294bfa74a21b4da1d4e605233bca664 (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 71e2498cf854aa0376861641704cd41cf3c12ca1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 24 19:46:47 2011 +0200 perl: Fix some dependency problems with perl modules and package perl-PathTools. commit e8ba3704cae27c876e4a5bb4501a98d5a0b75507 Author: Ben Schweikert <trikolon(a)ipfire.org> Date: Thu May 19 15:10:28 2011 +0200 libvirt: fixed building errors. ----------------------------------------------------------------------- Summary of changes: pkgs/libvirt/libvirt.nm | 2 +- pkgs/perl/perl.nm | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 31 insertions(+), 3 deletions(-) Difference in files: diff --git a/pkgs/libvirt/libvirt.nm b/pkgs/libvirt/libvirt.nm index c311303..2fb6671 100644 --- a/pkgs/libvirt/libvirt.nm +++ b/pkgs/libvirt/libvirt.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = libvirt PKG_VER = 0.9.0 -PKG_REL = 2 +PKG_REL = 3 PKG_MAINTAINER = PKG_GROUPS = Applications/Virtualization diff --git a/pkgs/perl/perl.nm b/pkgs/perl/perl.nm index e62675a..5904e3b 100644 --- a/pkgs/perl/perl.nm +++ b/pkgs/perl/perl.nm @@ -26,7 +26,7 @@ include $(PKGROOT)/Include PKG_NAME = perl PKG_VER = 5.12.3 -PKG_REL = 3 +PKG_REL = 4 PKG_MAINTAINER = PKG_GROUPS = Development/Languages @@ -120,7 +120,13 @@ PKG_PROVIDES-perl += \ perl(timelocal.pl) \ perl(utf8_heavy.pl) \ perl(validate.pl) \ - perl(Carp::Heavy) + perl(Carp) \ + perl(Carp::Heavy) \ + perl(Exporter) \ + perl(File::Basename) \ + perl(constant) \ + perl(strict) \ + perl(vars) define STAGE_PREPARE_CMDS cd $(DIR_APP) && sed -i 's/command /command[ -]/' makedepend.SH @@ -858,6 +864,7 @@ define PKG_DESCRIPTION-perl-Params-Check endef PKG_DEPS-perl-Params-Check = perl=$(THISVER) +PKG_PROVIDES-perl-Params-Check += perl(Params::Check) define PKG_FILES-perl-Params-Check /usr/share/perl5/Params/ @@ -885,6 +892,27 @@ define PKG_FILES-perl-Parse-CPAN-Meta /usr/share/man/man3/Parse::CPAN::Meta.3* endef +# PathTools +PKG_PACKAGES += perl-PathTools + +PKG_EPOCH-perl-PathTools = 0 +PKG_VER-perl-PathTools = 3.31 +PKG_LICENSE-perl-PathTools = (GPL+ or Artistic) and BSD + +PKG_SUMMARY-perl-PathTools = PathTools Perl module (Cwd, File::Spec). +define PKG_DESCRIPTION-perl-PathTools + PathTools Perl module (Cwd, File::Spec). +endef + +PKG_DEPS-perl-PathTools = perl=$(THISVER) + +define PKG_FILES-perl-PathTools + /usr/lib/perl5/Cwd.pm + /usr/lib/perl5/File/Spec* + /usr/share/man/man3/Cwd* + /usr/share/man/man3/File::Spec* +endef + # Pod-Escapes PKG_PACKAGES += perl-Pod-Escapes hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc03d52ee45e30af94e909f2bab4b4a838369cb6
by git＠ipfire.org 24 May '11

24 May '11

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, next has been updated via cc03d52ee45e30af94e909f2bab4b4a838369cb6 (commit) via 02d7d49c91b18b9f2086578fae8d26afdab8c8bb (commit) from a0c4de46fa00a83ad5fde5c3c654b296fa012fde (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 cc03d52ee45e30af94e909f2bab4b4a838369cb6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue May 24 08:22:51 2011 +0200 autoupdate kernel version at package install and core update scripts. commit 02d7d49c91b18b9f2086578fae8d26afdab8c8bb Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue May 24 07:13:05 2011 +0200 kernel: missed kernel-version at linux-xen install script. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/next/update.sh | 2 +- lfs/Config | 1 + lfs/core-updates | 5 ++++- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 444fcce..070a12b 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.41" +KVER="xxxKVERxxx" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/Config b/lfs/Config index 01b9cf1..fac10eb 100644 --- a/lfs/Config +++ b/lfs/Config @@ -196,6 +196,7 @@ define PAK fi cp -v /usr/src/config/rootfiles/packages/$(PROG) /install/packages/package/ROOTFILES sed -e 's/KVER/$(KVER)/g' -i /install/packages/package/ROOTFILES + sed -e 's/xxxKVERxxx/$(KVER)/g' -i /install/packages/package/install.sh chmod 755 /install/packages/package/{{,un}install,update}.sh cd / && tar cf /install/packages/package/files.tmp --files-from=/install/packages/package/ROOTFILES --exclude='#*' \ -p --numeric-owner diff --git a/lfs/core-updates b/lfs/core-updates index f7f50cf..0dd2ecc 100644 --- a/lfs/core-updates +++ b/lfs/core-updates @@ -63,7 +63,7 @@ core/%: #Change KVER to Kernelversion sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES - + #Remove doubled files with tar/untar/tar to save space tar -c -C / --files-from=/tmp/ROOTFILES \ -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \ @@ -80,6 +80,9 @@ core/%: #build package cp -f $(DIR_SRC)/config/rootfiles/$(a)/update.sh /install/packages/package chmod 755 /install/packages/package/update.sh + #Change xxxKVERxxx to Kernelversion + sed -e "s/xxxKVERxxx/$(KVER)/g" -i /install/packages/package/update.sh + cd /install/packages/package && tar cf ../core-upgrade-$(VERSION)-$$(basename $(a)).ipfire \ update.sh files ROOTFILES rm -rf /install/packages/package diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 83e9f49..60f8bbb 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.41 +KVER=xxxKVERxxx ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 5e03a74..70efa9d 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.40 +KVER=xxxKVERxxx ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a0c4de46fa00a83ad5fde5c3c654b296fa012fde
by git＠ipfire.org 23 May '11

23 May '11

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, next has been updated via a0c4de46fa00a83ad5fde5c3c654b296fa012fde (commit) via e1aa5a9bece1ac86808bbc26e54e133a3d7d61e6 (commit) via 94a4640d3a41b9aba5b1e998d78db63f32c70df1 (commit) from 9eca0c864505f02d794d00d46c53aa91524371b4 (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 a0c4de46fa00a83ad5fde5c3c654b296fa012fde Merge: e1aa5a9 94a4640 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 23 23:56:10 2011 +0200 Merge branch 'master' into next commit e1aa5a9bece1ac86808bbc26e54e133a3d7d61e6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 23 23:54:50 2011 +0200 kernel: update to 2.6.32.41. ----------------------------------------------------------------------- Summary of changes: config/mpfire/webradio | 1 + config/rootfiles/core/next/update.sh | 2 +- lfs/linux | 6 +++--- src/paks/linux-pae/install.sh | 4 ++-- src/paks/linux-pae/update.sh | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) Difference in files: diff --git a/config/mpfire/webradio b/config/mpfire/webradio index e11f6e3..402c31a 100644 --- a/config/mpfire/webradio +++ b/config/mpfire/webradio @@ -10,4 +10,5 @@ rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/ relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/ demovibes.de:8000/necta128.ogg|Nectarine Demoscene Radio|http://www.scenemusic.eu/ +r1.scenesat.com:8000/scenesathi|SceneSat Radio|http://www.scenesat.com radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/ diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 68c3af5..444fcce 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.40" +KVER="2.6.32.41" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/linux b/lfs/linux index 16ae152..fcae433 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .40 -VER = 2.6.32.40 +PATCHLEVEL = .41 +VER = 2.6.32.41 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -68,7 +68,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 xen-patches-2.6.32-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2 -$(DL_FILE)_MD5 = 043403f6264c1ec0aea67a5f039d0a31 +$(DL_FILE)_MD5 = 919fe13fe57f903eb03e291dcaeabf57 netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 1a663e9..83e9f49 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -17,14 +17,14 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2010 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2011 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.40 +KVER=2.6.32.41 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-pae/update.sh b/src/paks/linux-pae/update.sh index abbaf47..2878dfb 100644 --- a/src/paks/linux-pae/update.sh +++ b/src/paks/linux-pae/update.sh @@ -17,11 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2011 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh -#Don't remove old xen kernel at update +#Don't remove old pae kernel at update #./uninstall.sh ./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 94a4640d3a41b9aba5b1e998d78db63f32c70df1
by git＠ipfire.org 23 May '11

23 May '11

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 94a4640d3a41b9aba5b1e998d78db63f32c70df1 (commit) from 210673317524fce2073b908a8d920016614f5d72 (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 94a4640d3a41b9aba5b1e998d78db63f32c70df1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 23 23:08:28 2011 +0200 mpfire: add scenesat radio to webradio list. ----------------------------------------------------------------------- Summary of changes: config/mpfire/webradio | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) Difference in files: diff --git a/config/mpfire/webradio b/config/mpfire/webradio index e11f6e3..402c31a 100644 --- a/config/mpfire/webradio +++ b/config/mpfire/webradio @@ -10,4 +10,5 @@ rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/ relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/ demovibes.de:8000/necta128.ogg|Nectarine Demoscene Radio|http://www.scenemusic.eu/ +r1.scenesat.com:8000/scenesathi|SceneSat Radio|http://www.scenesat.com radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/ hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9eca0c864505f02d794d00d46c53aa91524371b4
by git＠ipfire.org 23 May '11

23 May '11

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, next has been updated via 9eca0c864505f02d794d00d46c53aa91524371b4 (commit) via 210673317524fce2073b908a8d920016614f5d72 (commit) via 9473df1ae828f3c110acc300209209214f025a98 (commit) via 7b9fe2c864b4451e5d6275166ddfa8d4c456fcaf (commit) from c8796dfba88eb17832cfc60f96c92e626d7cabf7 (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 9eca0c864505f02d794d00d46c53aa91524371b4 Merge: c8796df 2106733 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 23 21:52:13 2011 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/httpd/server-tuning.conf | 4 ++-- config/rootfiles/core/49/filelists/files | 2 ++ html/cgi-bin/qos.cgi | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf index 9cb7662..183ce80 100644 --- a/config/httpd/server-tuning.conf +++ b/config/httpd/server-tuning.conf @@ -18,8 +18,8 @@ MaxKeepAliveRequests 100 KeepAliveTimeout 15 MinSpareServers 1 -MaxSpareServers 2 -StartServers 2 +MaxSpareServers 10 +StartServers 1 MaxClients 10 MaxRequestsPerChild 100 diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 565594a..3bc88dd 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,4 +1,5 @@ etc/system-release +etc/httpd/conf/server-tuning.conf etc/rc.d/init.d/squid etc/rc.d/init.d/waitdrives etc/rc.d/rcsysinit.d/S19waitdrives @@ -10,6 +11,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/de.pl diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 60c75d7..844058d 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -531,7 +531,7 @@ END open( FILE, "> $level7file" ) or die "Unable to write $level7file"; print FILE <<END 102;$qossettings{'RED_DEV'};dns;;; -102;$qossettings{'RED_DEV'};sip;;; +102;$qossettings{'RED_DEV'};rtp;;; 102;$qossettings{'RED_DEV'};skypetoskype;;; 103;$qossettings{'RED_DEV'};ssh;;; 103;$qossettings{'RED_DEV'};rdp;;; @@ -540,6 +540,7 @@ END 104;$qossettings{'RED_DEV'};pop3;;; 120;$qossettings{'RED_DEV'};applejuice;;; 120;$qossettings{'RED_DEV'};bittorrent;;; +200;imq0;rtp;;; 200;imq0;skypetoskype;;; 203;imq0;ssh;;; 203;imq0;rdp;;; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 210673317524fce2073b908a8d920016614f5d72
by git＠ipfire.org 23 May '11

23 May '11

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 210673317524fce2073b908a8d920016614f5d72 (commit) via 9473df1ae828f3c110acc300209209214f025a98 (commit) from 7b9fe2c864b4451e5d6275166ddfa8d4c456fcaf (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 210673317524fce2073b908a8d920016614f5d72 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 23 21:50:12 2011 +0200 qos-preset: Replaced sip with rtp for voip. sip is only the signaling protocol and don't need realtime. commit 9473df1ae828f3c110acc300209209214f025a98 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon May 23 21:43:56 2011 +0200 apache: add server-tuning.conf to core49. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/49/filelists/files | 2 ++ html/cgi-bin/qos.cgi | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 565594a..3bc88dd 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,4 +1,5 @@ etc/system-release +etc/httpd/conf/server-tuning.conf etc/rc.d/init.d/squid etc/rc.d/init.d/waitdrives etc/rc.d/rcsysinit.d/S19waitdrives @@ -10,6 +11,7 @@ srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi var/ipfire/langs/de.pl diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 60c75d7..844058d 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -531,7 +531,7 @@ END open( FILE, "> $level7file" ) or die "Unable to write $level7file"; print FILE <<END 102;$qossettings{'RED_DEV'};dns;;; -102;$qossettings{'RED_DEV'};sip;;; +102;$qossettings{'RED_DEV'};rtp;;; 102;$qossettings{'RED_DEV'};skypetoskype;;; 103;$qossettings{'RED_DEV'};ssh;;; 103;$qossettings{'RED_DEV'};rdp;;; @@ -540,6 +540,7 @@ END 104;$qossettings{'RED_DEV'};pop3;;; 120;$qossettings{'RED_DEV'};applejuice;;; 120;$qossettings{'RED_DEV'};bittorrent;;; +200;imq0;rtp;;; 200;imq0;skypetoskype;;; 203;imq0;ssh;;; 203;imq0;rdp;;; hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c8796dfba88eb17832cfc60f96c92e626d7cabf7
by git＠ipfire.org 23 May '11

23 May '11

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, next has been updated via c8796dfba88eb17832cfc60f96c92e626d7cabf7 (commit) via 65f0333066db08ccaf9d0cf647f23ec5279e8ebe (commit) via 32c21db1c43be6d2d569cc8d1f92efabdf8885da (commit) from 62b923f9dfbf0c86ac49405c884d0b1167c71b5f (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 c8796dfba88eb17832cfc60f96c92e626d7cabf7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 21 23:37:15 2011 +0200 strongswan: update to 4.5.2. commit 65f0333066db08ccaf9d0cf647f23ec5279e8ebe Merge: 62b923f 32c21db Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat May 21 20:59:16 2011 +0200 Merge branch 'master' into next ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 8 +++----- config/rootfiles/core/49/filelists/files | 1 + .../{oldcore/38 => core/next}/filelists/strongswan | 0 html/cgi-bin/logs.cgi/log.dat | 2 +- lfs/strongswan | 6 +++--- 5 files changed, 8 insertions(+), 9 deletions(-) copy config/rootfiles/{oldcore/38 => core/next}/filelists/strongswan (100%) Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index df093b0..6e97b17 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -40,6 +40,9 @@ usr/libexec/ipsec/plugins/libstrongswan-aes.so #usr/libexec/ipsec/plugins/libstrongswan-attr.a #usr/libexec/ipsec/plugins/libstrongswan-attr.la usr/libexec/ipsec/plugins/libstrongswan-attr.so +#usr/libexec/ipsec/plugins/libstrongswan-constraints.a +#usr/libexec/ipsec/plugins/libstrongswan-constraints.la +usr/libexec/ipsec/plugins/libstrongswan-constraints.so #usr/libexec/ipsec/plugins/libstrongswan-curl.a #usr/libexec/ipsec/plugins/libstrongswan-curl.la usr/libexec/ipsec/plugins/libstrongswan-curl.so @@ -118,14 +121,11 @@ usr/sbin/ipsec #usr/share/man/man3/anyaddr.3 #usr/share/man/man3/atoaddr.3 #usr/share/man/man3/atoasr.3 -#usr/share/man/man3/atosa.3 #usr/share/man/man3/atoul.3 #usr/share/man/man3/goodmask.3 #usr/share/man/man3/initaddr.3 #usr/share/man/man3/initsubnet.3 -#usr/share/man/man3/keyblobtoid.3 #usr/share/man/man3/portof.3 -#usr/share/man/man3/prng.3 #usr/share/man/man3/rangetosubnet.3 #usr/share/man/man3/sameaddr.3 #usr/share/man/man3/subnetof.3 @@ -136,13 +136,11 @@ usr/sbin/ipsec #usr/share/man/man5/ipsec.conf.5 #usr/share/man/man5/ipsec.secrets.5 #usr/share/man/man5/strongswan.conf.5 -#usr/share/man/man8/_copyright.8 #usr/share/man/man8/_updown.8 #usr/share/man/man8/_updown_espmark.8 #usr/share/man/man8/ipsec.8 #usr/share/man/man8/openac.8 #usr/share/man/man8/pluto.8 #usr/share/man/man8/scepclient.8 -#usr/share/man/man8/starter.8 etc/ipsec.user.conf etc/ipsec.user.secrets diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index 032958b..565594a 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -6,6 +6,7 @@ var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/backup.cgi srv/web/ipfire/cgi-bin/extrahd.cgi srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/logs.cgi/log.dat srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi diff --git a/config/rootfiles/core/next/filelists/strongswan b/config/rootfiles/core/next/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/next/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index fea9e6b..5757080 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -60,7 +60,7 @@ my %sections = ( 'ssh' => '(sshd(?:$.*$)?\[.*\]: )', 'auth' => '(\w+$pam_unix$\[.*\]: )', 'kernel' => '(kernel: (?!DROP_))', - 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |vpnwatch: )', + 'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon\[.*\]: |vpnwatch: )', 'openvpn' => '(openvpnserver)\[.*\]: ', 'pakfire' => '(pakfire:) ', 'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ' diff --git a/lfs/strongswan b/lfs/strongswan index 380d351..8c27b1b 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # # # # 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 # @@ -24,7 +24,7 @@ include Config -VER = 4.5.0 +VER = 4.5.2 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cfbd6efef87830a2e7cc4175bde7ac84 +$(DL_FILE)_MD5 = ac33b8f849a274127f84df0838cae953 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. 7b9fe2c864b4451e5d6275166ddfa8d4c456fcaf
by git＠ipfire.org 23 May '11

23 May '11

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 7b9fe2c864b4451e5d6275166ddfa8d4c456fcaf (commit) from 32c21db1c43be6d2d569cc8d1f92efabdf8885da (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 7b9fe2c864b4451e5d6275166ddfa8d4c456fcaf Author: Christian Schmidt <maniacikarus(a)ipfire.org> Date: Mon May 23 07:07:13 2011 +0200 apache: Tuning max spare servers to 10, this should speed up webinterface and updx. ----------------------------------------------------------------------- Summary of changes: config/httpd/server-tuning.conf | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/httpd/server-tuning.conf b/config/httpd/server-tuning.conf index 9cb7662..183ce80 100644 --- a/config/httpd/server-tuning.conf +++ b/config/httpd/server-tuning.conf @@ -18,8 +18,8 @@ MaxKeepAliveRequests 100 KeepAliveTimeout 15 MinSpareServers 1 -MaxSpareServers 2 -StartServers 2 +MaxSpareServers 10 +StartServers 1 MaxClients 10 MaxRequestsPerChild 100 hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM May 2011