IPFire-SCM July 2018

ipfire-scm@lists.ipfire.org

1 participants
40 discussions

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. 87589bce0019b92911fab529b3a010a50cbdaa04
by git＠ipfire.org 31 Jul '18

31 Jul '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core122, updated. 5c61912dc39ab7357f0821d9a357e8505581e48d
by git＠ipfire.org 30 Jul '18

30 Jul '18

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, core122 has been updated via 5c61912dc39ab7357f0821d9a357e8505581e48d (commit) from c645bac12b753d9b8d95d61cff9b828ccbe3d391 (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 5c61912dc39ab7357f0821d9a357e8505581e48d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Jul 30 22:22:31 2018 +0200 core121: lower needed disksapce on /boot the old value will sometimes fail on pae systems. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/121/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Difference in files: diff --git a/config/rootfiles/core/121/update.sh b/config/rootfiles/core/121/update.sh index bee8fd24f..ca64b643d 100644 --- a/config/rootfiles/core/121/update.sh +++ b/config/rootfiles/core/121/update.sh @@ -61,7 +61,7 @@ fi BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` -if [ $BOOTSPACE -lt 22000 ]; then +if [ $BOOTSPACE -lt 19000 ]; then exit_with_error "ERROR cannot update because not enough free space on /boot." 3 exit 3 fi hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0cf70cae66593ce985d22b05d0be95c5b43b0565
by git＠ipfire.org 30 Jul '18

30 Jul '18

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 6cb06d262c0098700031c840e742cc38ae15db73
by git＠ipfire.org 26 Jul '18

26 Jul '18

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 6cb06d262c0098700031c840e742cc38ae15db73 (commit) via c1bc4a66daffa11cc3fe98391fdec5c874cab90b (commit) via 8a436145ab70675b1c15b0856406c7ebb796abf9 (commit) via e9f71ba263fab12e300c8b9efec8ad17d0c28c54 (commit) via fe0e9841196b0b05195d2fea9bccd321479845c2 (commit) from 326ae1cc6875eed9461b5eb59dda03d144688522 (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 6cb06d262c0098700031c840e742cc38ae15db73 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 15:38:33 2018 +0100 nftables: Update to version 0.9.0 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c1bc4a66daffa11cc3fe98391fdec5c874cab90b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 15:36:48 2018 +0100 libnftnl: Update to version 1.1.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 8a436145ab70675b1c15b0856406c7ebb796abf9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 15:33:20 2018 +0100 Revert "nftables: Drop package" This reverts commit 8c785caba7469a9db7700c7217411dada93107e0. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e9f71ba263fab12e300c8b9efec8ad17d0c28c54 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 15:32:22 2018 +0100 kernel: Re-enable support for nftables This reverts commit 5d17c06060b206bb8043f355fa9f21f23995c0ef. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fe0e9841196b0b05195d2fea9bccd321479845c2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 15:31:57 2018 +0100 Revert "iptables: New package" This reverts commit 46ad8236e7cda033d43d9132bc72881f87b09fb1. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: iptables/iptables.nm | 47 --------- kernel/config-generic | 105 +++++++++++---------- kernel/kernel.nm | 2 +- .../libnetfilter_acct.nm => libnftnl/libnftnl.nm | 25 +++-- .../usb-modeswitch.nm => nftables/nftables.nm | 28 +++--- 5 files changed, 86 insertions(+), 121 deletions(-) delete mode 100644 iptables/iptables.nm copy libnetfilter_acct/libnetfilter_acct.nm => libnftnl/libnftnl.nm (57%) copy usb-modeswitch/usb-modeswitch.nm => nftables/nftables.nm (56%) Difference in files: diff --git a/kernel/config-generic b/kernel/config-generic index f82742647..876ef6b07 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -623,7 +623,6 @@ CONFIG_NF_LOG_COMMON=m CONFIG_NF_LOG_NETDEV=m CONFIG_NF_CONNTRACK_MARK=y CONFIG_NF_CONNTRACK_SECMARK=y -# CONFIG_NF_CONNTRACK_ZONES is not set CONFIG_NF_CONNTRACK_PROCFS=y CONFIG_NF_CONNTRACK_EVENTS=y CONFIG_NF_CONNTRACK_TIMEOUT=y @@ -659,8 +658,35 @@ CONFIG_NF_NAT_IRC=m CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_TFTP=m CONFIG_NF_NAT_REDIRECT=m -CONFIG_NETFILTER_SYNPROXY=m -# CONFIG_NF_TABLES is not set +CONFIG_NF_TABLES=m +CONFIG_NF_TABLES_INET=m +CONFIG_NF_TABLES_NETDEV=m +CONFIG_NFT_EXTHDR=m +CONFIG_NFT_META=m +CONFIG_NFT_RT=m +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_CT=m +CONFIG_NFT_SET_RBTREE=m +CONFIG_NFT_SET_HASH=m +CONFIG_NFT_SET_BITMAP=m +CONFIG_NFT_COUNTER=m +CONFIG_NFT_LOG=m +CONFIG_NFT_LIMIT=m +CONFIG_NFT_MASQ=m +CONFIG_NFT_REDIR=m +CONFIG_NFT_NAT=m +CONFIG_NFT_OBJREF=m +CONFIG_NFT_QUEUE=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_REJECT=m +CONFIG_NFT_REJECT_INET=m +# CONFIG_NFT_COMPAT is not set +CONFIG_NFT_HASH=m +CONFIG_NFT_FIB=m +CONFIG_NFT_FIB_INET=m +CONFIG_NF_DUP_NETDEV=m +CONFIG_NFT_DUP_NETDEV=m +CONFIG_NFT_FWD_NETDEV=m CONFIG_NETFILTER_XTABLES=y # @@ -673,13 +699,9 @@ CONFIG_NETFILTER_XT_SET=m # # Xtables targets # -CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m -CONFIG_NETFILTER_XT_TARGET_CT=m -CONFIG_NETFILTER_XT_TARGET_DSCP=m -CONFIG_NETFILTER_XT_TARGET_HL=m CONFIG_NETFILTER_XT_TARGET_HMARK=m CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m CONFIG_NETFILTER_XT_TARGET_LED=m @@ -689,15 +711,11 @@ CONFIG_NETFILTER_XT_NAT=m CONFIG_NETFILTER_XT_TARGET_NETMAP=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m CONFIG_NETFILTER_XT_TARGET_RATEEST=m CONFIG_NETFILTER_XT_TARGET_REDIRECT=m CONFIG_NETFILTER_XT_TARGET_TEE=m -CONFIG_NETFILTER_XT_TARGET_TPROXY=m -CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m -CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m # # Xtables matches @@ -723,7 +741,7 @@ CONFIG_NETFILTER_XT_MATCH_HELPER=m CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPCOMP=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m -CONFIG_NETFILTER_XT_MATCH_IPVS=m +# CONFIG_NETFILTER_XT_MATCH_IPVS is not set CONFIG_NETFILTER_XT_MATCH_L2TP=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m @@ -815,34 +833,26 @@ CONFIG_IP_VS_PE_SIP=m CONFIG_NF_DEFRAG_IPV4=y CONFIG_NF_CONNTRACK_IPV4=y CONFIG_NF_SOCKET_IPV4=m +CONFIG_NF_TABLES_IPV4=m +CONFIG_NFT_CHAIN_ROUTE_IPV4=m +CONFIG_NFT_REJECT_IPV4=m +CONFIG_NFT_DUP_IPV4=m +CONFIG_NFT_FIB_IPV4=m +CONFIG_NF_TABLES_ARP=m CONFIG_NF_DUP_IPV4=m CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_IPV4=m CONFIG_NF_REJECT_IPV4=m CONFIG_NF_NAT_IPV4=m +CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NF_NAT_MASQUERADE_IPV4=m +CONFIG_NFT_MASQ_IPV4=m +CONFIG_NFT_REDIR_IPV4=m CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_PROTO_GRE=m CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m -CONFIG_IP_NF_IPTABLES=m -CONFIG_IP_NF_MATCH_AH=m -CONFIG_IP_NF_MATCH_ECN=m -CONFIG_IP_NF_MATCH_RPFILTER=m -CONFIG_IP_NF_MATCH_TTL=m -CONFIG_IP_NF_FILTER=m -CONFIG_IP_NF_TARGET_REJECT=m -CONFIG_IP_NF_TARGET_SYNPROXY=m -CONFIG_IP_NF_NAT=m -CONFIG_IP_NF_TARGET_MASQUERADE=m -CONFIG_IP_NF_TARGET_NETMAP=m -CONFIG_IP_NF_TARGET_REDIRECT=m -CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m -CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_TTL=m -CONFIG_IP_NF_RAW=m -CONFIG_IP_NF_SECURITY=m +# CONFIG_IP_NF_IPTABLES is not set CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m @@ -853,31 +863,24 @@ CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NF_DEFRAG_IPV6=y CONFIG_NF_CONNTRACK_IPV6=y CONFIG_NF_SOCKET_IPV6=m +CONFIG_NF_TABLES_IPV6=m +CONFIG_NFT_CHAIN_ROUTE_IPV6=m +CONFIG_NFT_REJECT_IPV6=m +CONFIG_NFT_DUP_IPV6=m +CONFIG_NFT_FIB_IPV6=m CONFIG_NF_DUP_IPV6=m CONFIG_NF_REJECT_IPV6=m CONFIG_NF_LOG_IPV6=m CONFIG_NF_NAT_IPV6=m +CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NF_NAT_MASQUERADE_IPV6=m -CONFIG_IP6_NF_IPTABLES=m -CONFIG_IP6_NF_MATCH_AH=m -CONFIG_IP6_NF_MATCH_EUI64=m -CONFIG_IP6_NF_MATCH_FRAG=m -CONFIG_IP6_NF_MATCH_OPTS=m -CONFIG_IP6_NF_MATCH_HL=m -CONFIG_IP6_NF_MATCH_IPV6HEADER=m -CONFIG_IP6_NF_MATCH_MH=m -CONFIG_IP6_NF_MATCH_RPFILTER=m -CONFIG_IP6_NF_MATCH_RT=m -CONFIG_IP6_NF_TARGET_HL=m -CONFIG_IP6_NF_FILTER=m -CONFIG_IP6_NF_TARGET_REJECT=m -CONFIG_IP6_NF_TARGET_SYNPROXY=m -CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_RAW=m -CONFIG_IP6_NF_SECURITY=m -CONFIG_IP6_NF_NAT=m -CONFIG_IP6_NF_TARGET_MASQUERADE=m -CONFIG_IP6_NF_TARGET_NPT=m +CONFIG_NFT_MASQ_IPV6=m +CONFIG_NFT_REDIR_IPV6=m +# CONFIG_IP6_NF_IPTABLES is not set +CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_BRIDGE_META=m +CONFIG_NFT_BRIDGE_REJECT=m +CONFIG_NF_LOG_BRIDGE=m CONFIG_BRIDGE_NF_EBTABLES=m CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m @@ -1012,7 +1015,6 @@ CONFIG_NET_ACT_GACT=m CONFIG_GACT_PROB=y CONFIG_NET_ACT_MIRRED=m CONFIG_NET_ACT_SAMPLE=m -CONFIG_NET_ACT_IPT=m CONFIG_NET_ACT_NAT=m CONFIG_NET_ACT_PEDIT=m CONFIG_NET_ACT_SIMP=m @@ -1020,7 +1022,6 @@ CONFIG_NET_ACT_SKBEDIT=m CONFIG_NET_ACT_CSUM=m CONFIG_NET_ACT_VLAN=m CONFIG_NET_ACT_BPF=m -CONFIG_NET_ACT_CONNMARK=m CONFIG_NET_ACT_SKBMOD=m CONFIG_NET_ACT_IFE=m CONFIG_NET_ACT_TUNNEL_KEY=m diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 200a3f2c8..902f0709a 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 4.13.3 -release = 2 +release = 3 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> diff --git a/iptables/iptables.nm b/libnftnl/libnftnl.nm similarity index 53% rename from iptables/iptables.nm rename to libnftnl/libnftnl.nm index ca62d0264..9a77c6745 100644 --- a/iptables/iptables.nm +++ b/libnftnl/libnftnl.nm @@ -3,35 +3,33 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -name = iptables -version = 1.6.2 +name = libnftnl +version = 1.1.1 release = 1 +thisapp = %{name}-%{version} groups = Networking/Tools -url = http://www.netfilter.org -license = GPL+ -summary = Tools for managing Linux kernel packet filtering capabilities +url = http://netfilter.org/projects/libnftnl +license = GPLv2 +summary = Library for low-level interaction with nftables description - The iptables utility controls the network packet filtering code - in the Linux kernel. + Library for low-level interaction with nftables Netlink's API over + libmnl. end -source_dl = http://ftp.netfilter.org/pub/iptables/ +source_dl = http://ftp.netfilter.org/pub/libnftnl/ sources = %{thisapp}.tar.bz2 build requires - libnfnetlink-devel + autoconf + autogen + automake + libmnl-devel + libtool end - configure_options += \ - --disable-nftables - - install_cmds - # Remove absolute symlink - ln -svf ../sbin/xtables-multi %{BUILDROOT}/usr/bin/iptables-xml - end end packages diff --git a/nftables/nftables.nm b/nftables/nftables.nm new file mode 100644 index 000000000..bca58c5f1 --- /dev/null +++ b/nftables/nftables.nm @@ -0,0 +1,43 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = nftables +version = 0.9.0 +release = 1 + +groups = Networking/Tools +url = http://netfilter.org/projects/nftables/ +license = GPLv2 +summary = Netfilter Tables userspace utillites + +description + %{summary} +end + +source_dl = http://ftp.netfilter.org/pub/nftables/ +sources = %{thisapp}.tar.bz2 + +build + requires + autogen + bison + docbook2X + docbook-xsl + flex + gmp-devel + libtool + libmnl-devel + libnftnl-devel >= 1.0.5 + readline-devel + end +end + +packages + package %{name} + + 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. a580a31c0ff5c596027b4e942869e4e7342f2de6
by git＠ipfire.org 26 Jul '18

26 Jul '18

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 a580a31c0ff5c596027b4e942869e4e7342f2de6 (commit) via 51099ddfd7a497d535662a93362e774ba30fe1ca (commit) via 64add19dfe8ecef092679871eac1d56560e2b0f5 (commit) from 4e4c122c58349a9cf7e496b1e61ea3f55e070681 (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 a580a31c0ff5c596027b4e942869e4e7342f2de6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Jul 26 14:46:53 2018 +0100 core123: Ship and restart squid and apache Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 51099ddfd7a497d535662a93362e774ba30fe1ca Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue Jul 17 20:50:41 2018 +0200 squid: Update to 3.5.28 For details see: http://www.squid-cache.org/Versions/v3/3.5/changesets/ Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 64add19dfe8ecef092679871eac1d56560e2b0f5 Author: Wolfgang Apolinarski <wolfgang.apolinarski(a)ipfire.org> Date: Tue Jul 17 20:13:30 2018 +0200 Apache: Update to 2.4.34 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: .../{oldcore/114 => core/123}/filelists/apache2 | 0 .../{oldcore/100 => core/123}/filelists/squid | 0 config/rootfiles/core/123/update.sh | 3 +++ lfs/apache2 | 4 ++-- lfs/squid | 8 +++---- src/patches/squid/SQUID-2018_1.patch | 28 ---------------------- src/patches/squid/SQUID-2018_2.patch | 23 ------------------ ...=> squid-3.5.28-fix-max-file-descriptors.patch} | 0 8 files changed, 8 insertions(+), 58 deletions(-) copy config/rootfiles/{oldcore/114 => core/123}/filelists/apache2 (100%) copy config/rootfiles/{oldcore/100 => core/123}/filelists/squid (100%) delete mode 100644 src/patches/squid/SQUID-2018_1.patch delete mode 100644 src/patches/squid/SQUID-2018_2.patch rename src/patches/squid/{squid-3.5.27-fix-max-file-descriptors.patch => squid-3.5.28-fix-max-file-descriptors.patch} (100%) Difference in files: diff --git a/config/rootfiles/core/123/filelists/apache2 b/config/rootfiles/core/123/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/123/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/123/filelists/squid b/config/rootfiles/core/123/filelists/squid new file mode 120000 index 000000000..2dc8372a0 --- /dev/null +++ b/config/rootfiles/core/123/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/123/update.sh b/config/rootfiles/core/123/update.sh index ee8a5ec0b..cf488ec49 100644 --- a/config/rootfiles/core/123/update.sh +++ b/config/rootfiles/core/123/update.sh @@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do done # Stop services +/etc/init.d/squid stop # Extract files extract_files @@ -46,7 +47,9 @@ ldconfig /usr/local/bin/update-lang-cache # Start services +/etc/init.d/apache restart /etc/init.d/unbound restart +/etc/init.d/squid start # This update needs a reboot... touch /var/run/need_reboot diff --git a/lfs/apache2 b/lfs/apache2 index 16dd101d7..0e526a575 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.4.33 +VER = 2.4.34 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6ef469d3f16fffeb688bc6e0346823e5 +$(DL_FILE)_MD5 = 818adca52f3be187fe45d6822755be95 install : $(TARGET) diff --git a/lfs/squid b/lfs/squid index f93097019..cae56407c 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.5.27 +VER = 3.5.28 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 39ef8199675d48a314b540f92c00c545 +$(DL_FILE)_MD5 = 9367e0375ea53ba0e99f77054d4402c5 install : $(TARGET) @@ -72,9 +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 -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_1.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/squid/SQUID-2018_2.patch - cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch + cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch cd $(DIR_APP) && autoreconf -vfi cd $(DIR_APP)/libltdl && autoreconf -vfi diff --git a/src/patches/squid/SQUID-2018_1.patch b/src/patches/squid/SQUID-2018_1.patch deleted file mode 100644 index 9392219a9..000000000 --- a/src/patches/squid/SQUID-2018_1.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit eb2db98a676321b814fc4a51c4fb7928a8bb45d9 (refs/remotes/origin/v3.5) -Author: Amos Jeffries <yadij(a)users.noreply.github.com> -Date: 2018-01-19 13:54:14 +1300 - - ESI: make sure endofName never exceeds tagEnd (#130) - -diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc -index d86d2d3..db634d9 100644 ---- a/src/esi/CustomParser.cc -+++ b/src/esi/CustomParser.cc -@@ -121,7 +121,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool - - char * endofName = strpbrk(const_cast<char *>(tag), w_space); - -- if (endofName > tagEnd) -+ if (!endofName || endofName > tagEnd) - endofName = const_cast<char *>(tagEnd); - - *endofName = '\0'; -@@ -214,7 +214,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool - - char * endofName = strpbrk(const_cast<char *>(tag), w_space); - -- if (endofName > tagEnd) -+ if (!endofName || endofName > tagEnd) - endofName = const_cast<char *>(tagEnd); - - *endofName = '\0'; diff --git a/src/patches/squid/SQUID-2018_2.patch b/src/patches/squid/SQUID-2018_2.patch deleted file mode 100644 index 9ecd8a5b7..000000000 --- a/src/patches/squid/SQUID-2018_2.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 8232b83d3fa47a1399f155cb829db829369fbae9 (refs/remotes/origin/v3.5) -Author: squidadm <squidadm(a)users.noreply.github.com> -Date: 2018-01-21 08:07:08 +1300 - - Fix indirect IP logging for transactions without a client connection (#129) (#136) - -diff --git a/src/client_side_request.cc b/src/client_side_request.cc -index be124f3..203f89d 100644 ---- a/src/client_side_request.cc -+++ b/src/client_side_request.cc -@@ -488,9 +488,9 @@ clientFollowXForwardedForCheck(allow_t answer, void *data) - * Ensure that the access log shows the indirect client - * instead of the direct client. - */ -- ConnStateData *conn = http->getConn(); -- conn->log_addr = request->indirect_client_addr; -- http->al->cache.caddr = conn->log_addr; -+ http->al->cache.caddr = request->indirect_client_addr; -+ if (ConnStateData *conn = http->getConn()) -+ conn->log_addr = request->indirect_client_addr; - } - request->x_forwarded_for_iterator.clean(); - request->flags.done_follow_x_forwarded_for = true; diff --git a/src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch b/src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch similarity index 100% rename from src/patches/squid/squid-3.5.27-fix-max-file-descriptors.patch rename to src/patches/squid/squid-3.5.28-fix-max-file-descriptors.patch hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. de7c8df83e23e82a4b757b6283ae06d2cd8eb14f
by git＠ipfire.org 25 Jul '18

25 Jul '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. 0efda7ac67d7e16c555bc6d07d1808a8480fa94b
by git＠ipfire.org 23 Jul '18

23 Jul '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. 5d657243cf2c0e68412003ac9e8cb76a1c967a5f
by git＠ipfire.org 22 Jul '18

22 Jul '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. 5dd9140a4477ea6f295936ee723ae3097f11810c
by git＠ipfire.org 22 Jul '18

22 Jul '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, efi, updated. 948d660c10d8f384484bc0cc4a9391a55a5c570c
by git＠ipfire.org 21 Jul '18

21 Jul '18

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, efi has been updated via 948d660c10d8f384484bc0cc4a9391a55a5c570c (commit) from 9023689d739e040b3e881886a19a6502b24c237f (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 948d660c10d8f384484bc0cc4a9391a55a5c570c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Jul 21 16:39:46 2018 +0200 syslinux: update i586 rootfile Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/i586/syslinux | 80 +++++++++++++++++++++++++++++------ 1 file changed, 67 insertions(+), 13 deletions(-) Difference in files: diff --git a/config/rootfiles/common/i586/syslinux b/config/rootfiles/common/i586/syslinux index 89cf5c844..0322239d0 100644 --- a/config/rootfiles/common/i586/syslinux +++ b/config/rootfiles/common/i586/syslinux @@ -14,7 +14,9 @@ usr/bin/isohybrid #usr/bin/syslinux2ansi #usr/man/man1/extlinux.1 #usr/man/man1/gethostip.1 +#usr/man/man1/isohybrid.1 #usr/man/man1/lss16toppm.1 +#usr/man/man1/memdiskfind.1 #usr/man/man1/ppmtolss16.1 #usr/man/man1/syslinux.1 #usr/man/man1/syslinux2ansi.1 @@ -25,6 +27,7 @@ usr/bin/isohybrid #usr/share/syslinux/cat.c32 #usr/share/syslinux/chain.c32 #usr/share/syslinux/cmd.c32 +#usr/share/syslinux/cmenu.c32 #usr/share/syslinux/com32 #usr/share/syslinux/com32/com32.ld #usr/share/syslinux/com32/include @@ -36,11 +39,26 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/bitsize/stdint.h #usr/share/syslinux/com32/include/bitsize/stdintconst.h #usr/share/syslinux/com32/include/bitsize/stdintlimits.h +#usr/share/syslinux/com32/include/bitsize32 +#usr/share/syslinux/com32/include/bitsize32/limits.h +#usr/share/syslinux/com32/include/bitsize32/stddef.h +#usr/share/syslinux/com32/include/bitsize32/stdint.h +#usr/share/syslinux/com32/include/bitsize32/stdintconst.h +#usr/share/syslinux/com32/include/bitsize32/stdintlimits.h +#usr/share/syslinux/com32/include/bitsize64 +#usr/share/syslinux/com32/include/bitsize64/limits.h +#usr/share/syslinux/com32/include/bitsize64/stddef.h +#usr/share/syslinux/com32/include/bitsize64/stdint.h +#usr/share/syslinux/com32/include/bitsize64/stdintconst.h +#usr/share/syslinux/com32/include/bitsize64/stdintlimits.h #usr/share/syslinux/com32/include/bufprintf.h +#usr/share/syslinux/com32/include/byteswap.h +#usr/share/syslinux/com32/include/cli.h #usr/share/syslinux/com32/include/colortbl.h #usr/share/syslinux/com32/include/com32.h #usr/share/syslinux/com32/include/console.h #usr/share/syslinux/com32/include/cpufeature.h +#usr/share/syslinux/com32/include/ctime.h #usr/share/syslinux/com32/include/ctype.h #usr/share/syslinux/com32/include/dev.h #usr/share/syslinux/com32/include/dhcp.h @@ -101,6 +119,8 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/gplinclude/vpd/vpd.h #usr/share/syslinux/com32/include/gplinclude/zzjson #usr/share/syslinux/com32/include/gplinclude/zzjson/zzjson.h +#usr/share/syslinux/com32/include/hw +#usr/share/syslinux/com32/include/hw/vga.h #usr/share/syslinux/com32/include/ilog2.h #usr/share/syslinux/com32/include/inttypes.h #usr/share/syslinux/com32/include/klibc @@ -109,16 +129,27 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/klibc/diverr.h #usr/share/syslinux/com32/include/klibc/endian.h #usr/share/syslinux/com32/include/klibc/extern.h +#usr/share/syslinux/com32/include/klibc/i386 +#usr/share/syslinux/com32/include/klibc/i386/archsetjmp.h #usr/share/syslinux/com32/include/klibc/sysconfig.h +#usr/share/syslinux/com32/include/klibc/x86_64 +#usr/share/syslinux/com32/include/klibc/x86_64/archsetjmp.h #usr/share/syslinux/com32/include/libansi.h #usr/share/syslinux/com32/include/limits.h +#usr/share/syslinux/com32/include/linux +#usr/share/syslinux/com32/include/linux/list.h #usr/share/syslinux/com32/include/math.h +#usr/share/syslinux/com32/include/menu.h #usr/share/syslinux/com32/include/minmax.h #usr/share/syslinux/com32/include/netinet #usr/share/syslinux/com32/include/netinet/in.h #usr/share/syslinux/com32/include/png.h #usr/share/syslinux/com32/include/pngconf.h +#usr/share/syslinux/com32/include/refstr.h +#usr/share/syslinux/com32/include/serial.h #usr/share/syslinux/com32/include/setjmp.h +#usr/share/syslinux/com32/include/sort.h +#usr/share/syslinux/com32/include/srecsend.h #usr/share/syslinux/com32/include/stdarg.h #usr/share/syslinux/com32/include/stdbool.h #usr/share/syslinux/com32/include/stddef.h @@ -134,14 +165,24 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/sys/elf32.h #usr/share/syslinux/com32/include/sys/elf64.h #usr/share/syslinux/com32/include/sys/elfcommon.h +#usr/share/syslinux/com32/include/sys/exec.h #usr/share/syslinux/com32/include/sys/fpu.h #usr/share/syslinux/com32/include/sys/gpxe.h +#usr/share/syslinux/com32/include/sys/i386 +#usr/share/syslinux/com32/include/sys/i386/bitops.h +#usr/share/syslinux/com32/include/sys/i386/cpu.h +#usr/share/syslinux/com32/include/sys/i386/module.h #usr/share/syslinux/com32/include/sys/io.h +#usr/share/syslinux/com32/include/sys/module.h #usr/share/syslinux/com32/include/sys/pci.h #usr/share/syslinux/com32/include/sys/stat.h #usr/share/syslinux/com32/include/sys/time.h #usr/share/syslinux/com32/include/sys/times.h #usr/share/syslinux/com32/include/sys/types.h +#usr/share/syslinux/com32/include/sys/x86_64 +#usr/share/syslinux/com32/include/sys/x86_64/bitops.h +#usr/share/syslinux/com32/include/sys/x86_64/cpu.h +#usr/share/syslinux/com32/include/sys/x86_64/module.h #usr/share/syslinux/com32/include/syslinux #usr/share/syslinux/com32/include/syslinux/adv.h #usr/share/syslinux/com32/include/syslinux/advconst.h @@ -150,8 +191,9 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/syslinux/bootpm.h #usr/share/syslinux/com32/include/syslinux/bootrm.h #usr/share/syslinux/com32/include/syslinux/config.h +#usr/share/syslinux/com32/include/syslinux/debug.h #usr/share/syslinux/com32/include/syslinux/disk.h -#usr/share/syslinux/com32/include/syslinux/features.h +#usr/share/syslinux/com32/include/syslinux/firmware.h #usr/share/syslinux/com32/include/syslinux/idle.h #usr/share/syslinux/com32/include/syslinux/io.h #usr/share/syslinux/com32/include/syslinux/keyboard.h @@ -164,27 +206,35 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/syslinux/pxe_api.h #usr/share/syslinux/com32/include/syslinux/reboot.h #usr/share/syslinux/com32/include/syslinux/resolve.h +#usr/share/syslinux/com32/include/syslinux/sysappend.h +#usr/share/syslinux/com32/include/syslinux/version.h #usr/share/syslinux/com32/include/syslinux/vesacon.h #usr/share/syslinux/com32/include/syslinux/video.h #usr/share/syslinux/com32/include/syslinux/zio.h +#usr/share/syslinux/com32/include/tftp.h #usr/share/syslinux/com32/include/time.h #usr/share/syslinux/com32/include/tinyjpeg.h #usr/share/syslinux/com32/include/unistd.h +#usr/share/syslinux/com32/include/upload_backend.h #usr/share/syslinux/com32/include/zconf.h #usr/share/syslinux/com32/include/zlib.h -#usr/share/syslinux/com32/libcom32.a -#usr/share/syslinux/com32/libcom32gpl.a #usr/share/syslinux/com32/libcom32upload.a -#usr/share/syslinux/com32/libutil_com.a +#usr/share/syslinux/com32/libgpl.c32 #usr/share/syslinux/com32/libutil_lnx.a #usr/share/syslinux/config.c32 +#usr/share/syslinux/cptime.c32 +#usr/share/syslinux/cpu.c32 #usr/share/syslinux/cpuid.c32 #usr/share/syslinux/cpuidtest.c32 +#usr/share/syslinux/debug.c32 +#usr/share/syslinux/dhcp.c32 #usr/share/syslinux/diag #usr/share/syslinux/diag/geodsp1s.img.xz #usr/share/syslinux/diag/geodspms.img.xz #usr/share/syslinux/diag/handoff.bin +#usr/share/syslinux/dir.c32 #usr/share/syslinux/disk.c32 +#usr/share/syslinux/dmi.c32 #usr/share/syslinux/dmitest.c32 #usr/share/syslinux/dosutil #usr/share/syslinux/dosutil/copybs.com @@ -197,15 +247,13 @@ usr/bin/isohybrid #usr/share/syslinux/gptmbr_c.bin #usr/share/syslinux/gptmbr_f.bin #usr/share/syslinux/gpxecmd.c32 -#usr/share/syslinux/gpxelinux.0 -#usr/share/syslinux/gpxelinuxk.0 #usr/share/syslinux/hdt.c32 +#usr/share/syslinux/hexdump.c32 #usr/share/syslinux/host.c32 #usr/share/syslinux/ifcpu.c32 #usr/share/syslinux/ifcpu64.c32 #usr/share/syslinux/ifmemdsk.c32 #usr/share/syslinux/ifplop.c32 -#usr/share/syslinux/int18.com #usr/share/syslinux/isohdpfx.bin #usr/share/syslinux/isohdpfx_c.bin #usr/share/syslinux/isohdpfx_f.bin @@ -216,7 +264,15 @@ usr/bin/isohybrid #usr/share/syslinux/isolinux.bin #usr/share/syslinux/kbdmap.c32 #usr/share/syslinux/kontron_wdt.c32 +#usr/share/syslinux/ldlinux.c32 +#usr/share/syslinux/lfs.c32 +#usr/share/syslinux/libcom32.c32 +#usr/share/syslinux/libgpl.c32 +#usr/share/syslinux/liblua.c32 +#usr/share/syslinux/libmenu.c32 +#usr/share/syslinux/libutil.c32 #usr/share/syslinux/linux.c32 +#usr/share/syslinux/lpxelinux.0 #usr/share/syslinux/ls.c32 #usr/share/syslinux/lua.c32 #usr/share/syslinux/mboot.c32 @@ -224,15 +280,14 @@ usr/bin/isohybrid #usr/share/syslinux/mbr_c.bin #usr/share/syslinux/mbr_f.bin #usr/share/syslinux/memdisk -#usr/share/syslinux/memdump.com #usr/share/syslinux/meminfo.c32 #usr/share/syslinux/menu.c32 +#usr/share/syslinux/pci.c32 #usr/share/syslinux/pcitest.c32 #usr/share/syslinux/pmload.c32 -#usr/share/syslinux/poweroff.com +#usr/share/syslinux/poweroff.c32 #usr/share/syslinux/prdhcp.c32 #usr/share/syslinux/pwd.c32 -#usr/share/syslinux/pxechain.com #usr/share/syslinux/pxechn.c32 #usr/share/syslinux/pxelinux.0 #usr/share/syslinux/reboot.c32 @@ -240,10 +295,9 @@ usr/bin/isohybrid #usr/share/syslinux/sanboot.c32 #usr/share/syslinux/sdi.c32 #usr/share/syslinux/sysdump.c32 +#usr/share/syslinux/syslinux.c32 #usr/share/syslinux/syslinux.com -#usr/share/syslinux/syslinux.exe -#usr/share/syslinux/syslinux64.exe -#usr/share/syslinux/ver.com +#usr/share/syslinux/vesa.c32 #usr/share/syslinux/vesainfo.c32 #usr/share/syslinux/vesamenu.c32 #usr/share/syslinux/vpdtest.c32 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 July 2018