From e2aedd8abd3ca3fb06e9a7ca9ccb01278ff31386 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Sun, 27 Jul 2014 15:27:04 +0000 Subject: [PATCH] Start cleaning up some of the uselessly ambigious patches named patch-xy, and giving them proper names. --- archivers/9e/files/{patch-ab => patch-9e.c} | 0 archivers/arc/files/{patch-aa => patch-Makefile} | 0 archivers/arc/files/{patch-ad => patch-arc.c} | 0 archivers/arc/files/{patch-ae => patch-arc.h} | 0 archivers/arc/files/{patch-af => patch-arcadd.c} | 0 archivers/arc/files/{patch-ag => patch-arccvt.c} | 0 archivers/arc/files/{patch-ah => patch-arcdata.c} | 0 archivers/arc/files/{patch-ab => patch-arcdos.c} | 0 archivers/arc/files/{patch-ai => patch-arcext.c} | 0 archivers/arc/files/{patch-aj => patch-arcio.c} | 0 archivers/arc/files/{patch-ak => patch-arclzw.c} | 0 archivers/arc/files/{patch-al => patch-arcrun.c} | 0 archivers/arc/files/{patch-am => patch-arcunp.c} | 0 archivers/bzip2/files/{patch-aa => patch-Makefile} | 0 .../ha/files/{patch-aa => patch-nix_machine.c} | 0 .../files/{patch-al => patch-archive.c} | 0 .../files/{patch-ak => patch-cli.c} | 0 .../files/{patch-ab => patch-crypt_keymgmt.c} | 0 .../files/{patch-ag => patch-defs.h} | 0 .../files/{patch-ah => patch-hpacklib.h} | 0 .../files/{patch-ad => patch-keycvt_keycvt.c} | 0 .../files/{patch-ac => patch-keycvt_makefile} | 0 .../files/{patch-ae => patch-language_language.c} | 0 .../files/{patch-aj => patch-makefile} | 0 .../files/{patch-ai => patch-system.h} | 0 .../files/{patch-af => patch-system_unix.c} | 0 archivers/lha/files/{patch-aa => patch-Makefile} | 0 archivers/lha/files/{patch-af => patch-src_lha.h} | 0 archivers/lha/files/{patch-ae => patch-src_lhadd.c} | 0 archivers/libarc/files/{patch-aa => patch-Makefile} | 0 archivers/libcabinet/files/patch-ab | 11 ----------- archivers/libcabinet/files/patch-bstring.cpp | 13 +++++++++++-- archivers/macutils/files/patch-ag | 11 ----------- .../macutils/files/{patch-ao => patch-crc_makefile} | 0 .../files/{patch-ak => patch-hexbin_globals.h} | 0 .../files/{patch-am => patch-macunpack_cpt.h} | 0 .../files/{patch-aj => patch-macunpack_dd.c} | 0 .../files/{patch-ai => patch-macunpack_dd.h} | 0 .../files/{patch-ac => patch-macunpack_jdw.h} | 0 .../files/{patch-al => patch-macunpack_lzc.h} | 0 .../files/{patch-lzh.c => patch-macunpack_lzh.c} | 13 +++++++++++-- .../files/{patch-ah => patch-macunpack_lzh.h} | 0 .../files/{patch-ae => patch-macunpack_sit.c} | 0 .../files/{patch-ad => patch-macunpack_sit.h} | 0 .../files/{patch-af => patch-macunpack_stf.h} | 0 .../files/{patch-an => patch-macunpack_zma.h} | 0 .../macutils/files/{patch-aa => patch-makefile} | 0 .../files/{patch-ab => patch-util_transname.c} | 0 .../ppunpack/files/{patch-aa => patch-depack.h} | 0 archivers/squsq/files/{patch-aa => patch-usq.c} | 0 .../zip/files/{patch-ab => patch-unix_Makefile} | 0 .../zip/files/{patch-aa => patch-unix_configure} | 0 52 files changed, 22 insertions(+), 26 deletions(-) rename archivers/9e/files/{patch-ab => patch-9e.c} (100%) rename archivers/arc/files/{patch-aa => patch-Makefile} (100%) rename archivers/arc/files/{patch-ad => patch-arc.c} (100%) rename archivers/arc/files/{patch-ae => patch-arc.h} (100%) rename archivers/arc/files/{patch-af => patch-arcadd.c} (100%) rename archivers/arc/files/{patch-ag => patch-arccvt.c} (100%) rename archivers/arc/files/{patch-ah => patch-arcdata.c} (100%) rename archivers/arc/files/{patch-ab => patch-arcdos.c} (100%) rename archivers/arc/files/{patch-ai => patch-arcext.c} (100%) rename archivers/arc/files/{patch-aj => patch-arcio.c} (100%) rename archivers/arc/files/{patch-ak => patch-arclzw.c} (100%) rename archivers/arc/files/{patch-al => patch-arcrun.c} (100%) rename archivers/arc/files/{patch-am => patch-arcunp.c} (100%) rename archivers/bzip2/files/{patch-aa => patch-Makefile} (100%) rename archivers/ha/files/{patch-aa => patch-nix_machine.c} (100%) rename archivers/hpack.non-usa.only/files/{patch-al => patch-archive.c} (100%) rename archivers/hpack.non-usa.only/files/{patch-ak => patch-cli.c} (100%) rename archivers/hpack.non-usa.only/files/{patch-ab => patch-crypt_keymgmt.c} (100%) rename archivers/hpack.non-usa.only/files/{patch-ag => patch-defs.h} (100%) rename archivers/hpack.non-usa.only/files/{patch-ah => patch-hpacklib.h} (100%) rename archivers/hpack.non-usa.only/files/{patch-ad => patch-keycvt_keycvt.c} (100%) rename archivers/hpack.non-usa.only/files/{patch-ac => patch-keycvt_makefile} (100%) rename archivers/hpack.non-usa.only/files/{patch-ae => patch-language_language.c} (100%) rename archivers/hpack.non-usa.only/files/{patch-aj => patch-makefile} (100%) rename archivers/hpack.non-usa.only/files/{patch-ai => patch-system.h} (100%) rename archivers/hpack.non-usa.only/files/{patch-af => patch-system_unix.c} (100%) rename archivers/lha/files/{patch-aa => patch-Makefile} (100%) rename archivers/lha/files/{patch-af => patch-src_lha.h} (100%) rename archivers/lha/files/{patch-ae => patch-src_lhadd.c} (100%) rename archivers/libarc/files/{patch-aa => patch-Makefile} (100%) delete mode 100644 archivers/libcabinet/files/patch-ab delete mode 100644 archivers/macutils/files/patch-ag rename archivers/macutils/files/{patch-ao => patch-crc_makefile} (100%) rename archivers/macutils/files/{patch-ak => patch-hexbin_globals.h} (100%) rename archivers/macutils/files/{patch-am => patch-macunpack_cpt.h} (100%) rename archivers/macutils/files/{patch-aj => patch-macunpack_dd.c} (100%) rename archivers/macutils/files/{patch-ai => patch-macunpack_dd.h} (100%) rename archivers/macutils/files/{patch-ac => patch-macunpack_jdw.h} (100%) rename archivers/macutils/files/{patch-al => patch-macunpack_lzc.h} (100%) rename archivers/macutils/files/{patch-lzh.c => patch-macunpack_lzh.c} (59%) rename archivers/macutils/files/{patch-ah => patch-macunpack_lzh.h} (100%) rename archivers/macutils/files/{patch-ae => patch-macunpack_sit.c} (100%) rename archivers/macutils/files/{patch-ad => patch-macunpack_sit.h} (100%) rename archivers/macutils/files/{patch-af => patch-macunpack_stf.h} (100%) rename archivers/macutils/files/{patch-an => patch-macunpack_zma.h} (100%) rename archivers/macutils/files/{patch-aa => patch-makefile} (100%) rename archivers/macutils/files/{patch-ab => patch-util_transname.c} (100%) rename archivers/ppunpack/files/{patch-aa => patch-depack.h} (100%) rename archivers/squsq/files/{patch-aa => patch-usq.c} (100%) rename archivers/zip/files/{patch-ab => patch-unix_Makefile} (100%) rename archivers/zip/files/{patch-aa => patch-unix_configure} (100%) diff --git a/archivers/9e/files/patch-ab b/archivers/9e/files/patch-9e.c similarity index 100% rename from archivers/9e/files/patch-ab rename to archivers/9e/files/patch-9e.c diff --git a/archivers/arc/files/patch-aa b/archivers/arc/files/patch-Makefile similarity index 100% rename from archivers/arc/files/patch-aa rename to archivers/arc/files/patch-Makefile diff --git a/archivers/arc/files/patch-ad b/archivers/arc/files/patch-arc.c similarity index 100% rename from archivers/arc/files/patch-ad rename to archivers/arc/files/patch-arc.c diff --git a/archivers/arc/files/patch-ae b/archivers/arc/files/patch-arc.h similarity index 100% rename from archivers/arc/files/patch-ae rename to archivers/arc/files/patch-arc.h diff --git a/archivers/arc/files/patch-af b/archivers/arc/files/patch-arcadd.c similarity index 100% rename from archivers/arc/files/patch-af rename to archivers/arc/files/patch-arcadd.c diff --git a/archivers/arc/files/patch-ag b/archivers/arc/files/patch-arccvt.c similarity index 100% rename from archivers/arc/files/patch-ag rename to archivers/arc/files/patch-arccvt.c diff --git a/archivers/arc/files/patch-ah b/archivers/arc/files/patch-arcdata.c similarity index 100% rename from archivers/arc/files/patch-ah rename to archivers/arc/files/patch-arcdata.c diff --git a/archivers/arc/files/patch-ab b/archivers/arc/files/patch-arcdos.c similarity index 100% rename from archivers/arc/files/patch-ab rename to archivers/arc/files/patch-arcdos.c diff --git a/archivers/arc/files/patch-ai b/archivers/arc/files/patch-arcext.c similarity index 100% rename from archivers/arc/files/patch-ai rename to archivers/arc/files/patch-arcext.c diff --git a/archivers/arc/files/patch-aj b/archivers/arc/files/patch-arcio.c similarity index 100% rename from archivers/arc/files/patch-aj rename to archivers/arc/files/patch-arcio.c diff --git a/archivers/arc/files/patch-ak b/archivers/arc/files/patch-arclzw.c similarity index 100% rename from archivers/arc/files/patch-ak rename to archivers/arc/files/patch-arclzw.c diff --git a/archivers/arc/files/patch-al b/archivers/arc/files/patch-arcrun.c similarity index 100% rename from archivers/arc/files/patch-al rename to archivers/arc/files/patch-arcrun.c diff --git a/archivers/arc/files/patch-am b/archivers/arc/files/patch-arcunp.c similarity index 100% rename from archivers/arc/files/patch-am rename to archivers/arc/files/patch-arcunp.c diff --git a/archivers/bzip2/files/patch-aa b/archivers/bzip2/files/patch-Makefile similarity index 100% rename from archivers/bzip2/files/patch-aa rename to archivers/bzip2/files/patch-Makefile diff --git a/archivers/ha/files/patch-aa b/archivers/ha/files/patch-nix_machine.c similarity index 100% rename from archivers/ha/files/patch-aa rename to archivers/ha/files/patch-nix_machine.c diff --git a/archivers/hpack.non-usa.only/files/patch-al b/archivers/hpack.non-usa.only/files/patch-archive.c similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-al rename to archivers/hpack.non-usa.only/files/patch-archive.c diff --git a/archivers/hpack.non-usa.only/files/patch-ak b/archivers/hpack.non-usa.only/files/patch-cli.c similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-ak rename to archivers/hpack.non-usa.only/files/patch-cli.c diff --git a/archivers/hpack.non-usa.only/files/patch-ab b/archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-ab rename to archivers/hpack.non-usa.only/files/patch-crypt_keymgmt.c diff --git a/archivers/hpack.non-usa.only/files/patch-ag b/archivers/hpack.non-usa.only/files/patch-defs.h similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-ag rename to archivers/hpack.non-usa.only/files/patch-defs.h diff --git a/archivers/hpack.non-usa.only/files/patch-ah b/archivers/hpack.non-usa.only/files/patch-hpacklib.h similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-ah rename to archivers/hpack.non-usa.only/files/patch-hpacklib.h diff --git a/archivers/hpack.non-usa.only/files/patch-ad b/archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-ad rename to archivers/hpack.non-usa.only/files/patch-keycvt_keycvt.c diff --git a/archivers/hpack.non-usa.only/files/patch-ac b/archivers/hpack.non-usa.only/files/patch-keycvt_makefile similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-ac rename to archivers/hpack.non-usa.only/files/patch-keycvt_makefile diff --git a/archivers/hpack.non-usa.only/files/patch-ae b/archivers/hpack.non-usa.only/files/patch-language_language.c similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-ae rename to archivers/hpack.non-usa.only/files/patch-language_language.c diff --git a/archivers/hpack.non-usa.only/files/patch-aj b/archivers/hpack.non-usa.only/files/patch-makefile similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-aj rename to archivers/hpack.non-usa.only/files/patch-makefile diff --git a/archivers/hpack.non-usa.only/files/patch-ai b/archivers/hpack.non-usa.only/files/patch-system.h similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-ai rename to archivers/hpack.non-usa.only/files/patch-system.h diff --git a/archivers/hpack.non-usa.only/files/patch-af b/archivers/hpack.non-usa.only/files/patch-system_unix.c similarity index 100% rename from archivers/hpack.non-usa.only/files/patch-af rename to archivers/hpack.non-usa.only/files/patch-system_unix.c diff --git a/archivers/lha/files/patch-aa b/archivers/lha/files/patch-Makefile similarity index 100% rename from archivers/lha/files/patch-aa rename to archivers/lha/files/patch-Makefile diff --git a/archivers/lha/files/patch-af b/archivers/lha/files/patch-src_lha.h similarity index 100% rename from archivers/lha/files/patch-af rename to archivers/lha/files/patch-src_lha.h diff --git a/archivers/lha/files/patch-ae b/archivers/lha/files/patch-src_lhadd.c similarity index 100% rename from archivers/lha/files/patch-ae rename to archivers/lha/files/patch-src_lhadd.c diff --git a/archivers/libarc/files/patch-aa b/archivers/libarc/files/patch-Makefile similarity index 100% rename from archivers/libarc/files/patch-aa rename to archivers/libarc/files/patch-Makefile diff --git a/archivers/libcabinet/files/patch-ab b/archivers/libcabinet/files/patch-ab deleted file mode 100644 index b36dca6cc36a..000000000000 --- a/archivers/libcabinet/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- bstring.cpp 2000/11/30 14:50:57 1.1 -+++ bstring.cpp 2000/11/30 14:57:48 -@@ -150,7 +150,7 @@ - if(strlen(str) < strlen(s)) // If more memory is needed - *this = s; // Use assign function - else // If stpcpy can be used -- stpcpy(str, s); // Copy s into str -+ strcpy(str, s); // Copy s into str - } - - return *this; // Return a refrence to this object diff --git a/archivers/libcabinet/files/patch-bstring.cpp b/archivers/libcabinet/files/patch-bstring.cpp index 3eabf052ae84..c4f88c8138f2 100644 --- a/archivers/libcabinet/files/patch-bstring.cpp +++ b/archivers/libcabinet/files/patch-bstring.cpp @@ -1,5 +1,5 @@ ---- bstring.cpp.orig 2014-02-21 15:40:03.760303112 -0500 -+++ bstring.cpp 2014-02-21 15:41:19.474297650 -0500 +--- bstring.cpp.orig 2014-07-27 11:17:34.000000000 -0400 ++++ bstring.cpp 2014-07-27 11:17:37.000000000 -0400 @@ -15,7 +15,7 @@ #include "bstring.h" @@ -18,6 +18,15 @@ return temp += s; } +@@ -150,7 +150,7 @@ + if(strlen(str) < strlen(s)) // If more memory is needed + *this = s; // Use assign function + else // If stpcpy can be used +- stpcpy(str, s); // Copy s into str ++ strcpy(str, s); // Copy s into str + } + + return *this; // Return a refrence to this object @@ -217,4 +217,4 @@ //*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/*/ diff --git a/archivers/macutils/files/patch-ag b/archivers/macutils/files/patch-ag deleted file mode 100644 index 335cc473ff00..000000000000 --- a/archivers/macutils/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- macunpack/lzh.c.orig Fri Apr 16 00:23:03 1999 -+++ macunpack/lzh.c Fri Apr 16 00:23:13 1999 -@@ -23,7 +23,7 @@ - extern unsigned char (*lzah_getbyte)(); - extern void de_lzh(); - --typedef struct methodinfo { -+struct methodinfo { - char *name; - int number; - }; diff --git a/archivers/macutils/files/patch-ao b/archivers/macutils/files/patch-crc_makefile similarity index 100% rename from archivers/macutils/files/patch-ao rename to archivers/macutils/files/patch-crc_makefile diff --git a/archivers/macutils/files/patch-ak b/archivers/macutils/files/patch-hexbin_globals.h similarity index 100% rename from archivers/macutils/files/patch-ak rename to archivers/macutils/files/patch-hexbin_globals.h diff --git a/archivers/macutils/files/patch-am b/archivers/macutils/files/patch-macunpack_cpt.h similarity index 100% rename from archivers/macutils/files/patch-am rename to archivers/macutils/files/patch-macunpack_cpt.h diff --git a/archivers/macutils/files/patch-aj b/archivers/macutils/files/patch-macunpack_dd.c similarity index 100% rename from archivers/macutils/files/patch-aj rename to archivers/macutils/files/patch-macunpack_dd.c diff --git a/archivers/macutils/files/patch-ai b/archivers/macutils/files/patch-macunpack_dd.h similarity index 100% rename from archivers/macutils/files/patch-ai rename to archivers/macutils/files/patch-macunpack_dd.h diff --git a/archivers/macutils/files/patch-ac b/archivers/macutils/files/patch-macunpack_jdw.h similarity index 100% rename from archivers/macutils/files/patch-ac rename to archivers/macutils/files/patch-macunpack_jdw.h diff --git a/archivers/macutils/files/patch-al b/archivers/macutils/files/patch-macunpack_lzc.h similarity index 100% rename from archivers/macutils/files/patch-al rename to archivers/macutils/files/patch-macunpack_lzc.h diff --git a/archivers/macutils/files/patch-lzh.c b/archivers/macutils/files/patch-macunpack_lzh.c similarity index 59% rename from archivers/macutils/files/patch-lzh.c rename to archivers/macutils/files/patch-macunpack_lzh.c index 7580345bc94b..d52b1ed742e7 100644 --- a/archivers/macutils/files/patch-lzh.c +++ b/archivers/macutils/files/patch-macunpack_lzh.c @@ -1,5 +1,14 @@ ---- macunpack/lzh.c.orig Thu Sep 28 13:10:04 2006 -+++ macunpack/lzh.c Thu Sep 28 13:11:27 2006 +--- 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 @@ + extern unsigned char (*lzah_getbyte)(); + extern void de_lzh(); + +-typedef struct methodinfo { ++struct methodinfo { + char *name; + int number; + }; @@ -40,13 +40,13 @@ {"-lzs-", lzs} }; diff --git a/archivers/macutils/files/patch-ah b/archivers/macutils/files/patch-macunpack_lzh.h similarity index 100% rename from archivers/macutils/files/patch-ah rename to archivers/macutils/files/patch-macunpack_lzh.h diff --git a/archivers/macutils/files/patch-ae b/archivers/macutils/files/patch-macunpack_sit.c similarity index 100% rename from archivers/macutils/files/patch-ae rename to archivers/macutils/files/patch-macunpack_sit.c diff --git a/archivers/macutils/files/patch-ad b/archivers/macutils/files/patch-macunpack_sit.h similarity index 100% rename from archivers/macutils/files/patch-ad rename to archivers/macutils/files/patch-macunpack_sit.h diff --git a/archivers/macutils/files/patch-af b/archivers/macutils/files/patch-macunpack_stf.h similarity index 100% rename from archivers/macutils/files/patch-af rename to archivers/macutils/files/patch-macunpack_stf.h diff --git a/archivers/macutils/files/patch-an b/archivers/macutils/files/patch-macunpack_zma.h similarity index 100% rename from archivers/macutils/files/patch-an rename to archivers/macutils/files/patch-macunpack_zma.h diff --git a/archivers/macutils/files/patch-aa b/archivers/macutils/files/patch-makefile similarity index 100% rename from archivers/macutils/files/patch-aa rename to archivers/macutils/files/patch-makefile diff --git a/archivers/macutils/files/patch-ab b/archivers/macutils/files/patch-util_transname.c similarity index 100% rename from archivers/macutils/files/patch-ab rename to archivers/macutils/files/patch-util_transname.c diff --git a/archivers/ppunpack/files/patch-aa b/archivers/ppunpack/files/patch-depack.h similarity index 100% rename from archivers/ppunpack/files/patch-aa rename to archivers/ppunpack/files/patch-depack.h diff --git a/archivers/squsq/files/patch-aa b/archivers/squsq/files/patch-usq.c similarity index 100% rename from archivers/squsq/files/patch-aa rename to archivers/squsq/files/patch-usq.c diff --git a/archivers/zip/files/patch-ab b/archivers/zip/files/patch-unix_Makefile similarity index 100% rename from archivers/zip/files/patch-ab rename to archivers/zip/files/patch-unix_Makefile diff --git a/archivers/zip/files/patch-aa b/archivers/zip/files/patch-unix_configure similarity index 100% rename from archivers/zip/files/patch-aa rename to archivers/zip/files/patch-unix_configure