[prev in list] [next in list] [prev in thread] [next in thread]
List: rpm-cvs
Subject: [CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/lib/ depends.c poptALL.c rpmds.c ...
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2008-08-22 4:46:48
Message-ID: 20080822044648.5002E75286 () rpm5 ! org
[Download RAW message or body]
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 22-Aug-2008 06:46:48
Branch: rpm-5_1 Handle: 2008082204464700
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/lib depends.c poptALL.c rpmds.c rpmrc.c
Log:
- jbj: WR: fix: cleanup patch integration thinkos.
Summary:
Revision Changes Path
1.2288.2.100+1 -0 rpm/CHANGES
1.394.2.8 +14 -6 rpm/lib/depends.c
2.90.2.2 +6 -2 rpm/lib/poptALL.c
2.94.2.2 +5 -0 rpm/lib/rpmds.c
2.234.2.3 +8 -1 rpm/lib/rpmrc.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.99 -r1.2288.2.100 CHANGES
--- rpm/CHANGES 22 Aug 2008 04:39:36 -0000 1.2288.2.99
+++ rpm/CHANGES 22 Aug 2008 04:46:47 -0000 1.2288.2.100
@@ -1,4 +1,5 @@
5.1.4 -> 5.1.5:
+ - jbj: WR: fix: cleanup patch integration thinkos.
- jbj: WR: mark wrs-rpm-enable-macro-validation.patch (but leave disabled).
- jbj: WR: fix: add rt-reloc-wrapper.sh to EXTRAS_DIST.
- jbj: rescusitate w make distcheck.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.394.2.7 -r1.394.2.8 depends.c
--- rpm/lib/depends.c 17 Aug 2008 16:16:59 -0000 1.394.2.7
+++ rpm/lib/depends.c 22 Aug 2008 04:46:47 -0000 1.394.2.8
@@ -252,17 +252,25 @@
* we do have a special case to allow upgrades of noarch w/ a arch package
*/
if (tscolor && (!hcolor || !ohcolor)) {
+ const char * arch;
+ const char * oharch;
+ he->tag = RPMTAG_ARCH;
+ xx = headerGet(h, he, 0);
+ arch = (xx && he->p.str != NULL ? he->p.str : NULL)
he->tag = RPMTAG_ARCH;
xx = headerGet(oh, he, 0);
- if (arch != NULL && he->p.str != NULL) {
- if (strcmp("noarch", arch) || strcmp("noarch", he->p.str)) {
- if (!_isCompatibleArch(arch, he->p.str)) {
- he->p.ptr = _free(he->p.ptr);
+ oharch = (xx && he->p.str != NULL ? he->p.str : NULL)
+ if (arch != NULL && oharch != NULL) {
+ if (strcmp("noarch", arch) || strcmp("noarch", oharch)) {
+ if (!_isCompatibleArch(arch, oharch)) {
+ arch = _free(arch);
+ oharch = _free(oharch);
continue;
}
}
}
- he->p.ptr = _free(he->p.ptr);
+ arch = _free(arch);
+ oharch = _free(oharch);
}
#endif
@@ -515,7 +523,7 @@
break;
t = strndup(p, (pe - p));
p = pe; /* Advance to next chunk */
-rpmMessage(RPMMESS_DEBUG, _(" Comparing compat archs %s ? %s\n"), arch, t);
+rpmlog(RPMLOG_DEBUG, D_(" Comparing compat archs %s ? %s\n"), arch, t);
if (!strcmp(arch, t))
match = 1;
t = _free(t);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.90.2.1 -r2.90.2.2 poptALL.c
--- rpm/lib/poptALL.c 19 Aug 2008 15:21:53 -0000 2.90.2.1
+++ rpm/lib/poptALL.c 22 Aug 2008 04:46:47 -0000 2.90.2.2
@@ -483,7 +483,9 @@
__usrlibrpm = getenv("RPM_USRLIBRPM");
__etcrpm = getenv("RPM_ETCRPM");
+#if defined(ENABLE_NLS) && !defined(__LCLINT__)
__localedir = getenv("RPM_LOCALEDIR");
+#endif
if ( __usrlibrpm == NULL ) {
__usrlibrpm = USRLIBRPM ;
@@ -495,10 +497,12 @@
setenv("RPM_ETCRPM", SYSCONFIGDIR, 0);
}
+#if defined(ENABLE_NLS) && !defined(__LCLINT__)
if ( __localedir == NULL ) {
__localedir = LOCALEDIR ;
setenv("RPM_LOCALEDIR", LOCALEDIR, 0);
}
+#endif
}
#endif
@@ -611,7 +615,7 @@
path_buf = _free(path_buf);
#if defined(RPM_VENDOR_WINDRIVER)
- { char * poptAliasFn = rpmGetPath(__usrlibrpm, "/", VERSION, "/rpmpopt", \
NULL); + { const char * poptAliasFn = rpmGetPath(__usrlibrpm, "/", VERSION, \
"/rpmpopt", NULL); (void) poptReadConfigFile(optCon, poptAliasFn);
poptAliasFn = _free(poptAliasFn);
}
@@ -621,7 +625,7 @@
(void) poptReadDefaultConfig(optCon, 1);
#if defined(RPM_VENDOR_WINDRIVER)
- { char * poptExecPath = rpmGetPath(__usrlibrpm, "/", VERSION, NULL);
+ { const char * poptExecPath = rpmGetPath(__usrlibrpm, "/", VERSION, NULL);
poptSetExecPath(optCon, poptExecPath, 1);
poptExecPath = _free(poptExecPath);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
============================================================================
$ cvs diff -u -r2.94.2.1 -r2.94.2.2 rpmds.c
--- rpm/lib/rpmds.c 19 Aug 2008 15:21:53 -0000 2.94.2.1
+++ rpm/lib/rpmds.c 22 Aug 2008 04:46:47 -0000 2.94.2.2
@@ -1583,7 +1583,12 @@
return rc;
}
+#if defined(RPM_VENDOR_WINDRIVER)
+#define _ETC_RPM_SYSINFO "%{_etcrpm}/sysinfo"
+#else
#define _ETC_RPM_SYSINFO SYSCONFIGDIR "/sysinfo"
+#endif
+
/*@unchecked@*/ /*@observer@*/ /*@owned@*/ /*@relnull@*/
const char *_sysinfo_path = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmrc.c
============================================================================
$ cvs diff -u -r2.234.2.2 -r2.234.2.3 rpmrc.c
--- rpm/lib/rpmrc.c 19 Aug 2008 15:21:53 -0000 2.234.2.2
+++ rpm/lib/rpmrc.c 22 Aug 2008 04:46:47 -0000 2.234.2.3
@@ -273,6 +273,13 @@
export RPM_BUILD_ROOT\n}\
";
+#if defined(RPM_VENDOR_WINDRIVER)
+/*@unchecked@*/
+extern const char * __usrlibrpm;
+/*@unchecked@*/
+extern const char * __etcrpm;
+#endif
+
static void setDefaults(void)
/*@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*@modifies rpmGlobalMacroContext, internalState @*/
@@ -281,7 +288,7 @@
#if defined(RPM_VENDOR_WINDRIVER)
addMacro(NULL, "_usrlibrpm", NULL, __usrlibrpm, RMIL_DEFAULT);
addMacro(NULL, "_etcrpm", NULL, __etcrpm, RMIL_DEFAULT);
- addMacro(NULL, "_vendor", NULL, "%{?_host_vendor}%{!?_host_vendor:" \
RPMCANONVENDOR "}", RMIL_DEFAULT); + addMacro(NULL, "_vendor", NULL, \
"%{?_host_vendor}%{!?_host_vendor:wrs}", RMIL_DEFAULT); #endif
addMacro(NULL, "_usr", NULL, USRPREFIX, RMIL_DEFAULT);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic