IPFire-SCM June 2015

ipfire-scm@lists.ipfire.org

1 participants
51 discussions

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3f933e235dc5b788635a2fe933e648fb3c2c84df
by git＠ipfire.org 06 Jun '15

06 Jun '15

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 3f933e235dc5b788635a2fe933e648fb3c2c84df (commit) via 9c758a337be9eaa26311740bccaef159871993ed (commit) via 897277abfe28e630a8bdd218c3e5404cbf41e103 (commit) from 5072bd4913dc10188029c3cc993e292bc59be7c1 (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 3f933e235dc5b788635a2fe933e648fb3c2c84df Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 12:54:56 2015 +0000 nftables: Update to snapshot 20150531 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9c758a337be9eaa26311740bccaef159871993ed Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 12:54:11 2015 +0000 libnftl: Update to snapshot 20150531 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 897277abfe28e630a8bdd218c3e5404cbf41e103 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 12:53:32 2015 +0000 collecty: Add -debuginfo package Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: collecty/collecty.nm | 6 +++++- libnftnl/libnftnl.nm | 14 ++++++++++++-- nftables/nftables.nm | 4 ++-- 3 files changed, 19 insertions(+), 5 deletions(-) Difference in files: diff --git a/collecty/collecty.nm b/collecty/collecty.nm index 271bc9e..d1e0318 100644 --- a/collecty/collecty.nm +++ b/collecty/collecty.nm @@ -5,7 +5,7 @@ name = collecty version = 003 -release = 1 +release = 2 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Monitoring @@ -77,4 +77,8 @@ packages systemctl try-restart collecty.service >/dev/null 2>&1 || : end end + + package %{name}-debuginfo + template DEBUGINFO + end end diff --git a/libnftnl/libnftnl.nm b/libnftnl/libnftnl.nm index c810e90..77d2e7a 100644 --- a/libnftnl/libnftnl.nm +++ b/libnftnl/libnftnl.nm @@ -5,7 +5,9 @@ name = libnftnl version = 1.0.3 -release = 1 +snapshot = 20150531 +release = 1.%{snapshot} +thisapp = %{name}-%{snapshot} groups = Networking/Tools url = http://netfilter.org/projects/libnftnl @@ -17,12 +19,20 @@ description libmnl. end -source_dl = http://ftp.netfilter.org/pub/libnftnl/ +source_dl = http://ftp.netfilter.org/pub/libnftnl/snapshot/ sources = %{thisapp}.tar.bz2 build requires + autoconf + autogen + automake libmnl-devel + libtool + end + + prepare_cmds + ./autogen.sh end end diff --git a/nftables/nftables.nm b/nftables/nftables.nm index 2f1098d..bd100df 100644 --- a/nftables/nftables.nm +++ b/nftables/nftables.nm @@ -5,7 +5,7 @@ name = nftables version = 0.100 -snapshot = 20141226 +snapshot = 20150531 release = 3.%{snapshot} thisapp = %{name}-%{snapshot} @@ -33,7 +33,7 @@ build gmp-devel libtool libmnl-devel - libnftnl-devel >= 1.0.3 + libnftnl-devel >= 1.0.3-1.20150531 readline-devel end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5072bd4913dc10188029c3cc993e292bc59be7c1
by git＠ipfire.org 06 Jun '15

06 Jun '15

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 5072bd4913dc10188029c3cc993e292bc59be7c1 (commit) via 65ae6b2749ab44ee221fec73cbbc74562ea4441c (commit) from 1d0547dc52dcb1d0d8a517a5be12764a9f5f9fb2 (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 5072bd4913dc10188029c3cc993e292bc59be7c1 Merge: 65ae6b2 1d0547d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 12:27:57 2015 +0000 Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x commit 65ae6b2749ab44ee221fec73cbbc74562ea4441c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jun 6 12:27:13 2015 +0000 collecty: Update to version 003 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: collecty/collecty.nm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) Difference in files: diff --git a/collecty/collecty.nm b/collecty/collecty.nm index 9c46acc..271bc9e 100644 --- a/collecty/collecty.nm +++ b/collecty/collecty.nm @@ -4,7 +4,7 @@ ############################################################################### name = collecty -version = 002 +version = 003 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -29,9 +29,12 @@ build docbook-xsl gettext-devel intltool + libatasmart-devel libtool-devel libxslt - python + lm-sensors-devel + python3-devel + python3-rrdtool systemd-devel end @@ -45,9 +48,9 @@ packages groups += Base requires - pygobject2 - python-dbus - python-rrdtool + python3-dbus + python3-gobject3 + python3-rrdtool end script postin hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 57f5c85825d9f6b61e8726c5b146bae1957acfcf
by git＠ipfire.org 04 Jun '15

04 Jun '15

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 57f5c85825d9f6b61e8726c5b146bae1957acfcf (commit) via 41ed4795fe92b1b16c8d946baef3f807adc97a77 (commit) from b2faf4f566b687052d40c8a2c37ed633ed643cb8 (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 57f5c85825d9f6b61e8726c5b146bae1957acfcf Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 4 19:31:53 2015 +0200 core91: Add strongswan update commit 41ed4795fe92b1b16c8d946baef3f807adc97a77 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 4 19:26:44 2015 +0200 strongswan: Update to 5.3.1 Fixed a denial-of-service and potential remote code execution vulnerability triggered by IKEv1/IKEv2 messages that contain payloads for the respective other IKE version. Such payload are treated specially since 5.2.2 but because they were still identified by their original payload type they were used as such in some places causing invalid function pointer dereferences. The vulnerability has been registered as CVE-2015-3991. https://www.strongswan.org/blog/2015/06/01/strongswan-vulnerability-%28cve-… The increased buffer size has been fixed in bug #943 upstream https://wiki.strongswan.org/issues/943 ----------------------------------------------------------------------- Summary of changes: .../91}/filelists/i586/strongswan-padlock | 0 .../{oldcore/87 => core/91}/filelists/strongswan | 0 lfs/strongswan | 8 ++--- ...-stroke-Increase-stroke-buffer-size-to-8k.patch | 34 ---------------------- .../strongswan-5.3.1-build-timeattack.patch | 11 +++++++ 5 files changed, 15 insertions(+), 38 deletions(-) copy config/rootfiles/{oldcore/77 => core/91}/filelists/i586/strongswan-padlock (100%) copy config/rootfiles/{oldcore/87 => core/91}/filelists/strongswan (100%) delete mode 100644 src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch create mode 100644 src/patches/strongswan-5.3.1-build-timeattack.patch Difference in files: diff --git a/config/rootfiles/core/91/filelists/i586/strongswan-padlock b/config/rootfiles/core/91/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/91/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/91/filelists/strongswan b/config/rootfiles/core/91/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/91/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/lfs/strongswan b/lfs/strongswan index f227bba..d1a5b8c 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.3.0 +VER = 5.3.1 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c52d4228231c2025d9c320d0e9990327 +$(DL_FILE)_MD5 = 66f258901a3d6c271da1a0c7fb3e5013 install : $(TARGET) @@ -78,10 +78,10 @@ $(subst %,%_MD5,$(objects)) : $(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.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.3.1-build-timeattack.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-ipfire.patch - cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh + cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP) && ./configure \ --prefix="/usr" \ --sysconfdir="/etc" \ diff --git a/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch b/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch deleted file mode 100644 index 2252e31..0000000 --- a/src/patches/strongswan-5.3.0-stroke-Increase-stroke-buffer-size-to-8k.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4b59d129fd1026bab37256af0df9ae7ace39e7ba Mon Sep 17 00:00:00 2001 -From: Michael Tremer <michael.tremer(a)ipfire.org> -Date: Mon, 27 Apr 2015 18:49:45 +0200 -Subject: [PATCH] stroke: Increase stroke buffer size to 8k - -Complicated connections can have lots of arguments -for the ike= and esp= directives in the ipsec.conf -configuration file. strongSwan wouldn't import those -because the size of the message that is send from -stroke to charon exceeded the limit of 4k. - -This patch increases the size of the buffer that -can be passed to charon to 8k which should be enough -even for connections with longer configurations. ---- - src/stroke/stroke_msg.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/stroke/stroke_msg.h b/src/stroke/stroke_msg.h -index c2b923f6db9a..c391efa00105 100644 ---- a/src/stroke/stroke_msg.h -+++ b/src/stroke/stroke_msg.h -@@ -32,7 +32,7 @@ - */ - #define STROKE_SOCKET IPSEC_PIDDIR "/charon.ctl" - --#define STROKE_BUF_LEN 4096 -+#define STROKE_BUF_LEN 8192 - - typedef enum list_flag_t list_flag_t; - --- -2.1.0 - diff --git a/src/patches/strongswan-5.3.1-build-timeattack.patch b/src/patches/strongswan-5.3.1-build-timeattack.patch new file mode 100644 index 0000000..948c4fc --- /dev/null +++ b/src/patches/strongswan-5.3.1-build-timeattack.patch @@ -0,0 +1,11 @@ +--- strongswan-5.3.1/scripts/Makefile.am.old 2015-06-04 17:20:43.539244145 +0000 ++++ strongswan-5.3.1/scripts/Makefile.am 2015-06-04 17:20:51.760510631 +0000 +@@ -42,7 +42,7 @@ + dnssec_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + aes_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la + settings_test_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la +-timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la ++timeattack_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la $(RTLIB) + + key2keyid.o : $(top_builddir)/config.status + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 1d0547dc52dcb1d0d8a517a5be12764a9f5f9fb2
by git＠ipfire.org 04 Jun '15

04 Jun '15

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 1d0547dc52dcb1d0d8a517a5be12764a9f5f9fb2 (commit) from d414a4c2b8314f70084edf3bb8fc0631f871fe0f (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 1d0547dc52dcb1d0d8a517a5be12764a9f5f9fb2 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun May 31 12:22:18 2015 +0200 Mass rebuild of perl and perl modules. Perl and all binary modules needs a rebuild with the latest version of pakfire (0.9.26-3.1) to provide and requires the correct perl API information for a correct dependency resolving. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: perl-BDB/perl-BDB.nm | 3 ++- perl-Coro/perl-Coro.nm | 3 ++- perl-DBI/perl-DBI.nm | 3 ++- perl-Digest-SHA1/perl-Digest-SHA1.nm | 3 ++- perl-FCGI/perl-FCGI.nm | 3 ++- perl-HTML-Parser/perl-HTML-Parser.nm | 3 ++- perl-IO-AIO/perl-IO-AIO.nm | 3 ++- perl-TermReadKey/perl-TermReadKey.nm | 3 ++- perl-Tk/perl-Tk.nm | 3 ++- perl-WWW-Curl/perl-WWW-Curl.nm | 3 ++- perl-XML-Parser/perl-XML-Parser.nm | 3 ++- perl-common-sense/perl-common-sense.nm | 3 ++- perl-libintl-perl/perl-libintl-perl.nm | 5 ++--- perl/perl.nm | 3 ++- 14 files changed, 28 insertions(+), 16 deletions(-) Difference in files: diff --git a/perl-BDB/perl-BDB.nm b/perl-BDB/perl-BDB.nm index 507bffd..326ee37 100644 --- a/perl-BDB/perl-BDB.nm +++ b/perl-BDB/perl-BDB.nm @@ -5,7 +5,7 @@ name = perl-BDB version = 1.91 -release = 1 +release = 1.1 thisapp = BDB-%{version} groups = Development/Libraries @@ -25,6 +25,7 @@ build perl(ExtUtils::MakeMaker) perl(ExtUtils::ParseXS) libdb-devel + pakfire >= 0.9.26-3.1 end build diff --git a/perl-Coro/perl-Coro.nm b/perl-Coro/perl-Coro.nm index cad57d0..5f25160 100644 --- a/perl-Coro/perl-Coro.nm +++ b/perl-Coro/perl-Coro.nm @@ -5,7 +5,7 @@ name = perl-Coro version = 6.42 -release = 1 +release = 1.1 thisapp = Coro-%{version} groups = Development/Libraries @@ -26,6 +26,7 @@ build requires perl(ExtUtils::MakeMaker) perl(ExtUtils::ParseXS) + pakfire >= 0.9.26-3.1 end prepare_cmds diff --git a/perl-DBI/perl-DBI.nm b/perl-DBI/perl-DBI.nm index 9e76605..8bc06bc 100644 --- a/perl-DBI/perl-DBI.nm +++ b/perl-DBI/perl-DBI.nm @@ -5,7 +5,7 @@ name = perl-DBI version = 1.633 -release = 1 +release = 1.1 thisapp = DBI-%{version} groups = Development/Libraries @@ -26,6 +26,7 @@ build perl(ExtUtils::ParseXS) perl(Carp) perl(Test::Simple) + pakfire >= 0.9.26-3.1 end build diff --git a/perl-Digest-SHA1/perl-Digest-SHA1.nm b/perl-Digest-SHA1/perl-Digest-SHA1.nm index 736fd9c..ac3aaa4 100644 --- a/perl-Digest-SHA1/perl-Digest-SHA1.nm +++ b/perl-Digest-SHA1/perl-Digest-SHA1.nm @@ -5,7 +5,7 @@ name = perl-Digest-SHA1 version = 2.13 -release = 4 +release = 4.1 thisapp = Digest-SHA1-%{version} groups = Development/Libraries @@ -33,6 +33,7 @@ build requires perl(ExtUtils::MakeMaker) perl(ExtUtils::ParseXS) + pakfire >= 0.9.26-3.1 end build diff --git a/perl-FCGI/perl-FCGI.nm b/perl-FCGI/perl-FCGI.nm index a810587..c2f3a3b 100644 --- a/perl-FCGI/perl-FCGI.nm +++ b/perl-FCGI/perl-FCGI.nm @@ -5,7 +5,7 @@ name = perl-FCGI version = 0.77 -release = 1 +release = 1.1 thisapp = FCGI-%{version} groups = Development/Libraries @@ -23,6 +23,7 @@ build requires perl(ExtUtils::MakeMaker) perl(ExtUtils::ParseXS) + pakfire >= 0.9.26-3.1 end build diff --git a/perl-HTML-Parser/perl-HTML-Parser.nm b/perl-HTML-Parser/perl-HTML-Parser.nm index 1d55894..02d8b3c 100644 --- a/perl-HTML-Parser/perl-HTML-Parser.nm +++ b/perl-HTML-Parser/perl-HTML-Parser.nm @@ -5,7 +5,7 @@ name = perl-HTML-Parser version = 3.71 -release = 1 +release = 1.1 groups = Development/Libratries url = http://search.cpan.org/dist/HTML-Parser/ @@ -28,6 +28,7 @@ build perl-devel perl(HTML::Tagset) perl(Test::More) + pakfire >= 0.9.26-3.1 end build diff --git a/perl-IO-AIO/perl-IO-AIO.nm b/perl-IO-AIO/perl-IO-AIO.nm index b2adec7..f15a05f 100644 --- a/perl-IO-AIO/perl-IO-AIO.nm +++ b/perl-IO-AIO/perl-IO-AIO.nm @@ -5,7 +5,7 @@ name = perl-IO-AIO version = 4.32 -release = 1 +release = 1.1 thisapp = IO-AIO-%{version} groups = Development/Libraries @@ -26,6 +26,7 @@ build perl(ExtUtils::ParseXS) perl(Carp) perl(common::sense) + pakfire >= 0.9.26-3.1 end build diff --git a/perl-TermReadKey/perl-TermReadKey.nm b/perl-TermReadKey/perl-TermReadKey.nm index 20896ca..58acccc 100644 --- a/perl-TermReadKey/perl-TermReadKey.nm +++ b/perl-TermReadKey/perl-TermReadKey.nm @@ -5,7 +5,7 @@ name = perl-TermReadKey version = 2.32 -release = 1 +release = 1.1 thisapp = TermReadKey-%{version} groups = Development/Libraries @@ -31,6 +31,7 @@ build perl(Carp) perl(Exporter) perl(ExtUtils::MakeMaker) + pakfire >= 0.9.26-3.1 end build diff --git a/perl-Tk/perl-Tk.nm b/perl-Tk/perl-Tk.nm index 9c7e449..665335d 100644 --- a/perl-Tk/perl-Tk.nm +++ b/perl-Tk/perl-Tk.nm @@ -5,7 +5,7 @@ name = perl-Tk version = 804.033 -release = 1 +release = 1.1 thisapp = Tk-%{version} groups = Development/Libraries @@ -34,6 +34,7 @@ build libpng-devel libX11-devel libXft-devel + pakfire >= 0.9.26-3.1 end build diff --git a/perl-WWW-Curl/perl-WWW-Curl.nm b/perl-WWW-Curl/perl-WWW-Curl.nm index 84895f8..736a80e 100644 --- a/perl-WWW-Curl/perl-WWW-Curl.nm +++ b/perl-WWW-Curl/perl-WWW-Curl.nm @@ -5,7 +5,7 @@ name = perl-WWW-Curl version = 4.17 -release = 1 +release = 1.1 thisapp = WWW-Curl-%{version} groups = Development/Libraries @@ -24,6 +24,7 @@ build perl(ExtUtils::MakeMaker) perl(ExtUtils::ParseXS) libcurl-devel + pakfire >= 0.9.26-3.1 end build diff --git a/perl-XML-Parser/perl-XML-Parser.nm b/perl-XML-Parser/perl-XML-Parser.nm index 7c3b249..90fccd4 100644 --- a/perl-XML-Parser/perl-XML-Parser.nm +++ b/perl-XML-Parser/perl-XML-Parser.nm @@ -5,7 +5,7 @@ name = perl-XML-Parser version = 2.44 -release = 1 +release = 1.1 thisapp = XML-Parser-%{version} groups = Development/Libraries @@ -24,6 +24,7 @@ source_dl = http://search.cpan.org/CPAN/authors/id/T/TO/TODDR/ build requires expat-devel + pakfire >= 0.9.26-3.1 perl-core perl-devel end diff --git a/perl-common-sense/perl-common-sense.nm b/perl-common-sense/perl-common-sense.nm index f71a743..54ed9bc 100644 --- a/perl-common-sense/perl-common-sense.nm +++ b/perl-common-sense/perl-common-sense.nm @@ -5,7 +5,7 @@ name = perl-common-sense version = 3.73 -release = 1 +release = 1.1 arch = noarch thisapp = common-sense-%{version} @@ -30,6 +30,7 @@ build requires perl(ExtUtils::MakeMaker) perl(ExtUtils::ParseXS) + pakfire >= 0.9.26-3.1 end build diff --git a/perl-libintl-perl/perl-libintl-perl.nm b/perl-libintl-perl/perl-libintl-perl.nm index bb3b8c5..e1f5b67 100644 --- a/perl-libintl-perl/perl-libintl-perl.nm +++ b/perl-libintl-perl/perl-libintl-perl.nm @@ -5,7 +5,7 @@ name = perl-libintl-perl version = 1.23 -release = 2 +release = 2.1 thisapp = libintl-perl-%{version} groups = Development/Libraries @@ -24,9 +24,8 @@ source_dl = http://search.cpan.org/CPAN/authors/id/G/GU/GUIDO/ build requires /usr/bin/xsubpp - # required for perl macros - pakfire-builder >= 0.9.23-6 perl(ExtUtils::MakeMaker) + pakfire >= 0.9.26-3.1 end build diff --git a/perl/perl.nm b/perl/perl.nm index ce7fbf3..c31463e 100644 --- a/perl/perl.nm +++ b/perl/perl.nm @@ -6,7 +6,7 @@ name = perl version = 5.20.2 # Never reset release in this package, just increase. -release = 13.1 +release = 13.2 perl_epoch = 2 thisver = %{perl_epoch}:%{version}-%{_release} @@ -40,6 +40,7 @@ build perl procps zlib-devel + pakfire >= 0.9.26-3.1 end # Perl passes -fstack-protector, if no argument is passed that enables the SSP. hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b2faf4f566b687052d40c8a2c37ed633ed643cb8
by git＠ipfire.org 04 Jun '15

04 Jun '15

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 b2faf4f566b687052d40c8a2c37ed633ed643cb8 (commit) via 5b93b50c6d91cf69d7716c6714808b6a5f87c224 (commit) from bd767b27c85b2c6992cac38781b7bb78a03b694a (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 b2faf4f566b687052d40c8a2c37ed633ed643cb8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jun 4 18:17:33 2015 +0200 core91: Add changed pppsetup.cgi and language files commit 5b93b50c6d91cf69d7716c6714808b6a5f87c224 Author: Lars Schuhmacher <larsen007(a)web.de> Date: Tue Jun 2 21:49:24 2015 +0200 Fix hardcoded strings in pppsetup.cgi Some strings for PPTP were hardcoded instead of using i18n features. Signed-off-by: Lars Schuhmacher <larsen007(a)web.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/91/filelists/files | 2 ++ html/cgi-bin/pppsetup.cgi | 6 +++--- langs/de/cgi-bin/de.pl | 3 +++ langs/en/cgi-bin/en.pl | 3 +++ 4 files changed, 11 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files index 76eee39..7cc5aa2 100644 --- a/config/rootfiles/core/91/filelists/files +++ b/config/rootfiles/core/91/filelists/files @@ -3,3 +3,5 @@ etc/issue opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/pppsetup.cgi +var/ipfire/langs diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 33f521e..59677a4 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -793,15 +793,15 @@ print <<END <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pptp settings'}</b></td> </tr> <tr> - <td width='25%'>Peer</td> + <td width='25%'>$Lang::tr{'pptp peer'}:</td> <td colspan='3'><input size=50 type='text' name='PPTP_PEER' value='$pppsettings{'PPTP_PEER'}' /></td> </tr> <tr> - <td width='25%'>My Netconfig</td> + <td width='25%'>$Lang::tr{'pptp netconfig'}:</td> <td colspan='3'><input size=50 type='text' name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' /></td> </tr> <tr> - <td width='25%'>PPTP Route <img src='/blob.gif' alt='*' /></td> + <td width='25%'>$Lang::tr{'pptp route'}: <img src='/blob.gif' alt='*' /></td> <td colspan='3'><input size=50 type='text' name='PPTP_ROUTE' value='$pppsettings{'PPTP_ROUTE'}' /></td> </tr> diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 8adefdf..48ade28 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1822,6 +1822,9 @@ 'ppp setup' => 'PPP-Einstellungen', 'pppoe' => 'PPPoE', 'pppoe settings' => 'Zusätzliche PPPoE-Einstellungen:', +'pptp netconfig' => 'Eigene Netzkonfiguration', +'pptp peer' => 'Gegenstelle', +'pptp route' => 'PPTP-Route', 'pptp settings' => 'Zusätzliche PPTP-Einstellungen:', 'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz', 'prefered master' => 'Prefered Master', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 43601c8..7964644 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1852,6 +1852,9 @@ 'ppp setup' => 'PPP setup', 'pppoe' => 'PPPoE', 'pppoe settings' => 'Additional PPPoE settings:', +'pptp netconfig' => 'My Net Config', +'pptp peer' => 'Peer', +'pptp route' => 'PPTP Route', 'pptp settings' => 'Additional PPTP settings:', 'pre-shared key is too short' => 'Pre-shared key is too short.', 'prefered master' => 'Prefered Master', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bd767b27c85b2c6992cac38781b7bb78a03b694a
by git＠ipfire.org 04 Jun '15

04 Jun '15

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 bd767b27c85b2c6992cac38781b7bb78a03b694a (commit) via e528fb2c7352bf8f2b5c2bc3e298bfa4c34b9d31 (commit) via bd33c332275ccb041a908c6e53ba78a1fa82f900 (commit) from 557d986cbb406369e0c253879e25f7c21f442830 (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 bd767b27c85b2c6992cac38781b7bb78a03b694a Author: Lars Schuhmacher <larsen007(a)web.de> Date: Thu Jun 4 00:58:49 2015 +0200 ipsec.conf: Include ipsec.user.conf and ipsec.user-post.conf Fix bug 10869 as the code has been removed by mistake by the previous commit dfea4f86c22c83e07d0f4a6f2a02166229ecb120. It also includes ipsec.user.conf only when it exists. Signed-off-by: Lars Schuhmacher <larsen007(a)web.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e528fb2c7352bf8f2b5c2bc3e298bfa4c34b9d31 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 3 18:00:13 2015 +0200 rebuildhosts: Don't break when RED not online The hosts file was not regenerated when RED was not connected which should not be happening. This patch checks if the file exists. If not, the gateway line will not be written to /etc/hosts. commit bd33c332275ccb041a908c6e53ba78a1fa82f900 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Jun 3 17:55:55 2015 +0200 rebuildhosts: Fix SEGV when not online Fixes #10867 ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/vpnmain.cgi | 14 ++++++++++++-- src/misc-progs/rebuildhosts.c | 20 ++++++++------------ 2 files changed, 20 insertions(+), 14 deletions(-) Difference in files: diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi index 9490076..218dafa 100644 --- a/html/cgi-bin/vpnmain.cgi +++ b/html/cgi-bin/vpnmain.cgi @@ -253,8 +253,10 @@ sub writeipsecfiles { print CONF "\n"; # Add user includes to config file - print CONF "include /etc/ipsec.user.conf\n"; - print CONF "\n"; + if (-e "/etc/ipsec.user.conf") { + print CONF "include /etc/ipsec.user.conf\n"; + print CONF "\n"; + } print SECRETS "include /etc/ipsec.user.secrets\n"; @@ -407,6 +409,14 @@ sub writeipsecfiles { print CONF "\n"; }#foreach key + + # Add post user includes to config file + # After the GUI-connections allows to patch connections. + if (-e "/etc/ipsec.user-post.conf") { + print CONF "include /etc/ipsec.user-post.conf\n"; + print CONF "\n"; + } + print SECRETS $last_secrets if ($last_secrets); close(CONF); close(SECRETS); diff --git a/src/misc-progs/rebuildhosts.c b/src/misc-progs/rebuildhosts.c index 21c5236..f77c2df 100644 --- a/src/misc-progs/rebuildhosts.c +++ b/src/misc-progs/rebuildhosts.c @@ -79,18 +79,13 @@ int main(int argc, char *argv[]) freekeyvalues(kv); kv = NULL; - if (!(gw = fopen(CONFIG_ROOT "/red/remote-ipaddress", "r"))) - { + if ((gw = fopen(CONFIG_ROOT "/red/remote-ipaddress", "r"))) { + if (fgets(gateway, STRING_SIZE, gw) == NULL) { + fprintf(stderr, "Couldn't read remote-ipaddress\n"); + exit(1); + } + } else { fprintf(stderr, "Couldn't open remote-ipaddress file\n"); - fclose(gw); - gw = NULL; - exit(1); - } - - if (fgets(gateway, STRING_SIZE, gw) == NULL) - { - fprintf(stderr, "Couldn't read remote-ipaddress\n"); - exit(1); } if (!(fd = fopen(CONFIG_ROOT "/main/hosts", "r"))) @@ -112,7 +107,8 @@ int main(int argc, char *argv[]) else fprintf(hosts, "%s\t%s\n",address,hostname); - fprintf(hosts, "%s\tgateway\n",gateway); + if (strlen(gateway) > 0) + fprintf(hosts, "%s\tgateway\n", gateway); while (fgets(buffer, STRING_SIZE, fd)) { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 557d986cbb406369e0c253879e25f7c21f442830
by git＠ipfire.org 02 Jun '15

02 Jun '15

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 557d986cbb406369e0c253879e25f7c21f442830 (commit) via b29a624081f02a3d4161b1c181dcf064429b51c8 (commit) via 6c7290acb29d6a9c7d455406a7bf0dafd4897b58 (commit) via 3560f497c090dafefc1d2d5b89ad7069a58c01f3 (commit) from 3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1 (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 557d986cbb406369e0c253879e25f7c21f442830 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 2 23:48:50 2015 +0200 core91: pakfire: Add changed functions.pl to update commit b29a624081f02a3d4161b1c181dcf064429b51c8 Author: Lars Schuhmacher <larsen007(a)web.de> Date: Mon Jun 1 22:50:07 2015 +0200 pakfire: Add information about probable causes when pakfire cannot connect Add information about probable causes when pakfire cannot connect. This includes port 11371 TCP and incorrect date/time settings. Signed-off-by: Lars Schuhmacher <larsen007(a)web.de> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6c7290acb29d6a9c7d455406a7bf0dafd4897b58 Merge: 3560f49 3d82ea0 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 2 21:56:58 2015 +0200 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 3560f497c090dafefc1d2d5b89ad7069a58c01f3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Jun 2 19:38:34 2015 +0200 core91: Ship connections.cgi because of past changes in e60cd3a4042e95cf2748aac2de9d991c724ef24d ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/91/filelists/files | 2 ++ src/pakfire/lib/functions.pl | 1 + 2 files changed, 3 insertions(+) Difference in files: diff --git a/config/rootfiles/core/91/filelists/files b/config/rootfiles/core/91/filelists/files index f1a51e6..76eee39 100644 --- a/config/rootfiles/core/91/filelists/files +++ b/config/rootfiles/core/91/filelists/files @@ -1,3 +1,5 @@ etc/system-release etc/issue +opt/pakfire/lib/functions.pl +srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl index 6bf85af..d2f77fa 100644 --- a/src/pakfire/lib/functions.pl +++ b/src/pakfire/lib/functions.pl @@ -890,6 +890,7 @@ sub checkcryptodb { unless ( "$ret" eq "0" ) { message("CRYPTO WARN: The GnuPG isn't configured corectly. Trying now to fix this."); message("CRYPTO WARN: It's normal to see this on first execution."); + message("CRYPTO WARN: If this message is being shown repeatedly, check if time and date are set correctly, and if IPFire can connect via port 11371 TCP."); my $command = "gpg --keyserver pgp.ipfire.org --always-trust --status-fd 2"; system("$command --recv-key $myid >> $Conf::logdir/gnupg-database.log 2>&1"); system("$command --recv-key $trustid >> $Conf::logdir/gnupg-database.log 2>&1"); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. d414a4c2b8314f70084edf3bb8fc0631f871fe0f
by git＠ipfire.org 02 Jun '15

02 Jun '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1
by git＠ipfire.org 02 Jun '15

02 Jun '15

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 3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1 (commit) via 65712deca2d3dc3d9f94b1434446a617f107403a (commit) via ee29c0d7445918c7edd81b5dcfb46210e2451bff (commit) from a421b8038b927529a4ed08c13539f74f66c18f9e (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 3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1 Merge: a421b80 65712de Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 2 09:47:01 2015 +0200 Merge remote-tracking branch 'origin/master' into next ----------------------------------------------------------------------- Summary of changes: lfs/postfix | 2 +- lfs/vsftpd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/postfix b/lfs/postfix index 77c6dd0..fd33253 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 7 +PAK_VER = 8 DEPS = "amavisd mysql" diff --git a/lfs/vsftpd b/lfs/vsftpd index f3e74a0..7284be9 100644 --- a/lfs/vsftpd +++ b/lfs/vsftpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vsftpd -PAK_VER = 7 +PAK_VER = 8 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 65712deca2d3dc3d9f94b1434446a617f107403a
by git＠ipfire.org 02 Jun '15

02 Jun '15

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 65712deca2d3dc3d9f94b1434446a617f107403a (commit) via ee29c0d7445918c7edd81b5dcfb46210e2451bff (commit) from a21df193794d422a85f822bd8cb3470b74826262 (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 65712deca2d3dc3d9f94b1434446a617f107403a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 2 09:09:20 2015 +0200 postfix: bump PAK_VER to fix link against new openssl. fixes: #10864 commit ee29c0d7445918c7edd81b5dcfb46210e2451bff Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jun 2 09:02:37 2015 +0200 vsftpd: bump PAK_VER to fix link angainst new openssl. fixes: 10866 ----------------------------------------------------------------------- Summary of changes: lfs/postfix | 2 +- lfs/vsftpd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/postfix b/lfs/postfix index 77c6dd0..fd33253 100644 --- a/lfs/postfix +++ b/lfs/postfix @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = postfix -PAK_VER = 7 +PAK_VER = 8 DEPS = "amavisd mysql" diff --git a/lfs/vsftpd b/lfs/vsftpd index f3e74a0..7284be9 100644 --- a/lfs/vsftpd +++ b/lfs/vsftpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vsftpd -PAK_VER = 7 +PAK_VER = 8 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM June 2015