[CVS] RPM: rpm/rpmio/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Eric Veith Root: /v/rpm/cvs Email: eve...@rpm5.org Module: rpm Date: 16-Dec-2010 19:14:41 Branch: HEAD Handle: 2010121618144100 Modified files: rpm/rpmio Makefile.am Log: Rip out Ruby macro defines no longer needed Summary: RevisionChanges Path 1.296 +0 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.295 -r1.296 Makefile.am --- rpm/rpmio/Makefile.am 15 Dec 2010 02:32:52 - 1.295 +++ rpm/rpmio/Makefile.am 16 Dec 2010 18:14:41 - 1.296 @@ -51,7 +51,6 @@ @WITH_NEON_CPPFLAGS@ \ @WITH_PCRE_CPPFLAGS@ \ @WITH_POPT_CPPFLAGS@ \ - @WITH_RUBY_CPPFLAGS@ \ @WITH_SYCK_CPPFLAGS@ \ @WITH_XAR_CPPFLAGS@ \ @WITH_XZ_CPPFLAGS@ \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 15-Dec-2010 03:32:53 Branch: HEAD Handle: 2010121502325200 Modified files: rpm/rpmio Makefile.am Log: install argv.h header on system as it's required by rpmgi.h Summary: RevisionChanges Path 1.295 +2 -2 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.294 -r1.295 Makefile.am --- rpm/rpmio/Makefile.am 9 Dec 2010 20:40:10 - 1.294 +++ rpm/rpmio/Makefile.am 15 Dec 2010 02:32:52 - 1.295 @@ -74,10 +74,10 @@ #pkglib_LTLIBRARIES = libsqlio.la pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX) -pkginc_HEADERS = mire.h rpmzlog.h yarn.h \ +pkginc_HEADERS = argv.h mire.h rpmzlog.h yarn.h \ rpmbf.h rpmcb.h rpmio.h rpmlog.h rpmiotypes.h rpmmacro.h rpmpgp.h rpmsw.h noinst_HEADERS = \ - argv.h ar.h bson.h cpio.h crc.h envvar.h fnmatch.h fts.h glob.h iosm.h \ + ar.h bson.h cpio.h crc.h envvar.h fnmatch.h fts.h glob.h iosm.h \ arirang.h blake.h bmw.h chi.h cubehash.h echo.h edon-r.h fugue.h \ groestl.h hamsi.h jh.h keccak.h lane.h luffa.h md2.h md6.h mongo.h \ salsa10.h salsa20.h shabal.h shavite3.h simd.h skein.h tib3.h tiger.h \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am rpmiotypes.h tsexp.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: 03-Jun-2010 18:27:57
Branch: HEAD Handle: 2010060316275600
Modified files:
rpm/rpmio Makefile.am rpmiotypes.h tsexp.c
Log:
- sexp: WIP.
Summary:
RevisionChanges Path
1.276 +1 -0 rpm/rpmio/Makefile.am
1.47+1 -1 rpm/rpmio/rpmiotypes.h
1.3 +142 -155 rpm/rpmio/tsexp.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.275 -r1.276 Makefile.am
--- rpm/rpmio/Makefile.am 2 Jun 2010 17:30:15 - 1.275
+++ rpm/rpmio/Makefile.am 3 Jun 2010 16:27:56 - 1.276
@@ -369,6 +369,7 @@
trpmio_LDADD = $(RPMIO_LDADD_COMMON)
tsexp_SOURCES = tsexp.c
+tsexp_LDFLAGS = $(RPMIO_LDADD_COMMON)
tsw_SOURCES = tsw.c
tsw_LDFLAGS = $(RPMIO_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmiotypes.h
$ cvs diff -u -r1.46 -r1.47 rpmiotypes.h
--- rpm/rpmio/rpmiotypes.h24 Dec 2009 16:23:50 - 1.46
+++ rpm/rpmio/rpmiotypes.h3 Jun 2010 16:27:56 - 1.47
@@ -322,7 +322,7 @@
#if defined(_RPMIOB_INTERNAL)
/** \ingroup rpmio
*/
-struct rpmiob_s{
+struct rpmiob_s {
struct rpmioItem_s _item;/*!< usage mutex and pool identifier. */
rpmuint8_t * b; /*!< data octects. */
size_t blen; /*!< no. of octets used. */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tsexp.c
$ cvs diff -u -r1.2 -r1.3 tsexp.c
--- rpm/rpmio/tsexp.c 2 Jun 2010 17:38:46 - 1.2
+++ rpm/rpmio/tsexp.c 3 Jun 2010 16:27:56 - 1.3
@@ -1,6 +1,8 @@
-#include
-#include
-#include
+#include "system.h"
+
+#include
+
+#include "debug.h"
/*==*/
/* --- Sexp.h */
@@ -24,62 +26,67 @@
#define DEFAULTLINELENGTH 75
-typedef unsigned char octet;
-
/* TYPES OF OBJECTS */
#define SEXP_STRING 1
#define SEXP_LIST 2
+typedef struct sexp_simplestring_s sexpSimpleString;
+typedef struct sexp_string_s sexpString;
+typedef struct sexp_list_s sexpList;
+typedef union sexp_object_s sexpObject;
+typedef sexpList sexpIter;
+typedef struct sexp_inputstream_s sexpInputStream;
+typedef struct sexp_outputstream_s sexpOutputStream;
+
/* sexpSimpleString */
-typedef struct sexp_simplestring {
-long int length;
-long int allocatedLength;
-octet *string;
-} sexpSimpleString;
+struct sexp_simplestring_s {
+size_t blen;
+size_t allocated;
+uint8_t * b;
+};
/* sexpString */
-typedef struct sexp_string {
+struct sexp_string_s {
int type;
sexpSimpleString *presentationHint;
sexpSimpleString *string;
-} sexpString;
+};
/* sexpList */
/* If first is NULL, then rest must also be NULL; this is empty list */
-typedef struct sexp_list {
+struct sexp_list_s {
char type;
-union sexp_object *first;
-struct sexp_list *rest;
-} sexpList;
+sexpObject *first;
+sexpList *rest;
+};
/* sexpObject */
/* so we can have a pointer to something of either type */
-typedef union sexp_object {
+union sexp_object_u {
sexpString string;
sexpList list;
-} sexpObject;
+};
/* sexpIter */
/* an "iterator" for going over lists */
/* In this implementation, it is the same as a list */
-typedef sexpList sexpIter;
-typedef struct sexp_inputstream {
+struct sexp_inputstream_s {
int nextChar;/* character currently being scanned */
int byteSize;/* 4 or 6 or 8 == currently scanning mode */
int bits;/* Bits waiting to be used */
int nBits; /* number of such bits waiting to be
used */
-void (*getChar) ();
+void (*getChar) (sexpInputStream *is);
int count; /* number of 8-bit characters output by
getChar */
FILE *inputFile; /* where to get input, if not stdin */
-} sexpInputStream;
+};
-typedef struct sexp_outputstream {
+struct sexp_outputstream_s {
long int column; /* column where next character will go */
long int maxcolumn; /* max usable column, or -1 if no
maximum */
long int indent; /
[CVS] RPM: rpm/rpmio/ Makefile.am tsexp.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: 02-Jun-2010 19:30:18
Branch: HEAD Handle: 2010060217301500
Added files:
rpm/rpmio tsexp.c
Modified files:
rpm/rpmio Makefile.am
Log:
- sexp: create from original source.
Summary:
RevisionChanges Path
1.275 +4 -2 rpm/rpmio/Makefile.am
1.1 +1773 -0rpm/rpmio/tsexp.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.274 -r1.275 Makefile.am
--- rpm/rpmio/Makefile.am 24 May 2010 12:09:46 - 1.274
+++ rpm/rpmio/Makefile.am 2 Jun 2010 17:30:15 - 1.275
@@ -12,14 +12,14 @@
rpmgenbasedir.c rpmgenpkglist.c rpmgensrclist.c \
rpmjsio.msg rpmtar.c rpmtar.h \
tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c \
- tput.c trpmio.c tsw.c lookup3.c tpw.c \
+ tput.c trpmio.c tsexp.c tsw.c lookup3.c tpw.c \
librpmio.vers testit.sh
EXTRA_PROGRAMS = bsdiff bspatch rpmborg rpmcpio rpmcurl rpmdpkg \
rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \
rpmpbzip2 rpmpigz rpmtar rpmz \
tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \
- tperl tpython tput tpw trpmio tsw ttcl dumpasn1 lookup3
+ tperl tpython tput tpw trpmio tsexp tsw ttcl dumpasn1 lookup3
bin_PROGRAMS =
man_MANS =
@@ -368,6 +368,8 @@
trpmio_SOURCES = trpmio.c
trpmio_LDADD = $(RPMIO_LDADD_COMMON)
+tsexp_SOURCES = tsexp.c
+
tsw_SOURCES = tsw.c
tsw_LDFLAGS = $(RPMIO_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tsexp.c
$ cvs diff -u -r0 -r1.1 tsexp.c
--- /dev/null 2010-06-02 19:30:17.0 +0200
+++ tsexp.c 2010-06-02 19:30:17.889314763 +0200
@@ -0,0 +1,1773 @@
+#include
+#include
+#include
+
+/*==*/
+/* --- Sexp.h */
+/* SEXP standard header file: sexp.h
+ * Ronald L. Rivest
+ * 6/29/1997
+ */
+
+/* GLOBAL DECLARATIONS */
+#define TRUE1
+#define FALSE 0
+
+/* PRINTING MODES */
+#define CANONICAL 1/* standard for hashing and tranmission */
+#define BASE642/* base64 version of canonical */
+#define ADVANCED 3/* pretty-printed */
+
+/* ERROR MESSAGE LEVELS */
+#define WARNING 1
+#define ERROR 2
+
+#define DEFAULTLINELENGTH 75
+
+typedef unsigned char octet;
+
+/* TYPES OF OBJECTS */
+#define SEXP_STRING 1
+#define SEXP_LIST 2
+
+/* sexpSimpleString */
+typedef struct sexp_simplestring {
+ long int length;
+ long int allocatedLength;
+ octet *string;
+} sexpSimpleString;
+
+/* sexpString */
+typedef struct sexp_string {
+ int type;
+ sexpSimpleString *presentationHint;
+ sexpSimpleString *string;
+} sexpString;
+
+/* sexpList */
+/* If first is NULL, then rest must also be NULL; this is empty list */
+typedef struct sexp_list {
+ char type;
+ union sexp_object *first;
+ struct sexp_list *rest;
+} sexpList;
+
+/* sexpObject */
+/* so we can have a pointer to something of either type */
+typedef union sexp_object {
+ sexpString string;
+ sexpList list;
+} sexpObject;
+
+/* sexpIter */
+/* an "iterator" for going over lists */
+/* In this implementation, it is the same as a list */
+typedef sexpList sexpIter;
+
+typedef struct sexp_inputstream {
+ int nextChar;/* character currently being scanned */
+ int byteSize;/* 4 or 6 or 8 == currently scanning mode */
+ int bits;/* Bits waiting to be used */
+ int nBits; /* number of such bits waiting to be used */
+ void (*getChar)();
+ int count; /* number of 8-bit characters output by getChar */
+ FILE *inputFile; /* where to get input, if not stdin */
+} sexpInputStream;
+
+typedef struct sexp_outputstream {
+ long int column; /* column where next character will go */
+ long int maxcolumn; /* max usable column, or -1 if no maximum */
+ long int indent; /* current indentation level (starts at 0) */
+ void (*putChar)();/* output a character */
+ void (*newLine)();/* go to next line (and indent) */
+ int byteSize; /* 4 or 6 or 8 depending on output mode */
+ int bits; /* bits waiting to go out */
+ int nBits;/* number of
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 24-May-2010 14:09:46 Branch: HEAD Handle: 2010052412094600 Modified files: rpm/rpmio Makefile.am Log: link librpmio against libdb_sql, otherwise build breaks when '--no-undefined' is passed to linker Summary: RevisionChanges Path 1.274 +3 -0 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.273 -r1.274 Makefile.am --- rpm/rpmio/Makefile.am 19 May 2010 14:57:35 - 1.273 +++ rpm/rpmio/Makefile.am 24 May 2010 12:09:46 - 1.274 @@ -115,6 +115,9 @@ librpmio_la_LDFLAGS += $(LDFLAGS) librpmio_la_LIBADD += $(LIBS) endif +if WITH_DBSQL +librpmio_la_LIBADD += $(top_builddir)/db3/libdb_sql-5.0.la +endif #librpmio.la: $(librpmio_la_OBJECTS) $(librpmio_la_DEPENDENCIES) #$(librpmio_la_LINK) -rpath $(usrlibdir) $(librpmio_la_OBJECTS) $(librpmio_la_LIBADD) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am librpmio.vers poptIO.c rpmhkp.c rpmh...
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: 19-May-2010 16:57:35
Branch: HEAD Handle: 2010051914573500
Added files:
rpm/rpmio rpmhkp.c rpmhkp.h
Modified files:
rpm/rpmio Makefile.am librpmio.vers poptIO.c rpmio.c
Log:
- hkp: stub-in a rpmhkp object.
Summary:
RevisionChanges Path
1.273 +2 -2 rpm/rpmio/Makefile.am
2.175 +3 -0 rpm/rpmio/librpmio.vers
1.87+4 -0 rpm/rpmio/poptIO.c
2.1 +95 -0 rpm/rpmio/rpmhkp.c
2.1 +104 -0 rpm/rpmio/rpmhkp.h
1.222 +6 -0 rpm/rpmio/rpmio.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.272 -r1.273 Makefile.am
--- rpm/rpmio/Makefile.am 6 May 2010 22:36:11 - 1.272
+++ rpm/rpmio/Makefile.am 19 May 2010 14:57:35 - 1.273
@@ -78,7 +78,7 @@
salsa10.h salsa20.h shabal.h shavite3.h simd.h skein.h tib3.h tiger.h \
poptIO.h rpmacl.h rpmaug.h rpmbc.h rpmbf.h rpmbz.h rpmcudf.h \
rpmdav.h rpmdir.h rpmficl.h rpmgc.h \
- rpmhash.h rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h rpmkeyring.h \
+ rpmhash.h rpmhkp.h rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h
rpmkeyring.h \
rpmku.h rpmlua.h rpmmg.h rpmnix.h rpmnss.h rpmperl.h rpmpython.h \
rpmruby.h rpmsm.h rpmsp.h rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.h \
rpmsx.h rpmsyck.h rpmtcl.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
@@ -95,7 +95,7 @@
salsa10.c salsa20.c shabal.c shavite3.c simd.c skein.c tib3.c tiger.c \
rpmacl.c rpmaug.c rpmbc.c rpmbf.c rpmcudf.c \
rpmdav.c rpmdir.c rpmficl.c rpmgc.c \
- rpmhash.c rpmhook.c rpmio.c rpmiob.c rpmio-stub.c \
+ rpmhash.c rpmhkp.c rpmhook.c rpmio.c rpmiob.c rpmio-stub.c \
rpmjs.c rpmjsio.c rpmkeyring.c \
rpmku.c rpmlog.c rpmlua.c rpmmalloc.c rpmmg.c rpmnix.c rpmnss.c \
rpmperl.c rpmpgp.c rpmpython.c rpmrpc.c rpmruby.c rpmsm.c rpmsp.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
$ cvs diff -u -r2.174 -r2.175 librpmio.vers
--- rpm/rpmio/librpmio.vers 16 May 2010 13:01:10 - 2.174
+++ rpm/rpmio/librpmio.vers 19 May 2010 14:57:35 - 2.175
@@ -350,6 +350,9 @@
rpmGetPath;
rpmGlob;
rpmGlobalMacroContext;
+_rpmhkpI;
+_rpmhkp_debug;
+rpmhkpNew;
rpmHmacInit;
rpmhookArgsFree;
rpmhookArgsNew;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
$ cvs diff -u -r1.86 -r1.87 poptIO.c
--- rpm/rpmio/poptIO.c14 Apr 2010 23:34:31 - 1.86
+++ rpm/rpmio/poptIO.c19 May 2010 14:57:35 - 1.87
@@ -39,6 +39,8 @@
#include
#include
+#include
+
#include
#include
#include
@@ -599,6 +601,8 @@
N_("Print PGP keys"), NULL},
{ "rpmbfdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmbf_debug,
-1,
N_("Debug Bloom filters"), NULL},
+ { "rpmhkpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmhkp_debug, -1,
+ N_("Debug hkp:// keyring"), NULL},
{ "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug,
-1,
N_("Debug rpmio I/O"), NULL},
{ "rpmiobdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmiob_debug, -1,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmhkp.c
$ cvs diff -u -r0 -r2.1 rpmhkp.c
--- /dev/null 2010-05-19 16:55:01.0 +0200
+++ rpmhkp.c 2010-05-19 16:57:35.661474894 +0200
@@ -0,0 +1,95 @@
+#include "system.h"
+
+#define _RPMHKP_INTERNAL
+#include
+
+#include "debug.h"
+
+/*...@unchecked@*/
+int _rpmhkp_debug = 0;
+
+/*...@unchecked@*/ /*...@relnull@*/
+rpmhkp _rpmhkpI = NULL;
+
+struct _filter_s {
+rpmbf bf;
+size_t n;
+double e;
+size_t m;
+size_t k;
+};
+
+static struct _filter_s awol = { .n = 10, .e = 1.0e-4 };
+static struct _filter_s crl = { .n = 10, .e = 1.0e-4 };
+
+static void rpmhkpFini(void * _hkp)
+/*...@globals fileSystem @*/
+/*...@modifies *_hkp, fileSystem @*/
+{
+rpmhkp hkp = _hkp;
+
+assert(hkp);
+hkp->pkt = _free(hkp->pkt);
+hkp->pktlen = 0;
+hkp->pkts = _free(hkp->pkts);
+hkp->npkts
[CVS] RPM: rpm/rpmio/ Makefile.am librpmio.vers rpmio.c rpmnix.c rpmni...
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: 27-Mar-2010 21:03:21
Branch: HEAD Handle: 2010032720032001
Added files:
rpm/rpmio rpmnix.c
Modified files:
rpm/rpmio Makefile.am librpmio.vers rpmio.c rpmnix.h
Log:
- nix: stub in a rpmnix ctor.
Summary:
RevisionChanges Path
1.267 +1 -1 rpm/rpmio/Makefile.am
2.156 +3 -0 rpm/rpmio/librpmio.vers
1.216 +4 -0 rpm/rpmio/rpmio.c
2.1 +77 -0 rpm/rpmio/rpmnix.c
1.2 +4 -6 rpm/rpmio/rpmnix.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.266 -r1.267 Makefile.am
--- rpm/rpmio/Makefile.am 27 Mar 2010 18:13:52 - 1.266
+++ rpm/rpmio/Makefile.am 27 Mar 2010 20:03:20 - 1.267
@@ -92,7 +92,7 @@
rpmdav.c rpmdir.c rpmficl.c rpmgc.c \
rpmhash.c rpmhook.c rpmio.c rpmiob.c rpmio-stub.c \
rpmjs.c rpmjsio.c rpmkeyring.c \
- rpmku.c rpmlog.c rpmlua.c rpmmalloc.c rpmmg.c rpmnss.c \
+ rpmku.c rpmlog.c rpmlua.c rpmmalloc.c rpmmg.c rpmnix.c rpmnss.c \
rpmperl.c rpmpgp.c rpmpython.c rpmrpc.c rpmruby.c rpmsm.c rpmsp.c \
rpmsq.c rpmsquirrel.c rpmssl.c rpmsyck.c rpmsw.c rpmsx.c rpmtcl.c \
rpmuuid.c rpmxar.c rpmzlog.c rpmzq.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
$ cvs diff -u -r2.155 -r2.156 librpmio.vers
--- rpm/rpmio/librpmio.vers 21 Mar 2010 00:11:25 - 2.155
+++ rpm/rpmio/librpmio.vers 27 Mar 2010 20:03:21 - 2.156
@@ -475,6 +475,9 @@
rpmmgNew;
rpmmgFile;
rpmmgBuffer;
+_rpmnix_debug;
+_rpmnixI;
+rpmNixNew;
_rpmnss_init;
rpmnssImplVecs;
_rpmperl_debug;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
$ cvs diff -u -r1.215 -r1.216 rpmio.c
--- rpm/rpmio/rpmio.c 20 Mar 2010 00:03:44 - 1.215
+++ rpm/rpmio/rpmio.c 27 Mar 2010 20:03:21 - 1.216
@@ -69,6 +69,7 @@
#include
#include
#include /* XXX rpmioClean() calls rpmluaFree() */
+#include
#include
#include
#include
@@ -3206,6 +3207,7 @@
extern rpmioPool _rpmsxPool;
extern rpmioPool _rpmsyckPool;
/*...@=shadow@*/
+extern rpmioPool _rpmnixPool;
extern rpmioPool _rpmaugPool;
extern rpmioPool _rpmcudfPool;
extern rpmioPool _rpmmgPool;
@@ -3250,6 +3252,8 @@
_rpmficlPool = rpmioFreePool(_rpmficlPool);
_rpmaugI = rpmaugFree(_rpmaugI);
_rpmaugPool = rpmioFreePool(_rpmaugPool);
+_rpmnixI = rpmnixFree(_rpmnixI);
+_rpmnixPool = rpmioFreePool(_rpmnixPool);
_rpmcudfPool = rpmioFreePool(_rpmcudfPool);
_rpmluavPool = rpmioFreePool(_rpmluavPool);
_rpmluaPool = rpmioFreePool(_rpmluaPool);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmnix.c
$ cvs diff -u -r0 -r2.1 rpmnix.c
--- /dev/null 2010-03-27 21:03:20 +0100
+++ rpmnix.c 2010-03-27 21:03:21 +0100
@@ -0,0 +1,77 @@
+#include "system.h"
+
+#define _RPMNIX_INTERNAL
+#include
+#include
+
+#include "debug.h"
+
+/*...@unchecked@*/
+int _rpmnix_debug = -1;
+
+/*...@unchecked@*/ /*...@relnull@*/
+rpmnix _rpmnixI = NULL;
+
+static void rpmnixFini(void * _nix)
+ /*...@globals fileSystem @*/
+ /*...@modifies *_nix, fileSystem @*/
+{
+rpmnix nix = _nix;
+
+DBG((stderr, "==> %s(%p) I %p\n", __FUNCTION__, nix, nix->I));
+
+nix->I = NULL;
+}
+
+/*...@unchecked@*/ /*...@only@*/ /*...@null@*/
+rpmioPool _rpmnixPool;
+
+static rpmnix rpmnixGetPool(/*...@null@*/ rpmioPool pool)
+ /*...@globals _rpmnixPool, fileSystem @*/
+ /*...@modifies pool, _rpmnixPool, fileSystem @*/
+{
+rpmnix nix;
+
+if (_rpmnixPool == NULL) {
+ _rpmnixPool = rpmioNewPool("nix", sizeof(*nix), -1, _rpmnix_debug,
+ NULL, NULL, rpmnixFini);
+ pool = _rpmnixPool;
+}
+return (rpmnix) rpmioGetPool(pool, sizeof(*nix));
+}
+
+static rpmnix rpmnixI(void)
+ /*...@globals _rpmnixI @*/
+ /*...@modifies _rpmnixI @*/
+{
+if (_rpmnixI == NULL) {
+ _rpmnixI = rpmnixNew(NULL, 0);
+}
+DBG((stderr, "<== %s() _rpmnixI %p\n", __FUNCTION__, _rpmnixI));
[CVS] RPM: rpm/rpmio/ Makefile.am rpmnix.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: 27-Mar-2010 19:13:52
Branch: HEAD Handle: 2010032718135200
Added files:
rpm/rpmio rpmnix.h
Modified files:
rpm/rpmio Makefile.am
Log:
- nix: stub-in an rpmnix object.
Summary:
RevisionChanges Path
1.266 +1 -1 rpm/rpmio/Makefile.am
1.1 +193 -0 rpm/rpmio/rpmnix.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.265 -r1.266 Makefile.am
--- rpm/rpmio/Makefile.am 21 Mar 2010 00:10:03 - 1.265
+++ rpm/rpmio/Makefile.am 27 Mar 2010 18:13:52 - 1.266
@@ -74,7 +74,7 @@
poptIO.h rpmacl.h rpmaug.h rpmbc.h rpmbf.h rpmbz.h rpmcudf.h \
rpmdav.h rpmdir.h rpmficl.h rpmgc.h \
rpmhash.h rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h rpmkeyring.h \
- rpmku.h rpmlua.h rpmmg.h rpmnss.h rpmperl.h rpmpython.h \
+ rpmku.h rpmlua.h rpmmg.h rpmnix.h rpmnss.h rpmperl.h rpmpython.h \
rpmruby.h rpmsm.h rpmsp.h rpmsq.h rpmsquirrel.h rpmssl.h rpmsx.h \
rpmsyck.h rpmtcl.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
tar.h ugid.h rpmio-stub.h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmnix.h
$ cvs diff -u -r0 -r1.1 rpmnix.h
--- /dev/null 2010-03-27 19:11:01 +0100
+++ rpmnix.h 2010-03-27 19:13:52 +0100
@@ -0,0 +1,193 @@
+#ifndef RPMNIX_H
+#define RPMNIX_H
+
+/** \ingroup rpmio
+ * \file rpmio/rpmnix.h
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+typedef /*...@abstract@*/ /*...@refcounted@*/ struct rpmnix_s * rpmnix;
+
+/*...@unchecked@*/
+#if defined(_RPMNIX_INTERNAL)
+static int _rpmnix_debug = -1;
+#else
+extern int _rpmnix_debug;
+#endif
+
+#if defined(_RPMNIX_INTERNAL)
+
+#define F_ISSET(_nix, _FLAG) ((_nix)->flags & (RPMNIX_FLAGS_##_FLAG))
+
+/**
+ * Interpreter flags.
+ */
+enum rpmnixFlags_e {
+RPMNIX_FLAGS_NONE= 0,
+
+/* nix-build */
+RPMNIX_FLAGS_ADDDRVLINK = (1 << 0),/*--add-drv-link */
+RPMNIX_FLAGS_NOOUTLINK = (1 << 1),/* -o,--no-out-link */
+RPMNIX_FLAGS_DRYRUN = (1 << 2),/* --dry-run */
+
+/* nix-collect-garbage */
+RPMNIX_FLAGS_DELETEOLD = (1 << 3),/* -d,--delete-old */
+
+/* nix-copy-closure */
+RPMNIX_FLAGS_SIGN= (1 << 4),/*--sign */
+RPMNIX_FLAGS_GZIP= (1 << 5),/*--gzip */
+
+/* nix-install-package */
+RPMNIX_FLAGS_INTERACTIVE = (1 << 6),/*--non-interactive */
+
+/* nix-pull */
+RPMNIX_FLAGS_SKIPWRONGSTORE = (1 << 7),/*
--skip-wrong-store */
+
+/* nix-push */
+RPMNIX_FLAGS_COPY= (1 << 8),/*--copy */
+
+};
+
+struct rpmnix_s {
+struct rpmioItem_s _item;/*!< usage mutex and pool identifier. */
+uint32_t flags; /*!< control bits */
+
+int op;
+const char * url;
+
+const char ** storePaths;
+
+const char ** narFiles;
+const char ** localPaths;
+const char ** patches;
+
+/* nix-build */
+const char * outLink;
+const char * drvLink;
+const char ** instArgs;
+const char ** buildArgs;
+const char ** exprs;
+
+/* nix-copy-closure */
+const char * sshHost;
+const char ** allStorePaths;
+const char ** missing;
+
+/* nix-install-package */
+const char ** profiles;
+
+/* nix-install-package */
+int quiet;
+int print;
+const char * nixPkgs;
+const char * downloadCache;
+const char * expHash;
+const char * hashType;
+const char * hashFormat;
+/*...@only@*/
+const char * hash;
+/*...@only@*/
+const char * finalPath;
+/*...@only@*/
+const char * tmpPath;
+/*...@only@*/
+const char * tmpFile;
+/*...@only@*/
+const char * name;
+const char * cacheFlags;
+const char * cachedHashFN;
+const char * cachedTimestampFN;
+const char * urlHash;
+
+/* nix-push */
+const char ** storeExprs;
+const char ** narArchives;
+const char ** narPaths;
+const char * localArchivesDir;
+const char * localManifestFile;
+const char * targetArchivesUrl;
+const char * archivesPutURL;
+const char * archivesGetU
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 21-Mar-2010 01:10:03 Branch: HEAD Handle: 2010032100100300 Modified files: rpm/rpmio Makefile.am Log: - nix: stub-in proof-of-concept target to link against Nix libraries. Summary: RevisionChanges Path 1.265 +22 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.264 -r1.265 Makefile.am --- rpm/rpmio/Makefile.am 10 Jan 2010 00:31:20 - 1.264 +++ rpm/rpmio/Makefile.am 21 Mar 2010 00:10:03 - 1.265 @@ -19,7 +19,7 @@ rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \ rpmpbzip2 rpmpigz rpmtar rpmz \ tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \ - tperl tpython tput tpw trpmio tsw ttcl dumpasn1 lookup3 + tnix tperl tpython tput tpw trpmio tsw ttcl dumpasn1 lookup3 bin_PROGRAMS = man_MANS = @@ -342,6 +342,27 @@ tmire_SOURCES = tmire.c tmire_LDADD = $(RPMIO_LDADD_COMMON) +#libtool: link: g++ +#-I../../externals/inst-aterm/include -I./.. +#-I./../libutil -I./../libstore -I./../libexpr -I./../libmain +#-I../libexpr +#-O2 -g -m32 -march=i686 -mtune=generic -fasynchronous-unwind-tables +#-o .libs/nix-instantiate nix-instantiate.o +#../libmain/.libs/libmain.so +#../libexpr/.libs/libexpr.so +#/X/nix/nix-0.15/src/libstore/.libs/libstore.so +#../libstore/.libs/libstore.so +#/X/nix/nix-0.15/src/libutil/.libs/libutil.so +#../libutil/.libs/libutil.so +#/X/nix/nix-0.15/src/boost/format/.libs/libformat.so +#../boost/format/.libs/libformat.so +#-L/X/nix/nix-0.15/externals/inst-aterm/lib /X/nix/nix-0.15/externals/inst-aterm/lib/libATerm.a +#-lpthread -Wl,-rpath -Wl,/usr/lib/nix +tnix_SOURCES = tnix.cc +tnix_LDADD = -L/usr/lib/nix -lmain -lexpr -lstore -lutil -lformat \ + /usr/lib/nix/libATerm.a +tnix_LDFLAGS = -Wl,-rpath -Wl,/usr/lib/nix + tperl_SOURCES = tperl.c tperl_LDADD = $(RPMIO_LDADD_COMMON) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 18-Dec-2009 01:39:29 Branch: HEAD Handle: 2009121800392800 Modified files: rpm/rpmio Makefile.am Log: - rpmbf: add -lm to pickup log(3) and pow(3). Summary: RevisionChanges Path 1.262 +1 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.261 -r1.262 Makefile.am --- rpm/rpmio/Makefile.am 2 Dec 2009 14:44:16 - 1.261 +++ rpm/rpmio/Makefile.am 18 Dec 2009 00:39:28 - 1.262 @@ -99,7 +99,7 @@ if HAVE_LD_VERSION_SCRIPT librpmio_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmio.vers endif -librpmio_la_LIBADD = +librpmio_la_LIBADD = -lm if ENABLE_BUILD_INTLIBDEP librpmio_la_LIBADD += $(top_builddir)/misc/librpmmisc.la @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am rpmacl.c rpmacl.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: 03-Sep-2009 19:41:36
Branch: HEAD Handle: 2009090317413600
Added files:
rpm/rpmio rpmacl.c rpmacl.h
Modified files:
rpm/rpmio Makefile.am
Log:
- rpmacl: copy ACL's from source -> target for dirs/fdnos. (from
FreeBSD cp(1)).
Summary:
RevisionChanges Path
1.257 +3 -2 rpm/rpmio/Makefile.am
1.1 +103 -0 rpm/rpmio/rpmacl.c
1.1 +25 -0 rpm/rpmio/rpmacl.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.256 -r1.257 Makefile.am
--- rpm/rpmio/Makefile.am 23 Aug 2009 19:25:38 - 1.256
+++ rpm/rpmio/Makefile.am 3 Sep 2009 17:41:36 - 1.257
@@ -70,7 +70,8 @@
arirang.h blake.h bmw.h chi.h cubehash.h echo.h edon-r.h fugue.h \
groestl.h hamsi.h jh.h keccak.h lane.h luffa.h md2.h md6.h \
salsa10.h salsa20.h shabal.h shavite3.h simd.h skein.h tib3.h tiger.h \
- poptIO.h rpmaug.h rpmbc.h rpmbf.h rpmbz.h rpmdav.h rpmdir.h rpmficl.h
rpmgc.h \
+ poptIO.h rpmacl.h rpmaug.h rpmbc.h rpmbf.h rpmbz.h rpmdav.h rpmdir.h \
+ rpmficl.h rpmgc.h \
rpmhash.h rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h rpmkeyring.h \
rpmku.h rpmlua.h rpmmg.h rpmnss.h rpmperl.h rpmpython.h \
rpmruby.h rpmsq.h rpmsquirrel.h rpmssl.h rpmsx.h rpmsyck.h rpmtcl.h \
@@ -86,7 +87,7 @@
arirang.c blake.c bmw.c chi.c cubehash.c echo.c edon-r.c fugue.c \
groestl.c hamsi.c jh.c keccak.c lane.c luffa.c md2.c md6.c \
salsa10.c salsa20.c shabal.c shavite3.c simd.c skein.c tib3.c tiger.c \
- rpmaug.c rpmbc.c rpmbf.c rpmdav.c rpmdir.c rpmficl.c rpmgc.c \
+ rpmacl.c rpmaug.c rpmbc.c rpmbf.c rpmdav.c rpmdir.c rpmficl.c rpmgc.c \
rpmhash.c rpmhook.c rpmio.c rpmiob.c rpmio-stub.c \
rpmjs.c rpmjsio.c rpmkeyring.c \
rpmku.c rpmlog.c rpmlua.c rpmmalloc.c rpmmg.c rpmnss.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmacl.c
$ cvs diff -u -r0 -r1.1 rpmacl.c
--- /dev/null 2009-09-03 19:39:17 +0200
+++ rpmacl.c 2009-09-03 19:41:36 +0200
@@ -0,0 +1,103 @@
+/** \ingroup rpmio
+ * \file rpmio/rpmacl.c
+ */
+
+#include "system.h"
+
+#include
+#include
+
+#include "debug.h"
+
+static inline int __acl_entries(acl_t a)
+{
+int count;
+#if defined(__FreeBSD__) /* XXX others too. HAVE_ACL_ACL_CNT AutoFu? */
+struct acl * aclp = &a->ats_acl;
+count = aclp->acl_cnt;
+#else
+int id = ACL_FIRST_ENTRY;
+acl_entry_t ace;
+
+count = 0;
+while (acl_get_entry(a, id, &ace) > 0) {
+ id = ACL_NEXT_ENTRY;
+ count++;
+}
+#endif
+return count;
+}
+
+rpmRC rpmaclCopyFd(FD_t ifd, FD_t ofd)
+{
+int ifdno = Fileno(ifd);
+int ofdno = Fileno(ofd);
+acl_t a;
+int count;
+
+if (ifdno < 0 || ofdno < 0)
+ return RPMRC_OK;
+
+#if defined(_PC_ACL_EXTENDED)
+if (fpathconf(ifdno, _PC_ACL_EXTENDED) != 1
+ || fpathconf(ofdno, _PC_ACL_EXTENDED) != 1)
+ return RPMRC_OK;
+#endif
+
+a = acl_get_fd(ifdno);
+if (a == NULL)
+ return RPMRC_FAIL;
+count = __acl_entries(a);
+if (count > 0 && count != 3 && acl_set_fd(ofdno, a) < 0)
+ return RPMRC_FAIL;
+return RPMRC_OK;
+}
+
+rpmRC rpmaclCopyDir(const char * sdn, const char * tdn, mode_t mode)
+{
+acl_t (*aclgetf)(const char *, acl_type_t);
+int (*aclsetf)(const char *, acl_type_t, acl_t);
+acl_t a;
+int count;
+
+if (!(sdn && *sdn && tdn && *tdn))
+ return RPMRC_OK;
+
+#if defined(_PC_ACL_EXTENDED)
+if (pathconf(sdn, _PC_ACL_EXTENDED) != 1
+ || pathconf(tdn, _PC_ACL_EXTENDED) != 1)
+return RPMRC_OK;
+#endif
+#if defined(__FreeBSD__)
+/* If the file is a link we will not follow it */
+if (S_ISLNK(mode)) {
+ aclgetf = acl_get_link_np;
+ aclsetf = acl_set_link_np;
+} else
+#endif
+{
+ aclgetf = acl_get_file;
+ aclsetf = acl_set_file;
+}
+
+/*
+ * Even if there is no ACL_TYPE_DEFAULT entry here, a zero
+ * size ACL will be returned. So it is not safe to simply
+ * check the pointer to see if the default ACL is present.
+ */
+a = aclgetf(sdn, ACL_TYPE_DEFAULT);
+if (a == NULL)
+ return RPMRC_FAIL;
+
+
[CVS] RPM: rpm/rpmio/ Makefile.am bmw.c bmw.h digest.c edon-r.c poptIO...
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: 19-Jul-2009 01:03:07
Branch: HEAD Handle: 2009071823030700
Added files:
rpm/rpmio bmw.c bmw.h
Modified files:
rpm/rpmio Makefile.am digest.c edon-r.c poptIO.c
rpmiotypes.h
Log:
- rpmdigest: add BlueMidnightWish 224/256/384/512.
Summary:
RevisionChanges Path
1.240 +2 -2 rpm/rpmio/Makefile.am
2.1 +750 -0 rpm/rpmio/bmw.c
2.1 +98 -0 rpm/rpmio/bmw.h
2.63+29 -0 rpm/rpmio/digest.c
1.4 +4 -0 rpm/rpmio/edon-r.c
1.62+8 -0 rpm/rpmio/poptIO.c
1.25+5 -0 rpm/rpmio/rpmiotypes.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.239 -r1.240 Makefile.am
--- rpm/rpmio/Makefile.am 17 Jul 2009 05:18:30 - 1.239
+++ rpm/rpmio/Makefile.am 18 Jul 2009 23:03:07 - 1.240
@@ -64,7 +64,7 @@
rpmcb.h rpmio.h rpmlog.h rpmiotypes.h rpmmacro.h rpmpgp.h rpmsw.h
noinst_HEADERS = \
argv.h ar.h cpio.h crc.h envvar.h fnmatch.h fts.h glob.h iosm.h \
- cubehash.h edon-r.h keccak.h md2.h md6.h \
+ bmw.h cubehash.h edon-r.h keccak.h md2.h md6.h \
salsa10.h salsa20.h skein.h tiger.h \
poptIO.h rpmaug.h rpmbc.h rpmbf.h rpmbz.h rpmdav.h rpmdir.h rpmficl.h
rpmgc.h \
rpmhash.h rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h rpmkeyring.h \
@@ -79,7 +79,7 @@
ar.c argv.c bzdio.c cpio.c crc.c digest.c fnmatch.c fts.c \
getdate.c gzdio.c glob.c iosm.c lsyck.c \
macro.c mire.c mount.c poptIO.c \
- cubehash.c edon-r.c keccak.c md2.c md6.c \
+ bmw.c cubehash.c edon-r.c keccak.c md2.c md6.c \
salsa10.c salsa20.c skein.c tiger.c \
rpmaug.c rpmbc.c rpmbf.c rpmdav.c rpmdir.c rpmficl.c rpmgc.c \
rpmhash.c rpmhook.c rpmio.c rpmiob.c rpmio-stub.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/bmw.c
$ cvs diff -u -r0 -r2.1 bmw.c
--- /dev/null 2009-07-19 01:03:07 +0200
+++ bmw.c 2009-07-19 01:03:07 +0200
@@ -0,0 +1,750 @@
+#include
+#include "bmw.h"
+
+enum { SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2,
BAD_CONSECUTIVE_CALL_TO_UPDATE = 3 };
+
+#define rotl32(x,n) (((x) << n) | ((x) >> (32 - n)))
+#define rotr32(x,n) (((x) >> n) | ((x) << (32 - n)))
+//#define rotl32 _lrotl
+//#define rotr32 _lrotr
+
+#define rotl64(x,n) (((x) << n) | ((x) >> (64 - n)))
+#define rotr64(x,n) (((x) >> n) | ((x) << (64 - n)))
+//#define rotl64 _rotl64
+//#define rotr64 _rotr64
+
+#define shl(x,n) ((x) << n)
+#define shr(x,n) ((x) >> n)
+
+/* BlueMidnightWish224 initial double chaining pipe */
+static
+const u_int32_t i224p2[16] =
+{ 0x00010203ul, 0x04050607ul, 0x08090a0bul, 0x0c0d0e0ful,
+0x10111213ul, 0x14151617ul, 0x18191a1bul, 0x1c1d1e1ful,
+0x20212223ul, 0x24252627ul, 0x28292a2bul, 0x2c2d2e2ful,
+0x30313233ul, 0x24353637ul, 0x38393a3bul, 0x3c3d3e3ful,
+};
+
+/* BlueMidnightWish256 initial double chaining pipe */
+static
+const u_int32_t i256p2[16] =
+{ 0x40414243ul, 0x44454647ul, 0x48494a4bul, 0x4c4d4e4ful,
+0x50515253ul, 0x54555657ul, 0x58595a5bul, 0x5c5d5e5ful,
+0x60616263ul, 0x64656667ul, 0x68696a6bul, 0x6c6d6e6ful,
+0x70717273ul, 0x74757677ul, 0x78797a7bul, 0x7c7d7e7ful,
+};
+
+/* BlueMidnightWish384 initial double chaining pipe */
+static
+const u_int64_t i384p2[16] =
+{
+0x0001020304050607ull, 0x08090a0b0c0d0e0full,
+0x1011121314151617ull, 0x18191a1b1c1d1e1full,
+0x2021222324252627ull, 0x28292a2b2c2d2e2full,
+0x3031323324353637ull, 0x38393a3b3c3d3e3full,
+0x4041424344454647ull, 0x48494a4b4c4d4e4full,
+0x5051525354555657ull, 0x58595a5b5c5d5e5full,
+0x6061626364656667ull, 0x68696a6b6c6d6e6full,
+0x7071727374757677ull, 0x78797a7b7c7d7e7full
+};
+
+/* BlueMidnightWish512 initial double chaining pipe */
+static
+const u_int64_t i512p2[16] =
+{
+0x8081828384858687ull, 0x88898a8b8c8d8e8full,
+0x9091929394959697ull, 0x98999a9b9c9d9e9full,
+0xa0a1a2a3a4a5a6a7ull, 0xa8a9aaabacadaeafull,
+0xb0b1b2b3b4b5b6b7ull, 0xb8b9babbbcbdbebfull,
+0xc0c1c2c3c4c5c6c7ull, 0xc8c9cacbcccdcecfull,
+0xd0d1d2d3d4d5d6d7ull, 0xd8d9dadbdcdddedfull,
+0xe0e1e2e3e4e5e6e7ull, 0xe8e9eaebecedeeefull,
+0xf0f1f2f3f4f5f6f7ull, 0xf8f
[CVS] RPM: rpm/rpmio/ Makefile.am skein.c skein.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: 15-Jul-2009 07:14:47
Branch: HEAD Handle: 2009071505144700
Added files:
rpm/rpmio skein.c skein.h
Modified files:
rpm/rpmio Makefile.am
Log:
- rpmio: add skein digest refernce code.
Summary:
RevisionChanges Path
1.237 +2 -2 rpm/rpmio/Makefile.am
1.1 +747 -0 rpm/rpmio/skein.c
1.1 +315 -0 rpm/rpmio/skein.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.236 -r1.237 Makefile.am
--- rpm/rpmio/Makefile.am 15 Jul 2009 05:11:39 - 1.236
+++ rpm/rpmio/Makefile.am 15 Jul 2009 05:14:47 - 1.237
@@ -65,7 +65,7 @@
noinst_HEADERS = \
argv.h ar.h cpio.h crc.h envvar.h fnmatch.h fts.h glob.h iosm.h \
md2.h \
- salsa10.h salsa20.h tiger.h \
+ salsa10.h salsa20.h skein.h tiger.h \
poptIO.h rpmaug.h rpmbc.h rpmbf.h rpmbz.h rpmdav.h rpmdir.h rpmficl.h
rpmgc.h \
rpmhash.h rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h rpmkeyring.h \
rpmku.h rpmlua.h rpmmg.h rpmnss.h rpmperl.h rpmpython.h \
@@ -80,7 +80,7 @@
getdate.c gzdio.c glob.c iosm.c lsyck.c \
macro.c mire.c mount.c poptIO.c \
md2.c \
- salsa10.c salsa20.c tiger.c \
+ salsa10.c salsa20.c skein.c tiger.c \
rpmaug.c rpmbc.c rpmbf.c rpmdav.c rpmdir.c rpmficl.c rpmgc.c \
rpmhash.c rpmhook.c rpmio.c rpmiob.c rpmio-stub.c \
rpmjs.c rpmjsio.c rpmkeyring.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/skein.c
$ cvs diff -u -r0 -r1.1 skein.c
--- /dev/null 2009-07-15 07:11:00 +0200
+++ skein.c 2009-07-15 07:14:47 +0200
@@ -0,0 +1,747 @@
+/***
+**
+** Implementation of the Skein hash function.
+**
+** Source code author: Doug Whiting, 2008.
+**
+** This algorithm and source code is released to the public domain.
+**
+/
+
+#include /* get the memcpy/memset functions */
+#include "skein.h" /* get the Skein API definitions */
+
+/*/
+/* External function to process blkCnt (nonzero) full block(s) of data. */
+voidSkein_256_Process_Block(Skein_256_Ctxt_t *ctx,const u08b_t
*blkPtr,size_t blkCnt,size_t byteCntAdd);
+voidSkein_512_Process_Block(Skein_512_Ctxt_t *ctx,const u08b_t
*blkPtr,size_t blkCnt,size_t byteCntAdd);
+voidSkein1024_Process_Block(Skein1024_Ctxt_t *ctx,const u08b_t
*blkPtr,size_t blkCnt,size_t byteCntAdd);
+
+/*/
+/* Portable (i.e., slow) endianness conversion functions */
+u64b_t Skein_Swap64(u64b_t w64)
+{/* instantiate the function body here */
+static const u64b_t ONE = 1; /* use this to check
endianness */
+
+/* figure out endianness "on-the-fly" */
+if (1 == ((u08b_t *) & ONE)[0])
+return w64; /* little-endian is fast */
+else
+return (( w64 & 0xFF) << 56) | /*big-endian is slow */
+(((w64 >> 8) & 0xFF) << 48) |
+(((w64 >>16) & 0xFF) << 40) |
+(((w64 >>24) & 0xFF) << 32) |
+(((w64 >>32) & 0xFF) << 24) |
+(((w64 >>40) & 0xFF) << 16) |
+(((w64 >>48) & 0xFF) << 8) |
+(((w64 >>56) & 0xFF) ) ;
+}
+
+voidSkein_Put64_LSB_First(u08b_t *dst,const u64b_t *src,size_t bCnt)
+{ /* this version is fully portable (big-endian or little-endian), but
slow */
+size_t n;
+
+for (n=0;n>3] >> (8*(n&7)));
+}
+
+voidSkein_Get64_LSB_First(u64b_t *dst,const u08b_t *src,size_t wCnt)
+{ /* this version is fully portable (big-endian or little-endian), but
slow */
+size_t n;
+
+for (n=0;n<8*wCnt;n+=8)
+dst[n/8] = (((u64b_t) src[n ]) ) +
+ (((u64b_t) src[n+1]) << 8) +
+ (((u64b_t) src[n+2]) << 16) +
+ (((u64b_t) src[n+3]) << 24) +
+ (((u64b_t) src[n+4]) << 32) +
+ (((u64b_t) src[n+5]) << 40) +
+
[CVS] RPM: rpm/rpmio/ Makefile.am librpmio.vers poptIO.c rpmio.c rpmsx...
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: 11-Jul-2009 19:14:04
Branch: HEAD Handle: 2009071117140300
Added files:
rpm/rpmio rpmsx.c rpmsx.h
Modified files:
rpm/rpmio Makefile.am librpmio.vers poptIO.c rpmio.c
Log:
- rpmsx: break ground for a SELinux coffin and shroud.
Summary:
RevisionChanges Path
1.235 +3 -3 rpm/rpmio/Makefile.am
2.130 +4 -0 rpm/rpmio/librpmio.vers
1.55+4 -0 rpm/rpmio/poptIO.c
1.202 +2 -0 rpm/rpmio/rpmio.c
2.1 +106 -0 rpm/rpmio/rpmsx.c
2.1 +108 -0 rpm/rpmio/rpmsx.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.234 -r1.235 Makefile.am
--- rpm/rpmio/Makefile.am 3 Jul 2009 16:50:08 - 1.234
+++ rpm/rpmio/Makefile.am 11 Jul 2009 17:14:03 - 1.235
@@ -69,7 +69,7 @@
poptIO.h rpmaug.h rpmbc.h rpmbf.h rpmbz.h rpmdav.h rpmdir.h rpmficl.h
rpmgc.h \
rpmhash.h rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h rpmkeyring.h \
rpmku.h rpmlua.h rpmmg.h rpmnss.h rpmperl.h rpmpython.h \
- rpmruby.h rpmsq.h rpmsquirrel.h rpmssl.h rpmsyck.h rpmtcl.h \
+ rpmruby.h rpmsq.h rpmsquirrel.h rpmssl.h rpmsx.h rpmsyck.h rpmtcl.h \
rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
tar.h ugid.h rpmio-stub.h
@@ -86,8 +86,8 @@
rpmjs.c rpmjsio.c rpmkeyring.c \
rpmku.c rpmlog.c rpmlua.c rpmmalloc.c rpmmg.c rpmnss.c \
rpmperl.c rpmpgp.c rpmpython.c rpmrpc.c rpmruby.c rpmsq.c \
- rpmsquirrel.c rpmssl.c rpmsyck.c rpmsw.c rpmtcl.c rpmuuid.c rpmxar.c \
- rpmzlog.c rpmzq.c \
+ rpmsquirrel.c rpmssl.c rpmsyck.c rpmsw.c rpmsx.c rpmtcl.c \
+ rpmuuid.c rpmxar.c rpmzlog.c rpmzq.c \
strcasecmp.c strtolocale.c tar.c url.c ugid.c xzdio.c yarn.c
librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
$ cvs diff -u -r2.129 -r2.130 librpmio.vers
--- rpm/rpmio/librpmio.vers 9 Jul 2009 01:26:09 - 2.129
+++ rpm/rpmio/librpmio.vers 11 Jul 2009 17:14:03 - 2.130
@@ -475,6 +475,10 @@
rpmswNow;
rpmswPrint;
rpmswSub;
+_rpmsex_debug;
+rpmsexExec;
+rpmsexMatch;
+rpmsexNew;
rpmSyckFree;
rpmSyckLoad;
_rpmtcl_debug;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
$ cvs diff -u -r1.54 -r1.55 poptIO.c
--- rpm/rpmio/poptIO.c9 Jul 2009 17:33:10 - 1.54
+++ rpm/rpmio/poptIO.c11 Jul 2009 17:14:03 - 1.55
@@ -36,6 +36,8 @@
#include
#include
+#include
+
#include "debug.h"
const char *__progname;
@@ -451,6 +453,8 @@
N_("Debug rpmsq Signal Queue"), NULL},
{ "rpmsquirreldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmsquirrel_debug, -1,
N_("Debug embedded SQUIRREL interpreter"), NULL},
+ { "rpmsexdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmsex_debug, -1,
+ N_("Debug SELinux"), NULL},
{ "rpmtcldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmtcl_debug, -1,
N_("Debug embedded TCL interpreter"), NULL},
#ifdef WITH_BZIP2
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
$ cvs diff -u -r1.201 -r1.202 rpmio.c
--- rpm/rpmio/rpmio.c 9 Jul 2009 17:33:10 - 1.201
+++ rpm/rpmio/rpmio.c 11 Jul 2009 17:14:03 - 1.202
@@ -3138,6 +3138,7 @@
extern rpmioPool _htmlPool;
extern rpmioPool _htPool;
extern rpmioPool _ctxPool;
+extern rpmioPool _rpmsexPool;
extern rpmioPool _rpmsyckPool;
/*...@=shadow@*/
extern rpmioPool _rpmaugPool;
@@ -3192,6 +3193,7 @@
_rpmbfPool = rpmioFreePool(_rpmbfPool);
_htPool = rpmioFreePool(_htPool);
_ctxPool = rpmioFreePool(_ctxPool);
+_rpmsexPool = rpmioFreePool(_rpmsexPool);
_rpmsyckPool = rpmioFreePool(_rpmsyckPool);
_rpmiobPool = rpmioFreePool(_rpmiobPool);
_digPool = rpmioFreePool(_digPool);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsx.c
$ cvs diff -u -r0 -r2.1 rpmsx.c
--- /dev/null 2009-07-11
[CVS] RPM: rpm/rpmio/ Makefile.am truby.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: 10-May-2009 16:09:49 Branch: HEAD Handle: 2009051014094801 Modified files: rpm/rpmio Makefile.am Removed files: rpm/rpmio truby.c Log: - truby: no longer needed, ruby/trb.c instead. Summary: RevisionChanges Path 1.229 +1 -4 rpm/rpmio/Makefile.am 2.2 +0 -54 rpm/rpmio/truby.c patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.228 -r1.229 Makefile.am --- rpm/rpmio/Makefile.am 6 May 2009 01:55:37 - 1.228 +++ rpm/rpmio/Makefile.am 10 May 2009 14:09:48 - 1.229 @@ -18,7 +18,7 @@ rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \ rpmpbzip2 rpmpigz rpmtar rpmz \ tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \ - tperl tpython tput tpw trpmio truby tsw ttcl dumpasn1 lookup3 + tperl tpython tput tpw trpmio tsw ttcl dumpasn1 lookup3 bin_PROGRAMS = man_MANS = @@ -336,9 +336,6 @@ trpmio_SOURCES = trpmio.c trpmio_LDADD = $(RPMIO_LDADD_COMMON) -truby_SOURCES = truby.c -truby_LDADD = $(RPMIO_LDADD_COMMON) - tsw_SOURCES = tsw.c tsw_LDFLAGS = $(RPMIO_LDADD_COMMON) @@ . rm -f rpm/rpmio/truby.c <<'@@ .' Index: rpm/rpmio/truby.c [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am librpmio.vers rpmsyck.c rpmsyck.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: 06-May-2009 03:55:37
Branch: HEAD Handle: 2009050601553700
Added files:
rpm/rpmio rpmsyck.c rpmsyck.h
Modified files:
rpm/rpmio Makefile.am librpmio.vers
Log:
rpmsyck: first shot at YAML parser in pure C.
Summary:
RevisionChanges Path
1.228 +2 -2 rpm/rpmio/Makefile.am
2.114 +1 -0 rpm/rpmio/librpmio.vers
2.1 +93 -0 rpm/rpmio/rpmsyck.c
2.1 +32 -0 rpm/rpmio/rpmsyck.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.227 -r1.228 Makefile.am
--- rpm/rpmio/Makefile.am 19 Apr 2009 19:00:07 - 1.227
+++ rpm/rpmio/Makefile.am 6 May 2009 01:55:37 - 1.228
@@ -69,7 +69,7 @@
poptIO.h rpmbc.h rpmbz.h rpmdav.h rpmficl.h rpmgc.h rpmhash.h \
rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h rpmkeyring.h rpmku.h \
rpmlua.h rpmmg.h rpmnss.h rpmperl.h rpmpython.h rpmruby.h rpmsq.h \
- rpmssl.h rpmtcl.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
+ rpmssl.h rpmsyck.h rpmtcl.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
tar.h ugid.h rpmio-stub.h
usrlibdir = $(libdir)
@@ -84,7 +84,7 @@
rpmio.c rpmiob.c rpmio-stub.c rpmjs.c rpmjsio.c rpmkeyring.c \
rpmku.c rpmlog.c rpmlua.c rpmmalloc.c rpmmg.c rpmnss.c \
rpmperl.c rpmpgp.c rpmpython.c rpmrpc.c rpmruby.c rpmsq.c \
- rpmssl.c rpmsw.c rpmtcl.c rpmuuid.c rpmxar.c rpmzlog.c rpmzq.c \
+ rpmssl.c rpmsyck.c rpmsw.c rpmtcl.c rpmuuid.c rpmxar.c rpmzlog.c
rpmzq.c \
strcasecmp.c strtolocale.c tar.c url.c ugid.c xzdio.c yarn.c
librpmio_la_LDFLAGS = -release $(LT_CURRENT).$(LT_REVISION)
if HAVE_LD_VERSION_SCRIPT
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
$ cvs diff -u -r2.113 -r2.114 librpmio.vers
--- rpm/rpmio/librpmio.vers 2 May 2009 20:06:29 - 2.113
+++ rpm/rpmio/librpmio.vers 6 May 2009 01:55:37 - 2.114
@@ -436,6 +436,7 @@
rpmswNow;
rpmswPrint;
rpmswSub;
+rpmSyckLoad;
_rpmtcl_debug;
rpmtclNew;
rpmtclRun;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsyck.c
$ cvs diff -u -r0 -r2.1 rpmsyck.c
--- /dev/null 2009-05-06 03:55:00 +0200
+++ rpmsyck.c 2009-05-06 03:55:37 +0200
@@ -0,0 +1,93 @@
+#include "system.h"
+
+#if defined(WITH_SYCK)
+
+#include
+#include
+#include
+
+
+static SYMID
+rpmsyck_parse_handler(SyckParser *p, SyckNode *n)
+{
+int i = 0;
+rpmsyck_node tn = xmalloc(sizeof(struct rpmsyck_node_s));
+
+switch ( n->kind )
+{
+case syck_str_kind:
+tn->type = T_STR;
+tn->key = syck_strndup( n->data.str->ptr, n->data.str->len );
+tn->value.seq = 0;
+break;
+
+case syck_seq_kind:
+{
+rpmsyck_node val;
+rpmsyck_node seq = xmalloc(sizeof(struct rpmsyck_node_s) *
(n->data.list->idx + 1));
+tn->type = T_SEQ;
+tn->key = 0;
+
+for (i = 0; i < n->data.list->idx; i++)
+{
+SYMID oid = syck_seq_read( n, i );
+syck_lookup_sym( p, oid, (char **)&val);
+seq[i] = val[0];
+}
+seq[n->data.list->idx].type = T_END;
+tn->value.seq = seq;
+}
+break;
+
+case syck_map_kind:
+ {
+ hashTable ht = htCreate(n->data.pairs->idx * 2, 0, 0, NULL, NULL);
+rpmsyck_node val;
+tn->type = T_MAP;
+tn->key = 0;
+for (i = 0; i < n->data.pairs->idx; i++)
+{
+ char *key, *value;
+SYMID oid = syck_map_read( n, map_key, i);
+syck_lookup_sym(p, oid, (char **)&val);
+ key = val[0].key;
+
+oid = syck_map_read(n, map_value, i);
+syck_lookup_sym(p, oid, (char **)&val);
+ value = val[0].key;
+
+ htAddEntry(ht, key, val);
+}
+tn->value.map = ht;
+}
+break;
+}
+
+tn->tag = 0;
+if (n->type_id != NULL) {
+tn->tag = syck_strndup(n->type_id, strlen( n->type
[CVS] RPM: rpm/rpmio/ Makefile.am rpmpigz.c rpmz.c rpmz.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: 23-Feb-2009 21:00:14
Branch: HEAD Handle: 200902232202
Added files:
rpm/rpmio rpmz.h
Modified files:
rpm/rpmio Makefile.am rpmpigz.c rpmz.c
Log:
- jbj: rpmz: create rpmz.h to hold rpmpigz <-> rpmz common code.
Summary:
RevisionChanges Path
1.210 +1 -1 rpm/rpmio/Makefile.am
1.3 +10 -129rpm/rpmio/rpmpigz.c
1.38+5 -88 rpm/rpmio/rpmz.c
1.1 +556 -0 rpm/rpmio/rpmz.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.209 -r1.210 Makefile.am
--- rpm/rpmio/Makefile.am 23 Feb 2009 18:33:31 - 1.209
+++ rpm/rpmio/Makefile.am 23 Feb 2009 20:00:02 - 1.210
@@ -66,7 +66,7 @@
poptIO.h rpmbc.h rpmdav.h \
rpmgc.h rpmhash.h rpmhook.h rpmio_internal.h rpmkeyring.h rpmku.h \
rpmlua.h rpmmg.h rpmnss.h rpmsq.h rpmssl.h \
- rpmio-stub.h rpmurl.h rpmuuid.h rpmxar.h \
+ rpmio-stub.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h \
tar.h ugid.h yarn.h
usrlibdir = $(libdir)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpigz.c
$ cvs diff -u -r1.2 -r1.3 rpmpigz.c
--- rpm/rpmio/rpmpigz.c 23 Feb 2009 19:11:42 - 1.2
+++ rpm/rpmio/rpmpigz.c 23 Feb 2009 20:00:02 - 1.3
@@ -270,101 +270,6 @@
#endif
-#define _RPMIOB_INTERNAL
-#include
-#include
-#include
-#include
-
-#include
-/*...@-bufferoverflowhigh -mustfreeo...@*/
-#include "poptIO.h"
-/*...@=bufferoverflowhigh =mustfreeo...@*/
-#if !defined(POPT_ARGFLAG_TOGGLE)/* XXX compat with popt < 1.15 */
-#define POPT_ARGFLAG_TOGGLE 0
-#endif
-
-#ifndef _PIGZNOTHREAD
-# include "yarn.h" /* yarnThread, yarnLaunch(), yarnJoin(),
yarnJoinAll(), */
-/* yarnLock, yarnNewLock(), yarnPossess(),
yarnTwist(), yarnWaitFor(),
- yarnRelease(), yarnPeekLock(), yarnFreeLock(),
yarnPrefix */
-#endif
-
-#include "debug.h"
-
-/*...@unchecked@*/
-static int _debug = 0;
-
-/**
- */
-enum rpmzMode_e {
-RPMZ_MODE_COMPRESS = 0,
-RPMZ_MODE_DECOMPRESS = 1,
-RPMZ_MODE_TEST = 2,
-};
-
-/**
- */
-enum rpmzFormat_e {
-RPMZ_FORMAT_AUTO = 0,
-RPMZ_FORMAT_XZ = 1,
-RPMZ_FORMAT_LZMA = 2,
-RPMZ_FORMAT_RAW = 3,
-RPMZ_FORMAT_GZIP = 4,
-RPMZ_FORMAT_ZLIB = 5,
-RPMZ_FORMAT_ZIP2 = 6,
-RPMZ_FORMAT_ZIP3 = 7,
-RPMZ_FORMAT_BZIP2= 8,
-};
-
-/**
- */
-typedef struct rpmz_s * rpmz;
-
-#define F_ISSET(_f, _FLAG) (((_f) & ((RPMZ_FLAGS_##_FLAG) & ~0x4000)) !=
RPMZ_FLAGS_NONE)
-#define RZ_ISSET(_FLAG) F_ISSET(z->flags, _FLAG)
-
-#define _KFB(n) (1U << (n))
-#define _ZFB(n) (_KFB(n) | 0x4000)
-
-enum rpmzFlags_e {
-RPMZ_FLAGS_NONE = 0,
-RPMZ_FLAGS_STDOUT= _ZFB( 0), /*!< -c, --stdout ... */
-RPMZ_FLAGS_FORCE = _ZFB( 1), /*!< -f, --force ... */
-RPMZ_FLAGS_KEEP = _ZFB( 2), /*!< -k, --keep ... */
-RPMZ_FLAGS_RECURSE = _ZFB( 3), /*!< -r, --recursive
... */
-RPMZ_FLAGS_EXTREME = _ZFB( 4), /*!< -e, --extreme ...
*/
- /* XXX compressor specific flags need to be set some other way. */
- /* XXX unused */
-RPMZ_FLAGS_FAST = _ZFB( 5), /*!< --fast ... */
-RPMZ_FLAGS_BEST = _ZFB( 6), /*!< --best ... */
-
- /* XXX logic is reversed, disablers should clear with toggle. */
-RPMZ_FLAGS_HNAME = _ZFB( 7), /*!< -n, --no-name ... */
-RPMZ_FLAGS_HTIME = _ZFB( 8), /*!< -T, --no-time ... */
-
- /* XXX unimplemented */
-RPMZ_FLAGS_RSYNCABLE = _ZFB( 9), /*!< -R, --rsyncable ... */
- /* XXX logic is reversed. */
-RPMZ_FLAGS_INDEPENDENT = _ZFB(10), /*!< -i, --independent ... */
-RPMZ_FLAGS_LIST = _ZFB(11), /*!< -l, --list ... */
-
-#ifdef NOTYET
-RPMZ_FLAGS_SUBBLOCK = INT_MIN,
-RPMZ_FLAGS_DELTA,
-RPMZ_FLAGS_LZMA1,
-RPMZ_FLAGS_LZMA2,
-#endif
-
-RPMZ_FLAGS_X86 = _ZFB(16),
-RPMZ_FLAGS_POWERPC = _ZFB(17),
-RPMZ_FLA
[CVS] RPM: rpm/rpmio/ Makefile.am rpmdpkg.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: 25-Jan-2009 01:26:26
Branch: HEAD Handle: 2009012500262500
Modified files:
rpm/rpmio Makefile.am rpmdpkg.c
Log:
- jbj: rpmdpkg: hide some weirdo administrative options.
- jbj: rpmdpkg: wire up rpmdpkg to use rpmcliInit, not rpmioInit.
Summary:
RevisionChanges Path
1.205 +1 -1 rpm/rpmio/Makefile.am
1.5 +19 -10 rpm/rpmio/rpmdpkg.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.204 -r1.205 Makefile.am
--- rpm/rpmio/Makefile.am 20 Jan 2009 23:02:23 - 1.204
+++ rpm/rpmio/Makefile.am 25 Jan 2009 00:26:25 - 1.205
@@ -243,7 +243,7 @@
rpmcurl_LDADD = $(RPMIO_LDADD_COMMON)
rpmdpkg_SOURCES = rpmdpkg.c
-rpmdpkg_LDADD = $(RPMIO_LDADD_COMMON)
+rpmdpkg_LDADD = $(RPM_LDADD_COMMON)
rpmgenbasedir = rpmgenbasedir.c
rpmgenbasedir_LDADD = $(RPMIO_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmdpkg.c
$ cvs diff -u -r1.4 -r1.5 rpmdpkg.c
--- rpm/rpmio/rpmdpkg.c 21 Jan 2009 21:01:33 - 1.4
+++ rpm/rpmio/rpmdpkg.c 25 Jan 2009 00:26:25 - 1.5
@@ -1,7 +1,16 @@
#include "system.h"
#include
+#ifdef DYING
#include
+#define rpmcliInit rpmioInit
+#define rpmcliFini rpmioFini
+#define rpmcliAllPoptTable rpmioAllPoptTable
+#
+#else
+#include
+#include
+#endif
#include "debug.h"
@@ -178,17 +187,17 @@
{ "search", 'S', POPT_ARG_STRING, NULL, 'S',
N_("Find package(s) owning file(s)."), N_("") },
- { "assert-support-predepends", '\0', POPT_ARG_NONE, NULL,
POPT_DPKG_ASSERT_SUPPORT_PREDEPENDS,
+ { "assert-support-predepends", '\0',
POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL,
POPT_DPKG_ASSERT_SUPPORT_PREDEPENDS,
N_("?assert-support-predepends?"), NULL },
- { "assert-working-epoch", '\0', POPT_ARG_NONE, NULL,
POPT_DPKG_ASSERT_WORKING_EPOCH,
+ { "assert-working-epoch", '\0', POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN,
NULL, POPT_DPKG_ASSERT_WORKING_EPOCH,
N_("?assert-working-epoch?"), NULL },
- { "assert-long-filenames", '\0', POPT_ARG_NONE, NULL,
POPT_DPKG_ASSERT_LONG_FILENAMES,
+ { "assert-long-filenames", '\0', POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN,
NULL, POPT_DPKG_ASSERT_LONG_FILENAMES,
N_("?assert-long-filenames?"), NULL },
- { "assert-multi-conrep", '\0', POPT_ARG_NONE, NULL,
POPT_DPKG_ASSERT_MULTI_CONREP,
+ { "assert-multi-conrep", '\0', POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN,
NULL, POPT_DPKG_ASSERT_MULTI_CONREP,
N_("?assert-multi-conrep?"), NULL },
- { "print-architecture", '\0', POPT_ARG_NONE, NULL, POPT_DPKG_PRINT_ARCH,
+ { "print-architecture", '\0', POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL,
POPT_DPKG_PRINT_ARCH,
N_("Print dpkg architecture."), NULL },
- { "print-installation-architecture", '\0', POPT_ARG_NONE, NULL,
POPT_DPKG_PRINT_INSTALL_ARCH,
+ { "print-installation-architecture", '\0',
POPT_ARG_NONE|POPT_ARGFLAG_DOC_HIDDEN, NULL, POPT_DPKG_PRINT_INSTALL_ARCH,
N_("Print dpkg installation architecture."), NULL },
{ "predep-package", '\0', POPT_ARG_NONE, NULL, POPT_DPKG_PREDEP_PACKAGE,
N_("?predep-package?"), NULL },
@@ -318,8 +327,8 @@
{ NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmdpkgOptionsPoptTable, 0,
N_("Options:"), NULL },
- { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmioAllPoptTable, 0,
- N_("Common options for all rpmio executables:"),
+ { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
+ N_("Common options for all executables:"),
NULL },
POPT_AUTOALIAS
@@ -413,7 +422,7 @@
/*...@modifies __assert_program_name, _rpmrepo,
rpmGlobalMacroContext, fileSystem, internalState @*/
{
-poptContext optCon = rpmioInit(argc, argv, optionsTable);
+poptContext optCon = rpmcliInit(argc, argv, optionsTable);
const char ** av = NULL;
int ac;
int rc = 1; /* assume failure. */
@@ -436,7 +445,7 @@
rc = 0;
exit:
-optCon = rpmioFini(optCon);
+optCon = rpmcliFini(optCon);
return rc;
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repository
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 05-Dec-2008 21:56:51 Branch: HEAD Handle: 2008120520565100 Modified files: rpm/rpmio Makefile.am Log: - jbj: typo remnant from revert. Summary: RevisionChanges Path 1.198 +1 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.197 -r1.198 Makefile.am --- rpm/rpmio/Makefile.am 5 Dec 2008 06:29:30 - 1.197 +++ rpm/rpmio/Makefile.am 5 Dec 2008 20:56:51 - 1.198 @@ -47,7 +47,7 @@ RPMIO_LDADD_COMMON = \ librpmio.la \ $(top_builddir)/misc/librpmmisc.la \ - @LTLIBINTL@ \ + @LTLIBINTL@ RPM_LDADD_COMMON = \ $(top_builddir)/build/librpmbuild.la \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am rpmiob.c rpmiob.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: 05-Aug-2008 14:57:07
Branch: HEAD Handle: 2008080512570700
Added files:
rpm/rpmio rpmiob.c rpmiob.h
Modified files:
rpm/rpmio Makefile.am
Log:
- jbj: add rpmiob.c rpmiob.h.
Summary:
RevisionChanges Path
1.190 +2 -2 rpm/rpmio/Makefile.am
1.1 +158 -0 rpm/rpmio/rpmiob.c
1.1 +167 -0 rpm/rpmio/rpmiob.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.189 -r1.190 Makefile.am
--- rpm/rpmio/Makefile.am 3 Aug 2008 14:01:01 - 1.189
+++ rpm/rpmio/Makefile.am 5 Aug 2008 12:57:07 - 1.190
@@ -57,14 +57,14 @@
pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX)
pkginc_HEADERS = \
- rpmcb.h rpmio.h rpmiotypes.h rpmmacro.h rpmpgp.h
+ rpmcb.h rpmio.h rpmlog.h rpmiotypes.h rpmmacro.h rpmpgp.h
noinst_HEADERS = \
argv.h ar.h cpio.h envvar.h fnmatch.h fts.h glob.h iosm.h \
md2.h md4.h rmd128.h rmd160.h rmd256.h rmd320.h sha224.h \
salsa10.h salsa20.h tiger.h \
mire.h poptIO.h rpmbc.h rpmdav.h \
rpmgc.h rpmhash.h rpmhook.h rpmio_internal.h rpmkeyring.h \
- rpmlog.h rpmlua.h rpmmg.h rpmnss.h rpmsq.h rpmssl.h \
+ rpmlua.h rpmmg.h rpmnss.h rpmsq.h rpmssl.h \
rpmio-stub.h rpmsw.h rpmurl.h rpmuuid.h rpmxar.h \
tar.h ugid.h
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmiob.c
$ cvs diff -u -r0 -r1.1 rpmiob.c
--- /dev/null 2008-08-05 14:55:00 +0200
+++ rpmiob.c 2008-08-05 14:57:07 +0200
@@ -0,0 +1,158 @@
+/** \ingroup rpmio
+ * \file rpmio/rpmiob.c
+ */
+#include "system.h"
+#define _RPMIOB_INTERNAL
+#include
+#include
+#include "debug.h"
+
+/[EMAIL PROTECTED]@*/
+size_t _rpmiob_chunk = 1024;
+
+rpmiob rpmiobFree(rpmiob iob)
+{
+if (iob != NULL) {
+ iob->b = _free(iob->b);
+ iob = _free(iob);
+}
+return NULL;
+}
+
+rpmiob rpmiobNew(size_t len)
+{
+rpmiob iob = xcalloc(1, sizeof(*iob));
+if (len == 0)
+ len = _rpmiob_chunk;
+iob->allocated = len;
+iob->blen = 0;
+iob->b = xcalloc(iob->allocated+1, sizeof(*iob->b));
+return iob;
+}
+
+rpmiob rpmiobEmpty(rpmiob iob)
+{
+assert(iob != NULL);
+iob->b[0] = '\0';
+iob->blen = 0;
+return iob;
+}
+
+rpmiob rpmiobRTrim(rpmiob iob)
+{
+
+assert(iob != NULL);
+while (iob->blen > 0 && xisspace((int)iob->b[iob->blen-1]))
+ iob->b[--iob->blen] = (rpmuint8_t) '\0';
+return iob;
+}
+
+rpmiob rpmiobAppend(rpmiob iob, const char * s, size_t nl)
+{
+size_t ns = strlen(s);
+rpmuint8_t * tail;
+
+if (nl > 0) ns++;
+
+assert(iob != NULL);
+if ((iob->blen + ns) > iob->allocated) {
+ iob->allocated += ((ns+_rpmiob_chunk-1)/_rpmiob_chunk) * _rpmiob_chunk;
+ iob->b = xrealloc(iob->b, iob->allocated+1);
+}
+
+tail = iob->b + iob->blen;
+tail = (rpmuint8_t *) stpcpy((char *)tail, s);
+if (nl > 0) {
+ *tail++ = (rpmuint8_t) '\n';
+ *tail = (rpmuint8_t) '\0';
+}
+iob->blen += ns;
+return iob;
+}
+
+rpmuint8_t * rpmiobBuf(rpmiob iob)
+{
+assert(iob != NULL);
+/[EMAIL PROTECTED] -usereleased @*/
+return iob->b;
+/[EMAIL PROTECTED] =usereleased @*/
+}
+
+char * rpmiobStr(rpmiob iob)
+{
+assert(iob != NULL);
+/[EMAIL PROTECTED] -usereleased @*/
+return (char *) iob->b;
+/[EMAIL PROTECTED] =usereleased @*/
+}
+
+size_t rpmiobLen(rpmiob iob)
+{
+return (iob != NULL ? iob->blen : 0);
+}
+
+int rpmiobSlurp(const char * fn, rpmiob * iobp)
+{
+static size_t blenmax = (32 * BUFSIZ);
+rpmuint8_t * b = NULL;
+size_t blen;
+struct stat sb;
+FD_t fd;
+int rc = 0;
+int xx;
+
+fd = Fopen(fn, "r%{?_rpmgio}");
+if (fd == NULL || Ferror(fd)) {
+ rc = 2;
+ goto exit;
+}
+sb.st_size = 0;
+if ((xx = Fstat(fd, &sb)) < 0)
+ sb.st_size = blenmax;
+#if defined(__linux__)
+/* XXX st->st_size = 0 for /proc files on linux, see stat(2). */
+/* XXX glibc mmap'd libio no workie for /proc files on linux?!? */
+if (sb.st_size == 0 && !strncmp(fn, "/proc/", sizeof("/proc/")-1)) {
+ blen = blenmax;
+ b = xmalloc(blen+1);
+ b[0]
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 10-Jun-2008 17:21:47 Branch: HEAD Handle: 2008061015214600 Modified files: rpm/rpmio Makefile.am Log: add missing liblzma flags Summary: RevisionChanges Path 1.177 +2 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.176 -r1.177 Makefile.am --- rpm/rpmio/Makefile.am 8 Jun 2008 19:55:45 - 1.176 +++ rpm/rpmio/Makefile.am 10 Jun 2008 15:21:46 - 1.177 @@ -41,7 +41,8 @@ @WITH_ZLIB_CPPFLAGS@ \ @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ \ - @WITH_XAR_CPPFLAGS@ + @WITH_XAR_CPPFLAGS@ \ + @WITH_LZMA_CPPFLAGS@ RPMIO_LDADD_COMMON = \ librpmio.la \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 11-May-2008 14:36:45 Branch: HEAD Handle: 2008051112364500 Modified files: rpm/rpmio Makefile.am Log: - jbj: typo. Summary: RevisionChanges Path 1.173 +1 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.172 -r1.173 Makefile.am --- rpm/rpmio/Makefile.am 7 May 2008 16:58:26 - 1.172 +++ rpm/rpmio/Makefile.am 11 May 2008 12:36:45 - 1.173 @@ -7,7 +7,7 @@ SUBDIRS = # tests EXTRA_DIST = \ - getdate.y LzamDecode.c rpmcpio.c rpmcpio.h \ + getdate.y LzmaDecode.c rpmcpio.c rpmcpio.h \ rpmgenbasedir.c rpmgenpkglist.c rpmgensrclist.c \ rpmmtree.c rpmrepo.c rpmtar.c rpmtar.h \ tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am rpmz.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: 30-Apr-2008 23:56:13
Branch: HEAD Handle: 2008043021561300
Added files:
rpm/rpmio rpmz.c
Modified files:
rpm/rpmio Makefile.am
Log:
- jbj: stub-in a CLI compressor driver using popt.
Summary:
RevisionChanges Path
1.170 +4 -1 rpm/rpmio/Makefile.am
1.1 +566 -0 rpm/rpmio/rpmz.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.169 -r1.170 Makefile.am
--- rpm/rpmio/Makefile.am 29 Apr 2008 14:07:34 - 1.169
+++ rpm/rpmio/Makefile.am 30 Apr 2008 21:56:13 - 1.170
@@ -14,7 +14,7 @@
EXTRA_PROGRAMS = rpmcpio \
rpmgenbasedir rpmgenpkglist rpmgensrclist \
- rpmmtree rpmrepo rpmtar \
+ rpmmtree rpmrepo rpmtar rpmz \
tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \
tput tpw trpmio tsw dumpasn1 lookup3
@@ -238,6 +238,9 @@
rpmtar_SOURCES = rpmtar.c
rpmtar_LDADD = $(RPM_LDADD_COMMON)
+rpmz_SOURCES = rpmz.c
+rpmz_LDADD = $(RPMIO_LDADD_COMMON)
+
tdir_SOURCES = tdir.c
tdir_LDADD = $(RPMIO_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmz.c
$ cvs diff -u -r0 -r1.1 rpmz.c
--- /dev/null 2008-04-30 23:55:00 +0200
+++ rpmz.c2008-04-30 23:56:13 +0200
@@ -0,0 +1,566 @@
+/**
+ * \file rpmio/rpmrepo.c
+ */
+
+#include "system.h"
+
+#include
+#include
+#include
+
+#include "debug.h"
+
+enum tool_mode {
+MODE_COMPRESS,
+MODE_DECOMPRESS,
+MODE_TEST,
+MODE_LIST,
+};
+/[EMAIL PROTECTED]@*/
+static enum tool_mode opt_mode = MODE_COMPRESS;
+
+enum header_type {
+HEADER_AUTO,
+HEADER_NATIVE,
+HEADER_SINGLE,
+HEADER_MULTI,
+HEADER_ALONE,
+// HEADER_GZIP,
+};
+/[EMAIL PROTECTED]@*/
+static enum header_type opt_header = HEADER_AUTO;
+
+/[EMAIL PROTECTED]@*/
+static char *opt_suffix = NULL;
+
+/[EMAIL PROTECTED]@*/
+static const char *opt_files_name = NULL;
+/[EMAIL PROTECTED]@*/
+static char opt_files_split = '\0';
+/[EMAIL PROTECTED]@*/
+static FILE *opt_files_file = NULL;
+
+/[EMAIL PROTECTED]@*/
+static int opt_stdout;
+/[EMAIL PROTECTED]@*/
+static int opt_force;
+/[EMAIL PROTECTED]@*/
+static int opt_keep_original;
+/[EMAIL PROTECTED]@*/
+static int opt_preserve_name;
+/[EMAIL PROTECTED]@*/
+static int opt_recursive;
+
+/[EMAIL PROTECTED]@*/
+static lzma_check_type opt_check = LZMA_CHECK_CRC64;
+/[EMAIL PROTECTED]@*/
+static lzma_options_filter opt_filters[8];
+
+// We don't modify or free() this, but we need to assign it in some
+// non-const pointers.
+/[EMAIL PROTECTED]@*/
+static const char *stdin_filename = "(stdin)";
+
+/[EMAIL PROTECTED]@*/
+static int opt_memory;
+/[EMAIL PROTECTED]@*/
+static int opt_threads;
+
+/[EMAIL PROTECTED]@*/
+static size_t preset_number = 7 - 1;
+/[EMAIL PROTECTED]@*/
+static int preset_default = 1;
+/[EMAIL PROTECTED]@*/
+static size_t filter_count = 0;
+
+enum {
+OPT_COPY = INT_MIN,
+OPT_SUBBLOCK,
+OPT_X86,
+OPT_POWERPC,
+OPT_IA64,
+OPT_ARM,
+OPT_ARMTHUMB,
+OPT_SPARC,
+OPT_DELTA,
+OPT_LZMA,
+
+OPT_FILES,
+OPT_FILES0,
+};
+
+/*==*/
+#define GZ_SUFFIX".gz"
+#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
+#define BUFLEN (16 * 1024)
+#define MAX_NAME_LEN1024
+
+/*
+ * Copy input to output.
+ */
+static rpmRC rpmz_copy(FD_t in, FD_t out)
+{
+char buf[BUFLEN];
+size_t len;
+
+for (;;) {
+len = Fread(buf, 1, sizeof(buf), in);
+if (Ferror(in))
+ return RPMRC_FAIL;
+
+if (len == 0) break;
+
+if (Fwrite(buf, 1, len, out) != len)
+ return RPMRC_FAIL;
+}
+return RPMRC_OK;
+}
+
+/*
+ * Compress the given file: create a corresponding .gz file and remove the
+ * original.
+ */
+static rpmRC file_compress(const char *file, const char *fmode)
+{
+const char * infile = file;
+char outfile[MAX_NAME_LEN];
+FD_t in;
+FD_t out;
+rpmRC rc;
+int xx;
+
+(void) stpcpy( stpcpy(o
[CVS] RPM: rpm/rpmio/ Makefile.am rpmgrep.c rpm/rpmio/testdata/ grepou...
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: 18-Apr-2008 23:28:04
Branch: HEAD Handle: 2008041821280301
Modified files:
rpm/rpmio Makefile.am rpmgrep.c
rpm/rpmio/testdata grepoutput
Log:
- jbj: rpmgrep: adjust error message to be i18n ready.
Summary:
RevisionChanges Path
1.167 +2 -2 rpm/rpmio/Makefile.am
1.77+1 -29 rpm/rpmio/rpmgrep.c
1.2 +2 -2 rpm/rpmio/testdata/grepoutput
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.166 -r1.167 Makefile.am
--- rpm/rpmio/Makefile.am 13 Apr 2008 18:50:34 - 1.166
+++ rpm/rpmio/Makefile.am 18 Apr 2008 21:28:03 - 1.167
@@ -87,8 +87,8 @@
librpmio_la_LDFLAGS += $(LDFLAGS)
librpmio_la_LIBADD += $(LIBS)
endif
-librpmio.la: $(librpmio_la_OBJECTS) $(librpmio_la_DEPENDENCIES)
- $(librpmio_la_LINK) -rpath $(usrlibdir) $(librpmio_la_OBJECTS)
$(librpmio_la_LIBADD)
+#librpmio.la: $(librpmio_la_OBJECTS) $(librpmio_la_DEPENDENCIES)
+#$(librpmio_la_LINK) -rpath $(usrlibdir) $(librpmio_la_OBJECTS)
$(librpmio_la_LIBADD)
install-data-hook:
if !ENABLE_BUILD_LAFILES
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgrep.c
$ cvs diff -u -r1.76 -r1.77 rpmgrep.c
--- rpm/rpmio/rpmgrep.c 12 Mar 2008 19:41:13 - 1.76
+++ rpm/rpmio/rpmgrep.c 18 Apr 2008 21:28:03 - 1.77
@@ -1069,34 +1069,6 @@
}
/*
- * Construct printed ordinal.
- *
- * This turns a number into "1st", "3rd", etc display string.
- * @param n the number
- * @return the number's ordinal display string
- */
-/[EMAIL PROTECTED]@*/
-static const char *
-ordin(unsigned n)
- /[EMAIL PROTECTED]/
-{
-static char buffer[16];
-buffer[0] = '\0';
-if (n > 0) {
- char *p = buffer;
- sprintf(p, " %u", n);
- while (*p != '\0') p++;
- switch (n%10) {
- case 1: strcpy(p, "st"); break;
- case 2: strcpy(p, "nd"); break;
- case 3: strcpy(p, "rd"); break;
- default:strcpy(p, "th"); break;
- }
-}
-return buffer;
-}
-
-/*
* Compile a single pattern.
*
* When the -F option has been used, this is called for each substring.
@@ -1145,7 +1117,7 @@
fprintf(stderr, _("%s: Error in"), __progname);
if (filename == NULL)
- fprintf(stderr, _("%s command-line"), ordin(count));
+ fprintf(stderr, _(" command-line %d"), count);
else
fprintf(stderr, _(" file:line %s:%d"), filename, count);
fprintf(stderr, _(" regex at offset %d: %s\n"), mire->erroff,
mire->errmsg);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/testdata/grepoutput
$ cvs diff -u -r1.1 -r1.2 grepoutput
--- rpm/rpmio/testdata/grepoutput 11 Feb 2008 22:11:40 - 1.1
+++ rpm/rpmio/testdata/grepoutput 18 Apr 2008 21:28:04 - 1.2
@@ -84,7 +84,7 @@
Test 14 -
./testdata/grepinputx:To pat or not to pat, that is the question.
Test 15 -
-pcregrep: Error in command-line regex at offset 4: nothing to repeat
+pcregrep: Error in command-line 0 regex at offset 4: nothing to repeat
Test 16 -
pcregrep: Failed to open ./testdata/nonexistfile: No such file or directory
Test 17 -
@@ -373,7 +373,7 @@
596:binary
597:binary
Test 45 --
-pcregrep: Error in 2nd command-line regex at offset 9: missing )
+pcregrep: Error in command-line 2 regex at offset 9: missing )
Test 46 --
AB.VE
Test 47 --
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am rpmgenbasedir.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: 12-Apr-2008 20:12:00
Branch: HEAD Handle: 200804121812
Added files:
rpm/rpmio rpmgenbasedir.c
Modified files:
rpm/rpmio Makefile.am
Log:
- jbj: rpmio: add rpmgenbasedir.c for rpmrepo composting.
Summary:
RevisionChanges Path
1.164 +8 -2 rpm/rpmio/Makefile.am
1.1 +133 -0 rpm/rpmio/rpmgenbasedir.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.163 -r1.164 Makefile.am
--- rpm/rpmio/Makefile.am 12 Apr 2008 17:08:39 - 1.163
+++ rpm/rpmio/Makefile.am 12 Apr 2008 18:12:00 - 1.164
@@ -5,13 +5,16 @@
LINT = splint
EXTRA_DIST = \
- getdate.y rpmcpio.c rpmcpio.h rpmgenpkglist.c rpmgensrclist.c \
+ getdate.y rpmcpio.c rpmcpio.h \
+ rpmgenbasedir.c rpmgenpkglist.c rpmgensrclist.c \
rpmmtree.c rpmrepo.c rpmtar.c rpmtar.h \
tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c \
tput.c trpmio.c tsw.c lookup3.c tpw.c \
librpmio.vers testit.sh rpmgrep.1 rpmmtree.8
-EXTRA_PROGRAMS = rpmcpio rpmgenpkglist rpmgensrclist rpmmtree rpmrepo rpmtar
\
+EXTRA_PROGRAMS = rpmcpio \
+ rpmgenbasedir rpmgenpkglist rpmgensrclist \
+ rpmmtree rpmrepo rpmtar \
tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire \
tput tpw trpmio tsw dumpasn1 lookup3
@@ -216,6 +219,9 @@
rpmdigest_SOURCES = rpmdigest.c
rpmdigest_LDADD = $(RPMIO_LDADD_COMMON)
+rpmgenbasedir = rpmgenbasedir.c
+rpmgenbasedir_LDADD = $(RPMIO_LDADD_COMMON)
+
rpmgenpkglist = rpmgenpkglist.c
rpmgenpkglist_LDADD = $(RPMIO_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmgenbasedir.c
$ cvs diff -u -r0 -r1.1 rpmgenbasedir.c
--- /dev/null 2008-04-12 20:11:00 +0200
+++ rpmgenbasedir.c 2008-04-12 20:12:00 +0200
@@ -0,0 +1,133 @@
+/**
+ * \file rpmio/rpmrepo.c
+ */
+
+#include "system.h"
+
+#include
+
+#include "debug.h"
+
+/[EMAIL PROTECTED] FD_t @*/
+/[EMAIL PROTECTED] miRE @*/
+
+/[EMAIL PROTECTED]@*/
+static int signit;
+/[EMAIL PROTECTED]@*/
+static const char * defaultkey;
+/[EMAIL PROTECTED]@*/
+static int hashonly;
+/[EMAIL PROTECTED]@*/
+static int listonly;
+/[EMAIL PROTECTED]@*/
+static int partial;
+/[EMAIL PROTECTED]@*/
+static int oldhashfile;
+/[EMAIL PROTECTED]@*/
+static int bz2only;
+/[EMAIL PROTECTED]@*/
+static int progress;
+/[EMAIL PROTECTED]@*/
+static const char * infofn;
+/[EMAIL PROTECTED]@*/
+static int flat;
+/[EMAIL PROTECTED]@*/
+static int bloat;
+/[EMAIL PROTECTED]@*/
+static const char * metasuffix;
+/[EMAIL PROTECTED]@*/
+static int compresslevel;
+/[EMAIL PROTECTED]@*/
+static const char * cachedir;
+
+/[EMAIL PROTECTED]@*/
+static const char * indexfn;
+/[EMAIL PROTECTED]@*/
+static int append;
+
+/*==*/
+
+/[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/
+static struct poptOption optionsTable[] = {
+
+ { "sign", 's', POPT_ARG_VAL,&signit, 1,
+ N_("Generate and sign hashfile"), NULL },
+ { "default-key", 's', POPT_ARG_VAL, &defaultkey, 1,
+ N_("Use as gnupg secret key"), N_("") },
+ { "hashonly", '\0', POPT_ARG_VAL, &hashonly, 1,
+ N_("Do hash stuff only"), NULL },
+ { "listonly", '\0', POPT_ARG_VAL, &listonly, 1,
+ N_("Generate pkglists/srclists and quit"), NULL },
+ { "partial", '\0', POPT_ARG_VAL,&partial, 1,
+ N_("Update just some of the already existent components"), NULL },
+ { "oldhashfile", '\0', POPT_ARG_VAL,&oldhashfile, 1,
+ N_("Enable generation of old hashfile"), NULL },
+ { "bz2only", '\0', POPT_ARG_VAL,&bz2only, 1,
+ N_("Generate only compressed lists"), NULL },
+ { "progress", '\0', POPT_ARG_VAL, &progress, 1,
+ N_("Show progress bars for genpkglist/gensrclist"), NULL },
+ { "updateinfo", '\0', POPT_ARG_STRING, &infofn, 0,
+ N_("Update information file"), N_("") },
+ { "flat", '\0', POPT_ARG_VAL, &flat, 1,
+ N_("use a flat directory structure with RPMS/SRPMS in the same
directory"), NULL },
+ { "bloat", '\0', POPT_ARG_VAL, &bloat, 1,
+
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 02-Apr-2008 10:03:03 Branch: HEAD Handle: 2008040208030300 Modified files: rpm/rpmio Makefile.am Log: unbreak snapshots Summary: RevisionChanges Path 1.161 +1 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.160 -r1.161 Makefile.am --- rpm/rpmio/Makefile.am 26 Mar 2008 14:07:28 - 1.160 +++ rpm/rpmio/Makefile.am 2 Apr 2008 08:03:03 - 1.161 @@ -4,7 +4,7 @@ LINT = splint -EXTRA_DIST = getdate.y rpmcpio.c rpmcpio.h rpmrepo.c rpmmtree.c rpmtar.c rpmtar.h tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c tsw.c lookup3.c tpw.c librpmio.vers testit.sh rpmgrep.1 rpmmtree.8 +EXTRA_DIST = getdate.y rpmcpio.c rpmcpio.h rpmrepo.c rpmmtree.c rpmtar.c rpmtar.h tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c tsw.c lookup3.c tpw.c librpmio.vers testit.sh rpmgrep.1 rpmmtree.8 LzmaTypes.h EXTRA_PROGRAMS = rpmcpio rpmrepo rpmmtree rpmtar tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am rpmrepo.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: 20-Mar-2008 22:49:21
Branch: HEAD Handle: 2008032021492100
Added files:
rpm/rpmio rpmrepo.c
Modified files:
rpm/rpmio Makefile.am
Log:
- jbj: rpmrepo: CLI options to process rpmrepo metadata.
Summary:
RevisionChanges Path
1.158 +5 -2 rpm/rpmio/Makefile.am
1.1 +259 -0 rpm/rpmio/rpmrepo.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.157 -r1.158 Makefile.am
--- rpm/rpmio/Makefile.am 18 Mar 2008 22:02:50 - 1.157
+++ rpm/rpmio/Makefile.am 20 Mar 2008 21:49:21 - 1.158
@@ -4,9 +4,9 @@
LINT = splint
-EXTRA_DIST = getdate.y rpmcpio.c rpmcpio.h rpmmtree.c rpmtar.c rpmtar.h
tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c
trpmio.c tsw.c lookup3.c tpw.c librpmio.vers testit.sh rpmgrep.1 rpmmtree.8
+EXTRA_DIST = getdate.y rpmcpio.c rpmcpio.h rpmrepo.c rpmmtree.c rpmtar.c
rpmtar.h tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c
tput.c trpmio.c tsw.c lookup3.c tpw.c librpmio.vers testit.sh rpmgrep.1
rpmmtree.8
-EXTRA_PROGRAMS = rpmcpio rpmmtree rpmtar tdir tfts tget tglob thkp thtml
tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3
+EXTRA_PROGRAMS = rpmcpio rpmrepo rpmmtree rpmtar tdir tfts tget tglob thkp
thtml tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3
bin_PROGRAMS = rpmdigest # rpmmtree
man_MANS = # rpmmtree.8
@@ -205,6 +205,9 @@
rpmdigest_SOURCES = rpmdigest.c
rpmdigest_LDADD = $(RPMIO_LDADD_COMMON)
+rpmrepo_SOURCES = rpmrepo.c
+rpmrepo_LDADD = $(RPMIO_LDADD_COMMON)
+
rpmmtree_SOURCES = rpmmtree.c
rpmmtree_LDADD = $(RPM_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmrepo.c
$ cvs diff -u -r0 -r1.1 rpmrepo.c
--- /dev/null 2008-03-20 22:44:00 +0100
+++ rpmrepo.c 2008-03-20 22:49:21 +0100
@@ -0,0 +1,259 @@
+/**
+ * \file rpmio/rpmrepo.c
+ */
+
+#include "system.h"
+
+#include
+
+#include "debug.h"
+
+/*==*/
+
+/[EMAIL PROTECTED]@*/
+static int quiet;
+/[EMAIL PROTECTED]@*/
+static int verbose;
+/[EMAIL PROTECTED]@*/
+static const char ** excludes;
+/[EMAIL PROTECTED]@*/
+static const char * basedir;
+/[EMAIL PROTECTED]@*/
+static const char * baseurl;
+/[EMAIL PROTECTED]@*/
+static const char * groupfile;
+/[EMAIL PROTECTED]@*/
+static const char * checksum = "sha";
+/[EMAIL PROTECTED]@*/
+static int noepoch;
+/[EMAIL PROTECTED]@*/
+static int pretty;
+/[EMAIL PROTECTED]@*/
+static const char * cachedir;
+/[EMAIL PROTECTED]@*/
+static int checkts;
+/[EMAIL PROTECTED]@*/
+static int database;
+/[EMAIL PROTECTED]@*/
+static int update;
+/[EMAIL PROTECTED]@*/
+static int skipstat;
+/[EMAIL PROTECTED]@*/
+static int split;
+/[EMAIL PROTECTED]@*/
+static const char ** pkglist;
+/[EMAIL PROTECTED]@*/
+static const char * outputdir;
+/[EMAIL PROTECTED]@*/
+static int skipsymlinks;
+/[EMAIL PROTECTED]@*/
+static int changeloglimit;
+/[EMAIL PROTECTED]@*/
+static int uniquemdfilenames;
+
+#if !defined(POPT_ARG_ARGV)
+static int _poptSaveString(const char ***argvp, unsigned int argInfo, const
char * val)
+ /[EMAIL PROTECTED]/
+{
+ARGV_t argv;
+int argc = 0;
+if (argvp == NULL)
+ return -1;
+if (*argvp)
+while ((*argvp)[argc] != NULL)
+ argc++;
+*argvp = xrealloc(*argvp, (argc + 1 + 1) * sizeof(**argvp));
+if ((argv = *argvp) != NULL) {
+ argv[argc++] = xstrdup(val);
+ argv[argc ] = NULL;
+}
+return 0;
+}
+#endif
+
+/**
+ */
+static void repoArgCallback(poptContext con,
+/[EMAIL PROTECTED]@*/ enum poptCallbackReason reason,
+const struct poptOption * opt, const char * arg,
+/[EMAIL PROTECTED]@*/ void * data)
+/[EMAIL PROTECTED] fileSystem, internalState @*/
+/[EMAIL PROTECTED] fileSystem, internalState @*/
+{
+/* XXX avoid accidental collisions with POPT_BIT_SET for flags */
+if (opt->arg == NULL)
+switch (opt->val) {
+#if !defined(POPT_ARG_ARGV)
+ int xx;
+case 'x':/* --excludes */
+assert(arg != NULL);
+xx = _poptSave
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 15-Mar-2008 20:02:26 Branch: HEAD Handle: 2008031519022600 Modified files: rpm/rpmio Makefile.am Log: fix building snapshots Summary: RevisionChanges Path 1.156 +1 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.155 -r1.156 Makefile.am --- rpm/rpmio/Makefile.am 14 Mar 2008 01:02:39 - 1.155 +++ rpm/rpmio/Makefile.am 15 Mar 2008 19:02:26 - 1.156 @@ -4,7 +4,7 @@ LINT = splint -EXTRA_DIST = getdate.y rpmcpio.c rpmcpio.h rpmtar.c rpmtar.h tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c tsw.c lookup3.c tpw.c librpmio.vers testit.sh rpmgrep.1 +EXTRA_DIST = getdate.y rpmcpio.c rpmcpio.h rpmtar.c rpmtar.h tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c tsw.c lookup3.c tpw.c librpmio.vers testit.sh rpmgrep.1 rpmmtree.8 EXTRA_PROGRAMS = rpmcpio rpmtar tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am ar.c cpio.c macro.c rpmrpc.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: 13-Mar-2008 23:39:33
Branch: HEAD Handle: 2008031322393200
Modified files:
rpm/rpmio Makefile.am ar.c cpio.c macro.c rpmrpc.c
Log:
- jbj: rpmio: splint fiddles.
- jbj: rpmio: add Mkdir/Chdir/Rmdir --rpmiodebug spew.
Summary:
RevisionChanges Path
1.154 +2 -0 rpm/rpmio/Makefile.am
1.17+2 -2 rpm/rpmio/ar.c
1.10+13 -8 rpm/rpmio/cpio.c
2.191 +2 -2 rpm/rpmio/macro.c
2.77+6 -0 rpm/rpmio/rpmrpc.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.153 -r1.154 Makefile.am
--- rpm/rpmio/Makefile.am 13 Mar 2008 18:56:12 - 1.153
+++ rpm/rpmio/Makefile.am 13 Mar 2008 22:39:32 - 1.154
@@ -104,6 +104,7 @@
echo "/[EMAIL PROTECTED] -modunconnomods -compdef -noeffectuncon
@*/";\
echo "/[EMAIL PROTECTED] -evalorderuncon -modobserveruncon
-modnomods @*/";\
echo "/[EMAIL PROTECTED] -branchstate -sizeoftype -usereleased @*/";\
+echo "/[EMAIL PROTECTED] -exportheader +longunsignedintegral -redecl
-type -warnlintcomments @*/";\
echo "/[EMAIL PROTECTED]@*/";\
sed -e 's,y.tab.c,getdate.c,' y.tab.c \
-e 's,^YYSTYPE ,static &,' \
@@ -111,6 +112,7 @@
-e 's,^const short ,static &,' \
-e 's,^int yydebug,/[EMAIL PROTECTED]@*/ static &,' \
-e 's,^int ,static &,' ;\
+echo "/[EMAIL PROTECTED] =exportheader =longunsignedintegral =redecl
=type =warnlintcomments @*/";\
echo "/[EMAIL PROTECTED] =branchstate =sizeoftype =usereleased @*/";\
echo "/[EMAIL PROTECTED] =evalorderuncon =modobserveruncon
=modnomods @*/";\
echo "/[EMAIL PROTECTED] =modunconnomods =compdef =noeffectuncon
@*/";\
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/ar.c
$ cvs diff -u -r1.16 -r1.17 ar.c
--- rpm/rpmio/ar.c11 Mar 2008 04:00:57 - 1.16
+++ rpm/rpmio/ar.c13 Mar 2008 22:39:32 - 1.17
@@ -261,7 +261,7 @@
_IOSMRC(rc);
#if !defined(JBJ_WRITEPAD)
rc = _iosmNext(iosm, IOSM_PAD);
- if (rc) return rc;
+ if (rc) return (int)rc;
#endif
}
}
@@ -302,7 +302,7 @@
_IOSMRC(rc);
rc = 0;
-return rc;
+return (int) rc;
}
int arTrailerWrite(void * _iosm)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/cpio.c
$ cvs diff -u -r1.9 -r1.10 cpio.c
--- rpm/rpmio/cpio.c 11 Mar 2008 04:00:57 - 1.9
+++ rpm/rpmio/cpio.c 13 Mar 2008 22:39:32 - 1.10
@@ -96,7 +96,6 @@
{
IOSM_t iosm = _iosm;
cpioHeader hdr = (cpioHeader) iosm->wrbuf;
-char * t;
size_t nb;
char * end;
int major, minor;
@@ -140,42 +139,48 @@
return IOSMERR_BAD_HEADER;
/* Read file name. */
-{t = xmalloc(nb + 1);
+{char * t = xmalloc(nb + 1);
rc = cpioRead(iosm, t, nb);
if (rc < 0) {
t = _free(t);
iosm->path = NULL;
+ } else {
+ _IOSMRC(rc);
+ t[nb] = '\0';
+ iosm->path = t;
}
- _IOSMRC(rc);
- t[nb] = '\0';
- iosm->path = t;
}
/* Read link name. */
if (S_ISLNK(st->st_mode)) {
+ char * t;
/* Make sure block aligned. */
rc = _iosmNext(iosm, IOSM_POS);
if (rc) return (int) -rc;
nb = (size_t) st->st_size;
+ t = xmalloc(nb + 1);
rc = cpioRead(iosm, t, nb);
if (rc < 0) {
t = _free(t);
iosm->lpath = NULL;
+ } else {
+ _IOSMRC(rc);
+ t[nb] = '\0';
+ iosm->lpath = t;
}
- _IOSMRC(rc);
- t[nb] = '\0';
- iosm->lpath = t;
}
rc = 0;
+/[EMAIL PROTECTED]@*/
if (_cpio_debug)
fprintf(stderr, "\t %06o%3d (%4d,%4d)%12lu %s\n\t-> %s\n",
(unsigned)st->st_mode, (int)st->st_nlink,
(int)st->st_uid, (int)st->st_gid, (unsigned long)st->st_size,
(iosm->path ? iosm->path : ""), (iosm->lpath ? iosm->lpath :
""));
+/[EMAIL PROTECTED]@*/
return (int) rc;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
=
[CVS] RPM: rpm/rpmio/ Makefile.am rpmcpio.c rpmcpio.h rpmtar.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: 12-Mar-2008 21:57:43 Branch: HEAD Handle: 2008031220574200 Added files: rpm/rpmio rpmcpio.c rpmcpio.h Modified files: rpm/rpmio Makefile.am rpmtar.c Log: - jbj: add a rpmcpio.c CLI toy (from libarchive/cpio.*). Summary: RevisionChanges Path 1.152 +12 -5 rpm/rpmio/Makefile.am 1.1 +689 -0 rpm/rpmio/rpmcpio.c 1.1 +113 -0 rpm/rpmio/rpmcpio.h 1.21+1 -1 rpm/rpmio/rpmtar.c patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.151 -r1.152 Makefile.am --- rpm/rpmio/Makefile.am 11 Mar 2008 17:59:01 - 1.151 +++ rpm/rpmio/Makefile.am 12 Mar 2008 20:57:42 - 1.152 @@ -4,9 +4,9 @@ LINT = splint -EXTRA_DIST = getdate.y rpmtar.c rpmtar.h tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c tsw.c lookup3.c tpw.c librpmio.vers testit.sh rpmgrep.1 +EXTRA_DIST = getdate.y rpmcpio.c rpmcpio.h rpmtar.c rpmtar.h tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c tsw.c lookup3.c tpw.c librpmio.vers testit.sh rpmgrep.1 -EXTRA_PROGRAMS = rpmtar tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3 +EXTRA_PROGRAMS = rpmcpio rpmtar tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3 bin_PROGRAMS = rpmdigest man_MANS = @@ -141,14 +141,18 @@ lint: $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) -.PHONY: lint_rpmtar -lint_rpmtar: - $(LINT) -f .splintrc_rpmtar $(DEFS) $(INCLUDES) rpmtar.c +.PHONY: lint_rpmcpio +lint_rpmcpio: + $(LINT) -f .splintrc_rpmcpio $(DEFS) $(INCLUDES) rpmcpio.c .PHONY: lint_rpmgrep lint_rpmgrep: $(LINT) -f .splintrc_rpmgrep $(DEFS) $(INCLUDES) rpmgrep.c +.PHONY: lint_rpmtar +lint_rpmtar: + $(LINT) -f .splintrc_rpmtar $(DEFS) $(INCLUDES) rpmtar.c + TESTS += RunGrepTest dist_noinst_SCRIPTS += RunGrepTest bin_PROGRAMS += rpmgrep @@ -189,6 +193,9 @@ testdata/wintestinput3 \ testdata/wintestoutput3 +rpmcpio_SOURCES = rpmcpio.c +rpmcpio_LDADD = $(RPM_LDADD_COMMON) + rpmdigest_SOURCES = rpmdigest.c rpmdigest_LDADD = $(RPMIO_LDADD_COMMON) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmcpio.c $ cvs diff -u -r0 -r1.1 rpmcpio.c --- /dev/null 2008-03-12 21:55:00 +0100 +++ rpmcpio.c 2008-03-12 21:57:42 +0100 @@ -0,0 +1,689 @@ +/*- + * Copyright (c) 2003-2007 Tim Kientzle + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer + *in this position and unchanged. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#define __FBSDID(_s) +#define BSDCPIO_VERSION_STRING "2.4.13" + +#define archive_version() BSDCPIO_VERSION_STRING + +/* Default: Do not try to set owner/group. */ +#define ARCHIVE_EXTRACT_OWNER (1) +/* Default: Do obey umask, do not restore SUID/SGID/SVTX bits. */ +#define ARCHIVE_EXTRACT_PERM(2) +/* Default: Do not restore mtime/atime. */ +#define ARCHIVE_EXTRACT_
[CVS] RPM: rpm/rpmio/ Makefile.am ar.c cpio.c rpmtar.c rpmtar.h tar.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: 08-Mar-2008 09:45:55
Branch: HEAD Handle: 2008030808455301
Modified files:
rpm/rpmio Makefile.am ar.c cpio.c rpmtar.c rpmtar.h tar.c
tdeb.c
Log:
- jbj: rpmtar: lash up a working rpmtar -tvf through iosm w ar/tar.
Summary:
RevisionChanges Path
1.149 +1 -1 rpm/rpmio/Makefile.am
1.14+2 -2 rpm/rpmio/ar.c
1.6 +2 -2 rpm/rpmio/cpio.c
1.10+669 -592 rpm/rpmio/rpmtar.c
1.3 +57 -61 rpm/rpmio/rpmtar.h
1.6 +4 -4 rpm/rpmio/tar.c
1.7 +0 -2 rpm/rpmio/tdeb.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.148 -r1.149 Makefile.am
--- rpm/rpmio/Makefile.am 7 Mar 2008 17:55:58 - 1.148
+++ rpm/rpmio/Makefile.am 8 Mar 2008 08:45:53 - 1.149
@@ -159,7 +159,7 @@
rpmdigest_LDADD = $(RPMIO_LDADD_COMMON)
rpmtar_SOURCES = rpmtar.c
-rpmtar_LDADD = $(RPMIO_LDADD_COMMON)
+rpmtar_LDADD = $(RPM_LDADD_COMMON)
tdeb_SOURCES = tdeb.c
tdeb_LDFLAGS = $(RPM_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/ar.c
$ cvs diff -u -r1.13 -r1.14 ar.c
--- rpm/rpmio/ar.c7 Mar 2008 17:13:49 - 1.13
+++ rpm/rpmio/ar.c8 Mar 2008 08:45:53 - 1.14
@@ -171,9 +171,9 @@
st->st_nlink = 1;
if (_ar_debug)
-fprintf(stderr, "\t %06o%3d (%4d,%4d)%12d %s\n",
+fprintf(stderr, "\t %06o%3d (%4d,%4d)%12lu %s\n",
(unsigned)st->st_mode, (int)st->st_nlink,
-(int)st->st_uid, (int)st->st_gid, (int)st->st_size,
+(int)st->st_uid, (int)st->st_gid, (unsigned long)st->st_size,
(iosm->path ? iosm->path : ""));
return (int) rc;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/cpio.c
$ cvs diff -u -r1.5 -r1.6 cpio.c
--- rpm/rpmio/cpio.c 7 Mar 2008 17:13:49 - 1.5
+++ rpm/rpmio/cpio.c 8 Mar 2008 08:45:54 - 1.6
@@ -206,9 +206,9 @@
}
if (_cpio_debug)
-fprintf(stderr, "\t %06o%3d (%4d,%4d)%10d %s\n\t-> %s\n",
+fprintf(stderr, "\t %06o%3d (%4d,%4d)%12lu %s\n\t-> %s\n",
(unsigned)st->st_mode, (int)st->st_nlink,
-(int)st->st_uid, (int)st->st_gid, (int)st->st_size,
+(int)st->st_uid, (int)st->st_gid, (unsigned long)st->st_size,
(iosm->path ? iosm->path : ""), (iosm->lpath ? iosm->lpath :
""));
return rc;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmtar.c
$ cvs diff -u -r1.9 -r1.10 rpmtar.c
--- rpm/rpmio/rpmtar.c8 Mar 2008 04:41:27 - 1.9
+++ rpm/rpmio/rpmtar.c8 Mar 2008 08:45:54 - 1.10
@@ -64,9 +64,6 @@
#include "system.h"
__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.79 2008/01/22 07:23:44
kientzle Exp $");
-#include
-#include
-
#ifdef HAVE_LANGINFO_H
#include
#endif
@@ -77,11 +74,45 @@
#include
#endif
-#include
-#include "rpmtar.h"
+#include
+#include
+#include
+
+#include "../rpmdb/rpmtag.h"
+
+typedef /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ struct rpmts_s * rpmts;
+typedef /[EMAIL PROTECTED]@*/ struct rpmte_s * rpmte;
+
+#define _RPMFI_INTERNAL
+#include "../lib/rpmfi.h"
+
+#define _IOSM_INTERNAL
+#include /* XXX CPIO_FOO/FSM_FOO constants */
+#include
+#include
+#include
+
+typedef /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ struct rpmds_s * rpmds;
+typedef struct rpmRelocation_s * rpmRelocation;
+
+typedef /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ struct rpmdb_s * rpmdb;
+typedef /[EMAIL PROTECTED]@*/ struct rpmdbMatchIterator_s *
rpmdbMatchIterator;
+typedef struct rpmPRCO_s * rpmPRCO;
+typedef struct Spec_s * Spec;
+#include "../lib/rpmts.h"
+
+typedef /[EMAIL PROTECTED]@*/ /[EMAIL PROTECTED]@*/ struct rpmpsm_s * rpmpsm;
+#define _RPMSQ_INTERNAL
+#include "../lib/psm.h"
+
+#include
#include "debug.h"
+/[EMAIL PROTECTED] FD_t @*/
+/[EMAIL PROTECTED] rpmpsm @*/
+/[EMAIL PROTECTED] IOSM_t @*/
+/[EMAIL PROTECTED] rpmfi @*/
/*
* Per POSIX.1-1988, tar defaults to reading/writing
[CVS] RPM: rpm/rpmio/ Makefile.am rpmtar.c rpmtar.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: 07-Mar-2008 18:55:58
Branch: HEAD Handle: 2008030717555800
Added files:
rpm/rpmio rpmtar.c rpmtar.h
Modified files:
rpm/rpmio Makefile.am
Log:
- jbj: rpmtar: swipe a copy of bsdtar.[ch], prepare for popt CLI
surgery.
Summary:
RevisionChanges Path
1.148 +5 -2 rpm/rpmio/Makefile.am
1.1 +926 -0 rpm/rpmio/rpmtar.c
1.1 +176 -0 rpm/rpmio/rpmtar.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.147 -r1.148 Makefile.am
--- rpm/rpmio/Makefile.am 6 Mar 2008 22:31:34 - 1.147
+++ rpm/rpmio/Makefile.am 7 Mar 2008 17:55:58 - 1.148
@@ -4,9 +4,9 @@
LINT = splint
-EXTRA_DIST = tdeb.c tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c
tkey.c tmire.c tput.c trpmio.c tsw.c ttar.c lookup3.c tpw.c librpmio.vers
testit.sh rpmgrep.1
+EXTRA_DIST = rpmtar.c rpmtar.h tdeb.c tdir.c tfts.c tget.c tglob.c thkp.c
thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c tsw.c ttar.c lookup3.c tpw.c
librpmio.vers testit.sh rpmgrep.1
-EXTRA_PROGRAMS = tdeb tdir tfts tget tglob thkp thtml tinv tkey tmacro
tmagic tmire tput tpw trpmio tsw ttar dumpasn1 lookup3
+EXTRA_PROGRAMS = rpmtar tdeb tdir tfts tget tglob thkp thtml tinv tkey
tmacro tmagic tmire tput tpw trpmio tsw ttar dumpasn1 lookup3
bin_PROGRAMS = rpmdigest
man_MANS =
@@ -158,6 +158,9 @@
rpmdigest_SOURCES = rpmdigest.c
rpmdigest_LDADD = $(RPMIO_LDADD_COMMON)
+rpmtar_SOURCES = rpmtar.c
+rpmtar_LDADD = $(RPMIO_LDADD_COMMON)
+
tdeb_SOURCES = tdeb.c
tdeb_LDFLAGS = $(RPM_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmtar.c
$ cvs diff -u -r0 -r1.1 rpmtar.c
--- /dev/null 2008-03-07 18:55:00 +0100
+++ rpmtar.c 2008-03-07 18:55:58 +0100
@@ -0,0 +1,926 @@
+/*-
+ * Copyright (c) 2003-2007 Tim Kientzle
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "system.h"
+__FBSDID("$FreeBSD: src/usr.bin/tar/bsdtar.c,v 1.79 2008/01/22 07:23:44
kientzle Exp $");
+
+#ifdef HAVE_GETOPT_LONG
+#include
+#else
+struct option {
+ const char *name;
+ int has_arg;
+ int *flag;
+ int val;
+};
+#define no_argument 0
+#define required_argument 1
+#endif
+#ifdef HAVE_LANGINFO_H
+#include
+#endif
+#ifdef HAVE_LOCALE_H
+#include
+#endif
+#ifdef HAVE_PATHS_H
+#include
+#endif
+#if HAVE_ZLIB_H
+#include
+#endif
+
+#include "bsdtar.h"
+
+#include "debug.h"
+
+#if !HAVE_DECL_OPTARG
+extern int optarg;
+#endif
+
+#if !HAVE_DECL_OPTIND
+extern int optind;
+#endif
+
+/*
+ * Per POSIX.1-1988, tar defaults to reading/writing archives to/from
+ * the default tape device for the system. Pick something reasonable here.
+ */
+#ifdef __linux
+#define _PATH_DEFTAPE "/dev/st0"
+#endif
+
+#ifndef _PATH_DEFTAPE
+#define _PATH_DEFTAPE "/dev/tape"
+#endif
+
+/* External function to parse a date/time string (from getdate.y) */
+time_t get_date(const char *)
+ /[
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 06-Mar-2008 23:31:34 Branch: HEAD Handle: 2008030622313400 Modified files: rpm/rpmio Makefile.am Log: rename variables to avoid automake warnings Summary: RevisionChanges Path 1.147 +23 -23 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.146 -r1.147 Makefile.am --- rpm/rpmio/Makefile.am 4 Mar 2008 01:42:55 - 1.146 +++ rpm/rpmio/Makefile.am 6 Mar 2008 22:31:34 - 1.147 @@ -30,16 +30,16 @@ @WITH_FILE_CPPFLAGS@ \ @WITH_XAR_CPPFLAGS@ -RPMIO_LDADD = \ +RPMIO_LDADD_COMMON = \ $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/misc/librpmmisc.la \ @LTLIBINTL@ -RPM_LDADD = \ +RPM_LDADD_COMMON = \ $(top_builddir)/build/librpmbuild.la \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmdb/librpmdb.la \ - $(RPMIO_LDADD) + $(RPMIO_LDADD_COMMON) pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX) pkginc_HEADERS = \ @@ -121,7 +121,7 @@ man_MANS += rpmgrep.1 rpmgrep_SOURCES = rpmgrep.c -rpmgrep_LDADD = $(RPMIO_LDADD) +rpmgrep_LDADD = $(RPMIO_LDADD_COMMON) EXTRA_DIST += \ testdata/grepinput \ @@ -156,68 +156,68 @@ testdata/wintestoutput3 rpmdigest_SOURCES = rpmdigest.c -rpmdigest_LDADD = $(RPMIO_LDADD) +rpmdigest_LDADD = $(RPMIO_LDADD_COMMON) tdeb_SOURCES = tdeb.c -tdeb_LDFLAGS = $(RPM_LDADD) +tdeb_LDFLAGS = $(RPM_LDADD_COMMON) tdir_SOURCES = tdir.c -tdir_LDADD = $(RPMIO_LDADD) +tdir_LDADD = $(RPMIO_LDADD_COMMON) tfts_SOURCES = tfts.c -tfts_LDADD = $(RPMIO_LDADD) +tfts_LDADD = $(RPMIO_LDADD_COMMON) tget_SOURCES = tget.c -tget_LDADD = $(RPMIO_LDADD) +tget_LDADD = $(RPMIO_LDADD_COMMON) tglob_SOURCES = tglob.c -tglob_LDADD = $(RPMIO_LDADD) +tglob_LDADD = $(RPMIO_LDADD_COMMON) thkp_SOURCES = thkp.c -thkp_LDADD = $(RPMIO_LDADD) +thkp_LDADD = $(RPMIO_LDADD_COMMON) thtml_SOURCES = thtml.c thtml_CFLAGS = $(CFLAGS) -I/usr/include/libxml2/ -thtml_LDADD = $(RPMIO_LDADD) +thtml_LDADD = $(RPMIO_LDADD_COMMON) tinv_SOURCES = tinv.c -tinv_LDADD = $(RPMIO_LDADD) +tinv_LDADD = $(RPMIO_LDADD_COMMON) tkey_SOURCES = gengpg.h tkey.c rpmgc.c rpmnss.c rpmssl.c tkey_CFLAGS = $(CFLAGS) -tkey_LDADD = $(RPMIO_LDADD) -lgcrypt +tkey_LDADD = $(RPMIO_LDADD_COMMON) -lgcrypt gengpg.h: -sh ./gengpg.sh > gengpg.h tmacro_SOURCES = -tmacro_LDADD = tmacro.o $(RPMIO_LDADD) +tmacro_LDADD = tmacro.o $(RPMIO_LDADD_COMMON) tmacro.o: macro.c $(COMPILE) -DDEBUG_MACROS -o $@ -c $< tmagic_SOURCES = tmagic.c -tmagic_LDADD = $(RPMIO_LDADD) +tmagic_LDADD = $(RPMIO_LDADD_COMMON) tmire_SOURCES = tmire.c -tmire_LDADD = $(RPMIO_LDADD) +tmire_LDADD = $(RPMIO_LDADD_COMMON) tput_SOURCES = tput.c -tput_LDADD = $(RPMIO_LDADD) +tput_LDADD = $(RPMIO_LDADD_COMMON) tpw_SOURCES = tpw.c -tpw_LDFLAGS = $(RPMIO_LDADD) +tpw_LDFLAGS = $(RPMIO_LDADD_COMMON) trpmio_SOURCES = trpmio.c -trpmio_LDADD = $(RPMIO_LDADD) +trpmio_LDADD = $(RPMIO_LDADD_COMMON) tsw_SOURCES = tsw.c -tsw_LDFLAGS = $(RPMIO_LDADD) +tsw_LDFLAGS = $(RPMIO_LDADD_COMMON) ttar_SOURCES = ttar.c -ttar_LDFLAGS = $(RPM_LDADD) +ttar_LDFLAGS = $(RPM_LDADD_COMMON) dumpasn1_SOURCES = dumpasn1.c lookup3_SOURCES = lookup3.c lookup3_CFLAGS = $(CFLAGS) -D_JLU3_SELFTEST -lookup3_LDADD = $(RPMIO_LDADD) +lookup3_LDADD = $(RPMIO_LDADD_COMMON) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 17-Feb-2008 18:20:29 Branch: HEAD Handle: 2008021717202900 Modified files: rpm/rpmio Makefile.am Log: unbreak the snapshots (rpmgrep.1 was missing) Summary: RevisionChanges Path 1.136 +1 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.135 -r1.136 Makefile.am --- rpm/rpmio/Makefile.am 17 Feb 2008 02:09:11 - 1.135 +++ rpm/rpmio/Makefile.am 17 Feb 2008 17:20:29 - 1.136 @@ -4,7 +4,7 @@ LINT = splint -EXTRA_DIST = tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c tsw.c ttar.c lookup3.c tpw.c librpmio.vers testit.sh +EXTRA_DIST = tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c tsw.c ttar.c lookup3.c tpw.c librpmio.vers testit.sh rpmgrep.1 EXTRA_PROGRAMS = tdir tfts tget thkp thtml tinv tkey tmacro tmagic tmire tput tpw trpmio tsw ttar dumpasn1 lookup3 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 15-Feb-2008 18:21:54 Branch: HEAD Handle: 2008021517215400 Modified files: rpm/rpmio Makefile.am Log: - jbj: rpmio: rpmgrep "make check" is better than tfoo, relegate to EXTRA_DIST. Summary: RevisionChanges Path 1.134 +5 -7 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.133 -r1.134 Makefile.am --- rpm/rpmio/Makefile.am 13 Feb 2008 22:40:59 - 1.133 +++ rpm/rpmio/Makefile.am 15 Feb 2008 17:21:54 - 1.134 @@ -4,19 +4,17 @@ LINT = splint -EXTRA_DIST = gengpg.sh thkp.c thtml.c tinv.c tkey.c tput.c trpmio.c lookup3.c tpw.c librpmio.vers testit.sh +EXTRA_DIST = tdir.c tfts.c tget.c tglob.c thkp.c thtml.c tinv.c tkey.c tmire.c tput.c trpmio.c lookup3.c tpw.c librpmio.vers testit.sh -EXTRA_PROGRAMS = thkp thtml tinv tkey tmacro tmagic tput tpw trpmio tsw dumpasn1 lookup3 +EXTRA_PROGRAMS = tdir tfts tget thkp thtml tinv tkey tmacro tmagic tmire tput tpw trpmio tsw dumpasn1 lookup3 bin_PROGRAMS = man_MANS = TESTS = -check_PROGRAMS = tdir tfts tget tglob tmire -check_SCRIPTS = testit.sh -dist_noinst_SCRIPTS = - -# TESTS += testit.sh +check_PROGRAMS = +check_SCRIPTS = +dist_noinst_SCRIPTS = gengpg.sh testit.sh AM_CPPFLAGS = \ -I$(srcdir) \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 10-Feb-2008 11:46:34 Branch: HEAD Handle: 2008021010463400 Modified files: rpm/rpmio Makefile.am Log: do not build test programs by default (only under "make check") and fix "make dist" (testit.sh was missing) Summary: RevisionChanges Path 1.129 +3 -3 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.128 -r1.129 Makefile.am --- rpm/rpmio/Makefile.am 10 Feb 2008 02:08:27 - 1.128 +++ rpm/rpmio/Makefile.am 10 Feb 2008 10:46:34 - 1.129 @@ -4,12 +4,12 @@ LINT = splint -EXTRA_DIST = gengpg.sh thkp.c thtml.c tinv.c tkey.c tput.c trpmio.c lookup3.c tpw.c librpmio.vers +EXTRA_DIST = gengpg.sh thkp.c thtml.c tinv.c tkey.c tput.c trpmio.c lookup3.c tpw.c librpmio.vers testit.sh EXTRA_PROGRAMS = thkp thtml tinv tkey tmacro tmagic tput tpw trpmio tsw dumpasn1 lookup3 -noinst_PROGRAMS = tdir tfts tget tglob tmire -noinst_SCRIPTS = testit.sh +check_PROGRAMS = tdir tfts tget tglob tmire +check_SCRIPTS = testit.sh TESTS = testit.sh @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 04-Feb-2008 21:09:37 Branch: HEAD Handle: 2008020420093700 Modified files: rpm/rpmio Makefile.am Log: remove double entry to please Automake Summary: RevisionChanges Path 1.121 +0 -3 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.120 -r1.121 Makefile.am --- rpm/rpmio/Makefile.am 2 Feb 2008 01:33:19 - 1.120 +++ rpm/rpmio/Makefile.am 4 Feb 2008 20:09:37 - 1.121 @@ -119,9 +119,6 @@ gengpg.h: -sh ./gengpg.sh > gengpg.h -tmire_SOURCES = tmire.c -tmire_LDADD = $(RPM_LDADD) - tmacro_SOURCES = tmacro_LDADD = tmacro.o $(RPM_LDADD) tmacro.o: macro.c @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am tmagic.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: 31-Jul-2007 20:25:33
Branch: HEAD Handle: 2007073119253300
Added files:
rpm/rpmio tmagic.c
Modified files:
rpm/rpmio Makefile.am
Log:
toy magic dispatch harness.
Summary:
RevisionChanges Path
1.103 +4 -1 rpm/rpmio/Makefile.am
1.1 +83 -0 rpm/rpmio/tmagic.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.102 -r1.103 Makefile.am
--- rpm/rpmio/Makefile.am 29 Jul 2007 14:02:34 - 1.102
+++ rpm/rpmio/Makefile.am 31 Jul 2007 18:25:33 - 1.103
@@ -6,7 +6,7 @@
EXTRA_DIST = tax.c tdir.c tfts.c tget.c thkp.c tput.c tglob.c tinv.c tkey.c
trpmio.c lookup3.c librpmio.vers
-EXTRA_PROGRAMS = tax tdir tfts tget thkp tmacro tput tglob tinv tkey trpmio
tsw dumpasn1 lookup3
+EXTRA_PROGRAMS = tax tdir tfts tget thkp tmacro tput tglob tinv tkey tmagic
trpmio tsw dumpasn1 lookup3
AM_CPPFLAGS = \
-I$(srcdir) \
@@ -116,6 +116,9 @@
tmacro.o: macro.c
$(COMPILE) -DDEBUG_MACROS -o $@ -c $<
+tmagic_SOURCES = tmagic.c
+tmagic_LDADD = $(RPM_LDADD)
+
tput_SOURCES = tput.c
tput_LDADD = $(RPM_LDADD)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/tmagic.c
$ cvs diff -u -r0 -r1.1 tmagic.c
--- /dev/null 2007-07-31 20:22:00 +0200
+++ tmagic.c 2007-07-31 20:25:33 +0200
@@ -0,0 +1,83 @@
+#include "system.h"
+
+#include
+#include
+#include
+#include
+
+#include "magic.h"
+
+#include "debug.h"
+
+static int _debug = 0;
+
+#define FNPATH "tmagic.test"
+static char * fnpath = FNPATH;
+
+static void readFile(const char * path)
+{
+FD_t fd;
+
+fprintf(stderr, "= %s\n", path);
+fd = Fopen(path, "r");
+if (fd != NULL) {
+ char buf[BUFSIZ];
+ size_t len = Fread(buf, 1, sizeof(buf), fd);
+ int xx;
+xx = Fclose(fd);
+
+ if (len > 0)
+ fwrite(buf, 1, len, stderr);
+}
+}
+
+static struct poptOption optionsTable[] = {
+ { "debug", 'd', POPT_ARG_VAL, &_debug, -1,NULL, NULL },
+ { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1,
+ N_("debug protocol data stream"), NULL},
+ { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug,
-1,
+ N_("debug rpmio I/O"), NULL},
+ { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1,
+ N_("debug URL cache handling"), NULL},
+ { "verbose", 'v', 0, 0, 'v',NULL, NULL },
+ POPT_AUTOHELP
+ POPT_TABLEEND
+};
+
+int
+main(int argc, const char *argv[])
+{
+poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable,
0);
+int msflags = MAGIC_CHECK;
+magic_t ms = NULL;
+const char * magicfile = NULL;
+int rc;
+int xx;
+
+while ((rc = poptGetNextOpt(optCon)) > 0) {
+ switch (rc) {
+ case 'v':
+ rpmIncreaseVerbosity();
+ /[EMAIL PROTECTED]@*/ break;
+ default:
+/[EMAIL PROTECTED]@*/ break;
+ }
+}
+
+ms = magic_open(msflags);
+assert(ms);
+xx = magic_load(ms, magicfile);
+
+if (_debug) {
+ rpmIncreaseVerbosity();
+ rpmIncreaseVerbosity();
+}
+
+readFile(fnpath);
+
+if (ms)
+ magic_close(ms);
+/[EMAIL PROTECTED]@*/ urlFreeCache();
+
+return 0;
+}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 17-Jul-2007 17:35:34 Branch: HEAD Handle: 2007071716353400 Modified files: rpm/rpmio Makefile.am Log: tficl.c is gone Summary: RevisionChanges Path 1.98+1 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.97 -r1.98 Makefile.am --- rpm/rpmio/Makefile.am 16 Jul 2007 08:49:04 - 1.97 +++ rpm/rpmio/Makefile.am 17 Jul 2007 15:35:34 - 1.98 @@ -4,7 +4,7 @@ LINT = splint -EXTRA_DIST = tax.c tdir.c tficl.c tfts.c tget.c thkp.c tput.c tglob.c tinv.c tkey.c trpmio.c lookup3.c librpmio.vers +EXTRA_DIST = tax.c tdir.c tfts.c tget.c thkp.c tput.c tglob.c tinv.c tkey.c trpmio.c lookup3.c librpmio.vers EXTRA_PROGRAMS = tax tdir tfts tget thkp tmacro tput tglob tinv tkey trpmio tsw dumpasn1 lookup3 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 15-Jul-2007 00:31:05 Branch: HEAD Handle: 2007071423310500 Modified files: rpm/rpmio Makefile.am Log: fix tax_LDADD and remove txxx_LDFLAGS as I see no reason why the test programs have to be linked statically Summary: RevisionChanges Path 1.93+1 -10 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.92 -r1.93 Makefile.am --- rpm/rpmio/Makefile.am 14 Jul 2007 22:22:35 - 1.92 +++ rpm/rpmio/Makefile.am 14 Jul 2007 22:31:05 - 1.93 @@ -71,44 +71,35 @@ $(LINT) $(DEFS) $(INCLUDES) $(librpmio_la_SOURCES) tax_SOURCES = tax.c -tax_LDADD = librpmio.la +tax_LDADD = $(RPM_LDADD) tdir_SOURCES = tdir.c -tdir_LDFLAGS = @LDFLAGS_STATIC@ tdir_LDADD = $(RPM_LDADD) tfts_SOURCES = tfts.c -tfts_LDFLAGS = @LDFLAGS_STATIC@ tfts_LDADD = $(RPM_LDADD) tget_SOURCES = tget.c -tget_LDFLAGS = @LDFLAGS_STATIC@ tget_LDADD = $(RPM_LDADD) thkp_SOURCES = thkp.c -thkp_LDFLAGS = @LDFLAGS_STATIC@ thkp_LDADD = $(RPM_LDADD) tmacro_SOURCES = -tmacro_LDFLAGS = @LDFLAGS_STATIC@ tmacro_LDADD = tmacro.o $(RPM_LDADD) tmacro.o: macro.c $(COMPILE) -DDEBUG_MACROS -o $@ -c $< tput_SOURCES = tput.c -tput_LDFLAGS = @LDFLAGS_STATIC@ tput_LDADD = $(RPM_LDADD) tglob_SOURCES = tglob.c -tglob_LDFLAGS = @LDFLAGS_STATIC@ tglob_LDADD = $(RPM_LDADD) tinv_SOURCES = tinv.c -tinv_LDFLAGS = @LDFLAGS_STATIC@ tinv_LDADD = $(RPM_LDADD) tkey_SOURCES = tkey.c -tkey_LDFLAGS = @LDFLAGS_STATIC@ tkey_LDADD = $(RPM_LDADD) trpmio_SOURCES = trpmio.c @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 15-Jul-2007 00:22:35 Branch: HEAD Handle: 2007071423223500 Modified files: rpm/rpmio Makefile.am Log: do not hard-code POPT, it actually is nowdays external; fix building by providing all RPM libraries Summary: RevisionChanges Path 1.92+20 -12 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.91 -r1.92 Makefile.am --- rpm/rpmio/Makefile.am 14 Jul 2007 20:33:25 - 1.91 +++ rpm/rpmio/Makefile.am 14 Jul 2007 22:22:35 - 1.92 @@ -21,6 +21,14 @@ @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ +RPM_LDADD = \ + $(top_builddir)/build/librpmbuild.la \ + $(top_builddir)/lib/librpm.la \ + $(top_builddir)/rpmdb/librpmdb.la \ + $(top_builddir)/rpmio/librpmio.la \ + $(top_builddir)/misc/librpmmisc.la \ + @LTLIBINTL@ + pkgincdir = $(pkgincludedir) pkginc_HEADERS = \ argv.h envvar.h fts.h mire.h rpmdav.h rpmhash.h \ @@ -67,53 +75,53 @@ tdir_SOURCES = tdir.c tdir_LDFLAGS = @LDFLAGS_STATIC@ -tdir_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tdir_LDADD = $(RPM_LDADD) tfts_SOURCES = tfts.c tfts_LDFLAGS = @LDFLAGS_STATIC@ -tfts_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tfts_LDADD = $(RPM_LDADD) tget_SOURCES = tget.c tget_LDFLAGS = @LDFLAGS_STATIC@ -tget_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tget_LDADD = $(RPM_LDADD) thkp_SOURCES = thkp.c thkp_LDFLAGS = @LDFLAGS_STATIC@ -thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +thkp_LDADD = $(RPM_LDADD) tmacro_SOURCES = tmacro_LDFLAGS = @LDFLAGS_STATIC@ -tmacro_LDADD = tmacro.o librpmio.la +tmacro_LDADD = tmacro.o $(RPM_LDADD) tmacro.o: macro.c $(COMPILE) -DDEBUG_MACROS -o $@ -c $< tput_SOURCES = tput.c tput_LDFLAGS = @LDFLAGS_STATIC@ -tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tput_LDADD = $(RPM_LDADD) tglob_SOURCES = tglob.c tglob_LDFLAGS = @LDFLAGS_STATIC@ -tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tglob_LDADD = $(RPM_LDADD) tinv_SOURCES = tinv.c tinv_LDFLAGS = @LDFLAGS_STATIC@ -tinv_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tinv_LDADD = $(RPM_LDADD) tkey_SOURCES = tkey.c tkey_LDFLAGS = @LDFLAGS_STATIC@ -tkey_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +tkey_LDADD = $(RPM_LDADD) trpmio_SOURCES = trpmio.c -trpmio_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la +trpmio_LDADD = $(RPM_LDADD) tsw_SOURCES = tsw.c -tsw_LDFLAGS = librpmio.la +tsw_LDFLAGS = $(RPM_LDADD) dumpasn1_SOURCES = dumpasn1.c lookup3_SOURCES = lookup3.c lookup3_CFLAGS = $(CFLAGS) -D_JLU3_SELFTEST -lookup3_LDADD = librpmio.la +lookup3_LDADD = $(RPM_LDADD) tficl.o: tficl.c $(COMPILE) -I/usr/include/ficl -o $@ -c tficl.c @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 14-Jul-2007 22:33:25 Branch: HEAD Handle: 2007071421332500 Modified files: rpm/rpmio Makefile.am Log: try to fix building of tmacro Summary: RevisionChanges Path 1.91+2 -2 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.90 -r1.91 Makefile.am --- rpm/rpmio/Makefile.am 27 Jun 2007 20:20:27 - 1.90 +++ rpm/rpmio/Makefile.am 14 Jul 2007 20:33:25 - 1.91 @@ -81,9 +81,9 @@ thkp_LDFLAGS = @LDFLAGS_STATIC@ thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la -tmacro_SOURCES = +tmacro_SOURCES = tmacro_LDFLAGS = @LDFLAGS_STATIC@ -tmacro_LDADD = tmacro.o # librpmio.la $(top_builddir)/popt/libpopt.la +tmacro_LDADD = tmacro.o librpmio.la tmacro.o: macro.c $(COMPILE) -DDEBUG_MACROS -o $@ -c $< @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am macro.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: 22-Jun-2007 04:05:04
Branch: HEAD Handle: 2007062203050300
Modified files:
rpm/rpmio Makefile.am macro.c
Log:
resurrect standalone macro tester.
Summary:
RevisionChanges Path
1.82+7 -2 rpm/rpmio/Makefile.am
2.119 +22 -4 rpm/rpmio/macro.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.81 -r1.82 Makefile.am
--- rpm/rpmio/Makefile.am 20 Jun 2007 21:10:22 - 1.81
+++ rpm/rpmio/Makefile.am 22 Jun 2007 02:05:03 - 1.82
@@ -6,7 +6,7 @@
EXTRA_DIST = tax.c tdir.c tficl.c tfts.c tget.c thkp.c tput.c tglob.c tinv.c
tkey.c trpmio.c lookup3.c librpmio.vers
-EXTRA_PROGRAMS = tax tdir tfts tget thkp tput tglob tinv tkey trpmio tsw
dumpasn1 lookup3
+EXTRA_PROGRAMS = tax tdir tfts tget thkp tmacro tput tglob tinv tkey trpmio
tsw dumpasn1 lookup3
INCLUDES = -I. \
-I$(top_srcdir) \
@@ -74,11 +74,16 @@
thkp_LDFLAGS = @LDFLAGS_STATIC@
thkp_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
+tmacro_SOURCES =
+tmacro_LDFLAGS = # @LDFLAGS_STATIC@
+tmacro_LDADD = tmacro.o # librpmio.la $(top_builddir)/popt/libpopt.la
+tmacro.o: macro.c
+ $(COMPILE) -DDEBUG_MACROS -DEVAL_MACROS -o $@ -c $<
+
tput_SOURCES = tput.c
tput_LDFLAGS = @LDFLAGS_STATIC@
tput_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
-
tglob_SOURCES = tglob.c
tglob_LDFLAGS = @LDFLAGS_STATIC@
tglob_LDADD = librpmio.la $(top_builddir)/popt/libpopt.la
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
$ cvs diff -u -r2.118 -r2.119 macro.c
--- rpm/rpmio/macro.c 17 Jun 2007 14:49:02 - 2.118
+++ rpm/rpmio/macro.c 22 Jun 2007 02:05:03 - 2.119
@@ -21,13 +21,21 @@
#include
#include
#include
+#include
#define rpmError fprintf
+#define rpmIsVerbose() (0)
#define RPMERR_BADSPEC stderr
#undef _
#define _(x)x
-#define vmefail() (exit(1), NULL)
-#define urlPath(_xr, _r)*(_r) = (_xr)
+#define vmefail(_nb)(exit(1), NULL)
+#define URL_IS_DASH 1
+#define URL_IS_PATH 2
+#define urlPath(_xr, _r)(*(_r) = (_xr), URL_IS_PATH)
+#define xisalnum(_c)isalnum(_c)
+#define xisalpha(_c)isalpha(_c)
+#define xisdigit(_c)isdigit(_c)
+#
typedef FILE * FD_t;
#define Fopen(_path, _fmode) fopen(_path, "r");
@@ -1148,7 +1156,8 @@
else
b = (rpmIsVerbose() ? buf : NULL);
} else if (STREQ("url2path", f, fn) || STREQ("u2p", f, fn)) {
- (void)urlPath(buf, (const char **)&b);
+ int ut = urlPath(buf, (const char **)&b);
+ ut = ut;/* XXX quiet gcc */
/[EMAIL PROTECTED]@*/
if (*b == '\0') b = "/";
/[EMAIL PROTECTED]@*/
@@ -1577,6 +1586,7 @@
return rc;
}
+#if !defined(DEBUG_MACROS)
/* === */
/* XXX dupe'd to avoid change in linkage conventions. */
@@ -1841,6 +1851,7 @@
/[EMAIL PROTECTED]@*/
return rc;
}
+#endif /* !defined(DEBUG_MACROS) */
/* === */
@@ -2032,9 +2043,16 @@
/* Glob expand the macro file path element, expanding ~ to $HOME. */
ac = 0;
av = NULL;
+#if defined(DEBUG_MACROS)
+ ac = 1;
+ av = xmalloc((ac + 1) * sizeof(*av));
+ av[0] = strdup(m);
+ av[1] = NULL;
+#else
i = rpmGlob(m, &ac, &av);
if (i != 0)
continue;
+#endif
/* Read macros from each file. */
@@ -2414,7 +2432,7 @@
#if defined(EVAL_MACROS)
-char *rpmMacrofiles = "/usr/lib/rpm/macros:/etc/rpm/macros:~/.rpmmacros";
+const char *rpmMacrofiles = MACROFILES;
int
main(int argc, char *argv[])
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ Makefile.am
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: 14-Jun-2007 14:56:56 Branch: HEAD Handle: 2007061413565600 Modified files: rpm/rpmio Makefile.am Log: do not hard-code -lpthread in rpmio/Makefile.am as this is not portable at all. It is also not necessary AFAIK as we have an explicit AC_CHECK_LIB(pthread, ...) in RPM's configure which will on-demand add -lpthread to LIBS Summary: RevisionChanges Path 1.79+0 -1 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.78 -r1.79 Makefile.am --- rpm/rpmio/Makefile.am 30 May 2007 02:49:41 - 1.78 +++ rpm/rpmio/Makefile.am 14 Jun 2007 12:56:56 - 1.79 @@ -50,7 +50,6 @@ @WITH_MAGIC_LIB@ \ @WITH_KEYUTILS_LIB@ \ @WITH_ZLIB_LIB@ \ - -lpthread \ @LTLIBINTL@ librpmio_la_LIBADD = # $(BEECRYPTLOBJS) librpmio_la_DEPENDENCIES = # .created @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
