[arch-commits] Commit in dspam/trunk (PKGBUILD dspam.install)

[Sergej Pupykin]

    Date: Wednesday, August 28, 2013 @ 12:29:00
  Author: spupykin
Revision: 96418

upgpkg: dspam 3.10.2-6

upd

Modified:
  dspam/trunk/PKGBUILD
  dspam/trunk/dspam.install

---------------+
 PKGBUILD      |    6 +++---
 dspam.install |   10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-28 09:26:00 UTC (rev 96417)
+++ PKGBUILD	2013-08-28 10:29:00 UTC (rev 96418)
@@ -4,7 +4,7 @@
 
 pkgname=dspam
 pkgver=3.10.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A scalable, open-source statistical anti-spam filter"
 arch=('i686' 'x86_64')
 url="http://dspam.nuclearelephant.com/"
@@ -39,7 +39,7 @@
 	--enable-split-configuration --enable-syslog --enable-clamav \
 	--with-dspam-home=/var/lib/dspam --with-logdir=/var/log/dspam --with-logfile=/var/log/dspam/dspam.log \
 	--with-mysql-includes=/usr/include/mysql --with-mysql-libraries=/usr/lib \
-	--with-storage-driver="mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv,hash_drv" --enable-preferences-extension"
+	--with-storage-driver="hash_drv,mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv" --enable-preferences-extension"
 
   cd $srcdir/$pkgname-$pkgver
   [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc/dspam --localstatedir=/var ${OPTS}
@@ -65,7 +65,7 @@
 				-e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/run/dspam/dspam.pid:gI' \
 				-i $pkgdir/etc/dspam/dspam.conf
 
-  sed -i 's|/var/lib/mysql/mysql.sock|/tmp/mysql.sock|' $pkgdir/etc/dspam/dspam.conf
+  sed -i 's|/var/lib/mysql/mysql.sock|/run/mysqld/mysqld.sock|' $pkgdir/etc/dspam/dspam.conf
 
   cp -r src/tools.mysql_drv/*.sql $pkgdir/usr/share/dspam/mysql
   cp -r src/tools.pgsql_drv/*.sql $pkgdir/usr/share/dspam/pgsql

Modified: dspam.install
===================================================================
--- dspam.install	2013-08-28 09:26:00 UTC (rev 96417)
+++ dspam.install	2013-08-28 10:29:00 UTC (rev 96418)
@@ -5,8 +5,9 @@
   useradd -c "DSPAM Daemon" -u 115 -d /var/lib/dspam -g dspam -s /bin/false dspam \
     && echo "done."
   passwd -l dspam &>/dev/null
-  chown root:dspam usr/bin/dspamc
-  chmod g+s usr/bin/dspamc
+  chown root:dspam usr/bin/dspam{,c}
+  chmod g+rs usr/bin/dspam{,c}
+  systemd-tmpfiles --create dspam.conf
 
 cat << EOF
 >>> To populate the DSPAM database, you need to follow several steps.
@@ -23,7 +24,7 @@
 >>> Enter the password you set in the previous step, and the database should be populated.
 
 >>> Remember to edit /etc/dspam/dspam.conf accordenly
->>> If you want to use the postgresql, sqlite3 or Berekely DB4 backends, 
+>>> If you want to use the postgresql, sqlite3 or Berekely DB4 backends,
 >>> read the documentation
 >>>
 EOF
@@ -30,8 +31,9 @@
 }
 
 post_upgrade() {
-  chown root:dspam usr/bin/dspamc
+  chown root:dspam usr/bin/dspam{,c}
   chmod g+s usr/bin/dspamc
+  systemd-tmpfiles --create dspam.conf
 }
 
 post_remove() {