Author: arekm Date: Sun Dec 19 12:27:40 2010 GMT
Module: packages Tag: rpm-4_5
---- Log message:
- rel 48; force glob() to use lstat now; we can avoid using internal copy now +
we are now sure that dangling symlinks will be properly globbed
---- Files affected:
packages/rpm:
rpm.spec (1.837.2.42.2.49.2.98 -> 1.837.2.42.2.49.2.99) , rpm-glob.patch
(1.8 -> 1.9)
---- Diffs:
================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.98
packages/rpm/rpm.spec:1.837.2.42.2.49.2.99
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.98 Thu Nov 25 15:49:09 2010
+++ packages/rpm/rpm.spec Sun Dec 19 13:27:34 2010
@@ -58,7 +58,7 @@
Summary(uk.UTF-8): Менеджер пакетів від RPM
Name: rpm
Version: 4.5
-Release: 47
+Release: 48
License: LGPL
Group: Base
Source0: %{name}-%{version}.tar.gz
@@ -182,6 +182,7 @@
Patch101: %{name}-builddir-readlink.patch
Patch102: pythondeps-speedup.patch
Patch103: %{name}-lua-exit-chroot-correctly.patch
+Patch104: %{name}-glob.patch
URL: http://rpm5.org/
BuildRequires: autoconf >= 2.57
BuildRequires: automake >= 1.4
@@ -812,6 +813,7 @@
%patch101 -p1
%patch102 -p1
%patch103 -p1
+%patch104 -p1
mv -f po/{sr,s...@latn}.po
rm -rf sqlite zlib popt
@@ -885,7 +887,7 @@
# pass CC and CXX too in case of building with some older configure macro
# disable perl-RPM2 build, we have it in separate spec
-CPPFLAGS=-I/usr/include/oosp-uuid
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ossp-uuid"
%configure \
CC="%{__newcc}" \
CXX="%{__newcxx}" \
@@ -1484,6 +1486,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.837.2.42.2.49.2.99 2010/12/19 12:27:34 arekm
+- rel 48; force glob() to use lstat now; we can avoid using internal copy now
+ we are now sure that dangling symlinks will be properly globbed
+
Revision 1.837.2.42.2.49.2.98 2010/11/25 14:49:09 hawk
- release 47
================================================================
Index: packages/rpm/rpm-glob.patch
diff -u packages/rpm/rpm-glob.patch:1.8 packages/rpm/rpm-glob.patch:1.9
--- packages/rpm/rpm-glob.patch:1.8 Tue Jul 29 21:42:44 2008
+++ packages/rpm/rpm-glob.patch Sun Dec 19 13:27:35 2010
@@ -1,48 +1,34 @@
---- 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);
- }
-
- void Globfree(glob_t *pglob)
- {
+--- 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, "*** 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
+ 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;
++
++/*...@=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
---- 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_*;
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.98&r2=1.837.2.42.2.49.2.99&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-glob.patch?r1=1.8&r2=1.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
