summaryrefslogtreecommitdiff
path: root/mail/nmh/patches
diff options
context:
space:
mode:
Diffstat (limited to 'mail/nmh/patches')
-rw-r--r--mail/nmh/patches/patch-ac15
-rw-r--r--mail/nmh/patches/patch-af117
-rw-r--r--mail/nmh/patches/patch-ay26
-rw-r--r--mail/nmh/patches/patch-ba10
-rw-r--r--mail/nmh/patches/patch-bb11
-rw-r--r--mail/nmh/patches/patch-ca91
-rw-r--r--mail/nmh/patches/patch-cd16
7 files changed, 68 insertions, 218 deletions
diff --git a/mail/nmh/patches/patch-ac b/mail/nmh/patches/patch-ac
deleted file mode 100644
index 8d951c8de4e..00000000000
--- a/mail/nmh/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2008/08/08 23:48:01 epg Exp $
-
-Committed upstream in r1.3; should be in next release.
-
---- sbr/discard.c.orig 2006-03-02 20:24:08.000000000 +0000
-+++ sbr/discard.c
-@@ -51,7 +51,7 @@ discard (FILE *io)
- # endif
- #endif
-
--#ifdef _FSTDIO
-+#if defined(_FSTDIO) || defined(__DragonFly__)
- fpurge (io);
- #else
- # ifdef LINUX_STDIO
diff --git a/mail/nmh/patches/patch-af b/mail/nmh/patches/patch-af
deleted file mode 100644
index f1f65cf43ac..00000000000
--- a/mail/nmh/patches/patch-af
+++ /dev/null
@@ -1,117 +0,0 @@
-$NetBSD: patch-af,v 1.2 2008/08/08 23:48:01 epg Exp $
-
-Committed upstream in r1.14; should be in next release.
-
---- sbr/m_getfld.c.orig 2006-03-02 20:29:22.000000000 +0000
-+++ sbr/m_getfld.c
-@@ -261,6 +261,9 @@ m_getfld (int state, unsigned char *name
- bp = sp = (unsigned char *) iob->_IO_read_ptr - 1;
- j = (cnt = ((long) iob->_IO_read_end -
- (long) iob->_IO_read_ptr) + 1) < i ? cnt : i;
-+#elif defined(__DragonFly__)
-+ bp = sp = (unsigned char *) ((struct __FILE_public *)iob)->_p - 1;
-+ j = (cnt = ((struct __FILE_public *)iob)->_r+1) < i ? cnt : i;
- #else
- bp = sp = (unsigned char *) iob->_ptr - 1;
- j = (cnt = iob->_cnt+1) < i ? cnt : i;
-@@ -273,6 +276,8 @@ m_getfld (int state, unsigned char *name
- #ifdef LINUX_STDIO
- iob->_IO_read_ptr = iob->_IO_read_end;
- if (__underflow(iob) == EOF) {
-+#elif defined(__DragonFly__)
-+ if (__srget(iob) == EOF) {
- #else
- if (_filbuf(iob) == EOF) {
- #endif
-@@ -286,6 +291,9 @@ m_getfld (int state, unsigned char *name
- } else {
- #ifdef LINUX_STDIO
- iob->_IO_read_ptr = bp + 1;
-+#elif defined(__DragonFly__)
-+ ((struct __FILE_public *)iob)->_p = bp + 1;
-+ ((struct __FILE_public *)iob)->_r = cnt - 1;
- #else
- iob->_ptr = bp + 1;
- iob->_cnt = cnt - 1;
-@@ -330,6 +338,9 @@ m_getfld (int state, unsigned char *name
- #ifdef LINUX_STDIO
- cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
- bp = (unsigned char *) --iob->_IO_read_ptr;
-+#elif defined(__DragonFly__)
-+ cnt = ((struct __FILE_public *)iob)->_r++;
-+ bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
- #else
- cnt = iob->_cnt++;
- bp = (unsigned char *) --iob->_ptr;
-@@ -344,6 +355,11 @@ m_getfld (int state, unsigned char *name
- j = ep - (unsigned char *) iob->_IO_read_ptr;
- memcpy (cp, iob->_IO_read_ptr, j);
- iob->_IO_read_ptr = ep;
-+#elif defined(__DragonFly__)
-+ j = ep - (unsigned char *) ((struct __FILE_public *)iob)->_p;
-+ memcpy (cp, ((struct __FILE_public *)iob)->_p, j);
-+ ((struct __FILE_public *)iob)->_p = ep;
-+ ((struct __FILE_public *)iob)->_r -= j;
- #else
- j = ep - (unsigned char *) iob->_ptr;
- memcpy (cp, iob->_ptr, j);
-@@ -363,6 +379,9 @@ m_getfld (int state, unsigned char *name
- #ifdef LINUX_STDIO
- c += bp - (unsigned char *) iob->_IO_read_ptr;
- memcpy( cp, iob->_IO_read_ptr, c);
-+#elif defined(__DragonFly__)
-+ c += bp - (unsigned char *) ((struct __FILE_public *)iob)->_p;
-+ memcpy( cp, ((struct __FILE_public *)iob)->_p, c);
- #else
- c += bp - (unsigned char *) iob->_ptr;
- memcpy( cp, iob->_ptr, c);
-@@ -373,6 +392,9 @@ m_getfld (int state, unsigned char *name
- /* the dest buffer is full */
- #ifdef LINUX_STDIO
- iob->_IO_read_ptr += c;
-+#elif defined(__DragonFly__)
-+ ((struct __FILE_public *)iob)->_r -= c;
-+ ((struct __FILE_public *)iob)->_p += c;
- #else
- iob->_cnt -= c;
- iob->_ptr += c;
-@@ -392,6 +414,9 @@ m_getfld (int state, unsigned char *name
- iob->_IO_read_ptr = iob->_IO_read_end;
- c = __underflow(iob);
- iob->_IO_read_ptr++; /* NOT automatic! */
-+#elif defined(__DragonFly__)
-+ *cp++ =j = *(((struct __FILE_public *)iob)->_p + c);
-+ c = __srget(iob);
- #else
- *cp++ = j = *(iob->_ptr + c);
- c = _filbuf(iob);
-@@ -401,6 +426,9 @@ m_getfld (int state, unsigned char *name
- if (c != EOF) {
- #ifdef LINUX_STDIO
- --iob->_IO_read_ptr;
-+#elif defined(__DragonFly__)
-+ --((struct __FILE_public *)iob)->_p;
-+ ++((struct __FILE_public *)iob)->_r;
- #else
- --iob->_ptr;
- ++iob->_cnt;
-@@ -424,6 +452,9 @@ m_getfld (int state, unsigned char *name
- #ifdef LINUX_STDIO
- bp = (unsigned char *) --iob->_IO_read_ptr;
- cnt = (long) iob->_IO_read_end - (long) iob->_IO_read_ptr;
-+#elif defined(__DragonFly__)
-+ bp = (unsigned char *) --((struct __FILE_public *)iob)->_p;
-+ cnt = ++((struct __FILE_public *)iob)->_r;
- #else
- bp = (unsigned char *) --iob->_ptr;
- cnt = ++iob->_cnt;
-@@ -486,6 +517,9 @@ m_getfld (int state, unsigned char *name
- memcpy( buf, bp, c );
- #ifdef LINUX_STDIO
- iob->_IO_read_ptr += c;
-+#elif defined(__DragonFly__)
-+ ((struct __FILE_public *)iob)->_r -= c;
-+ ((struct __FILE_public *)iob)->_p += c;
- #else
- iob->_cnt -= c;
- iob->_ptr += c;
diff --git a/mail/nmh/patches/patch-ay b/mail/nmh/patches/patch-ay
deleted file mode 100644
index eec651c222e..00000000000
--- a/mail/nmh/patches/patch-ay
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ay,v 1.2 2008/08/08 23:48:01 epg Exp $
-
-Committed upstream in r1.13; should be in next release.
-
---- uip/scansbr.c.orig 2006-03-02 21:05:07.000000000 +0000
-+++ uip/scansbr.c
-@@ -245,6 +245,8 @@ body:;
- while (state == BODY) {
- #ifdef LINUX_STDIO
- if (scnout->_IO_write_ptr == scnout->_IO_write_end) {
-+#elif defined(__DragonFly__)
-+ if (((struct __FILE_public *)scnout)->_w <= 0) {
- #else
- if (scnout->_cnt <= 0) {
- #endif
-@@ -255,6 +257,10 @@ body:;
- state = m_getfld(state, name, scnout->_IO_write_ptr,
- (long)scnout->_IO_write_ptr-(long)scnout->_IO_write_end , inb);
- scnout->_IO_write_ptr += msg_count;
-+#elif defined(__DragonFly__)
-+ state = m_getfld( state, name, ((struct __FILE_public *)scnout)->_p, -(((struct __FILE_public *)scnout)->_w), inb );
-+ ((struct __FILE_public *)scnout)->_w -= msg_count;
-+ ((struct __FILE_public *)scnout)->_p += msg_count;
- #else
- state = m_getfld( state, name, scnout->_ptr, -(scnout->_cnt), inb );
- scnout->_cnt -= msg_count;
diff --git a/mail/nmh/patches/patch-ba b/mail/nmh/patches/patch-ba
new file mode 100644
index 00000000000..355acc6af61
--- /dev/null
+++ b/mail/nmh/patches/patch-ba
@@ -0,0 +1,10 @@
+$NetBSD: patch-ba,v 1.7 2012/07/27 19:29:01 drochner Exp $
+
+see http://lists.nongnu.org/archive/html/nmh-workers/2012-07/msg00044.html
+
+--- etc/rcvdistcomps.orig 2010-12-02 21:15:50.000000000 +0000
++++ etc/rcvdistcomps
+@@ -1,2 +1,3 @@
++%(void(localmbox))%(void(width))%(putaddr Resent-From: )
+ %(lit)%(formataddr{addresses})\
+ %<(nonnull)%(void(width))%(putaddr Resent-To: )\n%>
diff --git a/mail/nmh/patches/patch-bb b/mail/nmh/patches/patch-bb
new file mode 100644
index 00000000000..b0230048e28
--- /dev/null
+++ b/mail/nmh/patches/patch-bb
@@ -0,0 +1,11 @@
+$NetBSD: patch-bb,v 1.3 2012/07/27 19:29:02 drochner Exp $
+
+see http://lists.nongnu.org/archive/html/nmh-workers/2012-07/msg00044.html
+
+--- etc/rcvdistcomps.outbox.orig 2010-12-02 21:15:50.000000000 +0000
++++ etc/rcvdistcomps.outbox
+@@ -1,3 +1,4 @@
++%(void(localmbox))%(void(width))%(putaddr Resent-From: )
+ %(lit)%(formataddr{addresses})\
+ %<(nonnull)%(void(width))%(putaddr Resent-To: )\n%>\
+ Resent-Fcc: outbox
diff --git a/mail/nmh/patches/patch-ca b/mail/nmh/patches/patch-ca
index 0e60b460fab..f11bb4f4735 100644
--- a/mail/nmh/patches/patch-ca
+++ b/mail/nmh/patches/patch-ca
@@ -1,59 +1,46 @@
-$NetBSD: patch-ca,v 1.6 2008/08/08 23:41:22 epg Exp $
+$NetBSD: patch-ca,v 1.7 2012/07/27 19:29:02 drochner Exp $
-Use ${INSTALL_SCRIPT} to install scripts
-Install configuration files as <conf-file>.dist
+install config files into share/examples
---- etc/Makefile.in.orig 2006-03-04 22:14:18.000000000 +0000
-+++ etc/Makefile.in 2008-08-08 21:22:09.000000000 +0000
-@@ -15,6 +15,7 @@
- bindir = @bindir@
- libdir = @libdir@
- etcdir = @sysconfdir@
-+egdir = @prefix@/share/examples/nmh
-
- MTS = @MTS@
- mailspool = @mailspool@
-@@ -92,7 +93,7 @@
+--- Makefile.in.orig 2012-06-11 04:14:07.000000000 +0000
++++ Makefile.in
+@@ -644,6 +644,7 @@ sharedstatedir = @sharedstatedir@
+ smtpservers = @smtpservers@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
++egdir = @prefix@/share/examples/nmh
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+@@ -3569,12 +3570,12 @@ uninstall-dist_docDATA:
done
-
- install-etc-files:
-- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
-+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(egdir)
- INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
- for file in $(STATIC_FILES); do \
- INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
-@@ -100,11 +101,11 @@
- for path in $$INSTALL_FILES; do \
- file=`basename $$path`; \
- echo "Installing $$file..."; \
-- if [ -f $(DESTDIR)$(etcdir)/$$file ]; then \
-- mv $(DESTDIR)$(etcdir)/$$file $(DESTDIR)$(etcdir)/$$file.prev; \
-- $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
-- if diff $(DESTDIR)$(etcdir)/$$file.prev $(DESTDIR)$(etcdir)/$$file; then \
-- rm $(DESTDIR)$(etcdir)/$$file.prev; \
-+ if [ -f $(DESTDIR)$(egdir)/$$file ]; then \
-+ mv $(DESTDIR)$(egdir)/$$file $(DESTDIR)$(egdir)/$$file.prev; \
-+ $(INSTALL_DATA) $$path $(DESTDIR)$(egdir)/$$file; \
-+ if diff $(DESTDIR)$(egdir)/$$file.prev $(DESTDIR)$(egdir)/$$file; then \
-+ rm $(DESTDIR)$(egdir)/$$file.prev; \
- else \
- echo; \
- echo " Previous version of $$file saved as $$file.prev due\c";\
-@@ -114,7 +115,7 @@
- echo; \
- fi; \
- else \
-- $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
-+ $(INSTALL_DATA) $$path $(DESTDIR)$(egdir)/$$file; \
- fi; \
+ install-dist_sysconfDATA: $(dist_sysconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++ test -z "$(egdir)" || $(MKDIR_P) "$(DESTDIR)$(egdir)"
+ @list='$(dist_sysconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
++ echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egdir)/$$f'"; \
++ $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egdir)/$$f"; \
done
-@@ -127,7 +128,7 @@
-
- uninstall-etc-files:
- for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
-- rm -f $(DESTDIR)$(etcdir)/$$file; \
-+ rm -f $(DESTDIR)$(egdir)/$$file; \
+ uninstall-dist_sysconfDATA:
+@@ -3586,12 +3587,12 @@ uninstall-dist_sysconfDATA:
+ done
+ install-sysconfDATA: $(sysconf_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++ test -z "$(egdir)" || $(MKDIR_P) "$(DESTDIR)$(egdir)"
+ @list='$(sysconf_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+- echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
+- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
++ echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egdir)/$$f'"; \
++ $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egdir)/$$f"; \
done
- # ========== DEPENDENCIES FOR CLEANUP ==========
+ uninstall-sysconfDATA:
diff --git a/mail/nmh/patches/patch-cd b/mail/nmh/patches/patch-cd
index 8a0eaebfe66..13e3f1044a7 100644
--- a/mail/nmh/patches/patch-cd
+++ b/mail/nmh/patches/patch-cd
@@ -1,15 +1,15 @@
-$NetBSD: patch-cd,v 1.5 2008/08/08 23:41:22 epg Exp $
+$NetBSD: patch-cd,v 1.6 2012/07/27 19:29:02 drochner Exp $
---- sbr/fmt_scan.c.orig 2008-04-05 18:41:37.000000000 +0000
-+++ sbr/fmt_scan.c 2008-08-08 21:24:12.000000000 +0000
-@@ -300,8 +300,8 @@
- char *savestr;
+make sure a time_t fits in
+
+--- sbr/fmt_scan.c.orig 2012-06-11 04:06:19.000000000 +0000
++++ sbr/fmt_scan.c
+@@ -298,7 +298,7 @@ fmt_scan (struct format *format, char *s
unsigned char *str = NULL;
char buffer[BUFSIZ], buffer2[BUFSIZ];
-- int i, c, ljust, n;
+ int i, c, ljust, n;
- int value = 0;
-+ int i, ljust, n;
-+ long long c, value = 0;
++ long long value = 0;
time_t t;
struct format *fmt;
struct comp *comp;
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 15:05:47 +0000