From 83116b433a1ceddef608a2e37a94a07ea497848d Mon Sep 17 00:00:00 2001 From: "Michael Mair-Keimberger (asterix)" Date: Sun, 15 Jan 2017 10:26:42 +0100 Subject: net-mail/mpack: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3488 --- net-mail/mpack/files/mpack-1.5-malloc-fix.patch | 33 ---------- net-mail/mpack/files/mpack-1.5-r1.patch | 82 ------------------------- 2 files changed, 115 deletions(-) delete mode 100644 net-mail/mpack/files/mpack-1.5-malloc-fix.patch delete mode 100644 net-mail/mpack/files/mpack-1.5-r1.patch (limited to 'net-mail') diff --git a/net-mail/mpack/files/mpack-1.5-malloc-fix.patch b/net-mail/mpack/files/mpack-1.5-malloc-fix.patch deleted file mode 100644 index 69777d87a889..000000000000 --- a/net-mail/mpack/files/mpack-1.5-malloc-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- mpack/xmalloc.c 2005-03-11 10:51:39.000000000 +0100 -+++ mpack/xmalloc.c 2005-03-11 10:51:39.000000000 +0100 -@@ -24,7 +24,7 @@ - */ - #include - #include --extern char *malloc(), *realloc(); -+extern void *malloc(), *realloc(); - - char *xmalloc (size) - int size; ---- mpack/unixos.c 2005-03-11 10:51:27.000000000 +0100 -+++ mpack/unixos.c 2005-03-11 10:51:27.000000000 +0100 -@@ -37,7 +37,7 @@ - #endif - - extern int errno; --extern char *malloc(); -+extern void *malloc(); - extern char *getenv(); - - int overwrite_files = 0; ---- mpack/unixpk.c 2005-03-11 10:53:22.000000000 +0100 -+++ mpack/unixpk.c 2005-03-11 10:53:22.000000000 +0100 -@@ -165,7 +165,7 @@ - strcpy(fnamebuf, "/tmp"); - } - strcat(fnamebuf, "/mpackXXXXXX"); -- mktemp(fnamebuf); -+ mkstemp(fnamebuf); - outfname = strsave(fnamebuf); - } - diff --git a/net-mail/mpack/files/mpack-1.5-r1.patch b/net-mail/mpack/files/mpack-1.5-r1.patch deleted file mode 100644 index 581f5d5590e1..000000000000 --- a/net-mail/mpack/files/mpack-1.5-r1.patch +++ /dev/null @@ -1,82 +0,0 @@ ---- mpack-1.5.orig/decode.c -+++ mpack-1.5/decode.c -@@ -466,6 +466,7 @@ - while (*from && *from != '\"') { - if (!--left) { - alloced += VALUEGROWSIZE; -+ left += VALUEGROWSIZE; - value = xrealloc(value, alloced); - to = value + alloced - left - 2; - } -@@ -482,6 +483,7 @@ - while (*from && !isspace(*from)) { - if (!--left) { - alloced += VALUEGROWSIZE; -+ left += VALUEGROWSIZE; - value = xrealloc(value, alloced); - to = value + alloced - left - 2; - } -@@ -571,6 +573,7 @@ - while (*disposition && *disposition != '\"') { - if (!--left) { - alloced += VALUEGROWSIZE; -+ left += VALUEGROWSIZE; - value = xrealloc(value, alloced); - to = value + alloced - left - 2; - } -@@ -588,6 +591,7 @@ - *disposition != '(') { - if (!--left) { - alloced += VALUEGROWSIZE; -+ left += VALUEGROWSIZE; - value = xrealloc(value, alloced); - to = value + alloced - left - 2; - } ---- mpack-1.5.orig/unixos.c -+++ mpack-1.5/unixos.c -@@ -89,7 +89,7 @@ - strcpy(buf, getenv("TMPDIR")); - } - else { -- strcpy(buf, "/usr/tmp"); -+ strcpy(buf, "/var/tmp"); - } - strcat(buf, "/m-prts-"); - p = getenv("USER"); -@@ -159,6 +159,11 @@ - - /* Get rid of leading ~ or ~/ */ - while (*fname == '~' || *fname == '/') fname++; -+ -+ /* Debian fix: the loop below handles internal "/../" but not -+ * leading "../" */ -+ /* Get rid of leading "../" */ -+ while (!strncmp(fname, "../", 3)) fname += 3; - - /* Clean out bad characters, create directories along path */ - for (p=fname; *p; p++) { ---- mpack-1.5.orig/unixunpk.man -+++ mpack-1.5/unixunpk.man -@@ -107,7 +107,7 @@ - .SH ENVIRONMENT - .TP - .B TMPDIR --Directory to store temporary files. Default is /usr/tmp. -+Directory to store temporary files. Default is /var/tmp. - .SH FILES - .TP - .B $TMPDIR/m-prts-$USER/ ---- mpack-1.5.orig/uudecode.c -+++ mpack-1.5/uudecode.c -@@ -524,8 +524,9 @@ - * representation syntax - */ - do { -- while (*scan != '\n' && isprint(*scan) -- && !isalnum(*scan) && *scan != '_') ++scan; -+ /* Debian patch: skip non-printable characters too. -+ * Sent upstream, no reply yet. */ -+ while (*scan != '\n' && !isalnum(*scan) && *scan != '_') ++scan; - *fnamep = start = scan; - while (isalnum(*scan) || *scan == '-' || *scan == '+' || *scan == '&' - || *scan == '_' || *scan == '.') { -- cgit v1.2.3-65-gdbad