Remove dead patches

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

diff --git a/rpm-glob.patch b/rpm-glob.patch
index 87ee587d449ecbef370ca0184a7f6af4f81aeee6..189c9e5b1cee18f2f41f6fd8d37dfebde1efef71 100644 (file)
--- a/rpm-glob.patch
+++ b/rpm-glob.patch
@@ -1,37 +1,34 @@
-diff -urN rpm-4.4.8.org/configure.ac rpm-4.4.8/configure.ac
---- rpm-4.4.8.org/configure.ac 2007-02-11 03:21:02.000000000 +0100
-+++ rpm-4.4.8/configure.ac     2007-04-10 18:00:13.715685518 +0200
-@@ -81,6 +81,8 @@
- AC_PATH_PROG(CTAGS, ctags, /bin/true)
- AC_PATH_PROG(CSCOPE, cscope, /bin/true)
- 
-+CPPFLAGS="$CPPFLAGS -Dglob=rpm_glob -Dglobfree=rpm_globfree -Dglob64=rpm_glob64 -Dglobfree64=rpm_globfree64"
+--- rpm-4.5/rpmio/rpmrpc.c~    2010-12-19 14:19:57.678043380 +0100
++++ rpm-4.5/rpmio/rpmrpc.c     2010-12-19 14:20:39.353812967 +0100
+@@ -1711,6 +1711,17 @@
+ if (_rpmio_debug)
+ fprintf(stderr, "*** Glob(%s,0x%x,%p,%p)\n", pattern, (unsigned)flags, (void *)errfunc, pglob);
+ /*@=castfcnptr@*/
++
++    /* same as upstream glob with difference that gl_stat is Lstat now */
++    pglob->gl_closedir = closedir;
++    pglob->gl_readdir = readdir;
++    pglob->gl_opendir = opendir;
++    pglob->gl_lstat = Lstat;
++    pglob->gl_stat = Lstat;
 +
- dnl
- dnl This now uses libtool. Put
- dnl   LDFLAGS_STATIC="-all"
-diff -urN rpm-4.4.8.org/rpmio/librpmio.vers rpm-4.4.8/rpmio/librpmio.vers
---- rpm-4.4.8.org/rpmio/librpmio.vers  2007-02-02 02:36:47.000000000 +0100
-+++ rpm-4.4.8/rpmio/librpmio.vers      2007-04-10 17:59:13.905039270 +0200
-@@ -79,10 +79,8 @@
-     Fwrite;
-     gidToGname;
-     Glob;
--    glob64;
-     Glob_error;
-     Globfree;
--    globfree64;
-     Glob_pattern_p;
-     gnameToGid;
-     gzdio;
-@@ -164,6 +162,10 @@
-     rpmGetPath;
-     rpmGlob;
-     rpmGlobalMacroContext;
-+    rpm_glob;
-+    rpm_glob64;
-+    rpm_globfree;
-+    rpm_globfree64;
-     rpmhookArgsFree;
-     rpmhookArgsNew;
-     rpmhookCall;
++/*@=type@*/
++      flags |= GLOB_ALTDIRFUNC;
++
+     switch (ut) {
+     case URL_IS_HTTPS:
+     case URL_IS_HTTP:
+--- rpm-4.5/configure.ac~      2010-12-19 13:46:37.917863585 +0100
++++ rpm-4.5/configure.ac       2010-12-19 13:50:49.826071048 +0100
+@@ -1004,8 +1004,8 @@
+ #fi
+ #
+ #if test "$rpm_cv_glob" = yes; then
+-    AC_DEFINE(USE_GNU_GLOB, 1, [Use the included glob.c?])
+-    AC_LIBOBJ(glob)
++#    AC_DEFINE(USE_GNU_GLOB, 1, [Use the included glob.c?])
++#    AC_LIBOBJ(glob)
+     AC_LIBOBJ(fnmatch)
+ #fi
+ 
+