Thu Aug 15 15:43:48 2013 UTC ()
Rename and comment pkgsrc patches. No functional change.


(schmonz)
diff -r1.22 -r1.23 pkgsrc/mail/qmail/distinfo
diff -r0 -r1.1 pkgsrc/mail/qmail/patches/patch-Makefile
diff -r0 -r1.1 pkgsrc/mail/qmail/patches/patch-strerr_sys.c
diff -r1.4 -r0 pkgsrc/mail/qmail/patches/patch-aa
diff -r1.4 -r0 pkgsrc/mail/qmail/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/mail/qmail/patches/patch-hier.c
diff -r1.1 -r1.2 pkgsrc/mail/qmail/patches/patch-spawn.c

cvs diff -r1.22 -r1.23 pkgsrc/mail/qmail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/qmail/distinfo 2012/05/20 08:48:56 1.22
+++ pkgsrc/mail/qmail/distinfo 2013/08/15 15:43:48 1.23
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: distinfo,v 1.22 2012/05/20 08:48:56 marino Exp $ 1$NetBSD: distinfo,v 1.23 2013/08/15 15:43:48 schmonz Exp $
2 2
3SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a 3SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a
4RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f 4RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f
5Size (qmail-1.03.tar.gz) = 220668 bytes 5Size (qmail-1.03.tar.gz) = 220668 bytes
6SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b 6SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b
7RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2 7RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2
8Size (netqmail-1.06.tar.gz) = 260941 bytes 8Size (netqmail-1.06.tar.gz) = 260941 bytes
9SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f 9SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f
10RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509 10RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509
11Size (badrcptto.patch) = 3033 bytes 11Size (badrcptto.patch) = 3033 bytes
12SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f 12SHA1 (qmail-103.patch) = dfb9cdabe91449dad2117115177b0a6a356baa9f
13RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c 13RMD160 (qmail-103.patch) = 437f8b3063438bbd82c59557333b3566214afa9c
14Size (qmail-103.patch) = 2104 bytes 14Size (qmail-103.patch) = 2104 bytes
15SHA1 (outgoingip.patch) = c37b50facc72f82cad6505d2db88d5eccc5418b2 15SHA1 (outgoingip.patch) = c37b50facc72f82cad6505d2db88d5eccc5418b2
16RMD160 (outgoingip.patch) = 032c653d395e5f599c0998e92debb09d84f90f0f 16RMD160 (outgoingip.patch) = 032c653d395e5f599c0998e92debb09d84f90f0f
17Size (outgoingip.patch) = 6839 bytes 17Size (outgoingip.patch) = 6839 bytes
18SHA1 (qregex-20060423.patch) = fe52992254e5d464ce0fa0b68cf15ee744266b83 18SHA1 (qregex-20060423.patch) = fe52992254e5d464ce0fa0b68cf15ee744266b83
19RMD160 (qregex-20060423.patch) = f28245fee8bcc38e84816fe379be886376740a0c 19RMD160 (qregex-20060423.patch) = f28245fee8bcc38e84816fe379be886376740a0c
20Size (qregex-20060423.patch) = 26745 bytes 20Size (qregex-20060423.patch) = 26745 bytes
21SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2 21SHA1 (qmail-1.03-realrcptto-2006.12.10.patch) = 89e06519df0f52f748afec583e3e2ce33fe5dfb2
22RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56 22RMD160 (qmail-1.03-realrcptto-2006.12.10.patch) = 0f6ad12dd24accab324097350a90f7717747eb56
23Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes 23Size (qmail-1.03-realrcptto-2006.12.10.patch) = 17718 bytes
24SHA1 (netqmail-1.05-tls-smtpauth-20070321.patch) = cab82b1edde2ea342275eb67354431d0b78f06a9 24SHA1 (netqmail-1.05-tls-smtpauth-20070417.patch) = d24cb13cf1371044fc2dfe20471478f59b5524e5
25RMD160 (netqmail-1.05-tls-smtpauth-20070321.patch) = 7ec6ee04046217c1c2158df36ca6bd4d82b6eab7 25RMD160 (netqmail-1.05-tls-smtpauth-20070417.patch) = 81a00e06fa67a4073b1a5bf5195fbbac675cd46b
26Size (netqmail-1.05-tls-smtpauth-20070321.patch) = 67641 bytes 26Size (netqmail-1.05-tls-smtpauth-20070417.patch) = 67942 bytes
27SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9 27SHA1 (qmail-smtpd-viruscan-1.3.patch) = 3a8f4e38df1c3f483f72b1a24ebc36664d075dd9
28RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54 28RMD160 (qmail-smtpd-viruscan-1.3.patch) = ad6c5ef7894177fd5a7f131765eff22d092ecf54
29Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes 29Size (qmail-smtpd-viruscan-1.3.patch) = 8891 bytes
30SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c 30SHA1 (qmail-smtpd-viruscan-logging.patch) = ca7105b5561cf280e9e3a465d2d68a16673ff56c
31RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4 31RMD160 (qmail-smtpd-viruscan-logging.patch) = 79631cb7b5b120f98397011c4fb94726c48b83e4
32Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes 32Size (qmail-smtpd-viruscan-logging.patch) = 2157 bytes
33SHA1 (patch-aa) = 2c8c50889cbc7da8c51bf6d44c0b31f5f0853896 33SHA1 (patch-Makefile) = 2c8c50889cbc7da8c51bf6d44c0b31f5f0853896
34SHA1 (patch-ab) = 15e6466c655058664cb660e5e12232bf45010814 34SHA1 (patch-hier.c) = cc6c7a4369cd8503a872667c4aa388d8e013e445
35SHA1 (patch-hier.c) = 3c3b6c9404ea2a852b89481dc67bf4ae4d869570 35SHA1 (patch-spawn.c) = aad06c4ed3ad4bd0e500ab561d7f7307c19e3283
36SHA1 (patch-spawn.c) = 8459ddb4aac3ee7c9f5324fd110e744f06f6b5fb 36SHA1 (patch-strerr_sys.c) = 15e6466c655058664cb660e5e12232bf45010814

File Added: pkgsrc/mail/qmail/patches/Attic/patch-Makefile
$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: \

File Added: pkgsrc/mail/qmail/patches/Attic/patch-strerr_sys.c
$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()
 {

File Deleted: pkgsrc/mail/qmail/patches/Attic/patch-aa

File Deleted: pkgsrc/mail/qmail/patches/Attic/patch-ab

cvs diff -r1.2 -r1.3 pkgsrc/mail/qmail/patches/Attic/patch-hier.c (expand / switch to unified diff)

--- pkgsrc/mail/qmail/patches/Attic/patch-hier.c 2012/03/12 03:53:55 1.2
+++ pkgsrc/mail/qmail/patches/Attic/patch-hier.c 2013/08/15 15:43:48 1.3
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-hier.c,v 1.2 2012/03/12 03:53:55 sbd Exp $ 1$NetBSD: patch-hier.c,v 1.3 2013/08/15 15:43:48 schmonz Exp $
 2
 3Don't install a manpage also installed by ucspi-tcp, or any catpages.
2 4
3--- hier.c.orig 1998-06-15 10:53:16.000000000 +0000 5--- hier.c.orig 1998-06-15 10:53:16.000000000 +0000
4+++ hier.c 6+++ hier.c
5@@ -37,10 +37,6 @@ void hier() 7@@ -37,10 +37,6 @@ void hier()
6 d(auto_qmail,"boot",auto_uido,auto_gidq,0755); 8 d(auto_qmail,"boot",auto_uido,auto_gidq,0755);
7 d(auto_qmail,"doc",auto_uido,auto_gidq,0755); 9 d(auto_qmail,"doc",auto_uido,auto_gidq,0755);
8 d(auto_qmail,"man",auto_uido,auto_gidq,0755); 10 d(auto_qmail,"man",auto_uido,auto_gidq,0755);
9- d(auto_qmail,"man/cat1",auto_uido,auto_gidq,0755); 11- d(auto_qmail,"man/cat1",auto_uido,auto_gidq,0755);
10- d(auto_qmail,"man/cat5",auto_uido,auto_gidq,0755); 12- d(auto_qmail,"man/cat5",auto_uido,auto_gidq,0755);
11- d(auto_qmail,"man/cat7",auto_uido,auto_gidq,0755); 13- d(auto_qmail,"man/cat7",auto_uido,auto_gidq,0755);
12- d(auto_qmail,"man/cat8",auto_uido,auto_gidq,0755); 14- d(auto_qmail,"man/cat8",auto_uido,auto_gidq,0755);
13 d(auto_qmail,"man/man1",auto_uido,auto_gidq,0755); 15 d(auto_qmail,"man/man1",auto_uido,auto_gidq,0755);
14 d(auto_qmail,"man/man5",auto_uido,auto_gidq,0755); 16 d(auto_qmail,"man/man5",auto_uido,auto_gidq,0755);

cvs diff -r1.1 -r1.2 pkgsrc/mail/qmail/patches/Attic/patch-spawn.c (expand / switch to unified diff)

--- pkgsrc/mail/qmail/patches/Attic/patch-spawn.c 2012/05/20 08:48:56 1.1
+++ pkgsrc/mail/qmail/patches/Attic/patch-spawn.c 2013/08/15 15:43:48 1.2
@@ -1,11 +1,13 @@ @@ -1,11 +1,13 @@
1$NetBSD: patch-spawn.c,v 1.1 2012/05/20 08:48:56 marino Exp $ 1$NetBSD: patch-spawn.c,v 1.2 2013/08/15 15:43:48 schmonz Exp $
 2
 3Fix qmail-*spawn segfaults on DragonFly (pkg/46333).
2 4
3--- spawn.c.orig 2012-04-14 13:35:08.381341000 +0000 5--- spawn.c.orig 2012-04-14 13:35:08.381341000 +0000
4+++ spawn.c 6+++ spawn.c
5@@ -1,5 +1,6 @@ 7@@ -1,5 +1,6 @@
6 #include <sys/types.h> 8 #include <sys/types.h>
7 #include <sys/stat.h> 9 #include <sys/stat.h>
8+#include "alloc.h" 10+#include "alloc.h"
9 #include "sig.h" 11 #include "sig.h"
10 #include "wait.h" 12 #include "wait.h"
11 #include "substdio.h" 13 #include "substdio.h"