network/policyd2: Upgraded for version 2.0.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

8 files changed, 44 insertions, 26 deletions

diff --git a/network/policyd2/README.SBo b/network/policyd2/README.SBo
index 252cb897ab..2e0d276ab6 100644
--- a/network/policyd2/README.SBo
+++ b/network/policyd2/README.SBo
@@ -1,3 +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.
+If you are upgrading from v2.0.11 or earlier, please see UPGRADING
+in /usr/doc/policyd2-2.0.14
 
diff --git a/network/policyd2/patches/cbpadmin.patch b/network/policyd2/patches/cbpadmin.patch
index a1986bd6c7..0ced1a4df4 100644
--- a/network/policyd2/patches/cbpadmin.patch
+++ b/network/policyd2/patches/cbpadmin.patch
@@ -1,5 +1,5 @@
---- cbpadmin.orig	2010-01-02 10:38:04.625362848 -0600
-+++ cbpadmin	2010-01-02 10:42:26.850146337 -0600
+--- cbpadmin.orig	2012-11-18 11:59:56.030942355 -0600
++++ cbpadmin	2012-11-18 12:05:00.078476122 -0600
 @@ -22,7 +22,7 @@
  use warnings;
  
diff --git a/network/policyd2/patches/cbpolicyd.patch b/network/policyd2/patches/cbpolicyd.patch
index bb881cbd1b..e53fb66ec8 100644
--- a/network/policyd2/patches/cbpolicyd.patch
+++ b/network/policyd2/patches/cbpolicyd.patch
@@ -1,6 +1,15 @@
---- cbpolicyd.orig	2010-11-30 12:03:52.815487946 -0600
-+++ cbpolicyd	2010-11-30 12:05:04.310762746 -0600
-@@ -53,13 +53,13 @@
+--- cbpolicyd.orig	2012-11-18 12:00:04.180070111 -0600
++++ cbpolicyd	2012-11-18 12:06:26.079296269 -0600
+@@ -22,7 +22,7 @@
+ use strict;
+ use warnings;
+ 
+-use lib('/usr/local/lib/policyd-2.0','/usr/lib/policyd-2.0','/usr/lib64/policyd-2.0');
++use lib('/usr/lib@LIBDIRSUFFIX@/policyd-2.0');
+ 
+ package cbp;
+ 
+@@ -53,15 +53,15 @@
  
  
  	# Set defaults
@@ -8,6 +17,8 @@
 +	$cfg->{'config_file'} = "/etc/policyd2.conf";
  
  	$server->{'timeout'} = 120;
+ 	$server->{'timeout_idle'} = 1015;
+ 	$server->{'timeout_busy'} = 115;
  	$server->{'background'} = "yes";
 -	$server->{'pid_file'} = "/var/run/cbpolicyd.pid";
 +	$server->{'pid_file'} = "/var/run/policyd2.pid";
diff --git a/network/policyd2/patches/httpd_policyd2_conf.patch b/network/policyd2/patches/httpd_policyd2_conf.patch
index 4dcc7b3392..43b704e8b4 100644
--- a/network/policyd2/patches/httpd_policyd2_conf.patch
+++ b/network/policyd2/patches/httpd_policyd2_conf.patch
@@ -1,5 +1,5 @@
---- cluebringer-httpd.conf.orig	2012-05-10 02:04:16.000000000 -0500
-+++ cluebringer-httpd.conf	2013-11-25 15:08:29.228400024 -0600
+--- httpd-policyd2.conf	2013-10-26 13:53:14.000000000 -0500
++++ httpd-policyd2.conf.new	2013-11-27 10:42:24.532100589 -0600
 @@ -8,11 +8,11 @@
  # as well as the authors' long time involvement in large scale mail

  # hosting industry.

diff --git a/network/policyd2/patches/policyd2_config.patch b/network/policyd2/patches/policyd2_config.patch
index e5750fa669..519fbfe1a0 100644
--- a/network/policyd2/patches/policyd2_config.patch
+++ b/network/policyd2/patches/policyd2_config.patch
@@ -1,5 +1,5 @@
---- policyd2.conf.orig	2010-01-02 11:12:18.047653694 -0600
-+++ policyd2.conf.new	2010-01-02 11:13:16.250398479 -0600
+--- policyd2.conf.orig	2012-11-18 12:00:16.298772997 -0600
++++ policyd2.conf.new	2012-11-18 12:10:42.361942813 -0600
 @@ -20,11 +20,11 @@
  EOT
  
@@ -24,3 +24,12 @@
  
  # Log destination for mail logs...
  # main		- Default. Log to policyd's main log mechanism, accepts NO args
+@@ -102,7 +102,7 @@
+ #host=*
+ 
+ # Port to run on
+-#port=10031
++port=10031
+ 
+ # Timeout in communication with clients
+ # Idle timeout in postfix defaults to 1015s (active connection)
diff --git a/network/policyd2/policyd2.SlackBuild b/network/policyd2/policyd2.SlackBuild
index 1b897d90da..d0839b2ea6 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-2012, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2008-2013, Nishant Limbachia, Hoffman Estates, IL, USA
 # <nishant _AT_ mnspace _DOT_ net>
 # All rights reserved.
 #
@@ -26,7 +26,7 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="policyd2"
-VERSION=${VERSION:-2.0.12}
+VERSION=${VERSION:-2.0.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -102,19 +102,17 @@ set -e
 rm -fr $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
-cd $TMP/$SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-v${VERSION}.tar.?z*
+cd $TMP/$SRCNAM-v${VERSION}
 chown -R root.root .
-
-find -L . \
-  \( -perm 1755 -o -perm 2755 -o -perm 777 -o -perm 555 -o -perm 711 -o -perm  511 \) \
-  -exec chmod 755 {} \;
 find -L . \
-  \( -perm 666 -o -perm 664 -o -perm 644 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 ### patch cbpolicyd and cbpadmin to correct library paths and defaults
-patch -p0 < $CWD/patches/cbpolicyd.patch
+sed s:@LIBDIRSUFFIX@:$LIBDIRSUFFIX: $CWD/patches/cbpolicyd.patch | patch -p0
 sed s:@LIBDIRSUFFIX@:$LIBDIRSUFFIX: $CWD/patches/cbpadmin.patch | patch -p0
 
 mkdir -p $PKG/$DOCROOT
diff --git a/network/policyd2/policyd2.info b/network/policyd2/policyd2.info
index b3cfdd0aad..a8e325fd9b 100644
--- a/network/policyd2/policyd2.info
+++ b/network/policyd2/policyd2.info
@@ -1,8 +1,8 @@
 PRGNAM="policyd2"
-VERSION="2.0.12"
+VERSION="2.0.14"
 HOMEPAGE="http://www.policyd.org/"
-DOWNLOAD="http://devlabs.linuxassist.net/attachments/download/223/cluebringer-2.0.12.tar.xz"
-MD5SUM="1819ad7785ca6375213ec828b84f91f7"
+DOWNLOAD="http://devlabs.linuxassist.net/attachments/download/320/cluebringer-v2.0.14.tar.xz"
+MD5SUM="e75cd25a836b316846f5ad8bf09a69a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="perl-Cache-FastMmap perl-Config-IniFiles perl-Mail-SPF perl-Net-CIDR perl-Net-Server"
diff --git a/network/policyd2/rc.policyd2 b/network/policyd2/rc.policyd2
index 6da466e9ba..008624a7af 100644
--- a/network/policyd2/rc.policyd2
+++ b/network/policyd2/rc.policyd2
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2008-2012, Nishant Limbachia, Hoffman Estates, IL, USA
+# Copyright (c) 2008-2013, Nishant Limbachia, Hoffman Estates, IL, USA
 #
 # /etc/rc.d/rc.policyd2
 # start|stop|restart|status Policyd2 daemon