head 1.10; access; symbols OPENPKG_E1_MP_HEAD:1.1 OPENPKG_E1_MP:1.1 OPENPKG_E1_MP_2_STABLE:1.1 OPENPKG_E1_FP:1.1 OPENPKG_2_STABLE_MP:1.1 OPENPKG_2_STABLE_20061018:1.1 OPENPKG_2_STABLE_20060622:1.1 OPENPKG_2_STABLE:1.1.0.4 OPENPKG_2_STABLE_BP:1.1 OPENPKG_2_5_RELEASE:1.1 OPENPKG_2_5_SOLID:1.1.0.2 OPENPKG_2_5_SOLID_BP:1.1; locks; strict; comment @# @; 1.10 date 2009.04.12.19.37.08; author rse; state Exp; branches; next 1.9; commitid SKtYHSdWqOSGnLJt; 1.9 date 2008.04.06.17.31.06; author rse; state Exp; branches; next 1.8; commitid wls1POSZNiyNB4Ys; 1.8 date 2007.12.13.18.32.26; author rse; state Exp; branches; next 1.7; commitid V7fL9whAqXb2EiJs; 1.7 date 2007.11.11.17.14.08; author rse; state Exp; branches; next 1.6; commitid ui3R46yUOV1XebFs; 1.6 date 2007.07.17.07.52.55; author rse; state Exp; branches; next 1.5; commitid UDQydnWnTgiAT5qs; 1.5 date 2007.07.17.06.41.25; author rse; state Exp; branches; next 1.4; commitid TKKc2PqSR0b3v5qs; 1.4 date 2007.06.22.06.21.20; author rse; state Exp; branches; next 1.3; commitid XERcf2QlTnEZbSms; 1.3 date 2007.06.14.20.56.32; author rse; state Exp; branches; next 1.2; commitid Y0V4BtOAdigbiVls; 1.2 date 2007.06.03.08.28.55; author rse; state Exp; branches; next 1.1; commitid sABeUWE2JCMCvrks; 1.1 date 2005.09.23.12.49.25; author rse; state Exp; branches; next ; desc @@ 1.10 log @upgrading package: popt 1.14 -> 1.15 @ text @Index: popt.c --- popt.c.orig 2009-04-12 20:14:38 +0200 +++ popt.c 2009-04-12 21:32:27 +0200 @@@@ -520,6 +520,11 @@@@ } if (con->leftovers != NULL && con->numLeftovers > 0) { +#if defined(OPENPKG) + /* Revert back to the old behaviour of passing to "exec" programs an + extra "--" argument to clearly separate options and arguments. */ + argv[argc++] = "--"; +#endif memcpy(argv + argc, con->leftovers, sizeof(*argv) * con->numLeftovers); argc += con->numLeftovers; } @@@@ -697,10 +702,19 @@@@ /*@@switchbreak@@*/ break; #endif case '!': +#if defined(OPENPKG) + /* allow standard "!#:+" (first argument is expanded multiple times) + and non-standard "!#:*" (all arguments are expanded in sequence) */ + if (!(s[0] == '#' && s[1] == ':' && (s[2] == '+' || s[2] == '*'))) +#else if (!(s[0] == '#' && s[1] == ':' && s[2] == '+')) +#endif /*@@switchbreak@@*/ break; - /* XXX Make sure that findNextArg deletes only next arg. */ +#if defined(OPENPKG) + if (a == NULL || s[2] == '*') { +#else if (a == NULL) { +#endif if ((a = findNextArg(con, 1U, 1)) == NULL) /*@@switchbreak@@*/ break; } Index: popthelp.c --- popthelp.c.orig 2009-04-12 20:14:38 +0200 +++ popthelp.c 2009-04-12 21:32:27 +0200 @@@@ -15,7 +15,9 @@@@ #include #endif +#if !defined(OPENPKG) #define POPT_WCHAR_HACK +#endif #ifdef POPT_WCHAR_HACK #include /* for mbsrtowcs */ /*@@access mbstate_t @@*/ @ 1.9 log @regen patch @ text @d2 3 a4 3 --- popt.c.orig 2008-03-10 09:05:06 +0100 +++ popt.c 2008-04-06 19:29:34 +0200 @@@@ -479,6 +479,11 @@@@ d16 1 a16 1 @@@@ -656,10 +661,19 @@@@ d38 2 a39 2 --- popthelp.c.orig 2008-03-27 18:33:08 +0100 +++ popthelp.c 2008-04-06 19:29:34 +0200 @ 1.8 log @upgrading package: popt 1.12 -> 1.13 @ text @d2 3 a4 3 --- popt.c.orig 2007-12-11 19:04:06 +0100 +++ popt.c 2007-12-13 19:30:59 +0100 @@@@ -404,6 +404,11 @@@@ d16 1 a16 1 @@@@ -587,10 +592,19 @@@@ d38 2 a39 2 --- popthelp.c.orig 2007-11-04 16:46:25 +0100 +++ popthelp.c 2007-12-13 19:30:59 +0100 @ 1.7 log @grrrr.. OpenPKG is not Linux: we do not wish any lib64 subdirs @ text @a0 12 Index: configure --- configure.orig 2007-07-14 09:21:21 +0200 +++ configure 2007-11-11 18:13:17 +0100 @@@@ -20800,7 +20800,7 @@@@ MARK64= if ! echo "${libdir}" | grep -q '64$' ; then case "${target_cpu}" in - x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64=64 ;; + x86_64*|powerpc64*|ppc64*|sparc64*|s390x*) MARK64= ;; esac fi d2 3 a4 3 --- popt.c.orig 2007-06-22 01:00:55 +0200 +++ popt.c 2007-11-11 18:12:46 +0100 @@@@ -417,6 +417,11 @@@@ d16 1 a16 1 @@@@ -604,10 +609,19 @@@@ d38 5 a42 5 --- popthelp.c.orig 2007-06-14 15:31:10 +0200 +++ popthelp.c 2007-11-11 18:12:46 +0100 @@@@ -10,7 +10,9 @@@@ #include "system.h" @ 1.6 log @upgrade to my latest OpenPKG-specific patch set @ text @d1 12 d14 2 a15 2 --- popt.c 22 Jun 2007 00:02:01 -0000 1.103 +++ popt.c 17 Jul 2007 07:51:44 -0000 d50 2 a51 2 --- popthelp.c 14 Jun 2007 13:31:10 -0000 1.57 +++ popthelp.c 17 Jul 2007 07:51:44 -0000 @ 1.5 log @upgrading package: popt 1.11 -> 1.12 @ text @d1 36 d38 3 a40 3 --- popthelp.c.orig 2007-04-21 02:18:21 +0200 +++ popthelp.c 2007-06-03 10:22:56 +0200 @@@@ -10,7 +10,6 @@@@ d44 3 a46 1 -#define POPT_WCHAR_HACK @ 1.4 log @apply vendor patch @ text @a11 12 Index: popt.c --- popt.c 14 Jun 2007 15:58:12 -0000 1.102 +++ popt.c 22 Jun 2007 00:02:01 -0000 1.103 @@@@ -396,7 +396,7 @@@@ if (!strchr(item->argv[0], '/') && con->execPath != NULL) { char *s = malloc(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/")); if (s) - sprintf(s, "%s/%s", con->execPath, item->argv[-1]); + sprintf(s, "%s/%s", con->execPath, item->argv[0]); argv[argc] = s; } else argv[argc] = POPT_findProgramPath(item->argv[0]); @ 1.3 log @finally upgrade to the new POPT 1.11 from rpm5.org ;-) @ text @d12 12 @ 1.2 log @upgrading package: popt 1.10.8 -> 1.10.9 @ text @a11 113 Index: poptint.c --- poptint.c.orig 2007-04-25 03:48:42 +0200 +++ poptint.c 2007-06-03 10:25:13 +0200 @@@@ -5,10 +5,6 @@@@ #include #include #include -#include -#ifdef HAVE_LANGINFO_H -#include -#endif #include "system.h" #include "poptint.h" @@@@ -19,76 +15,6 @@@@ va_end ((args)); static char * -strdup_locale_from_utf8 (char *buffer) -{ - char *codeset = NULL; - char *pout = NULL, *dest_str; - iconv_t fd; - int ib, ob, dest_size; - int done, is_error; - size_t err, used; - - if (!buffer) - return NULL; - -#ifdef HAVE_LANGINFO_H - codeset = nl_langinfo (CODESET); -#endif - - if (codeset && - strcmp (codeset, "UTF-8") && - (fd = iconv_open (codeset, "UTF-8")) != (iconv_t)-1) { - char *pin = buffer; - char *shift_pin = NULL; - - iconv (fd, NULL, (size_t*)&ib, &pout, (size_t*)&ob); - ib = strlen (buffer); - dest_size = ob = ib; - dest_str = pout = malloc ((dest_size + 1) * sizeof (char)); - done = is_error = 0; - while (!done && !is_error) { - err = iconv (fd, (const char**)&pin, (size_t*)&ib, &pout, (size_t*)&ob); - - if (err == (size_t)-1) { - switch (errno) { - case EINVAL: - done = 1; - break; - case E2BIG: - used = pout - dest_str; - dest_size *= 2; - dest_str = realloc (dest_str, (dest_size + 1) * sizeof (char)); - pout = dest_str + used; - ob = dest_size - used; - break; - case EILSEQ: - is_error = 1; - break; - default: - is_error = 1; - break; - } - } else { - if (!shift_pin) { - shift_pin = pin; - pin = NULL; - ib = 0; - } else { - done = 1; - } - } - } - iconv_close (fd); - *pout = '\0'; - dest_str = strdup (dest_str); - } else { - dest_str = strdup (buffer); - } - - return dest_str; -} - -static char * strdup_vprintf (const char *format, va_list ap) { char *buffer = NULL; @@@@ -118,20 +44,11 @@@@ int retval = 0; va_list args; char *buffer = NULL; - char *locale_str = NULL; va_start (args, format); buffer = strdup_vprintf (format, args); va_end (args); - - locale_str = strdup_locale_from_utf8 (buffer); - if (locale_str) { - retval = fprintf (stream, "%s", locale_str); - free (locale_str); - } else { - fprintf (stderr, POPT_WARNING "%s\n", "Invalid UTF-8"); - retval = fprintf (stream, "%s", buffer); - } + retval = fprintf (stream, "%s", buffer); free (buffer); return retval; @ 1.1 log @fix building under FreeBSD 4.x and similar systems who do not have wchar @ text @d2 2 a3 2 --- popthelp.c.orig 2004-02-26 02:20:53 +0100 +++ popthelp.c 2005-09-23 11:12:18 +0200 d12 113 @