SHA256
6
0
forked from pool/rpm

- update to rpm-4.13.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=378
This commit is contained in:
2017-01-19 15:41:55 +00:00
committed by Git OBS Bridge
parent ad32f0a6f5
commit e1e20a716d
34 changed files with 481 additions and 493 deletions

View File

@@ -1,8 +1,8 @@
Convert output to the current locale. Assumes utf8 input if the
decoding works, otherwise iso-8859-1.
--- ./lib/tagexts.c.orig 2010-12-03 12:11:57.000000000 +0000
+++ ./lib/tagexts.c 2011-05-10 16:05:30.000000000 +0000
--- ./lib/tagexts.c.orig 2016-10-21 09:44:00.309962086 +0000
+++ ./lib/tagexts.c 2017-01-19 10:27:57.243832208 +0000
@@ -2,6 +2,7 @@
* \file lib/formats.c
*/
@@ -11,9 +11,9 @@ decoding works, otherwise iso-8859-1.
#include "system.h"
#include <rpm/rpmtypes.h>
@@ -150,6 +151,114 @@ exit:
return rc;
}
@@ -197,6 +198,114 @@ typedef enum tMode_e {
TRANSFILETRIGGER = 2,
} tMode;
+static char * strtolocale(char *str)
+{
@@ -125,8 +125,8 @@ decoding works, otherwise iso-8859-1.
+
/**
* Retrieve trigger info.
* @param h header
@@ -435,10 +544,41 @@ static int i18nTag(Header h, rpmTag tag,
* @param mode type of trigger (see tMode_e)
@@ -607,10 +716,41 @@ static int i18nTag(Header h, rpmTag tag,
#endif
rc = headerGet(h, tag, td, HEADERGET_ALLOC);
@@ -168,7 +168,7 @@ decoding works, otherwise iso-8859-1.
* Retrieve summary text.
* @param h header
* @retval td tag data container
@@ -460,6 +600,16 @@ static int descriptionTag(Header h, rpmt
@@ -634,6 +774,16 @@ static int descriptionTag(Header h, rpmt
return i18nTag(h, RPMTAG_DESCRIPTION, td, hgflags);
}
@@ -185,7 +185,7 @@ decoding works, otherwise iso-8859-1.
/**
* Retrieve group text.
* @param h header
@@ -677,6 +827,8 @@ static const struct headerTagFunc_s rpmH
@@ -971,6 +1121,8 @@ static const struct headerTagFunc_s rpmH
{ RPMTAG_LONGARCHIVESIZE, longarchivesizeTag },
{ RPMTAG_LONGSIZE, longsizeTag },
{ RPMTAG_LONGSIGSIZE, longsigsizeTag },