RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm lua Date: 06-Apr-2009 02:21:23
Branch: HEAD Handle: 2009040600212003
Modified files:
lua/chkconfig chkconfig.c
lua/shadow groupadd.c useradd.c
rpm VENDOR rpmpopt.in rpmqv.c
rpm/build parsePreamble.c rpmspec.h
rpm/lib depends.c poptALL.c poptI.c poptQV.c query.c
rpmfc.c rpmfi.c rpmfi.h rpmps.c rpmte.c rpmts.c
rpm/rpmdb rpmdb.c
rpm/rpmio iosm.c lsyck.c poptIO.c rpmdav.c rpmdav.h
rpmhash.h rpmtar.c url.c
rpm/tools rpmmtree.c
Log:
- jbj: forward port fiddle-ups seen while backporting.
Summary:
Revision Changes Path
1.4 +3 -1 lua/chkconfig/chkconfig.c
1.6 +2 -1 lua/shadow/groupadd.c
1.7 +2 -1 lua/shadow/useradd.c
2.68 +11 -0 rpm/VENDOR
2.190 +1 -1 rpm/build/parsePreamble.c
2.79 +4 -2 rpm/build/rpmspec.h
1.441 +0 -8 rpm/lib/depends.c
2.120 +1 -1 rpm/lib/poptALL.c
2.53 +1 -0 rpm/lib/poptI.c
2.64 +2 -0 rpm/lib/poptQV.c
2.212 +2 -1 rpm/lib/query.c
1.64 +7 -6 rpm/lib/rpmfc.c
2.148 +6 -6 rpm/lib/rpmfi.c
2.75 +0 -1 rpm/lib/rpmfi.h
2.34 +6 -6 rpm/lib/rpmps.c
2.102 +2 -3 rpm/lib/rpmte.c
2.168 +2 -2 rpm/lib/rpmts.c
1.291 +1 -1 rpm/rpmdb/rpmdb.c
1.38 +1 -1 rpm/rpmio/iosm.c
2.4 +2 -1 rpm/rpmio/lsyck.c
1.36 +1 -1 rpm/rpmio/poptIO.c
2.99 +4 -3 rpm/rpmio/rpmdav.c
2.37 +1 -1 rpm/rpmio/rpmdav.h
1.11 +1 -1 rpm/rpmio/rpmhash.h
1.28 +1 -1 rpm/rpmio/rpmtar.c
1.70 +1 -1 rpm/rpmio/url.c
2.83 +3 -3 rpm/rpmpopt.in
1.158 +6 -6 rpm/rpmqv.c
2.8 +3 -3 rpm/tools/rpmmtree.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: lua/chkconfig/chkconfig.c
============================================================================
$ cvs diff -u -r1.3 -r1.4 chkconfig.c
--- lua/chkconfig/chkconfig.c 17 Nov 2008 14:21:15 -0000 1.3
+++ lua/chkconfig/chkconfig.c 6 Apr 2009 00:21:22 -0000 1.4
@@ -559,7 +559,9 @@
return 0;
}
-int chkconfig_main(int argc, const char ** argv) {
+int chkconfig_main(int argc, const char ** argv);
+int chkconfig_main(int argc, const char ** argv)
+{
int listItem = 0, addItem = 0, delItem = 0, overrideItem = 0;
int rc, i, x;
int LSB = 0;
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/groupadd.c
============================================================================
$ cvs diff -u -r1.5 -r1.6 groupadd.c
--- lua/shadow/groupadd.c 17 Nov 2008 14:21:14 -0000 1.5
+++ lua/shadow/groupadd.c 6 Apr 2009 00:21:22 -0000 1.6
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: groupadd.c,v 1.5 2008/11/17 14:21:14 jbj Exp $"
+#ident "$Id: groupadd.c,v 1.6 2009/04/06 00:21:22 jbj Exp $"
#include <ctype.h>
#include <fcntl.h>
@@ -431,6 +431,7 @@
* main - groupadd command
*/
+int groupadd_main (int argc, char **argv);
int groupadd_main (int argc, char **argv)
{
struct stat s;
@@ .
patch -p0 <<'@@ .'
Index: lua/shadow/useradd.c
============================================================================
$ cvs diff -u -r1.6 -r1.7 useradd.c
--- lua/shadow/useradd.c 17 Nov 2008 14:21:14 -0000 1.6
+++ lua/shadow/useradd.c 6 Apr 2009 00:21:22 -0000 1.7
@@ -36,7 +36,7 @@
#include "system.h"
#include "shadow_config.h"
-#ident "$Id: useradd.c,v 1.6 2008/11/17 14:21:14 jbj Exp $"
+#ident "$Id: useradd.c,v 1.7 2009/04/06 00:21:22 jbj Exp $"
#include <getopt.h>
#include <grp.h>
@@ -1756,6 +1756,7 @@
/*
* main - useradd command
*/
+int useradd_main (int argc, char **argv);
int useradd_main (int argc, char **argv)
{
struct stat s;
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.67 -r2.68 VENDOR
--- rpm/VENDOR 18 Jan 2009 04:00:03 -0000 2.67
+++ rpm/VENDOR 6 Apr 2009 00:21:20 -0000 2.68
@@ -601,3 +601,14 @@
Change: rpm-epoch0
Purpose: Explictly add Epoch: 0 in all packages.
Reason: Avoids compatibility issues with ancient versions of RPM
+ ________________________________________________________________________
+
+ Change: rpm-notsc
+ Purpose: Don't use rdtsc instruction for timing.
+ Reason: Avoids compatibility issues with i386 processors.
+ ________________________________________________________________________
+
+ Change: rpm-popt-aliases
+ Purpose: Add --downgrade and --norepackage options.
+ Reason: Cosmetic configuration sugary sweetness.
+
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/parsePreamble.c
============================================================================
$ cvs diff -u -r2.189 -r2.190 parsePreamble.c
--- rpm/build/parsePreamble.c 3 Apr 2009 20:03:50 -0000 2.189
+++ rpm/build/parsePreamble.c 6 Apr 2009 00:21:21 -0000 2.190
@@ -1198,8 +1198,8 @@
/* also declare %{epoch} to be same */
addMacro(spec->macros, "epoch", NULL, "0", RMIL_SPEC);
}
-
#endif /* RPM_VENDOR_PLD rpm-epoch0 */
+
if (checkForRequired(pkg->header, NVR) != RPMRC_OK)
return RPMRC_FAIL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/rpmspec.h
============================================================================
$ cvs diff -u -r2.78 -r2.79 rpmspec.h
--- rpm/build/rpmspec.h 3 Aug 2008 14:00:58 -0000 2.78
+++ rpm/build/rpmspec.h 6 Apr 2009 00:21:21 -0000 2.79
@@ -245,7 +245,8 @@
* Create and initialize Spec structure.
* @return spec spec file control structure
*/
-/*...@only@*/ Spec newSpec(void)
+/*...@only@*/
+Spec newSpec(void)
/*...@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*...@modifies rpmGlobalMacroContext, internalState @*/;
@@ -254,7 +255,8 @@
* @param spec spec file control structure
* @return NULL always
*/
-/*...@null@*/ Spec freeSpec(/*...@only@*/ /*...@null@*/ Spec spec)
+/*...@null@*/
+Spec freeSpec(/*...@only@*/ /*...@null@*/ Spec spec)
/*...@globals fileSystem, internalState @*/
/*...@modifies spec, fileSystem, internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
============================================================================
$ cvs diff -u -r1.440 -r1.441 depends.c
--- rpm/lib/depends.c 27 Mar 2009 21:17:42 -0000 1.440
+++ rpm/lib/depends.c 6 Apr 2009 00:21:21 -0000 1.441
@@ -755,14 +755,6 @@
ts->teInstall = ts->order[oc];
-#if 0
- { rpmTag tag = RPMTAG_SOURCERPM;
- const char * sourcerpm = rpmteSourcerpm(p);
-if (sourcerpm)
-fprintf(stderr, "*** %s: %d in %s\n", rpmteNEVRA(p),
rpmdbCount(rpmtsGetRdb(ts), tag, sourcerpm, 0), sourcerpm);
- }
-#endif
-
/* XXX rpmgi hack: Save header in transaction element if requested. */
if (upgrade & 0x2)
(void) rpmteSetHeader(p, h);
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.119 -r2.120 poptALL.c
--- rpm/lib/poptALL.c 27 Mar 2009 21:17:42 -0000 2.119
+++ rpm/lib/poptALL.c 6 Apr 2009 00:21:21 -0000 2.120
@@ -38,6 +38,7 @@
#if !defined(POPT_ARGFLAG_TOGGLE) /* XXX compat with popt < 1.15 */
#define POPT_ARGFLAG_TOGGLE 0
#endif
+
#define POPT_SHOWVERSION -999
#define POPT_SHOWRC -998
#define POPT_QUERYTAGS -997
@@ -95,7 +96,6 @@
/*...@unchecked@*/
extern rpmioPool _rpmdsPool;
-/* XXX avoid -lrpmbuild linkage. */
/*...@unchecked@*/
int _rpmfc_debug;
/*...@unchecked@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptI.c
============================================================================
$ cvs diff -u -r2.52 -r2.53 poptI.c
--- rpm/lib/poptI.c 30 Mar 2009 22:39:37 -0000 2.52
+++ rpm/lib/poptI.c 6 Apr 2009 00:21:21 -0000 2.53
@@ -32,6 +32,7 @@
#if !defined(POPT_ARGFLAG_TOGGLE) /* XXX compat with popt < 1.15 */
#define POPT_ARGFLAG_TOGGLE 0
#endif
+
#define POPT_RELOCATE -1021
#define POPT_EXCLUDEPATH -1022
#define POPT_ROLLBACK -1023
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptQV.c
============================================================================
$ cvs diff -u -r2.63 -r2.64 poptQV.c
--- rpm/lib/poptQV.c 30 Mar 2009 22:39:37 -0000 2.63
+++ rpm/lib/poptQV.c 6 Apr 2009 00:21:21 -0000 2.64
@@ -24,6 +24,7 @@
#if !defined(POPT_ARGFLAG_TOGGLE) /* XXX compat with popt < 1.15 */
#define POPT_ARGFLAG_TOGGLE 0
#endif
+
#define POPT_QUERYFORMAT -1000
#define POPT_WHATREQUIRES -1001
#define POPT_WHATPROVIDES -1002
@@ -197,6 +198,7 @@
#if !defined(POPT_READFILE_TRIMNEWLINES) /* XXX popt < 1.15 */
#define POPT_READFILE_TRIMNEWLINES 1
+
/**
* Read a file into a buffer.
* @param fn file name
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/query.c
============================================================================
$ cvs diff -u -r2.211 -r2.212 query.c
--- rpm/lib/query.c 27 Mar 2009 21:17:42 -0000 2.211
+++ rpm/lib/query.c 6 Apr 2009 00:21:21 -0000 2.212
@@ -125,10 +125,11 @@
more width and at the same time reduce the nlink and size fields
more to typical sizes within OpenPKG. */
sprintf(te, "%s %d %-13s %-13s %8s %s %s", perms,
+ (int)nlink, ownerfield, groupfield, sizefield, timefield, namefield);
#else
sprintf(te, "%s %4d %-7s %-8s %10s %s %s", perms,
-#endif
(int)nlink, ownerfield, groupfield, sizefield, timefield, namefield);
+#endif
perms = _free(perms);
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfc.c
============================================================================
$ cvs diff -u -r1.63 -r1.64 rpmfc.c
--- rpm/lib/rpmfc.c 27 Mar 2009 21:17:42 -0000 1.63
+++ rpm/lib/rpmfc.c 6 Apr 2009 00:21:21 -0000 1.64
@@ -18,11 +18,6 @@
#define _RPMNS_INTERNAL
#include <rpmns.h>
-/*...@unchecked@*/
-static int _filter_values = 1;
-/*...@unchecked@*/
-static int _filter_execs = 1;
-
#define _RPMFC_INTERNAL
#include <rpmfc.h>
@@ -35,6 +30,11 @@
/*...@access rpmds @*/
/*...@access miRE @*/
+/*...@unchecked@*/
+static int _filter_values = 1;
+/*...@unchecked@*/
+static int _filter_execs = 1;
+
/**
*/
static int rpmfcExpandAppend(/*...@out@*/ ARGV_t * argvp, const ARGV_t av)
@@ -721,6 +721,7 @@
}
}
}
+
/**
* Extract script dependencies.
* @param fc file classifier
@@ -1808,7 +1809,7 @@
}
/*...@-mustmod@*/
-static void rpmfcFini(void *_fc)
+static void rpmfcFini(void * _fc)
/*...@modifies _fc @*/
{
rpmfc fc = _fc;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.c
============================================================================
$ cvs diff -u -r2.147 -r2.148 rpmfi.c
--- rpm/lib/rpmfi.c 4 Apr 2009 16:37:40 -0000 2.147
+++ rpm/lib/rpmfi.c 6 Apr 2009 00:21:21 -0000 2.148
@@ -1460,7 +1460,7 @@
if (dalgo == PGPHASHALGO_ERROR)
dalgo = (fi->fdigestalgos[i] & 0xff);
else
-assert(dalgo == fi->fdigestalgos[i]);
+assert(dalgo == (pgpHashAlgo)fi->fdigestalgos[i]);
}
fi->fdigestalgos = _free(fi->fdigestalgos);
} else {
@@ -1667,11 +1667,11 @@
{
if (relocs) {
rpmRelocation r;
- for (r = relocs; (r->oldPath || r->newPath); r++) {
- r->oldPath = _free(r->oldPath);
- r->newPath = _free(r->newPath);
- }
- relocs = _free(relocs);
+ for (r = relocs; (r->oldPath || r->newPath); r++) {
+ r->oldPath = _free(r->oldPath);
+ r->newPath = _free(r->newPath);
+ }
+ relocs = _free(relocs);
}
return NULL;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.h
============================================================================
$ cvs diff -u -r2.74 -r2.75 rpmfi.h
--- rpm/lib/rpmfi.h 27 Mar 2009 21:17:42 -0000 2.74
+++ rpm/lib/rpmfi.h 6 Apr 2009 00:21:21 -0000 2.75
@@ -831,7 +831,6 @@
const char * oldPath, const char * newPath)
/*...@modifies *relp, *nrelp @*/;
-
/*...@}*/
#endif /* _RPMFI_NOMETHODS */
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmps.c
============================================================================
$ cvs diff -u -r2.33 -r2.34 rpmps.c
--- rpm/lib/rpmps.c 27 Mar 2009 21:17:42 -0000 2.33
+++ rpm/lib/rpmps.c 6 Apr 2009 00:21:21 -0000 2.34
@@ -402,30 +402,30 @@
char * rpmProblemGetPkgNEVR(rpmProblem prob)
{
- return (prob->pkgNEVR);
+ return prob->pkgNEVR;
}
char * rpmProblemGetAltNEVR(rpmProblem prob)
{
- return(prob->altNEVR);
+ return prob->altNEVR;
}
char * rpmProblemGetStr(rpmProblem prob)
{
- return (prob->str1);
+ return prob->str1;
}
rpmuint64_t rpmProblemGetDiskNeed(rpmProblem prob)
{
- return (prob->ulong1);
+ return prob->ulong1;
}
rpmProblemType rpmProblemGetType(rpmProblem prob)
{
- return (prob->type);
+ return prob->type;
}
fnpyKey rpmProblemKey(rpmProblem prob)
{
- return(prob->key);
+ return prob->key;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmte.c
============================================================================
$ cvs diff -u -r2.101 -r2.102 rpmte.c
--- rpm/lib/rpmte.c 31 Mar 2009 19:03:26 -0000 2.101
+++ rpm/lib/rpmte.c 6 Apr 2009 00:21:21 -0000 2.102
@@ -39,7 +39,6 @@
/*...@globals fileSystem @*/
/*...@modifies p, fileSystem @*/
{
-
p->relocs = rpmfiFreeRelocations(p->relocs);
rpmteCleanDS(p);
@@ -112,10 +111,10 @@
p->name = (xx ? he->p.str : xstrdup("?RPMTAG_NAME?"));
he->tag = RPMTAG_VERSION;
xx = headerGet(h, he, 0);
- p->version = (char*)(xx ? he->p.str : xstrdup("?RPMTAG_VERSION?"));
+ p->version = (char *)(xx ? he->p.str : xstrdup("?RPMTAG_VERSION?"));
he->tag = RPMTAG_RELEASE;
xx = headerGet(h, he, 0);
- p->release = (char*)(xx ? he->p.str : xstrdup("?RPMTAG_RELEASE?"));
+ p->release = (char *)(xx ? he->p.str : xstrdup("?RPMTAG_RELEASE?"));
p->db_instance = 0;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmts.c
============================================================================
$ cvs diff -u -r2.167 -r2.168 rpmts.c
--- rpm/lib/rpmts.c 27 Mar 2009 21:17:42 -0000 2.167
+++ rpm/lib/rpmts.c 6 Apr 2009 00:21:21 -0000 2.168
@@ -1399,10 +1399,10 @@
ts->dbmode = O_RDONLY;
ts->scriptFd = NULL;
- { struct timeval tv;
+ { struct timeval tv;
xx = gettimeofday(&tv, NULL);
ts->tid[0] = (rpmuint32_t) tv.tv_sec;
- ts->tid[1] = (rpmuint32_t) tv.tv_usec;
+ ts->tid[1] = (rpmuint32_t) tv.tv_usec;
}
ts->delta = 5;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
============================================================================
$ cvs diff -u -r1.290 -r1.291 rpmdb.c
--- rpm/rpmdb/rpmdb.c 30 Mar 2009 14:27:01 -0000 1.290
+++ rpm/rpmdb/rpmdb.c 6 Apr 2009 00:21:22 -0000 1.291
@@ -67,7 +67,7 @@
/*...@unchecked@*/
static int _db_filter_dups = 0;
-/* Use a path uniquifier in the upper 16 bits of tagNum? */
+/* Use a path uniqifier in the upper 16 bits of tagNum? */
/* XXX Note: one cannot just choose a value, rpmdb tagNum's need fixing too
*/
#define _DB_TAGGED_FILE_INDICES 1
/*...@unchecked@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/iosm.c
============================================================================
$ cvs diff -u -r1.37 -r1.38 iosm.c
--- rpm/rpmio/iosm.c 26 Mar 2009 18:07:34 -0000 1.37
+++ rpm/rpmio/iosm.c 6 Apr 2009 00:21:22 -0000 1.38
@@ -2672,7 +2672,7 @@
}
/*...@=compmempass@*/
-#define IOSM_SKIPPING(_a) \
+#define IOSM_SKIPPING(_a) \
((_a) == FA_SKIP || (_a) == FA_SKIPNSTATE || (_a) == FA_SKIPNETSHARED ||
(_a) == FA_SKIPCOLOR)
int iosmFileActionSkipped(iosmFileAction action)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/lsyck.c
============================================================================
$ cvs diff -u -r2.3 -r2.4 lsyck.c
--- rpm/rpmio/lsyck.c 2 Apr 2009 14:19:32 -0000 2.3
+++ rpm/rpmio/lsyck.c 6 Apr 2009 00:21:22 -0000 2.4
@@ -2,7 +2,7 @@
* lsyck.c
*
* $Author: jbj $
- * $Date: 2009/04/02 14:19:32 $
+ * $Date: 2009/04/06 00:21:22 $
*
* Copyright (C) 2005 Zachary P. Landau <kaphe...@divineinvasion.net>
*/
@@ -259,6 +259,7 @@
{NULL, NULL}
};
+LUALIB_API int luaopen_syck(lua_State *L);
LUALIB_API int luaopen_syck(lua_State *L)
{
luaL_openlib(L, "syck", sycklib, 0);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
============================================================================
$ cvs diff -u -r1.35 -r1.36 poptIO.c
--- rpm/rpmio/poptIO.c 29 Mar 2009 18:42:22 -0000 1.35
+++ rpm/rpmio/poptIO.c 6 Apr 2009 00:21:23 -0000 1.36
@@ -332,7 +332,7 @@
/*...@=type@*/
{ "debug", 'd', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &__debug, -1,
- N_("Debug generic operations"), NULL},
+ N_("Debug generic operations"), NULL },
#ifdef NOTYET
{ "define", 'D', POPT_ARG_STRING, NULL, (int)'D',
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.c
============================================================================
$ cvs diff -u -r2.98 -r2.99 rpmdav.c
--- rpm/rpmio/rpmdav.c 20 Mar 2009 18:28:35 -0000 2.98
+++ rpm/rpmio/rpmdav.c 6 Apr 2009 00:21:23 -0000 2.99
@@ -429,6 +429,7 @@
char buf[64];
urlinfo u = userdata;
ne_session * sess;
+
assert(u != NULL);
sess = u->sess;
assert(sess != NULL);
@@ -714,7 +715,7 @@
/* HACK: "302 Found" if URI is missing pesky trailing '/'. */
if (!strncmp("302 ", ne_get_error(u->sess), sizeof("302 ")-1)) {
char * t;
- if ((t = strchr(u->url, '\0') != NULL)
+ if ((t = strchr(u->url, '\0')) != NULL)
*t = '/';
break;
}
@@ -2335,7 +2336,7 @@
if (fd) {
fdSetIo(fd, ufdio);
fd->ftpFileDoneNeeded = 0;
- fd->rd_timeoutsecs = rpmioHttpReadTimeoutSecs;
+ fd->rd_timeoutsecs = rpmioHttpReadTimeoutSecs;
fd->contentLength = fd->bytesRemain = -1;
fd->url = urlLink(u, "url (httpOpen)");
fd = fdLink(fd, "grab data (httpOpen)");
@@ -2388,7 +2389,7 @@
else
uri = xstrdup(path);
/*...@=globs =m...@*/
-
+
/* Load DAV collection into argv. */
/* XXX HACK: davHEAD needs ctx->st. */
ctx = avContextCreate(uri, st);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdav.h
============================================================================
$ cvs diff -u -r2.36 -r2.37 rpmdav.h
--- rpm/rpmio/rpmdav.h 25 Mar 2009 20:26:46 -0000 2.36
+++ rpm/rpmio/rpmdav.h 6 Apr 2009 00:21:23 -0000 2.37
@@ -8,7 +8,7 @@
#include <argv.h>
/**
-*/
+ */
/*...@unchecked@*/
extern int rpmioHttpReadTimeoutSecs;
/*...@unchecked@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmhash.h
============================================================================
$ cvs diff -u -r1.10 -r1.11 rpmhash.h
--- rpm/rpmio/rpmhash.h 29 Mar 2009 18:42:22 -0000 1.10
+++ rpm/rpmio/rpmhash.h 6 Apr 2009 00:21:23 -0000 1.11
@@ -93,7 +93,7 @@
/**
* Unreference a hash table instance.
* @param ht hash table
- * @return NULL if free'd
+ * @return NULL on last dereference
*/
/*...@unused@*/ /*...@null@*/
hashTable htUnlink (/*...@killref@*/ /*...@null@*/ hashTable ht)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmtar.c
============================================================================
$ cvs diff -u -r1.27 -r1.28 rpmtar.c
--- rpm/rpmio/rpmtar.c 26 Mar 2009 18:07:34 -0000 1.27
+++ rpm/rpmio/rpmtar.c 6 Apr 2009 00:21:23 -0000 1.28
@@ -575,7 +575,7 @@
psm = rpmpsmFree(psm);
fi = rpmfiFree(fi);
- (void)rpmtsFree(ts);
+ (void)rpmtsFree(ts);
ts = NULL;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/url.c
============================================================================
$ cvs diff -u -r1.69 -r1.70 url.c
--- rpm/rpmio/url.c 25 Mar 2009 20:26:47 -0000 1.69
+++ rpm/rpmio/url.c 6 Apr 2009 00:21:23 -0000 1.70
@@ -64,7 +64,7 @@
/*...@only@*/ /*...@null@*/
urlinfo *_url_cache = NULL;
-static void urlFini(void *_u)
+static void urlFini(void * _u)
/*...@globals fileSystem, internalState @*/
/*...@modifies _u, fileSystem, internalState @*/
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
============================================================================
$ cvs diff -u -r2.82 -r2.83 rpmpopt.in
--- rpm/rpmpopt.in 11 Mar 2009 18:43:49 -0000 2.82
+++ rpm/rpmpopt.in 6 Apr 2009 00:21:20 -0000 2.83
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.82 2009/03/11 18:43:49 devzero2000 Exp $
+# $Id: rpmpopt.in,v 2.83 2009/04/06 00:21:20 jbj Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -66,11 +66,11 @@
#==============================================================================
rpm alias --danglinglink --nofiles \
- --pipe "set $(grep '^/' | sort -u) ; [ -L \"$1\" ] && echo \"$1\"
" \
+ --pipe "set $(grep '^/' | sort -u) ; [ -L \"$1\" ] && echo \"$1\" " \
--POPTdesc=$"display link needed, but not provided, by packages"
rpm alias --orphandirs --nofiles \
- --pipe "set $(grep '^/' | sort -u) ; [ -d \"$1\" ] && echo \"$1\"
" \
+ --pipe "set $(grep '^/' | sort -u) ; [ -d \"$1\" ] && echo \"$1\" " \
--POPTdesc=$"display directories needed, but not provided, by
packages"
rpm alias --setperms -q --qf '[\[ -L %{FILENAMES:shescape} \] || chmod
%7.7{FILEMODES:octal} %{FILENAMES:shescape}\n]' \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmqv.c
============================================================================
$ cvs diff -u -r1.157 -r1.158 rpmqv.c
--- rpm/rpmqv.c 26 Mar 2009 18:07:30 -0000 1.157
+++ rpm/rpmqv.c 6 Apr 2009 00:21:20 -0000 1.158
@@ -14,7 +14,7 @@
#endif
#if defined(RPM_VENDOR_OPENPKG) /* integrity-checking */
-#define _RPMIOB_INTERNAL /* XXX rpmiobSlurp */
+#define _RPMIOB_INTERNAL /* XXX rpmiobSlurp */
#include "rpmio_internal.h"
#endif
@@ -31,10 +31,10 @@
#endif
#if defined(RPM_VENDOR_OPENPKG) /* integrity-checking */
+#include "rpmns.h"
#define _RPMLUA_INTERNAL
#include "rpmlua.h"
#include "rpmluaext.h"
-#include "rpmns.h"
#endif
#include "rpmversion.h"
@@ -354,14 +354,14 @@
/* cleanup processing */
failure:
if (lua != NULL)
- rpmluaFree(lua);
+ rpmluaFree(lua);
if (ts != NULL)
- (void)rpmtsFree(ts);
+ (void)rpmtsFree(ts);
ts = NULL;
if (spec_iob != NULL)
- spec_iob = rpmiobFree(spec_iob);
+ spec_iob = rpmiobFree(spec_iob);
if (proc_iob != NULL)
- proc_iob = rpmiobFree(proc_iob);
+ proc_iob = rpmiobFree(proc_iob);
/* final result handling */
if (rc != INTEGRITY_OK) {
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmmtree.c
============================================================================
$ cvs diff -u -r2.7 -r2.8 rpmmtree.c
--- rpm/tools/rpmmtree.c 26 Mar 2009 18:07:34 -0000 2.7
+++ rpm/tools/rpmmtree.c 6 Apr 2009 00:21:23 -0000 2.8
@@ -2004,14 +2004,14 @@
}
/*...@-noeffectuncon -unre...@*/
if (c1 == NULL && c2->type == F_DIR) {
- if(asprintf(&np, "%s%s/", path, c2->name)) {
+ if (asprintf(&np, "%s%s/", path, c2->name)) {
perror("asprintf");
}
i = mtreeSWalk(c1, c2, np);
free(np);
i += compare_nodes(c1, c2, path);
} else if (c2 == NULL && c1->type == F_DIR) {
- if(asprintf(&np, "%s%s/", path, c1->name)) {
+ if (asprintf(&np, "%s%s/", path, c1->name)) {
perror("asprintf");
}
i = mtreeSWalk(c1, c2, np);
@@ -2020,7 +2020,7 @@
} else if (c1 == NULL || c2 == NULL) {
i = compare_nodes(c1, c2, path);
} else if (c1->type == F_DIR && c2->type == F_DIR) {
- if(asprintf(&np, "%s%s/", path, c1->name)) {
+ if (asprintf(&np, "%s%s/", path, c1->name)) {
perror("asprintf");
}
i = mtreeSWalk(c1, c2, np);
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
