From 70fd68b8d733aa6dbd44fb84ff3e54c929395c75 Mon Sep 17 00:00:00 2001 From: schmonz Date: Thu, 15 Aug 2013 15:43:48 +0000 Subject: Rename and comment pkgsrc patches. No functional change. --- mail/qmail/distinfo | 16 +++++------ mail/qmail/patches/patch-Makefile | 53 +++++++++++++++++++++++++++++++++++ mail/qmail/patches/patch-aa | 53 ----------------------------------- mail/qmail/patches/patch-ab | 15 ---------- mail/qmail/patches/patch-hier.c | 4 ++- mail/qmail/patches/patch-spawn.c | 4 ++- mail/qmail/patches/patch-strerr_sys.c | 15 ++++++++++ 7 files changed, 82 insertions(+), 78 deletions(-) create mode 100644 mail/qmail/patches/patch-Makefile delete mode 100644 mail/qmail/patches/patch-aa delete mode 100644 mail/qmail/patches/patch-ab create mode 100644 mail/qmail/patches/patch-strerr_sys.c (limited to 'mail/qmail') diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo index b1ba3981ebd..cf80e170e2e 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2012/05/20 08:48:56 marino Exp $ +$NetBSD: distinfo,v 1.23 2013/08/15 15:43:48 schmonz Exp $ SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f @@ -21,16 +21,16 @@ Size (qregex-20060423.patch) = 26745 bytes SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2 RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56 Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes -SHA1 (netqmail-1.05-tls-smtpauth-20070321.patch) = cab82b1edde2ea342275eb67354431d0b78f06a9 -RMD160 (netqmail-1.05-tls-smtpauth-20070321.patch) = 7ec6ee04046217c1c2158df36ca6bd4d82b6eab7 -Size (netqmail-1.05-tls-smtpauth-20070321.patch) = 67641 bytes +SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5 +RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b +Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9 RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54 Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4 Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes -SHA1 (patch-aa) = 2c8c50889cbc7da8c51bf6d44c0b31f5f0853896 -SHA1 (patch-ab) = 15e6466c655058664cb660e5e12232bf45010814 -SHA1 (patch-hier.c) = 3c3b6c9404ea2a852b89481dc67bf4ae4d869570 -SHA1 (patch-spawn.c) = 8459ddb4aac3ee7c9f5324fd110e744f06f6b5fb +SHA1 (patch-Makefile) = 2c8c50889cbc7da8c51bf6d44c0b31f5f0853896 +SHA1 (patch-hier.c) = cc6c7a4369cd8503a872667c4aa388d8e013e445 +SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283 +SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814 diff --git a/mail/qmail/patches/patch-Makefile b/mail/qmail/patches/patch-Makefile new file mode 100644 index 00000000000..7b83da9c127 --- /dev/null +++ b/mail/qmail/patches/patch-Makefile @@ -0,0 +1,53 @@ +$NetBSD: patch-Makefile,v 1.1 2013/08/15 15:43:48 schmonz Exp $ + +DESTDIR support. + +--- Makefile.orig 1998-06-15 10:53:16.000000000 +0000 ++++ Makefile +@@ -78,6 +78,14 @@ auto_break.o: \ + compile auto_break.c + ./compile auto_break.c + ++auto_destdir.c: \ ++auto-str conf-destdir ++ ./auto-str auto_qmail `head -1 conf-destdir` > auto_destdir.c ++ ++auto_destdir.o: \ ++compile auto_destdir.c ++ ./compile auto_destdir.c ++ + auto_patrn.c: \ + auto-int8 conf-patrn + ./auto-int8 auto_patrn `head -1 conf-patrn` > auto_patrn.c +@@ -740,15 +748,15 @@ seek.h fork.h + ./compile idedit.c + + install: \ +-load install.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \ ++load install.o fifo.o hier.o auto_destdir.o auto_split.o auto_uids.o \ + strerr.a substdio.a open.a error.a str.a fs.a +- ./load install fifo.o hier.o auto_qmail.o auto_split.o \ ++ ./load install fifo.o hier.o auto_destdir.o auto_split.o \ + auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a + + install-big: \ +-load install-big.o fifo.o install.o auto_qmail.o auto_split.o \ ++load install-big.o fifo.o install.o auto_destdir.o auto_split.o \ + auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a +- ./load install-big fifo.o install.o auto_qmail.o \ ++ ./load install-big fifo.o install.o auto_destdir.o \ + auto_split.o auto_uids.o strerr.a substdio.a open.a error.a \ + str.a fs.a + +@@ -763,9 +771,9 @@ exit.h + ./compile install.c + + instcheck: \ +-load instcheck.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \ ++load instcheck.o fifo.o hier.o auto_destdir.o auto_split.o auto_uids.o \ + strerr.a substdio.a error.a str.a fs.a +- ./load instcheck fifo.o hier.o auto_qmail.o auto_split.o \ ++ ./load instcheck fifo.o hier.o auto_destdir.o auto_split.o \ + auto_uids.o strerr.a substdio.a error.a str.a fs.a + + instcheck.o: \ diff --git a/mail/qmail/patches/patch-aa b/mail/qmail/patches/patch-aa deleted file mode 100644 index e7eedd444c3..00000000000 --- a/mail/qmail/patches/patch-aa +++ /dev/null @@ -1,53 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2011/06/07 02:53:42 schmonz Exp $ - -DESTDIR support. - ---- Makefile.orig 1998-06-15 10:53:16.000000000 +0000 -+++ Makefile -@@ -78,6 +78,14 @@ auto_break.o: \ - compile auto_break.c - ./compile auto_break.c - -+auto_destdir.c: \ -+auto-str conf-destdir -+ ./auto-str auto_qmail `head -1 conf-destdir` > auto_destdir.c -+ -+auto_destdir.o: \ -+compile auto_destdir.c -+ ./compile auto_destdir.c -+ - auto_patrn.c: \ - auto-int8 conf-patrn - ./auto-int8 auto_patrn `head -1 conf-patrn` > auto_patrn.c -@@ -740,15 +748,15 @@ seek.h fork.h - ./compile idedit.c - - install: \ --load install.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \ -+load install.o fifo.o hier.o auto_destdir.o auto_split.o auto_uids.o \ - strerr.a substdio.a open.a error.a str.a fs.a -- ./load install fifo.o hier.o auto_qmail.o auto_split.o \ -+ ./load install fifo.o hier.o auto_destdir.o auto_split.o \ - auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a - - install-big: \ --load install-big.o fifo.o install.o auto_qmail.o auto_split.o \ -+load install-big.o fifo.o install.o auto_destdir.o auto_split.o \ - auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a -- ./load install-big fifo.o install.o auto_qmail.o \ -+ ./load install-big fifo.o install.o auto_destdir.o \ - auto_split.o auto_uids.o strerr.a substdio.a open.a error.a \ - str.a fs.a - -@@ -763,9 +771,9 @@ exit.h - ./compile install.c - - instcheck: \ --load instcheck.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \ -+load instcheck.o fifo.o hier.o auto_destdir.o auto_split.o auto_uids.o \ - strerr.a substdio.a error.a str.a fs.a -- ./load instcheck fifo.o hier.o auto_qmail.o auto_split.o \ -+ ./load instcheck fifo.o hier.o auto_destdir.o auto_split.o \ - auto_uids.o strerr.a substdio.a error.a str.a fs.a - - instcheck.o: \ diff --git a/mail/qmail/patches/patch-ab b/mail/qmail/patches/patch-ab deleted file mode 100644 index 28a63568bca..00000000000 --- a/mail/qmail/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2011/06/07 02:53:42 schmonz Exp $ - -Compile on Darwin. - ---- strerr_sys.c.orig 1998-06-15 10:53:16.000000000 +0000 -+++ strerr_sys.c -@@ -1,7 +1,7 @@ - #include "error.h" - #include "strerr.h" - --struct strerr strerr_sys; -+struct strerr strerr_sys = {0,0,0,0}; - - void strerr_sysinit() - { diff --git a/mail/qmail/patches/patch-hier.c b/mail/qmail/patches/patch-hier.c index 96238672901..29a1f236978 100644 --- a/mail/qmail/patches/patch-hier.c +++ b/mail/qmail/patches/patch-hier.c @@ -1,4 +1,6 @@ -$NetBSD: patch-hier.c,v 1.2 2012/03/12 03:53:55 sbd Exp $ +$NetBSD: patch-hier.c,v 1.3 2013/08/15 15:43:48 schmonz Exp $ + +Don't install a manpage also installed by ucspi-tcp, or any catpages. --- hier.c.orig 1998-06-15 10:53:16.000000000 +0000 +++ hier.c diff --git a/mail/qmail/patches/patch-spawn.c b/mail/qmail/patches/patch-spawn.c index 3ca5d25326c..41d1afc6e23 100644 --- a/mail/qmail/patches/patch-spawn.c +++ b/mail/qmail/patches/patch-spawn.c @@ -1,4 +1,6 @@ -$NetBSD: patch-spawn.c,v 1.1 2012/05/20 08:48:56 marino Exp $ +$NetBSD: patch-spawn.c,v 1.2 2013/08/15 15:43:48 schmonz Exp $ + +Fix qmail-*spawn segfaults on DragonFly (pkg/46333). --- spawn.c.orig 2012-04-14 13:35:08.381341000 +0000 +++ spawn.c diff --git a/mail/qmail/patches/patch-strerr_sys.c b/mail/qmail/patches/patch-strerr_sys.c new file mode 100644 index 00000000000..bb66403f95b --- /dev/null +++ b/mail/qmail/patches/patch-strerr_sys.c @@ -0,0 +1,15 @@ +$NetBSD: patch-strerr_sys.c,v 1.1 2013/08/15 15:43:48 schmonz Exp $ + +Compile on Darwin. + +--- strerr_sys.c.orig 1998-06-15 10:53:16.000000000 +0000 ++++ strerr_sys.c +@@ -1,7 +1,7 @@ + #include "error.h" + #include "strerr.h" + +-struct strerr strerr_sys; ++struct strerr strerr_sys = {0,0,0,0}; + + void strerr_sysinit() + { -- cgit v1.2.3