[CVS] RPM: rpm-4_5: rpm/rpmdb/ db3.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Elan Ruusamäe
Root: /v/rpm/cvs Email: g...@rpm5.org
Module: rpm Date: 05-Jun-2009 01:13:41
Branch: rpm-4_5 Handle: 2009060423134000
Modified files: (Branch: rpm-4_5)
rpm/rpmdb db3.c
Log:
- prototype for Open func, from trunk
Summary:
RevisionChanges Path
1.64.2.9+1 -1 rpm/rpmdb/db3.c
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
$ cvs diff -u -r1.64.2.8 -r1.64.2.9 db3.c
--- rpm/rpmdb/db3.c 4 Jun 2009 23:09:36 - 1.64.2.8
+++ rpm/rpmdb/db3.c 4 Jun 2009 23:13:40 - 1.64.2.9
@@ -281,7 +281,7 @@
if (!oneshot) {
#if (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR != 0) || (DB_VERSION_MAJOR ==
4)
- xx = db_env_set_func_open(Open);
+ xx = db_env_set_func_open((int (*)(const char *, int, ...))Open);
xx = cvtdberr(dbi, "db_env_set_func_open", xx, _debug);
#endif
oneshot++;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-4_5: rpm/ CHANGES rpm/rpmdb/ db3.c rpmdb.c rpm/rpmio/ l...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Elan Ruusamäe
Root: /v/rpm/cvs Email: g...@rpm5.org
Module: rpm Date: 05-Jun-2009 01:09:37
Branch: rpm-4_5 Handle: 2009060423093501
Modified files: (Branch: rpm-4_5)
rpm CHANGES
rpm/rpmdb db3.c rpmdb.c
rpm/rpmio librpmio.vers rpmio.h rpmrpc.c
Log:
- merge changeset 8413
Summary:
RevisionChanges Path
1.1360.2.127+2 -0 rpm/CHANGES
1.64.2.8+9 -0 rpm/rpmdb/db3.c
1.128.2.10 +3 -2 rpm/rpmdb/rpmdb.c
2.2.2.6 +2 -0 rpm/rpmio/librpmio.vers
1.51.2.7+11 -0 rpm/rpmio/rpmio.h
2.49.2.6+48 -0 rpm/rpmio/rpmrpc.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.1360.2.126 -r1.1360.2.127 CHANGES
--- rpm/CHANGES 13 May 2009 15:43:19 - 1.1360.2.126
+++ rpm/CHANGES 4 Jun 2009 23:09:35 - 1.1360.2.127
@@ -1,4 +1,6 @@
4.4.9 -> 4.5:
+ - jbj: ensure that PLD setup & FHS packages install correctly.
+ - jbj: wrapper for open(2).
- glen: merge :shescape from rpm5 trunk (code in this branch read out
of buffer bounds)
- proyvind: fix segfault with relative paths due to missing header
inclusion.
- proyvind: fix build breakage without selinux due to unresolved
matchpathcon_fini().
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/db3.c
$ cvs diff -u -r1.64.2.7 -r1.64.2.8 db3.c
--- rpm/rpmdb/db3.c 31 May 2008 21:06:48 - 1.64.2.7
+++ rpm/rpmdb/db3.c 4 Jun 2009 23:09:36 - 1.64.2.8
@@ -272,12 +272,21 @@
fileSystem @*/
/*...@modifies dbi, *dbenvp, fileSystem @*/
{
+static int oneshot = 0;
rpmdb rpmdb = dbi->dbi_rpmdb;
DB_ENV *dbenv = NULL;
int eflags;
int rc;
int xx;
+if (!oneshot) {
+#if (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR != 0) || (DB_VERSION_MAJOR ==
4)
+ xx = db_env_set_func_open(Open);
+ xx = cvtdberr(dbi, "db_env_set_func_open", xx, _debug);
+#endif
+ oneshot++;
+}
+
if (dbenvp == NULL)
return 1;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmdb.c
$ cvs diff -u -r1.128.2.9 -r1.128.2.10 rpmdb.c
--- rpm/rpmdb/rpmdb.c 5 Jun 2008 15:06:21 - 1.128.2.9
+++ rpm/rpmdb/rpmdb.c 4 Jun 2009 23:09:36 - 1.128.2.10
@@ -3559,8 +3559,9 @@
if (db == NULL) return 0;
mi = rpmdbInitIterator(db, RPMTAG_BASENAMES, NULL, 0);
-if (mi == NULL) /* XXX should never happen */
- return 0;
+assert(mi); /* XXX will never happen. */
+if (mi == NULL)
+ return 2;
key = &mi->mi_key;
data = &mi->mi_data;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
$ cvs diff -u -r2.2.2.5 -r2.2.2.6 librpmio.vers
--- rpm/rpmio/librpmio.vers 22 Jun 2008 19:28:53 - 2.2.2.5
+++ rpm/rpmio/librpmio.vers 4 Jun 2009 23:09:36 - 2.2.2.6
@@ -110,6 +110,8 @@
Mkfifo;
Mknod;
noLibio;
+Open;
+_Open;
Opendir;
pgpArmorKeyTbl;
pgpArmorTbl;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.h
$ cvs diff -u -r1.51.2.6 -r1.51.2.7 rpmio.h
--- rpm/rpmio/rpmio.h 19 Mar 2009 01:04:42 - 1.51.2.6
+++ rpm/rpmio/rpmio.h 4 Jun 2009 23:09:36 - 1.51.2.7
@@ -229,11 +229,22 @@
/*...@globals errno, h_errno, fileSystem, internalState @*/
/*...@modifies errno, fileSystem, internalState @*/;
+/*...@unchecked@*/ /*...@observer@*/ /*...@null@*/
+extern const char * _chroot_prefix;
+
/**
* chroot(2) clone.
* @todo Implement remotely.
*/
int Chroot(const char * path)
+ /*...@globals _chroot_prefix, errno, fileSystem, internalState @*/
+ /*...@modifies _chroot_prefix, errno, fileSystem, internalState @*/;
+
+/**
+ * open(2) clone.
+ * @todo Implement remotely.
+ */
+int Open(const char * path, int flags, mode_t mode)
/*...@globals errno, fileSystem, internalState @*/
/*...@modifies errno, fileSystem, internalState @*/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmrpc.c
$ cvs diff -u -r2.49.2.
[CVS] RPM: rpm-5_2: 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: a...@rpm5.org Module: rpm Date: 04-Jun-2009 19:57:42 Branch: rpm-5_2 Handle: 2009060417574200 Modified files: (Branch: rpm-5_2) rpm devtool.conf Log: macosx: without embedded tcl, with embedded js Summary: RevisionChanges Path 2.293.2.9 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.293.2.8 -r2.293.2.9 devtool.conf --- rpm/devtool.conf 4 Jun 2009 17:37:38 - 2.293.2.8 +++ rpm/devtool.conf 4 Jun 2009 17:57:42 - 2.293.2.9 @@ -1687,9 +1687,9 @@ --with-dbapi=db \ --with-bugreport="a...@rpm5.org" \ --with-db=internal \ ---with-tcl=external \ --with-lua=internal \ --with-syck=internal \ +--with-js=internal \ --with-zlib=external \ --with-bzip2=external \ --with-file=internal \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: 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: a...@rpm5.org Module: rpm Date: 04-Jun-2009 19:37:38 Branch: rpm-5_2 Handle: 2009060417373800 Modified files: (Branch: rpm-5_2) rpm devtool.conf Log: macosx: add pkglib to path for test Summary: RevisionChanges Path 2.293.2.8 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.293.2.7 -r2.293.2.8 devtool.conf --- rpm/devtool.conf 1 Jun 2009 13:44:13 - 2.293.2.7 +++ rpm/devtool.conf 4 Jun 2009 17:37:38 - 2.293.2.8 @@ -1868,7 +1868,7 @@ rm -f /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.la # test drive (version only, should set up a local dbpath) -DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:$DYLD_LIBRARY_PATH /tmp/rpm-root/usr/local/bin/rpm --version + DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:/tmp/rpm-root/usr/local/lib/rpm/lib:$DYLD_LIBRARY_PATH /tmp/rpm-root/usr/local/bin/rpm --version %prepare %checkout @@ . __ 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: a...@rpm5.org Module: rpm Date: 04-Jun-2009 19:37:27 Branch: HEAD Handle: 2009060417372700 Modified files: rpm devtool.conf Log: macosx: add pkglib to path for test Summary: RevisionChanges Path 2.301 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.300 -r2.301 devtool.conf --- rpm/devtool.conf 2 Jun 2009 20:53:05 - 2.300 +++ rpm/devtool.conf 4 Jun 2009 17:37:27 - 2.301 @@ -1883,7 +1883,7 @@ rm -f /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.la # test drive (version only, should set up a local dbpath) -DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:$DYLD_LIBRARY_PATH /tmp/rpm-root/usr/local/bin/rpm --version + DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:/tmp/rpm-root/usr/local/lib/rpm/lib:$DYLD_LIBRARY_PATH /tmp/rpm-root/usr/local/bin/rpm --version %prepare %checkout @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/js/ rpmjsfile.msg
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 04-Jun-2009 19:35:29
Branch: rpm-5_2 Handle: 2009060417352900
Added files: (Branch: rpm-5_2)
rpm/js rpmjsfile.msg
Log:
add missing msg file (being included by rpmjsfile.c)
Summary:
RevisionChanges Path
1.1.2.2 +90 -0 rpm/js/rpmjsfile.msg
patch -p0 <<'@@ .'
Index: rpm/js/rpmjsfile.msg
$ cvs diff -u -r0 -r1.1.2.2 rpmjsfile.msg
--- /dev/null 2009-06-04 19:34:45 +0200
+++ rpmjsfile.msg 2009-06-04 19:35:29 +0200
@@ -0,0 +1,90 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * * BEGIN LICENSE BLOCK *
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License
Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the
"LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * * END LICENSE BLOCK * */
+
+/*
+Error messages for jsfile.c. See js.msg for format specification.
+*/
+
+MSG_DEF(JSFILEMSG_NOT_AN_ERROR,0, 0,
JSEXN_NONE, "")
+MSG_DEF(JSFILEMSG_FILE_CONSTRUCTOR_UNDEFINED_ERROR,1, 0,
JSEXN_NONE, "File constructor is undefined")
+MSG_DEF(JSFILEMSG_FILE_CURRENTDIR_UNDEFINED_ERROR, 2, 0,
JSEXN_NONE, "File.currentDir is undefined")
+MSG_DEF(JSFILEMSG_FIRST_ARGUMENT_OPEN_NOT_STRING_ERROR,3, 1,
JSEXN_NONE, "The first argument {0} to file.open must be a string")
+MSG_DEF(JSFILEMSG_SECOND_ARGUMENT_OPEN_NOT_STRING_ERROR, 4, 0,
JSEXN_NONE, "The second argument to file.open must be a string")
+MSG_DEF(JSFILEMSG_CANNOT_COPY_FILE_OPEN_FOR_WRITING_ERROR, 5, 1,
JSEXN_NONE, "Cannot copy file {0} open for writing")
+MSG_DEF(JSFILEMSG_CANNOT_ACCESS_FILE_INFO_ERROR, 6, 1,
JSEXN_NONE, "Cannot access file information for {0}")
+MSG_DEF(JSFILEMSG_COPY_READ_ERROR, 7, 1,
JSEXN_NONE, "An error occured while attempting to read a file {0} to copy")
+MSG_DEF(JSFILEMSG_COPY_WRITE_ERROR,8, 1,
JSEXN_NONE, "An error occured while attempting to copy into file {0}")
+MSG_DEF(JSFILEMSG_EXPECTS_ONE_ARG_ERROR, 9, 0,
JSEXN_NONE, "Operation {0} expects one argument, not {1}")
+MSG_DEF(JSFILEMSG_CANNOT_FLUSH_CLOSE_FILE_ERROR, 10, 1,
JSEXN_NONE, "Cannot flush closed file {0}")
+MSG_DEF(JSFILEMSG_CANNOT_OPEN_WRITING_ERROR, 11, 1,
JSEXN_NONE, "Cannot open file {0} for writing")
+MSG_DEF(JSFILEMSG_WRITEALL_EXPECTS_ONE_ARG_ERROR, 12, 0,
JSEXN_NONE, "writeAll expects one argument")
+MSG_DEF(JSFILEMSG_FIRST_ARGUMENT_WRITEALL_NOT_ARRAY_ERROR,13, 0,
JSEXN_NONE, "writeAll expects an array as an argument")
+MSG_DEF(JSFILEMSG_UNUSED0,14, 0,
JSEXN_NONE, "Unused error messag
[CVS] RPM: rpm-5_2: rpm/js/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 04-Jun-2009 19:32:21 Branch: rpm-5_2 Handle: 2009060417322100 Modified files: (Branch: rpm-5_2) rpm/js Makefile.am Log: split rpmjsm up, into one loadable module and one linkable library Summary: RevisionChanges Path 1.13.2.3+7 -2 rpm/js/Makefile.am patch -p0 <<'@@ .' Index: rpm/js/Makefile.am $ cvs diff -u -r1.13.2.2 -r1.13.2.3 Makefile.am --- rpm/js/Makefile.am8 May 2009 22:18:39 - 1.13.2.2 +++ rpm/js/Makefile.am4 Jun 2009 17:32:21 - 1.13.2.3 @@ -48,6 +48,7 @@ pkgbin_PROGRAMS =tjs pkglib_LTLIBRARIES = rpmjsm.la +pkglib_LTLIBRARIES +=librpmjsm.la rpmjsm_la_CFLAGS = -fno-strict-aliasing rpmjsm_la_LDFLAGS = -module -avoid-version @@ -59,6 +60,8 @@ $(top_builddir)/misc/librpmmisc.la \ @LTLIBINTL@ +librpmjsm_la_LIBADD = $(rpmjsm_la_LIBADD) + noinst_HEADERS = \ rpmjsfile.h \ rpmds-js.h rpmfi-js.h rpmhdr-js.h rpmmc-js.h rpmmi-js.h rpmps-js.h \ @@ -71,10 +74,12 @@ rpmte-js.c rpmts-js.c \ syck-js.c uuid-js.c +librpmjsm_la_SOURCES = $(rpmjsm_la_SOURCES) + .PHONY: lint lint: $(LINT) $(DEFS) $(INCLUDES) $(rpmjs_la_sources) -tjs_SOURCES = tjs.c rpmjsm.la -tjs_LDADD = rpmjsm.la $(RPM_LDADD_COMMON) +tjs_SOURCES = tjs.c librpmjsm.la +tjs_LDADD = librpmjsm.la $(RPM_LDADD_COMMON) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/js/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 04-Jun-2009 19:31:44 Branch: HEAD Handle: 2009060417314400 Modified files: rpm/js Makefile.am Log: split rpmjsm up, into one loadable module and one linkable library Summary: RevisionChanges Path 1.15+7 -2 rpm/js/Makefile.am patch -p0 <<'@@ .' Index: rpm/js/Makefile.am $ cvs diff -u -r1.14 -r1.15 Makefile.am --- rpm/js/Makefile.am7 May 2009 22:32:35 - 1.14 +++ rpm/js/Makefile.am4 Jun 2009 17:31:44 - 1.15 @@ -48,6 +48,7 @@ pkgbin_PROGRAMS =tjs pkglib_LTLIBRARIES = rpmjsm.la +pkglib_LTLIBRARIES +=librpmjsm.la rpmjsm_la_CFLAGS = -fno-strict-aliasing rpmjsm_la_LDFLAGS = -module -avoid-version @@ -59,6 +60,8 @@ $(top_builddir)/misc/librpmmisc.la \ @LTLIBINTL@ +librpmjsm_la_LIBADD = $(rpmjsm_la_LIBADD) + noinst_HEADERS = \ rpmjsfile.h \ rpmds-js.h rpmfi-js.h rpmhdr-js.h rpmmc-js.h rpmmi-js.h rpmps-js.h \ @@ -71,10 +74,12 @@ rpmte-js.c rpmts-js.c \ syck-js.c uuid-js.c +librpmjsm_la_SOURCES = $(rpmjsm_la_SOURCES) + .PHONY: lint lint: $(LINT) $(DEFS) $(INCLUDES) $(rpmjs_la_sources) -tjs_SOURCES = tjs.c rpmjsm.la -tjs_LDADD = rpmjsm.la $(RPM_LDADD_COMMON) +tjs_SOURCES = tjs.c librpmjsm.la +tjs_LDADD = librpmjsm.la $(RPM_LDADD_COMMON) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
