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, seventeen has been updated via 940c90d098b927d93fe32720031aaaad0ed30a4d (commit) via 99154ed19de35327b2fc27cb7e1c08e88d7527e7 (commit) from 584601c70eccaeccbd9b1025b045439868c419b7 (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 940c90d098b927d93fe32720031aaaad0ed30a4d Author: Erik Kapfer erik.kapfer@ipfire.org Date: Thu Oct 30 16:42:47 2014 +0100

New Addon: tmux

commit 99154ed19de35327b2fc27cb7e1c08e88d7527e7 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu Oct 30 17:49:43 2014 +0100

squidclamav: Fix an error when parsing the client IP address

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/packages/tmux | 2 ++ lfs/squidclamav | 3 ++- lfs/{mtr => tmux} | 16 +++++++++------- make.sh | 1 + .../squidclamav-5.11-source-address-parsing-issue.patch | 13 +++++++++++++ 5 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 config/rootfiles/packages/tmux copy lfs/{mtr => tmux} (92%) create mode 100644 src/patches/squidclamav-5.11-source-address-parsing-issue.patch

Difference in files: diff --git a/config/rootfiles/packages/tmux b/config/rootfiles/packages/tmux new file mode 100644 index 0000000..9e0fd02 --- /dev/null +++ b/config/rootfiles/packages/tmux @@ -0,0 +1,2 @@ +usr/bin/tmux +#usr/share/man/man1/tmux.1 diff --git a/lfs/squidclamav b/lfs/squidclamav index 697b59a..4a7918c 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squidclamav -PAK_VER = 19 +PAK_VER = 20

DEPS = "clamav"

@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-dont_use_ipv6.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-squid-helper-protocol.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-source-address-parsing-issue.patch cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make install install -v -m 664 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf diff --git a/lfs/tmux b/lfs/tmux new file mode 100644 index 0000000..ec4cc20 --- /dev/null +++ b/lfs/tmux @@ -0,0 +1,87 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2014 IPFire Team info@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.9a + +THISAPP = tmux-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = tmux +PAK_VER = 1 + +DEPS = "" + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = b07601711f96f1d260b390513b509a2d + +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 zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr + + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index bbbaffd..b54499d 100755 --- a/make.sh +++ b/make.sh @@ -817,6 +817,7 @@ buildipfire() { ipfiremake perl-PDF-API2 ipfiremake squid-accounting ipfiremake pigz + ipfiremake tmux }

buildinstaller() { diff --git a/src/patches/squidclamav-5.11-source-address-parsing-issue.patch b/src/patches/squidclamav-5.11-source-address-parsing-issue.patch new file mode 100644 index 0000000..4031c73 --- /dev/null +++ b/src/patches/squidclamav-5.11-source-address-parsing-issue.patch @@ -0,0 +1,13 @@ +--- squidclamav-5.11/src/pattern.c~ 2014-10-29 13:08:05.658143495 +0000 ++++ squidclamav-5.11/src/pattern.c 2014-10-29 13:08:20.964642365 +0000 +@@ -151,10 +151,6 @@ + return 1; + } + +- /* extract source ipaddress and source fqdn */ +- if (parseSourceAddress(in_buff.src_address, "/") != 0) { +- } +- + if (debug != 0) + logit(log_file, "DEBUG Parsed request: %s %s/%s %s %s\n", in_buff.url, in_buff.ipaddress, in_buff.fqdn, in_buff.ident, in_buff.method); +

hooks/post-receive -- IPFire 2.x development tree