Date: Friday, May 23, 2014 @ 11:50:11
Author: spupykin
Revision: 111751
archrelease: copy trunk to community-i686
Added:
dspam/repos/community-i686/PKGBUILD
(from rev 111750, dspam/trunk/PKGBUILD)
dspam/repos/community-i686/dspam.install
(from rev 111750, dspam/trunk/dspam.install)
dspam/repos/community-i686/dspam.logrotated
(from rev 111750, dspam/trunk/dspam.logrotated)
dspam/repos/community-i686/dspam.service
(from rev 111750, dspam/trunk/dspam.service)
dspam/repos/community-i686/dspam.tmpfiles
(from rev 111750, dspam/trunk/dspam.tmpfiles)
dspam/repos/community-i686/dspam_maintenance.cron
(from rev 111750, dspam/trunk/dspam_maintenance.cron)
Deleted:
dspam/repos/community-i686/PKGBUILD
dspam/repos/community-i686/dspam.install
dspam/repos/community-i686/dspam.logrotated
dspam/repos/community-i686/dspam.service
dspam/repos/community-i686/dspam.tmpfiles
dspam/repos/community-i686/dspam_maintenance.cron
------------------------+
PKGBUILD | 175 +++++++++++++++++++++++------------------------
dspam.install | 88 +++++++++++------------
dspam.logrotated | 20 ++---
dspam.service | 22 ++---
dspam.tmpfiles | 2
dspam_maintenance.cron | 12 +--
6 files changed, 161 insertions(+), 158 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-05-23 09:48:30 UTC (rev 111750)
+++ PKGBUILD 2014-05-23 09:50:11 UTC (rev 111751)
@@ -1,86 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: William Rea <sillywi...@gmail.com>
-
-pkgname=dspam
-pkgver=3.10.2
-pkgrel=8
-pkgdesc="A scalable, open-source statistical anti-spam filter"
-arch=('i686' 'x86_64')
-url="http://dspam.nuclearelephant.com/";
-backup=('etc/dspam/dspam.conf'
- 'srv/http/dspam/cgi-bin/admins'
- 'srv/http/dspam/cgi-bin/subadmins')
-license=("GPL")
-depends=(readline libcap ncurses zlib openssl)
-makedepends=('libmariadbclient' 'postgresql-libs' 'db' 'sqlite' 'libldap')
-optdepends=('libmariadbclient: MariaDB support'
- 'postgresql-libs: PostgreSQL support'
- 'db: BerkeleyDB support'
- 'sqlite: SQLite support'
- 'clamav: ClamAV support'
- 'libldap: external lookup support')
-options=('zipman' 'docs')
-install=$pkgname.install
-source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz
- dspam.logrotated
- dspam.service
- dspam.tmpfiles
- dspam_maintenance.cron)
-md5sums=('0e0e405d3284485b2a43f47eaf6b09bb'
- 'cec7e3df4cbc6feca387fb516a5b3490'
- '1581a94598cec370b66f37b118970676'
- '933643f2204ccbd7e451a439f83db1ea'
- 'ebfb0fec16a56f6e1a3a61ced2d5015d')
-
-build() {
- OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam
--with-dspam-home-group=dspam --with-dspam-mode=2510 \
- --enable-daemon --enable-virtual-users --enable-large-scale
--enable-long-usernames --enable-external-lookup \
- --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="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}
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-
- mkdir -p $pkgdir/srv/http/dspam
- cp -a webui/* $pkgdir/srv/http/dspam/
- find $pkgdir/srv/http/dspam/ -type f -name 'Makefile*' -exec rm -f {} \;
- find $pkgdir/srv/http/dspam/ -type f -name '*.in' -exec rm -f {} \;
-
- install -d $pkgdir/etc/logrotate.d \
- $pkgdir/usr/share/dspam/{mysql,pgsql}
- install -m644 ../dspam.logrotated $pkgdir/etc/logrotate.d/dspam
-
- sed -i 's|#ServerPID|ServerPID|' $pkgdir/etc/dspam/dspam.conf
-
- sed -e 's:^#*\(ServerDomainSocketPath[\t
]\{1,\}\).*:\1\"/run/dspam/dspam.sock\":gI' \
- -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|/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
-
- # install dspam_maintenance from contrib/
- install -Dm0755 contrib/dspam_maintenance/dspam_maintenance.sh
$pkgdir/usr/bin/dspam_maintenance
- install -Dm0644 contrib/dspam_maintenance/dspam_maintenance.1
$pkgdir/usr/share/man/man1/dspam_maintenance.1
- install -Dm0755 $srcdir/dspam_maintenance.cron
$pkgdir/etc/cron.daily/dspam_maintenance
-
- cd $pkgdir/usr/share/man/man3
- find -type l -exec ln -sf libdspam.3 {} \;
-
- # make logrotate happy
- chmod 750 $pkgdir/var/log/dspam
-
- install -Dm0644 $srcdir/$pkgname.service
$pkgdir/usr/lib/systemd/system/$pkgname.service
- install -Dm0644 $srcdir/$pkgname.tmpfiles
$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
-}
Copied: dspam/repos/community-i686/PKGBUILD (from rev 111750,
dspam/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-05-23 09:50:11 UTC (rev 111751)
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: William Rea <sillywi...@gmail.com>
+
+pkgname=dspam
+pkgver=3.10.2
+pkgrel=9
+pkgdesc="A scalable, open-source statistical anti-spam filter"
+arch=('i686' 'x86_64')
+url="http://dspam.nuclearelephant.com/";
+backup=('etc/dspam/dspam.conf'
+ 'srv/http/dspam/cgi-bin/admins'
+ 'srv/http/dspam/cgi-bin/subadmins')
+license=("GPL")
+depends=(readline libcap ncurses zlib openssl)
+makedepends=('libmariadbclient' 'postgresql-libs' 'db' 'sqlite' 'libldap')
+optdepends=('libmariadbclient: MariaDB support'
+ 'postgresql-libs: PostgreSQL support'
+ 'db: BerkeleyDB support'
+ 'sqlite: SQLite support'
+ 'clamav: ClamAV support'
+ 'libldap: external lookup support')
+options=('zipman' 'docs')
+install=$pkgname.install
+source=(http://downloads.sourceforge.net/project/dspam/dspam/dspam-$pkgver/dspam-$pkgver.tar.gz
+ dspam.logrotated
+ dspam.service
+ dspam.tmpfiles
+ dspam_maintenance.cron)
+md5sums=('0e0e405d3284485b2a43f47eaf6b09bb'
+ 'cec7e3df4cbc6feca387fb516a5b3490'
+ '1581a94598cec370b66f37b118970676'
+ '933643f2204ccbd7e451a439f83db1ea'
+ 'ebfb0fec16a56f6e1a3a61ced2d5015d')
+
+build() {
+ OPTS="--with-dspam-owner=dspam --with-dspam-group=dspam
--with-dspam-home-group=dspam --with-dspam-mode=2510 \
+ --enable-daemon --enable-virtual-users --enable-large-scale
--enable-long-usernames --enable-external-lookup \
+ --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="hash_drv,mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv"
--enable-preferences-extension"
+
+ export CFLAGS="-O2"
+ unset LDFLAGS
+
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc/dspam --localstatedir=/var
${OPTS}
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+
+ mkdir -p $pkgdir/srv/http/dspam
+ cp -a webui/* $pkgdir/srv/http/dspam/
+ find $pkgdir/srv/http/dspam/ -type f -name 'Makefile*' -exec rm -f {} \;
+ find $pkgdir/srv/http/dspam/ -type f -name '*.in' -exec rm -f {} \;
+
+ install -d $pkgdir/etc/logrotate.d \
+ $pkgdir/usr/share/dspam/{mysql,pgsql}
+ install -m644 ../dspam.logrotated $pkgdir/etc/logrotate.d/dspam
+
+ sed -i 's|#ServerPID|ServerPID|' $pkgdir/etc/dspam/dspam.conf
+
+ sed -e 's:^#*\(ServerDomainSocketPath[\t
]\{1,\}\).*:\1\"/run/dspam/dspam.sock\":gI' \
+ -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|/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
+
+ # install dspam_maintenance from contrib/
+ install -Dm0755 contrib/dspam_maintenance/dspam_maintenance.sh
$pkgdir/usr/bin/dspam_maintenance
+ install -Dm0644 contrib/dspam_maintenance/dspam_maintenance.1
$pkgdir/usr/share/man/man1/dspam_maintenance.1
+ install -Dm0755 $srcdir/dspam_maintenance.cron
$pkgdir/etc/cron.daily/dspam_maintenance
+
+ cd $pkgdir/usr/share/man/man3
+ find -type l -exec ln -sf libdspam.3 {} \;
+
+ # make logrotate happy
+ chmod 750 $pkgdir/var/log/dspam
+
+ install -Dm0644 $srcdir/$pkgname.service
$pkgdir/usr/lib/systemd/system/$pkgname.service
+ install -Dm0644 $srcdir/$pkgname.tmpfiles
$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
+}
Deleted: dspam.install
===================================================================
--- dspam.install 2014-05-23 09:48:30 UTC (rev 111750)
+++ dspam.install 2014-05-23 09:50:11 UTC (rev 111751)
@@ -1,44 +0,0 @@
-post_install() {
- echo -n "adding dspam system group... "
- groupadd -g 115 dspam && echo "done."
- echo -n "adding dspam system user... "
- 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/dspam{,c}
- chown -R root:dspam etc/dspam
- 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.
->>> First create a database. Login to the mysql command prompt.
- $ mysql -u root -p
- mysql> CREATE database dspam;
->>> Next, you need to create a dspam user. At the same MySQL prompt:
- mysql> GRANT ALL PRIVILEGES ON dspam.* TO dspam@'localhost' IDENTIFIED BY
'passwd';
->>> Replacing passwd with your chosen password.
->>> If you want a space optimized db do:
- $ mysql -u dspam dspam -p < /var/lib/dspam/mysql/mysql_objects-space.sql
->>> If you want a speed optimized db do:
- $ mysql -u dspam dspam -p < /var/lib/dspam/mysql/mysql_objects-speed.sql
->>> 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,
->>> read the documentation
->>>
-EOF
-}
-
-post_upgrade() {
- chown root:dspam usr/bin/dspam{,c}
- chown -R root:dspam etc/dspam
- chmod g+s usr/bin/dspamc
- systemd-tmpfiles --create dspam.conf
-}
-
-post_remove() {
- echo -n -e "\nremoving dspam system user and group..."
- userdel dspam && echo "done."
-}
Copied: dspam/repos/community-i686/dspam.install (from rev 111750,
dspam/trunk/dspam.install)
===================================================================
--- dspam.install (rev 0)
+++ dspam.install 2014-05-23 09:50:11 UTC (rev 111751)
@@ -0,0 +1,44 @@
+post_install() {
+ echo -n "adding dspam system group... "
+ groupadd -g 115 dspam && echo "done."
+ echo -n "adding dspam system user... "
+ 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/dspam{,c}
+ chown -R root:dspam etc/dspam
+ 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.
+>>> First create a database. Login to the mysql command prompt.
+ $ mysql -u root -p
+ mysql> CREATE database dspam;
+>>> Next, you need to create a dspam user. At the same MySQL prompt:
+ mysql> GRANT ALL PRIVILEGES ON dspam.* TO dspam@'localhost' IDENTIFIED BY
'passwd';
+>>> Replacing passwd with your chosen password.
+>>> If you want a space optimized db do:
+ $ mysql -u dspam dspam -p < /var/lib/dspam/mysql/mysql_objects-space.sql
+>>> If you want a speed optimized db do:
+ $ mysql -u dspam dspam -p < /var/lib/dspam/mysql/mysql_objects-speed.sql
+>>> 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,
+>>> read the documentation
+>>>
+EOF
+}
+
+post_upgrade() {
+ chown root:dspam usr/bin/dspam{,c}
+ chown -R root:dspam etc/dspam
+ chmod g+s usr/bin/dspamc
+ systemd-tmpfiles --create dspam.conf
+}
+
+post_remove() {
+ echo -n -e "\nremoving dspam system user and group..."
+ userdel dspam && echo "done."
+}
Deleted: dspam.logrotated
===================================================================
--- dspam.logrotated 2014-05-23 09:48:30 UTC (rev 111750)
+++ dspam.logrotated 2014-05-23 09:50:11 UTC (rev 111751)
@@ -1,10 +0,0 @@
-/var/log/dspam/sql.errors
-/var/lib/dspam/system.log
-/var/log/dspam/dspam.debug
-/var/log/dspam/dspam.messages
-/var/log/dspam/dspam.log {
- weekly
- compress
- missingok
- copytruncate
-}
Copied: dspam/repos/community-i686/dspam.logrotated (from rev 111750,
dspam/trunk/dspam.logrotated)
===================================================================
--- dspam.logrotated (rev 0)
+++ dspam.logrotated 2014-05-23 09:50:11 UTC (rev 111751)
@@ -0,0 +1,10 @@
+/var/log/dspam/sql.errors
+/var/lib/dspam/system.log
+/var/log/dspam/dspam.debug
+/var/log/dspam/dspam.messages
+/var/log/dspam/dspam.log {
+ weekly
+ compress
+ missingok
+ copytruncate
+}
Deleted: dspam.service
===================================================================
--- dspam.service 2014-05-23 09:48:30 UTC (rev 111750)
+++ dspam.service 2014-05-23 09:50:11 UTC (rev 111751)
@@ -1,11 +0,0 @@
-[Unit]
-Description=A highly accurate statistical spam filter that uses minimal
resources
-
-[Service]
-Type=forking
-User=dspam
-ExecStart=/usr/bin/dspam --daemon 2>/dev/null
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
Copied: dspam/repos/community-i686/dspam.service (from rev 111750,
dspam/trunk/dspam.service)
===================================================================
--- dspam.service (rev 0)
+++ dspam.service 2014-05-23 09:50:11 UTC (rev 111751)
@@ -0,0 +1,11 @@
+[Unit]
+Description=A highly accurate statistical spam filter that uses minimal
resources
+
+[Service]
+Type=forking
+User=dspam
+ExecStart=/usr/bin/dspam --daemon 2>/dev/null
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
Deleted: dspam.tmpfiles
===================================================================
--- dspam.tmpfiles 2014-05-23 09:48:30 UTC (rev 111750)
+++ dspam.tmpfiles 2014-05-23 09:50:11 UTC (rev 111751)
@@ -1 +0,0 @@
-d /var/run/dspam 0770 dspam mail -
Copied: dspam/repos/community-i686/dspam.tmpfiles (from rev 111750,
dspam/trunk/dspam.tmpfiles)
===================================================================
--- dspam.tmpfiles (rev 0)
+++ dspam.tmpfiles 2014-05-23 09:50:11 UTC (rev 111751)
@@ -0,0 +1 @@
+d /var/run/dspam 0770 dspam mail -
Deleted: dspam_maintenance.cron
===================================================================
--- dspam_maintenance.cron 2014-05-23 09:48:30 UTC (rev 111750)
+++ dspam_maintenance.cron 2014-05-23 09:50:11 UTC (rev 111751)
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# DSPAM maintenance tasks
-# check "man 1 dspam_maintenance" for more options
-
-/usr/bin/dspam_maintenance --verbose --purgescriptdir=/usr/share/dspam 1>
/dev/null
Copied: dspam/repos/community-i686/dspam_maintenance.cron (from rev 111750,
dspam/trunk/dspam_maintenance.cron)
===================================================================
--- dspam_maintenance.cron (rev 0)
+++ dspam_maintenance.cron 2014-05-23 09:50:11 UTC (rev 111751)
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# DSPAM maintenance tasks
+# check "man 1 dspam_maintenance" for more options
+
+/usr/bin/dspam_maintenance --verbose --purgescriptdir=/usr/share/dspam 1>
/dev/null
