network/policyd2: Updated for version 2.0.12.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

6 files changed, 26 insertions, 16 deletions

diff --git a/network/policyd2/README.SBo b/network/policyd2/README.SBo
new file mode 100644
index 000000000000..252cb897ab10
--- /dev/null
+++ b/network/policyd2/README.SBo
@@ -0,0 +1,3 @@
+If you are upgrading from v2.0.11, please run the SQL query shown in 
+/usr/doc/policy2-2.0.12/UPGRADING to update your database for v2.0.12.
+
diff --git a/network/policyd2/patches/cbpadmin.patch b/network/policyd2/patches/cbpadmin.patch
index bcc8ede9a98b..a1986bd6c7d6 100644
--- a/network/policyd2/patches/cbpadmin.patch
+++ b/network/policyd2/patches/cbpadmin.patch
@@ -5,7 +5,7 @@
  
  
 -use lib('/usr/local/lib/policyd-2.0','/usr/lib/policyd-2.0');
-+use lib('/usr/lib/policyd-2.0','/usr/lib64/policyd-2.0');
++use lib('/usr/lib@LIBDIRSUFFIX@/policyd-2.0');
  
  use Config::IniFiles;
  use Getopt::Long;
diff --git a/network/policyd2/policyd2.SlackBuild b/network/policyd2/policyd2.SlackBuild
index 979bd39353dc..f7658dead5fe 100644
--- a/network/policyd2/policyd2.SlackBuild
+++ b/network/policyd2/policyd2.SlackBuild
@@ -3,7 +3,7 @@
 # Slackware Package Build Script for policyd2 (a.k.a cluebringer)
 # Home Page http://www.policyd.org/
 
-# Copyright (c) 2008-2010, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2008-2012, Nishant Limbachia, Hoffman Estates, IL, USA
 # <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 #
@@ -25,12 +25,12 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=policyd2
-VERSION=${VERSION:-2.0.11}
+PRGNAM="policyd2"
+VERSION=${VERSION:-2.0.12}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCNAM=cluebringer
+SRCNAM="cluebringer"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -74,8 +74,14 @@ if ! grep -q ^policyd: /etc/passwd ; then
   exit 1
 fi
 
-### default database is mysql, but postgresql (pgsql) and SQlite (sqlite) are supported as well
-### please use exact words, mysql, pgsql or sqlite
+### default database is mysql, Following databases are supported by the
+### convert-tsql script to prepare a db template.
+#	mysql55 - For MySQL v5.5
+#	mysql4  - For MySQL v4
+#	mysql   - For MySQL v5
+#	pgsql   - For PostgreSQL
+#	sqlite  - For SQLite v3
+
 DATABASE=${DATABASE:-mysql}
 
 ### web user and group
@@ -89,7 +95,7 @@ GROUP=${GROUP:-policyd}
 ### define docroot to copy web admin files
 DOCROOT=${DOCROOT:-/var/www/htdocs}
 
-DOCS="AUTHORS ChangeLog INSTALL TODO LICENSE WISHLIST"
+DOCS="AUTHORS ChangeLog INSTALL TODO LICENSE UPGRADING WISHLIST"
 
 set -e
 
@@ -109,7 +115,7 @@ find . \
 
 ### patch cbpolicyd and cbpadmin to correct library paths and defaults
 patch -p0 < $CWD/patches/cbpolicyd.patch
-patch -p0 < $CWD/patches/cbpadmin.patch
+sed s:@LIBDIRSUFFIX@:$LIBDIRSUFFIX: $CWD/patches/cbpadmin.patch | patch -p0
 
 mkdir -p $PKG/$DOCROOT
 mkdir -p $PKG/usr/{bin,sbin,lib${LIBDIRSUFFIX}/policyd-2.0,doc/$PRGNAM-$VERSION}
@@ -117,6 +123,7 @@ cp -a cbp $PKG/usr/lib${LIBDIRSUFFIX}/policyd-2.0
 install -m 0755 -D cbpadmin $PKG/usr/bin/cbpadmin
 install -m 0755 -D cbpolicyd $PKG/usr/sbin/cbpolicyd
 install -m 0644 $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a database $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a webui $PKG/$DOCROOT/policyd2-webui
 
 ### move config.php to new file
diff --git a/network/policyd2/policyd2.info b/network/policyd2/policyd2.info
index de31057fbbbf..6cabc35a0c05 100644
--- a/network/policyd2/policyd2.info
+++ b/network/policyd2/policyd2.info
@@ -1,10 +1,10 @@
 PRGNAM="policyd2"
-VERSION="2.0.11"
+VERSION="2.0.12"
 HOMEPAGE="http://www.policyd.org/"
-DOWNLOAD="http://devlabs.linuxassist.net/attachments/download/186/cluebringer-2.0.11.tar.bz2"
-MD5SUM="b359032ac7ec9ae7aadbcbf2136b7a47"
+DOWNLOAD="http://devlabs.linuxassist.net/attachments/download/223/cluebringer-2.0.12.tar.xz"
+MD5SUM="1819ad7785ca6375213ec828b84f91f7"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Nishant Limbachia"
 EMAIL="nishant@mnspace.net"
-APPROVED="Niels Horn"
+APPROVED="dsomero"
diff --git a/network/policyd2/rc.policyd2 b/network/policyd2/rc.policyd2
index 7980d959bb11..6da466e9bac8 100644
--- a/network/policyd2/rc.policyd2
+++ b/network/policyd2/rc.policyd2
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2008-2011, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2008-2012, Nishant Limbachia, Hoffman Estates, IL, USA
 #
 # /etc/rc.d/rc.policyd2
 # start|stop|restart|status Policyd2 daemon
diff --git a/network/policyd2/slack-desc b/network/policyd2/slack-desc
index 8c20ea84cd6d..aa08ff813d85 100644
--- a/network/policyd2/slack-desc
+++ b/network/policyd2/slack-desc
@@ -10,8 +10,8 @@ policyd2: policyd2 (policy server for MTA)
 policyd2:
 policyd2: policyd2 is is a multi-platform policy server for popular MTAs.
 policyd2: policyd2 aims to implement as many spam combating and email compliance
-policyd2: features as possible while at the same time maintaining the
-policyd2: portability, stability and performance.
+policyd2: features as possible while at the same time maintaining the portability,
+policyd2: stability and performance.
 policyd2:
 policyd2: Home Page: http://www.policyd.org/
 policyd2: