pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/amavisd-new update amavisd-new to the latest version
details: https://anonhg.NetBSD.org/pkgsrc/rev/2fa40e1d791c
branches: trunk
changeset: 352441:2fa40e1d791c
user: spz <spz%pkgsrc.org@localhost>
date: Wed Sep 14 18:20:30 2016 +0000
description:
update amavisd-new to the latest version
remove the milter option since it is no longer contained in the software
diffstat:
mail/amavisd-new/MESSAGE | 4 +-
mail/amavisd-new/MESSAGE.milter | 24 --------------
mail/amavisd-new/Makefile | 37 +--------------------
mail/amavisd-new/PLIST | 4 +-
mail/amavisd-new/distinfo | 12 +++---
mail/amavisd-new/files/amavismilter.sh | 57 ----------------------------------
mail/amavisd-new/patches/patch-aa | 6 ++-
7 files changed, 16 insertions(+), 128 deletions(-)
diffs (234 lines):
diff -r 7fb76941577c -r 2fa40e1d791c mail/amavisd-new/MESSAGE
--- a/mail/amavisd-new/MESSAGE Wed Sep 14 18:11:12 2016 +0000
+++ b/mail/amavisd-new/MESSAGE Wed Sep 14 18:20:30 2016 +0000
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.3 2010/12/24 07:19:35 kefren Exp $
+$NetBSD: MESSAGE,v 1.4 2016/09/14 18:20:30 spz Exp $
To use amavisd-new, you should install at least one content checker.
Examples of content checkers include the freely-available Clam Anti-Virus
@@ -18,4 +18,6 @@
xbin archivers/xbin
zoo archivers/zoo
+The old amavisd-milter is no longer available, use the new amavisd-milter
+package instead.
===========================================================================
diff -r 7fb76941577c -r 2fa40e1d791c mail/amavisd-new/MESSAGE.milter
--- a/mail/amavisd-new/MESSAGE.milter Wed Sep 14 18:11:12 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE.milter,v 1.3 2010/12/24 07:19:35 kefren Exp $
-
-Before using amavisd-new with Sendmail, you must configure Sendmail
-properly. Please refer to the following documentation:
-
- ${PREFIX}/share/doc/amavisd-new/README.milter
- ${PREFIX}/share/doc/amavisd-new/README.sendmail
- ${PREFIX}/share/doc/amavisd-new/README.sendmail-dual
-
-There are several ways to configure Sendmail to pass mail through
-amavisd-new depending on your resources and whether you wish to use
-libmilter.
-
-If you choose to use libmilter, then you will need to add the following
-line to /etc/rc.conf:
-
- amavismilter=YES
-
-Please refer to the comments at the top of the amavismilter rc.d script
-for additional rc.conf settings to modify how libmilter and amavisd-new
-communicate with each other.
-
-===========================================================================
diff -r 7fb76941577c -r 2fa40e1d791c mail/amavisd-new/Makefile
--- a/mail/amavisd-new/Makefile Wed Sep 14 18:11:12 2016 +0000
+++ b/mail/amavisd-new/Makefile Wed Sep 14 18:20:30 2016 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/07/09 06:38:27 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2016/09/14 18:20:30 spz Exp $
DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL}
PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
-PKGREVISION= 1
CATEGORIES= mail security
MASTER_SITES= http://www.ijs.si/software/amavisd/ \
http://mirrors.catpipe.net/amavisd-new/ \
@@ -16,16 +15,13 @@
COMMENT= Daemonized interface between MTA and content checkers
LICENSE= gnu-gpl-v2
-VERSION= 2.10.1
+VERSION= 2.11.0
PATCHLEVEL= # empty
-#DEPENDS+= {perl>=5.9.3,p5-Archive-Tar-[0-9]*}:../../archivers/p5-Archive-Tar
DEPENDS+= p5-Archive-Zip>=1.14:../../archivers/p5-Archive-Zip
DEPENDS+= p5-BerkeleyDB-[0-9]*:../../databases/p5-BerkeleyDB
-#DEPENDS+= {perl>=5.10.1,p5-IO-Compress>=2.017}:../../devel/p5-IO-Compress # Compress::Raw::Zlib>=2.017
DEPENDS+= p5-Convert-TNEF-[0-9]*:../../converters/p5-Convert-TNEF
DEPENDS+= p5-Convert-UUlib>=1.05:../../converters/p5-Convert-UUlib
-#DEPENDS+= {perl>=5.8.1,p5-Digest-MD5>=2.22}:../../security/p5-Digest-MD5
DEPENDS+= p5-File-LibMagic>=1.0:../../devel/p5-File-LibMagic
DEPENDS+= p5-Mail-DKIM>=0.31:../../mail/p5-Mail-DKIM
DEPENDS+= p5-MIME-tools>=5.417:../../mail/p5-MIME-tools
@@ -33,7 +29,6 @@
DEPENDS+= p5-Net-LibIDN-[0-9]*:../../net/p5-Net-LibIDN
DEPENDS+= p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
DEPENDS+= p5-Net-Server>=0.88:../../net/p5-Net-Server
-#DEPENDS+= {perl>=5.8.1,p5-Time-HiRes>=1.49}:../../time/p5-Time-HiRes
DEPENDS+= p5-Unix-Syslog-[0-9]*:../../sysutils/p5-Unix-Syslog
WRKSRC= ${WRKDIR}/amavisd-new-${VERSION}
@@ -81,33 +76,9 @@
SMF_NAME= amavisd
CONF_FILES= ${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf
-PKG_OPTIONS_VAR= PKG_OPTIONS.amavisd-new
-PKG_SUPPORTED_OPTIONS= milter
-
-.include "../../mk/bsd.options.mk"
-
-PLIST_VARS+= milter
-.if !empty(PKG_OPTIONS:Mmilter)
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --with-runtime-dir=${AMAVIS_DIR}
-CONFIGURE_ARGS+= --with-sockname=${AMAVIS_DIR}/amavisd.sock
-CONFIGURE_ARGS+= --with-user=${AMAVIS_USER}
-CONFIGURE_ARGS+= --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include
-CONFIGURE_ARGS+= --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib
-CONFIGURE_DIRS= helper-progs
-BUILD_DIRS= helper-progs
-RCD_SCRIPTS+= amavismilter
-MESSAGE_SRC+= ${PKGDIR}/MESSAGE.milter
-PLIST.milter= yes
-
-PTHREAD_OPTS+= require native # doesn't work with pth
-. include "../../mail/libmilter/buildlink3.mk"
-. include "../../mk/pthread.buildlink3.mk"
-.else
USE_LANGUAGES= # none, not even C
do-build: replace-interpreter
-.endif
SUBST_CLASSES+= amavisd
SUBST_STAGE.amavisd= pre-build
@@ -123,10 +94,6 @@
INSTALLATION_DIRS+= sbin ${DOCDIR} ${EGDIR}
do-install:
-.if !empty(PKG_OPTIONS:Mmilter)
- ${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis ${DESTDIR}${PREFIX}/sbin
- ${INSTALL_PROGRAM} ${WRKSRC}/helper-progs/amavis-milter ${DESTDIR}${PREFIX}/sbin
-.endif
${INSTALL_SCRIPT} ${WRKSRC}/amavisd ${DESTDIR}${PREFIX}/sbin/amavisd
${INSTALL_SCRIPT} ${WRKSRC}/amavisd-nanny ${DESTDIR}${PREFIX}/sbin/amavisd-nanny
${INSTALL_SCRIPT} ${WRKSRC}/amavisd-release ${DESTDIR}${PREFIX}/sbin/amavisd-release
diff -r 7fb76941577c -r 2fa40e1d791c mail/amavisd-new/PLIST
--- a/mail/amavisd-new/PLIST Wed Sep 14 18:11:12 2016 +0000
+++ b/mail/amavisd-new/PLIST Wed Sep 14 18:20:30 2016 +0000
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:05:02 jperkin Exp $
-${PLIST.milter}sbin/amavis
-${PLIST.milter}sbin/amavis-milter
+@comment $NetBSD: PLIST,v 1.6 2016/09/14 18:20:30 spz Exp $
sbin/amavisd
sbin/amavisd-agent
sbin/amavisd-nanny
diff -r 7fb76941577c -r 2fa40e1d791c mail/amavisd-new/distinfo
--- a/mail/amavisd-new/distinfo Wed Sep 14 18:11:12 2016 +0000
+++ b/mail/amavisd-new/distinfo Wed Sep 14 18:20:30 2016 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 23:27:01 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/09/14 18:20:30 spz Exp $
-SHA1 (amavisd-new-2.10.1.tar.xz) = 0ef412d7fb98da311ed7b8eb8e8e9c619de63f50
-RMD160 (amavisd-new-2.10.1.tar.xz) = 233eb8ebfd5bb15eba152553424ef0622602430b
-SHA512 (amavisd-new-2.10.1.tar.xz) = 1939cc60136fe37a078ebd6117a774bcc7ee34b68807472eb08ab15414749300925f74898131299fb051c539cc59d264003439a6307c9d0fa16971d02dab1ff9
-Size (amavisd-new-2.10.1.tar.xz) = 767716 bytes
-SHA1 (patch-aa) = d8bc17da9b1d3ef883331d462ee06d534f5ff5b0
+SHA1 (amavisd-new-2.11.0.tar.xz) = 4ca973c50d0cc1dceb859119ac9d3b193ecce359
+RMD160 (amavisd-new-2.11.0.tar.xz) = cd06768a530fb86371f171e16b7f8c13c019b525
+SHA512 (amavisd-new-2.11.0.tar.xz) = a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957
+Size (amavisd-new-2.11.0.tar.xz) = 780548 bytes
+SHA1 (patch-aa) = 3be1325acb060370960fc0fb27d87bc360861320
diff -r 7fb76941577c -r 2fa40e1d791c mail/amavisd-new/files/amavismilter.sh
--- a/mail/amavisd-new/files/amavismilter.sh Wed Sep 14 18:11:12 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: amavismilter.sh,v 1.3 2010/12/24 07:19:35 kefren Exp $
-#
-# PROVIDE: amavismilter
-# REQUIRE: DAEMON
-# BEFORE: mail
-#
-# To communicate with libmilter through a UNIX domain socket (the
-# socket must exist in a location that's writable by the user named
-# by ${amavismilter_user}:
-#
-# amavismilter_flags="-p local:/path/to/socket"
-#
-# To communicate with libmilter through a TCP/IP socket:
-#
-# amavismilter_flags="-p inet:port@0.0.0.0"
-#
-# To communicate with libmilter through a TCP/IP socket restricted to a
-# particular interface address:
-#
-# amavismilter_flags="-p inet:port@A.B.C.D"
-#
-
-if [ -f /etc/rc.subr ]; then
- . /etc/rc.subr
-fi
-
-name="amavismilter"
-rcvar=$name
-command="@PREFIX@/sbin/amavis-milter"
-required_vars="amavisd"
-: ${amavismilter_user="@AMAVIS_USER@"}
-: ${amavismilter_flags="-p local:@AMAVIS_DIR@/amavis-milter.sock"}
-
-start_precmd="amavismilter_precmd"
-
-# Before starting amavis-milter, remove the old milter socket if it exists.
-amavismilter_precmd()
-{
- set -- ${amavismilter_flags}
- case $2 in
- local:*)
- @RM@ -f "${2#local:}"
- ;;
- esac
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf \
- -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
- load_rc_config $name
- run_rc_command "$1"
-else
- @ECHO@ -n " ${name}"
- eval ${start_precmd}
- ${command} ${amavismilter_flags} ${command_args}
-fi
diff -r 7fb76941577c -r 2fa40e1d791c mail/amavisd-new/patches/patch-aa
--- a/mail/amavisd-new/patches/patch-aa Wed Sep 14 18:11:12 2016 +0000
+++ b/mail/amavisd-new/patches/patch-aa Wed Sep 14 18:20:30 2016 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.3 2010/12/24 07:19:35 kefren Exp $
+$NetBSD: patch-aa,v 1.4 2016/09/14 18:20:30 spz Exp $
+
+pkgsrc-ify the conf file
--- amavisd.conf.orig 2008-06-24 22:23:05.000000000 -0400
+++ amavisd.conf 2008-06-24 22:25:53.000000000 -0400
-@@ -15,15 +15,15 @@
+@@ -14,15 +14,15 @@
# $bypass_decode_parts = 1; # controls running of decoders&dearchivers
$max_servers = 2; # num of pre-forked children (2..30 is common), -m
Home |
Main Index |
Thread Index |
Old Index