packages (rpm-4_5): rpm/rpm.spec, rpm/rpm-libmagic-locale.patch (NEW) - rel...

[arekm]

Author: arekm                        Date: Wed Oct  6 18:55:40 2010 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- rel 44; do magic_file() under C locale to avoid 'vasprintf failed' coming from libmagic

---- Files affected:
packages/rpm:
   rpm.spec (1.837.2.42.2.49.2.94 -> 1.837.2.42.2.49.2.95) , rpm-libmagic-locale.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.94 packages/rpm/rpm.spec:1.837.2.42.2.49.2.95
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.94	Tue Jul 20 07:40:35 2010
+++ packages/rpm/rpm.spec	Wed Oct  6 20:55:35 2010
@@ -58,7 +58,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	43
+Release:	44
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -103,6 +103,7 @@
 Patch13:	%{name}-unglobal.patch
 Patch14:	%{name}-etc_dir.patch
 Patch15:	%{name}-system_libs-more.patch
+Patch16:	%{name}-libmagic-locale.patch
 Patch17:	%{name}-ldconfig-always.patch
 Patch18:	%{name}-macros-ac.patch
 Patch19:	%{name}-macros-th.patch
@@ -717,6 +718,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch16 -p1
 %patch17 -p1
 sed -e 's/^/@pld@/' %{SOURCE2} >>platform.in
 echo '%%define	__perl_provides	%%{__perl} /usr/lib/rpm/perl.prov' > macros.perl
@@ -1482,6 +1484,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.95  2010/10/06 18:55:35  arekm
+- rel 44; do magic_file() under C locale to avoid 'vasprintf failed' coming from libmagic
+
 Revision 1.837.2.42.2.49.2.94  2010/07/20 05:40:35  glen
 - note about removing db4.5 being a good idea
 

================================================================
Index: packages/rpm/rpm-libmagic-locale.patch
diff -u /dev/null packages/rpm/rpm-libmagic-locale.patch:1.1.2.1
--- /dev/null	Wed Oct  6 20:55:40 2010
+++ packages/rpm/rpm-libmagic-locale.patch	Wed Oct  6 20:55:35 2010
@@ -0,0 +1,22 @@
+--- rpm-4.5/lib/rpmfc.c.org	2010-10-06 20:47:04.748417761 +0200
++++ rpm-4.5/lib/rpmfc.c	2010-10-06 20:48:13.364041124 +0200
+@@ -1356,8 +1356,18 @@
+ 	    /* XXX skip all files in /dev/ which are (or should be) %dev dummies. */
+ 	    else if (slen >= fc->brlen+sizeof("/dev/") && !strncmp(s+fc->brlen, "/dev/", sizeof("/dev/")-1))
+ 		ftype = "";
+-	    else
++	    else {
++		char *old_loc = setlocale(LC_CTYPE, NULL);
++		if (old_loc) {
++			old_loc = xstrdup(old_loc);
++			setlocale(LC_CTYPE, "C");
++		}
+ 		ftype = magic_file(ms, s);
++		if (old_loc) {
++			setlocale(LC_CTYPE, old_loc);
++			_free(old_loc);
++		}
++	    }
+ 
+ 	    if (ftype == NULL) {
+ 		xx = RPMERR_EXEC;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.94&r2=1.837.2.42.2.49.2.95&f=u