Date: Wednesday, January 10, 2018 @ 02:59:28 Author: eschwartz Revision: 280819
archrelease: copy trunk to community-any Added: spampd/repos/community-any/PKGBUILD (from rev 280818, spampd/trunk/PKGBUILD) spampd/repos/community-any/perl-5.18-fixes.patch (from rev 280818, spampd/trunk/perl-5.18-fixes.patch) spampd/repos/community-any/spampd.service (from rev 280818, spampd/trunk/spampd.service) Deleted: spampd/repos/community-any/PKGBUILD spampd/repos/community-any/perl-5.18-fixes.patch spampd/repos/community-any/spampd.install spampd/repos/community-any/spampd.service -----------------------+ PKGBUILD | 79 ++++++++++++++++++++++----------------------- perl-5.18-fixes.patch | 84 ++++++++++++++++++++++++------------------------ spampd.install | 11 ------ spampd.service | 20 +++++------ 4 files changed, 91 insertions(+), 103 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-10 02:58:53 UTC (rev 280818) +++ PKGBUILD 2018-01-10 02:59:28 UTC (rev 280819) @@ -1,40 +0,0 @@ -# Maintainer: Florian "Bluewind" Pritz <f...@xssn.at> -pkgname=spampd -pkgver=2.30 -pkgrel=13 -pkgdesc="Spamassassin Proxy Daemon" -arch=('any') -url="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm" -license=('GPL') -depends=('perl' 'perl-net-server' 'spamassassin') -install=spampd.install -source=("https://www.worlddesign.com/Content/rd/mta/$pkgname/$pkgname-$pkgver.tar.gz" - spampd.service perl-5.18-fixes.patch) -md5sums=('742c6f2cb75db54e59d044a8ee40445f' - 'afc4f2c824bfbd1cc81db3e740f29078' - '55ea1067be9e70c60b708d355b085a0a') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - patch -p1 -i "$srcdir/perl-5.18-fixes.patch" -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm755 spampd "$pkgdir/usr/bin/spampd" - install -Dm644 spampd.8.gz "$pkgdir/usr/share/man/man8/spampd.8.gz" - install -Dm644 "$srcdir/spampd.service" "$pkgdir/usr/lib/systemd/system/spampd.service" - - mkdir -p "$pkgdir/usr/lib/tmpfiles.d" - printf "d /run/spampd 0700 spampd spampd -\n" > "$pkgdir/usr/lib/tmpfiles.d/spampd.conf" -} - -# vim:set ts=2 sw=2 et: Copied: spampd/repos/community-any/PKGBUILD (from rev 280818, spampd/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-10 02:59:28 UTC (rev 280819) @@ -0,0 +1,39 @@ +# Maintainer: Florian "Bluewind" Pritz <f...@xssn.at> +pkgname=spampd +pkgver=2.30 +pkgrel=14 +pkgdesc="Spamassassin Proxy Daemon" +arch=('any') +url="https://www.worlddesign.com/index.cfm/page/software/open-source/spampd.htm" +license=('GPL') +depends=('perl' 'perl-net-server' 'spamassassin') +source=("https://www.worlddesign.com/Content/rd/mta/$pkgname/$pkgname-$pkgver.tar.gz" + spampd.service perl-5.18-fixes.patch) +md5sums=('742c6f2cb75db54e59d044a8ee40445f' + 'afc4f2c824bfbd1cc81db3e740f29078' + '55ea1067be9e70c60b708d355b085a0a') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + patch -p1 -i "$srcdir/perl-5.18-fixes.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -Dm755 spampd "$pkgdir/usr/bin/spampd" + install -Dm644 spampd.8.gz "$pkgdir/usr/share/man/man8/spampd.8.gz" + install -Dm644 "$srcdir/spampd.service" "$pkgdir/usr/lib/systemd/system/spampd.service" + + printf "u spampd - - /var/lib/spampd\n" | install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/spampd.conf" + printf "d /run/spampd 0700 spampd spampd -\n" | install -Dm644 /dev/stdin "$pkgdir/usr/lib/tmpfiles.d/spampd.conf" +} + +# vim:set ts=2 sw=2 et: Deleted: perl-5.18-fixes.patch =================================================================== --- perl-5.18-fixes.patch 2018-01-10 02:58:53 UTC (rev 280818) +++ perl-5.18-fixes.patch 2018-01-10 02:59:28 UTC (rev 280819) @@ -1,42 +0,0 @@ -diff --git a/spampd b/spampd -index 7b1f234..2798d50 100644 ---- a/spampd -+++ b/spampd -@@ -937,6 +937,10 @@ if ( !$options{logsock} ) { - }; - } - -+# untaint some args to prevent errors in other modules -+($pidfile) = ($pidfile =~ /^(.+)$/); -+($relayhost) = ($relayhost =~ /^(.+)$/); -+($relayport) = ($relayport =~ /^(.+)$/); - - my $server = bless { - server => {host => $host, -@@ -1147,10 +1151,10 @@ L<http://www.WorldDesign.com/index.cfm/rd/mta/spampd.htm>. - - =head1 Requires - --=over 5 -- - Perl modules: - -+=over 5 -+ - =item B<Mail::SpamAssassin> - - =item B<Net::Server::PreForkSimple> -@@ -1478,11 +1482,11 @@ Prints usage information. - - =head2 Deprecated Options - --=over 5 -- - The following options are no longer used but still accepted for backwards - compatibility with prevoius I<spampd> versions: - -+=over 5 -+ - =item B<--dead-letters> - - =item B<--heloname> Copied: spampd/repos/community-any/perl-5.18-fixes.patch (from rev 280818, spampd/trunk/perl-5.18-fixes.patch) =================================================================== --- perl-5.18-fixes.patch (rev 0) +++ perl-5.18-fixes.patch 2018-01-10 02:59:28 UTC (rev 280819) @@ -0,0 +1,42 @@ +diff --git a/spampd b/spampd +index 7b1f234..2798d50 100644 +--- a/spampd ++++ b/spampd +@@ -937,6 +937,10 @@ if ( !$options{logsock} ) { + }; + } + ++# untaint some args to prevent errors in other modules ++($pidfile) = ($pidfile =~ /^(.+)$/); ++($relayhost) = ($relayhost =~ /^(.+)$/); ++($relayport) = ($relayport =~ /^(.+)$/); + + my $server = bless { + server => {host => $host, +@@ -1147,10 +1151,10 @@ L<http://www.WorldDesign.com/index.cfm/rd/mta/spampd.htm>. + + =head1 Requires + +-=over 5 +- + Perl modules: + ++=over 5 ++ + =item B<Mail::SpamAssassin> + + =item B<Net::Server::PreForkSimple> +@@ -1478,11 +1482,11 @@ Prints usage information. + + =head2 Deprecated Options + +-=over 5 +- + The following options are no longer used but still accepted for backwards + compatibility with prevoius I<spampd> versions: + ++=over 5 ++ + =item B<--dead-letters> + + =item B<--heloname> Deleted: spampd.install =================================================================== --- spampd.install 2018-01-10 02:58:53 UTC (rev 280818) +++ spampd.install 2018-01-10 02:59:28 UTC (rev 280819) @@ -1,11 +0,0 @@ -post_install() { - post_upgrade "$1" -} - -post_upgrade() { - if ! getent passwd spampd >/dev/null; then - useradd -m -d /var/lib/spampd -r spampd - fi -} - -# vim:set ts=2 sw=2 et: Deleted: spampd.service =================================================================== --- spampd.service 2018-01-10 02:58:53 UTC (rev 280818) +++ spampd.service 2018-01-10 02:59:28 UTC (rev 280819) @@ -1,10 +0,0 @@ -[Unit] -Description=Spamassassin Proxy Daemon -After=network.target - -[Service] -ExecStart=/usr/bin/spampd --port=10025 --relayhost=127.0.0.1:10026 --tagall --log-rules-hit --user spampd --group spampd --pid=/run/spampd/spampd.pid --nodetach --maxsize=512 -PrivateTmp=true - -[Install] -WantedBy=multi-user.target Copied: spampd/repos/community-any/spampd.service (from rev 280818, spampd/trunk/spampd.service) =================================================================== --- spampd.service (rev 0) +++ spampd.service 2018-01-10 02:59:28 UTC (rev 280819) @@ -0,0 +1,10 @@ +[Unit] +Description=Spamassassin Proxy Daemon +After=network.target + +[Service] +ExecStart=/usr/bin/spampd --port=10025 --relayhost=127.0.0.1:10026 --tagall --log-rules-hit --user spampd --group spampd --pid=/run/spampd/spampd.pid --nodetach --maxsize=512 +PrivateTmp=true + +[Install] +WantedBy=multi-user.target