From dfcba874ab72131df51e3570ca20fbcc93e3fe5c Mon Sep 17 00:00:00 2001
From: Nishant Limbachia <nishant@mnspace.net>
Date: Sat, 21 Dec 2013 08:18:24 +0700
Subject: network/policyd2: Upgraded for version 2.0.4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/policyd2/patches/cbpadmin.patch            |  4 ++--
 network/policyd2/patches/cbpolicyd.patch           | 17 ++++++++++++++---
 network/policyd2/patches/httpd_policyd2_conf.patch |  4 ++--
 network/policyd2/patches/policyd2_config.patch     | 13 +++++++++++--
 4 files changed, 29 insertions(+), 9 deletions(-)

(limited to 'network/policyd2/patches')

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)
-- 
cgit v1.2.3