Changeset 98805

Timestamp:

Oct 17, 2012, 5:44:55 AM (12 years ago)

Author:

pixilla@…

Message:

mail/sqlgrey:

• Make database table names configurable.

Location:

trunk/dports/mail/sqlgrey

Files:

• Portfile (modified) (5 diffs)
• files/patch-Makefile.diff (modified) (1 diff)
• files/patch-etc-sqlgrey.conf.diff (modified) (4 diffs)
• files/patch-sqlgrey-logstats.pl.diff (modified) (1 diff)
• files/patch-sqlgrey.diff (modified) (9 diffs)
• files/patch-table-names.diff (added)
• files/patch-tester.pl.diff (modified) (1 diff)

trunk/dports/mail/sqlgrey/Portfile

@@ -28 +28 @@
 checksums           sha1    2359577af0149394d1181e12007f013478148423 \
                     rmd160  0404df3987ceb4732e73fee09388454995754c1c
-
+patch.pre_args      -p1
 patchfiles          patch-Makefile.diff \
                     patch-etc-sqlgrey.conf.diff \
@@ -39 +39 @@
 
 post-patch {
-    reinplace "s|@@PREFIX@@|${prefix}|g" \
+    reinplace "s|@PREFIX@|${prefix}|g" \
         ${worksrcpath}/etc/sqlgrey.conf \
         ${worksrcpath}/sqlgrey \
@@ -45 +45 @@
         ${worksrcpath}/tester.pl \
         ${worksrcpath}/Makefile
-    reinplace "s|@@DESTROOT@@|${destroot}|g" \
+    reinplace "s|@DESTROOT@|${destroot}|g" \
         ${worksrcpath}/Makefile
-    reinplace "s|@@NAME@@|${name}|g" \
+    reinplace "s|@NAME@|${name}|g" \
         ${worksrcpath}/etc/sqlgrey.conf \
         ${worksrcpath}/sqlgrey
-    reinplace "s|@@SQLGREYUSER@@|${sqlgreyuser}|g" \
+    reinplace "s|@SQLGREYUSER@|${sqlgreyuser}|g" \
         ${worksrcpath}/etc/sqlgrey.conf \
         ${worksrcpath}/sqlgrey
-    reinplace "s|@@SQLGREYGROUP@@|${sqlgreygroup}|g" \
+    reinplace "s|@SQLGREYGROUP@|${sqlgreygroup}|g" \
         ${worksrcpath}/etc/sqlgrey.conf \
         ${worksrcpath}/sqlgrey
@@ -70 +70 @@
     set gid [existsgroup ${sqlgreygroup}]
     adduser ${sqlgreyuser} gid=${gid} realname=${name}
-    move ${destroot}${prefix}/etc/sqlgrey/sqlgrey.conf ${destroot}${prefix}/etc/sqlgrey/sqlgrey.conf.example
+    move ${destroot}${prefix}/etc/${name}/sqlgrey.conf ${destroot}${prefix}/etc/${name}/sqlgrey.conf.example
+    xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 0664 -W ${worksrcpath} FAQ HOWTO README.DBCLUSTER README.DISCRIMINATION README.OPTINOUT README.PERF \
-        ${destroot}${prefix}/etc/sqlgrey
+        ${destroot}${prefix}/share/doc/${name}
 }
 
 post-activate {
-    touch ${prefix}/etc/sqlgrey/clients_fqdn_whitelist.local
-    touch ${prefix}/etc/sqlgrey/clients_ip_whitelist.local
+    touch ${prefix}/etc/${name}/clients_fqdn_whitelist.local
+    touch ${prefix}/etc/${name}/clients_ip_whitelist.local
 }
 
@@ -94 +95 @@
 }
 
+variant table_names description {Make table names configurable} {
+    patchfiles-append   patch-table-names.diff
+}
+
 livecheck.version   ${version}
 livecheck.regex     "(?!${name}).*${name}-((?!${extract.suffix}).*)${extract.suffix}"

trunk/dports/mail/sqlgrey/files/patch-Makefile.diff

@@ -1 @@
---- Makefile.orig       2010-05-17 11:36:13.000000000 -0700
-+++ Makefile    2010-05-17 11:36:17.000000000 -0700
+--- a/Makefile  2012-08-24 18:05:39.000000000 -0700
++++ b/Makefile  2012-08-24 18:06:42.000000000 -0700
 @@ -1,10 +1,10 @@
  INSTALL = install
 -ETCDIR = $(ROOTDIR)/etc
-+ETCDIR = @@DESTROOT@@@@PREFIX@@/etc
++ETCDIR = @DESTROOT@@PREFIX@/etc
  CONFDIR = $(ETCDIR)/sqlgrey
 -SBINDIR = $(ROOTDIR)/usr/sbin
 -BINDIR = $(ROOTDIR)/usr/bin
-+SBINDIR = @@DESTROOT@@@@PREFIX@@/sbin
-+BINDIR = @@DESTROOT@@@@PREFIX@@/bin
++SBINDIR = @DESTROOT@@PREFIX@/sbin
++BINDIR = @DESTROOT@@PREFIX@/bin
  INITDIR = $(ETCDIR)/init.d
 -MANDIR = $(ROOTDIR)/usr/share/man/man1
-+MANDIR = @@DESTROOT@@@@PREFIX@@/share/man/man1
++MANDIR = @DESTROOT@@PREFIX@/share/man/man1
  
  VERSION := $(shell cat VERSION)

trunk/dports/mail/sqlgrey/files/patch-etc-sqlgrey.conf.diff

@@ -1 @@
---- etc/sqlgrey.conf.orig       2010-05-17 12:32:55.000000000 -0700
-+++ etc/sqlgrey.conf    2010-05-17 12:33:08.000000000 -0700
+--- a/etc/sqlgrey.conf  2012-08-24 18:05:39.000000000 -0700
++++ b/etc/sqlgrey.conf  2012-08-24 18:08:37.000000000 -0700
 @@ -7,7 +7,7 @@
  # - SQLgrey uses a specific config file when called with -f <conf_file>
@@ -6 +6 @@
  ## Configuration files
 -# conf_dir = /etc/sqlgrey
-+# conf_dir = @@PREFIX@@/etc/sqlgrey
++# conf_dir = @PREFIX@/etc/sqlgrey
  
  ## Log level
@@ -16 +16 @@
 -# user = sqlgrey
 -# group = sqlgrey
-+# user = @@SQLGREYUSER@@
-+# group = @@SQLGREYGROUP@@
++# user = @SQLGREYUSER@
++# group = @SQLGREYGROUP@
  
  ## Socket
@@ -26 +26 @@
  # where to store the process PID
 -# pidfile = /var/run/sqlgrey.pid
-+# pidfile = @@PREFIX@@/var/run/@@NAME@@/sqlgrey.pid
++# pidfile = @PREFIX@/var/run/@NAME@/sqlgrey.pid
  
  ## Greylisting delays

trunk/dports/mail/sqlgrey/files/patch-sqlgrey-logstats.pl.diff

@@ -1 @@
---- sqlgrey-logstats.pl.orig    2010-05-17 11:55:47.000000000 -0700
-+++ sqlgrey-logstats.pl 2010-05-17 11:55:50.000000000 -0700
+--- a/sqlgrey-logstats.pl       2012-08-24 18:05:39.000000000 -0700
++++ b/sqlgrey-logstats.pl       2012-08-24 18:06:53.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -w
-+#!@@PREFIX@@/bin/perl -w
++#!@PREFIX@/bin/perl -w
  
  # sqlgrey: a postfix greylisting policy server using an SQL backend

trunk/dports/mail/sqlgrey/files/patch-sqlgrey.diff

@@ -1 @@
---- sqlgrey.orig        2010-05-17 12:40:48.000000000 -0700
-+++ sqlgrey     2010-05-17 12:40:52.000000000 -0700
+--- a/sqlgrey   2012-08-24 18:05:39.000000000 -0700
++++ b/sqlgrey   2012-08-24 18:07:09.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -w
-+#!@@PREFIX@@/bin/perl -w
++#!@PREFIX@/bin/perl -w
  
  # sqlgrey: a postfix greylisting policy server using an SQL backend
@@ -13 +13 @@
 -$dflt{user}               = 'sqlgrey';
 -$dflt{group}              = 'sqlgrey';
-+$dflt{user}               = '@@SQLGREYUSER@@';
-+$dflt{group}              = '@@SQLGREYGROUP@@';
++$dflt{user}               = '@SQLGREYUSER@';
++$dflt{group}              = '@SQLGREYGROUP@';
  $dflt{inet}               = '2501';
 -$dflt{pidfile}            = '/var/run/sqlgrey.pid';
 -$dflt{conf_dir}           = '/etc/sqlgrey';
-+$dflt{pidfile}            = '@@PREFIX@@/var/run/@@NAME@@/sqlgrey.pid';
-+$dflt{conf_dir}           = '@@PREFIX@@/etc/sqlgrey';
++$dflt{pidfile}            = '@PREFIX@/var/run/@NAME@/sqlgrey.pid';
++$dflt{conf_dir}           = '@PREFIX@/etc/sqlgrey';
  $dflt{reconnect_delay}    = 5;            # 5 minutes
  $dflt{max_connect_age}    = 24;           # 24 hours
@@ -28 +28 @@
  # Default configuration file
 -my $config_file              = '/etc/sqlgrey/sqlgrey.conf';
-+my $config_file              = '@@PREFIX@@/etc/sqlgrey/sqlgrey.conf';
++my $config_file              = '@PREFIX@/etc/sqlgrey/sqlgrey.conf';
  
  # whitelist files
@@ -37 +37 @@
         # 'warning: Filehandle STDERR reopened as FILE only \
 -       # for input at /usr/bin/sqlgrey line 717, <FILE> line 57'
-+       # for input at @@PREFIX@@/bin/sqlgrey line 717, <FILE> line 57'
++       # for input at @PREFIX@/bin/sqlgrey line 717, <FILE> line 57'
         open(STDIN,'</dev/null');
         open(STDOUT,'>/dev/null');
@@ -46 +46 @@
   -f, --configfile=FILE      read config from FILE
 -                            (default /etc/sqlgrey/sqlgrey.conf)
-+                            (default @@PREFIX@@/etc/sqlgrey/sqlgrey.conf)
++                            (default @PREFIX@/etc/sqlgrey/sqlgrey.conf)
                              expecting config_param=value lines,
                              - spaces are ignored,
@@ -52 +52 @@
  
 -See the default config file at /etc/sqlgrey/sqlgrey.conf for runtime parameters.
-+See the default config file at @@PREFIX@@/etc/sqlgrey/sqlgrey.conf for runtime parameters.
++See the default config file at @PREFIX@/etc/sqlgrey/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.
-+@@PREFIX@@/share/doc/sqlgrey-<version>/ on most Linux distributions for example.
++@PREFIX@/share/doc/sqlgrey-<version>/ on most Linux distributions for example.
  
  =head1 DESCRIPTION
@@ -65 +65 @@
  Start by adding check_policy_service after reject_unauth_destination in
 -/etc/postfix/main.cf :
-+@@PREFIX@@/etc/postfix/main.cf :
++@PREFIX@/etc/postfix/main.cf :
  
   smtpd_recipient_restrictions =
@@ -74 +74 @@
  
 -/etc/postfix/sqlgrey_recipient_access:
-+@@PREFIX@@/etc/postfix/sqlgrey_recipient_access:
++@PREFIX@/etc/postfix/sqlgrey_recipient_access:
    i_like_spam@ee.ethz.ch                OK
  
@@ -84 +84 @@
 -       check_client_access    hash:/etc/postfix/sqlgrey_client_access
 -       check_recipient_access hash:/etc/postfix/sqlgrey_recipient_access
-+       check_client_access    hash:@@PREFIX@@/etc/postfix/sqlgrey_client_access
-+       check_recipient_access hash:@@PREFIX@@/etc/postfix/sqlgrey_recipient_access
++       check_client_access    hash:@PREFIX@/etc/postfix/sqlgrey_client_access
++       check_recipient_access hash:@PREFIX@/etc/postfix/sqlgrey_recipient_access
         check_policy_service inet:127.0.0.1:10023
  

trunk/dports/mail/sqlgrey/files/patch-tester.pl.diff

@@ -1 @@
---- tester.pl.orig      2010-05-17 11:57:50.000000000 -0700
-+++ tester.pl   2010-05-17 11:58:00.000000000 -0700
+--- a/tester.pl 2012-08-24 18:05:39.000000000 -0700
++++ b/tester.pl 2012-08-24 18:06:30.000000000 -0700
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl
-+#!@@PREFIX@@/bin/perl
++#!@PREFIX@/bin/perl
  
  # Tester for SQLgrey