Date: Fri, 14 Mar 2008 22:08:38 +0900 From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/121701: [patch] mail/dk-milter update to 1.0.0 Message-ID: <867ig5sbah.wl%umq@ueo.co.jp> Resent-Message-ID: <200803141310.m2EDA2st013828@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 121701 >Category: ports >Synopsis: [patch] mail/dk-milter update to 1.0.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Mar 14 13:10:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Hirohisa Yamaguchi >Release: FreeBSD 8.0-CURRENT amd64 >Organization: <organization of PR author (multiple lines)> >Environment: System: FreeBSD calliope.****.org 8.0-CURRENT FreeBSD 8.0-CURRENT #15: Fri Jan 18 14:38:27 JST 2008 root@calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64 >Description: The new version of mail/dk-milter has been released. Release notes: https://sourceforge.net/project/shownotes.php?release_id=584092 >How-To-Repeat: N/A >Fix: The patch follows: diff -Npru ports.orig/mail/dk-milter/Makefile ports/mail/dk-milter/Makefile --- ports.orig/mail/dk-milter/Makefile 2007-06-19 22:02:47.000000000 +0900 +++ ports/mail/dk-milter/Makefile 2008-03-14 21:17:18.000000000 +0900 @@ -6,8 +6,7 @@ # PORTNAME= dk-milter -PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTVERSION= 1.0.0 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= dk-milter @@ -45,6 +44,7 @@ SITE_SUB+= -e "s|%%PREFIX%%|${PREFIX}|g" .include <bsd.port.pre.mk> +WITHOUT_MILTER_CFLAGS= yes .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" SITE+= ${WRKSRC}/site.config.m4.dist @@ -71,12 +71,17 @@ SITE_SUB+= -e '/-DPOPAUTH/s/^dnl //g' .endif .if defined(WITH_POPAUTH) +. if defined(WITH_BDB_BASE) +IGNORE= does not work with base bdb +SITE_SUB+= -e 's|%%BDB%%|dnl |g' +. else USE_BDB= 41+ -INVALID_BDB_VER= 2 3 40 +INVALID_BDB_VER= 2 40 SITE_SUB+= -e 's|%%BDB%%||g' \ -e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \ -e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \ -e "s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g" +. endif .else SITE_SUB+= -e 's|%%BDB%%|dnl |g' .endif diff -Npru ports.orig/mail/dk-milter/Makefile.features ports/mail/dk-milter/Makefile.features --- ports.orig/mail/dk-milter/Makefile.features 2007-06-02 23:46:40.000000000 +0900 +++ ports/mail/dk-milter/Makefile.features 2008-03-13 02:45:27.000000000 +0900 @@ -15,10 +15,6 @@ SITE_SUB+= -e '/-D_FFR_ANTICIPATE_SENDMA SITE_SUB+= -e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||' .endif -.if defined(WITH_MULTIPLE_KEYS) && !defined(WITHOUT_MULTIPLE_KEYS) -SITE_SUB+= -e '/-D_FFR_MULTIPLE_KEYS/s|^dnl ||' -.endif - .if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS) SITE_SUB+= -e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||' .endif diff -Npru ports.orig/mail/dk-milter/distinfo ports/mail/dk-milter/distinfo --- ports.orig/mail/dk-milter/distinfo 2007-06-05 09:20:47.000000000 +0900 +++ ports/mail/dk-milter/distinfo 2008-03-14 19:52:56.000000000 +0900 @@ -1,3 +1,3 @@ -MD5 (dk-milter-0.6.0.tar.gz) = f0fb37e503d34d13893c259867463dd8 -SHA256 (dk-milter-0.6.0.tar.gz) = 1114e9e548a341eda66da92fcca903d665e77763ee63d67e690606af4acce683 -SIZE (dk-milter-0.6.0.tar.gz) = 350417 +MD5 (dk-milter-1.0.0.tar.gz) = cea37167253d402dcb8b18c943d521bd +SHA256 (dk-milter-1.0.0.tar.gz) = d0f8e5c080d2a026ec22c24ef9a4c89f0996570125058b4d62bb3741d50ca7b1 +SIZE (dk-milter-1.0.0.tar.gz) = 359694 diff -Npru ports.orig/mail/dk-milter/files/patch-dk-filter__dk-filter.c ports/mail/dk-milter/files/patch-dk-filter__dk-filter.c --- ports.orig/mail/dk-milter/files/patch-dk-filter__dk-filter.c 1970-01-01 09:00:00.000000000 +0900 +++ ports/mail/dk-milter/files/patch-dk-filter__dk-filter.c 2008-02-28 16:19:19.000000000 +0900 @@ -0,0 +1,16 @@ +--- ./dk-filter/dk-filter.c.orig 2007-06-01 05:22:16.000000000 +0900 ++++ ./dk-filter/dk-filter.c 2008-02-28 12:18:03.000000000 +0900 +@@ -3650,11 +3650,12 @@ + pw = getpwnam(become); + if (pw == NULL) + { ++ char *q; + uid_t uid; + +- uid = atoi(become); +- if (uid != 0 && uid != LONG_MIN && uid != LONG_MAX) ++ uid = (uid_t) strtol(become, &q, 10); ++ if (*q == '\0') + pw = getpwuid(uid); + if (pw == NULL) + { >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?867ig5sbah.wl%umq>