From fb529b067a73d854f6dd32ff1e44d7500ef21a8c Mon Sep 17 00:00:00 2001
From: Michael Scheidell <scheidell@FreeBSD.org>
Date: Mon, 5 Dec 2011 11:37:23 +0000
Subject: [PATCH] -Update ports mail/assp to latest version 1.9.1.8 -Also, fix
 some permissions in install.

PR:		161965
Approved by:	gabor(mentor)
Feature safe:	yes
---
 mail/assp/Makefile             |  2 +-
 mail/assp/distinfo             |  4 ++--
 mail/assp/files/pkg-install.in |  5 +++++
 mail/assp/pkg-plist            | 10 ++++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index 46c758daa53b..cba63d23b718 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	assp
-PORTVERSION=	1.9.1.1
+PORTVERSION=	1.9.1.9
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ringofsaturn.com/distfiles/
diff --git a/mail/assp/distinfo b/mail/assp/distinfo
index b8841e5b7cd0..440c1f663e54 100644
--- a/mail/assp/distinfo
+++ b/mail/assp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ASSP_1.9.1.1-Install.zip) = 6fb485c87ca1db9d5d0a6ecdd5cb702771aa1a5e4b0f3ba57d407f77f641f5c3
-SIZE (ASSP_1.9.1.1-Install.zip) = 759829
+SHA256 (ASSP_1.9.1.9-Install.zip) = f3ff8c2ed968f1d9d72891db749a2a8181bc803c4c3547882099d4501aa07934
+SIZE (ASSP_1.9.1.9-Install.zip) = 835543
diff --git a/mail/assp/files/pkg-install.in b/mail/assp/files/pkg-install.in
index b8a4bf171fa3..04372239897f 100644
--- a/mail/assp/files/pkg-install.in
+++ b/mail/assp/files/pkg-install.in
@@ -8,6 +8,9 @@ if [ "${2}" = "POST-INSTALL" ]; then
     ASSP_LOG=%%ASSP_LOG%%
     DATADIR=${PKG_PREFIX}/share/assp
 
+    chmod -R 755 ${DATADIR}/files
+    chown -R ${ASSP_USER}:${ASSP_GROUP} ${DATADIR}/files
+
     ln -sf ${DATADIR}/assp.pl ${PKG_PREFIX}/sbin/assp
 
     install -d -m 750 -o ${ASSP_USER} -g ${ASSP_GROUP} ${ASSP_LOG}
@@ -16,5 +19,7 @@ if [ "${2}" = "POST-INSTALL" ]; then
     ln -sf ${DATADIR}/files ${ASSP_HOME}
     ln -sf ${DATADIR}/images ${ASSP_HOME}
     ln -sf ${DATADIR}/reports ${ASSP_HOME}
+    ln -sf ${DATADIR}/rebuildspam.pl ${ASSP_HOME}
     ln -sf ${ASSP_LOG} ${ASSP_HOME}/logs
+
 fi
diff --git a/mail/assp/pkg-plist b/mail/assp/pkg-plist
index e71eaec9bf5c..e21f1f919706 100644
--- a/mail/assp/pkg-plist
+++ b/mail/assp/pkg-plist
@@ -18,9 +18,11 @@ sbin/assplog
 %%DATADIR%%/files/denyalways.txt
 %%DATADIR%%/files/dnsbls.txt
 %%DATADIR%%/files/droplist.txt
+%%DATADIR%%/files/groups.txt
 %%DATADIR%%/files/invalidhelo.txt
 %%DATADIR%%/files/invalidptr.txt
 %%DATADIR%%/files/ipnp.txt
+%%DATADIR%%/files/noblocking.txt
 %%DATADIR%%/files/nodelay.txt
 %%DATADIR%%/files/nodelayhelosre.txt
 %%DATADIR%%/files/nogrip.txt
@@ -89,10 +91,10 @@ sbin/assplog
 @dirrm %%DATADIR%%
 @dirrmtry etc/periodic/daily
 @dirrmtry etc/periodic
-@unexec rm %%ASSP_HOME%%/logs
-@unexec rm %%ASSP_HOME%%/reports
-@unexec rm %%ASSP_HOME%%/images
-@unexec rm %%ASSP_HOME%%/files
+@unexec rm -f %%ASSP_HOME%%/logs
+@unexec rm -f %%ASSP_HOME%%/reports
+@unexec rm -f %%ASSP_HOME%%/images
+@unexec rm -f %%ASSP_HOME%%/files
 @unexec rmdir %%ASSP_HOME%% 2>/dev/null || true
 @unexec if [ -d %%ASSP_HOME%% ]; then echo "If you are deinstalling ASSP completely, remove the %%ASSP_HOME%% directory."; fi
 @unexec rmdir %%ASSP_LOG%% 2>/dev/null || true