[arch-commits] Commit in clamav/repos (extra-i686 extra-i686/PKGBUILD)

Eric Bélanger eric at archlinux.org
Wed Jul 15 20:34:35 UTC 2009


    Date: Wednesday, July 15, 2009 @ 16:34:35
  Author: eric
Revision: 46323

Merged revisions 46321 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/clamav/trunk

........
  r46321 | eric | 2009-07-15 16:21:31 -0400 (Wed, 15 Jul 2009) | 2 lines
  
  upgpkg: clamav 0.95.2-1
      upstream update
........

Modified:
  clamav/repos/extra-i686/	(properties)
  clamav/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)


Property changes on: clamav/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /clamav/trunk:1-40060
   + /clamav/trunk:1-46322

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-07-15 20:22:01 UTC (rev 46322)
+++ extra-i686/PKGBUILD	2009-07-15 20:34:35 UTC (rev 46323)
@@ -3,7 +3,7 @@
 # Contributor: Gregor Ibic <gregor.ibic at intelicom.si>
 
 pkgname=clamav
-pkgver=0.95.1
+pkgver=0.95.2
 pkgrel=1
 pkgdesc="Anti-virus toolkit for Unix."
 arch=(i686 x86_64)
@@ -17,34 +17,32 @@
         clamav
 	clamav.confd
 	clamav.logrotate)
-md5sums=('c802d4b372e455849cfcb0d776fc72d8'
-         '338db2f3fbca9d5747ba635d576d8739'
-         'f1fd8e736f808da0487928274f585851'
-         'a7a4d527ba80ec9d4811e2264e9fab9e')
+md5sums=('930362397d30e01ba81b5f24c1046d48' '338db2f3fbca9d5747ba635d576d8739'\
+         'f1fd8e736f808da0487928274f585851' 'a7a4d527ba80ec9d4811e2264e9fab9e')
 
 build() {
-	cd $startdir/src/$pkgname-$pkgver
+	cd "$srcdir/$pkgname-$pkgver"
 	./configure --prefix=/usr --sysconfdir=/etc/clamav \
 		--with-dbdir=/var/lib/clamav --disable-clamav
 	# will add clamav user with clamav.install
 	make || return 1
-	make DESTDIR=$startdir/pkg install || return 1
+	make DESTDIR="$pkgdir" install || return 1
 
 	# make sure conf files get installed, cause make install
 	# doesn't do that if clamav is already installed upon building.
 	for i in clamd freshclam; do
-		install -D -m644 etc/$i.conf $startdir/pkg/etc/clamav/$i.conf
+		install -D -m644 etc/$i.conf "$pkgdir/etc/clamav/$i.conf"
 	done
 	
-	install -D -m644 $startdir/src/clamav.confd $startdir/pkg/etc/conf.d/clamav
-	install -D -m755 $startdir/src/clamav $startdir/pkg/etc/rc.d/clamav
-	install -D -m644 $startdir/src/clamav.logrotate	$startdir/pkg/etc/logrotate.d/clamav
+	install -D -m644 "$srcdir/clamav.confd" "$pkgdir/etc/conf.d/clamav"
+	install -D -m755 "$srcdir/clamav" "$pkgdir/etc/rc.d/clamav"
+	install -D -m644 "$srcdir/clamav.logrotate" "$pkgdir/etc/logrotate.d/clamav"
 
 	# create log dirs/files & fix conf files.
-	mkdir -p $startdir/pkg/var/log/clamav/
-	mkdir -p $startdir/pkg/var/run/clamav/
-	chown 64.root $startdir/pkg/var/log/clamav/
-	chown 64.root $startdir/pkg/var/run/clamav/
+	mkdir -p "$pkgdir/var/log/clamav/"
+	mkdir -p "$pkgdir/var/run/clamav/"
+	chown 64.root "$pkgdir/var/log/clamav/"
+	chown 64.root "$pkgdir/var/run/clamav/"
 
 	sed -i -e "s:\#LogFile /tmp/clamd.log:LogFile /var/log/clamav/clamd.log:" \
 		-e "s:\#PidFile /var/run/clamd.pid:PidFile /var/run/clamav/clamd.pid:" \
@@ -52,22 +50,22 @@
 		-e "s:\#LogTime:LogTime:" \
 		-e "s:\#TemporaryDirectory /var/tmp:TemporaryDirectory /tmp:" \
 		-e "s:\LocalSocket /tmp/clamd.socket:LocalSocket /var/lib/clamav/clamd.sock:" \
-		$startdir/pkg/etc/clamav/clamd.conf || return 1
+		"$pkgdir/etc/clamav/clamd.conf" || return 1
 
 	sed -i -e "s:\#UpdateLogFile /var/log/freshclam.log:UpdateLogFile /var/log/clamav/freshclam.log:" \
 		-e "s:\#NotifyClamd /path/to/clamd.conf$:NotifyClamd /etc/clamav/clamd.conf:" \
-		$startdir/pkg/etc/clamav/freshclam.conf || return 1
+		"$pkgdir/etc/clamav/freshclam.conf" || return 1
 
 	# fix perms on virus database directory and un-distribute databases to require freshclam
-	rm $startdir/pkg/var/lib/clamav/*.cvd
-	chown 64:64 -R $startdir/pkg/var/lib/clamav/
+	rm "$pkgdir"/var/lib/clamav/*.cvd
+	chown 64:64 -R "$pkgdir/var/lib/clamav/"
 
 	# install clamdwatch
-	cd $startdir/src/$pkgname-$pkgver/contrib/clamdwatch
+	cd "$srcdir/$pkgname-$pkgver/contrib/clamdwatch"
 	tar zxf clamdwatch.tar.gz
 	sed -i -e 's@/tmp/clamd.socket@/var/lib/clamav/clamd.sock@' \
 	       -e 's@/var/lock/subsys/clamd@/var/run/clamav/clamd.pid@' \
 	       -e 's at mkstemp( "/tmp/clamdwatch-XXXXXXXXXXXXXXXX" );@mkstemp( "/tmp/clamdwatch-XXXXXXXXXXXXXXXX" );\nchmod 0644, "$tempFile";@' clamdwatch || return 1
 
-	install -D -m755 clamdwatch $startdir/pkg/usr/sbin/clamdwatch.pl || return 1
+	install -D -m755 clamdwatch "$pkgdir/usr/sbin/clamdwatch.pl" || return 1
 }




More information about the arch-commits mailing list