[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Nov-2008 11:09:10
Branch: HEAD Handle: 2008111710090900
Modified files:
rpm devtool.conf
Log:
macosx: add expat, as required by lua/local
Summary:
RevisionChanges Path
2.251 +2 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.250 -r2.251 devtool.conf
--- rpm/devtool.conf 8 Nov 2008 15:53:23 - 2.250
+++ rpm/devtool.conf 17 Nov 2008 10:09:09 - 2.251
@@ -1627,6 +1627,8 @@
LIBS=$LIBS -lssl -lcrypto # shameless workaround for Neon
LDFLAGS=$LDFLAGS -L`pwd`/xar/lib/.libs # Xar linking hack
LDFLAGS=$LDFLAGS -L`pwd`/lzma/src/liblzma/.libs # LZMA hack
+CPPFLAGS=$CPPFLAGS -I$basemac/bin/$platform/expat-${v_expat}/lib #
lua
+LDFLAGS=$LDFLAGS -L$basemac/bin/$platform/expat-${v_expat}/.libs #
lua
export CPP
export CC
export CXX
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 17-Nov-2008 11:16:06 Branch: HEAD Handle: 2008111710160500 Modified files: rpm devtool.conf Log: macosx: avoid duplicate sqlite3 in rpmio Summary: RevisionChanges Path 2.252 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.251 -r2.252 devtool.conf --- rpm/devtool.conf 17 Nov 2008 10:09:09 - 2.251 +++ rpm/devtool.conf 17 Nov 2008 10:16:05 - 2.252 @@ -1683,7 +1683,7 @@ # python complains about missing symbols from all over when using librpm*, relink: make -C misc LIBS=-lz -lxml2 -lpcre $LIBS clean all -make -C rpmio LIBS=-lsqlite3 -lpopt -lneon -lexpat -lbeecrypt -lxar -lbz2 $LIBS clean all +make -C rpmio LIBS=-lpopt -lneon -lexpat -lbeecrypt -lxar -lbz2 $LIBS clean all # install into a temporary destroot, instead of to system rm -rf /tmp/rpm-root @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/rpmdb/ sqlite.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Nov-2008 15:12:53
Branch: HEAD Handle: 2008111714125201
Modified files:
rpm CHANGES
rpm/rpmdb sqlite.c
Log:
- jbj: WR: fix: sqlite assertion failure while sequentially retrieving
keys.
Summary:
RevisionChanges Path
1.2651 +1 -0 rpm/CHANGES
1.37+2 -0 rpm/rpmdb/sqlite.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2650 -r1.2651 CHANGES
--- rpm/CHANGES 14 Nov 2008 10:01:25 - 1.2650
+++ rpm/CHANGES 17 Nov 2008 14:12:52 - 1.2651
@@ -1,5 +1,6 @@
5.2a2 - 5.2a3:
+- jbj: WR: fix: sqlite assertion failure while sequentially retrieving
keys.
- bero: Ark: create --with-vendor=ark, borrow some Mandriva patches, add
use-gnu-tar-compression-detection patch for vendor ark
- jbj: eliminate --with-vendor arguments that are not in use.
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/sqlite.c
$ cvs diff -u -r1.36 -r1.37 sqlite.c
--- rpm/rpmdb/sqlite.c2 Aug 2008 16:36:10 - 1.36
+++ rpm/rpmdb/sqlite.c17 Nov 2008 14:12:53 - 1.37
@@ -1186,8 +1186,10 @@
* to later iteration confusion. (It may return the same value for the
multiple keys.)
*/
+#ifdef DYING
/* Only RPMDBI_PACKAGES is supposed to be iterating, and this is guarenteed
to be unique */
assert(dbi-dbi_rpmtag == RPMDBI_PACKAGES);
+#endif
switch (dbi-dbi_rpmtag) {
case RPMDBI_PACKAGES:
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/rpmdb/ sqlite.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 17-Nov-2008 15:13:32
Branch: rpm-5_1 Handle: 2008111714133100
Modified files: (Branch: rpm-5_1)
rpm CHANGES
rpm/rpmdb sqlite.c
Log:
- WR: fix: sqlite assertion failure while sequentially retrieving
keys.
Summary:
RevisionChanges Path
1.2288.2.153+1 -0 rpm/CHANGES
1.33.2.2+2 -0 rpm/rpmdb/sqlite.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2288.2.152 -r1.2288.2.153 CHANGES
--- rpm/CHANGES 11 Nov 2008 15:47:35 - 1.2288.2.152
+++ rpm/CHANGES 17 Nov 2008 14:13:31 - 1.2288.2.153
@@ -1,4 +1,5 @@
5.1.6 - 5.1.7:
+- jbj: WR: fix: sqlite assertion failure while sequentially retrieving
keys.
- jbj: update INSTALL to indicate that external zlib is preferred now.
- at: fix: initialize msbits of erased package keys to zeroes on 64b
hosts.
- jbj: lua: bind mkdtemp(3) in lposix.c
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/sqlite.c
$ cvs diff -u -r1.33.2.1 -r1.33.2.2 sqlite.c
--- rpm/rpmdb/sqlite.c16 Aug 2008 17:20:56 - 1.33.2.1
+++ rpm/rpmdb/sqlite.c17 Nov 2008 14:13:31 - 1.33.2.2
@@ -1185,8 +1185,10 @@
* to later iteration confusion. (It may return the same value for the
multiple keys.)
*/
+#ifdef DYING
/* Only RPMDBI_PACKAGES is supposed to be iterating, and this is guarenteed
to be unique */
assert(dbi-dbi_rpmtag == RPMDBI_PACKAGES);
+#endif
switch (dbi-dbi_rpmtag) {
case RPMDBI_PACKAGES:
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: lua/chkconfig/ chkconfig.c lua/shadow/ groupadd.c useradd.c...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm lua Date: 17-Nov-2008 15:21:15
Branch: HEAD Handle: 2008111714211401
Modified files:
lua/chkconfig chkconfig.c
lua/shadow groupadd.c useradd.c
rpm CHANGES
Log:
- WR: lua: display rpm:lua:foo progname w chkconfig/useradd/groupadd
errors.
Summary:
RevisionChanges Path
1.3 +2 -2 lua/chkconfig/chkconfig.c
1.5 +2 -2 lua/shadow/groupadd.c
1.6 +2 -2 lua/shadow/useradd.c
1.2652 +2 -0 rpm/CHANGES
patch -p0 '@@ .'
Index: lua/chkconfig/chkconfig.c
$ cvs diff -u -r1.2 -r1.3 chkconfig.c
--- lua/chkconfig/chkconfig.c 18 Aug 2008 19:16:10 - 1.2
+++ lua/chkconfig/chkconfig.c 17 Nov 2008 14:21:15 - 1.3
@@ -27,7 +27,7 @@
#include sys/stat.h
#include unistd.h
-static const char *progname;
+static const char *progname = rpm:lua:chkconfig;
#define _(String) gettext((String))
@@ -579,6 +579,7 @@
{ 0, 0, 0, 0, 0 }
};
+#if 0
if ((progname = strrchr(argv[0], '/')) != NULL)
progname++;
else
@@ -592,7 +593,6 @@
LSB++;
}
-#if 0
setlocale(LC_ALL, );
bindtextdomain(chkconfig,/usr/share/locale);
textdomain(chkconfig);
@@ .
patch -p0 '@@ .'
Index: lua/shadow/groupadd.c
$ cvs diff -u -r1.4 -r1.5 groupadd.c
--- lua/shadow/groupadd.c 18 Aug 2008 19:16:10 - 1.4
+++ lua/shadow/groupadd.c 17 Nov 2008 14:21:14 - 1.5
@@ -36,7 +36,7 @@
#include system.h
#include shadow_config.h
-#ident $Id: groupadd.c,v 1.4 2008/08/18 19:16:10 jbj Exp $
+#ident $Id: groupadd.c,v 1.5 2008/11/17 14:21:14 jbj Exp $
#include ctype.h
#include fcntl.h
@@ -85,7 +85,7 @@
static gid_t group_id;
static char *empty_list = NULL;
-static char *Prog;
+static char *Prog = rpm:lua:wrs.groupadd;
static int oflg = 0; /* permit non-unique group ID to be specified
with -g */
static int gflg = 0; /* ID value for the new group */
@@ .
patch -p0 '@@ .'
Index: lua/shadow/useradd.c
$ cvs diff -u -r1.5 -r1.6 useradd.c
--- lua/shadow/useradd.c 27 Oct 2008 00:38:26 - 1.5
+++ lua/shadow/useradd.c 17 Nov 2008 14:21:14 - 1.6
@@ -36,7 +36,7 @@
#include system.h
#include shadow_config.h
-#ident $Id: useradd.c,v 1.5 2008/10/27 00:38:26 jbj Exp $
+#ident $Id: useradd.c,v 1.6 2008/11/17 14:21:14 jbj Exp $
#include getopt.h
#include grp.h
@@ -117,7 +117,7 @@
static long sys_ngroups;
static int do_grp_update = 0;/* group files need to be updated */
-static char *Prog;
+static char *Prog = rpm:lua:wrs.useradd;
static int
bflg = 0, /* new default root of home directory */
@@ .
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2651 -r1.2652 CHANGES
--- rpm/CHANGES 17 Nov 2008 14:12:52 - 1.2651
+++ rpm/CHANGES 17 Nov 2008 14:21:14 - 1.2652
@@ -1,5 +1,7 @@
5.2a2 - 5.2a3:
+- jbj: WR: lua: display rpm:lua:foo progname w
chkconfig/useradd/groupadd
+ errors.
- jbj: WR: fix: sqlite assertion failure while sequentially retrieving
keys.
- bero: Ark: create --with-vendor=ark, borrow some Mandriva patches, add
use-gnu-tar-compression-detection patch for vendor ark
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
