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

[arekm]

Author: arekm                        Date: Wed Feb 29 15:39:47 2012 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- rel 63; set also LC_COLLATE=C before doing magic_file() check; fixes problem with libreoffice building

---- Files affected:
packages/rpm:
   rpm-libmagic-locale.patch (1.1.2.1 -> 1.1.2.2) , rpm.spec (1.837.2.42.2.49.2.118 -> 1.837.2.42.2.49.2.119) 

---- Diffs:

================================================================
Index: packages/rpm/rpm-libmagic-locale.patch
diff -u packages/rpm/rpm-libmagic-locale.patch:1.1.2.1 packages/rpm/rpm-libmagic-locale.patch:1.1.2.2
--- packages/rpm/rpm-libmagic-locale.patch:1.1.2.1	Wed Oct  6 20:55:35 2010
+++ packages/rpm/rpm-libmagic-locale.patch	Wed Feb 29 16:39:42 2012
@@ -1,22 +1,35 @@
---- 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 @@
+--- rpm-4.5/lib/rpmfc.c.org	2012-02-29 16:32:05.655058968 +0100
++++ rpm-4.5/lib/rpmfc.c	2012-02-29 16:36:22.430972834 +0100
+@@ -1114,9 +1114,31 @@
  	    /* 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);
++		char *old_ctype = setlocale(LC_CTYPE, NULL);
++		char *old_collate = setlocale(LC_COLLATE, NULL);
++
++		if (old_ctype) {
++			old_ctype = xstrdup(old_ctype);
 +			setlocale(LC_CTYPE, "C");
 +		}
++		if (old_collate) {
++			old_ctype = xstrdup(old_collate);
++			setlocale(LC_COLLATE, "C");
++		}
++
  		ftype = magic_file(ms, s);
-+		if (old_loc) {
-+			setlocale(LC_CTYPE, old_loc);
-+			_free(old_loc);
+ 
++		if (old_ctype) {
++			setlocale(LC_CTYPE, old_ctype);
++			_free(old_ctype);
++		}
++		if (old_collate) {
++			setlocale(LC_COLLATE, old_collate);
++			_free(old_collate);
 +		}
 +	    }
- 
++
  	    if (ftype == NULL) {
  		xx = RPMERR_EXEC;
+ 		rpmError(xx, _("magic_file(ms, \"%s\") failed: mode %06o %s\n"),

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.118 packages/rpm/rpm.spec:1.837.2.42.2.49.2.119
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.118	Tue Feb 14 19:19:57 2012
+++ packages/rpm/rpm.spec	Wed Feb 29 16:39:42 2012
@@ -58,7 +58,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	62
+Release:	63
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -1495,6 +1495,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.119  2012/02/29 15:39:42  arekm
+- rel 63; set also LC_COLLATE=C before doing magic_file() check; fixes problem with libreoffice building
+
 Revision 1.837.2.42.2.49.2.118  2012/02/14 18:19:57  qboosh
 - added helperEVR-noassert patch (replace assert by error message;
   or maybe the build should fail in such case? but not in such pailfully way)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm-libmagic-locale.patch?r1=1.1.2.1&r2=1.1.2.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.118&r2=1.837.2.42.2.49.2.119&f=u