- missing R and BR for keyutils

[packages/rpm.git] / rpm-glob.patch

diff --git a/rpm-glob.patch b/rpm-glob.patch
index 7e59fe807e7cb39fdac04e9c3e6d6144911f2883..1138f2c31782888bbf230d3505f8f59c81664628 100644 (file)
--- a/rpm-glob.patch
+++ b/rpm-glob.patch
@@ -1,49 +1,48 @@
---- rpm-4.0.4/lib/misc.c.wiget Sun Jan 20 23:10:19 2002
-+++ rpm-4.0.4/lib/misc.c       Tue Feb 12 22:41:39 2002
-@@ -514,6 +514,11 @@
-     const char * path;
-     const char * globURL;
-     char * globRoot = NULL;
-+#ifdef ENABLE_NLS     
-+      char * old_collate = NULL;
-+      char * old_ctype = NULL;
-+      char * t;
-+#endif
-     size_t maxb, nb;
-     glob_t gl;
-     int ut;
-@@ -524,6 +529,17 @@
-     if (rc)
-       return rc;
+--- rpm-5.1.4/rpmio/rpmrpc.c.org       2008-07-29 21:27:42.203871384 +0200
++++ rpm-5.1.4/rpmio/rpmrpc.c   2008-07-29 21:27:58.080756454 +0200
+@@ -1757,14 +1757,14 @@
+       return -2;
+       /*@notreached@*/ break;
+     }
+-    return glob(pattern, flags, errfunc, pglob);
++    return rpm_glob(pattern, flags, errfunc, pglob);
+ }
  
-+#ifdef ENABLE_NLS
-+      t = setlocale(LC_COLLATE, NULL);
-+      if (t)
-+              old_collate = strdup(t);
-+      t = setlocale(LC_CTYPE, NULL);
-+      if (t)
-+              old_ctype = strdup(t);
-+      setlocale(LC_COLLATE, "C");
-+      setlocale(LC_CTYPE, "C");
-+#endif
-+      
-     for (j = 0; j < ac; j++) {
-       if (!myGlobPatternP(av[j])) {
-           if (argc == 0)
-@@ -609,6 +625,16 @@
+ void Globfree(glob_t *pglob)
+ {
+ if (_rpmio_debug)
+ fprintf(stderr, "*** Globfree(%p)\n", pglob);
+-    globfree(pglob);
++    rpm_globfree(pglob);
+ }
  
+ DIR * Opendir(const char * path)
+--- rpm-5.1.4/misc/librpmmisc.c.org    2008-07-29 21:26:19.710540550 +0200
++++ rpm-5.1.4/misc/librpmmisc.c        2008-07-29 21:27:25.357426308 +0200
+@@ -71,7 +71,11 @@
+ #include "fnmatch.h"
+ #include "fnmatch.c"
+ #ifndef __CYGWIN__
++#define       glob            rpm_glob
++#define       globfree        rpm_globfree
+ #include "glob.h"
+ #include "glob.c"
++#undef glob
++#undef globfree
+ #endif
  
- exit:
-+#ifdef ENABLE_NLS
-+    if (old_collate) {
-+      setlocale(LC_COLLATE, old_collate);
-+      free(old_collate);
-+    }
-+    if (old_ctype) {
-+      setlocale(LC_CTYPE, old_ctype);
-+      free(old_ctype);
-+    }
-+#endif
-     av = _free(av);
-     if (rc || argvPtr == NULL) {
-       if (argv != NULL)
+--- rpm/misc/librpmmisc.vers~  2007-11-13 03:16:23.000000000 +0100
++++ rpm/misc/librpmmisc.vers   2008-07-29 21:32:35.023645681 +0200
+@@ -7,8 +7,10 @@
+     db_strerror_rpmdb;
+     db_create_rpmdb;
+     fnmatch;
+-    glob;
+-    globfree;
++    rpm_glob;
++    rpm_glob64;
++    rpm_globfree;
++    rpm_globfree64;
+     lua*;
+     magic_*;
+     rpmz_*;