IPFire-SCM February 2014

ipfire-scm@lists.ipfire.org

1 participants
75 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 91d4c3f389a100c2089fdc5c40f6605d0e033bb4
by git＠ipfire.org 10 Feb '14

10 Feb '14

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 91d4c3f389a100c2089fdc5c40f6605d0e033bb4 (commit) via 20d4a89f358a499b2294e5dbb3d30d1fd25a0937 (commit) via ea2fec1919ee1e04c391f8b8c5822d1e37830ad4 (commit) from 6bb58a239137257ef3eaaf6d1efc0f0b1d34d143 (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 91d4c3f389a100c2089fdc5c40f6605d0e033bb4 Merge: 20d4a89 ea2fec1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 10 20:24:40 2014 +0100 Merge remote-tracking branch 'stevee/dosfsutils-update' commit 20d4a89f358a499b2294e5dbb3d30d1fd25a0937 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 10 18:56:25 2014 +0100 libusb: libusbx has been merged into libusb 1.0.18 again. commit ea2fec1919ee1e04c391f8b8c5822d1e37830ad4 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Feb 9 21:53:09 2014 +0100 dosfstools: Update to 3.0.25. Cleanup install process, with the following benefits: * Now symlinks for fsck.msdos and fsck.vfat will be created. * Manpages are shipped. ----------------------------------------------------------------------- Summary of changes: dosfstools/dosfstools.nm | 8 +++----- libusbx/libusbx.nm => libusb/libusb.nm | 16 ++++++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) rename libusbx/libusbx.nm => libusb/libusb.nm (74%) Difference in files: diff --git a/dosfstools/dosfstools.nm b/dosfstools/dosfstools.nm index 72727f5..2d62205 100644 --- a/dosfstools/dosfstools.nm +++ b/dosfstools/dosfstools.nm @@ -4,7 +4,7 @@ ############################################################################### name = dosfstools -version = 3.0.24 +version = 3.0.25 release = 1 groups = System/Filesystems @@ -21,10 +21,8 @@ end source_dl = http://www.daniel-baumann.ch/files/software/dosfstools/ build - install - make install-bin DESTDIR=%{BUILDROOT} \ - PREFIX=/usr SBINDIR=/sbin - end + make_install_targets += \ + PREFIX=%{prefix} end packages diff --git a/libusb/libusb.nm b/libusb/libusb.nm new file mode 100644 index 0000000..8c9129d --- /dev/null +++ b/libusb/libusb.nm @@ -0,0 +1,45 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = libusb +version = 1.0.18 +release = 1 + +groups = System/Libraries +url = http://sourceforge.net/apps/mediawiki/libusb/ +license = LGPLv2+ +summary = A library which allows userspace access to USB devices. + +description + This package provides a way for applications to access USB devices. +end + +source_dl = http://downloads.sourceforge.net/libusb/libusb-1.0/ +sources = %{thisapp}.tar.bz2 + +build + requires + libudev-devel + end + + configure_options += \ + --disable-static \ + --enable-examples-build +end + +packages + package %{name} + provides = libusbx = %{thisver} + obsoletes = libusbx < %{thisver} + end + + package %{name}-devel + template DEVEL + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/libusbx/libusbx.nm b/libusbx/libusbx.nm deleted file mode 100644 index 6394d04..0000000 --- a/libusbx/libusbx.nm +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # -############################################################################### - -name = libusbx -version = 1.0.11 -release = 1 - -groups = System/Libraries -url = http://sourceforge.net/apps/mediawiki/libusbx/ -license = LGPLv2+ -summary = A library which allows userspace access to USB devices. - -description - This package provides a way for applications to access USB devices. -end - -source_dl = http://downloads.sourceforge.net/libusbx/ -sources = %{thisapp}.tar.bz2 - -build - configure_options += \ - --disable-static \ - --enable-examples-build -end - -packages - package %{name} - provides = libusb = %{thisver} - obsoletes = libusb < %{thisver} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7d7d5092d3a17ec38f3a8baa5a214075dc269ed3
by git＠ipfire.org 09 Feb '14

09 Feb '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 41e2c149a52c602ca1e5a7c9439e4e0d630620c0
by git＠ipfire.org 08 Feb '14

08 Feb '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 59b081c2a14a015fe47a5f32f169cf7b85fdca4b
by git＠ipfire.org 07 Feb '14

07 Feb '14

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 59b081c2a14a015fe47a5f32f169cf7b85fdca4b (commit) from 1c38ad92a274423e36e085b69bea0951889d35b4 (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 59b081c2a14a015fe47a5f32f169cf7b85fdca4b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 7 23:10:22 2014 +0100 rootfile updates: perl-DBI, perl-File-ReadBackwards. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/perl-DBI | 21 ++++++++++++++++----- config/rootfiles/packages/perl-File-ReadBackwards | 1 + 2 files changed, 17 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/perl-DBI b/config/rootfiles/packages/perl-DBI index 188fa18..7351841 100644 --- a/config/rootfiles/packages/perl-DBI +++ b/config/rootfiles/packages/perl-DBI @@ -5,7 +5,11 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/DBI.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/DBM.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/ExampleP.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/File usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/File.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/File/Developers.pod +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/File/HowTo.pod +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/File/Roadmap.pod #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Policy @@ -15,6 +19,7 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Policy/pedan usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Policy/rush.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport/Base.pm +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport/corostream.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport/null.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport/pipeone.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/Gofer/Transport/stream.pm @@ -33,6 +38,10 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Const/GetInfoType. #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD/Metadata.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD/SqlEngine +usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD/SqlEngine.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD/SqlEngine/Developers.pod +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/DBD/SqlEngine/HowTo.pod usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/FAQ.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Gofer/Execute.pm @@ -54,15 +63,12 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/ProfileDumper/Apac usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/ProfileSubs.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/ProxyServer.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/PurePerl.pm -usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Roadmap.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/SQL usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/SQL/Nano.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Util usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Util/CacheMemory.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/Util/_accessor.pm usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBI/W32ODBC.pm -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Roadmap.pod -#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/TASKS.pod #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Win32 usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Win32/DBIODBC.pm #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI @@ -84,12 +90,16 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/DBI.so #usr/share/man/man3/Bundle::DBI.3 #usr/share/man/man3/DBD::DBM.3 #usr/share/man/man3/DBD::File.3 +#usr/share/man/man3/DBD::File::Developers.3 +#usr/share/man/man3/DBD::File::HowTo.3 +#usr/share/man/man3/DBD::File::Roadmap.3 #usr/share/man/man3/DBD::Gofer.3 #usr/share/man/man3/DBD::Gofer::Policy::Base.3 #usr/share/man/man3/DBD::Gofer::Policy::classic.3 #usr/share/man/man3/DBD::Gofer::Policy::pedantic.3 #usr/share/man/man3/DBD::Gofer::Policy::rush.3 #usr/share/man/man3/DBD::Gofer::Transport::Base.3 +#usr/share/man/man3/DBD::Gofer::Transport::corostream.3 #usr/share/man/man3/DBD::Gofer::Transport::null.3 #usr/share/man/man3/DBD::Gofer::Transport::pipeone.3 #usr/share/man/man3/DBD::Gofer::Transport::stream.3 @@ -102,6 +112,9 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/DBI.so #usr/share/man/man3/DBI::Const::GetInfoType.3 #usr/share/man/man3/DBI::DBD.3 #usr/share/man/man3/DBI::DBD::Metadata.3 +#usr/share/man/man3/DBI::DBD::SqlEngine.3 +#usr/share/man/man3/DBI::DBD::SqlEngine::Developers.3 +#usr/share/man/man3/DBI::DBD::SqlEngine::HowTo.3 #usr/share/man/man3/DBI::FAQ.3 #usr/share/man/man3/DBI::Gofer::Execute.3 #usr/share/man/man3/DBI::Gofer::Request.3 @@ -122,6 +135,4 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBI/DBI.so #usr/share/man/man3/DBI::SQL::Nano.3 #usr/share/man/man3/DBI::Util::CacheMemory.3 #usr/share/man/man3/DBI::W32ODBC.3 -#usr/share/man/man3/Roadmap.3 -#usr/share/man/man3/TASKS.3 #usr/share/man/man3/Win32::DBIODBC.3 diff --git a/config/rootfiles/packages/perl-File-ReadBackwards b/config/rootfiles/packages/perl-File-ReadBackwards index be62542..5985ef0 100644 --- a/config/rootfiles/packages/perl-File-ReadBackwards +++ b/config/rootfiles/packages/perl-File-ReadBackwards @@ -1,4 +1,5 @@ usr/lib/perl5/site_perl/5.12.3/File/ReadBackwards.pm +#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/File #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/File/ReadBackwards #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/File/ReadBackwards/.packlist #usr/share/man/man3/File::ReadBackwards.3 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1c38ad92a274423e36e085b69bea0951889d35b4
by git＠ipfire.org 07 Feb '14

07 Feb '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f17f51e87361efe5c687690e0614636384657b9d
by git＠ipfire.org 07 Feb '14

07 Feb '14

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 f17f51e87361efe5c687690e0614636384657b9d (commit) via e360e50ac4cf04717281344382d5ee243091bb50 (commit) from 2cce1559f2da9b986a4288159478b1b999710457 (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 f17f51e87361efe5c687690e0614636384657b9d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 7 14:59:50 2014 +0100 fireinfo: Fix finding the root device. commit e360e50ac4cf04717281344382d5ee243091bb50 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Feb 7 14:49:03 2014 +0100 strongswan: Update to 5.1.2dr3. ----------------------------------------------------------------------- Summary of changes: lfs/fireinfo | 1 + lfs/strongswan | 5 ++-- ...-mounted-filesystems-from-proc-mounts-ins.patch | 30 +++++++++++++++++++ src/patches/strongswan-5.1.1-delay-dpd.patch | 35 ---------------------- 4 files changed, 33 insertions(+), 38 deletions(-) create mode 100644 src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch delete mode 100644 src/patches/strongswan-5.1.1-delay-dpd.patch Difference in files: diff --git a/lfs/fireinfo b/lfs/fireinfo index 0c5d313..802f485 100644 --- a/lfs/fireinfo +++ b/lfs/fireinfo @@ -71,6 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch cd $(DIR_APP) && [ -x "configure" ] || sh ./autogen.sh cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) diff --git a/lfs/strongswan b/lfs/strongswan index 7583c62..2c2c0d7 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.1.1 +VER = 5.1.2dr3 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e3af3d493d22286be3cd794533a8966a +$(DL_FILE)_MD5 = 0a2aba6b0682cc01eb4f9bbeb94bc481 install : $(TARGET) @@ -79,7 +79,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.0.2_ipfire.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.1.1-delay-dpd.patch cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh cd $(DIR_APP) && ./configure \ diff --git a/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch b/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch new file mode 100644 index 0000000..86e30cb --- /dev/null +++ b/src/patches/fireinfo-2.1.8-Revert-Read-mounted-filesystems-from-proc-mounts-ins.patch @@ -0,0 +1,30 @@ +From 758f624a9862b214f39c9106137a61e2d6b14544 Mon Sep 17 00:00:00 2001 +From: Michael Tremer <michael.tremer(a)ipfire.org> +Date: Fri, 7 Feb 2014 14:56:14 +0100 +Subject: [PATCH] Revert "Read mounted filesystems from /proc/mounts instead of + /etc/mtab." + +This reverts commit c916f644c57b638b3128d0e882c32bf50ea29631. + +For some reason, the output of /etc/mtab and /proc/mounts is not +identical and the root device is missing in /proc/mounts on IPFire. +--- + src/fireinfo/system.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fireinfo/system.py b/src/fireinfo/system.py +index 800032e..40ff7b0 100644 +--- a/src/fireinfo/system.py ++++ b/src/fireinfo/system.py +@@ -364,7 +364,7 @@ class System(object): + """ + Return the dev node of the root disk. + """ +- with open("/proc/mounts", "r") as f: ++ with open("/etc/mtab", "r") as f: + dev, mountpoint, fs, rest = f.readline().split(" ", 3) + if mountpoint == "/" and not fs == "rootfs": + # Cut off /dev +-- +1.8.3.1 + diff --git a/src/patches/strongswan-5.1.1-delay-dpd.patch b/src/patches/strongswan-5.1.1-delay-dpd.patch deleted file mode 100644 index db3d664..0000000 --- a/src/patches/strongswan-5.1.1-delay-dpd.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b76e96e2ef4d56c863b36c8d3c39e3c2efcf4a7c Mon Sep 17 00:00:00 2001 -From: Martin Willi <martin(a)revosec.ch> -Date: Fri, 1 Nov 2013 11:28:53 +0100 -Subject: [PATCH] ike: Don't immediately DPD after deferred DELETEs following IKE_SA rekeying - -Some peers seem to defer DELETEs a few seconds after rekeying the IKE_SA, which -is perfectly valid. For short(er) DPD delays, this leads to the situation where -we send a DPD request during set_state(), but the IKE_SA has no hosts set yet. -Avoid that DPD by resetting the INBOUND timestamp during set_state(). ---- - src/libcharon/sa/ike_sa.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c -index 0282087..d482f8b 100644 ---- a/src/libcharon/sa/ike_sa.c -+++ b/src/libcharon/sa/ike_sa.c -@@ -687,6 +687,14 @@ METHOD(ike_sa_t, set_state, void, - DBG1(DBG_IKE, "maximum IKE_SA lifetime %ds", t); - } - trigger_dpd = this->peer_cfg->get_dpd(this->peer_cfg); -+ if (trigger_dpd) -+ { -+ /* Some peers delay the DELETE after rekeying an IKE_SA. -+ * If this delay is longer than our DPD delay, we would -+ * send a DPD request here. The IKE_SA is not ready to do -+ * so yet, so prevent that. */ -+ this->stats[STAT_INBOUND] = this->stats[STAT_ESTABLISHED]; -+ } - } - break; - } --- -1.7.4.1 - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2cce1559f2da9b986a4288159478b1b999710457
by git＠ipfire.org 05 Feb '14

05 Feb '14

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 2cce1559f2da9b986a4288159478b1b999710457 (commit) via c0e8224d1c176a1df13db0a2a506c9cdea4058a8 (commit) from b8101c50ea58cc6a6bc76fe472826af7b7f33271 (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 2cce1559f2da9b986a4288159478b1b999710457 Merge: c0e8224 b8101c5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 5 13:38:25 2014 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit c0e8224d1c176a1df13db0a2a506c9cdea4058a8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 5 13:15:31 2014 +0100 network-vlans: Provide a better configuation file. As suggested by Bernhard Bitsch, #10470. ----------------------------------------------------------------------- Summary of changes: config/cfgroot/ethernet-vlans | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) Difference in files: diff --git a/config/cfgroot/ethernet-vlans b/config/cfgroot/ethernet-vlans index ae87bfe..88a38e3 100644 --- a/config/cfgroot/ethernet-vlans +++ b/config/cfgroot/ethernet-vlans @@ -1,9 +1,9 @@ -#GREEN_PARENT_DEV=eth0 -#GREEN_VLAN_ID=20 -#GREEN_MAC_ADDRESS=00:11:22:33:44:55 -#BLUE_PARENT_DEV=green0 -#BLUE_VLAN_ID=30 -#BLUE_MAC_ADDRESS=00:22:33:44:55:66 -#ORANGE_PARENT_DEV=green0 -#ORANGE_VLAN_ID=40 -#ORANGE_MAC_ADDRESS=00:33:44:55:66:77 +GREEN_PARENT_DEV= +GREEN_VLAN_ID= +GREEN_MAC_ADDRESS= +BLUE_PARENT_DEV= +BLUE_VLAN_ID= +BLUE_MAC_ADDRESS= +ORANGE_PARENT_DEV= +ORANGE_VLAN_ID= +ORANGE_MAC_ADDRESS= hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b8101c50ea58cc6a6bc76fe472826af7b7f33271
by git＠ipfire.org 05 Feb '14

05 Feb '14

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 97461f500bc755bb4bd0158b0bd4df5f1fc226f5
by git＠ipfire.org 04 Feb '14

04 Feb '14

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 97461f500bc755bb4bd0158b0bd4df5f1fc226f5 (commit) via af789b69a81bd028c0d07d5aaa4cee96f37a31b8 (commit) from f74ea48125233bc2a06f2f25f2c44e110bbaefd2 (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 97461f500bc755bb4bd0158b0bd4df5f1fc226f5 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 4 18:50:02 2014 +0100 krng: default entropy pool has 2kb with grsecurity. commit af789b69a81bd028c0d07d5aaa4cee96f37a31b8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Feb 4 18:49:00 2014 +0100 Revert "krng: use kernel entropy if no random-seed is stored." This reverts commit 1c72742bca7e8e5e6151c77481e9110f6b8a1cf4. ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/random | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/random b/src/initscripts/init.d/random index 7159b53..57aef99 100644 --- a/src/initscripts/init.d/random +++ b/src/initscripts/init.d/random @@ -13,19 +13,16 @@ case "$1" in boot_mesg "Initializing kernel random number generator..." if [ -f /var/tmp/random-seed ]; then /bin/cat /var/tmp/random-seed >/dev/urandom - else - /bin/dd if=/dev/random of=/dev/urandom \ - count=1 &>/dev/null fi /bin/dd if=/dev/urandom of=/var/tmp/random-seed \ - count=1 &>/dev/null + count=4 &>/dev/null evaluate_retval ;; stop) boot_mesg "Saving random seed..." /bin/dd if=/dev/urandom of=/var/tmp/random-seed \ - count=1 &>/dev/null + count=4 &>/dev/null evaluate_retval ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f74ea48125233bc2a06f2f25f2c44e110bbaefd2
by git＠ipfire.org 04 Feb '14

04 Feb '14

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2014