From a8d8108586b2f12e80a84f6d519db993d234b1d4 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Wed, 15 Aug 2018 15:06:43 -1000 Subject: Update cpio tp 2.12 --- data/cpio/_metadata/version | 2 +- data/cpio/cpio-2.12.tar.bz2 | Bin 0 -> 1258605 bytes data/cpio/cpio-2.9.tar.gz | Bin 977105 -> 0 bytes data/cpio/make.sh | 2 +- data/cpio/progname.diff | 14 ++++++++++ data/cpio/static.diff | 64 -------------------------------------------- 6 files changed, 16 insertions(+), 66 deletions(-) create mode 100644 data/cpio/cpio-2.12.tar.bz2 delete mode 100644 data/cpio/cpio-2.9.tar.gz create mode 100644 data/cpio/progname.diff delete mode 100644 data/cpio/static.diff (limited to 'data') diff --git a/data/cpio/_metadata/version b/data/cpio/_metadata/version index 8c2691509..3e162f02e 100644 --- a/data/cpio/_metadata/version +++ b/data/cpio/_metadata/version @@ -1 +1 @@ -2.9 +2.12 diff --git a/data/cpio/cpio-2.12.tar.bz2 b/data/cpio/cpio-2.12.tar.bz2 new file mode 100644 index 000000000..80bda2b69 Binary files /dev/null and b/data/cpio/cpio-2.12.tar.bz2 differ diff --git a/data/cpio/cpio-2.9.tar.gz b/data/cpio/cpio-2.9.tar.gz deleted file mode 100644 index ebdb4fb10..000000000 Binary files a/data/cpio/cpio-2.9.tar.gz and /dev/null differ diff --git a/data/cpio/make.sh b/data/cpio/make.sh index 7c5a8023e..0d5a91a00 100644 --- a/data/cpio/make.sh +++ b/data/cpio/make.sh @@ -1,5 +1,5 @@ pkg:setup pkg:configure ac_cv_func_obstack=no -make +make -j8 pkg:install pkg: rm -f /usr/libexec/rmt diff --git a/data/cpio/progname.diff b/data/cpio/progname.diff new file mode 100644 index 000000000..fbcea28c0 --- /dev/null +++ b/data/cpio/progname.diff @@ -0,0 +1,14 @@ +diff -ur cpio-2.12/gnu/progname.c cpio-2.12+iPhone/gnu/progname.c +--- cpio-2.12/gnu/progname.c 2015-08-31 09:58:43.000000000 -1000 ++++ cpio-2.12+iPhone/gnu/progname.c 2018-08-14 11:30:38.000000000 -1000 +@@ -28,10 +28,6 @@ + #include + + +-/* String containing name the program is called with. +- To be initialized by main(). */ +-const char *program_name = NULL; +- + /* Set program_name, based on argv[0]. + argv0 must be a string allocated with indefinite extent, and must not be + modified after this call. */ diff --git a/data/cpio/static.diff b/data/cpio/static.diff deleted file mode 100644 index 41733b504..000000000 --- a/data/cpio/static.diff +++ /dev/null @@ -1,64 +0,0 @@ -diff -r -u tar-1.19/lib/argp-fmtstream.h tar-1.19+iPhone/lib/argp-fmtstream.h ---- tar-1.19/lib/argp-fmtstream.h 2007-09-28 13:11:36.000000000 +0000 -+++ tar-1.19+iPhone/lib/argp-fmtstream.h 2007-12-26 23:04:38.000000000 +0000 -@@ -135,15 +135,15 @@ - const char *__fmt, ...) - __attribute__ ((__format__ (printf, 2, 3))); - --extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); --extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); -+static int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); -+static int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); - --extern int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str); --extern int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str); -+static int __argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str); -+static int argp_fmtstream_puts (argp_fmtstream_t __fs, const char *__str); - --extern size_t __argp_fmtstream_write (argp_fmtstream_t __fs, -+static size_t __argp_fmtstream_write (argp_fmtstream_t __fs, - const char *__str, size_t __len); --extern size_t argp_fmtstream_write (argp_fmtstream_t __fs, -+static size_t argp_fmtstream_write (argp_fmtstream_t __fs, - const char *__str, size_t __len); - - /* Access macros for various bits of state. */ -@@ -155,25 +155,25 @@ - #define __argp_fmtstream_wmargin argp_fmtstream_wmargin - - /* Set __FS's left margin to LMARGIN and return the old value. */ --extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, -+static size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, - size_t __lmargin); - extern size_t __argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, - size_t __lmargin); - - /* Set __FS's right margin to __RMARGIN and return the old value. */ --extern size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs, -+static size_t argp_fmtstream_set_rmargin (argp_fmtstream_t __fs, - size_t __rmargin); - extern size_t __argp_fmtstream_set_rmargin (argp_fmtstream_t __fs, - size_t __rmargin); - - /* Set __FS's wrap margin to __WMARGIN and return the old value. */ --extern size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs, -+static size_t argp_fmtstream_set_wmargin (argp_fmtstream_t __fs, - size_t __wmargin); - extern size_t __argp_fmtstream_set_wmargin (argp_fmtstream_t __fs, - size_t __wmargin); - - /* Return the column number of the current output point in __FS. */ --extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); -+static size_t argp_fmtstream_point (argp_fmtstream_t __fs); - extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); - - /* Internal routines. */ -@@ -198,7 +198,7 @@ - #endif - - #ifndef ARGP_FS_EI --#define ARGP_FS_EI extern inline -+#define ARGP_FS_EI static inline - #endif - - ARGP_FS_EI size_t -- cgit v1.2.3