[gentoo-commits] repo/gentoo:master commit in: mail-filter/milter-regex/files/, mail-filter/milter-regex/
commit: f9aab8b4ee08a412aeb0e0cd33c8fd35ef1b6e65 Author: Ralph Seichter seichter de> AuthorDate: Fri Jul 26 15:02:05 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Jul 30 17:48:46 2019 + 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 seichter.de> Closes: https://github.com/gentoo/gentoo/pull/12549 Signed-off-by: Joonas Niilola 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..000 --- 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.0 +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 ad...@2ka.mipt.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..000 --- 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.0 +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 ad...@2ka.mipt.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
[gentoo-commits] repo/gentoo:master commit in: mail-filter/milter-regex/files/, mail-filter/milter-regex/
commit: a199b66a6767c285587d9a22e06a42078e8a5684
Author: Ralph Seichter seichter de>
AuthorDate: Fri Sep 28 16:04:54 2018 +
Commit: Craig Andrews gentoo org>
CommitDate: Thu Nov 8 17:17:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a199b66a
mail-filter/milter-regex: Replacement for outdated ebuild
This is a replacement for the milter-regex 1.9 ebuild. Version
1.9 was released seven years ago, and the old ebuild was based
on EAPI 4. The new ebuild for milter-regex 2.2 (released a few
days ago) uses EAPI 7.
Bug: https://bugs.gentoo.org/666758
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Signed-off-by: Ralph Seichter seichter.de>
Signed-off-by: Craig Andrews gentoo.org>
mail-filter/milter-regex/Manifest | 1 +
.../files/milter-regex-2.2-gentoo.patch| 38
.../milter-regex/files/milter-regex-conf-2.2 | 13 ++
.../milter-regex/files/milter-regex-init-2.2 | 14 ++
mail-filter/milter-regex/metadata.xml | 26 ---
mail-filter/milter-regex/milter-regex-2.2.ebuild | 51 ++
6 files changed, 137 insertions(+), 6 deletions(-)
diff --git a/mail-filter/milter-regex/Manifest
b/mail-filter/milter-regex/Manifest
index bd47890fe48..688c2efe87e 100644
--- a/mail-filter/milter-regex/Manifest
+++ b/mail-filter/milter-regex/Manifest
@@ -1 +1,2 @@
DIST milter-regex-1.9.tar.gz 19880 BLAKE2B
8934eb4f78f168b6f4f93b3a7e70b896c6518cd1228ea8fe387184a718a002f051f5084a7a7f4d07c9e7832fe1c9e9bc907661c4e765dde938b7c6049c8772e6
SHA512
55cb97eba01220eb57c29498a090152c05d259abbe6f771e47a67499e7c2a1d4121ec9d0bce84cc8b6490bcd20dea8eaaba753e61f1ce9002edd8440b13f7148
+DIST milter-regex-2.2.tar.gz 20496 BLAKE2B
75cd668e8f75a62bb16d1e38d089465e1e9b49a7441594cb8f77279c9e29f1b90c7b452595f8653b81167fbed8f10e8322ccec51374446938ca43b245cbfa440
SHA512
c2f94d1d9897e2a3f62639343ff9272d28c044f25c59e10f12f37250aa0e5426174cb2a74850993246628e828d21f5cba8567de65a225235eac1969836e41f28
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
new file mode 100644
index 000..14efd964f84
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-2.2-gentoo.patch
@@ -0,0 +1,38 @@
+--- a/Makefile.linux 2011-07-16 16:51:34.0 +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 ad...@2ka.mipt.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-2.2
b/mail-filter/milter-regex/files/milter-regex-conf-2.2
new file mode 100644
index 000..382a5fe1d97
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-conf-2.2
@@ -0,0 +1,13 @@
+# 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-2.2
b/mail-filter/milter-regex/files/milter-regex-init-2.2
new file mode 100644
index 000..57c5988babb
--- /dev/null
+++ b/mail-filter/milter-regex/files/milter-regex-init-2.2
@@ -0,0 +1,14 @@
+#!/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/metadata.xml
b/mail-filter/milter-regex/metadata.xml
index 400a0fa1ec9..e6990e63034 100644
--- a/mail-filter/milter-regex/metadata.xml
+++ b/mail-filter/milter-regex/met
