summaryrefslogtreecommitdiff
path: root/mail/deliver
diff options
context:
space:
mode:
authorwiz <wiz>2004-05-28 01:09:01 +0000
committerwiz <wiz>2004-05-28 01:09:01 +0000
commitd3756f9330af6fae65c49f684f5c9d9dc023484d (patch)
treeceadd96df58198751b499ae2711f86ef95a452ae /mail/deliver
parent07989af54669621347fdaf119479f7bb70be905a (diff)
downloadpkgsrc-d3756f9330af6fae65c49f684f5c9d9dc023484d.tar.gz
Add patches from Jim Bernard to make this build on -current and fix
a problem with basename(); bump PKGREVISION. Closes PR 20978 and PR 25733 by Jim Bernard.
Diffstat (limited to 'mail/deliver')
-rw-r--r--mail/deliver/Makefile5
-rw-r--r--mail/deliver/distinfo8
-rw-r--r--mail/deliver/patches/patch-af18
-rw-r--r--mail/deliver/patches/patch-ai13
-rw-r--r--mail/deliver/patches/patch-aj92
-rw-r--r--mail/deliver/patches/patch-ak13
-rw-r--r--mail/deliver/patches/patch-al26
7 files changed, 165 insertions, 10 deletions
diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile
index 4de4ae9e830..1a296e5e0b1 100644
--- a/mail/deliver/Makefile
+++ b/mail/deliver/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:45:51 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/28 01:09:01 wiz Exp $
DISTNAME= deliver-2.1.14
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=deliver/}
@@ -33,7 +34,7 @@ post-install:
cd ${WRKSRC}; \
for FILE in deliver.1 header.1; do \
CATFILE=`${BASENAME} $${FILE} .1`.0; \
- ${NROFF} -man $${FILE} > $${CATFILE}; \
+ nroff -man $${FILE} > $${CATFILE}; \
${INSTALL_MAN} $${FILE} ${PREFIX}/man/man1; \
${INSTALL_MAN} $${CATFILE} ${PREFIX}/man/cat1; \
done
diff --git a/mail/deliver/distinfo b/mail/deliver/distinfo
index a544a28733d..f6214274193 100644
--- a/mail/deliver/distinfo
+++ b/mail/deliver/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2003/07/02 11:32:36 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2004/05/28 01:09:01 wiz Exp $
SHA1 (deliver-2.1.14.tar.gz) = 77d591f29b8829b3c347eb107a427ad826ffca99
Size (deliver-2.1.14.tar.gz) = 80892 bytes
@@ -7,6 +7,10 @@ SHA1 (patch-ab) = 719d400005844fe824bab7106c97f66e4c8867b3
SHA1 (patch-ac) = 2f47891e3bc46aec12c93a647fbd751397b7d9fe
SHA1 (patch-ad) = 0404e117fda6f03ddc99c819353925c8714fced2
SHA1 (patch-ae) = a4e478765a240a2099c101ddd2d6abf3ddcf0ba2
-SHA1 (patch-af) = e232661038a8b33d7abdf8aead754a38143011f4
+SHA1 (patch-af) = bc14f87956fde8f08146c79b9435cb753d5f5a2a
SHA1 (patch-ag) = 1ea8ca73ce2f930444cdcb3a09f49a11926bf3da
SHA1 (patch-ah) = 380e17b0e1dc659013be50e75ea0141b94081681
+SHA1 (patch-ai) = 63e86f1dc5353bfa8519746b48e743614ce6ca46
+SHA1 (patch-aj) = 7ccbe4c2420d097608eec6dccf75fcbc7a47247e
+SHA1 (patch-ak) = d99847ed1cf65c244440fc7b6cb9a3cc4315f832
+SHA1 (patch-al) = 5263f4369110e693cfd603cb7e00fa8333589c2b
diff --git a/mail/deliver/patches/patch-af b/mail/deliver/patches/patch-af
index aab0535623e..f6654334d77 100644
--- a/mail/deliver/patches/patch-af
+++ b/mail/deliver/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2003/07/02 11:32:36 jmmv Exp $
+$NetBSD: patch-af,v 1.3 2004/05/28 01:09:01 wiz Exp $
---- /dev/null Sat Jan 29 20:16:40 2000
-+++ conf/os-netbsd.h Sat Jan 29 20:47:21 2000
-@@ -0,0 +1,27 @@
+--- /dev/null 2003-03-15 16:33:11.000000000 -0700
++++ conf/os-netbsd.h
+@@ -0,0 +1,33 @@
+/*
+ * Deliver configuration for NetBSD.
+ *
@@ -15,7 +15,7 @@ $NetBSD: patch-af,v 1.2 2003/07/02 11:32:36 jmmv Exp $
+/* Then again... */
+
+#undef SAFEPATH
-+#define SAFEPATH "/bin:/usr/bin:@PREFIX@/bin" /* Safe dirs for PATH */
++#define SAFEPATH "/bin:/usr/bin:@PREFIX@/bin" /* Safe dirs for PATH */
+
+#undef SYSV_USRMAIL /* Mailboxes in /usr/mail, as per SysV */
+#define MBX_DIR "/var/mail"
@@ -23,7 +23,13 @@ $NetBSD: patch-af,v 1.2 2003/07/02 11:32:36 jmmv Exp $
+#undef HAS_TIMEZONE /* Has global variable timezone (SVID) */
+#define HAS_MKTIME /* Has mktime() */
+
-+#define HAS_BASENAME /* Has basename() */
++/* We avoid defining HAS_BASENAME because NetBSD's basename(3), as of
++ * revision 1.5 of basename.c (October 17, 2002), returns a pointer to
++ * a copy of the base name in static storage, and uses of basename in
++ * the code are incompatible with that behavior. So we rely instead on
++ * the basename replacement included here.
++ */
++#undef HAS_BASENAME /* Has basename() */
+#define HAS_LONGNAMES /* Long filenames (>14) supported */
+
+/* Note that we don't define HAS_USLEEP, since deliver wants to use it
diff --git a/mail/deliver/patches/patch-ai b/mail/deliver/patches/patch-ai
new file mode 100644
index 00000000000..25347c93f44
--- /dev/null
+++ b/mail/deliver/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2004/05/28 01:09:01 wiz Exp $
+
+--- deliver.h.orig 1999-12-01 19:16:21.000000000 -0700
++++ deliver.h 2004-05-27 10:47:11.000000000 -0600
+@@ -97,7 +97,7 @@
+ extern char *eff_group; /* Name of effective gid */
+ extern char *real_group; /* Name of real gid */
+
+-extern FILE *log; /* File to log deliveries */
++extern FILE *logfile; /* File to log deliveries */
+ extern char *t_logfile; /* Temporary file for log */
+ extern char *f_logfile; /* Final file for log */
+
diff --git a/mail/deliver/patches/patch-aj b/mail/deliver/patches/patch-aj
new file mode 100644
index 00000000000..dc3274a455c
--- /dev/null
+++ b/mail/deliver/patches/patch-aj
@@ -0,0 +1,92 @@
+$NetBSD: patch-aj,v 1.1 2004/05/28 01:09:01 wiz Exp $
+
+--- log.c.orig 1999-12-01 19:16:21.000000000 -0700
++++ log.c 2004-05-27 10:54:45.000000000 -0600
+@@ -58,7 +58,7 @@
+ if (!dryrun && exists(f_logfile))
+ {
+ t_logfile = tempfile();
+- if ((log = ftcreate(t_logfile)) == NULL)
++ if ((logfile = ftcreate(t_logfile)) == NULL)
+ syserr("can't create %s", t_logfile);
+ }
+ #endif
+@@ -85,17 +85,17 @@
+ void
+ savelogs()
+ {
+- if (!log && !errlog)
++ if (!logfile && !errlog)
+ return;
+
+ /* If temporary logs contain anything, append them to real logs. */
+
+- if (logsize(log) || logsize(errlog))
++ if (logsize(logfile) || logsize(errlog))
+ {
+ if (log_lock() == 0)
+ {
+ if (t_logfile)
+- applog(&log, f_logfile);
++ applog(&logfile, f_logfile);
+ errdone();
+ if (t_errlogfile)
+ applog(&errlog, f_errlogfile);
+@@ -201,27 +201,27 @@
+ {
+ int a;
+
+- if (!log)
++ if (!logfile)
+ return;
+
+- logstart(log);
++ logstart(logfile);
+
+ if (local_sender)
+- (void) fprintf(log, "local sender: %s\n", local_sender);
++ (void) fprintf(logfile, "local sender: %s\n", local_sender);
+ if (orig_sender)
+- (void) fprintf(log, "original sender: %s\n", orig_sender);
++ (void) fprintf(logfile, "original sender: %s\n", orig_sender);
+ if (boxdelivery)
+- (void) fprintf(log, "mailbox%s:", (ac > 1) ? "es" : "");
++ (void) fprintf(logfile, "mailbox%s:", (ac > 1) ? "es" : "");
+ else
+- (void) fprintf(log, "destination%s:", (ac > 1) ? "s" : "");
++ (void) fprintf(logfile, "destination%s:", (ac > 1) ? "s" : "");
+ for (a = 0; a < ac; ++a)
+- (void) fprintf(log, " \"%s\"", av[a]);
+- (void) fputc('\n', log);
++ (void) fprintf(logfile, " \"%s\"", av[a]);
++ (void) fputc('\n', logfile);
+
+ logstate("delivered", ST_DONE);
+ logstate("failed", ST_ERROR);
+
+- logdone(log);
++ logdone(logfile);
+ }
+
+ /*----------------------------------------------------------------------
+@@ -244,15 +244,15 @@
+ continue;
+
+ if (++dcount == 1)
+- (void) fprintf(log, "%s:", desc);
+- (void) fprintf(log, " %s", d->d_name);
++ (void) fprintf(logfile, "%s:", desc);
++ (void) fprintf(logfile, " %s", d->d_name);
+ if (d->d_class == CL_MBOX)
+- (void) fprintf(log, ":%s", d->d_param);
++ (void) fprintf(logfile, ":%s", d->d_param);
+ else if (d->d_class == CL_PROG)
+- (void) fprintf(log, "|\"%s\"", d->d_param);
++ (void) fprintf(logfile, "|\"%s\"", d->d_param);
+ }
+ if (dcount)
+- (void) fputc('\n', log);
++ (void) fputc('\n', logfile);
+ }
+
+ /*----------------------------------------------------------------------
diff --git a/mail/deliver/patches/patch-ak b/mail/deliver/patches/patch-ak
new file mode 100644
index 00000000000..4b1395f7d96
--- /dev/null
+++ b/mail/deliver/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2004/05/28 01:09:01 wiz Exp $
+
+--- main.c.orig 1999-12-01 19:49:22.000000000 -0700
++++ main.c 2004-05-27 10:58:17.000000000 -0600
+@@ -123,7 +123,7 @@
+ char *eff_group = NULL;
+ char *real_group = NULL;
+
+-FILE *log = NULL;
++FILE *logfile = NULL;
+ char *t_logfile = NULL;
+ char *f_logfile = NULL;
+
diff --git a/mail/deliver/patches/patch-al b/mail/deliver/patches/patch-al
new file mode 100644
index 00000000000..987768d9620
--- /dev/null
+++ b/mail/deliver/patches/patch-al
@@ -0,0 +1,26 @@
+$NetBSD: patch-al,v 1.1 2004/05/28 01:09:01 wiz Exp $
+
+--- procs.c.orig 1999-12-01 19:16:21.000000000 -0700
++++ procs.c 2004-05-27 11:00:23.000000000 -0600
+@@ -173,8 +173,8 @@
+
+ (void) fflush(stdout);
+ (void) fflush(stderr);
+- if (log)
+- (void) fflush(log);
++ if (logfile)
++ (void) fflush(logfile);
+ if (errlog)
+ (void) fflush(errlog);
+
+@@ -396,8 +396,8 @@
+ (void) await_child();
+ (void) fflush(stdout);
+ (void) fflush(stderr);
+- if (log)
+- (void) fflush(log);
++ if (logfile)
++ (void) fflush(logfile);
+ if (errlog)
+ (void) fflush(errlog);
+