[gentoo-commits] repo/gentoo:master commit in: mail-filter/milter-regex/files/, mail-filter/milter-regex/

[Joonas Niilola]

commit:     f9aab8b4ee08a412aeb0e0cd33c8fd35ef1b6e65
Author:     Ralph Seichter <github <AT> seichter <DOT> de>
AuthorDate: Fri Jul 26 15:02:05 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 17:48:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9aab8b4

mail-filter/milter-regex: Remove obsolete ebuilds

Version 2.6 has been stabilised, older ebuilds are now obsolete.

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Ralph Seichter <gentoo <AT> seichter.de>
Closes: https://github.com/gentoo/gentoo/pull/12549
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 mail-filter/milter-regex/Manifest                  |  2 -
 .../files/milter-regex-1.9-gentoo.patch            | 38 --------------
 .../files/milter-regex-2.2-gentoo.patch            | 38 --------------
 mail-filter/milter-regex/files/milter-regex-conf   |  8 ---
 .../milter-regex/files/milter-regex-conf-2.2       | 13 -----
 mail-filter/milter-regex/files/milter-regex-init   | 41 ---------------
 .../milter-regex/files/milter-regex-init-2.2       | 14 -----
 mail-filter/milter-regex/milter-regex-1.9.ebuild   | 60 ----------------------
 mail-filter/milter-regex/milter-regex-2.2.ebuild   | 51 ------------------
 9 files changed, 265 deletions(-)

diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest
index 0c6613f6e75..3858d0ac6d1 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -1,3 +1 @@
-DIST milter-regex-1.9.tar.gz 19880 BLAKE2B 8934eb4f78f168b6f4f93b3a7e70b896c6518cd1228ea8fe387184a718a002f051f5084a7a7f4d07c9e7832fe1c9e9bc907661c4e765dde938b7c6049c8772e6 SHA512 55cb97eba01220eb57c29498a090152c05d259abbe6f771e47a67499e7c2a1d4121ec9d0bce84cc8b6490bcd20dea8eaaba753e61f1ce9002edd8440b13f7148
-DIST milter-regex-2.2.tar.gz 20496 BLAKE2B 75cd668e8f75a62bb16d1e38d089465e1e9b49a7441594cb8f77279c9e29f1b90c7b452595f8653b81167fbed8f10e8322ccec51374446938ca43b245cbfa440 SHA512 c2f94d1d9897e2a3f62639343ff9272d28c044f25c59e10f12f37250aa0e5426174cb2a74850993246628e828d21f5cba8567de65a225235eac1969836e41f28
 DIST milter-regex-2.6.tar.gz 20517 BLAKE2B d98587146010d60a062833d8529af2788d657141e19c249e97bf5c847ffa01d6c76f42b6c8413f957fbeb9843ad38281ba8257aef10d0f1bd414726c416533da SHA512 33afa9a314ff2a2f14a301a85fa142e6e4166ffb77e8d18632b094c7873397e037ee6c5d3d1c248bfbb23037c45a15f21fb0cebcbb0f90c69b3d985aad37f169

diff --git a/mail-filter/milter-regex/files/milter-regex-1.9-gentoo.patch b/mail-filter/milter-regex/files/milter-regex-1.9-gentoo.patch
deleted file mode 100644
index 38ba17af0d8..00000000000
--- a/mail-filter/milter-regex/files/milter-regex-1.9-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- Makefile.linux	2011-07-16 16:51:34.000000000 +0300
-+++ Makefile.linux	2012-08-05 18:15:30.906378968 +0300
-@@ -6,28 +6,27 @@
- # see milter-regex.init for an init script for RedHat/Fedora
- # (contributed by admin@××××××××.ru)
- 
--CFLAGS=		-g
--LDFLAGS=	-L/usr/lib/libmilter -lmilter -lpthread
-+LIBS=  -lmilter -lpthread
- 
- all: milter-regex milter-regex.cat8
- 
- milter-regex: milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o
--	gcc -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LIBS)
- 
- milter-regex.o: milter-regex.c eval.h
--	gcc $(CFLAGS) -c milter-regex.c
-+	$(CC) $(CFLAGS) -c milter-regex.c
- 
- eval.o: eval.c eval.h
--	gcc $(CFLAGS) -c eval.c
-+	$(CC) $(CFLAGS) -c eval.c
- 
- strlcat.o: strlcat.c
--	gcc $(CFLAGS) -c strlcat.c
-+	$(CC) $(CFLAGS) -c strlcat.c
- 
- strlcpy.o: strlcpy.c
--	gcc $(CFLAGS) -c strlcpy.c
-+	$(CC) $(CFLAGS) -c strlcpy.c
- 
- y.tab.o: y.tab.c
--	gcc $(CFLAGS) -c y.tab.c
-+	$(CC) $(CFLAGS) -c y.tab.c
- 
- y.tab.c: parse.y
- 	yacc -d parse.y

diff --git a/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch b/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch
deleted file mode 100644
index 14efd964f84..00000000000
--- a/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/Makefile.linux	2011-07-16 16:51:34.000000000 +0300
-+++ a/Makefile.linux	2012-08-05 18:15:30.906378968 +0300
-@@ -6,28 +6,27 @@
- # see milter-regex.init for an init script for RedHat/Fedora
- # (contributed by admin@××××××××.ru)
- 
--CFLAGS=		-g
--LDFLAGS=	-L/usr/lib/libmilter -lmilter -lpthread
-+LIBS=  -lmilter -lpthread
- 
- all: milter-regex milter-regex.cat8
- 
- milter-regex: milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o
--	gcc -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LDFLAGS)
-+	$(CC) $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LIBS)
- 
- milter-regex.o: milter-regex.c eval.h
--	gcc $(CFLAGS) -c milter-regex.c
-+	$(CC) $(CFLAGS) -c milter-regex.c
- 
- eval.o: eval.c eval.h
--	gcc $(CFLAGS) -c eval.c
-+	$(CC) $(CFLAGS) -c eval.c
- 
- strlcat.o: strlcat.c
--	gcc $(CFLAGS) -c strlcat.c
-+	$(CC) $(CFLAGS) -c strlcat.c
- 
- strlcpy.o: strlcpy.c
--	gcc $(CFLAGS) -c strlcpy.c
-+	$(CC) $(CFLAGS) -c strlcpy.c
- 
- y.tab.o: y.tab.c
--	gcc $(CFLAGS) -c y.tab.c
-+	$(CC) $(CFLAGS) -c y.tab.c
- 
- y.tab.c: parse.y
- 	yacc -d parse.y

diff --git a/mail-filter/milter-regex/files/milter-regex-conf b/mail-filter/milter-regex/files/milter-regex-conf
deleted file mode 100644
index 51846a214e4..00000000000
--- a/mail-filter/milter-regex/files/milter-regex-conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# Daemon user
-USER="milter"
-
-# The location of the Unix socket
-SOCKET="/var/run/milter-regex/milter-regex.sock"
-
-# Regular expression rules
-CONFIG="/etc/mail/milter-regex.conf"

diff --git a/mail-filter/milter-regex/files/milter-regex-conf-2.2 b/mail-filter/milter-regex/files/milter-regex-conf-2.2
deleted file mode 100644
index 382a5fe1d97..00000000000
--- a/mail-filter/milter-regex/files/milter-regex-conf-2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-# Config file.
-MR_CONF="/etc/milter-regex.conf"
-
-# Process and socket owner, socket group, socket permissions.
-MR_USER="milter"
-MR_GROUP="milter"
-MR_PERM="0660"
-
-MR_RUNDIR="/run/milter-regex"
-MR_SOCKET="${MR_RUNDIR}/socket"
-
-# Additional options for logging etc.
-MR_OPTS=""

diff --git a/mail-filter/milter-regex/files/milter-regex-init b/mail-filter/milter-regex/files/milter-regex-init
deleted file mode 100644
index 7528e625d2d..00000000000
--- a/mail-filter/milter-regex/files/milter-regex-init
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	use dns logger net
-}
-
-check_cfg() {
-	if [ -z "${USER}" ] ; then
-		eerror "USER is unset"
-		return 1
-	fi
-
-	if [ ! -s "${CONFIG}" ]; then
-		eerror "configuration file ${CONFIG} doesn't seem to be valid"
-		return 1
-	fi
-}
-
-start() {
-	check_cfg || return 1
-
-	# Remove stalled Unix socket if no other process is using it
-	if [ -S "${SOCKET}" ] && ! fuser -s "${SOCKET}"; then
-		rm "${SOCKET}"
-	fi
-	
-	ebegin "Starting milter-regex"
-	start-stop-daemon --start --exec /usr/bin/milter-regex -- \
-		-u "${USER}" -p "${SOCKET}" -c "${CONFIG}"
-	EXIT=$?
-	[ $? == 0 ] && chmod a+rw "${SOCKET}"
-	eend ${EXIT}
-}
-
-stop() {
-	ebegin "Stopping milter-regex"
-	start-stop-daemon --stop --exec /usr/bin/milter-regex
-	eend $?
-}

diff --git a/mail-filter/milter-regex/files/milter-regex-init-2.2 b/mail-filter/milter-regex/files/milter-regex-init-2.2
deleted file mode 100644
index 57c5988babb..00000000000
--- a/mail-filter/milter-regex/files/milter-regex-init-2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-command="/usr/bin/milter-regex"
-command_args="-c ${MR_CONF} -u ${MR_USER} -p unix:${MR_SOCKET} -P ${MR_PERM} -U ${MR_USER} -G ${MR_GROUP} ${MR_OPTS}"
-
-depend() {
-	before postfix sendmail
-}
-
-start_pre() {
-	checkpath --directory --mode 0755 --owner ${MR_USER}:${MR_GROUP} ${MR_RUNDIR}
-}

diff --git a/mail-filter/milter-regex/milter-regex-1.9.ebuild b/mail-filter/milter-regex/milter-regex-1.9.ebuild
deleted file mode 100644
index cca5c424b6c..00000000000
--- a/mail-filter/milter-regex/milter-regex-1.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils user
-
-DESCRIPTION="A milter-based regular expression filter"
-HOMEPAGE="http://www.benzedrine.cx/milter-regex.html"
-SRC_URI="http://www.benzedrine.cx/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" -f Makefile.linux milter-regex
-}
-
-src_install() {
-	dobin milter-regex
-
-	keepdir /var/run/milter-regex
-
-	insinto /etc/mail
-	newins rules milter-regex.conf
-
-	newconfd "${FILESDIR}"/milter-regex-conf milter-regex
-	newinitd "${FILESDIR}"/milter-regex-init milter-regex
-
-	doman *.8
-}
-
-pkg_preinst() {
-	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
-
-	fowners milter:milter /var/run/milter-regex
-}
-
-pkg_postinst() {
-	elog "If you're using Sendmail, you'll need to add this to your sendmail.mc:"
-	elog "  INPUT_MAIL_FILTER(\`milter-regex', \`S=unix:/var/run/milter-regex/milter-regex.sock, T=S:30s;R:2m')"
-	echo
-	elog "If you are using Postfix, you'll need to add this to your main.cf:"
-	elog "  smtpd_milters     = unix:/var/run/milter-regex/milter-regex.sock"
-	elog "  non_smtpd_milters = unix:/var/run/milter-regex/milter-regex.sock"
-}

diff --git a/mail-filter/milter-regex/milter-regex-2.2.ebuild b/mail-filter/milter-regex/milter-regex-2.2.ebuild
deleted file mode 100644
index 5b060fbb4e9..00000000000
--- a/mail-filter/milter-regex/milter-regex-2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs user
-
-DESCRIPTION="A milter-based regular expression filter"
-HOMEPAGE="https://www.benzedrine.ch/milter-regex.html"
-SRC_URI="https://www.benzedrine.ch/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )"
-DEPEND="${RDEPEND}
-	virtual/yacc"
-
-PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
-
-src_compile() {
-	emake CC="$(tc-getCC)" -f Makefile.linux all
-}
-
-src_install() {
-	dobin ${PN}
-
-	insinto /etc
-	newins rules ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}-conf-${PV}" ${PN}
-	newinitd "${FILESDIR}/${PN}-init-${PV}" ${PN}
-
-	doman *.8
-}
-
-pkg_preinst() {
-	# For consistency with mail-milter/spamass-milter (see bug #280571).
-	# While the milter process requires an owner, a home directory is not
-	# necessary because no data is written.
-	enewgroup milter
-	enewuser milter -1 -1 /var/lib/milter milter
-}
-
-pkg_postinst() {
-	elog "Postfix configuration example (add to main.cf or master.cf):"
-	elog "  smtpd_milters=unix:/run/milter-regex/socket"
-	elog "Sendmail configuration example:"
-	elog "  INPUT_MAIL_FILTER(\`${PN}',\`S=unix:/run/milter-regex/socket,T=S:30s;R:2m')"
-}