Date: Sat, 23 Jul 2005 11:47:23 +0800 (WST) From: Dean Hollister <dean@odyssey.apana.org.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/83936: Upgraded Port: mail/dcc-dccd Message-ID: <200507230347.LAA72272@odyssey.apana.org.au> Resent-Message-ID: <200507230350.j6N3oGuf075253@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83936
>Category: ports
>Synopsis: Upgraded Port: mail/dcc-dccd
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jul 23 03:50:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Dean Hollister
>Release: FreeBSD 4.11-STABLE i386
>Organization:
Australian Public Access Network Association Inc
>Environment:
System: FreeBSD odyssey.apana.org.au 4.11-STABLE FreeBSD 4.11-STABLE #0: Fri Apr 15 17:22:23 WST 2005 root@odyssey.apana.org.au:/usr/obj/usr/src/sys/ODYSSEY i386
>Description:
Upgraded Port: mail/dcc-dccd to 1.3.9
Changes included in this update:
o Removal of all sed replace scripting, at Vendor's request.
o dcc dameons su to the dcc user correctly, now using /bin/sh
(or other default shell as defined) instead of nologin when
su'ing to the dcc user.
o Ownerships of the ${PREFIX}/bin executables fixed. Now owned
by root. Request sent to Vendor to make this a user-defined
setting.
>How-To-Repeat:
>Fix:
diff -ruN dcc-dccd.orig/Makefile dcc-dccd/Makefile
--- dcc-dccd.orig/Makefile Sat Jul 23 11:38:23 2005
+++ dcc-dccd/Makefile Sat Jul 23 11:39:46 2005
@@ -6,7 +6,7 @@
#
PORTNAME= dcc-dccd
-PORTVERSION= 1.3.5
+PORTVERSION= 1.3.9
CATEGORIES= mail
MASTER_SITES= http://www.rhyolite.com/anti-spam/dcc/source/ \
http://www.wa.apana.org.au/~dean/sources/ \
@@ -33,11 +33,12 @@
DCCGROUP?= dcc
DCCGID?= 112
-# if no preference was set, check for an up to date base version
-# but give an installed port preference over it.
+#
+# Use configure script to set locations of all files. Use of
+# sed scripting breaks things.
+#
-HOMEDIR= ${PREFIX}/dcc
-CONFIGURE_ARGS= --homedir=${HOMEDIR}
+CONFIGURE_ARGS= --homedir=${PREFIX}/dcc --bindir=${PREFIX}/bin --mandir=${PREFIX}/man --with-rundir=/var/run
.include <bsd.port.pre.mk>
@@ -82,7 +83,8 @@
PLIST_SUB+= WITH_DCCIFD=""
.endif
-CONFIGURE_ARGS+= --with-uid=${DCCUSER}
+CONFIGURE_ARGS+= --with-uid=${DCCUSER}
+
SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' \
-e 's|%%DCCUSER%%|${DCCUSER}|g' -e 's|%%DCCUID%%|${DCCUID}|g' \
-e 's|%%DCCGROUP%%|${DCCGROUP}|g' -e 's|%%DCCGID%%|${DCCGID}|g'
@@ -98,23 +100,12 @@
@${ECHO_MSG} 'WITHOUT_SENDMAIL=yes'
@${ECHO_MSG} ''
-post-patch:
- ${FIND} ${WRKSRC} -type f -exec \
- ${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' {} \;
- ${REINPLACE_CMD} -e 's,PTHREAD_LDFLAGS="$$PTHREAD_LDFLAGS -pthread,PTHREAD_LDFLAGS="$$PTHREAD_LDFLAGS,g' ${WRKSRC}/configure
- ${REINPLACE_CMD} -e 's,FreeBSD)\n\tPTHREAD_LDFLAGS,FreeBSD)\n\tDCC_CFLAGS="${PTHREAD_CFLAGS} $$DCC_CFLAGS"\n\tPTHREAD_LDFLAGS,g' ${WRKSRC}/configure
- ${REINPLACE_CMD} -e 's,PTHREAD_LIBS="$$PTHREAD_LIBS -lc_r,PTHREAD_LIBS=" ${PTHREAD_LIBS},g' ${WRKSRC}/configure
-
post-build:
@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${PKGDEINSTALL}
pre-install:
@${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
-
-post-install:
- @[ -s ${HOMEDIR}/dcc_conf ] || \
- ${CP} ${HOMEDIR}/dcc_conf.dist ${HOMEDIR}/dcc_conf
+ ${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
.include <bsd.port.post.mk>
diff -ruN dcc-dccd.orig/distinfo dcc-dccd/distinfo
--- dcc-dccd.orig/distinfo Sun Jun 12 11:04:15 2005
+++ dcc-dccd/distinfo Sat Jul 23 10:29:07 2005
@@ -1,2 +1,2 @@
-MD5 (dcc-dccd-1.3.5.tar.Z) = f51fe9106e79fe0dd00192f7c7998447
-SIZE (dcc-dccd-1.3.5.tar.Z) = 1307125
+MD5 (dcc-dccd-1.3.9.tar.Z) = 89d6336ec9d365db13f0c9a22d64172a
+SIZE (dcc-dccd-1.3.9.tar.Z) = 1346997
diff -ruN dcc-dccd.orig/files/patch-configure dcc-dccd/files/patch-configure
--- dcc-dccd.orig/files/patch-configure Sun Jun 12 11:17:52 2005
+++ dcc-dccd/files/patch-configure Sat Jul 23 11:31:36 2005
@@ -1,16 +1,27 @@
---- configure.orig Thu May 26 21:52:13 2005
-+++ configure Sun Jun 12 11:17:03 2005
-@@ -2491,6 +2491,13 @@
+--- configure.orig Fri Jul 22 11:36:56 2005
++++ configure Sat Jul 23 11:27:41 2005
+@@ -2371,8 +2371,8 @@
+ ;;
+ *)
+ DCCUID=root
+- BINUID=bin
+- BIN_GRP=bin
++ BINUID=root
++ BIN_GRP=dcc
+ ;;
+ esac
+
+@@ -2445,6 +2445,13 @@
+ SENDMAIL="$with_sendmail"
SENDMAIL_EVAL="$SENDMAIL"
with_sendmail=yes
- fi
++fi
+if test -n "$SENDMAIL" -a "$SENDMAIL" != "no"; then
+ if test -f $SENDMAIL/include/libmilter/mfapi.h -a -f $SENDMAIL/lib/libmilter.a; then
+ SENDMAIL_OBJ=$SENDMAIL/lib
+ SENDMAIL_OBJ_EVAL=$SENDMAIL_OBJ
+ SENDMAIL_LIB=$SENDMAIL_OBJ/libmilter.a
+ fi
-+fi
+ fi
if test -z "$SENDMAIL"; then
# prefer a parallel ../sendmail directory
- DEPTH=.
diff -ruN dcc-dccd.orig/pkg-plist dcc-dccd/pkg-plist
--- dcc-dccd.orig/pkg-plist Sun Nov 21 10:35:45 2004
+++ dcc-dccd/pkg-plist Sat Jul 23 10:58:48 2005
@@ -24,8 +24,10 @@
dcc/libexec/dcc-stats-init
dcc/libexec/dccd
dcc/libexec/dccsight
+dcc/libexec/fetchblack
dcc/libexec/fetch-testmsg-whitelist
dcc/libexec/hackmc
+dcc/libexec/list-clients
dcc/libexec/logger
dcc/libexec/newwebuser
dcc/libexec/rcDCC
@@ -42,6 +44,8 @@
dcc/whiteclnt
dcc/whitecommon
dcc/whitelist
+share/nls/POSIX
+share/nls/en_US.US-ASCII
@dirrm dcc/log
@dirrm dcc/libexec
@dirrm dcc/cgi-bin
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200507230347.LAA72272>