cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to 4.2.7

Browse Source 
- use SUBST_CMD
- add rc script

feedback and ok ajacoutot@
(maintainer timeout)
This commit is contained in:
okan 2011-05-13 12:52:22 +00:00
parent 892d302f67
commit 783ba8055a
7 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mail/milter-greylist/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.11 2010/11/19 07:23:07 espie Exp $
# $OpenBSD: Makefile,v 1.12 2011/05/13 12:52:22 okan Exp $
COMMENT= greylist milter
DISTNAME= milter-greylist-4.2.3
DISTNAME= milter-greylist-4.2.7
CATEGORIES= mail
HOMEPAGE= http://hcpnet.free.fr/milter-greylist/
@ -27,7 +27,7 @@ USERNAME= _milter-greylist:_milter-greylist
GREYLISTDIR= /var/db/milter-greylist
EXAMPLESDIR= share/examples/milter-greylist
SUBST_VARS= GREYLISTDIR
SUBST_VARS= GREYLISTDIR USERNAME
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --with-user=${USERNAME} \
@ -38,9 +38,7 @@ USE_GROFF = Yes
NO_REGRESS= Yes
pre-configure:
@perl -pi -e 's,!!USERNAME!!,${USERNAME},; \
s,!!GREYLISTDIR!!,${GREYLISTDIR},' ${WRKSRC}/greylist.conf
@perl -pi -e 's,!!GREYLISTDIR!!,${GREYLISTDIR},' \
${SUBST_CMD} ${WRKSRC}/greylist.conf \
${WRKSRC}/greylist.conf.5 ${WRKSRC}/milter-greylist.8
do-install:

10
mail/milter-greylist/distinfo
View File

@ -1,5 +1,5 @@
MD5 (milter-greylist-4.2.3.tgz) = 6CGopFJ8HjE/If42295KJA==
RMD160 (milter-greylist-4.2.3.tgz) = LL8AIq3nmriUdeeY4BDstkw3Cvk=
SHA1 (milter-greylist-4.2.3.tgz) = GVJwxOoBMx0/+xivdGaCjS1S66M=
SHA256 (milter-greylist-4.2.3.tgz) = 19zmqwsPI4h9qHamuAewRtC5HgVC+OdDjvdPgj+xFG0=
SIZE (milter-greylist-4.2.3.tgz) = 210106
MD5 (milter-greylist-4.2.7.tgz) = pH1w4LinPTQfDVEbP2k2UA==
RMD160 (milter-greylist-4.2.7.tgz) = oPmwG7YlsasSWmgYIuxRa4rcYno=
SHA1 (milter-greylist-4.2.7.tgz) = Vg2COw1P0l+6bxAMowc7jmyJ7cI=
SHA256 (milter-greylist-4.2.7.tgz) = QebMiNzMuOGZOlgjURGzTeJtywcfpZ6FuHfsuGmVB4c=
SIZE (milter-greylist-4.2.7.tgz) = 213919

12
mail/milter-greylist/patches/patch-greylist_conf
View File

@ -1,20 +1,20 @@
--- greylist.conf.orig Thu Feb 12 23:39:01 2009
+++ greylist.conf Wed Sep 30 22:18:38 2009
--- greylist.conf.orig Fri Feb 13 00:39:01 2009
+++ greylist.conf Fri May 6 16:52:40 2011
@@ -6,13 +6,13 @@
#
pidfile "/var/run/milter-greylist.pid"
-socket "/var/milter-greylist/milter-greylist.sock"
-dumpfile "/var/milter-greylist/greylist.db" 600
+socket "!!GREYLISTDIR!!/milter-greylist.sock"
+dumpfile "!!GREYLISTDIR!!/greylist.db" 600
+socket "${GREYLISTDIR}/milter-greylist.sock"
+dumpfile "${GREYLISTDIR}/greylist.db" 600
dumpfreq 1
-user "smmsp"
+user "!!USERNAME!!"
+user "${USERNAME}"
# Log milter-greylist activity to a file
-#stat ">>/var/milter-greylist/greylist.log" \
+#stat ">>!!GREYLISTDIR!!/greylist.log" \
+#stat ">>${GREYLISTDIR}/greylist.log" \
# "%T{%Y/%m/%d %T} %d [%i] %r -> %f %S (ACL %A) %Xc %Xe %Xm %Xh\n"
# Same, sent to syslog
#stat "|logger -p local7.info" \

12
mail/milter-greylist/patches/patch-greylist_conf_5
View File

@ -1,20 +1,20 @@
--- greylist.conf.5.orig Sat Apr 4 05:21:02 2009
+++ greylist.conf.5 Wed Sep 30 22:20:21 2009
@@ -947,7 +947,7 @@
--- greylist.conf.5.orig Wed Apr 14 17:32:49 2010
+++ greylist.conf.5 Fri May 6 16:52:40 2011
@@ -978,7 +978,7 @@ command line option does. The path must be absolute an
It can optionally be followed by an octal permission mode.
Example:
.IP
- dumpfile "/var/milter-greylist/greylist.db" 640
+ dumpfile "!!GREYLISTDIR!!/greylist.db" 640
+ dumpfile "${GREYLISTDIR}/greylist.db" 640
.TP
.I subnetmatch
This is equivalent to the
@@ -977,7 +977,7 @@
@@ -1008,7 +1008,7 @@ It must be enclosed in quotes and can optionally be fo
permission mode
(valid values are 666, 660 or 600, other values cause an error):
.IP
- socket "/var/milter-greylist/milter-greylist.sock" 660
+ socket "!!GREYLISTDIR!!/milter-greylist.sock" 660
+ socket "${GREYLISTDIR}/milter-greylist.sock" 660
.TP
.I user
This keyword should be followed by a quoted user login and optionally a

10
mail/milter-greylist/patches/patch-milter-greylist_8
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-milter-greylist_8,v 1.1 2007/11/19 09:18:42 jakob Exp $
--- milter-greylist.8.orig Tue Oct 23 07:38:51 2007
+++ milter-greylist.8 Wed Nov 7 11:36:22 2007
$OpenBSD: patch-milter-greylist_8,v 1.2 2011/05/13 12:52:22 okan Exp $
--- milter-greylist.8.orig Thu Apr 2 06:09:28 2009
+++ milter-greylist.8 Fri May 6 16:52:40 2011
@@ -100,7 +100,7 @@ will start with an empty grey list.
.PP
The default location for the grey list database and the socket for
communicating with sendmail is
-.B /var/milter-greylist/\fR.
+.B !!GREYLISTDIR!!\fR.
+.B ${GREYLISTDIR}/\fR.
That directory must be owned and writeable by the user id under
which
.B milter-greylist
@ -15,7 +15,7 @@ $OpenBSD: patch-milter-greylist_8,v 1.1 2007/11/19 09:18:42 jakob Exp $
.B -d \fIdumpfile\fR
Location of the dump file. Default is
-.I /var/milter-greylist/greylist.db\fR.
+.I !!GREYLISTDIR!!/greylist.db\fR.
+.I ${GREYLISTDIR}/greylist.db\fR.
Equivalent to the
.I dumpfile
option in the configuration file.

3
mail/milter-greylist/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2009/10/01 14:06:19 benoit Exp $
@comment $OpenBSD: PLIST,v 1.4 2011/05/13 12:52:22 okan Exp $
@newgroup _milter-greylist:568
@newuser _milter-greylist:568:_milter-greylist:daemon:milter-greylist Account:/nonexistent:/sbin/nologin
@bin libexec/milter-greylist
@ -8,6 +8,7 @@ share/examples/milter-greylist/
@sample ${SYSCONFDIR}/mail/
share/examples/milter-greylist/greylist.conf
@sample ${SYSCONFDIR}/mail/greylist.conf
@rcscript ${RCDIR}/milter_greylist
@mode 0755
@owner _milter-greylist
@group _milter-greylist

11
mail/milter-greylist/pkg/milter_greylist.rc Executable file
View File

@ -0,0 +1,11 @@
#!/bin/sh
#
# $OpenBSD: milter_greylist.rc,v 1.1 2011/05/13 12:52:22 okan Exp $
daemon="${TRUEPREFIX}/libexec/milter-greylist"
. /etc/rc.d/rc.subr
rc_reload=NO
rc_cmd $1