OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 03-Jun-2007 10:28:55
Branch: HEAD Handle: 2007060309285500
Modified files:
openpkg-src/popt popt.patch popt.spec
Log:
upgrading package: popt 1.10.8 -> 1.10.9
Summary:
Revision Changes Path
1.2 +115 -2 openpkg-src/popt/popt.patch
1.41 +6 -6 openpkg-src/popt/popt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/popt/popt.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 popt.patch
--- openpkg-src/popt/popt.patch 23 Sep 2005 12:49:25 -0000 1.1
+++ openpkg-src/popt/popt.patch 3 Jun 2007 08:28:55 -0000 1.2
@@ -1,6 +1,6 @@
Index: popthelp.c
---- popthelp.c.orig 2004-02-26 02:20:53 +0100
-+++ popthelp.c 2005-09-23 11:12:18 +0200
+--- popthelp.c.orig 2007-04-21 02:18:21 +0200
++++ popthelp.c 2007-06-03 10:22:56 +0200
@@ -10,7 +10,6 @@
#include "system.h"
@@ -9,3 +9,116 @@
#ifdef POPT_WCHAR_HACK
#include <wchar.h> /* for mbsrtowcs */
/[EMAIL PROTECTED] mbstate_t @*/
+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 <stdio.h>
+ #include <stdarg.h>
+ #include <errno.h>
+-#include <iconv.h>
+-#ifdef HAVE_LANGINFO_H
+-#include <langinfo.h>
+-#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;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/popt/popt.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 popt.spec
--- openpkg-src/popt/popt.spec 3 Mar 2007 21:36:49 -0000 1.40
+++ openpkg-src/popt/popt.spec 3 Jun 2007 08:28:55 -0000 1.41
@@ -24,13 +24,13 @@
# package versions
%define V_rpm_class 4.4.x
-%define V_rpm 4.4.8
-%define V_popt 1.10.8
+%define V_rpm 4.4.9
+%define V_popt 1.10.9
# package information
Name: popt
Summary: Option Parsing Library
-URL: ftp://jbj.org/pub/
+URL: http://rpm5.org/
Vendor: Eric Troja, Jeff Johnson
Packager: OpenPKG Foundation e.V.
Distribution: OpenPKG Community
@@ -38,10 +38,10 @@
Group: Libraries
License: LGPL
Version: %{V_popt}
-Release: 20070303
+Release: 20070603
# list of sources
-Source0: ftp://jbj.org/pub/rpm-%{V_rpm_class}/rpm-%{V_rpm}.tar.gz
+Source0:
http://rpm5.org/files/rpm/rpm-%{V_rpm_class}/rpm-%{V_rpm}.tar.gz
Source1: popt.pc
Patch0: popt.patch
@@ -68,7 +68,7 @@
}
prog popt:popt = {
version = %{V_popt}
- url = ftp://jbj.org/pub/rpm-%{V_rpm_class}/
+ url = http://rpm5.org/files/rpm/rpm-%{V_rpm_class}/
regex = popt-(__VER__)\.tar\.gz
}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
