[csw-devel] SF.net SVN: gar:[6861] csw/mgar/pkg/miltergreylist/trunk
bonivart at users.sourceforge.net
bonivart at users.sourceforge.net
Wed Oct 14 16:52:08 CEST 2009
Revision: 6861
http://gar.svn.sourceforge.net/gar/?rev=6861&view=rev
Author: bonivart
Date: 2009-10-14 14:52:07 +0000 (Wed, 14 Oct 2009)
Log Message:
-----------
miltergreylist: update to 4.2.3, use new gar features
Modified Paths:
--------------
csw/mgar/pkg/miltergreylist/trunk/Makefile
csw/mgar/pkg/miltergreylist/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/miltergreylist/trunk/files/COPYING
csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init
csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug
csw/mgar/pkg/miltergreylist/trunk/files/README.CSW
Removed Paths:
-------------
csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec
Modified: csw/mgar/pkg/miltergreylist/trunk/Makefile
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/Makefile 2009-10-14 14:26:39 UTC (rev 6860)
+++ csw/mgar/pkg/miltergreylist/trunk/Makefile 2009-10-14 14:52:07 UTC (rev 6861)
@@ -1,29 +1,32 @@
GARNAME = miltergreylist
-GARVERSION = 4.2
-RELEASE = b1
-DISTVERSION = $(GARVERSION)$(RELEASE)
+GARVERSION = 4.2.3
+#RELEASE = rc1
+#DISTVERSION = $(GARVERSION)$(RELEASE)
+DISTVERSION = $(GARVERSION)
DISTNAME = milter-greylist-$(DISTVERSION)
WORKSRC = $(WORKDIR)/$(DISTNAME)
CATEGORIES = net
-DESCRIPTION = greylist mail filtering method
+DESCRIPTION = Greylist mail filtering method
define BLURB
+ Greylist mail filtering method
endef
MASTER_SITES = http://ftp.espci.fr/pub/milter-greylist/
DISTFILES = milter-greylist-$(DISTVERSION).tgz
-DISTFILES += $(call admfiles,CSWmiltergreylist,)
+DISTFILES += COPYING
-REQUIRED_PKGS = CSWsendmail CSWcurlrt CSWgeoip CSWcswclassutils
+REQUIRED_PKGS = CSWsendmail CSWcurlrt CSWgeoip
# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = -(\d+(?:\.\d+)*).tgz
+UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
-#CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS = --prefix=/opt/csw
-CONFIGURE_ARGS += --with-user=bonivart
+CONFIGURE_ARGS += --sysconfdir=/etc/opt/csw
#CONFIGURE_ARGS += --with-user=greylist
-CONFIGURE_ARGS += --with-conffile=/opt/csw/etc/mail/greylist.conf
+CONFIGURE_ARGS += --with-user=`/usr/xpg4/bin/id -u`
+CONFIGURE_ARGS += --with-conffile=/etc/opt/csw/greylist.conf
CONFIGURE_ARGS += --enable-dnsrbl
CONFIGURE_ARGS += --enable-stdio-hack
CONFIGURE_ARGS += --localstatedir=/var/opt/csw/milter-greylist
@@ -31,12 +34,40 @@
CONFIGURE_ARGS += --with-libcurl=/opt/csw/lib
CONFIGURE_ARGS += --mandir=/opt/csw/share/man
+#SPKG_CLASSES = none cswusergroup cswcpsampleconf cswinitsmf
+
TEST_SCRIPTS =
+INSTALL_SCRIPTS = custom
+USERGROUP = /opt/csw/etc/pkg/miltergreylist/cswusergroup
+SAMPLECONF = /etc/opt/csw/greylist.conf.CSW
+INITSMF = /etc/opt/csw/init.d/cswmiltergreylist
-PROTOTYPE_FILTER = awk '$$$$3 ~ /\/init.d\/cswmiltergreylist$$$$/ { $$$$2 = "cswinitsmf" } $$$$3 ~ /\/greylist.conf.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } $$$$3 ~ /\/var\/opt\/csw\/named/ { $$$$5 = "named" } { print }'
+PROTOTYPE_FILTER = awk ' \
+ $$$$3 ~ /\/var\/opt\/csw\/miltergreylist/ { $$$$4 = "0700" ; $$$$5 = "greylist" } \
+ { print }'
include gar/category.mk
#WORKSRC := $(WORKDIR)/$(GARNAME)-$(GARVERSION)b1
SPKG_SOURCEURL = http://hcpnet.free.fr/milter-greylist
-SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
+#SPKG_REVSTAMP := $(SPKG_REVSTAMP)_rev=$(RELEASE)
+
+DOCLIST = README ChangeLog greylist.conf greylist2.conf milter-greylist.m4
+
+install-custom:
+ @echo " ==> Installing $(GARNAME) (custom)"
+ @( cd $(WORKSRC) ; \
+ gmake DESTDIR=$(DESTDIR) install )
+ @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw
+ @mv $(DESTDIR)/etc/mail/greylist.conf $(DESTDIR)/etc/opt/csw/greylist.conf.CSW
+ @rmdir $(DESTDIR)/etc/mail
+ @ginstall -d -m 755 $(DESTDIR)$(docdir)/$(GARNAME)
+ @$(foreach DOC,$(DOCLIST),cp $(WORKSRC)/$(DOC) $(DESTDIR)$(docdir)/$(GARNAME);)
+ @ginstall -d -m 755 $(DESTDIR)/var/opt/csw/$(GARNAME)
+ @rmdir $(DESTDIR)/var/milter-greylist
+ @ginstall -d -m 755 $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME)
+ @cp $(FILEDIR)/CSWmiltergreylist.ug $(DESTDIR)/opt/csw/etc/pkg/$(GARNAME)/cswusergroup
+ @ginstall -d -m 755 $(DESTDIR)/etc/opt/csw/init.d
+ @cp $(FILEDIR)/CSWmiltergreylist.init $(DESTDIR)/etc/opt/csw/init.d/cswmiltergreylist
+ @cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)$(GARNAME)
+ @$(MAKECOOKIE)
Modified: csw/mgar/pkg/miltergreylist/trunk/checksums
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/checksums 2009-10-14 14:26:39 UTC (rev 6860)
+++ csw/mgar/pkg/miltergreylist/trunk/checksums 2009-10-14 14:52:07 UTC (rev 6861)
@@ -1,2 +1,2 @@
-2e76e2643469ec393a15dfce9f8ff695 download/milter-greylist-4.2b1.tgz
-e8f3c634293ea11273eeb1bd78d95d35 download/CSWmiltergreylist.gspec
+e61edd088404cd2a0eacb03ce70e2d5f COPYING
+e821a8a4527c1e313f21fe36dbde4a24 milter-greylist-4.2.3.tgz
Added: csw/mgar/pkg/miltergreylist/trunk/files/COPYING
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/files/COPYING (rev 0)
+++ csw/mgar/pkg/miltergreylist/trunk/files/COPYING 2009-10-14 14:52:07 UTC (rev 6861)
@@ -0,0 +1,149 @@
+ 20 License
+ ==========
+
+This software is available under a 3 clauses BSD license:
+ Copyright (c) 2004-2007 Emmanuel Dreyfus
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by Emmanuel Dreyfus
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+If you run on a non-BSD system, two files with different licenses might
+be required for building or installing.
+
+install-sh has a MIT BSD-like license:
+ Copyright 1991 by the Massachusetts Institute of Technology
+
+ Permission to use, copy, modify, distribute, and sell this software and its
+ documentation for any purpose is hereby granted without fee, provided that
+ the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation, and that the name of M.I.T. not be used in advertising or
+ publicity pertaining to distribution of the software without specific,
+ written prior permission. M.I.T. makes no representations about the
+ suitability of this software for any purpose. It is provided "as is"
+ without express or implied warranty.
+
+
+queue.h has a 4 clause BSD license:
+ Copyright (c) 1991, 1993
+ The Regents of the University of California. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by the University of
+ California, Berkeley and its contributors.
+ 4. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
+
+The configure script has the following license:
+ Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+ Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+
+If you use the 32 bit ABI on Solaris and have a large traffic, you will
+need the a workaround for stdio unability to use streams with associated
+file dexriptor above 255. The files implementing the workaround are
+fd_pool.c and fd_pool.h, and they have a 3 clause BSD license:
+ Copyright (c) 2007 Johann Klasek
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by Johann Klasek
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+SpamAssassin binding requires the spamd.c file, which has a 3-clauses
+BSD licence:
+ Copyright (c) 2008 Manuel Badzong, Emmanuel Dreyfus
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. All advertising materials mentioning features or use of this software
+ must display the following acknowledgement:
+ This product includes software developed by Manuel Badzong
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
Deleted: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec 2009-10-14 14:26:39 UTC (rev 6860)
+++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.gspec 2009-10-14 14:52:07 UTC (rev 6861)
@@ -1,7 +0,0 @@
-%var bitname miltergreylist
-%var pkgname CSWmiltergreylist
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-
-Please see /opt/csw/share/doc/miltergreylist/README for license information
-
Added: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init (rev 0)
+++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.init 2009-10-14 14:52:07 UTC (rev 6861)
@@ -0,0 +1,47 @@
+#!/sbin/sh
+
+# 2009-10-13 Peter Bonivart
+
+if [ -f /lib/svc/share/smf_include.sh ]; then
+ . /lib/svc/share/smf_include.sh
+fi
+
+MILDIR=/var/opt/csw/miltergreylist
+BINDIR=/opt/csw/bin
+USER=greylist
+
+#OPTIONS="-v -w 14m"
+OPTIONS="-u $USER -f /etc/opt/csw/greylist.conf"
+
+case "$1" in
+ start)
+ # Start daemon
+ echo "Starting milter-greylist ..."
+ chown $USER $MILDIR
+ ulimit -n 1024
+ $BINDIR/milter-greylist $OPTIONS
+ ;;
+ stop)
+ # Stop daemon
+ echo "Shutting down milter-greylist ..."
+ /usr/bin/kill `cat $MILDIR/milter-greylist.pid` > /dev/null 2>&1
+ ;;
+ restart)
+ echo "Restarting milter-greylist ... "
+ $0 stop
+ echo "Waiting for milter-greylist to stop: \c"
+ while ( pgrep milter-greylist > /dev/null )
+ do
+ echo ".\c"
+ sleep 1
+ done
+ echo
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "Usage: `basename $0` { start | stop | restart}"
+ exit 1
+esac
+
+exit 0
Added: csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug (rev 0)
+++ csw/mgar/pkg/miltergreylist/trunk/files/CSWmiltergreylist.ug 2009-10-14 14:52:07 UTC (rev 6861)
@@ -0,0 +1 @@
+greylist:greylist:CSW Milter-Greylist:/bin/false:/false::NP
Added: csw/mgar/pkg/miltergreylist/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/miltergreylist/trunk/files/README.CSW (rev 0)
+++ csw/mgar/pkg/miltergreylist/trunk/files/README.CSW 2009-10-14 14:52:07 UTC (rev 6861)
@@ -0,0 +1,26 @@
+README.CSW
+==========
+
+Installation
+------------
+
+1. If you're adding directly to your mc-file you should use this instead of
+ what's in the official README since the location of the socket isn't correct.
+
+INPUT_MAIL_FILTER(`greylist', `S=local:/var/opt/csw/milter-greylist/milter-greyl
+ist.sock')
+define(`confMILTER_MACROS_CONNECT', `j, {if_addr}')
+define(`confMILTER_MACROS_HELO', `{verify}, {cert_subject}')
+define(`confMILTER_MACROS_ENVFROM', `i, {auth_authen}')
+define(`confMILTER_MACROS_ENVRCPT', `{greylist}')
+
+ The included m4-file is fixed.
+
+2. Build a new cf-file.
+3. Modify /etc/opt/csw/greylist.conf as needed.
+4. Start milter-greylist with "/etc/init.d/cswmiltergreylist start" or
+ "svcadm enable cswmiltergreylist".
+
+More info: http://milter-greylist.wikidot.com.
+
+bonivart/091013
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list