From ef0a9fa9d811fedff9e83a2a5577a3fcf43cb25d Mon Sep 17 00:00:00 2001 From: "Michael Mair-Keimberger (asterix)" Date: Tue, 13 Dec 2016 21:25:54 +0100 Subject: mail-filter/milter-regex: remove unused patches --- .../files/milter-regex-1.7-gentoo.patch | 52 --------- .../files/milter-regex-1.7-rules.patch | 11 -- .../milter-regex/files/milter-regex-1.7-yacc.patch | 12 -- .../files/milter-regex-1.8-gentoo.patch | 129 --------------------- .../files/milter-regex-1.8-rules.patch | 12 -- 5 files changed, 216 deletions(-) delete mode 100644 mail-filter/milter-regex/files/milter-regex-1.7-gentoo.patch delete mode 100644 mail-filter/milter-regex/files/milter-regex-1.7-rules.patch delete mode 100644 mail-filter/milter-regex/files/milter-regex-1.7-yacc.patch delete mode 100644 mail-filter/milter-regex/files/milter-regex-1.8-gentoo.patch delete mode 100644 mail-filter/milter-regex/files/milter-regex-1.8-rules.patch (limited to 'mail-filter') diff --git a/mail-filter/milter-regex/files/milter-regex-1.7-gentoo.patch b/mail-filter/milter-regex/files/milter-regex-1.7-gentoo.patch deleted file mode 100644 index bd5d926ce218..000000000000 --- a/mail-filter/milter-regex/files/milter-regex-1.7-gentoo.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -Nru milter-regex-1.7.orig/Makefile.linux milter-regex-1.7/Makefile.linux ---- milter-regex-1.7.orig/Makefile.linux 2007-01-11 17:49:52.000000000 +0200 -+++ milter-regex-1.7/Makefile.linux 2008-02-18 10:17:35.000000000 +0200 -@@ -6,13 +6,12 @@ - # see milter-regex.init for an init script for RedHat/Fedora - # (contributed by admin@2ka.mipt.ru) - --CFLAGS= -g --LDFLAGS= -lmilter -lpthread -+LIBS= -lmilter -lpthread - - all: milter-regex milter-regex.cat8 - - milter-regex: milter-regex.o eval.o strlcpy.o y.tab.o -- gcc -o milter-regex milter-regex.o eval.o strlcpy.o y.tab.o $(LDFLAGS) -+ gcc $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcpy.o y.tab.o $(LIBS) - - milter-regex.o: milter-regex.c eval.h - gcc $(CFLAGS) -c milter-regex.c -@@ -27,7 +26,7 @@ - gcc $(CFLAGS) -c y.tab.c - - y.tab.c: parse.y -- yacc -d parse.y -+ yacc -d -y parse.y - - milter-regex.cat8: milter-regex.8 - nroff -Tascii -mandoc milter-regex.8 > milter-regex.cat8 -diff -Nru milter-regex-1.7.orig/parse.y milter-regex-1.7/parse.y ---- milter-regex-1.7.orig/parse.y 2007-01-11 17:49:52.000000000 +0200 -+++ milter-regex-1.7/parse.y 2008-02-18 10:16:02.000000000 +0200 -@@ -71,6 +71,7 @@ - } v; - int lineno; - } YYSTYPE; -+#define YYSTYPE_IS_DECLARED 1 - - %} - -@@ -481,9 +482,9 @@ - *r = rs; - return (0); - } --#ifdef __linux__ -- (void)&yyrcsid; /* warning about yyrcsid declared but unused */ --#endif -+//#ifdef __linux__ -+// (void)&yyrcsid; /* warning about yyrcsid declared but unused */ -+//#endif - } - - static int diff --git a/mail-filter/milter-regex/files/milter-regex-1.7-rules.patch b/mail-filter/milter-regex/files/milter-regex-1.7-rules.patch deleted file mode 100644 index 2e85be4c28b2..000000000000 --- a/mail-filter/milter-regex/files/milter-regex-1.7-rules.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- rules~ 2007-01-11 08:49:52.000000000 -0700 -+++ rules 2008-01-28 11:52:49.629153456 -0700 -@@ -21,7 +21,7 @@ - header /From/ /ebay\.com/i - header /From/ /sabresfc11@aol\.com/i - header /From/ /ictp\.ch/i --header /From/ /(sgi.org.uk/ei -+header /From/ /(sgi.org.uk)/ei - header /From/ /tera-byte/i - header /From/ /google\.com/i - header /Subject/ /item/i diff --git a/mail-filter/milter-regex/files/milter-regex-1.7-yacc.patch b/mail-filter/milter-regex/files/milter-regex-1.7-yacc.patch deleted file mode 100644 index 880f05d1fa7b..000000000000 --- a/mail-filter/milter-regex/files/milter-regex-1.7-yacc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru milter-regex-1.7.orig/Makefile.linux milter-regex-1.7/Makefile.linux ---- milter-regex-1.7.orig/Makefile.linux 2008-12-11 20:54:05.000000000 +0000 -+++ milter-regex-1.7/Makefile.linux 2008-12-11 20:54:22.000000000 +0000 -@@ -26,7 +26,7 @@ - gcc $(CFLAGS) -c y.tab.c - - y.tab.c: parse.y -- yacc -d -y parse.y -+ yacc -d parse.y - - milter-regex.cat8: milter-regex.8 - nroff -Tascii -mandoc milter-regex.8 > milter-regex.cat8 diff --git a/mail-filter/milter-regex/files/milter-regex-1.8-gentoo.patch b/mail-filter/milter-regex/files/milter-regex-1.8-gentoo.patch deleted file mode 100644 index 27caafb654c3..000000000000 --- a/mail-filter/milter-regex/files/milter-regex-1.8-gentoo.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -Nru milter-regex-1.8.orig/Makefile.linux milter-regex-1.8/Makefile.linux ---- milter-regex-1.8.orig/Makefile.linux 2007-01-11 16:49:52.000000000 +0100 -+++ milter-regex-1.8/Makefile.linux 2010-09-24 22:33:19.000000000 +0200 -@@ -6,13 +6,12 @@ - # see milter-regex.init for an init script for RedHat/Fedora - # (contributed by admin@2ka.mipt.ru) - --CFLAGS= -g --LDFLAGS= -lmilter -lpthread -+LIBS= -lmilter -lpthread - - all: milter-regex milter-regex.cat8 - --milter-regex: milter-regex.o eval.o strlcpy.o y.tab.o -- gcc -o milter-regex milter-regex.o eval.o strlcpy.o y.tab.o $(LDFLAGS) -+milter-regex: milter-regex.o eval.o strlcpy.o strlcat.o y.tab.o -+ gcc $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcpy.o strlcat.o y.tab.o $(LIBS) - - milter-regex.o: milter-regex.c eval.h - gcc $(CFLAGS) -c milter-regex.c -@@ -22,7 +21,10 @@ - - strlcpy.o: strlcpy.c - gcc $(CFLAGS) -c strlcpy.c -- -+ -+strlcat.o: strlcat.c -+ gcc $(CFLAGS) -c strlcat.c -+ - y.tab.o: y.tab.c - gcc $(CFLAGS) -c y.tab.c - -diff -Nru milter-regex-1.8.orig/parse.y milter-regex-1.8/parse.y ---- milter-regex-1.8.orig/parse.y 2007-01-11 16:49:52.000000000 +0100 -+++ milter-regex-1.8/parse.y 2010-09-24 22:33:19.000000000 +0200 -@@ -71,6 +71,7 @@ - } v; - int lineno; - } YYSTYPE; -+#define YYSTYPE_IS_DECLARED 1 - - %} - -@@ -481,9 +482,9 @@ - *r = rs; - return (0); - } --#ifdef __linux__ -- (void)&yyrcsid; /* warning about yyrcsid declared but unused */ --#endif -+//#ifdef __linux__ -+// (void)&yyrcsid; /* warning about yyrcsid declared but unused */ -+//#endif - } - - static int -diff -Nru milter-regex-1.8.orig/strlcat.c milter-regex-1.8/strlcat.c ---- milter-regex-1.8.orig/strlcat.c 1970-01-01 01:00:00.000000000 +0100 -+++ milter-regex-1.8/strlcat.c 2010-09-24 22:34:31.000000000 +0200 -@@ -0,0 +1,69 @@ -+/* $OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $ */ -+ -+/*- -+ * Copyright (c) 1998 Todd C. Miller -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 3. The name of the author may not be used to endorse or promote products -+ * derived from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, -+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY -+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL -+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include -+#include -+ -+/* -+ * Appends src to string dst of size siz (unlike strncat, siz is the -+ * full size of dst, not space left). At most siz-1 characters -+ * will be copied. Always NUL terminates (unless siz <= strlen(dst)). -+ * Returns strlen(src) + MIN(siz, strlen(initial dst)). -+ * If retval >= siz, truncation occurred. -+ */ -+size_t -+strlcat(dst, src, siz) -+ char *dst; -+ const char *src; -+ size_t siz; -+{ -+ char *d = dst; -+ const char *s = src; -+ size_t n = siz; -+ size_t dlen; -+ -+ /* Find the end of dst and adjust bytes left but don't go past end */ -+ while (n-- != 0 && *d != '\0') -+ d++; -+ dlen = d - dst; -+ n = siz - dlen; -+ -+ if (n == 0) -+ return(dlen + strlen(s)); -+ while (*s != '\0') { -+ if (n != 1) { -+ *d++ = *s; -+ n--; -+ } -+ s++; -+ } -+ *d = '\0'; -+ -+ return(dlen + (s - src)); /* count does not include NUL */ -+} diff --git a/mail-filter/milter-regex/files/milter-regex-1.8-rules.patch b/mail-filter/milter-regex/files/milter-regex-1.8-rules.patch deleted file mode 100644 index 7103e7e6c59e..000000000000 --- a/mail-filter/milter-regex/files/milter-regex-1.8-rules.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru milter-regex-1.8.orig/rules milter-regex-1.8/rules ---- milter-regex-1.8.orig/rules 2007-01-11 16:49:52.000000000 +0100 -+++ milter-regex-1.8/rules 2010-09-24 22:11:46.000000000 +0200 -@@ -21,7 +21,7 @@ - header /From/ /ebay\.com/i - header /From/ /sabresfc11@aol\.com/i - header /From/ /ictp\.ch/i --header /From/ /(sgi.org.uk/ei -+header /From/ /(sgi.org.uk)/ei - header /From/ /tera-byte/i - header /From/ /google\.com/i - header /Subject/ /item/i -- cgit v1.2.3-65-gdbad