IPFire-SCM February 2012

ipfire-scm@lists.ipfire.org

1 participants
48 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 968d4ea400651b48672390956ae856a9f62deba0
by git＠ipfire.org 22 Feb '12

22 Feb '12

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 968d4ea400651b48672390956ae856a9f62deba0 (commit) from a5bc82a447a25aea3a4f6de3db962a2122244556 (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 968d4ea400651b48672390956ae856a9f62deba0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 23 00:01:05 2012 +0100 vim: Add "set ruler" option to configuration file. This will show a small line at the bottom which displays the current cursor position and more. References bug #10021. ----------------------------------------------------------------------- Summary of changes: lfs/vim | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Difference in files: diff --git a/lfs/vim b/lfs/vim index a018dc1..3935d33 100644 --- a/lfs/vim +++ b/lfs/vim @@ -79,9 +79,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -sv vim /usr/bin/vi echo "set nocompatible" > /etc/vimrc echo "set backspace=2" >> /etc/vimrc + echo "set ruler" >> /etc/vimrc echo "syntax on" >> /etc/vimrc echo -e "if (&term == \"iterm\") || (&term == \"putty\")" >> /etc/vimrc - echo "set background=dark" >> /etc/vimrc + echo " set background=dark" >> /etc/vimrc echo "endif" >> /etc/vimrc @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, core57, updated. a5bc82a447a25aea3a4f6de3db962a2122244556
by git＠ipfire.org 19 Feb '12

19 Feb '12

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, core57 has been updated via a5bc82a447a25aea3a4f6de3db962a2122244556 (commit) from eb17d0fd69ae2c21becfee831b32d3441ec6652c (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 a5bc82a447a25aea3a4f6de3db962a2122244556 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 19 13:04:06 2012 +0100 core57: stop/start ipsec at update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/57/update.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/57/update.sh b/config/rootfiles/core/57/update.sh index 6668c8f..177bf72 100644 --- a/config/rootfiles/core/57/update.sh +++ b/config/rootfiles/core/57/update.sh @@ -36,16 +36,19 @@ done #Stop services /etc/init.d/squid stop /etc/init.d/apache stop +/etc/init.d/ipsec stop # #Extract files extract_files - # #Start services /etc/init.d/squid start /etc/init.d/apache start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi # #Update Language cache hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a5bc82a447a25aea3a4f6de3db962a2122244556
by git＠ipfire.org 19 Feb '12

19 Feb '12

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 a5bc82a447a25aea3a4f6de3db962a2122244556 (commit) from eb17d0fd69ae2c21becfee831b32d3441ec6652c (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 a5bc82a447a25aea3a4f6de3db962a2122244556 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 19 13:04:06 2012 +0100 core57: stop/start ipsec at update. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/57/update.sh | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/core/57/update.sh b/config/rootfiles/core/57/update.sh index 6668c8f..177bf72 100644 --- a/config/rootfiles/core/57/update.sh +++ b/config/rootfiles/core/57/update.sh @@ -36,16 +36,19 @@ done #Stop services /etc/init.d/squid stop /etc/init.d/apache stop +/etc/init.d/ipsec stop # #Extract files extract_files - # #Start services /etc/init.d/squid start /etc/init.d/apache start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi # #Update Language cache hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, core57, created. eb17d0fd69ae2c21becfee831b32d3441ec6652c
by git＠ipfire.org 19 Feb '12

19 Feb '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. eb17d0fd69ae2c21becfee831b32d3441ec6652c
by git＠ipfire.org 19 Feb '12

19 Feb '12

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 eb17d0fd69ae2c21becfee831b32d3441ec6652c (commit) via fa4762fbf8732a1e48015ee07a422f293d7be1f7 (commit) via 36661efeecd3f3e0d1bb46cc65aa5f696b18f649 (commit) via dc083d18df3f5ed30956237c6e3488d9f5449f5c (commit) via 38d3bcd5c14b9670163774d02606a4f7045668d6 (commit) via 3412d9ef01a9e4f7718f8d05587f1a5748d0632b (commit) via bc48f6631581360454d55085db94b446772413a8 (commit) via 9da0695da76e008fbfadbf976b5eaa904f707b40 (commit) via a73f60abb870bf94498eb1147f97b7b67b036f32 (commit) via 732447b9b3a188ac4f50b4902efaa854c2fba176 (commit) via d02a7f9d050e97714e151bb93c8f67448b743d5e (commit) via fdde104f2d7a333b79fe61eeeb77582efe10cb58 (commit) via 261f88ebe6eee1de5c874c831017a8e536225c30 (commit) via 2b5d1d8f703ae2bb0a5b11c254c0890242c3259d (commit) via da997327ad98ff64c1c5e9f765946713970887e1 (commit) via 5971e9a1aa61b76c523111f6c972c531dcd4def4 (commit) via 7e4506e9c7cc5e2dd2cd5e617ec190c89cd12dca (commit) via 7d5fdf795458fde3a2778577445b879e2f1d51af (commit) via 144815dabebdd5cbabc73a205db8143215fac59d (commit) from 9e31e76b8b72325dcaede4d3dfefc4a56d5caa4b (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 eb17d0fd69ae2c21becfee831b32d3441ec6652c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 19 12:51:12 2012 +0100 finished core57. commit fa4762fbf8732a1e48015ee07a422f293d7be1f7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 19 12:48:42 2012 +0100 network: don't set ip address "1.1.1.1". This change made also green-only with dhcp possible. configure green to 1.1.1.1 and red to dhcp client and RED_DEV=green0. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/apache2 | 18 ++++++++++++++---- config/rootfiles/common/php | 1 + config/rootfiles/common/vim | 4 ++-- config/rootfiles/core/{52 => 57}/filelists/apache2 | 0 config/rootfiles/core/57/filelists/files | 1 + .../{oldcore/47 => core/57}/filelists/php | 0 config/rootfiles/core/{52 => 57}/filelists/squid | 0 .../rootfiles/core/{53 => 57}/filelists/strongswan | 0 .../{oldcore/44 => core/57}/filelists/vim | 0 config/rootfiles/core/57/update.sh | 4 ++++ config/rootfiles/packages/cups | 2 ++ config/rootfiles/packages/nut | 2 +- html/cgi-bin/outgoingfw.cgi | 2 +- lfs/apache2 | 13 +++++++------ lfs/cups | 8 ++++---- lfs/nut | 6 +++--- lfs/php | 12 ++---------- lfs/pound | 7 ++++--- lfs/squid | 6 +++--- lfs/strongswan | 4 ++++ make.sh | 2 +- src/initscripts/init.d/networking/any | 16 ++++++++++------ src/install+setup/install/mountsource.sh | 10 ++++++---- src/patches/pound-2.6.patch | 11 +++++++++++ 24 files changed, 81 insertions(+), 48 deletions(-) copy config/rootfiles/core/{52 => 57}/filelists/apache2 (100%) copy config/rootfiles/{oldcore/47 => core/57}/filelists/php (100%) copy config/rootfiles/core/{52 => 57}/filelists/squid (100%) copy config/rootfiles/core/{53 => 57}/filelists/strongswan (100%) copy config/rootfiles/{oldcore/44 => core/57}/filelists/vim (100%) create mode 100644 src/patches/pound-2.6.patch Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 2eab3b5..01e9bbe 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -482,6 +482,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/license.html.en #srv/web/ipfire/manual/logs.html #srv/web/ipfire/manual/logs.html.en +#srv/web/ipfire/manual/logs.html.fr #srv/web/ipfire/manual/logs.html.ja.utf8 #srv/web/ipfire/manual/logs.html.ko.euc-kr #srv/web/ipfire/manual/logs.html.tr.utf8 @@ -758,11 +759,14 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/mod/mod_proxy_connect.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_proxy_ftp.html #srv/web/ipfire/manual/mod/mod_proxy_ftp.html.en +#srv/web/ipfire/manual/mod/mod_proxy_ftp.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_proxy_http.html #srv/web/ipfire/manual/mod/mod_proxy_http.html.en #srv/web/ipfire/manual/mod/mod_proxy_http.html.fr +#srv/web/ipfire/manual/mod/mod_proxy_http.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_proxy_scgi.html #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en +#srv/web/ipfire/manual/mod/mod_proxy_scgi.html.ja.utf8 #srv/web/ipfire/manual/mod/mod_reqtimeout.html #srv/web/ipfire/manual/mod/mod_reqtimeout.html.en #srv/web/ipfire/manual/mod/mod_rewrite.html @@ -873,6 +877,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/new_features_2_2.html #srv/web/ipfire/manual/new_features_2_2.html.en #srv/web/ipfire/manual/new_features_2_2.html.fr +#srv/web/ipfire/manual/new_features_2_2.html.ja.utf8 #srv/web/ipfire/manual/new_features_2_2.html.ko.euc-kr #srv/web/ipfire/manual/new_features_2_2.html.pt-br #srv/web/ipfire/manual/new_features_2_2.html.tr.utf8 @@ -942,6 +947,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/programs/index.html #srv/web/ipfire/manual/programs/index.html.en #srv/web/ipfire/manual/programs/index.html.es +#srv/web/ipfire/manual/programs/index.html.ja.utf8 #srv/web/ipfire/manual/programs/index.html.ko.euc-kr #srv/web/ipfire/manual/programs/index.html.ru.koi8-r #srv/web/ipfire/manual/programs/index.html.tr.utf8 @@ -1066,6 +1072,7 @@ etc/httpd/conf/mime.types #srv/web/ipfire/manual/upgrading.html.de #srv/web/ipfire/manual/upgrading.html.en #srv/web/ipfire/manual/upgrading.html.fr +#srv/web/ipfire/manual/upgrading.html.ja.utf8 #srv/web/ipfire/manual/urlmapping.html #srv/web/ipfire/manual/urlmapping.html.en #srv/web/ipfire/manual/urlmapping.html.ja.utf8 @@ -1135,6 +1142,7 @@ etc/httpd/conf/mime.types #usr/include/apache/apr_atomic.h #usr/include/apache/apr_base64.h #usr/include/apache/apr_buckets.h +#usr/include/apache/apr_crypto.h #usr/include/apache/apr_date.h #usr/include/apache/apr_dbd.h #usr/include/apache/apr_dbm.h @@ -1194,6 +1202,7 @@ etc/httpd/conf/mime.types #usr/include/apache/apr_xlate.h #usr/include/apache/apr_xml.h #usr/include/apache/apu.h +#usr/include/apache/apu_errno.h #usr/include/apache/apu_version.h #usr/include/apache/apu_want.h #usr/include/apache/http_config.h @@ -1322,7 +1331,7 @@ usr/lib/libapr-1.so.0.4.5 #usr/lib/libaprutil-1.la usr/lib/libaprutil-1.so usr/lib/libaprutil-1.so.0 -usr/lib/libaprutil-1.so.0.3.12 +usr/lib/libaprutil-1.so.0.4.1 #usr/lib/pkgconfig/apr-1.pc #usr/lib/pkgconfig/apr-util-1.pc #usr/sbin/ab @@ -1340,16 +1349,17 @@ usr/sbin/httpd #usr/sbin/httxt2dbm #usr/sbin/logresolve #usr/sbin/rotatelogs +#usr/share/man/man1/ab.1 +#usr/share/man/man1/apxs.1 #usr/share/man/man1/dbmmanage.1 #usr/share/man/man1/htdbm.1 #usr/share/man/man1/htdigest.1 #usr/share/man/man1/htpasswd.1 -#usr/share/man/man8/ab.8 +#usr/share/man/man1/httxt2dbm.1 +#usr/share/man/man1/logresolve.1 #usr/share/man/man8/apachectl.8 -#usr/share/man/man8/apxs.8 #usr/share/man/man8/htcacheclean.8 #usr/share/man/man8/httpd.8 -#usr/share/man/man8/logresolve.8 #usr/share/man/man8/rotatelogs.8 #usr/share/man/man8/suexec.8 var/log/httpd diff --git a/config/rootfiles/common/php b/config/rootfiles/common/php index 693a4b2..23031e9 100644 --- a/config/rootfiles/common/php +++ b/config/rootfiles/common/php @@ -197,6 +197,7 @@ usr/bin/php #usr/include/php/ext/standard/credits.h #usr/include/php/ext/standard/credits_ext.h #usr/include/php/ext/standard/credits_sapi.h +#usr/include/php/ext/standard/crypt_blowfish.h #usr/include/php/ext/standard/crypt_freesec.h #usr/include/php/ext/standard/css.h #usr/include/php/ext/standard/cyr_convert.h diff --git a/config/rootfiles/common/vim b/config/rootfiles/common/vim index 65667bc..6f5ee80 100644 --- a/config/rootfiles/common/vim +++ b/config/rootfiles/common/vim @@ -1,4 +1,4 @@ -#etc/vimrc +etc/vimrc #usr/bin/ex #usr/bin/rview #usr/bin/rvim @@ -17,7 +17,7 @@ usr/bin/vim #usr/share/man/man1/vimdiff.1 #usr/share/man/man1/vimtutor.1 #usr/share/man/man1/xxd.1 -#usr/share/vim +usr/share/vim #usr/share/vim/vim72 #usr/share/vim/vim72/autoload #usr/share/vim/vim72/autoload/README.txt diff --git a/config/rootfiles/core/57/filelists/apache2 b/config/rootfiles/core/57/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/57/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/57/filelists/files b/config/rootfiles/core/57/filelists/files index a678ee8..2f80b5f 100644 --- a/config/rootfiles/core/57/filelists/files +++ b/config/rootfiles/core/57/filelists/files @@ -2,3 +2,4 @@ etc/system-release etc/issue etc/rc.d/init.d/networking/red.up/10-static-routes etc/rc.d/init.d/networking/red.down/10-static-routes +etc/rc.d/init.d/networking/any diff --git a/config/rootfiles/core/57/filelists/php b/config/rootfiles/core/57/filelists/php new file mode 120000 index 0000000..1ae48d7 --- /dev/null +++ b/config/rootfiles/core/57/filelists/php @@ -0,0 +1 @@ +../../../common/php \ No newline at end of file diff --git a/config/rootfiles/core/57/filelists/squid b/config/rootfiles/core/57/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/57/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/57/filelists/strongswan b/config/rootfiles/core/57/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/57/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/57/filelists/vim b/config/rootfiles/core/57/filelists/vim new file mode 120000 index 0000000..9861317 --- /dev/null +++ b/config/rootfiles/core/57/filelists/vim @@ -0,0 +1 @@ +../../../common/vim \ No newline at end of file diff --git a/config/rootfiles/core/57/update.sh b/config/rootfiles/core/57/update.sh index 2f78a25..6668c8f 100644 --- a/config/rootfiles/core/57/update.sh +++ b/config/rootfiles/core/57/update.sh @@ -34,6 +34,8 @@ done # #Stop services +/etc/init.d/squid stop +/etc/init.d/apache stop # #Extract files @@ -42,6 +44,8 @@ extract_files # #Start services +/etc/init.d/squid start +/etc/init.d/apache start # #Update Language cache diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups index 6bf7e69..5f90047 100644 --- a/config/rootfiles/packages/cups +++ b/config/rootfiles/packages/cups @@ -949,8 +949,10 @@ usr/share/doc/cups/images #usr/share/doc/cups/images/cups.png #usr/share/doc/cups/images/generic.png #usr/share/doc/cups/images/left.gif +#usr/share/doc/cups/images/raster-organization.png #usr/share/doc/cups/images/raster.png #usr/share/doc/cups/images/right.gif +#usr/share/doc/cups/images/sample-image.png #usr/share/doc/cups/images/sel.gif #usr/share/doc/cups/images/smiley.jpg #usr/share/doc/cups/images/unsel.gif diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut index 5be3ac6..53935f0 100644 --- a/config/rootfiles/packages/nut +++ b/config/rootfiles/packages/nut @@ -69,7 +69,7 @@ usr/lib/libnutscan.so.1.0.0 #usr/lib/libupsclient.la usr/lib/libupsclient.so usr/lib/libupsclient.so.1 -usr/lib/libupsclient.so.1.0.0 +usr/lib/libupsclient.so.1.1.0 usr/sbin/upsd usr/sbin/upsmon usr/sbin/upssched diff --git a/html/cgi-bin/outgoingfw.cgi b/html/cgi-bin/outgoingfw.cgi index 295bde4..b417817 100644 --- a/html/cgi-bin/outgoingfw.cgi +++ b/html/cgi-bin/outgoingfw.cgi @@ -631,7 +631,7 @@ END sub addrule { &Header::openbox('100%', 'center', $Lang::tr{'Add Rule'}); - if ($outfwsettings{'EDIT'} eq 'no') { $selected{'ENABLED'} = 'checked'; } + if ($outfwsettings{'ENABLED'} eq 'on') { $selected{'ENABLED'} = 'checked'; } $selected{'TIME_FROM'}{$outfwsettings{'TIME_FROM'}} = "selected='selected'"; $selected{'TIME_TO'}{$outfwsettings{'TIME_TO'}} = "selected='selected'"; print <<END diff --git a/lfs/apache2 b/lfs/apache2 index f548271..bcc9155 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 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 # @@ -25,7 +25,7 @@ include Config -VER = 2.2.21 +VER = 2.2.22 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE) \ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch -$(DL_FILE)_MD5 = 1696ae62cd879ab1d4dd9ff021a470f2 +$(DL_FILE)_MD5 = 9fe3093194c8a57f085ff7c3fc43715f httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822 install : $(TARGET) @@ -133,9 +133,10 @@ else cd $(DIR_APP) && make install chown -v root:root /usr/lib/apache/httpd.exp \ /usr/sbin/{apxs,apachectl,dbmmanage,envvars{,-std}} \ - /usr/share/man/man1/{dbmmanage,ht{dbm,digest,passwd}}.1 \ - /usr/share/man/man8/{ab,apachectl,apxs,htcacheclean,httpd}.8 \ - /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 + /usr/share/man/man1/{ab,apxs,dbmmanage,ht{dbm,digest,passwd,txt2dbm}}.1 \ + /usr/share/man/man1/logresolve.1 \ + /usr/share/man/man8/{apachectl,htcacheclean,httpd}.8 \ + /usr/share/man/man8/{rotatelogs,suexec}.8 @rm -rf $(DIR_APP) endif @$(POSTBUILD) diff --git a/lfs/cups b/lfs/cups index e7fd085..f182538 100644 --- a/lfs/cups +++ b/lfs/cups @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 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 = 1.4.6 +VER = 1.4.8 THISAPP = cups-$(VER) DL_FILE = $(THISAPP)-source.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/cups-$(VER) TARGET = $(DIR_INFO)/$(THISAPP) PROG = cups -PAK_VER = 7 +PAK_VER = 8 DEPS = "ghostscript" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = de8fb5a29c36554925c0c6a6e2c0dae1 +$(DL_FILE)_MD5 = 0ec52d3f3c69bc2ab5ed70c594edbce6 install : $(TARGET) diff --git a/lfs/nut b/lfs/nut index bc83b8e..8007a53 100644 --- a/lfs/nut +++ b/lfs/nut @@ -24,7 +24,7 @@ include Config -VER = 2.6.2 +VER = 2.6.3 THISAPP = nut-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nut -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f6d0683e51e0fcab06e6a79724685d26 +$(DL_FILE)_MD5 = 8db00c21f8bc03add6e14d15f634ec6a install : $(TARGET) diff --git a/lfs/php b/lfs/php index e8073ff..2a883de 100644 --- a/lfs/php +++ b/lfs/php @@ -24,18 +24,13 @@ include Config -VER = 5.3.5 +VER = 5.3.10 THISAPP = php-$(VER) DL_FILE = $(THISAPP).tar.bz2 DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = php -PAK_VER = 1 - -DEPS = "" - ############################################################################### # Top-level Rules @@ -47,7 +42,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE) idn-0.1.tgz = $(DL_FROM)/idn-0.1.tgz Log-1.9.11.tgz = $(DL_FROM)/Log-1.9.11.tgz -$(DL_FILE)_MD5 = 8aaf20c95e91f25c5b6a591e5d6d61b9 +$(DL_FILE)_MD5 = 816259e5ca7d0a7e943e56a3bb32b17f idn-0.1.tgz_MD5 = ef8635ec22348325a76abd2abddca4a1 Log-1.9.11.tgz_MD5 = fb7c648b212f12fdb5ce1ab687793513 @@ -59,9 +54,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) md5 : $(subst %,%_MD5,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, md5sum ############################################################################### diff --git a/lfs/pound b/lfs/pound index 39ef2cd..1b9e523 100644 --- a/lfs/pound +++ b/lfs/pound @@ -24,7 +24,7 @@ include Config -VER = 2.5 +VER = 2.6 THISAPP = Pound-$(VER) DL_FILE = $(THISAPP).tgz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = pound -PAK_VER = 2 +PAK_VER = 3 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8a39f5902094619afcda7d12d9d8342c +$(DL_FILE)_MD5 = 8c913b527332694943c4c67c8f152071 install : $(TARGET) @@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/pound-2.6.patch cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-cert1l cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/squid b/lfs/squid index 610154b..814985c 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2012 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 = 3.1.18 +VER = 3.1.19 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b53f8fb6e22551c2a7376292df5b6ec7 +$(DL_FILE)_MD5 = 9b6ffaf96bee8f05f0085bc6361d7c94 install : $(TARGET) diff --git a/lfs/strongswan b/lfs/strongswan index e2da475..7370be9 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -73,6 +73,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch + # Customize the welcome banner. + sed -i $(DIR_APP)/src/pluto/modecfg.c \ + -e 's/^#define.*DEFAULT_UNITY_BANNER.*/#define DEFAULT_UNITY_BANNER "Welcome to IPFire - An Open Source Firewall Solution.\\n"/' + cd $(DIR_APP) && ./configure --prefix="/usr" --sysconfdir="/etc" \ --enable-cisco-quirks \ --enable-curl \ diff --git a/make.sh b/make.sh index f425428..598681d 100755 --- a/make.sh +++ b/make.sh @@ -26,7 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.11" # Version number CORE="57" # Core Level (Filename) -PAKFIRE_CORE="56" # Core Level (PAKFIRE) +PAKFIRE_CORE="57" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/initscripts/init.d/networking/any b/src/initscripts/init.d/networking/any index b88d21e..5609a9e 100644 --- a/src/initscripts/init.d/networking/any +++ b/src/initscripts/init.d/networking/any @@ -80,15 +80,19 @@ case "${1}" in # Create & Enable vnstat data collection /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..." - ip addr add ${args} dev ${DEVICE} - evaluate_retval + if [ ! "${ADDRESS}" == "1.1.1.1" ]; then + boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..." + ip addr add ${args} dev ${DEVICE} + evaluate_retval + fi ;; stop) - boot_mesg "Removing IPv4 addresses from the ${DEVICE} interface..." - ip addr flush dev ${DEVICE} - evaluate_retval + if [ ! "${ADDRESS}" == "1.1.1.1" ]; then + boot_mesg "Removing IPv4 addresses from the ${DEVICE} interface..." + ip addr flush dev ${DEVICE} + evaluate_retval + fi # Disable vnstat collection /usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1 diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh index bb7a7e2..6813758 100644 --- a/src/install+setup/install/mountsource.sh +++ b/src/install+setup/install/mountsource.sh @@ -36,15 +36,17 @@ done # scan HD device part1 (usb sticks, etc.) for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do - mount /dev/${DEVICE}1 /cdrom 2> /dev/null + for DEVICEP in $(ls /dev/${DEVICE}? | sed "s/\/dev\///");do + mount /dev/${DEVICEP} /cdrom 2> /dev/null if [ -n "$(ls /cdrom/ipfire-*.tlz 2>/dev/null)" ]; then - echo -n ${DEVICE}1 > /tmp/source_device - echo "Found tarball on ${DEVICE}1" + echo -n ${DEVICEP} > /tmp/source_device + echo "Found tarball on ${DEVICEP}" exit 0 else - echo "Found no tarballs on ${DEVICE}1 - SKIP" + echo "Found no tarballs on ${DEVICEP} - SKIP" fi umount /cdrom 2> /dev/null + done done # scan HD device unpart (usb sticks, etc.) diff --git a/src/patches/pound-2.6.patch b/src/patches/pound-2.6.patch new file mode 100644 index 0000000..9dceebc --- /dev/null +++ b/src/patches/pound-2.6.patch @@ -0,0 +1,11 @@ +--- build/usr/src/Pound-2.6/configure_orig 2011-12-28 14:57:45.000000000 +0100 ++++ build/usr/src/Pound-2.6/configure 2012-02-10 21:09:50.000000000 +0100 +@@ -3232,7 +3232,7 @@ + + if test "${CC}" = "gcc" + then +- CPPFLAGS="${CPPFLAGS} -Wstrict-prototypes -Wno-unused-result -pipe" ++ CPPFLAGS="${CPPFLAGS} -Wstrict-prototypes -pipe" + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: *** Checking for threads library and/or flags ***" >&5 hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree tag, v2.11-core57, created. eb17d0fd69ae2c21becfee831b32d3441ec6652c
by git＠ipfire.org 19 Feb '12

19 Feb '12

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 tag, v2.11-core57 has been created at eb17d0fd69ae2c21becfee831b32d3441ec6652c (commit) - Log ----------------------------------------------------------------- commit eb17d0fd69ae2c21becfee831b32d3441ec6652c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 19 12:51:12 2012 +0100 finished core57. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. eb17d0fd69ae2c21becfee831b32d3441ec6652c
by git＠ipfire.org 19 Feb '12

19 Feb '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. e87a04764f162d83bec9fdfad6a31af429225625
by git＠ipfire.org 18 Feb '12

18 Feb '12

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 e87a04764f162d83bec9fdfad6a31af429225625 (commit) via d75c0d50110efc190ae7316e6300a3c665d247e1 (commit) from b24088d312b943f082c450227d7231a66d8dc559 (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 e87a04764f162d83bec9fdfad6a31af429225625 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 18 18:47:12 2012 +0100 ipfire-logos: New package. This package ships IPFire logos and artwork. commit d75c0d50110efc190ae7316e6300a3c665d247e1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Feb 18 18:46:31 2012 +0100 ipfire-release: Rename the system-release package. ----------------------------------------------------------------------- Summary of changes: pyfire/pyfire.nm => ipfire-logos/ipfire-logos.nm | 35 ++++++++------------ .../ipfire-release.nm | 0 2 files changed, 14 insertions(+), 21 deletions(-) copy pyfire/pyfire.nm => ipfire-logos/ipfire-logos.nm (52%) rename system-release/system-release.nm => ipfire-release/ipfire-release.nm (100%) Difference in files: diff --git a/ipfire-logos/ipfire-logos.nm b/ipfire-logos/ipfire-logos.nm new file mode 100644 index 0000000..9947523 --- /dev/null +++ b/ipfire-logos/ipfire-logos.nm @@ -0,0 +1,35 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = ipfire-logos +version = 1 +release = 1 +arch = noarch + +maintainer = Michael Tremer <michael.tremer(a)ipfire.org> +groups = Base System/Base +url = http://www.ipfire.org +license = +summary = IPFire logos and images. + +description + This package contains several logos, fonts and artwork of the + IPFire distribution. +end + +source_dl = http://source.ipfire.org/releases/%{name}/ + +build + requires + ImageMagick + ghostscript + end +end + +packages + package %{name} + provides = system-logos + end +end diff --git a/ipfire-release/ipfire-release.nm b/ipfire-release/ipfire-release.nm new file mode 100644 index 0000000..afc0609 --- /dev/null +++ b/ipfire-release/ipfire-release.nm @@ -0,0 +1,68 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +# Make the configuration of your distribution right here. +DISTRO_NAME = IPFire +DISTRO_SNAME = ipfire +DISTRO_VERSION = 3.0-alpha2 +DISTRO_RELEASE = 3 +DISTRO_SLOGAN = Gluttony +DISTRO_COLOR = 0;31 + +name = %{DISTRO_SNAME}-release +version = %{DISTRO_VERSION} +release = 1 +epoch = 3 +arch = noarch + +maintainer = Michael Tremer <michael.tremer(a)ipfire.org> +groups = Base Build System/Base +url = http://www.ipfire.org +license = +summary = %{DISTRO_NAME} release files. + +description + %{DISTRO_NAME} release files such as pakfire configs and various /etc/ \ + files that define the release. +end + +# No tarball. +sources = + +build + prepare = # Do nothing + build = # Do nothing + + install + mkdir -pv %{BUILDROOT}/etc + + echo "%{DISTRO_NAME} v%{DISTRO_VERSION} for %{DISTRO_ARCH} - %{DISTRO_SLOGAN} (\l)" \ + > %{BUILDROOT}/etc/issue + echo "===============================" >> %{BUILDROOT}/etc/issue + echo "\n running on \s \r \m" >> %{BUILDROOT}/etc/issue + + echo "%{DISTRO_NAME} release %{DISTRO_VERSION} (%{DISTRO_SLOGAN})" \ + > %{BUILDROOT}/etc/%{DISTRO_SNAME}-release + ln -svf %{DISTRO_SNAME}-release %{BUILDROOT}/etc/system-release + + # Set a default hostname that is set until the user customizes that. + echo "%{DISTRO_SNAME}.localdomain" > %{BUILDROOT}/etc/hostname + + # Create /etc/os-release. + echo "NAME=\"%{DISTRO_NAME}\"" >> %{BUILDROOT}/etc/os-release + echo "VERSION=\"%{DISTRO_VERSION}\"" >> %{BUILDROOT}/etc/os-release + echo "ID=%{DISTRO_SNAME}" >> %{BUILDROOT}/etc/os-release + echo "VERSION_ID=%{DISTRO_RELEASE}" >> %{BUILDROOT}/etc/os-release + echo "PRETTY_NAME=\"%{DISTRO_NAME} %{DISTRO_VERSION} (%{DISTRO_SLOGAN})\"" \ + >> %{BUILDROOT}/etc/os-release + echo "ANSI_COLOR=%{DISTRO_COLOR}" >> %{BUILDROOT}/etc/os-release + end +end + +packages + package %{name} + provides = system-release + end +end diff --git a/system-release/system-release.nm b/system-release/system-release.nm deleted file mode 100644 index afc0609..0000000 --- a/system-release/system-release.nm +++ /dev/null @@ -1,68 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -# Make the configuration of your distribution right here. -DISTRO_NAME = IPFire -DISTRO_SNAME = ipfire -DISTRO_VERSION = 3.0-alpha2 -DISTRO_RELEASE = 3 -DISTRO_SLOGAN = Gluttony -DISTRO_COLOR = 0;31 - -name = %{DISTRO_SNAME}-release -version = %{DISTRO_VERSION} -release = 1 -epoch = 3 -arch = noarch - -maintainer = Michael Tremer <michael.tremer(a)ipfire.org> -groups = Base Build System/Base -url = http://www.ipfire.org -license = -summary = %{DISTRO_NAME} release files. - -description - %{DISTRO_NAME} release files such as pakfire configs and various /etc/ \ - files that define the release. -end - -# No tarball. -sources = - -build - prepare = # Do nothing - build = # Do nothing - - install - mkdir -pv %{BUILDROOT}/etc - - echo "%{DISTRO_NAME} v%{DISTRO_VERSION} for %{DISTRO_ARCH} - %{DISTRO_SLOGAN} (\l)" \ - > %{BUILDROOT}/etc/issue - echo "===============================" >> %{BUILDROOT}/etc/issue - echo "\n running on \s \r \m" >> %{BUILDROOT}/etc/issue - - echo "%{DISTRO_NAME} release %{DISTRO_VERSION} (%{DISTRO_SLOGAN})" \ - > %{BUILDROOT}/etc/%{DISTRO_SNAME}-release - ln -svf %{DISTRO_SNAME}-release %{BUILDROOT}/etc/system-release - - # Set a default hostname that is set until the user customizes that. - echo "%{DISTRO_SNAME}.localdomain" > %{BUILDROOT}/etc/hostname - - # Create /etc/os-release. - echo "NAME=\"%{DISTRO_NAME}\"" >> %{BUILDROOT}/etc/os-release - echo "VERSION=\"%{DISTRO_VERSION}\"" >> %{BUILDROOT}/etc/os-release - echo "ID=%{DISTRO_SNAME}" >> %{BUILDROOT}/etc/os-release - echo "VERSION_ID=%{DISTRO_RELEASE}" >> %{BUILDROOT}/etc/os-release - echo "PRETTY_NAME=\"%{DISTRO_NAME} %{DISTRO_VERSION} (%{DISTRO_SLOGAN})\"" \ - >> %{BUILDROOT}/etc/os-release - echo "ANSI_COLOR=%{DISTRO_COLOR}" >> %{BUILDROOT}/etc/os-release - end -end - -packages - package %{name} - provides = system-release - end -end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, kernel-update, created. e0ece8e7cca18bc4521256d013a3e8e550a851c2
by git＠ipfire.org 18 Feb '12

18 Feb '12

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, kernel-update has been created at e0ece8e7cca18bc4521256d013a3e8e550a851c2 (commit) - Log ----------------------------------------------------------------- commit e0ece8e7cca18bc4521256d013a3e8e550a851c2 Author: root <root(a)build.warriors.homedns.org> Date: Sat Feb 18 17:34:56 2012 +0100 kernel: compile usb driver into kernel. commit 7640b78b8fb38b40606c1e7ec5dde14d62fc069a Author: root <root(a)build.warriors.homedns.org> Date: Sat Feb 18 17:34:16 2012 +0100 v4l-dvb: update to 20111225. commit 0249e1a638f053816badf81b908ff6989840cf94 Author: root <root(a)build.warriors.homedns.org> Date: Sat Feb 18 17:33:22 2012 +0100 compat-wireless: update to 3.2.5-1. commit 524ba44a83c3785f3773ab05961c4059baba8022 Author: root <root(a)build.warriors.homedns.org> Date: Sat Feb 18 11:51:05 2012 +0100 kernel: update to 2.6.32.57. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b24088d312b943f082c450227d7231a66d8dc559
by git＠ipfire.org 17 Feb '12

17 Feb '12

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2012