diff options
author | Dirk Meyer <dinoex@FreeBSD.org> | 2008-03-17 19:11:20 +0000 |
---|---|---|
committer | Dirk Meyer <dinoex@FreeBSD.org> | 2008-03-17 19:11:20 +0000 |
commit | 2282c497e8baf59cee3d4fd6db0b7630e1673489 (patch) | |
tree | a9daa22a314c3d42777328c301c95bcb0f0c8024 /mail/dk-milter | |
parent | - set USE_XORG (diff) |
- update to 1.0.0
PR: 121701
Submitted by: Hirohisa Yamaguchi
Notes
Notes:
svn path=/head/; revision=209243
Diffstat (limited to 'mail/dk-milter')
-rw-r--r-- | mail/dk-milter/Makefile | 11 | ||||
-rw-r--r-- | mail/dk-milter/Makefile.features | 4 | ||||
-rw-r--r-- | mail/dk-milter/distinfo | 6 | ||||
-rw-r--r-- | mail/dk-milter/files/patch-dk-filter__dk-filter.c | 16 |
4 files changed, 27 insertions, 10 deletions
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile index 273d319cabda..f2ca033a9543 100644 --- a/mail/dk-milter/Makefile +++ b/mail/dk-milter/Makefile @@ -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 --git a/mail/dk-milter/Makefile.features b/mail/dk-milter/Makefile.features index a175385be55c..a54d299b3f7d 100644 --- a/mail/dk-milter/Makefile.features +++ b/mail/dk-milter/Makefile.features @@ -15,10 +15,6 @@ SITE_SUB+= -e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||' 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 --git a/mail/dk-milter/distinfo b/mail/dk-milter/distinfo index 0557151ca5de..2546784114b9 100644 --- a/mail/dk-milter/distinfo +++ b/mail/dk-milter/distinfo @@ -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 --git a/mail/dk-milter/files/patch-dk-filter__dk-filter.c b/mail/dk-milter/files/patch-dk-filter__dk-filter.c new file mode 100644 index 000000000000..18bdeecf1ca2 --- /dev/null +++ b/mail/dk-milter/files/patch-dk-filter__dk-filter.c @@ -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) + { |