From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a079f7aaeefbb66283a10466e80be5695828217a Date: Sun, 03 Mar 2019 15:29:33 +0000 Message-ID: <20190303152934.7557A84FDD4@people01.i.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4004520050326223594==" List-Id: --===============4004520050326223594== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 a079f7aaeefbb66283a10466e80be5695828217a (commit) via d50a78220d220d755d5d86fe0dcfc249f8dd2afb (commit) via 3d01a8f1a66d84024f3c9472dfda749d8c224a34 (commit) via 46a073f1b5538d3606c8f3b67787be6d0f29f03a (commit) via 7c57cbe24b4a48dbce6cdede9f0211bca9707890 (commit) via 6ca3265c41d5cfa0232a6c2c87d244fc159a0453 (commit) via 15c71234ca3762c0565f96507e17fc4d6397f254 (commit) via ae45fb5193d1e45acf9b4405064571edaafb0b31 (commit) via ae4ca7ef1305a66937a98c687375032c74b1429c (commit) via aa88b2ef592401863585d7f6fc1eb7b63849f7d0 (commit) from e1982c695c6faf86fb74c48c151985acb1f9250e (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 a079f7aaeefbb66283a10466e80be5695828217a Author: Michael Tremer Date: Sat Mar 2 14:14:14 2019 +0000 core129: Ship updated proxy.cgi =20 Signed-off-by: Michael Tremer commit d50a78220d220d755d5d86fe0dcfc249f8dd2afb Author: Matthias Fischer Date: Sun Mar 3 09:37:01 2019 +0100 Bug 12008 - Typo in 'proxy.cgi' leads to wrong path for 'basic_ldap_auth' =20 Hi, =20 This should fix https://bugzilla.ipfire.org/show_bug.cgi?id=3D12008 =20 Best, Matthias =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 3d01a8f1a66d84024f3c9472dfda749d8c224a34 Author: Michael Tremer Date: Sat Mar 2 14:12:18 2019 +0000 core129: Ship updated ipset =20 Signed-off-by: Michael Tremer commit 46a073f1b5538d3606c8f3b67787be6d0f29f03a Author: Erik Kapfer Date: Sun Mar 3 09:22:50 2019 +0100 ipset: Update to version 7.1 =20 Signed-off-by: Erik Kapfer Signed-off-by: Michael Tremer commit 7c57cbe24b4a48dbce6cdede9f0211bca9707890 Author: Michael Tremer Date: Sat Mar 2 14:11:02 2019 +0000 core129: Ship updated tar =20 Signed-off-by: Michael Tremer commit 6ca3265c41d5cfa0232a6c2c87d244fc159a0453 Author: Matthias Fischer Date: Sat Mar 2 21:24:15 2019 +0100 tar: Update to 1.32 =20 For details see: http://git.savannah.gnu.org/cgit/tar.git/log/ =20 Best, Matthias =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 15c71234ca3762c0565f96507e17fc4d6397f254 Author: Michael Tremer Date: Sat Mar 2 14:10:21 2019 +0000 core129: Ship updated bind =20 Signed-off-by: Michael Tremer commit ae45fb5193d1e45acf9b4405064571edaafb0b31 Author: Matthias Fischer Date: Sat Mar 2 21:19:03 2019 +0100 bind: Update to 9.11.6 =20 For details see: http://ftp.isc.org/isc/bind9/9.11.6/RELEASE-NOTES-bind-9.11.6.html =20 Best, Matthias =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit ae4ca7ef1305a66937a98c687375032c74b1429c Author: Michael Tremer Date: Sat Mar 2 14:09:00 2019 +0000 core129: Ship updated squid =20 Signed-off-by: Michael Tremer commit aa88b2ef592401863585d7f6fc1eb7b63849f7d0 Author: Matthias Fischer Date: Sat Mar 2 21:08:06 2019 +0100 squid: Update to 4.6 =20 For details see: http://www.squid-cache.org/Versions/v4/changesets/ =20 The 'configure'-option "--disable-ipv6" was removed, it is no longer nece= ssary. =20 See: https://lists.ipfire.org/pipermail/development/2016-April/002046.html =20 "The --disable-ipv6 build option is now deprecated. ... Squid-3.5.7 and later will perform IPv6 availability tests on startup in all builds. =20 - Where IPv6 is unavailable Squid will continue exactly as it would have had the build option not been used. =20 These Squid can have the build option removed now." =20 The warning message concerning a "BCP 177 violation" while starting 'squid' can be ignored. =20 Best, Matthias =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/bind | 14 +++++++-----= -- config/rootfiles/common/ipset | 7 ++++--- config/rootfiles/{oldcore/100 =3D> core/129}/filelists/bind | 0 config/rootfiles/core/129/filelists/files | 1 + config/rootfiles/{oldcore/106 =3D> core/129}/filelists/ipset | 0 config/rootfiles/{oldcore/100 =3D> core/129}/filelists/squid | 0 config/rootfiles/{oldcore/121 =3D> core/129}/filelists/tar | 0 config/rootfiles/core/129/update.sh | 2 ++ html/cgi-bin/proxy.cgi | 2 +- lfs/bind | 7 ++++--- lfs/ipset | 6 +++--- lfs/squid | 9 ++++----- lfs/tar | 6 +++--- ...tors.patch =3D> squid-4.6-fix-max-file-descriptors.patch} | 0 14 files changed, 29 insertions(+), 25 deletions(-) copy config/rootfiles/{oldcore/100 =3D> core/129}/filelists/bind (100%) copy config/rootfiles/{oldcore/106 =3D> core/129}/filelists/ipset (100%) copy config/rootfiles/{oldcore/100 =3D> core/129}/filelists/squid (100%) copy config/rootfiles/{oldcore/121 =3D> core/129}/filelists/tar (100%) rename src/patches/squid/{squid-4.5-fix-max-file-descriptors.patch =3D> squi= d-4.6-fix-max-file-descriptors.patch} (100%) Difference in files: diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index bbe0e0741..8c8a55d19 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -266,27 +266,27 @@ usr/bin/nsupdate #usr/lib/libbind9.la #usr/lib/libbind9.so usr/lib/libbind9.so.161 -usr/lib/libbind9.so.161.0.0 +usr/lib/libbind9.so.161.0.1 #usr/lib/libdns.la #usr/lib/libdns.so -usr/lib/libdns.so.1104 -usr/lib/libdns.so.1104.0.1 +usr/lib/libdns.so.1105 +usr/lib/libdns.so.1105.0.0 #usr/lib/libisc.la #usr/lib/libisc.so usr/lib/libisc.so.1100 -usr/lib/libisc.so.1100.0.0 +usr/lib/libisc.so.1100.0.1 #usr/lib/libisccc.la #usr/lib/libisccc.so usr/lib/libisccc.so.161 -usr/lib/libisccc.so.161.0.0 +usr/lib/libisccc.so.161.0.1 #usr/lib/libisccfg.la #usr/lib/libisccfg.so usr/lib/libisccfg.so.163 -usr/lib/libisccfg.so.163.0.0 +usr/lib/libisccfg.so.163.0.1 #usr/lib/liblwres.la #usr/lib/liblwres.so usr/lib/liblwres.so.161 -usr/lib/liblwres.so.161.0.0 +usr/lib/liblwres.so.161.0.1 #usr/share/man/man1/dig.1 #usr/share/man/man1/host.1 #usr/share/man/man1/nslookup.1 diff --git a/config/rootfiles/common/ipset b/config/rootfiles/common/ipset index 24f5e95f5..b3fcb640b 100644 --- a/config/rootfiles/common/ipset +++ b/config/rootfiles/common/ipset @@ -3,6 +3,7 @@ etc/ipset #usr/include/libipset/args.h #usr/include/libipset/data.h #usr/include/libipset/errcode.h +#usr/include/libipset/ipset.h #usr/include/libipset/linux_ip_set.h #usr/include/libipset/linux_ip_set_bitmap.h #usr/include/libipset/linux_ip_set_hash.h @@ -16,12 +17,12 @@ etc/ipset #usr/include/libipset/session.h #usr/include/libipset/transport.h #usr/include/libipset/types.h -#usr/include/libipset/ui.h #usr/include/libipset/utils.h #usr/lib/libipset.la #usr/lib/libipset.so -usr/lib/libipset.so.11 -usr/lib/libipset.so.11.1.0 +usr/lib/libipset.so.13 +usr/lib/libipset.so.13.1.0 #usr/lib/pkgconfig/libipset.pc usr/sbin/ipset +#usr/share/man/man3/libipset.3 #usr/share/man/man8/ipset.8 diff --git a/config/rootfiles/core/129/filelists/bind b/config/rootfiles/core= /129/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/129/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/129/filelists/files b/config/rootfiles/cor= e/129/filelists/files index 14bd3edc9..71abbb6be 100644 --- a/config/rootfiles/core/129/filelists/files +++ b/config/rootfiles/core/129/filelists/files @@ -7,6 +7,7 @@ etc/rc.d/init.d/networking/red.up/50-ipsec srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/netovpnsrv.cgi +srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/bin/readelf usr/bin/strings diff --git a/config/rootfiles/core/129/filelists/ipset b/config/rootfiles/cor= e/129/filelists/ipset new file mode 120000 index 000000000..2b43691f2 --- /dev/null +++ b/config/rootfiles/core/129/filelists/ipset @@ -0,0 +1 @@ +../../../common/ipset \ No newline at end of file diff --git a/config/rootfiles/core/129/filelists/squid b/config/rootfiles/cor= e/129/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/129/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/129/filelists/tar b/config/rootfiles/core/= 129/filelists/tar new file mode 120000 index 000000000..3e585d2eb --- /dev/null +++ b/config/rootfiles/core/129/filelists/tar @@ -0,0 +1 @@ +../../../common/tar \ No newline at end of file diff --git a/config/rootfiles/core/129/update.sh b/config/rootfiles/core/129/= update.sh index 5ab078ea3..62a278ce5 100644 --- a/config/rootfiles/core/129/update.sh +++ b/config/rootfiles/core/129/update.sh @@ -32,6 +32,7 @@ for (( i=3D1; i<=3D$core; i++ )); do done =20 # Stop services +/etc/init.d/squid stop /usr/local/bin/openvpnctrl -k /usr/local/bin/openvpnctrl -kn2n /usr/local/bin/ipsecctrl D @@ -56,6 +57,7 @@ ldconfig /usr/local/bin/ipsecctrl S /usr/local/bin/openvpnctrl -s /usr/local/bin/openvpnctrl -sn2n +/etc/init.d/squid start =20 # This update needs a reboot... #touch /var/run/need_reboot diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 9082a7994..6daa7fbd2 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -101,7 +101,7 @@ my $cre_svhosts =3D "${General::swroot}/proxy/advanced/cr= e/supervisors"; =20 my $identhosts =3D "$identdir/hosts"; =20 -my $authdir =3D "/usr/lib/squid/"; +my $authdir =3D "/usr/lib/squid"; my $errordir =3D "/usr/lib/squid/errors"; =20 my $acl_src_subnets =3D "$acldir/src_subnets.acl"; diff --git a/lfs/bind b/lfs/bind index 44b649fcb..f2286fe1f 100644 --- a/lfs/bind +++ b/lfs/bind @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2019 IPFire Team = # # = # # This program is free software: you can redistribute it and/or modify = # # it under the terms of the GNU General Public License as published by = # @@ -25,7 +25,7 @@ =20 include Config =20 -VER =3D 9.11.5-P1 +VER =3D 9.11.6 =20 THISAPP =3D bind-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 2825d818db51008f88a0030507edfa8a +$(DL_FILE)_MD5 =3D 4882bd3eeef779e05b515b32354cc081 =20 install : $(TARGET) =20 @@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --prefix=3D/usr \ --enable-threads \ --with-libtool \ + --without-python \ --disable-static cd $(DIR_APP) && make -C lib/isc install cd $(DIR_APP) && make -C lib/dns install diff --git a/lfs/ipset b/lfs/ipset index d33e9327f..3382c668c 100644 --- a/lfs/ipset +++ b/lfs/ipset @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2019 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 6.38 +VER =3D 7.1 =20 THISAPP =3D ipset-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 0e5d9c85f6b78e7dff0c996e2900574b +$(DL_FILE)_MD5 =3D 72b477d1ce076d681b0799f88280f2f3 =20 install : $(TARGET) =20 diff --git a/lfs/squid b/lfs/squid index 6033ab394..0115cad82 100644 --- a/lfs/squid +++ b/lfs/squid @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2019 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 4.5 +VER =3D 4.6 =20 THISAPP =3D squid-$(VER) DL_FILE =3D $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 8275da5846f9f2243ad2625e5aef2ee0 +$(DL_FILE)_MD5 =3D e25e7cc37754ad14d8aa368c0c210e54 =20 install : $(TARGET) =20 @@ -72,7 +72,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.5-fix-m= ax-file-descriptors.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.6-fix-m= ax-file-descriptors.patch =20 cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi @@ -91,7 +91,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-kqueue \ --disable-esi \ --disable-arch-native \ - --enable-ipv6 \ --enable-poll \ --enable-ident-lookups \ --enable-storeio=3Daufs,diskd,ufs \ diff --git a/lfs/tar b/lfs/tar index 953613d51..f5c280fb2 100644 --- a/lfs/tar +++ b/lfs/tar @@ -1,7 +1,7 @@ ############################################################################= ### # = # # IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2018 IPFire Team = # +# Copyright (C) 2007-2019 IPFire Team = # # = # # 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 @@ =20 include Config =20 -VER =3D 1.31 +VER =3D 1.32 =20 THISAPP =3D tar-$(VER) DL_FILE =3D $(THISAPP).tar.bz2 @@ -50,7 +50,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 77afa35b696c8d760331fa0e12c2fac9 +$(DL_FILE)_MD5 =3D 17917356fff5cb4bd3cd5a6c3e727b05 =20 install : $(TARGET) =20 diff --git a/src/patches/squid/squid-4.5-fix-max-file-descriptors.patch b/src= /patches/squid/squid-4.6-fix-max-file-descriptors.patch similarity index 100% rename from src/patches/squid/squid-4.5-fix-max-file-descriptors.patch rename to src/patches/squid/squid-4.6-fix-max-file-descriptors.patch hooks/post-receive -- IPFire 2.x development tree --===============4004520050326223594==--