[CVS] RPM: rpm/ Makefile.am configure.ac
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 Date: 01-Dec-2010 16:00:46 Branch: HEAD Handle: 2010120115003802 Modified files: rpm Makefile.am configure.ac Log: - typo in version, don't add arbitrarytag*.src.rpm yet. Summary: RevisionChanges Path 2.262 +0 -1 rpm/Makefile.am 2.471 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.261 -r2.262 Makefile.am --- rpm/Makefile.am 2 Nov 2010 15:57:10 - 2.261 +++ rpm/Makefile.am 1 Dec 2010 15:00:40 - 2.262 @@ -16,7 +16,6 @@ pubkeys/JBJ-GPG-KEY \ rpm.magic rpmqv.c \ python \ - tests/arbitrarytag-1.0-1.src.rpm \ tests/cudf-test-1-0.src.rpm \ tests/devtool-sanity-1.0-1.src.rpm \ tests/edos-test-1-0.src.rpm \ @@ . patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.470 -r2.471 configure.ac --- rpm/configure.ac 2 Nov 2010 15:57:10 - 2.470 +++ rpm/configure.ac 1 Dec 2010 15:00:38 - 2.471 @@ -8,7 +8,7 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.5.DEVEL],[PACKAGE_BUGREPORT_DEFAULT]) +AC_INIT([rpm],[5.4.DEVEL],[PACKAGE_BUGREPORT_DEFAULT]) PACKAGE_TIMESTAMP=2010-09-18 dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmruby.h
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 Date: 01-Dec-2010 17:05:19
Branch: HEAD Handle: 2010120116051900
Modified files:
rpm/rpmio rpmruby.h
Log:
- ruby: consistent doco.
Summary:
RevisionChanges Path
2.10+28 -42 rpm/rpmio/rpmruby.h
patch -p0 '@@ .'
Index: rpm/rpmio/rpmruby.h
$ cvs diff -u -r2.9 -r2.10 rpmruby.h
--- rpm/rpmio/rpmruby.h 18 Sep 2010 16:37:06 - 2.9
+++ rpm/rpmio/rpmruby.h 1 Dec 2010 16:05:19 - 2.10
@@ -1,7 +1,6 @@
#ifndef RPMRUBY_H
#define RPMRUBY_H
-
/**
* \file rpmio/rpmruby.h
* \ingroup rpmio
@@ -10,7 +9,7 @@
*
* This allows the embedding of the Ruby interpreter into RPM5. It can be
* used, for example, for expanding in the fashion of
- * tt%%expand{ruby ...}/tt.
+ * tt%%expand{ruby: ...}/tt.
*
* Currently (as of ruby-1.9.2), the Ruby interpreter allows only one
instance
* of itself per process. As such, rpmio's pooling mechanism will also always
@@ -23,11 +22,9 @@
* You can use rpmrubyRun() to evaluate Ruby code and get the result back.
*/
-
#include rpmiotypes.h
#include rpmio.h
-
/** Triggers printing of debugging information */
/*...@unchecked@*/
extern int _rpmruby_debug;
@@ -45,9 +42,7 @@
/*...@unchecked@*/ /*...@relnull@*/
extern rpmruby _rpmrubyI;
-
#if defined(_RPMRUBY_INTERNAL)
-
/**
* Instances of this struct carry an embedded Ruby interpreter and the state
* associated with it.
@@ -65,44 +60,40 @@
/**
* Carries the interpreter's current state, e.g. the latest return code.
- * */
+ */
unsigned long state;
#if defined(__LCLINT__)
/** Reference count: Currently unused, only to keep splint happy. */
-/*...@refs@*/
+/*...@refs@*/
int nrefs;
#endif
};
-
#endif /* _RPMRUBY_INTERNAL */
-
#ifdef __cplusplus
extern C {
#endif
-
/**
- * Dereferences a Ruby interpreter instance in the rpmio pool
+ * Dereferences a Ruby interpreter instance.
*
- * @param ruby Ruby interpreter pool item
- * @return NULL on last dereference
+ * @param ruby Ruby interpreter pool item
+ * @return NULL on last dereference
* @see rpmUnlinkPoolItem
*/
/*...@unused@*/ /*...@null@*/
rpmruby rpmrubyUnlink (/*...@killref@*/ /*...@only@*/ /*...@null@*/ rpmruby
ruby)
-/*...@modifies ruby @*/;
+ /*...@modifies ruby @*/;
#define rpmrubyUnlink(_ruby) \
((rpmruby)rpmioUnlinkPoolItem((rpmioItem)(_ruby), __FUNCTION__, \
__FILE__, __LINE__))
-
/**
- * References a Ruby interpreter instance in the rpmio pool
+ * References a Ruby interpreter instance.
*
- * @param ruby Ruby interpreter
- * @return A new ruby interpreter reference
+ * @param ruby Ruby interpreter
+ * @return A new ruby interpreter reference
* @see rpmioLinkPoolItem
*/
/*...@unused@*/ /*...@newref@*/ /*...@null@*/
@@ -112,12 +103,11 @@
((rpmruby)rpmioLinkPoolItem((rpmioItem)(_ruby), __FUNCTION__, \
__FILE__, __LINE__))
-
/**
- * Destroys a Ruby interpreter instance in the rpmio pool
+ * Destroys a Ruby interpreter instance.
*
- * @param ruby The Ruby interpreter to be destroyed
- * @return NULL on last dereference
+ * @param ruby The Ruby interpreter to be destroyed
+ * @return NULL on last dereference
* @see rpmioFreePoolItem
*/
/*...@null@*/
@@ -128,38 +118,34 @@
((rpmruby)rpmioFreePoolItem((rpmioItem)(_ruby), __FUNCTION__, \
__FILE__, __LINE__))
-
/**
- * Creates and initializes a Ruby interpreter
+ * Creates and initializes a Ruby interpreter.
*
- * @param av Arguments to the Ruby interpreter (may be NULL)
- * @param flags Ruby interpreter flags; ((131): use global
interpreter)
- * @return A new Ruby interpreter
+ * @param av Arguments to the Ruby interpreter (may be NULL)
+ * @param flags Ruby interpreter flags: ((131): use global
interpreter)
+ * @return A new Ruby interpreter
*/
/*...@newref@*/ /*...@null@*/
rpmruby rpmrubyNew(/*...@null@*/ char **av, uint32_t flags)
-/*...@globals fileSystem, internalState @*/
-/*...@modifies fileSystem, internalState @*/;
-
+ /*...@globals fileSystem, internalState @*/
+ /*...@modifies
[CVS] RPM: rpm/rpmio/ rpmperl.c
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 Date: 01-Dec-2010 17:06:06 Branch: HEAD Handle: 2010120116060600 Modified files: rpm/rpmio rpmperl.c Log: - perl: avoid make check failures if rpm-perl isn't installed. Summary: RevisionChanges Path 2.12+0 -1 rpm/rpmio/rpmperl.c patch -p0 '@@ .' Index: rpm/rpmio/rpmperl.c $ cvs diff -u -r2.11 -r2.12 rpmperl.c --- rpm/rpmio/rpmperl.c 8 Mar 2010 22:24:07 - 2.11 +++ rpm/rpmio/rpmperl.c 1 Dec 2010 16:06:06 - 2.12 @@ -76,7 +76,6 @@ use IO::String;\n\ our $io = IO::String-new;\n\ select $io;\n\ -use RPM;\n\ ; #endif @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ruby/ rpm-rb.h system.h
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 Date: 01-Dec-2010 17:09:51 Branch: HEAD Handle: 2010120116095000 Modified files: rpm/rubyrpm-rb.h system.h Log: - ruby: orphaned check-in's. Summary: RevisionChanges Path 1.7 +9 -0 rpm/ruby/rpm-rb.h 1.5 +1 -1 rpm/ruby/system.h patch -p0 '@@ .' Index: rpm/ruby/rpm-rb.h $ cvs diff -u -r1.6 -r1.7 rpm-rb.h --- rpm/ruby/rpm-rb.h 13 Nov 2010 21:42:47 - 1.6 +++ rpm/ruby/rpm-rb.h 1 Dec 2010 16:09:50 - 1.7 @@ -13,6 +13,15 @@ #include rpmiotypes.h +#include rpmtypes.h +#include rpmtag.h + +#undef xmalloc +#undef xcalloc +#undef xrealloc +#pragma GCC diagnostic ignored -Wstrict-prototypes +#include ruby.h +#pragma GCC diagnostic warning -Wstrict-prototypes /** * The RPM Ruby module. @@ . patch -p0 '@@ .' Index: rpm/ruby/system.h $ cvs diff -u -r1.4 -r1.5 system.h --- rpm/ruby/system.h 13 Nov 2010 15:21:23 - 1.4 +++ rpm/ruby/system.h 1 Dec 2010 16:09:50 - 1.5 @@ -3,7 +3,7 @@ #include ../system.h -/* XXX grrr, ruby.h includes its own config.h too. */ +/* XXX ruby-1.8.6 grrr, ruby.h includes its own config.h too. */ #undef PACKAGE_NAME #undef PACKAGE_TARNAME #undef PACKAGE_VERSION @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/python/ rpmmodule.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 01-Dec-2010 17:46:05 Branch: HEAD Handle: 2010120116460300 Modified files: rpm/python rpmmodule.c Log: recommit RPMSENSE_* enum constant exports temporarily under vendor #ifdef just to get rpmlint working for now... Summary: RevisionChanges Path 1.180 +7 -0 rpm/python/rpmmodule.c patch -p0 '@@ .' Index: rpm/python/rpmmodule.c $ cvs diff -u -r1.179 -r1.180 rpmmodule.c --- rpm/python/rpmmodule.c30 Nov 2010 00:03:18 - 1.179 +++ rpm/python/rpmmodule.c1 Dec 2010 16:46:03 - 1.180 @@ -487,6 +487,13 @@ REGISTER_ENUM(RPMSENSE_EQUAL); REGISTER_ENUM(RPMSENSE_NOTEQUAL); REGISTER_ENUM(RPMSENSE_FIND_REQUIRES); +#if defined(RPM_VENDOR_MANDRIVA) +REGISTER_ENUM(RPMSENSE_PREREQ); +REGISTER_ENUM(RPMSENSE_SCRIPT_PRE); +REGISTER_ENUM(RPMSENSE_SCRIPT_POST); +REGISTER_ENUM(RPMSENSE_SCRIPT_PREUN); +REGISTER_ENUM(RPMSENSE_SCRIPT_POSTUN) +#endif REGISTER_ENUM(RPMDEPS_FLAG_NOUPGRADE); REGISTER_ENUM(RPMDEPS_FLAG_NOREQUIRES); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: beecrypt/ .cvsignore config.h.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: beecrypt Date: 01-Dec-2010 18:28:37 Branch: rpm-5_3 Handle: 2010120117283700 Modified files: (Branch: rpm-5_3) beecrypt.cvsignore config.h.in Log: - cruft propagation (config.h.in needs removal, not yet). Summary: RevisionChanges Path 1.20.2.1+1 -0 beecrypt/.cvsignore 1.8.2.1 +3 -0 beecrypt/config.h.in patch -p0 '@@ .' Index: beecrypt/.cvsignore $ cvs diff -u -r1.20 -r1.20.2.1 .cvsignore --- beecrypt/.cvsignore 29 Apr 2010 23:19:56 - 1.20 +++ beecrypt/.cvsignore 1 Dec 2010 17:28:37 - 1.20.2.1 @@ -5,6 +5,7 @@ Doxyfile Makefile Makefile.in +m4 aclocal.m4 missing mkinstalldirs @@ . patch -p0 '@@ .' Index: beecrypt/config.h.in $ cvs diff -u -r1.8 -r1.8.2.1 config.h.in --- beecrypt/config.h.in 20 Jun 2010 00:13:36 - 1.8 +++ beecrypt/config.h.in 1 Dec 2010 17:28:37 - 1.8.2.1 @@ -240,6 +240,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ .cvsignore
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 Date: 01-Dec-2010 18:29:32 Branch: rpm-5_3 Handle: 2010120117293200 Modified files: (Branch: rpm-5_3) rpm .cvsignore Log: - ignore detached signatures on release tarballs. Summary: RevisionChanges Path 1.39.2.1+1 -0 rpm/.cvsignore patch -p0 '@@ .' Index: rpm/.cvsignore $ cvs diff -u -r1.39 -r1.39.2.1 .cvsignore --- rpm/.cvsignore27 Nov 2009 16:07:04 - 1.39 +++ rpm/.cvsignore1 Dec 2010 17:29:32 - 1.39.2.1 @@ -49,6 +49,7 @@ rpmrc stamp-h* rpm-*.tar.gz +rpm-*.tar.gz.asc ylwrap .git .gitignore @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/tests/ref/ showrc
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 Date: 01-Dec-2010 22:23:31
Branch: rpm-5_3 Handle: 2010120121233100
Modified files: (Branch: rpm-5_3)
rpm/tests/ref showrc
Log:
- sanity.
Summary:
RevisionChanges Path
1.23.2.19 +2 -4 rpm/tests/ref/showrc
patch -p0 '@@ .'
Index: rpm/tests/ref/showrc
$ cvs diff -u -r1.23.2.18 -r1.23.2.19 showrc
--- rpm/tests/ref/showrc 31 Oct 2010 20:10:43 - 1.23.2.18
+++ rpm/tests/ref/showrc 1 Dec 2010 21:23:31 - 1.23.2.19
@@ -16,11 +16,9 @@
MACRO DEFINITIONS:
macrofiles: ../macros/macros:../tests/macros
Features provided by rpmlib installer:
-rpmlib(BuiltinJavaScript) = 5.2-1
rpmlib(BuiltinLuaScripts) = 4.2.2-1
rpmlib(BuiltinPythonScripts) = 5.2-1
rpmlib(BuiltinRubyScripts) = 5.2-1
-rpmlib(BuiltinSpookScripts) = 5.3-1
rpmlib(BuiltinSqlScripts) = 5.3-1
rpmlib(BuiltinTclScripts) = 5.2-1
rpmlib(CompressedFileNames) = 3.0.4-1
@@ -234,7 +232,7 @@
-14: __find_provides %{_rpmhome}/find-provides
-14: __find_requires %{_rpmhome}/find-requires
-14: __git /usr/bin/git
--14: __gpg /usr/bin/gpg2
+-14: __gpg /usr/bin/gpg
-14: __gpg_check_password_cmd%{__gpg}
gpg --batch --no-verbose --passphrase-fd 3 -u %{_gpg_name} -so -
-14: __gpg_sign_cmd %{__gpg}
@@ -388,7 +386,7 @@
-14: __xar %{_usrlibrpmbin}/xar
-14: __xz/usr/bin/xz
-14: _arbitrary_tags
Class:Track:Trackprog:Depflags:Transflags:%{_arbitrary_tags_debian}
--14: _arbitrary_tags_debian
Priority:Essential:Depends:Predepends:Recommends:Suggests:Enhances:Breaks
+-14: _arbitrary_tags_debian CVEID:RHSA:RHBZ:ATAS
-14: _arch i386
-14: _bhA%{nil}
-14: _bhN%{nil}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES
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 Date: 01-Dec-2010 22:27:15 Branch: rpm-5_3 Handle: 2010120121271400 Modified files: (Branch: rpm-5_3) rpm CHANGES Log: - release rpm-5.3.6 (in a *.src.rpm). Summary: RevisionChanges Path 1.3296.2.129+3 -0 rpm/CHANGES patch -p0 '@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.128 -r1.3296.2.129 CHANGES --- rpm/CHANGES 1 Dec 2010 16:30:54 - 1.3296.2.128 +++ rpm/CHANGES 1 Dec 2010 21:27:14 - 1.3296.2.129 @@ -1,4 +1,7 @@ +5.3.6 - 5.3.7: + 5.3.5 - 5.3.6: +- jbj: release rpm-5.3.6 (in a *.src.rpm). - jbj: i18n: update po files (Translation Project). - jbj: rpmdb: minimalistic lock object scaling. - jbj: rpmdb: re-open with DB_RECOVER iff DB_RUNRECOVERY. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ configure.ac
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 Date: 01-Dec-2010 22:27:39 Branch: rpm-5_3 Handle: 2010120121273900 Modified files: (Branch: rpm-5_3) rpm configure.ac Log: - bump the version to 5.3.7. Summary: RevisionChanges Path 2.432.2.41 +2 -2 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.40 -r2.432.2.41 configure.ac --- rpm/configure.ac 7 Nov 2010 18:08:25 - 2.432.2.40 +++ rpm/configure.ac 1 Dec 2010 21:27:39 - 2.432.2.41 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.3.6],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP=2010-09-18 dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.3.7],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP=2010-12-01 dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmconstant/ rpmconstant.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 01-Dec-2010 23:50:01 Branch: HEAD Handle: 2010120122500100 Modified files: rpm/rpmconstant rpmconstant.h Log: remove inclusion of header that's not used nor part of exported api Summary: RevisionChanges Path 1.8 +1 -2 rpm/rpmconstant/rpmconstant.h patch -p0 '@@ .' Index: rpm/rpmconstant/rpmconstant.h $ cvs diff -u -r1.7 -r1.8 rpmconstant.h --- rpm/rpmconstant/rpmconstant.h 31 Jul 2008 00:21:42 - 1.7 +++ rpm/rpmconstant/rpmconstant.h 1 Dec 2010 22:50:01 - 1.8 @@ -1,5 +1,5 @@ /* Nanar nanar...@zarb.org - * $Id: rpmconstant.h,v 1.7 2008/07/31 00:21:42 jbj Exp $ + * $Id: rpmconstant.h,v 1.8 2010/12/01 22:50:01 pkarlsen Exp $ */ #ifndef H_RPMCONSTANT @@ -31,7 +31,6 @@ #include rpmps.h #include rpmds.h #include rpmfi.h -#include misc.h #include rpmbuild.h /** @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/rpmconstant/ rpmconstant.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: pkarl...@rpm5.org Module: rpm Date: 01-Dec-2010 23:52:20 Branch: rpm-5_3 Handle: 2010120122522000 Modified files: (Branch: rpm-5_3) rpm/rpmconstant rpmconstant.h Log: remove inclusion of header that's not used nor part of exported api Summary: RevisionChanges Path 1.7.4.1 +1 -2 rpm/rpmconstant/rpmconstant.h patch -p0 '@@ .' Index: rpm/rpmconstant/rpmconstant.h $ cvs diff -u -r1.7 -r1.7.4.1 rpmconstant.h --- rpm/rpmconstant/rpmconstant.h 31 Jul 2008 00:21:42 - 1.7 +++ rpm/rpmconstant/rpmconstant.h 1 Dec 2010 22:52:20 - 1.7.4.1 @@ -1,5 +1,5 @@ /* Nanar nanar...@zarb.org - * $Id: rpmconstant.h,v 1.7 2008/07/31 00:21:42 jbj Exp $ + * $Id: rpmconstant.h,v 1.7.4.1 2010/12/01 22:52:20 pkarlsen Exp $ */ #ifndef H_RPMCONSTANT @@ -31,7 +31,6 @@ #include rpmps.h #include rpmds.h #include rpmfi.h -#include misc.h #include rpmbuild.h /** @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
