pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
dcc: Remove after applying the update to pkgsrc, thanks!
Module Name: pkgsrc-wip
Committed By: coypu <coypu%sdf.org@localhost>
Pushed By: coypu
Date: Sun May 28 14:48:16 2017 +0300
Changeset: 09ee1f864449aba905e22d43526ce8d499f4f011
Removed Files:
dcc/DESCR
dcc/MESSAGE
dcc/Makefile
dcc/PLIST
dcc/distinfo
dcc/files/dccd.sh
dcc/files/dccifd.sh
dcc/patches/patch-Makefile.inc.in
dcc/patches/patch-configure
dcc/patches/patch-homedir_Makefile.in
dcc/patches/patch-homedir_fix-map.in
Log Message:
dcc: Remove after applying the update to pkgsrc, thanks!
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=09ee1f864449aba905e22d43526ce8d499f4f011
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
dcc/DESCR | 9 ---
dcc/MESSAGE | 44 ---------------
dcc/Makefile | 102 ----------------------------------
dcc/PLIST | 68 -----------------------
dcc/distinfo | 10 ----
dcc/files/dccd.sh | 32 -----------
dcc/files/dccifd.sh | 32 -----------
dcc/patches/patch-Makefile.inc.in | 42 --------------
dcc/patches/patch-configure | 85 ----------------------------
dcc/patches/patch-homedir_Makefile.in | 38 -------------
dcc/patches/patch-homedir_fix-map.in | 16 ------
11 files changed, 478 deletions(-)
diffs:
diff --git a/dcc/DESCR b/dcc/DESCR
deleted file mode 100644
index f8d3a7020d..0000000000
--- a/dcc/DESCR
+++ /dev/null
@@ -1,9 +0,0 @@
-The Distributed Checksum Clearinghouses or DCC is an anti-spam content filter
-that runs on a variety of operating systems. As of the middle of 2007, it
-involves millions of users, more than six hundred thousand client computer
-systems, and more than 250 servers collecting and counting checksums related to
-more than 300 million mail messages on week days. The counts can be used by
-SMTP servers and mail user agents to detect and reject or filter spam or
-unsolicited bulk mail. DCC servers exchange or "flood" common checksums. The
-checksums include values that are constant across common variations in bulk
-messages, including "personalizations".
diff --git a/dcc/MESSAGE b/dcc/MESSAGE
deleted file mode 100644
index 9fa65de3ed..0000000000
--- a/dcc/MESSAGE
+++ /dev/null
@@ -1,44 +0,0 @@
-===========================================================================
-$NetBSD$
-
-Use of Public DCC Servers
--------------------------
-
-This package will by default query public servers; before running it
-read the documentation and terms of use at:
-
- http://www.rhyolite.com/dcc/#public-servers
-
-The essence is:
-
- Public DCC servers for anonymous DCC clients handling fewer than
- 100,000 mail messages per day are provided by people and organizations
- in the following list. The default contents of /var/dcc/map file point
- to these servers.
-
- Note well that it has been wrong to take and resell the bandwidth and,
- most important, human system administration work of the public DCC
- servers to third parties. Blunt words for that include theft and
- stealing. Vendors of "spam appliances" or services including DCC such
- as "managed email" must provide DCC servers of their own or contract
- for DCC services from others. They must also buy a license for the
- commercial version of the DCC software.
-
-(Note that these terms are similar but not identical to the license
-for the dcc software itself.)
-
-===========================================================================
-===========================================================================
-
-DCC Server (dccd)
------------------
-
-Running an own DCC server is strongly recommended if your site handles
-more than 100k messages per day. It will decrease the load on public DCC
-servers and increase the responsiveness of your DCC clients. When doing
-so, cron-dccd should run at least once per day in order to remove old
-checksums from the database:
-
- ${PREFIX}/libexec/cron-dccd
-
-===========================================================================
diff --git a/dcc/Makefile b/dcc/Makefile
deleted file mode 100644
index fe4d763f82..0000000000
--- a/dcc/Makefile
+++ /dev/null
@@ -1,102 +0,0 @@
-# $NetBSD$
-
-DISTNAME= dcc-1.3.159
-#PKGREVISION= 2
-CATEGORIES= mail
-MASTER_SITES= https://www.dcc-servers.net/src/dcc/old/
-EXTRACT_SUFX= .tar.Z
-
-OWNER= petar%smokva.net@localhost
-HOMEPAGE= https://www.dcc-servers.net/dcc/
-COMMENT= Anti-spam content filter
-LICENSE= dcc-free-license
-
-.include "../../mk/bsd.prefs.mk"
-
-DCC_USER?= dcc
-DCC_GROUP?= dcc
-DCC_HOME?= ${VARBASE}/dcc
-DCC_RUN?= ${VARBASE}/run/dcc
-
-# expanded in files/dcc*.sh
-FILES_SUBST+= DCC_HOME=${DCC_HOME}
-FILES_SUBST+= DCC_EGDIR=${DCC_EGDIR}
-FILES_SUBST+= DCC_RC=${PREFIX}/libexec/rcDCC
-FILES_SUBST+= DCC_FIXMAP=${PREFIX}/libexec/fix-map
-
-# enabling/disabling daemons is done in rc.conf
-SUBST_CLASSES+= dae
-SUBST_STAGE.dae= post-patch
-SUBST_FILES.dae= homedir/dcc_conf.in
-SUBST_SED.dae= -e 's/^\(DCCD_ENABLE=\).*$$/\1on/'
-SUBST_SED.dae+= -e 's/^\(GREY_ENABLE=\).*$$/\1on/'
-SUBST_SED.dae+= -e 's/^\(DCCM_ENABLE=\).*$$/\1on/'
-SUBST_SED.dae+= -e 's/^\(DCCIFD_ENABLE=\).*$$/\1on/'
-SUBST_MESSAGE.dae= Enabling all daemons in dcc_conf
-
-HAS_CONFIGURE= yes
-
-USE_TOOLS+= xargs:run
-USE_TOOLS+= ftp:run
-
-CONFIGURE_ENV+= DCC_XARGS=${TOOLS_PATH.xargs:Q}
-# See --with-fetch-cmd for ftp..
-
-# dcc provides certain auxiliary scripts used for its web-UI and stats
-# management. Since these scripts are non-essential, the bulky tools
-# they rely on are not declared as dependencies.
-CONFIGURE_ENV+= PERL=${DCC_HOME}/bin/perl
-CONFIGURE_ENV+= NOTIFYMAILER=${DCC_HOME}/bin/sendmail
-CONFIGURE_ENV+= HTPASSWD=${DCC_HOME}/bin/htpasswd
-CONFIGURE_ENV+= RRDTOOL=${DCC_HOME}/bin/rrdtool
-
-CONFIGURE_ARGS+= --homedir=${DCC_HOME}
-CONFIGURE_ARGS+= --bindir=${PREFIX}/bin
-CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec
-CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+= --with-cgi-bin=${DCC_EGDIR}/cgi-bin
-CONFIGURE_ARGS+= --with-rundir=${DCC_RUN}
-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=${DESTDIR:Q}
-CONFIGURE_ARGS+= --enable-pkg-make
-CONFIGURE_ARGS+= --disable-dccm
-
-MAKE_JOBS_SAFE= no
-
-# PKGSRC_DCC_EGDIR is for homedir/Makefile
-MAKE_ENV+= PKGSRC_DCC_EGDIR=${DCC_EGDIR}
-
-BUILD_DEFS+= VARBASE
-
-INSTALLATION_DIRS+= bin
-INSTALLATION_DIRS+= libexec
-INSTALLATION_DIRS+= ${PKGMANDIR}/man8
-INSTALLATION_DIRS+= ${DCC_EGDIR_REL}
-INSTALLATION_DIRS+= ${DCC_EGDIR_REL}/cgi-bin
-
-PKG_GROUPS= ${DCC_GROUP}
-PKG_USERS= ${DCC_USER}:${DCC_GROUP}
-
-OWN_DIRS_PERMS+= ${DCC_HOME} ${DCC_USER} ${DCC_GROUP} 0755
-OWN_DIRS_PERMS+= ${DCC_HOME}/log ${DCC_USER} ${DCC_GROUP} 0710
-
-DCC_EGDIR_REL= share/examples/dcc
-DCC_EGDIR= ${PREFIX}/${DCC_EGDIR_REL}
-DCC_PERMS_CONFIG= ${DCC_USER} ${DCC_GROUP} 0600
-CONF_FILES_PERMS+= ${DCC_EGDIR}/dcc_conf ${DCC_HOME}/dcc_conf ${DCC_PERMS_CONFIG}
-CONF_FILES_PERMS+= ${DCC_EGDIR}/flod ${DCC_HOME}/flod ${DCC_PERMS_CONFIG}
-CONF_FILES_PERMS+= ${DCC_EGDIR}/grey_flod ${DCC_HOME}/grey_flod ${DCC_PERMS_CONFIG}
-CONF_FILES_PERMS+= ${DCC_EGDIR}/grey_whitelist ${DCC_HOME}/grey_whitelist ${DCC_PERMS_CONFIG}
-CONF_FILES_PERMS+= ${DCC_EGDIR}/whiteclnt ${DCC_HOME}/whiteclnt ${DCC_PERMS_CONFIG}
-CONF_FILES_PERMS+= ${DCC_EGDIR}/whitecommon ${DCC_HOME}/whitecommon ${DCC_PERMS_CONFIG}
-CONF_FILES_PERMS+= ${DCC_EGDIR}/whitelist ${DCC_HOME}/whitelist ${DCC_PERMS_CONFIG}
-RCD_SCRIPTS+= dccd dccifd
-
-DCC_PERMS_SETUID= ${DCC_USER} ${REAL_ROOT_GROUP} 4555
-SPECIAL_PERMS+= bin/cdcc ${DCC_PERMS_SETUID}
-SPECIAL_PERMS+= bin/dccproc ${DCC_PERMS_SETUID}
-SPECIAL_PERMS+= libexec/dccsight ${DCC_PERMS_SETUID}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/dcc/PLIST b/dcc/PLIST
deleted file mode 100644
index f35dc14d91..0000000000
--- a/dcc/PLIST
+++ /dev/null
@@ -1,68 +0,0 @@
-@comment $NetBSD$
-bin/cdcc
-bin/dccif-test
-bin/dccproc
-libexec/check_ip_range
-libexec/ck2ip
-libexec/cron-dccd
-libexec/dbclean
-libexec/dblist
-libexec/dcc-nagios
-libexec/dcc-stats-collect
-libexec/dcc-stats-graph
-libexec/dcc-stats-init
-libexec/dcc-stats-update
-libexec/dccd
-libexec/dccifd
-libexec/dccsight
-libexec/dns-helper
-libexec/dump-clients
-libexec/fetch-testmsg-whitelist
-libexec/fetchblack
-libexec/fix-map
-libexec/hackmc
-libexec/list-clients
-libexec/logger
-libexec/newwebuser
-libexec/rcDCC
-libexec/start-dccd
-libexec/start-dccifd
-libexec/start-dccm
-libexec/start-grey
-libexec/stats-get
-libexec/stop-dccd
-libexec/uninstalldcc
-libexec/updatedcc
-libexec/wlist
-man/man8/cdcc.8
-man/man8/dbclean.8
-man/man8/dblist.8
-man/man8/dcc.8
-man/man8/dccd.8
-man/man8/dccifd.8
-man/man8/dccm.8
-man/man8/dccproc.8
-man/man8/dccsight.8
-share/examples/dcc/cgi-bin/README
-share/examples/dcc/cgi-bin/chgpasswd
-share/examples/dcc/cgi-bin/common
-share/examples/dcc/cgi-bin/common.pm
-share/examples/dcc/cgi-bin/edit-whiteclnt
-share/examples/dcc/cgi-bin/footer
-share/examples/dcc/cgi-bin/footer-dist
-share/examples/dcc/cgi-bin/header
-share/examples/dcc/cgi-bin/header-dist
-share/examples/dcc/cgi-bin/http2https
-share/examples/dcc/cgi-bin/list-log
-share/examples/dcc/cgi-bin/list-msg
-share/examples/dcc/cgi-bin/webuser-notify
-share/examples/dcc/dcc_conf
-share/examples/dcc/flod
-share/examples/dcc/grey_flod
-share/examples/dcc/grey_whitelist
-share/examples/dcc/ids
-share/examples/dcc/map
-share/examples/dcc/map.txt
-share/examples/dcc/whiteclnt
-share/examples/dcc/whitecommon
-share/examples/dcc/whitelist
diff --git a/dcc/distinfo b/dcc/distinfo
deleted file mode 100644
index ae58e17d2d..0000000000
--- a/dcc/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD$
-
-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 --git a/dcc/files/dccd.sh b/dcc/files/dccd.sh
deleted file mode 100644
index abbb625fb5..0000000000
--- a/dcc/files/dccd.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD$
-#
-#
-# PROVIDE: dccd
-# REQUIRE: DAEMON
-# BEFORE: mail spamd dccifd
-# KEYWORD: shutdown
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name=dccd
-rcvar=$name
-start_precmd=dcc_precmd
-start_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name start"
-stop_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name stop"
-
-dcc_precmd ()
-{
- if [ ! -s @DCC_HOME@/ids ]; then
- @DCC_FIXMAP@ \
- -i @DCC_HOME@/ids \
- -I @DCC_EGDIR@/ids \
- -m @DCC_HOME@/map \
- -t @DCC_HOME@/map.txt \
- -T @DCC_EGDIR@/map.txt
- fi
-}
-
-load_rc_config $name
-run_rc_command "${1}"
diff --git a/dcc/files/dccifd.sh b/dcc/files/dccifd.sh
deleted file mode 100644
index b6e4a68694..0000000000
--- a/dcc/files/dccifd.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD$
-#
-#
-# PROVIDE: dccifd
-# REQUIRE: DAEMON
-# BEFORE: mail spamd
-# KEYWORD: shutdown
-
-$_rc_subr_loaded . /etc/rc.subr
-
-name=dccifd
-rcvar=$name
-start_precmd=dcc_precmd
-start_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name start"
-stop_cmd="@DCC_RC@ \${rc_flags:+-x} -m $name stop"
-
-dcc_precmd ()
-{
- if [ ! -s @DCC_HOME@/ids ]; then
- @DCC_FIXMAP@ \
- -i @DCC_HOME@/ids \
- -I @DCC_EGDIR@/ids \
- -m @DCC_HOME@/map \
- -t @DCC_HOME@/map.txt \
- -T @DCC_EGDIR@/map.txt
- fi
-}
-
-load_rc_config $name
-run_rc_command "${1}"
diff --git a/dcc/patches/patch-Makefile.inc.in b/dcc/patches/patch-Makefile.inc.in
deleted file mode 100644
index 62bbcbd00d..0000000000
--- a/dcc/patches/patch-Makefile.inc.in
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD$
-
-make will otherwise try to exec ""
-
---- Makefile.inc.in.orig 2017-02-04 19:18:07.000000000 +0000
-+++ Makefile.inc.in
-@@ -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@
-- @
-+ @:
-
- $(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 --git a/dcc/patches/patch-configure b/dcc/patches/patch-configure
deleted file mode 100644
index 47db845acf..0000000000
--- a/dcc/patches/patch-configure
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD$
-
-Always install man-pages.
-
---- configure.orig 2015-05-22 18:00:33.000000000 +0000
-+++ configure
-@@ -1925,76 +1922,8 @@ fi
- # decide whether to install .8 or .0 files.
- MANXFILE=
- MAN0AS8='/`expr $$NM : "\(.*\)".0`.8'
--case "$TARGET_SYS" in
-- Linux)
-- # default to /usr/local/man/man8 and use roff files
-- mancat=man
-- MANX='$(MANGZ)'
-- ;;
-- OpenBSD)
-- # default to /usr/local/man/cat8 and .0 names
-- mancat=cat
-- MANX='$(MAN0)'
-- ;;
-- HP-UX)
-- # default to /usr/local/man/cat8 and use cleartext files and .8 names
-- mancat=cat
-- MANX='$(MAN0)'
-- MANXFILE="$MAN8AS8"
-- ;;
-- IRIX*)
-- # default to /usr/local/man/man8 and use cleartext files and .8 names
-- mancat=man
-- MANX='$(MAN0)'
-- MANXFILE="$MAN8AS8"
-- ;;
-- SunOS)
-- # default to /usr/local/man/cat8 and use cleartext files,
-- # use our installation rule, and .8 names
-- mancat=cat
-- MANX='$(MAN0)'
-- MANXFILE="$MAN8AS8"
-- ;;
-- FreeBSD|DragonFly)
-- # default to /usr/local/man/man8 and use nroff files
-- mancat=man
-- MANX='$(MANGZ)'
-- ;;
-- Darwin)
-- # default to /usr/local/man/man8 and use nroff files
-- mancat=man
-- MANX='$(MAN8)'
-- ;;
-- NetBSD)
-- # use text output to avoid running groff on every `man` command
-- mancat=cat
-- MANX='$(MAN0)'
-- ;;
-- 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)'
-- ;;
-- AIX)
-- # default to /usr/local/man/cat8, use our installation rule,
-- # and use cleartext files named .8
-- mancat=cat
-- MANX='$(MAN0)'
-- MANXFILE="$MAN8AS8"
-- ;;
-- OpenUNIX)
-- # default to /usr/local/man/cat8 and use cleartext files named .8
-- mancat=cat
-- MANX='$(MAN0)'
-- MANXFILE="$MAN8AS8"
-- ;;
-- *)
-- echo "warning: *** Cannot install man pages on unfamiliar systems ***" 1>&2
-- mancat=fixme
-- MANX=
-- ;;
--esac
-+mancat=man
-+MANX='$(MAN8)'
- if test "$mandir" = '${prefix}/man'; then
- if test "$DCC_MANDIR"SET != SET; then
- mandir="$DCC_MANDIR"
diff --git a/dcc/patches/patch-homedir_Makefile.in b/dcc/patches/patch-homedir_Makefile.in
deleted file mode 100644
index 43d3fe0037..0000000000
--- a/dcc/patches/patch-homedir_Makefile.in
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD$
-
-Install configuration files into PKGSRC_DCC_EGDIR.
-
-The path in HD is only used during installation and should therefore not
-end up in any of the installed files.
-
-Also, skip make-dcc_conf (there is nothing to merge) and fix-map (moved
-into rc-files as start_precmd check).
-
---- homedir/Makefile.in.orig 2017-01-16 06:22:01.000000000 +0000
-+++ homedir/Makefile.in
-@@ -39,7 +39,7 @@
- DEPTH =..
-
- HINST =$(INSTALL) -c $(SET_DCCOWN)
--HD =@installroot@@prefix@
-+HD =@installroot@$(PKGSRC_DCC_EGDIR)
- MAP =$(HD)/map@configsuffix@
- MAPTXT =$(HD)/map.txt@configsuffix@
- IDS =$(HD)/ids@configsuffix@
-@@ -55,14 +55,12 @@ SSCRIPTS=fix-map
- DCC_BINDIR=@installroot@@libexecdir@
- @INCLUDE_INC@
-
--install:$(HD) $(HD)/log
-+install:$(HD)
- for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done
-- sh make-dcc_conf -F '@configsuffix@' -h $(HD)
-- for NM in $(SIMPLE); do\
-+ for NM in $(SIMPLE) $(GENFILES); do\
- if test -n '@configsuffix@' -o ! -f $(HD)/$$NM; then\
- $(HINST) -m 644 $$NM $(HD)/$${NM}@configsuffix@; fi; done
- if test -s $(PFILE); then $(HINST) -m 600 $(PFILE) $(HD)/$(PFILE); fi
-- sh fix-map -n '@configsuffix@' -c $(CDCC) -h $(HD) -i $(IDS) -m $(MAP) -t $(MAPTXT)
- for NM in $(SIMPLE) $(GENFILES); do\
- if test -n '@configsuffix@' -a ! -s $(HD)/$$NM; then\
- cp -p $(HD)/$${NM}@configsuffix@ $(HD)/$${NM}; fi; done
diff --git a/dcc/patches/patch-homedir_fix-map.in b/dcc/patches/patch-homedir_fix-map.in
deleted file mode 100644
index dca009e118..0000000000
--- a/dcc/patches/patch-homedir_fix-map.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Configure will record that we are unprivileged during packaging and wire
-fix-map accordingly. However, on pkgsrc, fix-map runs later and should
-have no issues with privileged operations (like chown).
-
---- homedir/fix-map.in.orig 2017-02-04 19:18:32.000000000 +0000
-+++ homedir/fix-map.in
-@@ -42,7 +42,6 @@
- set -e
-
- @NO_SUID@
--@PKG_MAKE@
-
- DCC_HOMEDIR=@prefix@
- CDCC=@bindir@/cdcc
Home |
Main Index |
Thread Index |
Old Index