| 1 |
robbat2 13/12/28 04:33:08 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: dcc-1.3.154.ebuild |
| 5 |
Log: |
| 6 |
Bug #452328: bump, also bashisms in init script. |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.76 mail-filter/dcc/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/ChangeLog?rev=1.76&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/ChangeLog?rev=1.76&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/ChangeLog?r1=1.75&r2=1.76 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v |
| 20 |
retrieving revision 1.75 |
| 21 |
retrieving revision 1.76 |
| 22 |
diff -p -w -b -B -u -u -r1.75 -r1.76 |
| 23 |
--- ChangeLog 1 Jan 2013 18:03:36 -0000 1.75 |
| 24 |
+++ ChangeLog 28 Dec 2013 04:33:08 -0000 1.76 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for mail-filter/dcc |
| 27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.75 2013/01/01 18:03:36 polynomial-c Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.76 2013/12/28 04:33:08 robbat2 Exp $ |
| 30 |
+ |
| 31 |
+*dcc-1.3.154 (28 Dec 2013) |
| 32 |
+ |
| 33 |
+ 28 Dec 2013; Robin H. Johnson <robbat2@g.o> +dcc-1.3.154.ebuild, |
| 34 |
+ +files/dcc.initd-1.3.154: |
| 35 |
+ Bug #452328: bump, also bashisms in init script. |
| 36 |
|
| 37 |
01 Jan 2013; Lars Wendler <polynomial-c@g.o> files/dcc.initd-1.3.140: |
| 38 |
Non-maintainer commit: Removed bashism in init script (bug #388723). |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 mail-filter/dcc/dcc-1.3.154.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/dcc-1.3.154.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/dcc/dcc-1.3.154.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: dcc-1.3.154.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2013 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.154.ebuild,v 1.1 2013/12/28 04:33:08 robbat2 Exp $ |
| 52 |
|
| 53 |
EAPI=5 |
| 54 |
|
| 55 |
inherit base eutils flag-o-matic toolchain-funcs |
| 56 |
|
| 57 |
DESCRIPTION="Distributed Checksum Clearinghouse" |
| 58 |
HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/" |
| 59 |
SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/old/${P}.tar.Z" |
| 60 |
|
| 61 |
LICENSE="DCC" |
| 62 |
SLOT="0" |
| 63 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
| 64 |
IUSE="cgi ipv6 rrdtool milter" |
| 65 |
|
| 66 |
RDEPEND="dev-lang/perl |
| 67 |
rrdtool? ( net-analyzer/rrdtool ) |
| 68 |
|| ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp ) |
| 69 |
milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )" |
| 70 |
DEPEND="sys-apps/sed |
| 71 |
sys-devel/gcc |
| 72 |
${RDEPEND}" |
| 73 |
|
| 74 |
dcc_cgibin=/var/www/localhost/cgi-bin/dcc |
| 75 |
dcc_homedir=/var/dcc |
| 76 |
dcc_libexec=/usr/sbin |
| 77 |
dcc_man=/usr/share/man |
| 78 |
dcc_rundir=/var/run/dcc |
| 79 |
|
| 80 |
PATCHES=( ) |
| 81 |
#"${FILESDIR}"/dcc-1.3.140-configure-fix.patch # Merged upstream |
| 82 |
|
| 83 |
src_configure() { |
| 84 |
local myconf |
| 85 |
myconf="${myconf} --homedir=${dcc_homedir}" |
| 86 |
myconf="${myconf} --bindir=/usr/bin" |
| 87 |
myconf="${myconf} --libexecdir=${dcc_libexec}" |
| 88 |
myconf="${myconf} --mandir=/usr/share/man" |
| 89 |
myconf="${myconf} --with-updatedcc_pfile=${dcc_homedir}/updatecc.pfile" |
| 90 |
myconf="${myconf} --with-installroot=${D}" |
| 91 |
# sigh. should be DCC-MD5 but see line 486 in the shipped configure script |
| 92 |
myconf="${myconf} --with-DDC-MD5" |
| 93 |
myconf="${myconf} --with-uid=root" |
| 94 |
myconf="${myconf} --enable-server" |
| 95 |
myconf="${myconf} --enable-dccifd" |
| 96 |
myconf="${myconf} --with-rundir=${dcc_rundir}" |
| 97 |
myconf="${myconf} --with-db-memory=64" |
| 98 |
myconf="${myconf} --with-max-db-mem=128" |
| 99 |
myconf="${myconf} --with-max-log-size=0" |
| 100 |
myconf="${myconf} $(use_enable ipv6 IPv6)" |
| 101 |
myconf="${myconf} $(use_with cgi cgibin ${dcc_cgibin})" |
| 102 |
myconf="${myconf} $(use_enable milter dccm)" |
| 103 |
use milter && myconf="${myconf} --with-sendmail=" |
| 104 |
|
| 105 |
einfo "Using config: ${myconf}" |
| 106 |
|
| 107 |
# This is NOT a normal configure script. |
| 108 |
./configure ${myconf} || die "configure failed!" |
| 109 |
} |
| 110 |
|
| 111 |
src_compile() { |
| 112 |
emake CC="$(tc-getCC)" || die "emake failed!" |
| 113 |
} |
| 114 |
|
| 115 |
moveconf() { |
| 116 |
local into=/etc/dcc/ |
| 117 |
for i in $@; do |
| 118 |
mv "${D}${dcc_homedir}/${i}" "${D}${into}" |
| 119 |
dosym "${into}${i}" "${dcc_homedir}/${i}" |
| 120 |
done |
| 121 |
} |
| 122 |
|
| 123 |
src_install() { |
| 124 |
# stolen from the RPM .spec and modified for gentoo |
| 125 |
MANOWN=root MANGRP=root export MANOWN MANGRP |
| 126 |
BINOWN="${MANOWN}" BINGRP="${MANGRP}" export BINOWN BINGRP |
| 127 |
DCC_PROTO_HOMEDIR="${D}${dcc_homedir}" export DCC_PROTO_HOMEDIR |
| 128 |
DCC_CGIBINDIR="${D}${dcc_cgibin}" export DCC_CGIBINDIR |
| 129 |
DCC_SUID="${BINOWN}" DCC_OWN="${BINOWN}" DCC_GRP="${BINGRP}" export DCC_SUID DCC_OWN DCC_GRP |
| 130 |
|
| 131 |
dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin /usr/share/man/man{0,8} /etc/dcc |
| 132 |
if use cgi ; then |
| 133 |
dodir "${dcc_cgibin}" |
| 134 |
fi |
| 135 |
keepdir /var/log/dcc |
| 136 |
|
| 137 |
# This package now takes "${D}" at compile-time! |
| 138 |
# make DESTDIR="${D}" DCC_BINDIR="${D}"/usr/bin MANDIR="${D}"/usr/share/man/man DCC_HOMEDIR="${D}"${dcc_homedir} install || die |
| 139 |
emake install || die "emake install failed" |
| 140 |
|
| 141 |
# branding and setting reasonable defaults |
| 142 |
sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \ |
| 143 |
-e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \ |
| 144 |
-e "s/DCCM_LOG_AT=5\$/DCCM_LOG_AT=50/;" \ |
| 145 |
-e "s,DCCM_LOGDIR=\"log\"\$,DCCM_LOGDIR=\"/var/log/dcc\",;" \ |
| 146 |
-e "s/DCCM_ARGS=\$/DCCM_ARGS='-SHELO -Smail_host -SSender -SList-ID'/;" \ |
| 147 |
-e "s/DCCIFD_ARGS=\$/DCCIFD_ARGS=\"\$DCCM_ARGS\"/;" \ |
| 148 |
-e 's/DCCIFD_ENABLE=off/DCCIFD_ENABLE=on/' \ |
| 149 |
-e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \ |
| 150 |
-i "${D}${dcc_homedir}/dcc_conf" |
| 151 |
|
| 152 |
if use milter ; then |
| 153 |
# enable milter |
| 154 |
sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \ |
| 155 |
"${D}${dcc_homedir}"/dcc_conf |
| 156 |
fi |
| 157 |
|
| 158 |
# provide cronjob |
| 159 |
mv "${D}"/usr/sbin/cron-dccd "${D}"/etc/cron.daily/dccd || die "mv failed" |
| 160 |
|
| 161 |
# clean up |
| 162 |
mv "${D}"/usr/sbin/logger "${D}"/usr/sbin/logger-dcc || die "mv failed" |
| 163 |
|
| 164 |
statslist="${D}/usr/sbin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}" |
| 165 |
if ! use rrdtool; then |
| 166 |
# remove rrdtool interface scripts |
| 167 |
eval rm -f ${statslist} || die "Failed to clean up rrdtool scripts" |
| 168 |
fi |
| 169 |
|
| 170 |
# clean up |
| 171 |
rm -f "${D}"/usr/sbin/{rcDCC,updatedcc} |
| 172 |
|
| 173 |
# place configuration files into /etc instead of /var/dcc |
| 174 |
moveconf dcc_conf flod grey_flod grey_whitelist ids map map.txt whiteclnt whitecommon whitelist |
| 175 |
|
| 176 |
newinitd "${FILESDIR}"/dcc.initd-1.3.154 dcc |
| 177 |
newconfd "${FILESDIR}"/dcc.confd dcc |
| 178 |
|
| 179 |
rmdir "${D}"/var/dcc/log/ |
| 180 |
|
| 181 |
dodoc CHANGES RESTRICTIONS |
| 182 |
dohtml *.html |
| 183 |
doman *.{0,8} |
| 184 |
} |
Archives