[gentoo-commits] repo/gentoo:master commit in: mail-filter/dcc/, mail-filter/dcc/files/
commit: 7f0de70518fc3643b7d2f8309b216d2ef5227bde
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Sep 29 02:10:01 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Sep 29 04:17:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f0de705
mail-filter/dcc: fix configure with clang16
Doesn't look like will get to use eautoreconf here.
Closes: https://bugs.gentoo.org/870646
Signed-off-by: Ionen Wolkens gentoo.org>
mail-filter/dcc/dcc-1.3.158-r2.ebuild | 1 +
mail-filter/dcc/files/dcc-1.3.158-clang16.patch | 30 +
2 files changed, 31 insertions(+)
diff --git a/mail-filter/dcc/dcc-1.3.158-r2.ebuild
b/mail-filter/dcc/dcc-1.3.158-r2.ebuild
index 7a01e900a63e..7aac567ecd12 100644
--- a/mail-filter/dcc/dcc-1.3.158-r2.ebuild
+++ b/mail-filter/dcc/dcc-1.3.158-r2.ebuild
@@ -35,6 +35,7 @@ dcc_rundir=var/run/dcc
PATCHES=(
"${FILESDIR}"/${PN}-1.3.140-freebsd.patch
"${FILESDIR}"/${P}-fno-common.patch
+ "${FILESDIR}"/${P}-clang16.patch
)
src_configure() {
diff --git a/mail-filter/dcc/files/dcc-1.3.158-clang16.patch
b/mail-filter/dcc/files/dcc-1.3.158-clang16.patch
new file mode 100644
index ..adf518944408
--- /dev/null
+++ b/mail-filter/dcc/files/dcc-1.3.158-clang16.patch
@@ -0,0 +1,30 @@
+configure.ac is missing, so need to edit this manually
+
+https://bugs.gentoo.org/870646
+--- a/configure
b/configure
+@@ -796,3 +796,3 @@
+
+-main(){return(0);}
++int main(void){return(0);}
+ EOF
+@@ -1100,3 +1100,3 @@
+ #include "confdefs.h"
+-main()
++int main(void)
+ {exit(sizeof(void*)==8 ? 0 : sizeof(void*));}
+@@ -1463,3 +1463,3 @@
+ #include
+-main()
++int main(void)
+ {
+@@ -3330,3 +3330,3 @@
+ #define min(a,b) ((a) < (b) ? (a) : (b))
+-main()
++int main(void)
+ {
+@@ -3596,3 +3596,3 @@
+ #include "include/dcc_paths.h"
+-main()
++int main(void)
+ {
[gentoo-commits] repo/gentoo:master commit in: mail-filter/dcc/, mail-filter/dcc/files/
commit: 49241f1373444258fd5ad16b4f00c5b1510c19ac
Author: Jakov Smolic sartura hr>
AuthorDate: Tue Jan 12 12:03:59 2021 +
Commit: David Seifert gentoo org>
CommitDate: Tue Jan 12 12:03:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49241f13
mail-filter/dcc: Port to EAPI 7
Closes: https://bugs.gentoo.org/706988
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
mail-filter/dcc/dcc-1.3.158-r1.ebuild | 144 +
mail-filter/dcc/files/dcc-1.3.140-freebsd.patch| 2 -
mail-filter/dcc/files/dcc-1.3.158-fno-common.patch | 23
3 files changed, 167 insertions(+), 2 deletions(-)
diff --git a/mail-filter/dcc/dcc-1.3.158-r1.ebuild
b/mail-filter/dcc/dcc-1.3.158-r1.ebuild
new file mode 100644
index 000..be9cf2452f6
--- /dev/null
+++ b/mail-filter/dcc/dcc-1.3.158-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Distributed Checksum Clearinghouse"
+HOMEPAGE="https://www.rhyolite.com/dcc/";
+SRC_URI="https://www.rhyolite.com/dcc/source/old/${P}.tar.Z";
+
+LICENSE="DCC GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" #
+IUSE="cgi ipv6 rrdtool milter"
+
+RDEPEND="
+ dev-lang/perl
+ || (
+ net-ftp/ftp
+ net-misc/curl
+ net-misc/wget
+ www-client/fetch
+ )
+ milter? (
+ || (
+ mail-filter/libmilter
+ mail-mta/sendmail
+ )
+ )
+ rrdtool? ( net-analyzer/rrdtool )"
+DEPEND="${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
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.140-freebsd.patch
+ "${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_configure() {
+ tc-export CC AR RANLIB
+ local myconf=(
+ --bindir="${EPREFIX}"/usr/bin
+ --homedir="${EPREFIX}"/${dcc_homedir}
+ --libexecdir="${EPREFIX}"/${dcc_libexec}
+ --mandir="${EPREFIX}"/usr/share/man
+ --enable-dccifd
+ --enable-server
+ --with-DDC-MD5
+ --with-installroot="${D}"
+ --with-rundir="${EPREFIX}"/${dcc_rundir}
+ --with-uid=root
+
--with-updatedcc_pfile="${EPREFIX}"/${dcc_homedir}/updatecc.pfile
+ --with-db-memory=64
+ --with-max-db-mem=128
+ --with-max-log-size=0
+ --with-make-cmd=${MAKE:-make}
+ $(use_enable ipv6 IPv6)
+ $(use_enable milter dccm)
+ $(use_with cgi cgibin ${dcc_cgibin})
+ $(use_with milter sendmail)
+ )
+
+ einfo "Using config: ${myconf[@]}"
+
+ # This is NOT a normal configure script.
+ ./configure "${myconf[@]}" || die "configure failed!"
+}
+
+moveconf() {
+ local i
+ for i in $@; do
+ mv "${ED}/${dcc_homedir}/${i}" "${ED}"/etc/dcc || die
+ dosym ../../etc/dcc/"${i}" "${dcc_homedir}/${i}"
+ done
+}
+
+src_install() {
+ # stolen from the RPM .spec and modified for gentoo
+ export MANOWN=root
+ export MANGRP=$(id -g -n root)
+ export BINOWN="${MANOWN}"
+ export BINGRP="${MANGRP}"
+ export DCC_PROTO_HOMEDIR="${ED}/${dcc_homedir}"
+ export DCC_CGIBINDIR="${ED}/${dcc_cgibin}"
+ export DCC_SUID="${BINOWN}"
+ export DCC_OWN="${BINOWN}"
+ export DCC_GRP="${BINGRP}"
+
+ dodir /etc/cron.daily "${dcc_homedir}" /usr/bin /usr/sbin
/usr/share/man/man{0,8} /etc/dcc
+ if use cgi ; then
+ dodir "${dcc_cgibin}"
+ fi
+ keepdir /var/log/dcc
+
+ emake install
+
+ # branding and setting reasonable defaults
+ sed -e "s/BRAND=\$/BRAND='Gentoo ${PF}'/;" \
+ -e "s/GREY_ENABLE=\$/GREY_ENABLE=off/;" \
+ -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/' \
+ -e 's/DBCLEAN_LOGDAYS=14/DBCLEAN_LOGDAYS=1/' \
+ -i "${ED}/${dcc_homedir}/dcc_conf" || die
+
+ if use milter ; then
+ # enable milter
+ sed -i -e "s:^[\t #]*\(DCCM_ENABLE[\t ]*=[\t ]*\).*:\1on:g" \
+ "${ED}/${dcc_homedir}"/dcc_conf || die
+ fi
+
+ # provide cronjob
+ mv "${ED}"/usr/sbin/cron-dccd "${ED}"/etc/cron.daily/dccd || die "mv
failed"
+
+ # clean up
+ mv "${ED}"/u
