[CVS] RPM: rpm-5_4: rpm/ system.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 09-Aug-2013 12:08:24 Branch: rpm-5_4 Handle: 2013080910082400 Modified files: (Branch: rpm-5_4) rpm system.h Log: macosx: the uuid functions also conflict now Summary: RevisionChanges Path 2.129.2.7 +4 -0 rpm/system.h patch -p0 '@@ .' Index: rpm/system.h $ cvs diff -u -r2.129.2.6 -r2.129.2.7 system.h --- rpm/system.h 8 Aug 2013 21:45:25 - 2.129.2.6 +++ rpm/system.h 9 Aug 2013 10:08:24 - 2.129.2.7 @@ -62,8 +62,12 @@ of _POSIX_VERSION. */ #ifdef HAVE_UNISTD_H #define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different. */ +#define uuid_create unistd_uuid_create +#define uuid_compareunistd_uuid_compare #include unistd.h #undef unistd_uuid_t /* XXX Mac OS X dares to be different. */ +#undef unistd_uuid_create +#undef unistd_uuid_compare #if defined(__LCLINT__) /*@-superuser -declundef -incondefs @*/ /* LCL: modifies clause missing */ extern int chroot (const char *__path) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ system.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 09-Aug-2013 12:30:24 Branch: rpm-5_4 Handle: 2013080910302200 Modified files: (Branch: rpm-5_4) rpm system.h Log: move uuid workaround to the right header Summary: RevisionChanges Path 2.129.2.8 +4 -4 rpm/system.h patch -p0 '@@ .' Index: rpm/system.h $ cvs diff -u -r2.129.2.7 -r2.129.2.8 system.h --- rpm/system.h 9 Aug 2013 10:08:24 - 2.129.2.7 +++ rpm/system.h 9 Aug 2013 10:30:22 - 2.129.2.8 @@ -62,12 +62,8 @@ of _POSIX_VERSION. */ #ifdef HAVE_UNISTD_H #define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different. */ -#define uuid_create unistd_uuid_create -#define uuid_compareunistd_uuid_compare #include unistd.h #undef unistd_uuid_t /* XXX Mac OS X dares to be different. */ -#undef unistd_uuid_create -#undef unistd_uuid_compare #if defined(__LCLINT__) /*@-superuser -declundef -incondefs @*/ /* LCL: modifies clause missing */ extern int chroot (const char *__path) @@ -328,8 +324,12 @@ #if defined(HAVE_GRP_H) #define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different. */ +#define uuid_create unistd_uuid_create +#define uuid_compareunistd_uuid_compare #include grp.h #undef unistd_uuid_t /* XXX Mac OS X dares to be different. */ +#undef unistd_uuid_create +#undef unistd_uuid_compare #endif #if defined(HAVE_LIMITS_H) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/python/ system.h rpm/ system.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 08-Aug-2013 23:45:26 Branch: rpm-5_4 Handle: 2013080821452501 Modified files: (Branch: rpm-5_4) rpm system.h rpm/python system.h Log: macosx: fix the uuid build on mountain lion Summary: RevisionChanges Path 1.5.2.1 +2 -0 rpm/python/system.h 2.129.2.6 +2 -0 rpm/system.h patch -p0 '@@ .' Index: rpm/python/system.h $ cvs diff -u -r1.5 -r1.5.2.1 system.h --- rpm/python/system.h 3 Dec 2010 18:29:22 - 1.5 +++ rpm/python/system.h 8 Aug 2013 21:45:26 - 1.5.2.1 @@ -9,7 +9,9 @@ #include sys/types.h #endif +#define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different. */ #include Python.h +#undef unistd_uuid_t /* XXX Mac OS X dares to be different. */ #if PY_MAJOR_VERSION == 2 PY_MINOR_VERSION 4 #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None @@ . patch -p0 '@@ .' Index: rpm/system.h $ cvs diff -u -r2.129.2.5 -r2.129.2.6 system.h --- rpm/system.h 26 Jul 2012 12:56:08 - 2.129.2.5 +++ rpm/system.h 8 Aug 2013 21:45:25 - 2.129.2.6 @@ -323,7 +323,9 @@ #endif #if defined(HAVE_GRP_H) +#define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different. */ #include grp.h +#undef unistd_uuid_t /* XXX Mac OS X dares to be different. */ #endif #if defined(HAVE_LIMITS_H) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: syck/lib/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: syck Date: 08-Aug-2013 23:58:58 Branch: rpm-5_4 Handle: 2013080821585800 Modified files: (Branch: rpm-5_4) syck/libMakefile.am Log: syck: use the configured bison flags (if any) Summary: RevisionChanges Path 1.6.8.1 +1 -1 syck/lib/Makefile.am patch -p0 '@@ .' Index: syck/lib/Makefile.am $ cvs diff -u -r1.6 -r1.6.8.1 Makefile.am --- syck/lib/Makefile.am 1 Apr 2009 20:43:58 - 1.6 +++ syck/lib/Makefile.am 8 Aug 2013 21:58:58 - 1.6.8.1 @@ -4,7 +4,7 @@ LEXLIB = @LEXLIB@ -YACC = bison +YACC = @YACC@ AM_YFLAGS = -d -t -v -p syck #lib_LTLIBRARIES = libsyck.la @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ INSTALL
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 05-May-2013 17:03:11 Branch: rpm-5_4 Handle: 2013050515031100 Modified files: (Branch: rpm-5_4) rpm INSTALL Log: Wrong db version in the install documentation Summary: RevisionChanges Path 2.134.2.2 +2 -2 rpm/INSTALL patch -p0 '@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.134.2.1 -r2.134.2.2 INSTALL --- rpm/INSTALL 4 Jun 2012 15:10:02 - 2.134.2.1 +++ rpm/INSTALL 5 May 2013 15:03:11 - 2.134.2.2 @@ -37,7 +37,7 @@ PCREmandatory 7.0 8.10http://www.pcre.org/ Mozilla NSS optional 3.113.12.8 http://www.mozilla.org/projects/security/pki/nss/ OpenSSL optional 0.9.8 1.0.0a http://www.openssl.org/ -Berkeley-DB [1] optional 5.1.19 5.1.19 http://www.oracle.com/database/berkeley-db.html +Berkeley-DB [1] optional 5.3.21 5.3.21 http://www.oracle.com/database/berkeley-db.html SQLite [1] optional 3.3 3.7.0.1 http://www.sqlite.org/ Lua [2] optional 5.1 5.1.4 http://www.lua.org/ ZLiboptional 1.2 1.2.3 http://www.zlib.net/ @@ -58,7 +58,7 @@ [0] m4:NOTICE: Do not use GNU m4 1.4.10, it breaks GNU autoconf. [1] db/sqlite: Berkeley-DB used by RPM. - Building RPM against anything _EXCEPT_ db-5.1.19 + Building RPM against anything _EXCEPT_ db-5.3.21 external Berkeley-DB is not officially supported (but any version of Berkeley-DB since db-4.5.20 will work). @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ set.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 02-May-2013 21:55:33
Branch: rpm-5_4 Handle: 2013050219553300
Modified files: (Branch: rpm-5_4)
rpm/rpmio set.c
Log:
nested functions are not in standard C (nor clang)
Summary:
RevisionChanges Path
1.1.2.8 +64 -57 rpm/rpmio/set.c
patch -p0 '@@ .'
Index: rpm/rpmio/set.c
$ cvs diff -u -r1.1.2.7 -r1.1.2.8 set.c
--- rpm/rpmio/set.c 4 Jun 2012 15:10:22 - 1.1.2.7
+++ rpm/rpmio/set.c 2 May 2013 19:55:33 - 1.1.2.8
@@ -9,10 +9,6 @@
/* XXX FIXME: avoid fcntl.h borkage on RHEL for now. */
#define _FCNTL_H1
-/* XXX nested functions in GCC --std=c99 spew mucho here if not */
-#pragma GCC diagnostic ignored -Wmissing-prototypes
-#pragma GCC diagnostic ignored -Woverride-init
-
#include system.h
#include rpmio.h
@@ -54,12 +50,8 @@
return bitc / 5 + 2;
}
-/* Main base62 encoding routine: pack bitv into base62 string. */
-static
-int encode_base62(int bitc, const char *bitv, char *base62)
-{
-char *base62_start = base62;
-void put_digit(int c)
+static
+void put_digit(char *base62, int c)
{
assert(c = 0 c = 61);
if (c 10)
@@ -69,6 +61,12 @@
else if (c 62)
*base62++ = c - 36 + 'A';
}
+
+/* Main base62 encoding routine: pack bitv into base62 string. */
+static
+int encode_base62(int bitc, const char *bitv, char *base62)
+{
+char *base62_start = base62;
int bits2 = 0; /* number of high bits set */
int bits6 = 0; /* number of regular bits set */
int num6b = 0; /* pending 6-bit number */
@@ -79,21 +77,21 @@
switch (num6b) {
case 61:
/* escape */
- put_digit(61);
+ put_digit(base62, 61);
/* extra 00 high bits (in the next character) */
bits2 = 2;
bits6 = 0;
num6b = 0;
break;
case 62:
- put_digit(61);
+ put_digit(base62, 61);
/* extra 01 high bits */
bits2 = 2;
bits6 = 0;
num6b = 16;
break;
case 63:
- put_digit(61);
+ put_digit(base62, 61);
/* extra 10 high bits */
bits2 = 2;
bits6 = 0;
@@ -101,7 +99,7 @@
break;
default:
assert(num6b 61);
- put_digit(num6b);
+ put_digit(base62, num6b);
bits2 = 0;
bits6 = 0;
num6b = 0;
@@ -110,7 +108,7 @@
}
if (bits6 + bits2) {
assert(num6b 61);
- put_digit(num6b);
+ put_digit(base62, num6b);
}
*base62 = '\0';
return base62 - base62_start;
@@ -139,13 +137,8 @@
C26('A', 'A' + 36),
};
-/* Main base62 decoding routine: unpack base62 string into bitv[]. */
-static
-int decode_base62(const char *base62, char *bitv)
-{
-char *bitv_start = bitv;
-inline
-void put6bits(int c)
+static inline
+void put6bits(char *bitv, int c)
{
*bitv++ = (c 0) 1;
*bitv++ = (c 1) 1;
@@ -154,19 +147,25 @@
*bitv++ = (c 4) 1;
*bitv++ = (c 5) 1;
}
-inline
-void put4bits(int c)
+static inline
+void put4bits(char *bitv, int c)
{
*bitv++ = (c 0) 1;
*bitv++ = (c 1) 1;
*bitv++ = (c 2) 1;
*bitv++ = (c 3) 1;
}
+
+/* Main base62 decoding routine: unpack base62 string into bitv[]. */
+static
+int decode_base62(const char *base62, char *bitv)
+{
+char *bitv_start = bitv;
while (1) {
long c = (unsigned char) *base62++;
int num6b = char_to_num[c];
while (num6b 61) {
- put6bits(num6b);
+ put6bits(bitv, num6b);
c = (unsigned char) *base62++;
num6b = char_to_num[c];
}
@@ -195,8 +194,8 @@
default:
return -4;
}
- put6bits(num6b);
- put4bits(num4b);
+ put6bits(bitv, num6b);
+ put4bits(bitv, num4b);
}
return bitv - bitv_start;
}
@@ -260,10 +259,7 @@
*
http://algo2.iti.uni-karlsruhe.de/singler/publications/cacheefficientbloomfilters-wea2007.pdf
*/
-/* Calculate Mshift paramter for encoding. */
-static
-int encode_golomb_Mshift(int c, int bpp)
-{
+static
int log2i(int n)
[CVS] RPM: rpm-5_4: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 06-Apr-2012 12:17:24
Branch: rpm-5_4 Handle: 2012040610172400
Modified files: (Branch: rpm-5_4)
rpm devtool.conf
Log:
macports: disable openmp (backport check-in 16097)
Summary:
RevisionChanges Path
2.365.2.51 +2 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.365.2.50 -r2.365.2.51 devtool.conf
--- rpm/devtool.conf 1 Apr 2012 18:41:03 - 2.365.2.50
+++ rpm/devtool.conf 6 Apr 2012 10:17:24 - 2.365.2.51
@@ -2881,7 +2881,8 @@
--sysconfdir=${prefix}/etc \
--with-path-cfg=${prefix}/etc/rpm \
--enable-broken-chown \
- --disable-rpath
+ --disable-rpath \
+ --disable-openmp
%freebsd
%checkout
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 06-Apr-2012 12:18:38
Branch: rpm-5_4 Handle: 2012040610183700
Modified files: (Branch: rpm-5_4)
rpm devtool.conf
Log:
macports: upgrade to rpm53
Summary:
RevisionChanges Path
2.365.2.52 +3 -3 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.365.2.51 -r2.365.2.52 devtool.conf
--- rpm/devtool.conf 6 Apr 2012 10:17:24 - 2.365.2.51
+++ rpm/devtool.conf 6 Apr 2012 10:18:37 - 2.365.2.52
@@ -2830,7 +2830,7 @@
# autoconf
# libiconv
# gettext
- # db51
+ # db53
# sqlite3
# popt
# beecrypt
@@ -2850,8 +2850,8 @@
PATH=${prefix}/bin:$PATH
%autogen
CPPFLAGS=-I${prefix}/include -I${prefix}/include/xar \
- -I${prefix}/include/ossp -I${prefix}/include/db51
- LDFLAGS=-L${prefix}/lib -L${prefix}/lib/db51
+ -I${prefix}/include/ossp -I${prefix}/include/db53
+ LDFLAGS=-L${prefix}/lib -L${prefix}/lib/db53
export CPPFLAGS
export LDFLAGS
__PYTHON=${prefix}/bin/python2.6
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tools/ rpmdigest.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 04-Jun-2011 09:56:46
Branch: HEAD Handle: 2011060407564600
Modified files:
rpm/tools rpmdigest.c
Log:
add dirs to rpmdigest --0install manifest
Summary:
RevisionChanges Path
2.19+12 -1 rpm/tools/rpmdigest.c
patch -p0 '@@ .'
Index: rpm/tools/rpmdigest.c
$ cvs diff -u -r2.18 -r2.19 rpmdigest.c
--- rpm/tools/rpmdigest.c 10 Oct 2009 13:57:00 - 2.18
+++ rpm/tools/rpmdigest.c 4 Jun 2011 07:56:46 - 2.19
@@ -721,6 +721,7 @@
{
char *const * paths = (char * const *) dc-paths;
int ftsoptions = dc-ftsoptions;
+int toplen = 0;
int rval = 0;
dc-t = Fts_open(paths, ftsoptions,
@@ -754,8 +755,18 @@
(void) rpmdcVisitD(dc);
#endif
/* XXX don't visit topdirs for 0install. */
- if (F_ISSET(dc, 0INSTALL) dc-p-fts_level 0)
+ if (F_ISSET(dc, 0INSTALL) dc-p-fts_level 0) {
+ char *dir = dc-p-fts_path + toplen;
+ char *t;
+ t = rpmExpand(D , dir, \n, NULL);
+ size_t nb = strlen(t);
+ nb = Fwrite(t, nb, sizeof(*t), dc-ofd);
+ (void) Fflush(dc-ofd);
+ t = _free(t);
rpmdcVisitF(dc);
+ }
+ else if (F_ISSET(dc, 0INSTALL) dc-p-fts_level == 0)
+ toplen = dc-p-fts_pathlen;
/*@switchbreak@*/ break;
case FTS_DP:
#ifdef NOTYET
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ wnh_filelists_mongo wnh_other_mongo wnh_primar...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 26-May-2011 11:11:56
Branch: HEAD Handle: 2011052609115500
Modified files:
rpm/scripts wnh_filelists_mongo wnh_other_mongo
wnh_primary_mongo
Log:
json: use null for missing values
Summary:
RevisionChanges Path
1.7 +1 -1 rpm/scripts/wnh_filelists_mongo
1.8 +1 -1 rpm/scripts/wnh_other_mongo
1.8 +1 -1 rpm/scripts/wnh_primary_mongo
patch -p0 '@@ .'
Index: rpm/scripts/wnh_filelists_mongo
$ cvs diff -u -r1.6 -r1.7 wnh_filelists_mongo
--- rpm/scripts/wnh_filelists_mongo 14 May 2011 07:22:08 - 1.6
+++ rpm/scripts/wnh_filelists_mongo 26 May 2011 09:11:55 - 1.7
@@ -1,6 +1,6 @@
\
db.filelists.save(\{\
-\n _id: %|HDRID?{%{HDRID:json}}:{'XXX',}|\
+\n _id: %|HDRID?{%{HDRID:json}}:{null,}|\
\n Name:%{NAME:json}\
\n Arch:%{ARCH:json}\
\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/wnh_other_mongo
$ cvs diff -u -r1.7 -r1.8 wnh_other_mongo
--- rpm/scripts/wnh_other_mongo 11 Apr 2011 23:51:21 - 1.7
+++ rpm/scripts/wnh_other_mongo 26 May 2011 09:11:55 - 1.8
@@ -1,6 +1,6 @@
\
db.other.save(\{\
-\n _id: %|HDRID?{%{HDRID:json}}:{XXX,}|\
+\n _id: %|HDRID?{%{HDRID:json}}:{null,}|\
\n Name:%{NAME:json}\
\n Arch:%{ARCH:json}\
\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/wnh_primary_mongo
$ cvs diff -u -r1.7 -r1.8 wnh_primary_mongo
--- rpm/scripts/wnh_primary_mongo 14 May 2011 07:22:08 - 1.7
+++ rpm/scripts/wnh_primary_mongo 26 May 2011 09:11:55 - 1.8
@@ -1,6 +1,6 @@
\
db.primary.save(\{\
-\n _id: %|HDRID?{%{HDRID:json}}:{'',}|\
+\n _id: %|HDRID?{%{HDRID:json}}:{null,}|\
\n Name:%{NAME:json}\
\n Arch:%{ARCH:json}\
\n Version: %{VERSION:json}\
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ wnh_other_yaml
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 26-May-2011 19:42:48
Branch: HEAD Handle: 2011052617424800
Modified files:
rpm/scripts wnh_other_yaml
Log:
use :json format, not (indented) :yaml
Summary:
RevisionChanges Path
1.8 +2 -2 rpm/scripts/wnh_other_yaml
patch -p0 '@@ .'
Index: rpm/scripts/wnh_other_yaml
$ cvs diff -u -r1.7 -r1.8 wnh_other_yaml
--- rpm/scripts/wnh_other_yaml13 May 2011 14:15:28 - 1.7
+++ rpm/scripts/wnh_other_yaml26 May 2011 17:42:48 - 1.8
@@ -9,9 +9,9 @@
%|changelogname?{\
[\
\n -\
-\nAuthor: %{CHANGELOGNAME:yaml}\
+\nAuthor: %{CHANGELOGNAME:json}\
\nDate: %{CHANGELOGTIME:isodate}\
-\nText: %{CHANGELOGTEXT:yaml}\
+\nText: %{CHANGELOGTEXT:json}\
]\
}|\
\n
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmdb/ hdrfmt.c rpm/scripts/ wnh_filelists_mongo wnh_pr...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 14-May-2011 09:22:09
Branch: HEAD Handle: 2011051407220800
Modified files:
rpm/rpmdb hdrfmt.c
rpm/scripts wnh_filelists_mongo wnh_primary_mongo
Log:
json: separate from sql, remove dbinstance fields
Summary:
RevisionChanges Path
1.160 +79 -8 rpm/rpmdb/hdrfmt.c
1.6 +1 -1 rpm/scripts/wnh_filelists_mongo
1.7 +5 -5 rpm/scripts/wnh_primary_mongo
patch -p0 '@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.159 -r1.160 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c13 May 2011 11:59:38 - 1.159
+++ rpm/rpmdb/hdrfmt.c14 May 2011 07:22:08 - 1.160
@@ -3502,7 +3502,7 @@
}
/*@-compmempass -kepttrans -nullstate -usereleased @*/
-static int PRCOsqlTag(Header h, HE_t he, rpmTag EVRtag, rpmTag Ftag)
+static int PRCOsqlTag(Header h, HE_t he, rpmTag EVRtag, rpmTag Ftag, int
json)
/*@globals internalState @*/
/*@modifies he, internalState @*/
{
@@ -3536,7 +3536,10 @@
if (xx == 0) goto exit;
F.ui32p = he-p.ui32p;
+if (!json)
xx = snprintf(instance, sizeof(instance), '%u',
(unsigned)headerGetInstance(h));
+else
+*instance = '\0';
nb = 0;
ac = 0;
for (i = 0; i c; i++) {
@@ -3591,8 +3594,10 @@
continue;
/*@=nullstate@*/
he-p.argv[ac++] = te;
+ if (*instance) {
te = stpcpy(te, instance);
*te++ = ',';*te++ = ' ';
+ }
*te++ = q; te = stpcpy(te, N.argv[i]); *te++ = q;
/*@-readonlytrans@*/
if (EVR.argv != NULL EVR.argv[i] != NULL *EVR.argv[i] != '\0') {
@@ -3657,7 +3662,7 @@
/*@modifies he, internalState @*/
{
he-tag = RPMTAG_PROVIDENAME;
-return PRCOsqlTag(h, he, RPMTAG_PROVIDEVERSION, RPMTAG_PROVIDEFLAGS);
+return PRCOsqlTag(h, he, RPMTAG_PROVIDEVERSION, RPMTAG_PROVIDEFLAGS, 0);
}
static int RsqlTag(Header h, HE_t he)
@@ -3665,7 +3670,7 @@
/*@modifies he, internalState @*/
{
he-tag = RPMTAG_REQUIRENAME;
-return PRCOsqlTag(h, he, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS);
+return PRCOsqlTag(h, he, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS, 0);
}
static int CsqlTag(Header h, HE_t he)
@@ -3673,7 +3678,7 @@
/*@modifies he, internalState @*/
{
he-tag = RPMTAG_CONFLICTNAME;
-return PRCOsqlTag(h, he, RPMTAG_CONFLICTVERSION, RPMTAG_CONFLICTFLAGS);
+return PRCOsqlTag(h, he, RPMTAG_CONFLICTVERSION, RPMTAG_CONFLICTFLAGS,
0);
}
static int OsqlTag(Header h, HE_t he)
@@ -3681,7 +3686,39 @@
/*@modifies he, internalState @*/
{
he-tag = RPMTAG_OBSOLETENAME;
-return PRCOsqlTag(h, he, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS);
+return PRCOsqlTag(h, he, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
0);
+}
+
+static int PjsonTag(Header h, HE_t he)
+ /*@globals internalState @*/
+ /*@modifies he, internalState @*/
+{
+he-tag = RPMTAG_PROVIDENAME;
+return PRCOsqlTag(h, he, RPMTAG_PROVIDEVERSION, RPMTAG_PROVIDEFLAGS, 1);
+}
+
+static int RjsonTag(Header h, HE_t he)
+ /*@globals internalState @*/
+ /*@modifies he, internalState @*/
+{
+he-tag = RPMTAG_REQUIRENAME;
+return PRCOsqlTag(h, he, RPMTAG_REQUIREVERSION, RPMTAG_REQUIREFLAGS, 1);
+}
+
+static int CjsonTag(Header h, HE_t he)
+ /*@globals internalState @*/
+ /*@modifies he, internalState @*/
+{
+he-tag = RPMTAG_CONFLICTNAME;
+return PRCOsqlTag(h, he, RPMTAG_CONFLICTVERSION, RPMTAG_CONFLICTFLAGS,
1);
+}
+
+static int OjsonTag(Header h, HE_t he)
+ /*@globals internalState @*/
+ /*@modifies he, internalState @*/
+{
+he-tag = RPMTAG_OBSOLETENAME;
+return PRCOsqlTag(h, he, RPMTAG_OBSOLETEVERSION, RPMTAG_OBSOLETEFLAGS,
1);
}
static int PRCOyamlTag(Header h, HE_t he, rpmTag EVRtag, rpmTag Ftag)
@@ -3993,7 +4030,7 @@
return FDGxmlTag(h, he, 2);
}
-static int FDGsqlTag(Header h, HE_t he, int lvl)
+static int FDGsqlTag(Header h, HE_t he, int lvl, int json)
/*@globals internalState @*/
/*@modifies he, internalState @*/
{
@@ -4038,7 +4075,10 @@
if (xx == 0) goto exit;
FFLAGS.ui32p = he-p.ui32p;
+if (!json)
xx = snprintf(instance, sizeof(instance), '%u',
(unsigned)headerGetInstance(h));
+else
+
[CVS] RPM: rpm/rpmdb/ hdrfmt.c rpm/scripts/ yum_filelists_sqlite yum_o...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 14-May-2011 10:59:47
Branch: HEAD Handle: 2011051408594601
Modified files:
rpm/rpmdb hdrfmt.c
rpm/scripts yum_filelists_sqlite yum_other_sqlite
yum_primary_sqlite
Log:
sql: don't quote dbinstance, it's an integer
Summary:
RevisionChanges Path
1.161 +2 -2 rpm/rpmdb/hdrfmt.c
1.3 +1 -1 rpm/scripts/yum_filelists_sqlite
1.3 +7 -5 rpm/scripts/yum_other_sqlite
1.3 +1 -1 rpm/scripts/yum_primary_sqlite
patch -p0 '@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.160 -r1.161 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c14 May 2011 07:22:08 - 1.160
+++ rpm/rpmdb/hdrfmt.c14 May 2011 08:59:46 - 1.161
@@ -3537,7 +3537,7 @@
F.ui32p = he-p.ui32p;
if (!json)
-xx = snprintf(instance, sizeof(instance), '%u',
(unsigned)headerGetInstance(h));
+xx = snprintf(instance, sizeof(instance), %u,
(unsigned)headerGetInstance(h));
else
*instance = '\0';
nb = 0;
@@ -4076,7 +4076,7 @@
FFLAGS.ui32p = he-p.ui32p;
if (!json)
-xx = snprintf(instance, sizeof(instance), '%u',
(unsigned)headerGetInstance(h));
+xx = snprintf(instance, sizeof(instance), %u,
(unsigned)headerGetInstance(h));
else
*instance = '\0';
nb = sizeof(*he-p.argv);
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/yum_filelists_sqlite
$ cvs diff -u -r1.2 -r1.3 yum_filelists_sqlite
--- rpm/scripts/yum_filelists_sqlite 25 Jan 2009 18:38:01 - 1.2
+++ rpm/scripts/yum_filelists_sqlite 14 May 2011 08:59:47 - 1.3
@@ -1,6 +1,6 @@
\
INSERT into packages values (\
-'%{DBINSTANCE}'\
+%{DBINSTANCE}\
, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
);\
%|basenames?{[\
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/yum_other_sqlite
$ cvs diff -u -r1.2 -r1.3 yum_other_sqlite
--- rpm/scripts/yum_other_sqlite 25 Jan 2009 18:38:01 - 1.2
+++ rpm/scripts/yum_other_sqlite 14 May 2011 08:59:47 - 1.3
@@ -1,16 +1,18 @@
\
INSERT into packages values (\
-'%{DBINSTANCE}'\
+%{DBINSTANCE}\
, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
);\
-%|changelogname?{[\
+%|changelogname?{\
+\nCREATE temporary table temp (key INTEGER);\
+\nINSERT into temp values (%{DBINSTANCE});[\
\nINSERT into changelog values (\
-'XXX'\
+(SELECT key from temp)\
, '%{CHANGELOGNAME:sqlescape}'\
, '%{CHANGELOGTIME}'\
, '%{CHANGELOGTEXT:sqlescape}'\
);\
-]}:{\
-\nINSERT into changelog ('%{DBINSTANCE}', '', '', '');\
+]\nDROP table temp;}:{\
+\nINSERT into changelog (%{DBINSTANCE}, '', '', '');\
}|\
\n
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/yum_primary_sqlite
$ cvs diff -u -r1.2 -r1.3 yum_primary_sqlite
--- rpm/scripts/yum_primary_sqlite25 Jan 2009 18:38:01 - 1.2
+++ rpm/scripts/yum_primary_sqlite14 May 2011 08:59:47 - 1.3
@@ -1,6 +1,6 @@
\
INSERT into packages values (\
-'%{DBINSTANCE}'\
+%{DBINSTANCE}\
, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
,\n '%{NAME:sqlescape}'\
, '%{ARCH:sqlescape}'\
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmdb/ hdrfmt.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 14-May-2011 11:30:02
Branch: HEAD Handle: 2011051409300100
Modified files:
rpm/rpmdb hdrfmt.c
Log:
sql: pkgkey/dbinstance is supposed to be last (in prco/files, not
changelog/filelist)
Summary:
RevisionChanges Path
1.163 +19 -10 rpm/rpmdb/hdrfmt.c
patch -p0 '@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.162 -r1.163 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c14 May 2011 09:12:21 - 1.162
+++ rpm/rpmdb/hdrfmt.c14 May 2011 09:30:01 - 1.163
@@ -3590,10 +3590,6 @@
continue;
/*@=nullstate@*/
he-p.argv[ac++] = te;
- if (*instance) {
- te = stpcpy(te, instance);
- *te++ = ',';*te++ = ' ';
- }
*te++ = q; te = stpcpy(te, N.argv[i]); *te++ = q;
/*@-readonlytrans@*/
if (EVR.argv != NULL EVR.argv[i] != NULL *EVR.argv[i] != '\0') {
@@ -3632,6 +3628,10 @@
*te++ = q; *te++ = q;
}
/*@=readonlytrans@*/
+ if (*instance) {
+ *te++ = ',';*te++ = ' ';
+ te = stpcpy(te, instance);
+ }
if (!json) {
if (tag == RPMTAG_REQUIRENAME)
te = stpcpy(stpcpy(stpcpy(te, , '),(F.ui32p[i] 0x40) ? 1 :
0), ');
@@ -4111,11 +4111,14 @@
if (S_ISDIR(FMODES.ui16p[i]))
continue;
he-p.argv[ac++] = t;
- if (*instance)
- t = stpcpy( stpcpy(t, instance), , ');
+ if (*instance lvl == 2)
+ t = stpcpy( stpcpy(t, instance), , );
+ *t++ = '\'';
t = strcpy(t, DN.argv[DI.ui32p[i]]);t += strlen(t);
t = strcpy(t, BN.argv[i]); t += strlen(t);
t = stpcpy(t, ', 'file');
+ if (*instance lvl == 1)
+ t = stpcpy( stpcpy(t, , ), instance);
*t++ = '\0';
}
for (i = 0; i c; i++) {
@@ -4126,8 +4129,9 @@
if (!S_ISDIR(FMODES.ui16p[i]))
continue;
he-p.argv[ac++] = t;
- if (*instance)
- t = stpcpy( stpcpy(t, instance), , ');
+ if (*instance lvl == 2)
+ t = stpcpy( stpcpy(t, instance), , );
+ *t++ = '\'';
t = strcpy(t, DN.argv[DI.ui32p[i]]);t += strlen(t);
t = strcpy(t, BN.argv[i]); t += strlen(t);
#ifdef NOTYET
@@ -4136,6 +4140,8 @@
t = stpcpy(t, /);
#endif
t = stpcpy(t, ', 'dir');
+ if (*instance lvl == 1)
+ t = stpcpy( stpcpy(t, , ), instance);
*t++ = '\0';
}
for (i = 0; i c; i++) {
@@ -4144,11 +4150,14 @@
if (!(FFLAGS.ui32p[i] 0x40)) /* XXX RPMFILE_GHOST */
continue;
he-p.argv[ac++] = t;
- if (*instance)
- t = stpcpy( stpcpy(t, instance), , ');
+ if (*instance lvl == 2)
+ t = stpcpy( stpcpy(t, instance), , );
+ *t++ = '\'';
t = strcpy(t, DN.argv[DI.ui32p[i]]);t += strlen(t);
t = strcpy(t, BN.argv[i]); t += strlen(t);
t = stpcpy(t, ', 'ghost');
+ if (*instance lvl == 1)
+ t = stpcpy( stpcpy(t, , ), instance);
*t++ = '\0';
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmdb/ hdrfmt.c rpm/scripts/ yum_filelists_sqlite
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 14-May-2011 13:23:45
Branch: HEAD Handle: 2011051411234500
Modified files:
rpm/rpmdb hdrfmt.c
rpm/scripts yum_filelists_sqlite
Log:
use dirnames not basenames for yum
Summary:
RevisionChanges Path
1.164 +86 -1 rpm/rpmdb/hdrfmt.c
1.4 +1 -1 rpm/scripts/yum_filelists_sqlite
patch -p0 '@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.163 -r1.164 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c14 May 2011 09:30:01 - 1.163
+++ rpm/rpmdb/hdrfmt.c14 May 2011 11:23:45 - 1.164
@@ -4036,11 +4036,16 @@
rpmTagData FMODES = { .ptr = NULL };
rpmTagData FFLAGS = { .ptr = NULL };
char instance[64];
+char *filetypes;
size_t nb;
rpmuint32_t ac;
rpmuint32_t c;
+rpmuint32_t d;
+rpmuint32_t n;
rpmuint32_t i;
+rpmuint32_t j;
char *t;
+char *f;
int rc = 1; /* assume failure */
int xx;
@@ -4055,6 +4060,7 @@
xx = headerGet(h, he, 0);
if (xx == 0) goto exit;
DN.argv = he-p.argv;
+d = he-c;
he-tag = RPMTAG_DIRINDEXES;
xx = headerGet(h, he, 0);
@@ -4077,6 +4083,7 @@
*instance = '\0';
nb = sizeof(*he-p.argv);
ac = 0;
+if (lvl == 1 || json) {
for (i = 0; i c; i++) {
if (lvl 0 FDGSkip(DN, BN, DI, i) != lvl)
continue;
@@ -4095,6 +4102,37 @@
} else
nb += sizeof(file) - 1;
}
+} else if (lvl == 2 !json) {
+for (j = 0; j d; j++) {
+n = 0;
+for (i = 0; i c; i++) {
+ if (DI.ui32p[i] != j)
+ continue;
+ if (lvl 0 FDGSkip(DN, BN, DI, i) != lvl)
+ continue;
+ n++;
+}
+if (!n)
+continue;
+ac++;
+nb += sizeof(*he-p.argv);
+nb += strlen(instance) + sizeof(, '', '');
+nb += strlen(DN.argv[j]);
+n = 0;
+for (i = 0; i c; i++) {
+ if (DI.ui32p[i] != j)
+ continue;
+ if (lvl 0 FDGSkip(DN, BN, DI, i) != lvl)
+ continue;
+ if (n)
+ nb++;
+ n++;
+ nb += strlen(BN.argv[i]);
+ nb++;
+}
+nb += sizeof(, '') - 1;
+}
+} /* lvl */
he-t = RPM_STRING_ARRAY_TYPE;
he-c = ac;
@@ -4102,6 +4140,7 @@
he-p.argv = xmalloc(nb);
t = (char *) he-p.argv[he-c + 1];
ac = 0;
+if (lvl == 1 || json) {
/* FIXME: Files, then dirs, finally ghosts breaks sort order. */
for (i = 0; i c; i++) {
if (lvl 0 FDGSkip(DN, BN, DI, i) != lvl)
@@ -4160,6 +4199,52 @@
t = stpcpy( stpcpy(t, , ), instance);
*t++ = '\0';
}
+} else if (lvl == 2 !json) {
+/* Dirs, with slash-joined basenames and single-letter filetypes. */
+for (j = 0; j d; j++) {
+n = 0;
+for (i = 0; i c; i++) {
+ if (DI.ui32p[i] != j)
+ continue;
+ if (lvl 0 FDGSkip(DN, BN, DI, i) != lvl)
+ continue;
+ n++;
+}
+if (!n)
+continue;
+he-p.argv[ac++] = t;
+if (*instance lvl == 2)
+t = stpcpy( stpcpy(t, instance), , );
+*t++ = '\'';
+t = strcpy(t, DN.argv[j]); t += strlen(t);
+if (t[-1] == '/')
+t--;
+t = stpcpy(t, ', ');
+f = filetypes = xmalloc(c + 1);
+n = 0;
+for (i = 0; i c; i++) {
+ if (DI.ui32p[i] != j)
+ continue;
+ if (lvl 0 FDGSkip(DN, BN, DI, i) != lvl)
+ continue;
+ if (n)
+ *t++ = '/';
+ n++;
+ t = strcpy(t, BN.argv[i]); t += strlen(t);
+ if (FFLAGS.ui32p[i] 0x40) /* XXX RPMFILE_GHOST */
+ *f++ = 'g';
+ else if (S_ISDIR(FMODES.ui16p[i]))
+ *f++ = 'd';
+ else
+ *f++ = 'f';
+}
+*f++ = '\0';
+t = stpcpy(stpcpy(t, ', '), filetypes);
+*t++ = '\'';
+filetypes = _free(filetypes);
+*t++ = '\0';
+}
+} /* lvl */
he-p.argv[he-c] = NULL;
/*@=compmempass@*/
@@ -4192,7 +4277,7 @@
/*@globals internalState @*/
/*@modifies he, internalState @*/
{
-he-tag = RPMTAG_BASENAMES;
+he-tag = RPMTAG_DIRNAMES; /* use dirnames, not basenames */
return FDGsqlTag(h, he, 2, 0);
}
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/yum_filelists_sqlite
[CVS] RPM: rpm/rpmdb/ hdrfmt.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 13-May-2011 13:59:38
Branch: HEAD Handle: 2011051311593800
Modified files:
rpm/rpmdb hdrfmt.c
Log:
ISO timestamps are UTC in yaml, make it explicit
Summary:
RevisionChanges Path
1.159 +8 -5 rpm/rpmdb/hdrfmt.c
patch -p0 '@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.158 -r1.159 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c12 May 2011 08:54:47 - 1.158
+++ rpm/rpmdb/hdrfmt.c13 May 2011 11:59:38 - 1.159
@@ -195,7 +195,7 @@
* @return formatted string
*/
static char * realDateFormat(HE_t he, /*@unused@*/ /*@null@*/ const char **
av,
- const char * strftimeFormat)
+ const char * strftimeFormat, int utc)
/*@*/
{
char * val;
@@ -208,7 +208,10 @@
/* this is important if sizeof(rpmuint64_t) ! sizeof(time_t) */
{ time_t dateint = he-p.ui64p[0];
- tstruct = localtime(dateint);
+ if (utc)
+ tstruct = gmtime(dateint);
+ else
+ tstruct = localtime(dateint);
}
buf[0] = '\0';
if (tstruct)
@@ -229,7 +232,7 @@
static char * dateFormat(HE_t he, /*@null@*/ const char ** av)
/*@*/
{
-return realDateFormat(he, av, _(%c));
+return realDateFormat(he, av, _(%c), 0);
}
/**
@@ -241,7 +244,7 @@
static char * dayFormat(HE_t he, /*@null@*/ const char ** av)
/*@*/
{
-return realDateFormat(he, av, _(%a %b %d %Y));
+return realDateFormat(he, av, _(%a %b %d %Y), 0);
}
/**
@@ -253,7 +256,7 @@
static char * isodateFormat(HE_t he, /*@null@*/ const char ** av)
/*@*/
{
-return realDateFormat(he, av, _(%Y-%m-%dT%H:%M:%S));
+return realDateFormat(he, av, %Y-%m-%dT%H:%M:%SZ, 1);
}
/**
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ wnh_filelists_yaml wnh_other_yaml wnh_primary_...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 13-May-2011 16:15:28
Branch: HEAD Handle: 2011051314152800
Modified files:
rpm/scripts wnh_filelists_yaml wnh_other_yaml wnh_primary_yaml
Log:
yaml: change sequence back to mapping again, but now using Id
Summary:
RevisionChanges Path
1.4 +1 -3 rpm/scripts/wnh_filelists_yaml
1.7 +1 -3 rpm/scripts/wnh_other_yaml
1.6 +1 -3 rpm/scripts/wnh_primary_yaml
patch -p0 '@@ .'
Index: rpm/scripts/wnh_filelists_yaml
$ cvs diff -u -r1.3 -r1.4 wnh_filelists_yaml
--- rpm/scripts/wnh_filelists_yaml12 May 2011 06:34:02 - 1.3
+++ rpm/scripts/wnh_filelists_yaml13 May 2011 14:15:28 - 1.4
@@ -1,7 +1,5 @@
\
--\
-\n Id: %|HDRID?{%{HDRID}}:{~}|\
-\n Idtype: sha\
+%|HDRID?{%{HDRID}}:{~}|:\
\n Name:%{NAME:yaml}\
\n Arch:%{ARCH:yaml}\
\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/wnh_other_yaml
$ cvs diff -u -r1.6 -r1.7 wnh_other_yaml
--- rpm/scripts/wnh_other_yaml12 May 2011 17:55:27 - 1.6
+++ rpm/scripts/wnh_other_yaml13 May 2011 14:15:28 - 1.7
@@ -1,7 +1,5 @@
\
--\
-\n Id: %|HDRID?{%{HDRID}}:{~}|\
-\n Idtype: sha\
+%|HDRID?{%{HDRID}}:{~}|:\
\n Name:%{NAME:yaml}\
\n Arch:%{ARCH:yaml}\
\n Epoch: %|EPOCH?{%{EPOCH}}:{0}|\
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/wnh_primary_yaml
$ cvs diff -u -r1.5 -r1.6 wnh_primary_yaml
--- rpm/scripts/wnh_primary_yaml 12 May 2011 17:55:27 - 1.5
+++ rpm/scripts/wnh_primary_yaml 13 May 2011 14:15:28 - 1.6
@@ -1,7 +1,5 @@
\
--\
-\n Id: %|HDRID?{%{HDRID}}:{~}|\
-\n Idtype: sha\
+%|HDRID?{%{HDRID}}:{~}|:\
\n Name:%{NAME:yaml}\
\n Arch:%{ARCH:yaml}\
\n Version: %{VERSION:yaml}\
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ wnh_other_yaml wnh_primary_yaml
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 12-May-2011 08:36:53
Branch: HEAD Handle: 2011051206365201
Modified files:
rpm/scripts wnh_other_yaml wnh_primary_yaml
Log:
yaml: use cvs -q diff -utimestamp for timestamps
Summary:
RevisionChanges Path
1.4 +1 -1 rpm/scripts/wnh_other_yaml
1.4 +2 -2 rpm/scripts/wnh_primary_yaml
patch -p0 '@@ .'
Index: rpm/scripts/wnh_other_yaml
$ cvs diff -u -r1.3 -r1.4 wnh_other_yaml
--- rpm/scripts/wnh_other_yaml12 May 2011 06:34:03 - 1.3
+++ rpm/scripts/wnh_other_yaml12 May 2011 06:36:53 - 1.4
@@ -12,7 +12,7 @@
[\
\n -\
\nAuthor: %{CHANGELOGNAME}\
-\nDate: %{CHANGELOGTIME:date}\
+\nDate: !!timestamp '%{CHANGELOGTIME:isodate}'\
\n%{CHANGELOGTEXT:yaml}\
]\
}|\
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/wnh_primary_yaml
$ cvs diff -u -r1.3 -r1.4 wnh_primary_yaml
--- rpm/scripts/wnh_primary_yaml 12 May 2011 06:34:02 - 1.3
+++ rpm/scripts/wnh_primary_yaml 12 May 2011 06:36:52 - 1.4
@@ -11,8 +11,8 @@
\n Description: %{DESCRIPTION:yaml}\
\n Packager:%|PACKAGER?{%{PACKAGER:yaml}}:{~}|\
\n Url: %|URL?{%{URL:yaml}}:{~}|\
-\n Filetime:%{PACKAGETIME:date}\
-\n Buildtime: %{BUILDTIME:date}\
+\n Filetime:!!timestamp '%{PACKAGETIME:isodate}'\
+\n Buildtime: !!timestamp '%{BUILDTIME:isodate}'\
\n Packagesize: %{PACKAGESIZE}\
\n Size:%{SIZE}\
\n Archivesize: %{ARCHIVESIZE}\
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ wnh_other_yaml
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 12-May-2011 08:39:15
Branch: HEAD Handle: 2011051206391500
Modified files:
rpm/scripts wnh_other_yaml
Log:
yaml: fix changelog entry markup
Summary:
RevisionChanges Path
1.5 +2 -2 rpm/scripts/wnh_other_yaml
patch -p0 '@@ .'
Index: rpm/scripts/wnh_other_yaml
$ cvs diff -u -r1.4 -r1.5 wnh_other_yaml
--- rpm/scripts/wnh_other_yaml12 May 2011 06:36:53 - 1.4
+++ rpm/scripts/wnh_other_yaml12 May 2011 06:39:15 - 1.5
@@ -11,9 +11,9 @@
%|changelogname?{\
[\
\n -\
-\nAuthor: %{CHANGELOGNAME}\
+\nAuthor: %{CHANGELOGNAME:yaml}\
\nDate: !!timestamp '%{CHANGELOGTIME:isodate}'\
-\n%{CHANGELOGTEXT:yaml}\
+\nText: %{CHANGELOGTEXT:yaml}\
]\
}|\
\n
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 12-May-2011 09:39:26
Branch: HEAD Handle: 2011051207392600
Modified files:
rpm devtool.conf
Log:
devtool: macosx: disable openmp (linker issues)
Summary:
RevisionChanges Path
2.379 +2 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.378 -r2.379 devtool.conf
--- rpm/devtool.conf 11 May 2011 15:59:22 - 2.378
+++ rpm/devtool.conf 12 May 2011 07:39:26 - 2.379
@@ -2674,7 +2674,8 @@
--sysconfdir=${prefix}/etc \
--with-path-cfg=${prefix}/etc/rpm \
--enable-broken-chown \
- --disable-rpath
+ --disable-rpath \
+ --disable-openmp
%freebsd
%checkout
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmdb/ hdrfmt.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 12-May-2011 10:54:47
Branch: HEAD Handle: 2011051208544700
Modified files:
rpm/rpmdb hdrfmt.c
Log:
xml: parse distepoch correctly
Summary:
RevisionChanges Path
1.158 +12 -1 rpm/rpmdb/hdrfmt.c
patch -p0 '@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.157 -r1.158 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c12 May 2011 06:38:28 - 1.157
+++ rpm/rpmdb/hdrfmt.c12 May 2011 08:54:47 - 1.158
@@ -3341,6 +3341,10 @@
nb -= 2;
if (strchr(EVR.argv[i], '-') != NULL)
nb += sizeof( rel=\\) - 2;
+#ifdef NOTYET
+ if (strchr(EVR.argv[i], ':') != NULL)
+ nb += sizeof( distepoch=\\) - 2;
+#endif
}
#ifdef NOTNOW
if (tag == RPMTAG_REQUIRENAME (F.ui32p[i] 0x40))
@@ -3371,13 +3375,16 @@
if (EVR.argv != NULL EVR.argv[i] != NULL *EVR.argv[i] != '\0') {
static char *Fstr[] = { ?0,LT,GT,?3,EQ,LE,GE,?7 };
rpmuint32_t Fx = ((F.ui32p[i] 1) 0x7);
- const char *E, *V, *R;
+ const char *E, *V, *R, *D;
char *f, *fe;
t = stpcpy( stpcpy( stpcpy(t, flags=\), Fstr[Fx]), \);
f = (char *) EVR.argv[i];
for (fe = f; *fe != '\0' *fe = '0' *fe = '9'; fe++)
{};
if (*fe == ':') { *fe++ = '\0'; E = f; f = fe; } else E = NULL;
+ for (fe = f + strlen(f); fe != f *fe != ':'; fe--)
+ {};
+ if (*fe == ':') { *fe++ = '\0'; D = fe; } else D = NULL;
V = f;
for (fe = f; *fe != '\0' *fe != '-'; fe++)
{};
@@ -3386,6 +3393,10 @@
t = stpcpy( stpcpy( stpcpy(t, ver=\), V), \);
if (R != NULL)
t = stpcpy( stpcpy( stpcpy(t, rel=\), R), \);
+#ifdef NOTYET
+ if (D != NULL)
+ t = stpcpy( stpcpy( stpcpy(t, distepoch=\), D), \);
+#endif
}
/*@=readonlytrans@*/
#ifdef NOTNOW
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/scripts/ wnh_other_yaml wnh_primary_yaml
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 12-May-2011 19:55:27
Branch: HEAD Handle: 2011051217552700
Modified files:
rpm/scripts wnh_other_yaml wnh_primary_yaml
Log:
don't need explicit types for timestamps
Summary:
RevisionChanges Path
1.6 +1 -1 rpm/scripts/wnh_other_yaml
1.5 +2 -2 rpm/scripts/wnh_primary_yaml
patch -p0 '@@ .'
Index: rpm/scripts/wnh_other_yaml
$ cvs diff -u -r1.5 -r1.6 wnh_other_yaml
--- rpm/scripts/wnh_other_yaml12 May 2011 06:39:15 - 1.5
+++ rpm/scripts/wnh_other_yaml12 May 2011 17:55:27 - 1.6
@@ -12,7 +12,7 @@
[\
\n -\
\nAuthor: %{CHANGELOGNAME:yaml}\
-\nDate: !!timestamp '%{CHANGELOGTIME:isodate}'\
+\nDate: %{CHANGELOGTIME:isodate}\
\nText: %{CHANGELOGTEXT:yaml}\
]\
}|\
@@ .
patch -p0 '@@ .'
Index: rpm/scripts/wnh_primary_yaml
$ cvs diff -u -r1.4 -r1.5 wnh_primary_yaml
--- rpm/scripts/wnh_primary_yaml 12 May 2011 06:36:52 - 1.4
+++ rpm/scripts/wnh_primary_yaml 12 May 2011 17:55:27 - 1.5
@@ -11,8 +11,8 @@
\n Description: %{DESCRIPTION:yaml}\
\n Packager:%|PACKAGER?{%{PACKAGER:yaml}}:{~}|\
\n Url: %|URL?{%{URL:yaml}}:{~}|\
-\n Filetime:!!timestamp '%{PACKAGETIME:isodate}'\
-\n Buildtime: !!timestamp '%{BUILDTIME:isodate}'\
+\n Filetime:%{PACKAGETIME:isodate}\
+\n Buildtime: %{BUILDTIME:isodate}\
\n Packagesize: %{PACKAGESIZE}\
\n Size:%{SIZE}\
\n Archivesize: %{ARCHIVESIZE}\
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/python/ header-py.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 09-Dec-2010 08:46:46
Branch: HEAD Handle: 2010120907464600
Modified files:
rpm/python header-py.c
Log:
python: hdr.setorigin needs arguments
Summary:
RevisionChanges Path
1.111 +1 -1 rpm/python/header-py.c
patch -p0 '@@ .'
Index: rpm/python/header-py.c
$ cvs diff -u -r1.110 -r1.111 header-py.c
--- rpm/python/header-py.c20 Aug 2009 16:32:42 - 1.110
+++ rpm/python/header-py.c9 Dec 2010 07:46:46 - 1.111
@@ -308,7 +308,7 @@
NULL },
{getorigin,(PyCFunction) hdrGetOrigin, METH_NOARGS,
NULL },
-{setorigin,(PyCFunction) hdrSetOrigin, METH_NOARGS,
+{setorigin,(PyCFunction) hdrSetOrigin,
METH_VARARGS|METH_KEYWORDS,
NULL },
{sprintf, (PyCFunction) hdrSprintf,
METH_VARARGS|METH_KEYWORDS,
NULL },
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/python/ header-py.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 09-Dec-2010 08:47:24
Branch: rpm-5_4 Handle: 2010120907472300
Modified files: (Branch: rpm-5_4)
rpm/python header-py.c
Log:
python: hdr.setorigin needs arguments
Summary:
RevisionChanges Path
1.110.4.1 +1 -1 rpm/python/header-py.c
patch -p0 '@@ .'
Index: rpm/python/header-py.c
$ cvs diff -u -r1.110 -r1.110.4.1 header-py.c
--- rpm/python/header-py.c20 Aug 2009 16:32:42 - 1.110
+++ rpm/python/header-py.c9 Dec 2010 07:47:23 - 1.110.4.1
@@ -308,7 +308,7 @@
NULL },
{getorigin,(PyCFunction) hdrGetOrigin, METH_NOARGS,
NULL },
-{setorigin,(PyCFunction) hdrSetOrigin, METH_NOARGS,
+{setorigin,(PyCFunction) hdrSetOrigin,
METH_VARARGS|METH_KEYWORDS,
NULL },
{sprintf, (PyCFunction) hdrSprintf,
METH_VARARGS|METH_KEYWORDS,
NULL },
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/python/ header-py.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 09-Dec-2010 08:47:45
Branch: rpm-5_3 Handle: 2010120907474500
Modified files: (Branch: rpm-5_3)
rpm/python header-py.c
Log:
python: hdr.setorigin needs arguments
Summary:
RevisionChanges Path
1.110.2.1 +1 -1 rpm/python/header-py.c
patch -p0 '@@ .'
Index: rpm/python/header-py.c
$ cvs diff -u -r1.110 -r1.110.2.1 header-py.c
--- rpm/python/header-py.c20 Aug 2009 16:32:42 - 1.110
+++ rpm/python/header-py.c9 Dec 2010 07:47:45 - 1.110.2.1
@@ -308,7 +308,7 @@
NULL },
{getorigin,(PyCFunction) hdrGetOrigin, METH_NOARGS,
NULL },
-{setorigin,(PyCFunction) hdrSetOrigin, METH_NOARGS,
+{setorigin,(PyCFunction) hdrSetOrigin,
METH_VARARGS|METH_KEYWORDS,
NULL },
{sprintf, (PyCFunction) hdrSprintf,
METH_VARARGS|METH_KEYWORDS,
NULL },
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/python/ header-py.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 09-Dec-2010 08:48:33
Branch: rpm-5_2 Handle: 2010120907483300
Modified files: (Branch: rpm-5_2)
rpm/python header-py.c
Log:
python: hdr.setorigin needs arguments
Summary:
RevisionChanges Path
1.106.2.3 +1 -1 rpm/python/header-py.c
patch -p0 '@@ .'
Index: rpm/python/header-py.c
$ cvs diff -u -r1.106.2.2 -r1.106.2.3 header-py.c
--- rpm/python/header-py.c23 Jul 2009 13:13:59 - 1.106.2.2
+++ rpm/python/header-py.c9 Dec 2010 07:48:33 - 1.106.2.3
@@ -302,7 +302,7 @@
NULL },
{getorigin,(PyCFunction) hdrGetOrigin, METH_NOARGS,
NULL },
-{setorigin,(PyCFunction) hdrSetOrigin, METH_NOARGS,
+{setorigin,(PyCFunction) hdrSetOrigin,
METH_VARARGS|METH_KEYWORDS,
NULL },
{sprintf, (PyCFunction) hdrSprintf,
METH_VARARGS|METH_KEYWORDS,
NULL },
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: js/src/ jscpucfg.c jscpucfg_Darwin-i386.h jscpucfg...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: js Date: 04-Nov-2010 12:41:01 Branch: rpm-5_2 Handle: 2010110411410100 Added files: (Branch: rpm-5_2) js/src jscpucfg_Darwin-i386.h jscpucfg_Darwin-ppc.h jscpucfg_Darwin-ppc64.h jscpucfg_Darwin-x86_64.h Modified files: (Branch: rpm-5_2) js/src jscpucfg.c Log: jscpucfg.h: use pre-generated runtime configuration, for Universal on Darwin Summary: RevisionChanges Path 1.1.1.1.2.1 +14 -0 js/src/jscpucfg.c 1.1.2.1 +54 -0 js/src/jscpucfg_Darwin-i386.h 1.1.2.1 +54 -0 js/src/jscpucfg_Darwin-ppc.h 1.1.2.1 +54 -0 js/src/jscpucfg_Darwin-ppc64.h 1.1.2.1 +54 -0 js/src/jscpucfg_Darwin-x86_64.h patch -p0 '@@ .' Index: js/src/jscpucfg.c $ cvs diff -u -r1.1.1.1 -r1.1.1.1.2.1 jscpucfg.c --- js/src/jscpucfg.c 20 Apr 2009 18:28:03 - 1.1.1.1 +++ js/src/jscpucfg.c 4 Nov 2010 11:41:01 - 1.1.1.1.2.1 @@ -177,6 +177,19 @@ BitsPerByte(); +#if defined(RPM_OS_DARWIN) +printf(#if defined (__ppc__)\n); +printf(#include \jscpucfg_Darwin-ppc.h\\n); +printf(#elif defined (__ppc64__)\n); +printf(#include \jscpucfg_Darwin-ppc64.h\\n); +printf(#elif defined (__i386__)\n); +printf(#include \jscpucfg_Darwin-i386.h\\n); +printf(#elif defined (__x86_64__)\n); +printf(#include \jscpucfg_Darwin-x86_64.h\\n); +printf(#else\n); +printf(#error architecture not supported\n); +printf(#endif\n); +#else /* !RPM_OS_DARWIN */ printf(#ifndef js_cpucfg___\n); printf(#define js_cpucfg___\n\n); @@ -390,6 +403,7 @@ printf(\n); printf(#endif /* js_cpucfg___ */\n); +#endif /* RPM_OS_DARWIN */ return EXIT_SUCCESS; } @@ . patch -p0 '@@ .' Index: js/src/jscpucfg_Darwin-i386.h $ cvs diff -u -r0 -r1.1.2.1 jscpucfg_Darwin-i386.h --- /dev/null 2010-11-04 12:38:03.0 +0100 +++ jscpucfg_Darwin-i386.h2010-11-04 12:41:01.726731605 +0100 @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#define IS_LITTLE_ENDIAN 1 +#undef IS_BIG_ENDIAN + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define JS_BYTES_PER_WORD 4L +#define JS_BYTES_PER_DWORD 8L + +#define JS_BITS_PER_BYTE8L +#define JS_BITS_PER_SHORT 16L +#define JS_BITS_PER_INT 32L +#define JS_BITS_PER_INT64 64L +#define JS_BITS_PER_LONG32L +#define JS_BITS_PER_FLOAT 32L +#define JS_BITS_PER_DOUBLE 64L +#define JS_BITS_PER_WORD32L + +#define JS_BITS_PER_BYTE_LOG2 3L +#define JS_BITS_PER_SHORT_LOG2 4L +#define JS_BITS_PER_INT_LOG25L +#define JS_BITS_PER_INT64_LOG2 6L +#define JS_BITS_PER_LONG_LOG2 5L +#define JS_BITS_PER_FLOAT_LOG2 5L +#define JS_BITS_PER_DOUBLE_LOG2 6L +#define JS_BITS_PER_WORD_LOG2 5L + +#define JS_ALIGN_OF_SHORT 2L +#define JS_ALIGN_OF_INT 4L +#define JS_ALIGN_OF_LONG4L +#define JS_ALIGN_OF_INT64 4L +#define JS_ALIGN_OF_FLOAT 4L +#define JS_ALIGN_OF_DOUBLE 4L +#define JS_ALIGN_OF_POINTER 4L +#define JS_ALIGN_OF_WORD4L + +#define JS_BYTES_PER_WORD_LOG2 2L +#define JS_BYTES_PER_DWORD_LOG2 3L +#define JS_WORDS_PER_DWORD_LOG2 1L + +#define JS_STACK_GROWTH_DIRECTION (-1) + +#define JS_HAVE_LONG_LONG + +#endif /* js_cpucfg___ */ @@ . patch -p0 '@@ .' Index: js/src/jscpucfg_Darwin-ppc.h $ cvs diff -u -r0 -r1.1.2.1 jscpucfg_Darwin-ppc.h --- /dev/null 2010-11-04 12:38:03.0 +0100 +++ jscpucfg_Darwin-ppc.h 2010-11-04 12:41:01.756732930 +0100 @@ -0,0 +1,54 @@ +#ifndef js_cpucfg___ +#define js_cpucfg___ + +/* AUTOMATICALLY GENERATED - DO NOT EDIT */ + +#undef IS_LITTLE_ENDIAN +#define IS_BIG_ENDIAN 1 + +#define JS_BYTES_PER_BYTE 1L +#define JS_BYTES_PER_SHORT 2L +#define JS_BYTES_PER_INT4L +#define JS_BYTES_PER_INT64 8L +#define JS_BYTES_PER_LONG 4L +#define JS_BYTES_PER_FLOAT 4L +#define JS_BYTES_PER_DOUBLE 8L +#define
[CVS] RPM: rpm-5_2: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 04-Nov-2010 12:42:42
Branch: rpm-5_2 Handle: 2010110411424200
Modified files: (Branch: rpm-5_2)
rpm devtool.conf
Log:
devtool: add %snowleopard, for the native python2.6
Summary:
RevisionChanges Path
2.293.2.22 +15 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.293.2.21 -r2.293.2.22 devtool.conf
--- rpm/devtool.conf 30 Oct 2010 21:43:40 - 2.293.2.21
+++ rpm/devtool.conf 4 Nov 2010 11:42:42 - 2.293.2.22
@@ -1369,6 +1369,21 @@
platform=Leopard
@source %macosx
+%snowleopard
+MACOSX_DEPLOYMENT_TARGET=10.6
+export MACOSX_DEPLOYMENT_TARGET
+UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.6.sdk
+UNIVERSAL_CPP=gcc-4.2 -E -isysroot ${UNIVERSAL_SDK}
+UNIVERSAL_CC=gcc-4.2
+UNIVERSAL_CXX=g++-4.2
+UNIVERSAL_CPPFLAGS=
+UNIVERSAL_CFLAGS=-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386 -arch
x86_64
+UNIVERSAL_LDFLAGS=-arch ppc -arch i386 -arch x86_64
+UNIVERSAL_TARGET=--host i686-apple-darwin10 --target
i686-apple-darwin10
+UNIVERSAL_PYTHON=2.6
+platform=SnowLeopard
+@source %macosx
+
%darwin
%macosx
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 04-Nov-2010 12:56:16 Branch: rpm-5_2 Handle: 2010110411561500 Modified files: (Branch: rpm-5_2) rpm devtool.conf Log: devtool: disable openmp in beecrypt for %macosx Summary: RevisionChanges Path 2.293.2.23 +1 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.293.2.22 -r2.293.2.23 devtool.conf --- rpm/devtool.conf 4 Nov 2010 11:42:42 - 2.293.2.22 +++ rpm/devtool.conf 4 Nov 2010 11:56:15 - 2.293.2.23 @@ -1698,6 +1698,7 @@ --without-java \ --without-python \ --disable-threads \ +--disable-openmp \ --disable-shared make ) || exit $? @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 02-Nov-2010 17:46:18
Branch: HEAD Handle: 2010110216461700
Modified files:
rpm devtool.conf
Log:
devtool: copy %macosx and %freebsd from 5.3
Summary:
RevisionChanges Path
2.363 +84 -7 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.362 -r2.363 devtool.conf
--- rpm/devtool.conf 2 Nov 2010 15:03:51 - 2.362
+++ rpm/devtool.conf 2 Nov 2010 16:46:17 - 2.363
@@ -2035,7 +2035,78 @@
standalone_testdrive
}
+%macosx
+%checkout
+%macports
+gnumake install DESTDIR=/tmp/rpm-root
+
DYLD_LIBRARY_PATH=/tmp/rpm-root/opt/local/lib:/tmp/rpm-root/opt/local/lib/rpm/lib:$DYLD_LIBRARY_PATH
/tmp/rpm-root/opt/local/bin/rpm --version
+
+%macports
+ # Ports:
+ # automake
+ # autoconf
+ # libiconv
+ # gettext
+ # db51
+ # sqlite3
+ # popt
+ # beecrypt
+ # expat
+ # neon
+ # zlib
+ # file
+ # xar-devel
+ # liblzma
+ # pcre
+ # ossp-uuid
+ # *lua
+ # python26
+ # perl5.10
+
+ prefix=/opt/local
+ PATH=${prefix}/bin:$PATH
+ %autogen
+ CPPFLAGS=-I${prefix}/include -I${prefix}/include/xar \
+ -I${prefix}/include/ossp -I${prefix}/include/db51
+ LDFLAGS=-L${prefix}/lib -L${prefix}/lib/db51
+ export CPPFLAGS
+ export LDFLAGS
+ __PYTHON=${prefix}/bin/python2.6
+ __PERL=${prefix}/bin/perl5.10
+ export __PYTHON
+ export __PERL
+ %configure \
+ --prefix=${prefix} \
+ --with-libintl-prefix=${prefix} \
+ --with-libiconv-prefix=${prefix} \
+ --mandir=${prefix}/share/man \
+ --infodir=${prefix}/share/info \
+ --with-lua=internal \
+ --without-js \
+ --with-python=`$__PYTHON -c import sys; print
sys.version[:3]` \
+ --with-perl \
+ --with-db \
+ --with-sqlite \
+ --with-popt=external \
+ --with-beecrypt=external \
+ --with-neon=external \
+ --with-xar=external \
+ --with-xz=external \
+ --with-pcre=external \
+ --with-uuid=external \
+ --without-apidocs \
+ --sysconfdir=${prefix}/etc \
+ --with-path-cfg=${prefix}/etc/rpm \
+ --enable-broken-chown \
+ --disable-rpath
+
%freebsd
+%checkout
+%ports
+pkg_add -r gmake bash
+gmake SHELL=`which bash`
+
+%ports
# Ports: (* = internal)
# devel/automake111
# devel/autoconf268
@@ -2045,15 +2116,17 @@
# devel/gettext
# *lang/lua
# *textproc/syck
+ # lang/perl5.10
+ # lang/python26
# databases/db51 SQL=on
# databases/sqlite3 EXTENSION=on
# devel/popt = 1.15
- # security/beecrypt
- # www/neon28
+ # security/beecrypt = 4.2.1
+ # www/neon29
# sysutils/file
- # sysutils/xar
- # sysutils/xz
- # sysutils/pcre
+ # archivers/xar
+ # archivers/xz
+ # devel/pcre
# misc/ossp-uuid
%autogen
@@ -2061,8 +2134,9 @@
PREFIX=${LOCALBASE}
sed -i -E -e s:\$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig: \
scripts/Makefile.in
- CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/xar
- LDFLAGS=-L${LOCALBASE}/lib
+ CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/xar \
+ -I${LOCALBASE}/include/db51
+ LDFLAGS=-L${LOCALBASE}/lib -L${LOCALBASE}/lib/db51
export CPPFLAGS
export LDFLAGS
%configure \
@@ -2077,6 +2151,9 @@
--with-sqlite \
--with-dbsql \
--with-db-tools-integrated \
+ --with-popt=external \
+ --with-beecrypt=external \
+ --with-neon=external \
--with-zlib=external \
--with-file=external \
[CVS] RPM: rpm/ VENDOR devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-Nov-2010 11:26:08
Branch: HEAD Handle: 2010110110260800
Modified files:
rpm VENDOR devtool.conf
Log:
devtool: remove the defunct rpm4darwin
Summary:
RevisionChanges Path
2.70+0 -7 rpm/VENDOR
2.361 +0 -569rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/VENDOR
$ cvs diff -u -r2.69 -r2.70 VENDOR
--- rpm/VENDOR18 Apr 2009 16:41:58 - 2.69
+++ rpm/VENDOR1 Nov 2010 10:26:08 - 2.70
@@ -441,13 +441,6 @@
messages!
- o Name: RPM4DARWIN
- Vendor: RPM for Darwin (Mac OS X)
http://rpm4darwin.sourceforge.net/
- Representative: Anders F. Bjorklund a...@users.sourceforge.net
a...@rpm5.org
- Application:a port of the RPM software (RPM 4.x) to Darwin and Mac
OS X
- Characteristic: standalone installation of RPM that installs into
/usr/local
-
-
o Name: FEDORA
Vendor: Fedora Project http://fedoraproject.org/
Representative: Robert Scheck rob...@fedoraproject.org
rob...@rpm5.org
@@ .
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.360 -r2.361 devtool.conf
--- rpm/devtool.conf 31 Oct 2010 16:42:26 - 2.360
+++ rpm/devtool.conf 1 Nov 2010 10:26:08 - 2.361
@@ -2035,575 +2035,6 @@
standalone_testdrive
}
-%darwin
-%macosx
-
-%macosx
-##
-## These tools are built local: m4, autoconf, automake, libtool, gettext
-## (the system-provided versions are too old, and thus cannot be
used...)
-## Note: libtool is called glibtool on the Darwin platform, due to a
-## name conflict with the system linker which is also called libtool(1)
-##
-## These libraries are built internally: db, lua, syck, file, xar, xz
-## These are statically linked: neon, beecrypt, sqlite, popt, pcre, uuid
-## (building popt statically requires that the required popt.h header
-## is included within the rpm headers, so that it can be found later)
-##
-## The package is configured to install in /usr/local and /var/local,
-## with the RPM configuration files in /etc. RPM libraries are dynamic.
-## The Perl module for RPM is included, built in /Library/Perl/
-## The Python module for RPM is included, built in /Library/Python/
-##
-
-@source %standalone-modules
-standalone_defines
-
-#determine some local tools
-SHTOOL=`cd ${DEVTOOL_SRCDIR} pwd`/devtool.shtool
-
-# third-party base directory
-basemac=${DEVTOOL_SRCDIR}/../mac
-platform=MacOSX # needs subdir
-
-# prepare build environment
-prepare () {
-echo ++ establishing third-party area under ($basemac)
-for dir in src bin bin/$platform run; do
-if [ ! -d $basemac/$dir ]; then
-mkdir $basemac/$dir || exit $?
-fi
-done
-
-echo ++ establishing third-party distribution files ($basemac/src/)
-for spec in $dist; do
-file=`echo $spec | sed -e 's;,.*$;;'`
-urls=`echo $spec | sed -e 's;^[^,]*;;'`
-if [ ! -f $basemac/src/$file ]; then
-standalone_download $basemac/src/$file $urls || exit $?
-fi
-done
-
-# extend environment
-prefix_tools=`cd $basemac/run pwd`
-PATH=$prefix_tools/bin:$prefix_tools/sbin:$PATH
-PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
-export PATH
-
-# GNU m4 (installed development tool)
-if [ ! -d $basemac/bin/m4-${v_m4} ]; then
-echo ++ building third-party development tool m4-${v_m4}
-( cd $basemac/bin
-rm -rf m4-${v_m4}
-gzip -d -c ../src/m4-${v_m4}.tar.gz | gnutar xf -
-( cd m4-${v_m4}
-CC=cc \
-GREP=grep \
-./configure \
---prefix=$prefix_tools \
---disable-nls
-make
-
[CVS] RPM: rpm-5_3: rpm/ VENDOR devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-Nov-2010 11:26:21
Branch: rpm-5_3 Handle: 2010110110262100
Modified files: (Branch: rpm-5_3)
rpm VENDOR devtool.conf
Log:
devtool: remove the defunct rpm4darwin
Summary:
RevisionChanges Path
2.69.4.1+0 -7 rpm/VENDOR
2.333.2.58 +0 -569rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/VENDOR
$ cvs diff -u -r2.69 -r2.69.4.1 VENDOR
--- rpm/VENDOR18 Apr 2009 16:41:58 - 2.69
+++ rpm/VENDOR1 Nov 2010 10:26:21 - 2.69.4.1
@@ -441,13 +441,6 @@
messages!
- o Name: RPM4DARWIN
- Vendor: RPM for Darwin (Mac OS X)
http://rpm4darwin.sourceforge.net/
- Representative: Anders F. Bjorklund a...@users.sourceforge.net
a...@rpm5.org
- Application:a port of the RPM software (RPM 4.x) to Darwin and Mac
OS X
- Characteristic: standalone installation of RPM that installs into
/usr/local
-
-
o Name: FEDORA
Vendor: Fedora Project http://fedoraproject.org/
Representative: Robert Scheck rob...@fedoraproject.org
rob...@rpm5.org
@@ .
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.333.2.57 -r2.333.2.58 devtool.conf
--- rpm/devtool.conf 31 Oct 2010 00:08:52 - 2.333.2.57
+++ rpm/devtool.conf 1 Nov 2010 10:26:21 - 2.333.2.58
@@ -2036,575 +2036,6 @@
standalone_testdrive
}
-%darwin
-%macosx
-
-%macosx
-##
-## These tools are built local: m4, autoconf, automake, libtool, gettext
-## (the system-provided versions are too old, and thus cannot be
used...)
-## Note: libtool is called glibtool on the Darwin platform, due to a
-## name conflict with the system linker which is also called libtool(1)
-##
-## These libraries are built internally: db, lua, syck, file, xar, xz
-## These are statically linked: neon, beecrypt, sqlite, popt, pcre, uuid
-## (building popt statically requires that the required popt.h header
-## is included within the rpm headers, so that it can be found later)
-##
-## The package is configured to install in /usr/local and /var/local,
-## with the RPM configuration files in /etc. RPM libraries are dynamic.
-## The Perl module for RPM is included, built in /Library/Perl/
-## The Python module for RPM is included, built in /Library/Python/
-##
-
-@source %standalone-modules
-standalone_defines
-
-#determine some local tools
-SHTOOL=`cd ${DEVTOOL_SRCDIR} pwd`/devtool.shtool
-
-# third-party base directory
-basemac=${DEVTOOL_SRCDIR}/../mac
-platform=MacOSX # needs subdir
-
-# prepare build environment
-prepare () {
-echo ++ establishing third-party area under ($basemac)
-for dir in src bin bin/$platform run; do
-if [ ! -d $basemac/$dir ]; then
-mkdir $basemac/$dir || exit $?
-fi
-done
-
-echo ++ establishing third-party distribution files ($basemac/src/)
-for spec in $dist; do
-file=`echo $spec | sed -e 's;,.*$;;'`
-urls=`echo $spec | sed -e 's;^[^,]*;;'`
-if [ ! -f $basemac/src/$file ]; then
-standalone_download $basemac/src/$file $urls || exit $?
-fi
-done
-
-# extend environment
-prefix_tools=`cd $basemac/run pwd`
-PATH=$prefix_tools/bin:$prefix_tools/sbin:$PATH
-PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin
-export PATH
-
-# GNU m4 (installed development tool)
-if [ ! -d $basemac/bin/m4-${v_m4} ]; then
-echo ++ building third-party development tool m4-${v_m4}
-( cd $basemac/bin
-rm -rf m4-${v_m4}
-gzip -d -c ../src/m4-${v_m4}.tar.gz | gnutar xf -
-( cd m4-${v_m4}
-CC=cc \
-GREP=grep \
-./configure \
---prefix=$prefix_tools \
-
[CVS] RPM: rpm-5_3: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-Nov-2010 12:31:40
Branch: rpm-5_3 Handle: 2010110111313900
Modified files: (Branch: rpm-5_3)
rpm devtool.conf
Log:
devtool: add new %macosx target
Summary:
RevisionChanges Path
2.333.2.60 +65 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.333.2.59 -r2.333.2.60 devtool.conf
--- rpm/devtool.conf 1 Nov 2010 11:27:23 - 2.333.2.59
+++ rpm/devtool.conf 1 Nov 2010 11:31:39 - 2.333.2.60
@@ -2036,6 +2036,71 @@
standalone_testdrive
}
+%macosx
+%checkout
+%macports
+gnumake install DESTDIR=/tmp/rpm-root
+
DYLD_LIBRARY_PATH=/tmp/rpm-root/opt/local/lib:/tmp/rpm-root/opt/local/lib/rpm/lib:$DYLD_LIBRARY_PATH
/tmp/rpm-root/opt/local/bin/rpm --version
+
+%macports
+ # Ports:
+ # automake
+ # autoconf
+ # libiconv
+ # gettext
+ # db51
+ # sqlite3
+ # popt
+ # beecrypt
+ # expat
+ # neon
+ # zlib
+ # file
+ # xar-devel
+ # liblzma
+ # pcre
+ # ossp-uuid
+ # *lua
+ # python26
+ # perl5.10
+
+ prefix=/opt/local
+ PATH=${prefix}/bin:$PATH
+ %autogen
+ CPPFLAGS=-I${prefix}/include -I${prefix}/include/xar \
+ -I${prefix}/include/ossp -I${prefix}/include/db51
+ LDFLAGS=-L${prefix}/lib -L${prefix}/lib/db51
+ export CPPFLAGS
+ export LDFLAGS
+ __PYTHON=${prefix}/bin/python2.6
+ __PERL=${prefix}/bin/perl5.10
+ export __PYTHON
+ export __PERL
+%configure \
+ --prefix=${prefix} \
+ --with-libintl-prefix=${prefix} \
+ --with-libiconv-prefix=${prefix} \
+ --mandir=${prefix}/share/man \
+ --infodir=${prefix}/share/info \
+ --with-lua=internal \
+ --without-js \
+ --with-python=`$__PYTHON -c import sys; print
sys.version[:3]` \
+ --with-perl \
+ --with-db \
+ --with-sqlite \
+ --with-popt=external \
+ --with-beecrypt=external \
+ --with-neon=external \
+ --with-xar=external \
+ --with-xz=external \
+ --with-pcre=external \
+ --with-uuid=external \
+ --without-apidocs \
+ --sysconfdir=${prefix}/etc \
+ --with-path-cfg=${prefix}/etc/rpm \
+ --enable-broken-chown \
+ --disable-rpath
+
%freebsd
%checkout
%ports
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 30-Oct-2010 13:39:49 Branch: rpm-5_3 Handle: 2010103011394900 Modified files: (Branch: rpm-5_3) rpm devtool.conf Log: devtool: freebsd: don't use internal file Summary: RevisionChanges Path 2.333.2.55 +2 -2 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.333.2.54 -r2.333.2.55 devtool.conf --- rpm/devtool.conf 28 Oct 2010 19:04:25 - 2.333.2.54 +++ rpm/devtool.conf 30 Oct 2010 11:39:49 - 2.333.2.55 @@ -2620,7 +2620,7 @@ # devel/popt = 1.15 # security/beecrypt # www/neon28 - # *sysutils/file + # sysutils/file # sysutils/xar # sysutils/xz # sysutils/pcre @@ -2648,7 +2648,7 @@ --with-dbsql \ --with-db-tools-integrated \ --with-zlib=external \ - --with-file=internal \ + --with-file=external \ --with-xar=external \ --with-xz=external \ --with-pcre=external \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 30-Oct-2010 13:48:20
Branch: HEAD Handle: 2010103011482000
Modified files:
rpm devtool.conf
Log:
devtool: freebsd: stop setting autotools versions
Summary:
RevisionChanges Path
2.357 +0 -2 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.356 -r2.357 devtool.conf
--- rpm/devtool.conf 30 Oct 2010 11:38:48 - 2.356
+++ rpm/devtool.conf 30 Oct 2010 11:48:20 - 2.357
@@ -2554,8 +2554,6 @@
# sysutils/pcre
# misc/ossp-uuid
- AUTOMAKE_VERSION=111
- AUTOCONF_VERSION=263
%autogen
LOCALBASE=/usr/local
PREFIX=${LOCALBASE}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 30-Oct-2010 23:43:41
Branch: rpm-5_2 Handle: 2010103021434000
Modified files: (Branch: rpm-5_2)
rpm devtool.conf
Log:
devtool: macosx: fix python version and perl compiler
Summary:
RevisionChanges Path
2.293.2.21 +7 -3 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.293.2.20 -r2.293.2.21 devtool.conf
--- rpm/devtool.conf 30 Oct 2010 21:41:33 - 2.293.2.20
+++ rpm/devtool.conf 30 Oct 2010 21:43:40 - 2.293.2.21
@@ -1335,6 +1335,7 @@
UNIVERSAL_CFLAGS=-isystem ${UNIVERSAL_SDK}/usr/include -isystem
${UNIVERSAL_SDK}/usr/include/gcc/darwin/3.3 -arch ppc
UNIVERSAL_LDFLAGS=-Wl,-syslibroot,${UNIVERSAL_SDK} -arch ppc
UNIVERSAL_TARGET=--host powerpc-apple-darwin7 --target
powerpc-apple-darwin7
+UNIVERSAL_PYTHON=2.3
platform=Panther
@source %macosx
@@ -1349,6 +1350,7 @@
UNIVERSAL_CFLAGS=-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386
UNIVERSAL_LDFLAGS=-arch ppc -arch i386
UNIVERSAL_TARGET=--host i686-apple-darwin8 --target i686-apple-darwin8
+UNIVERSAL_PYTHON=2.5 # http://python.org
platform=Tiger
@source %macosx
@@ -1363,6 +1365,7 @@
UNIVERSAL_CFLAGS=-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386
UNIVERSAL_LDFLAGS=-arch ppc -arch i386
UNIVERSAL_TARGET=--host i686-apple-darwin9 --target i686-apple-darwin9
+UNIVERSAL_PYTHON=2.5
platform=Leopard
@source %macosx
@@ -1414,6 +1417,7 @@
test .$UNIVERSAL_CPP == . UNIVERSAL_CPP=gcc -E
test .$UNIVERSAL_CC == . UNIVERSAL_CC=gcc
test .$UNIVERSAL_CXX == . UNIVERSAL_CXX=g++
+test .$UNIVERSAL_PYTHON == . UNIVERSAL_PYTHON=`python -c import
sys; print sys.version[:3]`
# third-party base directory
basemac=${DEVTOOL_SRCDIR}/../mac
@@ -1839,7 +1843,7 @@
--with-pcre=$basemac/bin/$platform/pcre-${v_pcre} \
--with-uuid=$basemac/bin/$platform/uuid-${v_uuid} \
--with-perl \
---with-python \
+--with-python=$UNIVERSAL_PYTHON \
--with-apidocs=auto \
--disable-static \
--enable-shared \
@@ -1855,7 +1859,7 @@
gnumake
# perl's makefile doesn't seem to be able to find the libraries in
DYLD_LIBRARY_PATH
-make -C perl MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
OTHERLDFLAGS=$LDFLAGS
+make -C perl CC=$UNIVERSAL_CC
MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET OTHERLDFLAGS=$LDFLAGS
# python complains about missing symbols from all over when using
librpm*, relink:
make -C misc LIBS=-lz -lxml2 -lpcre $LIBS clean all
@@ -1877,7 +1881,7 @@
rm
/tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/.packlist
# move perl/python modules to canonical /Library locations
-python_version=`python -c import sys; print sys.version[:3]`
+python_version=$UNIVERSAL_PYTHON
mkdir -p /tmp/rpm-root/Library/Python/$python_version
mv /tmp/rpm-root/System/Library/Frameworks/Python.framework/Versions/* \
/tmp/rpm-root/Library/Python/ 2/dev/null
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 18-Oct-2010 12:12:12
Branch: rpm-5_3 Handle: 2010101810121100
Modified files: (Branch: rpm-5_3)
rpm devtool.conf
Log:
devtool: update the freebsd target.
Summary:
RevisionChanges Path
2.333.2.32 +4 -6 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.333.2.31 -r2.333.2.32 devtool.conf
--- rpm/devtool.conf 18 Oct 2010 04:22:04 - 2.333.2.31
+++ rpm/devtool.conf 18 Oct 2010 10:12:11 - 2.333.2.32
@@ -2283,14 +2283,14 @@
%freebsd
# Ports: (* = internal)
# devel/automake111
- # devel/autoconf263
+ # devel/autoconf268
# devel/doxygen
# graphics/graphviz
# converters/libiconv
# devel/gettext
# *lang/lua
# *textproc/syck
- # *databases/db50 SQL=on
+ # databases/db51 SQL=on
# databases/sqlite3 EXTENSION=on
# devel/popt = 1.15
# security/beecrypt
@@ -2301,8 +2301,6 @@
# sysutils/pcre
# misc/ossp-uuid
- AUTOMAKE_VERSION=111
- AUTOCONF_VERSION=263
%autogen
LOCALBASE=/usr/local
PREFIX=${LOCALBASE}
@@ -2320,9 +2318,9 @@
--with-perl \
--with-python \
--with-apidocs \
- --with-db=internal \
+ --with-db \
--with-sqlite=external \
- --with-db-sql \
+ --with-dbsql \
--with-db-tools-integrated \
--with-zlib=external \
--with-file=internal \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/rpmconstant/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 18-Oct-2010 12:13:49 Branch: rpm-5_3 Handle: 2010101810134900 Modified files: (Branch: rpm-5_3) rpm/rpmconstant Makefile.am Log: rpmconstant: add rpmio to rpmmisc (for glob64) Summary: RevisionChanges Path 1.11.4.2+2 -1 rpm/rpmconstant/Makefile.am patch -p0 '@@ .' Index: rpm/rpmconstant/Makefile.am $ cvs diff -u -r1.11.4.1 -r1.11.4.2 Makefile.am --- rpm/rpmconstant/Makefile.am 18 Oct 2010 04:22:06 - 1.11.4.1 +++ rpm/rpmconstant/Makefile.am 18 Oct 2010 10:13:49 - 1.11.4.2 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.11.4.1 2010/10/18 04:22:06 jbj Exp $ +# $Id: Makefile.am,v 1.11.4.2 2010/10/18 10:13:49 afb Exp $ AUTOMAKE_OPTIONS = 1.4 foreign @@ -36,6 +36,7 @@ librpmconstant_la_LDFLAGS += -Wl,--version-script=$(srcdir)/librpmconstant.vers endif librpmconstant_la_LIBADD = \ + $(top_builddir)/rpmio/librpmio.la \ $(top_builddir)/misc/librpmmisc.la librpmconstant.la: $(librpmconstant_la_OBJECTS) $(librpmconstant_la_DEPENDENCIES) $(librpmconstant_la_LINK) -rpath $(usrlibdir) $(librpmconstant_la_OBJECTS) $(librpmconstant_la_LIBADD) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: lua/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: lua Date: 01-Oct-2010 09:56:43 Branch: HEAD Handle: 2010100107564300 Modified files: lua Makefile.am Log: lua: use DESTDIR, don't hardlink across devices Summary: RevisionChanges Path 1.42+6 -6 lua/Makefile.am patch -p0 '@@ .' Index: lua/Makefile.am $ cvs diff -u -r1.41 -r1.42 Makefile.am --- lua/Makefile.am 30 Apr 2010 18:03:42 - 1.41 +++ lua/Makefile.am 1 Oct 2010 07:56:43 - 1.42 @@ -316,9 +316,9 @@ # XXX Build install as rpmlua/rpmluac with hardlinks to lua/luac post install. # XXX CVS has lua/luac sub-directories in the Attic that collide with the # XXX lua/luac executable names when using cvs update. -install-exec-hook: rpmlua rpmluac - mkdir -p $(pkgbindir) - $(__RM) -f $(pkgbindir)/lua - $(__LN) rpmlua $(pkgbindir)/lua - $(__RM) -f $(pkgbindir)/luac - $(__LN) rpmluac $(pkgbindir)/luac +install-exec-hook: install-pkgbinPROGRAMS + mkdir -p $(DESTDIR)$(pkgbindir) + $(__RM) -f $(DESTDIR)$(pkgbindir)/lua + $(__LN) $(DESTDIR)$(pkgbindir)/rpmlua $(DESTDIR)$(pkgbindir)/lua + $(__RM) -f $(DESTDIR)$(pkgbindir)/luac + $(__LN) $(DESTDIR)$(pkgbindir)/rpmluac $(DESTDIR)$(pkgbindir)/luac @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: lua/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: lua Date: 01-Oct-2010 09:56:51 Branch: rpm-5_3 Handle: 2010100107565100 Modified files: (Branch: rpm-5_3) lua Makefile.am Log: lua: use DESTDIR, don't hardlink across devices Summary: RevisionChanges Path 1.40.2.2+6 -6 lua/Makefile.am patch -p0 '@@ .' Index: lua/Makefile.am $ cvs diff -u -r1.40.2.1 -r1.40.2.2 Makefile.am --- lua/Makefile.am 30 Apr 2010 18:14:29 - 1.40.2.1 +++ lua/Makefile.am 1 Oct 2010 07:56:51 - 1.40.2.2 @@ -316,9 +316,9 @@ # XXX Build install as rpmlua/rpmluac with hardlinks to lua/luac post install. # XXX CVS has lua/luac sub-directories in the Attic that collide with the # XXX lua/luac executable names when using cvs update. -install-exec-hook: rpmlua rpmluac - mkdir -p $(pkgbindir) - $(__RM) -f $(pkgbindir)/lua - $(__LN) rpmlua $(pkgbindir)/lua - $(__RM) -f $(pkgbindir)/luac - $(__LN) rpmluac $(pkgbindir)/luac +install-exec-hook: install-pkgbinPROGRAMS + mkdir -p $(DESTDIR)$(pkgbindir) + $(__RM) -f $(DESTDIR)$(pkgbindir)/lua + $(__LN) $(DESTDIR)$(pkgbindir)/rpmlua $(DESTDIR)$(pkgbindir)/lua + $(__RM) -f $(DESTDIR)$(pkgbindir)/luac + $(__LN) $(DESTDIR)$(pkgbindir)/rpmluac $(DESTDIR)$(pkgbindir)/luac @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES configure.ac rpm/tests/ macros.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-Sep-2010 10:26:37
Branch: HEAD Handle: 2010090108263601
Modified files:
rpm CHANGES configure.ac
rpm/tests macros.in
Log:
tests: set up local magic path for internal file.
Summary:
RevisionChanges Path
1.3436 +1 -0 rpm/CHANGES
2.449 +5 -2 rpm/configure.ac
1.30+1 -2 rpm/tests/macros.in
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3435 -r1.3436 CHANGES
--- rpm/CHANGES 31 Aug 2010 16:34:00 - 1.3435
+++ rpm/CHANGES 1 Sep 2010 08:26:36 - 1.3436
@@ -1,4 +1,5 @@
5.3.3 - 5.4a1:
+- afb: tests: set up local magic path for internal file.
- jbj: rpmrepo: move CLI tables and global __rpmrepo structure.
- afb: tests: target POSIX make instead of GNU make.
- jbj: rpmrepo: move the data structures into the rpmrepo object.
@@ .
patch -p0 '@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.448 -r2.449 configure.ac
--- rpm/configure.ac 30 Aug 2010 08:28:36 - 2.448
+++ rpm/configure.ac 1 Sep 2010 08:26:36 - 2.449
@@ -1356,11 +1356,14 @@
[File (magic)], [file],
[magic], [magic_open], [magic.h],
[yes,external:internal:none], [file:src:src],
-[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
+[ AM_CONDITIONAL(WITH_FILE_INTERNAL, [ test .$RPM_CHECK_LIB_LOCATION =
.internal ])
+ if test .$RPM_CHECK_LIB_LOCATION = .internal; then
WITH_FILE_INTERNAL=true
AC_DEFINE(HAVE_MAGIC_H, 1, [Define to 1 if you have magic.h])
fi
-], [])
+],
+[ AM_CONDITIONAL(WITH_FILE_INTERNAL, [ false ])
+])
dnl # Berkeley-DB SQLite
DBLIBSRCS=
@@ .
patch -p0 '@@ .'
Index: rpm/tests/macros.in
$ cvs diff -u -r1.29 -r1.30 macros.in
--- rpm/tests/macros.in 28 Aug 2010 18:53:48 - 1.29
+++ rpm/tests/macros.in 1 Sep 2010 08:26:37 - 1.30
@@ -45,8 +45,7 @@
#%_solve_name_fmt%{?_solve_pkgsdir}%{___NVRA}.rpm
%find_lang %{_testdir}/../scripts/find-lang.sh %{buildroot}
-# XXX uncomment for --with-file=internal
-#%_rpmfc_magic_path %{_testdir}/../file/magic/magic
+...@with_file_internal_true@%_rpmfc_magic_path
%{_testdir}/../file/magic/magic
%__libtool_provides %{nil}
%__libtool_requires %{nil}
%__scriptlet_requires%{nil}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-Sep-2010 10:32:08
Branch: HEAD Handle: 2010090108320800
Modified files:
rpm devtool.conf
Log:
devtool: copy %freebsd from rpm-5_3
Summary:
RevisionChanges Path
2.344 +57 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.343 -r2.344 devtool.conf
--- rpm/devtool.conf 28 Aug 2010 16:05:44 - 2.343
+++ rpm/devtool.conf 1 Sep 2010 08:32:08 - 2.344
@@ -2038,6 +2038,63 @@
# test drive (version only, should set up a local dbpath)
DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:/tmp/rpm-root/usr/local/lib/rpm/lib:$DYLD_LIBRARY_PATH
/tmp/rpm-root/usr/local/bin/rpm --version
+%freebsd
+ # Ports: (* = internal)
+ # devel/automake111
+ # devel/autoconf263
+ # devel/doxygen
+ # graphics/graphviz
+ # converters/libiconv
+ # devel/gettext
+ # *lang/lua
+ # *textproc/syck
+ # *databases/db50 SQL=on
+ # databases/sqlite3 EXTENSION=on
+ # devel/popt = 1.15
+ # security/beecrypt
+ # www/neon28
+ # *sysutils/file
+ # sysutils/xar
+ # sysutils/xz
+ # sysutils/pcre
+ # misc/ossp-uuid
+
+ AUTOMAKE_VERSION=111
+ AUTOCONF_VERSION=263
+ %autogen
+ LOCALBASE=/usr/local
+ PREFIX=${LOCALBASE}
+ sed -i -E -e s:\$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig: \
+ scripts/Makefile.in
+ CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/xar
+ LDFLAGS=-L${LOCALBASE}/lib
+ export CPPFLAGS
+ export LDFLAGS
+ %configure \
+ --with-lua=internal \
+ --with-syck=internal \
+ --without-js \
+ --without-gpsee \
+ --with-perl \
+ --with-python \
+ --with-apidocs \
+ --with-db=internal \
+ --with-sqlite=external \
+ --with-db-sql \
+ --with-db-tools-integrated \
+ --with-zlib=external \
+ --with-file=internal \
+ --with-xar=external \
+ --with-xz=external \
+ --with-pcre=external \
+ --with-uuid=external \
+ --sysconfdir=${PREFIX}/etc \
+ --with-path-cfg=${PREFIX}/etc/rpm \
+ --prefix=${PREFIX} \
+ --mandir=${PREFIX}/man \
+ --infodir=${PREFIX}/info \
+ --disable-openmp
+
%prepare
%checkout
%autogen
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-Sep-2010 11:01:47
Branch: HEAD Handle: 2010090109014700
Modified files:
rpm devtool.conf
Log:
devtool: rip out %tiger universal
Summary:
RevisionChanges Path
2.345 +12 -131rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.344 -r2.345 devtool.conf
--- rpm/devtool.conf 1 Sep 2010 08:32:08 - 2.344
+++ rpm/devtool.conf 1 Sep 2010 09:01:47 - 2.345
@@ -1350,74 +1350,16 @@
standalone_testdrive
}
-%afb
-%tiger
-
-%panther
-MACOSX_DEPLOYMENT_TARGET=10.3
-export MACOSX_DEPLOYMENT_TARGET
-UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
-UNIVERSAL_CPP=gcc-3.3 -E
-UNIVERSAL_CC=gcc-3.3; export
PATH=$PATH:/usr/libexec/gcc/darwin/ppc/3.3 # horrible Intel workaround
-UNIVERSAL_CXX=g++-3.3
-UNIVERSAL_CPPFLAGS=-I${UNIVERSAL_SDK}/usr/include
-UNIVERSAL_CFLAGS=-isystem ${UNIVERSAL_SDK}/usr/include -isystem
${UNIVERSAL_SDK}/usr/include/gcc/darwin/3.3 -arch ppc
-UNIVERSAL_LDFLAGS=-Wl,-syslibroot,${UNIVERSAL_SDK} -arch ppc
-UNIVERSAL_TARGET=--host powerpc-apple-darwin7 --target
powerpc-apple-darwin7
-platform=Panther
-@source %macosx
-
-%tiger
-MACOSX_DEPLOYMENT_TARGET=10.4
-export MACOSX_DEPLOYMENT_TARGET
-UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-UNIVERSAL_CPP=gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}
-UNIVERSAL_CC=gcc-4.0
-UNIVERSAL_CXX=g++-4.0
-UNIVERSAL_CPPFLAGS=
-UNIVERSAL_CFLAGS=-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386
-UNIVERSAL_LDFLAGS=-arch ppc -arch i386
-UNIVERSAL_TARGET=--host i686-apple-darwin8 --target i686-apple-darwin8
-platform=Tiger
-@source %macosx
-
-%leopard
-MACOSX_DEPLOYMENT_TARGET=10.5
-export MACOSX_DEPLOYMENT_TARGET
-UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.5.sdk
-UNIVERSAL_CPP=gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}
-UNIVERSAL_CC=gcc-4.0
-UNIVERSAL_CXX=g++-4.0
-UNIVERSAL_CPPFLAGS=
-UNIVERSAL_CFLAGS=-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386
-UNIVERSAL_LDFLAGS=-arch ppc -arch i386
-UNIVERSAL_TARGET=--host i686-apple-darwin9 --target i686-apple-darwin9
-platform=Leopard
-@source %macosx
-
%darwin
%macosx
%macosx
##
-## Builds a Universal Binary (ppc/i386), on the Mac OS X 10.x platforms.
-## (this target is heavilly inspired by the OpenPKG standalone target)
-##
-## Written by Anders F Bjorklund in memoriam of the rpm4darwin project
-## which provided the legacy RPM 4.0 to 4.3, for Mac OS X 10.1 to 10.4
-## It can also be used if you want access to the RPM tools or libraries
-## from RPM, without having to install all requirements from MacPorts.
-##
## These tools are built local: m4, autoconf, automake, libtool, gettext
## (the system-provided versions are too old, and thus cannot be
used...)
## Note: libtool is called glibtool on the Darwin platform, due to a
## name conflict with the system linker which is also called libtool(1)
##
-## Shipped programs/libraries are built as Universal Binaries (i.e. fat)
-## with: -isysroot /Developer/SDKs/MacOSX10.x.sdk -arch ppc -arch i386
-## This also requires --disable-dependency-tracking, since it doesn't
-## work with multiple -arch flags (see Apple's Technical Note TN2137)
-##
## These libraries are built internally: db, lua, syck, file, xar, xz
## These are statically linked: neon, beecrypt, sqlite, popt, pcre, uuid
## (building popt statically requires that the required popt.h header
@@ -1434,19 +1376,10 @@
#determine some local tools
SHTOOL=`cd ${DEVTOOL_SRCDIR} pwd`/devtool.shtool
-if [ .$UNIVERSAL_SDK != . ]; then
-if [ ! -d $UNIVERSAL_SDK ]; then
-echo devtool:ERROR: sorry, \$UNIVERSAL_SDK\ is missing 12
-exit 1
-fi
-fi
-test .$UNIVERSAL_CPP == . UNIVERSAL_CPP=gcc -E
-test .$UNIVERSAL_CC == . UNIVERSAL_CC=gcc
-test .$UNIVERSAL_CXX == . UNIVERSAL_CXX=g++
# third-party base directory
basemac=${DEVTOOL_SRCDIR}/../mac
-test .$platform == . platform=MacOSX # needs subdir
+platform=MacOSX # needs subdir
# prepare build environment
[CVS] RPM: rpm-5_3: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-Sep-2010 11:04:44
Branch: rpm-5_3 Handle: 2010090109044300
Modified files: (Branch: rpm-5_3)
rpm devtool.conf
Log:
devtool: rip out %tiger universal
Summary:
RevisionChanges Path
2.333.2.18 +12 -131rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.333.2.17 -r2.333.2.18 devtool.conf
--- rpm/devtool.conf 23 Aug 2010 19:46:19 - 2.333.2.17
+++ rpm/devtool.conf 1 Sep 2010 09:04:43 - 2.333.2.18
@@ -1549,74 +1549,16 @@
standalone_testdrive
}
-%afb
-%tiger
-
-%panther
-MACOSX_DEPLOYMENT_TARGET=10.3
-export MACOSX_DEPLOYMENT_TARGET
-UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.3.9.sdk
-UNIVERSAL_CPP=gcc-3.3 -E
-UNIVERSAL_CC=gcc-3.3; export
PATH=$PATH:/usr/libexec/gcc/darwin/ppc/3.3 # horrible Intel workaround
-UNIVERSAL_CXX=g++-3.3
-UNIVERSAL_CPPFLAGS=-I${UNIVERSAL_SDK}/usr/include
-UNIVERSAL_CFLAGS=-isystem ${UNIVERSAL_SDK}/usr/include -isystem
${UNIVERSAL_SDK}/usr/include/gcc/darwin/3.3 -arch ppc
-UNIVERSAL_LDFLAGS=-Wl,-syslibroot,${UNIVERSAL_SDK} -arch ppc
-UNIVERSAL_TARGET=--host powerpc-apple-darwin7 --target
powerpc-apple-darwin7
-platform=Panther
-@source %macosx
-
-%tiger
-MACOSX_DEPLOYMENT_TARGET=10.4
-export MACOSX_DEPLOYMENT_TARGET
-UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-UNIVERSAL_CPP=gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}
-UNIVERSAL_CC=gcc-4.0
-UNIVERSAL_CXX=g++-4.0
-UNIVERSAL_CPPFLAGS=
-UNIVERSAL_CFLAGS=-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386
-UNIVERSAL_LDFLAGS=-arch ppc -arch i386
-UNIVERSAL_TARGET=--host i686-apple-darwin8 --target i686-apple-darwin8
-platform=Tiger
-@source %macosx
-
-%leopard
-MACOSX_DEPLOYMENT_TARGET=10.5
-export MACOSX_DEPLOYMENT_TARGET
-UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.5.sdk
-UNIVERSAL_CPP=gcc-4.0 -E -isysroot ${UNIVERSAL_SDK}
-UNIVERSAL_CC=gcc-4.0
-UNIVERSAL_CXX=g++-4.0
-UNIVERSAL_CPPFLAGS=
-UNIVERSAL_CFLAGS=-isysroot ${UNIVERSAL_SDK} -arch ppc -arch i386
-UNIVERSAL_LDFLAGS=-arch ppc -arch i386
-UNIVERSAL_TARGET=--host i686-apple-darwin9 --target i686-apple-darwin9
-platform=Leopard
-@source %macosx
-
%darwin
%macosx
%macosx
##
-## Builds a Universal Binary (ppc/i386), on the Mac OS X 10.x platforms.
-## (this target is heavilly inspired by the OpenPKG standalone target)
-##
-## Written by Anders F Bjorklund in memoriam of the rpm4darwin project
-## which provided the legacy RPM 4.0 to 4.3, for Mac OS X 10.1 to 10.4
-## It can also be used if you want access to the RPM tools or libraries
-## from RPM, without having to install all requirements from MacPorts.
-##
## These tools are built local: m4, autoconf, automake, libtool, gettext
## (the system-provided versions are too old, and thus cannot be
used...)
## Note: libtool is called glibtool on the Darwin platform, due to a
## name conflict with the system linker which is also called libtool(1)
##
-## Shipped programs/libraries are built as Universal Binaries (i.e. fat)
-## with: -isysroot /Developer/SDKs/MacOSX10.x.sdk -arch ppc -arch i386
-## This also requires --disable-dependency-tracking, since it doesn't
-## work with multiple -arch flags (see Apple's Technical Note TN2137)
-##
## These libraries are built internally: db, lua, syck, file, xar, xz
## These are statically linked: neon, beecrypt, sqlite, popt, pcre, uuid
## (building popt statically requires that the required popt.h header
@@ -1633,19 +1575,10 @@
#determine some local tools
SHTOOL=`cd ${DEVTOOL_SRCDIR} pwd`/devtool.shtool
-if [ .$UNIVERSAL_SDK != . ]; then
-if [ ! -d $UNIVERSAL_SDK ]; then
-echo devtool:ERROR: sorry, \$UNIVERSAL_SDK\ is missing 12
-exit 1
-fi
-fi
-test .$UNIVERSAL_CPP == . UNIVERSAL_CPP=gcc -E
-test .$UNIVERSAL_CC == . UNIVERSAL_CC=gcc
-test .$UNIVERSAL_CXX == . UNIVERSAL_CXX=g++
# third-party base directory
basemac=${DEVTOOL_SRCDIR}/../mac
-test .$platform == . platform=MacOSX # needs subdir
+platform=MacOSX # needs subdir
[CVS] RPM: rpm-5_3: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 01-May-2010 15:30:05
Branch: rpm-5_3 Handle: 2010050113300400
Modified files: (Branch: rpm-5_3)
rpm devtool.conf
Log:
%freebsd: add internal devtool target, similar config to port
Summary:
RevisionChanges Path
2.333.2.10 +57 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.333.2.9 -r2.333.2.10 devtool.conf
--- rpm/devtool.conf 1 May 2010 05:19:50 - 2.333.2.9
+++ rpm/devtool.conf 1 May 2010 13:30:04 - 2.333.2.10
@@ -2160,6 +2160,63 @@
# test drive (version only, should set up a local dbpath)
DYLD_LIBRARY_PATH=/tmp/rpm-root/usr/local/lib:/tmp/rpm-root/usr/local/lib/rpm/lib:$DYLD_LIBRARY_PATH
/tmp/rpm-root/usr/local/bin/rpm --version
+%freebsd
+ # Ports: (* = internal)
+ # devel/automake111
+ # devel/autoconf263
+ # devel/doxygen
+ # graphics/graphviz
+ # converters/libiconv
+ # devel/gettext
+ # *lang/lua
+ # *textproc/syck
+ # *databases/db50 SQL=on
+ # databases/sqlite3 EXTENSION=on
+ # devel/popt = 1.15
+ # security/beecrypt
+ # www/neon28
+ # *sysutils/file
+ # sysutils/xar
+ # sysutils/xz
+ # sysutils/pcre
+ # misc/ossp-uuid
+
+ AUTOMAKE_VERSION=111
+ AUTOCONF_VERSION=263
+ %autogen
+ LOCALBASE=/usr/local
+ PREFIX=${LOCALBASE}
+ sed -i -E -e s:\$(libdir)/pkgconfig:${PREFIX}/libdata/pkgconfig: \
+ scripts/Makefile.in
+ CPPFLAGS=-I${LOCALBASE}/include -I${LOCALBASE}/include/xar
+ LDFLAGS=-L${LOCALBASE}/lib
+ export CPPFLAGS
+ export LDFLAGS
+ %configure \
+ --with-lua=internal \
+ --with-syck=internal \
+ --without-js \
+ --without-gpsee \
+ --with-perl \
+ --with-python \
+ --with-apidocs \
+ --with-db=internal \
+ --with-sqlite=external \
+ --with-db-sql \
+ --with-db-tools-integrated \
+ --with-zlib=external \
+ --with-file=internal \
+ --with-xar=external \
+ --with-xz=external \
+ --with-pcre=external \
+ --with-uuid=external \
+ --sysconfdir=${PREFIX}/etc \
+ --with-path-cfg=${PREFIX}/etc/rpm \
+ --prefix=${PREFIX} \
+ --mandir=${PREFIX}/man \
+ --infodir=${PREFIX}/info \
+ --disable-openmp
+
%prepare
%checkout
%autogen
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ INSTALL
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 27-Apr-2010 09:10:05 Branch: rpm-5_3 Handle: 2010042707100500 Modified files: (Branch: rpm-5_3) rpm INSTALL Log: version order accidentally reversed Summary: RevisionChanges Path 2.128.2.2 +1 -1 rpm/INSTALL patch -p0 '@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.128.2.1 -r2.128.2.2 INSTALL --- rpm/INSTALL 26 Apr 2010 19:15:23 - 2.128.2.1 +++ rpm/INSTALL 27 Apr 2010 07:10:05 - 2.128.2.2 @@ -29,7 +29,7 @@ POSIX make mandatory - - e.g. http://www.gnu.org/software/make/ Perlmandatory 5.8.0 5.10.0 http://www.perl.com/ POPTmandatory 1.151.15http://rpm5.org/files/popt/ -BeeCryptmandatory 4.2.1 4.2.0 http://beecrypt.sourceforge.net/ +BeeCryptmandatory 4.2.0 4.2.1 http://beecrypt.sourceforge.net/ PCREmandatory 7.0 7.9 http://www.pcre.org/ Mozilla NSS optional 3.113.11.7 http://www.mozilla.org/projects/security/pki/nss/ OpenSSL optional 0.9.8 0.9.8k http://www.openssl.org/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 27-Apr-2010 10:31:46 Branch: rpm-5_3 Handle: 2010042708314600 Modified files: (Branch: rpm-5_3) rpm configure.ac Log: cut down on the numbers of beecrypt headers checked, and don't need to add them to config.h Summary: RevisionChanges Path 2.432.2.5 +2 -7 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.4 -r2.432.2.5 configure.ac --- rpm/configure.ac 26 Apr 2010 19:15:23 - 2.432.2.4 +++ rpm/configure.ac 27 Apr 2010 08:31:46 - 2.432.2.5 @@ -1216,13 +1216,8 @@ if test .$WITH_BEECRYPT = .no; then AC_MSG_ERROR([BEECRYPT is mandatory]) fi -AC_CHECK_HEADERS([beecrypt/api.h beecrypt/base64.h beecrypt/beecrypt.h dnl -beecrypt/dsa.h beecrypt/endianness.h beecrypt/md4.h beecrypt/md5.h dnl -beecrypt/mp.h beecrypt/mpbarrett.h beecrypt/ripemd128.h dnl -beecrypt/ripemd160.h beecrypt/ripemd256.h beecrypt/ripemd320.h dnl -beecrypt/rsa.h beecrypt/rsapk.h beecrypt/sha1.h beecrypt/sha224.h dnl -beecrypt/sha256.h beecrypt/sha384.h beecrypt/sha512.h], [], -[ AC_MSG_ERROR([Your version of BEECRYPT is too old.]) ]) +AC_CHECK_HEADER([beecrypt/md4.h], [], + AC_MSG_ERROR([Your version of BEECRYPT is too old])) dnl # GCrypt RPM_CHECK_LIB( @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 27-Apr-2010 10:33:20 Branch: rpm-5_3 Handle: 2010042708332000 Modified files: (Branch: rpm-5_3) rpm configure.ac Log: check for manadatory minimum version of popt (1.15) Summary: RevisionChanges Path 2.432.2.6 +7 -0 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.5 -r2.432.2.6 configure.ac --- rpm/configure.ac 27 Apr 2010 08:31:46 - 2.432.2.5 +++ rpm/configure.ac 27 Apr 2010 08:33:20 - 2.432.2.6 @@ -1167,6 +1167,13 @@ [popt], [poptGetContext], [popt.h], [yes,external], [], [], [AC_MSG_ERROR([mandatory POPT library not found])]) +PROVIDES_POPT_ARGFLAG_TOGGLE=no +AC_MSG_CHECKING(if popt.h defines POPT_ARGFLAG_TOGGLE) +AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include popt.h]], [[printf(%d,POPT_ARGFLAG_TOGGLE)]])],[PROVIDES_POPT_ARGFLAG_TOGGLE=yes],[]) +AC_MSG_RESULT($PROVIDES_POPT_ARGFLAG_TOGGLE) +if test .$PROVIDES_POPT_ARGFLAG_TOGGLE = .no; then + AC_MSG_ERROR([Your version of POPT is too old]) +fi HAVE_RPM_COMPRESSION=no dnl # ZLib @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 27-Apr-2010 14:55:57 Branch: rpm-5_3 Handle: 2010042712555700 Modified files: (Branch: rpm-5_3) rpm configure.ac Log: look for sha224 instead of md4, for minimum beecrypt version (4.2.0) Summary: RevisionChanges Path 2.432.2.7 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.6 -r2.432.2.7 configure.ac --- rpm/configure.ac 27 Apr 2010 08:33:20 - 2.432.2.6 +++ rpm/configure.ac 27 Apr 2010 12:55:57 - 2.432.2.7 @@ -1223,7 +1223,7 @@ if test .$WITH_BEECRYPT = .no; then AC_MSG_ERROR([BEECRYPT is mandatory]) fi -AC_CHECK_HEADER([beecrypt/md4.h], [], +AC_CHECK_HEADER([beecrypt/sha224.h], [], AC_MSG_ERROR([Your version of BEECRYPT is too old])) dnl # GCrypt @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/tools/ rpm2cpio.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 25-Apr-2010 10:10:27
Branch: rpm-5_2 Handle: 2010042508102700
Modified files: (Branch: rpm-5_2)
rpm/tools rpm2cpio.c
Log:
- rpm2cpio: resurrect - compatibility. (backport from 5.3)
Summary:
RevisionChanges Path
2.10.2.1+1 -1 rpm/tools/rpm2cpio.c
patch -p0 '@@ .'
Index: rpm/tools/rpm2cpio.c
$ cvs diff -u -r2.10 -r2.10.2.1 rpm2cpio.c
--- rpm/tools/rpm2cpio.c 26 Mar 2009 18:07:34 - 2.10
+++ rpm/tools/rpm2cpio.c 25 Apr 2010 08:10:27 - 2.10.2.1
@@ -23,7 +23,7 @@
FD_t gzdi;
setprogname(argv[0]);/* Retrofit glibc __progname */
-if (argc == 1)
+if (argc == 1 || (argc == 2 !strcmp(argv[1], -)))
fdi = fdDup(STDIN_FILENO);
else {
int ut = urlPath(argv[1], NULL);
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 20-Apr-2010 15:18:46 Branch: HEAD Handle: 2010042013184600 Modified files: rpm configure.ac Log: add missing sys/time.h detection, for use in system.h Summary: RevisionChanges Path 2.434 +1 -1 rpm/configure.ac patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.433 -r2.434 configure.ac --- rpm/configure.ac 3 Apr 2010 15:55:58 - 2.433 +++ rpm/configure.ac 20 Apr 2010 13:18:46 - 2.434 @@ -575,7 +575,7 @@ dnl # standard headers (generic) AC_CHECK_HEADERS([dnl fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h dnl -signal.h sys/ipc.h sys/socket.h sys/select.h dnl +signal.h sys/ipc.h sys/socket.h sys/select.h sys/time.h dnl sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ macro.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 20-Apr-2010 15:22:28
Branch: HEAD Handle: 2010042013222700
Modified files:
rpm/rpmio macro.c
Log:
fix conditionals, minor typo on WITH_SQLITE
Summary:
RevisionChanges Path
2.248 +2 -2 rpm/rpmio/macro.c
patch -p0 '@@ .'
Index: rpm/rpmio/macro.c
$ cvs diff -u -r2.247 -r2.248 macro.c
--- rpm/rpmio/macro.c 4 Apr 2010 14:35:44 - 2.247
+++ rpm/rpmio/macro.c 20 Apr 2010 13:22:27 - 2.248
@@ -99,7 +99,7 @@
#include debug.h
/*...@unchecked@*/
-#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_JS) ||
defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) ||
defined(WITH_RUBYEMBED) || defined(WITH_SQL) || defined(WITH_SQUIRREL) ||
defined(WITH_TCL)
+#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_JS) ||
defined(WITH_NIX) || defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) ||
defined(WITH_RUBYEMBED) || defined(WITH_SQLITE) || defined(WITH_SQUIRREL) ||
defined(WITH_TCL)
static int _globalI = 0x8000;
#endif
@@ -1587,7 +1587,7 @@
* @retval *avp invocation args
* @return script string
*/
-#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_JS) ||
defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED)
|| defined(WITH_SQUIRREL) || defined(WITH_TCL)
+#if defined(WITH_AUGEAS) || defined(WITH_FICL) || defined(WITH_JS) ||
defined(WITH_PERLEMBED) || defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED)
|| defined(WITH_SQLITE) || defined(WITH_SQUIRREL) || defined(WITH_TCL)
static char * parseEmbedded(const char * s, size_t nb, char *** avp)
/*...@*/
{
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: lua/chkconfig/ chkconfig.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: lua Date: 04-Apr-2010 09:59:35
Branch: HEAD Handle: 2010040407593500
Modified files:
lua/chkconfig chkconfig.c
Log:
fix casts, to work with C too
Summary:
RevisionChanges Path
1.6 +3 -3 lua/chkconfig/chkconfig.c
patch -p0 '@@ .'
Index: lua/chkconfig/chkconfig.c
$ cvs diff -u -r1.5 -r1.6 chkconfig.c
--- lua/chkconfig/chkconfig.c 21 Mar 2010 14:56:58 - 1.5
+++ lua/chkconfig/chkconfig.c 4 Apr 2010 07:59:35 - 1.6
@@ -211,7 +211,7 @@
}
if (!S_ISREG(sb.st_mode)) continue;
if (!strcmp(ent-d_name, s-name)) continue;
- servs = (service *) realloc(servs, (numservs+1) * sizeof(struct
service));
+ servs = (struct service *) realloc(servs, (numservs+1) *
sizeof(struct service));
if (!readServiceInfo(ent-d_name, servs + numservs, 0))
numservs++;
}
@@ -473,7 +473,7 @@
}
numServices = 0;
numServicesAlloced = 10;
- s = (service *) malloc(sizeof (*s) * numServicesAlloced);
+ s = (struct service *) malloc(sizeof (*s) * numServicesAlloced);
while ((ent = readdir(dir))) {
const char *dn;
@@ -492,7 +492,7 @@
if (numServices == numServicesAlloced) {
numServicesAlloced += 10;
- s = (service *) realloc(s, numServicesAlloced *
sizeof (*s));
+ s = (struct service *) realloc(s,
numServicesAlloced * sizeof (*s));
}
if (readXinetdServiceInfo(ent-d_name, s + numServices, 0)
!= -1)
numServices ++;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: lua/shadow/ strtoday.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: lua Date: 04-Apr-2010 10:06:01
Branch: HEAD Handle: 2010040408060100
Modified files:
lua/shadow strtoday.c
Log:
make function match prototype, cast instead
Summary:
RevisionChanges Path
1.8 +3 -3 lua/shadow/strtoday.c
patch -p0 '@@ .'
Index: lua/shadow/strtoday.c
$ cvs diff -u -r1.7 -r1.8 strtoday.c
--- lua/shadow/strtoday.c 21 Mar 2010 14:56:59 - 1.7
+++ lua/shadow/strtoday.c 4 Apr 2010 08:06:01 - 1.8
@@ -42,7 +42,7 @@
#include defines.h
#include prototypes.h
-#ident $Id: strtoday.c,v 1.7 2010/03/21 14:56:59 jbj Exp $
+#ident $Id: strtoday.c,v 1.8 2010/04/04 08:06:01 afb Exp $
#ifndef USE_GETDATE
#define USE_GETDATE 1
@@ -1711,7 +1711,7 @@
* 24-sep-72
* 24sep72
*/
-long strtoday (char *str)
+long strtoday (const char *str)
{
time_t t;
@@ -1723,7 +1723,7 @@
if (!str || *str == '\0')
return -1;
- t = get_date (str, (struct timeb *) 0);
+ t = get_date ((char *) str, (struct timeb *) 0);
if (t == (time_t) - 1)
return -1;
/* convert seconds to days since 1970-01-01 */
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ md6.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 10-Jan-2010 10:05:27
Branch: HEAD Handle: 2010011009052600
Modified files:
rpm/rpmio md6.c
Log:
make sure to include system headers early, so that local #defines
don't break them
Summary:
RevisionChanges Path
1.3 +1 -0 rpm/rpmio/md6.c
patch -p0 '@@ .'
Index: rpm/rpmio/md6.c
$ cvs diff -u -r1.2 -r1.3 md6.c
--- rpm/rpmio/md6.c 6 Dec 2009 16:47:05 - 1.2
+++ rpm/rpmio/md6.c 10 Jan 2010 09:05:26 - 1.3
@@ -128,6 +128,7 @@
#include assert.h
#include stdio.h
+#include stdlib.h
#include string.h
#include md6.h
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ INSTALL
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 10-Jan-2010 10:39:48 Branch: rpm-5_2 Handle: 2010011009394800 Modified files: (Branch: rpm-5_2) rpm INSTALL Log: doc: move pcre to mandatory section (backport) Summary: RevisionChanges Path 2.122.2.2 +2 -1 rpm/INSTALL patch -p0 '@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.122.2.1 -r2.122.2.2 INSTALL --- rpm/INSTALL 1 Jun 2009 13:44:13 - 2.122.2.1 +++ rpm/INSTALL 10 Jan 2010 09:39:48 - 2.122.2.2 @@ -30,6 +30,7 @@ Perlmandatory 5.8.0 5.10.0 http://www.perl.com/ POPTmandatory 1.151.15http://rpm5.org/files/popt/ BeeCryptmandatory 4.0 4.1.2 http://beecrypt.sourceforge.net/ +PCREmandatory 7.0 7.9 http://www.pcre.org/ Mozilla NSS optional 3.113.11.7 http://www.mozilla.org/projects/security/pki/nss/ OpenSSL optional 0.9.8 0.9.8k http://www.openssl.org/ Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/ @@ -42,7 +43,6 @@ File/magic [4] optional 4.005.00ftp://ftp.astron.com/pub/file/ GNU gettext optional 0.160.17 http://www.gnu.org/software/gettext/ GNU iconv optional 1.111.11 http://www.gnu.org/software/libiconv/ -PCREmandatory 7.0 7.9 http://www.pcre.org/ OSSP uuid optional 1.6.0 1.6.2 http://www.ossp.org/pkg/lib/uuid/ XAR [5] optional 1.5.2 1.5.2 http://code.google.com/p/xar/ DMalloc optional 5 5.5.2 http://dmalloc.com/ @@ -207,6 +207,7 @@ Third-Party Libraries: libpopt (mandatory) (stage 2) libbeecrypt (mandatory) libdb (mandatory) + libpcre (mandatory) libsqlite3 (optional) liblua (optional) libz(optional) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ CHANGES INSTALL rpm/rpmio/ rpmjs.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 10-Jan-2010 10:49:29
Branch: rpm-5_2 Handle: 2010011009492801
Modified files: (Branch: rpm-5_2)
rpm CHANGES INSTALL
rpm/rpmio rpmjs.c
Log:
allow building rpm with js-1.7.0 too (backport)
Summary:
RevisionChanges Path
1.2970.2.44 +1 -0 rpm/CHANGES
2.122.2.3 +2 -0 rpm/INSTALL
1.11.2.3+20 -0 rpm/rpmio/rpmjs.c
patch -p0 '@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2970.2.43 -r1.2970.2.44 CHANGES
--- rpm/CHANGES 19 Nov 2009 15:52:09 - 1.2970.2.43
+++ rpm/CHANGES 10 Jan 2010 09:49:28 - 1.2970.2.44
@@ -1,4 +1,5 @@
5.2.0 - 5.2.1:
+- afb: permit building with js-1.7.0 (the only released version)
- proyvind: add %distepoch back to provideversion, leave legacy
compatibility for adopters to care about.
- proyvind: fix assert fail with Mandriva filetriggers in case of
@@ .
patch -p0 '@@ .'
Index: rpm/INSTALL
$ cvs diff -u -r2.122.2.2 -r2.122.2.3 INSTALL
--- rpm/INSTALL 10 Jan 2010 09:39:48 - 2.122.2.2
+++ rpm/INSTALL 10 Jan 2010 09:49:28 - 2.122.2.3
@@ -37,6 +37,7 @@
Berkeley-DB [1] optional 4.5 4.7.25
http://www.oracle.com/database/berkeley-db.html
SQLite [1] optional 3.3 3.6.14 http://www.sqlite.org/
Lua [2] optional 5.1 5.1.4 http://www.lua.org/
+JavaScript optional 1.7 1.7.0
http://www.mozilla.org/js/spidermonkey/
ZLiboptional 1.2 1.2.3 http://www.zlib.net/
Bzip2 optional 1.0 1.0.5 http://www.bzip.org/
XZ Utils[3] optional 4.999.8 4.999.8 http://tukaani.org/xz/
@@ -210,6 +211,7 @@
libpcre (mandatory)
libsqlite3 (optional)
liblua (optional)
+ libjs (optional)
libz(optional)
libbz2 (optional)
libintl (optional)
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmjs.c
$ cvs diff -u -r1.11.2.2 -r1.11.2.3 rpmjs.c
--- rpm/rpmio/rpmjs.c 10 May 2009 15:49:43 - 1.11.2.2
+++ rpm/rpmio/rpmjs.c 10 Jan 2010 09:49:29 - 1.11.2.3
@@ -58,8 +58,12 @@
{werror, JSOPTION_WERROR},
{atline, JSOPTION_ATLINE},
{xml, JSOPTION_XML},
+#ifdef JSOPTION_RELIMIT
{relimit, JSOPTION_RELIMIT},
+#endif
+#ifdef JSOPTION_ANONFUNFIX
{anonfunfix, JSOPTION_ANONFUNFIX},
+#endif
{NULL, 0}
};
@@ -182,7 +186,11 @@
JSString *str;
char *bytes;
if ((str = JS_ValueToString(cx, argv[i])) == NULL
+#if JS_VERSION 180
+ || (bytes = JS_GetStringBytes(str)) == NULL)
+#else
|| (bytes = JS_EncodeString(cx, str)) == NULL)
+#endif
return JS_FALSE;
fprintf(fp, %s%s, i ? : , bytes);
JS_free(cx, bytes);
@@ -192,6 +200,14 @@
return JS_TRUE;
}
+#ifndef JS_FS
+#define JS_FS(name,call,nargs,flags,extra) \
+{name, call, nargs, flags, extra}
+#endif
+#ifndef JS_FS_END
+#define JS_FS_END JS_FS(NULL,NULL,0,0,0)
+#endif
+
static JSFunctionSpec shell_functions[] = {
JS_FS(version, Version,0,0,0),
JS_FS(options, Options,0,0,0),
@@ -377,7 +393,11 @@
JS_BeginRequest(cx);
#endif
JS_SetOptions(cx, JSOPTION_VAROBJFIX);
+#if JS_VERSION 180
+JS_SetVersion(cx, JSVERSION_1_7);
+#else
JS_SetVersion(cx, JSVERSION_LATEST);
+#endif
JS_SetErrorReporter(cx, reportError);
js-cx = cx;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac rpm/rpmio/ librpmio.vers rpmio-stub.c rpm...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 09-Jan-2010 23:03:34 Branch: HEAD Handle: 2010010922033300 Modified files: rpm configure.ac rpm/rpmio librpmio.vers rpmio-stub.c rpmio-stub.h rpmio.h rpmrpc.c Log: add lutimes to rpmio Summary: RevisionChanges Path 2.425 +1 -1 rpm/configure.ac 2.149 +2 -0 rpm/rpmio/librpmio.vers 2.11+1 -0 rpm/rpmio/rpmio-stub.c 2.8 +1 -0 rpm/rpmio/rpmio-stub.h 1.95+8 -0 rpm/rpmio/rpmio.h 2.97+36 -0 rpm/rpmio/rpmrpc.c patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.424 -r2.425 configure.ac --- rpm/configure.ac 6 Jan 2010 07:27:49 - 2.424 +++ rpm/configure.ac 9 Jan 2010 22:03:33 - 2.425 @@ -784,7 +784,7 @@ asprintf basename chflags clearenv confstr fallocate fchflags fchmod dnl ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo dnl getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl -lgetxattr lsetxattr madvise mempcpy mkdtemp mkstemp mtrace dnl +lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl posix_fallocate putenv realpath regcomp __secure_getenv setattrlist dnl setenv setlocale setmode setproctitle setxattr sigaddset sigdelset dnl sigemptyset sighold sigrelse sigpause sigprocmask sigsuspend sigaction dnl @@ . patch -p0 '@@ .' Index: rpm/rpmio/librpmio.vers $ cvs diff -u -r2.148 -r2.149 librpmio.vers --- rpm/rpmio/librpmio.vers 24 Dec 2009 16:23:50 - 2.148 +++ rpm/rpmio/librpmio.vers 9 Jan 2010 22:03:33 - 2.149 @@ -175,6 +175,8 @@ _Lseek; Lstat; _Lstat; +Lutimes; +_Lutimes; lzdio; max_macro_depth; _max_load_depth; @@ . patch -p0 '@@ .' Index: rpm/rpmio/rpmio-stub.c $ cvs diff -u -r2.10 -r2.11 rpmio-stub.c --- rpm/rpmio/rpmio-stub.c6 Sep 2009 17:36:03 - 2.10 +++ rpm/rpmio/rpmio-stub.c9 Jan 2010 22:03:33 - 2.11 @@ -62,6 +62,7 @@ int (*_Mknod) (const char * path, mode_t mode, dev_t dev) = Mknod; int (*_Utime) (const char * path, const struct utimbuf * buf) = Utime; int (*_Utimes) (const char * path, const struct timeval * times) = Utimes; +int (*_Lutimes) (const char * path, const struct timeval * times) = Lutimes; int (*_Symlink) (const char * oldpath, const char * newpath) = Symlink; /*...@-type@*/ int (*_Readlink) (const char * path, char * buf, size_t bufsiz) = Readlink; @@ . patch -p0 '@@ .' Index: rpm/rpmio/rpmio-stub.h $ cvs diff -u -r2.7 -r2.8 rpmio-stub.h --- rpm/rpmio/rpmio-stub.h6 Sep 2009 17:36:03 - 2.7 +++ rpm/rpmio/rpmio-stub.h9 Jan 2010 22:03:33 - 2.8 @@ -45,6 +45,7 @@ extern int (*_Mknod) (const char * path, mode_t mode, dev_t dev); extern int (*_Utime) (const char * path, const struct utimbuf * buf); extern int (*_Utimes) (const char * path, const struct timeval * times); +extern int (*_Lutimes) (const char * path, const struct timeval * times); extern int (*_Symlink) (const char * oldpath, const char * newpath); extern int (*_Readlink) (const char * path, char * buf, size_t bufsiz); extern int (*_Access) (const char * path, int amode); @@ . patch -p0 '@@ .' Index: rpm/rpmio/rpmio.h $ cvs diff -u -r1.94 -r1.95 rpmio.h --- rpm/rpmio/rpmio.h 6 Sep 2009 17:36:03 - 1.94 +++ rpm/rpmio/rpmio.h 9 Jan 2010 22:03:33 - 1.95 @@ -416,6 +416,14 @@ /*...@modifies errno, fileSystem, internalState @*/; /** + * lutimes(2) clone. + * @todo Implement remotely. + */ +int Lutimes(const char * path, const struct timeval * times) + /*...@globals errno, fileSystem, internalState @*/ + /*...@modifies errno, fileSystem, internalState @*/; + +/** * symlink(3) clone. * @todo Implement remotely. */ @@ . patch -p0 '@@ .' Index: rpm/rpmio/rpmrpc.c $ cvs diff -u -r2.96 -r2.97 rpmrpc.c
[CVS] RPM: rpm/tools/ cp.c rpmfind.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 09-Jan-2010 23:04:15
Branch: HEAD Handle: 2010010922041500
Modified files:
rpm/tools cp.c rpmfind.c
Log:
use rpmio for compat
Summary:
RevisionChanges Path
2.20+1 -1 rpm/tools/cp.c
2.14+1 -1 rpm/tools/rpmfind.c
patch -p0 '@@ .'
Index: rpm/tools/cp.c
$ cvs diff -u -r2.19 -r2.20 cp.c
--- rpm/tools/cp.c6 Dec 2009 16:33:26 - 2.19
+++ rpm/tools/cp.c9 Jan 2010 22:04:15 - 2.20
@@ -218,7 +218,7 @@
TIMESPEC_TO_TIMEVAL(ct-tv[0], st-st_atimespec);
TIMESPEC_TO_TIMEVAL(ct-tv[1], st-st_mtimespec);
-if (islink ? lutimes(ct-npath, ct-tv) : Utimes(ct-npath, ct-tv)) {
+if (islink ? Lutimes(ct-npath, ct-tv) : Utimes(ct-npath, ct-tv)) {
rpmlog(RPMLOG_ERR, %stimes: %s: %s\n, islink ? lu : U, ct-npath,
strerror(errno));
rval = RPMRC_FAIL;
}
@@ .
patch -p0 '@@ .'
Index: rpm/tools/rpmfind.c
$ cvs diff -u -r2.13 -r2.14 rpmfind.c
--- rpm/tools/rpmfind.c 18 Dec 2009 00:32:39 - 2.13
+++ rpm/tools/rpmfind.c 9 Jan 2010 22:04:15 - 2.14
@@ -1483,7 +1483,7 @@
if ((entry-fts_statp-st_flags (UF_APPEND|UF_IMMUTABLE))
!(entry-fts_statp-st_flags (SF_APPEND|SF_IMMUTABLE))
geteuid() == 0)
- lchflags(entry-fts_accpath,
+ Lchflags(entry-fts_accpath,
entry-fts_statp-st_flags = ~(UF_APPEND|UF_IMMUTABLE));
#endif
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 06-Jan-2010 11:55:06
Branch: HEAD Handle: 2010010610550600
Modified files:
rpm devtool.conf
Log:
macosx: sync beecrypt with standalone
Summary:
RevisionChanges Path
2.328 +1 -3 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.327 -r2.328 devtool.conf
--- rpm/devtool.conf 6 Jan 2010 07:27:49 - 2.327
+++ rpm/devtool.conf 6 Jan 2010 10:55:06 - 2.328
@@ -1681,7 +1681,7 @@
-e '/^CXX = /s;@CXX@;@CC@;g' \
Makefile.in
$SHTOOL subst \
--e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
+-e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/ \}/;}' \
configure
( echo 'ac_cv_have_dev_dsp=no'
echo 'ac_cv_have_dev_audio=no'
@@ -1697,8 +1697,6 @@
--without-cplusplus \
--without-java \
--without-python \
---with-cpu=none \
---with-arch=none \
--disable-threads \
--disable-shared
make
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmrpc.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 07-Jan-2010 00:28:08
Branch: HEAD Handle: 2010010623280700
Modified files:
rpm/rpmio rpmrpc.c
Log:
check for having lchmod
Summary:
RevisionChanges Path
2.96+5 -0 rpm/rpmio/rpmrpc.c
patch -p0 '@@ .'
Index: rpm/rpmio/rpmrpc.c
$ cvs diff -u -r2.95 -r2.96 rpmrpc.c
--- rpm/rpmio/rpmrpc.c17 Oct 2009 16:22:42 - 2.95
+++ rpm/rpmio/rpmrpc.c6 Jan 2010 23:28:07 - 2.96
@@ -1719,6 +1719,7 @@
int Lchmod(const char * path, mode_t mode)
{
+#if defined(HAVE_LCHMOD)
const char * lpath;
int ut = urlPath(path, lpath);
int rc = -2;
@@ -1744,6 +1745,10 @@
if (_rpmio_debug)
fprintf(stderr, -- %s(%s,%0o) rc %d\n, __FUNCTION__, path, (int)mode, rc);
return rc;
+#else
+errno = ENOSYS;
+return -2;
+#endif
}
int Fchmod(FD_t fd, mode_t mode)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmdb/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 07-Jan-2010 00:45:07 Branch: HEAD Handle: 2010010623450400 Modified files: rpm/rpmdb Makefile.am Log: fix builds using VPATH Summary: RevisionChanges Path 1.124 +8 -5 rpm/rpmdb/Makefile.am patch -p0 '@@ .' Index: rpm/rpmdb/Makefile.am $ cvs diff -u -r1.123 -r1.124 Makefile.am --- rpm/rpmdb/Makefile.am 5 Jan 2010 11:35:44 - 1.123 +++ rpm/rpmdb/Makefile.am 6 Jan 2010 23:45:04 - 1.124 @@ -24,11 +24,11 @@ @WITH_PCRE_CPPFLAGS@ \ @WITH_XAR_CPPFLAGS@ -AM_CFLAGS = $(OPENMP_CFLAGS) -I../db +AM_CFLAGS = $(OPENMP_CFLAGS) -I$(top_srcdir)/db EXTRA_DIST = \ db3.c sqlite.c db_emu.h librpmdb.vers bdb.sql \ - logio.awk logio.src logio_template logio.c logio_rec.c \ + logio.awk logio.src logio_recover_template logio_template logio.c logio_rec.c \ logio_auto.c logio_autop.c logio_auto.h EXTRA_PROGRAMS = logio tjfn tbdb @@ -180,14 +180,17 @@ #rsync -rvz -e ssh --delete lcov/* ??? logio_BUILT = logio_auto.c logio_autop.c logio_auto.h logio_template -$(logio_BUILT): logio.awk logio.src +$(logio_BUILT): logio.awk logio.src logio_recover_template + @test -e $(builddir)/logio_recover_template || \ + cp -p $(srcdir)/logio_recover_template \ + $(builddir)/logio_recover_template @rm -f $(logio_BUILT) - @$(AWK) -f logio.awk \ + @$(AWK) -f $(srcdir)/logio.awk \ -v header_file=logio_auto.h \ -v print_file=logio_autop.c \ -v source_file=logio_auto.c \ -v template_file=logio_template \ - logio.src + $(srcdir)/logio.src logio_SOURCES = logio.c logio.h logio_LDADD = $(mylibs) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 05-Jan-2010 12:32:42
Branch: HEAD Handle: 2010010511324200
Modified files:
rpm devtool.conf
Log:
standalone: upgrade beecrypt, disable openmp
Summary:
RevisionChanges Path
2.325 +4 -4 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.324 -r2.325 devtool.conf
--- rpm/devtool.conf 3 Jan 2010 22:26:23 - 2.324
+++ rpm/devtool.conf 5 Jan 2010 11:32:42 - 2.325
@@ -524,7 +524,7 @@
v_openssl=0.9.8k
v_expat=2.0.1
v_neon=0.28.4
-v_beecrypt=4.1.2
+v_beecrypt=4.2.1
v_db=4.7.25
v_sqlite=3.6.14.2
v_lua=5.1.4
@@ -976,7 +976,7 @@
-e '/^CXX = /s;@CXX@;@CC@;g' \
Makefile.in
$SHTOOL subst \
--e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
+-e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/ \}/;}' \
configure
( echo 'ac_cv_have_dev_dsp=no'
echo 'ac_cv_have_dev_audio=no'
@@ -990,9 +990,8 @@
--without-cplusplus \
--without-java \
--without-python \
---with-cpu=none \
---with-arch=none \
--disable-threads \
+--disable-openmp \
--disable-shared
make
) || exit $?
@@ -1280,6 +1279,7 @@
OPTION=$OPTION --disable-build-lafiles
OPTION=$OPTION --enable-build-warnings
OPTION=$OPTION --enable-build-debug
+OPTION=$OPTION --disable-openmp
OPTION=$OPTION --disable-shared
OPTION=$OPTION --disable-rpath
OPTION=$OPTION --disable-nls
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf rpm/rpmdb/ Makefile.am
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 05-Jan-2010 12:35:45
Branch: HEAD Handle: 2010010511354400
Modified files:
rpm devtool.conf
rpm/rpmdb Makefile.am
Log:
standalone: build without db_sql, for db 4.7
Summary:
RevisionChanges Path
2.326 +1 -0 rpm/devtool.conf
1.123 +4 -1 rpm/rpmdb/Makefile.am
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.325 -r2.326 devtool.conf
--- rpm/devtool.conf 5 Jan 2010 11:32:42 - 2.325
+++ rpm/devtool.conf 5 Jan 2010 11:35:44 - 2.326
@@ -1265,6 +1265,7 @@
OPTION=$OPTION
--with-db=\$base3rd/bin/$platform/db-${v_db}/build_unix\
OPTION=$OPTION --with-xz=\$base3rd/bin/$platform/xz-${v_xz}\
OPTION=$OPTION --without-db-rpc
+OPTION=$OPTION --without-db-sql
OPTION=$OPTION --without-db-largefile
OPTION=$OPTION --with-db-tools-integrated
OPTION=$OPTION --with-db-mutex=\UNIX/fcntl\
@@ .
patch -p0 '@@ .'
Index: rpm/rpmdb/Makefile.am
$ cvs diff -u -r1.122 -r1.123 Makefile.am
--- rpm/rpmdb/Makefile.am 26 Dec 2009 16:21:58 - 1.122
+++ rpm/rpmdb/Makefile.am 5 Jan 2010 11:35:44 - 1.123
@@ -192,7 +192,10 @@
logio_SOURCES = logio.c logio.h
logio_LDADD = $(mylibs)
-BUILT_SOURCES = tagtbl.c tbdb.c bdb.c bdb.h $(logio_BUILT)
+BUILT_SOURCES = tagtbl.c $(logio_BUILT)
+if WITH_DB_SQL
+BUILT_SOURCES += tbdb.c bdb.c bdb.h
+endif
tjfn_SOURCES = tjfn.c
tjfn_LDADD = $(mylibs)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tests/ Makefile.am
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 04-Jan-2010 21:35:14
Branch: HEAD Handle: 2010010420351400
Modified files:
rpm/tests Makefile.am
Log:
remove makefile bashism by expanding paths
Summary:
RevisionChanges Path
1.50+5 -5 rpm/tests/Makefile.am
patch -p0 '@@ .'
Index: rpm/tests/Makefile.am
$ cvs diff -u -r1.49 -r1.50 Makefile.am
--- rpm/tests/Makefile.am 4 Jan 2010 03:51:38 - 1.49
+++ rpm/tests/Makefile.am 4 Jan 2010 20:35:14 - 1.50
@@ -112,13 +112,13 @@
@echo === $@ ===
@mkdir -p tmp/hrmib/ tmp/repackage/
@${rpm} -v --version tmp/version
- @-diff -u {tmp,ref}/version || cp {tmp,ref}/version
+ @-diff -u tmp/version ref/version || cp tmp/version ref/version
@${rpm} -v --querytags tmp/querytags
- @-diff -u {tmp,ref}/querytags || cp {tmp,ref}/querytags
+ @-diff -u tmp/querytags ref/querytags || cp tmp/querytags ref/querytags
@${rpm} -v --showrc | sed -e s,$(abs_top_builddir),..,g tmp/showrc
- @-diff -u {tmp,ref}/showrc || cp {tmp,ref}/showrc
+ @-diff -u tmp/showrc ref/showrc || cp tmp/showrc ref/showrc
@${rpmdigest} --alldigests ref/[^C]* tmp/.alldigests
- @-diff -u {tmp,ref}/.alldigests || cp {tmp,ref}/.alldigests
+ @-diff -u tmp/.alldigests ref/.alldigests || cp tmp/.alldigests
ref/.alldigests
@${mtree} -c -p ref | ${mtree} -p ref # XXX mtime usecs need fixing
POPTURI =http://rpm5.org/files/popt/
@@ -133,7 +133,7 @@
check-pubkeys: tpgp $(POPTPKGS)
@echo === $@ ===
@${rm} -rf tmp/rpmdb
- @${mkdir} -p tmp/rpmdb/{log,tmp}
+ @${mkdir} -p tmp/rpmdb/log tmp/rpmdb/tmp
@${cp} ref/DB_CONFIG tmp/rpmdb
@${rpm} --import tmp/DSA.pubpem
@${rpm} --import tmp/RSA.pubpem
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ gzdio.c rpmio.c xzdio.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 04-Jan-2010 22:36:39
Branch: HEAD Handle: 2010010421363801
Modified files:
rpm/rpmio gzdio.c rpmio.c xzdio.c
Log:
remove inline from *Seek, to avoid linking errors
Summary:
RevisionChanges Path
2.17+1 -1 rpm/rpmio/gzdio.c
1.212 +2 -2 rpm/rpmio/rpmio.c
1.14+1 -1 rpm/rpmio/xzdio.c
patch -p0 '@@ .'
Index: rpm/rpmio/gzdio.c
$ cvs diff -u -r2.16 -r2.17 gzdio.c
--- rpm/rpmio/gzdio.c 28 Aug 2009 14:09:02 - 2.16
+++ rpm/rpmio/gzdio.c 4 Jan 2010 21:36:38 - 2.17
@@ -368,7 +368,7 @@
/* XXX zlib-1.0.4 has not */
#define HAVE_GZSEEK /* XXX autoFu doesn't set this anymore. */
-static inline int gzdSeek(void * cookie, _libio_pos_t pos, int whence)
+static int gzdSeek(void * cookie, _libio_pos_t pos, int whence)
/*...@globals fileSystem, internalState @*/
/*...@modifies fileSystem, internalState @*/
{
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmio.c
$ cvs diff -u -r1.211 -r1.212 rpmio.c
--- rpm/rpmio/rpmio.c 24 Dec 2009 16:23:50 - 1.211
+++ rpm/rpmio/rpmio.c 4 Jan 2010 21:36:38 - 1.212
@@ -464,7 +464,7 @@
return rc;
}
-static inline int fdSeek(void * cookie, _libio_pos_t pos, int whence)
+static int fdSeek(void * cookie, _libio_pos_t pos, int whence)
/*...@globals fileSystem, internalState @*/
/*...@modifies fileSystem, internalState @*/
{
@@ -2049,7 +2049,7 @@
return (ssize_t) count;
}
-static inline int ufdSeek(void * cookie, _libio_pos_t pos, int whence)
+static int ufdSeek(void * cookie, _libio_pos_t pos, int whence)
/*...@globals fileSystem, internalState @*/
/*...@modifies fileSystem, internalState @*/
{
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/xzdio.c
$ cvs diff -u -r1.13 -r1.14 xzdio.c
--- rpm/rpmio/xzdio.c 28 Aug 2009 14:09:02 - 1.13
+++ rpm/rpmio/xzdio.c 4 Jan 2010 21:36:39 - 1.14
@@ -425,7 +425,7 @@
return rc;
}
-static inline int xzdSeek(void * cookie, /*...@unused@*/ _libio_pos_t pos,
+static int xzdSeek(void * cookie, /*...@unused@*/ _libio_pos_t pos,
/*...@unused@*/ int whence)
/*...@*/
{
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ INSTALL
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 03-Jan-2010 11:05:54 Branch: HEAD Handle: 2010010310055400 Modified files: rpm INSTALL Log: doc: move pcre to mandatory section Summary: RevisionChanges Path 2.126 +2 -1 rpm/INSTALL patch -p0 '@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.125 -r2.126 INSTALL --- rpm/INSTALL 2 Sep 2009 21:12:03 - 2.125 +++ rpm/INSTALL 3 Jan 2010 10:05:54 - 2.126 @@ -30,6 +30,7 @@ Perlmandatory 5.8.0 5.10.0 http://www.perl.com/ POPTmandatory 1.151.15http://rpm5.org/files/popt/ BeeCryptmandatory 4.2.0 4.2.0 http://beecrypt.sourceforge.net/ +PCREmandatory 7.0 7.9 http://www.pcre.org/ Mozilla NSS optional 3.113.11.7 http://www.mozilla.org/projects/security/pki/nss/ OpenSSL optional 0.9.8 0.9.8k http://www.openssl.org/ Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/ @@ -42,7 +43,6 @@ File/magic [4] optional 4.005.03ftp://ftp.astron.com/pub/file/ GNU gettext optional 0.160.17 http://www.gnu.org/software/gettext/ GNU iconv optional 1.111.11 http://www.gnu.org/software/libiconv/ -PCREmandatory 7.0 7.9 http://www.pcre.org/ OSSP uuid optional 1.6.0 1.6.2 http://www.ossp.org/pkg/lib/uuid/ XAR [5] optional 1.5.2 1.5.2 http://code.google.com/p/xar/ DMalloc optional 5 5.5.2 http://dmalloc.com/ @@ -206,6 +206,7 @@ Third-Party Libraries: libpopt (mandatory) (stage 2) libbeecrypt (mandatory) libdb (mandatory) + libpcre (mandatory) libsqlite3 (optional) liblua (optional) libz(optional) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ INSTALL rpm/rpmio/ rpmjs.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 03-Jan-2010 11:12:40
Branch: HEAD Handle: 2010010310124000
Modified files:
rpm INSTALL
rpm/rpmio rpmjs.c
Log:
allow building rpm with js-1.7.0 too
Summary:
RevisionChanges Path
2.127 +2 -0 rpm/INSTALL
1.15+12 -3 rpm/rpmio/rpmjs.c
patch -p0 '@@ .'
Index: rpm/INSTALL
$ cvs diff -u -r2.126 -r2.127 INSTALL
--- rpm/INSTALL 3 Jan 2010 10:05:54 - 2.126
+++ rpm/INSTALL 3 Jan 2010 10:12:40 - 2.127
@@ -37,6 +37,7 @@
Berkeley-DB [1] optional 4.5 4.7.25
http://www.oracle.com/database/berkeley-db.html
SQLite [1] optional 3.3 3.6.14 http://www.sqlite.org/
Lua [2] optional 5.1 5.1.4 http://www.lua.org/
+JavaScript optional 1.7 1.7.0
http://www.mozilla.org/js/spidermonkey/
ZLiboptional 1.2 1.2.3 http://www.zlib.net/
Bzip2 optional 1.0 1.0.5 http://www.bzip.org/
XZ Utils[3] optional 4.999.9 4.999.9 http://tukaani.org/xz/
@@ -209,6 +210,7 @@
libpcre (mandatory)
libsqlite3 (optional)
liblua (optional)
+ libjs (optional)
libz(optional)
libbz2 (optional)
libintl (optional)
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmjs.c
$ cvs diff -u -r1.14 -r1.15 rpmjs.c
--- rpm/rpmio/rpmjs.c 26 Dec 2009 13:40:25 - 1.14
+++ rpm/rpmio/rpmjs.c 3 Jan 2010 10:12:40 - 1.15
@@ -70,8 +70,6 @@
{werror, JSOPTION_WERROR},
{atline, JSOPTION_ATLINE},
{xml, JSOPTION_XML},
-{relimit, JSOPTION_RELIMIT},
-{anonfunfix, JSOPTION_ANONFUNFIX},
{NULL, 0}
};
@@ -154,7 +152,11 @@
JSString *str;
char *bytes;
if ((str = JS_ValueToString(cx, argv[i])) == NULL
+#if JS_VERSION 180
+ || (bytes = JS_GetStringBytes(str)) == NULL)
+#else
|| (bytes = JS_EncodeString(cx, str)) == NULL)
+#endif
return JS_FALSE;
fprintf(fp, %s%s, i ? : , bytes);
JS_free(cx, bytes);
@@ -215,6 +217,14 @@
return JS_TRUE;
}
+#ifndef JS_FS
+#define JS_FS(name,call,nargs,flags,extra) \
+{name, call, nargs, flags, extra}
+#endif
+#ifndef JS_FS_END
+#define JS_FS_END JS_FS(NULL,NULL,0,0,0)
+#endif
+
static JSFunctionSpec shell_functions[] = {
JS_FS(version, Version,0,0,0),
JS_FS(options, Options,0,0,0),
@@ -407,7 +417,6 @@
JS_BeginRequest(cx);
#endif
JS_SetOptions(cx, JSOPTION_VAROBJFIX);
-JS_SetVersion(cx, JSVERSION_LATEST);
JS_SetErrorReporter(cx, reportError);
#ifdef NOTYET
JS_CStringsAreUTF8();
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/js/ rpm-js.h rpmds-js.c rpmfts-js.c rpmjsfile.c tjs.c r...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 03-Jan-2010 11:47:25
Branch: HEAD Handle: 2010010310472400
Modified files:
rpm/js rpm-js.h rpmds-js.c rpmfts-js.c rpmjsfile.c tjs.c
rpm/rpmio rpmjs.c
Log:
allow building tjs with js-1.7.0 too
Summary:
RevisionChanges Path
1.4 +8 -0 rpm/js/rpm-js.h
1.16+1 -1 rpm/js/rpmds-js.c
1.6 +1 -1 rpm/js/rpmfts-js.c
1.3 +4 -0 rpm/js/rpmjsfile.c
1.68+2 -0 rpm/js/tjs.c
1.16+0 -8 rpm/rpmio/rpmjs.c
patch -p0 '@@ .'
Index: rpm/js/rpm-js.h
$ cvs diff -u -r1.3 -r1.4 rpm-js.h
--- rpm/js/rpm-js.h 30 Jun 2009 16:23:46 - 1.3
+++ rpm/js/rpm-js.h 3 Jan 2010 10:47:24 - 1.4
@@ -35,4 +35,12 @@
#include jsutil.h /* Added by JSIFY */
#endif
+#ifndef JS_FS
+#define JS_FS(name,call,nargs,flags,extra) \
+{name, call, nargs, flags, extra}
+#endif
+#ifndef JS_FS_END
+#define JS_FS_END JS_FS(NULL,NULL,0,0,0)
+#endif
+
#endif /* H_RPM_JS */
@@ .
patch -p0 '@@ .'
Index: rpm/js/rpmds-js.c
$ cvs diff -u -r1.15 -r1.16 rpmds-js.c
--- rpm/js/rpmds-js.c 14 May 2009 00:07:51 - 1.15
+++ rpm/js/rpmds-js.c 3 Jan 2010 10:47:24 - 1.16
@@ -357,7 +357,7 @@
return NULL;
}
} else
-if (OBJ_IS_ARRAY(cx, o)) {
+if (JS_IsArrayObject(cx, o)) {
jsuint length = 0;
jsuint i;
JSBool ok = JS_GetArrayLength(cx, o, length);
@@ .
patch -p0 '@@ .'
Index: rpm/js/rpmfts-js.c
$ cvs diff -u -r1.5 -r1.6 rpmfts-js.c
--- rpm/js/rpmfts-js.c6 Jul 2009 22:30:28 - 1.5
+++ rpm/js/rpmfts-js.c3 Jan 2010 10:47:24 - 1.6
@@ -46,7 +46,7 @@
if (dno) {
ARGV_t av = NULL;
- if (OBJ_IS_ARRAY(cx, dno)) {
+ if (JS_IsArrayObject(cx, dno)) {
jsuint length = 0;
jsuint i;
@@ .
patch -p0 '@@ .'
Index: rpm/js/rpmjsfile.c
$ cvs diff -u -r1.2 -r1.3 rpmjsfile.c
--- rpm/js/rpmjsfile.c3 Jul 2009 18:07:16 - 1.2
+++ rpm/js/rpmjsfile.c3 Jan 2010 10:47:24 - 1.3
@@ -2231,7 +2231,11 @@
urlChars = js_InflateString(cx, url, len);
if (!urlChars)
return JS_FALSE;
+#if JS_VERSION 180
+str = js_NewString(cx, urlChars, len, 0);
+#else
str = js_NewString(cx, urlChars, len);
+#endif
if (!str) {
JS_free(cx, urlChars);
return JS_FALSE;
@@ .
patch -p0 '@@ .'
Index: rpm/js/tjs.c
$ cvs diff -u -r1.67 -r1.68 tjs.c
--- rpm/js/tjs.c 1 Jan 2010 14:17:47 - 1.67
+++ rpm/js/tjs.c 3 Jan 2010 10:47:24 - 1.68
@@ -206,7 +206,9 @@
/* XXX FIXME: resultp != NULL to actually execute?!? */
(void) rpmjsRun(NULL, print(\loading RPM classes.\);, result);
js = _rpmjsI;
+#ifdef JS_GC_ZEAL
(void) JS_SetGCZeal(js-cx, _zeal);
+#endif
for (i = 0, tbl = classTable; i nclassTable; i++, tbl++) {
if (tbl-ix = 0)
continue;
@@ .
patch -p0 '@@ .'
Index: rpm/rpmio/rpmjs.c
$ cvs diff -u -r1.15 -r1.16 rpmjs.c
--- rpm/rpmio/rpmjs.c 3 Jan 2010 10:12:40 - 1.15
+++ rpm/rpmio/rpmjs.c 3 Jan 2010 10:47:24 - 1.16
@@ -217,14 +217,6 @@
return JS_TRUE;
}
-#ifndef JS_FS
-#define JS_FS(name,call,nargs,flags,extra) \
-{name, call, nargs, flags, extra}
-#endif
-#ifndef JS_FS_END
-#define JS_FS_END JS_FS(NULL,NULL,0,0,0)
-#endif
-
static JSFunctionSpec shell_functions[] = {
JS_FS(version, Version,0,0,0),
JS_FS(options, Options,0,0,0),
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 03-Jan-2010 23:26:23
Branch: HEAD Handle: 2010010322262300
Modified files:
rpm devtool.conf
Log:
%standalone: macros moved to a subdirectory
Summary:
RevisionChanges Path
2.324 +4 -3 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.323 -r2.324 devtool.conf
--- rpm/devtool.conf 2 Jan 2010 23:48:07 - 2.323
+++ rpm/devtool.conf 3 Jan 2010 22:26:23 - 2.324
@@ -1311,9 +1311,10 @@
$prefix/bin/rpm -vv -qi gpg-pubkey-2039b291-3dbaae72 || exit $?
$prefix/bin/rpm -vv -e gpg-pubkey-2039b291-3dbaae72 || exit $?
$prefix/bin/rpm -vv -Va || exit $?
-rpmtopdir=`$prefix/bin/rpm --macros=macros --eval %{_topdir}`
# override --macros to avoid ~/.rpmmacros
-$prefix/bin/rpmbuild -vv --macros=macros -ba
${DEVTOOL_SRCDIR}/devtool-test.spec || exit $?
-$prefix/bin/rpmbuild -vv --macros=macros --rebuild
$rpmtopdir/SRPMS/devtool-test-1.0-1.src.rpm || exit $?
+macros=macros/macros # override --macros to avoid ~/.rpmmacros
+rpmtopdir=`$prefix/bin/rpm --macros=$macros --eval %{_topdir}`
+$prefix/bin/rpmbuild -vv --macros=$macros -ba
${DEVTOOL_SRCDIR}/devtool-test.spec || exit $?
+$prefix/bin/rpmbuild -vv --macros=$macros --rebuild
$rpmtopdir/SRPMS/devtool-test-1.0-1.src.rpm || exit $?
$prefix/bin/rpm -vv -qpil
$rpmtopdir/RPMS/noarch/devtool-test-1.0-1.noarch.rpm || exit $?
rm -f $rpmtopdir/SRPMS/devtool-test-1.0-1.src.rpm
$prefix/bin/rpm -vv -iv
$rpmtopdir/RPMS/noarch/devtool-test-1.0-1.noarch.rpm || exit $?
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ INSTALL
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 03-Jan-2010 23:49:43 Branch: HEAD Handle: 2010010322494300 Modified files: rpm INSTALL Log: remove js info, until properly rewritten Summary: RevisionChanges Path 2.128 +0 -2 rpm/INSTALL patch -p0 '@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.127 -r2.128 INSTALL --- rpm/INSTALL 3 Jan 2010 10:12:40 - 2.127 +++ rpm/INSTALL 3 Jan 2010 22:49:43 - 2.128 @@ -37,7 +37,6 @@ Berkeley-DB [1] optional 4.5 4.7.25 http://www.oracle.com/database/berkeley-db.html SQLite [1] optional 3.3 3.6.14 http://www.sqlite.org/ Lua [2] optional 5.1 5.1.4 http://www.lua.org/ -JavaScript optional 1.7 1.7.0 http://www.mozilla.org/js/spidermonkey/ ZLiboptional 1.2 1.2.3 http://www.zlib.net/ Bzip2 optional 1.0 1.0.5 http://www.bzip.org/ XZ Utils[3] optional 4.999.9 4.999.9 http://tukaani.org/xz/ @@ -210,7 +209,6 @@ libpcre (mandatory) libsqlite3 (optional) liblua (optional) - libjs (optional) libz(optional) libbz2 (optional) libintl (optional) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 02-Jan-2010 11:06:11
Branch: HEAD Handle: 2010010210061100
Modified files:
rpm devtool.conf
Log:
initdb doesn't exist anymore
Summary:
RevisionChanges Path
2.322 +0 -1 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.321 -r2.322 devtool.conf
--- rpm/devtool.conf 2 Jan 2010 01:19:45 - 2.321
+++ rpm/devtool.conf 2 Jan 2010 10:06:11 - 2.322
@@ -1303,7 +1303,6 @@
# test RPM (trivially only)
standalone_testdrive () {
( set -x
-$prefix/bin/rpm -vv --initdb || exit $?
$prefix/bin/rpm -vv --import
${DEVTOOL_SRCDIR}/pubkeys/JBJ-GPG-KEY || exit $?
$prefix/bin/rpm -vv -qa || exit $?
$prefix/bin/rpm -vv -qi gpg-pubkey-2039b291-3dbaae72 || exit $?
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmsp.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 02-Jan-2010 11:09:14 Branch: HEAD Handle: 2010010210091400 Modified files: rpm/rpmio rpmsp.c Log: missing symbol for rpmspI Summary: RevisionChanges Path 2.5 +3 -0 rpm/rpmio/rpmsp.c patch -p0 '@@ .' Index: rpm/rpmio/rpmsp.c $ cvs diff -u -r2.4 -r2.5 rpmsp.c --- rpm/rpmio/rpmsp.c 15 Sep 2009 20:59:53 - 2.4 +++ rpm/rpmio/rpmsp.c 2 Jan 2010 10:09:14 - 2.5 @@ -18,6 +18,9 @@ /*...@unchecked@*/ int _rpmsp_debug = -1; +/*...@unchecked@*/ /*...@relnull@*/ +rpmsp _rpmspI = NULL; + static void rpmspFini(void * _sp) /*...@globals fileSystem @*/ /*...@modifies *_sp, fileSystem @*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: xar/ ChangeLog xar/lib/ archive.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: xar Date: 18-Sep-2009 08:45:31
Branch: HEAD Handle: 2009091806453100
Modified files:
xar ChangeLog
xar/lib archive.c
Log:
some bugfixes from upstream
Summary:
RevisionChanges Path
1.16+3 -0 xar/ChangeLog
1.12+39 -1 xar/lib/archive.c
patch -p0 '@@ .'
Index: xar/ChangeLog
$ cvs diff -u -r1.15 -r1.16 ChangeLog
--- xar/ChangeLog 19 Dec 2008 20:53:09 - 1.15
+++ xar/ChangeLog 18 Sep 2009 06:45:31 - 1.16
@@ -1,4 +1,7 @@
devel
+ 2009-07-08 Rob Braun bbr...@synack.net
+ * lib/archive.c: Fix an invalid free, pointed out by Randy Saldinger
+ * lib/archive.c: Have xar_open() check if there are checksum properties
in the toc and use that. If not, fall back to static location.
2008-12-19 Rob Braun bbr...@synack.net
* lib/lzmaxar.c include/xar.h.in src/xar.c: Update lzma support to
reflect the new xz naming and adjust lzma to be the old lzma format. Changes
from Anders F Björklund.
2008-08-19 Rob Braun bbr...@synack.net
@@ .
patch -p0 '@@ .'
Index: xar/lib/archive.c
$ cvs diff -u -r1.11 -r1.12 archive.c
--- xar/lib/archive.c 19 Oct 2008 21:53:07 - 1.11
+++ xar/lib/archive.c 18 Sep 2009 06:45:31 - 1.12
@@ -330,6 +330,44 @@
EVP_DigestFinal(XAR(ret)-toc_ctx, toccksum, tlen);
+ const char *value;
+ uint64_t offset = 0;
+ uint64_t length = tlen;
+ if( xar_prop_get( XAR_FILE(ret) , checksum/offset, value) ==
0 ) {
+ errno = 0;
+ offset = strtoull( value, (char **)NULL, 10);
+ if( errno != 0 ) {
+ xar_close(ret);
+ return NULL;
+ }
+ } else if( xar_signature_first(ret) != NULL ) {
+ // All archives that have a signature also specify the
location
+ // of the checksum. If the location isn't specified,
error out.
+ xar_close(ret);
+ return NULL;
+ }
+
+ XAR(ret)-heap_offset = xar_get_heap_offset(ret) + offset;
+ if( lseek(XAR(ret)-fd, XAR(ret)-heap_offset, SEEK_SET) == -1
) {
+ xar_close(ret);
+ return NULL;
+ }
+ if( xar_prop_get( XAR_FILE(ret) , checksum/size, value) == 0
) {
+ errno = 0;
+ length = strtoull( value, (char **)NULL, 10);
+ if( errno != 0 ) {
+ xar_close(ret);
+ return NULL;
+ }
+ } else if( xar_signature_first(ret) != NULL ) {
+ xar_close(ret);
+ return NULL;
+ }
+ if( length != tlen ) {
+ xar_close(ret);
+ return NULL;
+ }
+
xar_read_fd(XAR(ret)-fd, cval, tlen);
XAR(ret)-heap_offset += tlen;
if( memcmp(cval, toccksum, tlen) != 0 ) {
@@ -1234,7 +1272,7 @@
ret = xar_arcmod_extract(x,f,NULL,*buffer,*size);
if( ret ) {
*size = 0;
- free(buffer);
+ free(*buffer);
*buffer = NULL;
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/python/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 30-Jun-2009 18:44:57 Branch: HEAD Handle: 2009063016445700 Modified files: rpm/python Makefile.am Log: add internal pcre flags, if any Summary: RevisionChanges Path 1.85+1 -0 rpm/python/Makefile.am patch -p0 '@@ .' Index: rpm/python/Makefile.am $ cvs diff -u -r1.84 -r1.85 Makefile.am --- rpm/python/Makefile.am20 Dec 2008 06:40:58 - 1.84 +++ rpm/python/Makefile.am30 Jun 2009 16:44:57 - 1.85 @@ -19,6 +19,7 @@ @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ \ @WITH_XAR_CPPFLAGS@ \ + @WITH_PCRE_CPPFLAGS@ \ -...@with_python_incdir@ noinst_HEADERS = header-py.h \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/python/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 30-Jun-2009 18:45:45 Branch: rpm-5_2 Handle: 2009063016454500 Modified files: (Branch: rpm-5_2) rpm/python Makefile.am Log: add internal pcre flags, if any Summary: RevisionChanges Path 1.84.2.1+1 -0 rpm/python/Makefile.am patch -p0 '@@ .' Index: rpm/python/Makefile.am $ cvs diff -u -r1.84 -r1.84.2.1 Makefile.am --- rpm/python/Makefile.am20 Dec 2008 06:40:58 - 1.84 +++ rpm/python/Makefile.am30 Jun 2009 16:45:45 - 1.84.2.1 @@ -19,6 +19,7 @@ @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ \ @WITH_XAR_CPPFLAGS@ \ + @WITH_PCRE_CPPFLAGS@ \ -...@with_python_incdir@ noinst_HEADERS = header-py.h \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 25-Jun-2009 08:59:36
Branch: rpm-5_2 Handle: 2009062506593600
Modified files: (Branch: rpm-5_2)
rpm devtool.conf
Log:
standalone: make sure to use local zlib for libxml2
Summary:
RevisionChanges Path
2.293.2.11 +2 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.293.2.10 -r2.293.2.11 devtool.conf
--- rpm/devtool.conf 13 Jun 2009 12:58:48 - 2.293.2.10
+++ rpm/devtool.conf 25 Jun 2009 06:59:36 - 2.293.2.11
@@ -970,6 +970,8 @@
-e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
configure
CC=$cc \
+CPPFLAGS=-I`pwd`/../zlib-${v_zlib} \
+LDFLAGS=-L`pwd`/../zlib-${v_zlib} \
./configure \
--without-iconv \
--disable-shared \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac rpm/misc/ setproctitle.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 16-Jun-2009 22:21:54 Branch: HEAD Handle: 2009061620215301 Modified files: rpm configure.ac rpm/miscsetproctitle.c Log: guard sys/prctl.h header include Summary: RevisionChanges Path 2.383 +1 -1 rpm/configure.ac 1.6 +3 -0 rpm/misc/setproctitle.c patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.382 -r2.383 configure.ac --- rpm/configure.ac 12 Jun 2009 18:34:57 - 2.382 +++ rpm/configure.ac 16 Jun 2009 20:21:53 - 2.383 @@ -558,7 +558,7 @@ fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h dnl signal.h sys/ipc.h sys/socket.h sys/select.h dnl sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl -sys/utsname.h sys/wait.h netinet/in_systm.h dnl +sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl libio.h err.h mcheck.h limits.h libgen.h float.h dnl @@ . patch -p0 '@@ .' Index: rpm/misc/setproctitle.c $ cvs diff -u -r1.5 -r1.6 setproctitle.c --- rpm/misc/setproctitle.c 16 Jun 2009 19:28:59 - 1.5 +++ rpm/misc/setproctitle.c 16 Jun 2009 20:21:54 - 1.6 @@ -21,7 +21,10 @@ #include system.h #include stdarg.h + +#ifdef HAVE_SYS_PRCTL_H #include sys/prctl.h +#endif #if !defined(HAVE_SETPROCTITLE) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 13-Jun-2009 14:58:48 Branch: rpm-5_2 Handle: 2009061312584800 Modified files: (Branch: rpm-5_2) rpm devtool.conf Log: macosx: also prepare bundled libs Summary: RevisionChanges Path 2.293.2.10 +2 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.293.2.9 -r2.293.2.10 devtool.conf --- rpm/devtool.conf 4 Jun 2009 17:57:42 - 2.293.2.9 +++ rpm/devtool.conf 13 Jun 2009 12:58:48 - 2.293.2.10 @@ -1864,7 +1864,9 @@ strip -S /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle chmod 555 /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle strip -S /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.so +strip -S /tmp/rpm-root/usr/local/lib/rpm/lib/*.so rm -f /tmp/rpm-root/usr/local/lib/librpm*.la +rm -f /tmp/rpm-root/usr/local/lib/rpm/lib/*.la rm -f /tmp/rpm-root/Library/Python/*/site-packages/rpm/_rpmmodule.la # test drive (version only, should set up a local dbpath) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ rpm.spec.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 10-Jun-2009 13:00:43
Branch: rpm-5_2 Handle: 2009061011004300
Modified files: (Branch: rpm-5_2)
rpm rpm.spec.in
Log:
update filelists to match
Summary:
RevisionChanges Path
2.456.2.2 +31 -10 rpm/rpm.spec.in
patch -p0 '@@ .'
Index: rpm/rpm.spec.in
$ cvs diff -u -r2.456.2.1 -r2.456.2.2 rpm.spec.in
--- rpm/rpm.spec.in 10 Jun 2009 10:59:03 - 2.456.2.1
+++ rpm/rpm.spec.in 10 Jun 2009 11:00:43 - 2.456.2.2
@@ -227,7 +227,8 @@
make -C lua clean || :
make -C python clean || :
-make %{?_smp_mflags}
+make %{?_smp_mflags} \
+INSTALLMAN3DIR=%{_mandir}/man3
%if %{with_apidocs}
make apidocs
@@ -281,7 +282,6 @@
rm -rf ./sparc-linux
rm -rf ./sparc64-linux
rm -rf ./sparcv9-linux
- rm -rf ./x86_64-linux
)
%find_lang rpm
@@ -293,7 +293,6 @@
# Get rid of unpackaged files
{ cd $RPM_BUILD_ROOT
rm -f
.%{_rpmhome}/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,trpm}
- rm -rf .%{_mandir}/man8/rpmcache.8*
rm -rf .%{_mandir}/man8/rpmgraph.8*
rm -rf .%{_mandir}/ja/man8/rpmcache.8*
rm -rf .%{_mandir}/ja/man8/rpmgraph.8*
@@ -357,13 +356,17 @@
%attr(0644, @RPMUSER@, @RPMGROUP@) %{_rpmhome}/rpmpopt
%rpmattr %{_rpmhome}/rpmdb_loadcvt
-%rpmattr %{_rpmhome}/db_*
+%rpmattr %{_rpmhome}/bin/db_*
%rpmattr %{_rpmhome}/magic
%rpmattr %{_rpmhome}/magic.mgc
%rpmattr %{_rpmhome}/magic.mime
%rpmattr %{_rpmhome}/magic.mime.mgc
%rpmattr %{_rpmhome}/rpm2cpio
%rpmattr %{_rpmhome}/vcheck
+%rpmattr %{_rpmhome}/helpers
+%rpmattr %{_rpmhome}/qf
+
+%rpmattr %{_rpmhome}/cpuinfo.yaml
%files common -f rpm.lang
%doc CHANGES doc/manual/[a-z]*
@@ -430,9 +433,12 @@
%lang(sk)%{_mandir}/sk/man8/rpm.8*
%{_mandir}/man1/gendiff.1*
+%{_mandir}/man1/rpmgrep.1*
%{_mandir}/man8/rpmbuild.8*
%{_mandir}/man8/rpmconstant.8*
+%{_mandir}/man8/rpmcache.8*
%{_mandir}/man8/rpmdeps.8*
+%{_mandir}/man8/rpmmtree.8*
#%lang(ja) %{_mandir}/ja/man1/gendiff.1*
%lang(ja)%{_mandir}/ja/man8/rpmbuild.8*
#%lang(ja) %{_mandir}/ja/man8/rpmdeps.8*
@@ -457,12 +463,17 @@
%{_libdir}/librpmmi...@lt_current@@lt_revision@.so
%{_libdir}/librpmbui...@lt_current@@lt_revision@.so
+%{_rpmhome}/lib/libxar.so.*
+%{_rpmhome}/lib/libjs.so.*
+%{_rpmhome}/lib/librpmjsm.so.*
+%{_rpmhome}/lib/rpmjsm.so
+
%files build
%rpmattr %{_bindir}/rpmbuild
%rpmattr %{_rpmhome}/brp-*
%rpmattr %{_rpmhome}/check-files
%rpmattr %{_rpmhome}/cross-build
-%rpmattr %{_rpmhome}/debugedit
+%rpmattr %{_rpmhome}/bin/debugedit
%rpmattr %{_rpmhome}/find-debuginfo.sh
%rpmattr %{_rpmhome}/find-lang.sh
%rpmattr %{_rpmhome}/find-prov.pl
@@ -487,12 +498,12 @@
%rpmattr %{_rpmhome}/php.req
%rpmattr %{_rpmhome}/pkgconfigdeps.sh
%rpmattr %{_rpmhome}/pythondeps.sh
-%rpmattr %{_rpmhome}/rpmcache
-%rpmattr %{_rpmhome}/rpmcmp
-%rpmattr %{_rpmhome}/rpmdeps
-%rpmattr %{_rpmhome}/rpmdigest
+%rpmattr %{_rpmhome}/bin/rpmcache
+%rpmattr %{_rpmhome}/bin/rpmcmp
+%rpmattr %{_rpmhome}/bin/rpmdeps
+%rpmattr %{_rpmhome}/bin/rpmdigest
-%rpmattr %{_rpmhome}/symclash.*
+#%rpmattr%{_rpmhome}/symclash.*
%rpmattr %{_rpmhome}/u_pkg.sh
%rpmattr %{_rpmhome}/vpkg-provides.sh
%rpmattr %{_rpmhome}/vpkg-provides2.sh
@@ -534,6 +545,16 @@
%{_libdir}/librpmbuild.so
%{_libdir}/pkgconfig/rpm.pc
+%{_rpmhome}/lib/libxar.a
+%{_rpmhome}/lib/libxar.la
+%{_rpmhome}/lib/libxar.so
+%{_rpmhome}/lib/libjs.a
+%{_rpmhome}/lib/libjs.la
+%{_rpmhome}/lib/libjs.so
+%{_rpmhome}/lib/librpmjsm.a
+%{_rpmhome}/lib/librpmjsm.la
+%{_rpmhome}/lib/librpmjsm.so
+
%changelog
* Tue Jan 22 2008 Jeff Johnson j...@rpm5.org - 5.1-0.1
- resurect rpm.spec.
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ rpm.spec.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 10-Jun-2009 12:59:03
Branch: rpm-5_2 Handle: 2009061010590300
Modified files: (Branch: rpm-5_2)
rpm rpm.spec.in
Log:
add necessary flags and requires, plus pcre and js
Summary:
RevisionChanges Path
2.456.2.1 +14 -3 rpm/rpm.spec.in
patch -p0 '@@ .'
Index: rpm/rpm.spec.in
$ cvs diff -u -r2.456 -r2.456.2.1 rpm.spec.in
--- rpm/rpm.spec.in 16 Mar 2009 13:26:20 - 2.456
+++ rpm/rpm.spec.in 10 Jun 2009 10:59:03 - 2.456.2.1
@@ -19,7 +19,7 @@
Release: 0.1
Group: System Environment/Base
URL: http://rpm5.org
-Source0: http://rpm5.org/files/rpm/rpm-5.0/rpm-%{version}.tar.gz
+Source0: http://rpm5.org/files/rpm/rpm-5.2/rpm-%{version}.tar.gz
Source1: cpu-os-macros.tar.gz
License: LGPL
Requires: fileutils shadow-utils
@@ -29,6 +29,8 @@
BuildRequires: elfutils-libelf
BuildRequires: elfutils-devel
BuildRequires: zlib-devel
+BuildRequires: popt-devel = 1.15
+BuildRequires: pcre-devel = 7.0
BuildRequires: beecrypt-devel = 4.1.2
Requires: beecrypt = 4.1.2
@@ -180,6 +182,13 @@
WITH_PERL=--without-perl
%endif
+%ifarch x86_64
+CFLAGS=$CFLAGS -DHAVE_VA_COPY -DVA_COPY=va_copy; export CFLAGS
+%endif
+%ifos linux
+LDFLAGS=$LDFLAGS -lacl -lcrypto; export LDFLAGS
+%endif
+
./configure \
--verbose \
--prefix=/usr \
@@ -192,14 +201,16 @@
--with-zlib=external \
--with-file=internal \
--with-lua=internal \
+--with-js=internal \
--with-sqlite=external \
--with-beecrypt=external \
--with-nss=external \
--with-neon=external \
--with-xar=internal \
- $WITH_BZIP2 \
- $WITH_XZ \
+$WITH_BZIP2 \
+$WITH_XZ \
--with-popt=external \
+--with-pcre=external \
--with-keyutils=external \
--with-libelf \
--with-selinux \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/js/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 04-Jun-2009 19:32:21 Branch: rpm-5_2 Handle: 2009060417322100 Modified files: (Branch: rpm-5_2) rpm/js Makefile.am Log: split rpmjsm up, into one loadable module and one linkable library Summary: RevisionChanges Path 1.13.2.3+7 -2 rpm/js/Makefile.am patch -p0 '@@ .' Index: rpm/js/Makefile.am $ cvs diff -u -r1.13.2.2 -r1.13.2.3 Makefile.am --- rpm/js/Makefile.am8 May 2009 22:18:39 - 1.13.2.2 +++ rpm/js/Makefile.am4 Jun 2009 17:32:21 - 1.13.2.3 @@ -48,6 +48,7 @@ pkgbin_PROGRAMS =tjs pkglib_LTLIBRARIES = rpmjsm.la +pkglib_LTLIBRARIES +=librpmjsm.la rpmjsm_la_CFLAGS = -fno-strict-aliasing rpmjsm_la_LDFLAGS = -module -avoid-version @@ -59,6 +60,8 @@ $(top_builddir)/misc/librpmmisc.la \ @LTLIBINTL@ +librpmjsm_la_LIBADD = $(rpmjsm_la_LIBADD) + noinst_HEADERS = \ rpmjsfile.h \ rpmds-js.h rpmfi-js.h rpmhdr-js.h rpmmc-js.h rpmmi-js.h rpmps-js.h \ @@ -71,10 +74,12 @@ rpmte-js.c rpmts-js.c \ syck-js.c uuid-js.c +librpmjsm_la_SOURCES = $(rpmjsm_la_SOURCES) + .PHONY: lint lint: $(LINT) $(DEFS) $(INCLUDES) $(rpmjs_la_sources) -tjs_SOURCES = tjs.c rpmjsm.la -tjs_LDADD = rpmjsm.la $(RPM_LDADD_COMMON) +tjs_SOURCES = tjs.c librpmjsm.la +tjs_LDADD = librpmjsm.la $(RPM_LDADD_COMMON) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 04-Jun-2009 19:57:42 Branch: rpm-5_2 Handle: 2009060417574200 Modified files: (Branch: rpm-5_2) rpm devtool.conf Log: macosx: without embedded tcl, with embedded js Summary: RevisionChanges Path 2.293.2.9 +1 -1 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.293.2.8 -r2.293.2.9 devtool.conf --- rpm/devtool.conf 4 Jun 2009 17:37:38 - 2.293.2.8 +++ rpm/devtool.conf 4 Jun 2009 17:57:42 - 2.293.2.9 @@ -1687,9 +1687,9 @@ --with-dbapi=db \ --with-bugreport=a...@rpm5.org \ --with-db=internal \ ---with-tcl=external \ --with-lua=internal \ --with-syck=internal \ +--with-js=internal \ --with-zlib=external \ --with-bzip2=external \ --with-file=internal \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 03-Jun-2009 11:10:45 Branch: HEAD Handle: 2009060309104400 Modified files: rpm configure.ac rpm/tools Makefile.am Log: rpmkey program requires keyutils (from 5.2, cn12564) Summary: RevisionChanges Path 2.380 +3 -1 rpm/configure.ac 2.125 +2 -2 rpm/tools/Makefile.am patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.379 -r2.380 configure.ac --- rpm/configure.ac 2 Jun 2009 20:53:05 - 2.379 +++ rpm/configure.ac 3 Jun 2009 09:10:44 - 2.380 @@ -1463,11 +1463,13 @@ [], []) dnl # Linux keyutils +WITH_KEYUTILS_RPMKEY= RPM_CHECK_LIB( [Linux keyutils], [keyutils], [keyutils], [keyctl_read], [keyutils.h], [no,external:none], [], -[], []) +[WITH_KEYUTILS_RPMKEY=rpmkey], []) +AC_SUBST(WITH_KEYUTILS_RPMKEY) # later.. dnl # CPUInfo @@ . patch -p0 '@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.124 -r2.125 Makefile.am --- rpm/tools/Makefile.am 2 Jun 2009 14:05:39 - 2.124 +++ rpm/tools/Makefile.am 3 Jun 2009 09:10:44 - 2.125 @@ -20,7 +20,7 @@ EXTRA_DIST = hashtab.h -EXTRA_PROGRAMS = debugedit rpmkey +EXTRA_PROGRAMS = rpmkey debugedit RPMMISC_LDADD_COMMON = \ $(top_builddir)/misc/librpmmisc.la \ @@ -47,7 +47,7 @@ pkgbindir = @USRLIBRPM@/bin pkgbin_PROGRAMS =\ rpmcache rpmdigest grep mtree rpmrepo rpmspecdump wget \ - rpmcmp rpmdeps txar @WITH_LIBELF_DEBUGEDIT@ + rpmcmp rpmdeps @WITH_KEYUTILS_RPMKEY@ txar @WITH_LIBELF_DEBUGEDIT@ dist_man_MANS = rpmgrep.1 debugedit_SOURCES = debugedit.c hashtab.c @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 03-Jun-2009 11:20:59 Branch: HEAD Handle: 2009060309205800 Modified files: rpm configure.ac rpm/tools Makefile.am Log: txar program requires xar (from 5.2, cn12572) Summary: RevisionChanges Path 2.381 +5 -2 rpm/configure.ac 2.126 +5 -1 rpm/tools/Makefile.am patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.380 -r2.381 configure.ac --- rpm/configure.ac 3 Jun 2009 09:10:44 - 2.380 +++ rpm/configure.ac 3 Jun 2009 09:20:58 - 2.381 @@ -1442,11 +1442,14 @@ [XAR], [xar], [xar], [xar_open], [xar.h], [no,internal:external:none], [xar:include:lib], -[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then +[ AM_CONDITIONAL(WITH_XAR, [ true ]) + if test .$RPM_CHECK_LIB_LOCATION = .internal; then AC_DEFINE(HAVE_XAR_H, 1, [Have xar.h header]) fi AC_MSG_WARN([XAR support is under development]) -], []) +], +[ AM_CONDITIONAL(WITH_XAR, [ false ]) +]) dnl # DMalloc RPM_CHECK_LIB( @@ . patch -p0 '@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.125 -r2.126 Makefile.am --- rpm/tools/Makefile.am 3 Jun 2009 09:10:44 - 2.125 +++ rpm/tools/Makefile.am 3 Jun 2009 09:20:58 - 2.126 @@ -47,7 +47,7 @@ pkgbindir = @USRLIBRPM@/bin pkgbin_PROGRAMS =\ rpmcache rpmdigest grep mtree rpmrepo rpmspecdump wget \ - rpmcmp rpmdeps @WITH_KEYUTILS_RPMKEY@ txar @WITH_LIBELF_DEBUGEDIT@ + rpmcmp rpmdeps @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ dist_man_MANS = rpmgrep.1 debugedit_SOURCES = debugedit.c hashtab.c @@ -96,9 +96,13 @@ ## ## XAR - RPM package converter ## + +if WITH_XAR +pkgbin_PROGRAMS += txar txar_SOURCES = txar.c txar_LDADD = $(RPM_LDADD_COMMON) @WITH_XAR_LDFLAGS@ txar_LIBS = @WITH_XAR_LIBS@ +endif ## ## provide Berkeley-DB tools @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/js/ tjs.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 03-Jun-2009 14:20:48
Branch: HEAD Handle: 2009060312204800
Modified files:
rpm/js tjs.c
Log:
conditionalize initializers
Summary:
RevisionChanges Path
1.31+4 -0 rpm/js/tjs.c
patch -p0 '@@ .'
Index: rpm/js/tjs.c
$ cvs diff -u -r1.30 -r1.31 tjs.c
--- rpm/js/tjs.c 30 May 2009 11:30:24 - 1.30
+++ rpm/js/tjs.c 3 Jun 2009 12:20:48 - 1.31
@@ -50,10 +50,14 @@
{ Mc, rpmjs_InitMcClass, 24 },
{ Mi, rpmjs_InitMiClass, 11 },
{ Ps, rpmjs_InitPsClass, 16 },
+#ifdef WITH_SYCK
{ Syck,rpmjs_InitSyckClass, -3 },
+#endif
{ Te, rpmjs_InitTeClass, 15 },
{ Ts, rpmjs_InitTsClass, 10 },
+#ifdef WITH_UUID
{ Uuid,rpmjs_InitUuidClass, 2 },
+#endif
};
/*...@unchecked@*/
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/js/ tjs.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 03-Jun-2009 14:20:57
Branch: rpm-5_2 Handle: 2009060312205700
Modified files: (Branch: rpm-5_2)
rpm/js tjs.c
Log:
conditionalize initializers
Summary:
RevisionChanges Path
1.28.2.2+4 -0 rpm/js/tjs.c
patch -p0 '@@ .'
Index: rpm/js/tjs.c
$ cvs diff -u -r1.28.2.1 -r1.28.2.2 tjs.c
--- rpm/js/tjs.c 11 May 2009 15:31:10 - 1.28.2.1
+++ rpm/js/tjs.c 3 Jun 2009 12:20:57 - 1.28.2.2
@@ -50,10 +50,14 @@
{ Mc, rpmjs_InitMcClass, 24 },
{ Mi, rpmjs_InitMiClass, 11 },
{ Ps, rpmjs_InitPsClass, 16 },
+#ifdef WITH_SYCK
{ Syck,rpmjs_InitSyckClass, -3 },
+#endif
{ Te, rpmjs_InitTeClass, 15 },
{ Ts, rpmjs_InitTsClass, 10 },
+#ifdef WITH_UUID
{ Uuid,rpmjs_InitUuidClass, 2 },
+#endif
};
/*...@unchecked@*/
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/js/ uuid-js.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 03-Jun-2009 14:45:09 Branch: HEAD Handle: 2009060312450800 Modified files: rpm/js uuid-js.c Log: workaround for uuid_t type conflict, between unistd.h and uuid.h Summary: RevisionChanges Path 1.14+9 -0 rpm/js/uuid-js.c patch -p0 '@@ .' Index: rpm/js/uuid-js.c $ cvs diff -u -r1.13 -r1.14 uuid-js.c --- rpm/js/uuid-js.c 14 May 2009 00:07:51 - 1.13 +++ rpm/js/uuid-js.c 3 Jun 2009 12:45:08 - 1.14 @@ -2,6 +2,15 @@ * \file js/uuid-js.c */ +#if defined(__APPLE__) +/* workaround for uuid_t type conflict, between unistd.h and uuid.h */ +#define _UUID_T +#define uuid_t __darwin_uuid_t +#include unistd.h +#undef uuid_t +#undef _UUID_T +#endif + #include system.h #include rpmjs-debug.h @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/js/ uuid-js.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 03-Jun-2009 14:45:44 Branch: rpm-5_2 Handle: 2009060312454400 Modified files: (Branch: rpm-5_2) rpm/js uuid-js.c Log: workaround for uuid_t type conflict, between unistd.h and uuid.h Summary: RevisionChanges Path 1.10.2.4+9 -0 rpm/js/uuid-js.c patch -p0 '@@ .' Index: rpm/js/uuid-js.c $ cvs diff -u -r1.10.2.3 -r1.10.2.4 uuid-js.c --- rpm/js/uuid-js.c 14 May 2009 00:10:21 - 1.10.2.3 +++ rpm/js/uuid-js.c 3 Jun 2009 12:45:44 - 1.10.2.4 @@ -2,6 +2,15 @@ * \file js/uuid-js.c */ +#if defined(__APPLE__) +/* workaround for uuid_t type conflict, between unistd.h and uuid.h */ +#define _UUID_T +#define uuid_t __darwin_uuid_t +#include unistd.h +#undef uuid_t +#undef _UUID_T +#endif + #include system.h #include rpmjs-debug.h @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 02-Jun-2009 16:05:39 Branch: HEAD Handle: 2009060214053900 Modified files: rpm/tools Makefile.am Log: be compatible with Automake 1.11 Summary: RevisionChanges Path 2.124 +2 -2 rpm/tools/Makefile.am patch -p0 '@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.123 -r2.124 Makefile.am --- rpm/tools/Makefile.am 1 Jun 2009 13:22:12 - 2.123 +++ rpm/tools/Makefile.am 2 Jun 2009 14:05:39 - 2.124 @@ -155,7 +155,7 @@ @[ -d $(DESTDIR)$(pkgbindir) ] || $(mkinstalldirs) $(DESTDIR)$(pkgbindir) if WITH_DB_INTERNAL if WITH_DB_TOOLS_INTEGRATED - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pkgbinPROGRAMS_INSTALL) \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \ $(builddir)/db_tool $(DESTDIR)$(pkgbindir)/db_tool for tool in . $(my_DB_TOOLS); do \ test .$$tool = .. continue; \ @@ -165,7 +165,7 @@ else for tool in . $(my_DB_TOOLS); do \ test .$$tool = .. continue; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pkgbinPROGRAMS_INSTALL) \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \ $(top_builddir)/$(WITH_DB_SUBDIR)/$$tool $(DESTDIR)$(pkgbindir)/$$tool; \ done endif @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 02-Jun-2009 16:06:41 Branch: rpm-5_2 Handle: 2009060214064100 Modified files: (Branch: rpm-5_2) rpm/tools Makefile.am Log: be compatible with Automake 1.11 Summary: RevisionChanges Path 2.120.2.7 +2 -2 rpm/tools/Makefile.am patch -p0 '@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.120.2.6 -r2.120.2.7 Makefile.am --- rpm/tools/Makefile.am 18 May 2009 19:04:30 - 2.120.2.6 +++ rpm/tools/Makefile.am 2 Jun 2009 14:06:41 - 2.120.2.7 @@ -159,7 +159,7 @@ @[ -d $(DESTDIR)$(pkgbindir) ] || $(mkinstalldirs) $(DESTDIR)$(pkgbindir) if WITH_DB_INTERNAL if WITH_DB_TOOLS_INTEGRATED - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pkgbinPROGRAMS_INSTALL) \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \ $(builddir)/db_tool $(DESTDIR)$(pkgbindir)/db_tool for tool in . $(my_DB_TOOLS); do \ test .$$tool = .. continue; \ @@ -169,7 +169,7 @@ else for tool in . $(my_DB_TOOLS); do \ test .$$tool = .. continue; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(pkgbinPROGRAMS_INSTALL) \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) \ $(top_builddir)/$(WITH_DB_SUBDIR)/$$tool $(DESTDIR)$(pkgbindir)/$$tool; \ done endif @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/rpmio/ rpmlua.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 19-May-2009 14:40:25 Branch: rpm-5_2 Handle: 2009051912402500 Modified files: (Branch: rpm-5_2) rpm/rpmio rpmlua.c Log: fix linkage without lua Summary: RevisionChanges Path 2.72.2.2+12 -6 rpm/rpmio/rpmlua.c patch -p0 '@@ .' Index: rpm/rpmio/rpmlua.c $ cvs diff -u -r2.72.2.1 -r2.72.2.2 rpmlua.c --- rpm/rpmio/rpmlua.c6 May 2009 19:43:18 - 2.72.2.1 +++ rpm/rpmio/rpmlua.c19 May 2009 12:40:25 - 2.72.2.2 @@ -45,9 +45,21 @@ /*...@access rpmiob @*/ +#else /* WITH_LUA */ +#include rpmio.h +#endif + /*...@unchecked@*/ int _rpmlua_debug = 0; +/*...@unchecked@*/ /*...@only@*/ /*...@null@*/ +rpmioPool _rpmluaPool = NULL; + +/*...@unchecked@*/ /*...@only@*/ /*...@null@*/ +rpmioPool _rpmluavPool = NULL; + +#ifdef WITH_LUA + #if !defined(HAVE_VSNPRINTF) static inline int vsnprintf(char * buf, /*...@unused@*/ size_t nb, const char * fmt, va_list ap) @@ -97,9 +109,6 @@ lua-printbuf = _free(lua-printbuf); } -/*...@unchecked@*/ /*...@only@*/ /*...@null@*/ -rpmioPool _rpmluaPool; - static rpmlua rpmluaGetPool(/*...@null@*/ rpmioPool pool) /*...@globals _rpmluaPool, fileSystem @*/ /*...@modifies pool, _rpmluaPool, fileSystem @*/ @@ -481,9 +490,6 @@ return NULL; } -/*...@unchecked@*/ /*...@only@*/ /*...@null@*/ -rpmioPool _rpmluavPool; - static rpmluav rpmluavGetPool(/*...@null@*/ rpmioPool pool) /*...@globals _rpmluavPool, fileSystem @*/ /*...@modifies pool, _rpmluavPool, fileSystem @*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmlua.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 19-May-2009 14:44:16 Branch: HEAD Handle: 2009051912441500 Modified files: rpm/rpmio rpmlua.c Log: fix linkage without lua Summary: RevisionChanges Path 2.74+12 -6 rpm/rpmio/rpmlua.c patch -p0 '@@ .' Index: rpm/rpmio/rpmlua.c $ cvs diff -u -r2.73 -r2.74 rpmlua.c --- rpm/rpmio/rpmlua.c6 May 2009 19:42:42 - 2.73 +++ rpm/rpmio/rpmlua.c19 May 2009 12:44:15 - 2.74 @@ -45,9 +45,21 @@ /*...@access rpmiob @*/ +#else /* WITH_LUA */ +#include rpmio.h +#endif + /*...@unchecked@*/ int _rpmlua_debug = 0; +/*...@unchecked@*/ /*...@only@*/ /*...@null@*/ +rpmioPool _rpmluaPool = NULL; + +/*...@unchecked@*/ /*...@only@*/ /*...@null@*/ +rpmioPool _rpmluavPool = NULL; + +#ifdef WITH_LUA + #if !defined(HAVE_VSNPRINTF) static inline int vsnprintf(char * buf, /*...@unused@*/ size_t nb, const char * fmt, va_list ap) @@ -97,9 +109,6 @@ lua-printbuf = _free(lua-printbuf); } -/*...@unchecked@*/ /*...@only@*/ /*...@null@*/ -rpmioPool _rpmluaPool; - static rpmlua rpmluaGetPool(/*...@null@*/ rpmioPool pool) /*...@globals _rpmluaPool, fileSystem @*/ /*...@modifies pool, _rpmluaPool, fileSystem @*/ @@ -481,9 +490,6 @@ return NULL; } -/*...@unchecked@*/ /*...@only@*/ /*...@null@*/ -rpmioPool _rpmluavPool; - static rpmluav rpmluavGetPool(/*...@null@*/ rpmioPool pool) /*...@globals _rpmluavPool, fileSystem @*/ /*...@modifies pool, _rpmluavPool, fileSystem @*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 18-May-2009 14:30:15
Branch: rpm-5_2 Handle: 2009051812301400
Modified files: (Branch: rpm-5_2)
rpm devtool.conf
Log:
macosx: find shared runtime libraries
Summary:
RevisionChanges Path
2.293.2.3 +6 -0 rpm/devtool.conf
patch -p0 '@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.293.2.2 -r2.293.2.3 devtool.conf
--- rpm/devtool.conf 7 May 2009 08:26:41 - 2.293.2.2
+++ rpm/devtool.conf 18 May 2009 12:30:14 - 2.293.2.3
@@ -1658,7 +1658,9 @@
LDFLAGS=$UNIVERSAL_LDFLAGS -Wl,-search_paths_first # static
LIBS=$LIBS -lssl -lcrypto # shameless workaround for Neon
LDFLAGS=$LDFLAGS -L`pwd`/xar/lib/.libs # Xar linking hack
+DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/xar/lib/.libs
LDFLAGS=$LDFLAGS -L`pwd`/xz/src/liblzma/.libs # LZMA hack
+DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:`pwd`/xz/src/liblzma/.libs
CPPFLAGS=$CPPFLAGS -I$basemac/bin/$platform/expat-${v_expat}/lib #
lua
LDFLAGS=$LDFLAGS -L$basemac/bin/$platform/expat-${v_expat}/.libs #
lua
export CPP
@@ -1669,6 +1671,7 @@
export CXXFLAGS
export LDFLAGS
export LIBS
+export DYLD_LIBRARY_PATH
${DEVTOOL_SRCDIR}/configure $UNIVERSAL_TARGET -v \
--prefix=/usr/local \
--sysconfdir=/private/etc \
@@ -1717,6 +1720,9 @@
# build the internal txar tool, for testing purposes
make -C tools txar || true
+# perl's makefile doesn't seem to be able to find the libraries in
DYLD_LIBRARY_PATH
+make -C perl MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
OTHERLDFLAGS=$LDFLAGS
+
# python complains about missing symbols from all over when using
librpm*, relink:
make -C misc LIBS=-lz -lxml2 -lpcre $LIBS clean all
make -C rpmio LIBS=-lpopt -lneon -lexpat -lbeecrypt -lxar -lbz2 $LIBS
clean all
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ configure.ac rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 18-May-2009 14:31:25 Branch: rpm-5_2 Handle: 2009051812312500 Modified files: (Branch: rpm-5_2) rpm configure.ac rpm/tools Makefile.am Log: rpmkey program requires keyutils Summary: RevisionChanges Path 2.372.2.3 +3 -1 rpm/configure.ac 2.120.2.4 +1 -1 rpm/tools/Makefile.am patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.372.2.2 -r2.372.2.3 configure.ac --- rpm/configure.ac 12 May 2009 15:30:49 - 2.372.2.2 +++ rpm/configure.ac 18 May 2009 12:31:25 - 2.372.2.3 @@ -1426,11 +1426,13 @@ [], []) dnl # Linux keyutils +WITH_KEYUTILS_RPMKEY= RPM_CHECK_LIB( [Linux keyutils], [keyutils], [keyutils], [keyctl_read], [keyutils.h], [no,external:none], [], -[], []) +[WITH_KEYUTILS_RPMKEY=rpmkey], []) +AC_SUBST(WITH_KEYUTILS_RPMKEY) # later.. dnl # CPUInfo @@ . patch -p0 '@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.120.2.3 -r2.120.2.4 Makefile.am --- rpm/tools/Makefile.am 14 May 2009 19:20:54 - 2.120.2.3 +++ rpm/tools/Makefile.am 18 May 2009 12:31:25 - 2.120.2.4 @@ -47,7 +47,7 @@ pkgbindir = @USRLIBRPM@/bin pkgbin_PROGRAMS =\ rpmcache rpmdigest grep mtree rpmrepo rpmspecdump wget \ - rpmcmp rpmdeps rpmkey txar @WITH_LIBELF_DEBUGEDIT@ + rpmcmp rpmdeps @WITH_KEYUTILS_RPMKEY@ txar @WITH_LIBELF_DEBUGEDIT@ dist_man_MANS = rpmgrep.1 debugedit_SOURCES = debugedit.c hashtab.c @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 18-May-2009 15:06:41 Branch: rpm-5_2 Handle: 2009051813064100 Modified files: (Branch: rpm-5_2) rpm devtool.conf Log: macosx: binaries moved to bin Summary: RevisionChanges Path 2.293.2.4 +2 -3 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.293.2.3 -r2.293.2.4 devtool.conf --- rpm/devtool.conf 18 May 2009 12:30:14 - 2.293.2.3 +++ rpm/devtool.conf 18 May 2009 13:06:41 - 2.293.2.4 @@ -1864,10 +1864,9 @@ # strip debugging symbols, and remove libtool files (.la) strip -S /tmp/rpm-root/usr/local/bin/rpm* -strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmcmp -strip -S /tmp/rpm-root/usr/local/lib/rpm/rpmdeps -strip -S /tmp/rpm-root/usr/local/lib/rpm/db_* +strip -S /tmp/rpm-root/usr/local/lib/rpm/bin/* strip -S /tmp/rpm-root/usr/local/lib/librpm*.dylib +strip -S /tmp/rpm-root/usr/local/lib/lib/*.dylib chmod 755 /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle strip -S /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle chmod 555 /tmp/rpm-root/Library/Perl/*/darwin-thread-multi-2level/auto/RPM/RPM.bundle @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmsyck.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 18-May-2009 17:07:29
Branch: HEAD Handle: 2009051815072900
Modified files:
rpm/rpmio rpmsyck.c
Log:
fix linkage without syck
Summary:
RevisionChanges Path
2.4 +4 -2 rpm/rpmio/rpmsyck.c
patch -p0 '@@ .'
Index: rpm/rpmio/rpmsyck.c
$ cvs diff -u -r2.3 -r2.4 rpmsyck.c
--- rpm/rpmio/rpmsyck.c 12 May 2009 13:35:21 - 2.3
+++ rpm/rpmio/rpmsyck.c 18 May 2009 15:07:29 - 2.4
@@ -1,15 +1,17 @@
#include system.h
#if defined(WITH_SYCK)
-
#include syck.h
#include rpmhash.h
#include rpmsyck.h
+#endif
#include rpmio.h
int _rpmsyck_debug = 0;
-rpmioPool _rpmsyckPool;
+rpmioPool _rpmsyckPool = NULL;
+
+#if defined(WITH_SYCK)
static int rpmSyckFreeNode(char *key, rpmsyck_node node, char *arg) {
switch (node-type) {
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/rpmio/ rpmsyck.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: a...@rpm5.org
Module: rpm Date: 18-May-2009 17:07:47
Branch: rpm-5_2 Handle: 2009051815074700
Modified files: (Branch: rpm-5_2)
rpm/rpmio rpmsyck.c
Log:
fix linkage without syck
Summary:
RevisionChanges Path
2.1.2.4 +4 -2 rpm/rpmio/rpmsyck.c
patch -p0 '@@ .'
Index: rpm/rpmio/rpmsyck.c
$ cvs diff -u -r2.1.2.3 -r2.1.2.4 rpmsyck.c
--- rpm/rpmio/rpmsyck.c 14 May 2009 20:06:50 - 2.1.2.3
+++ rpm/rpmio/rpmsyck.c 18 May 2009 15:07:47 - 2.1.2.4
@@ -1,15 +1,17 @@
#include system.h
#if defined(WITH_SYCK)
-
#include syck.h
#include rpmhash.h
#include rpmsyck.h
+#endif
#include rpmio.h
int _rpmsyck_debug = 0;
-rpmioPool _rpmsyckPool;
+rpmioPool _rpmsyckPool = NULL;
+
+#if defined(WITH_SYCK)
static int rpmSyckFreeNode(char *key, rpmsyck_node node, char *arg) {
switch (node-type) {
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ configure.ac rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 18-May-2009 21:04:30 Branch: rpm-5_2 Handle: 2009051819043000 Modified files: (Branch: rpm-5_2) rpm configure.ac rpm/tools Makefile.am Log: txar program requires xar Summary: RevisionChanges Path 2.372.2.4 +5 -2 rpm/configure.ac 2.120.2.6 +5 -1 rpm/tools/Makefile.am patch -p0 '@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.372.2.3 -r2.372.2.4 configure.ac --- rpm/configure.ac 18 May 2009 12:31:25 - 2.372.2.3 +++ rpm/configure.ac 18 May 2009 19:04:30 - 2.372.2.4 @@ -1405,11 +1405,14 @@ [XAR], [xar], [xar], [xar_open], [xar.h], [no,internal:external:none], [xar:include:lib], -[ if test .$RPM_CHECK_LIB_LOCATION = .internal; then +[ AM_CONDITIONAL(WITH_XAR, [ true ]) + if test .$RPM_CHECK_LIB_LOCATION = .internal; then AC_DEFINE(HAVE_XAR_H, 1, [Have xar.h header]) fi AC_MSG_WARN([XAR support is under development]) -], []) +], +[ AM_CONDITIONAL(WITH_XAR, [ false ]) +]) dnl # DMalloc RPM_CHECK_LIB( @@ . patch -p0 '@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.120.2.5 -r2.120.2.6 Makefile.am --- rpm/tools/Makefile.am 18 May 2009 13:39:48 - 2.120.2.5 +++ rpm/tools/Makefile.am 18 May 2009 19:04:30 - 2.120.2.6 @@ -47,7 +47,7 @@ pkgbindir = @USRLIBRPM@/bin pkgbin_PROGRAMS =\ rpmcache rpmdigest grep mtree rpmrepo rpmspecdump wget \ - rpmcmp rpmdeps @WITH_KEYUTILS_RPMKEY@ txar @WITH_LIBELF_DEBUGEDIT@ + rpmcmp rpmdeps @WITH_KEYUTILS_RPMKEY@ @WITH_LIBELF_DEBUGEDIT@ dist_man_MANS = rpmgrep.1 debugedit_SOURCES = debugedit.c hashtab.c @@ -96,9 +96,13 @@ ## ## XAR - RPM package converter ## + +if WITH_XAR +pkgbin_PROGRAMS += txar txar_SOURCES = txar.c txar_LDADD = $(RPM_LDADD_COMMON) @WITH_XAR_LDFLAGS@ txar_LIBS = @WITH_XAR_LIBS@ +endif ## ## provide Berkeley-DB tools @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Anders F. Björklund Root: /v/rpm/cvs Email: a...@rpm5.org Module: rpm Date: 07-May-2009 10:26:42 Branch: rpm-5_2 Handle: 2009050708264100 Modified files: (Branch: rpm-5_2) rpm devtool.conf Log: macosx: add i586 and i686 to platform score Summary: RevisionChanges Path 2.293.2.2 +2 -0 rpm/devtool.conf patch -p0 '@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.293.2.1 -r2.293.2.2 devtool.conf --- rpm/devtool.conf 6 May 2009 19:26:08 - 2.293.2.1 +++ rpm/devtool.conf 7 May 2009 08:26:41 - 2.293.2.2 @@ -1785,6 +1785,8 @@ # setup CVOG platform cat __EOF__ /tmp/rpm-root/private/etc/rpm/platform i386-apple-darwin +i586-apple-darwin +i686-apple-darwin fat-apple-darwin noarch-apple-darwin __EOF__ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
