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 cfab012b143b6aaf7f181243c96616e060c08d05 (commit) via 25848b36da1363f46ad85570501e6aff7a3eec1e (commit) from 8b417dd143a02900f8ba06510d7ffa3039f15be8 (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 cfab012b143b6aaf7f181243c96616e060c08d05 Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jul 16 19:46:29 2013 +0200

squidclamav: Fix indentation of update script.

commit 25848b36da1363f46ad85570501e6aff7a3eec1e Author: Michael Tremer michael.tremer@ipfire.org Date: Tue Jul 16 19:42:53 2013 +0200

squidclamav: Fix permissions of /etc/squidclamav.conf.

The file must not be executable, but writeable by anybody in the group nobody.

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

Summary of changes: lfs/squidclamav | 3 ++- src/paks/squidclamav/update.sh | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-)

Difference in files: diff --git a/lfs/squidclamav b/lfs/squidclamav index 79bf5d0..7d9e6af 100644 --- a/lfs/squidclamav +++ b/lfs/squidclamav @@ -80,7 +80,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squidclamav-5.11-dont_use_ipv6.patch cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make install - install -v -m 755 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf + install -v -m 664 $(DIR_CONF)/squidclamav/squidclamav.conf /etc/squidclamav.conf + chown -v root:nobody /etc/squidclamav.conf install -v -m 644 $(DIR_SRC)/config/backup/includes/squidclamav /var/ipfire/backup/addons/includes/squidclamav chmod 755 /srv/web/ipfire/html/clwarn.cgi @rm -rf $(DIR_APP) diff --git a/src/paks/squidclamav/update.sh b/src/paks/squidclamav/update.sh index 4b54216..4376085 100644 --- a/src/paks/squidclamav/update.sh +++ b/src/paks/squidclamav/update.sh @@ -28,21 +28,26 @@ extract_files VERSION=$(cat /opt/pakfire/db/installed/meta-squidclamav | grep Release | cut -d" " -f2)

if [ "$VERSION" -gt "10" ]; then - restore_backup ${NAME} + restore_backup ${NAME} fi

if [ "$VERSION" -lt "11" ]; then - sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf + sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf fi

if [ "$VERSION" -lt "16" ]; then - sed -e "s/proxy none//g" -i /etc/squidclamav.conf - sed -e "s/^#squid_ip 127.0.0.1/squid_ip 127.0.0.1/g" \ - -e "s/^#squid_port 3128/squid_port 800/g" \ - -e "s/^#trust_cache 1/trust_cache 1/g" -i /etc/squidclamav.conf + sed -i /etc/squidclamav.conf \ + -e "s/proxy none//g" \ + -e "s/^#squid_ip 127.0.0.1/squid_ip 127.0.0.1/g" \ + -e "s/^#squid_port 3128/squid_port 800/g" \ + -e "s/^#trust_cache 1/trust_cache 1/g"

- # Regenerate configuration files. - perl /srv/web/ipfire/cgi-bin/proxy.cgi + # Fix permissions. + chmod 664 /etc/squidclamav.conf + chown root.nobody /etc/squidclamav.conf + + # Regenerate configuration files. + perl /srv/web/ipfire/cgi-bin/proxy.cgi fi

/etc/init.d/squid restart

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