[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2020-06-21 Thread Evangelos Foutras via arch-commits 
Date: Sunday, June 21, 2020 @ 15:46:46
  Author: foutrelis
Revision: 389877

upgpkg: spamassassin 3.4.4-3: Perl 5.32 rebuild

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-06-21 15:33:05 UTC (rev 389876)
+++ PKGBUILD2020-06-21 15:46:46 UTC (rev 389877)
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2020-05-16 Thread Evangelos Foutras via arch-commits 
Date: Saturday, May 16, 2020 @ 14:29:49
  Author: foutrelis
Revision: 384768

upgpkg: spamassassin 3.4.4-2: reproducibility rebuild

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-16 14:16:21 UTC (rev 384767)
+++ PKGBUILD2020-05-16 14:29:49 UTC (rev 384768)
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2020-01-30 Thread Florian Pritz via arch-commits 
Date: Thursday, January 30, 2020 @ 20:30:37
  Author: bluewind
Revision: 374373

upgpkg: spamassassin 3.4.4-1: upstream update

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-30 20:05:52 UTC (rev 374372)
+++ PKGBUILD2020-01-30 20:30:37 UTC (rev 374373)
@@ -2,7 +2,7 @@
 # Contributor: Dale Blount 
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
-pkgver=3.4.3
+pkgver=3.4.4
 pkgrel=1
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
@@ -31,7 +31,7 @@
 'spamassassin.tmpfiles.d'
 'spamassassin.service')
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
-sha512sums=('d2fd657d3c20273b0c06cb1da083d757d3f2a7f60c7ed6e6ad8f98e6df33c9c5f3824f0531abf5dbc32b0dde22979d7d671231fa2ef0d8b073ea6804c5de0c3a'
+sha512sums=('b6efa1c733ddf810b189ec69445faeae6488ee2671f87f56b49ec3bf85690bf7950aa5ce251c1f1371b2bbe4fb88dbce0a162c9a24a48ed5e6584f9019611552'
 'SKIP'
 
'994ebb2b6c127521676f35879017112a33da53ad99431837d06973a9abfc4aa0434ea2c9b19073ff2cc877ebe3a5a7fe8525bc93222fd05956069ce73e5ae389'
 
'5ad6aa8d992375b0989413d36ff0485f792ac9211a47e6a2a7fa5c0b9eb353aa6efe6f55da3ff4480bdef24beb4fa456c64c5a5ce72e8ad6c93c171c969fd6ee')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2020-01-17 Thread Florian Pritz via arch-commits 
Date: Friday, January 17, 2020 @ 14:09:37
  Author: bluewind
Revision: 373617

Todo List: Remove usage of makepkg subroutines from PKGBUILDs

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-01-17 13:57:33 UTC (rev 373616)
+++ PKGBUILD2020-01-17 14:09:37 UTC (rev 373617)
@@ -78,7 +78,7 @@
   for file in "$pkgdir/etc/mail/spamassassin/"*.pre; do
  clean_file="${file#"$pkgdir/"}"
  if ! in_array "$clean_file" "${backup[@]}"; then
- error "backup array is missing an entry for '$clean_file'"
+ echo "ERROR: backup array is missing an entry for 
'$clean_file'" >&2
  backup_incomplete=1
  fi
   done

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2019-12-12 Thread Florian Pritz via arch-commits 
Date: Thursday, December 12, 2019 @ 19:22:10
  Author: bluewind
Revision: 371311

upgpkg: spamassassin 3.4.3-1: upstream update

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-12 18:14:13 UTC (rev 371310)
+++ PKGBUILD2019-12-12 19:22:10 UTC (rev 371311)
@@ -2,8 +2,8 @@
 # Contributor: Dale Blount 
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
-pkgver=3.4.2
-pkgrel=5
+pkgver=3.4.3
+pkgrel=1
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')
@@ -23,7 +23,8 @@
 'etc/mail/spamassassin/v330.pre'
 'etc/mail/spamassassin/v340.pre'
 'etc/mail/spamassassin/v341.pre'
-'etc/mail/spamassassin/v342.pre')
+'etc/mail/spamassassin/v342.pre'
+   'etc/mail/spamassassin/v343.pre')
 install="${pkgname}.install"
 
source=("https://ftp.fau.de/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz;
 
"https://www.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz.asc;
@@ -30,7 +31,7 @@
 'spamassassin.tmpfiles.d'
 'spamassassin.service')
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
-sha512sums=('85e3d78bb885ad1d0bf2066d1bc919d6ad5e9f86795069397e7c28cc1ba02870566ec014c08c81f68e7ed03b7f60d2de0b9730b3415b35d848abde2c8920a28f'
+sha512sums=('d2fd657d3c20273b0c06cb1da083d757d3f2a7f60c7ed6e6ad8f98e6df33c9c5f3824f0531abf5dbc32b0dde22979d7d671231fa2ef0d8b073ea6804c5de0c3a'
 'SKIP'
 
'994ebb2b6c127521676f35879017112a33da53ad99431837d06973a9abfc4aa0434ea2c9b19073ff2cc877ebe3a5a7fe8525bc93222fd05956069ce73e5ae389'
 
'5ad6aa8d992375b0989413d36ff0485f792ac9211a47e6a2a7fa5c0b9eb353aa6efe6f55da3ff4480bdef24beb4fa456c64c5a5ce72e8ad6c93c171c969fd6ee')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2019-06-01 Thread Evangelos Foutras via arch-commits 
Date: Saturday, June 1, 2019 @ 13:49:15
  Author: foutrelis
Revision: 354703

Perl 5.30 rebuild

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-06-01 13:36:37 UTC (rev 354702)
+++ PKGBUILD2019-06-01 13:49:15 UTC (rev 354703)
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2019-05-25 Thread Evangelos Foutras via arch-commits 
Date: Saturday, May 25, 2019 @ 11:31:21
  Author: foutrelis
Revision: 354238

Perl 5.30 rebuild

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-25 11:18:29 UTC (rev 354237)
+++ PKGBUILD2019-05-25 11:31:21 UTC (rev 354238)
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2019-05-25 Thread Evangelos Foutras via arch-commits 
Date: Saturday, May 25, 2019 @ 11:18:29
  Author: foutrelis
Revision: 354237

Switch to working source URL

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-25 11:04:33 UTC (rev 354236)
+++ PKGBUILD2019-05-25 11:18:29 UTC (rev 354237)
@@ -23,9 +23,10 @@
 'etc/mail/spamassassin/v330.pre'
 'etc/mail/spamassassin/v340.pre'
 'etc/mail/spamassassin/v341.pre'
-   'etc/mail/spamassassin/v342.pre')
+'etc/mail/spamassassin/v342.pre')
 install="${pkgname}.install"
-source=("https://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
+source=("https://ftp.fau.de/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz;
+
"https://www.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz.asc;
 'spamassassin.tmpfiles.d'
 'spamassassin.service')
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2019-05-01 Thread Florian Pritz via arch-commits 
Date: Wednesday, May 1, 2019 @ 09:23:05
  Author: bluewind
Revision: 352342

upgpkg: spamassassin 3.4.2-3

Add missing files to backup array

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-05-01 09:17:05 UTC (rev 352341)
+++ PKGBUILD2019-05-01 09:23:05 UTC (rev 352342)
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')
@@ -20,7 +20,10 @@
 'etc/mail/spamassassin/v310.pre'
 'etc/mail/spamassassin/v312.pre'
 'etc/mail/spamassassin/v320.pre'
-'etc/mail/spamassassin/v330.pre')
+'etc/mail/spamassassin/v330.pre'
+'etc/mail/spamassassin/v340.pre'
+'etc/mail/spamassassin/v341.pre'
+   'etc/mail/spamassassin/v342.pre')
 install="${pkgname}.install"
 
source=("https://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
 'spamassassin.tmpfiles.d'
@@ -68,4 +71,16 @@
  install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 
   install -Dm644 "$srcdir/spamassassin.tmpfiles.d" 
"$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+
+  backup_incomplete=0
+  for file in "$pkgdir/etc/mail/spamassassin/"*.pre; do
+ clean_file="${file#"$pkgdir/"}"
+ if ! in_array "$clean_file" "${backup[@]}"; then
+ error "backup array is missing an entry for '$clean_file'"
+ backup_incomplete=1
+ fi
+  done
+  if ((backup_incomplete)); then
+ exit 1
+  fi
 }

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2018-09-17 Thread Florian Pritz via arch-commits 
Date: Monday, September 17, 2018 @ 08:46:03
  Author: bluewind
Revision: 334676

use https urls, sha512sums, fix missing quoting

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-16 20:23:16 UTC (rev 334675)
+++ PKGBUILD2018-09-17 08:46:03 UTC (rev 334676)
@@ -7,7 +7,7 @@
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')
-url="http://spamassassin.apache.org;
+url="https://spamassassin.apache.org;
 depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
  'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
  'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
@@ -22,12 +22,12 @@
 'etc/mail/spamassassin/v320.pre'
 'etc/mail/spamassassin/v330.pre')
 install="${pkgname}.install"
-source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
+source=("https://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
 'spamassassin.service')
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
-md5sums=('3fa07acc17bc4d024108265dadefdb3a'
- 'SKIP'
- '8adce028f25387ac3bc4dba697d209ed')
+sha512sums=('85e3d78bb885ad1d0bf2066d1bc919d6ad5e9f86795069397e7c28cc1ba02870566ec014c08c81f68e7ed03b7f60d2de0b9730b3415b35d848abde2c8920a28f'
+'SKIP'
+
'7e44370e9433134816db51681de388618f8b00f27e9229b673ca7da5821b6bfc27dfc9f6f7387ef18d1d310ea03a4569f46cae3089bba91dd71692b9eee8c8e4')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
@@ -63,5 +63,5 @@
   install -d -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
 
   echo 'u spamd 182 - /var/lib/spamassassin' |
- install -Dm644 /dev/stdin "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf
+ install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 }

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2018-09-16 Thread Florian Pritz via arch-commits 
Date: Sunday, September 16, 2018 @ 20:23:10
  Author: bluewind
Revision: 334674

upgpkg: spamassassin 3.4.2-1

upstream update

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |   25 +
 1 file changed, 5 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-09-16 18:39:51 UTC (rev 334673)
+++ PKGBUILD2018-09-16 20:23:10 UTC (rev 334674)
@@ -2,8 +2,8 @@
 # Contributor: Dale Blount 
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
-pkgver=3.4.1
-pkgrel=13
+pkgver=3.4.2
+pkgrel=1
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')
@@ -23,16 +23,11 @@
 'etc/mail/spamassassin/v330.pre')
 install="${pkgname}.install"
 
source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
-'spamassassin.service' net-dns-1.01-compat.patch 
net-dns-1.01-compat-uribl.patch disable-sslv3.patch 
'bug_828552-openssl-1.1.0.patch' edb00a8d76a625bf03227ee2f6e915c9a0d90bad.patch)
+'spamassassin.service')
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
-md5sums=('76eca1f38c11635d319e62c26d5b034b'
+md5sums=('3fa07acc17bc4d024108265dadefdb3a'
  'SKIP'
- '8adce028f25387ac3bc4dba697d209ed'
- '63458976671c35f423bd4e8033cfff3a'
- '14f2e3dc93c560d6b5a7fd7d54e44e11'
- 'e6aeeae9828f305db72abb8707312ee7'
- '8de3e540060b5a0dce23d12420cb7902'
- 'faec41f86be348c1d6f131612a8ee1fa')
+ '8adce028f25387ac3bc4dba697d209ed')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
@@ -39,16 +34,6 @@
 
   sed -i t/sa_compile.t \
  -e 's#^my $temp_binpath = $Config{sitebinexp};#my $temp_binpath = 
"/bin/site_perl/";#'
-
-  patch -i "$srcdir/net-dns-1.01-compat.patch" -p3
-  patch -i "$srcdir/net-dns-1.01-compat-uribl.patch" -p3
-
-  # From Debian
-  patch -i "$srcdir/disable-sslv3.patch" -p1
-  patch -i "$srcdir/bug_828552-openssl-1.1.0.patch" -p1
-
-  # FS#54378 - [spamassassin] sa-update Perl deprecation warnings
-  patch -i "$srcdir/edb00a8d76a625bf03227ee2f6e915c9a0d90bad.patch" -p1
 }
 
 build() {

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2018-08-01 Thread Florian Pritz via arch-commits 
Date: Wednesday, August 1, 2018 @ 11:51:37
  Author: bluewind
Revision: 330200

Perl 5.28 rebuild

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-01 11:36:49 UTC (rev 330199)
+++ PKGBUILD2018-08-01 11:51:37 UTC (rev 330200)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=12
+pkgrel=13
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2018-02-10 Thread Florian Pritz via arch-commits 
Date: Saturday, February 10, 2018 @ 15:06:41
  Author: bluewind
Revision: 316592

upgpkg: spamassassin 3.4.1-12

bump pkgrel

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-10 14:55:34 UTC (rev 316591)
+++ PKGBUILD2018-02-10 15:06:41 UTC (rev 316592)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=11
+pkgrel=12
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')

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

2018-02-10 Thread Florian Pritz via arch-commits 
Date: Saturday, February 10, 2018 @ 14:52:33
  Author: bluewind
Revision: 316586

Switch to systemd-sysusers

upgpkg: spamassassin 3.4.1-11

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/spamassassin.install

--+
 PKGBUILD |5 -
 spamassassin.install |   13 -
 2 files changed, 4 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-02-10 14:47:52 UTC (rev 316585)
+++ PKGBUILD2018-02-10 14:52:33 UTC (rev 316586)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=10
+pkgrel=11
 pkgdesc="A mail filter to identify spam."
 arch=('x86_64')
 license=('APACHE')
@@ -77,4 +77,7 @@
 
   install -D -m644 "${srcdir}/spamassassin.service" 
"${pkgdir}/usr/lib/systemd/system/spamassassin.service"
   install -d -o 182 -g 182 -m 755 "$pkgdir/var/lib/spamassassin"
+
+  echo 'u spamd 182 - /var/lib/spamassassin' |
+ install -Dm644 /dev/stdin "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf
 }

Modified: spamassassin.install
===
--- spamassassin.install2018-02-10 14:47:52 UTC (rev 316585)
+++ spamassassin.install2018-02-10 14:52:33 UTC (rev 316586)
@@ -1,21 +1,8 @@
-setup_user() {
-   getent group spamd  &>/dev/null || groupadd -g 182 spamd  >/dev/null
-   getent passwd spamd &>/dev/null || useradd -u 182 -d 
/var/lib/spamassassin -g spamd -s /bin/false spamd >/dev/null
-
-   if [[ -d /var/lib/spamassassin ]]; then
-   chown spamd:spamd /var/lib/spamassassin
-   fi
-
-   true
-}
-
 post_install() {
echo "You must run 'sa-update' to install spam rules before use."
-   setup_user
 }
 
 post_upgrade() {
-   setup_user
if  [ "$(vercmp $2 3.4)" -lt 0 ]; then
echo '/var/lib/spamassassin is now owned by the spamd user. 
spamassassin.service'
echo 'will also run under that user. You may need to adjust 
your setup.'

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2017-08-26 Thread Felix Yan 
Date: Saturday, August 26, 2017 @ 18:22:45
  Author: felixonmars
Revision: 304076

Perl versioned binary modules rebuild

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-08-26 18:08:41 UTC (rev 304075)
+++ PKGBUILD2017-08-26 18:22:45 UTC (rev 304076)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=9
+pkgrel=10
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2017-06-17 Thread Florian Pritz 
Date: Saturday, June 17, 2017 @ 10:29:00
  Author: bluewind
Revision: 298921

Add gcc optdep

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-17 08:05:25 UTC (rev 298920)
+++ PKGBUILD2017-06-17 10:29:00 UTC (rev 298921)
@@ -14,7 +14,8 @@
  'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
 makedepends=('razor' 'perl-dbi')
 optdepends=('razor: to identify collaborately-flagged spam'
-'make: to use sa-compile')
+'make: to use sa-compile'
+'gcc: to use sa-compile')
 backup=('etc/mail/spamassassin/local.cf'
 'etc/mail/spamassassin/init.pre'
 'etc/mail/spamassassin/v310.pre'

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2017-06-02 Thread Evangelos Foutras 
Date: Friday, June 2, 2017 @ 06:54:26
  Author: foutrelis
Revision: 297474

Perl 5.26 rebuild

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-02 06:42:40 UTC (rev 297473)
+++ PKGBUILD2017-06-02 06:54:26 UTC (rev 297474)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=7
+pkgrel=8
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2017-06-02 Thread Evangelos Foutras 
Date: Friday, June 2, 2017 @ 06:42:40
  Author: foutrelis
Revision: 297473

Fix build with Perl 5.26

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-02 06:41:51 UTC (rev 297472)
+++ PKGBUILD2017-06-02 06:42:40 UTC (rev 297473)
@@ -51,9 +51,10 @@
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
 
   # install module in vendor directories.
+  export PERL_USE_UNSAFE_INC=1
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
   CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no
-  make 
+  make
 }
 
 check() {

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2017-04-06 Thread Florian Pritz 
Date: Thursday, April 6, 2017 @ 20:48:03
  Author: bluewind
Revision: 292244

upgpkg: spamassassin 3.4.1-7

rebuild against openssl 1.1

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-06 20:06:53 UTC (rev 292243)
+++ PKGBUILD2017-04-06 20:48:03 UTC (rev 292244)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=6
+pkgrel=7
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2017-04-05 Thread Florian Pritz 
Date: Wednesday, April 5, 2017 @ 13:14:36
  Author: bluewind
Revision: 292125

Add make to optdeps for sa-compile

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-04-05 13:00:20 UTC (rev 292124)
+++ PKGBUILD2017-04-05 13:14:36 UTC (rev 292125)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=5
+pkgrel=6
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -13,7 +13,8 @@
  'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
  'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
 makedepends=('razor' 'perl-dbi')
-optdepends=('razor: to identify collaborately-flagged spam')
+optdepends=('razor: to identify collaborately-flagged spam'
+'make: to use sa-compile')
 backup=('etc/mail/spamassassin/local.cf'
 'etc/mail/spamassassin/init.pre'
 'etc/mail/spamassassin/v310.pre'

[arch-commits] Commit in spamassassin/trunk (PKGBUILD bug_828552-openssl-1.1.0.patch)

2017-03-10 Thread Florian Pritz 
Date: Friday, March 10, 2017 @ 15:42:20
  Author: bluewind
Revision: 290502

upgpkg: spamassassin 3.4.1-5

opensssl 1.1.0 rebuild

Added:
  spamassassin/trunk/bug_828552-openssl-1.1.0.patch
Modified:
  spamassassin/trunk/PKGBUILD

+
 PKGBUILD   |8 
 bug_828552-openssl-1.1.0.patch |  453 +++
 2 files changed, 458 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-10 15:41:10 UTC (rev 290501)
+++ PKGBUILD2017-03-10 15:42:20 UTC (rev 290502)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=4
+pkgrel=5
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -22,7 +22,7 @@
 'etc/mail/spamassassin/v330.pre')
 install="${pkgname}.install"
 
source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
-'spamassassin.service' net-dns-1.01-compat.patch 
net-dns-1.01-compat-uribl.patch disable-sslv3.patch)
+'spamassassin.service' net-dns-1.01-compat.patch 
net-dns-1.01-compat-uribl.patch disable-sslv3.patch 
'bug_828552-openssl-1.1.0.patch')
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
 md5sums=('76eca1f38c11635d319e62c26d5b034b'
  'SKIP'
@@ -29,7 +29,8 @@
  '8adce028f25387ac3bc4dba697d209ed'
  '63458976671c35f423bd4e8033cfff3a'
  '14f2e3dc93c560d6b5a7fd7d54e44e11'
- 'e6aeeae9828f305db72abb8707312ee7')
+ 'e6aeeae9828f305db72abb8707312ee7'
+ '8de3e540060b5a0dce23d12420cb7902')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
@@ -42,6 +43,7 @@
 
   # From Debian
   patch -i "$srcdir/disable-sslv3.patch" -p1
+  patch -i "$srcdir/bug_828552-openssl-1.1.0.patch" -p1
 }
 
 build() {

Added: bug_828552-openssl-1.1.0.patch
===
--- bug_828552-openssl-1.1.0.patch  (rev 0)
+++ bug_828552-openssl-1.1.0.patch  2017-03-10 15:42:20 UTC (rev 290502)
@@ -0,0 +1,453 @@
+From: Sebastian Andrzej Siewior 
+Date: Thu, 22 Sep 2016 11:19:42 +
+Subject: [PATCH] spamassassin: get it compiled against openssl 1.1.0
+
+CRYPTO_lock was part of the old locking API which got removed. I picked
+a different symbol.
+
+Signed-off-by: Sebastian Andrzej Siewior 
+---
+ spamc/configure| 22 +++---
+ spamc/configure.in |  2 +-
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+Index: spamassassin-3.4.1/spamc/configure
+===
+--- spamassassin-3.4.1.orig/spamc/configure
 spamassassin-3.4.1/spamc/configure
+@@ -943,7 +943,7 @@ esac
+ else
+   echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+-cd "$ac_popdir"
++cd $ac_popdir
+   done
+ fi
+ 
+@@ -1874,7 +1874,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-   { ac_try='test -z "$ac_c_werror_flag"   || test ! -s 
conftest.err'
++   { ac_try='test -z "$ac_c_werror_flag"
++   || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -1932,7 +1933,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-   { ac_try='test -z "$ac_c_werror_flag"   || test ! -s 
conftest.err'
++   { ac_try='test -z "$ac_c_werror_flag"
++   || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2048,7 +2050,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-   { ac_try='test -z "$ac_c_werror_flag"   || test ! -s 
conftest.err'
++   { ac_try='test -z "$ac_c_werror_flag"
++   || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2102,7 +2105,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+-   { ac_try='test -z "$ac_c_werror_flag"   || test ! -s 
conftest.err'
++   { ac_try='test -z "$ac_c_werror_flag"
++   || test ! -s conftest.err'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2147,7 +2151,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&

[arch-commits] Commit in spamassassin/trunk (PKGBUILD net-dns-1.01-compat-uribl.patch)

2016-09-07 Thread Florian Pritz 
Date: Wednesday, September 7, 2016 @ 19:03:28
  Author: bluewind
Revision: 275827

Fix URIBL errors

https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7231

upgpkg: spamassassin 3.4.1-4

Added:
  spamassassin/trunk/net-dns-1.01-compat-uribl.patch
Modified:
  spamassassin/trunk/PKGBUILD

-+
 PKGBUILD|6 --
 net-dns-1.01-compat-uribl.patch |   27 +++
 2 files changed, 31 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-09-07 17:57:00 UTC (rev 275826)
+++ PKGBUILD2016-09-07 19:03:28 UTC (rev 275827)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -22,12 +22,13 @@
 'etc/mail/spamassassin/v330.pre')
 install="${pkgname}.install"
 
source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"{,.asc}
-'spamassassin.service' net-dns-1.01-compat.patch disable-sslv3.patch)
+'spamassassin.service' net-dns-1.01-compat.patch 
net-dns-1.01-compat-uribl.patch disable-sslv3.patch)
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
 md5sums=('76eca1f38c11635d319e62c26d5b034b'
  'SKIP'
  '8adce028f25387ac3bc4dba697d209ed'
  '63458976671c35f423bd4e8033cfff3a'
+ '14f2e3dc93c560d6b5a7fd7d54e44e11'
  'e6aeeae9828f305db72abb8707312ee7')
 
 prepare() {
@@ -37,6 +38,7 @@
  -e 's#^my $temp_binpath = $Config{sitebinexp};#my $temp_binpath = 
"/bin/site_perl/";#'
 
   patch -i "$srcdir/net-dns-1.01-compat.patch" -p3
+  patch -i "$srcdir/net-dns-1.01-compat-uribl.patch" -p3
 
   # From Debian
   patch -i "$srcdir/disable-sslv3.patch" -p1

Added: net-dns-1.01-compat-uribl.patch
===
--- net-dns-1.01-compat-uribl.patch (rev 0)
+++ net-dns-1.01-compat-uribl.patch 2016-09-07 19:03:28 UTC (rev 275827)
@@ -0,0 +1,27 @@
+--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 
2015/04/28 20:36:05 1676616
 spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/URIDNSBL.pm 
2015/08/04 23:16:38 1694126
+@@ -942,9 +942,8 @@
+ next unless (defined($str) && defined($dom));
+ dbg("uridnsbl: got($j) NS for $dom: $str");
+ 
+-if ($str =~ /IN\s+NS\s+(\S+)/) {
+-  my $nsmatch = lc $1;
+-  $nsmatch =~ s/\.$//;
++if ($rr->type eq 'NS') {
++  my $nsmatch = lc $rr->nsdname;  # available since at least Net::DNS 0.14
+   my $nsrhblstr = $nsmatch;
+   my $fullnsrhblstr = $nsmatch;
+ 
+@@ -1025,9 +1024,9 @@
+ }
+ dbg("uridnsbl: complete_a_lookup got(%d) A for %s: %s", $j,$hname,$str);
+ 
+-local $1;
+-if ($str =~ /IN\s+A\s+(\S+)/) {
+-  $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $1);
++if ($rr->type eq 'A') {
++  my $ip_address = $rr->rdatastr;
++  $self->lookup_dnsbl_for_ip($pms, $ent->{obj}, $ip_address);
+ }
+   }
+ }

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2016-03-03 Thread Felix Yan 
Date: Thursday, March 3, 2016 @ 09:20:25
  Author: fyan
Revision: 260574

OpenSSL 1.0.2g rebuild

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-03 08:14:30 UTC (rev 260573)
+++ PKGBUILD2016-03-03 08:20:25 UTC (rev 260574)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD net-dns-1.01-compat.patch)

2015-08-20 Thread Florian Pritz 
Date: Thursday, August 20, 2015 @ 23:34:26
  Author: bluewind
Revision: 244454

upgpkg: spamassassin 3.4.1-2

fix dnsbl errors

Added:
  spamassassin/trunk/net-dns-1.01-compat.patch
Modified:
  spamassassin/trunk/PKGBUILD

---+
 PKGBUILD  |9 ++---
 net-dns-1.01-compat.patch |   14 ++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-20 21:08:38 UTC (rev 244453)
+++ PKGBUILD2015-08-20 21:34:26 UTC (rev 244454)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A mail filter to identify spam.
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -22,11 +22,12 @@
 'etc/mail/spamassassin/v330.pre')
 install=${pkgname}.install
 
source=(http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz{,.asc}
-'spamassassin.service')
+'spamassassin.service' net-dns-1.01-compat.patch)
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
 md5sums=('76eca1f38c11635d319e62c26d5b034b'
  'SKIP'
- '8adce028f25387ac3bc4dba697d209ed')
+ '8adce028f25387ac3bc4dba697d209ed'
+ '63458976671c35f423bd4e8033cfff3a')
 
 prepare() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}
@@ -33,6 +34,8 @@
 
   sed -i t/sa_compile.t \
  -e 's#^my $temp_binpath = $Config{sitebinexp};#my $temp_binpath = 
/bin/site_perl/;#'
+
+  patch -i $srcdir/net-dns-1.01-compat.patch -p3
 }
 
 build() {

Added: net-dns-1.01-compat.patch
===
--- net-dns-1.01-compat.patch   (rev 0)
+++ net-dns-1.01-compat.patch   2015-08-20 21:34:26 UTC (rev 244454)
@@ -0,0 +1,14 @@
+https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7223
+
+--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm 
2015/07/20 18:23:18 1691991
 spamassassin/branches/3.4/lib/Mail/SpamAssassin/DnsResolver.pm 
2015/07/20 18:24:48 1691992
+@@ -592,6 +592,9 @@
+   };
+ 
+   if ($packet) {
++# RD flag needs to be set explicitly since Net::DNS 1.01, Bug 7223
++$packet-header-rd(1);
++
+   # my $udp_payload_size = $self-{res}-udppacketsize;
+ my $udp_payload_size = $self-{conf}-{dns_options}-{edns};
+ if ($udp_payload_size  $udp_payload_size  512) {

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2015-05-01 Thread Florian Pritz 
Date: Friday, May 1, 2015 @ 21:52:11
  Author: bluewind
Revision: 238326

upgpkg: spamassassin 3.4.1-1

upstream update

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |   16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-01 19:26:21 UTC (rev 238325)
+++ PKGBUILD2015-05-01 19:52:11 UTC (rev 238326)
@@ -3,8 +3,8 @@
 # Contributor: Dale Blount d...@archlinux.org
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
-pkgver=3.4.0
-pkgrel=4
+pkgver=3.4.1
+pkgrel=1
 pkgdesc=A mail filter to identify spam.
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -22,21 +22,17 @@
 'etc/mail/spamassassin/v330.pre')
 install=${pkgname}.install
 
source=(http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz{,.asc}
-'spamassassin.service' net-dns.patch)
+'spamassassin.service')
 validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
-md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
+md5sums=('76eca1f38c11635d319e62c26d5b034b'
  'SKIP'
- '8adce028f25387ac3bc4dba697d209ed'
- '0bcf0419608ec4ac200e794563620f31')
+ '8adce028f25387ac3bc4dba697d209ed')
 
 prepare() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}
 
   sed -i t/sa_compile.t \
- -e 's#/foo/bin/spamassassin#/foo/bin/site_perl/spamassassin#' \
- -e 's#/foo/bin/sa-compile#/foo/bin/site_perl/sa-compile#'
-
-  patch -p1 -i $srcdir/net-dns.patch
+ -e 's#^my $temp_binpath = $Config{sitebinexp};#my $temp_binpath = 
/bin/site_perl/;#'
 }
 
 build() {

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2015-01-06 Thread Florian Pritz 
Date: Tuesday, January 6, 2015 @ 13:52:45
  Author: bluewind
Revision: 228704

add validpgpkeys

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2015-01-06 07:41:02 UTC (rev 228703)
+++ PKGBUILD2015-01-06 12:52:45 UTC (rev 228704)
@@ -23,6 +23,7 @@
 install=${pkgname}.install
 
source=(http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz{,.asc}
 'spamassassin.service' net-dns.patch)
+validpgpkeys=(D8099BC79E17D7E49BC21E31FDE52F40F7D39814)
 md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
  'SKIP'
  'd0ce5f8a02fd74dbc83632f4aaec6185'

[arch-commits] Commit in spamassassin/trunk (PKGBUILD net-dns.patch)

2014-06-08 Thread Felix Yan 
Date: Sunday, June 8, 2014 @ 09:53:16
  Author: fyan
Revision: 214375

upgpkg: spamassassin 3.4.0-3

- fix nameserver fetching from net-dns

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/net-dns.patch

---+
 PKGBUILD  |4 ++--
 net-dns.patch |   16 +++-
 2 files changed, 17 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-08 04:02:14 UTC (rev 214374)
+++ PKGBUILD2014-06-08 07:53:16 UTC (rev 214375)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc=A mail filter to identify spam.
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -26,7 +26,7 @@
 md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
  'SKIP'
  'd0ce5f8a02fd74dbc83632f4aaec6185'
- 'bd27e3a54784a0a519d3abff3fa82392')
+ '0bcf0419608ec4ac200e794563620f31')
 
 prepare() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}

Modified: net-dns.patch
===
--- net-dns.patch   2014-06-08 04:02:14 UTC (rev 214374)
+++ net-dns.patch   2014-06-08 07:53:16 UTC (rev 214375)
@@ -1,5 +1,8 @@
-Fix FS#40707 by disabling the failing version check. We don't ship versions 
that old anyway.
+Fix FS#40707 by
 
+- disabling the failing version check. We don't ship versions that old anyway.
+- fix nameservers fetching from Net::DNS
+
 ---
 diff -Nur a/lib/Mail/SpamAssassin/Dns.pm b/lib/Mail/SpamAssassin/Dns.pm
 --- a/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:34:56.299391918 +0200
@@ -25,3 +28,14 @@
  
return $self;
  }
+--- a/lib/Mail/SpamAssassin/DnsResolver.pm 2014-06-08 12:48:29.064230952 
+0800
 b/lib/Mail/SpamAssassin/DnsResolver.pm 2014-06-08 12:49:06.961872678 
+0800
+@@ -205,7 +205,7 @@
+ dbg(dns: servers set by config to: %s, join(', ',@ns_addr_port));
+   } elsif ($res) {  # default as provided by Net::DNS, e.g. /etc/resolv.conf
+ @ns_addr_port = map(untaint_var([$_]: . $res-{port}),
+-@{$res-{nameservers}});
++$res-nameservers);
+ dbg(dns: servers obtained from Net::DNS : %s, join(', ',@ns_addr_port));
+   }
+   return @ns_addr_port;

[arch-commits] Commit in spamassassin/trunk (PKGBUILD net-dns.patch)

2014-06-05 Thread Florian Pritz 
Date: Thursday, June 5, 2014 @ 20:50:35
  Author: bluewind
Revision: 214307

upgpkg: spamassassin 3.4.0-2

fix FS#40707; Net::DNS dev version causes errors

Added:
  spamassassin/trunk/net-dns.patch
Modified:
  spamassassin/trunk/PKGBUILD

---+
 PKGBUILD  |9 ++---
 net-dns.patch |   27 +++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-05 17:24:35 UTC (rev 214306)
+++ PKGBUILD2014-06-05 18:50:35 UTC (rev 214307)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A mail filter to identify spam.
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -22,10 +22,11 @@
 'etc/mail/spamassassin/v330.pre')
 install=${pkgname}.install
 
source=(http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz{,.asc}
-'spamassassin.service')
+'spamassassin.service' net-dns.patch)
 md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
  'SKIP'
- 'd0ce5f8a02fd74dbc83632f4aaec6185')
+ 'd0ce5f8a02fd74dbc83632f4aaec6185'
+ 'bd27e3a54784a0a519d3abff3fa82392')
 
 prepare() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}
@@ -33,6 +34,8 @@
   sed -i t/sa_compile.t \
  -e 's#/foo/bin/spamassassin#/foo/bin/site_perl/spamassassin#' \
  -e 's#/foo/bin/sa-compile#/foo/bin/site_perl/sa-compile#'
+
+  patch -p1 -i $srcdir/net-dns.patch
 }
 
 build() {

Added: net-dns.patch
===
--- net-dns.patch   (rev 0)
+++ net-dns.patch   2014-06-05 18:50:35 UTC (rev 214307)
@@ -0,0 +1,27 @@
+Fix FS#40707 by disabling the failing version check. We don't ship versions 
that old anyway.
+
+---
+diff -Nur a/lib/Mail/SpamAssassin/Dns.pm b/lib/Mail/SpamAssassin/Dns.pm
+--- a/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:34:56.299391918 +0200
 b/lib/Mail/SpamAssassin/Dns.pm 2014-06-05 19:35:56.816256160 +0200
+@@ -518,7 +518,7 @@
+   }
+ }
+ else {
+-  if ($Net::DNS::VERSION  0.34) {
++  if (0) {
+   warn(dns: Net::DNS version is $Net::DNS::VERSION, but need 0.34);
+   return $IS_DNS_AVAILABLE;
+   }
+diff -Nur a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm 
Mail-SpamAssassin-3.4.0/lib/Mail/SpamAssassin/Plugin/AskDNS.pm
+--- a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm   2014-06-05 19:34:56.302725263 
+0200
 b/lib/Mail/SpamAssassin/Plugin/AskDNS.pm   2014-06-05 19:35:30.086168916 
+0200
+@@ -211,7 +211,7 @@
+ 
+   $self-set_config($sa_main-{conf});
+ 
+-  $txtdata_can_provide_a_list = Net::DNS-VERSION = 0.69;
++  $txtdata_can_provide_a_list = 1;
+ 
+   return $self;
+ }

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2013-05-12 Thread Florian Pritz 
Date: Sunday, May 12, 2013 @ 19:03:15
  Author: bluewind
Revision: 185270

upgpkg: spamassassin 3.3.2-8

remove initscripts files

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-12 16:30:19 UTC (rev 185269)
+++ PKGBUILD2013-05-12 17:03:15 UTC (rev 185270)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=7
+pkgrel=8
 pkgdesc=A mail filter to identify spam.
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -14,8 +14,7 @@
  'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
 makedepends=('razor' 'perl-dbi') 
 optdepends=('razor: to identify collaborately-flagged spam')
-backup=('etc/conf.d/spamd' 
-'etc/mail/spamassassin/local.cf'
+backup=('etc/mail/spamassassin/local.cf'
 'etc/mail/spamassassin/init.pre'
 'etc/mail/spamassassin/v310.pre'
 'etc/mail/spamassassin/v312.pre'
@@ -24,10 +23,8 @@
 install=${pkgname}.install
 options=('!emptydirs')
 
source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz;
-'spamd.conf.d' 'spamd' 'spamassassin.service')
+'spamassassin.service')
 md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
- 'af501c6b0bb937a2775b747cc4b6d150'
- '57545e6877503d897db21e9a2e8bd2b9'
  'ded3e012a4d502df001f2d97c495cc4e')
 
 build() {
@@ -55,7 +52,5 @@
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}
   make DESTDIR=${pkgdir} install
 
-  install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd
-  install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd
   install -D -m644 ${srcdir}/spamassassin.service 
${pkgdir}/usr/lib/systemd/system/spamassassin.service
 }

[arch-commits] Commit in spamassassin/trunk (PKGBUILD spamassassin.service)

2012-10-19 Thread Florian Pritz 
Date: Friday, October 19, 2012 @ 05:02:58
  Author: bluewind
Revision: 169316

fix missing -d in systemd service file

upgpkg: spamassassin 3.3.2-7

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/spamassassin.service

--+
 PKGBUILD |4 ++--
 spamassassin.service |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-19 08:50:03 UTC (rev 169315)
+++ PKGBUILD2012-10-19 09:02:58 UTC (rev 169316)
@@ -4,7 +4,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=6
+pkgrel=7
 pkgdesc=A mail filter to identify spam.
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -28,7 +28,7 @@
 md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
  'af501c6b0bb937a2775b747cc4b6d150'
  '57545e6877503d897db21e9a2e8bd2b9'
- '1c39572b79bc20c822387814050ee5c1')
+ 'ded3e012a4d502df001f2d97c495cc4e')
 
 build() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}

Modified: spamassassin.service
===
--- spamassassin.service2012-10-19 08:50:03 UTC (rev 169315)
+++ spamassassin.service2012-10-19 09:02:58 UTC (rev 169316)
@@ -5,7 +5,7 @@
 [Service]
 Type=forking
 PIDFile=/var/run/spamd.pid
-ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c
+ExecStart=/usr/bin/vendor_perl/spamd -d --pidfile /var/run/spamd.pid -c
 StandardOutput=syslog
 StandardError=syslog
 Restart=always

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

2012-08-29 Thread Florian Pritz 
Date: Wednesday, August 29, 2012 @ 05:52:02
  Author: bluewind
Revision: 165692

upgpkg: spamassassin 3.3.2-5

fix FS#31326

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/spamassassin.install

--+
 PKGBUILD |2 +-
 spamassassin.install |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-29 09:27:22 UTC (rev 165691)
+++ PKGBUILD2012-08-29 09:52:02 UTC (rev 165692)
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=4
+pkgrel=5
 pkgdesc=A mail filter to identify spam.
 arch=('i686' 'x86_64')
 license=('APACHE')

Modified: spamassassin.install
===
--- spamassassin.install2012-08-29 09:27:22 UTC (rev 165691)
+++ spamassassin.install2012-08-29 09:52:02 UTC (rev 165692)
@@ -4,7 +4,7 @@
 
 post_upgrade() {
   # Compile rules, if rules have previously been compiled, and it's possible
-  if type re2c /dev/null  type sa-compile /dev/null  [[ -d 
/var/lib/spamassassin/compiled ]]
+  if type re2c /dev/null  type sa-compile /dev/null  [[ -d 
/var/lib/spamassassin/compiled ]]; then
 echo Detected compiled rules, running sa-compile...
 sa-compile  /dev/null 21
 fi

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2012-08-29 Thread Florian Pritz 
Date: Wednesday, August 29, 2012 @ 09:16:34
  Author: bluewind
Revision: 165765

upgpkg: spamassassin 3.3.2-6

fix typo

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-29 13:14:23 UTC (rev 165764)
+++ PKGBUILD2012-08-29 13:16:34 UTC (rev 165765)
@@ -1,9 +1,10 @@
 # $Id$
-# Maintainer: Dale Blount d...@archlinux.org
+# Maintainer: Florian Pritz bluew...@xinu.at
+# Contributor: Dale Blount d...@archlinux.org
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=5
+pkgrel=6
 pkgdesc=A mail filter to identify spam.
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -56,5 +57,5 @@
 
   install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd
   install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd
-  install -D -m644 ${srcdir}/spamassassin.service 
${pkgdir}/usr/lib/systemd/system/spamassassin.serivce
+  install -D -m644 ${srcdir}/spamassassin.service 
${pkgdir}/usr/lib/systemd/system/spamassassin.service
 }

[arch-commits] Commit in spamassassin/trunk (PKGBUILD spamassassin.service)

2012-08-16 Thread Florian Pritz 
Date: Thursday, August 16, 2012 @ 12:15:27
  Author: bluewind
Revision: 165369

upgpkg: spamassassin 3.3.2-4

add system unit

Added:
  spamassassin/trunk/spamassassin.service
Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |8 +---
 spamassassin.service |   14 ++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-08-16 14:45:26 UTC (rev 165368)
+++ PKGBUILD2012-08-16 16:15:27 UTC (rev 165369)
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=3
+pkgrel=4
 pkgdesc=A mail filter to identify spam.
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -23,10 +23,11 @@
 install=${pkgname}.install
 options=('!emptydirs')
 
source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz;
-'spamd.conf.d' 'spamd')
+'spamd.conf.d' 'spamd' 'spamassassin.service')
 md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
  'af501c6b0bb937a2775b747cc4b6d150'
- '57545e6877503d897db21e9a2e8bd2b9')
+ '57545e6877503d897db21e9a2e8bd2b9'
+ '1c39572b79bc20c822387814050ee5c1')
 
 build() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}
@@ -55,4 +56,5 @@
 
   install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd
   install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd
+  install -D -m644 ${srcdir}/spamassassin.service 
${pkgdir}/usr/lib/systemd/system/spamassassin.serivce
 }

Added: spamassassin.service
===
--- spamassassin.service(rev 0)
+++ spamassassin.service2012-08-16 16:15:27 UTC (rev 165369)
@@ -0,0 +1,14 @@
+[Unit]
+Description=Spamassassin daemon
+After=syslog.target network.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/spamd.pid
+ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c
+StandardOutput=syslog
+StandardError=syslog
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

[arch-commits] Commit in spamassassin/trunk (PKGBUILD spamd)

2012-01-16 Thread Florian Pritz 
Date: Monday, January 16, 2012 @ 03:56:03
  Author: bluewind
Revision: 146677

fix make test and some syntax errors

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/spamd

--+
 PKGBUILD |   12 ++--
 spamd|2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-16 08:07:28 UTC (rev 146676)
+++ PKGBUILD2012-01-16 08:56:03 UTC (rev 146677)
@@ -13,7 +13,8 @@
  'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
 makedepends=('razor' 'perl-dbi') 
 optdepends=('razor: to identify collaborately-flagged spam')
-backup=('etc/conf.d/spamd etc/mail/spamassassin/local.cf'
+backup=('etc/conf.d/spamd' 
+'etc/mail/spamassassin/local.cf'
 'etc/mail/spamassassin/init.pre'
 'etc/mail/spamassassin/v310.pre'
 'etc/mail/spamassassin/v312.pre'
@@ -25,7 +26,7 @@
 'spamd.conf.d' 'spamd')
 md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
  'af501c6b0bb937a2775b747cc4b6d150'
- '94ee712d7b521d1788171e804e86f785')
+ '57545e6877503d897db21e9a2e8bd2b9')
 
 build() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}
@@ -38,6 +39,13 @@
 
 check() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}
+
+  # SSLv2 is disabled by upstream so this test would fail
+  rm -rf t/spamd_ssl_v2.t
+
+  # parallel tests cause lots of failures; disable for now
+  #export HARNESS_OPTIONS=j$(echo $MAKEFLAGS | sed 
's/.*-j\([0-9][0-9]*\).*/\1/')
+
   make test
 }
 

Modified: spamd
===
--- spamd   2012-01-16 08:07:28 UTC (rev 146676)
+++ spamd   2012-01-16 08:56:03 UTC (rev 146677)
@@ -7,7 +7,7 @@
 . /etc/rc.d/functions
 
 PIDFILE=/var/run/spamd.pid
-if [ -f $PIDFILE]; then
+if [ -f $PIDFILE ]; then
   PID=$(cat $PIDFILE)
 else
   PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat

[arch-commits] Commit in spamassassin/trunk (PKGBUILD spamd)

2012-01-15 Thread Florian Pritz 
Date: Sunday, January 15, 2012 @ 10:32:27
  Author: bluewind
Revision: 146656

clean up PKGBUILD; fix FS#20936

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/spamd

--+
 PKGBUILD |   59 +++
 spamd|   10 --
 2 files changed, 35 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-15 12:58:26 UTC (rev 146655)
+++ PKGBUILD2012-01-15 15:32:27 UTC (rev 146656)
@@ -3,53 +3,48 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc=A mail filter to identify spam.
-arch=(i686 x86_64)
-license=(APACHE)
+arch=('i686' 'x86_64')
+license=('APACHE')
 url=http://spamassassin.apache.org;
-depends=('perl=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \
-   'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \
-   'perl-libwww' 'perl-mail-spf' \
-   'zlib' 're2c')
-# perl-archive-tar perl-io-zlib)
+depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
+ 'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
+ 'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
 makedepends=('razor' 'perl-dbi') 
-optdepends=('razor: to identify collaborately-flagged spam'
-   'gnupg: gpg support, without this use --nogpg flag for 
sa-update'
-'re2c: regexp compiler, for compiling rules with sa-compile'
-'perl-io-socket-inet6: ipv6 support'
-'perl-mail-dkim: DomainKeys Identified Mail (DKIM) checking')
-backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \
-   etc/mail/spamassassin/init.pre \
-   etc/mail/spamassassin/v310.pre \
-   etc/mail/spamassassin/v312.pre \
-   etc/mail/spamassassin/v320.pre)
-install=${pkgname}.install
-options=(!emptydirs)
-source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz
 \
-   spamd.conf.d spamd)
+optdepends=('razor: to identify collaborately-flagged spam')
+backup=('etc/conf.d/spamd etc/mail/spamassassin/local.cf'
+'etc/mail/spamassassin/init.pre'
+'etc/mail/spamassassin/v310.pre'
+'etc/mail/spamassassin/v312.pre'
+'etc/mail/spamassassin/v320.pre'
+'etc/mail/spamassassin/v330.pre')
+install=${pkgname}.install
+options=('!emptydirs')
+source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz;
+'spamd.conf.d' 'spamd')
 md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
  'af501c6b0bb937a2775b747cc4b6d150'
- '0534d3071a526a27ddc2b297afa03b04')
+ '94ee712d7b521d1788171e804e86f785')
 
 build() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
+  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
 
   # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor \
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
   CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no
-  /usr/bin/make 
+  make 
 }
 
 check() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-  /usr/bin/make test || true
+  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
+  make test
 }
 
 package() {
-  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
-  /usr/bin/make DESTDIR=${pkgdir} install
+  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
+  make DESTDIR=${pkgdir} install
 
-  /bin/install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd
-  /bin/install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd
+  install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd
+  install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd
 }

Modified: spamd
===
--- spamd   2012-01-15 12:58:26 UTC (rev 146655)
+++ spamd   2012-01-15 15:32:27 UTC (rev 146656)
@@ -6,11 +6,17 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/bin/vendor_perl/spamd`
+PIDFILE=/var/run/spamd.pid
+if [ -f $PIDFILE]; then
+  PID=$(cat $PIDFILE)
+else
+  PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat
+fi
+
 case $1 in
   start)
 stat_busy Starting spamd
-[ -z $PID ]  /usr/bin/vendor_perl/spamd -d ${SPAMD_OPTS}
+[ -z $PID ]  /usr/bin/vendor_perl/spamd -d -r $PIDFILE ${SPAMD_OPTS}
 if [ $? -gt 0 ]; then
   stat_fail
 else

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2011-09-11 Thread Florian Pritz 
Date: Sunday, September 11, 2011 @ 06:04:02
  Author: bluewind
Revision: 137801

add perl-io-socket-inet6 optdep

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |1 +
 1 file changed, 1 insertion(+)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-11 10:02:16 UTC (rev 137800)
+++ PKGBUILD2011-09-11 10:04:02 UTC (rev 137801)
@@ -17,6 +17,7 @@
 optdepends=('razor: to identify collaborately-flagged spam'
'gnupg: gpg support, without this use --nogpg flag for 
sa-update'
 're2c: regexp compiler, for compiling rules with sa-compile'
+'perl-io-socket-inet6: ipv6 support'
 'perl-mail-dkim: DomainKeys Identified Mail (DKIM) checking')
 backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \
etc/mail/spamassassin/init.pre \

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2011-06-28 Thread Angel Velásquez 
Date: Tuesday, June 28, 2011 @ 14:19:06
  Author: angvp
Revision: 129532

upgpkg: spamassassin 3.3.2-2
Fixing FS#24197

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-28 17:11:52 UTC (rev 129531)
+++ PKGBUILD2011-06-28 18:19:06 UTC (rev 129532)
@@ -3,7 +3,7 @@
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc=A mail filter to identify spam.
 arch=(i686 x86_64)
 license=(APACHE)
@@ -17,7 +17,7 @@
 optdepends=('razor: to identify collaborately-flagged spam'
'gnupg: gpg support, without this use --nogpg flag for 
sa-update'
 're2c: regexp compiler, for compiling rules with sa-compile'
-'dkim: DomainKeys Identified Mail (DKIM) checking')
+'perl-mail-dkim: DomainKeys Identified Mail (DKIM) checking')
 backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \
etc/mail/spamassassin/init.pre \
etc/mail/spamassassin/v310.pre \

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2011-06-23 Thread Angel Velásquez 
Date: Thursday, June 23, 2011 @ 18:14:04
  Author: angvp
Revision: 128413

upgpkg: spamassassin 3.3.2-1
Version bump + FS#24197

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-23 22:00:45 UTC (rev 128412)
+++ PKGBUILD2011-06-23 22:14:04 UTC (rev 128413)
@@ -1,10 +1,9 @@
 # $Id$
 # Maintainer: Dale Blount d...@archlinux.org
 # Contributor: Manolis Tzanidakis
-
 pkgname=spamassassin
-pkgver=3.3.1
-pkgrel=5
+pkgver=3.3.2
+pkgrel=1
 pkgdesc=A mail filter to identify spam.
 arch=(i686 x86_64)
 license=(APACHE)
@@ -16,8 +15,9 @@
 # perl-archive-tar perl-io-zlib)
 makedepends=('razor' 'perl-dbi') 
 optdepends=('razor: to identify collaborately-flagged spam'
-   'gnupg: gpg support, without this use --nogpg flag for sa-update'
-'re2c: regexp compiler, for compiling rules with sa-compile')
+   'gnupg: gpg support, without this use --nogpg flag for 
sa-update'
+'re2c: regexp compiler, for compiling rules with sa-compile'
+'dkim: DomainKeys Identified Mail (DKIM) checking')
 backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \
etc/mail/spamassassin/init.pre \
etc/mail/spamassassin/v310.pre \
@@ -27,7 +27,7 @@
 options=(!emptydirs)
 
source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz
 \
spamd.conf.d spamd)
-md5sums=('5a93f81fda315411560ff5da099382d2'
+md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
  'af501c6b0bb937a2775b747cc4b6d150'
  '0534d3071a526a27ddc2b297afa03b04')

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2011-05-25 Thread Rémy Oudompheng 
Date: Wednesday, May 25, 2011 @ 17:40:50
  Author: remy
Revision: 125325

Add a check() function, rebuild for perl 5.14

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-25 21:23:30 UTC (rev 125324)
+++ PKGBUILD2011-05-25 21:40:50 UTC (rev 125325)
@@ -4,15 +4,16 @@
 
 pkgname=spamassassin
 pkgver=3.3.1
-pkgrel=4
+pkgrel=5
 pkgdesc=A mail filter to identify spam.
 arch=(i686 x86_64)
 license=(APACHE)
 url=http://spamassassin.apache.org;
-depends=('perl=5.12.2' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \
+depends=('perl=5.14' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \
'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \
-   'perl-libwww' 'perl-io-zlib' 'perl-mail-spf' \
-   'perl-archive-tar' 'zlib' 're2c')
+   'perl-libwww' 'perl-mail-spf' \
+   'zlib' 're2c')
+# perl-archive-tar perl-io-zlib)
 makedepends=('razor' 'perl-dbi') 
 optdepends=('razor: to identify collaborately-flagged spam'
'gnupg: gpg support, without this use --nogpg flag for sa-update'
@@ -39,12 +40,14 @@
   /usr/bin/make 
 }
 
+check() {
+  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
+  /usr/bin/make test || true
+}
+
 package() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}
   /usr/bin/make DESTDIR=${pkgdir} install
-  # remove perllocal.pod and .packlist
-  find ${pkgdir} -name perllocal.pod -delete
-  find ${pkgdir} -name .packlist -delete
 
   /bin/install -D -m644 ${srcdir}/spamd.conf.d ${pkgdir}/etc/conf.d/spamd
   /bin/install -D -m755 ${srcdir}/spamd ${pkgdir}/etc/rc.d/spamd

[arch-commits] Commit in spamassassin/trunk (PKGBUILD spamd)

2011-01-16 Thread Angel Velásquez 
Date: Sunday, January 16, 2011 @ 12:09:43
  Author: angvp
Revision: 106385

upgpkg: spamassassin 3.3.1-4
Fixing path of the perl on the spamd script

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/spamd

--+
 PKGBUILD |4 ++--
 spamd|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-16 17:09:23 UTC (rev 106384)
+++ PKGBUILD2011-01-16 17:09:43 UTC (rev 106385)
@@ -4,7 +4,7 @@
 
 pkgname=spamassassin
 pkgver=3.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc=A mail filter to identify spam.
 arch=(i686 x86_64)
 license=(APACHE)
@@ -28,7 +28,7 @@
spamd.conf.d spamd)
 md5sums=('5a93f81fda315411560ff5da099382d2'
  'af501c6b0bb937a2775b747cc4b6d150'
- 'db5c79722722e56678401ae454b28ece')
+ '0534d3071a526a27ddc2b297afa03b04')
 
 build() {
   cd ${srcdir}/Mail-SpamAssassin-${pkgver}

Modified: spamd
===
--- spamd   2011-01-16 17:09:23 UTC (rev 106384)
+++ spamd   2011-01-16 17:09:43 UTC (rev 106385)
@@ -6,11 +6,11 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/bin/perlbin/vendor/spamd`
+PID=`pidof -o %PPID /usr/bin/vendor_perl/spamd`
 case $1 in
   start)
 stat_busy Starting spamd
-[ -z $PID ]  /usr/bin/perlbin/vendor/spamd -d ${SPAMD_OPTS}
+[ -z $PID ]  /usr/bin/vendor_perl/spamd -d ${SPAMD_OPTS}
 if [ $? -gt 0 ]; then
   stat_fail
 else

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2011-01-05 Thread Angel Velásquez 
Date: Thursday, January 6, 2011 @ 00:02:44
  Author: angvp
Revision: 105086

upgpkg: spamassassin 3.3.1-3
Rebuilt against perl 5.12.2

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-06 05:01:25 UTC (rev 105085)
+++ PKGBUILD2011-01-06 05:02:44 UTC (rev 105086)
@@ -4,12 +4,12 @@
 
 pkgname=spamassassin
 pkgver=3.3.1
-pkgrel=2
+pkgrel=3
 pkgdesc=A mail filter to identify spam.
 arch=(i686 x86_64)
 license=(APACHE)
 url=http://spamassassin.apache.org;
-depends=('perl=5.10.0' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \
+depends=('perl=5.12.2' 'perl-net-dns' 'perl-uri' 'perl-html-parser' \
'perl-digest-sha1' 'perl-io-socket-ssl' 'openssl' \
'perl-libwww' 'perl-io-zlib' 'perl-mail-spf' \
'perl-archive-tar' 'zlib' 're2c')
@@ -36,9 +36,12 @@
   # install module in vendor directories.
   PERL_MM_USE_DEFAULT=1 /usr/bin/perl Makefile.PL INSTALLDIRS=vendor \
   contact_address=r...@localhost ENABLE_SSL=yes PERL_TAINT=no
-  /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=${pkgdir} install || return 1
+  /usr/bin/make 
+}
 
+package() {
+  cd ${srcdir}/Mail-SpamAssassin-${pkgver}
+  /usr/bin/make DESTDIR=${pkgdir} install
   # remove perllocal.pod and .packlist
   find ${pkgdir} -name perllocal.pod -delete
   find ${pkgdir} -name .packlist -delete

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2010-04-01 Thread Giovanni Scafora 
Date: Thursday, April 1, 2010 @ 18:07:41
  Author: giovanni
Revision: 75581

upgpkg: spamassassin 3.3.1-2
openssl-1 rebuild

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-01 21:42:42 UTC (rev 75580)
+++ PKGBUILD2010-04-01 22:07:41 UTC (rev 75581)
@@ -4,7 +4,7 @@
 
 pkgname=spamassassin
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc=A mail filter to identify spam.
 arch=(i686 x86_64)
 license=(APACHE)

[arch-commits] Commit in spamassassin/trunk (PKGBUILD)

2010-03-22 Thread Paul Mattal 
Date: Monday, March 22, 2010 @ 21:02:38
  Author: paul
Revision: 73137

upgpkg: spamassassin 3.3.1-1
upstream update to 3.3.1

Modified:
  spamassassin/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-23 00:47:36 UTC (rev 73136)
+++ PKGBUILD2010-03-23 01:02:38 UTC (rev 73137)
@@ -3,8 +3,8 @@
 # Contributor: Manolis Tzanidakis
 
 pkgname=spamassassin
-pkgver=3.3.0
-pkgrel=2
+pkgver=3.3.1
+pkgrel=1
 pkgdesc=A mail filter to identify spam.
 arch=(i686 x86_64)
 license=(APACHE)
@@ -26,7 +26,7 @@
 options=(!emptydirs)
 
source=(http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz
 \
spamd.conf.d spamd)
-md5sums=('38078b07396c0ab92b46386bc70ef086'
+md5sums=('5a93f81fda315411560ff5da099382d2'
  'af501c6b0bb937a2775b747cc4b6d150'
  'db5c79722722e56678401ae454b28ece')

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

2010-03-06 Thread Paul Mattal 
Date: Saturday, March 6, 2010 @ 17:49:00
  Author: paul
Revision: 71393

added auto detection of compiled rules and running of sa-update (FS#17731)

Modified:
  spamassassin/trunk/PKGBUILD
  spamassassin/trunk/spamassassin.install

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

Modified: PKGBUILD
===
--- PKGBUILD2010-03-06 22:20:36 UTC (rev 71392)
+++ PKGBUILD2010-03-06 22:49:00 UTC (rev 71393)
@@ -4,7 +4,7 @@
 
 pkgname=spamassassin
 pkgver=3.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc=A mail filter to identify spam.
 arch=(i686 x86_64)
 license=(APACHE)
@@ -15,7 +15,8 @@
'perl-archive-tar' 'zlib' 're2c')
 makedepends=('razor' 'perl-dbi') 
 optdepends=('razor: to identify collaborately-flagged spam'
-   'gnupg: gpg support, without this use --nogpg flag for sa-update')
+   'gnupg: gpg support, without this use --nogpg flag for sa-update'
+'re2c: regexp compiler, for compiling rules with sa-compile')
 backup=(etc/conf.d/spamd etc/mail/spamassassin/local.cf \
etc/mail/spamassassin/init.pre \
etc/mail/spamassassin/v310.pre \

Modified: spamassassin.install
===
--- spamassassin.install2010-03-06 22:20:36 UTC (rev 71392)
+++ spamassassin.install2010-03-06 22:49:00 UTC (rev 71393)
@@ -1,15 +1,17 @@
 # arg 1:  the new package version
 post_install() {
+  echo You must run 'sa-update' to install spam rules before use.
   /bin/true
 }
 
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  echo You must run 'sa-update' to install spam rules before use.
-  echo For detailed upgrade notes, see:
-  echo   
http://svn.apache.org/repos/asf/spamassassin/tags/spamassassin_current_release_3.3.x/UPGRADE;
-   post_install
+  # Compile rules, if rules have previously been compiled, and it's possible
+  if [ -x /usr/bin/re2c -a -x /usr/bin/perlbin/vendor/sa-compile -a -d 
/var/lib/spamassassin/compiled ]; then
+echo Detected compiled rules, running sa-compile...
+sa-compile  /dev/null 21
+fi
 }
 
 # arg 1:  the old package version