diff options
Diffstat (limited to 'converters/mpack/patches')
| -rw-r--r-- | converters/mpack/patches/patch-aa | 50 | ||||
| -rw-r--r-- | converters/mpack/patches/patch-ab | 28 | ||||
| -rw-r--r-- | converters/mpack/patches/patch-ae | 29 | ||||
| -rw-r--r-- | converters/mpack/patches/patch-af | 15 |
4 files changed, 53 insertions, 69 deletions
diff --git a/converters/mpack/patches/patch-aa b/converters/mpack/patches/patch-aa deleted file mode 100644 index 3af22ab11b6..00000000000 --- a/converters/mpack/patches/patch-aa +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-aa,v 1.6 2002/12/05 16:45:21 is Exp $ ---- Makefile.orig Thu Feb 16 22:39:41 1995 -+++ Makefile Thu Dec 5 16:57:10 2002 -@@ -1,6 +1,7 @@ --CFLAGS=$(OPT) $(DEFINES) --OPT=-O -- -+CFLAGS+=$(OPT) $(DEFINES) -+#OPT=-O -+DEFINES=-Dunix -+LIBS=${LDFLAGS} - - #Uncomment the following line if your system does not have strchr() - #DEFINES=-Dstrchr=index -Dstrrchr=rindex -@@ -24,11 +25,11 @@ - - - PACKOBJS = unixpk.o encode.o codes.o magic.o unixos.o string.o \ -- xmalloc.o md5c.o getopt.o -+ xmalloc.o md5c.o - UNPACKOBJS = unixunpk.o decode.o uudecode.o codes.o unixos.o string.o \ -- part.o xmalloc.o md5c.o getopt.o -+ part.o xmalloc.o md5c.o - --DESTDIR=/usr/local -+DESTDIR=${PREFIX} - - all: mpack munpack - -@@ -39,13 +40,13 @@ - $(CC) $(CFLAGS) -o munpack $(UNPACKOBJS) $(LIBS) - - install: all -- -mkdir $(DESTDIR)/bin -- -mkdir $(DESTDIR)/man -- -mkdir $(DESTDIR)/man/man1 -- install -s -m 755 mpack $(DESTDIR)/bin -- install -s -m 755 munpack $(DESTDIR)/bin -- install -m 644 unixpk.man $(DESTDIR)/man/man1/mpack.1 -- install -m 644 unixunpk.man $(DESTDIR)/man/man1/munpack.1 -+ -${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)/bin -+ -${BSD_INSTALL_MAN_DIR} $(DESTDIR)/man -+ -${BSD_INSTALL_MAN_DIR} $(DESTDIR)/man/man1 -+ ${BSD_INSTALL_PROGRAM} mpack $(DESTDIR)/bin -+ ${BSD_INSTALL_PROGRAM} munpack $(DESTDIR)/bin -+ ${BSD_INSTALL_MAN} unixpk.man $(DESTDIR)/man/man1/mpack.1 -+ ${BSD_INSTALL_MAN} unixunpk.man $(DESTDIR)/man/man1/munpack.1 - - clean: - rm -f *.o mpack munpack diff --git a/converters/mpack/patches/patch-ab b/converters/mpack/patches/patch-ab index 7ad142f7d07..f535bb9f339 100644 --- a/converters/mpack/patches/patch-ab +++ b/converters/mpack/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2005/12/19 00:13:39 joerg Exp $ +$NetBSD: patch-ab,v 1.7 2009/02/15 20:12:18 dholland Exp $ ---- unixos.c.orig 1995-02-16 21:39:50.000000000 +0000 -+++ unixos.c -@@ -23,6 +23,7 @@ +--- unixos.c.orig 2003-07-21 16:54:05.000000000 -0400 ++++ unixos.c 2009-02-15 14:56:48.000000000 -0500 +@@ -23,9 +23,11 @@ * SOFTWARE. */ #include <stdio.h> @@ -10,7 +10,11 @@ $NetBSD: patch-ab,v 1.6 2005/12/19 00:13:39 joerg Exp $ #include <ctype.h> #include <string.h> #include <errno.h> -@@ -36,10 +37,6 @@ ++#include <time.h> + #include <sys/types.h> + #include <sys/param.h> + #include <netdb.h> +@@ -38,10 +40,6 @@ #define MAXHOSTNAMELEN 64 #endif @@ -21,14 +25,24 @@ $NetBSD: patch-ab,v 1.6 2005/12/19 00:13:39 joerg Exp $ int overwrite_files = 0; int didchat; -@@ -89,7 +86,11 @@ char *id; +@@ -76,7 +74,7 @@ char *os_genid(void) + } + + result = malloc(25+strlen(hostname)); +- sprintf(result, "%d.%d@%s", pid, curtime++, hostname); ++ sprintf(result, "%d.%lld@%s", pid, (long long) curtime++, hostname); + return result; + } + +@@ -90,7 +88,11 @@ char *os_idtodir(char *id) strcpy(buf, getenv("TMPDIR")); } else { +- strcpy(buf, "/usr/tmp"); +#if defined(P_tmpdir) + strcpy(buf, P_tmpdir); +#else - strcpy(buf, "/usr/tmp"); ++ strcpy(buf, "/var/tmp"); +#endif } strcat(buf, "/m-prts-"); diff --git a/converters/mpack/patches/patch-ae b/converters/mpack/patches/patch-ae index 4a78f48922c..5d6ad91b4d8 100644 --- a/converters/mpack/patches/patch-ae +++ b/converters/mpack/patches/patch-ae @@ -1,11 +1,30 @@ -$NetBSD: patch-ae,v 1.1 2005/12/19 00:13:39 joerg Exp $ +$NetBSD: patch-ae,v 1.2 2009/02/15 20:12:18 dholland Exp $ ---- unixpk.c.orig 2005-12-19 00:09:00.000000000 +0000 -+++ unixpk.c -@@ -33,7 +33,6 @@ ww * Permission to use, copy, modify, di +--- unixpk.c.orig 2003-07-21 16:50:41.000000000 -0400 ++++ unixpk.c 2009-02-15 15:09:47.000000000 -0500 +@@ -22,8 +22,16 @@ + * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ ++ ++#ifdef __NetBSD__ ++/* Use of mktemp() below is ok - resulting names are opened with O_EXCL. */ ++#define __MKTEMP_OK__ ++#endif ++ + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> ++#include <unistd.h> + #include <errno.h> + #include "common.h" + #include "version.h" +@@ -31,9 +39,6 @@ - extern char *getenv(); + #define MAXADDRESS 100 +-extern char *getenv(); +- -extern int errno; extern int optind; extern char *optarg; diff --git a/converters/mpack/patches/patch-af b/converters/mpack/patches/patch-af index ee03c6455d3..622e54f20f4 100644 --- a/converters/mpack/patches/patch-af +++ b/converters/mpack/patches/patch-af @@ -1,13 +1,14 @@ -$NetBSD: patch-af,v 1.1 2006/06/09 15:34:31 minskim Exp $ +$NetBSD: patch-af,v 1.2 2009/02/15 20:12:18 dholland Exp $ ---- xmalloc.c.orig 1995-02-16 21:39:50.000000000 +0000 -+++ xmalloc.c -@@ -24,7 +24,7 @@ +--- xmalloc.c.orig 2003-07-21 16:35:31.000000000 -0400 ++++ xmalloc.c 2009-02-15 14:47:02.000000000 -0500 +@@ -23,8 +23,8 @@ + * SOFTWARE. */ #include <stdio.h> ++#include <stdlib.h> #include <string.h> -extern char *malloc(), *realloc(); -+#include <stdlib.h> - char *xmalloc (size) - int size; + char *xmalloc (int size) + { |