pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/dcc dcc: update to 1.3.159
details: https://anonhg.NetBSD.org/pkgsrc/rev/2dbf3d97cedb
branches: trunk
changeset: 362883:2dbf3d97cedb
user: maya <maya%pkgsrc.org@localhost>
date: Sun May 28 11:50:07 2017 +0000
description:
dcc: update to 1.3.159
1.3.159
Stop using /usr/share/mk Makefiles on BSD systems in order to allow
building on FreeBSD 11.
Add ./configure --with-install-cmd=X --enable-pkg-make to facilitate
as FreeBSD port without patches.
Use /proc/uptime to compute boottime on Linux.
Ignore host names defined as 0.0.0.0.
Don't let the Received: header parsing for the sender IP address in
dccifd and dccproc be fooled by HELO values like "[127.0.0.1]"
Change URLs to use https
>From Petar Bogdanovic (OWNER).
diffstat:
mail/dcc/Makefile | 24 ++++----------
mail/dcc/PLIST | 3 +-
mail/dcc/distinfo | 18 +++++-----
mail/dcc/patches/patch-Makefile.inc.in | 48 +++++++++++++++++++++++------
mail/dcc/patches/patch-Makefile.inc2.in | 16 ----------
mail/dcc/patches/patch-configure | 35 +++++----------------
mail/dcc/patches/patch-homedir_Makefile.in | 10 +++---
7 files changed, 68 insertions(+), 86 deletions(-)
diffs (truncated from 319 to 300 lines):
diff -r 69e89812564c -r 2dbf3d97cedb mail/dcc/Makefile
--- a/mail/dcc/Makefile Sun May 28 11:46:11 2017 +0000
+++ b/mail/dcc/Makefile Sun May 28 11:50:07 2017 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.12 2016/07/09 06:38:28 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2017/05/28 11:50:07 maya Exp $
-DISTNAME= dcc-1.3.158
-PKGREVISION= 2
+DISTNAME= dcc-1.3.159
+#PKGREVISION= 2
CATEGORIES= mail
-MASTER_SITES= http://www.rhyolite.com/dcc/source/old/
+MASTER_SITES= https://www.dcc-servers.net/src/dcc/old/
EXTRACT_SUFX= .tar.Z
OWNER= petar%smokva.net@localhost
-HOMEPAGE= http://www.rhyolite.com/dcc/
+HOMEPAGE= https://www.dcc-servers.net/dcc/
COMMENT= Anti-spam content filter
LICENSE= dcc-free-license
@@ -18,13 +18,6 @@
DCC_HOME?= ${VARBASE}/dcc
DCC_RUN?= ${VARBASE}/run/dcc
-# dcc already implements $DESTDIR as $installroot but also prepends
-# $installroot to $BINDIR, which bsd.prog.mk subsequently extends to
-# $DESTDIR/$BINDIR, effectively doubling the $DESTDIR prefix. The
-# following bit of make dances around the issue and avoids adding
-# $DESTDIR when evaluated within a bsd.prog.mk target.
-DCC_DESTDIR= $${"$${@:Mproginstall-*}"=="":?$${DESTDIR}:}
-
# expanded in files/dcc*.sh
FILES_SUBST+= DCC_HOME=${DCC_HOME}
FILES_SUBST+= DCC_EGDIR=${DCC_EGDIR}
@@ -66,17 +59,14 @@
CONFIGURE_ARGS+= --with-uid=${DCC_USER}
CONFIGURE_ARGS+= --with-make-cmd=${MAKE_PROGRAM:Q}
CONFIGURE_ARGS+= --with-fetch-cmd=${TOOLS_PATH.ftp:Q}
-CONFIGURE_ARGS+= --with-installroot=\$$\(DCC_DESTDIR\)
-CONFIGURE_ARGS+= --disable-sys-inst
+CONFIGURE_ARGS+= --with-installroot=${DESTDIR:Q}
+CONFIGURE_ARGS+= --enable-pkg-make
CONFIGURE_ARGS+= --disable-dccm
-USE_BSD_MAKEFILE= yes
MAKE_JOBS_SAFE= no
# PKGSRC_DCC_EGDIR is for homedir/Makefile
MAKE_ENV+= PKGSRC_DCC_EGDIR=${DCC_EGDIR}
-MAKE_ENV+= DCC_DESTDIR=${DCC_DESTDIR:Q}
-MAKE_ENV+= NO_SUID=yes
BUILD_DEFS+= VARBASE
diff -r 69e89812564c -r 2dbf3d97cedb mail/dcc/PLIST
--- a/mail/dcc/PLIST Sun May 28 11:46:11 2017 +0000
+++ b/mail/dcc/PLIST Sun May 28 11:50:07 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/06/05 13:43:20 gdt Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/05/28 11:50:07 maya Exp $
bin/cdcc
bin/dccif-test
bin/dccproc
@@ -19,7 +19,6 @@
libexec/dump-clients
libexec/fetch-testmsg-whitelist
libexec/fetchblack
-libexec/fetchids
libexec/fix-map
libexec/hackmc
libexec/list-clients
diff -r 69e89812564c -r 2dbf3d97cedb mail/dcc/distinfo
--- a/mail/dcc/distinfo Sun May 28 11:46:11 2017 +0000
+++ b/mail/dcc/distinfo Sun May 28 11:50:07 2017 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 23:27:03 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/05/28 11:50:07 maya Exp $
-SHA1 (dcc-1.3.158.tar.Z) = 016442e1cf87f50588787cd5632b345bb15e6335
-RMD160 (dcc-1.3.158.tar.Z) = 00676a5fbb52cd3971a764f1b4244296e90c2dba
-SHA512 (dcc-1.3.158.tar.Z) = 24fba5ea713e8df1468644508c323d64b3868685716b7cc02263933476940a807cfc4593432a9195371308c83d4ea93653e89634681d95dcb32f5d65c7274599
-Size (dcc-1.3.158.tar.Z) = 1714175 bytes
-SHA1 (patch-Makefile.inc.in) = 9cd0fb433697d1864dde3314bed08f5a78bf3e7e
-SHA1 (patch-Makefile.inc2.in) = 16e3fdd5933048ea31f90a6e1b2dad2949deb2a3
-SHA1 (patch-configure) = c1a1c536cd2643043f2eb2ede2acc4b9f000f4b4
-SHA1 (patch-homedir_Makefile.in) = f1097124734b848140cd7ea7827b67c7e3855680
+SHA1 (dcc-1.3.159.tar.Z) = 05be2fdca4484434f25afb7d23e0c17b3e074620
+RMD160 (dcc-1.3.159.tar.Z) = f98e75c224f3a5411e1552e2b6fbab7a80547cf9
+SHA512 (dcc-1.3.159.tar.Z) = 5abb938a5a22bb8315d90797551be3eda3a9cdf2e6479e4ae561d3946fd1cc1a0db0562315b8741cc3e70a7e5c61460643cffb77adf4110b81060920362168d7
+Size (dcc-1.3.159.tar.Z) = 1606625 bytes
+SHA1 (patch-Makefile.inc.in) = a58beebf596bf4ef648a7f5e3202869b474d54a5
+SHA1 (patch-configure) = 6510a44febf3004df88e0d67484f0a04d33694c0
+SHA1 (patch-homedir_Makefile.in) = 6d01cb4fe1dd3412a50cc419045e3ffdbd3ec07c
+SHA1 (patch-homedir_fix-map.in) = 620fe1a7e4d0abdac31f466c9d78f817c5424d17
diff -r 69e89812564c -r 2dbf3d97cedb mail/dcc/patches/patch-Makefile.inc.in
--- a/mail/dcc/patches/patch-Makefile.inc.in Sun May 28 11:46:11 2017 +0000
+++ b/mail/dcc/patches/patch-Makefile.inc.in Sun May 28 11:50:07 2017 +0000
@@ -1,14 +1,42 @@
-$NetBSD: patch-Makefile.inc.in,v 1.1 2015/06/05 13:43:20 gdt Exp $
+$NetBSD: patch-Makefile.inc.in,v 1.2 2017/05/28 11:50:07 maya Exp $
-NO_SYS_INSTALL shouldn't prevent man pages from being installed.
+make will otherwise try to exec ""
---- Makefile.inc.in.orig 2014-08-06 14:43:42.000000000 +0000
+--- Makefile.inc.in.orig 2017-02-04 19:18:07.000000000 +0000
+++ Makefile.inc.in
-@@ -124,7 +124,6 @@ MANOWN =$(DCC_OWN)
- MANMODE =444
+@@ -52,7 +52,7 @@ clean cleandir:
+ # do not let clean be the default target
+ # and silence gmake "nothing to be done" noise
+ all:
+- @
++ @:
+ ###########################################################################
+ @endif@
+
+@@ -231,7 +231,7 @@ maninstall:
+ done
+ @endif@
+ @endif@
+- @
++ @:
- @MAKE_DOT@ifdef NO_SYS_INSTALL
--NOMAN =no
- SET_BINOWN=
- SET_MANOWN=
- SET_DCCOWN=
+ $(MANDIR)8:
+ @ifndef@ NOMAN
+@@ -239,7 +239,7 @@ $(MANDIR)8:
+ $(INSTALL) -d $(SET_MANOWN) -m 755 $(MANDIR)8
+ @endif@
+ @endif@
+- @
++ @:
+
+
+ uninstall delete:deinstall
+@@ -252,7 +252,7 @@ progdelete:
+ @ifdef@ PROG
+ rm -f $(BINDIR)/$(PROG)
+ @endif@
+- @
++ @:
+
+ beforedelete:progdelete
+ @ifdef@ SUBDIR
diff -r 69e89812564c -r 2dbf3d97cedb mail/dcc/patches/patch-Makefile.inc2.in
--- a/mail/dcc/patches/patch-Makefile.inc2.in Sun May 28 11:46:11 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-Makefile.inc2.in,v 1.1 2015/06/05 13:43:20 gdt Exp $
-
-Prepending `depend' and `all' during the install stage will cause at
-least two ambiguous errors. Remove the whole dependency because it
-doesn't seem to have much use anyway.
-
---- Makefile.inc2.in.orig 2014-08-06 14:43:42.000000000 +0000
-+++ Makefile.inc2.in
-@@ -47,7 +47,6 @@ INSTALL =@DCCINSTALL@
- BININSTALL=$(INSTALL) -c $(SET_BINOWN) -m $(BINMODE)
-
- # create the DCC home directory before trying to install files
--beforeinstall:$(BINDIR) $(MANDIR)8 depend all
- $(BINDIR):
- $(INSTALL) -d $(SET_BINOWN) -m 755 $(BINDIR)
-
diff -r 69e89812564c -r 2dbf3d97cedb mail/dcc/patches/patch-configure
--- a/mail/dcc/patches/patch-configure Sun May 28 11:46:11 2017 +0000
+++ b/mail/dcc/patches/patch-configure Sun May 28 11:50:07 2017 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.2 2015/07/11 23:44:21 sevan Exp $
+$NetBSD: patch-configure,v 1.3 2017/05/28 11:50:07 maya Exp $
Always install man-pages.
---- configure.orig 2014-08-06 14:43:42.000000000 +0000
+--- configure.orig 2015-05-22 18:00:33.000000000 +0000
+++ configure
-@@ -1920,93 +1920,10 @@ fi
+@@ -1925,76 +1922,8 @@ fi
# decide whether to install .8 or .0 files.
MANXFILE=
MAN0AS8='/`expr $$NM : "\(.*\)".0`.8'
@@ -12,29 +12,24 @@
- Linux)
- # default to /usr/local/man/man8 and use roff files
- mancat=man
-- MANX='$(MAN8)'
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
+- MANX='$(MANGZ)'
- ;;
- OpenBSD)
- # default to /usr/local/man/cat8 and .0 names
- mancat=cat
- MANX='$(MAN0)'
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- HP-UX)
-- # default to /usr/local/man/cat8 and use cleartext files and
-- # .8 names
+- # default to /usr/local/man/cat8 and use cleartext files and .8 names
- mancat=cat
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- IRIX*)
- # default to /usr/local/man/man8 and use cleartext files and .8 names
- mancat=man
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- SunOS)
- # default to /usr/local/man/cat8 and use cleartext files,
@@ -42,35 +37,27 @@
- mancat=cat
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- FreeBSD|DragonFly)
-- # default to /usr/local/man/man8 and use nroff files, possibly
-- # compressed via /usr/share/mk
+- # default to /usr/local/man/man8 and use nroff files
- mancat=man
-- MANX='$(MAN8)'
-- USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
+- MANX='$(MANGZ)'
- ;;
- Darwin)
- # default to /usr/local/man/man8 and use nroff files
- mancat=man
- MANX='$(MAN8)'
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- NetBSD)
- # use text output to avoid running groff on every `man` command
- mancat=cat
- MANX='$(MAN0)'
-- # force NetBSD to install the man pages
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes\
--install:maninstall'
- ;;
- BSD/OS)
- # default to /usr/local/man/cat8 and use cleartext files, possibly
- # compressed via /usr/share/mk, and named .0
- mancat=cat
- MANX='$(MAN0)'
-- USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
- ;;
- AIX)
- # default to /usr/local/man/cat8, use our installation rule,
@@ -78,27 +65,21 @@
- mancat=cat
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- OpenUNIX)
-- # default to /usr/local/man/cat8 and use cleartext files named
-- # .8
+- # default to /usr/local/man/cat8 and use cleartext files named .8
- mancat=cat
- MANX='$(MAN0)'
- MANXFILE="$MAN8AS8"
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
- *)
- echo "warning: *** Cannot install man pages on unfamiliar systems ***" 1>&2
- mancat=fixme
- MANX=
-- USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
- ;;
-esac
-+# default to /usr/local/man/man8 and use nroff files
+mancat=man
+MANX='$(MAN8)'
-+USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
if test "$mandir" = '${prefix}/man'; then
if test "$DCC_MANDIR"SET != SET; then
mandir="$DCC_MANDIR"
diff -r 69e89812564c -r 2dbf3d97cedb mail/dcc/patches/patch-homedir_Makefile.in
--- a/mail/dcc/patches/patch-homedir_Makefile.in Sun May 28 11:46:11 2017 +0000
+++ b/mail/dcc/patches/patch-homedir_Makefile.in Sun May 28 11:50:07 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-homedir_Makefile.in,v 1.1 2015/06/05 13:43:20 gdt Exp $
+$NetBSD: patch-homedir_Makefile.in,v 1.2 2017/05/28 11:50:07 maya Exp $
Install configuration files into PKGSRC_DCC_EGDIR.
@@ -8,7 +8,7 @@
Also, skip make-dcc_conf (there is nothing to merge) and fix-map (moved
into rc-files as start_precmd check).
Home |
Main Index |
Thread Index |
Old Index