summaryrefslogtreecommitdiff
path: root/mail/sqlgrey/patches
diff options
context:
space:
mode:
Diffstat (limited to 'mail/sqlgrey/patches')
-rw-r--r--mail/sqlgrey/patches/patch-aa10
-rw-r--r--mail/sqlgrey/patches/patch-ab36
-rw-r--r--mail/sqlgrey/patches/patch-ac8
-rw-r--r--mail/sqlgrey/patches/patch-ad22
4 files changed, 46 insertions, 30 deletions
diff --git a/mail/sqlgrey/patches/patch-aa b/mail/sqlgrey/patches/patch-aa
index 506fd0c4efa..bfbdf0b934d 100644
--- a/mail/sqlgrey/patches/patch-aa
+++ b/mail/sqlgrey/patches/patch-aa
@@ -1,6 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2010/02/04 02:43:52 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2016/05/25 21:39:44 fhajny Exp $
---- Makefile.orig 2005-06-07 02:28:38.000000000 +0200
+Default dirs.
+
+--- Makefile.orig 2012-02-13 16:54:08.000000000 +0000
+++ Makefile
@@ -1,10 +1,8 @@
INSTALL = install
@@ -16,8 +18,8 @@ $NetBSD: patch-aa,v 1.2 2010/02/04 02:43:52 joerg Exp $
+MANDIR = ${DESTDIR}$(PREFIX)/$(PKGMANDIR)/man1
VERSION := $(shell cat VERSION)
- TBZ2 = sqlgrey-$(VERSION).tar.bz2
-@@ -30,9 +28,7 @@ clean:
+
+@@ -43,9 +41,7 @@ clean:
install: all
$(INSTALL) -d -m 755 $(SBINDIR)
diff --git a/mail/sqlgrey/patches/patch-ab b/mail/sqlgrey/patches/patch-ab
index e7363218764..b132ce9f9b7 100644
--- a/mail/sqlgrey/patches/patch-ab
+++ b/mail/sqlgrey/patches/patch-ab
@@ -1,44 +1,54 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/11/13 16:43:04 ghen Exp $
+$NetBSD: patch-ab,v 1.2 2016/05/25 21:39:44 fhajny Exp $
---- sqlgrey.orig 2007-08-05 22:41:19.000000000 +0200
+Default dirs. Use native connection to syslog.
+
+--- sqlgrey.orig 2012-02-13 16:54:08.000000000 +0000
+++ sqlgrey
-@@ -52,11 +52,11 @@ my $config = 'config';
+@@ -57,10 +57,10 @@ my $config = 'config';
# defaults
my %dflt;
$dflt{loglevel} = 2; # used for $dflt{log} entries in read_conffile()
-$dflt{user} = 'sqlgrey';
-$dflt{group} = 'sqlgrey';
-+$dflt{user} = '%%SQLGREY_USER%%';
-+$dflt{group} = '%%SQLGREY_GROUP%%';
- $dflt{inet} = '2501';
-$dflt{pidfile} = '/var/run/sqlgrey.pid';
-$dflt{conf_dir} = '/etc/sqlgrey';
-+$dflt{pidfile} = '%%VARBASE%%/run/sqlgrey.pid';
-+$dflt{conf_dir} = '%%PKG_SYSCONFDIR%%';
++$dflt{user} = '@SQLGREY_USER@';
++$dflt{group} = '@SQLGREY_GROUP@';
++$dflt{pidfile} = '@SQLGREY_PIDDIR@/sqlgrey.pid';
++$dflt{conf_dir} = '@PKG_SYSCONFDIR@';
$dflt{reconnect_delay} = 5; # 5 minutes
$dflt{max_connect_age} = 24; # 24 hours
$dflt{awl_age} = 60; # 60 days
-@@ -91,7 +91,7 @@ $dflt{log} = { # note values here are no
+@@ -104,7 +104,7 @@ $dflt{log} = { # note values here are no
};
# Default configuration file
-my $config_file = '/etc/sqlgrey/sqlgrey.conf';
-+my $config_file = '%%PKG_SYSCONFDIR%%/sqlgrey.conf';
++my $config_file = '@PKG_SYSCONFDIR@/sqlgrey.conf';
# whitelist files
my $stat_ip_whitelist_file = $dflt{conf_dir} . '/clients_ip_whitelist';
-@@ -2390,12 +2390,12 @@ B<sqlgrey> [I<options>...]
+@@ -2639,7 +2639,7 @@ sub main()
+ log_level => $dflt{loglevel} > 2 ? $dflt{loglevel} : 2,
+ log_file => $opt{daemonize} ? 'Sys::Syslog' : undef,
+ syslog_facility => 'mail',
+- syslog_logsock => 'unix',
++ syslog_logsock => 'native',
+ syslog_ident => defined $dflt{log_ident} ? $dflt{log_ident} :
+ # process name
+ $0 =~ m{.*/(.*)},
+@@ -2825,12 +2825,12 @@ B<sqlgrey> [I<options>...]
-k, --kill kill a running sqlgrey
(identified by 'pidfile' content)
-f, --configfile=FILE read config from FILE
- (default /etc/sqlgrey/sqlgrey.conf)
-+ (default %%PKG_SYSCONFDIR%%/sqlgrey.conf)
++ (default @PKG_SYSCONFDIR@/sqlgrey.conf)
expecting config_param=value lines,
- spaces are ignored,
- '#' is used for comments
-See the default config file at /etc/sqlgrey/sqlgrey.conf for runtime parameters.
-+See the default config file at %%PKG_SYSCONFDIR%%/sqlgrey.conf for runtime parameters.
++See the default config file at @PKG_SYSCONFDIR@/sqlgrey.conf for runtime parameters.
If you got sqlgrey from sources, read the HOWTO file in the compressed archive.
If it came prepackaged, look into the documentation tree for this file:
/usr/share/doc/sqlgrey-<version>/ on most Linux distributions for example.
diff --git a/mail/sqlgrey/patches/patch-ac b/mail/sqlgrey/patches/patch-ac
index 7a00bab4b1e..7ae72085a8e 100644
--- a/mail/sqlgrey/patches/patch-ac
+++ b/mail/sqlgrey/patches/patch-ac
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/11/13 16:43:04 ghen Exp $
+$NetBSD: patch-ac,v 1.2 2016/05/25 21:39:44 fhajny Exp $
+
+Default dirs.
--- update_sqlgrey_config.orig 2005-03-02 01:49:41.000000000 +0100
+++ update_sqlgrey_config
@@ -7,7 +9,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2007/11/13 16:43:04 ghen Exp $
LC_ALL=C
-MYDIR=/etc/sqlgrey
-+MYDIR=%%PKG_SYSCONFDIR%%
++MYDIR=@PKG_SYSCONFDIR@
CONF=$MYDIR/sqlgrey.conf
# Get whitelists host and pidfile from conf
@@ -16,7 +18,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2007/11/13 16:43:04 ghen Exp $
if [ -z "$pidfile" ]
then
- pidfile="/var/run/sqlgrey.pid"
-+ pidfile="/%%VARBASE%%/run/sqlgrey.pid"
++ pidfile="@SQLGREY_PIDDIR@/sqlgrey.pid"
fi
# Go into a temp directory
diff --git a/mail/sqlgrey/patches/patch-ad b/mail/sqlgrey/patches/patch-ad
index a79141610d0..8bc9bbc6a62 100644
--- a/mail/sqlgrey/patches/patch-ad
+++ b/mail/sqlgrey/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.1.1.1 2007/11/13 16:43:04 ghen Exp $
+$NetBSD: patch-ad,v 1.2 2016/05/25 21:39:44 fhajny Exp $
---- etc/sqlgrey.conf.orig 2005-12-20 11:41:30.000000000 +0100
+Default dirs.
+
+--- etc/sqlgrey.conf.orig 2012-02-13 16:54:08.000000000 +0000
+++ etc/sqlgrey.conf
@@ -7,7 +7,7 @@
# - SQLgrey uses a specific config file when called with -f <conf_file>
## Configuration files
-# conf_dir = /etc/sqlgrey
-+# conf_dir = %%PKG_SYSCONFDIR%%
++# conf_dir = @PKG_SYSCONFDIR@
## Log level
# Uncomment to change the log level (default is normal: 2)
@@ -17,17 +19,17 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/11/13 16:43:04 ghen Exp $
## username and groupname the daemon runs as
-# user = sqlgrey
-# group = sqlgrey
-+# user = %%SQLGREY_USER%%
-+# group = %%SQLGREY_GROUP%%
++# user = @SQLGREY_USER@
++# group = @SQLGREY_GROUP@
## Socket
# On which socket do SQLgrey wait for queries
-@@ -75,7 +75,7 @@
+@@ -73,7 +73,7 @@
- ## Config directory
- # where to look for other configuration files (whitelists)
--# confdir = /etc/sqlgrey
-+# confdir = %%PKG_SYSCONFDIR%%
+ ## PID
+ # where to store the process PID
+-# pidfile = /var/run/sqlgrey.pid
++# pidfile = @SQLGREY_PIDDIR@/sqlgrey.pid
## Greylisting delays
# If you want to be really strict (RFC-wise) use these
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 00:04:24 +0000