IPFire-SCM

ipfire-scm@lists.ipfire.org

1 participants
7853 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 55bec7f58fa5b38a8ce37d3667730c80e85f2577
by git＠ipfire.org 21 Jan '12

21 Jan '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 55bec7f58fa5b38a8ce37d3667730c80e85f2577 (commit) via 9f212a96075bd0c3cc0b55c57ea8c2427ef6847c (commit) via 4de55e0b3d1cedf25f9ea2b00e17d054115bf8fa (commit) via 93474644055b272ec614cbc27b5bf7eb9ab3c379 (commit) from 18e7404874ed3442a38cd538a7184cfc67951db1 (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 55bec7f58fa5b38a8ce37d3667730c80e85f2577 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 21 20:26:26 2012 +0100 core56: stop/start sshd and apache while updateing. commit 9f212a96075bd0c3cc0b55c57ea8c2427ef6847c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 21 20:24:09 2012 +0100 core56: add openvpnctrl to updater. commit 4de55e0b3d1cedf25f9ea2b00e17d054115bf8fa Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 21 20:20:57 2012 +0100 initskripts: add disc sync before unmounting filesystems. commit 93474644055b272ec614cbc27b5bf7eb9ab3c379 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 21 20:19:25 2012 +0100 core56: add Crypt-PasswdMD5 to updater. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/56/filelists/Crypt-PasswdMD5 | 1 + config/rootfiles/core/56/filelists/files | 2 ++ config/rootfiles/core/56/update.sh | 5 ++++- src/initscripts/init.d/mountfs | 4 ++++ 4 files changed, 11 insertions(+), 1 deletions(-) create mode 120000 config/rootfiles/core/56/filelists/Crypt-PasswdMD5 Difference in files: diff --git a/config/rootfiles/core/56/filelists/Crypt-PasswdMD5 b/config/rootfiles/core/56/filelists/Crypt-PasswdMD5 new file mode 120000 index 0000000..9a766e1 --- /dev/null +++ b/config/rootfiles/core/56/filelists/Crypt-PasswdMD5 @@ -0,0 +1 @@ +../../../common/Crypt-PasswdMD5 \ No newline at end of file diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files index 26d35c5..58c1960 100644 --- a/config/rootfiles/core/56/filelists/files +++ b/config/rootfiles/core/56/filelists/files @@ -1,8 +1,10 @@ etc/system-release etc/issue +etc/rc.d/init.d/mountfs etc/rc.d/init.d/smartenabler srv/web/ipfire/cgi-bin/chpasswd.cgi srv/web/ipfire/cgi-bin/hardwaregraphs.cgi srv/web/ipfire/cgi-bin/media.cgi usr/local/bin/hddshutdown usr/local/bin/makegraphs +usr/local/bin/openvpnctrl diff --git a/config/rootfiles/core/56/update.sh b/config/rootfiles/core/56/update.sh index cde93e1..2655a40 100644 --- a/config/rootfiles/core/56/update.sh +++ b/config/rootfiles/core/56/update.sh @@ -34,6 +34,8 @@ done # #Stop services +/etc/init.d/sshd stop +/etc/init.d/apache stop # #Extract files @@ -46,7 +48,8 @@ sed -i -e "s|38400|115200|g" /etc/inittab # #Start services - +/etc/init.d/apache start +/etc/init.d/sshd start # #Update Language cache diff --git a/src/initscripts/init.d/mountfs b/src/initscripts/init.d/mountfs index 43ef02d..01ecafd 100644 --- a/src/initscripts/init.d/mountfs +++ b/src/initscripts/init.d/mountfs @@ -40,6 +40,10 @@ case "${1}" in ;; stop) + boot_mesg "Syncing discs..." + sync && sync + evaluate_retval + boot_mesg "Unmounting all other currently mounted file systems..." umount -a -d -r &>/dev/null evaluate_retval hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 18e7404874ed3442a38cd538a7184cfc67951db1
by git＠ipfire.org 21 Jan '12

21 Jan '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 18e7404874ed3442a38cd538a7184cfc67951db1 (commit) via d8799d92805d01a700afe3dad14c6dde439f42d7 (commit) from 120cedf2852b71cd06cdacda10a18a8e7f2eeb8a (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 18e7404874ed3442a38cd538a7184cfc67951db1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 21 20:13:54 2012 +0100 chpasswd.cgi: fixed for new MD5 password hashes. commit d8799d92805d01a700afe3dad14c6dde439f42d7 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 21 20:11:01 2012 +0100 Crypt-PasswdMD5: add new perl modul to use apache md5 passwords. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/Crypt-PasswdMD5 | 6 ++++++ config/rootfiles/core/56/filelists/files | 1 + html/cgi-bin/chpasswd.cgi | 6 +++++- lfs/{Locale-Country => Crypt-PasswdMD5} | 8 ++++---- make.sh | 1 + 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 config/rootfiles/common/Crypt-PasswdMD5 copy lfs/{Locale-Country => Crypt-PasswdMD5} (94%) Difference in files: diff --git a/config/rootfiles/common/Crypt-PasswdMD5 b/config/rootfiles/common/Crypt-PasswdMD5 new file mode 100644 index 0000000..93df4cb --- /dev/null +++ b/config/rootfiles/common/Crypt-PasswdMD5 @@ -0,0 +1,6 @@ +#usr/lib/perl5/site_perl/5.12.3/Crypt +usr/lib/perl5/site_perl/5.12.3/Crypt/PasswdMD5.pm +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Crypt +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Crypt/PasswdMD5 +#usr/lib/perl5/site_perl/5.12.3/i586-linux-thread-multi/auto/Crypt/PasswdMD5/.packlist +#usr/share/man/man3/Crypt::PasswdMD5.3 diff --git a/config/rootfiles/core/56/filelists/files b/config/rootfiles/core/56/filelists/files index c82a52e..26d35c5 100644 --- a/config/rootfiles/core/56/filelists/files +++ b/config/rootfiles/core/56/filelists/files @@ -1,6 +1,7 @@ etc/system-release etc/issue etc/rc.d/init.d/smartenabler +srv/web/ipfire/cgi-bin/chpasswd.cgi srv/web/ipfire/cgi-bin/hardwaregraphs.cgi srv/web/ipfire/cgi-bin/media.cgi usr/local/bin/hddshutdown diff --git a/html/cgi-bin/chpasswd.cgi b/html/cgi-bin/chpasswd.cgi index 6ce8787..ae9e6ec 100644 --- a/html/cgi-bin/chpasswd.cgi +++ b/html/cgi-bin/chpasswd.cgi @@ -20,6 +20,7 @@ ############################################################################### use CGI qw(param); +use Crypt::PasswdMD5; $swroot = "/var/ipfire"; @@ -98,7 +99,10 @@ if ($cgiparams{'SUBMIT'} eq $tr{'advproxy chgwebpwd change password'}) $errormessage = $tr{'advproxy errmsg invalid user'}; goto ERROR; } - if (!(crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd)) + if ( + !(crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd) && + !(apache_md5_crypt($cgiparams{'OLD_PASSWORD'}, $cryptpwd) eq $cryptpwd) + ) { $errormessage = $tr{'advproxy errmsg password incorrect'}; goto ERROR; diff --git a/lfs/Crypt-PasswdMD5 b/lfs/Crypt-PasswdMD5 new file mode 100644 index 0000000..57c88fc --- /dev/null +++ b/lfs/Crypt-PasswdMD5 @@ -0,0 +1,77 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# 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 # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.3 + +THISAPP = Crypt-PasswdMD5-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 368205b1be8c0d4f807afe25d6fbd1ad + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && perl Makefile.PL + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index 3dad5a3..dba36b4 100755 --- a/make.sh +++ b/make.sh @@ -571,6 +571,7 @@ buildipfire() { ipfiremake Text-Tabs+Wrap ipfiremake Locale-Country ipfiremake XML-Parser + ipfiremake Crypt-PasswdMD5 ipfiremake python-setuptools ipfiremake python-clientform ipfiremake python-mechanize hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 120cedf2852b71cd06cdacda10a18a8e7f2eeb8a
by git＠ipfire.org 21 Jan '12

21 Jan '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 18252bf79499ec809dc4f4eeba6fecffd50bd3e6
by git＠ipfire.org 21 Jan '12

21 Jan '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 18252bf79499ec809dc4f4eeba6fecffd50bd3e6 (commit) from 0b236f60676f47cf1c255d0d591824f2100aed7c (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 18252bf79499ec809dc4f4eeba6fecffd50bd3e6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jan 21 17:10:05 2012 +0100 usb-modeswitch: update to 1.2.2 and data 20120120. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/usb_modeswitch_data | 15 +++++++++++++++ .../core/{53 => 56}/filelists/usb_modeswitch | 0 .../core/{53 => 56}/filelists/usb_modeswitch_data | 0 lfs/usb_modeswitch | 6 +++--- lfs/usb_modeswitch_data | 4 ++-- 5 files changed, 20 insertions(+), 5 deletions(-) copy config/rootfiles/core/{53 => 56}/filelists/usb_modeswitch (100%) copy config/rootfiles/core/{53 => 56}/filelists/usb_modeswitch_data (100%) Difference in files: diff --git a/config/rootfiles/common/usb_modeswitch_data b/config/rootfiles/common/usb_modeswitch_data index 953f851..0ebcf62 100644 --- a/config/rootfiles/common/usb_modeswitch_data +++ b/config/rootfiles/common/usb_modeswitch_data @@ -11,12 +11,14 @@ usr/share/usb_modeswitch/0471:1210:uMa=Philips usr/share/usb_modeswitch/0471:1210:uMa=Wisue usr/share/usb_modeswitch/0471:1237 usr/share/usb_modeswitch/0482:024d +usr/share/usb_modeswitch/04bb:bccd usr/share/usb_modeswitch/04e8:689a usr/share/usb_modeswitch/04e8:f000:sMo=U209 usr/share/usb_modeswitch/057c:84ff usr/share/usb_modeswitch/05c6:1000:sVe=GT usr/share/usb_modeswitch/05c6:1000:sVe=Option usr/share/usb_modeswitch/05c6:1000:uMa=AnyDATA +usr/share/usb_modeswitch/05c6:1000:uMa=DGT usr/share/usb_modeswitch/05c6:1000:uMa=Option usr/share/usb_modeswitch/05c6:1000:uMa=SAMSUNG usr/share/usb_modeswitch/05c6:1000:uMa=SSE @@ -57,6 +59,7 @@ usr/share/usb_modeswitch/0af0:7401 usr/share/usb_modeswitch/0af0:7501 usr/share/usb_modeswitch/0af0:7601 usr/share/usb_modeswitch/0af0:7701 +usr/share/usb_modeswitch/0af0:7706 usr/share/usb_modeswitch/0af0:7801 usr/share/usb_modeswitch/0af0:7901 usr/share/usb_modeswitch/0af0:7a01 @@ -73,6 +76,7 @@ usr/share/usb_modeswitch/0af0:8900 usr/share/usb_modeswitch/0af0:9000 usr/share/usb_modeswitch/0af0:c031 usr/share/usb_modeswitch/0af0:c100 +usr/share/usb_modeswitch/0af0:d001 usr/share/usb_modeswitch/0af0:d013 usr/share/usb_modeswitch/0af0:d031 usr/share/usb_modeswitch/0af0:d033 @@ -100,7 +104,11 @@ usr/share/usb_modeswitch/1004:1000 usr/share/usb_modeswitch/1004:607f usr/share/usb_modeswitch/1004:613a usr/share/usb_modeswitch/1004:613f +usr/share/usb_modeswitch/1004:614e usr/share/usb_modeswitch/1004:6190 +usr/share/usb_modeswitch/1004:61dd +usr/share/usb_modeswitch/1004:61e7 +usr/share/usb_modeswitch/1004:61eb usr/share/usb_modeswitch/1033:0035 usr/share/usb_modeswitch/106c:3b03 usr/share/usb_modeswitch/106c:3b05 @@ -134,6 +142,7 @@ usr/share/usb_modeswitch/12d1:1557 usr/share/usb_modeswitch/12d1:1c0b usr/share/usb_modeswitch/12d1:1d50 usr/share/usb_modeswitch/12d1:1da1 +usr/share/usb_modeswitch/12d1:1f01 usr/share/usb_modeswitch/12d1:380b usr/share/usb_modeswitch/1307:1169 usr/share/usb_modeswitch/1410:5010 @@ -162,8 +171,10 @@ usr/share/usb_modeswitch/19d2:0101 usr/share/usb_modeswitch/19d2:0103 usr/share/usb_modeswitch/19d2:0110 usr/share/usb_modeswitch/19d2:0115 +usr/share/usb_modeswitch/19d2:0146 usr/share/usb_modeswitch/19d2:0149 usr/share/usb_modeswitch/19d2:0166 +usr/share/usb_modeswitch/19d2:0169 usr/share/usb_modeswitch/19d2:1001 usr/share/usb_modeswitch/19d2:1007 usr/share/usb_modeswitch/19d2:1009 @@ -175,6 +186,7 @@ usr/share/usb_modeswitch/19d2:1201 usr/share/usb_modeswitch/19d2:1216 usr/share/usb_modeswitch/19d2:1224 usr/share/usb_modeswitch/19d2:1517 +usr/share/usb_modeswitch/19d2:1520 usr/share/usb_modeswitch/19d2:2000 usr/share/usb_modeswitch/19d2:bccd usr/share/usb_modeswitch/19d2:ffde @@ -182,6 +194,7 @@ usr/share/usb_modeswitch/19d2:ffe6 usr/share/usb_modeswitch/19d2:fff5 usr/share/usb_modeswitch/19d2:fff6 usr/share/usb_modeswitch/1a8d:1000 +usr/share/usb_modeswitch/1a8d:2000 usr/share/usb_modeswitch/1ab7:5700 usr/share/usb_modeswitch/1b7d:0700 usr/share/usb_modeswitch/1bbb:f000 @@ -204,8 +217,10 @@ usr/share/usb_modeswitch/1ee8:0040 usr/share/usb_modeswitch/1f28:0021 usr/share/usb_modeswitch/1fac:0032 usr/share/usb_modeswitch/1fac:0130 +usr/share/usb_modeswitch/201e:1023 usr/share/usb_modeswitch/201e:2009 usr/share/usb_modeswitch/2020:f00e +usr/share/usb_modeswitch/21f5:1000 usr/share/usb_modeswitch/230d:0001 usr/share/usb_modeswitch/230d:0007 usr/share/usb_modeswitch/8888:6500 diff --git a/config/rootfiles/core/56/filelists/usb_modeswitch b/config/rootfiles/core/56/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/56/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/56/filelists/usb_modeswitch_data b/config/rootfiles/core/56/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/56/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/lfs/usb_modeswitch b/lfs/usb_modeswitch index 1d6ac81..db9ca3a 100644 --- a/lfs/usb_modeswitch +++ b/lfs/usb_modeswitch @@ -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.2.0 +VER = 1.2.2 THISAPP = usb-modeswitch-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1932ab96d6e3c5e0a6bdfac863338627 +$(DL_FILE)_MD5 = 4f3d3b9342b59b488089a8a81abda3ae install : $(TARGET) diff --git a/lfs/usb_modeswitch_data b/lfs/usb_modeswitch_data index 990c950..2b99bd0 100644 --- a/lfs/usb_modeswitch_data +++ b/lfs/usb_modeswitch_data @@ -24,7 +24,7 @@ include Config -VER = 20111023 +VER = 20120120 THISAPP = usb-modeswitch-data-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6e7cb67d0428bda241600b038ba11aeb +$(DL_FILE)_MD5 = c899cc9c71bb35f3ec600b7cd1455c65 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9207700e6cd9f645a54e0ef25ce5dfcb817748b1
by git＠ipfire.org 21 Jan '12

21 Jan '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 9207700e6cd9f645a54e0ef25ce5dfcb817748b1 (commit) from 62144100b010f03780a632ec0ecc18e437cdb534 (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 9207700e6cd9f645a54e0ef25ce5dfcb817748b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jan 21 14:46:29 2012 +0100 pciutils: Update to 3.1.9. Bug #10003. ----------------------------------------------------------------------- Summary of changes: pciutils/pciutils.nm | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/pciutils/pciutils.nm b/pciutils/pciutils.nm index dbf6eff..e67831e 100644 --- a/pciutils/pciutils.nm +++ b/pciutils/pciutils.nm @@ -4,8 +4,8 @@ ############################################################################### name = pciutils -version = 3.1.7 -release = 3 +version = 3.1.9 +release = 1 groups = System/Base url = http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml @@ -17,8 +17,8 @@ description and setting devices connected to the PCI bus. end -source_dl = -sources = %{thisapp}.tar.bz2 +source_dl = ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/ +sources = %{thisapp}.tar.gz build build hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0b236f60676f47cf1c255d0d591824f2100aed7c
by git＠ipfire.org 21 Jan '12

21 Jan '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 62144100b010f03780a632ec0ecc18e437cdb534
by git＠ipfire.org 21 Jan '12

21 Jan '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 62144100b010f03780a632ec0ecc18e437cdb534 (commit) from 7438ebb844dfdba3edd8104973f6665f5d6dffeb (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 62144100b010f03780a632ec0ecc18e437cdb534 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jan 21 13:51:31 2012 +0100 libidn: Update to 1.24. Fixes bug #10002. Package was re-licensed to GPLv2+ and LGPLv3+. ----------------------------------------------------------------------- Summary of changes: libidn/libidn.nm | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) Difference in files: diff --git a/libidn/libidn.nm b/libidn/libidn.nm index 1941920..fbd566d 100644 --- a/libidn/libidn.nm +++ b/libidn/libidn.nm @@ -4,12 +4,12 @@ ############################################################################### name = libidn -version = 1.22 -release = 2 +version = 1.24 +release = 1 groups = System/Libraries url = http://www.gnu.org/software/libidn/ -license = LGPLv2+ GPLv3+ +license = GPLv2+ LGPLv3+ summary = Internationalized Domain Name support library. description @@ -19,7 +19,7 @@ description names. end -source_dl = +source_dl = http://ftp.gnu.org/gnu/libidn/ build configure_options += \ @@ -28,6 +28,7 @@ build --disable-static test + export LD_LIBRARY_PATH=$(pwd)/lib/.libs make -C tests check end @@ -37,7 +38,7 @@ build mkdir -pv %{BUILDROOT}%{libdir} rm -vf %{BUILDROOT}/%{lib}/libidn.so - ln -svf ../../%{lib}/libidn.so.11.6.5 %{BUILDROOT}%{libdir}/libidn.so + ln -svf ../../%{lib}/libidn.so.11.6.7 %{BUILDROOT}%{libdir}/libidn.so end end hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7438ebb844dfdba3edd8104973f6665f5d6dffeb
by git＠ipfire.org 21 Jan '12

21 Jan '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 7438ebb844dfdba3edd8104973f6665f5d6dffeb (commit) via 3d694011b286b62d43cdecfc74b8d3117298533d (commit) via b146f40751993e63b6b74961a64bf3945f542fb4 (commit) via 777cf2ae29f820eca33f2d7f2f22bc6f09b01338 (commit) via 4c15615b2e3b78d61f042cca0e240ba66e9b6186 (commit) from a0649a3f09e87818ec3ee50078bdd1854e8e8681 (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 7438ebb844dfdba3edd8104973f6665f5d6dffeb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jan 21 13:22:18 2012 +0100 openssl: Update to 1.0.0g. Bug #10001: This release fixed a DTLS DoS issue which was recently introduced by the fix for CVE-2011-4109. commit 3d694011b286b62d43cdecfc74b8d3117298533d Merge: b146f40 777cf2a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jan 21 12:59:02 2012 +0100 Merge remote-tracking branch 'maniacikarus/iptables' commit b146f40751993e63b6b74961a64bf3945f542fb4 Merge: a0649a3 4c15615 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jan 21 12:58:55 2012 +0100 Merge remote-tracking branch 'maniacikarus/ccache' commit 777cf2ae29f820eca33f2d7f2f22bc6f09b01338 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jan 9 21:42:16 2012 +0000 iptables: Updated to minor 1.4.12.2 Fixes #318 commit 4c15615b2e3b78d61f042cca0e240ba66e9b6186 Author: Christian Schmidt <christian.schmidt(a)ipfire.org> Date: Mon Jan 9 21:36:05 2012 +0000 ccache: Updated to the latest version 3.1.7 Fixes #322 ----------------------------------------------------------------------- Summary of changes: ccache/ccache.nm | 4 ++-- iptables/iptables.nm | 4 ++-- openssl/openssl.nm | 4 ++-- ...-version.patch => openssl-1.0.0g-version.patch} | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) rename openssl/patches/{openssl-1.0.0f-version.patch => openssl-1.0.0g-version.patch} (57%) Difference in files: diff --git a/ccache/ccache.nm b/ccache/ccache.nm index b30a0d6..9fd27eb 100644 --- a/ccache/ccache.nm +++ b/ccache/ccache.nm @@ -4,8 +4,8 @@ ############################################################################### name = ccache -version = 3.1.6 -release = 3 +version = 3.1.7 +release = 1 groups = Development/Compilers url = http://ccache.samba.org/ diff --git a/iptables/iptables.nm b/iptables/iptables.nm index b16942a..ea53b4c 100644 --- a/iptables/iptables.nm +++ b/iptables/iptables.nm @@ -4,8 +4,8 @@ ############################################################################### name = iptables -version = 1.4.12.1 -release = 2 +version = 1.4.12.2 +release = 1 groups = Networking/Tools url = http://www.netfilter.org/ diff --git a/openssl/openssl.nm b/openssl/openssl.nm index 4c27b89..f221603 100644 --- a/openssl/openssl.nm +++ b/openssl/openssl.nm @@ -4,8 +4,8 @@ ############################################################################### name = openssl -version = 1.0.0f -release = 2 +version = 1.0.0g +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Libraries diff --git a/openssl/patches/openssl-1.0.0f-version.patch b/openssl/patches/openssl-1.0.0f-version.patch deleted file mode 100644 index 6c67a5e..0000000 --- a/openssl/patches/openssl-1.0.0f-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up openssl-1.0.0f/crypto/opensslv.h.version openssl-1.0.0f/crypto/opensslv.h ---- openssl-1.0.0f/crypto/opensslv.h.version 2012-01-05 13:28:32.000000000 +0100 -+++ openssl-1.0.0f/crypto/opensslv.h 2012-01-05 13:29:37.000000000 +0100 -@@ -25,7 +25,8 @@ - * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for - * major minor fix final patch/beta) - */ --#define OPENSSL_VERSION_NUMBER 0x1000006fL -+/* we have to keep the version number to not break the abi */ -+#define OPENSSL_VERSION_NUMBER 0x10000003 - #ifdef OPENSSL_FIPS - #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0f-fips 4 Jan 2012" - #else -@@ -83,7 +84,7 @@ - * should only keep the versions that are binary compatible with the current. - */ - #define SHLIB_VERSION_HISTORY "" --#define SHLIB_VERSION_NUMBER "1.0.0" -+#define SHLIB_VERSION_NUMBER "1.0.0f" - - - #endif /* HEADER_OPENSSLV_H */ diff --git a/openssl/patches/openssl-1.0.0g-version.patch b/openssl/patches/openssl-1.0.0g-version.patch new file mode 100644 index 0000000..55aa0c0 --- /dev/null +++ b/openssl/patches/openssl-1.0.0g-version.patch @@ -0,0 +1,22 @@ +diff -up openssl-1.0.0g/crypto/opensslv.h.version openssl-1.0.0g/crypto/opensslv.h +--- openssl-1.0.0g/crypto/opensslv.h.version 2012-01-19 14:50:50.094028047 +0100 ++++ openssl-1.0.0g/crypto/opensslv.h 2012-01-19 14:51:48.655529671 +0100 +@@ -25,7 +25,8 @@ + * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for + * major minor fix final patch/beta) + */ +-#define OPENSSL_VERSION_NUMBER 0x1000007fL ++/* we have to keep the version number to not break the abi */ ++#define OPENSSL_VERSION_NUMBER 0x10000003 + #ifdef OPENSSL_FIPS + #define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0g-fips 18 Jan 2012" + #else +@@ -83,7 +84,7 @@ + * should only keep the versions that are binary compatible with the current. + */ + #define SHLIB_VERSION_HISTORY "" +-#define SHLIB_VERSION_NUMBER "1.0.0" ++#define SHLIB_VERSION_NUMBER "1.0.0g" + + + #endif /* HEADER_OPENSSLV_H */ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. fbb2ebd68446a51c4d6d543210a1f53b7fcd73dc
by git＠ipfire.org 20 Jan '12

20 Jan '12

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a6d0d790ebe2c72aa85b83961ab1915fec14ab20
by git＠ipfire.org 20 Jan '12

20 Jan '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 a6d0d790ebe2c72aa85b83961ab1915fec14ab20 (commit) from 6333b4e7257cfeb79a381de1f62bdc9a20070eaf (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 a6d0d790ebe2c72aa85b83961ab1915fec14ab20 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Jan 20 08:02:31 2012 +0100 flash-image: add automatic resizing /var partition at first boot. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 2 + config/rootfiles/common/i586/initscripts | 2 + lfs/flash-images | 19 ++++++++++- src/initscripts/init.d/fsresize | 46 ++++++++++++++++++++++++++ src/initscripts/init.d/partresize | 45 +++++++++++++++++++++++++ 5 files changed, 113 insertions(+), 1 deletions(-) create mode 100644 src/initscripts/init.d/fsresize create mode 100644 src/initscripts/init.d/partresize Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 22a7c13..a7f0fed 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -93,6 +93,8 @@ etc/rc.d/init.d/networking/red.up/99-pakfire-update etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut #etc/rc.d/init.d/openvmtools +etc/rc.d/init.d/partresize +etc/rc.d/init.d/fsresize #etc/rc.d/init.d/portmap #etc/rc.d/init.d/postfix #etc/rc.d/init.d/pound diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 65fa0cd..91e3308 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -94,6 +94,8 @@ etc/rc.d/init.d/networking/red.up/99-pakfire-update etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut #etc/rc.d/init.d/openvmtools +etc/rc.d/init.d/partresize +etc/rc.d/init.d/fsresize #etc/rc.d/init.d/portmap #etc/rc.d/init.d/postfix #etc/rc.d/init.d/pound diff --git a/lfs/flash-images b/lfs/flash-images index 7888423..0b07704 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -111,6 +111,11 @@ ifneq "$(MACHINE_TYPE)" "arm" sed -i -e "s|ROOT|UUID=$$(blkid -sUUID $(IMGroot) | cut -d'"' -f2)|g" $(MNThdd)/boot/grub/grub.conf ln -s grub.conf $(MNThdd)/boot/grub/menu.lst + # Setup symlink for partresize at first boot... + ln -sf ../init.d/partresize $(MNThdd)/etc/rc.d/rcsysinit.d/S25partresize + # Setup symlink for fsresize at second boot... + ln -sf ../init.d/fsresize $(MNThdd)/etc/rc.d/rcsysinit.d/S26fsresize + # Copy grub files manually cp -f $(MNThdd)/usr/share/grub/i386-pc/* $(MNThdd)/boot/grub/ endif @@ -123,12 +128,18 @@ endif umount $(MNThdd)/var umount $(MNThdd) - # zerofree the ext3 images to get better compression + # zerofree the ext2 images to get better compression ifneq "$(MACHINE_TYPE)" "arm" zerofree $(IMGboot) + -fsck.ext2 -f -y $(IMGboot) + fsck.ext2 -f -y $(IMGboot) endif zerofree $(IMGroot) + -fsck.ext2 -f -y $(IMGroot) + fsck.ext2 -f -y $(IMGroot) zerofree $(IMGvar) + -fsck.ext2 -f -y $(IMGvar) + fsck.ext2 -f -y $(IMGvar) # Cat to an image cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinst) @@ -175,9 +186,15 @@ endif # zerofree the ext3 images to get better compression ifneq "$(MACHINE_TYPE)" "arm" zerofree $(IMGboot) + -fsck.ext2 -f -y $(IMGboot) + fsck.ext2 -f -y $(IMGboot) endif zerofree $(IMGroot) + -fsck.ext2 -f -y $(IMGroot) + fsck.ext2 -f -y $(IMGroot) zerofree $(IMGvar) + -fsck.ext2 -f -y $(IMGvar) + fsck.ext2 -f -y $(IMGvar) # Cat to an image cat $(IMGpart) $(IMGboot) $(IMGroot) $(IMGvar) > $(IMGinsts) diff --git a/src/initscripts/init.d/fsresize b/src/initscripts/init.d/fsresize new file mode 100644 index 0000000..b1af720 --- /dev/null +++ b/src/initscripts/init.d/fsresize @@ -0,0 +1,46 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/fsresize +# +# Description : Resize the /var filesystem +# +# Authors : Arne Fitzenreiter - arne_f(a)ipfire.org +# +# Version : 1.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + boot_mesg "Autoresize /var partition to use the whole drive ..." + + # Ensure that / is writeable + mount + + # Detect device + ROOT=`mount | grep -m1 " / " | cut -d" " -f1`; + DRV=${ROOT::`expr length $ROOT`-1} + boot_mesg " * check filesystem on ${DRV}4 before resize ..." + fsck -f ${DRV}4 + + boot_mesg " * resize ${DRV}4 ..." + resize2fs -p ${DRV}4 + evaluate_retval + + # Erase symlink, it should run only once + rm -f /etc/rc.d/rcsysinit.d/S26fsresize + + exit 0; + ;; + *) + echo "Usage: ${0} {start}" + exit 1 + ;; +esac + +# End $rc_base/init.d/26fsresize diff --git a/src/initscripts/init.d/partresize b/src/initscripts/init.d/partresize new file mode 100644 index 0000000..9c9a609 --- /dev/null +++ b/src/initscripts/init.d/partresize @@ -0,0 +1,45 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/partresize +# +# Description : Resize the /var partition to the drivesize +# +# Authors : Arne Fitzenreiter - arne_f(a)ipfire.org +# +# Version : 1.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + + # Ensure that / is writeable + mount -o remount,rw / + + # Detect device + ROOT=`mount | grep -m1 " / " | cut -d" " -f1`; + DRV=${ROOT::`expr length $ROOT`-1} + + boot_mesg "Change Partition 4 to all free space ..." + echo -e 'd\n4\nn\np\n4\n\n\nw\nq\n' | fdisk ${DRV} + + # Erase symlink, it should run only once + rm -f /etc/rc.d/rcsysinit.d/S25partresize + + boot_mesg "Rebooting ..." + reboot -f + + ;; + *) + echo "Usage: ${0} {start}" + exit 1 + ;; +esac + +# End $rc_base/init.d/partresize + hooks/post-receive -- IPFire 2.x development tree

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM