IPFire-SCM May 2016

ipfire-scm@lists.ipfire.org

1 participants
29 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3fcc9b67fc7ab1886244a647dd7cf98f00e5c555
by git＠ipfire.org 18 May '16

18 May '16

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 3fcc9b67fc7ab1886244a647dd7cf98f00e5c555 (commit) via 691b2836c0ffa54b3f7fc8d6f3b98377b3c9a470 (commit) via 6113575d81201591b2e8a76520579a4e7b7c5d46 (commit) from e93a0b06fe1c55c41ce24c33449f16f4ce5e5c53 (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 3fcc9b67fc7ab1886244a647dd7cf98f00e5c555 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 18 16:17:21 2016 +0100 squid: Fix indentation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 691b2836c0ffa54b3f7fc8d6f3b98377b3c9a470 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed May 18 16:16:12 2016 +0100 squid: Kill redirector processes only after squid has stopped Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 6113575d81201591b2e8a76520579a4e7b7c5d46 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue May 17 21:33:24 2016 +0200 squid: Rework initscript The initscript now takes care that the squid proxy server process is properly shut down. If that fails, it will remove the cache index and let it be recreated at the next start. A warning is shown to the user. The "flush" command will now remove the entire proxy cache. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/initscripts/init.d/squid | 68 +++++++++++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 26 deletions(-) Difference in files: diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index abed90a..7255c0a 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -92,38 +92,55 @@ case "$1" in ;; stop) - iptables -t nat -F SQUID + iptables -t nat -F SQUID + if [ -e /var/run/squid.pid ]; then - boot_mesg "Stopping Squid Proxy Server..." + boot_mesg -n "Stopping Squid Proxy Server (this may take up to a few minutes)..." squid -k shutdown >/dev/null 2>&1 - evaluate_retval - # Stop squidGuard, updxlrator, squidclamav - # and redirect_wrappers. + # If some squid processes are still running, wait up to 360 seconds + # before we go on to kill the remaining process(es) and delete damaged + # '/var/log/cache/swap.state'. + n=0 + while squid -k check &>/dev/null && [ $n -lt 360 ]; do + # Print a dot every 6 seconds + [ $(( ${n} % 6 )) -eq 0 ] && boot_mesg -n . + + n=$(( ${n} + 1 )) + sleep 1 + done + boot_mesg "" # end line + + # If (squid-1) is still running, kill all squid processes + if squid -k check &>/dev/null || pgrep -fl "(squid-1)" >/dev/null 2>&1; then + killproc /usr/sbin/squid >/dev/null + echo_failure + + # Remove damaged journal of cache index + rm -f /var/log/cache/swap.state + + boot_mesg -n "WARNING: squid could not be gracefully shut down." ${WARNING} + boot_mesg -n " The cache index was damaged and has been removed." + boot_mesg -n " The cache data has not been lost and the index will be" + boot_mesg -n " recreated at the next start." + boot_mesg "" ${NORMAL} + echo_warning + else + logger -t squid "squid shutdown time: ${n} seconds" + + echo_ok + fi + + # Kill any redirector processes that might have been left running killproc /usr/bin/squidGuard >/dev/null & killproc /usr/sbin/updxlrator >/dev/null & killproc /usr/bin/squidclamav >/dev/null & killproc /usr/sbin/redirect_wrapper >/dev/null & - - # Wait until all redirectors have been stopped. wait - - # If squid is still running, wait up to 30 seconds - # before we go on to kill it. - counter=30 - - while [ ${counter} -gt 0 ]; do - statusproc /usr/sbin/squid >/dev/null && break; - sleep 1 - counter=$(( ${counter} - 1)) - done - - # Kill squid service, if still running. - killproc /usr/sbin/squid >/dev/null - - # Trash remain pid file from squid. - rm -rf /var/run/squid.pid fi + + # Trash remain pid file from squid. + rm -f /var/run/squid.pid ;; restart) @@ -133,7 +150,7 @@ case "$1" in ;; reconfigure) - /usr/sbin/squid -k reconfigure + /usr/sbin/squid -k reconfigure ;; status) @@ -143,8 +160,7 @@ case "$1" in flush) $0 stop - echo > /var/log/cache/swap.state - chown squid.squid /var/log/cache/swap.state + rm -rf /var/log/cache/* sleep 1 $0 start ;; hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e93a0b06fe1c55c41ce24c33449f16f4ce5e5c53
by git＠ipfire.org 17 May '16

17 May '16

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 e93a0b06fe1c55c41ce24c33449f16f4ce5e5c53 (commit) via a1a05a444ffa2064bc15533165a3d3bac369a887 (commit) via cdd422b561fcd8d2fa3bd229ae4f78def24a6df5 (commit) from e5158aea0a6ea2be4e4da3b3b7b02bf78e13be48 (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 e93a0b06fe1c55c41ce24c33449f16f4ce5e5c53 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sat May 7 16:16:35 2016 +0200 Replace portmap with rpcbind Portmap is not maintained anymore that's why it is replaced by rpcbind. Rpcbind provides also rpcinfo which is quite useful for debugging. Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit a1a05a444ffa2064bc15533165a3d3bac369a887 Author: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Date: Sat May 7 16:16:34 2016 +0200 New package libtirpc libtirpc is a dependency of rpcbind Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cdd422b561fcd8d2fa3bd229ae4f78def24a6df5 Author: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Date: Fri May 13 17:50:57 2016 +0200 7zip: update to 15.14.1 Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- config/rootfiles/packages/7zip | 1 + config/rootfiles/packages/libtirpc | 61 ++++++++++++++++ config/rootfiles/packages/portmap | 7 -- config/rootfiles/packages/rpcbind | 5 ++ lfs/7zip | 6 +- lfs/{nmap => libtirpc} | 12 +-- lfs/nfs | 2 +- lfs/portmap | 85 ---------------------- lfs/{spice-protocol => rpcbind} | 17 +++-- make.sh | 3 +- src/initscripts/init.d/portmap | 38 ---------- src/initscripts/init.d/{stunnel => rpcbind} | 25 ++++--- src/paks/portmap/install.sh | 29 -------- src/paks/portmap/uninstall.sh | 27 ------- src/paks/{default => rpcbind}/install.sh | 8 +- src/paks/{cups => rpcbind}/uninstall.sh | 2 +- src/paks/{portmap => rpcbind}/update.sh | 0 .../rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch | 48 ++++++++++++ 21 files changed, 163 insertions(+), 219 deletions(-) create mode 100644 config/rootfiles/packages/libtirpc delete mode 100644 config/rootfiles/packages/portmap create mode 100644 config/rootfiles/packages/rpcbind copy lfs/{nmap => libtirpc} (92%) delete mode 100644 lfs/portmap copy lfs/{spice-protocol => rpcbind} (85%) delete mode 100644 src/initscripts/init.d/portmap copy src/initscripts/init.d/{stunnel => rpcbind} (50%) delete mode 100644 src/paks/portmap/install.sh delete mode 100644 src/paks/portmap/uninstall.sh copy src/paks/{default => rpcbind}/install.sh (85%) copy src/paks/{cups => rpcbind}/uninstall.sh (98%) rename src/paks/{portmap => rpcbind}/update.sh (100%) create mode 100644 src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index b827b1c..bc253c0 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -103,13 +103,13 @@ etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut #etc/rc.d/init.d/openvmtools etc/rc.d/init.d/partresize -#etc/rc.d/init.d/portmap #etc/rc.d/init.d/postfix #etc/rc.d/init.d/pound etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd +#etc/rc.d/init.d/rpcbind #etc/rc.d/init.d/rtpproxy #etc/rc.d/init.d/samba #etc/rc.d/init.d/sane diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 0976fe5..f1024a2 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -104,13 +104,13 @@ etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut #etc/rc.d/init.d/openvmtools etc/rc.d/init.d/partresize -#etc/rc.d/init.d/portmap #etc/rc.d/init.d/postfix #etc/rc.d/init.d/pound etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd +#etc/rc.d/init.d/rpcbind #etc/rc.d/init.d/rtpproxy #etc/rc.d/init.d/samba #etc/rc.d/init.d/sane diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index 0976fe5..f1024a2 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -104,13 +104,13 @@ etc/rc.d/init.d/ntp #etc/rc.d/init.d/nut #etc/rc.d/init.d/openvmtools etc/rc.d/init.d/partresize -#etc/rc.d/init.d/portmap #etc/rc.d/init.d/postfix #etc/rc.d/init.d/pound etc/rc.d/init.d/random etc/rc.d/init.d/rc etc/rc.d/init.d/reboot etc/rc.d/init.d/rngd +#etc/rc.d/init.d/rpcbind #etc/rc.d/init.d/rtpproxy #etc/rc.d/init.d/samba #etc/rc.d/init.d/sane diff --git a/config/rootfiles/packages/7zip b/config/rootfiles/packages/7zip index 15d9515..a49dee7 100644 --- a/config/rootfiles/packages/7zip +++ b/config/rootfiles/packages/7zip @@ -3,6 +3,7 @@ usr/local/lib/p7zip #usr/local/lib/p7zip/7z #usr/local/lib/p7zip/7z.so #usr/local/lib/p7zip/Codecs +usr/local/lib/p7zip/Codecs/Rar.so #usr/local/lib/p7zip/Codecs/Rar29.so #usr/local/man/man1/7z.1 #usr/local/man/man1/7za.1 diff --git a/config/rootfiles/packages/libtirpc b/config/rootfiles/packages/libtirpc new file mode 100644 index 0000000..e197563 --- /dev/null +++ b/config/rootfiles/packages/libtirpc @@ -0,0 +1,61 @@ +etc/netconfig +#usr/include/tirpc +#usr/include/tirpc/netconfig.h +#usr/include/tirpc/rpc +#usr/include/tirpc/rpc/auth.h +#usr/include/tirpc/rpc/auth_des.h +#usr/include/tirpc/rpc/auth_unix.h +#usr/include/tirpc/rpc/clnt.h +#usr/include/tirpc/rpc/clnt_soc.h +#usr/include/tirpc/rpc/clnt_stat.h +#usr/include/tirpc/rpc/des.h +#usr/include/tirpc/rpc/des_crypt.h +#usr/include/tirpc/rpc/key_prot.h +#usr/include/tirpc/rpc/nettype.h +#usr/include/tirpc/rpc/pmap_clnt.h +#usr/include/tirpc/rpc/pmap_prot.h +#usr/include/tirpc/rpc/pmap_rmt.h +#usr/include/tirpc/rpc/raw.h +#usr/include/tirpc/rpc/rpc.h +#usr/include/tirpc/rpc/rpc_com.h +#usr/include/tirpc/rpc/rpc_msg.h +#usr/include/tirpc/rpc/rpcb_clnt.h +#usr/include/tirpc/rpc/rpcb_prot.h +#usr/include/tirpc/rpc/rpcb_prot.x +#usr/include/tirpc/rpc/rpcent.h +#usr/include/tirpc/rpc/svc.h +#usr/include/tirpc/rpc/svc_auth.h +#usr/include/tirpc/rpc/svc_dg.h +#usr/include/tirpc/rpc/svc_mt.h +#usr/include/tirpc/rpc/svc_soc.h +#usr/include/tirpc/rpc/types.h +#usr/include/tirpc/rpc/xdr.h +#usr/include/tirpc/rpcsvc +#usr/include/tirpc/rpcsvc/crypt.h +#usr/include/tirpc/rpcsvc/crypt.x +#usr/lib/libtirpc.a +#usr/lib/libtirpc.la +#usr/lib/libtirpc.so +usr/lib/libtirpc.so.3 +usr/lib/libtirpc.so.3.0.0 +#usr/lib/pkgconfig/libtirpc.pc +#usr/share/man/man3/bindresvport.3t +#usr/share/man/man3/des_crypt.3t +#usr/share/man/man3/getnetconfig.3t +#usr/share/man/man3/getnetpath.3t +#usr/share/man/man3/getrpcent.3t +#usr/share/man/man3/getrpcport.3t +#usr/share/man/man3/rpc.3t +#usr/share/man/man3/rpc_clnt_auth.3t +#usr/share/man/man3/rpc_clnt_calls.3t +#usr/share/man/man3/rpc_clnt_create.3t +#usr/share/man/man3/rpc_secure.3t +#usr/share/man/man3/rpc_soc.3t +#usr/share/man/man3/rpc_svc_calls.3t +#usr/share/man/man3/rpc_svc_create.3t +#usr/share/man/man3/rpc_svc_err.3t +#usr/share/man/man3/rpc_svc_reg.3t +#usr/share/man/man3/rpc_xdr.3t +#usr/share/man/man3/rpcbind.3t +#usr/share/man/man3/rtime.3t +#usr/share/man/man5/netconfig.5 diff --git a/config/rootfiles/packages/portmap b/config/rootfiles/packages/portmap deleted file mode 100644 index 4b60d64..0000000 --- a/config/rootfiles/packages/portmap +++ /dev/null @@ -1,7 +0,0 @@ -etc/rc.d/init.d/portmap -sbin/portmap -#sbin/pmap_dump -#sbin/pmap_set -#usr/share/man/man8/pmap_dump.8 -#usr/share/man/man8/pmap_set.8 -#usr/share/man/man8/portmap.8 diff --git a/config/rootfiles/packages/rpcbind b/config/rootfiles/packages/rpcbind new file mode 100644 index 0000000..5270207 --- /dev/null +++ b/config/rootfiles/packages/rpcbind @@ -0,0 +1,5 @@ +etc/rc.d/init.d/rpcbind +sbin/rpcbind +sbin/rpcinfo +#usr/share/man/man8/rpcbind.8 +#usr/share/man/man8/rpcinfo.8 diff --git a/lfs/7zip b/lfs/7zip index f8ac672..e3ac3b3 100644 --- a/lfs/7zip +++ b/lfs/7zip @@ -24,7 +24,7 @@ include Config -VER = 9.38.1 +VER = 15.14.1 THISAPP = p7zip_$(VER) DL_FILE = $(THISAPP)_src_all.tar.bz2 @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = 7zip -PAK_VER = 4 +PAK_VER = 5 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 6cba8402ccab2370d3b70c5e28b3d651 +$(DL_FILE)_MD5 = 92cca093312b5a71a7be7dc7d1d32509 install : $(TARGET) diff --git a/lfs/libtirpc b/lfs/libtirpc new file mode 100644 index 0000000..382d7e5 --- /dev/null +++ b/lfs/libtirpc @@ -0,0 +1,84 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.0.1 + +THISAPP = libtirpc-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = libtirpc +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 36ce1c0ff80863bb0839d54aa0b94014 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-gssapi --disable-ipv6 + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/nfs b/lfs/nfs index b6cef7b..ee9b3a0 100644 --- a/lfs/nfs +++ b/lfs/nfs @@ -34,7 +34,7 @@ TARGET = $(DIR_INFO)/$(THISAPP) PROG = nfs PAK_VER = 7 -DEPS = "portmap" +DEPS = "rpcbind" LIBNFSIDMAP = 0.25 diff --git a/lfs/portmap b/lfs/portmap deleted file mode 100644 index c903547..0000000 --- a/lfs/portmap +++ /dev/null @@ -1,85 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 6.0 - -THISAPP = portmap_$(VER) -DL_FILE = $(THISAPP).tgz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = portmap -PAK_VER = 2 - -DEPS = "" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = ac108ab68bf0f34477f8317791aaf1ff - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvfz $(DIR_DL)/$(DL_FILE) -# cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/portmap-5beta-compilation_fixes-3.patch -# cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/portmap-5beta-glibc_errno_fix-1.patch - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/rpcbind b/lfs/rpcbind new file mode 100644 index 0000000..d9e2885 --- /dev/null +++ b/lfs/rpcbind @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.2.3 + +THISAPP = rpcbind-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = rpcbind +PAK_VER = 1 + +DEPS = "libtirpc" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = c8875246b2688a1adfbd6ad43480278d + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -i "/servname/s:rpcbind:sunrpc:" src/rpcbind.c + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch + cd $(DIR_APP) && ./configure --prefix=/usr --bindir=/sbin --with-rpcuser=root --without-systemdsystemunitdir --disable-ipv6 + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) + cd $(DIR_APP) && make install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index fee4edd..3293fd8 100755 --- a/make.sh +++ b/make.sh @@ -678,7 +678,8 @@ buildipfire() { ipfiremake tcpwrapper ipfiremake libevent ipfiremake libevent2 - ipfiremake portmap + ipfiremake libtirpc + ipfiremake rpcbind ipfiremake nfs ipfiremake gnu-netcat ipfiremake ncat diff --git a/src/initscripts/init.d/portmap b/src/initscripts/init.d/portmap deleted file mode 100644 index 00516a2..0000000 --- a/src/initscripts/init.d/portmap +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Begin $rc_base/init.d/portmap - -#$LastChangedBy: bdubbs $ -#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $ - -. /etc/sysconfig/rc -. $rc_functions - -case "$1" in - start) - boot_mesg "Starting RPC Portmap" - loadproc /sbin/portmap - ;; - - stop) - boot_mesg "Stopping Portmap" - killproc /sbin/portmap - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - status) - statusproc /sbin/portmap - ;; - - *) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 - ;; - -esac - -# End $rc_base/init.d/portmap diff --git a/src/initscripts/init.d/rpcbind b/src/initscripts/init.d/rpcbind new file mode 100644 index 0000000..7216acd --- /dev/null +++ b/src/initscripts/init.d/rpcbind @@ -0,0 +1,46 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/rpcbind +# +# Description : rpcbind init script +# +# Authors : Jonatan Schlag jonatan.schlag(a)ipfire.org +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. $rc_functions + +case "$1" in + start) + boot_mesg "Starting rpcbind" + loadproc /sbin/rpcbind + ;; + + stop) + boot_mesg "Stopping rpcbind" + killproc /sbin/rpcbind + ;; + + restart) + $0 stop + sleep 1 + $0 start + ;; + + status) + statusproc /sbin/rpcbind + ;; + + *) + echo "Usage: $0 {start|stop|restart|status}" + exit 1 + ;; + +esac + +# End $rc_base/init.d/rpcbind diff --git a/src/paks/portmap/install.sh b/src/paks/portmap/install.sh deleted file mode 100644 index 6c391d6..0000000 --- a/src/paks/portmap/install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -start_service --background ${NAME} -ln -sf ../init.d/portmap /etc/rc.d/rc0.d/K49portmap -ln -sf ../init.d/portmap /etc/rc.d/rc3.d/S22portmap -ln -sf ../init.d/portmap /etc/rc.d/rc6.d/K49portmap diff --git a/src/paks/portmap/uninstall.sh b/src/paks/portmap/uninstall.sh deleted file mode 100644 index 12ecada..0000000 --- a/src/paks/portmap/uninstall.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} -remove_files -rm -rf /etc/rc.d/rc*.d/*portmap diff --git a/src/paks/portmap/update.sh b/src/paks/portmap/update.sh deleted file mode 100644 index 89c40d0..0000000 --- a/src/paks/portmap/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh diff --git a/src/paks/rpcbind/install.sh b/src/paks/rpcbind/install.sh new file mode 100644 index 0000000..e523183 --- /dev/null +++ b/src/paks/rpcbind/install.sh @@ -0,0 +1,33 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +# remove portmap +/etc/init.d/portmap stop +rm -rf /etc/rc.d/rc*.d/*portmap /sbin/portmap /etc/rc.d/init.d/portmap +# install rpcbind +extract_files +start_service --background ${NAME} +ln -sf ../init.d/rpcbind /etc/rc.d/rc0.d/K49rpcbind +ln -sf ../init.d/rpcbind /etc/rc.d/rc3.d/S22rpcbind +ln -sf ../init.d/rpcbind /etc/rc.d/rc6.d/K49rpcbind diff --git a/src/paks/rpcbind/uninstall.sh b/src/paks/rpcbind/uninstall.sh new file mode 100644 index 0000000..e705c8c --- /dev/null +++ b/src/paks/rpcbind/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +remove_files +rm -rf /etc/rc.d/rc*.d/*rpcbind diff --git a/src/paks/rpcbind/update.sh b/src/paks/rpcbind/update.sh new file mode 100644 index 0000000..89c40d0 --- /dev/null +++ b/src/paks/rpcbind/update.sh @@ -0,0 +1,26 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh diff --git a/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch b/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch new file mode 100644 index 0000000..bdf73a3 --- /dev/null +++ b/src/patches/rpcbind/rpcbind-0.2.3-tirpc_fix-1.patch @@ -0,0 +1,48 @@ +Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org> +Date: 2015-11-29 +Initial Package Version: 0.2.3 +Upstream Status: Already in upstream git repository +Origin: Upstream +Description: This patch fixes rpcbind to be able to build with + recent tirpc versions. + +From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 +From: Steve Dickson <steved(a)redhat.com> +Date: Mon, 2 Nov 2015 17:05:18 -0500 +Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly + +In the latest libtirpc version to access the xp_auth +one must use the SVC_XP_AUTH macro. To be backwards +compatible a couple ifdefs were added to use the +macro when it exists. + +Signed-off-by: Steve Dickson <steved(a)redhat.com> +--- + src/rpcb_svc_com.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c +index 4ae93f1..22d6c84 100644 +--- a/src/rpcb_svc_com.c ++++ b/src/rpcb_svc_com.c +@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) + a.rmt_localvers = fi->versnum; + + xprt_set_caller(xprt, fi); ++#if defined(SVC_XP_AUTH) ++ SVC_XP_AUTH(xprt) = svc_auth_none; ++#else + xprt->xp_auth = &svc_auth_none; ++#endif + svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); ++#if !defined(SVC_XP_AUTH) + SVCAUTH_DESTROY(xprt->xp_auth); + xprt->xp_auth = NULL; ++#endif ++ + done: + if (buffer) + free(buffer); +-- +1.8.2.1 + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e5158aea0a6ea2be4e4da3b3b7b02bf78e13be48
by git＠ipfire.org 16 May '16

16 May '16

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 e5158aea0a6ea2be4e4da3b3b7b02bf78e13be48 (commit) via c00aeae80ff74313ad4db74595c187556c2812c8 (commit) via 3f877ebd251ac7e804f89adef5daf1a80e582747 (commit) via 4d36732fe23a15cd79ca7dcd8f0ea21975c6a75c (commit) via 15f37d7738ebb756090d30762fbea780ea32bbf8 (commit) via bb91c2f74439495a7fd4a62337dc7f41386fa42a (commit) from ef553dccc8462355389450913d5485e40814f266 (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 e5158aea0a6ea2be4e4da3b3b7b02bf78e13be48 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon May 16 18:02:03 2016 +0100 core103: Ship updated dnsmasq Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c00aeae80ff74313ad4db74595c187556c2812c8 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun May 15 13:29:54 2016 +0200 dnsmasq: Update to 2.76rc2 - Updated to 2.76rc2 and deleted obsolete patch files from 2.76rc1 Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 3f877ebd251ac7e804f89adef5daf1a80e582747 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri May 13 19:06:10 2016 +0200 dnsmasq: Update to 2.76rc1 - added latest patches (001-002) Update, added latest patches and deleted obsolete patch files. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4d36732fe23a15cd79ca7dcd8f0ea21975c6a75c Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Thu May 5 19:54:42 2016 +0200 dnsmasq: Update to 2.76test13 with latest patches (001-006) Update from 'dnsmasq 2.76test10' to '2.76test13' Includes latest patches (001-006) from upstream. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 15f37d7738ebb756090d30762fbea780ea32bbf8 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sun May 15 23:19:46 2016 +0200 procps: Update to 3.2.8 For details see: http://procps.sourceforge.net/changelog.html Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit bb91c2f74439495a7fd4a62337dc7f41386fa42a Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat May 14 19:17:03 2016 +0200 squid init: small cosmetic fixes - Deleted a few absolutely unneeded tabs. - Inserted/deleted some needed/unnecessary line breaks. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/procps | 2 +- .../{oldcore/96 => core/103}/filelists/dnsmasq | 0 config/rootfiles/core/103/update.sh | 3 +- lfs/dnsmasq | 9 +- lfs/procps | 6 +- src/initscripts/init.d/squid | 18 +- ...q-Add-support-to-read-ISC-DHCP-lease-file.patch | 23 +- ...TL_parameter_to_--host-record_and_--cname.patch | 265 --------------------- .../dnsmasq/002-Add_--dhcp-ttl_option.patch | 117 --------- src/patches/dnsmasq/003-Update_CHANGELOG.patch | 17 -- .../dnsmasq/004-Add_--tftp-mtu_option.patch | 136 ----------- ...ease_length_to_TTL_when_--dhcp-ttl_in_use.patch | 37 --- ...tch => procps-3.2.8-fix_unknown_HZ_value.patch} | 2 +- 13 files changed, 36 insertions(+), 599 deletions(-) copy config/rootfiles/{oldcore/96 => core/103}/filelists/dnsmasq (100%) delete mode 100644 src/patches/dnsmasq/001-Add_TTL_parameter_to_--host-record_and_--cname.patch delete mode 100644 src/patches/dnsmasq/002-Add_--dhcp-ttl_option.patch delete mode 100644 src/patches/dnsmasq/003-Update_CHANGELOG.patch delete mode 100644 src/patches/dnsmasq/004-Add_--tftp-mtu_option.patch delete mode 100644 src/patches/dnsmasq/005-Apply_ceiling_of_lease_length_to_TTL_when_--dhcp-ttl_in_use.patch rename src/patches/{procps-3.2.6-fix_unknown_HZ_value.patch => procps-3.2.8-fix_unknown_HZ_value.patch} (98%) Difference in files: diff --git a/config/rootfiles/common/procps b/config/rootfiles/common/procps index 2863167..1f32be9 100644 --- a/config/rootfiles/common/procps +++ b/config/rootfiles/common/procps @@ -1,6 +1,6 @@ bin/kill bin/ps -lib/libproc-3.2.6.so +lib/libproc-3.2.8.so sbin/sysctl usr/bin/free usr/bin/pgrep diff --git a/config/rootfiles/core/103/filelists/dnsmasq b/config/rootfiles/core/103/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/core/103/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/core/103/update.sh index 2c1d0ab..65a85a2 100644 --- a/config/rootfiles/core/103/update.sh +++ b/config/rootfiles/core/103/update.sh @@ -56,9 +56,8 @@ ldconfig # Update Language cache #/usr/local/bin/update-lang-cache -# # Start services -# +/etc/init.d/dnsmasq restart sync # This update need a reboot... diff --git a/lfs/dnsmasq b/lfs/dnsmasq index 84585c1..7d09e6c 100644 --- a/lfs/dnsmasq +++ b/lfs/dnsmasq @@ -24,7 +24,7 @@ include Config -VER = 2.76test10 +VER = 2.76rc2 THISAPP = dnsmasq-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -43,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4b51474ed6081b18c61407077f254cf7 +$(DL_FILE)_MD5 = 1d5b834803a44e806f2865877574fe47 install : $(TARGET) @@ -73,11 +73,6 @@ $(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/dnsmasq/001-Add_TTL_parameter_to_--host-record_and_--cname.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/002-Add_--dhcp-ttl_option.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/003-Update_CHANGELOG.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/004-Add_--tftp-mtu_option.patch - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq/005-Apply_ceiling_of_lease_length_to_TTL_when_--dhcp-ttl_in_use.patch cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch cd $(DIR_APP) && sed -i src/config.h \ diff --git a/lfs/procps b/lfs/procps index ae30f2f..183a95c 100644 --- a/lfs/procps +++ b/lfs/procps @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2016 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 3.2.6 +VER = 3.2.8 THISAPP = procps-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 7ce39ea27d7b3da0e8ad74dd41d06783 +$(DL_FILE)_MD5 = 9532714b6846013ca9898984ba4cd7e0 install : $(TARGET) diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index c641c7d..abed90a 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -33,16 +33,16 @@ transparent() { CONN_TYPE=`echo "$LINE" | awk -F, '{ print $5 }'` if [ "$CONN_TYPE" != "net" ]; then continue - fi - iptables -t nat -A SQUID -i $1 -p tcp -d `echo "$LINE" | awk -F, '{ print $13 }'` --dport 80 -j RETURN + fi + iptables -t nat -A SQUID -i $1 -p tcp -d `echo "$LINE" | awk -F, '{ print $13 }'` --dport 80 -j RETURN done < $FILE - + if [ "$RED_TYPE" == "STATIC" ]; then iptables -t nat -A SQUID -i $1 -p tcp -d $RED_NETADDRESS/$RED_NETMASK --dport 80 -j RETURN fi - + iptables -t nat -A SQUID -i $1 -p tcp -d $LOCALIP --dport 80 -j RETURN - + iptables -t nat -A SQUID -i $1 -p tcp --dport 80 -j REDIRECT --to-port "${TRANSPARENT_PORT}" } @@ -57,7 +57,6 @@ case "$1" in exit fi - eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings) eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) @@ -100,7 +99,7 @@ case "$1" in evaluate_retval # Stop squidGuard, updxlrator, squidclamav - # and redirect_wrappers. + # and redirect_wrappers. killproc /usr/bin/squidGuard >/dev/null & killproc /usr/sbin/updxlrator >/dev/null & killproc /usr/bin/squidclamav >/dev/null & @@ -123,7 +122,7 @@ case "$1" in killproc /usr/sbin/squid >/dev/null # Trash remain pid file from squid. - rm -rf /var/run/squid.pid + rm -rf /var/run/squid.pid fi ;; @@ -141,7 +140,7 @@ case "$1" in statusproc /usr/sbin/squid statusproc /usr/lib/squid/unlinkd ;; - + flush) $0 stop echo > /var/log/cache/swap.state @@ -149,6 +148,7 @@ case "$1" in sleep 1 $0 start ;; + setperms) chown -R nobody.squid /var/updatecache/ ;; diff --git a/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch b/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch index 703e94f..25feb8d 100644 --- a/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch +++ b/src/patches/dnsmasq-Add-support-to-read-ISC-DHCP-lease-file.patch @@ -42,7 +42,7 @@ --- a/src/dnsmasq.c Thu Jul 30 20:59:06 2015 +++ b/src/dnsmasq.c Wed Dec 16 19:38:32 2015 -@@ -1013,6 +1013,11 @@ +@@ -1016,6 +1016,11 @@ poll_resolv(0, daemon->last_resolv != 0, now); daemon->last_resolv = now; @@ -72,7 +72,7 @@ - --- /dev/null Wed Dec 16 19:48:08 2015 +++ b/src/isc.c Wed Dec 16 19:41:35 2015 -@@ -0,0 +1,251 @@ +@@ -0,0 +1,266 @@ +/* dnsmasq is Copyright (c) 2014 John Volpe, Simon Kelley and + Michael Tremer + @@ -94,6 +94,12 @@ + Michael Tremer. +*/ + ++ ++#define _GNU_SOURCE ++ ++#include <assert.h> ++#include <stdio.h> ++ +#include "dnsmasq.h" + +#ifdef HAVE_ISC_READER @@ -109,10 +115,18 @@ + +static struct isc_dhcp_lease* dhcp_lease_new(const char* hostname) { + struct isc_dhcp_lease* lease = whine_malloc(sizeof(*lease)); ++ if (!lease) ++ return NULL; + + lease->name = strdup(hostname); + if (daemon->domain_suffix) { -+ asprintf(&lease->fqdn, "%s.%s", hostname, daemon->domain_suffix); ++ int r = asprintf(&lease->fqdn, "%s.%s", hostname, daemon->domain_suffix); ++ ++ // Handle OOM ++ if (r < 0) { ++ free(lease); ++ return NULL; ++ } + } + lease->expires = 0; + lease->next = NULL; @@ -285,6 +299,7 @@ + // and append it to the list. + if (!lease) { + lease = dhcp_lease_new(hostname); ++ assert(lease); + + lease->next = leases; + leases = lease; @@ -326,7 +341,7 @@ +#endif --- a/src/option.c Wed Dec 16 19:24:12 2015 +++ b/src/option.c Wed Dec 16 19:42:48 2015 -@@ -1769,7 +1769,7 @@ +@@ -1770,7 +1770,7 @@ ret_err(_("bad MX target")); break; diff --git a/src/patches/dnsmasq/001-Add_TTL_parameter_to_--host-record_and_--cname.patch b/src/patches/dnsmasq/001-Add_TTL_parameter_to_--host-record_and_--cname.patch deleted file mode 100644 index 86fbc9c..0000000 --- a/src/patches/dnsmasq/001-Add_TTL_parameter_to_--host-record_and_--cname.patch +++ /dev/null @@ -1,265 +0,0 @@ -From df3d54f776a3c9b60735b45c0b7fd88b66a2d5c4 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Wed, 24 Feb 2016 21:03:38 +0000 -Subject: [PATCH] Add TTL parameter to --host-record and --cname. - ---- - man/dnsmasq.8 | 12 ++++++++++-- - src/cache.c | 7 +++++++ - src/dnsmasq.h | 2 ++ - src/option.c | 46 ++++++++++++++++++++++++++++++++++++++-------- - src/rfc1035.c | 6 +++++- - 5 files changed, 62 insertions(+), 11 deletions(-) - -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index b782eaf..7bc1394 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -529,7 +529,7 @@ zone files: the port, weight and priority numbers are in a different - order. More than one SRV record for a given service/domain is allowed, - all that match are returned. - .TP --.B --host-record=<name>[,<name>....],[<IPv4-address>],[<IPv6-address>] -+.B --host-record=<name>[,<name>....],[<IPv4-address>],[<IPv6-address>][,<TTL>] - Add A, AAAA and PTR records to the DNS. This adds one or more names to - the DNS with associated IPv4 (A) and IPv6 (AAAA) records. A name may - appear in more than one -@@ -546,6 +546,10 @@ is in effect. Short and long names may appear in the same - .B host-record, - eg. - .B --host-record=laptop,laptop.thekelleys.org,192.168.0.1,1234::100 -+ -+If the time-to-live is given, it overrides the default, which is zero -+or the value of --local-ttl. The value is a positive integer and gives -+the time-to-live in seconds. - .TP - .B \-Y, --txt-record=<name>[[,<text>],<text>] - Return a TXT DNS record. The value of TXT record is a set of strings, -@@ -559,7 +563,7 @@ Return a PTR DNS record. - .B --naptr-record=<name>,<order>,<preference>,<flags>,<service>,<regexp>[,<replacement>] - Return an NAPTR DNS record, as specified in RFC3403. - .TP --.B --cname=<cname>,<target> -+.B --cname=<cname>,<target>[,<TTL>] - Return a CNAME record which indicates that <cname> is really - <target>. There are significant limitations on the target; it must be a - DNS name which is known to dnsmasq from /etc/hosts (or additional -@@ -568,6 +572,10 @@ hosts files), from DHCP, from --interface-name or from another - If the target does not satisfy this - criteria, the whole cname is ignored. The cname must be unique, but it - is permissable to have more than one cname pointing to the same target. -+ -+If the time-to-live is given, it overrides the default, which is zero -+or the value of -local-ttl. The value is a positive integer and gives -+the time-to-live in seconds. - .TP - .B --dns-rr=<name>,<RR-number>,[<hex data>] - Return an arbitrary DNS Resource Record. The number is the type of the -diff --git a/src/cache.c b/src/cache.c -index a9eaa65..4ecd535 100644 ---- a/src/cache.c -+++ b/src/cache.c -@@ -778,6 +778,7 @@ static void add_hosts_cname(struct crec *target) - (crec = whine_malloc(sizeof(struct crec)))) - { - crec->flags = F_FORWARD | F_IMMORTAL | F_NAMEP | F_CONFIG | F_CNAME; -+ crec->ttd = a->ttl; - crec->name.namep = a->alias; - crec->addr.cname.target.cache = target; - crec->addr.cname.uid = target->uid; -@@ -981,6 +982,7 @@ int read_hostsfile(char *filename, unsigned int index, int cache_size, struct cr - strcat(cache->name.sname, "."); - strcat(cache->name.sname, domain_suffix); - cache->flags = flags; -+ cache->ttd = daemon->local_ttl; - add_hosts_entry(cache, &addr, addrlen, index, rhash, hashsz); - name_count++; - } -@@ -988,6 +990,7 @@ int read_hostsfile(char *filename, unsigned int index, int cache_size, struct cr - { - strcpy(cache->name.sname, canon); - cache->flags = flags; -+ cache->ttd = daemon->local_ttl; - add_hosts_entry(cache, &addr, addrlen, index, rhash, hashsz); - name_count++; - } -@@ -1057,6 +1060,7 @@ void cache_reload(void) - ((cache = whine_malloc(sizeof(struct crec))))) - { - cache->flags = F_FORWARD | F_NAMEP | F_CNAME | F_IMMORTAL | F_CONFIG; -+ cache->ttd = a->ttl; - cache->name.namep = a->alias; - cache->addr.cname.target.int_name = intr; - cache->addr.cname.uid = SRC_INTERFACE; -@@ -1071,6 +1075,7 @@ void cache_reload(void) - (cache->addr.ds.keydata = blockdata_alloc(ds->digest, ds->digestlen))) - { - cache->flags = F_FORWARD | F_IMMORTAL | F_DS | F_CONFIG | F_NAMEP; -+ cache->ttd = daemon->local_ttl; - cache->name.namep = ds->name; - cache->addr.ds.keylen = ds->digestlen; - cache->addr.ds.algo = ds->algo; -@@ -1095,6 +1100,7 @@ void cache_reload(void) - (cache = whine_malloc(sizeof(struct crec)))) - { - cache->name.namep = nl->name; -+ cache->ttd = hr->ttl; - cache->flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV4 | F_NAMEP | F_CONFIG; - add_hosts_entry(cache, (struct all_addr *)&hr->addr, INADDRSZ, SRC_CONFIG, (struct crec **)daemon->packet, revhashsz); - } -@@ -1103,6 +1109,7 @@ void cache_reload(void) - (cache = whine_malloc(sizeof(struct crec)))) - { - cache->name.namep = nl->name; -+ cache->ttd = hr->ttl; - cache->flags = F_HOSTS | F_IMMORTAL | F_FORWARD | F_REVERSE | F_IPV6 | F_NAMEP | F_CONFIG; - add_hosts_entry(cache, (struct all_addr *)&hr->addr6, IN6ADDRSZ, SRC_CONFIG, (struct crec **)daemon->packet, revhashsz); - } -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index 6d1c5ae..6344df5 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -308,6 +308,7 @@ struct ptr_record { - }; - - struct cname { -+ int ttl; - char *alias, *target; - struct cname *next; - }; -@@ -344,6 +345,7 @@ struct auth_zone { - - - struct host_record { -+ int ttl; - struct name_list { - char *name; - struct name_list *next; -diff --git a/src/option.c b/src/option.c -index c98bdc9..7c5e6bc 100644 ---- a/src/option.c -+++ b/src/option.c -@@ -448,20 +448,20 @@ static struct { - { LOPT_GEN_NAMES, ARG_DUP, "[=tag:<tag>]", gettext_noop("Generate hostnames based on MAC address for nameless clients."), NULL}, - { LOPT_PROXY, ARG_DUP, "[=<ipaddr>]...", gettext_noop("Use these DHCP relays as full proxies."), NULL }, - { LOPT_RELAY, ARG_DUP, "<local-addr>,<server>[,<interface>]", gettext_noop("Relay DHCP requests to a remote server"), NULL}, -- { LOPT_CNAME, ARG_DUP, "<alias>,<target>", gettext_noop("Specify alias name for LOCAL DNS name."), NULL }, -+ { LOPT_CNAME, ARG_DUP, "<alias>,<target>[,<ttl>]", gettext_noop("Specify alias name for LOCAL DNS name."), NULL }, - { LOPT_PXE_PROMT, ARG_DUP, "<prompt>,[<timeout>]", gettext_noop("Prompt to send to PXE clients."), NULL }, - { LOPT_PXE_SERV, ARG_DUP, "<service>", gettext_noop("Boot service for PXE menu."), NULL }, - { LOPT_TEST, 0, NULL, gettext_noop("Check configuration syntax."), NULL }, - { LOPT_ADD_MAC, ARG_DUP, "[=base64|text]", gettext_noop("Add requestor's MAC address to forwarded DNS queries."), NULL }, - { LOPT_ADD_SBNET, ARG_ONE, "<v4 pref>[,<v6 pref>]", gettext_noop("Add specified IP subnet to forwarded DNS queries."), NULL }, -- { LOPT_CPE_ID, ARG_ONE, "<text>", gettext_noop("Add client identification to forwarded DNS queries."), NULL }, -+ { LOPT_CPE_ID, ARG_ONE, "<text>", gettext_noop("Add client identification to forwarded DNS queries."), NULL }, - { LOPT_DNSSEC, OPT_DNSSEC_PROXY, NULL, gettext_noop("Proxy DNSSEC validation results from upstream nameservers."), NULL }, - { LOPT_INCR_ADDR, OPT_CONSEC_ADDR, NULL, gettext_noop("Attempt to allocate sequential IP addresses to DHCP clients."), NULL }, - { LOPT_CONNTRACK, OPT_CONNTRACK, NULL, gettext_noop("Copy connection-track mark from queries to upstream connections."), NULL }, - { LOPT_FQDN, OPT_FQDN_UPDATE, NULL, gettext_noop("Allow DHCP clients to do their own DDNS updates."), NULL }, - { LOPT_RA, OPT_RA, NULL, gettext_noop("Send router-advertisements for interfaces doing DHCPv6"), NULL }, - { LOPT_DUID, ARG_ONE, "<enterprise>,<duid>", gettext_noop("Specify DUID_EN-type DHCPv6 server DUID"), NULL }, -- { LOPT_HOST_REC, ARG_DUP, "<name>,<address>", gettext_noop("Specify host (A/AAAA and PTR) records"), NULL }, -+ { LOPT_HOST_REC, ARG_DUP, "<name>,<address>[,<ttl>]", gettext_noop("Specify host (A/AAAA and PTR) records"), NULL }, - { LOPT_RR, ARG_DUP, "<name>,<RR-number>,[<data>]", gettext_noop("Specify arbitrary DNS resource record"), NULL }, - { LOPT_CLVERBIND, OPT_CLEVERBIND, NULL, gettext_noop("Bind to interfaces in use - check for new interfaces"), NULL }, - { LOPT_AUTHSERV, ARG_ONE, "<NS>,<interface>", gettext_noop("Export local names to global DNS"), NULL }, -@@ -3692,12 +3692,15 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - case LOPT_CNAME: /* --cname */ - { - struct cname *new; -- char *alias; -- char *target; -+ char *alias, *target, *ttls; -+ int ttl = -1; - - if (!(comma = split(arg))) - ret_err(gen_err); - -+ if ((ttls = split(comma)) && !atoi_check(ttls, &ttl)) -+ ret_err(_("bad TTL")); -+ - alias = canonicalise_opt(arg); - target = canonicalise_opt(comma); - -@@ -3713,6 +3716,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - daemon->cnames = new; - new->alias = alias; - new->target = target; -+ new->ttl = ttl; - } - - break; -@@ -3913,14 +3917,22 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - { - struct host_record *new = opt_malloc(sizeof(struct host_record)); - memset(new, 0, sizeof(struct host_record)); -- -+ new->ttl = -1; -+ - if (!arg || !(comma = split(arg))) - ret_err(_("Bad host-record")); - - while (arg) - { - struct all_addr addr; -- if (inet_pton(AF_INET, arg, &addr)) -+ char *dig; -+ -+ for (dig = arg; *dig != 0; dig++) -+ if (*dig < '0' || *dig > '9') -+ break; -+ if (*dig == 0) -+ new->ttl = atoi(arg); -+ else if (inet_pton(AF_INET, arg, &addr)) - new->addr = addr.addr.addr4; - #ifdef HAVE_IPV6 - else if (inet_pton(AF_INET6, arg, &addr)) -@@ -4601,7 +4613,25 @@ void read_opts(int argc, char **argv, char *compile_opts) - } - } - } -- -+ -+ if (daemon->host_records) -+ { -+ struct host_record *hr; -+ -+ for (hr = daemon->host_records; hr; hr = hr->next) -+ if (hr->ttl == -1) -+ hr->ttl = daemon->local_ttl; -+ } -+ -+ if (daemon->cnames) -+ { -+ struct cname *cn; -+ -+ for (cn = daemon->cnames; cn; cn = cn->next) -+ if (cn->ttl == -1) -+ cn->ttl = daemon->local_ttl; -+ } -+ - if (daemon->if_addrs) - { - struct iname *tmp; -diff --git a/src/rfc1035.c b/src/rfc1035.c -index 9c0ddb5..3535a71 100644 ---- a/src/rfc1035.c -+++ b/src/rfc1035.c -@@ -1169,9 +1169,13 @@ static unsigned long crec_ttl(struct crec *crecp, time_t now) - /* Return 0 ttl for DHCP entries, which might change - before the lease expires. */ - -- if (crecp->flags & (F_IMMORTAL | F_DHCP)) -+ if (crecp->flags & F_DHCP) - return daemon->local_ttl; - -+ /* Immortal entries other than DHCP are local, and hold TTL in TTD field. */ -+ if (crecp->flags & F_IMMORTAL) -+ return crecp->ttd; -+ - /* Return the Max TTL value if it is lower then the actual TTL */ - if (daemon->max_ttl == 0 || ((unsigned)(crecp->ttd - now) < daemon->max_ttl)) - return crecp->ttd - now; --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/002-Add_--dhcp-ttl_option.patch b/src/patches/dnsmasq/002-Add_--dhcp-ttl_option.patch deleted file mode 100644 index 45e3b9b..0000000 --- a/src/patches/dnsmasq/002-Add_--dhcp-ttl_option.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 832e47beab95c2918b5264f0504f2fe6fe523e4c Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Wed, 24 Feb 2016 21:24:45 +0000 -Subject: [PATCH] Add --dhcp-ttl option. - ---- - man/dnsmasq.8 | 5 ++++- - src/dnsmasq.h | 2 +- - src/option.c | 13 +++++++++++-- - src/rfc1035.c | 2 +- - 4 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 7bc1394..2bcce20 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -60,7 +60,7 @@ in the same way as for DHCP-derived names. Note that this does not - apply to domain names in cnames, PTR records, TXT records etc. - .TP - .B \-T, --local-ttl=<time> --When replying with information from /etc/hosts or the DHCP leases -+When replying with information from /etc/hosts or configuration or the DHCP leases - file dnsmasq by default sets the time-to-live field to zero, meaning - that the requester should not itself cache the information. This is - the correct thing to do in almost all situations. This option allows a -@@ -68,6 +68,9 @@ time-to-live (in seconds) to be given for these replies. This will - reduce the load on the server at the expense of clients using stale - data under some circumstances. - .TP -+.B --dhcp-ttl=<time> -+As for --local-ttl, but affects only replies with information from DHCP leases. If both are given, --dhcp-ttl applies for DHCP information, and --local-ttl for others. Setting this to zero eliminates the effect of --local-ttl for DHCP. -+.TP - .B --neg-ttl=<time> - Negative replies from upstream servers normally contain time-to-live - information in SOA records which dnsmasq uses for caching. If the -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index 6344df5..9f73c3b 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -955,7 +955,7 @@ extern struct daemon { - int max_logs; /* queue limit */ - int cachesize, ftabsize; - int port, query_port, min_port, max_port; -- unsigned long local_ttl, neg_ttl, max_ttl, min_cache_ttl, max_cache_ttl, auth_ttl; -+ unsigned long local_ttl, neg_ttl, max_ttl, min_cache_ttl, max_cache_ttl, auth_ttl, dhcp_ttl, use_dhcp_ttl; - char *dns_client_id; - struct hostsfile *addn_hosts; - struct dhcp_context *dhcp, *dhcp6; -diff --git a/src/option.c b/src/option.c -index 7c5e6bc..3f6d162 100644 ---- a/src/option.c -+++ b/src/option.c -@@ -157,6 +157,7 @@ struct myoption { - #define LOPT_MAXPORT 345 - #define LOPT_CPE_ID 346 - #define LOPT_SCRIPT_ARP 347 -+#define LOPT_DHCPTTL 348 - - #ifdef HAVE_GETOPT_LONG - static const struct option opts[] = -@@ -319,6 +320,7 @@ static const struct myoption opts[] = - { "quiet-ra", 0, 0, LOPT_QUIET_RA }, - { "dns-loop-detect", 0, 0, LOPT_LOOP_DETECT }, - { "script-arp", 0, 0, LOPT_SCRIPT_ARP }, -+ { "dhcp-ttl", 1, 0 , LOPT_DHCPTTL }, - { NULL, 0, 0, 0 } - }; - -@@ -485,9 +487,10 @@ static struct { - { LOPT_QUIET_DHCP, OPT_QUIET_DHCP, NULL, gettext_noop("Do not log routine DHCP."), NULL }, - { LOPT_QUIET_DHCP6, OPT_QUIET_DHCP6, NULL, gettext_noop("Do not log routine DHCPv6."), NULL }, - { LOPT_QUIET_RA, OPT_QUIET_RA, NULL, gettext_noop("Do not log RA."), NULL }, -- { LOPT_LOCAL_SERVICE, OPT_LOCAL_SERVICE, NULL, gettext_noop("Accept queries only from directly-connected networks"), NULL }, -- { LOPT_LOOP_DETECT, OPT_LOOP_DETECT, NULL, gettext_noop("Detect and remove DNS forwarding loops"), NULL }, -+ { LOPT_LOCAL_SERVICE, OPT_LOCAL_SERVICE, NULL, gettext_noop("Accept queries only from directly-connected networks."), NULL }, -+ { LOPT_LOOP_DETECT, OPT_LOOP_DETECT, NULL, gettext_noop("Detect and remove DNS forwarding loops."), NULL }, - { LOPT_IGNORE_ADDR, ARG_DUP, "<ipaddr>", gettext_noop("Ignore DNS responses containing ipaddr."), NULL }, -+ { LOPT_DHCPTTL, ARG_ONE, "<ttl>", gettext_noop("Set TTL in DNS responses with DHCP-derived addresses."), NULL }, - { 0, 0, NULL, NULL, NULL } - }; - -@@ -2580,6 +2583,7 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - case LOPT_MINCTTL: /* --min-cache-ttl */ - case LOPT_MAXCTTL: /* --max-cache-ttl */ - case LOPT_AUTHTTL: /* --auth-ttl */ -+ case LOPT_DHCPTTL: /* --dhcp-ttl */ - { - int ttl; - if (!atoi_check(arg, &ttl)) -@@ -2598,6 +2602,11 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - daemon->max_cache_ttl = (unsigned long)ttl; - else if (option == LOPT_AUTHTTL) - daemon->auth_ttl = (unsigned long)ttl; -+ else if (option == LOPT_DHCPTTL) -+ { -+ daemon->dhcp_ttl = (unsigned long)ttl; -+ daemon->use_dhcp_ttl = 1; -+ } - else - daemon->local_ttl = (unsigned long)ttl; - break; -diff --git a/src/rfc1035.c b/src/rfc1035.c -index 3535a71..8f1e3b4 100644 ---- a/src/rfc1035.c -+++ b/src/rfc1035.c -@@ -1170,7 +1170,7 @@ static unsigned long crec_ttl(struct crec *crecp, time_t now) - before the lease expires. */ - - if (crecp->flags & F_DHCP) -- return daemon->local_ttl; -+ return daemon->use_dhcp_ttl ? daemon->dhcp_ttl : daemon->local_ttl; - - /* Immortal entries other than DHCP are local, and hold TTL in TTD field. */ - if (crecp->flags & F_IMMORTAL) --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/003-Update_CHANGELOG.patch b/src/patches/dnsmasq/003-Update_CHANGELOG.patch deleted file mode 100644 index f04f943..0000000 --- a/src/patches/dnsmasq/003-Update_CHANGELOG.patch +++ /dev/null @@ -1,17 +0,0 @@ -X-Git-Url: http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=blobdiff_plain;f=CHANGELOG… - -diff --git a/CHANGELOG b/CHANGELOG -index 14354f2..6d9ba49 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -48,6 +48,10 @@ version 2.76 - (ie xx::0 to xx::ffff:ffff:ffff:ffff) - Thanks to Laurent Bendel for spotting this problem. - -+ Add support for a TTL parameter in --host-record and -+ --cname. -+ -+ Add --dhcp-ttl option. - - version 2.75 - Fix reversion on 2.74 which caused 100% CPU use when a diff --git a/src/patches/dnsmasq/004-Add_--tftp-mtu_option.patch b/src/patches/dnsmasq/004-Add_--tftp-mtu_option.patch deleted file mode 100644 index c06705a..0000000 --- a/src/patches/dnsmasq/004-Add_--tftp-mtu_option.patch +++ /dev/null @@ -1,136 +0,0 @@ -From bec366b4041df72b559e713f1c924177676e6eb0 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Wed, 24 Feb 2016 22:03:26 +0000 -Subject: [PATCH] Add --tftp-mtu option. - ---- - CHANGELOG | 4 ++++ - man/dnsmasq.8 | 4 ++++ - src/dnsmasq.h | 2 +- - src/option.c | 10 +++++++++- - src/tftp.c | 14 ++++++++++++-- - 5 files changed, 30 insertions(+), 4 deletions(-) - -diff --git a/CHANGELOG b/CHANGELOG -index 6d9ba49..9218b8c 100644 ---- a/CHANGELOG -+++ b/CHANGELOG -@@ -53,6 +53,10 @@ version 2.76 - - Add --dhcp-ttl option. - -+ Add --tftp-mtu option. Thanks to Patrick McLean for the -+ initial patch. -+ -+ - version 2.75 - Fix reversion on 2.74 which caused 100% CPU use when a - dhcp-script is configured. Thanks to Adrian Davey for -diff --git a/man/dnsmasq.8 b/man/dnsmasq.8 -index 2bcce20..3cf48cd 100644 ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -1810,6 +1810,10 @@ require about (2*n) + 10 descriptors. If - .B --tftp-port-range - is given, that can affect the number of concurrent connections. - .TP -+.B --tftp-mtu=<mtu size> -+Use size as the ceiling of the MTU supported by the intervening network when -+negotiating TFTP blocksize, overriding the MTU setting of the local interface if it is larger. -+.TP - .B --tftp-no-blocksize - Stop the TFTP server from negotiating the "blocksize" option with a - client. Some buggy clients request this option but then behave badly -diff --git a/src/dnsmasq.h b/src/dnsmasq.h -index 9f73c3b..280ad9d 100644 ---- a/src/dnsmasq.h -+++ b/src/dnsmasq.h -@@ -975,7 +975,7 @@ extern struct daemon { - struct dhcp_netid_list *dhcp_ignore, *dhcp_ignore_names, *dhcp_gen_names; - struct dhcp_netid_list *force_broadcast, *bootp_dynamic; - struct hostsfile *dhcp_hosts_file, *dhcp_opts_file, *dynamic_dirs; -- int dhcp_max, tftp_max; -+ int dhcp_max, tftp_max, tftp_mtu; - int dhcp_server_port, dhcp_client_port; - int start_tftp_port, end_tftp_port; - unsigned int min_leasetime; -diff --git a/src/option.c b/src/option.c -index 3f6d162..765965f 100644 ---- a/src/option.c -+++ b/src/option.c -@@ -158,7 +158,8 @@ struct myoption { - #define LOPT_CPE_ID 346 - #define LOPT_SCRIPT_ARP 347 - #define LOPT_DHCPTTL 348 -- -+#define LOPT_TFTP_MTU 349 -+ - #ifdef HAVE_GETOPT_LONG - static const struct option opts[] = - #else -@@ -244,6 +245,7 @@ static const struct myoption opts[] = - { "tftp-unique-root", 0, 0, LOPT_APREF }, - { "tftp-root", 1, 0, LOPT_PREFIX }, - { "tftp-max", 1, 0, LOPT_TFTP_MAX }, -+ { "tftp-mtu", 1, 0, LOPT_TFTP_MTU }, - { "tftp-lowercase", 0, 0, LOPT_TFTP_LC }, - { "ptr-record", 1, 0, LOPT_PTR }, - { "naptr-record", 1, 0, LOPT_NAPTR }, -@@ -432,6 +434,7 @@ static struct { - { LOPT_SECURE, OPT_TFTP_SECURE, NULL, gettext_noop("Allow access only to files owned by the user running dnsmasq."), NULL }, - { LOPT_TFTP_NO_FAIL, OPT_TFTP_NO_FAIL, NULL, gettext_noop("Do not terminate the service if TFTP directories are inaccessible."), NULL }, - { LOPT_TFTP_MAX, ARG_ONE, "<integer>", gettext_noop("Maximum number of conncurrent TFTP transfers (defaults to %s)."), "#" }, -+ { LOPT_TFTP_MTU, ARG_ONE, "<integer>", gettext_noop("Maximum MTU to use for TFTP transfers."), NULL }, - { LOPT_NOBLOCK, OPT_TFTP_NOBLOCK, NULL, gettext_noop("Disable the TFTP blocksize extension."), NULL }, - { LOPT_TFTP_LC, OPT_TFTP_LC, NULL, gettext_noop("Convert TFTP filenames to lowercase"), NULL }, - { LOPT_TFTPPORTS, ARG_ONE, "<start>,<end>", gettext_noop("Ephemeral port range for use by TFTP transfers."), NULL }, -@@ -2625,6 +2628,11 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma - ret_err(gen_err); - break; - -+ case LOPT_TFTP_MTU: /* --tftp-mtu */ -+ if (!atoi_check(arg, &daemon->tftp_mtu)) -+ ret_err(gen_err); -+ break; -+ - case LOPT_PREFIX: /* --tftp-prefix */ - comma = split(arg); - if (comma) -diff --git a/src/tftp.c b/src/tftp.c -index 00ed2fc..dc4aa85 100644 ---- a/src/tftp.c -+++ b/src/tftp.c -@@ -103,8 +103,10 @@ void tftp_request(struct listener *listen, time_t now) - if (listen->iface) - { - addr = listen->iface->addr; -- mtu = listen->iface->mtu; - name = listen->iface->name; -+ mtu = listen->iface->mtu; -+ if (daemon->tftp_mtu != 0 && daemon->tftp_mtu < mtu) -+ mtu = daemon->tftp_mtu; - } - else - { -@@ -234,9 +236,17 @@ void tftp_request(struct listener *listen, time_t now) - - strncpy(ifr.ifr_name, name, IF_NAMESIZE); - if (ioctl(listen->tftpfd, SIOCGIFMTU, &ifr) != -1) -- mtu = ifr.ifr_mtu; -+ { -+ mtu = ifr.ifr_mtu; -+ if (daemon->tftp_mtu != 0 && daemon->tftp_mtu < mtu) -+ mtu = daemon->tftp_mtu; -+ } - } - -+ /* Failed to get interface mtu - can use configured value. */ -+ if (mtu == 0) -+ mtu = daemon->tftp_mtu; -+ - if (name) - { - /* check for per-interface prefix */ --- -1.7.10.4 - diff --git a/src/patches/dnsmasq/005-Apply_ceiling_of_lease_length_to_TTL_when_--dhcp-ttl_in_use.patch b/src/patches/dnsmasq/005-Apply_ceiling_of_lease_length_to_TTL_when_--dhcp-ttl_in_use.patch deleted file mode 100644 index 2875d2c..0000000 --- a/src/patches/dnsmasq/005-Apply_ceiling_of_lease_length_to_TTL_when_--dhcp-ttl_in_use.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7480aeffc8ad195e9fd8bcf424bae0fab3839d55 Mon Sep 17 00:00:00 2001 -From: Simon Kelley <simon(a)thekelleys.org.uk> -Date: Fri, 26 Feb 2016 21:58:20 +0000 -Subject: [PATCH] Apply ceiling of lease length to TTL when --dhcp-ttl in use. - ---- - src/rfc1035.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/rfc1035.c b/src/rfc1035.c -index 8f1e3b4..bed5312 100644 ---- a/src/rfc1035.c -+++ b/src/rfc1035.c -@@ -1167,10 +1167,18 @@ int add_resource_record(struct dns_header *header, char *limit, int *truncp, int - static unsigned long crec_ttl(struct crec *crecp, time_t now) - { - /* Return 0 ttl for DHCP entries, which might change -- before the lease expires. */ -+ before the lease expires, unless configured otherwise. */ - - if (crecp->flags & F_DHCP) -- return daemon->use_dhcp_ttl ? daemon->dhcp_ttl : daemon->local_ttl; -+ { -+ int conf_ttl = daemon->use_dhcp_ttl ? daemon->dhcp_ttl : daemon->local_ttl; -+ -+ /* Apply ceiling of actual lease length to configured TTL. */ -+ if (!(crecp->flags & F_IMMORTAL) && (crecp->ttd - now) < conf_ttl) -+ return crecp->ttd - now; -+ -+ return conf_ttl; -+ } - - /* Immortal entries other than DHCP are local, and hold TTL in TTD field. */ - if (crecp->flags & F_IMMORTAL) --- -1.7.10.4 - diff --git a/src/patches/procps-3.2.6-fix_unknown_HZ_value.patch b/src/patches/procps-3.2.6-fix_unknown_HZ_value.patch deleted file mode 100644 index 31d8593..0000000 --- a/src/patches/procps-3.2.6-fix_unknown_HZ_value.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -Naur procps-3.2.6.org/proc/sysinfo.c procps-3.2.6/proc/sysinfo.c ---- procps-3.2.6.org/proc/sysinfo.c 2005-03-14 05:31:27.000000000 +0100 -+++ procps-3.2.6/proc/sysinfo.c 2011-10-02 12:51:32.000000000 +0200 -@@ -209,6 +209,7 @@ - static void init_libproc(void) __attribute__((constructor)); - static void init_libproc(void){ - have_privs = check_for_privs(); -+ init_Linux_version(); - // ought to count CPUs in /proc/stat instead of relying - // on glibc, which foolishly tries to parse /proc/cpuinfo - // -diff -Naur procps-3.2.6.org/proc/version.c procps-3.2.6/proc/version.c ---- procps-3.2.6.org/proc/version.c 2003-01-29 02:11:43.000000000 +0100 -+++ procps-3.2.6/proc/version.c 2011-10-02 12:52:36.000000000 +0200 -@@ -33,8 +33,7 @@ - - int linux_version_code; - --static void init_Linux_version(void) __attribute__((constructor)); --static void init_Linux_version(void) { -+void init_Linux_version(void) { - static struct utsname uts; - int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ - -diff -Naur procps-3.2.6.org/proc/version.h procps-3.2.6/proc/version.h ---- procps-3.2.6.org/proc/version.h 2002-12-15 01:08:32.000000000 +0100 -+++ procps-3.2.6/proc/version.h 2011-10-02 12:53:10.000000000 +0200 -@@ -14,6 +14,7 @@ - - EXTERN_C_BEGIN - -+extern void init_Linux_version(void); - extern void display_version(void); /* display suite version */ - extern const char procps_version[]; /* global buf for suite version */ - diff --git a/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch b/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch new file mode 100644 index 0000000..08edaa6 --- /dev/null +++ b/src/patches/procps-3.2.8-fix_unknown_HZ_value.patch @@ -0,0 +1,35 @@ +diff -Naur procps-3.2.6.org/proc/sysinfo.c procps-3.2.6/proc/sysinfo.c +--- procps-3.2.6.org/proc/sysinfo.c 2005-03-14 05:31:27.000000000 +0100 ++++ procps-3.2.6/proc/sysinfo.c 2011-10-02 12:51:32.000000000 +0200 +@@ -212,6 +212,7 @@ + static void init_libproc(void) __attribute__((constructor)); + static void init_libproc(void){ + have_privs = check_for_privs(); ++ init_Linux_version(); + // ought to count CPUs in /proc/stat instead of relying + // on glibc, which foolishly tries to parse /proc/cpuinfo + // +diff -Naur procps-3.2.6.org/proc/version.c procps-3.2.6/proc/version.c +--- procps-3.2.6.org/proc/version.c 2003-01-29 02:11:43.000000000 +0100 ++++ procps-3.2.6/proc/version.c 2011-10-02 12:52:36.000000000 +0200 +@@ -33,8 +33,7 @@ + + int linux_version_code; + +-static void init_Linux_version(void) __attribute__((constructor)); +-static void init_Linux_version(void) { ++void init_Linux_version(void) { + static struct utsname uts; + int x = 0, y = 0, z = 0; /* cleared in case sscanf() < 3 */ + +diff -Naur procps-3.2.6.org/proc/version.h procps-3.2.6/proc/version.h +--- procps-3.2.6.org/proc/version.h 2002-12-15 01:08:32.000000000 +0100 ++++ procps-3.2.6/proc/version.h 2011-10-02 12:53:10.000000000 +0200 +@@ -14,6 +14,7 @@ + + EXTERN_C_BEGIN + ++extern void init_Linux_version(void); + extern void display_version(void); /* display suite version */ + extern const char procps_version[]; /* global buf for suite version */ + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ef553dccc8462355389450913d5485e40814f266
by git＠ipfire.org 11 May '16

11 May '16

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 7473defb95e13e254d3e4cd481f33ce5b03ee6ad
by git＠ipfire.org 11 May '16

11 May '16

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 7473defb95e13e254d3e4cd481f33ce5b03ee6ad (commit) from f03929e702ebe2b607765f0ab304b2be34c7e028 (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 7473defb95e13e254d3e4cd481f33ce5b03ee6ad Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Wed May 11 11:32:20 2016 +0200 rsync: Update to 3.1.2. This is a minor update to the latest stable version of rsync. * Drop patch which got upstream. * Link/Use system libpopt and zlib instead of bundled ones. * Enable testsuite. * Drop xinetd support and add service files for systemd. * Ship a sample configuration file. Fixes #11118. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: rsync/patches/rsync-3.0.7-buf-overflow.patch | 39 ------------------- rsync/rsync.nm | 58 ++++++++++++++++++++++++++-- rsync/rsyncd.conf | 20 ++++++++++ rsync/systemd/rsyncd.service | 9 +++++ rsync/systemd/rsyncd.socket | 10 +++++ rsync/systemd/rsyncd@.service | 7 ++++ 6 files changed, 100 insertions(+), 43 deletions(-) delete mode 100644 rsync/patches/rsync-3.0.7-buf-overflow.patch create mode 100644 rsync/rsyncd.conf create mode 100644 rsync/systemd/rsyncd.service create mode 100644 rsync/systemd/rsyncd.socket create mode 100644 rsync/systemd/rsyncd@.service Difference in files: diff --git a/rsync/patches/rsync-3.0.7-buf-overflow.patch b/rsync/patches/rsync-3.0.7-buf-overflow.patch deleted file mode 100644 index 2c6b195..0000000 --- a/rsync/patches/rsync-3.0.7-buf-overflow.patch +++ /dev/null @@ -1,39 +0,0 @@ -index 7139b10..fef15aa 100644 ---- a/flist.c -+++ b/flist.c -@@ -1640,21 +1640,29 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len, - } - - p = fbuf + len; -- if (len != 1 || *fbuf != '/') -+ if (len == 1 && *fbuf == '/') -+ remainder = MAXPATHLEN - 1; -+ else if (len < MAXPATHLEN-1) { - *p++ = '/'; -- *p = '\0'; -- remainder = MAXPATHLEN - (p - fbuf); -+ *p = '\0'; -+ remainder = MAXPATHLEN - (len + 1); -+ } else -+ remainder = 0; - - for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { - char *dname = d_name(di); - if (dname[0] == '.' && (dname[1] == '\0' - || (dname[1] == '.' && dname[2] == '\0'))) - continue; -- if (strlcpy(p, dname, remainder) >= remainder) { -+ unsigned name_len = strlcpy(p, dname, remainder); -+ if (name_len >= remainder) { -+ char save = fbuf[len]; -+ fbuf[len] = '\0'; - io_error |= IOERR_GENERAL; - rprintf(FERROR_XFER, -- "cannot send long-named file %s\n", -- full_fname(fbuf)); -+ "filename overflows max-path len by %u: %s/%s\n", -+ name_len - remainder + 1, fbuf, dname); -+ fbuf[len] = save; - continue; - } - if (dname[0] == '\0') { diff --git a/rsync/rsync.nm b/rsync/rsync.nm index 3af7d69..36e04b2 100644 --- a/rsync/rsync.nm +++ b/rsync/rsync.nm @@ -4,7 +4,7 @@ ############################################################################### name = rsync -version = 3.0.7 +version = 3.1.2 release = 1 groups = Applications/Internet @@ -31,8 +31,17 @@ build libacl-devel libattr-devel popt-devel + zlib-devel + + # Testsuite. + %{bindir}/setfacl end + configure_options += \ + --without-included-popt \ + --without-included-zlib + + prepare_cmds # Fix permission issure. cd %{DIR_APP} && chmod -x support/* @@ -52,19 +61,60 @@ build make_build_targets = proto all + test + # Fix permissions of testsuite helper script. + # + # Otherwise some tests of the testsuite will fail, + # because the script is not allowed to be executed. + chmod +x ./support/lsh.sh + + make check + end + make_install_targets += \ INSTALLCMD="install -p" \ INSTALLMAN="install -p" install_cmds - mkdir -pv %{BUILDROOT}/etc/xinetd.d - install -p -m 644 %{DIR_SOURCE}/rsync.xinetd \ - %{BUILDROOT}/etc/xinetd.d/rsync + + # Install config file. + mkdir -pv %{BUILDROOT}%{sysconfdir} + + install -m 0644 %{DIR_SOURCE}/rsyncd.conf \ + %{BUILDROOT}%{sysconfdir}/ + + # Create directory for pidfile. + mkdir -pv %{BUILDROOT}/run/rsyncd end + end packages package %{name} + configfiles + %{sysconfdir}/rsyncd.conf + end + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script preun + systemctl --no-reload disable rsyncd.service >/dev/null 2>&1 || : + systemctl --no-reload disable rsyncd.socket >/dev/null 2>&1 || : + systemctl stop rsyncd.service >/dev/null 2>&1 || : + systemctl stop rsyncd.socket >/dev/null 2>&1 || : + systemctl stop rsyncd@.service >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl try-restart rsyncd.service >/dev/null 2>&1 || : + end end package %{name}-debuginfo diff --git a/rsync/rsyncd.conf b/rsync/rsyncd.conf new file mode 100644 index 0000000..09e768f --- /dev/null +++ b/rsync/rsyncd.conf @@ -0,0 +1,20 @@ +# /etc/rsyncd: configuration file for rsync daemon mode + +# See rsyncd.conf man page for more options. + +# configuration example: + +# uid = nobody +# gid = nobody +# use chroot = yes +# max connections = 4 +# pid file = /run/rsyncd/rsyncd.pid +# exclude = lost+found/ +# transfer logging = yes +# timeout = 900 +# ignore nonreadable = yes +# dont compress = *.gz *.tgz *.zip *.z *.Z *.rpm *.deb *.bz2 + +# [ftp] +# path = /home/ftp +# comment = ftp export area diff --git a/rsync/systemd/rsyncd.service b/rsync/systemd/rsyncd.service new file mode 100644 index 0000000..30c3ca0 --- /dev/null +++ b/rsync/systemd/rsyncd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Fast remote file copy program daemon +ConditionPathExists=/etc/rsyncd.conf + +[Service] +ExecStart=/usr/bin/rsync --daemon --no-detach + +[Install] +WantedBy=multi-user.target diff --git a/rsync/systemd/rsyncd.socket b/rsync/systemd/rsyncd.socket new file mode 100644 index 0000000..7306ad0 --- /dev/null +++ b/rsync/systemd/rsyncd.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Rsync Server Socket +Conflicts=rsyncd.service + +[Socket] +ListenStream=873 +Accept=yes + +[Install] +WantedBy=sockets.target diff --git a/rsync/systemd/rsyncd@.service b/rsync/systemd/rsyncd@.service new file mode 100644 index 0000000..beef5c9 --- /dev/null +++ b/rsync/systemd/rsyncd@.service @@ -0,0 +1,7 @@ +[Unit] +Description=Fast remote file copy program daemon +ConditionPathExists=/etc/rsyncd.conf + +[Service] +ExecStart=/usr/bin/rsync --daemon --no-detach +StandardInput=socket hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e0cba8eea96adddaf7da65113cebd22cc1a11c28
by git＠ipfire.org 11 May '16

11 May '16

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 e0cba8eea96adddaf7da65113cebd22cc1a11c28 (commit) via 9a4bfe028442c95f6d0243dd5d4794a21f8089a4 (commit) from efccb4330333aa4460475fa96539e1613697896b (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 e0cba8eea96adddaf7da65113cebd22cc1a11c28 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue May 10 18:50:25 2016 +0200 squid 3.4: remove obsolete patch files Obsolete, no longer needed. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 9a4bfe028442c95f6d0243dd5d4794a21f8089a4 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Tue May 10 18:58:28 2016 +0200 squid: Update to 3.5.19 Activated 'ipv6', as discussed in ipfire-list with Michael: "I had a look what the IPv6 switch actually changes. And that is not really much. Essentially nothing. It just probes if the system supports IPv6 and if not it disables it internally. http://git.ipfire.org/?p=thirdparty%2Fsquid.git&a=search&h=refs%2Fheads%2Ft… I think we can as well enable this." Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/squid | 6 +- src/patches/squid-3.4-13233.patch | 274 -------------------------------------- src/patches/squid-3.4-13234.patch | 33 ----- src/patches/squid-3.4-13235.patch | 97 -------------- 4 files changed, 3 insertions(+), 407 deletions(-) delete mode 100644 src/patches/squid-3.4-13233.patch delete mode 100644 src/patches/squid-3.4-13234.patch delete mode 100644 src/patches/squid-3.4-13235.patch Difference in files: diff --git a/lfs/squid b/lfs/squid index a7edc9d..74a4f19 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.5.18 +VER = 3.5.19 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 9ae3843c341e8a142e963ab937c51cdd +$(DL_FILE)_MD5 = a1d990284c429a63ee85d80ee5b3b8b9 install : $(TARGET) @@ -89,7 +89,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-kqueue \ --disable-esi \ --disable-arch-native \ - --disable-ipv6 \ + --enable-ipv6 \ --enable-poll \ --enable-ident-lookups \ --enable-storeio=aufs,diskd,ufs \ diff --git a/src/patches/squid-3.4-13233.patch b/src/patches/squid-3.4-13233.patch deleted file mode 100644 index d657838..0000000 --- a/src/patches/squid-3.4-13233.patch +++ /dev/null @@ -1,274 +0,0 @@ ------------------------------------------------------------- -revno: 13233 -revision-id: squid3(a)treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11 -parent: squid3(a)treenet.co.nz-20160330141410-t6p2dhzr8ri36fap -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.4 -timestamp: Wed 2016-04-20 18:39:07 +1200 -message: - cachemgr.cgi: use dynamic MemBuf for internal content generation - - Using a fixed size buffer limits how big content lines can be. Modern - HTTP is fast reaching the point where such limits are problematic. - Also fixes incorrect uses of snprintf() by removing them. ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11 -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: 161e86814f6f14d74557a3fa169b37b6601c08a1 -# timestamp: 2016-04-20 06:50:57 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20160330141410-\ -# t6p2dhzr8ri36fap -# -# Begin patch -=== modified file 'src/tests/stub_cbdata.cc' ---- src/tests/stub_cbdata.cc 2012-11-01 10:31:28 +0000 -+++ src/tests/stub_cbdata.cc 2016-04-20 06:39:07 +0000 -@@ -5,7 +5,13 @@ - #include "tests/STUB.h" - - void cbdataRegisterWithCacheManager(void) STUB -- -+void *cbdataInternalAlloc(cbdata_type type, const char *, int sz) { -+ return xcalloc(1, sz); -+} -+void *cbdataInternalFree(void *p, const char *, int) { -+ xfree(p); -+ return nullptr; -+} - #if USE_CBDATA_DEBUG - void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL) - void *cbdataInternalFreeDbg(void *p, const char *, int) STUB_RETVAL(NULL) - -=== modified file 'src/tests/stub_mem.cc' ---- src/tests/stub_mem.cc 2012-08-29 07:29:35 +0000 -+++ src/tests/stub_mem.cc 2016-04-20 06:39:07 +0000 -@@ -5,7 +5,7 @@ - #include "squid.h" - - #define STUB_API "stub_mem.cc" --#include "STUB.h" -+#include "tests/STUB.h" - #include "Mem.h" - - void - -=== modified file 'tools/Makefile.am' ---- tools/Makefile.am 2014-04-06 04:37:08 +0000 -+++ tools/Makefile.am 2016-04-20 06:39:07 +0000 -@@ -35,15 +35,24 @@ - stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc - cp $(top_srcdir)/src/tests/stub_debug.cc . - -+MemBuf.cc: $(top_srcdir)/src/MemBuf.cc -+ cp $(top_srcdir)/src/MemBuf.cc $@ -+ - time.cc: $(top_srcdir)/src/time.cc - cp $(top_srcdir)/src/time.cc . - -+stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc -+ cp $(top_srcdir)/src/tests/stub_cbdata.cc $@ -+ -+stub_mem.cc: $(top_srcdir)/src/tests/stub_mem.cc -+ cp $(top_srcdir)/src/tests/stub_mem.cc $@ -+ - # stock tools for unit tests - library independent versions of dlink_list - # etc. - # globals.cc is needed by test_tools.cc. - # Neither of these should be disted from here. - TESTSOURCES= test_tools.cc --CLEANFILES += test_tools.cc stub_debug.cc time.cc -+CLEANFILES += test_tools.cc MemBuf.cc stub_debug.cc time.cc stub_cbdata.cc stub_mem.cc - - ## ##### helper-mux ##### - -@@ -74,7 +83,10 @@ - libexec_PROGRAMS = cachemgr$(CGIEXT) - - cachemgr__CGIEXT__SOURCES = cachemgr.cc \ -+ MemBuf.cc \ -+ stub_cbdata.cc \ - stub_debug.cc \ -+ stub_mem.cc \ - test_tools.cc \ - time.cc - - -=== modified file 'tools/cachemgr.cc' ---- tools/cachemgr.cc 2015-01-09 10:32:57 +0000 -+++ tools/cachemgr.cc 2016-04-20 06:39:07 +0000 -@@ -35,6 +35,7 @@ - #include "getfullhostname.h" - #include "html_quote.h" - #include "ip/Address.h" -+#include "MemBuf.h" - #include "rfc1123.h" - #include "rfc1738.h" - #include "util.h" -@@ -460,8 +461,8 @@ - return url; - } - --static const char * --munge_menu_line(const char *buf, cachemgr_request * req) -+static void -+munge_menu_line(MemBuf &out, const char *buf, cachemgr_request * req) - { - char *x; - const char *a; -@@ -469,15 +470,14 @@ - const char *p; - char *a_url; - char *buf_copy; -- static char html[2 * 1024]; -- -- if (strlen(buf) < 1) -- return buf; -- -- if (*buf != ' ') -- return buf; -- -- buf_copy = x = xstrdup(buf); -+ -+ const char bufLen = strlen(buf); -+ if (bufLen < 1 || *buf != ' ') { -+ out.append(buf, bufLen); -+ return; -+ } -+ -+ buf_copy = x = xstrndup(buf, bufLen); - - a = xstrtok(&x, '\t'); - -@@ -489,59 +489,56 @@ - - /* no reason to give a url for a disabled action */ - if (!strcmp(p, "disabled")) -- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (disabled)<A HREF=\"%s\">.</A>\n", d, a_url); -+ out.Printf("<LI type=\"circle\">%s (disabled)<A HREF=\"%s\">.</A>\n", d, a_url); - else - /* disable a hidden action (requires a password, but password is not in squid.conf) */ - if (!strcmp(p, "hidden")) -- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (hidden)<A HREF=\"%s\">.</A>\n", d, a_url); -+ out.Printf("<LI type=\"circle\">%s (hidden)<A HREF=\"%s\">.</A>\n", d, a_url); - else - /* disable link if authentication is required and we have no password */ - if (!strcmp(p, "protected") && !req->passwd) -- snprintf(html, sizeof(html), "<LI type=\"circle\">%s (requires <a href=\"%s\">authentication</a>)<A HREF=\"%s\">.</A>\n", -- d, menu_url(req, "authenticate"), a_url); -+ out.Printf("<LI type=\"circle\">%s (requires <a href=\"%s\">authentication</a>)<A HREF=\"%s\">.</A>\n", -+ d, menu_url(req, "authenticate"), a_url); - else - /* highlight protected but probably available entries */ - if (!strcmp(p, "protected")) -- snprintf(html, sizeof(html), "<LI type=\"square\"><A HREF=\"%s\"><font color=\"#FF0000\">%s</font></A>\n", -- a_url, d); -+ out.Printf("<LI type=\"square\"><A HREF=\"%s\"><font color=\"#FF0000\">%s</font></A>\n", -+ a_url, d); - - /* public entry or unknown type of protection */ - else -- snprintf(html, sizeof(html), "<LI type=\"disk\"><A HREF=\"%s\">%s</A>\n", a_url, d); -+ out.Printf("<LI type=\"disk\"><A HREF=\"%s\">%s</A>\n", a_url, d); - - xfree(a_url); - - xfree(buf_copy); -- -- return html; - } - --static const char * --munge_other_line(const char *buf, cachemgr_request * req) -+static void -+munge_other_line(MemBuf &out, const char *buf, cachemgr_request *) - { - static const char *ttags[] = {"td", "th"}; - -- static char html[4096]; - static int table_line_num = 0; - static int next_is_header = 0; - int is_header = 0; - const char *ttag; - char *buf_copy; - char *x, *p; -- int l = 0; - /* does it look like a table? */ - - if (!strchr(buf, '\t') || *buf == '\t') { - /* nope, just text */ -- snprintf(html, sizeof(html), "%s%s", -- table_line_num ? "</table>\n<pre>" : "", html_quote(buf)); -+ if (table_line_num) -+ out.append("</table>\n<pre>", 14); -+ out.Printf("%s", html_quote(buf)); - table_line_num = 0; -- return html; -+ return; - } - - /* start html table */ - if (!table_line_num) { -- l += snprintf(html + l, sizeof(html) - l, "</pre><table cellpadding=\"2\" cellspacing=\"1\">\n"); -+ out.append("</pre><table cellpadding=\"2\" cellspacing=\"1\">\n", 46); - next_is_header = 0; - } - -@@ -551,7 +548,7 @@ - ttag = ttags[is_header]; - - /* record starts */ -- l += snprintf(html + l, sizeof(html) - l, "<tr>"); -+ out.append("<tr>", 4); - - /* substitute '\t' */ - buf_copy = x = xstrdup(buf); -@@ -568,18 +565,17 @@ - ++x; - } - -- l += snprintf(html + l, sizeof(html) - l, "<%s colspan=\"%d\" align=\"%s\">%s</%s>", -- ttag, column_span, -- is_header ? "center" : is_number(cell) ? "right" : "left", -- html_quote(cell), ttag); -+ out.Printf("<%s colspan=\"%d\" align=\"%s\">%s</%s>", -+ ttag, column_span, -+ is_header ? "center" : is_number(cell) ? "right" : "left", -+ html_quote(cell), ttag); - } - - xfree(buf_copy); - /* record ends */ -- snprintf(html + l, sizeof(html) - l, "</tr>\n"); -+ out.append("</tr>\n", 6); - next_is_header = is_header && strstr(buf, "\t\t"); - ++table_line_num; -- return html; - } - - static const char * -@@ -736,14 +732,18 @@ - /* yes, fall through, we do not want to loose the first line */ - - case isBody: -+ { - /* interpret [and reformat] cache response */ -- -+ MemBuf out; -+ out.init(); - if (parse_menu) -- fputs(munge_menu_line(buf, req), stdout); -+ munge_menu_line(out, buf, req); - else -- fputs(munge_other_line(buf, req), stdout); -+ munge_other_line(out, buf, req); - -- break; -+ fputs(out.buf, stdout); -+ } -+ break; - - case isForward: - /* forward: no modifications allowed */ - diff --git a/src/patches/squid-3.4-13234.patch b/src/patches/squid-3.4-13234.patch deleted file mode 100644 index 6f701fa..0000000 --- a/src/patches/squid-3.4-13234.patch +++ /dev/null @@ -1,33 +0,0 @@ ------------------------------------------------------------- -revno: 13234 -revision-id: squid3(a)treenet.co.nz-20160420101437-36eofkldxfku61kj -parent: squid3(a)treenet.co.nz-20160420063907-hcnf4qmcg5hbjc11 -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.4 -timestamp: Wed 2016-04-20 22:14:37 +1200 -message: - nullptr is a C++11 feature ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160420101437-36eofkldxfku61kj -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: 0f9f2a5b29a7ef02befe2a4e2e6357ef4bcffbce -# timestamp: 2016-04-20 10:51:03 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20160420063907-\ -# hcnf4qmcg5hbjc11 -# -# Begin patch -=== modified file 'src/tests/stub_cbdata.cc' ---- src/tests/stub_cbdata.cc 2016-04-20 06:39:07 +0000 -+++ src/tests/stub_cbdata.cc 2016-04-20 10:14:37 +0000 -@@ -10,7 +10,7 @@ - } - void *cbdataInternalFree(void *p, const char *, int) { - xfree(p); -- return nullptr; -+ return NULL; - } - #if USE_CBDATA_DEBUG - void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL) - diff --git a/src/patches/squid-3.4-13235.patch b/src/patches/squid-3.4-13235.patch deleted file mode 100644 index e380225..0000000 --- a/src/patches/squid-3.4-13235.patch +++ /dev/null @@ -1,97 +0,0 @@ ------------------------------------------------------------- -revno: 13235 -revision-id: squid3(a)treenet.co.nz-20160420111514-4hpxglbn9k15l5sa -parent: squid3(a)treenet.co.nz-20160420101437-36eofkldxfku61kj -committer: Amos Jeffries <squid3(a)treenet.co.nz> -branch nick: 3.4 -timestamp: Wed 2016-04-20 23:15:14 +1200 -message: - Fix several ESI element construction issues - - * Do not wrap active logic in assert(). - - * Fix localbuf array bounds checking. - - * Add Must() conditions to verify array writes will succeed ------------------------------------------------------------- -# Bazaar merge directive format 2 (Bazaar 0.90) -# revision_id: squid3(a)treenet.co.nz-20160420111514-4hpxglbn9k15l5sa -# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# testament_sha1: e95687b13c98667ab09966e7f94d511ca3e6ad96 -# timestamp: 2016-04-20 11:18:22 +0000 -# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.4 -# base_revision_id: squid3(a)treenet.co.nz-20160420101437-\ -# 36eofkldxfku61kj -# -# Begin patch -=== modified file 'src/esi/Esi.cc' ---- src/esi/Esi.cc 2013-06-27 15:58:46 +0000 -+++ src/esi/Esi.cc 2016-04-20 11:15:14 +0000 -@@ -991,7 +991,7 @@ - ESIElement::Pointer element; - int specifiedattcount = attrCount * 2; - char *position; -- assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */ -+ Must(ellen < sizeof(localbuf)); /* prevent unexpected overruns. */ - - debugs(86, 5, "ESIContext::Start: element '" << el << "' with " << specifiedattcount << " tags"); - -@@ -1005,15 +1005,17 @@ - /* Spit out elements we aren't interested in */ - localbuf[0] = '<'; - localbuf[1] = '\0'; -- assert (xstrncpy (&localbuf[1], el, sizeof(localbuf) - 2)); -+ xstrncpy(&localbuf[1], el, sizeof(localbuf) - 2); - position = localbuf + strlen (localbuf); - - for (i = 0; i < specifiedattcount && attr[i]; i += 2) { -+ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1); - *position = ' '; - ++position; - /* TODO: handle thisNode gracefully */ -- assert (xstrncpy (position, attr[i], sizeof(localbuf) + (position - localbuf))); -+ xstrncpy(position, attr[i], sizeof(localbuf) - (position - localbuf)); - position += strlen (position); -+ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2); - *position = '='; - ++position; - *position = '\"'; -@@ -1022,18 +1024,21 @@ - char ch; - while ((ch = *chPtr++) != '\0') { - if (ch == '\"') { -- assert( xstrncpy(position, """, sizeof(localbuf) + (position-localbuf)) ); -+ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 6); -+ xstrncpy(position, """, sizeof(localbuf) - (position-localbuf)); - position += 6; - } else { -+ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1); - *position = ch; - ++position; - } - } -- position += strlen (position); -+ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1); - *position = '\"'; - ++position; - } - -+ Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2); - *position = '>'; - ++position; - *position = '\0'; -@@ -1119,11 +1124,11 @@ - switch (ESIElement::IdentifyElement (el)) { - - case ESIElement::ESI_ELEMENT_NONE: -- assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */ -+ Must(ellen < sizeof(localbuf) - 3); /* prevent unexpected overruns. */ - /* Add elements we aren't interested in */ - localbuf[0] = '<'; - localbuf[1] = '/'; -- assert (xstrncpy (&localbuf[2], el, sizeof(localbuf) - 3)); -+ xstrncpy(&localbuf[2], el, sizeof(localbuf) - 3); - position = localbuf + strlen (localbuf); - *position = '>'; - ++position; - hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. efccb4330333aa4460475fa96539e1613697896b
by git＠ipfire.org 07 May '16

07 May '16

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 efccb4330333aa4460475fa96539e1613697896b (commit) via 86eda7b5521f04fbf3648534a35f89409a94837a (commit) via fb196971e9bac3b8055547f8273e4bad786f896d (commit) via 03306ff6a25238e01a1f2b39fbb929cf56615934 (commit) from be700f1806ed83225923dbd85b4574b8220db698 (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 efccb4330333aa4460475fa96539e1613697896b Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Sat May 7 13:01:58 2016 +0200 squid: Update to 3.5.18 Removed unecessary quotations and two configure-options, see: ftp://ftp.fu-berlin.de/unix/www/squid/archive/3.1/squid-3.1.0.16-RELEASENOTES.html --with-aio Deprecated. POSIX AIO is now auto-detected and enabled. Use --without-aio to disable, but only if you really have to. --with-pthreads Deprecated. pthreads library is now auto-detected and enabled. Use --without-pthreads to disable, but only if you really have to. Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 86eda7b5521f04fbf3648534a35f89409a94837a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 7 13:23:28 2016 +0100 tor: Update to 0.2.7.6 Fixes #11117 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit fb196971e9bac3b8055547f8273e4bad786f896d Merge: 03306ff be700f1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat May 7 12:32:27 2016 +0100 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next commit 03306ff6a25238e01a1f2b39fbb929cf56615934 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue May 3 22:50:53 2016 +0100 general-functions.pl: Allow underscores in domain names Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 13 ++++--------- lfs/squid | 12 +++++------- lfs/tor | 6 +++--- 3 files changed, 12 insertions(+), 19 deletions(-) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index f3a2e47..d3d7251 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -633,15 +633,10 @@ sub validdomainname # Each part should be no more than 63 characters in length if (length ($part) < 1 || length ($part) > 63) { return 0;} - # Only valid characters are a-z, A-Z, 0-9 and - - if ($part !~ /^[a-zA-Z0-9-]*$/) { - return 0;} - # First character can only be a letter or a digit - if (substr ($part, 0, 1) !~ /^[a-zA-Z0-9]*$/) { - return 0;} - # Last character can only be a letter or a digit - if (substr ($part, -1, 1) !~ /^[a-zA-Z0-9]*$/) { - return 0;} + # Only valid characters are a-z, A-Z, 0-9, _ and - + if ($part !~ /^[a-zA-Z0-9_-]*$/) { + return 0; + } } return 1; } diff --git a/lfs/squid b/lfs/squid index 66ad875..a7edc9d 100644 --- a/lfs/squid +++ b/lfs/squid @@ -24,7 +24,7 @@ include Config -VER = 3.5.17 +VER = 3.5.18 THISAPP = squid-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2dc73cc01e77b1bd16d9070780ae79b1 +$(DL_FILE)_MD5 = 9ae3843c341e8a142e963ab937c51cdd install : $(TARGET) @@ -92,10 +92,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --disable-ipv6 \ --enable-poll \ --enable-ident-lookups \ - --enable-storeio="aufs,diskd,ufs" \ + --enable-storeio=aufs,diskd,ufs \ --enable-underscores \ --enable-http-violations \ - --enable-removal-policies="heap,lru" \ + --enable-removal-policies=heap,lru \ --enable-delay-pools \ --enable-linux-netfilter \ --enable-snmp \ @@ -119,11 +119,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --enable-kill-parent-hack \ --enable-icap-client \ --enable-zph-qos \ - --with-pthreads \ --with-dl \ --with-filedescriptors=$$(( 16384 * 64 )) \ - --with-large-files \ - --with-aio + --with-large-files cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install diff --git a/lfs/tor b/lfs/tor index 91eab09..4cecf23 100644 --- a/lfs/tor +++ b/lfs/tor @@ -24,7 +24,7 @@ include Config -VER = 0.2.6.9 +VER = 0.2.7.6 THISAPP = tor-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = tor -PAK_VER = 15 +PAK_VER = 16 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4a1b334c30d7b37ea72fa33425220d5d +$(DL_FILE)_MD5 = cc19107b57136a68e8c563bf2d35b072 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. be700f1806ed83225923dbd85b4574b8220db698
by git＠ipfire.org 06 May '16

06 May '16

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 be700f1806ed83225923dbd85b4574b8220db698 (commit) from f61b838fb0842bf76e7cf12f3eaa6e86bfd275be (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 be700f1806ed83225923dbd85b4574b8220db698 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri May 6 15:32:01 2016 +0200 core103: start Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{102 => 103}/exclude | 0 config/rootfiles/core/{102 => 103}/filelists/files | 0 config/rootfiles/core/{102 => 103}/meta | 0 config/rootfiles/core/{102 => 103}/update.sh | 2 +- config/rootfiles/oldcore/{101 => 102}/exclude | 0 config/rootfiles/oldcore/{98 => 102}/filelists/files | 0 config/rootfiles/{core => oldcore}/102/filelists/i586/openssl-sse2 | 0 config/rootfiles/{core => oldcore}/102/filelists/openssh | 0 config/rootfiles/{core => oldcore}/102/filelists/openssl | 0 config/rootfiles/oldcore/{99 => 102}/meta | 0 config/rootfiles/{core => oldcore}/102/update.sh | 0 make.sh | 2 +- 12 files changed, 2 insertions(+), 2 deletions(-) rename config/rootfiles/core/{102 => 103}/exclude (100%) rename config/rootfiles/core/{102 => 103}/filelists/files (100%) rename config/rootfiles/core/{102 => 103}/meta (100%) copy config/rootfiles/core/{102 => 103}/update.sh (99%) copy config/rootfiles/oldcore/{101 => 102}/exclude (100%) copy config/rootfiles/oldcore/{98 => 102}/filelists/files (100%) rename config/rootfiles/{core => oldcore}/102/filelists/i586/openssl-sse2 (100%) rename config/rootfiles/{core => oldcore}/102/filelists/openssh (100%) rename config/rootfiles/{core => oldcore}/102/filelists/openssl (100%) copy config/rootfiles/oldcore/{99 => 102}/meta (100%) rename config/rootfiles/{core => oldcore}/102/update.sh (100%) Difference in files: diff --git a/config/rootfiles/core/102/exclude b/config/rootfiles/core/102/exclude deleted file mode 100644 index 7ddeae0..0000000 --- a/config/rootfiles/core/102/exclude +++ /dev/null @@ -1,28 +0,0 @@ -boot/config.txt -boot/grub/grub.cfg -boot/grub/grubenv -etc/alternatives -etc/collectd.custom -etc/default/grub -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -etc/localtime -etc/shadow -etc/snort/snort.conf -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf -etc/sudoers -etc/sysconfig/firewall.local -etc/sysconfig/rc.local -etc/udev/rules.d/30-persistent-network.rules -srv/web/ipfire/html/proxy.pac -var/ipfire/dma -var/ipfire/time -var/ipfire/ovpn -var/lib/alternatives -var/log/cache -var/state/dhcp/dhcpd.leases -var/updatecache diff --git a/config/rootfiles/core/102/filelists/files b/config/rootfiles/core/102/filelists/files deleted file mode 100644 index 409e5fe..0000000 --- a/config/rootfiles/core/102/filelists/files +++ /dev/null @@ -1,2 +0,0 @@ -etc/system-release -etc/issue diff --git a/config/rootfiles/core/102/filelists/i586/openssl-sse2 b/config/rootfiles/core/102/filelists/i586/openssl-sse2 deleted file mode 120000 index f424713..0000000 --- a/config/rootfiles/core/102/filelists/i586/openssl-sse2 +++ /dev/null @@ -1 +0,0 @@ -../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/102/filelists/openssh b/config/rootfiles/core/102/filelists/openssh deleted file mode 120000 index d8c77fd..0000000 --- a/config/rootfiles/core/102/filelists/openssh +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/core/102/filelists/openssl b/config/rootfiles/core/102/filelists/openssl deleted file mode 120000 index e011a92..0000000 --- a/config/rootfiles/core/102/filelists/openssl +++ /dev/null @@ -1 +0,0 @@ -../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/102/meta b/config/rootfiles/core/102/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/102/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/102/update.sh b/config/rootfiles/core/102/update.sh deleted file mode 100644 index 2f51d10..0000000 --- a/config/rootfiles/core/102/update.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 - -core=102 - -function exit_with_error() { - # Set last succesfull installed core. - echo $(($core-1)) > /opt/pakfire/db/core/mine - /usr/bin/logger -p syslog.emerg -t ipfire \ - "core-update-${core}: $1" - exit $2 -} - -# Remove old core updates from pakfire cache to save space... -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - - -# Stop services - -# Extract files -extract_files - -# update linker config -ldconfig - -# Update Language cache -#/usr/local/bin/update-lang-cache - -# -# Start services -# - -sync -# This update need a reboot... -touch /var/run/need_reboot - -# Finish -/etc/init.d/fireinfo start -sendprofile - -# Update grub config to display new core version -if [ -e /boot/grub/grub.cfg ]; then - grub-mkconfig -o /boot/grub/grub.cfg -fi -sync - -# Don't report the exitcode last command -exit 0 diff --git a/config/rootfiles/core/103/exclude b/config/rootfiles/core/103/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/core/103/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/core/103/filelists/files b/config/rootfiles/core/103/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/core/103/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/103/meta b/config/rootfiles/core/103/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/103/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/core/103/update.sh new file mode 100644 index 0000000..924cab3 --- /dev/null +++ b/config/rootfiles/core/103/update.sh @@ -0,0 +1,74 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=103 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# +# Start services +# + +sync +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/oldcore/102/exclude b/config/rootfiles/oldcore/102/exclude new file mode 100644 index 0000000..7ddeae0 --- /dev/null +++ b/config/rootfiles/oldcore/102/exclude @@ -0,0 +1,28 @@ +boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv +etc/alternatives +etc/collectd.custom +etc/default/grub +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +etc/localtime +etc/shadow +etc/snort/snort.conf +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +etc/sudoers +etc/sysconfig/firewall.local +etc/sysconfig/rc.local +etc/udev/rules.d/30-persistent-network.rules +srv/web/ipfire/html/proxy.pac +var/ipfire/dma +var/ipfire/time +var/ipfire/ovpn +var/lib/alternatives +var/log/cache +var/state/dhcp/dhcpd.leases +var/updatecache diff --git a/config/rootfiles/oldcore/102/filelists/files b/config/rootfiles/oldcore/102/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/oldcore/102/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/oldcore/102/filelists/i586/openssl-sse2 b/config/rootfiles/oldcore/102/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/oldcore/102/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/oldcore/102/filelists/openssh b/config/rootfiles/oldcore/102/filelists/openssh new file mode 120000 index 0000000..d8c77fd --- /dev/null +++ b/config/rootfiles/oldcore/102/filelists/openssh @@ -0,0 +1 @@ +../../../common/openssh \ No newline at end of file diff --git a/config/rootfiles/oldcore/102/filelists/openssl b/config/rootfiles/oldcore/102/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/oldcore/102/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/oldcore/102/meta b/config/rootfiles/oldcore/102/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/oldcore/102/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/oldcore/102/update.sh b/config/rootfiles/oldcore/102/update.sh new file mode 100644 index 0000000..2f51d10 --- /dev/null +++ b/config/rootfiles/oldcore/102/update.sh @@ -0,0 +1,74 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 3 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2016 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +core=102 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + + +# Stop services + +# Extract files +extract_files + +# update linker config +ldconfig + +# Update Language cache +#/usr/local/bin/update-lang-cache + +# +# Start services +# + +sync +# This update need a reboot... +touch /var/run/need_reboot + +# Finish +/etc/init.d/fireinfo start +sendprofile + +# Update grub config to display new core version +if [ -e /boot/grub/grub.cfg ]; then + grub-mkconfig -o /boot/grub/grub.cfg +fi +sync + +# Don't report the exitcode last command +exit 0 diff --git a/make.sh b/make.sh index bdf58b9..fee4edd 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="102" # Core Level (Filename) +CORE="103" # Core Level (Filename) PAKFIRE_CORE="102" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f61b838fb0842bf76e7cf12f3eaa6e86bfd275be
by git＠ipfire.org 06 May '16

06 May '16

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 f61b838fb0842bf76e7cf12f3eaa6e86bfd275be (commit) from 4558108c4d1ed68b7f47287239b529b0cf909109 (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 f61b838fb0842bf76e7cf12f3eaa6e86bfd275be Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri May 6 15:16:12 2016 +0200 linux-pae: prevent install on non pae systems Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/paks/linux-pae/install.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) Difference in files: diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 58a9c1c..ef271f3 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2014 IPFire-Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2016 IPFire-Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -42,6 +42,13 @@ function find_partition() { return 0 } +if [ "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + rm -f /opt/pakfire/db/instelled/meta-linux-pae + /usr/bin/logger -p syslog.emerg -i pakfire \ + "linux-pae: no pae support found, aborted!" + exit 1 +fi + extract_files # KVER=xxxKVERxxx @@ -75,8 +82,6 @@ else ln -s grub.conf $MNThdd/boot/grub/menu.lst fi -# request a reboot if pae is supported -if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - touch /var/run/need_reboot -fi +# request a reboot +touch /var/run/need_reboot sync && sync \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4558108c4d1ed68b7f47287239b529b0cf909109
by git＠ipfire.org 06 May '16

06 May '16

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 4558108c4d1ed68b7f47287239b529b0cf909109 (commit) from fe6e5e03d53d80117abde47c9965c82cbc25ddcc (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 4558108c4d1ed68b7f47287239b529b0cf909109 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri May 6 11:22:05 2016 +0200 clamav: rework initskript display download wait, increase time to 15min and remove tmp files at freshclam terminate. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/clamav | 2 +- src/initscripts/init.d/clamav | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) Difference in files: diff --git a/lfs/clamav b/lfs/clamav index a286017..8911619 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 32 +PAK_VER = 33 DEPS = "" diff --git a/src/initscripts/init.d/clamav b/src/initscripts/init.d/clamav index 5b31e02..fa080a6 100644 --- a/src/initscripts/init.d/clamav +++ b/src/initscripts/init.d/clamav @@ -9,17 +9,31 @@ case "$1" in if [ $(basename $0) == "clamav" ]; then boot_mesg "Starting Clamav Definition Updater..." loadproc /usr/bin/freshclam -d -c 10 - - boot_mesg "Starting Clamav Daemon..." + COUNTER=0 - while [ "$COUNTER" -lt "30" ]; do + while [ "$COUNTER" -lt "61" ]; do [ -e "/usr/share/clamav/main.cvd" ] && \ [ -e "/usr/share/clamav/daily.cvd" ] || \ [ -e "/usr/share/clamav/daily.cld" ] && \ break - sleep 5 + if [ "$COUNTER" -lt "1" ]; then + boot_mesg -n "Download db " + else + boot_mesg -n "." + fi + sleep 15 COUNTER=$(($COUNTER + 1)) done + if [ "$COUNTER" -gt "0" ]; then + boot_mesg + fi + if [ "$COUNTER" -gt "60" ]; then + boot_mesg "Download takes longer than 15min check freshclam status!" + echo_failure; + exit 1; + fi + + boot_mesg "Starting Clamav Daemon..." loadproc /usr/sbin/clamd else boot_mesg "Starting Clamav in background..." @@ -32,7 +46,8 @@ case "$1" in stop) boot_mesg "Stopping Clamav Definition Updater..." killproc /usr/bin/freshclam - + rm -rf /usr/share/clamav/*.tmp + boot_mesg "Stopping Clamav Daemon..." killproc /usr/sbin/clamd ;; 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 May 2016