diff options
Diffstat (limited to 'archivers')
210 files changed, 911 insertions, 862 deletions
diff --git a/archivers/9e/files/patch-9e.c b/archivers/9e/files/patch-9e.c index 6333e3868512..2f7eefa8257c 100644 --- a/archivers/9e/files/patch-9e.c +++ b/archivers/9e/files/patch-9e.c @@ -1,6 +1,6 @@ ---- 9e.c.orig Thu Jun 15 13:40:52 2000 -+++ 9e.c Fri Jun 23 04:16:00 2000 -@@ -139,17 +139,16 @@ +--- 9e.c.orig 2000-06-15 13:40:52 UTC ++++ 9e.c +@@ -139,17 +139,16 @@ void do_file(char *file, FILE *fin) { } if(Hdrs) { diff --git a/archivers/advancecomp/files/patch-Portable.h b/archivers/advancecomp/files/patch-7z_Portable.h index e4ae77909198..e19b52f9c7de 100644 --- a/archivers/advancecomp/files/patch-Portable.h +++ b/archivers/advancecomp/files/patch-7z_Portable.h @@ -1,5 +1,5 @@ ---- 7z/Portable.h.org Mon Aug 7 10:54:35 2006 -+++ 7z/Portable.h Mon Aug 7 10:54:55 2006 +--- 7z/Portable.h.orig 2012-12-08 22:16:47 UTC ++++ 7z/Portable.h @@ -2,7 +2,7 @@ #define __PORTABLE_H diff --git a/archivers/arc/files/patch-Makefile b/archivers/arc/files/patch-Makefile index 39dc54bd7d4a..bc67c7a69791 100644 --- a/archivers/arc/files/patch-Makefile +++ b/archivers/arc/files/patch-Makefile @@ -1,7 +1,7 @@ ---- Makefile.orig Fri Oct 31 05:32:51 2003 -+++ Makefile Wed Nov 5 13:53:51 2003 -@@ -38,14 +38,14 @@ - OPT = -O +--- Makefile.orig 2010-08-07 13:06:42 UTC ++++ Makefile +@@ -44,14 +44,14 @@ SYSTEM = -DSYSV=1 + OPT = -O -Wall # For MWC 3.0 on the Atari ST, use: #CFLAGS = -VCOMPAC -VPEEP -CFLAGS = $(OPT) $(SYSTEM) diff --git a/archivers/arc/files/patch-arc.c b/archivers/arc/files/patch-arc.c index 63954d8d2317..446149131503 100644 --- a/archivers/arc/files/patch-arc.c +++ b/archivers/arc/files/patch-arc.c @@ -1,6 +1,6 @@ ---- arc.c.orig Sun Oct 9 03:38:22 2005 -+++ arc.c Fri Oct 14 14:22:38 2005 -@@ -290,7 +290,7 @@ +--- arc.c.orig 2010-08-07 13:06:42 UTC ++++ arc.c +@@ -298,7 +298,7 @@ main(num, arg) /* system entry point * keepbak = 1; else if (*a == 'W') /* suppress warnings */ @@ -9,7 +9,7 @@ #if !DOS else if (*a == 'I') /* image mode, no ASCII/EBCDIC x-late */ image = !image; -@@ -426,7 +426,7 @@ +@@ -434,7 +434,7 @@ static VOID expandlst(n) /* expand an indirect reference */ int n; /* number of entry to expand */ { diff --git a/archivers/arc/files/patch-arc.h b/archivers/arc/files/patch-arc.h index a228e9d11dfd..0ba371b9f874 100644 --- a/archivers/arc/files/patch-arc.h +++ b/archivers/arc/files/patch-arc.h @@ -1,6 +1,6 @@ ---- ./arc.h.orig Tue Aug 10 23:03:24 1999 -+++ ./arc.h Tue Aug 10 23:01:55 1999 -@@ -106,7 +106,7 @@ +--- arc.h.orig 2010-08-07 13:06:42 UTC ++++ arc.h +@@ -106,7 +106,7 @@ extern char tmpchr[2]; /* Temporary #if GEMDOS extern int hold; /* hold screen before exiting */ #endif diff --git a/archivers/arc/files/patch-arcadd.c b/archivers/arc/files/patch-arcadd.c index 8a5597cfc6f5..2c10334c08a0 100644 --- a/archivers/arc/files/patch-arcadd.c +++ b/archivers/arc/files/patch-arcadd.c @@ -1,6 +1,6 @@ ---- ./arcadd.c.orig Tue Aug 10 23:03:24 1999 -+++ ./arcadd.c Tue Aug 10 23:01:55 1999 -@@ -119,7 +119,7 @@ +--- arcadd.c.orig 2010-08-07 13:06:42 UTC ++++ arcadd.c +@@ -119,7 +119,7 @@ int fresh; /* true if fresh } #endif } @@ -9,7 +9,7 @@ printf("No files match: %s\n", arg[n]); } -@@ -133,7 +133,7 @@ +@@ -133,7 +133,7 @@ int fresh; /* true if fresh free(path); free(name); } @@ -18,7 +18,7 @@ printf("No files were added.\n"); } -@@ -227,7 +227,7 @@ +@@ -227,7 +227,7 @@ addbunch(nfiles, path, name, move, updat if (move) { /* if this was a move */ for (n = 0; n < nfiles; n++) { /* then delete each file * added */ @@ -27,7 +27,7 @@ printf("Cannot unsave %s\n", path[n]); nerrs++; } -@@ -259,7 +259,7 @@ +@@ -259,7 +259,7 @@ addfile(path, name, update, fresh) /* ad if (!f) #endif { @@ -36,7 +36,7 @@ printf("Cannot read file: %s\n", path); nerrs++; } -@@ -267,7 +267,7 @@ +@@ -267,7 +267,7 @@ addfile(path, name, update, fresh) /* ad } #if !DOS if (strlen(name) >= FNLEN) { diff --git a/archivers/arc/files/patch-arccvt.c b/archivers/arc/files/patch-arccvt.c index 1f496113cbb2..54fe714c5b57 100644 --- a/archivers/arc/files/patch-arccvt.c +++ b/archivers/arc/files/patch-arccvt.c @@ -1,6 +1,6 @@ ---- ./arccvt.c.orig Tue Aug 10 23:03:24 1999 -+++ ./arccvt.c Tue Aug 10 23:01:55 1999 -@@ -120,7 +120,7 @@ +--- arccvt.c.orig 2010-08-07 13:06:42 UTC ++++ arccvt.c +@@ -120,7 +120,7 @@ cvtfile(hdr) /* convert a file */ writehdr(hdr, new); /* write out real header */ fseek(new, hdr->size, 1); /* skip over data to next header */ fclose(tmp); /* all done with the file */ diff --git a/archivers/arc/files/patch-arcdata.c b/archivers/arc/files/patch-arcdata.c index f9e7a9067de8..386eb235c141 100644 --- a/archivers/arc/files/patch-arcdata.c +++ b/archivers/arc/files/patch-arcdata.c @@ -1,6 +1,6 @@ ---- ./arcdata.c.orig Tue Aug 10 23:03:24 1999 -+++ ./arcdata.c Tue Aug 10 23:01:56 1999 -@@ -35,7 +35,7 @@ +--- arcdata.c.orig 2010-08-07 13:06:42 UTC ++++ arcdata.c +@@ -35,7 +35,7 @@ char tmpchr[2] = "-";/* Tempo #if GEMDOS int hold = 0; /* true to pause before exit */ #endif diff --git a/archivers/arc/files/patch-arcdos.c b/archivers/arc/files/patch-arcdos.c index 52bf11b472f3..28cec121b0f3 100644 --- a/archivers/arc/files/patch-arcdos.c +++ b/archivers/arc/files/patch-arcdos.c @@ -1,25 +1,23 @@ -*** arcdos.c.old Wed Apr 15 02:58:21 1992 ---- arcdos.c Sat Dec 31 20:32:25 1994 -*************** -*** 173,186 **** ---- 173,192 ---- - struct tm tm; - struct timeval tvp[2]; - int utimes(); -+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) - long tmclock(); -+ #endif - tm.tm_sec = (time & 31) * 2; - tm.tm_min = (time >> 5) & 63; - tm.tm_hour = (time >> 11); - tm.tm_mday = date & 31; - tm.tm_mon = ((date >> 5) & 15) - 1; - tm.tm_year = (date >> 9) + 80; -+ #if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) - tvp[0].tv_sec = tmclock(&tm); -+ #else -+ tvp[0].tv_sec = timelocal(&tm); -+ #endif - tvp[1].tv_sec = tvp[0].tv_sec; - tvp[0].tv_usec = tvp[1].tv_usec = 0; - utimes(f, tvp); +--- arcdos.c.orig 2010-08-07 13:06:42 UTC ++++ arcdos.c +@@ -175,14 +175,20 @@ setstamp(f, date, time) /* set a file's + struct tm tm; + struct timeval tvp[2]; + int utimes(); ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) + long tmclock(); ++#endif + tm.tm_sec = (time & 31) * 2; + tm.tm_min = (time >> 5) & 63; + tm.tm_hour = (time >> 11); + tm.tm_mday = date & 31; + tm.tm_mon = ((date >> 5) & 15) - 1; + tm.tm_year = (date >> 9) + 80; ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + tvp[0].tv_sec = tmclock(&tm); ++#else ++ tvp[0].tv_sec = timelocal(&tm); ++#endif + tvp[1].tv_sec = tvp[0].tv_sec; + tvp[0].tv_usec = tvp[1].tv_usec = 0; + utimes(f, tvp); diff --git a/archivers/arc/files/patch-arcext.c b/archivers/arc/files/patch-arcext.c index eae8495ed002..7e8f1434ea04 100644 --- a/archivers/arc/files/patch-arcext.c +++ b/archivers/arc/files/patch-arcext.c @@ -1,6 +1,6 @@ ---- arcext.c.orig Sat Oct 8 22:24:37 2005 -+++ arcext.c Fri Oct 14 00:52:14 2005 -@@ -143,7 +143,7 @@ +--- arcext.c.orig 2010-08-07 13:06:42 UTC ++++ arcext.c +@@ -143,7 +143,7 @@ extfile(hdr, path, prt) /* extract a fi if (note) printf("Extracting file: %s\n", fix); @@ -9,7 +9,7 @@ if ((f = fopen(fix, "r"))) { /* see if it exists */ fclose(f); printf("WARNING: File %s already exists!", fix); -@@ -190,7 +190,7 @@ +@@ -191,7 +191,7 @@ extfile(hdr, path, prt) /* extract a fi if (!f) #endif { diff --git a/archivers/arc/files/patch-arcio.c b/archivers/arc/files/patch-arcio.c index 7034aeaf6cb0..be27ece679a4 100644 --- a/archivers/arc/files/patch-arcio.c +++ b/archivers/arc/files/patch-arcio.c @@ -1,6 +1,6 @@ ---- arcio.c.orig Wed Apr 15 02:58:26 1992 -+++ arcio.c Sat Aug 11 22:10:55 2001 -@@ -46,7 +46,7 @@ +--- arcio.c.orig 2010-08-07 13:06:42 UTC ++++ arcio.c +@@ -46,7 +46,7 @@ readhdr(hdr, f) /* read a header from return 0; /* then signal end of archive */ if (hdrver != ARCMARK) { /* check archive validity */ @@ -9,7 +9,7 @@ printf("An entry in %s has a bad header.\n", arcname); nerrs++; } -@@ -63,10 +63,10 @@ +@@ -67,10 +67,10 @@ readhdr(hdr, f) /* read a header from if (feof(f) && first) arcdie("%s is not an archive", arcname); @@ -22,7 +22,7 @@ printf(" %d bytes skipped.\n", try); if (feof(f)) -@@ -110,7 +110,8 @@ +@@ -118,7 +118,8 @@ readhdr(hdr, f) /* read a header from hdr->crc = (short) ((dummy[22] << 8) + dummy[21]); for (i = 0, hdr->length=0; i<4; hdr->length<<=8, hdr->length += dummy[26-i], i++); #endif diff --git a/archivers/arc/files/patch-arclzw.c b/archivers/arc/files/patch-arclzw.c index 7933c26409d1..c0f1c8996403 100644 --- a/archivers/arc/files/patch-arclzw.c +++ b/archivers/arc/files/patch-arclzw.c @@ -1,6 +1,6 @@ ---- ./arclzw.c.orig Tue Aug 10 23:03:25 1999 -+++ ./arclzw.c Tue Aug 10 23:01:57 1999 -@@ -546,7 +546,7 @@ +--- arclzw.c.orig 2010-08-07 13:06:42 UTC ++++ arclzw.c +@@ -560,7 +560,7 @@ decomp(squash, f, t) /* decompress a fi */ if (code >= free_ent) { if (code > free_ent) { diff --git a/archivers/arc/files/patch-arcrun.c b/archivers/arc/files/patch-arcrun.c index 207e33531b82..42b1985b4bd8 100644 --- a/archivers/arc/files/patch-arcrun.c +++ b/archivers/arc/files/patch-arcrun.c @@ -1,6 +1,6 @@ ---- arcrun.c.orig Wed Oct 12 19:22:18 2005 -+++ arcrun.c Sat May 27 03:47:30 2006 -@@ -98,7 +98,7 @@ +--- arcrun.c.orig 2010-08-07 13:06:42 UTC ++++ arcrun.c +@@ -98,7 +98,7 @@ runfile(hdr, num, arg) /* run a file */ strcpy(sys, buf); else { @@ -9,7 +9,7 @@ printf("File %s is not a .BAS, .BAT, .COM, or .EXE\n", hdr->name); nerrs++; -@@ -112,7 +112,7 @@ +@@ -112,7 +112,7 @@ runfile(hdr, num, arg) /* run a file */ && strcmp(i, ".TTP") && strcmp(i, ".TOS")) { @@ -18,7 +18,7 @@ printf("File %s is not a .PRG, .TOS, or .TTP\n", hdr->name); nerrs++; -@@ -122,7 +122,7 @@ +@@ -122,7 +122,7 @@ runfile(hdr, num, arg) /* run a file */ } #endif @@ -27,7 +27,7 @@ if ((tmp = fopen(buf, "r"))) arcdie("Temporary file %s already exists", buf); if (!(tmp = tmpopen(buf))) -@@ -146,7 +146,7 @@ +@@ -146,7 +146,7 @@ runfile(hdr, num, arg) /* run a file */ if (system(buf)) /* try to invoke it */ arcdie("Execution failed for %s", buf); #endif diff --git a/archivers/arc/files/patch-arcunp.c b/archivers/arc/files/patch-arcunp.c index 08e091f2462e..ed3f7191d744 100644 --- a/archivers/arc/files/patch-arcunp.c +++ b/archivers/arc/files/patch-arcunp.c @@ -1,6 +1,6 @@ ---- ./arcunp.c.orig Tue Aug 10 23:03:25 1999 -+++ ./arcunp.c Tue Aug 10 23:01:57 1999 -@@ -123,7 +123,7 @@ +--- arcunp.c.orig 2010-08-07 13:06:42 UTC ++++ arcunp.c +@@ -122,7 +122,7 @@ unpack(f, t, hdr) /* unpack an archive break; default: /* unknown method */ @@ -9,7 +9,7 @@ printf("I don't know how to unpack file %s\n", hdr->name); printf("I think you need a newer version of ARC\n"); nerrs++; -@@ -135,7 +135,7 @@ +@@ -134,7 +134,7 @@ unpack(f, t, hdr) /* unpack an archive /* cleanups common to all methods */ if (crcval != hdr->crc) { diff --git a/archivers/arj/files/patch-arj_arcv.c b/archivers/arj/files/patch-arj__arcv.c index e65faa41f9cc..2bfbab86c1e0 100644 --- a/archivers/arj/files/patch-arj_arcv.c +++ b/archivers/arj/files/patch-arj__arcv.c @@ -1,6 +1,6 @@ ---- arj_arcv.c 2005-06-21 22:53:12.000000000 +0300 -+++ arj_arcv.c 2005-11-24 02:50:31.000000000 +0200 -@@ -59,27 +59,27 @@ +--- arj_arcv.c.orig 2005-06-21 19:53:12 UTC ++++ arj_arcv.c +@@ -59,27 +59,27 @@ static char idxid_fault[]="?"; #define setup_hput(ptr) (tmp_hptr=(ptr)) #define hget_byte() (*(tmp_hptr++)&0xFF) @@ -35,7 +35,7 @@ return result; } -@@ -87,18 +87,18 @@ +@@ -87,18 +87,18 @@ static unsigned long hget_longword() /* Writes two bytes to the header, incrementing the pointer */ @@ -58,4 +58,3 @@ } /* Calculates and stores the basic header size */ -diff -Naur -x .svn -x CVS arj-3.10.22.orig/arj_proc.c arj-3.10.22/arj_proc.c diff --git a/archivers/arj/files/patch-arj_proc.c b/archivers/arj/files/patch-arj__proc.c index c8a27fcf44cc..b6b733254d00 100644 --- a/archivers/arj/files/patch-arj_proc.c +++ b/archivers/arj/files/patch-arj__proc.c @@ -1,6 +1,6 @@ ---- arj_proc.c 2005-11-24 02:50:19.000000000 +0200 -+++ arj_proc.c 2005-11-24 02:50:31.000000000 +0200 -@@ -585,7 +585,7 @@ +--- arj_proc.c.orig 2005-06-21 19:53:12 UTC ++++ arj_proc.c +@@ -585,7 +585,7 @@ int search_for_extension(char *name, cha /* Returns the exact amount of data that could be safely written to the destination volume */ @@ -9,7 +9,7 @@ { unsigned long pvol; unsigned int arjsec_overhead; -@@ -605,7 +605,7 @@ +@@ -605,7 +605,7 @@ unsigned long get_volfree(unsigned int i remain=volume_limit-ftell(aostream)-pvol-(long)arjsec_overhead- (long)out_bytes-(long)cpos-(long)ext_voldata- MULTIVOLUME_RESERVE-t_volume_offset; @@ -18,7 +18,7 @@ } /* Performs various checks when multivolume data is packed to predict an -@@ -2466,14 +2466,14 @@ +@@ -2466,14 +2466,14 @@ static int get_str_from_jq() *tsptr='\0'; endptr=tsptr; tsptr=sptr; @@ -36,8 +36,8 @@ tsptr++; } } -@@ -2901,9 +2901,9 @@ - #if (defined(WORDS_BIGENDIAN) || defined(ALIGN_POINTERS)) && !defined(ARJDISP) && !defined(REGISTER) +@@ -2901,9 +2901,9 @@ char *ltrim(char *str) + #if defined(WORDS_BIGENDIAN)&&!defined(ARJDISP)&&!defined(REGISTER) /* Model-independent routine to get 2 bytes from far RAM */ -unsigned int mget_word(char FAR *p) @@ -48,7 +48,7 @@ b0=mget_byte(p); b1=mget_byte(p+1); -@@ -2912,9 +2912,9 @@ +@@ -2912,9 +2912,9 @@ unsigned int mget_word(char FAR *p) /* Model-independent routine to get 4 bytes from far RAM */ @@ -60,7 +60,7 @@ w0=mget_word(p); w1=mget_word(p+2); -@@ -2923,7 +2923,7 @@ +@@ -2923,7 +2923,7 @@ unsigned long mget_dword(char FAR *p) /* Model-independent routine to store 2 bytes in far RAM */ @@ -69,7 +69,7 @@ { mput_byte(w&0xFF, p); mput_byte(w>>8 , p+1); -@@ -2931,7 +2931,7 @@ +@@ -2931,7 +2931,7 @@ void mput_word(unsigned int w, char FAR /* Model-independent routine to store 4 bytes in far RAM */ diff --git a/archivers/arj/files/patch-arj_proc.h b/archivers/arj/files/patch-arj__proc.h index 9501e70c08af..11dda85fa14d 100644 --- a/archivers/arj/files/patch-arj_proc.h +++ b/archivers/arj/files/patch-arj__proc.h @@ -1,5 +1,5 @@ ---- arj_proc.h.orig 2004-01-25 08:39:30.000000000 -0200 -+++ arj_proc.h 2010-02-19 08:35:05.000000000 -0200 +--- arj_proc.h.orig 2004-01-25 10:39:30 UTC ++++ arj_proc.h @@ -8,15 +8,17 @@ #ifndef ARJ_PROC_INCLUDED #define ARJ_PROC_INCLUDED @@ -24,7 +24,7 @@ #endif /* Prototypes */ -@@ -31,7 +33,7 @@ +@@ -31,7 +33,7 @@ void copy_bytes(unsigned long nbytes); int translate_path(char *name); void restart_proc(char *dest); int search_for_extension(char *name, char *ext_list); @@ -33,7 +33,7 @@ unsigned int check_multivolume(unsigned int increment); void store(); void hollow_encode(); -@@ -61,10 +63,10 @@ +@@ -61,10 +63,10 @@ void unpack_mem(struct mempack *mempack) void strip_lf(char *str); char *ltrim(char *str); #ifdef WORDS_BIGENDIAN diff --git a/archivers/arj/files/patch-environ.c b/archivers/arj/files/patch-environ.c index f4cbb1d89387..d1bedb05e458 100644 --- a/archivers/arj/files/patch-environ.c +++ b/archivers/arj/files/patch-environ.c @@ -1,6 +1,6 @@ ---- environ.c.orig 2010-10-28 13:11:54.000000000 -0200 -+++ environ.c 2010-10-28 13:13:10.000000000 -0200 -@@ -2058,7 +2058,7 @@ +--- environ.c.orig 2004-06-18 16:19:36 UTC ++++ environ.c +@@ -2058,7 +2058,7 @@ FILE *file_open(char *name, char *mode) /* ASR fix 01/10/2003 -- re-fix to handle umask 022 correctly */ if((handle=open(name, oflag, 0644))==-1) return(NULL); diff --git a/archivers/arj/files/patch-fardata.c b/archivers/arj/files/patch-fardata.c index 0b9163f954f2..1ce033fd6123 100644 --- a/archivers/arj/files/patch-fardata.c +++ b/archivers/arj/files/patch-fardata.c @@ -1,5 +1,5 @@ ---- fardata.c.orig 2010-01-18 10:06:57.000000000 -0200 -+++ fardata.c 2010-01-18 10:08:24.000000000 -0200 +--- fardata.c.orig 2004-04-17 11:39:42 UTC ++++ fardata.c @@ -190,7 +190,7 @@ int msg_sprintf(char *str, FMSG *fmt, .. /* Length-limited strlen() */ diff --git a/archivers/ark/files/patch-git_cd8ad27 b/archivers/ark/files/patch-git_cd8ad27 index 229d8cd202c4..058d208c0c68 100644 --- a/archivers/ark/files/patch-git_cd8ad27 +++ b/archivers/ark/files/patch-git_cd8ad27 @@ -31,7 +31,7 @@ Date: Mon Nov 24 01:37:06 2014 +0200 Conflicts: part/part.cpp ---- app/mainwindow.cpp +--- app/mainwindow.cpp.orig 2014-10-25 12:53:24 UTC +++ app/mainwindow.cpp @@ -38,6 +38,7 @@ #include <KDebug> @@ -50,7 +50,7 @@ Date: Mon Nov 24 01:37:06 2014 +0200 delete m_part; m_part = 0; } ---- part/part.cpp +--- part/part.cpp.orig 2014-10-25 12:53:24 UTC +++ part/part.cpp @@ -53,7 +53,6 @@ #include <KStandardGuiItem> @@ -60,7 +60,7 @@ Date: Mon Nov 24 01:37:06 2014 +0200 #include <QAction> #include <QCursor> -@@ -138,8 +137,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList& args) +@@ -138,8 +137,6 @@ Part::Part(QWidget *parentWidget, QObjec Part::~Part() { diff --git a/archivers/atool/files/patch-configure b/archivers/atool/files/patch-configure index 3460043639a9..c065424bc1c9 100644 --- a/archivers/atool/files/patch-configure +++ b/archivers/atool/files/patch-configure @@ -1,6 +1,6 @@ --- configure.orig 2012-02-21 18:14:06 UTC +++ configure -@@ -2261,7 +2261,7 @@ +@@ -2261,7 +2261,7 @@ fi eval `$PERL -V:startperl` diff --git a/archivers/bzip/files/patch-Makefile b/archivers/bzip/files/patch-Makefile index 69b52ae7048c..071211dc6cd0 100644 --- a/archivers/bzip/files/patch-Makefile +++ b/archivers/bzip/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Aug 31 09:50:33 1996 -+++ Makefile Fri Sep 27 13:57:55 1996 +--- Makefile.orig 1996-08-31 07:50:33 UTC ++++ Makefile @@ -1,29 +1,17 @@ - -CC = gcc diff --git a/archivers/bzip/files/patch-bzip.c b/archivers/bzip/files/patch-bzip.c index ea9513a90511..cba7ce00e711 100644 --- a/archivers/bzip/files/patch-bzip.c +++ b/archivers/bzip/files/patch-bzip.c @@ -1,4 +1,4 @@ ---- bzip.c.orig 1996-08-30 20:35:28.000000000 +0000 +--- bzip.c.orig 1996-08-30 20:35:28 UTC +++ bzip.c @@ -114,9 +114,13 @@ --*/ diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index efec0cf588fd..60c6eb2645ac 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -13,7 +13,6 @@ COMMENT= Block-sorting file compressor USES= cpe CPE_VENDOR= bzip USE_LDCONFIG= yes -PATCH_STRIP= -p3 OPTIONS_DEFINE= DOCS diff --git a/archivers/bzip2/files/patch-Makefile b/archivers/bzip2/files/patch-Makefile index 3cb244c9242e..59d34dd2a38c 100644 --- a/archivers/bzip2/files/patch-Makefile +++ b/archivers/bzip2/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Jan 2 22:49:21 2007 -+++ Makefile Sat Jan 27 12:02:14 2007 +--- Makefile.orig 2010-09-10 22:46:02 UTC ++++ Makefile @@ -15,13 +15,15 @@ SHELL=/bin/sh @@ -18,7 +18,7 @@ # Where you want it installed when you do 'make install' PREFIX=/usr/local -@@ -35,10 +37,18 @@ +@@ -35,10 +37,18 @@ OBJS= blocksort.o \ decompress.o \ bzlib.o @@ -40,7 +40,7 @@ bzip2recover: bzip2recover.o $(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o -@@ -52,6 +62,10 @@ +@@ -52,6 +62,10 @@ libbz2.a: $(OBJS) $(RANLIB) libbz2.a ; \ fi @@ -51,7 +51,7 @@ check: test test: bzip2 @cat words1 -@@ -109,9 +123,25 @@ +@@ -109,10 +123,26 @@ install: bzip2 bzip2recover echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1 clean: @@ -59,7 +59,7 @@ + rm -f *.o *.so libbz2.a libbz2.so.1 bzip2 bzip2recover \ sample1.rb2 sample2.rb2 sample3.rb2 \ sample1.tst sample2.tst sample3.tst -+ + +blocksort.so: blocksort.c + @cat words0 + $(CC) $(CFLAGS) $(SOFLAGS) -c blocksort.c -o blocksort.so @@ -75,6 +75,7 @@ + $(CC) $(CFLAGS) $(SOFLAGS) -c decompress.c -o decompress.so +bzlib.so: bzlib.c + $(CC) $(CFLAGS) $(SOFLAGS) -c bzlib.c -o bzlib.so - ++ blocksort.o: blocksort.c @cat words0 + $(CC) $(CFLAGS) -c blocksort.c diff --git a/archivers/dact/files/patch-Makefile.in b/archivers/dact/files/patch-Makefile.in index 8ff5925b635b..34b4e903adbd 100644 --- a/archivers/dact/files/patch-Makefile.in +++ b/archivers/dact/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2006-03-25 16:15:04.000000000 +0300 -+++ Makefile.in 2015-02-25 22:26:51.000000000 +0300 -@@ -24,8 +24,8 @@ +--- Makefile.in.orig 2006-03-25 13:15:04 UTC ++++ Makefile.in +@@ -24,8 +24,8 @@ INSTALL = @INSTALL@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -11,7 +11,7 @@ sysconfdir = @sysconfdir@ mandir = @mandir@ datadir = @datadir@ -@@ -41,13 +41,14 @@ +@@ -41,13 +41,14 @@ OBJS += dact_common.o comp_fail.o comp_p # be kept in sync with OBJS SHLIBOBJS += dact_common_shr.o comp_fail_shr.o comp_plain_shr.o buffer_shr.o header_shr.o sort_shr.o module_shr.o parse_shr.o dendian_shr.o crc_shr.o net_shr.o ui_shr.o sfx_shr.o libdact_shr.o @SHLIBOBJS@ ALGO = comp_snibble.c comp_delta.c comp_text.c comp_rle.c cipher_chaos.c cipher_sub.c cipher_psub.c @ALGO@ diff --git a/archivers/deutex/files/patch-src-deutex.h b/archivers/deutex/files/patch-src_deutex.h index 20e713558adb..e410fcd1e6ed 100644 --- a/archivers/deutex/files/patch-src-deutex.h +++ b/archivers/deutex/files/patch-src_deutex.h @@ -1,6 +1,6 @@ ---- src/deutex.h.orig 1999-12-31 07:20:22.000000000 +0800 -+++ src/deutex.h 2012-02-12 16:53:51.000000000 +0800 -@@ -31,23 +31,13 @@ +--- src/deutex.h.orig 1999-12-30 23:20:22 UTC ++++ src/deutex.h +@@ -31,23 +31,13 @@ Place, Suite 330, Boston, MA 02111-1307, #define DeuSF for DOS .EXE Unix Linux OS/2 *********************************************/ diff --git a/archivers/dpkg/files/patch-lib_compat_gettext.h b/archivers/dpkg/files/patch-lib_compat_gettext.h index 9598958acaee..807480c33a2c 100644 --- a/archivers/dpkg/files/patch-lib_compat_gettext.h +++ b/archivers/dpkg/files/patch-lib_compat_gettext.h @@ -1,4 +1,4 @@ ---- lib/compat/gettext.h.orig 2015-05-03 14:52:33 UTC +--- lib/compat/gettext.h.orig 2015-11-25 21:45:14 UTC +++ lib/compat/gettext.h @@ -53,7 +53,6 @@ <libintl.h>, which chokes if dcgettext is defined as a macro. So include diff --git a/archivers/dpkg/files/patch-scripts_Dpkg_Compression.pm b/archivers/dpkg/files/patch-scripts_Dpkg_Compression.pm index ad8ce0893d9f..cad07bc2b42c 100644 --- a/archivers/dpkg/files/patch-scripts_Dpkg_Compression.pm +++ b/archivers/dpkg/files/patch-scripts_Dpkg_Compression.pm @@ -1,4 +1,4 @@ ---- scripts/Dpkg/Compression.pm.orig 2015-06-11 20:28:56 UTC +--- scripts/Dpkg/Compression.pm.orig 2016-07-03 19:02:23 UTC +++ scripts/Dpkg/Compression.pm @@ -55,7 +55,7 @@ interact with the set of supported compr my $COMP = { diff --git a/archivers/engrampa/files/patch-src_fr-command-lrzip.c b/archivers/engrampa/files/patch-src_fr-command-lrzip.c index ae2d7d440482..3c17dd13d7c0 100644 --- a/archivers/engrampa/files/patch-src_fr-command-lrzip.c +++ b/archivers/engrampa/files/patch-src_fr-command-lrzip.c @@ -1,11 +1,11 @@ ---- src/fr-command-lrzip.c.orig 2010-08-26 12:40:56.000000000 -0400 -+++ src/fr-command-lrzip.c 2010-08-26 12:41:41.000000000 -0400 +--- src/fr-command-lrzip.c.orig 2015-10-14 17:33:41 UTC ++++ src/fr-command-lrzip.c @@ -53,7 +53,7 @@ list__process_line (char *line, struct stat st; - time_t tt; + if (stat (comm->filename, &st) == 0) - fdata->modified = st.st_mtim.tv_sec; + fdata->modified = st.st_mtime; else time(&(fdata->modified)); - fdata->modified; + diff --git a/archivers/engrampa/files/patch-src_fr-command-tar.c b/archivers/engrampa/files/patch-src_fr-command-tar.c index f80cbce7b080..8733b0399966 100644 --- a/archivers/engrampa/files/patch-src_fr-command-tar.c +++ b/archivers/engrampa/files/patch-src_fr-command-tar.c @@ -1,6 +1,6 @@ ---- src/fr-command-tar.c.orig 2014-11-19 15:44:09.000000000 +0100 -+++ src/fr-command-tar.c 2014-12-04 18:28:31.998497849 +0100 -@@ -245,6 +245,10 @@ +--- src/fr-command-tar.c.orig 2015-10-14 17:33:41 UTC ++++ src/fr-command-tar.c +@@ -245,6 +245,10 @@ begin_tar_command (FrCommand *comm) g_free (command); command = g_strdup ("/usr/sfw/bin/gtar"); } diff --git a/archivers/engrampa/files/patch-src_fr-command-zip.c b/archivers/engrampa/files/patch-src_fr-command-zip.c index ee9ec93de8c1..f650086b4d7c 100644 --- a/archivers/engrampa/files/patch-src_fr-command-zip.c +++ b/archivers/engrampa/files/patch-src_fr-command-zip.c @@ -1,5 +1,5 @@ ---- src/fr-command-zip.c.orig 2010-01-02 17:02:44.000000000 -0500 -+++ src/fr-command-zip.c 2010-01-02 17:08:03.000000000 -0500 +--- src/fr-command-zip.c.orig 2015-10-14 17:33:41 UTC ++++ src/fr-command-zip.c @@ -187,7 +187,11 @@ fr_command_zip_list (FrCommand *comm) { fr_process_set_out_line_func (comm->process, list__process_line, comm); @@ -11,8 +11,8 @@ +#endif fr_process_set_begin_func (comm->process, list__begin, comm); fr_process_add_arg (comm->process, "-ZTs"); - fr_process_add_arg (comm->process, comm->filename); -@@ -302,7 +306,11 @@ fr_command_zip_extract (FrCommand *comm + fr_process_add_arg (comm->process, "--"); +@@ -307,7 +311,11 @@ fr_command_zip_extract (FrCommand *comm process_line__common, comm); @@ -24,7 +24,7 @@ if (dest_dir != NULL) { fr_process_add_arg (comm->process, "-d"); -@@ -334,7 +342,11 @@ fr_command_zip_extract (FrCommand *comm +@@ -341,7 +349,11 @@ fr_command_zip_extract (FrCommand *comm static void fr_command_zip_test (FrCommand *comm) { @@ -36,4 +36,4 @@ +#endif fr_process_add_arg (comm->process, "-t"); add_password_arg (comm, comm->password); - fr_process_add_arg (comm->process, comm->filename); + fr_process_add_arg (comm->process, "--"); diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c index 78843a28c6e9..c61478e72453 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,6 +1,6 @@ ---- src/fr-command-tar.c.orig Sun Oct 15 12:33:56 2006 -+++ src/fr-command-tar.c Mon Oct 16 19:18:03 2006 -@@ -231,6 +231,9 @@ +--- src/fr-command-tar.c.orig 2014-08-13 05:21:20 UTC ++++ src/fr-command-tar.c +@@ -236,6 +236,9 @@ begin_tar_command (FrCommand *comm) #if defined (__SVR4) && defined (__sun) if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) command = g_strdup ("/usr/sfw/bin/gtar"); diff --git a/archivers/file-roller/files/patch-src_fr-command-zip.c b/archivers/file-roller/files/patch-src_fr-command-zip.c index 5995813eb3b6..d55515487711 100644 --- a/archivers/file-roller/files/patch-src_fr-command-zip.c +++ b/archivers/file-roller/files/patch-src_fr-command-zip.c @@ -1,6 +1,6 @@ ---- src/fr-command-zip.c.orig 2010-11-16 08:32:18.000000000 +0000 -+++ src/fr-command-zip.c 2011-01-20 16:55:45.000000000 +0000 -@@ -186,7 +186,11 @@ fr_command_zip_list (FrCommand *comm) +--- src/fr-command-zip.c.orig 2015-02-15 10:13:10 UTC ++++ src/fr-command-zip.c +@@ -179,7 +179,11 @@ fr_command_zip_list (FrCommand *comm) { fr_process_set_out_line_func (comm->process, list__process_line, comm); @@ -11,8 +11,8 @@ +#endif fr_process_set_begin_func (comm->process, list__begin, comm); fr_process_add_arg (comm->process, "-ZTs"); - fr_process_add_arg (comm->process, comm->filename); -@@ -301,7 +305,11 @@ fr_command_zip_extract (FrCommand *comm + fr_process_add_arg (comm->process, "--"); +@@ -299,7 +303,11 @@ fr_command_zip_extract (FrCommand *comm process_line__common, comm); @@ -34,5 +34,5 @@ fr_process_begin_command (comm->process, "unzip"); +#endif fr_process_add_arg (comm->process, "-t"); - add_password_arg (comm, comm->password); - fr_process_add_arg (comm->process, comm->filename); + add_password_arg (comm, FR_ARCHIVE (comm)->password); + fr_process_add_arg (comm->process, "--"); diff --git a/archivers/freeze/files/patch-Makefile.in b/archivers/freeze/files/patch-Makefile.in index cb1a903c5805..52507b44f19c 100644 --- a/archivers/freeze/files/patch-Makefile.in +++ b/archivers/freeze/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- ./Makefile.in.orig 1993-02-24 14:36:56.000000000 +0100 -+++ ./Makefile.in 2014-02-13 12:44:47.785972991 +0100 -@@ -18,9 +18,9 @@ +--- Makefile.in.orig 1993-02-24 13:36:56 UTC ++++ Makefile.in +@@ -18,9 +18,9 @@ EXE = default: prog # Added the prefix macro, so that it was easier to change installation place. diff --git a/archivers/freeze/files/patch-freeze.c b/archivers/freeze/files/patch-freeze.c index e11bfc56fc92..128d63b03597 100644 --- a/archivers/freeze/files/patch-freeze.c +++ b/archivers/freeze/files/patch-freeze.c @@ -1,6 +1,6 @@ ---- ./freeze.c.orig 1993-02-24 14:36:55.000000000 +0100 -+++ ./freeze.c 2014-02-13 12:43:34.946976981 +0100 -@@ -176,7 +176,7 @@ +--- freeze.c.orig 1993-02-24 13:36:55 UTC ++++ freeze.c +@@ -176,7 +176,7 @@ void writeerr(), copystat(), version( /* From compress.c. Replace .Z --> .F etc */ diff --git a/archivers/freeze/files/patch-freeze.h b/archivers/freeze/files/patch-freeze.h index 10f052a8ab53..222843bb821d 100644 --- a/archivers/freeze/files/patch-freeze.h +++ b/archivers/freeze/files/patch-freeze.h @@ -1,5 +1,5 @@ ---- ./freeze.h.orig 1993-02-24 14:36:58.000000000 +0100 -+++ ./freeze.h 2014-02-13 12:43:34.947977110 +0100 +--- freeze.h.orig 1993-02-24 13:36:58 UTC ++++ freeze.h @@ -5,21 +5,6 @@ # include <sys/stdtypes.h> #endif diff --git a/archivers/ha/files/patch-nix_machine.c b/archivers/ha/files/patch-nix_machine.c index 0bdd3610fb1a..735343ea7fd5 100644 --- a/archivers/ha/files/patch-nix_machine.c +++ b/archivers/ha/files/patch-nix_machine.c @@ -1,19 +1,11 @@ -*** nix/machine.c.bak Thu Jan 12 09:53:00 1995 ---- nix/machine.c Tue Jan 24 19:38:07 1995 -*************** -*** 417,423 **** - if (plainname!=NULL) free(plainname),plainname=NULL; - if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) - error(1,ERR_MEM,"md_stripname()"); -! for (i=strlen(mdfullpath)-1;i>0;i--) { - if (mdfullpath[i]=='/') { - i++; - break; ---- 417,423 ---- - if (plainname!=NULL) free(plainname),plainname=NULL; - if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) - error(1,ERR_MEM,"md_stripname()"); -! for (i=strlen(mdfullpath)-1;i>=0;i--) { - if (mdfullpath[i]=='/') { - i++; - break; +--- nix/machine.c.orig 1995-01-12 06:53:00 UTC ++++ nix/machine.c +@@ -417,7 +417,7 @@ char *md_stripname(char *mdfullpath) { + if (plainname!=NULL) free(plainname),plainname=NULL; + if ((plainname=malloc(strlen(mdfullpath)+1))==NULL) + error(1,ERR_MEM,"md_stripname()"); +- for (i=strlen(mdfullpath)-1;i>0;i--) { ++ for (i=strlen(mdfullpath)-1;i>=0;i--) { + if (mdfullpath[i]=='/') { + i++; + break; diff --git a/archivers/hffzip/files/patch-Makefile b/archivers/hffzip/files/patch-Makefile index 4e275885d3ee..b8b4263a1fce 100644 --- a/archivers/hffzip/files/patch-Makefile +++ b/archivers/hffzip/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Wed Jun 11 07:59:00 2003 -+++ Makefile Wed Jun 11 08:00:47 2003 +--- Makefile.orig 2003-06-05 14:38:33 UTC ++++ Makefile @@ -1,16 +1,19 @@ -opzioni=-O3 +CFLAGS ?= ${CFLAGS} diff --git a/archivers/hlextract/files/patch-HLExtract-Main.c b/archivers/hlextract/files/patch-HLExtract-Main.c index c278a81f2bd8..5775195c39a4 100644 --- a/archivers/hlextract/files/patch-HLExtract-Main.c +++ b/archivers/hlextract/files/patch-HLExtract-Main.c @@ -1,6 +1,5 @@ -diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c ---- ../orig/HLExtract/Main.c 2011-09-17 00:41:54.000000000 -0300 -+++ ./HLExtract/Main.c 2013-02-11 18:29:02.880217165 -0200 +--- HLExtract/Main.c.orig 2016-07-26 11:59:22 UTC ++++ HLExtract/Main.c @@ -52,7 +52,7 @@ # define WIN32_LEAN_AND_MEAN # include <windows.h> @@ -10,7 +9,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c # define MAX_PATH PATH_MAX # define FOREGROUND_BLUE 0x0001 -@@ -618,15 +618,15 @@ +@@ -618,15 +618,15 @@ hlVoid PrintUsage() printf("\n"); printf("Example HLExtract usage:\n"); #ifdef _WIN32 @@ -34,7 +33,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c #endif } -@@ -657,6 +657,8 @@ +@@ -657,6 +657,8 @@ hlVoid List(FILE *pFile, HLDirectoryItem fprintf(pFile, "%s\n", lpPath); } break; @@ -43,7 +42,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } } -@@ -843,6 +845,8 @@ +@@ -843,6 +845,8 @@ HLValidation Validate(HLDirectoryItem *p PrintValidation(eValidation); printf("\n"); break; @@ -52,7 +51,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } } else -@@ -851,6 +855,8 @@ +@@ -851,6 +855,8 @@ HLValidation Validate(HLDirectoryItem *p printf(" \n"); } break; @@ -61,7 +60,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } return eValidation; -@@ -882,6 +888,8 @@ +@@ -882,6 +888,8 @@ hlVoid PrintAttribute(hlChar *lpPrefix, case HL_ATTRIBUTE_STRING: printf("%s%s: %s%s\n", lpPrefix, pAttribute->lpName, pAttribute->Value.String.lpValue, lpPostfix); break; @@ -70,7 +69,7 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } } -@@ -1151,6 +1159,8 @@ +@@ -1151,6 +1159,8 @@ hlVoid EnterConsole(hlUInt uiPackage, hl printf(" Size: %u B\n", hlFileGetSize(pSubItem)); printf(" Size On Disk: %u B\n", hlFileGetSizeOnDisk(pSubItem)); break; @@ -79,4 +78,3 @@ diff -ru ../orig/HLExtract/Main.c ./HLExtract/Main.c } uiItemCount = hlPackageGetItemAttributeCount(); -Only in ./HLExtract: Main.c.bak diff --git a/archivers/hpack.non-usa.only/files/patch-archive.c b/archivers/hpack.non-usa.only/files/patch-archive.c index 31c668f04727..7d7c6bd93ae7 100644 --- a/archivers/hpack.non-usa.only/files/patch-archive.c +++ b/archivers/hpack.non-usa.only/files/patch-archive.c @@ -1,6 +1,6 @@ ---- archive.c.orig Tue Jun 29 05:27:52 1993 -+++ archive.c Tue Dec 28 20:01:38 1999 -@@ -326,12 +326,22 @@ +--- archive.c.orig 1993-06-29 10:27:52 UTC ++++ archive.c +@@ -326,12 +326,22 @@ BOOLEAN confirmSkip( const char *str1, c void getFileName( char *fileName ) { diff --git a/archivers/hpack.non-usa.only/files/patch-cli.c b/archivers/hpack.non-usa.only/files/patch-cli.c index 92f804937070..0693258803b3 100644 --- a/archivers/hpack.non-usa.only/files/patch-cli.c +++ b/archivers/hpack.non-usa.only/files/patch-cli.c @@ -1,6 +1,6 @@ ---- cli.c.orig Sat Sep 4 22:23:48 1993 -+++ cli.c Tue Dec 28 20:01:38 1999 -@@ -724,12 +724,18 @@ +--- cli.c.orig 1993-09-05 03:23:48 UTC ++++ cli.c +@@ -724,12 +724,18 @@ static BOOLEAN checkStealthMode( char *a void doConfigFile( void ) { diff --git a/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c b/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c index 689ba37f6b94..9c951c3e4b48 100644 --- a/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c +++ b/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c @@ -1,6 +1,6 @@ ---- crypt/keymgmt.c.orig Tue Aug 17 16:56:14 1993 -+++ crypt/keymgmt.c Tue Dec 28 20:01:38 1999 -@@ -495,11 +495,24 @@ +--- crypt/keymgmt.c.orig 1993-08-17 21:56:14 UTC ++++ crypt/keymgmt.c +@@ -495,11 +495,24 @@ BOOLEAN getKey( const BOOLEAN isPemKey, FD keyFileFD, savedInFD = getInputFD(); BOOLEAN matched, firstTime = TRUE; char *matchID, firstChar; diff --git a/archivers/hpack.non-usa.only/files/patch-defs.h b/archivers/hpack.non-usa.only/files/patch-defs.h index c993b1058dba..4b885846d019 100644 --- a/archivers/hpack.non-usa.only/files/patch-defs.h +++ b/archivers/hpack.non-usa.only/files/patch-defs.h @@ -1,6 +1,6 @@ ---- defs.h.orig Mon May 31 10:17:00 1993 -+++ defs.h Tue Dec 28 20:01:38 1999 -@@ -43,7 +43,7 @@ +--- defs.h.orig 1993-05-31 15:17:00 UTC ++++ defs.h +@@ -43,7 +43,7 @@ typedef int BOOLEAN; /* 'inline' patch for compilers which can't handle this */ diff --git a/archivers/hpack.non-usa.only/files/patch-hpacklib.h b/archivers/hpack.non-usa.only/files/patch-hpacklib.h index cc178b89f5d3..5779136c41fb 100644 --- a/archivers/hpack.non-usa.only/files/patch-hpacklib.h +++ b/archivers/hpack.non-usa.only/files/patch-hpacklib.h @@ -1,5 +1,5 @@ ---- hpacklib.h.orig Thu Aug 5 04:10:40 1993 -+++ hpacklib.h Tue Dec 28 20:01:38 1999 +--- hpacklib.h.orig 1993-08-05 09:10:40 UTC ++++ hpacklib.h @@ -26,12 +26,12 @@ #include <stdio.h> /* Prototypes for generic functions */ diff --git a/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c b/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c index 2ef0a9d78471..3a601cc17dbd 100644 --- a/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c +++ b/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c @@ -1,6 +1,6 @@ ---- keycvt/keycvt.c.orig Fri Aug 13 15:06:28 1993 -+++ keycvt/keycvt.c Tue Dec 28 20:01:38 1999 -@@ -582,11 +582,21 @@ +--- keycvt/keycvt.c.orig 1993-08-13 20:06:28 UTC ++++ keycvt/keycvt.c +@@ -582,11 +582,21 @@ static void byteReverse( BYTE *regPtr, i static void getPassword( void ) { @@ -22,7 +22,7 @@ } void initCrypt( void ) -@@ -1020,27 +1030,46 @@ +@@ -1020,27 +1030,46 @@ int main( const int argc, const char *ar /* Try and find the PGP seed file */ if( ( pgpPath = getenv( "PGPPATH" ) ) == NULL ) diff --git a/archivers/hpack.non-usa.only/files/patch-keycvt_makefile b/archivers/hpack.non-usa.only/files/patch-keycvt_makefile index 7d6de4115cda..09e76e370464 100644 --- a/archivers/hpack.non-usa.only/files/patch-keycvt_makefile +++ b/archivers/hpack.non-usa.only/files/patch-keycvt_makefile @@ -1,6 +1,6 @@ ---- keycvt/makefile.orig Tue May 18 00:43:30 1993 -+++ keycvt/makefile Sun Jul 21 17:32:13 2002 -@@ -48,7 +48,7 @@ +--- keycvt/makefile.orig 1993-05-17 21:43:30 UTC ++++ keycvt/makefile +@@ -48,7 +48,7 @@ DEFINES = $(OS) PROJ = keycvt @@ -9,7 +9,7 @@ LFLAGS = -o $(PROJ) $(CMDL) # Flags for linker -@@ -60,6 +60,7 @@ +@@ -60,6 +60,7 @@ LD = $(CC) # Linker (just use the C LS = ls -l # Directory command ECHO = echo # Echo to screen command MAKE = make # The make command @@ -17,7 +17,7 @@ #**************************************************************************** #* * -@@ -71,7 +72,7 @@ +@@ -71,7 +72,7 @@ default: @$(ECHO) @$(ECHO) "To create KEYCVT you have to enter the Unix system type you want to build" @$(ECHO) "KEYCVT for. Possible options are: aix (RS6000), aix370, aix386, convex," @@ -26,16 +26,16 @@ @$(ECHO) "(Ultrix 3.x or earlier), and uts4. If none of the above fit, try" @$(ECHO) "'make generic', and send a copy of any changes necessary to the author," @$(ECHO) "pgut1@cs.aukuni.ac.nz" -@@ -128,6 +129,12 @@ - +@@ -129,6 +130,12 @@ aix386: convex: @$(MAKE) keycvt CC="cc" -+ + +freebsd: + @$(MAKE) $(PROJ) + +freebsd.install: + $(BSD_INSTALL_PROGRAM) $(PROJ) $(PREFIX)/bin - ++ # Generic: Generic BSD-ish system running gcc. Can't continue, we really # need user intervention here. + diff --git a/archivers/hpack.non-usa.only/files/patch-language_language.c b/archivers/hpack.non-usa.only/files/patch-language_language.c index c4d33be961a9..c052f184d3ad 100644 --- a/archivers/hpack.non-usa.only/files/patch-language_language.c +++ b/archivers/hpack.non-usa.only/files/patch-language_language.c @@ -1,6 +1,6 @@ ---- language/language.c.orig Wed Sep 22 21:23:20 1993 -+++ language/language.c Tue Dec 28 20:01:38 1999 -@@ -188,7 +188,7 @@ +--- language/language.c.orig 1993-09-23 02:23:20 UTC ++++ language/language.c +@@ -188,7 +188,7 @@ void showHelp( void ) /* Process user response */ response = hgetch(); response = toupper( response ); /* Damn macros */ @@ -9,7 +9,7 @@ if( response == RESPONSE_QUIT ) return; lineNo -= ( response == ' ' ) ? screenHeight : 1; -@@ -268,6 +268,9 @@ +@@ -268,6 +268,9 @@ int initMessages( const char *path, cons if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) == ERROR ) return( ERROR ); #elif defined( __UNIX__ ) @@ -19,7 +19,7 @@ /* Build path to language file and try and process it */ fileNamePtr = getFirstKeyPath( getenv( "PATH" ), DATA_FILENAME ); while( fileNamePtr != NULL ) -@@ -290,6 +293,9 @@ +@@ -290,6 +293,9 @@ int initMessages( const char *path, cons return( ERROR ); /* Couldn't find/open input file */ } #endif /* System-specific handling of how to find language defn.file */ diff --git a/archivers/hpack.non-usa.only/files/patch-system.h b/archivers/hpack.non-usa.only/files/patch-system.h index 5988653572d8..91bba18dd6d5 100644 --- a/archivers/hpack.non-usa.only/files/patch-system.h +++ b/archivers/hpack.non-usa.only/files/patch-system.h @@ -1,6 +1,6 @@ ---- system.h.orig Fri Aug 27 12:16:40 1993 -+++ system.h Tue Dec 28 20:01:38 1999 -@@ -788,7 +788,10 @@ +--- system.h.orig 1993-08-27 17:16:40 UTC ++++ system.h +@@ -788,7 +788,10 @@ void strlwr( char *string ); #elif defined( CONVEX ) #define MAX_PATH ( _POSIX_PATH_MAX + 1 ) #define MAX_FILENAME ( 254 + 1 ) @@ -12,7 +12,7 @@ #define MAX_PATH ( _POSIX_PATH_MAX + 1 ) #define MAX_FILENAME ( NAME_MAX + 1 ) #elif defined( SVR4 ) -@@ -875,7 +878,8 @@ +@@ -875,7 +878,8 @@ typedef struct { #if defined( AIX ) || defined( AIX386 ) || defined( AIX370 ) || \ defined( BSD386 ) || defined( GENERIC ) || defined( HPUX ) || \ defined( IRIX ) || defined( NEXT ) || defined( OSF1 ) || \ @@ -22,7 +22,7 @@ #define SPACE_OK TRUE #else #define SPACE_OK FALSE -@@ -948,6 +952,13 @@ +@@ -948,6 +952,13 @@ typedef struct { #elif defined( UTS4 ) /* Amdahl UTS4 */ #define NEED_STRLWR #define NEED_STRICMP diff --git a/archivers/hpack.non-usa.only/files/patch-system_unix.c b/archivers/hpack.non-usa.only/files/patch-system_unix.c index 0e67e42e5cb6..bedab817934e 100644 --- a/archivers/hpack.non-usa.only/files/patch-system_unix.c +++ b/archivers/hpack.non-usa.only/files/patch-system_unix.c @@ -1,6 +1,6 @@ ---- system/unix.c.orig Fri Aug 27 12:20:56 1993 -+++ system/unix.c Tue Dec 28 20:01:38 1999 -@@ -123,7 +123,7 @@ +--- system/unix.c.orig 1993-08-27 17:20:56 UTC ++++ system/unix.c +@@ -123,7 +123,7 @@ static int randomBufferPos = 0; #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ @@ -9,7 +9,7 @@ #include <termios.h> -@@ -144,7 +144,7 @@ +@@ -144,7 +144,7 @@ int hgetch( void ) tcgetattr( ttyFD, &ttyInfo ); #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ @@ -18,7 +18,7 @@ ttyInfo.c_lflag &= ~ECHO; ttyInfo.c_lflag &= ~ICANON; #else -@@ -183,7 +183,7 @@ +@@ -183,7 +183,7 @@ int hgetch( void ) tcgetattr( ttyFD, &ttyInfo ); #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ @@ -27,7 +27,7 @@ ttyInfo.c_lflag |= ECHO; ttyInfo.c_lflag |= ICANON; #else -@@ -728,7 +728,7 @@ +@@ -728,7 +728,7 @@ int getCountry( void ) defined( HPUX ) || defined( IRIX ) || defined( LINUX ) || \ defined( NEXT ) || defined( OSF1 ) || defined( SUNOS ) || \ defined( SVR4 ) || defined( ULTRIX ) || defined( ULTRIX_OLD ) || \ diff --git a/archivers/lbzip2/files/patch-Makefile b/archivers/lbzip2/files/patch-Makefile index c0ff177ee3de..2d1b1c5ccb51 100644 --- a/archivers/lbzip2/files/patch-Makefile +++ b/archivers/lbzip2/files/patch-Makefile @@ -1,18 +1,18 @@ ---- Makefile.orig 2009-01-25 18:27:52.000000000 +0100 -+++ Makefile 2009-02-07 18:56:15.000000000 +0100 +--- Makefile.orig 2009-04-03 22:33:49 UTC ++++ Makefile @@ -1,15 +1,10 @@ - # Makefile,v 1.8 2009-01-25 17:27:52 lacos Exp + # Makefile,v 1.9 2009/04/03 22:33:49 lacos Exp .POSIX: -CC=gcc -CFLAGS=$$($(SHELL) lfs.sh CFLAGS) -D _XOPEN_SOURCE=500 -pipe -ansi -pedantic \ - -O2 -+LDFLAGS+= -s -+LIBS+= -l pthread -l bz2 - - - - ++LDFLAGS+= -s ++LIBS+= -l pthread -l bz2 + -LDFLAGS=-s $$($(SHELL) lfs.sh LDFLAGS) -LIBS=-l pthread -l bz2 $$($(SHELL) lfs.sh LIBS) +all: lbzip2 diff --git a/archivers/lha-ac/files/patch-lha.h b/archivers/lha-ac/files/patch-src_lha.h index 56cf5ba4b970..808692bab78c 100644 --- a/archivers/lha-ac/files/patch-lha.h +++ b/archivers/lha-ac/files/patch-src_lha.h @@ -1,5 +1,5 @@ ---- src/lha.h.orig Sun Sep 21 15:58:52 2003 -+++ src/lha.h Thu Sep 23 07:10:33 2004 +--- src/lha.h.orig 2006-10-10 16:27:51 UTC ++++ src/lha.h @@ -16,6 +16,7 @@ #endif diff --git a/archivers/libarc/files/patch-Makefile b/archivers/libarc/files/patch-Makefile index 6601419ad2df..50787c4184f1 100644 --- a/archivers/libarc/files/patch-Makefile +++ b/archivers/libarc/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile Tue Jun 13 07:21:19 2000 -+++ Makefile Tue Jun 20 17:44:24 2000 -@@ -14,20 +15,30 @@ +--- Makefile.orig 2000-06-13 04:21:19 UTC ++++ Makefile +@@ -14,23 +14,33 @@ OBJS = inflate.o url.o url_file.o url_in url_hqxdecode.o url_qsdecode.o url_news.o url_newsgroup.o url_cgiesc.o \ arc_mime.o @@ -36,3 +36,6 @@ + +.c.so: + $(CC) $(CFLAGS) -fPIC -fpic -DPIC -c $(.IMPSRC) -o $(.TARGET) + install:: + test -d $(PREFIX)/lib || mkdir -p $(PREFIX)/lib + $(INSTALL) -m 444 $(LIB) $(PREFIX)/lib diff --git a/archivers/libcabinet/files/patch-Makefile b/archivers/libcabinet/files/patch-Makefile index 01e67ad0e9fc..cdf7152ad4fc 100644 --- a/archivers/libcabinet/files/patch-Makefile +++ b/archivers/libcabinet/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Aug 19 18:15:11 2003 -+++ Makefile Tue Aug 19 18:33:06 2003 +--- Makefile.orig 2016-07-26 12:03:27 UTC ++++ Makefile @@ -0,0 +1,16 @@ +NO_PROFILE= true +CXXFLAGS+= -Wno-deprecated diff --git a/archivers/libcabinet/files/patch-bstring.cpp b/archivers/libcabinet/files/patch-bstring.cpp index c4f88c8138f2..b37512ddc7b3 100644 --- a/archivers/libcabinet/files/patch-bstring.cpp +++ b/archivers/libcabinet/files/patch-bstring.cpp @@ -1,5 +1,5 @@ ---- bstring.cpp.orig 2014-07-27 11:17:34.000000000 -0400 -+++ bstring.cpp 2014-07-27 11:17:37.000000000 -0400 +--- bstring.cpp.orig 1999-10-24 11:29:53 UTC ++++ bstring.cpp @@ -15,7 +15,7 @@ #include "bstring.h" @@ -9,7 +9,7 @@ ///////////////////////////////////////*************************************** -@@ -91,7 +91,7 @@ +@@ -91,7 +91,7 @@ b_string& b_string::operator += (const c b_string b_string::operator + (const char* s) { @@ -18,7 +18,7 @@ return temp += s; } -@@ -150,7 +150,7 @@ +@@ -150,7 +150,7 @@ b_string& b_string::StpCpy(const char* s if(strlen(str) < strlen(s)) // If more memory is needed *this = s; // Use assign function else // If stpcpy can be used @@ -27,7 +27,7 @@ } return *this; // Return a refrence to this object -@@ -217,4 +217,4 @@ +@@ -217,4 +217,4 @@ istream& operator >> (istream& input, b_ //*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/ diff --git a/archivers/libcabinet/files/patch-bstring.h b/archivers/libcabinet/files/patch-bstring.h index 77047321f149..ff19e14260b7 100644 --- a/archivers/libcabinet/files/patch-bstring.h +++ b/archivers/libcabinet/files/patch-bstring.h @@ -1,5 +1,5 @@ ---- bstring.h.orig 1999-10-24 07:29:53.000000000 -0400 -+++ bstring.h 2014-02-21 16:09:56.194556928 -0500 +--- bstring.h.orig 1999-10-24 11:29:53 UTC ++++ bstring.h @@ -21,13 +21,15 @@ #ifndef __BSTRING_HPP__ #define __BSTRING_HPP__ diff --git a/archivers/libcabinet/files/patch-cfcreate.cpp b/archivers/libcabinet/files/patch-cfcreate.cpp index 029861262d78..2dd4b65325d6 100644 --- a/archivers/libcabinet/files/patch-cfcreate.cpp +++ b/archivers/libcabinet/files/patch-cfcreate.cpp @@ -1,5 +1,5 @@ ---- cfcreate.cpp.orig 1999-10-24 07:29:53.000000000 -0400 -+++ cfcreate.cpp 2014-02-21 15:48:26.812268415 -0500 +--- cfcreate.cpp.orig 1999-10-24 11:29:53 UTC ++++ cfcreate.cpp @@ -29,6 +29,10 @@ #include <unistd.h> #endif @@ -11,7 +11,7 @@ ///////////////////////////////////////*************************************** int cfc_fileinfo::write_entry(ostream& out) -@@ -129,7 +133,7 @@ +@@ -129,7 +133,7 @@ int cfc_folderinfo::add_file(const char* } } @@ -20,7 +20,7 @@ #ifndef unix if(getftime(in.rdbuf()->fd(), &datetime) != 0) return GETTIME_FAILURE; #endif -@@ -194,7 +198,7 @@ +@@ -194,7 +198,7 @@ int cfc_folderinfo::read_block(istream& unprocessed_data = NULL; // Reset buffer holder unprocessed_data_len = 0u; @@ -29,7 +29,7 @@ { delete[] buf; buf = NULL; -@@ -272,7 +276,7 @@ +@@ -272,7 +276,7 @@ int cfc_folderinfo::process_block(const return WRITE_ERROR; } diff --git a/archivers/libcabinet/files/patch-cfcreate.h b/archivers/libcabinet/files/patch-cfcreate.h index 023e4a6b9602..de0dc7e5ed41 100644 --- a/archivers/libcabinet/files/patch-cfcreate.h +++ b/archivers/libcabinet/files/patch-cfcreate.h @@ -1,5 +1,5 @@ ---- cfcreate.h.orig 1999-10-24 07:29:53.000000000 -0400 -+++ cfcreate.h 2014-02-21 15:47:18.116272433 -0500 +--- cfcreate.h.orig 1999-10-24 11:29:53 UTC ++++ cfcreate.h @@ -20,6 +20,8 @@ #include "cffile.h" #include "zlib.h" @@ -9,7 +9,7 @@ #ifdef unix #include <unistd.h> #endif -@@ -211,7 +213,7 @@ +@@ -211,7 +213,7 @@ class cfc_folderinfo : public ObjectBase int process_block(const byte* data, word datalen); int read_block(istream& in, byte* &buf, int& bytesread); int compress_block(byte* &dest, word &destlen, byte* src, word srclen); diff --git a/archivers/libcabinet/files/patch-cfdblock.cpp b/archivers/libcabinet/files/patch-cfdblock.cpp index 63e1ebde2a80..b11eb74a96db 100644 --- a/archivers/libcabinet/files/patch-cfdblock.cpp +++ b/archivers/libcabinet/files/patch-cfdblock.cpp @@ -1,5 +1,5 @@ ---- cfdblock.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cfdblock.cpp 2014-02-21 15:49:13.695264850 -0500 +--- cfdblock.cpp.orig 1999-10-24 06:13:29 UTC ++++ cfdblock.cpp @@ -17,7 +17,7 @@ #ifndef __CFDBLOCK_CPP__ #define __CFDBLOCK_CPP__ @@ -9,7 +9,7 @@ #include "cftypes.h" #include "cfdblock.h" #include "cfheader.h" -@@ -124,7 +124,7 @@ +@@ -124,7 +124,7 @@ int cabinet_datablock::read(istream& in, ra_size = cab_header.get_datablock_ra_size(); reserved_area = new byte[ra_size]; @@ -18,7 +18,7 @@ { return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF; } -@@ -154,7 +154,7 @@ +@@ -154,7 +154,7 @@ int cabinet_datablock::write(ostream& ou if(ra_size) // If reserve area, write it { diff --git a/archivers/libcabinet/files/patch-cfdblock.h b/archivers/libcabinet/files/patch-cfdblock.h index 05fa803caccd..7de70e3720fb 100644 --- a/archivers/libcabinet/files/patch-cfdblock.h +++ b/archivers/libcabinet/files/patch-cfdblock.h @@ -1,5 +1,5 @@ ---- cfdblock.h.orig 2014-02-21 15:49:53.526262379 -0500 -+++ cfdblock.h 2014-02-21 15:50:02.511261600 -0500 +--- cfdblock.h.orig 1999-10-24 06:13:29 UTC ++++ cfdblock.h @@ -14,7 +14,7 @@ #ifndef __CFDBLOCK_H__ #define __CFDBLOCK_H__ diff --git a/archivers/libcabinet/files/patch-cffdrmgr.cpp b/archivers/libcabinet/files/patch-cffdrmgr.cpp index 88210e589287..a592124c1f34 100644 --- a/archivers/libcabinet/files/patch-cffdrmgr.cpp +++ b/archivers/libcabinet/files/patch-cffdrmgr.cpp @@ -1,5 +1,5 @@ ---- cffdrmgr.cpp.orig 2014-02-21 15:50:45.048258834 -0500 -+++ cffdrmgr.cpp 2014-02-21 15:50:53.033257685 -0500 +--- cffdrmgr.cpp.orig 1999-10-24 11:29:53 UTC ++++ cffdrmgr.cpp @@ -12,7 +12,7 @@ #ifndef __CFFDRMGR_CPP__ #define __CFFDRMGR_CPP__ diff --git a/archivers/libcabinet/files/patch-cffdrmgr.h b/archivers/libcabinet/files/patch-cffdrmgr.h index 5d44fcd11ad5..9c879ee68c8e 100644 --- a/archivers/libcabinet/files/patch-cffdrmgr.h +++ b/archivers/libcabinet/files/patch-cffdrmgr.h @@ -1,5 +1,5 @@ ---- cffdrmgr.h.orig 2014-02-21 15:51:05.912257936 -0500 -+++ cffdrmgr.h 2014-02-21 15:51:13.426256130 -0500 +--- cffdrmgr.h.orig 1999-10-24 06:13:29 UTC ++++ cffdrmgr.h @@ -9,7 +9,7 @@ #ifndef __CFFDRMGR_H__ #define __CFFDRMGR_H__ diff --git a/archivers/libcabinet/files/patch-cffile.cpp b/archivers/libcabinet/files/patch-cffile.cpp index 4ccda8e072fe..b9c2414d93df 100644 --- a/archivers/libcabinet/files/patch-cffile.cpp +++ b/archivers/libcabinet/files/patch-cffile.cpp @@ -1,5 +1,5 @@ ---- cffile.cpp.orig 2014-02-21 15:52:54.235249989 -0500 -+++ cffile.cpp 2014-02-21 15:53:02.965814752 -0500 +--- cffile.cpp.orig 1999-10-24 06:13:29 UTC ++++ cffile.cpp @@ -17,7 +17,7 @@ #ifndef __CFFILE_CPP__ #define __CFFILE_CPP__ diff --git a/archivers/libcabinet/files/patch-cffile.h b/archivers/libcabinet/files/patch-cffile.h index 6bbe343a01e8..9be0bb42337f 100644 --- a/archivers/libcabinet/files/patch-cffile.h +++ b/archivers/libcabinet/files/patch-cffile.h @@ -1,5 +1,5 @@ ---- cffile.h.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cffile.h 2014-02-21 16:12:05.824389036 -0500 +--- cffile.h.orig 1999-10-24 06:13:29 UTC ++++ cffile.h @@ -15,7 +15,7 @@ #define __CFFILE_H__ @@ -9,7 +9,7 @@ #include "bstring.h" #include "cftypes.h" -@@ -161,4 +161,4 @@ +@@ -161,4 +161,4 @@ class cabinet_file_header : public cabin //////////////////////////////////////////////////////////////////////////////// diff --git a/archivers/libcabinet/files/patch-cffolder.cpp b/archivers/libcabinet/files/patch-cffolder.cpp index 8eed0dea64a9..d9b15c0fbb17 100644 --- a/archivers/libcabinet/files/patch-cffolder.cpp +++ b/archivers/libcabinet/files/patch-cffolder.cpp @@ -1,5 +1,5 @@ ---- cffolder.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cffolder.cpp 2014-02-21 15:53:49.255245183 -0500 +--- cffolder.cpp.orig 1999-10-24 06:13:29 UTC ++++ cffolder.cpp @@ -17,7 +17,7 @@ #ifndef __CFFOLDER_CPP__ #define __CFFOLDER_CPP__ @@ -9,7 +9,7 @@ #include "cftypes.h" #include "cfheader.h" #include "cffolder.h" -@@ -70,7 +70,7 @@ +@@ -70,7 +70,7 @@ Error cabinet_folder_header::read(istrea ra_size = cab_header.get_folder_ra_size(); reserved_area = new byte[ra_size]; @@ -18,7 +18,7 @@ { return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF; } -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ Error cabinet_folder_header::write(ostre if(ra_size) // If reserved area present { diff --git a/archivers/libcabinet/files/patch-cffolder.h b/archivers/libcabinet/files/patch-cffolder.h index 8aeac9d936e2..513bbdebaba0 100644 --- a/archivers/libcabinet/files/patch-cffolder.h +++ b/archivers/libcabinet/files/patch-cffolder.h @@ -1,5 +1,5 @@ ---- cffolder.h.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cffolder.h 2014-02-21 15:52:05.724747639 -0500 +--- cffolder.h.orig 1999-10-24 06:13:29 UTC ++++ cffolder.h @@ -15,7 +15,7 @@ #define __CFFOLDER_H__ @@ -9,7 +9,7 @@ #include "cftypes.h" #include "cfheader.h" -@@ -89,4 +89,5 @@ +@@ -89,4 +89,5 @@ class cabinet_folder_header : public cab //////////////////////////////////////////////////////////////////////////////// diff --git a/archivers/libcabinet/files/patch-cfheader.cpp b/archivers/libcabinet/files/patch-cfheader.cpp index 4d026b5e760a..ffa18a9dbde2 100644 --- a/archivers/libcabinet/files/patch-cfheader.cpp +++ b/archivers/libcabinet/files/patch-cfheader.cpp @@ -1,5 +1,5 @@ ---- cfheader.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cfheader.cpp 2014-02-21 16:02:37.285291121 -0500 +--- cfheader.cpp.orig 1999-10-24 06:13:29 UTC ++++ cfheader.cpp @@ -18,17 +18,23 @@ #define __CFHEADER_CPP__ @@ -26,7 +26,7 @@ ////////////////////////////////////////**************************************** // Initializes a valid fixed cabinet header -@@ -127,7 +133,7 @@ +@@ -127,7 +133,7 @@ Error cabinet_header::read(istream& in) { reserved_area = new byte[cabinet_ra_size]; @@ -35,7 +35,7 @@ { return (in.fail()) ? READ_ERROR : UNEXPECTED_EOF; } -@@ -172,7 +178,7 @@ +@@ -172,7 +178,7 @@ Error cabinet_header::write(ostream& out if(cabinet_ra_size > 0) // If has cabinet reserved area { @@ -44,7 +44,7 @@ { return WRITE_ERROR; } -@@ -210,4 +216,4 @@ +@@ -210,4 +216,4 @@ Error cabinet_header::write(ostream& out ////////////////////////////////////////**************************************** diff --git a/archivers/libcabinet/files/patch-cfheader.h b/archivers/libcabinet/files/patch-cfheader.h index 9baa26596835..c794c265e38c 100644 --- a/archivers/libcabinet/files/patch-cfheader.h +++ b/archivers/libcabinet/files/patch-cfheader.h @@ -1,5 +1,5 @@ ---- cfheader.h.orig 2014-02-21 15:42:52.379291286 -0500 -+++ cfheader.h 2014-02-21 16:02:51.918208148 -0500 +--- cfheader.h.orig 1999-10-24 06:13:29 UTC ++++ cfheader.h @@ -15,10 +15,12 @@ #define __CFHEADER_H__ diff --git a/archivers/libcabinet/files/patch-cfreader.cpp b/archivers/libcabinet/files/patch-cfreader.cpp index e68813fdf8a1..bebea6172356 100644 --- a/archivers/libcabinet/files/patch-cfreader.cpp +++ b/archivers/libcabinet/files/patch-cfreader.cpp @@ -1,5 +1,5 @@ ---- cfreader.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cfreader.cpp 2014-02-21 15:55:15.698239494 -0500 +--- cfreader.cpp.orig 1999-10-24 06:13:29 UTC ++++ cfreader.cpp @@ -22,7 +22,7 @@ #include <errno.h> #include <stdlib.h> diff --git a/archivers/libcabinet/files/patch-cfreader.h b/archivers/libcabinet/files/patch-cfreader.h index 1dba9a5085b8..af8c9703b4e3 100644 --- a/archivers/libcabinet/files/patch-cfreader.h +++ b/archivers/libcabinet/files/patch-cfreader.h @@ -1,5 +1,5 @@ ---- cfreader.h.orig 2014-02-21 16:11:11.770180090 -0500 -+++ cfreader.h 2014-02-21 16:10:41.259844074 -0500 +--- cfreader.h.orig 1999-10-24 06:13:29 UTC ++++ cfreader.h @@ -11,7 +11,7 @@ #ifndef __CFREADER_H__ #define __CFREADER_H__ diff --git a/archivers/libcabinet/files/patch-cftypes.cpp b/archivers/libcabinet/files/patch-cftypes.cpp index 437a41632e84..c3285a7b4951 100644 --- a/archivers/libcabinet/files/patch-cftypes.cpp +++ b/archivers/libcabinet/files/patch-cftypes.cpp @@ -1,5 +1,5 @@ ---- cftypes.cpp.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cftypes.cpp 2014-02-21 16:06:43.971192116 -0500 +--- cftypes.cpp.orig 1999-10-24 06:13:29 UTC ++++ cftypes.cpp @@ -10,11 +10,20 @@ #ifndef __CFTYPES_CPP__ #define __CFTYPES_CPP__ @@ -23,7 +23,7 @@ /******************************************************************************/ int convert_z_error_code(int code) -@@ -138,15 +147,20 @@ +@@ -138,15 +147,20 @@ const char* get_cabinet_error_string(int int io_read(istream& in, byte* buf, word len) { @@ -49,7 +49,7 @@ ? (in.fail()) ? READ_ERROR : UNEXPECTED_EOF : OK; } -@@ -154,14 +168,19 @@ +@@ -154,14 +168,19 @@ int io_read(istream& in, byte* buf, word int io_write(ostream& out, const byte* buf, word len) { diff --git a/archivers/libcabinet/files/patch-cftypes.h b/archivers/libcabinet/files/patch-cftypes.h index dd814b0dfab1..0c393d281208 100644 --- a/archivers/libcabinet/files/patch-cftypes.h +++ b/archivers/libcabinet/files/patch-cftypes.h @@ -1,5 +1,5 @@ ---- cftypes.h.orig 1999-10-24 02:13:29.000000000 -0400 -+++ cftypes.h 2014-02-21 15:42:11.491293648 -0500 +--- cftypes.h.orig 1999-10-24 06:13:29 UTC ++++ cftypes.h @@ -16,7 +16,10 @@ #ifndef __CFTYPES_H__ #define __CFTYPES_H__ diff --git a/archivers/libcabinet/files/patch-darray.h b/archivers/libcabinet/files/patch-darray.h index 2e28f3f879f1..3687c2748494 100644 --- a/archivers/libcabinet/files/patch-darray.h +++ b/archivers/libcabinet/files/patch-darray.h @@ -1,6 +1,6 @@ ---- darray.h.orig Sun Aug 31 05:55:31 2003 -+++ darray.h Sun Aug 31 05:55:32 2003 -@@ -155,4 +155,4 @@ +--- darray.h.orig 1999-10-24 11:29:53 UTC ++++ darray.h +@@ -155,4 +155,4 @@ void dynamic_array<ObjectType>::reset(si ///////////////////////////////////////*************************************** diff --git a/archivers/libcabinet/files/patch-listcab.cpp b/archivers/libcabinet/files/patch-listcab.cpp index b8c491785904..c46f051b7ae8 100644 --- a/archivers/libcabinet/files/patch-listcab.cpp +++ b/archivers/libcabinet/files/patch-listcab.cpp @@ -1,5 +1,5 @@ ---- listcab.cpp.orig 1999-10-24 08:11:38.000000000 -0400 -+++ listcab.cpp 2014-02-21 16:14:29.246853465 -0500 +--- listcab.cpp.orig 1999-10-24 12:11:38 UTC ++++ listcab.cpp @@ -8,8 +8,8 @@ #include <stdio.h> #include <string.h> @@ -22,7 +22,7 @@ ////////////////////////////////////////**************************************** void display_header_info(cabinet_header& cfh); -@@ -47,13 +51,19 @@ +@@ -47,13 +51,19 @@ int main(int argc, char *argv[]) cerr << "New Folder Error: " << retval << endl; return 1; } @@ -46,7 +46,7 @@ if((retval = cab.add_file(filename)) != OK) { perror("read"); -@@ -62,10 +72,13 @@ +@@ -62,10 +72,13 @@ int main(int argc, char *argv[]) return 1; } } diff --git a/archivers/libcomprex/files/patch-configure b/archivers/libcomprex/files/patch-configure index e89ad6403c2e..1e0f894717fc 100644 --- a/archivers/libcomprex/files/patch-configure +++ b/archivers/libcomprex/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2003-03-06 07:31:05.000000000 +0300 -+++ configure 2009-11-04 07:04:24.000000000 +0300 -@@ -9263,7 +9263,7 @@ +--- configure.orig 2003-03-06 04:31:05 UTC ++++ configure +@@ -9263,7 +9263,7 @@ if test "x$static_scheme_curl" = "xyes"; extern_scheme_init="$extern_scheme_init CxSchemeOps *init_curl_scheme_module(void);" load_scheme_mod="$load_scheme_mod init_curl_scheme_module();" else diff --git a/archivers/libcomprex/files/patch-header.c b/archivers/libcomprex/files/patch-modules_archive_zip_header.c index 5a6fd4b4c673..f138702ea211 100644 --- a/archivers/libcomprex/files/patch-header.c +++ b/archivers/libcomprex/files/patch-modules_archive_zip_header.c @@ -1,5 +1,5 @@ ---- modules/archive/zip/header.c.orig Sun Aug 15 18:08:32 2004 -+++ modules/archive/zip/header.c Sun Aug 15 18:08:34 2004 +--- modules/archive/zip/header.c.orig 2003-01-01 06:22:34 UTC ++++ modules/archive/zip/header.c @@ -25,7 +25,7 @@ #include "zip.h" diff --git a/archivers/libcomprex/files/patch-tests__extractarchive.c b/archivers/libcomprex/files/patch-tests__extractarchive.c index 559dcb67af68..8cf7bd09640a 100644 --- a/archivers/libcomprex/files/patch-tests__extractarchive.c +++ b/archivers/libcomprex/files/patch-tests__extractarchive.c @@ -1,5 +1,5 @@ ---- tests/extractarchive.c.orig Fri Dec 20 08:03:40 2002 -+++ tests/extractarchive.c Mon Jun 23 13:16:14 2003 +--- tests/extractarchive.c.orig 2002-12-19 23:03:40 UTC ++++ tests/extractarchive.c @@ -37,7 +37,9 @@ void __extractprogress(CxArchive *archive, CxFile *file, size_t onFile, size_t fileCount) diff --git a/archivers/liblzxcomp/files/patch-lz_nonslide.c b/archivers/liblzxcomp/files/patch-lz__nonslide.c index 339cb29f2737..a44a9f2b67c2 100644 --- a/archivers/liblzxcomp/files/patch-lz_nonslide.c +++ b/archivers/liblzxcomp/files/patch-lz__nonslide.c @@ -1,4 +1,5 @@ -Index: lz_nonslide.c +--- lz_nonslide.c.orig 2005-07-06 02:17:46 UTC ++++ lz_nonslide.c @@ -19,10 +19,11 @@ /* * Document here diff --git a/archivers/liborange/files/patch-inno.h b/archivers/liborange/files/patch-lib_inno.h index e34969a54f5e..c9e262e5258e 100644 --- a/archivers/liborange/files/patch-inno.h +++ b/archivers/liborange/files/patch-lib_inno.h @@ -1,5 +1,5 @@ ---- lib/inno.h.orig 2008-05-22 15:55:23.000000000 +1000 -+++ lib/inno.h 2008-05-22 15:57:49.000000000 +1000 +--- lib/inno.h.orig 2007-11-29 13:50:20 UTC ++++ lib/inno.h @@ -3,7 +3,7 @@ #define __inno_h__ @@ -9,7 +9,7 @@ #include <stdio.h> #include <zlib.h> -@@ -99,7 +99,7 @@ +@@ -99,7 +99,7 @@ typedef struct uint32_t NumUninstallDeleteEntries; uint32_t NumRunEntries; uint32_t NumUninstallRunEntries; @@ -18,7 +18,7 @@ } TSetupHeader; #define SETUP_HEADER_SIZE 0xd9 -@@ -143,9 +143,9 @@ +@@ -143,9 +143,9 @@ typedef enum typedef struct { @@ -31,7 +31,7 @@ } TSetupVersionData; #if 0 -@@ -172,12 +172,12 @@ +@@ -172,12 +172,12 @@ typedef struct char* InstallFontName; char* Components; char* Tasks; diff --git a/archivers/libunrar/files/patch-dll.cpp b/archivers/libunrar/files/patch-dll.cpp index a09c78f074f9..1751b68cd735 100644 --- a/archivers/libunrar/files/patch-dll.cpp +++ b/archivers/libunrar/files/patch-dll.cpp @@ -1,6 +1,6 @@ -diff -ruN unrar.orig/dll.cpp unrar/dll.cpp +--- dll.cpp.orig 2010-03-15 06:30:52 UTC +++ dll.cpp -@@ -272,7 +272,9 @@ +@@ -281,7 +281,9 @@ int PASCAL ProcessFile(HANDLE hArcData,i strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T"); Data->Cmd.Test=Operation!=RAR_EXTRACT; bool Repeat=false; diff --git a/archivers/libunrar/files/patch-dll.hpp b/archivers/libunrar/files/patch-dll.hpp index d78aea5bb571..9a075eb41c89 100644 --- a/archivers/libunrar/files/patch-dll.hpp +++ b/archivers/libunrar/files/patch-dll.hpp @@ -1,5 +1,5 @@ ---- dll.hpp 2008-11-06 01:37:37.000000000 +0100 -+++ dll.hpp 2008-11-06 01:38:47.000000000 +0100 +--- dll.hpp.orig 2010-03-15 06:30:53 UTC ++++ dll.hpp @@ -28,14 +28,14 @@ #define RAR_DLL_VERSION 4 diff --git a/archivers/libunrar/files/patch-extract.cpp b/archivers/libunrar/files/patch-extract.cpp index d52b2842361f..3343c6255c49 100644 --- a/archivers/libunrar/files/patch-extract.cpp +++ b/archivers/libunrar/files/patch-extract.cpp @@ -1,6 +1,6 @@ ---- extract.cpp.orig 2009-06-30 09:18:53.000000000 +0300 -+++ extract.cpp 2009-07-09 10:02:21.000000000 +0300 -@@ -354,6 +354,7 @@ +--- extract.cpp.orig 2010-03-15 06:30:52 UTC ++++ extract.cpp +@@ -354,6 +354,7 @@ bool CmdExtract::ExtractCurrentFile(Comm char CurVolName[NM]; strcpy(CurVolName,ArcName); diff --git a/archivers/libunrar/files/patch-makefile.unix b/archivers/libunrar/files/patch-makefile.unix index 436368432457..66ff4e0854db 100644 --- a/archivers/libunrar/files/patch-makefile.unix +++ b/archivers/libunrar/files/patch-makefile.unix @@ -1,5 +1,5 @@ ---- makefile.unix.orig 2008-10-09 15:43:06.000000000 +0200 -+++ makefile.unix 2008-11-06 01:43:52.000000000 +0100 +--- makefile.unix.orig 2009-05-03 05:18:45 UTC ++++ makefile.unix @@ -7,10 +7,11 @@ # Linux using GCC @@ -14,16 +14,16 @@ # Linux using LCC #CXX=lcc -@@ -100,7 +101,7 @@ +@@ -100,7 +101,7 @@ LINK=$(CXX) WHAT=UNRAR UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o -LIB_OBJ=filestr.o scantree.o dll.o +LIB_OBJ=dll.o - OBJECTS=rar.o strlist.o strfn.o pathfn.o int64.o savepos.o global.o file.o filefn.o filcreat.o \ + OBJECTS=rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o filefn.o filcreat.o \ archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \ -@@ -131,9 +132,15 @@ +@@ -131,9 +132,15 @@ sfx: $(OBJECTS) $(STRIP) default.sfx lib: WHAT=RARDLL diff --git a/archivers/libzip/files/patch-lib__Makefile.in b/archivers/libzip/files/patch-lib__Makefile.in index cd4d7ffaad5d..eaebfcc94cc3 100644 --- a/archivers/libzip/files/patch-lib__Makefile.in +++ b/archivers/libzip/files/patch-lib__Makefile.in @@ -1,6 +1,6 @@ ---- lib/Makefile.in.orig 2015-08-26 18:39:20 UTC +--- lib/Makefile.in.orig 2016-02-19 14:21:44 UTC +++ lib/Makefile.in -@@ -355,8 +355,8 @@ AM_CFLAGS = @CFLAG_VISIBILITY@ +@@ -367,8 +367,8 @@ AM_CFLAGS = @CFLAG_VISIBILITY@ libincludedir = ${libdir}/@PACKAGE@/include lib_LTLIBRARIES = libzip.la noinst_HEADERS = zipint.h @@ -11,7 +11,7 @@ # also update CMakeLists.txt when changing version libzip_la_LDFLAGS = -no-undefined -version-info 4:0:0 -@@ -869,8 +869,7 @@ info: info-am +@@ -882,8 +882,7 @@ info: info-am info-am: diff --git a/archivers/libzip/files/patch-libzip.pc.in b/archivers/libzip/files/patch-libzip.pc.in index 4c6607709e47..7a9a58210a00 100644 --- a/archivers/libzip/files/patch-libzip.pc.in +++ b/archivers/libzip/files/patch-libzip.pc.in @@ -1,4 +1,4 @@ ---- libzip.pc.in.orig 2014-03-08 20:13:21 UTC +--- libzip.pc.in.orig 2014-08-12 12:48:41 UTC +++ libzip.pc.in @@ -2,7 +2,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/archivers/lrzip/files/patch-lrzip__private.h b/archivers/lrzip/files/patch-lrzip__private.h index 0d0a20e66993..6cbd129a04e5 100644 --- a/archivers/lrzip/files/patch-lrzip__private.h +++ b/archivers/lrzip/files/patch-lrzip__private.h @@ -1,4 +1,4 @@ ---- lrzip_private.h.orig 2015-03-10 09:25:42 UTC +--- lrzip_private.h.orig 2016-06-09 05:01:44 UTC +++ lrzip_private.h @@ -47,7 +47,7 @@ #ifdef HAVE_ALLOCA_H diff --git a/archivers/lzo2/files/patch-include__lzo__lzodefs.h b/archivers/lzo2/files/patch-include__lzo__lzodefs.h index f72388541adc..b836430e338a 100644 --- a/archivers/lzo2/files/patch-include__lzo__lzodefs.h +++ b/archivers/lzo2/files/patch-include__lzo__lzodefs.h @@ -1,5 +1,5 @@ ---- ./include/lzo/lzodefs.h.orig 2014-06-25 15:47:13.000000000 +0200 -+++ ./include/lzo/lzodefs.h 2014-06-27 06:31:33.000000000 +0200 +--- include/lzo/lzodefs.h.orig 2015-02-04 11:24:51 UTC ++++ include/lzo/lzodefs.h @@ -29,6 +29,8 @@ #ifndef __LZODEFS_H_INCLUDED #define __LZODEFS_H_INCLUDED 1 diff --git a/archivers/macutils/files/patch-crc_makefile b/archivers/macutils/files/patch-crc_makefile index c053bcbb1716..aa88fd6aa67e 100644 --- a/archivers/macutils/files/patch-crc_makefile +++ b/archivers/macutils/files/patch-crc_makefile @@ -1,12 +1,12 @@ ---- crc/makefile.orig Sun Oct 19 01:17:42 2003 -+++ crc/makefile Sun Oct 19 01:18:15 2003 +--- crc/makefile.orig 1993-10-02 20:16:00 UTC ++++ crc/makefile @@ -1,4 +1,4 @@ -CFLAGS = -O $(CF) +CFLAGS += $(CF) CRCC = arc.c ccitt.c kermit.c binhex.c ccitt32.c zip.c CRCO = arc.o ccitt.o kermit.o binhex.o ccitt32.o zip.o -@@ -16,7 +16,7 @@ +@@ -16,7 +16,7 @@ $(CRCC): makecrc ./makecrc makecrc: makecrc.o diff --git a/archivers/macutils/files/patch-hexbin_globals.h b/archivers/macutils/files/patch-hexbin_globals.h index b5ec39483f06..7fb9c127602e 100644 --- a/archivers/macutils/files/patch-hexbin_globals.h +++ b/archivers/macutils/files/patch-hexbin_globals.h @@ -1,6 +1,6 @@ ---- hexbin/globals.h.orig Fri Apr 16 00:28:16 1999 -+++ hexbin/globals.h Fri Apr 16 00:28:25 1999 -@@ -13,7 +13,7 @@ +--- hexbin/globals.h.orig 1993-10-02 20:16:00 UTC ++++ hexbin/globals.h +@@ -13,7 +13,7 @@ extern void transname(); extern char info[]; extern char trname[]; diff --git a/archivers/macutils/files/patch-macunpack_cpt.h b/archivers/macutils/files/patch-macunpack_cpt.h index 0fbd808f7db8..94a77a576eed 100644 --- a/archivers/macutils/files/patch-macunpack_cpt.h +++ b/archivers/macutils/files/patch-macunpack_cpt.h @@ -1,5 +1,5 @@ ---- macunpack/cpt.h.orig Fri Apr 16 00:31:28 1999 -+++ macunpack/cpt.h Fri Apr 16 00:32:07 1999 +--- macunpack/cpt.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/cpt.h @@ -31,7 +31,7 @@ typedef long OSType; @@ -9,7 +9,7 @@ unsigned char signature; /* = 1 -- for verification */ unsigned char volume; /* for multi-file archives */ unsigned short xmagic; /* verification multi-file consistency*/ -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ typedef struct cptHdr { /* 8 bytes */ unsigned char commentsize; /* number of bytes comment that follow*/ }; diff --git a/archivers/macutils/files/patch-macunpack_dd.c b/archivers/macutils/files/patch-macunpack_dd.c index 83ae8b721f64..953e85584db3 100644 --- a/archivers/macutils/files/patch-macunpack_dd.c +++ b/archivers/macutils/files/patch-macunpack_dd.c @@ -1,6 +1,6 @@ ---- macunpack/dd.c.orig Fri Apr 16 00:26:39 1999 -+++ macunpack/dd.c Fri Apr 16 00:26:45 1999 -@@ -45,7 +45,7 @@ +--- macunpack/dd.c.orig 1993-10-02 20:16:00 UTC ++++ macunpack/dd.c +@@ -45,7 +45,7 @@ static int dd_getbits(); #endif /* UNTESTED */ static void dd_cpt_compat(); diff --git a/archivers/macutils/files/patch-macunpack_dd.h b/archivers/macutils/files/patch-macunpack_dd.h index 1e60f45f1515..dff85ca8f99d 100644 --- a/archivers/macutils/files/patch-macunpack_dd.h +++ b/archivers/macutils/files/patch-macunpack_dd.h @@ -1,5 +1,5 @@ ---- macunpack/dd.h.orig Fri Apr 16 00:25:41 1999 -+++ macunpack/dd.h Fri Apr 16 00:25:55 1999 +--- macunpack/dd.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/dd.h @@ -52,7 +52,7 @@ typedef long OSType; @@ -9,7 +9,7 @@ unsigned char magic[4]; /* "DDAR" */ unsigned char fill1[4]; /* ??? */ unsigned char fName[64]; /* a STR63 */ -@@ -73,7 +73,7 @@ +@@ -73,7 +73,7 @@ typedef struct fileHdr { /* 124 bytes * unsigned short hdrcrc; /* true crc */ }; diff --git a/archivers/macutils/files/patch-macunpack_jdw.h b/archivers/macutils/files/patch-macunpack_jdw.h index 4eca92c2636b..8699e8fd2e26 100644 --- a/archivers/macutils/files/patch-macunpack_jdw.h +++ b/archivers/macutils/files/patch-macunpack_jdw.h @@ -1,5 +1,5 @@ ---- macunpack/jdw.h.orig Fri Apr 16 00:13:34 1999 -+++ macunpack/jdw.h Fri Apr 16 00:13:37 1999 +--- macunpack/jdw.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/jdw.h @@ -8,7 +8,7 @@ #define J_MTIME 34 #define J_FLENGTH 38 diff --git a/archivers/macutils/files/patch-macunpack_lzc.h b/archivers/macutils/files/patch-macunpack_lzc.h index d68cac214f63..2141a2a8e85c 100644 --- a/archivers/macutils/files/patch-macunpack_lzc.h +++ b/archivers/macutils/files/patch-macunpack_lzc.h @@ -1,5 +1,5 @@ ---- macunpack/lzc.h.orig Fri Apr 16 00:29:28 1999 -+++ macunpack/lzc.h Fri Apr 16 00:29:36 1999 +--- macunpack/lzc.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/lzc.h @@ -12,7 +12,7 @@ #define C_AUTHOFF 36 #define C_FLAGOFF 40 diff --git a/archivers/macutils/files/patch-macunpack_lzh.c b/archivers/macutils/files/patch-macunpack_lzh.c index d52b1ed742e7..95db98290162 100644 --- a/archivers/macutils/files/patch-macunpack_lzh.c +++ b/archivers/macutils/files/patch-macunpack_lzh.c @@ -1,6 +1,6 @@ ---- macunpack/lzh.c.orig 2014-07-27 11:11:36.000000000 -0400 -+++ macunpack/lzh.c 2014-07-27 11:11:39.000000000 -0400 -@@ -23,7 +23,7 @@ +--- macunpack/lzh.c.orig 1993-10-02 20:16:00 UTC ++++ macunpack/lzh.c +@@ -23,7 +23,7 @@ extern void de_lzah(); extern unsigned char (*lzah_getbyte)(); extern void de_lzh(); @@ -9,7 +9,7 @@ char *name; int number; }; -@@ -40,13 +40,13 @@ +@@ -40,13 +40,13 @@ static struct methodinfo methods[] = { {"-lzs-", lzs} }; static char *lzh_archive; diff --git a/archivers/macutils/files/patch-macunpack_lzh.h b/archivers/macutils/files/patch-macunpack_lzh.h index 902138b785ff..bdd51ad9da3c 100644 --- a/archivers/macutils/files/patch-macunpack_lzh.h +++ b/archivers/macutils/files/patch-macunpack_lzh.h @@ -1,5 +1,5 @@ ---- macunpack/lzh.h.orig Fri Apr 16 00:24:44 1999 -+++ macunpack/lzh.h Fri Apr 16 00:24:58 1999 +--- macunpack/lzh.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/lzh.h @@ -30,7 +30,7 @@ #define L_EEXTENDSZ 0 #define L_EEXTEND 1 diff --git a/archivers/macutils/files/patch-macunpack_sit.c b/archivers/macutils/files/patch-macunpack_sit.c index b5574ae7b748..c1000b9a779f 100644 --- a/archivers/macutils/files/patch-macunpack_sit.c +++ b/archivers/macutils/files/patch-macunpack_sit.c @@ -1,6 +1,6 @@ ---- macunpack/sit.c.orig Fri Apr 16 00:18:28 1999 -+++ macunpack/sit.c Fri Apr 16 00:18:34 1999 -@@ -19,7 +19,7 @@ +--- macunpack/sit.c.orig 1993-10-02 20:16:00 UTC ++++ macunpack/sit.c +@@ -19,7 +19,7 @@ extern void set_huffman(); extern void de_lzah(); extern unsigned char (*lzah_getbyte)(); diff --git a/archivers/macutils/files/patch-macunpack_sit.h b/archivers/macutils/files/patch-macunpack_sit.h index 8cfc5459da91..fcf1f0878ae9 100644 --- a/archivers/macutils/files/patch-macunpack_sit.h +++ b/archivers/macutils/files/patch-macunpack_sit.h @@ -1,5 +1,5 @@ ---- macunpack/sit.h.orig Fri Apr 16 00:15:41 1999 -+++ macunpack/sit.h Fri Apr 16 00:15:56 1999 +--- macunpack/sit.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/sit.h @@ -24,7 +24,7 @@ typedef long OSType; @@ -9,7 +9,7 @@ OSType signature; /* = 'SIT!' -- for verification */ unsigned short numFiles; /* number of files in archive */ unsigned long arcLength; /* length of entire archive incl. -@@ -34,7 +34,7 @@ +@@ -34,7 +34,7 @@ typedef struct sitHdr { /* 22 bytes */ char reserved[7]; }; diff --git a/archivers/macutils/files/patch-macunpack_stf.h b/archivers/macutils/files/patch-macunpack_stf.h index 20c7d02dea73..19f4404b2506 100644 --- a/archivers/macutils/files/patch-macunpack_stf.h +++ b/archivers/macutils/files/patch-macunpack_stf.h @@ -1,5 +1,5 @@ ---- macunpack/stf.h.orig Fri Apr 16 00:22:12 1999 -+++ macunpack/stf.h Fri Apr 16 00:22:19 1999 +--- macunpack/stf.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/stf.h @@ -5,7 +5,7 @@ #define S_RSRCLNGTH 3 /* + NAMELENGTH */ #define S_DATALNGTH 7 /* + NAMELENGTH */ diff --git a/archivers/macutils/files/patch-macunpack_zma.h b/archivers/macutils/files/patch-macunpack_zma.h index 6dac05bda456..05db6614ef29 100644 --- a/archivers/macutils/files/patch-macunpack_zma.h +++ b/archivers/macutils/files/patch-macunpack_zma.h @@ -1,5 +1,5 @@ ---- macunpack/zma.h.orig Fri Apr 16 01:04:19 1999 -+++ macunpack/zma.h Fri Apr 16 01:04:29 1999 +--- macunpack/zma.h.orig 1993-10-02 20:16:00 UTC ++++ macunpack/zma.h @@ -20,7 +20,7 @@ #define Z_RCRC 44 /* Resource crc */ #define Z_FNAME 46 /* File name length and name */ diff --git a/archivers/macutils/files/patch-makefile b/archivers/macutils/files/patch-makefile index 080da53c7ae2..0c381564f8d5 100644 --- a/archivers/macutils/files/patch-makefile +++ b/archivers/macutils/files/patch-makefile @@ -1,12 +1,12 @@ ---- makefile.orig Sun Oct 3 05:16:00 1993 -+++ makefile Sat Jun 10 13:35:16 2000 +--- makefile.orig 1993-10-02 20:16:00 UTC ++++ makefile @@ -1,5 +1,4 @@ SHELL = /bin/sh -BINDIR = /ufs/dik/tmpbin # Use the following flags on the CF macro definition as needed. # # -DBSD if you are on a BSD system -@@ -24,44 +23,44 @@ +@@ -24,44 +23,44 @@ BINDIR = /ufs/dik/tmpbin # # -DAPPLEDOUBLE if you want to be able to use an AppleDouble file system # diff --git a/archivers/macutils/files/patch-util_transname.c b/archivers/macutils/files/patch-util_transname.c index 325ecdab60bd..22d615288a20 100644 --- a/archivers/macutils/files/patch-util_transname.c +++ b/archivers/macutils/files/patch-util_transname.c @@ -1,5 +1,5 @@ ---- util/transname.c.orig Fri Apr 16 00:02:36 1999 -+++ util/transname.c Fri Apr 16 00:02:38 1999 +--- util/transname.c.orig 1993-10-02 20:16:00 UTC ++++ util/transname.c @@ -1,5 +1,5 @@ #include <sys/types.h> -#include <sys/dir.h> diff --git a/archivers/mscompress/files/patch-mscompress.c b/archivers/mscompress/files/patch-mscompress.c index 5184992ab5dc..6b2181be9ac9 100644 --- a/archivers/mscompress/files/patch-mscompress.c +++ b/archivers/mscompress/files/patch-mscompress.c @@ -1,5 +1,5 @@ ---- mscompress.c.orig 2011-12-22 00:20:22.000000000 +0800 -+++ mscompress.c 2011-12-22 00:20:29.000000000 +0800 +--- mscompress.c.orig 2000-04-15 13:15:38 UTC ++++ mscompress.c @@ -306,7 +306,7 @@ usage (char *progname) exit (0); } diff --git a/archivers/mscompress/files/patch-msexpand.c b/archivers/mscompress/files/patch-msexpand.c index fe4eb61de5aa..781a778fd7c4 100644 --- a/archivers/mscompress/files/patch-msexpand.c +++ b/archivers/mscompress/files/patch-msexpand.c @@ -1,5 +1,5 @@ ---- msexpand.c.orig 2011-12-22 00:20:38.000000000 +0800 -+++ msexpand.c 2011-12-22 00:20:44.000000000 +0800 +--- msexpand.c.orig 2000-04-15 13:15:45 UTC ++++ msexpand.c @@ -215,7 +215,7 @@ usage (char *progname) exit (0); } diff --git a/archivers/p5-Compress-LZO/files/patch-Makefile.PL b/archivers/p5-Compress-LZO/files/patch-Makefile.PL index 058110fee105..e96c66e5cf58 100644 --- a/archivers/p5-Compress-LZO/files/patch-Makefile.PL +++ b/archivers/p5-Compress-LZO/files/patch-Makefile.PL @@ -1,6 +1,6 @@ ---- Makefile.PL.orig 1998-08-23 18:14:41.000000000 +0800 -+++ Makefile.PL 2011-12-06 09:11:59.832206442 +0800 -@@ -14,6 +14,8 @@ +--- Makefile.PL.orig 1998-08-23 10:14:41 UTC ++++ Makefile.PL +@@ -14,6 +14,8 @@ use Config; # installed. #$LZO_LIB = '-L/usr/local/lib'; @@ -9,7 +9,7 @@ # It shouldn't be necessary to change anything from here on. -@@ -21,7 +23,7 @@ +@@ -21,7 +23,7 @@ use Config; WriteMakefile( NAME => 'Compress::LZO', VERSION_FROM => 'LZO.pm', diff --git a/archivers/p5-IO-Zlib/files/patch-Zlib.pm b/archivers/p5-IO-Zlib/files/patch-Zlib.pm index 0fa9323ccb77..4ff6310c14c7 100644 --- a/archivers/p5-IO-Zlib/files/patch-Zlib.pm +++ b/archivers/p5-IO-Zlib/files/patch-Zlib.pm @@ -1,6 +1,6 @@ ---- Zlib.pm.orig Sun Feb 13 00:43:08 2005 -+++ Zlib.pm Sun Feb 13 00:43:30 2005 -@@ -297,7 +297,7 @@ +--- Zlib.pm.orig 2009-07-14 21:30:41 UTC ++++ Zlib.pm +@@ -289,7 +289,7 @@ use strict; use vars qw($VERSION $AUTOLOAD @ISA); use Carp; diff --git a/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp b/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp index 2ff5cd79e848..e01719cb0514 100644 --- a/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp +++ b/archivers/p7zip/files/patch-CPP_7zip_Archive_HfsHandler.cpp @@ -1,9 +1,9 @@ Patch for CVE-2016-2334. Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/ ---- CPP/7zip/Archive/HfsHandler.cpp.orig Fri Jun 19 06:52:08 2015 -+++ CPP/7zip/Archive/HfsHandler.cpp Mon May 23 20:37:42 2016 -@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFork &fork, cons +--- CPP/7zip/Archive/HfsHandler.cpp.orig 2015-06-19 10:52:08 UTC ++++ CPP/7zip/Archive/HfsHandler.cpp +@@ -987,7 +987,9 @@ HRESULT CDatabase::LoadCatalog(const CFo item.GroupID = Get32(r + 0x24); item.AdminFlags = r[0x28]; item.OwnerFlags = r[0x29]; @@ -13,13 +13,13 @@ Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b item.special.iNodeNum = Get16(r + 0x2C); // or .linkCount item.FileType = Get32(r + 0x30); item.FileCreator = Get32(r + 0x34); -@@ -1571,6 +1573,9 @@ HRESULT CHandler::ExtractZlibFile( - blockSize = (UInt32)rem; +@@ -1572,6 +1574,9 @@ HRESULT CHandler::ExtractZlibFile( UInt32 size = GetUi32(tableBuf + i * 8 + 4); -+ + + if (size > buf.Size() || size > kCompressionBlockSize + 1) + return S_FALSE; - ++ RINOK(ReadStream_FALSE(inStream, buf, size)); + if ((buf[0] & 0xF) == 0xF) diff --git a/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp b/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp index 54c50066a2ef..a8e754d18f17 100644 --- a/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp +++ b/archivers/p7zip/files/patch-CPP_7zip_Archive_Udf_UdfIn.cpp @@ -1,9 +1,9 @@ Patch for CVE-2016-2335. Obtained from: https://sourceforge.net/p/p7zip/discussion/383043/thread/9d0fb86b/ ---- CPP/7zip/Archive/Udf/UdfIn.cpp.orig Fri Nov 20 15:40:08 2015 -+++ CPP/7zip/Archive/Udf/UdfIn.cpp Mon May 23 20:37:46 2016 -@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int volIndex, int fsI +--- CPP/7zip/Archive/Udf/UdfIn.cpp.orig 2015-11-20 20:40:08 UTC ++++ CPP/7zip/Archive/Udf/UdfIn.cpp +@@ -389,7 +389,11 @@ HRESULT CInArchive::ReadFileItem(int vol return S_FALSE; CFile &file = Files.Back(); const CLogVol &vol = LogVols[volIndex]; diff --git a/archivers/p7zip/files/patch-CPP-Windows-System.cpp b/archivers/p7zip/files/patch-CPP_Windows_System.cpp index 467aceaccba2..4214f0888b95 100644 --- a/archivers/p7zip/files/patch-CPP-Windows-System.cpp +++ b/archivers/p7zip/files/patch-CPP_Windows_System.cpp @@ -1,4 +1,4 @@ ---- CPP/Windows/System.cpp.orig 2015-09-26 08:47:01 UTC +--- CPP/Windows/System.cpp.orig 2015-11-20 21:33:04 UTC +++ CPP/Windows/System.cpp @@ -44,7 +44,7 @@ namespace NWindows #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) diff --git a/archivers/packddir/files/patch-upackddir.c b/archivers/packddir/files/patch-upackddir.c index 64a51e301916..8972f60fa251 100644 --- a/archivers/packddir/files/patch-upackddir.c +++ b/archivers/packddir/files/patch-upackddir.c @@ -1,6 +1,6 @@ ---- upackddir.c.orig 2009-08-22 04:48:16.000000000 +0900 -+++ upackddir.c 2009-08-22 04:48:39.000000000 +0900 -@@ -253,7 +253,7 @@ +--- upackddir.c.orig 2004-01-17 12:08:52 UTC ++++ upackddir.c +@@ -253,7 +253,7 @@ int packfile_extract(char *packfile, int } /* Let's jump to the beginning of our sweet data */ @@ -9,7 +9,7 @@ for (i = 0; i < pack->numfiles; i++) { fprintf(stderr, "%s\n", mapped->name); -@@ -297,7 +297,7 @@ +@@ -297,7 +297,7 @@ int packfile_extract_filename(char *pack } /* Let's jump to the beginning of our sweet data */ diff --git a/archivers/paq/files/patch-zpaq.cpp b/archivers/paq/files/patch-zpaq.cpp index 4b39843d73af..56b513320dc4 100644 --- a/archivers/paq/files/patch-zpaq.cpp +++ b/archivers/paq/files/patch-zpaq.cpp @@ -1,6 +1,6 @@ ---- zpaq.cpp.orig 2013-02-07 12:39:36.000000000 -0500 -+++ zpaq.cpp 2013-02-07 12:39:51.000000000 -0500 -@@ -1089,24 +1089,7 @@ +--- zpaq.cpp.orig 2016-07-26 12:11:37 UTC ++++ zpaq.cpp +@@ -1236,24 +1236,7 @@ int numberOfProcessors() { int rc=0; // result #ifdef unix diff --git a/archivers/paq/files/patch_zpsfx.cpp b/archivers/paq/files/patch_zpsfx.cpp index a23211719c1c..5f6031b53128 100644 --- a/archivers/paq/files/patch_zpsfx.cpp +++ b/archivers/paq/files/patch_zpsfx.cpp @@ -1,6 +1,6 @@ ---- zpsfx.cpp.orig 2012-04-09 04:01:23.000000000 -0400 -+++ zpsfx.cpp 2012-04-09 04:02:25.000000000 -0400 -@@ -16,19 +16,38 @@ +--- zpsfx.cpp.orig 2016-07-26 12:10:41 UTC ++++ zpsfx.cpp +@@ -16,19 +16,38 @@ Or use appropriate optimization options. the executable smaller. -DNDEBUG turns off run time checks. To convert a ZPAQ archive to a self extracting archive: @@ -39,7 +39,7 @@ The program reads itself and decompresses the appended archive. You must enter the .exe extension as shown. If the file is not in the current folder then you need to specify the path. The PATH environment -@@ -44,7 +63,11 @@ +@@ -44,7 +63,11 @@ stored filename. SHA-1 checksums are not #include <stdio.h> #include <stdlib.h> #include <string> @@ -51,7 +51,7 @@ // An error handler is required as shown in this example. libzpaq will // call it with an English language message in case of a fatal error. -@@ -96,7 +119,11 @@ +@@ -96,7 +119,11 @@ struct Buf: public libzpaq::Writer { // Return '/' in Linux or '\' in Windows char slash() { @@ -63,7 +63,7 @@ } // Create directories as needed. For example if path="/tmp/foo/bar" -@@ -106,7 +133,11 @@ +@@ -106,7 +133,11 @@ void makepath(std::string& path) { for (int i=0; i<path.size(); ++i) { if (path[i]=='\\' || path[i]=='/') { path[i]=0; diff --git a/archivers/par2cmdline-tbb/files/patch-configure b/archivers/par2cmdline-tbb/files/patch-configure index 8022ce18c3c8..4b77ca91ed59 100644 --- a/archivers/par2cmdline-tbb/files/patch-configure +++ b/archivers/par2cmdline-tbb/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2009-02-09 06:07:02.000000000 +0100 -+++ configure 2009-02-09 06:09:27.000000000 +0100 -@@ -4113,7 +4113,7 @@ +--- configure.orig 2009-02-03 05:15:30 UTC ++++ configure +@@ -4113,7 +4113,7 @@ _ACEOF case "$host_cpu" in diff --git a/archivers/par2cmdline-tbb/files/patch-par2cmdline.h b/archivers/par2cmdline-tbb/files/patch-par2cmdline.h index e63c118471df..b58d2e5109f7 100644 --- a/archivers/par2cmdline-tbb/files/patch-par2cmdline.h +++ b/archivers/par2cmdline-tbb/files/patch-par2cmdline.h @@ -1,6 +1,6 @@ ---- par2cmdline.h.orig 2010-08-28 00:21:07.730518551 +0200 -+++ par2cmdline.h 2010-08-28 00:21:42.779186595 +0200 -@@ -428,6 +428,7 @@ +--- par2cmdline.h.orig 2009-02-03 05:14:49 UTC ++++ par2cmdline.h +@@ -428,6 +428,7 @@ typedef enum Result #include <vector> #include <map> #include <algorithm> diff --git a/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp b/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp index b275a374dfb6..60de68ab300e 100644 --- a/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp +++ b/archivers/par2cmdline/files/patch-par2creatorsourcefile.cpp @@ -1,6 +1,6 @@ ---- par2creatorsourcefile.cpp.orig 2009-03-10 07:10:35.860499029 +0000 -+++ par2creatorsourcefile.cpp 2009-03-10 07:12:53.111712521 +0000 -@@ -224,6 +224,10 @@ +--- par2creatorsourcefile.cpp.orig 2004-04-15 13:45:23 UTC ++++ par2creatorsourcefile.cpp +@@ -224,6 +224,10 @@ bool Par2CreatorSourceFile::Open(Command cout << newfraction/10 << '.' << newfraction%10 << "%\r" << flush; } } diff --git a/archivers/par2cmdline/files/patch-par2fileformat.h b/archivers/par2cmdline/files/patch-par2fileformat.h index 8b2a7642cddf..b89635e08205 100644 --- a/archivers/par2cmdline/files/patch-par2fileformat.h +++ b/archivers/par2cmdline/files/patch-par2fileformat.h @@ -1,6 +1,6 @@ ---- par2fileformat.h.orig 2011-06-23 08:31:37.639455018 +0200 -+++ par2fileformat.h 2011-06-23 08:38:29.287362503 +0200 -@@ -84,7 +84,7 @@ +--- par2fileformat.h.orig 2003-08-01 23:43:40 UTC ++++ par2fileformat.h +@@ -84,7 +84,7 @@ struct FILEVERIFICATIONPACKET PACKET_HEADER header; // Body MD5Hash fileid; // MD5hash of file_hash_16k, file_length, file_name diff --git a/archivers/par2cmdline/files/patch-reedsolomon.cpp b/archivers/par2cmdline/files/patch-reedsolomon.cpp index 279479af1dc5..8738aec6479a 100644 --- a/archivers/par2cmdline/files/patch-reedsolomon.cpp +++ b/archivers/par2cmdline/files/patch-reedsolomon.cpp @@ -1,6 +1,6 @@ ---- ./reedsolomon.cpp.orig Tue May 27 02:01:31 2003 -+++ ./reedsolomon.cpp Fri Mar 23 00:49:59 2007 -@@ -51,7 +51,7 @@ +--- reedsolomon.cpp.orig 2003-05-26 18:01:31 UTC ++++ reedsolomon.cpp +@@ -51,7 +51,7 @@ u32 gcd(u32 a, u32 b) } } @@ -9,7 +9,7 @@ { inputcount = (u32)present.size(); -@@ -80,7 +80,7 @@ +@@ -80,7 +80,7 @@ bool ReedSolomon<Galois8>::SetInput(cons return true; } @@ -18,7 +18,7 @@ { inputcount = count; -@@ -101,7 +101,7 @@ +@@ -101,7 +101,7 @@ bool ReedSolomon<Galois8>::SetInput(u32 return true; } @@ -27,7 +27,7 @@ { // Look up the appropriate element in the RS matrix Galois8 factor = leftmatrix[outputindex * (datapresent + datamissing) + inputindex]; -@@ -189,7 +189,7 @@ +@@ -189,7 +189,7 @@ bool ReedSolomon<Galois8>::Process(size_ // Set which of the source files are present and which are missing // and compute the base values to use for the vandermonde matrix. @@ -36,7 +36,7 @@ { inputcount = (u32)present.size(); -@@ -233,7 +233,7 @@ +@@ -233,7 +233,7 @@ bool ReedSolomon<Galois16>::SetInput(con // Record that the specified number of source files are all present // and compute the base values to use for the vandermonde matrix. @@ -45,7 +45,7 @@ { inputcount = count; -@@ -267,7 +267,7 @@ +@@ -267,7 +267,7 @@ bool ReedSolomon<Galois16>::SetInput(u32 return true; } diff --git a/archivers/peazip/files/patch-peach.pas b/archivers/peazip/files/patch-peach.pas index ceb82e41270b..35a5bc967c7d 100644 --- a/archivers/peazip/files/patch-peach.pas +++ b/archivers/peazip/files/patch-peach.pas @@ -1,6 +1,6 @@ ---- peach.pas 2016-01-27 13:08:24.382120000 -0500 -+++ peach.pas 2016-01-27 13:17:34.207034000 -0500 -@@ -4445,6 +4445,7 @@ +--- peach.pas.orig 2016-07-26 12:13:05 UTC ++++ peach.pas +@@ -4468,6 +4468,7 @@ const APPLICATION5 = ''; APPLICATION6 = ''; APPLICATION7 = ''; @@ -8,7 +8,7 @@ {$ENDIF} {$IFDEF NETBSD} EXEEXT = ''; -@@ -4455,6 +4456,7 @@ +@@ -4478,6 +4479,7 @@ const APPLICATION5 = ''; APPLICATION6 = ''; APPLICATION7 = ''; @@ -16,7 +16,7 @@ {$ENDIF} {$IFDEF DARWIN} EXEEXT = ''; -@@ -4465,6 +4467,7 @@ +@@ -4488,6 +4490,7 @@ const APPLICATION5 = ''; APPLICATION6 = ''; APPLICATION7 = ''; diff --git a/archivers/pecl-rar/files/patch-config.m4 b/archivers/pecl-rar/files/patch-config.m4 index cb5a85fa4790..2144e19820aa 100644 --- a/archivers/pecl-rar/files/patch-config.m4 +++ b/archivers/pecl-rar/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orgi 2013-05-28 16:35:29.000000000 +0800 -+++ config.m4 2013-05-28 16:35:47.000000000 +0800 -@@ -27,6 +27,6 @@ +--- config.m4.orig 2013-10-14 15:30:44 UTC ++++ config.m4 +@@ -27,6 +27,6 @@ if test "$PHP_RAR" != "no"; then PHP_REQUIRE_CXX() PHP_ADD_LIBRARY_WITH_PATH(stdc++, "", RAR_SHARED_LIBADD) diff --git a/archivers/php5-snappy/files/patch-config.m4 b/archivers/php5-snappy/files/patch-config.m4 index fef0debcffc5..ee75b443f980 100644 --- a/archivers/php5-snappy/files/patch-config.m4 +++ b/archivers/php5-snappy/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2011-09-07 10:27:21.000000000 +0200 -+++ config.m4 2014-05-17 13:31:39.000000000 +0200 -@@ -53,7 +53,7 @@ +--- config.m4.orig 2011-09-07 08:27:21 UTC ++++ config.m4 +@@ -53,7 +53,7 @@ if test "$PHP_SNAPPY" != "no"; then if test "$PHP_SNAPPY_INCLUDEDIR" != "no" && test "$PHP_SNAPPY_INCLUDEDIR" != "yes"; then if test -r "$PHP_SNAPPY_INCLUDEDIR/snappy.h"; then @@ -9,7 +9,7 @@ else AC_MSG_ERROR([Can't find snappy headers under "$PHP_SNAPPY_INCLUDEDIR"]) fi -@@ -61,12 +61,12 @@ +@@ -61,12 +61,12 @@ if test "$PHP_SNAPPY" != "no"; then SEARCH_PATH="/usr/local /usr" # you might want to change this SEARCH_FOR="/include/snappy-c.h" # you most likely want to change this if test -r $PHP_SNAPPY/$SEARCH_FOR; then # path given as parameter @@ -24,7 +24,7 @@ AC_MSG_RESULT(found in $i) fi done -@@ -80,7 +80,7 @@ +@@ -80,7 +80,7 @@ if test "$PHP_SNAPPY" != "no"; then dnl # add include path @@ -33,7 +33,7 @@ dnl # check for lib -@@ -90,7 +90,7 @@ +@@ -90,7 +90,7 @@ if test "$PHP_SNAPPY" != "no"; then AC_LANG_CPLUSPLUS AC_TRY_COMPILE( [ diff --git a/archivers/php55-phar/files/patch-config.m4 b/archivers/php55-phar/files/patch-config.m4 index 1a981bfefdc1..5e5d281265b7 100644 --- a/archivers/php55-phar/files/patch-config.m4 +++ b/archivers/php55-phar/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2011-11-25 15:31:20.000000000 +0100 -+++ config.m4 2011-11-25 15:47:45.000000000 +0100 -@@ -4,8 +4,38 @@ +--- config.m4.orig 2016-06-21 11:11:59 UTC ++++ config.m4 +@@ -4,8 +4,38 @@ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) diff --git a/archivers/php55-phar/files/patch-phar.c b/archivers/php55-phar/files/patch-phar.c index 231ec40a8423..ae3b3230e526 100644 --- a/archivers/php55-phar/files/patch-phar.c +++ b/archivers/php55-phar/files/patch-phar.c @@ -1,6 +1,6 @@ ---- phar.c.orig 2011-11-25 15:38:44.000000000 +0100 -+++ phar.c 2011-11-25 15:39:01.000000000 +0100 -@@ -3716,7 +3716,7 @@ +--- phar.c.orig 2016-06-21 11:11:59 UTC ++++ phar.c +@@ -3651,7 +3651,7 @@ static const zend_module_dep phar_deps[] ZEND_MOD_OPTIONAL("openssl") ZEND_MOD_OPTIONAL("zlib") ZEND_MOD_OPTIONAL("standard") diff --git a/archivers/php55-zip/files/patch-config.m4 b/archivers/php55-zip/files/patch-config.m4 index a87640ff160d..fdcaae50fbc0 100644 --- a/archivers/php55-zip/files/patch-config.m4 +++ b/archivers/php55-zip/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2009-04-09 16:16:30.000000000 +0200 -+++ config.m4 2009-04-09 16:17:02.000000000 +0200 -@@ -65,6 +65,7 @@ +--- config.m4.orig 2016-06-21 11:11:59 UTC ++++ config.m4 +@@ -65,6 +65,7 @@ yes #endif ],[ PHP_PCRE_REGEX=pecl diff --git a/archivers/php55-zlib/files/patch-zlib.c b/archivers/php55-zlib/files/patch-zlib.c index 0e88fee9c5bf..62d5d711db17 100644 --- a/archivers/php55-zlib/files/patch-zlib.c +++ b/archivers/php55-zlib/files/patch-zlib.c @@ -1,10 +1,10 @@ ---- zlib.c.orig 2012-07-09 15:25:31.000000000 +0200 -+++ zlib.c 2012-07-09 15:26:07.000000000 +0200 -@@ -957,6 +957,7 @@ +--- zlib.c.orig 2016-06-21 11:11:59 UTC ++++ zlib.c +@@ -977,6 +977,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib) /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(zlib) { + ZLIBG(output_compression) = 0; ZLIBG(compression_coding) = 0; - - php_zlib_output_compression_start(TSRMLS_C); + if (!ZLIBG(handler_registered)) { + ZLIBG(output_compression) = ZLIBG(output_compression_default); diff --git a/archivers/php56-phar/files/patch-config.m4 b/archivers/php56-phar/files/patch-config.m4 index 1a981bfefdc1..d83591d88076 100644 --- a/archivers/php56-phar/files/patch-config.m4 +++ b/archivers/php56-phar/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2011-11-25 15:31:20.000000000 +0100 -+++ config.m4 2011-11-25 15:47:45.000000000 +0100 -@@ -4,8 +4,38 @@ +--- config.m4.orig 2016-06-22 01:50:40 UTC ++++ config.m4 +@@ -4,8 +4,38 @@ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) diff --git a/archivers/php56-phar/files/patch-phar.c b/archivers/php56-phar/files/patch-phar.c index 231ec40a8423..5a5f2fc9b755 100644 --- a/archivers/php56-phar/files/patch-phar.c +++ b/archivers/php56-phar/files/patch-phar.c @@ -1,6 +1,6 @@ ---- phar.c.orig 2011-11-25 15:38:44.000000000 +0100 -+++ phar.c 2011-11-25 15:39:01.000000000 +0100 -@@ -3716,7 +3716,7 @@ +--- phar.c.orig 2016-06-22 01:50:40 UTC ++++ phar.c +@@ -3630,7 +3630,7 @@ static const zend_module_dep phar_deps[] ZEND_MOD_OPTIONAL("openssl") ZEND_MOD_OPTIONAL("zlib") ZEND_MOD_OPTIONAL("standard") diff --git a/archivers/php56-zlib/files/patch-zlib.c b/archivers/php56-zlib/files/patch-zlib.c index 0e88fee9c5bf..894ccdc71a29 100644 --- a/archivers/php56-zlib/files/patch-zlib.c +++ b/archivers/php56-zlib/files/patch-zlib.c @@ -1,10 +1,10 @@ ---- zlib.c.orig 2012-07-09 15:25:31.000000000 +0200 -+++ zlib.c 2012-07-09 15:26:07.000000000 +0200 -@@ -957,6 +957,7 @@ +--- zlib.c.orig 2016-06-22 01:50:40 UTC ++++ zlib.c +@@ -977,6 +977,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib) /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(zlib) { + ZLIBG(output_compression) = 0; ZLIBG(compression_coding) = 0; - - php_zlib_output_compression_start(TSRMLS_C); + if (!ZLIBG(handler_registered)) { + ZLIBG(output_compression) = ZLIBG(output_compression_default); diff --git a/archivers/php70-phar/files/patch-config.m4 b/archivers/php70-phar/files/patch-config.m4 index 07ff4a59962f..1aba3bd9a5a8 100644 --- a/archivers/php70-phar/files/patch-config.m4 +++ b/archivers/php70-phar/files/patch-config.m4 @@ -1,6 +1,6 @@ ---- config.m4.orig 2015-12-10 14:23:55.176546745 +0300 -+++ config.m4 2015-12-10 14:29:14.284524651 +0300 -@@ -4,8 +4,38 @@ +--- config.m4.orig 2016-06-21 19:56:50 UTC ++++ config.m4 +@@ -4,8 +4,38 @@ dnl config.m4 for extension phar PHP_ARG_ENABLE(phar, for phar archive support, [ --disable-phar Disable phar support], yes) diff --git a/archivers/php70-phar/files/patch-phar.c b/archivers/php70-phar/files/patch-phar.c index 7897a70585fa..e7ae6cb3328d 100644 --- a/archivers/php70-phar/files/patch-phar.c +++ b/archivers/php70-phar/files/patch-phar.c @@ -1,6 +1,6 @@ ---- phar.c.orig 2015-12-10 14:18:59.933565343 +0300 -+++ phar.c 2015-12-10 14:19:28.787563292 +0300 -@@ -3578,7 +3578,7 @@ +--- phar.c.orig 2016-06-21 19:56:49 UTC ++++ phar.c +@@ -3589,7 +3589,7 @@ static const zend_module_dep phar_deps[] ZEND_MOD_OPTIONAL("openssl") ZEND_MOD_OPTIONAL("zlib") ZEND_MOD_OPTIONAL("standard") diff --git a/archivers/php70-zlib/files/patch-zlib.c b/archivers/php70-zlib/files/patch-zlib.c index 0e88fee9c5bf..be02c50d1df6 100644 --- a/archivers/php70-zlib/files/patch-zlib.c +++ b/archivers/php70-zlib/files/patch-zlib.c @@ -1,10 +1,10 @@ ---- zlib.c.orig 2012-07-09 15:25:31.000000000 +0200 -+++ zlib.c 2012-07-09 15:26:07.000000000 +0200 -@@ -957,6 +957,7 @@ +--- zlib.c.orig 2016-06-21 19:57:08 UTC ++++ zlib.c +@@ -1480,6 +1480,7 @@ static PHP_MSHUTDOWN_FUNCTION(zlib) /* {{{ PHP_RINIT_FUNCTION */ static PHP_RINIT_FUNCTION(zlib) { + ZLIBG(output_compression) = 0; ZLIBG(compression_coding) = 0; - - php_zlib_output_compression_start(TSRMLS_C); + if (!ZLIBG(handler_registered)) { + ZLIBG(output_compression) = ZLIBG(output_compression_default); diff --git a/archivers/ppunpack/files/patch-depack.h b/archivers/ppunpack/files/patch-depack.h index 358db5625743..75e11383c299 100644 --- a/archivers/ppunpack/files/patch-depack.h +++ b/archivers/ppunpack/files/patch-depack.h @@ -1,5 +1,5 @@ ---- depack.h.orig Sat May 22 21:55:32 1999 -+++ depack.h Sat May 22 21:56:18 1999 +--- depack.h.orig 1995-03-03 14:25:04 UTC ++++ depack.h @@ -4,8 +4,10 @@ * see accompanying file README for distribution information */ diff --git a/archivers/pxz/files/patch-pxz.c b/archivers/pxz/files/patch-pxz.c index 8878d8ea28c5..4f09c008714b 100644 --- a/archivers/pxz/files/patch-pxz.c +++ b/archivers/pxz/files/patch-pxz.c @@ -1,26 +1,24 @@ ---- pxz.c.orig 2010-11-23 10:35:25.720939440 +0100 -+++ pxz.c 2010-11-23 10:46:28.910235910 +0100 -@@ -21,11 +21,17 @@ +--- pxz.c.orig 2014-10-18 17:06:27 UTC ++++ pxz.c +@@ -23,11 +23,17 @@ #include <string.h> #include <stdio.h> --#include <stdio_ext.h> +#ifndef __FreeBSD__ -+#include <stdio_ext.h> + #include <stdio_ext.h> +#endif #include <stdlib.h> #include <inttypes.h> #include <unistd.h> --#include <error.h> +#ifdef __FreeBSD__ +#include <err.h> +#else -+#include <error.h> + #include <error.h> +#endif #include <errno.h> #include <sys/stat.h> #include <sys/mman.h> -@@ -40,6 +46,10 @@ +@@ -42,6 +48,10 @@ #include <omp.h> #endif @@ -31,7 +29,7 @@ #ifndef XZ_BINARY #define XZ_BINARY "xz" #endif -@@ -119,6 +129,13 @@ +@@ -121,6 +131,13 @@ const struct option long_opts[] = { { NULL, 0, NULL, 0 } }; diff --git a/archivers/py-lzma/files/patch-setup.py b/archivers/py-lzma/files/patch-setup.py index b3dbbc6dd3fa..f37d6a85ff34 100644 --- a/archivers/py-lzma/files/patch-setup.py +++ b/archivers/py-lzma/files/patch-setup.py @@ -1,8 +1,8 @@ ---- ./setup.py.orig 2010-10-23 22:50:04.000000000 +0200 -+++ ./setup.py 2011-01-27 02:30:39.000000000 +0100 -@@ -27,13 +27,10 @@ - from distutils import log +--- setup.py.orig 2016-07-26 12:20:39 UTC ++++ setup.py +@@ -28,13 +28,10 @@ from distutils import log from distutils.command.build_ext import build_ext as _build_ext + from version import get_git_version -try: - from setuptools import setup, Extension diff --git a/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h b/archivers/py-lzma/files/patch-src_compat_LzmaCompatDecode.h index 0b606faa6022..38ab031e533b 100644 --- a/archivers/py-lzma/files/patch-src__compat__LzmaCompatDecode.h +++ b/archivers/py-lzma/files/patch-src_compat_LzmaCompatDecode.h @@ -1,6 +1,6 @@ ---- ./src/compat/LzmaCompatDecode.h.orig 2010-04-24 00:26:40.000000000 +0200 -+++ ./src/compat/LzmaCompatDecode.h 2011-01-27 02:30:39.000000000 +0100 -@@ -39,14 +39,6 @@ +--- src/compat/LzmaCompatDecode.h.orig 2016-07-26 12:20:39 UTC ++++ src/compat/LzmaCompatDecode.h +@@ -39,14 +39,6 @@ extern "C" { # define LZMACALL #endif diff --git a/archivers/py-pyliblzma/files/patch-setup.py b/archivers/py-pyliblzma/files/patch-setup.py index 7cd8df3fc6ec..d4baf46700b1 100644 --- a/archivers/py-pyliblzma/files/patch-setup.py +++ b/archivers/py-pyliblzma/files/patch-setup.py @@ -2,7 +2,7 @@ # https://bugs.launchpad.net/pyliblzma/+bug/613837 # https://bazaar.launchpad.net/~proyvind/pyliblzma/trunk/revision/494 ---- setup.py.orig 2015-11-14 02:51:37 UTC +--- setup.py.orig 2010-04-13 21:06:43 UTC +++ setup.py @@ -24,6 +24,7 @@ import sys, os, subprocess diff --git a/archivers/qpress/files/patch-qpress.cpp b/archivers/qpress/files/patch-qpress.cpp index 3e32fb406934..6c90357027d1 100644 --- a/archivers/qpress/files/patch-qpress.cpp +++ b/archivers/qpress/files/patch-qpress.cpp @@ -1,4 +1,4 @@ ---- qpress.cpp.orig 2013-11-02 00:43:30.451058000 +0000 +--- qpress.cpp.orig 2016-07-26 12:20:52 UTC +++ qpress.cpp @@ -88,6 +88,7 @@ and finally outputs an UPDIR: diff --git a/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version b/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version index 5793b3937c92..5e034c3c458b 100644 --- a/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version +++ b/archivers/quazip-qt5/files/patch-coinstallable_with_qt4_version @@ -23,9 +23,9 @@ Patch #25 (Make devel packages coinstallable too) Index: CMakeLists.txt =================================================================== ---- CMakeLists.txt (revision 250) -+++ CMakeLists.txt (working copy) -@@ -10,10 +10,11 @@ +--- CMakeLists.txt.orig 2013-11-18 17:37:54 UTC ++++ CMakeLists.txt +@@ -10,10 +10,11 @@ endif() if (Qt5Core_FOUND) set(QTCORE_LIBRARIES ${Qt5Core_LIBRARIES}) @@ -38,7 +38,7 @@ Index: CMakeLists.txt include_directories(${Qt5Core_INCLUDE_DIRS}) macro(qt_wrap_cpp) -@@ -48,7 +49,9 @@ +@@ -48,7 +49,9 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_D set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Library directory name" FORCE) @@ -49,11 +49,9 @@ Index: CMakeLists.txt -install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules) +install(FILES FindQuaZip.cmake RENAME FindQuaZip${QUAZIP_LIB_VERSION_SUFFIX}.cmake DESTINATION ${CMAKE_ROOT}/Modules) -Index: FindQuaZip.cmake -=================================================================== ---- FindQuaZip.cmake (revision 250) -+++ FindQuaZip.cmake (working copy) -@@ -9,14 +9,17 @@ +--- FindQuaZip.cmake.orig 2012-02-26 06:46:10 UTC ++++ FindQuaZip.cmake +@@ -9,14 +9,17 @@ IF (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRA # in cache already SET(QUAZIP_FOUND TRUE) ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES) @@ -73,7 +71,7 @@ Index: FindQuaZip.cmake FIND_PATH(QUAZIP_INCLUDE_DIR NAMES quazip.h HINTS ${QUAZIP_LIBRARY_DIR}/../ PATH_SUFFIXES include/quazip) FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR NAMES zlib.h) ELSE(WIN32) -@@ -25,12 +28,12 @@ +@@ -25,12 +28,12 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIB pkg_check_modules(PC_QUAZIP quazip) FIND_LIBRARY(QUAZIP_LIBRARIES WIN32_DEBUG_POSTFIX d @@ -88,11 +86,9 @@ Index: FindQuaZip.cmake ) FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include) ENDIF (WIN32) -Index: quazip/CMakeLists.txt -=================================================================== ---- quazip/CMakeLists.txt (revision 250) -+++ quazip/CMakeLists.txt (working copy) -@@ -14,10 +14,10 @@ +--- quazip/CMakeLists.txt.orig 2013-08-10 16:00:00 UTC ++++ quazip/CMakeLists.txt +@@ -14,10 +14,10 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD) qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) set(SRCS ${SRCS} ${MOC_SRCS}) diff --git a/archivers/quazip/files/patch-qztest__qztest.pro b/archivers/quazip/files/patch-qztest_qztest.pro index 1161e1dbecc2..9b1960fad4be 100644 --- a/archivers/quazip/files/patch-qztest__qztest.pro +++ b/archivers/quazip/files/patch-qztest_qztest.pro @@ -1,6 +1,6 @@ ---- ./qztest/qztest.pro.orig 2014-02-09 12:36:57.000000000 +0100 -+++ ./qztest/qztest.pro 2014-03-30 05:01:44.000000000 +0200 -@@ -39,7 +39,10 @@ +--- qztest/qztest.pro.orig 2014-02-10 18:04:08 UTC ++++ qztest/qztest.pro +@@ -40,7 +40,10 @@ MOC_DIR = .moc win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../quazip/release/ -lquazip else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../quazip/debug/ -lquazip diff --git a/archivers/rpm4/files/patch-lib_backend_db3.c b/archivers/rpm4/files/patch-lib_backend_db3.c index 9a88011ab7ce..8c33b429986c 100644 --- a/archivers/rpm4/files/patch-lib_backend_db3.c +++ b/archivers/rpm4/files/patch-lib_backend_db3.c @@ -1,5 +1,5 @@ ---- lib/backend/db3.c.orig 2011-03-02 07:40:10.000000000 +0100 -+++ lib/backend/db3.c 2011-06-10 15:21:12.000000000 +0200 +--- lib/backend/db3.c.orig 2014-06-30 08:47:13 UTC ++++ lib/backend/db3.c @@ -8,6 +8,8 @@ static int _debug = 1; /* XXX if < 0 deb #include <errno.h> diff --git a/archivers/rpm4/files/patch-lib_cpio.c b/archivers/rpm4/files/patch-lib_cpio.c index a06895394295..692e5657a6ae 100644 --- a/archivers/rpm4/files/patch-lib_cpio.c +++ b/archivers/rpm4/files/patch-lib_cpio.c @@ -1,8 +1,8 @@ Fix for CVE-2014-8118 as found at https://bugzilla.redhat.com/show_bug.cgi?id=1168715 ---- lib/cpio.c.orig 2015-03-22 19:29:29.000000000 +0100 -+++ lib/cpio.c 2015-03-22 19:29:30.000000000 +0100 +--- lib/cpio.c.orig 2014-06-30 08:47:13 UTC ++++ lib/cpio.c @@ -399,6 +399,9 @@ int rpmcpioHeaderRead(rpmcpio_t cpio, ch GET_NUM_FIELD(hdr.filesize, fsize); diff --git a/archivers/rpm4/files/patch-misc_fts.c b/archivers/rpm4/files/patch-misc_fts.c index 3a36a6b2cf40..f6c633ef28a7 100644 --- a/archivers/rpm4/files/patch-misc_fts.c +++ b/archivers/rpm4/files/patch-misc_fts.c @@ -1,5 +1,5 @@ ---- misc/fts.c 2012-04-03 15:53:59.000000000 +0200 -+++ misc/fts.c 2012-05-30 14:07:33.000000000 +0200 +--- misc/fts.c.orig 2014-06-30 08:47:14 UTC ++++ misc/fts.c @@ -31,13 +31,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #endif /* LIBC_SCCS and not lint */ @@ -16,7 +16,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -@@ -61,11 +62,9 @@ +@@ -61,11 +62,9 @@ static char sccsid[] = "@(#)fts.c 8.6 (B # define _STAT_VER 0 # define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp)) #endif diff --git a/archivers/rpm4/files/patch-system.h b/archivers/rpm4/files/patch-system.h index 087025591e2a..7d119aaaa7ef 100644 --- a/archivers/rpm4/files/patch-system.h +++ b/archivers/rpm4/files/patch-system.h @@ -1,6 +1,6 @@ ---- system.h.orig 2011-06-10 15:27:05.000000000 +0200 -+++ system.h 2011-06-10 15:27:09.000000000 +0200 -@@ -39,6 +39,13 @@ char * stpncpy(char * dest, const char * +--- system.h.orig 2014-06-30 08:47:14 UTC ++++ system.h +@@ -41,6 +41,13 @@ char * stpncpy(char * dest, const char * #define getenv(_s) __secure_getenv(_s) #endif diff --git a/archivers/ruby-lha/files/patch-math-remainder b/archivers/ruby-lha/files/patch-math-remainder index 2e440d04917b..fbcf5c58d7bc 100644 --- a/archivers/ruby-lha/files/patch-math-remainder +++ b/archivers/ruby-lha/files/patch-math-remainder @@ -4,37 +4,46 @@ and allow this code to compile with Ruby-2.x -mi ---- ext/slide.c 2006-09-17 13:45:51.000000000 -0400 -+++ ext/slide.c 2015-03-23 10:27:10.000000000 -0400 -@@ -88,5 +88,5 @@ +--- ext/slide.c.orig 2006-09-17 17:45:51 UTC ++++ ext/slide.c +@@ -87,7 +87,7 @@ static struct decode_option decode_set; + static unsigned int txtsiz; static unsigned long dicsiz; -static unsigned int remainder; +static unsigned int iremainder; struct matchdata { -@@ -163,5 +163,5 @@ + int len; +@@ -162,7 +162,7 @@ update_dict(pos, crc) + n = fread_crc(crc, &text[txtsiz - dicsiz], dicsiz, infile); - remainder += n; + iremainder += n; *pos -= dicsiz; -@@ -271,5 +271,5 @@ + for (i = 0; i < HSHSIZ; i++) { +@@ -270,7 +270,7 @@ search_dict(token, pos, min, m) + /* re-search */ search_dict_1(token, pos, 0, off+2, m); - if (m->len > remainder) m->len = remainder; + if (m->len > iremainder) m->len = iremainder; } -@@ -281,5 +281,5 @@ + /* slide dictionary */ +@@ -280,7 +280,7 @@ next_token(token, pos, crc) + unsigned int *pos; unsigned int *crc; { - remainder--; + iremainder--; if (++*pos >= txtsiz - maxmatch) { update_dict(pos, crc); -@@ -317,9 +317,9 @@ + #ifdef DEBUG +@@ -316,17 +316,17 @@ encode(intf) + encode_set.encode_start(); memset(text, ' ', TXTSIZ); - remainder = fread_crc(&crc, &text[dicsiz], txtsiz-dicsiz, infile); @@ -46,10 +55,11 @@ and allow this code to compile with Ruby-2.x + if (match.len > iremainder) match.len = iremainder; pos = dicsiz; -@@ -327,5 +327,5 @@ + token = INIT_HASH(pos); insert_hash(token, pos); /* associate token and pos */ - while (remainder > 0 && ! unpackable) { + while (iremainder > 0 && ! unpackable) { last = match; + next_token(&token, &pos, &crc); diff --git a/archivers/ruby-lha/files/patch-tests b/archivers/ruby-lha/files/patch-tests index bc81d47baad9..2607ce19a616 100644 --- a/archivers/ruby-lha/files/patch-tests +++ b/archivers/ruby-lha/files/patch-tests @@ -1,9 +1,11 @@ ---- test/test.rb 2006-09-17 14:32:52.000000000 -0400 -+++ test/test.rb 2015-03-23 11:18:00.000000000 -0400 -@@ -21,5 +21,5 @@ +--- test/test.rb.orig 2006-09-17 18:32:52 UTC ++++ test/test.rb +@@ -20,7 +20,7 @@ class TestLhaLib < Test::Unit::TestCase + assert(File.exist?('test.dat')) obuff = ' ' * 256 (0..255).each do |x| - obuff[x] = x + obuff[x] = x.chr end nbuff = nil + File.open('test.dat', 'rb') do |f| diff --git a/archivers/ruby-lha/files/patch-warnings b/archivers/ruby-lha/files/patch-warnings index 458060927389..75da76ac771a 100644 --- a/archivers/ruby-lha/files/patch-warnings +++ b/archivers/ruby-lha/files/patch-warnings @@ -1,6 +1,7 @@ ---- ext/crcio.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/crcio.c 2015-03-23 10:29:59.000000000 -0400 -@@ -34,9 +34,11 @@ +--- ext/crcio.c.orig 2006-09-17 16:38:22 UTC ++++ ext/crcio.c +@@ -33,11 +33,13 @@ make_crctable( /* void */ ) + /* ------------------------------------------------------------------------ */ unsigned int -calccrc(crc, p, n) @@ -14,14 +15,18 @@ + while (n-- > 0) crc = UPDATE_CRC(crc, *p++); -@@ -68,5 +70,5 @@ + return crc; +@@ -67,7 +69,7 @@ fread_crc(crcp, p, n, fp) + void fwrite_crc(crcp, p, n, fp) unsigned int *crcp; - unsigned char *p; + const unsigned char *p; int n; FILE *fp; -@@ -139,9 +141,11 @@ + { +@@ -138,11 +140,13 @@ putc_euc(c, fd) + /* ------------------------------------------------------------------------ */ int -fwrite_txt(p, n, fp) @@ -35,7 +40,9 @@ + while (--n >= 0) { if (*p != '\015' && *p != '\032') { -@@ -161,6 +165,6 @@ + #ifdef EUC +@@ -160,13 +164,14 @@ fwrite_txt(p, n, fp) + /* ------------------------------------------------------------------------ */ int -fread_txt(p, n, fp) @@ -44,24 +51,28 @@ + void *_p; int n; FILE *fp; -@@ -168,4 +172,5 @@ + { int c; int cnt = 0; + unsigned char *p = _p; while (cnt < n) { ---- ext/extract.c 2006-09-17 13:45:51.000000000 -0400 -+++ ext/extract.c 2015-03-23 10:42:48.000000000 -0400 -@@ -15,5 +15,5 @@ + if (getc_euc_cache != EOF) { +--- ext/extract.c.orig 2006-09-17 17:45:51 UTC ++++ ext/extract.c +@@ -14,7 +14,7 @@ decode_lzhuf(infp, outfp, original_size, + FILE *outfp; size_t original_size; size_t packed_size; - char *name; + const char *name; int method; size_t *read_sizep; ---- ext/header.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/header.c 2015-03-23 10:54:36.000000000 -0400 -@@ -49,10 +49,11 @@ + { +--- ext/header.c.orig 2006-09-17 16:38:22 UTC ++++ ext/header.c +@@ -48,12 +48,13 @@ int default_system_kanji_code = MULTIBYT + int default_system_kanji_code = NONE; #endif -int @@ -76,42 +87,54 @@ + const char *p = _p; while (len--) sum += *p++; -@@ -68,5 +69,5 @@ + +@@ -67,7 +68,7 @@ dump_get_byte() + int c; if (verbose_listing && verbose > 1) - printf("%02d %2d: ", get_ptr - start_ptr, 1); + printf("%02td %2d: ", get_ptr - start_ptr, 1); c = GET_BYTE(); if (verbose_listing && verbose > 1) { -@@ -85,5 +86,5 @@ + if (isprint(c)) +@@ -84,7 +85,7 @@ dump_skip_bytes(len) + { if (len == 0) return; if (verbose_listing && verbose > 1) { - printf("%02d %2d: ", get_ptr - start_ptr, len); + printf("%02td %2d: ", get_ptr - start_ptr, len); while (len--) printf("0x%02x ", GET_BYTE()); -@@ -103,5 +104,5 @@ + printf("... ignored\n"); +@@ -102,7 +103,7 @@ get_word() + #if DUMP_HEADER if (verbose_listing && verbose > 1) - printf("%02d %2d: ", get_ptr - start_ptr, 2); + printf("%02td %2d: ", get_ptr - start_ptr, 2); #endif b0 = GET_BYTE(); -@@ -131,5 +132,5 @@ + b1 = GET_BYTE(); +@@ -130,7 +131,7 @@ get_longword() + #if DUMP_HEADER if (verbose_listing && verbose > 1) - printf("%02d %2d: ", get_ptr - start_ptr, 4); + printf("%02td %2d: ", get_ptr - start_ptr, 4); #endif b0 = GET_BYTE(); -@@ -164,5 +165,5 @@ + b1 = GET_BYTE(); +@@ -163,7 +164,7 @@ get_bytes(buf, len, size) + #if DUMP_HEADER if (verbose_listing && verbose > 1) - printf("%02d %2d: \"", get_ptr - start_ptr, len); + printf("%02td %2d: \"", get_ptr - start_ptr, len); for (i = 0; i < len; i++) { -@@ -1172,9 +1173,9 @@ + if (i < size) buf[i] = get_ptr[i]; +@@ -1171,11 +1172,11 @@ seek_lha_header(fp) + /* remove leading `xxxx/..' */ -static char * @@ -125,16 +148,20 @@ + const char *ptr = NULL; if (strcmp(first, "..") == 0) { -@@ -1201,5 +1202,5 @@ + warning("Removing leading `..' from member name."); +@@ -1200,7 +1201,7 @@ remove_leading_dots(char *path) + } if (ptr) { - warning("Removing leading `%.*s' from member name.", ptr-first, first); + warning("Removing leading `%.*s' from member name.", (int)(ptr - first), first); return ptr; } ---- ext/huf.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/huf.c 2015-03-23 10:37:51.000000000 -0400 -@@ -235,7 +235,5 @@ + +--- ext/huf.c.orig 2006-09-17 16:38:22 UTC ++++ ext/huf.c +@@ -234,9 +234,7 @@ send_block( /* void */ ) + /* ------------------------------------------------------------------------ */ /* lh4, 5, 6, 7 */ void -output_st1(c, p) @@ -143,16 +170,20 @@ +output_st1(unsigned short c, unsigned short p) { static unsigned short cpos; ---- ext/lha.h 2006-09-18 04:53:29.000000000 -0400 -+++ ext/lha.h 2015-03-23 11:03:01.000000000 -0400 -@@ -212,4 +212,6 @@ + +--- ext/lha.h.orig 2006-09-18 08:53:29 UTC ++++ ext/lha.h +@@ -211,6 +211,8 @@ int fnmatch(const char *pattern, const c + #include "lha_macro.h" +unsigned char *alloc_buf(void); + #define exit(n) lha_exit(n) -@@ -301,32 +303,34 @@ + struct encode_option { +@@ -300,41 +302,56 @@ LHALIB_EXTERN void cmd_extract(const cha + LHALIB_EXTERN FILE * open_old_archive(const char* archive); LHALIB_EXTERN boolean need_file(const char*); LHALIB_EXTERN boolean archive_is_msdos_sfx1(const char*); -LHALIB_EXTERN void output_dyn(); @@ -214,7 +245,8 @@ +LHALIB_EXTERN void init_code_cache(void); LHALIB_EXTERN void putcode(unsigned char n, unsigned short x); LHALIB_EXTERN void putbits(unsigned char n, unsigned short x); -@@ -335,5 +339,18 @@ + LHALIB_EXTERN unsigned short getbits(unsigned char n); + LHALIB_EXTERN void fillbuf(unsigned char n); LHALIB_EXTERN void encode_p_st0(unsigned short j); - @@ -234,34 +266,42 @@ +PRINTF_ARGS(int xsnprintf(char *dst, size_t size, const char *fmt, ...), 3, 4); #define start_indicator(name, size, ing, len) 0 ---- ext/lhalib.c 2006-09-18 05:11:35.000000000 -0400 -+++ ext/lhalib.c 2015-03-23 11:00:35.000000000 -0400 -@@ -19,5 +19,5 @@ + #define finish_indicator(name, ed) 0 +--- ext/lhalib.c.orig 2006-09-18 09:11:35 UTC ++++ ext/lhalib.c +@@ -18,7 +18,7 @@ + #define LHALIB_VERSION "0.8.1" #include "lha.h" -#include "st.h" +#include <ruby/st.h> static VALUE lhalib; -@@ -76,5 +76,5 @@ + +@@ -75,7 +75,7 @@ static VALUE s_ex(int argc, VALUE* argv, + VALUE file; proc = Qnil; rb_scan_args(argc, argv, "1&", &file, &proc); - rb_check_safe_str(file); + SafeStringValue(file); rb_secure(4); ---- ext/lharc.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/lharc.c 2015-03-23 10:58:33.000000000 -0400 -@@ -53,5 +53,5 @@ + file_count = 0; +--- ext/lharc.c.orig 2006-09-17 16:38:22 UTC ++++ ext/lharc.c +@@ -52,7 +52,7 @@ static int error_occurred; + /* ------------------------------------------------------------------------ */ static boolean open_old_archive_1(name, v_fp) - char *name; + const char *name; FILE **v_fp; { ---- ext/lhext.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/lhext.c 2015-03-23 10:41:48.000000000 -0400 -@@ -27,6 +27,7 @@ + FILE *fp; +--- ext/lhext.c.orig 2006-09-17 16:38:22 UTC ++++ ext/lhext.c +@@ -26,8 +26,9 @@ static char *methods[] = + NULL }; -static void add_dirinfo(char* name, LzHeader* hdr); @@ -271,7 +311,9 @@ +static int is_directory_traversal(const char *path); /* ------------------------------------------------------------------------ */ -@@ -396,6 +397,6 @@ + static boolean +@@ -395,8 +396,8 @@ cmd_extract(const char* archive_name, ad + return; } -int @@ -280,16 +322,20 @@ +is_directory_traversal(const char *path) { int state = 0; -@@ -437,5 +438,5 @@ + +@@ -436,7 +437,7 @@ typedef struct lhdDirectoryInfo_t { + static LzHeaderList *dirinfo; -static void add_dirinfo(char *name, LzHeader *hdr) +static void add_dirinfo(const char *name, LzHeader *hdr) { LzHeaderList *p; ---- ext/maketbl.c 2006-09-17 12:38:22.000000000 -0400 -+++ ext/maketbl.c 2015-03-23 10:32:06.000000000 -0400 -@@ -10,9 +10,6 @@ + +--- ext/maketbl.c.orig 2006-09-17 16:38:22 UTC ++++ ext/maketbl.c +@@ -9,11 +9,8 @@ + #include "lha.h" void -make_table(nchar, bitlen, tablebits, table) @@ -301,18 +347,22 @@ + unsigned short table[]) { unsigned short count[17]; /* count of bitlen */ ---- ext/maketree.c 2006-09-17 13:36:33.000000000 -0400 -+++ ext/maketree.c 2015-03-23 11:02:50.000000000 -0400 -@@ -96,5 +96,5 @@ + unsigned short weight[17]; /* 0x10000ul >> bitlen */ +--- ext/maketree.c.orig 2006-09-17 17:36:33 UTC ++++ ext/maketree.c +@@ -95,7 +95,7 @@ downheap(i, heap, heapsize, freq) + int i; short *heap; size_t heapsize; - unsigned short *freq; + const unsigned short *freq; { short j, k; ---- ext/util.c 2006-09-18 04:53:29.000000000 -0400 -+++ ext/util.c 2015-03-23 10:57:53.000000000 -0400 -@@ -115,8 +115,9 @@ + +--- ext/util.c.orig 2006-09-18 08:53:29 UTC ++++ ext/util.c +@@ -114,10 +114,11 @@ archive_is_msdos_sfx1(const char* name) + int #if STDC_HEADERS -xsnprintf(char *dest, size_t size, char *fmt, ...) @@ -324,3 +374,4 @@ + const char *fmt; size_t size; va_dcl + #endif diff --git a/archivers/rubygem-bzip2-ruby/files/patch-ext__bzip2.c b/archivers/rubygem-bzip2-ruby/files/patch-ext_bzip2.c index bf3684c0d271..05384a6fbdda 100644 --- a/archivers/rubygem-bzip2-ruby/files/patch-ext__bzip2.c +++ b/archivers/rubygem-bzip2-ruby/files/patch-ext_bzip2.c @@ -1,6 +1,6 @@ ---- ./ext/bzip2.c.orig 2014-08-23 18:00:07.743290567 +0000 -+++ ./ext/bzip2.c 2014-08-23 18:00:07.790289811 +0000 -@@ -247,9 +247,6 @@ +--- ext/bzip2.c.orig 2016-07-26 12:25:25 UTC ++++ ext/bzip2.c +@@ -247,9 +247,6 @@ static VALUE bz_writer_close(VALUE obj) Get_BZ2(obj, bzf); res = bz_writer_internal_close(bzf); diff --git a/archivers/rubygem-bzip2-ruby/files/patch-ext__extconf.rb b/archivers/rubygem-bzip2-ruby/files/patch-ext_extconf.rb index e0d93697504f..f64c6649612e 100644 --- a/archivers/rubygem-bzip2-ruby/files/patch-ext__extconf.rb +++ b/archivers/rubygem-bzip2-ruby/files/patch-ext_extconf.rb @@ -1,6 +1,6 @@ ---- ./ext/extconf.rb.orig 2013-12-12 21:55:36.054257218 +0000 -+++ ./ext/extconf.rb 2013-12-12 21:55:51.579256255 +0000 -@@ -11,11 +11,9 @@ +--- ext/extconf.rb.orig 2016-07-26 12:25:25 UTC ++++ ext/extconf.rb +@@ -11,11 +11,9 @@ if have_library("bz2", "BZ2_bzWriteOpen" $static = nil end diff --git a/archivers/rvm/files/patch-reporter.cc b/archivers/rvm/files/patch-reporter.cc index 129bf7fd6529..f2886daae0b4 100644 --- a/archivers/rvm/files/patch-reporter.cc +++ b/archivers/rvm/files/patch-reporter.cc @@ -1,10 +1,10 @@ ---- reporter.cc.orig Thu Mar 25 00:28:09 2004 -+++ reporter.cc Sat Apr 3 21:26:51 2004 +--- reporter.cc.orig 2014-01-07 20:30:56 UTC ++++ reporter.cc @@ -4,6 +4,7 @@ #include <string> #include <vector> #include <algorithm> +#include <cassert> - #include "debug.h" + #include "asserts.h" #include "error.h" diff --git a/archivers/rvm/files/patch-vaulter.cpp b/archivers/rvm/files/patch-vaulter.cc index ba57d2db207a..479fe9942810 100644 --- a/archivers/rvm/files/patch-vaulter.cpp +++ b/archivers/rvm/files/patch-vaulter.cc @@ -1,10 +1,10 @@ ---- vaulter.cc.orig Wed Mar 24 05:03:42 2004 -+++ vaulter.cc Sat Apr 3 21:24:37 2004 +--- vaulter.cc.orig 2014-11-12 13:09:24 UTC ++++ vaulter.cc @@ -4,6 +4,7 @@ #include <vector> #include <map> #include <string> +#include <cassert> - #include "debug.h" + #include "asserts.h" #include "error.h" diff --git a/archivers/rzip/files/patch-Makefile.in b/archivers/rzip/files/patch-Makefile.in index 31c6ad48cef4..5d76bac31eac 100644 --- a/archivers/rzip/files/patch-Makefile.in +++ b/archivers/rzip/files/patch-Makefile.in @@ -1,5 +1,5 @@ ---- ./Makefile.in.orig 2013-11-15 10:34:18.246331970 +0100 -+++ ./Makefile.in 2013-11-15 10:34:38.383364598 +0100 +--- Makefile.in.orig 2006-02-14 00:38:23 UTC ++++ Makefile.in @@ -3,8 +3,8 @@ prefix=@prefix@ diff --git a/archivers/sharutils/files/patch-intl__Makefile.in b/archivers/sharutils/files/patch-intl_Makefile.in index b88aa5df3f18..723c5e53268c 100644 --- a/archivers/sharutils/files/patch-intl__Makefile.in +++ b/archivers/sharutils/files/patch-intl_Makefile.in @@ -1,6 +1,6 @@ ---- intl/Makefile.in.orig 2013-06-11 08:30:00.000000000 -0300 -+++ intl/Makefile.in 2013-06-11 08:31:11.000000000 -0300 -@@ -447,7 +447,6 @@ +--- intl/Makefile.in.orig 2015-05-30 15:35:20 UTC ++++ intl/Makefile.in +@@ -451,7 +451,6 @@ install-exec: all temp=$(DESTDIR)$(localedir)/t-locale.alias; \ dest=$(DESTDIR)$(localedir)/locale.alias; \ sed -f ref-add.sed $$orig > $$temp; \ @@ -8,7 +8,7 @@ rm -f $$temp; \ else \ : ; \ -@@ -556,11 +555,6 @@ +@@ -559,11 +558,6 @@ uninstall: temp=$(DESTDIR)$(localedir)/t-locale.alias; \ dest=$(DESTDIR)$(localedir)/locale.alias; \ sed -f ref-del.sed $$dest > $$temp; \ diff --git a/archivers/sharutils/files/patch-lib__Makefile.in b/archivers/sharutils/files/patch-lib_Makefile.in index 5d48eed40a6b..3dfc30ed5eeb 100644 --- a/archivers/sharutils/files/patch-lib__Makefile.in +++ b/archivers/sharutils/files/patch-lib_Makefile.in @@ -1,6 +1,6 @@ ---- lib/Makefile.in.orig 2010-03-04 12:31:24.000000000 -0300 -+++ lib/Makefile.in 2010-03-04 12:31:35.000000000 -0300 -@@ -1592,7 +1592,7 @@ +--- lib/Makefile.in.orig 2015-05-30 15:35:32 UTC ++++ lib/Makefile.in +@@ -2126,7 +2126,7 @@ install-exec-localcharset: all-local case '$(host_os)' in \ darwin[56]*) \ need_charset_alias=true ;; \ diff --git a/archivers/snappy-java/files/patch-likelinux b/archivers/snappy-java/files/patch-likelinux index e2cbea524c08..8c674a37d205 100644 --- a/archivers/snappy-java/files/patch-likelinux +++ b/archivers/snappy-java/files/patch-likelinux @@ -1,6 +1,6 @@ ---- Makefile.common.orig 2011-10-05 03:29:42.000000000 +0200 -+++ Makefile.common 2013-05-13 02:19:31.000000000 +0200 -@@ -50,8 +50,8 @@ +--- Makefile.common.orig 2011-10-05 01:29:42 UTC ++++ Makefile.common +@@ -50,8 +50,8 @@ endif Default_CXX := g++ Default_STRIP := strip diff --git a/archivers/squsq/files/patch-usq.c b/archivers/squsq/files/patch-usq.c index 496a192ae68f..c1287d023034 100644 --- a/archivers/squsq/files/patch-usq.c +++ b/archivers/squsq/files/patch-usq.c @@ -1,6 +1,6 @@ ---- usq.c.orig Sun Jan 17 01:54:04 1988 -+++ usq.c Sun Jan 17 01:54:05 1988 -@@ -215,7 +215,7 @@ +--- usq.c.orig 1988-01-17 00:54:04 UTC ++++ usq.c +@@ -215,7 +215,7 @@ char *infile; goto closein; } @@ -9,7 +9,7 @@ filecrc = getx16(inbuff); #else filecrc = getw16(inbuff); -@@ -239,7 +239,7 @@ +@@ -239,7 +239,7 @@ char *infile; printf("%s -> %s: ", infile, outfile); #endif diff --git a/archivers/star/files/patch-rmt_Makefile b/archivers/star/files/patch-rmt_Makefile index 0d97110a8ec6..6affa15542a3 100644 --- a/archivers/star/files/patch-rmt_Makefile +++ b/archivers/star/files/patch-rmt_Makefile @@ -1,4 +1,4 @@ ---- rmt/Makefile.orig 2016-02-10 20:47:23 UTC +--- rmt/Makefile.orig 2011-04-15 20:06:22 UTC +++ rmt/Makefile @@ -6,13 +6,13 @@ include $(SRCROOT)/$(RULESDIR)/rules.to ########################################################################### diff --git a/archivers/star/files/patch-rmt_Makefile.man b/archivers/star/files/patch-rmt_Makefile.man index 9243d0e8ef38..5898f2547021 100644 --- a/archivers/star/files/patch-rmt_Makefile.man +++ b/archivers/star/files/patch-rmt_Makefile.man @@ -1,4 +1,4 @@ ---- rmt/Makefile.man.orig 2016-02-10 20:47:23 UTC +--- rmt/Makefile.man.orig 2000-12-04 21:25:51 UTC +++ rmt/Makefile.man @@ -8,10 +8,10 @@ include $(SRCROOT)/$(RULESDIR)/rules.to ########################################################################### diff --git a/archivers/star/files/patch-star_Makefile b/archivers/star/files/patch-star_Makefile index 42e4205fd3b1..84179542d96c 100644 --- a/archivers/star/files/patch-star_Makefile +++ b/archivers/star/files/patch-star_Makefile @@ -1,4 +1,4 @@ ---- star/Makefile.orig 2016-02-10 20:47:23 UTC +--- star/Makefile.orig 2010-05-13 19:47:27 UTC +++ star/Makefile @@ -15,7 +15,7 @@ include $(SRCROOT)/$(RULESDIR)/rules.to INSDIR= bin diff --git a/archivers/star/files/patch-star_star.1 b/archivers/star/files/patch-star_star.1 index 5c459c9297c0..e4cd5c224792 100644 --- a/archivers/star/files/patch-star_star.1 +++ b/archivers/star/files/patch-star_star.1 @@ -1,4 +1,4 @@ ---- star/star.1.orig 2016-02-10 20:47:23 UTC +--- star/star.1.orig 2011-04-12 17:34:22 UTC +++ star/star.1 @@ -32,14 +32,6 @@ star \- unique standard tape archiver .I file1 .\|.\|. filen diff --git a/archivers/torrentzip/files/patch-src-trrntzip.c b/archivers/torrentzip/files/patch-src-trrntzip.c index e54c5b305054..ee9c83c33731 100644 --- a/archivers/torrentzip/files/patch-src-trrntzip.c +++ b/archivers/torrentzip/files/patch-src-trrntzip.c @@ -1,6 +1,6 @@ ---- src/trrntzip.c-orig Mon May 2 08:38:40 2005 -+++ src/trrntzip.c Sat May 7 02:51:55 2005 -@@ -716,7 +716,7 @@ +--- src/trrntzip.c.orig 2005-05-02 13:38:40 UTC ++++ src/trrntzip.c +@@ -716,7 +716,7 @@ RecursiveMigrate (const char *pszPath, W if (dirp) { @@ -9,7 +9,7 @@ // our new zipfiles if they are returned by readdir() a second time. while (direntp = readdir (dirp)) { -@@ -732,7 +732,7 @@ +@@ -732,7 +732,7 @@ RecursiveMigrate (const char *pszPath, W if (strstr (szTmpBuf, ".zip\0")) { @@ -18,7 +18,7 @@ } } // Zip file is actually a dir -@@ -780,9 +780,9 @@ +@@ -780,9 +780,9 @@ RecursiveMigrate (const char *pszPath, W sprintf (szTmpBuf, "%s", direntp->d_name); strlwr (szTmpBuf); diff --git a/archivers/unace/files/patch-CVE-2015-2063 b/archivers/unace/files/patch-CVE-2015-2063 index 72c0fb38e707..046844c6e261 100644 --- a/archivers/unace/files/patch-CVE-2015-2063 +++ b/archivers/unace/files/patch-CVE-2015-2063 @@ -10,13 +10,9 @@ Bug-Debian: https://bugs.debian.org/775003 Forwarded: no Last-Update: 2015-02-24 ---- - unace.c | 25 +++++++++++++++++++++++-- - 1 file changed, 23 insertions(+), 2 deletions(-) - ---- unace.c +--- unace.c.orig 1998-07-01 08:29:00 UTC +++ unace.c -@@ -113,6 +113,7 @@ INT read_header(INT print_err) +@@ -111,6 +111,7 @@ INT read_header(INT print_err) { USHORT rd, head_size, @@ -24,7 +20,7 @@ Last-Update: 2015-02-24 crc_ok; LONG crc; UCHAR *tp=readbuf; -@@ -128,6 +129,9 @@ INT read_header(INT print_err) +@@ -126,6 +127,9 @@ INT read_header(INT print_err) #endif // read size_headrdb bytes into head_size = head.HEAD_SIZE; // header structure @@ -34,7 +30,7 @@ Last-Update: 2015-02-24 rd = (head_size > size_headrdb) ? size_headrdb : head_size; if (read(archan, readbuf, rd) < rd) return 0; -@@ -147,7 +151,12 @@ INT read_header(INT print_err) +@@ -145,7 +149,12 @@ INT read_header(INT print_err) head.HEAD_FLAGS=BUFP2WORD(tp); if (head.HEAD_FLAGS & ACE_ADDSIZE) @@ -47,7 +43,7 @@ Last-Update: 2015-02-24 else skipsize = 0; -@@ -158,6 +167,9 @@ INT read_header(INT print_err) +@@ -156,6 +165,9 @@ INT read_header(INT print_err) switch (head.HEAD_TYPE) // specific buffer to head conversion { case MAIN_BLK: @@ -57,7 +53,7 @@ Last-Update: 2015-02-24 memcpy(mhead.ACESIGN, tp, acesign_len); tp+=acesign_len; mhead.VER_MOD=*tp++; mhead.VER_CR =*tp++; -@@ -168,9 +180,15 @@ INT read_header(INT print_err) +@@ -166,9 +178,15 @@ INT read_header(INT print_err) mhead.RES2 =BUFP2WORD(tp); mhead.RES =BUFP2LONG(tp); mhead.AV_SIZE=*tp++; @@ -74,7 +70,7 @@ Last-Update: 2015-02-24 fhead.PSIZE =BUFP2LONG(tp); fhead.SIZE =BUFP2LONG(tp); fhead.FTIME =BUFP2LONG(tp); -@@ -181,7 +199,10 @@ INT read_header(INT print_err) +@@ -179,7 +197,10 @@ INT read_header(INT print_err) fhead.TECH.PARM =BUFP2WORD(tp); fhead.RESERVED =BUFP2WORD(tp); fhead.FNAME_SIZE=BUFP2WORD(tp); diff --git a/archivers/unace/files/patch-uac__crt.c b/archivers/unace/files/patch-uac__crt.c index 0502e49a5d01..857c44127b16 100644 --- a/archivers/unace/files/patch-uac__crt.c +++ b/archivers/unace/files/patch-uac__crt.c @@ -1,4 +1,4 @@ ---- uac_crt.c.orig +--- uac_crt.c.orig 1998-07-01 08:29:00 UTC +++ uac_crt.c @@ -33,12 +33,15 @@ @@ -19,7 +19,7 @@ s[i] = 0; if (nopath) -@@ -56,22 +59,72 @@ +@@ -56,22 +59,72 @@ CHAR *ace_fname(CHAR * s, thead * head, } #endif diff --git a/archivers/unace/files/patch-unace.c b/archivers/unace/files/patch-unace.c index 77a8bf769f81..398895e2213e 100644 --- a/archivers/unace/files/patch-unace.c +++ b/archivers/unace/files/patch-unace.c @@ -1,6 +1,6 @@ ---- unace.c.orig +--- unace.c.orig 1998-07-01 08:29:00 UTC +++ unace.c -@@ -240,6 +240,7 @@ +@@ -240,6 +240,7 @@ INT read_arc_head(void) // searc INT open_archive(INT print_err) // opens archive (or volume) { CHAR av_str[80]; @@ -8,7 +8,7 @@ archan = open(aname, O_RDONLY | O_BINARY); // open file -@@ -263,8 +264,11 @@ +@@ -263,8 +264,11 @@ INT open_archive(INT print_err) sprintf(av_str, "\ncreated on %d.%d.%d by ", ts_day(adat.time_cr), ts_month(adat.time_cr), ts_year(adat.time_cr)); printf(av_str); @@ -22,7 +22,7 @@ printf("%s\n\n", av_str); } comment_out("Main comment:"); // print main comment -@@ -300,7 +304,7 @@ +@@ -300,7 +304,7 @@ void get_next_volname(void) INT proc_vol(void) // opens volume { INT i; @@ -31,7 +31,7 @@ // if f_allvol_pr is 2 we have -y and should never ask if ((!fileexists_insense(aname) && f_allvol_pr != 2) || !f_allvol_pr) -@@ -428,7 +432,7 @@ +@@ -428,7 +432,7 @@ void extract_files(int nopath, int test) if (head.HEAD_TYPE == FILE_BLK) { comment_out("File comment:"); // show file comment @@ -40,7 +40,7 @@ printf("\n%s", file); flush; dcpr_init_file(); // initialize decompression of file -@@ -496,7 +500,7 @@ +@@ -496,7 +500,7 @@ void list_files(int verbose) if (head.HEAD_TYPE == FILE_BLK) { ULONG ti=fhead.FTIME; @@ -49,7 +49,7 @@ size += fhead.SIZE; psize += -@@ -588,7 +592,8 @@ +@@ -588,7 +592,8 @@ int main(INT argc, CHAR * argv[]) init_unace(); // initialize unace diff --git a/archivers/unalz/files/patch-UnAlz.cpp b/archivers/unalz/files/patch-UnAlz.cpp index d440e9108cc0..627cce0c8cbe 100644 --- a/archivers/unalz/files/patch-UnAlz.cpp +++ b/archivers/unalz/files/patch-UnAlz.cpp @@ -1,4 +1,4 @@ ---- UnAlz.cpp.orig 2014-07-07 10:40:53.000000000 +0000 +--- UnAlz.cpp.orig 2016-07-26 12:39:47 UTC +++ UnAlz.cpp @@ -37,7 +37,7 @@ # include <errno.h> diff --git a/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd b/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd index 021d56a92c93..1552fbb68434 100644 --- a/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd +++ b/archivers/unarchiver/files/patch-UniversalDetector_Makefile.freebsd @@ -1,4 +1,4 @@ ---- UniversalDetector/Makefile.freebsd.orig 2015-09-23 20:24:59 UTC +--- UniversalDetector/Makefile.freebsd.orig 2016-05-17 06:39:04 UTC +++ UniversalDetector/Makefile.freebsd @@ -1,10 +1,7 @@ # Compilers and linkers diff --git a/archivers/unarchiver/files/patch-XADMaster_Makefile.common b/archivers/unarchiver/files/patch-XADMaster_Makefile.common index 353e5576da1d..d6ea2a344371 100644 --- a/archivers/unarchiver/files/patch-XADMaster_Makefile.common +++ b/archivers/unarchiver/files/patch-XADMaster_Makefile.common @@ -1,6 +1,6 @@ ---- XADMaster/Makefile.common.orig 2015-09-23 20:24:59 UTC +--- XADMaster/Makefile.common.orig 2016-05-17 06:39:04 UTC +++ XADMaster/Makefile.common -@@ -206,12 +206,6 @@ LIBRARY_C_FILES = BWT.c \ +@@ -209,12 +209,6 @@ LIBRARY_C_FILES = BWT.c \ PPMd/VariantG.c \ PPMd/VariantH.c \ PPMd/VariantI.c \ diff --git a/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd b/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd index 1bb2b350c391..b2f911d28c3f 100644 --- a/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd +++ b/archivers/unarchiver/files/patch-XADMaster_Makefile.freebsd @@ -1,4 +1,4 @@ ---- XADMaster/Makefile.freebsd.orig 2015-09-23 20:24:59 UTC +--- XADMaster/Makefile.freebsd.orig 2016-05-17 06:39:04 UTC +++ XADMaster/Makefile.freebsd @@ -1,10 +1,7 @@ # Compilers and linkers diff --git a/archivers/unarchiver/files/patch-XADMaster_XADWinZipWavPackHandle.h b/archivers/unarchiver/files/patch-XADMaster_XADWinZipWavPackHandle.h index 97c304b11734..a58dd5f5a5dd 100644 --- a/archivers/unarchiver/files/patch-XADMaster_XADWinZipWavPackHandle.h +++ b/archivers/unarchiver/files/patch-XADMaster_XADWinZipWavPackHandle.h @@ -1,4 +1,4 @@ ---- XADMaster/XADWinZipWavPackHandle.h.orig 2015-09-23 20:24:59 UTC +--- XADMaster/XADWinZipWavPackHandle.h.orig 2016-05-17 06:39:04 UTC +++ XADMaster/XADWinZipWavPackHandle.h @@ -1,6 +1,6 @@ #import "CSBlockStreamHandle.h" diff --git a/archivers/unarj/files/patch-CVE-2004-0947 b/archivers/unarj/files/patch-CVE-2004-0947 index b66db317b198..317d595de984 100644 --- a/archivers/unarj/files/patch-CVE-2004-0947 +++ b/archivers/unarj/files/patch-CVE-2004-0947 @@ -1,6 +1,8 @@ - Fix buffer overflow problem in filename handling (CAN-2004-0947) -Index: unarj.c -@@ -217,7 +217,7 @@ static uchar arj_flags; + +--- unarj.c.orig 2002-06-05 08:28:06 UTC ++++ unarj.c +@@ -213,7 +213,7 @@ static uchar arj_flags; static short method; static uint file_mode; static ulong time_stamp; @@ -9,7 +11,7 @@ Index: unarj.c static ushort host_data; static uchar *get_ptr; static UCRC file_crc; -@@ -608,6 +608,7 @@ char *name; +@@ -604,6 +604,7 @@ char *name; error(M_BADHEADR, ""); crc = CRC_MASK; @@ -17,7 +19,7 @@ Index: unarj.c fread_crc(header, (int) headersize, fd); header_crc = fget_crc(fd); if ((crc ^ CRC_MASK) != header_crc) -@@ -632,9 +633,13 @@ char *name; +@@ -628,9 +629,13 @@ char *name; if (origsize < 0 || compsize < 0) error(M_HEADRCRC, ""); @@ -31,7 +33,7 @@ Index: unarj.c if (host_os != OS) strparity((uchar *)filename); if ((arj_flags & PATHSYM_FLAG) != 0) -@@ -733,11 +738,11 @@ extract() +@@ -727,11 +732,11 @@ extract() no_output = 0; if (command == 'E') diff --git a/archivers/unarj/files/patch-CVE-2004-1027 b/archivers/unarj/files/patch-CVE-2004-1027 index 7a236040cc09..28b54b85f922 100644 --- a/archivers/unarj/files/patch-CVE-2004-1027 +++ b/archivers/unarj/files/patch-CVE-2004-1027 @@ -1,30 +1,8 @@ - Fix unchecked path extraction problem (CAN-2004-1027) -Index: unarj.c -@@ -235,6 +235,8 @@ static UCRC crctable[UCHAR_MAX + 1]; - - /* Functions */ - -+void copy_path_relative(char *dest, char *src, size_t len); -+ - static void - make_crctable() - { -@@ -738,11 +740,11 @@ extract() - - no_output = 0; - if (command == 'E') -- strncopy(name, &filename[entry_pos], sizeof(name)); -+ copy_path_relative(name, &filename[entry_pos], sizeof(name)); - else - { - strcpy(name, DEFAULT_DIR); -- strncopy(name+strlen(name), filename, sizeof(name)-strlen(name)); -+ copy_path_relative(name+strlen(name), filename, sizeof(name)-strlen(name)); - } - - if (host_os != OS) -Index: Makefile -@@ -9,7 +9,9 @@ + +--- Makefile.orig 2004-11-29 13:47:24 UTC ++++ Makefile +@@ -9,7 +9,9 @@ environ.o: environ.c unarj.h decode.o: decode.c unarj.h @@ -35,7 +13,8 @@ Index: Makefile unarj: $(OBJS) $(CC) $(LDFLAGS) $(OBJS) -o unarj -Index: sanitize.c +--- sanitize.c.orig 2016-07-26 12:41:37 UTC ++++ sanitize.c @@ -0,0 +1,81 @@ +/* + * Path sanitation code by Ludwig Nussel <ludwig.nussel@suse.de>. Public Domain. @@ -118,3 +97,28 @@ Index: sanitize.c + } + o[len?0:-1] = '\0'; +} +--- unarj.c.orig 2016-07-26 12:41:37 UTC ++++ unarj.c +@@ -231,6 +231,8 @@ static UCRC crctable[UCHAR_MAX + 1]; + + /* Functions */ + ++void copy_path_relative(char *dest, char *src, size_t len); ++ + static void + make_crctable() + { +@@ -732,11 +734,11 @@ extract() + + no_output = 0; + if (command == 'E') +- strncopy(name, &filename[entry_pos], sizeof(name)); ++ copy_path_relative(name, &filename[entry_pos], sizeof(name)); + else + { + strcpy(name, DEFAULT_DIR); +- strncopy(name+strlen(name), filename, sizeof(name)-strlen(name)); ++ copy_path_relative(name+strlen(name), filename, sizeof(name)-strlen(name)); + } + + if (host_os != OS) diff --git a/archivers/unarj/files/patch-environ.c b/archivers/unarj/files/patch-environ.c index 43f2e4c66c96..ed827668c968 100644 --- a/archivers/unarj/files/patch-environ.c +++ b/archivers/unarj/files/patch-environ.c @@ -1,6 +1,6 @@ ---- environ.c.orig Mon Sep 29 14:00:24 1997 -+++ environ.c Thu Feb 18 01:14:35 1999 -@@ -430,16 +430,24 @@ +--- environ.c.orig 2002-06-05 08:28:06 UTC ++++ environ.c +@@ -430,16 +430,24 @@ uint host; #define SUBS_DEFINED @@ -28,7 +28,7 @@ FILE * file_open(name, mode) -@@ -535,8 +543,12 @@ +@@ -535,8 +543,12 @@ uint mode; } long @@ -42,7 +42,7 @@ #define NOONOFFSET 43200L #define SEC_IN_DAY (24L * 60L * 60L) #define INV_VALUE (SEC_IN_DAY + 1L) -@@ -552,6 +564,7 @@ +@@ -552,6 +564,7 @@ gettz() /* returns the offset fr noontm = localtime(&noon); retval = NOONOFFSET - 60 * (60 * noontm->tm_hour - noontm->tm_min); return retval; @@ -50,7 +50,7 @@ } long -@@ -600,19 +613,29 @@ +@@ -600,19 +613,29 @@ uint host; { time_t m_time; struct utimbuf diff --git a/archivers/unarj/files/patch-unarj.c b/archivers/unarj/files/patch-unarj.c index 5b683946234c..d348abe13792 100644 --- a/archivers/unarj/files/patch-unarj.c +++ b/archivers/unarj/files/patch-unarj.c @@ -1,5 +1,5 @@ ---- unarj.c.orig Wed Jun 5 12:28:06 2002 -+++ unarj.c Mon Nov 29 17:48:27 2004 +--- unarj.c.orig 2002-06-05 08:28:06 UTC ++++ unarj.c @@ -54,6 +54,10 @@ #include <stdlib.h> #include <string.h> @@ -11,7 +11,7 @@ #else /* !MODERN */ extern void free(); extern void exit(); -@@ -718,6 +722,8 @@ +@@ -718,6 +722,8 @@ static int extract() { char name[FNAME_MAX]; @@ -20,11 +20,10 @@ if (check_flags()) { -@@ -736,6 +742,21 @@ - +@@ -737,6 +743,21 @@ extract() if (host_os != OS) default_case_path(name); -+ + + + /* + 8/8/2000 Phil Knirsch: Bugfix to create subdirectories. Unarj didn't @@ -39,6 +38,7 @@ + mkdir(dir, 0777); + pos = strchr(pos+1, PATH_CHAR); + } - ++ if (file_exists(name)) { + printf(M_FEXISTS, name); diff --git a/archivers/unarj/files/patch-unarj.h b/archivers/unarj/files/patch-unarj.h index 42d3e4a23b6c..79c120416fbb 100644 --- a/archivers/unarj/files/patch-unarj.h +++ b/archivers/unarj/files/patch-unarj.h @@ -1,5 +1,5 @@ ---- unarj.h.orig Mon Sep 29 14:00:24 1997 -+++ unarj.h Thu Feb 18 01:06:10 1999 +--- unarj.h.orig 2002-06-05 08:28:06 UTC ++++ unarj.h @@ -106,8 +106,12 @@ #endif diff --git a/archivers/unshield/files/patch-unshield-v2-format b/archivers/unshield/files/patch-unshield-v2-format index 85a7ce9b0b7a..fae6714ebbcb 100644 --- a/archivers/unshield/files/patch-unshield-v2-format +++ b/archivers/unshield/files/patch-unshield-v2-format @@ -1,6 +1,6 @@ ---- lib/component.c.orig +--- lib/component.c.orig 2005-06-28 18:49:36 UTC +++ lib/component.c -@@ -40,11 +40,13 @@ +@@ -40,11 +40,13 @@ UnshieldComponent* unshield_component_ne case 7: case 8: case 9: @@ -17,9 +17,9 @@ } self->file_group_count = READ_UINT16(p); p += 2; ---- lib/file.c.orig +--- lib/file.c.orig 2007-01-06 14:34:57 UTC +++ lib/file.c -@@ -77,6 +77,11 @@ +@@ -77,6 +77,11 @@ static FileDescriptor* unshield_read_fil case 7: case 8: case 9: @@ -31,7 +31,7 @@ saved_p = p = header->data + header->common.cab_descriptor_offset + header->cab.file_table_offset + -@@ -117,10 +122,6 @@ +@@ -117,10 +122,6 @@ static FileDescriptor* unshield_read_fil assert((p - saved_p) == 0x57); break; @@ -42,7 +42,7 @@ } if (!(fd->flags & FILE_COMPRESSED) && -@@ -363,6 +364,11 @@ +@@ -363,6 +364,11 @@ static bool unshield_reader_open_volume( case 7: case 8: case 9: @@ -54,7 +54,7 @@ { uint8_t six_header[VOLUME_HEADER_SIZE_V6]; uint8_t* p = six_header; -@@ -389,10 +395,6 @@ +@@ -389,10 +395,6 @@ static bool unshield_reader_open_volume( reader->volume_header.last_file_size_compressed_high = READ_UINT32(p); p += 4; } break; @@ -65,9 +65,9 @@ } #if VERBOSE >= 2 ---- lib/libunshield.c.orig +--- lib/libunshield.c.orig 2004-08-24 06:10:27 UTC +++ lib/libunshield.c -@@ -205,7 +205,7 @@ +@@ -205,7 +205,7 @@ static bool unshield_header_get_file_gro /** Read all header files */ @@ -76,7 +76,7 @@ { int i; bool iterate = true; -@@ -268,8 +268,21 @@ +@@ -268,8 +268,21 @@ static bool unshield_read_headers(Unshie unshield_error("Failed to read common header from header file %i", i); goto error; } @@ -100,7 +100,7 @@ #if 0 if (header->major_version < 5) -@@ -326,6 +339,11 @@ +@@ -326,6 +339,11 @@ error: Unshield* unshield_open(const char* filename)/*{{{*/ { @@ -112,7 +112,7 @@ Unshield* unshield = NEW1(Unshield); if (!unshield) { -@@ -339,7 +357,7 @@ +@@ -339,7 +357,7 @@ Unshield* unshield_open(const char* file goto error; } @@ -121,9 +121,9 @@ { unshield_error("Failed to read header files"); goto error; ---- lib/libunshield.h.orig +--- lib/libunshield.h.orig 2007-01-06 14:34:57 UTC +++ lib/libunshield.h -@@ -33,6 +33,7 @@ +@@ -33,6 +33,7 @@ void unshield_set_log_level(int level); */ Unshield* unshield_open(const char* filename); @@ -131,7 +131,7 @@ void unshield_close(Unshield* unshield); /* ---- man/unshield.1.orig +--- man/unshield.1.orig 2008-02-15 16:36:33 UTC +++ man/unshield.1 @@ -2,7 +2,7 @@ .SH NAME @@ -142,7 +142,7 @@ .SH DESCRIPTION Unshield extracts CAB files from InstallShield installers, used to install software on Microsoft Windows based machines. -@@ -27,6 +27,11 @@ +@@ -27,6 +27,11 @@ Only list/extract this file group \fB\-h\fR Show help message .TP @@ -154,9 +154,9 @@ \fB\-j\fR Junk paths (do not make directories) .TP ---- src/unshield.c.orig +--- src/unshield.c.orig 2009-06-18 05:11:31 UTC +++ src/unshield.c -@@ -58,6 +58,7 @@ +@@ -58,6 +58,7 @@ static OVERWRITE overwrite = static int log_level = UNSHIELD_LOG_LEVEL_LOWEST; static int exit_status = 0; static FORMAT format = FORMAT_NEW; @@ -164,7 +164,7 @@ static bool make_sure_directory_exists(const char* directory)/*{{{*/ { -@@ -108,7 +109,7 @@ +@@ -108,7 +109,7 @@ static void show_usage(const char* name) fprintf(stderr, "Syntax:\n" "\n" @@ -173,7 +173,7 @@ "\n" "Options:\n" "\t-c COMPONENT Only list/extract this component\n" -@@ -120,6 +121,7 @@ +@@ -120,6 +121,7 @@ static void show_usage(const char* name) "\t 3 - Errors, warnings and debug messages\n" "\t-g GROUP Only list/extract this file group\n" "\t-h Show this help message\n" @@ -181,7 +181,7 @@ "\t-j Junk paths (do not make directories)\n" "\t-L Make file and directory names lowercase\n" "\t-O Use old compression\n" -@@ -152,7 +154,7 @@ +@@ -152,7 +154,7 @@ static bool handle_parameters( { int c; @@ -190,7 +190,7 @@ { switch (c) { -@@ -172,6 +174,10 @@ +@@ -172,6 +174,10 @@ static bool handle_parameters( file_group_name = optarg; break; @@ -201,7 +201,7 @@ case 'j': junk_paths = true; break; -@@ -532,7 +538,7 @@ +@@ -532,7 +538,7 @@ int main(int argc, char** argv) cabfile = argv[last_optind]; diff --git a/archivers/untar/Makefile b/archivers/untar/Makefile index 2bf88c071798..bf4b366f2e23 100644 --- a/archivers/untar/Makefile +++ b/archivers/untar/Makefile @@ -21,7 +21,7 @@ MAKE_ENV+= PROG=untar NO_MAN=yes MAKE_ARGS+= CFLAGS="${CFLAGS} -D_POSIX_SOURCE" \ LDFLAGS="${LDFLAGS} -static" -pre-patch: +post-extract: @${CP} ${DISTDIR}/untar.c ${WRKSRC} do-install: diff --git a/archivers/untar/files/patch-untar.c b/archivers/untar/files/patch-untar.c index 760b6819c7a1..f65415ba1c2c 100644 --- a/archivers/untar/files/patch-untar.c +++ b/archivers/untar/files/patch-untar.c @@ -1,5 +1,5 @@ ---- untar.c.old 2010-03-19 22:39:55.000000000 +0100 -+++ untar.c 2010-03-19 22:36:01.000000000 +0100 +--- untar.c.orig 2016-07-26 12:43:54 UTC ++++ untar.c @@ -48,6 +48,9 @@ */ diff --git a/archivers/unzip/files/patch-crypt.c b/archivers/unzip/files/patch-crypt.c index 96d1c071a7a2..82fde67fda12 100644 --- a/archivers/unzip/files/patch-crypt.c +++ b/archivers/unzip/files/patch-crypt.c @@ -1,6 +1,6 @@ ---- crypt.c.orig 2007-01-05 16:47:36.000000000 +0100 -+++ crypt.c 2016-01-04 14:39:27.300502995 +0100 -@@ -465,7 +465,17 @@ +--- crypt.c.orig 2007-01-05 15:47:36 UTC ++++ crypt.c +@@ -465,7 +465,17 @@ int decrypt(__G__ passwrd) GLOBAL(pInfo->encrypted) = FALSE; defer_leftover_input(__G); for (n = 0; n < RAND_HEAD_LEN; n++) { diff --git a/archivers/unzip/files/patch-extract.c b/archivers/unzip/files/patch-extract.c index 63ad0548ad83..2d93b1c58b8e 100644 --- a/archivers/unzip/files/patch-extract.c +++ b/archivers/unzip/files/patch-extract.c @@ -1,5 +1,5 @@ ---- extract.c.orig 2009-03-14 02:32:52.000000000 +0100 -+++ extract.c 2016-01-04 14:43:11.813488458 +0100 +--- extract.c.orig 2009-03-14 01:32:52 UTC ++++ extract.c @@ -1,5 +1,5 @@ /* - Copyright (c) 1990-2009 Info-ZIP. All rights reserved. @@ -7,7 +7,7 @@ See the accompanying file LICENSE, version 2009-Jan-02 or later (the contents of which are also included in unzip.h) for terms of use. -@@ -298,6 +298,8 @@ +@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD[] = #ifndef SFX static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \ EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n"; @@ -16,7 +16,7 @@ static ZCONST char Far InvalidComprDataEAs[] = " invalid compressed data for EAs\n"; # if (defined(WIN32) && defined(NTSD_EAS)) -@@ -2023,7 +2025,8 @@ +@@ -2023,7 +2025,8 @@ static int TestExtraField(__G__ ef, ef_l ebID = makeword(ef); ebLen = (unsigned)makeword(ef+EB_LEN); @@ -26,7 +26,7 @@ /* Discovered some extra field inconsistency! */ if (uO.qflag) Info(slide, 1, ((char *)slide, "%-22s ", -@@ -2032,6 +2035,16 @@ +@@ -2032,6 +2035,16 @@ static int TestExtraField(__G__ ef, ef_l ebLen, (ef_len - EB_HEADSIZE))); return PK_ERR; } @@ -43,7 +43,7 @@ switch (ebID) { case EF_OS2: -@@ -2217,14 +2230,28 @@ +@@ -2217,14 +2230,28 @@ static int test_compr_eb(__G__ eb, eb_si ulg eb_ucsize; uch *eb_ucptr; int r; @@ -75,7 +75,7 @@ if ( #ifdef INT_16BIT -@@ -2701,6 +2728,12 @@ +@@ -2701,6 +2728,12 @@ __GDEF int repeated_buf_err; bz_stream bstrm; diff --git a/archivers/unzoo/files/patch-unzoo.c b/archivers/unzoo/files/patch-unzoo.c index c111a57e6c0e..71c65ca53ec3 100644 --- a/archivers/unzoo/files/patch-unzoo.c +++ b/archivers/unzoo/files/patch-unzoo.c @@ -1,20 +1,20 @@ ---- unzoo.c.orig Sat Nov 25 00:53:57 2006 -+++ unzoo.c Sat Nov 25 01:00:42 2006 -@@ -2590,20 +2590,20 @@ +--- unzoo.c.orig 2016-07-26 12:44:10 UTC ++++ unzoo.c +@@ -2590,20 +2590,20 @@ int ExtrArch ( bim, out, ovr /* but only if the user did not request otherwise */ - + /* building the universal path of this member */ + int found_trav = 0; char patu [sizeof(Entry.diru) + sizeof(Entry.namu) + 2]; strcpy( patu, Entry.diru ); if ( strlen(patu) && patu[strlen(patu)-1] != '/') strcat( patu, "/" ); strcat( patu, (Entry.lnamu ? Entry.namu : Entry.nams) ); - + - int found_trav = 0; - + if ( strstr( patu, "/../" )) { - found_trav = 1; - + /* remove "/../" from the path */ char tmp [sizeof(patu)]; char *p; @@ -22,25 +22,25 @@ + found_trav = 1; memset(tmp, 0, sizeof(tmp)); q = patu; - -@@ -2625,10 +2625,10 @@ + +@@ -2625,10 +2625,10 @@ int ExtrArch ( bim, out, ovr printf("unzoo: skipped \"/../\" path component(s) in '%s'\n", Entry.patl); } if ( *patu == '/' && !strlen( pre ) ) { - found_trav = 1; - + char *p = malloc(sizeof(patu)); char *q = p; + found_trav = 1; memset(p, 0, sizeof(patu)); strcpy(p, patu); while ( q[0] == '/' ) q++; -@@ -2638,9 +2638,9 @@ +@@ -2638,9 +2638,9 @@ int ExtrArch ( bim, out, ovr printf("unzoo: skipped root directory path component in '%s'\n", patl); } if ( !strncmp( patu, "../", 3 )) { - found_trav = 1; - + char tmp [sizeof(patu)]; + found_trav = 1; memset(tmp, 0, sizeof(tmp)); diff --git a/archivers/upx/files/patch-src-Makefile b/archivers/upx/files/patch-src_Makefile index ff98a0bb4671..17c9907cfea8 100644 --- a/archivers/upx/files/patch-src-Makefile +++ b/archivers/upx/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig Fri Apr 27 15:00:00 2007 -+++ src/Makefile Wed May 9 22:55:18 2007 -@@ -52,7 +52,7 @@ +--- src/Makefile.orig 2013-09-30 15:51:00 UTC ++++ src/Makefile +@@ -55,7 +55,7 @@ upx_OBJECTS := $(notdir $(upx_SOURCES:.c # we need UCL and zlib - you can set envvar UPX_UCLDIR ifneq ($(wildcard $(UPX_UCLDIR)/include/ucl/ucl.h),) INCLUDES += -I$(UPX_UCLDIR)/include @@ -8,4 +8,4 @@ +LIBS += -L$(UPX_UCLDIR)/lib endif LIBS += -lucl -lz - # you should set envvar UPX_LZMADIR to point to your unpacked lzma443.tar.bz2 + # you should set envvar UPX_LZMADIR to point to your unpacked LZMA SDK diff --git a/archivers/upx/files/patch-src-miniacc.h b/archivers/upx/files/patch-src_miniacc.h index 38622598a89e..38622598a89e 100644 --- a/archivers/upx/files/patch-src-miniacc.h +++ b/archivers/upx/files/patch-src_miniacc.h diff --git a/archivers/upx/files/patch-src-packer.h b/archivers/upx/files/patch-src_packer.h index c16901d55891..d99e08bd955b 100644 --- a/archivers/upx/files/patch-src-packer.h +++ b/archivers/upx/files/patch-src_packer.h @@ -1,6 +1,6 @@ ---- src/packer.h.orig 2011-12-13 00:08:00.000000000 +0800 -+++ src/packer.h 2012-01-06 04:41:44.771998330 +0800 -@@ -235,7 +235,7 @@ +--- src/packer.h.orig 2013-09-30 15:51:00 UTC ++++ src/packer.h +@@ -238,7 +238,7 @@ protected: void addLoader(C,C,C,C,C,C,C,C); void addLoader(C,C,C,C,C,C,C,C,C); void addLoader(C,C,C,C,C,C,C,C,C,C); #undef C diff --git a/archivers/xarchive/files/patch-doc-Makefile.in b/archivers/xarchive/files/patch-doc-Makefile.in deleted file mode 100644 index 538f1296b1f8..000000000000 --- a/archivers/xarchive/files/patch-doc-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- ./doc/Makefile.in.orig Wed May 17 08:42:06 2006 -+++ ./doc/Makefile.in Wed May 17 08:42:32 2006 -@@ -234,7 +234,7 @@ - - info-am: - --install-data-am: install-docDATA install-man -+install-data-am: install-man - - install-exec-am: - diff --git a/archivers/xarchive/files/patch-doc_Makefile.in b/archivers/xarchive/files/patch-doc_Makefile.in new file mode 100644 index 000000000000..1e9bc5a21a1a --- /dev/null +++ b/archivers/xarchive/files/patch-doc_Makefile.in @@ -0,0 +1,11 @@ +--- doc/Makefile.in.orig 2006-02-27 17:29:16 UTC ++++ doc/Makefile.in +@@ -234,7 +234,7 @@ info: info-am + + info-am: + +-install-data-am: install-docDATA install-man ++install-data-am: install-man + + install-exec-am: + diff --git a/archivers/xarchive/files/patch-src-main.c b/archivers/xarchive/files/patch-src_main.c index 0e1363951367..7138e8a0c1f1 100644 --- a/archivers/xarchive/files/patch-src-main.c +++ b/archivers/xarchive/files/patch-src_main.c @@ -1,6 +1,6 @@ ---- src/main.c.orig Sun Nov 6 21:26:45 2005 -+++ src/main.c Sun Nov 13 02:57:57 2005 -@@ -115,6 +115,7 @@ +--- src/main.c.orig 2006-02-23 17:25:47 UTC ++++ src/main.c +@@ -115,6 +115,7 @@ setup_wrappers(void) WrapperEntry *wrapent = NULL; home = g_strdup_printf("%s/.xarchive/wrappers", getenv("HOME")); @@ -8,11 +8,11 @@ char *dir[] = { home, -@@ -145,6 +146,7 @@ - if (WRAPPER_ARRAY == NULL) +@@ -146,6 +147,7 @@ setup_wrappers(void) { g_print("No wrappers found\n"); -+ } } ++ } } + extern gchar * diff --git a/archivers/xarchive/files/patch-src-widgets_gtk.c b/archivers/xarchive/files/patch-src_widgets__gtk.c index 58beeb2624d5..b0125309f4b4 100644 --- a/archivers/xarchive/files/patch-src-widgets_gtk.c +++ b/archivers/xarchive/files/patch-src_widgets__gtk.c @@ -1,6 +1,6 @@ ---- src/widgets_gtk.c.orig Tue Nov 8 20:39:01 2005 -+++ src/widgets_gtk.c Sun Nov 13 03:03:53 2005 -@@ -1022,8 +1022,9 @@ +--- src/widgets_gtk.c.orig 2006-02-27 14:00:30 UTC ++++ src/widgets_gtk.c +@@ -1131,8 +1131,9 @@ open_one_file(WrapperData *wrapper, gcha if (wrapper_cmd(AR_EXTRACT, wrapper->argv, wrapper->dir) == 0) { diff --git a/archivers/xarchiver/files/patch-src_bzip2.c b/archivers/xarchiver/files/patch-src_bzip2.c index 4471a049a328..debaa115fbfe 100644 --- a/archivers/xarchiver/files/patch-src_bzip2.c +++ b/archivers/xarchiver/files/patch-src_bzip2.c @@ -1,6 +1,6 @@ ---- src/bzip2.c.orig 2014-02-09 15:26:24 UTC +--- src/bzip2.c.orig 2016-07-19 21:54:07 UTC +++ src/bzip2.c -@@ -171,11 +171,11 @@ void xa_open_tar_compressed_file(XArchiv +@@ -176,11 +176,11 @@ void xa_open_tar_compressed_file(XArchiv if (archive->type == XARCHIVETYPE_TAR_BZ2) command = g_strconcat(tar," tfjv ",archive->escaped_path,NULL); else if (archive->type == XARCHIVETYPE_TAR_LZMA) diff --git a/archivers/xarchiver/files/patch-src_tar.c b/archivers/xarchiver/files/patch-src_tar.c index 1e97ef7408b8..3722360be86b 100644 --- a/archivers/xarchiver/files/patch-src_tar.c +++ b/archivers/xarchiver/files/patch-src_tar.c @@ -1,6 +1,6 @@ ---- src/tar.c.orig 2016-03-09 15:25:48 UTC +--- src/tar.c.orig 2016-07-19 21:54:07 UTC +++ src/tar.c -@@ -330,7 +330,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -334,7 +334,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -9,7 +9,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -349,7 +349,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -353,7 +353,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -18,7 +18,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -368,7 +368,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -372,7 +372,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -27,7 +27,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -387,7 +387,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -391,7 +391,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -36,7 +36,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -406,7 +406,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -410,7 +410,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif @@ -45,7 +45,7 @@ " -C ",archive->extraction_path," ",names->str,NULL); } else -@@ -425,7 +425,7 @@ gboolean xa_tar_extract(XArchive *archiv +@@ -429,7 +429,7 @@ gboolean xa_tar_extract(XArchive *archiv #else archive->overwrite ? " --overwrite" : " --keep-old-files", #endif diff --git a/archivers/xarchiver/files/patch-src_window.c b/archivers/xarchiver/files/patch-src_window.c index 9b2fe011bf0f..6d7f91b64490 100644 --- a/archivers/xarchiver/files/patch-src_window.c +++ b/archivers/xarchiver/files/patch-src_window.c @@ -1,6 +1,6 @@ ---- src/window.c.orig 2014-09-28 20:42:37 UTC +--- src/window.c.orig 2016-07-19 21:54:07 UTC +++ src/window.c -@@ -1130,7 +1130,7 @@ XArchiveType xa_detect_archive_type (gch +@@ -1181,7 +1181,7 @@ XArchiveType xa_detect_archive_type (gch xx = XARCHIVETYPE_BZIP2; else if (memcmp ( magic,"\x1f\x8b",2) == 0 || memcmp ( magic,"\x1f\x9d",2) == 0) xx = XARCHIVETYPE_GZIP; diff --git a/archivers/xmill/files/patch-XMill+BZlib.cpp b/archivers/xmill/files/patch-XMill_BZlib.cpp index 24c25114c64e..95cd778a6d35 100644 --- a/archivers/xmill/files/patch-XMill+BZlib.cpp +++ b/archivers/xmill/files/patch-XMill_BZlib.cpp @@ -1,6 +1,6 @@ ---- XMill/BZlib.cpp.orig 2008-07-26 04:10:15.000000000 +0700 -+++ XMill/BZlib.cpp 2008-07-26 04:20:22.000000000 +0700 -@@ -44,7 +44,7 @@ +--- XMill/BZlib.cpp.orig 2016-07-26 12:48:05 UTC ++++ XMill/BZlib.cpp +@@ -44,7 +44,7 @@ BZip::~BZip() void BZip::initCompress() { @@ -9,7 +9,7 @@ throw new XMillException (XMILL_ERR_ZLIB, "Error while compressing container!"); } } -@@ -60,19 +60,19 @@ +@@ -60,19 +60,19 @@ int BZip::doCompress(int flag) { if (flag == -1) flag = BZ_FINISH; @@ -32,7 +32,7 @@ throw new XMillException (XMILL_ERR_ZLIB, "Error while uncompressing container!"); } } -@@ -106,7 +106,7 @@ +@@ -106,7 +106,7 @@ char **BZip::getNextInPtr() void BZip::endUncompress() { @@ -41,7 +41,7 @@ throw new XMillException (XMILL_ERR_ZLIB, "Error while uncompressing container!"); } } -@@ -138,22 +138,24 @@ +@@ -138,22 +138,24 @@ int* BZip::getAvailOutPtr() int BZip::getTotalOut() { diff --git a/archivers/xmill/files/patch-XMill-CompressMan.cpp b/archivers/xmill/files/patch-XMill_CompressMan.cpp index 4e281515351e..c64b68dd77ef 100644 --- a/archivers/xmill/files/patch-XMill-CompressMan.cpp +++ b/archivers/xmill/files/patch-XMill_CompressMan.cpp @@ -1,6 +1,6 @@ ---- XMill/CompressMan.cpp.orig 2009-03-13 19:11:05.000000000 +0100 -+++ XMill/CompressMan.cpp 2009-03-13 19:11:08.000000000 +0100 -@@ -423,7 +423,7 @@ +--- XMill/CompressMan.cpp.orig 2016-07-26 12:48:05 UTC ++++ XMill/CompressMan.cpp +@@ -423,7 +423,7 @@ void BothCompressMan::DebugPrint() UserCompressorFactory *compressor=compressorlist; while(compressor!=NULL) { diff --git a/archivers/xmill/files/patch-XMill-PPMDI.cpp b/archivers/xmill/files/patch-XMill_PPMDI.cpp index a2b72a53cc78..0340d73155f1 100644 --- a/archivers/xmill/files/patch-XMill-PPMDI.cpp +++ b/archivers/xmill/files/patch-XMill_PPMDI.cpp @@ -1,6 +1,6 @@ ---- XMill/PPMDI.cpp.orig 2009-03-13 19:12:05.000000000 +0100 -+++ XMill/PPMDI.cpp 2009-03-13 19:12:29.000000000 +0100 -@@ -245,7 +245,7 @@ +--- XMill/PPMDI.cpp.orig 2016-07-26 12:48:05 UTC ++++ XMill/PPMDI.cpp +@@ -245,7 +245,7 @@ int PPMDI::uncompress(unsigned char *dst cleanup: *outused = j; diff --git a/archivers/xmill/files/patch-makefile b/archivers/xmill/files/patch-makefile index 7a9d3b94641d..fd8d9379de09 100644 --- a/archivers/xmill/files/patch-makefile +++ b/archivers/xmill/files/patch-makefile @@ -1,22 +1,21 @@ ---- makefile.orig 2008-07-26 04:10:14.000000000 +0700 -+++ makefile 2008-07-26 04:08:44.000000000 +0700 -@@ -43,25 +43,18 @@ +--- makefile.orig 2016-07-26 12:48:05 UTC ++++ makefile +@@ -43,25 +43,18 @@ INSPECTSRC = ./xmillinspect PPMZIPSRC = ./ppmzip PPMSRC = ./ppmdi -CPP = g++ -CC = gcc -LINK = g++ -- ++CPP = $(CXX) ++CC = $(CC) ++LINK = $(CPP) + -CFLAGS = -O3 -c -w -CPPFLAGS_XMILL = $(CFLAGS) -DXMILL -Izlib -Ibzlib -IXMill -Ippmdi -CPPFLAGS_XDEMILL = $(CFLAGS) -Izlib -Ibzlib -DXDEMILL -Ippmdi -CPPFLAGS_XMILLTEST = $(CFLAGS) -IXMill -CPPFLAGS_PPMZIP = $(CFLAGS) -Ippmdi -+CPP = $(CXX) -+CC = $(CC) -+LINK = $(CPP) -+ +CPPFLAGS = $(CXXFLAGS) -c -w +CPPFLAGS_XMILL = $(CPPFLAGS) -DXMILL -IXMill -Ippmdi +CPPFLAGS_XDEMILL = $(CPPFLAGS) -DXDEMILL -Ippmdi @@ -35,7 +34,7 @@ XMILLLIB_MISC = \ $(TMP)/CompressMan.o $(TMP)/ContMan.o $(TMP)/PathDict.o \ $(TMP)/UnCompCont.o \ -@@ -120,9 +113,9 @@ +@@ -120,9 +113,9 @@ XMILL_OBJSPART = $(TMP)/realmain.o $(TMP XDEMILL_OBJSPART = $(TMP)/realmain_u.o $(TMP)/Options_u.o XMILLTEST_OBJSPART = $(TMP)/testset.o $(TMP)/xmilltest.o @@ -48,7 +47,7 @@ XMILLINSPECTOBJS = $(TMP)/containers.o $(TMP)/exprinfo.o \ $(TMP)/globals.o \ -@@ -131,27 +124,27 @@ +@@ -131,27 +124,27 @@ XMILLINSPECTOBJS = $(TMP)/containers.o $ $(TMP)/lists.o \ $(TMP)/main.o \ $(TMP)/xmillinspect.o \ diff --git a/archivers/xpk/files/patch-shell_xQuery.c b/archivers/xpk/files/patch-shell_xQuery.c index 99c50170eb10..81b00012d456 100644 --- a/archivers/xpk/files/patch-shell_xQuery.c +++ b/archivers/xpk/files/patch-shell_xQuery.c @@ -1,5 +1,5 @@ ---- shell/xQuery.c.orig 2011-12-22 00:24:32.000000000 +0800 -+++ shell/xQuery.c 2011-12-22 00:24:43.000000000 +0800 +--- shell/xQuery.c.orig 2000-04-15 00:37:42 UTC ++++ shell/xQuery.c @@ -83,7 +83,7 @@ void packerquery(unsigned int packerid) printf("\n"); } diff --git a/archivers/zip/files/patch-man__zipcloak.1 b/archivers/zip/files/patch-man_zipcloak.1 index 98726b738dc4..21d0c1906c11 100644 --- a/archivers/zip/files/patch-man__zipcloak.1 +++ b/archivers/zip/files/patch-man_zipcloak.1 @@ -1,6 +1,6 @@ --- man/zipcloak.1.orig 2008-05-08 08:18:46 UTC +++ man/zipcloak.1 -@@ -12,8 +12,6 @@ +@@ -12,8 +12,6 @@ zipcloak \- encrypt entries in a zipfile zipfile .SH ARGUMENTS diff --git a/archivers/zip/files/patch-man__zipnote.1 b/archivers/zip/files/patch-man_zipnote.1 index 15d2b1c85f25..612f292e17a1 100644 --- a/archivers/zip/files/patch-man__zipnote.1 +++ b/archivers/zip/files/patch-man_zipnote.1 @@ -1,6 +1,6 @@ --- man/zipnote.1.orig 2008-05-08 08:17:56 UTC +++ man/zipnote.1 -@@ -12,8 +12,6 @@ +@@ -12,8 +12,6 @@ zipnote \- write the comments in zipfile zipfile .SH ARGUMENTS diff --git a/archivers/zip/files/patch-man__zipsplit.1 b/archivers/zip/files/patch-man_zipsplit.1 index 196a53b6d89d..5006951e9cc2 100644 --- a/archivers/zip/files/patch-man__zipsplit.1 +++ b/archivers/zip/files/patch-man_zipsplit.1 @@ -1,6 +1,6 @@ --- man/zipsplit.1.orig 2008-05-08 08:17:48 UTC +++ man/zipsplit.1 -@@ -17,8 +17,6 @@ +@@ -17,8 +17,6 @@ zipsplit \- split a zipfile into smaller zipfile .SH ARGUMENTS diff --git a/archivers/zip/files/patch-unix_Makefile b/archivers/zip/files/patch-unix_Makefile index c466c97973f2..f60637ff31d0 100644 --- a/archivers/zip/files/patch-unix_Makefile +++ b/archivers/zip/files/patch-unix_Makefile @@ -1,6 +1,6 @@ ---- unix/Makefile.orig 2008-05-07 02:33:56.000000000 +0400 -+++ unix/Makefile 2008-08-03 06:36:20.000000000 +0400 -@@ -22,7 +22,6 @@ +--- unix/Makefile.orig 2008-05-07 06:33:56 UTC ++++ unix/Makefile +@@ -22,7 +22,6 @@ SHELL = /bin/sh LN = ln -s # (to use the GNU compiler, change cc to gcc in CC) @@ -8,7 +8,7 @@ BIND = $(CC) AS = $(CC) -c CPP = /lib/cpp -@@ -57,8 +56,7 @@ +@@ -57,8 +56,7 @@ IZ_OUR_BZIP2_DIR = bzip2 # CFLAGS flags for C compile # LFLAGS1 flags after output file spec, before obj file list # LFLAGS2 flags after obj file list (libraries, etc) diff --git a/archivers/zip/files/patch-unix_configure b/archivers/zip/files/patch-unix_configure index adcc2c41e3cf..3e421f3ffba6 100644 --- a/archivers/zip/files/patch-unix_configure +++ b/archivers/zip/files/patch-unix_configure @@ -1,6 +1,6 @@ ---- unix/configure.orig 2008-06-19 23:32:20.000000000 +0400 -+++ unix/configure 2008-08-03 06:35:03.000000000 +0400 -@@ -98,7 +98,6 @@ +--- unix/configure.orig 2008-06-20 03:32:20 UTC ++++ unix/configure +@@ -98,7 +98,6 @@ int main() _EOF_ $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null if test $? -eq 0; then @@ -8,7 +8,7 @@ echo " GNU C ($CFLAGS_OPT)" # Special Mac OS X shared library "ld" option? if test ` uname -s 2> /dev/null ` = 'Darwin'; then -@@ -110,7 +109,6 @@ +@@ -110,7 +109,6 @@ _EOF_ rm -f conftest fi else @@ -16,7 +16,7 @@ echo " Other-unknown C ($CFLAGS_OPT)" fi fi -@@ -224,7 +222,6 @@ +@@ -224,7 +222,6 @@ CPP="${CC} -E" [ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" [ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp [ -f /lib/cpp ] && CPP=/lib/cpp @@ -24,7 +24,7 @@ [ -f /xenix ] && CPP="${CC} -E" [ -f /lynx.os ] && CPP="${CC} -E" -@@ -244,7 +241,7 @@ +@@ -244,7 +241,7 @@ if eval "$CPP match.S > _match.s 2>/dev/ echo "int foo() { return 0;}" > conftest.c $CC -c conftest.c >/dev/null 2>/dev/null echo Check if compiler generates underlines diff --git a/archivers/zipmix/files/patch-zipmix.c b/archivers/zipmix/files/patch-zipmix.c index bbf0d282f065..a27591fa426d 100644 --- a/archivers/zipmix/files/patch-zipmix.c +++ b/archivers/zipmix/files/patch-zipmix.c @@ -1,5 +1,5 @@ ---- zipmix.c.orig 2013-05-27 12:33:32.795062151 +0200 -+++ zipmix.c 2013-05-27 12:33:52.048486869 +0200 +--- zipmix.c.orig 2016-07-26 12:48:42 UTC ++++ zipmix.c @@ -4,6 +4,17 @@ zipmix.exe: zipmix.c; cl zipmix.c /O1 /G !if 0 #endif diff --git a/archivers/zoo/files/patch-ar.h b/archivers/zoo/files/patch-ar.h index fbc3ec644a2d..0acf929a0b65 100644 --- a/archivers/zoo/files/patch-ar.h +++ b/archivers/zoo/files/patch-ar.h @@ -1,6 +1,6 @@ ---- ./ar.h.orig 1993-05-01 06:04:22.000000000 +0200 -+++ ./ar.h 2011-12-22 14:00:55.000000000 +0100 -@@ -15,10 +15,12 @@ +--- ar.h.orig 1993-05-01 04:04:22 UTC ++++ ar.h +@@ -15,10 +15,12 @@ Adapted from "ar" archiver written by Ha /* uchar should be 8 bits or more */ /* typedef unsigned char uchar; -- already in zoo.h */ diff --git a/archivers/zoo/files/patch-bsd.c b/archivers/zoo/files/patch-bsd.c index bcb7712b7f3f..bc76a076e8a6 100644 --- a/archivers/zoo/files/patch-bsd.c +++ b/archivers/zoo/files/patch-bsd.c @@ -1,6 +1,6 @@ ---- ./bsd.c.orig 1993-05-01 06:21:53.000000000 +0200 -+++ ./bsd.c 2011-12-22 14:00:55.000000000 +0100 -@@ -69,8 +69,12 @@ +--- bsd.c.orig 1993-05-01 04:21:53 UTC ++++ bsd.c +@@ -69,8 +69,12 @@ ZOOFILE f; } /* Function gettz() returns the offset from GMT in seconds */ @@ -14,7 +14,7 @@ #define SEC_IN_DAY (24L * 60L * 60L) #define INV_VALUE (SEC_IN_DAY + 1L) static long retval = INV_VALUE; /* cache, init to impossible value */ -@@ -95,6 +99,7 @@ +@@ -95,6 +99,7 @@ long gettz() retval = -tm->tm_gmtoff; #endif return retval; @@ -22,7 +22,7 @@ } /* Standard UNIX-compatible time routines */ -@@ -103,15 +108,19 @@ +@@ -103,15 +108,19 @@ long gettz() /* Standard UNIX-specific file attribute routines */ #include "nixmode.i" diff --git a/archivers/zoo/files/patch-makefile b/archivers/zoo/files/patch-makefile index 18ec3e7caabd..50ddafa118df 100644 --- a/archivers/zoo/files/patch-makefile +++ b/archivers/zoo/files/patch-makefile @@ -1,5 +1,5 @@ ---- ./makefile.orig 1991-07-16 17:52:08.000000000 +0200 -+++ ./makefile 2011-12-22 14:00:55.000000000 +0100 +--- makefile.orig 1991-07-16 15:52:08 UTC ++++ makefile @@ -18,13 +18,13 @@ MAKE = make # needed for some systems e.g. older BSD @@ -18,7 +18,7 @@ #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ -@@ -67,7 +67,7 @@ +@@ -67,7 +67,7 @@ help : @echo "lint_turboc: Run lint under **IX for checking Turbo C/MSDOS code" # install alpha zoo as "tzoo" @@ -27,7 +27,7 @@ mv zoo $(DESTDIR)/tzoo # install beta zoo as "bzoo" -@@ -75,8 +75,9 @@ +@@ -75,8 +75,9 @@ inst_beta: mv zoo $(DESTDIR)/bzoo # install production zoo as "zoo" diff --git a/archivers/zoo/files/patch-misc.c b/archivers/zoo/files/patch-misc.c index a613087b3a10..65d744f73632 100644 --- a/archivers/zoo/files/patch-misc.c +++ b/archivers/zoo/files/patch-misc.c @@ -1,6 +1,6 @@ ---- ./misc.c.orig 1991-07-16 17:52:54.000000000 +0200 -+++ ./misc.c 2011-12-22 14:02:23.000000000 +0100 -@@ -135,11 +135,16 @@ +--- misc.c.orig 1991-07-16 15:52:54 UTC ++++ misc.c +@@ -135,11 +135,16 @@ if available, else the short filename is char *fullpath (direntry) struct direntry *direntry; { @@ -18,7 +18,7 @@ return (result); } -@@ -172,7 +177,11 @@ +@@ -172,7 +177,11 @@ int preserve; frd_zooh (header, zoo_file); diff --git a/archivers/zoo/files/patch-misc2.c b/archivers/zoo/files/patch-misc2.c index de3595ab5713..b4be82fc4f96 100644 --- a/archivers/zoo/files/patch-misc2.c +++ b/archivers/zoo/files/patch-misc2.c @@ -1,6 +1,6 @@ ---- ./misc2.c.orig 1991-07-16 17:53:02.000000000 +0200 -+++ ./misc2.c 2011-12-22 14:00:55.000000000 +0100 -@@ -314,10 +314,12 @@ +--- misc2.c.orig 1991-07-16 15:53:02 UTC ++++ misc2.c +@@ -314,10 +314,12 @@ struct direntry *direntry; { long diff_tz; long longtime; diff --git a/archivers/zoo/files/patch-nixtime.i b/archivers/zoo/files/patch-nixtime.i index d536387bd063..2c1d2c1e1859 100644 --- a/archivers/zoo/files/patch-nixtime.i +++ b/archivers/zoo/files/patch-nixtime.i @@ -1,6 +1,6 @@ ---- ./nixtime.i.orig 1991-07-16 17:53:46.000000000 +0200 -+++ ./nixtime.i 2011-12-22 14:00:55.000000000 +0100 -@@ -52,7 +52,8 @@ +--- nixtime.i.orig 1991-07-16 15:53:46 UTC ++++ nixtime.i +@@ -52,7 +52,8 @@ unsigned int date, time; long mstonix(); long gettz(); long utimbuf[2]; diff --git a/archivers/zoo/files/patch-options.h b/archivers/zoo/files/patch-options.h index 3749d82708d3..5dad8f4b2f74 100644 --- a/archivers/zoo/files/patch-options.h +++ b/archivers/zoo/files/patch-options.h @@ -1,6 +1,6 @@ ---- ./options.h.orig 1993-05-01 06:27:59.000000000 +0200 -+++ ./options.h 2011-12-22 14:00:55.000000000 +0100 -@@ -96,7 +96,6 @@ +--- options.h.orig 1993-05-01 04:27:59 UTC ++++ options.h +@@ -96,7 +96,6 @@ For documentation about this file, see o #define NIXTIME #define NIXFNAME #define NEEDCTYP @@ -8,7 +8,7 @@ #define REN_STDC #define SETBUF #define GETTZ -@@ -110,6 +109,7 @@ +@@ -110,6 +109,7 @@ For documentation about this file, see o #define ANSI_PROTO #define VOIDPTR void * #else diff --git a/archivers/zoo/files/patch-zooadd2.c b/archivers/zoo/files/patch-zooadd2.c index 247acb84de6c..be9cc6d6cff1 100644 --- a/archivers/zoo/files/patch-zooadd2.c +++ b/archivers/zoo/files/patch-zooadd2.c @@ -1,6 +1,6 @@ ---- ./zooadd2.c.orig 1991-07-20 01:38:10.000000000 +0200 -+++ ./zooadd2.c 2011-12-22 14:00:55.000000000 +0100 -@@ -258,12 +258,15 @@ +--- zooadd2.c.orig 1991-07-19 23:38:10 UTC ++++ zooadd2.c +@@ -258,12 +258,15 @@ void newdir (direntry) register struct direntry *direntry; { #ifdef GETTZ diff --git a/archivers/zoo/files/patch-zooext.c b/archivers/zoo/files/patch-zooext.c index 1553286201f9..a8c85f2b682e 100644 --- a/archivers/zoo/files/patch-zooext.c +++ b/archivers/zoo/files/patch-zooext.c @@ -1,6 +1,6 @@ ---- ./zooext.c.orig 1993-05-01 05:58:50.000000000 +0200 -+++ ./zooext.c 2011-12-22 14:03:37.000000000 +0100 -@@ -163,7 +163,11 @@ +--- zooext.c.orig 1993-05-01 03:58:50 UTC ++++ zooext.c +@@ -163,7 +163,11 @@ if (fiz_ofs != 0L) { /* i } else { /* read header */ frd_zooh (&zoo_header, zoo_file); @@ -12,7 +12,7 @@ prterror ('w', failed_consistency); bad_header++; exit_status = 1; -@@ -184,7 +188,8 @@ +@@ -184,7 +188,8 @@ if (null_device) { this_file = STDOUT; /* standard output */ while (1) { diff --git a/archivers/zoo/files/patch-zoofns.h b/archivers/zoo/files/patch-zoofns.h index c51cfcb3dbed..693da9df2cf4 100644 --- a/archivers/zoo/files/patch-zoofns.h +++ b/archivers/zoo/files/patch-zoofns.h @@ -1,6 +1,6 @@ ---- ./zoofns.h.orig 1993-05-01 05:57:35.000000000 +0200 -+++ ./zoofns.h 2011-12-22 14:00:55.000000000 +0100 -@@ -94,7 +94,11 @@ +--- zoofns.h.orig 1993-05-01 03:57:35 UTC ++++ zoofns.h +@@ -94,7 +94,11 @@ void exit PARMS ((int)); void fixslash PARMS ((char *)); void makelist PARMS ((int, char *[], char *[], int, char *, char *, char *, int *)); void memerr PARMS ((unsigned int)); diff --git a/archivers/zoo/files/patch-zoolist.c b/archivers/zoo/files/patch-zoolist.c index 339b3bdb14c6..b61d9938297f 100644 --- a/archivers/zoo/files/patch-zoolist.c +++ b/archivers/zoo/files/patch-zoolist.c @@ -1,6 +1,6 @@ ---- ./zoolist.c.orig 1991-07-20 00:57:27.000000000 +0200 -+++ ./zoolist.c 2011-12-22 14:00:55.000000000 +0100 -@@ -539,10 +539,12 @@ +--- zoolist.c.orig 1991-07-19 22:57:27 UTC ++++ zoolist.c +@@ -539,10 +539,12 @@ int file_tz; { long gettz(); int diff_tz; /* timezone difference */ |