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, master has been updated via 80c7f007fe5c70b1bbfa56286806e73ae1e93bfa (commit) via 78e1facfba34d36f37f24ed0a232dadfeed72f61 (commit) via d02e057e21b3e0729dacba2611b5a527e3e46fe4 (commit) from cadb66f381e606df01509e9a4e388b1d3b85752b (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 80c7f007fe5c70b1bbfa56286806e73ae1e93bfa Merge: 78e1fac cadb66f Author: Christian Schmidt maniacikarus@ipfire.org Date: Sat Apr 2 19:49:11 2011 +0200
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
Conflicts: config/rootfiles/core/49/filelists/files
commit 78e1facfba34d36f37f24ed0a232dadfeed72f61 Author: Christian Schmidt maniacikarus@ipfire.org Date: Sat Apr 2 19:45:12 2011 +0200
Change squid init script to kill remaining clamav redirectors.
commit d02e057e21b3e0729dacba2611b5a527e3e46fe4 Author: Christian Schmidt maniacikarus@ipfire.org Date: Sat Apr 2 19:44:35 2011 +0200
Added ntfs-3g to core49.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/49/filelists/files | 1 + .../{oldcore/32 => core/49}/filelists/ntfs-3g | 0 src/initscripts/init.d/squid | 1 + 3 files changed, 2 insertions(+), 0 deletions(-) copy config/rootfiles/{oldcore/32 => core/49}/filelists/ntfs-3g (100%)
Difference in files: diff --git a/config/rootfiles/core/49/filelists/files b/config/rootfiles/core/49/filelists/files index ed587ee..0051c60 100644 --- a/config/rootfiles/core/49/filelists/files +++ b/config/rootfiles/core/49/filelists/files @@ -1,4 +1,5 @@ etc/system-release +etc/init.d/squid var/ipfire/backup/bin/backup.pl srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi diff --git a/config/rootfiles/core/49/filelists/ntfs-3g b/config/rootfiles/core/49/filelists/ntfs-3g new file mode 120000 index 0000000..d93adc2 --- /dev/null +++ b/config/rootfiles/core/49/filelists/ntfs-3g @@ -0,0 +1 @@ +../../../common/ntfs-3g \ No newline at end of file diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index 75dbbfa..1a1425d 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -88,6 +88,7 @@ case "$1" in evaluate_retval killproc /usr/bin/squidGuard >/dev/null killproc /usr/sbin/updxlrator >/dev/null + killproc /usr/bin/squidclamav >/dev/null killproc /usr/sbin/squid >/dev/null rm -rf /var/run/squid.pid fi
hooks/post-receive -- IPFire 2.x development tree