diff options
author | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
---|---|---|
committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
commit | 9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896 (patch) | |
tree | 9b071a8105704e992946dcd6b801e9fcb7635142 /archivers/unace | |
parent | 5a20e7990eb544509174d617d359bf0d4ac64737 (diff) |
Cleanup patches, a* categories.
Rename them to follow the make makepatch naming, and regenerate them.
With hat: portmgr
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=419133
Diffstat (limited to 'archivers/unace')
-rw-r--r-- | archivers/unace/files/patch-CVE-2015-2063 | 18 | ||||
-rw-r--r-- | archivers/unace/files/patch-uac__crt.c | 4 | ||||
-rw-r--r-- | archivers/unace/files/patch-unace.c | 14 |
3 files changed, 16 insertions, 20 deletions
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 |