commit: 8edfb67b10eaf574e978f8d12078f9b4df14df75 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Thu Sep 26 14:48:11 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Sep 26 14:49:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edfb67b
mail-filter/sid-milter: Remove last-rited pkg Closes: https://bugs.gentoo.org/519668 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> mail-filter/sid-milter/Manifest | 1 - mail-filter/sid-milter/files/gentoo-config.m4 | 6 -- mail-filter/sid-milter/files/sid-filter.conf | 5 -- mail-filter/sid-milter/files/sid-filter.init-r1 | 88 ---------------------- .../files/sid-milter-1.0.0-as-needed.patch | 21 ------ .../files/sid-milter-1.0.0-nopra_on_spf1.patch | 57 -------------- mail-filter/sid-milter/metadata.xml | 11 --- mail-filter/sid-milter/sid-milter-1.0.0-r6.ebuild | 64 ---------------- mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild | 66 ---------------- profiles/package.mask | 6 -- 10 files changed, 325 deletions(-) diff --git a/mail-filter/sid-milter/Manifest b/mail-filter/sid-milter/Manifest deleted file mode 100644 index f2ffa412623..00000000000 --- a/mail-filter/sid-milter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST sid-milter-1.0.0.tar.gz 351161 BLAKE2B 152472577addbebf549ccc17f96e3e4d7bb645ab7924fe1b1ffa8361f0629851143818b1fe0d856ad72b097037482198152dab20e6e39f2fe8b374263de5653b SHA512 599eae36b7708e045e3f120cd6b4215906ea954b5f10be520d917404a02cf0b03d79b8fcf9543080288a9ab8e436b393c8b6340d2b1edced3d4fb827ff4c30dc diff --git a/mail-filter/sid-milter/files/gentoo-config.m4 b/mail-filter/sid-milter/files/gentoo-config.m4 deleted file mode 100644 index d5692bad036..00000000000 --- a/mail-filter/sid-milter/files/gentoo-config.m4 +++ /dev/null @@ -1,6 +0,0 @@ -define(`confNO_MAN_BUILD',`') -define(`confCC', `@@CC@@') -define(`confOPTIMIZE', `@@CFLAGS@@') -define(`confLDOPTS', `@@LDFLAGS@@') -define(`confENVDEF', `@@ENVDEF@@') -define(`bld_USE_ARLIB', `true') diff --git a/mail-filter/sid-milter/files/sid-filter.conf b/mail-filter/sid-milter/files/sid-filter.conf deleted file mode 100644 index fb506c39388..00000000000 --- a/mail-filter/sid-milter/files/sid-filter.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Additional options for the Sender-ID Milter -# see sid-filter(8) for more information. -SOCKETSPEC="inet:8026@localhost" -DOMAIN="example.com" -SID_FILTER_OPTS="-u milter -l -p $SOCKETSPEC -d $DOMAIN -P /var/run/sid-filter.pid" diff --git a/mail-filter/sid-milter/files/sid-filter.init-r1 b/mail-filter/sid-milter/files/sid-filter.init-r1 deleted file mode 100644 index 853e96653a0..00000000000 --- a/mail-filter/sid-milter/files/sid-filter.init-r1 +++ /dev/null @@ -1,88 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - # need net - use dns logger net -} - -parse_opts() { - local filter_opt filter_flag= - for filter_opt in ${SID_FILTER_OPTS}; do - case "${filter_flag}" in - -u) filter_user=${filter_opt} - ;; - -P) filter_pid=${filter_opt} - ;; - esac - [ -n "${filter_user}" -a -n "${filter_pid}" ] && break - filter_flag=${filter_opt} - done - - if [ -z "${filter_user}" ]; then - filter_user=milter - SID_FILTER_OPTS="${SID_FILTER_OPTS} -u ${filter_user}" - fi - if [ -z "${filter_pid}" ]; then - filter_pid="/var/run/sid-filter.pid" - SID_FILTER_OPTS="${SID_FILTER_OPTS} -P ${filter_pid}" - fi -} - -clean_socket() { - local socket_file= svc_pid= - - socket_file="$(echo ${SID_FILTER_OPTS} | sed -e 's/.*local:\(.*\) .*/\1/' | awk '{print $1}')" - svc_pid="$(ps -C sid-filter -o pid=)" - if [[ -z "${svc_pid}" ]] && [[ ! -z "${socket_file}" ]] && [[ -S "${socket_file}" ]]; then - ewarn "Strange, the socket file already exist in \"${socket_file}\"" - ewarn "it will be removed now and re-created by the sid-filter server" - ewarn "BUT please make your checks." - rm -f "${socket_file}" - fi -} - -check_socketdir() { - local socket_dir - case "${SOCKETSPEC}" in - local:*) socket_dir="$(echo ${SOCKETSPEC} | sed -e 's~^local:\(.*\)/.*$~\1~')" - if [[ ! -d ${socket_dir} ]]; then - checkpath -q -d -o ${filter_user}:${filter_user} -m 0755 ${socket_dir} || return 1 - fi ;; - inet:*) ;; - *) eerror "Unknown socket spec. Please check your /etc/conf.d/sid-milter file." - return 1 ;; - esac -} - - -start() { - local filter_user= filter_pid= - - clean_socket - parse_opts - check_socketdir || return 1 - if ! (touch ${filter_pid} && chown ${filter_user} ${filter_pid}) ; then - eerror "Failed to create pidfile" - return 1 - fi - - ebegin "Starting Sender-ID Filter" - start-stop-daemon --start --exec /usr/bin/sid-filter -- ${SID_FILTER_OPTS} - eend $? -} - -stop() { - local filter_user= filter_pid= - - parse_opts - - ebegin "Stopping Sender-ID Filter" - start-stop-daemon --stop --quiet --name sid-filter --pidfile ${filter_pid} - eend $? - - if [ $? = 0 -a -f "${filter_pid}" ]; then - rm ${filter_pid} - fi -} diff --git a/mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch b/mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch deleted file mode 100644 index 365604f721f..00000000000 --- a/mail-filter/sid-milter/files/sid-milter-1.0.0-as-needed.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru sid-milter-1.0.0.orig/devtools/M4/UNIX/defines.m4 sid-milter-1.0.0/devtools/M4/UNIX/defines.m4 ---- sid-milter-1.0.0.orig/devtools/M4/UNIX/defines.m4 2006-10-06 07:44:44.000000000 +0200 -+++ sid-milter-1.0.0/devtools/M4/UNIX/defines.m4 2009-07-08 17:11:06.000000000 +0200 -@@ -26,7 +26,7 @@ - CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC') - # Linker for libraries - LD= ifdef(`confLD', `confLD', `confCC') --LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `') -+LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') - LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared') - - # Shell -@@ -71,7 +71,7 @@ - LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') - - # libraries required on your system --LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') -+LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `') - - # location of sendmail binary (usually /usr/sbin or /usr/lib) - BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin') diff --git a/mail-filter/sid-milter/files/sid-milter-1.0.0-nopra_on_spf1.patch b/mail-filter/sid-milter/files/sid-milter-1.0.0-nopra_on_spf1.patch deleted file mode 100644 index 868a2d9ecd5..00000000000 --- a/mail-filter/sid-milter/files/sid-milter-1.0.0-nopra_on_spf1.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nru sid-milter-1.0.0.orig/sid-filter/sid-filter.c sid-milter-1.0.0/sid-filter/sid-filter.c ---- sid-milter-1.0.0.orig/sid-filter/sid-filter.c 2009-03-08 09:51:00.000000000 +0000 -+++ sid-milter-1.0.0/sid-filter/sid-filter.c 2009-03-08 16:29:24.000000000 +0000 -@@ -1279,30 +1279,35 @@ - switch (scope) - { - case SM_SCOPE_PRA: --#ifdef _FFR_NH_MFROM -- if ((strncasecmp(mreplies[rcount], -- "spf2.0/pra", -- 10) == 0) || -- (strncasecmp(mreplies[rcount], -- "spf2.0/mfrom,pra", -- 16) == 0)) --#else /* _FFR_NH_MFROM */ -- if (strncasecmp(mreplies[rcount], -- "spf2.0/pra", 10) == 0) --#endif /* _FFR_NH_MFROM */ -+ if (( -+ (strncasecmp(mreplies[rcount], -+ "spf2.0/pra", -+ 10) == 0) || -+ (strncasecmp(mreplies[rcount], -+ "spf2.0/mfrom,pra", -+ 16) == 0)) && -+ (strncasecmp(policy, -+ "spf2.0/", -+ 7) != 0)) - { - sm_strlcpy(policy, - mreplies[rcount], - sizeof policy); - } -- else if (!nopraspf1 && -- (strncasecmp(mreplies[rcount], -- "v=spf1", 6) == 0) && -- policy[0] == '\0') -+ else if (strncasecmp(mreplies[rcount], -+ "v=spf1", 6) == 0) - { -- sm_strlcpy(policy, -- mreplies[rcount], -- sizeof policy); -+ if (nopraspf1) -+ { -+ memset(mreplies[rcount], '\0', -+ sizeof mreplies[rcount]); -+ } -+ else if (policy[0] == '\0') -+ { -+ sm_strlcpy(policy, -+ mreplies[rcount], -+ sizeof policy); -+ } - } - break; - diff --git a/mail-filter/sid-milter/metadata.xml b/mail-filter/sid-milter/metadata.xml deleted file mode 100644 index 25ff620540d..00000000000 --- a/mail-filter/sid-milter/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription>A milter-based application that implements and enforces -the merged Caller-ID/SPF specification from the IETF MARID working group, -currently dubbed "Sender-ID"</longdescription> - <upstream> - <remote-id type="sourceforge">sid-milter</remote-id> - </upstream> -</pkgmetadata> diff --git a/mail-filter/sid-milter/sid-milter-1.0.0-r6.ebuild b/mail-filter/sid-milter/sid-milter-1.0.0-r6.ebuild deleted file mode 100644 index 8fbd47db0f8..00000000000 --- a/mail-filter/sid-milter/sid-milter-1.0.0-r6.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit eutils toolchain-funcs user - -DESCRIPTION="A milter-based application to provide Sender-ID verification service" -HOMEPAGE="https://sourceforge.net/projects/sid-milter/"; -SRC_URI="mirror://sourceforge/sid-milter/${P}.tar.gz" - -LICENSE="Sendmail-Open-Source" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="ipv6" - -DEPEND="dev-libs/openssl - >=sys-libs/db-3.2 - || ( mail-filter/libmilter mail-mta/sendmail )" -RDEPEND="${DEPEND} - sys-apps/openrc" - -pkg_setup() { - enewgroup milter - # mail-milter/spamass-milter creates milter user with this home directory - # For consistency reasons, milter user must be created here with this home directory - # even though this package doesn't need a home directory for this user (#280571) - enewuser milter -1 -1 /var/lib/milter milter -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-nopra_on_spf1.patch - epatch "${FILESDIR}"/${P}-as-needed.patch - - local CC="$(tc-getCC)" - local ENVDEF="" - use ipv6 && ENVDEF="${ENVDEF} -DNETINET6" - sed -e "s:@@CC@@:${CC}:" \ - -e "s:@@CFLAGS@@:${CFLAGS}:" \ - -e "s:@@LDFLAGS@@:${LDFLAGS}:" \ - -e "s:@@ENVDEF@@:${ENVDEF}:" \ - "${FILESDIR}/gentoo-config.m4" > "${S}/devtools/Site/site.config.m4" \ - || die "failed to generate site.config.m4" -} - -src_compile() { - emake -j1 -} - -src_install() { - dodir /usr/bin - emake -j1 DESTDIR="${D}" SUBDIRS=sid-filter \ - SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ - install - - newinitd "${FILESDIR}/sid-filter.init-r1" sid-filter - newconfd "${FILESDIR}/sid-filter.conf" sid-filter - - # man build is broken; do man page installation by hand - doman */*.8 - - # some people like docs - dodoc RELEASE_NOTES *.txt sid-filter/README -} diff --git a/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild b/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild deleted file mode 100644 index 9c8ac171f4b..00000000000 --- a/mail-filter/sid-milter/sid-milter-1.0.0-r7.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils toolchain-funcs user - -DESCRIPTION="A milter-based application to provide Sender-ID verification service" -HOMEPAGE="https://sourceforge.net/projects/sid-milter/"; -SRC_URI="mirror://sourceforge/sid-milter/${P}.tar.gz" - -LICENSE="Sendmail-Open-Source" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="ipv6 libressl" - -DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - >=sys-libs/db-3.2:* - || ( mail-filter/libmilter mail-mta/sendmail )" -RDEPEND="${DEPEND} - sys-apps/openrc" - -pkg_setup() { - enewgroup milter - # mail-milter/spamass-milter creates milter user with this home directory - # For consistency reasons, milter user must be created here with this home directory - # even though this package doesn't need a home directory for this user (#280571) - enewuser milter -1 -1 /var/lib/milter milter -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-nopra_on_spf1.patch - epatch "${FILESDIR}"/${P}-as-needed.patch - - local CC="$(tc-getCC)" - local ENVDEF="" - use ipv6 && ENVDEF="${ENVDEF} -DNETINET6" - sed -e "s:@@CC@@:${CC}:" \ - -e "s:@@CFLAGS@@:${CFLAGS}:" \ - -e "s:@@LDFLAGS@@:${LDFLAGS}:" \ - -e "s:@@ENVDEF@@:${ENVDEF}:" \ - "${FILESDIR}/gentoo-config.m4" > "${S}/devtools/Site/site.config.m4" \ - || die "failed to generate site.config.m4" -} - -src_compile() { - emake -j1 -} - -src_install() { - dodir /usr/bin - emake -j1 DESTDIR="${D}" SUBDIRS=sid-filter \ - SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ - install - - newinitd "${FILESDIR}/sid-filter.init-r1" sid-filter - newconfd "${FILESDIR}/sid-filter.conf" sid-filter - - # man build is broken; do man page installation by hand - doman */*.8 - - # some people like docs - dodoc RELEASE_NOTES *.txt sid-filter/README -} diff --git a/profiles/package.mask b/profiles/package.mask index 33572b41de6..b634b627adf 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1101,12 +1101,6 @@ dev-embedded/scratchbox-devkit-perl dev-embedded/scratchbox-devkit-qemu dev-embedded/scratchbox-devkit-svn -# Michał Górny <[email protected]> (2019-08-27) -# Unmaintained. No release since 2008. Is reported to wrongly reject -# 'pretty much all mails', also reported build failure. -# Removal in 30 days. Bug #519668. -mail-filter/sid-milter - # Miroslav Šulc <[email protected]> (2019-08-19) # Depends on >=virtual/{jdk,jre}-11 which is masked =www-servers/tomcat-9.0.24
