Date: Friday, September 20, 2013 @ 04:05:29 Author: bisson Revision: 194640
archrelease: copy trunk to extra-i686, extra-x86_64 Added: clamav/repos/extra-i686/PKGBUILD (from rev 194639, clamav/trunk/PKGBUILD) clamav/repos/extra-i686/config.patch (from rev 194639, clamav/trunk/config.patch) clamav/repos/extra-i686/install (from rev 194639, clamav/trunk/install) clamav/repos/extra-i686/logrotate (from rev 194639, clamav/trunk/logrotate) clamav/repos/extra-i686/service (from rev 194639, clamav/trunk/service) clamav/repos/extra-i686/service.fresh (from rev 194639, clamav/trunk/service.fresh) clamav/repos/extra-i686/tmpfiles.d (from rev 194639, clamav/trunk/tmpfiles.d) clamav/repos/extra-x86_64/PKGBUILD (from rev 194639, clamav/trunk/PKGBUILD) clamav/repos/extra-x86_64/config.patch (from rev 194639, clamav/trunk/config.patch) clamav/repos/extra-x86_64/install (from rev 194639, clamav/trunk/install) clamav/repos/extra-x86_64/logrotate (from rev 194639, clamav/trunk/logrotate) clamav/repos/extra-x86_64/service (from rev 194639, clamav/trunk/service) clamav/repos/extra-x86_64/service.fresh (from rev 194639, clamav/trunk/service.fresh) clamav/repos/extra-x86_64/tmpfiles.d (from rev 194639, clamav/trunk/tmpfiles.d) Deleted: clamav/repos/extra-i686/PKGBUILD clamav/repos/extra-i686/config.patch clamav/repos/extra-i686/install clamav/repos/extra-i686/logrotate clamav/repos/extra-i686/service clamav/repos/extra-i686/service.fresh clamav/repos/extra-i686/tmpfiles.d clamav/repos/extra-x86_64/PKGBUILD clamav/repos/extra-x86_64/config.patch clamav/repos/extra-x86_64/install clamav/repos/extra-x86_64/logrotate clamav/repos/extra-x86_64/service clamav/repos/extra-x86_64/service.fresh clamav/repos/extra-x86_64/tmpfiles.d ----------------------------+ /PKGBUILD | 120 +++++++++++++++++++++++++++++++++++++++++++ /config.patch | 60 +++++++++++++++++++++ /install | 20 +++++++ /logrotate | 20 +++++++ /service | 20 +++++++ /service.fresh | 20 +++++++ /tmpfiles.d | 2 extra-i686/PKGBUILD | 65 ----------------------- extra-i686/config.patch | 30 ---------- extra-i686/install | 10 --- extra-i686/logrotate | 10 --- extra-i686/service | 10 --- extra-i686/service.fresh | 10 --- extra-i686/tmpfiles.d | 1 extra-x86_64/PKGBUILD | 65 ----------------------- extra-x86_64/config.patch | 30 ---------- extra-x86_64/install | 10 --- extra-x86_64/logrotate | 10 --- extra-x86_64/service | 10 --- extra-x86_64/service.fresh | 10 --- extra-x86_64/tmpfiles.d | 1 21 files changed, 262 insertions(+), 272 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-i686/PKGBUILD 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,65 +0,0 @@ -# $Id$ -# Contributor: Dale Blount <d...@archlinux.org> -# Contributor: Gregor Ibic <gregor.i...@intelicom.si> -# Maintainer: Gaetan Bisson <bis...@archlinux.org> - -pkgname=clamav -pkgver=0.97.8 -pkgrel=3 -pkgdesc='Anti-virus toolkit for Unix' -url='http://www.clamav.net/' -license=('GPL') -options=('!libtool') -arch=('i686' 'x86_64') -depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/logrotate.d/clamav') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'service' - 'service.fresh' - 'logrotate' - 'tmpfiles.d' - 'config.patch') -sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' - 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' - 'cda9a087e5593992150cb456e34c5f6f589aca82' - 'bb488a56b0f6a0760446cde89c1e3321e2717b78' - 'a224ea9b4d0f4f196827347d54bed51e11c197ea' - '1c8ef193919b041135115170acd6313f008de808') - -install=install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../config.patch -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --sysconfdir=/etc/clamav \ - --with-dbdir=/var/lib/clamav \ - --disable-clamav \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Make sure conf files get installed, because make install - # doesn't do that if clamav is already installed upon building. - install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf - install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf - - install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service - install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf - install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav - - install -d -o 64 -g 64 "${pkgdir}"/run/clamav - install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav - install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav -} Copied: clamav/repos/extra-i686/PKGBUILD (from rev 194639, clamav/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,60 @@ +# $Id$ +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Gregor Ibic <gregor.i...@intelicom.si> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=clamav +pkgver=0.98 +pkgrel=1 +pkgdesc='Anti-virus toolkit for Unix' +url='http://www.clamav.net/' +license=('GPL') +options=('!libtool') +arch=('i686' 'x86_64') +depends=('bzip2' 'libltdl') +backup=('etc/logrotate.d/clamav') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'service' + 'service.fresh' + 'logrotate' + 'tmpfiles.d' + 'config.patch') +sha1sums=('1e6a7284721387646c713a8d32fa8b5a897985db' + 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' + 'cda9a087e5593992150cb456e34c5f6f589aca82' + 'bb488a56b0f6a0760446cde89c1e3321e2717b78' + 'a224ea9b4d0f4f196827347d54bed51e11c197ea' + '00dfadd93d11186793cb1161745f9dd7370beb99') + +install=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../config.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc/clamav \ + --with-dbdir=/var/lib/clamav \ + --disable-clamav \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf + install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav + + install -d -o 64 -g 64 "${pkgdir}"/run/clamav + install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav + install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav +} Deleted: extra-i686/config.patch =================================================================== --- extra-i686/config.patch 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-i686/config.patch 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,30 +0,0 @@ -diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf ---- old/etc/clamd.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/clamd.conf 2010-12-02 19:31:45.873357389 +0100 -@@ -14 +14 @@ --#LogFile /tmp/clamd.log -+LogFile /var/log/clamav/clamd.log -@@ -34 +34 @@ --#LogTime yes -+LogTime yes -@@ -61 +61 @@ --#PidFile /var/run/clamd.pid -+PidFile /run/clamav/clamd.pid -@@ -65 +65 @@ --#TemporaryDirectory /var/tmp -+TemporaryDirectory /tmp -@@ -80 +80 @@ --#LocalSocket /tmp/clamd.socket -+LocalSocket /var/lib/clamav/clamd.sock -@@ -190 +190 @@ --#User clamav -+User clamav -diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf ---- old/etc/freshclam.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/freshclam.conf 2010-12-02 19:31:51.190024057 +0100 -@@ -17 +17 @@ --#UpdateLogFile /var/log/freshclam.log -+UpdateLogFile /var/log/clamav/freshclam.log -@@ -121 +121 @@ --#NotifyClamd /path/to/clamd.conf -+NotifyClamd /etc/clamav/clamd.conf Copied: clamav/repos/extra-i686/config.patch (from rev 194639, clamav/trunk/config.patch) =================================================================== --- extra-i686/config.patch (rev 0) +++ extra-i686/config.patch 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,30 @@ +diff -arU 0 old/etc/clamd.conf.sample new/etc/clamd.conf.sample +--- old/etc/clamd.conf.sample 2010-12-02 19:31:21.773357389 +0100 ++++ new/etc/clamd.conf.sample 2010-12-02 19:31:45.873357389 +0100 +@@ -14 +14 @@ +-#LogFile /tmp/clamd.log ++LogFile /var/log/clamav/clamd.log +@@ -34 +34 @@ +-#LogTime yes ++LogTime yes +@@ -61 +61 @@ +-#PidFile /var/run/clamd.pid ++PidFile /run/clamav/clamd.pid +@@ -65 +65 @@ +-#TemporaryDirectory /var/tmp ++TemporaryDirectory /tmp +@@ -80 +80 @@ +-#LocalSocket /tmp/clamd.socket ++LocalSocket /var/lib/clamav/clamd.sock +@@ -190 +190 @@ +-#User clamav ++User clamav +diff -arU 0 old/etc/freshclam.conf.sample new/etc/freshclam.conf.sample +--- old/etc/freshclam.conf.sample 2010-12-02 19:31:21.773357389 +0100 ++++ new/etc/freshclam.conf.sample 2010-12-02 19:31:51.190024057 +0100 +@@ -17 +17 @@ +-#UpdateLogFile /var/log/freshclam.log ++UpdateLogFile /var/log/clamav/freshclam.log +@@ -121 +121 @@ +-#NotifyClamd /path/to/clamd.conf ++NotifyClamd /etc/clamav/clamd.conf Deleted: extra-i686/install =================================================================== --- extra-i686/install 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-i686/install 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,10 +0,0 @@ -post_install() { - getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null - getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null -} - -post_remove() { - getent passwd clamav &>/dev/null && userdel clamav >/dev/null - getent group clamav &>/dev/null && groupdel clamav >/dev/null - return 0 -} Copied: clamav/repos/extra-i686/install (from rev 194639, clamav/trunk/install) =================================================================== --- extra-i686/install (rev 0) +++ extra-i686/install 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,10 @@ +post_install() { + getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null + getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null +} + +post_remove() { + getent passwd clamav &>/dev/null && userdel clamav >/dev/null + getent group clamav &>/dev/null && groupdel clamav >/dev/null + return 0 +} Deleted: extra-i686/logrotate =================================================================== --- extra-i686/logrotate 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-i686/logrotate 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,10 +0,0 @@ -/var/log/clamav/clamd.log /var/log/clamav/freshclam.log { - create 644 clamav clamav - sharedscripts - missingok - notifempty - postrotate - /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true - /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true - endscript -} Copied: clamav/repos/extra-i686/logrotate (from rev 194639, clamav/trunk/logrotate) =================================================================== --- extra-i686/logrotate (rev 0) +++ extra-i686/logrotate 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,10 @@ +/var/log/clamav/clamd.log /var/log/clamav/freshclam.log { + create 644 clamav clamav + sharedscripts + missingok + notifempty + postrotate + /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true + endscript +} Deleted: extra-i686/service =================================================================== --- extra-i686/service 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-i686/service 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,10 +0,0 @@ -[Unit] -Description=clamav daemon - -[Service] -Type=forking -PIDFile=/run/clamav/clamd.pid -ExecStart=/usr/bin/clamd - -[Install] -WantedBy=multi-user.target Copied: clamav/repos/extra-i686/service (from rev 194639, clamav/trunk/service) =================================================================== --- extra-i686/service (rev 0) +++ extra-i686/service 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,10 @@ +[Unit] +Description=clamav daemon + +[Service] +Type=forking +PIDFile=/run/clamav/clamd.pid +ExecStart=/usr/bin/clamd + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/service.fresh =================================================================== --- extra-i686/service.fresh 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-i686/service.fresh 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,10 +0,0 @@ -[Unit] -Description=clamav updater - -[Service] -Type=forking -PIDFile=/run/clamav/freshclam.pid -ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid - -[Install] -WantedBy=multi-user.target Copied: clamav/repos/extra-i686/service.fresh (from rev 194639, clamav/trunk/service.fresh) =================================================================== --- extra-i686/service.fresh (rev 0) +++ extra-i686/service.fresh 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,10 @@ +[Unit] +Description=clamav updater + +[Service] +Type=forking +PIDFile=/run/clamav/freshclam.pid +ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid + +[Install] +WantedBy=multi-user.target Deleted: extra-i686/tmpfiles.d =================================================================== --- extra-i686/tmpfiles.d 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-i686/tmpfiles.d 2013-09-20 02:05:29 UTC (rev 194640) @@ -1 +0,0 @@ -d /run/clamav 0755 clamav clamav Copied: clamav/repos/extra-i686/tmpfiles.d (from rev 194639, clamav/trunk/tmpfiles.d) =================================================================== --- extra-i686/tmpfiles.d (rev 0) +++ extra-i686/tmpfiles.d 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1 @@ +d /run/clamav 0755 clamav clamav Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-x86_64/PKGBUILD 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,65 +0,0 @@ -# $Id$ -# Contributor: Dale Blount <d...@archlinux.org> -# Contributor: Gregor Ibic <gregor.i...@intelicom.si> -# Maintainer: Gaetan Bisson <bis...@archlinux.org> - -pkgname=clamav -pkgver=0.97.8 -pkgrel=3 -pkgdesc='Anti-virus toolkit for Unix' -url='http://www.clamav.net/' -license=('GPL') -options=('!libtool') -arch=('i686' 'x86_64') -depends=('bzip2' 'libltdl') -backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/logrotate.d/clamav') -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'service' - 'service.fresh' - 'logrotate' - 'tmpfiles.d' - 'config.patch') -sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' - 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' - 'cda9a087e5593992150cb456e34c5f6f589aca82' - 'bb488a56b0f6a0760446cde89c1e3321e2717b78' - 'a224ea9b4d0f4f196827347d54bed51e11c197ea' - '1c8ef193919b041135115170acd6313f008de808') - -install=install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../config.patch -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --sysconfdir=/etc/clamav \ - --with-dbdir=/var/lib/clamav \ - --disable-clamav \ - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - # Make sure conf files get installed, because make install - # doesn't do that if clamav is already installed upon building. - install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf - install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf - - install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service - install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service - install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf - install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav - - install -d -o 64 -g 64 "${pkgdir}"/run/clamav - install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav - install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav -} Copied: clamav/repos/extra-x86_64/PKGBUILD (from rev 194639, clamav/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,60 @@ +# $Id$ +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Gregor Ibic <gregor.i...@intelicom.si> +# Maintainer: Gaetan Bisson <bis...@archlinux.org> + +pkgname=clamav +pkgver=0.98 +pkgrel=1 +pkgdesc='Anti-virus toolkit for Unix' +url='http://www.clamav.net/' +license=('GPL') +options=('!libtool') +arch=('i686' 'x86_64') +depends=('bzip2' 'libltdl') +backup=('etc/logrotate.d/clamav') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" + 'service' + 'service.fresh' + 'logrotate' + 'tmpfiles.d' + 'config.patch') +sha1sums=('1e6a7284721387646c713a8d32fa8b5a897985db' + 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' + 'cda9a087e5593992150cb456e34c5f6f589aca82' + 'bb488a56b0f6a0760446cde89c1e3321e2717b78' + 'a224ea9b4d0f4f196827347d54bed51e11c197ea' + '00dfadd93d11186793cb1161745f9dd7370beb99') + +install=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../config.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --sysconfdir=/etc/clamav \ + --with-dbdir=/var/lib/clamav \ + --disable-clamav \ + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service + install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf + install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav + + install -d -o 64 -g 64 "${pkgdir}"/run/clamav + install -d -o 64 -g 64 "${pkgdir}"/var/log/clamav + install -d -o 64 -g 64 "${pkgdir}"/var/lib/clamav +} Deleted: extra-x86_64/config.patch =================================================================== --- extra-x86_64/config.patch 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-x86_64/config.patch 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,30 +0,0 @@ -diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf ---- old/etc/clamd.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/clamd.conf 2010-12-02 19:31:45.873357389 +0100 -@@ -14 +14 @@ --#LogFile /tmp/clamd.log -+LogFile /var/log/clamav/clamd.log -@@ -34 +34 @@ --#LogTime yes -+LogTime yes -@@ -61 +61 @@ --#PidFile /var/run/clamd.pid -+PidFile /run/clamav/clamd.pid -@@ -65 +65 @@ --#TemporaryDirectory /var/tmp -+TemporaryDirectory /tmp -@@ -80 +80 @@ --#LocalSocket /tmp/clamd.socket -+LocalSocket /var/lib/clamav/clamd.sock -@@ -190 +190 @@ --#User clamav -+User clamav -diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf ---- old/etc/freshclam.conf 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/freshclam.conf 2010-12-02 19:31:51.190024057 +0100 -@@ -17 +17 @@ --#UpdateLogFile /var/log/freshclam.log -+UpdateLogFile /var/log/clamav/freshclam.log -@@ -121 +121 @@ --#NotifyClamd /path/to/clamd.conf -+NotifyClamd /etc/clamav/clamd.conf Copied: clamav/repos/extra-x86_64/config.patch (from rev 194639, clamav/trunk/config.patch) =================================================================== --- extra-x86_64/config.patch (rev 0) +++ extra-x86_64/config.patch 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,30 @@ +diff -arU 0 old/etc/clamd.conf.sample new/etc/clamd.conf.sample +--- old/etc/clamd.conf.sample 2010-12-02 19:31:21.773357389 +0100 ++++ new/etc/clamd.conf.sample 2010-12-02 19:31:45.873357389 +0100 +@@ -14 +14 @@ +-#LogFile /tmp/clamd.log ++LogFile /var/log/clamav/clamd.log +@@ -34 +34 @@ +-#LogTime yes ++LogTime yes +@@ -61 +61 @@ +-#PidFile /var/run/clamd.pid ++PidFile /run/clamav/clamd.pid +@@ -65 +65 @@ +-#TemporaryDirectory /var/tmp ++TemporaryDirectory /tmp +@@ -80 +80 @@ +-#LocalSocket /tmp/clamd.socket ++LocalSocket /var/lib/clamav/clamd.sock +@@ -190 +190 @@ +-#User clamav ++User clamav +diff -arU 0 old/etc/freshclam.conf.sample new/etc/freshclam.conf.sample +--- old/etc/freshclam.conf.sample 2010-12-02 19:31:21.773357389 +0100 ++++ new/etc/freshclam.conf.sample 2010-12-02 19:31:51.190024057 +0100 +@@ -17 +17 @@ +-#UpdateLogFile /var/log/freshclam.log ++UpdateLogFile /var/log/clamav/freshclam.log +@@ -121 +121 @@ +-#NotifyClamd /path/to/clamd.conf ++NotifyClamd /etc/clamav/clamd.conf Deleted: extra-x86_64/install =================================================================== --- extra-x86_64/install 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-x86_64/install 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,10 +0,0 @@ -post_install() { - getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null - getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null -} - -post_remove() { - getent passwd clamav &>/dev/null && userdel clamav >/dev/null - getent group clamav &>/dev/null && groupdel clamav >/dev/null - return 0 -} Copied: clamav/repos/extra-x86_64/install (from rev 194639, clamav/trunk/install) =================================================================== --- extra-x86_64/install (rev 0) +++ extra-x86_64/install 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,10 @@ +post_install() { + getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null + getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null +} + +post_remove() { + getent passwd clamav &>/dev/null && userdel clamav >/dev/null + getent group clamav &>/dev/null && groupdel clamav >/dev/null + return 0 +} Deleted: extra-x86_64/logrotate =================================================================== --- extra-x86_64/logrotate 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-x86_64/logrotate 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,10 +0,0 @@ -/var/log/clamav/clamd.log /var/log/clamav/freshclam.log { - create 644 clamav clamav - sharedscripts - missingok - notifempty - postrotate - /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true - /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true - endscript -} Copied: clamav/repos/extra-x86_64/logrotate (from rev 194639, clamav/trunk/logrotate) =================================================================== --- extra-x86_64/logrotate (rev 0) +++ extra-x86_64/logrotate 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,10 @@ +/var/log/clamav/clamd.log /var/log/clamav/freshclam.log { + create 644 clamav clamav + sharedscripts + missingok + notifempty + postrotate + /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true + /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true + endscript +} Deleted: extra-x86_64/service =================================================================== --- extra-x86_64/service 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-x86_64/service 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,10 +0,0 @@ -[Unit] -Description=clamav daemon - -[Service] -Type=forking -PIDFile=/run/clamav/clamd.pid -ExecStart=/usr/bin/clamd - -[Install] -WantedBy=multi-user.target Copied: clamav/repos/extra-x86_64/service (from rev 194639, clamav/trunk/service) =================================================================== --- extra-x86_64/service (rev 0) +++ extra-x86_64/service 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,10 @@ +[Unit] +Description=clamav daemon + +[Service] +Type=forking +PIDFile=/run/clamav/clamd.pid +ExecStart=/usr/bin/clamd + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/service.fresh =================================================================== --- extra-x86_64/service.fresh 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-x86_64/service.fresh 2013-09-20 02:05:29 UTC (rev 194640) @@ -1,10 +0,0 @@ -[Unit] -Description=clamav updater - -[Service] -Type=forking -PIDFile=/run/clamav/freshclam.pid -ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid - -[Install] -WantedBy=multi-user.target Copied: clamav/repos/extra-x86_64/service.fresh (from rev 194639, clamav/trunk/service.fresh) =================================================================== --- extra-x86_64/service.fresh (rev 0) +++ extra-x86_64/service.fresh 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1,10 @@ +[Unit] +Description=clamav updater + +[Service] +Type=forking +PIDFile=/run/clamav/freshclam.pid +ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid + +[Install] +WantedBy=multi-user.target Deleted: extra-x86_64/tmpfiles.d =================================================================== --- extra-x86_64/tmpfiles.d 2013-09-20 02:04:26 UTC (rev 194639) +++ extra-x86_64/tmpfiles.d 2013-09-20 02:05:29 UTC (rev 194640) @@ -1 +0,0 @@ -d /run/clamav 0755 clamav clamav Copied: clamav/repos/extra-x86_64/tmpfiles.d (from rev 194639, clamav/trunk/tmpfiles.d) =================================================================== --- extra-x86_64/tmpfiles.d (rev 0) +++ extra-x86_64/tmpfiles.d 2013-09-20 02:05:29 UTC (rev 194640) @@ -0,0 +1 @@ +d /run/clamav 0755 clamav clamav