[CVS] RPM: rpm/lib/ rpmlib.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Arkadiusz Miskiewicz Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 29-Jul-2008 16:51:36 Branch: HEAD Handle: 2008072914513600 Modified files: rpm/lib rpmlib.h Log: Include rpmio.h (needed due to rpmRC). Summary: RevisionChanges Path 2.463 +1 -0 rpm/lib/rpmlib.h patch -p0 <<'@@ .' Index: rpm/lib/rpmlib.h $ cvs diff -u -r2.462 -r2.463 rpmlib.h --- rpm/lib/rpmlib.h 26 Mar 2008 20:59:14 - 2.462 +++ rpm/lib/rpmlib.h 29 Jul 2008 14:51:36 - 2.463 @@ -10,6 +10,7 @@ #include #include +#include #define RPM_FORMAT_VERSION 5 #define RPM_MAJOR_VERSION 0 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmlib.h rpm/rpmdb/ rpmtag.h rpm/ rpmpopt.in
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: 26-Mar-2008 21:59:14
Branch: HEAD Handle: 2008032620591301
Modified files:
rpm rpmpopt.in
rpm/lib rpmlib.h
rpm/rpmdb rpmtag.h
Log:
- jbj: start --qf spew for .yaml markup and .sqlite imports.
Summary:
RevisionChanges Path
2.462 +2 -0 rpm/lib/rpmlib.h
1.44+0 -1 rpm/rpmdb/rpmtag.h
2.58+263 -57rpm/rpmpopt.in
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
$ cvs diff -u -r2.461 -r2.462 rpmlib.h
--- rpm/lib/rpmlib.h 2 Mar 2008 21:09:36 - 2.461
+++ rpm/lib/rpmlib.h 26 Mar 2008 20:59:14 - 2.462
@@ -16,11 +16,13 @@
#define RPM_MINOR_VERSION 0
/[EMAIL PROTECTED]@*/
+/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
extern struct MacroContext_s * rpmGlobalMacroContext;
/[EMAIL PROTECTED]@*/
extern struct MacroContext_s * rpmCLIMacroContext;
+/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
extern const char * RPMVERSION;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/rpmtag.h
$ cvs diff -u -r1.43 -r1.44 rpmtag.h
--- rpm/rpmdb/rpmtag.h23 Mar 2008 02:49:47 - 1.43
+++ rpm/rpmdb/rpmtag.h26 Mar 2008 20:59:14 - 1.44
@@ -967,7 +967,6 @@
* @param h header
* @return header time
*/
-/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
uint32_t headerGetTime(/[EMAIL PROTECTED]@*/ Header h)
/[EMAIL PROTECTED]/;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
$ cvs diff -u -r2.57 -r2.58 rpmpopt.in
--- rpm/rpmpopt.in25 Mar 2008 12:40:27 - 2.57
+++ rpm/rpmpopt.in26 Mar 2008 20:59:13 - 2.58
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.57 2008/03/25 12:40:27 jbj Exp $
+# $Id: rpmpopt.in,v 2.58 2008/03/26 20:59:13 jbj Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -101,112 +101,318 @@
--POPTdesc=$"list metadata in xml"
rpm alias --yaml --qf '[%{*:yaml}\n]' \
--POPTdesc=$"list metadata in yaml"
+
+#==
rpm alias --yum:primary.xml --qf '\
-\n\
- %{NAME:cdata}\n\
- %{ARCH:cdata}\n\
- \n\
- %|HDRID?{%{HDRID}}|\n\
- %{SUMMARY:cdata}\n\
- %{DESCRIPTION:cdata}\n\
- %|PACKAGER?{%{PACKAGER:cdata}}:{}|\n\
- %|URL?{%{URL:cdata}}:{}|\n\
- \n\
- \n\
- \n\
- \n\
+\
+\n %{NAME:cdata}\
+\n %{ARCH:cdata}\
+\n \
+\n %|HDRID?{%{HDRID}}|\
+\n %{SUMMARY:cdata}\
+\n %{DESCRIPTION:cdata}\
+\n %|PACKAGER?{%{PACKAGER:cdata}}:{}|\
+\n %|URL?{%{URL:cdata}}:{}|\
+\n \
+\n \
+\n \
+\n \
%|license?{\
-%{LICENSE:cdata}\n\
+\n%{LICENSE:cdata}\
}:{\
-\n\
+\n\
}|\
%|vendor?{\
-%{VENDOR:cdata}\n\
+\n%{VENDOR:cdata}\
}:{\
-\n\
+\n\
}|\
%|group?{\
-%{GROUP:cdata}\n\
+\n%{GROUP:cdata}\
}:{\
-\n\
+\n\
}|\
%|buildhost?{\
-%{BUILDHOST:cdata}\n\
+\n%{BUILDHOST:cdata}\
}:{\
-\n\
+\n\
}|\
%|sourcerpm?{\
-%{SOURCERPM:cdata}\n\
+\n%{SOURCERPM:cdata}\
}|\
-\n\
-%|provideentry?{\
-\n\
+\n\
+%|providename?{\
+\n\
[\
- %{provideentry}\n\
+\n %{provideentry}\
]\
-\n\
+\n\
}:{\
-\n\
-}|\
-%|requireentry?{\
-\n\
+\n\
+\n}|\
+%|requirename?{\
+\n\
[\
- %{requireentry}\n\
+\n %{requireentry}\
]\
-\n\
+\n\
}:{\
-\n\
+\n\
}|\
-%|conflictentry?{\
-\n\
+%|conflictname?{\
+\n\
[\
- %{conflictentry}\n\
+\n %{conflictentry}\
]\
-\n\
+\n\
}:{\
-\n\
+\n\
}|\
-%|obsoleteentry?{\
-\n\
+%|obsoletename?{\
+\n\
[\
- %{obsoleteentry}\n\
+\n %{obsoleteentry}\
]\
-\n\
+\n\
}:{\
-\n\
+\n\
}|\
%|filesentry1?{\
[\
-%{filesentry1}\n\
+\n%{filesentry1}\
]\
}|\
- \n\
-\n' \
+\n \
+\n\
+\n' \
--POPTdesc=$"display yum primary.xml markup"
[CVS] RPM: rpm/lib/ rpmlib.h rpmsx.c rpm/python/ rpmal-py.c rpm/rpmdb/...
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: 02-Mar-2008 22:09:37
Branch: HEAD Handle: 2008030221093601
Modified files:
rpm/lib rpmlib.h rpmsx.c
rpm/python rpmal-py.c
rpm/rpmdb fprint.c merge.c
rpm/rpmio rpmio.h
Log:
- jbj: move rpmRC return codes from rmlib.h -> rpmio.h (where _free()
is).
Summary:
RevisionChanges Path
2.461 +0 -11 rpm/lib/rpmlib.h
2.17+1 -1 rpm/lib/rpmsx.c
1.15+1 -0 rpm/python/rpmal-py.c
1.24+1 -0 rpm/rpmdb/fprint.c
1.12+2 -1 rpm/rpmdb/merge.c
1.68+11 -0 rpm/rpmio/rpmio.h
patch -p0 <<'@@ .'
Index: rpm/lib/rpmlib.h
$ cvs diff -u -r2.460 -r2.461 rpmlib.h
--- rpm/lib/rpmlib.h 2 Mar 2008 20:57:25 - 2.460
+++ rpm/lib/rpmlib.h 2 Mar 2008 21:09:36 - 2.461
@@ -15,17 +15,6 @@
#define RPM_MAJOR_VERSION 0
#define RPM_MINOR_VERSION 0
-/**
- * Package read return codes.
- */
-typedef enum rpmRC_e {
-RPMRC_OK = 0,/*!< Generic success code */
-RPMRC_NOTFOUND = 1,/*!< Generic not found code. */
-RPMRC_FAIL = 2,/*!< Generic failure code. */
-RPMRC_NOTTRUSTED = 3,/*!< Signature is OK, but key is not trusted. */
-RPMRC_NOKEY = 4 /*!< Public key is unavailable. */
-} rpmRC;
-
/[EMAIL PROTECTED]@*/
/[EMAIL PROTECTED]@*/
extern struct MacroContext_s * rpmGlobalMacroContext;
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmsx.c
$ cvs diff -u -r2.16 -r2.17 rpmsx.c
--- rpm/lib/rpmsx.c 30 Sep 2007 20:38:26 - 2.16
+++ rpm/lib/rpmsx.c 2 Mar 2008 21:09:36 - 2.17
@@ -3,8 +3,8 @@
*/
#include "system.h"
-#include
#include
+#include
#include /* for rpmGetPath() */
#define _RPMSX_INTERNAL
@@ .
patch -p0 <<'@@ .'
Index: rpm/python/rpmal-py.c
$ cvs diff -u -r1.14 -r1.15 rpmal-py.c
--- rpm/python/rpmal-py.c 19 Nov 2007 18:57:58 - 1.14
+++ rpm/python/rpmal-py.c 2 Mar 2008 21:09:37 - 1.15
@@ -4,6 +4,7 @@
#include "system.h"
+#include/* XXX rpmRC returns */
#include/* XXX fnpyKey */
#include
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/fprint.c
$ cvs diff -u -r1.23 -r1.24 fprint.c
--- rpm/rpmdb/fprint.c24 Nov 2007 22:07:30 - 1.23
+++ rpm/rpmdb/fprint.c2 Mar 2008 21:09:37 - 1.24
@@ -4,6 +4,7 @@
#include "system.h"
+#include/* XXX rpmRC codes. */
#include /* XXX for rpmCleanPath */
#include
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmdb/merge.c
$ cvs diff -u -r1.11 -r1.12 merge.c
--- rpm/rpmdb/merge.c 15 Nov 2007 14:30:25 - 1.11
+++ rpm/rpmdb/merge.c 2 Mar 2008 21:09:37 - 1.12
@@ -55,7 +55,8 @@
#include "system.h"
-#include "rpmdb.h"
+#include/* XXX rpmRC returns. */
+#include
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.h
$ cvs diff -u -r1.67 -r1.68 rpmio.h
--- rpm/rpmio/rpmio.h 27 Feb 2008 18:27:11 - 1.67
+++ rpm/rpmio/rpmio.h 2 Mar 2008 21:09:37 - 1.68
@@ -46,6 +46,17 @@
extern "C" {
#endif
+/**
+ * RPM return codes.
+ */
+typedef enum rpmRC_e {
+RPMRC_OK = 0,/*!< Generic success code */
+RPMRC_NOTFOUND = 1,/*!< Generic not found code. */
+RPMRC_FAIL = 2,/*!< Generic failure code. */
+RPMRC_NOTTRUSTED = 3,/*!< Signature is OK, but key is not trusted. */
+RPMRC_NOKEY = 4 /*!< Public key is unavailable. */
+} rpmRC;
+
/** \ingroup rpmio
* \name RPMIO Vectors.
*/
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmlib.h
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: 04-Dec-2007 08:55:03 Branch: HEAD Handle: 2007120407550300 Modified files: rpm/lib rpmlib.h Log: change rpmdbMatchIterator struct name, to match rpmdb/rpmdb.h Summary: RevisionChanges Path 2.455 +1 -1 rpm/lib/rpmlib.h patch -p0 <<'@@ .' Index: rpm/lib/rpmlib.h $ cvs diff -u -r2.454 -r2.455 rpmlib.h --- rpm/lib/rpmlib.h 3 Dec 2007 18:22:32 - 2.454 +++ rpm/lib/rpmlib.h 4 Dec 2007 07:55:03 - 2.455 @@ -103,7 +103,7 @@ /** \ingroup rpmdb * Database iterator. */ -typedef /[EMAIL PROTECTED]@*/ struct _rpmdbMatchIterator * rpmdbMatchIterator; +typedef /[EMAIL PROTECTED]@*/ struct rpmdbMatchIterator_s * rpmdbMatchIterator; /** \ingroup rpmgi * Generalized iterator. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmlib.h
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: 08-Sep-2007 20:56:49 Branch: HEAD Handle: 2007090819564900 Modified files: rpm/lib rpmlib.h Log: orphan. Summary: RevisionChanges Path 2.432 +0 -12 rpm/lib/rpmlib.h patch -p0 <<'@@ .' Index: rpm/lib/rpmlib.h $ cvs diff -u -r2.431 -r2.432 rpmlib.h --- rpm/lib/rpmlib.h 28 Aug 2007 00:12:38 - 2.431 +++ rpm/lib/rpmlib.h 8 Sep 2007 18:56:49 - 2.432 @@ -778,18 +778,6 @@ */ typedef /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ struct rpmpsm_s * rpmpsm; -/** - * Perform simple sanity and range checks on header tag(s). - * @param il no. of tags in header - * @param dl no. of bytes in header data. - * @param pev1st element in tag array, big-endian - * @param iv failing (or last) tag element, host-endian - * @param negate negative offset expected? - * @return -1 on success, otherwise failing tag element index - */ -int headerVerifyInfo(int il, int dl, const void * pev, void * iv, int negate) - /[EMAIL PROTECTED] *iv @*/; - /** * Check header consistency, performing headerGetEntry() the hard way. * @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ rpmlib.h rpmrc.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 19-Jun-2007 08:49:49 Branch: HEAD Handle: 2007061907494900 Modified files: rpm/lib rpmlib.h rpmrc.c Log: fix two compiler warnings by providing the necessary prototypes Summary: RevisionChanges Path 2.423 +6 -0 rpm/lib/rpmlib.h 2.198 +1 -0 rpm/lib/rpmrc.c patch -p0 <<'@@ .' Index: rpm/lib/rpmlib.h $ cvs diff -u -r2.422 -r2.423 rpmlib.h --- rpm/lib/rpmlib.h 18 Jun 2007 00:03:05 - 2.422 +++ rpm/lib/rpmlib.h 19 Jun 2007 06:49:49 - 2.423 @@ -586,6 +586,12 @@ int rpmMachineScore(int type, const char * name) /[EMAIL PROTECTED]/; +/** + * (unused) + */ +void rpmGetMachine(const char ** arch, const char ** os) +/[EMAIL PROTECTED]/; + /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ extern void * platpat; /[EMAIL PROTECTED]@*/ @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmrc.c $ cvs diff -u -r2.197 -r2.198 rpmrc.c --- rpm/lib/rpmrc.c 19 Jun 2007 06:42:55 - 2.197 +++ rpm/lib/rpmrc.c 19 Jun 2007 06:49:49 - 2.198 @@ -12,6 +12,7 @@ #define __power_pc() 0 #endif +#include /* for rpmioSlurp() */ #include #include #include @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
