summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2008-09-30 07:15:50 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2008-09-30 07:15:50 +0000
commit1fd49a9dde3f84ea5743f2ba1f65fe5b82e980cc (patch)
tree34717b8e8267ddfd915af896b93fe66f85b50485 /mail-filter/dcc
parentAdd a link to upstream bug report in the patch (diff)
downloadhistorical-1fd49a9dde3f84ea5743f2ba1f65fe5b82e980cc.tar.gz
historical-1fd49a9dde3f84ea5743f2ba1f65fe5b82e980cc.tar.bz2
historical-1fd49a9dde3f84ea5743f2ba1f65fe5b82e980cc.zip
Bug #182172, version bump. Very nice submission from steveb <steeeeeveee@gmx.net> that now includes an init script as well. The following keywords are dropped due to the addition of libmilter: alpha hppa ia64 ppc ppc64 sparc.
Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64
Diffstat (limited to 'mail-filter/dcc')
-rw-r--r--mail-filter/dcc/ChangeLog12
-rw-r--r--mail-filter/dcc/Manifest17
-rw-r--r--mail-filter/dcc/dcc-1.3.97.ebuild135
-rw-r--r--mail-filter/dcc/files/dcc-1.3.86.patch41
-rw-r--r--mail-filter/dcc/files/dcc.confd14
-rw-r--r--mail-filter/dcc/files/dcc.initd136
6 files changed, 343 insertions, 12 deletions
diff --git a/mail-filter/dcc/ChangeLog b/mail-filter/dcc/ChangeLog
index 6a0a7d9183b2..e5bf5f1cb8c4 100644
--- a/mail-filter/dcc/ChangeLog
+++ b/mail-filter/dcc/ChangeLog
@@ -1,6 +1,16 @@
# ChangeLog for mail-filter/dcc
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.49 2008/08/23 05:46:10 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.50 2008/09/30 07:15:49 robbat2 Exp $
+
+*dcc-1.3.97 (30 Sep 2008)
+
+ 30 Sep 2008; Robin H. Johnson <robbat2@gentoo.org>
+ +files/dcc-1.3.86.patch, +files/dcc.confd, +files/dcc.initd,
+ +dcc-1.3.97.ebuild:
+ Bug #182172, version bump. Very nice submission from steveb
+ <steeeeeveee@gmx.net> that now includes an init script as well. The
+ following keywords are dropped due to the addition of libmilter: alpha
+ hppa ia64 ppc ppc64 sparc.
23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
add GLEP 56 USE flag desc from use.local.desc
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index d109059efe1d..a63480b0c99f 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX dcc-1.3.86.patch 1337 RMD160 266253bd960c5a81c7af50174818538b6fd734f6 SHA1 dead098768cad2add66d6ab57d973c6aa3e8a285 SHA256 0ff766a5c4254be8af20bfc7e3b350e8f9990faa6ebb87d1f5d8b982f8bb572b
+AUX dcc.confd 274 RMD160 da42330e9085960e6dae4fe26db74ae2742ef0a9 SHA1 36e1920c5cab693e123f6b324bd229903531d8f2 SHA256 c3c379c26d3c06a18ba87bd22bb299cbcacad262eff78ce75385c6d753373a0e
+AUX dcc.initd 3112 RMD160 ed649dac393301fb96f4f0b415a5010af5dd896d SHA1 ea1894b1fc9a88e33dbdb5902cd7940ad7200d26 SHA256 0db8f6330c2fb3d06e16c0c527b0326f0cd1ea29550cdf223aeb587c7192cc5f
+DIST dcc-1.3.97.tar.Z 2548599 RMD160 b777ed19912f3bb0a617d083d479b9cc2cc47b59 SHA1 8212e07c5eee573c36cdb7527e1efe7573bc05a1 SHA256 d959351a7440e0703f35ebcfc4bfd8e83b92867a82970f716816aa84c55c49f7
DIST dcc-dccd-1.2.28.tar.Z 1221437 RMD160 efdb671cc82fd39dbbd68cebbe65ed99f812ba96 SHA1 6a9bdbd8628975cb03121f9151f385629391b543 SHA256 30c02c25dfe8817c150952a11ed408fc635e2ed549528d1b6ddb7d5cfa5dd880
DIST dcc-dccd-1.2.74.tar.Z 1232905 RMD160 886183bef5b032154a43e9cf17c59282d4580f7d SHA1 1661f5ce912cd97ab0d82eec62f69776246aa67a SHA256 448c5ff0f223520e69bda83188515a23c12ad3038640ea18173af5c0a22afc12
DIST dcc-dccd-1.3.16.tar.Z 1370359 RMD160 9ec7b4a8a1ebad7fe910d7d8bd415ba2c004b0c4 SHA1 323f8a80ce3b0753035db0ec19125ac1bfb3aaa9 SHA256 d63c2baa55354200e512e723f309dc1eb0f493bf8c581f6acf1ae0066c44cdb4
@@ -14,12 +15,6 @@ EBUILD dcc-1.3.16.ebuild 3546 RMD160 1195752487ba73e82cc5e3efc97410afed8e4dc6 SH
EBUILD dcc-1.3.24.ebuild 3941 RMD160 418ab31d28cb8d8b1ba52176904058b6880ebaed SHA1 19caaef2ab2e0feb57603462eab3bf9bf7d8a852 SHA256 e1afbc563679cf256bf501b2fe6fad2204988ead5786ebda24a4a33210a2c066
EBUILD dcc-1.3.31.ebuild 3946 RMD160 fd2c517e498a159aaf7e6ca8cbedbd35367720ec SHA1 26c93a656763bcc764f54095be1cc14257535618 SHA256 5291e8339464f9ba0b912deefa49d6c792a6e1e6c139f8d2e01035c0ead28b24
EBUILD dcc-1.3.55.ebuild 3951 RMD160 729f9031eeb03fb886a96cf39c7b2b432fcb64d8 SHA1 fb18088300ee92f119d33d0c66aa9bba528f8eee SHA256 a9fef6979c6cbaea90bde58a1d48b2009ff8fd23960e792278bbda548093246a
-MISC ChangeLog 5632 RMD160 e15519bed59624b9d1512cfe30e59272882c0e08 SHA1 81a04e23753e2987276b45aba72809c27de2aa48 SHA256 83df56aac012b3cb479bc3d3ff29b146cb42b60886507417d2558e54d0278957
+EBUILD dcc-1.3.97.ebuild 4210 RMD160 d3bd2bfa0e362744706cf22c369c9c5d2c8d879d SHA1 5def55880ffed14a01220c67ed2ed851ecb90f70 SHA256 de212086c331f0a6d69c42d52def6b8e9921f5505508ad4e2736bd5f18e52001
+MISC ChangeLog 6033 RMD160 d938753143465b282c620642d382fbc2cefd8502 SHA1 53ab5e2938ee51eb4a833761a759ce0e28b2838f SHA256 7e0a5894899479a09d322cbe71fb15fe9c6d14542e19b9e38654e253473ad590
MISC metadata.xml 324 RMD160 76205802852d0b5b55cdfe30c25452661675f4ae SHA1 9c261fe7a0389a016a42475447505c6c816a6a42 SHA256 ceb55854f84ec88f0305b0138c48c22bd8fa0834127c78cc158447527dad7155
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkivpCcACgkQoeSe8B0zEfzIBACZAbNRt33fVNkKWL1FhDw8uHgb
-e8kAniiks31jug1FyF3YtIA9Ga/DKAgz
-=Wl1j
------END PGP SIGNATURE-----
diff --git a/mail-filter/dcc/dcc-1.3.97.ebuild b/mail-filter/dcc/dcc-1.3.97.ebuild
new file mode 100644
index 000000000000..e64996af5b36
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.3.97.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.97.ebuild,v 1.1 2008/09/30 07:15:49 robbat2 Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Distributed Checksum Clearinghouse"
+HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
+SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${PN}-${PV}.tar.Z"
+
+LICENSE="DCC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ipv6 rrdtool milter"
+
+RDEPEND="dev-lang/perl
+ rrdtool? ( net-analyzer/rrdtool )
+ || ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
+ milter? ( mail-filter/libmilter )
+ virtual/libc"
+DEPEND="sys-apps/sed
+ sys-devel/gcc
+ ${RDEPEND}"
+
+dcc_cgibin=/var/www/localhost/cgi-bin/dcc
+dcc_homedir=/var/dcc
+dcc_libexec=/usr/sbin
+dcc_man=/usr/share/man
+dcc_rundir=/var/run/dcc
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${PN}-1.3.86.patch
+}
+
+src_compile() {
+ local myconf
+ myconf="${myconf} --homedir=${dcc_homedir}"
+ myconf="${myconf} --bindir=/usr/bin"
+ myconf="${myconf} --libexecdir=${dcc_libexec}"
+ myconf="${myconf} --mandir=/usr/share/man"
+ myconf="${myconf} --with-updatedcc_pfile=${dcc_homedir}/updatecc.pfile"
+ myconf="${myconf} --with-installroot=${D}"
+ myconf="${myconf} --with-DCC-MD5"
+ myconf="${myconf} --with-uid=root"
+ myconf="${myconf} --enable-server"
+ myconf="${myconf} --enable-dccifd"
+ #myconf="${myconf} --without-cgibin"
+ myconf="${myconf} --with-cgibin=${dcc_cgibin}"
+ myconf="${myconf} --with-rundir=${dcc_rundir}"
+ myconf="${myconf} --with-db-memory=64"
+ myconf="${myconf} --with-max-db-mem=128"
+ myconf="${myconf} --with-max-log-size=0"
+ myconf="${myconf} $(use_enable ipv6 IPv6)"
+
+ if use milter ; then
+ myconf="${myconf} --enable-dccm"
+ myconf="${myconf} --with-sendmail="
+ else
+ myconf="${myconf} --disable-dccm"
+ fi
+
+ einfo "Using config: ${myconf}"
+
+ ./configure ${myconf} || die "configure failed!"
+ #make -C homedir
+ emake || die "emake failed!"
+}
+
+moveconf() {
+ for i in $@; do
+ local into=/etc/dcc/
+ mv "${D}"${dcc_homedir}/${i} "${D}"${into}
+ dosym ${into}${i} ${dcc_homedir}/${i}
+ done
+}
+
+src_install() {
+ # stolen from the RPM .spec and modified for gentoo
+ MANOWN=root MANGRP=root export MANOWN MANGRP
+ BINOWN=$MANOWN BINGRP=$MANGRP export BINOWN BINGRP
+ DCC_PROTO_HOMEDIR="${D}${dcc_homedir}" export DCC_PROTO_HOMEDIR
+ DCC_CGIBINDIR="${D}${dcc_cgibin}" export DCC_CGIBINDIR
+ DCC_SUID=$BINOWN DCC_OWN=$BINOWN DCC_GRP=$BINGRP export DCC_SUID DCC_OWN DCC_GRP
+
+ dodir /etc/cron.daily ${dcc_homedir} ${dcc_cgibin} /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc
+ keepdir /var/run/dcc /var/log/dcc
+
+ addwrite "${dcc_homedir}/map"
+# This package now takes "${D}" at compile-time!
+# make DESTDIR="${D}" DCC_BINDIR="${D}"/usr/bin MANDIR="${D}"/usr/share/man/man DCC_HOMEDIR="${D}"${dcc_homedir} install || die
+ emake install || die
+
+ einfo "Branding and setting reasonable defaults"
+ sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
+ -e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \
+ -e "s,DCCM_LOGDIR=log\$,DCCM_LOGDIR=/var/log/dcc,;" \
+ -e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \
+ -e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \
+ -e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \
+ -i "${D}"${dcc_homedir}/dcc_conf
+
+ einfo "Enabling milter"
+ if use milter ; then
+ sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
+ "${D}"${dcc_homedir}/dcc_conf
+ fi
+
+ einfo "Providing cronjob"
+ mv "${D}"/usr/sbin/cron-dccd "${D}"/etc/cron.daily/dccd
+
+ einfo "Cleaning up"
+ mv "${D}"/usr/sbin/logger "${D}"/usr/sbin/logger-dcc
+
+ statslist="${D}/usr/sbin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}"
+ if ! use rrdtool; then
+ einfo "Removing rrdtool interface scripts"
+ eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
+ fi
+
+ einfo "Cleaning up"
+ rm -f "${D}"/usr/sbin/{rcDCC,updatedcc}
+
+ einfo "Placing configuration files into /etc instead of /var/dcc"
+ moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist
+
+ einfo "Install conf.d configuration"
+ newconfd "${FILESDIR}"/dcc.confd dcc
+
+ einfo "Install init.d script"
+ newinitd "${FILESDIR}"/dcc.initd dcc
+
+ rmdir "${D}"/var/dcc/log/
+}
diff --git a/mail-filter/dcc/files/dcc-1.3.86.patch b/mail-filter/dcc/files/dcc-1.3.86.patch
new file mode 100644
index 000000000000..c1ac27f1075c
--- /dev/null
+++ b/mail-filter/dcc/files/dcc-1.3.86.patch
@@ -0,0 +1,41 @@
+I know it looks weird that we are patching configure here, but there is NO
+configure.{ac,in} source included with this package.
+- Robin H. Johnson <robbat2@gentoo.org>
+
+This patch is from Gentoo bug 182172, and was submitted by steveb
+<steeeeeveee@gmx.net>.
+
+diff -Naur dcc-1.3.86/configure dcc-1.3.86.new/configure
+--- dcc-1.3.86/configure 2008-03-11 16:38:41.000000000 +0100
++++ dcc-1.3.86.new/configure 2008-03-24 19:50:52.802962250 +0100
+@@ -1058,8 +1058,7 @@
+ FreeBSD|DragonFly)
+ PTHREAD_LDFLAGS="$PTHREAD_LDFLAGS -pthread"
+ if test -s /usr/lib/libc_r.a; then
+- # use libc_r on ancient versions
+- appendvar PTHREAD_LIBS -lc_r
++ appendvar PTHREAD_LIBS
+ fi
+ ;;
+ Darwin)
+@@ -3511,7 +3510,7 @@
+ mancat=man
+ MAN8='dcc.8 $(SUBDIR_MAN8)'
+ MAN8INST=''
+- USE_DCCMANINSTALL='# do not use dccmaninstall'
++ USE_DCCMANINSTALL='maninstall:dccmaninstall'
+ ;;
+ DragonFly)
+ # default to /usr/local/man/man8 and use nroff files, possibly
+diff -Naur dcc-1.3.86/thrlib/cmn.c dcc-1.3.86.new/thrlib/cmn.c
+--- dcc-1.3.86/thrlib/cmn.c 2008-02-11 06:00:45.000000000 +0100
++++ dcc-1.3.86.new/thrlib/cmn.c 2008-03-24 19:51:36.333682750 +0100
+@@ -667,7 +667,7 @@
+ LOG_CMN_CAPTION(cwp, DCC_LOG_TRN_MSG_CR);
+ cwp->log_size = MAX_LOG_SIZE+1;
+ #else
+- log_write(&wp->cw, buf, buflen);
++ log_write(cwp, buf, buflen);
+ #endif
+ }
+
diff --git a/mail-filter/dcc/files/dcc.confd b/mail-filter/dcc/files/dcc.confd
new file mode 100644
index 000000000000..a6e556827dbd
--- /dev/null
+++ b/mail-filter/dcc/files/dcc.confd
@@ -0,0 +1,14 @@
+# Config file for /etc/init.d/dcc
+
+# Start server or DCC daemon
+START_DCC_DCCD="yes"
+
+# Start DCC greylisting
+START_DCC_GREY="yes"
+
+# Start milter interface
+START_DCC_DCCM="yes"
+
+# Start general Perl and MTA interface
+# and Postfix before-queue filter
+START_DCC_DCCIF="yes"
diff --git a/mail-filter/dcc/files/dcc.initd b/mail-filter/dcc/files/dcc.initd
new file mode 100644
index 000000000000..6a39d4c59059
--- /dev/null
+++ b/mail-filter/dcc/files/dcc.initd
@@ -0,0 +1,136 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/files/dcc.initd,v 1.1 2008/09/30 07:15:50 robbat2 Exp $
+
+depend() {
+ use logger
+ need net
+ before mta
+}
+
+checkconfig() {
+ if [[ ! -f "/etc/dcc/dcc_conf" || ! -r "/etc/dcc/dcc_conf" ]]
+ then
+ eerror "You need a DCC configuration in /etc/dcc/dcc_conf"
+ return 1
+ else
+ source "/etc/dcc/dcc_conf"
+ fi
+}
+
+start() {
+ checkconfig || return 1
+
+ if [[ "${START_DCC_DCCD}" == "yes" ]]
+ then
+ if [[ "${DCCD_ENABLE}" != "on" ]]
+ then
+ einfo "DCCD_ENABLE is not setto 'on' in dcc_conf"
+ else
+ if [[ -x "${DCC_LIBEXEC}/start-dccd" ]]
+ then
+ ebegin "Starting dccd"
+ ${DCC_LIBEXEC}/start-dccd >/dev/null 2>&1
+ eend ${?}
+ else
+ eerror "You enabled DCCD but start-dccd is missing or not executable"
+ fi
+ fi
+ fi
+
+ if [[ "${START_DCC_GREY}" == "yes" ]]
+ then
+ if [[ "${GREY_ENABLE}" != "on" ]]
+ then
+ einfo "GREY_ENABLE is not set to 'on' in dcc_conf"
+ else
+ if [[ -x "${DCC_LIBEXEC}/start-grey" ]]
+ then
+ ebegin "Starting grey"
+ ${DCC_LIBEXEC}/start-grey >/dev/null 2>&1
+ eend ${?}
+ else
+ eerror "You enabled GREY but start-grey is missing or not executable"
+ fi
+ fi
+ fi
+
+ if [[ "${START_DCC_DCCM}" == "yes" ]]
+ then
+ if [[ "${DCCM_ENABLE}" != "on" ]]
+ then
+ einfo "DCCM_ENABLE is not set to 'on' in dcc_conf"
+ else
+ if [[ -x "${DCC_LIBEXEC}/start-dccm" ]]
+ then
+ ebegin "Starting dccm"
+ ${DCC_LIBEXEC}/start-dccm >/dev/null 2>&1
+ eend ${?}
+ for ((dccmtimeout=0 ; dccmtimeout <= 20 ; dccmtimeout++))
+ do
+ if [[ ! -S "${DCC_RUNDIR}/dccm" || ! -r "${DCC_RUNDIR}/dccm" ]]
+ then
+ sleep 1
+ else
+ break
+ fi
+ done
+ chown ${SOCKET_USER:-milter}:${SOCKET_GROUP:-milter} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
+ chmod ${SOCKET_MODE:-664} ${DCC_RUNDIR}/dccm 1>/dev/null 2>&1
+ sed -i -e "s:^\-::" ${DCC_RUNDIR}/dccm.pid
+ else
+ eerror "You enabled DCCM but start-dccm is missing or not executable"
+ fi
+ fi
+ fi
+
+ if [[ "${START_DCC_DCCIF}" == "yes" ]]
+ then
+ if [[ "${DCCIFD}" != "on" ]]
+ then
+ einfo "DCCIFD_ENABLE is not set to 'on' in dcc_conf"
+ else
+ if [[ -x "${DCC_LIBEXEC}/start-dccifd" ]]
+ then
+ ebegin "Starting dccif"
+ ${DCC_LIBEXEC}/start-dccifd >/dev/null 2>&1
+ eend ${?}
+ else
+ eerror "You enabled DCCIF but start-dccif is missing or not executable"
+ fi
+ fi
+ fi
+}
+
+stop() {
+ checkconfig || return 1
+
+ if [[ -r "${DCC_RUNDIR}/dccifd.pid" ]]
+ then
+ ebegin "Stopping dccif"
+ kill -15 $(< ${DCC_RUNDIR}/dccifd.pid) 2>/dev/null
+ eend ${?}
+ fi
+
+ if [[ -r "${DCC_RUNDIR}/dccm.pid" ]]
+ then
+ ebegin "Stopping dccm"
+ kill -15 $(< ${DCC_RUNDIR}/dccm.pid) 2>/dev/null
+ eend ${?}
+ fi
+
+ if (pidof dccd >/dev/null 2>&1) && [[ -x "${DCC_LIBEXEC}/stop-dccd" ]]
+ then
+ ebegin "Stopping dccd"
+ ${DCC_LIBEXEC}/stop-dccd >/dev/null 2>&1
+ eend ${?}
+ fi
+
+ if (pidof dccd >/dev/null 2>&1) && [[ -x "${DCC_LIBEXEC}/stop-dccd" ]]
+ then
+ ebegin "Stopping grey"
+ ${DCC_LIBEXEC}/stop-dccd -G >/dev/null 2>&1
+ eend ${?}
+ fi
+}