[CVS] RPM: rpm-5_2: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Jul-2009 23:11:53 Branch: rpm-5_2 Handle: 2009070721115200 Modified files: (Branch: rpm-5_2) rpm CHANGES Log: remember my change Summary: RevisionChanges Path 1.2970.2.26 +1 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2970.2.25 -r1.2970.2.26 CHANGES --- rpm/CHANGES 7 Jul 2009 18:02:48 - 1.2970.2.25 +++ rpm/CHANGES 7 Jul 2009 21:11:52 - 1.2970.2.26 @@ -1,5 +1,6 @@ 5.2b1 -> 5.2.0: +- rse: fix building under RPM_VENDOR_OPENPKG/switch-from-susr-to-musr-on-srpm-install 5.2a4 -> 5.2b1: - jbj: revert checkfiles behavior to last known good (rpm-5.1.9). @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Jul-2009 23:11:25 Branch: HEAD Handle: 2009070721112500 Modified files: rpm CHANGES Log: remember my change Summary: RevisionChanges Path 1.3044 +1 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3043 -r1.3044 CHANGES --- rpm/CHANGES 4 Jul 2009 15:54:28 - 1.3043 +++ rpm/CHANGES 7 Jul 2009 21:11:25 - 1.3044 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 +- rse: fix building under RPM_VENDOR_OPENPKG/switch-from-susr-to-musr-on-srpm-install - jbj: rpmio: fix: compute url length in rpmGenPath() w/o using pointers. - jbj: yarn: convert rpmavx to usage mutex with refcounts. - jbj: rename avContext to rpmavx. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/lib/ psm.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 07-Jul-2009 23:10:28
Branch: rpm-5_2 Handle: 2009070721102700
Modified files: (Branch: rpm-5_2)
rpm/lib psm.c
Log:
Merge from HEAD: fix building under
RPM_VENDOR_OPENPKG/switch-from-susr-to-musr-on-srpm-install
Summary:
RevisionChanges Path
2.366.2.3 +13 -0 rpm/lib/psm.c
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.366.2.2 -r2.366.2.3 psm.c
--- rpm/lib/psm.c 22 May 2009 15:09:18 - 2.366.2.2
+++ rpm/lib/psm.c 7 Jul 2009 21:10:27 - 2.366.2.3
@@ -152,7 +152,11 @@
return RPMRC_OK;
}
+#if defined(RPM_VENDOR_OPENPKG) /* switch-from-susr-to-musr-on-srpm-install
*/
+static rpmRC createDir(rpmfi fi, rpmts ts, const char ** fn, const char *
name)
+#else
static rpmRC createDir(rpmts ts, const char ** fn, const char * name)
+#endif
/*...@globals rpmGlobalMacroContext @*/
/*...@modifies *fn, rpmGlobalMacroContext @*/
{
@@ -323,12 +327,21 @@
}
}
+#if defined(RPM_VENDOR_OPENPKG) /* switch-from-susr-to-musr-on-srpm-install
*/
+if(createDir(fi, ts, NULL, "%{_topdir}") ||
+ createDir(fi, ts, NULL, "%{_builddir}") ||
+ createDir(fi, ts, NULL, "%{_rpmdir}") ||
+ createDir(fi, ts, NULL, "%{_srcrpmdir}") ||
+ createDir(fi, ts, &_sourcedir, "%{_sourcedir}") ||
+ createDir(fi, ts, &_specdir, "%{_specdir}"))
+#else
if(createDir(ts, NULL, "%{_topdir}") ||
createDir(ts, NULL, "%{_builddir}") ||
createDir(ts, NULL, "%{_rpmdir}") ||
createDir(ts, NULL, "%{_srcrpmdir}") ||
createDir(ts, &_sourcedir, "%{_sourcedir}") ||
createDir(ts, &_specdir, "%{_specdir}"))
+#endif
goto exit;
/* Build dnl/dil with {_sourcedir, _specdir} as values. */
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ psm.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 07-Jul-2009 23:10:14
Branch: HEAD Handle: 2009070721101400
Modified files:
rpm/lib psm.c
Log:
fix building under
RPM_VENDOR_OPENPKG/switch-from-susr-to-musr-on-srpm-install
Summary:
RevisionChanges Path
2.376 +13 -0 rpm/lib/psm.c
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.375 -r2.376 psm.c
--- rpm/lib/psm.c 18 Jun 2009 21:31:41 - 2.375
+++ rpm/lib/psm.c 7 Jul 2009 21:10:14 - 2.376
@@ -154,7 +154,11 @@
return RPMRC_OK;
}
+#if defined(RPM_VENDOR_OPENPKG) /* switch-from-susr-to-musr-on-srpm-install
*/
+static rpmRC createDir(rpmfi fi, rpmts ts, const char ** fn, const char *
name)
+#else
static rpmRC createDir(rpmts ts, const char ** fn, const char * name)
+#endif
/*...@globals rpmGlobalMacroContext @*/
/*...@modifies *fn, rpmGlobalMacroContext @*/
{
@@ -325,12 +329,21 @@
}
}
+#if defined(RPM_VENDOR_OPENPKG) /* switch-from-susr-to-musr-on-srpm-install
*/
+if(createDir(fi, ts, NULL, "%{_topdir}") ||
+ createDir(fi, ts, NULL, "%{_builddir}") ||
+ createDir(fi, ts, NULL, "%{_rpmdir}") ||
+ createDir(fi, ts, NULL, "%{_srcrpmdir}") ||
+ createDir(fi, ts, &_sourcedir, "%{_sourcedir}") ||
+ createDir(fi, ts, &_specdir, "%{_specdir}"))
+#else
if(createDir(ts, NULL, "%{_topdir}") ||
createDir(ts, NULL, "%{_builddir}") ||
createDir(ts, NULL, "%{_rpmdir}") ||
createDir(ts, NULL, "%{_srcrpmdir}") ||
createDir(ts, &_sourcedir, "%{_sourcedir}") ||
createDir(ts, &_specdir, "%{_specdir}"))
+#endif
goto exit;
/* Build dnl/dil with {_sourcedir, _specdir} as values. */
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Jul-2009 20:02:49 Branch: rpm-5_2 Handle: 2009070718024800 Modified files: (Branch: rpm-5_2) rpm CHANGES Log: prepare for release Summary: RevisionChanges Path 1.2970.2.25 +1 -1 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2970.2.24 -r1.2970.2.25 CHANGES --- rpm/CHANGES 28 Jun 2009 17:30:49 - 1.2970.2.24 +++ rpm/CHANGES 7 Jul 2009 18:02:48 - 1.2970.2.25 @@ -1,5 +1,5 @@ -5.2b1 -> 5.2b2: +5.2b1 -> 5.2.0: 5.2a4 -> 5.2b1: - jbj: revert checkfiles behavior to last known good (rpm-5.1.9). @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 28-Jun-2009 19:30:50 Branch: rpm-5_2 Handle: 2009062817304900 Modified files: (Branch: rpm-5_2) rpm CHANGES Log: Puh... I finally resolved the issues in rolling 5.2 releases and were able to provide a 5.2b1 distribution tarball Summary: RevisionChanges Path 1.2970.2.24 +2 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2970.2.23 -r1.2970.2.24 CHANGES --- rpm/CHANGES 27 Jun 2009 19:09:00 - 1.2970.2.23 +++ rpm/CHANGES 28 Jun 2009 17:30:49 - 1.2970.2.24 @@ -1,4 +1,6 @@ +5.2b1 -> 5.2b2: + 5.2a4 -> 5.2b1: - jbj: revert checkfiles behavior to last known good (rpm-5.1.9). - jbj: rpmfc: reduce the amount of debugging noise with lots of files. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: file/ autogen.sh pcre/ autogen.sh rpm/ INSTALL aut...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: xar rpm syck file pcre Date: 01-Jun-2009 15:44:14 Branch: rpm-5_2 Handle: 2009060113441301 Modified files: (Branch: rpm-5_2) fileautogen.sh pcreautogen.sh rpm INSTALL autogen.sh devtool.conf syckautogen.sh xar autogen.sh Log: merge: upgrade build environment to GNU automake 1.11 and GNU m4 1.4.13 Summary: RevisionChanges Path 1.42.2.1+1 -1 file/autogen.sh 1.1.2.1 +1 -1 pcre/autogen.sh 2.122.2.1 +3 -3 rpm/INSTALL 2.102.2.1 +1 -1 rpm/autogen.sh 2.293.2.7 +4 -4 rpm/devtool.conf 1.1.4.1 +1 -1 syck/autogen.sh 1.16.2.1+1 -1 xar/autogen.sh patch -p0 <<'@@ .' Index: file/autogen.sh $ cvs diff -u -r1.42 -r1.42.2.1 autogen.sh --- file/autogen.sh 24 Sep 2008 21:20:08 - 1.42 +++ file/autogen.sh 1 Jun 2009 13:44:13 - 1.42.2.1 @@ -1,7 +1,7 @@ #!/bin/sh # configure the requirements -AMV="automake (GNU automake) 1.10" +AMV="automake (GNU automake) 1.11" ACV="autoconf (GNU Autoconf) 2.63" LTV="libtoolize (GNU libtool) 2.2.6" GTT="gettextize (GNU gettext-tools) 0.17" @@ . patch -p0 <<'@@ .' Index: pcre/autogen.sh $ cvs diff -u -r1.1 -r1.1.2.1 autogen.sh --- pcre/autogen.sh 16 Jan 2009 14:25:05 - 1.1 +++ pcre/autogen.sh 1 Jun 2009 13:44:13 - 1.1.2.1 @@ -1,7 +1,7 @@ #!/bin/sh # configure the requirements -AMV="automake (GNU automake) 1.10" +AMV="automake (GNU automake) 1.11" ACV="autoconf (GNU Autoconf) 2.63" LTV="libtoolize (GNU libtool) 2.2.6" GTT="gettextize (GNU gettext-tools) 0.17" @@ . patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.122 -r2.122.2.1 INSTALL --- rpm/INSTALL 6 May 2009 11:33:16 - 2.122 +++ rpm/INSTALL 1 Jun 2009 13:44:13 - 2.122.2.1 @@ -11,9 +11,9 @@ --- - --- --- - CVS mandatory 1.121.12.13 http://www.nongnu.org/cvs/ Perlmandatory 5.8.0 5.10.0 http://www.perl.com/ -GNU m4 [0] mandatory 1.4.0 1.4.12 http://www.gnu.org/software/m4/ +GNU m4 [0] mandatory 1.4.0 1.4.13 http://www.gnu.org/software/m4/ GNU autoconfmandatory 2.59b 2.63 http://www.gnu.org/software/autoconf/ -GNU automakemandatory 1.8 1.10 http://www.gnu.org/software/automake/ +GNU automakemandatory 1.8 1.11 http://www.gnu.org/software/automake/ GNU libtool mandatory 1.5 2.2.6a http://www.gnu.org/software/libtool/ GNU gettext mandatory 0.160.17 http://www.gnu.org/software/gettext/ --- - --- --- - @@ -34,7 +34,7 @@ OpenSSL optional 0.9.8 0.9.8k http://www.openssl.org/ Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/ Berkeley-DB [1] optional 4.5 4.7.25 http://www.oracle.com/database/berkeley-db.html -SQLite [1] optional 3.3 3.6.13 http://www.sqlite.org/ +SQLite [1] optional 3.3 3.6.14 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/ Bzip2 optional 1.0 1.0.5 http://www.bzip.org/ @@ . patch -p0 <<'@@ .' Index: rpm/autogen.sh $ cvs diff -u -r2.102 -r2.102.2.1 autogen.sh --- rpm/autogen.sh1 Apr 2009 00:07:36 - 2.102 +++ rpm/autogen.sh1 Jun 2009 13:44:13 - 2.102.2.1 @@ -1,7 +1,7 @@ #!/bin/sh # configure the requirements -AMV="automake (GNU automake) 1.10" +AMV="automake (GNU automake) 1.11" ACV="autoconf (GNU Autoconf) 2.63" LTV="libtoolize (GNU libtool) 2.2.6" GTT="gettextize (GNU gettext-tools) 0.17" @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf ===
[CVS] RPM: rpm-5_2: pcre/ config.h.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: pcre Date: 01-Jun-2009 15:43:47 Branch: rpm-5_2 Handle: 2009060113434600 Modified files: (Branch: rpm-5_2) pcreconfig.h.in Log: merge: newer libtool wants to add LT_OBJDIR, so let do it Summary: RevisionChanges Path 1.3.2.1 +4 -0 pcre/config.h.in patch -p0 <<'@@ .' Index: pcre/config.h.in $ cvs diff -u -r1.3 -r1.3.2.1 config.h.in --- pcre/config.h.in 16 Apr 2009 20:26:43 - 1.3 +++ pcre/config.h.in 1 Jun 2009 13:43:46 - 1.3.2.1 @@ -123,6 +123,10 @@ "configure" can be used to override this default. */ #undef LINK_SIZE +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* The value of MATCH_LIMIT determines the default number of times the internal match() function can be called during a single execution of pcre_exec(). There is a runtime interface for setting a different limit. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/rpmio/ macro.c rpmpython.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 01-Jun-2009 15:43:16
Branch: rpm-5_2 Handle: 2009060113431600
Modified files: (Branch: rpm-5_2)
rpm/rpmio macro.c rpmpython.c
Log:
merge embedded language related compile-time warning removals
Summary:
RevisionChanges Path
2.230.2.2 +4 -0 rpm/rpmio/macro.c
2.11.2.2+2 -0 rpm/rpmio/rpmpython.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
$ cvs diff -u -r2.230.2.1 -r2.230.2.2 macro.c
--- rpm/rpmio/macro.c 13 May 2009 18:40:56 - 2.230.2.1
+++ rpm/rpmio/macro.c 1 Jun 2009 13:43:16 - 2.230.2.2
@@ -87,7 +87,9 @@
#include "debug.h"
/*...@unchecked@*/
+#if defined(WITH_FICL) || defined(WITH_JS) || defined(WITH_PERLEMBED) ||
defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_TCL)
static int _globalI = 1;
+#endif
#if defined(__LCLINT__)
/*...@-exportheader@*/
@@ -1569,6 +1571,7 @@
* @retval *avp invocation args
* @return script string
*/
+#if defined(WITH_FICL) || defined(WITH_JS) || defined(WITH_PERLEMBED) ||
defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_TCL)
static char * parseEmbedded(const char * s, size_t nb, const char *** avp)
/*...@*/
{
@@ -1602,6 +1605,7 @@
script[nb] = '\0';
return script;
}
+#endif
/**
* The main macro recursion loop.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpython.c
$ cvs diff -u -r2.11.2.1 -r2.11.2.2 rpmpython.c
--- rpm/rpmio/rpmpython.c 14 May 2009 00:15:40 - 2.11.2.1
+++ rpm/rpmio/rpmpython.c 1 Jun 2009 13:43:16 - 2.11.2.2
@@ -71,7 +71,9 @@
rpmpython rpmpythonNew(const char ** av, int flags)
{
static const char * _av[] = { "rpmpython", NULL };
+#if defined(WITH_PYTHONEMBED)
int initialize = (!flags || _rpmpythonI == NULL);
+#endif
rpmpython python = (flags ? rpmpythonI() :
rpmpythonGetPool(_rpmpythonPool));
if (_rpmpython_debug)
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/rpmdb/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 01-Jun-2009 15:34:04 Branch: rpm-5_2 Handle: 2009060113340400 Modified files: (Branch: rpm-5_2) rpm/rpmdb Makefile.am Log: be compatible with Automake 1.11 Summary: RevisionChanges Path 1.107.2.1 +1 -1 rpm/rpmdb/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmdb/Makefile.am $ cvs diff -u -r1.107 -r1.107.2.1 Makefile.am --- rpm/rpmdb/Makefile.am 15 Jan 2009 02:11:44 - 1.107 +++ rpm/rpmdb/Makefile.am 1 Jun 2009 13:34:04 - 1.107.2.1 @@ -112,7 +112,7 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgincdir) - $(pkgincHEADERS_INSTALL) $(my_DB_HEADER) $(DESTDIR)$(pkgincdir)/db.h + $(INSTALL_HEADER) $(my_DB_HEADER) $(DESTDIR)$(pkgincdir)/db.h check-local: @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: file/ autogen.sh pcre/ autogen.sh rpm/ CHANGES INSTALL auto...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: xar rpm syck file pcre Date: 01-Jun-2009 15:27:57 Branch: HEAD Handle: 2009060113275502 Modified files: fileautogen.sh pcreautogen.sh rpm CHANGES INSTALL autogen.sh devtool.conf syckautogen.sh xar autogen.sh Log: upgrade build environment to GNU automake 1.11 and GNU m4 1.4.13 Summary: RevisionChanges Path 1.43+1 -1 file/autogen.sh 1.2 +1 -1 pcre/autogen.sh 1.3007 +1 -0 rpm/CHANGES 2.123 +3 -3 rpm/INSTALL 2.105 +1 -1 rpm/autogen.sh 2.299 +4 -4 rpm/devtool.conf 1.2 +1 -1 syck/autogen.sh 1.17+1 -1 xar/autogen.sh patch -p0 <<'@@ .' Index: file/autogen.sh $ cvs diff -u -r1.42 -r1.43 autogen.sh --- file/autogen.sh 24 Sep 2008 21:20:08 - 1.42 +++ file/autogen.sh 1 Jun 2009 13:27:56 - 1.43 @@ -1,7 +1,7 @@ #!/bin/sh # configure the requirements -AMV="automake (GNU automake) 1.10" +AMV="automake (GNU automake) 1.11" ACV="autoconf (GNU Autoconf) 2.63" LTV="libtoolize (GNU libtool) 2.2.6" GTT="gettextize (GNU gettext-tools) 0.17" @@ . patch -p0 <<'@@ .' Index: pcre/autogen.sh $ cvs diff -u -r1.1 -r1.2 autogen.sh --- pcre/autogen.sh 16 Jan 2009 14:25:05 - 1.1 +++ pcre/autogen.sh 1 Jun 2009 13:27:56 - 1.2 @@ -1,7 +1,7 @@ #!/bin/sh # configure the requirements -AMV="automake (GNU automake) 1.10" +AMV="automake (GNU automake) 1.11" ACV="autoconf (GNU Autoconf) 2.63" LTV="libtoolize (GNU libtool) 2.2.6" GTT="gettextize (GNU gettext-tools) 0.17" @@ . patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3006 -r1.3007 CHANGES --- rpm/CHANGES 31 May 2009 19:56:58 - 1.3006 +++ rpm/CHANGES 1 Jun 2009 13:27:55 - 1.3007 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 +- rse: upgrade build environment to GNU automake 1.11 and GNU m4 1.4.13 - jbj: performance tweaks. - jbj: change default dep whiteout to ensure filessystem before setup. - jbj: prepare to save install scriptlet states/metrics. @@ . patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.122 -r2.123 INSTALL --- rpm/INSTALL 6 May 2009 11:33:16 - 2.122 +++ rpm/INSTALL 1 Jun 2009 13:27:55 - 2.123 @@ -11,9 +11,9 @@ --- - --- --- - CVS mandatory 1.121.12.13 http://www.nongnu.org/cvs/ Perlmandatory 5.8.0 5.10.0 http://www.perl.com/ -GNU m4 [0] mandatory 1.4.0 1.4.12 http://www.gnu.org/software/m4/ +GNU m4 [0] mandatory 1.4.0 1.4.13 http://www.gnu.org/software/m4/ GNU autoconfmandatory 2.59b 2.63 http://www.gnu.org/software/autoconf/ -GNU automakemandatory 1.8 1.10 http://www.gnu.org/software/automake/ +GNU automakemandatory 1.8 1.11 http://www.gnu.org/software/automake/ GNU libtool mandatory 1.5 2.2.6a http://www.gnu.org/software/libtool/ GNU gettext mandatory 0.160.17 http://www.gnu.org/software/gettext/ --- - --- --- - @@ -34,7 +34,7 @@ OpenSSL optional 0.9.8 0.9.8k http://www.openssl.org/ Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/ Berkeley-DB [1] optional 4.5 4.7.25 http://www.oracle.com/database/berkeley-db.html -SQLite [1] optional 3.3 3.6.13 http://www.sqlite.org/ +SQLite [1] optional 3.3 3.6.14 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/ Bzip2 optional 1.0 1.0.5 http://www.bzip.org/ @@ . patch -p0 <<'@@ .' Index: rpm/autogen.sh ==
[CVS] RPM: pcre/ config.h.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: pcre Date: 01-Jun-2009 15:27:27 Branch: HEAD Handle: 2009060113272700 Modified files: pcreconfig.h.in Log: newer libtool wants to add LT_OBJDIR, so let do it Summary: RevisionChanges Path 1.4 +4 -0 pcre/config.h.in patch -p0 <<'@@ .' Index: pcre/config.h.in $ cvs diff -u -r1.3 -r1.4 config.h.in --- pcre/config.h.in 16 Apr 2009 20:26:43 - 1.3 +++ pcre/config.h.in 1 Jun 2009 13:27:27 - 1.4 @@ -123,6 +123,10 @@ "configure" can be used to override this default. */ #undef LINK_SIZE +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* The value of MATCH_LIMIT determines the default number of times the internal match() function can be called during a single execution of pcre_exec(). There is a runtime interface for setting a different limit. @@ . __ 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: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 01-Jun-2009 15:22:38 Branch: HEAD Handle: 2009060113223700 Modified files: rpm/rpmdb Makefile.am Log: be compatible with Automake 1.11 Summary: RevisionChanges Path 1.108 +1 -1 rpm/rpmdb/Makefile.am patch -p0 <<'@@ .' Index: rpm/rpmdb/Makefile.am $ cvs diff -u -r1.107 -r1.108 Makefile.am --- rpm/rpmdb/Makefile.am 15 Jan 2009 02:11:44 - 1.107 +++ rpm/rpmdb/Makefile.am 1 Jun 2009 13:22:37 - 1.108 @@ -112,7 +112,7 @@ install-data-local: $(mkinstalldirs) $(DESTDIR)$(pkgincdir) - $(pkgincHEADERS_INSTALL) $(my_DB_HEADER) $(DESTDIR)$(pkgincdir)/db.h + $(INSTALL_HEADER) $(my_DB_HEADER) $(DESTDIR)$(pkgincdir)/db.h check-local: @@ . __ 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: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 01-Jun-2009 15:22:12 Branch: HEAD Handle: 2009060113221200 Modified files: rpm/tools Makefile.am Log: rpmkey is Keyutils specific, so do not build it by default for now Summary: RevisionChanges Path 2.123 +2 -2 rpm/tools/Makefile.am patch -p0 <<'@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.122 -r2.123 Makefile.am --- rpm/tools/Makefile.am 21 May 2009 16:33:08 - 2.122 +++ rpm/tools/Makefile.am 1 Jun 2009 13:22:12 - 2.123 @@ -20,7 +20,7 @@ EXTRA_DIST = hashtab.h -EXTRA_PROGRAMS = debugedit +EXTRA_PROGRAMS = debugedit rpmkey 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 rpmkey txar @WITH_LIBELF_DEBUGEDIT@ + rpmcmp rpmdeps 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/rpmio/ rpmpython.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 01-Jun-2009 15:21:45
Branch: HEAD Handle: 2009060113214500
Modified files:
rpm/rpmio rpmpython.c
Log:
get rid of additional compile-time warning
Summary:
RevisionChanges Path
2.13+2 -0 rpm/rpmio/rpmpython.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpython.c
$ cvs diff -u -r2.12 -r2.13 rpmpython.c
--- rpm/rpmio/rpmpython.c 14 May 2009 00:14:59 - 2.12
+++ rpm/rpmio/rpmpython.c 1 Jun 2009 13:21:45 - 2.13
@@ -71,7 +71,9 @@
rpmpython rpmpythonNew(const char ** av, int flags)
{
static const char * _av[] = { "rpmpython", NULL };
+#if defined(WITH_PYTHONEMBED)
int initialize = (!flags || _rpmpythonI == NULL);
+#endif
rpmpython python = (flags ? rpmpythonI() :
rpmpythonGetPool(_rpmpythonPool));
if (_rpmpython_debug)
@@ .
__
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: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 01-Jun-2009 14:56:46
Branch: HEAD Handle: 2009060112564500
Modified files:
rpm/rpmio macro.c
Log:
get rid of compile-time warnings in case one builds without any
embedded languages
Summary:
RevisionChanges Path
2.232 +4 -0 rpm/rpmio/macro.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
$ cvs diff -u -r2.231 -r2.232 macro.c
--- rpm/rpmio/macro.c 13 May 2009 18:40:19 - 2.231
+++ rpm/rpmio/macro.c 1 Jun 2009 12:56:45 - 2.232
@@ -87,7 +87,9 @@
#include "debug.h"
/*...@unchecked@*/
+#if defined(WITH_FICL) || defined(WITH_JS) || defined(WITH_PERLEMBED) ||
defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_TCL)
static int _globalI = 1;
+#endif
#if defined(__LCLINT__)
/*...@-exportheader@*/
@@ -1569,6 +1571,7 @@
* @retval *avp invocation args
* @return script string
*/
+#if defined(WITH_FICL) || defined(WITH_JS) || defined(WITH_PERLEMBED) ||
defined(WITH_PYTHONEMBED) || defined(WITH_RUBYEMBED) || defined(WITH_TCL)
static char * parseEmbedded(const char * s, size_t nb, const char *** avp)
/*...@*/
{
@@ -1602,6 +1605,7 @@
script[nb] = '\0';
return script;
}
+#endif
/**
* The main macro recursion loop.
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ CHANGES rpm/rpmio/ rpmlua.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-May-2009 21:44:15 Branch: rpm-5_1 Handle: 2009050619441401 Modified files: (Branch: rpm-5_1) rpm CHANGES rpm/rpmio rpmlua.c Log: align semantics of Lua function rpm.hostname() with the C API function buildHost() Summary: RevisionChanges Path 1.2288.2.300+1 -0 rpm/CHANGES 2.52.2.11 +1 -1 rpm/rpmio/rpmlua.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.299 -r1.2288.2.300 CHANGES --- rpm/CHANGES 18 Apr 2009 17:23:31 - 1.2288.2.299 +++ rpm/CHANGES 6 May 2009 19:44:14 - 1.2288.2.300 @@ -1,4 +1,5 @@ 5.1.9 -> 5.1.10: +- rse: align semantics of Lua function rpm.hostname() with the C API function buildHost() 5.1.8 -> 5.1.9: - rse: fix release tarball rolling after recent addition of local copies of XZ, PCRE and Syck @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmlua.c $ cvs diff -u -r2.52.2.10 -r2.52.2.11 rpmlua.c --- rpm/rpmio/rpmlua.c18 Apr 2009 16:45:17 - 2.52.2.10 +++ rpm/rpmio/rpmlua.c6 May 2009 19:44:15 - 2.52.2.11 @@ -1147,7 +1147,7 @@ if ((hbn = gethostbyname(hostname)) != NULL) h = hbn->h_name; else -h = "localhost"; +h = hostname; /*...@=multithreaded@*/ lua_pushstring(L, (const char *)h); return 1; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ CHANGES rpm/rpmio/ rpmlua.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-May-2009 21:43:18 Branch: rpm-5_2 Handle: 2009050619431701 Modified files: (Branch: rpm-5_2) rpm CHANGES rpm/rpmio rpmlua.c Log: align semantics of Lua function rpm.hostname() with the C API function buildHost() Summary: RevisionChanges Path 1.2970.2.1 +1 -0 rpm/CHANGES 2.72.2.1+1 -1 rpm/rpmio/rpmlua.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2970 -r1.2970.2.1 CHANGES --- rpm/CHANGES 6 May 2009 02:26:10 - 1.2970 +++ rpm/CHANGES 6 May 2009 19:43:17 - 1.2970.2.1 @@ -1,5 +1,6 @@ 5.2a4 -> 5.2b1: +- rse: align semantics of Lua function rpm.hostname() with the C API function buildHost() - proyvind: cpuinfo: move out cpuinfo feature dependencies to YAML. - proyvind: rpmsyck: first shot at YAML parser in pure C. - proyvind: get rid of parallel %___NVRDA macro, just merge it with %___NVRA in stead. @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmlua.c $ cvs diff -u -r2.72 -r2.72.2.1 rpmlua.c --- rpm/rpmio/rpmlua.c18 Apr 2009 16:41:58 - 2.72 +++ rpm/rpmio/rpmlua.c6 May 2009 19:43:18 - 2.72.2.1 @@ -1155,7 +1155,7 @@ if ((hbn = gethostbyname(hostname)) != NULL) h = hbn->h_name; else -h = "localhost"; +h = hostname; /*...@=multithreaded@*/ lua_pushstring(L, (const char *)h); return 1; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/rpmio/ rpmlua.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-May-2009 21:42:42 Branch: HEAD Handle: 2009050619424101 Modified files: rpm CHANGES rpm/rpmio rpmlua.c Log: align semantics of Lua function rpm.hostname() with the C API function buildHost() Summary: RevisionChanges Path 1.2972 +1 -0 rpm/CHANGES 2.73+1 -1 rpm/rpmio/rpmlua.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2971 -r1.2972 CHANGES --- rpm/CHANGES 6 May 2009 17:05:31 - 1.2971 +++ rpm/CHANGES 6 May 2009 19:42:41 - 1.2972 @@ -1,5 +1,6 @@ 5.2b1 -> 5.3a1 + - rse: align semantics of Lua function rpm.hostname() with the C API function buildHost() = @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmlua.c $ cvs diff -u -r2.72 -r2.73 rpmlua.c --- rpm/rpmio/rpmlua.c18 Apr 2009 16:41:58 - 2.72 +++ rpm/rpmio/rpmlua.c6 May 2009 19:42:42 - 2.73 @@ -1155,7 +1155,7 @@ if ((hbn = gethostbyname(hostname)) != NULL) h = hbn->h_name; else -h = "localhost"; +h = hostname; /*...@=multithreaded@*/ lua_pushstring(L, (const char *)h); return 1; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_2: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-May-2009 19:17:43 Branch: rpm-5_2 Handle: 2009050617174200 Modified files: (Branch: rpm-5_2) rpm configure.ac Log: use the correct year Summary: RevisionChanges Path 2.372.2.1 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.372 -r2.372.2.1 configure.ac --- rpm/configure.ac 2 May 2009 20:06:27 - 2.372 +++ rpm/configure.ac 6 May 2009 17:17:42 - 2.372.2.1 @@ -9,7 +9,7 @@ AC_PREREQ(2.63) AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) AC_INIT([rpm],[5.2.DEVEL],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2008" dnl # [-MM[-DD[ HH[:MM +PACKAGE_TIMESTAMP="2009" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-May-2009 19:06:35 Branch: HEAD Handle: 2009050617063500 Modified files: rpm configure.ac Log: switch to 5.3 tagging on HEAD Summary: RevisionChanges Path 2.373 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.372 -r2.373 configure.ac --- rpm/configure.ac 2 May 2009 20:06:27 - 2.372 +++ rpm/configure.ac 6 May 2009 17:06:35 - 2.373 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) AC_DEFUN([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.2.DEVEL],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2008" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.3.DEVEL],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2009" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-May-2009 19:05:31 Branch: HEAD Handle: 2009050617053100 Modified files: rpm CHANGES Log: HEAD is now open for RPM 5.3 development Summary: RevisionChanges Path 1.2971 +5 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2970 -r1.2971 CHANGES --- rpm/CHANGES 6 May 2009 02:26:10 - 1.2970 +++ rpm/CHANGES 6 May 2009 17:05:31 - 1.2971 @@ -1,5 +1,10 @@ +5.2b1 -> 5.3a1 + += + 5.2a4 -> 5.2b1: +[...] - proyvind: cpuinfo: move out cpuinfo feature dependencies to YAML. - proyvind: rpmsyck: first shot at YAML parser in pure C. - proyvind: get rid of parallel %___NVRDA macro, just merge it with %___NVRA in stead. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 18-Apr-2009 19:23:32 Branch: rpm-5_1 Handle: 2009041817233100 Modified files: (Branch: rpm-5_1) rpm CHANGES Log: 5.1.9 released today Summary: RevisionChanges Path 1.2288.2.299+2 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.298 -r1.2288.2.299 CHANGES --- rpm/CHANGES 13 Apr 2009 18:41:52 - 1.2288.2.298 +++ rpm/CHANGES 18 Apr 2009 17:23:31 - 1.2288.2.299 @@ -1,3 +1,5 @@ +5.1.9 -> 5.1.10: + 5.1.8 -> 5.1.9: - rse: fix release tarball rolling after recent addition of local copies of XZ, PCRE and Syck @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ VENDOR rpm/lib/ poptALL.c rpm/rpmio/ poptIO.c...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 18-Apr-2009 18:45:19
Branch: rpm-5_1 Handle: 2009041816451601
Modified files: (Branch: rpm-5_1)
rpm VENDOR
rpm/lib poptALL.c
rpm/rpmio poptIO.c rpmlua.c
Log:
Merge RPM_VENDOR_OPENPKG/stick-with-rpm-file-sanity-checking changes.
Summary:
RevisionChanges Path
2.47.2.10 +18 -0 rpm/VENDOR
2.90.2.23 +2 -1 rpm/lib/poptALL.c
1.24.2.9+2 -3 rpm/rpmio/poptIO.c
2.52.2.10 +2 -1 rpm/rpmio/rpmlua.c
patch -p0 <<'@@ .'
Index: rpm/VENDOR
$ cvs diff -u -r2.47.2.9 -r2.47.2.10 VENDOR
--- rpm/VENDOR5 Apr 2009 13:03:03 - 2.47.2.9
+++ rpm/VENDOR18 Apr 2009 16:45:16 - 2.47.2.10
@@ -448,6 +448,24 @@
just ignored.
+ Change: stick-with-rpm-file-sanity-checking
+ Purpose:Use file sanity checking code of RPM instead of POPT
+ Reason: POPT >= 1.15 contains the poptSaneFile() function which
+ is equivalent to rpmSecuritySaneFile(). And POPT >=
+ 1.15 also contains a poptReadConfigFiles() which
+ returns POPT_ERROR_BADCONFIG in case poptSaneFile()
+ says a file is not sane. This is all fine from a
+ raw sanity checking point of view. Unfortunately,
+ in the error reporting it is absolutely vital to
+ know _WHICH_ file is considered insecure. Until
+ POPT provides an error reporting callback or other
+ means for RPM to provide again reasonable warning
+ messages, we stick with the RPM sanity checking
+ code. So, this is not because OpenPKG is using
+ POPT < 1.15, but because we need proper warning
+ messages!
+
+
o Name: RPM4DARWIN
Vendor: RPM for Darwin (Mac OS X)
<http://rpm4darwin.sourceforge.net/>
Representative: Anders F. Bjorklund
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
$ cvs diff -u -r2.90.2.22 -r2.90.2.23 poptALL.c
--- rpm/lib/poptALL.c 11 Apr 2009 14:51:00 - 2.90.2.22
+++ rpm/lib/poptALL.c 18 Apr 2009 16:45:17 - 2.90.2.23
@@ -642,7 +642,8 @@
optCon = poptGetContext(__progname, argc, (const char **)argv,
optionsTable, 0);
/*...@=nullpass =temptr...@*/
-#if !defined(POPT_ERROR_BADCONFIG) /* XXX popt-1.15- retrofit */
+#if defined(RPM_VENDOR_OPENPKG) /* stick-with-rpm-file-sanity-checking */ ||
\
+!defined(POPT_ERROR_BADCONFIG) /* XXX POPT 1.15 retrofit */
{ char * path_buf = xstrdup(rpmpoptfiles);
char *path;
char *path_next;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
$ cvs diff -u -r1.24.2.8 -r1.24.2.9 poptIO.c
--- rpm/rpmio/poptIO.c11 Apr 2009 16:34:41 - 1.24.2.8
+++ rpm/rpmio/poptIO.c18 Apr 2009 16:45:17 - 1.24.2.9
@@ -526,7 +526,8 @@
/*...@=nullpass =temptr...@*/
#ifdef NOTYET
-#if !defined(POPT_ERROR_BADCONFIG) /* XXX popt-1.15- retrofit */
+#if defined(RPM_VENDOR_OPENPKG) /* stick-with-rpm-file-sanity-checking */ ||
\
+!defined(POPT_ERROR_BADCONFIG) /* XXX POPT 1.15 retrofit */
{ char * path_buf = xstrdup(rpmpoptfiles);
char *path;
char *path_next;
@@ -551,7 +552,6 @@
/* work-off each resulting file from the path element */
for (i = 0; i < ac; i++) {
const char *fn = av[i];
-#if defined(RPM_VENDOR_OPENPKG) /*
security-sanity-check-rpmpopt-and-rpmmacros */
if (fn[0] == '@' /* attention */) {
fn++;
if (!rpmSecuritySaneFile(fn)) {
@@ -559,7 +559,6 @@
continue;
}
}
-#endif
(void)poptReadConfigFile(optCon, fn);
av[i] = _free(
[CVS] RPM: rpm/ CHANGES VENDOR rpm/lib/ poptALL.c rpm/rpmio/ macro.c p...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 18-Apr-2009 18:41:59
Branch: HEAD Handle: 2009041816415701
Modified files:
rpm CHANGES VENDOR
rpm/lib poptALL.c
rpm/rpmio macro.c poptIO.c rpmlua.c
Log:
RPM_VENDOR_OPENPKG: stick with local RPM sanity checking for reasonable
warning messages. The reason simply is: POPT >= 1.15 contains the
poptSaneFile() function which is equivalent to rpmSecuritySaneFile().
And POPT >= 1.15 also contains a poptReadConfigFiles() which returns
POPT_ERROR_BADCONFIG in case poptSaneFile() says a file is not
sane. This is all fine from a raw sanity checking point of view.
Unfortunately, in the error reporting it is absolutely vital to know
_WHICH_ file is considered insecure. Until POPT provides an error
reporting callback or other means for RPM to provide again reasonable
warning messages, we stick with the RPM sanity checking code. So, this
is not because OpenPKG is using POPT < 1.15, but because we need proper
warning messages!
Summary:
RevisionChanges Path
1.2945 +1 -0 rpm/CHANGES
2.69+18 -0 rpm/VENDOR
2.126 +2 -1 rpm/lib/poptALL.c
2.228 +4 -2 rpm/rpmio/macro.c
1.49+2 -3 rpm/rpmio/poptIO.c
2.72+2 -1 rpm/rpmio/rpmlua.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2944 -r1.2945 CHANGES
--- rpm/CHANGES 17 Apr 2009 22:42:11 - 1.2944
+++ rpm/CHANGES 18 Apr 2009 16:41:57 - 1.2945
@@ -1,5 +1,6 @@
5.2a4 -> 5.2b1:
+- rse: RPM_VENDOR_OPENPKG: stick with local RPM sanity checking for
reasonable warning messages
- jbj: js: simplify the embedding to the JSAPI examples, not the js
shell.
- jbj: ficl: capture stdout from ficl vm.
- jbj: ficl: wire-up %post -p .
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
$ cvs diff -u -r2.68 -r2.69 VENDOR
--- rpm/VENDOR6 Apr 2009 00:21:20 - 2.68
+++ rpm/VENDOR18 Apr 2009 16:41:58 - 2.69
@@ -423,6 +423,24 @@
just ignored.
+ Change: stick-with-rpm-file-sanity-checking
+ Purpose:Use file sanity checking code of RPM instead of POPT
+ Reason: POPT >= 1.15 contains the poptSaneFile() function which
+ is equivalent to rpmSecuritySaneFile(). And POPT >=
+ 1.15 also contains a poptReadConfigFiles() which
+ returns POPT_ERROR_BADCONFIG in case poptSaneFile()
+ says a file is not sane. This is all fine from a
+ raw sanity checking point of view. Unfortunately,
+ in the error reporting it is absolutely vital to
+ know _WHICH_ file is considered insecure. Until
+ POPT provides an error reporting callback or other
+ means for RPM to provide again reasonable warning
+ messages, we stick with the RPM sanity checking
+ code. So, this is not because OpenPKG is using
+ POPT < 1.15, but because we need proper warning
+ messages!
+
+
o Name: RPM4DARWIN
Vendor: RPM for Darwin (Mac OS X)
<http://rpm4darwin.sourceforge.net/>
Representative: Anders F. Bjorklund
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
$ cvs diff -u -r2.125 -r2.126 poptALL.c
--- rpm/lib/poptALL.c 13 Apr 2009 18:07:31 - 2.125
+++ rpm/lib/poptALL.c 18 Apr 2009 16:41:58 - 2.126
@@ -679,7 +679,8 @@
optCon = poptGetContext(__progname, argc, (const char **)argv,
optionsTable, 0);
/*...@=nullpass =temptr...@*/
-#if !defined(POPT_ERROR_BADCONFIG) /* XXX popt-1.15- retrofit */
+#if defined(RPM_VENDOR_OPENPKG) /* stick-with-rpm-file-sanity-checking */ ||
\
+!defined(POPT_ERROR_BADCONFIG) /* XXX POPT 1.15 retrofit */
{ char * path_buf = xstrdup(r
[CVS] RPM: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 15-Apr-2009 14:38:44 Branch: HEAD Handle: 2009041512384400 Modified files: rpm configure.ac Log: search also for Python library with numbers Summary: RevisionChanges Path 2.362 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.361 -r2.362 configure.ac --- rpm/configure.ac 15 Apr 2009 11:28:06 - 2.361 +++ rpm/configure.ac 15 Apr 2009 12:38:44 - 2.362 @@ -1251,7 +1251,7 @@ dnl # Python embedding RPM_CHECK_LIB( [Python embedding], [pythonembed], -[python], [Py_Initialize], [Python.h], +[python2.6 python2.5 python], [Py_Initialize], [Python.h], [no,external:none], [], [ ], []) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 15-Apr-2009 14:38:14 Branch: HEAD Handle: 2009041512381300 Modified files: rpm CHANGES Log: Remember change. Summary: RevisionChanges Path 1.2933 +1 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2932 -r1.2933 CHANGES --- rpm/CHANGES 15 Apr 2009 12:15:51 - 1.2932 +++ rpm/CHANGES 15 Apr 2009 12:38:13 - 1.2933 @@ -1,5 +1,6 @@ 5.2a4 -> 5.2b1: +- rse: RPM_CHECK_LIB: correctly handle library names like "libpython2.6" and "libdb-4.7" - rse: place XZ code under WITH_XZ (RPM_CHECK_LIB based) instead of HAVE_LZMA_H (standard Autoconf header check) - rse: place BZip2 code under WITH_BZIP2 (RPM_CHECK_LIB based) instead of HAVE_BZLIB_H (standard Autoconf header check) - rse: RPM_CHECK_LIB: support --with-=system to enable a library but control detection via flags only @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ acinclude.m4
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 15-Apr-2009 14:37:57
Branch: HEAD Handle: 2009041512375700
Modified files:
rpm acinclude.m4
Log:
RPM_CHECK_LIB: correctly handle library names like "libpython2.6" and
"libdb-4.7"
Summary:
RevisionChanges Path
2.30+1 -1 rpm/acinclude.m4
patch -p0 <<'@@ .'
Index: rpm/acinclude.m4
$ cvs diff -u -r2.29 -r2.30 acinclude.m4
--- rpm/acinclude.m4 15 Apr 2009 12:06:46 - 2.29
+++ rpm/acinclude.m4 15 Apr 2009 12:37:57 - 2.30
@@ -472,7 +472,7 @@
AC_CHECK_LIB(m4_defn([__rcl_lib]), [$4])
dnl # manually check for success (do not use third
argument to AC_CHECK_LIB
dnl # here as this would no longer set the LIBS variable
(the default action)
-test ".${ac_cv_lib_[]m4_defn([__rcl_lib])_$4}" = .yes &&
__rcl_found_lib=yes
+test
".${m4_translit(ac_cv_lib_[]m4_defn([__rcl_lib])_$4,[.-,],[___])}" = .yes &&
__rcl_found_lib=yes
])
test ".${__rcl_found_lib}" = .no && __rcl_found="no"
dnl # determine final results
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmds.c rpm/rpmio/ rpmio.c xzdio.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 15-Apr-2009 14:15:52
Branch: HEAD Handle: 2009041512155101
Modified files:
rpm CHANGES
rpm/lib rpmds.c
rpm/rpmio rpmio.c xzdio.c
Log:
place XZ code under WITH_XZ (RPM_CHECK_LIB based) instead of HAVE_LZMA_H
(standard Autoconf header check)
Summary:
RevisionChanges Path
1.2932 +1 -0 rpm/CHANGES
2.149 +2 -2 rpm/lib/rpmds.c
1.189 +6 -6 rpm/rpmio/rpmio.c
1.12+1 -1 rpm/rpmio/xzdio.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2931 -r1.2932 CHANGES
--- rpm/CHANGES 15 Apr 2009 12:12:45 - 1.2931
+++ rpm/CHANGES 15 Apr 2009 12:15:51 - 1.2932
@@ -1,5 +1,6 @@
5.2a4 -> 5.2b1:
+- rse: place XZ code under WITH_XZ (RPM_CHECK_LIB based) instead of
HAVE_LZMA_H (standard Autoconf header check)
- rse: place BZip2 code under WITH_BZIP2 (RPM_CHECK_LIB based) instead
of HAVE_BZLIB_H (standard Autoconf header check)
- rse: RPM_CHECK_LIB: support --with-=system to enable a library
but control detection via flags only
- rse: let Lua's lregex_lposix to build against PCRE POSIX out of the box
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.148 -r2.149 rpmds.c
--- rpm/lib/rpmds.c 15 Apr 2009 12:12:46 - 2.148
+++ rpm/lib/rpmds.c 15 Apr 2009 12:15:51 - 2.149
@@ -1500,7 +1500,7 @@
{ "rpmlib(PayloadIsUstar)", "4.4.4-1",
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package payload can be in ustar tar archive format.") },
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
{ "rpmlib(PayloadIsLzma)", "4.4.6-1",
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package payload can be compressed using lzma.") },
@@ -1516,7 +1516,7 @@
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package payload can be in ar archive format.") },
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
{ "rpmlib(PayloadIsXz)", "5.2-1",
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package payload can be compressed using xz.") },
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
$ cvs diff -u -r1.188 -r1.189 rpmio.c
--- rpm/rpmio/rpmio.c 15 Apr 2009 12:12:46 - 1.188
+++ rpm/rpmio/rpmio.c 15 Apr 2009 12:15:52 - 1.189
@@ -58,7 +58,7 @@
# include
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
#include
#endif
@@ -216,7 +216,7 @@
} else if (fps->io == bzdio) {
sprintf(be, "BZD %p fdno %d", fps->fp, fps->fdno);
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
} else if (fps->io == lzdio) {
sprintf(be, "LZD %p fdno %d", fps->fp, fps->fdno);
} else if (fps->io == xzdio) {
@@ -2332,7 +2332,7 @@
} else
#endif
-#ifdef HAVE_LZMA_H
+#if defined(WITH_XZ)
if (fdGetIo(fd) == lzdio) {
errstr = fd->errcookie;
} else
@@ -2662,7 +2662,7 @@
fd = iof->_fdopen(fd, zstdio);
/*...@=internalglobs@*/
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
} else if (!strcmp(end, "lzdio")) {
iof = lzdio;
fd = iof->_fdopen(fd, zstdio);
@@ -2836,7 +2836,7 @@
if (vh && fdGetIo(fd) == bzdio && bzdio->_flush != NULL)
return (*bzdio->_flush) ((void *)fd);
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
if (vh && fdGetIo(fd) == lzdio && lzdio->_flush != NULL)
return (*lzdio->_flush) ((void *)fd);
if (vh && fdGetIo(fd) == xzdio && xzdio->_flush != NULL)
@@ -2873,7 +2873,7 @@
ec = (fd->syserrno || fd->errcookie != NULL) ? -1 : 0;
i--;/* XXX fdio under bzdio always has fdno == -1 */
#endif
-#if defined(HAVE_LZMA_H)
+#if defined(WITH_XZ)
} else if (fps->io == lzdio) {
ec = (fd->syserrno || fd->errcookie != NULL) ? -1
[CVS] RPM: rpm/ CHANGES rpm/lib/ rpmds.c rpm/rpmio/ bzdio.c poptIO.c r...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 15-Apr-2009 14:12:46
Branch: HEAD Handle: 2009041512124501
Modified files:
rpm CHANGES
rpm/lib rpmds.c
rpm/rpmio bzdio.c poptIO.c rpmio.c rpmzq.c
Log:
place BZip2 code under WITH_BZIP2 (RPM_CHECK_LIB based) instead of
HAVE_BZLIB_H (standard Autoconf header check)
Summary:
RevisionChanges Path
1.2931 +1 -0 rpm/CHANGES
2.148 +1 -1 rpm/lib/rpmds.c
2.20+1 -1 rpm/rpmio/bzdio.c
1.45+1 -1 rpm/rpmio/poptIO.c
1.188 +6 -6 rpm/rpmio/rpmio.c
1.26+2 -2 rpm/rpmio/rpmzq.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2930 -r1.2931 CHANGES
--- rpm/CHANGES 15 Apr 2009 11:49:39 - 1.2930
+++ rpm/CHANGES 15 Apr 2009 12:12:45 - 1.2931
@@ -1,5 +1,6 @@
5.2a4 -> 5.2b1:
+- rse: place BZip2 code under WITH_BZIP2 (RPM_CHECK_LIB based) instead
of HAVE_BZLIB_H (standard Autoconf header check)
- rse: RPM_CHECK_LIB: support --with-=system to enable a library
but control detection via flags only
- rse: let Lua's lregex_lposix to build against PCRE POSIX out of the box
- jbj: inject $1/$2 into embedded tcl/perl/python/ruby interpreter
contexts.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmds.c
$ cvs diff -u -r2.147 -r2.148 rpmds.c
--- rpm/lib/rpmds.c 8 Apr 2009 18:13:05 - 2.147
+++ rpm/lib/rpmds.c 15 Apr 2009 12:12:46 - 2.148
@@ -1446,7 +1446,7 @@
{ "rpmlib(CompressedFileNames)", "3.0.4-1",
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("file name(s) stored as (dirName,baseName,dirIndex) tuple, not as
path.")},
-#if defined(HAVE_BZLIB_H)
+#if defined(WITH_BZIP2)
{ "rpmlib(PayloadIsBzip2)", "3.0.5-1",
(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
N_("package payload can be compressed using bzip2.") },
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/bzdio.c
$ cvs diff -u -r2.19 -r2.20 bzdio.c
--- rpm/rpmio/bzdio.c 25 Mar 2009 20:26:46 - 2.19
+++ rpm/rpmio/bzdio.c 15 Apr 2009 12:12:46 - 2.20
@@ -8,7 +8,7 @@
#include
#include
-#if defined(HAVE_BZLIB_H)
+#if defined(WITH_BZIP2)
#define _RPMBZ_INTERNAL
#include "rpmbz.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
$ cvs diff -u -r1.44 -r1.45 poptIO.c
--- rpm/rpmio/poptIO.c15 Apr 2009 11:24:44 - 1.44
+++ rpm/rpmio/poptIO.c15 Apr 2009 12:12:46 - 1.45
@@ -439,7 +439,7 @@
{ "rpmtcldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmtcl_debug, -1,
N_("Debug embedded TCL interpreter"), NULL},
#endif
-#ifdef HAVE_BZLIB_H
+#ifdef WITH_BZIP2
{ "rpmzqdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmzq_debug,
-1,
N_("Debug rpmzq Job Queuing"), NULL},
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
$ cvs diff -u -r1.187 -r1.188 rpmio.c
--- rpm/rpmio/rpmio.c 13 Apr 2009 16:32:43 - 1.187
+++ rpm/rpmio/rpmio.c 15 Apr 2009 12:12:46 - 1.188
@@ -212,7 +212,7 @@
} else if (fps->io == gzdio) {
sprintf(be, "GZD %p fdno %d", fps->fp, fps->fdno);
#endif
-#if defined(HAVE_BZLIB_H)
+#if defined(WITH_BZIP2)
} else if (fps->io == bzdio) {
sprintf(be, "BZD %p fdno %d", fps->fp, fps->fdno);
#endif
@@ -2326,11 +2326,11 @@
} else
#endif /* WITH_ZLIB */
-#ifdef HAVE_BZLIB_H
+#if defined(WITH_BZIP2)
if (fdGetIo(fd) == bzdio) {
errstr = fd->errcookie;
} else
-#endif /* HAVE_BZLIB_H */
+#endif
#ifdef HAVE_LZMA_H
if (fdGetIo(fd) == lzdio) {
@@ -2655,7 +2655,7 @@
fd = iof->_fdopen(fd, zstdio);
/*...@=internalglobs@*/
#endif
-#if defined(HA
[CVS] RPM: rpm/ acinclude.m4
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 15-Apr-2009 14:06:46
Branch: HEAD Handle: 2009041512064600
Modified files:
rpm acinclude.m4
Log:
ops, I forgot to finish the error handling
Summary:
RevisionChanges Path
2.29+1 -1 rpm/acinclude.m4
patch -p0 <<'@@ .'
Index: rpm/acinclude.m4
$ cvs diff -u -r2.28 -r2.29 acinclude.m4
--- rpm/acinclude.m4 15 Apr 2009 11:49:40 - 2.28
+++ rpm/acinclude.m4 15 Apr 2009 12:06:46 - 2.29
@@ -447,7 +447,7 @@
break
fi
else
-AC_MSG_ERROR(
+AC_MSG_ERROR([Unknown location specification
$__rcl_location])
fi
done
IFS="${__rcl_IFS}"
@@ .
__
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: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 15-Apr-2009 13:50:26 Branch: HEAD Handle: 2009041511502600 Modified files: rpm devtool.conf Log: try to fix Jeff's OSSP uuid vs. E2FSUTILS uuid problem with the new 'system' feature of RPM_CHECK_LIB Summary: RevisionChanges Path 2.286 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.285 -r2.286 devtool.conf --- rpm/devtool.conf 13 Apr 2009 16:32:42 - 2.285 +++ rpm/devtool.conf 15 Apr 2009 11:50:26 - 2.286 @@ -85,7 +85,7 @@ --with-gcrypt=external \ --with-neon=external \ --with-pcre=internal \ ---with-uuid=external \ +--with-uuid=system \ --with-xar=internal \ --with-popt=external \ --with-keyutils=external \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES acinclude.m4
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 15-Apr-2009 13:49:40
Branch: HEAD Handle: 2009041511493901
Modified files:
rpm CHANGES acinclude.m4
Log:
RPM_CHECK_LIB: support --with-=system to enable a library but
control detection via flags only. This allows one to especially ignore
any -config and .pc stuff and indeas control everything
manually via CPPFLAGS and LDFLAGS.
Summary:
RevisionChanges Path
1.2930 +1 -0 rpm/CHANGES
2.28+20 -0 rpm/acinclude.m4
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2929 -r1.2930 CHANGES
--- rpm/CHANGES 15 Apr 2009 11:28:07 - 1.2929
+++ rpm/CHANGES 15 Apr 2009 11:49:39 - 1.2930
@@ -1,5 +1,6 @@
5.2a4 -> 5.2b1:
+- rse: RPM_CHECK_LIB: support --with-=system to enable a library
but control detection via flags only
- rse: let Lua's lregex_lposix to build against PCRE POSIX out of the box
- jbj: inject $1/$2 into embedded tcl/perl/python/ruby interpreter
contexts.
- jbj: perl: add use RPM; so that perl bindings are available.
@@ .
patch -p0 <<'@@ .'
Index: rpm/acinclude.m4
$ cvs diff -u -r2.27 -r2.28 acinclude.m4
--- rpm/acinclude.m4 7 Apr 2009 16:41:39 - 2.27
+++ rpm/acinclude.m4 15 Apr 2009 11:49:40 - 2.28
@@ -99,6 +99,7 @@
dnl ## ::= "yes" | "no"
dnl ## ::= ":"
dnl ## |
+dnl ## | "system"
dnl ## | "external"
dnl ## | "internal"
dnl ## | "none"
@@ -298,6 +299,23 @@
break
fi
fi
+elif test ".${__rcl_location}" = .system; then
+dnl # detection of library in external locations
controlled
+dnl # by explicit build flags or in standard system
locations
+dnl # (usually /usr/include and /usr/lib)
+__rcl_found_hdr=no
+__rcl_found_lib=no
+AC_PREPROC_IFELSE([AC_LANG_SOURCE([...@%:@include
<$5>])], [ __rcl_found_hdr=yes ])
+m4_foreach_w([__rcl_lib], [$3], [
+__rcl_safe_LIBS="${LIBS}"
+LIBS="-l[]m4_defn([__rcl_lib]) ${LIBS}"
+AC_LINK_IFELSE([AC_LANG_CALL([], [$4])], [
__rcl_found_lib=yes ])
+LIBS="${__rcl_safe_LIBS}"
+])
+if test ".${__rcl_found_hdr}:${__rcl_found_lib}" =
".yes:yes"; then
+__rcl_result_hint="system: explicitly controlled or
system location"
+break
+fi
elif test -d "${__rcl_location}"; then
dnl # detection of library in particular external
location
__rcl_found=no
@@ -428,6 +446,8 @@
if test ".${__rcl_found}" = .yes; then
break
fi
+else
+AC_MSG_ERROR(
fi
done
IFS="${__rcl_IFS}"
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 15-Apr-2009 13:28:07 Branch: HEAD Handle: 2009041511280601 Modified files: rpm CHANGES configure.ac Log: let Lua's lregex_lposix to build against PCRE POSIX out of the box, too Summary: RevisionChanges Path 1.2929 +1 -0 rpm/CHANGES 2.361 +7 -0 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2928 -r1.2929 CHANGES --- rpm/CHANGES 14 Apr 2009 19:27:58 - 1.2928 +++ rpm/CHANGES 15 Apr 2009 11:28:07 - 1.2929 @@ -1,5 +1,6 @@ 5.2a4 -> 5.2b1: +- rse: let Lua's lregex_lposix to build against PCRE POSIX out of the box - jbj: inject $1/$2 into embedded tcl/perl/python/ruby interpreter contexts. - jbj: perl: add use RPM; so that perl bindings are available. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.360 -r2.361 configure.ac --- rpm/configure.ac 13 Apr 2009 18:31:52 - 2.360 +++ rpm/configure.ac 15 Apr 2009 11:28:06 - 2.361 @@ -1311,6 +1311,7 @@ dnl # - RPM under WITH_PCRE uses +libpcre in addition to dnl # - RPM under WITH_PCRE+WITH_PCRE_POSIX uses +libpcreposix instead of dnl # - RPM/Lua under LUA_USE_PCRE uses +libpcre in addition to +dnl # - RPM/Lua under REX_POSIX_INCLUDE uses +libposixpcre instead of dnl # attention: dnl # - In the locally bundled PCRE all libpcre objects are embedded into libpcreposix dnl # because of s/lib/noinst/ changes in pcre/Makefile.am. Here we have to link @@ -1326,6 +1327,9 @@ AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if you have the 'pcre' library (-lpcre).]) AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is available]) WITH_PCRE_LIBS="-lpcreposix" # override, not prepend! (see attention above) + if test ".$WITH_LUA" = .yes; then + WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DREX_POSIX_INCLUDE=\"\"" + fi AC_SUBST(WITH_PCRE_LIBS) else dnl # make sure PCRE POSIX API can be really _USED_ by RPM @@ -1335,6 +1339,9 @@ AC_LANG_PROGRAM([#include ], [(void)regcomp(0, 0, 0)]) ], [ AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is available]) + if test ".$WITH_LUA" = .yes; then + WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DREX_POSIX_INCLUDE=\"\"" + fi ], [ LIBS="$LIBS_SAVED" ]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ poptIO.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 15-Apr-2009 13:24:45
Branch: HEAD Handle: 2009041511244400
Modified files:
rpm/rpmio poptIO.c
Log:
ops, fix introduced typo
Summary:
RevisionChanges Path
1.44+1 -1 rpm/rpmio/poptIO.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
$ cvs diff -u -r1.43 -r1.44 poptIO.c
--- rpm/rpmio/poptIO.c13 Apr 2009 19:06:18 - 1.43
+++ rpm/rpmio/poptIO.c15 Apr 2009 11:24:44 - 1.44
@@ -439,7 +439,7 @@
{ "rpmtcldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmtcl_debug, -1,
N_("Debug embedded TCL interpreter"), NULL},
#endif
-#idef HAVE_BZLIB_H
+#ifdef HAVE_BZLIB_H
{ "rpmzqdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmzq_debug,
-1,
N_("Debug rpmzq Job Queuing"), NULL},
#endif
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/rpmio/ poptIO.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 13-Apr-2009 21:06:18
Branch: HEAD Handle: 2009041319061701
Modified files:
rpm CHANGES
rpm/rpmio poptIO.c
Log:
fix building without BZip2
Summary:
RevisionChanges Path
1.2925 +1 -0 rpm/CHANGES
1.43+2 -0 rpm/rpmio/poptIO.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2924 -r1.2925 CHANGES
--- rpm/CHANGES 13 Apr 2009 18:56:27 - 1.2924
+++ rpm/CHANGES 13 Apr 2009 19:06:17 - 1.2925
@@ -1,5 +1,6 @@
5.2a3 -> 5.2a4:
+- rse: fix building without BZip2
- rse: fix release tarball rolling after recent addition of local copies
of XZ, PCRE and Syck
- rse: forward port all build infrastructure fixes from RPM 5.1
- rse: eliminate compile-time warnings introduced with recent embedded
language support
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
$ cvs diff -u -r1.42 -r1.43 poptIO.c
--- rpm/rpmio/poptIO.c13 Apr 2009 16:32:43 - 1.42
+++ rpm/rpmio/poptIO.c13 Apr 2009 19:06:18 - 1.43
@@ -439,8 +439,10 @@
{ "rpmtcldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmtcl_debug, -1,
N_("Debug embedded TCL interpreter"), NULL},
#endif
+#idef HAVE_BZLIB_H
{ "rpmzqdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmzq_debug,
-1,
N_("Debug rpmzq Job Queuing"), NULL},
+#endif
{ "xardebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_xar_debug, -1,
N_("Debug xar archives"), NULL},
{ "tardebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_tar_debug, -1,
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 21:13:27 Branch: HEAD Handle: 2009041319132600 Modified files: rpm CHANGES Log: ok, 5.2a4 released. Next release hopefully can be some sort of a beta version to finally start directing us towards 5.2.0 Summary: RevisionChanges Path 1.2926 +2 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2925 -r1.2926 CHANGES --- rpm/CHANGES 13 Apr 2009 19:06:17 - 1.2925 +++ rpm/CHANGES 13 Apr 2009 19:13:26 - 1.2926 @@ -1,4 +1,6 @@ +5.2a4 -> 5.2b1: + 5.2a3 -> 5.2a4: - rse: fix building without BZip2 - rse: fix release tarball rolling after recent addition of local copies of XZ, PCRE and Syck @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 20:56:28 Branch: HEAD Handle: 2009041318562700 Modified files: rpm CHANGES Log: remember fix Summary: RevisionChanges Path 1.2924 +1 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2923 -r1.2924 CHANGES --- rpm/CHANGES 13 Apr 2009 18:31:52 - 1.2923 +++ rpm/CHANGES 13 Apr 2009 18:56:27 - 1.2924 @@ -1,5 +1,6 @@ 5.2a3 -> 5.2a4: +- rse: fix release tarball rolling after recent addition of local copies of XZ, PCRE and Syck - rse: forward port all build infrastructure fixes from RPM 5.1 - rse: eliminate compile-time warnings introduced with recent embedded language support - afb: rename --with-ruby to --with-rubyembed, to match Perl/Python. @@ . __ 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: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 20:53:10 Branch: HEAD Handle: 2009041318530900 Modified files: rpm INSTALL Log: notice that we really require POPT 1.15 now Summary: RevisionChanges Path 2.121 +1 -1 rpm/INSTALL patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.120 -r2.121 INSTALL --- rpm/INSTALL 13 Apr 2009 15:53:03 - 2.120 +++ rpm/INSTALL 13 Apr 2009 18:53:09 - 2.121 @@ -28,7 +28,7 @@ ISO C Compiler mandatory - - e.g. http://gcc.gnu.org/ POSIX make mandatory - - e.g. http://www.gnu.org/software/make/ Perlmandatory 5.8.0 5.10.0 http://www.perl.com/ -POPTmandatory 1.9 1.15http://rpm5.org/files/popt/ +POPTmandatory 1.151.15http://rpm5.org/files/popt/ BeeCryptmandatory 4.0 4.1.2 http://beecrypt.sourceforge.net/ 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_1: rpm/ CHANGES Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 20:41:52 Branch: rpm-5_1 Handle: 2009041318415200 Modified files: (Branch: rpm-5_1) rpm CHANGES Makefile.am Log: ARGL... this is exactly why we should avoid any infrastructure changes on stable branches: the recent XZ, PCRE and Syck local copies on RPM 5.1 missed an entries in the EXTRA_DIST and hence the 5.1.8 release tarball missed the subdirs (too bad that for all today's tests I used the CVS sources only) Summary: RevisionChanges Path 1.2288.2.298+1 -0 rpm/CHANGES 2.215.2.12 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.297 -r1.2288.2.298 CHANGES --- rpm/CHANGES 13 Apr 2009 17:46:08 - 1.2288.2.297 +++ rpm/CHANGES 13 Apr 2009 18:41:52 - 1.2288.2.298 @@ -1,4 +1,5 @@ 5.1.8 -> 5.1.9: +- rse: fix release tarball rolling after recent addition of local copies of XZ, PCRE and Syck 5.1.7 -> 5.1.8: - jbj: adjust loader maps for lua. @@ . patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.215.2.11 -r2.215.2.12 Makefile.am --- rpm/Makefile.am 13 Apr 2009 10:22:31 - 2.215.2.11 +++ rpm/Makefile.am 13 Apr 2009 18:41:52 - 2.215.2.12 @@ -6,7 +6,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ - db db3/configure xar \ + db db3/configure xar xz pcre syck \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ file/autogen.sh file/config* file/depcomp file/install-sh file/ltmain.sh file/missing file/mkinstalldirs \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 20:37:28 Branch: HEAD Handle: 2009041318372800 Modified files: rpm Makefile.am Log: fix tarball creation Summary: RevisionChanges Path 2.231 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.230 -r2.231 Makefile.am --- rpm/Makefile.am 13 Apr 2009 18:31:52 - 2.230 +++ rpm/Makefile.am 13 Apr 2009 18:37:28 - 2.231 @@ -6,7 +6,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ - db db3/configure xar xz pcre \ + db db3/configure xar xz pcre syck \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ file/autogen.sh file/config* file/depcomp file/install-sh file/ltmain.sh file/missing file/mkinstalldirs \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: xz/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: xz Date: 13-Apr-2009 20:32:32 Branch: HEAD Handle: 2009041318323100 Modified files: xz .cvsignore Log: ignore generates files Summary: RevisionChanges Path 1.3 +7 -0 xz/.cvsignore patch -p0 <<'@@ .' Index: xz/.cvsignore $ cvs diff -u -r1.2 -r1.3 .cvsignore --- xz/.cvsignore 16 Feb 2009 17:07:46 - 1.2 +++ xz/.cvsignore 13 Apr 2009 18:32:31 - 1.3 @@ -13,3 +13,10 @@ lcov libtool stamp-h1 +compile +config.guess +config.sub +depcomp +install-sh +ltmain.sh +missing @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: lua/ Makefile.am rpm/ CHANGES Makefile.am rpm/build/ Makefi...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm lua Date: 13-Apr-2009 20:31:55 Branch: HEAD Handle: 2009041318315203 Modified files: lua Makefile.am rpm CHANGES Makefile.am configure.ac rpm/build Makefile.am rpm/miscMakefile.am librpmmisc.vers rpm/rpmconstant Makefile.am rpm/rpmio Makefile.am Log: forward port all build infrastructure fixes from RPM 5.1 Summary: RevisionChanges Path 1.35+3 -3 lua/Makefile.am 1.2923 +1 -0 rpm/CHANGES 2.230 +3 -2 rpm/Makefile.am 2.75+1 -0 rpm/build/Makefile.am 2.360 +10 -1 rpm/configure.ac 1.45+4 -2 rpm/misc/Makefile.am 1.17+65 -0 rpm/misc/librpmmisc.vers 1.11+2 -1 rpm/rpmconstant/Makefile.am 1.223 +1 -2 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: lua/Makefile.am $ cvs diff -u -r1.34 -r1.35 Makefile.am --- lua/Makefile.am 31 Mar 2009 17:37:46 - 1.34 +++ lua/Makefile.am 13 Apr 2009 18:31:54 - 1.35 @@ -11,7 +11,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(srcdir)/local \ - -I$(builddir)/local + -I$(builddir)/local \ + @WITH_PCRE_CPPFLAGS@ if USE_LUA_CHKCONFIG AM_CPPFLAGS += \ -I$(srcdir)/chkconfig \ @@ -36,8 +37,7 @@ bin2c_LDADD = liblua_la_SOURCES = -liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ -DLUA_USE_POSIX -liblua_la_LDFLAGS = $(top_builddir)/misc/librpmmisc.la +liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ if USE_LUA_CRYPTO liblua_la_CFLAGS += \ @@ . patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2922 -r1.2923 CHANGES --- rpm/CHANGES 13 Apr 2009 18:07:30 - 1.2922 +++ rpm/CHANGES 13 Apr 2009 18:31:52 - 1.2923 @@ -1,5 +1,6 @@ 5.2a3 -> 5.2a4: +- rse: forward port all build infrastructure fixes from RPM 5.1 - rse: eliminate compile-time warnings introduced with recent embedded language support - afb: rename --with-ruby to --with-rubyembed, to match Perl/Python. - jbj: perl: attach stdout to macro expansion buffer with IO::String. @@ . patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.229 -r2.230 Makefile.am --- rpm/Makefile.am 1 Apr 2009 00:07:36 - 2.229 +++ rpm/Makefile.am 13 Apr 2009 18:31:52 - 2.230 @@ -53,13 +53,13 @@ SUBDIRS += \ @WITH_DB_SUBDIR@ \ @WITH_ZLIB_SUBDIR@ \ - @WITH_FILE_SUBDIR@ \ @WITH_PCRE_SUBDIR@ \ + @WITH_LUA_SUBDIR@ \ + @WITH_FILE_SUBDIR@ \ @WITH_SYCK_SUBDIR@ \ @WITH_XAR_SUBDIR@ \ @WITH_XZ_SUBDIR@ \ misc \ - @WITH_LUA_SUBDIR@ \ rpmio \ rpmdb \ lib \ @@ -86,6 +86,7 @@ @WITH_ZLIB_CPPFLAGS@ \ @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ \ + @WITH_PCRE_CPPFLAGS@ \ @WITH_XAR_CPPFLAGS@ \ @WITH_XZ_CPPFLAGS@ @@ . patch -p0 <<'@@ .' Index: rpm/build/Makefile.am $ cvs diff -u -r2.74 -r2.75 Makefile.am --- rpm/build/Makefile.am 11 Oct 2008 23:58:00 - 2.74 +++ rpm/build/Makefile.am 13 Apr 2009 18:31:54 - 2.75 @@ -21,6 +21,7 @@ @WITH_ZLIB_CPPFLAGS@ \ @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ \ + @WITH_PCRE_CPPFLAGS@ \ @WITH_XAR_CPPFLAGS@ pkgincdir = $(pkgincludedir)$(WITH_PATH_VERSIONED_SUFFIX) @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.359 -r2.360 configure.ac --- rpm/configure.ac 13 Apr 2009 16:32:42 - 2.359 +++ rpm/configure.ac 13 Apr 2009 18:31:52 - 2.360 @@ -1307,16 +1307,25 @@ AM_CONDITIONAL(USE_LUA_SOCKET, [ test ".$USE_LUA_SOCKET" = .yes ]) dnl # PCRE +dnl # use cases: +dnl # - RPM under WITH_PCRE uses +libpcre in addition to +dnl # - RPM under WITH_PCRE+WITH_PCRE_POSIX uses +libpcreposix instead of +dnl # - RPM/Lua under LUA_USE_PCRE uses +libpcre in addition to +
[CVS] RPM: rpm/ CHANGES rpm/lib/ poptALL.c rpm/rpmio/ rpmperl.c rpmpyt...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 13-Apr-2009 20:07:31
Branch: HEAD Handle: 2009041318073001
Modified files:
rpm CHANGES
rpm/lib poptALL.c
rpm/rpmio rpmperl.c rpmpython.c rpmruby.c
Log:
eliminate compile-time warnings introduced with recent embedded
language support
Summary:
RevisionChanges Path
1.2922 +1 -0 rpm/CHANGES
2.125 +0 -1 rpm/lib/poptALL.c
2.5 +5 -1 rpm/rpmio/rpmperl.c
2.7 +2 -0 rpm/rpmio/rpmpython.c
2.6 +2 -0 rpm/rpmio/rpmruby.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2921 -r1.2922 CHANGES
--- rpm/CHANGES 13 Apr 2009 17:47:14 - 1.2921
+++ rpm/CHANGES 13 Apr 2009 18:07:30 - 1.2922
@@ -1,5 +1,6 @@
5.2a3 -> 5.2a4:
+- rse: eliminate compile-time warnings introduced with recent embedded
language support
- afb: rename --with-ruby to --with-rubyembed, to match Perl/Python.
- jbj: perl: attach stdout to macro expansion buffer with IO::String.
- rse: use new POPT 1.15 from devtool environment
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
$ cvs diff -u -r2.124 -r2.125 poptALL.c
--- rpm/lib/poptALL.c 11 Apr 2009 19:33:35 - 2.124
+++ rpm/lib/poptALL.c 13 Apr 2009 18:07:31 - 2.125
@@ -222,7 +222,6 @@
iob = rpmiobAppend(rpmiobNew(strlen(arg)+1), arg, 0);
}
-exit:
val = rpmExpand(pre, iob->b, post, NULL);
iob = rpmiobFree(iob);
return val;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmperl.c
$ cvs diff -u -r2.4 -r2.5 rpmperl.c
--- rpm/rpmio/rpmperl.c 12 Apr 2009 22:28:49 - 2.4
+++ rpm/rpmio/rpmperl.c 13 Apr 2009 18:07:31 - 2.5
@@ -77,6 +77,7 @@
";
#else
#define xs_init NULL
+#if defined(WITH_PERLEMBED)
/*...@unchecked@*/
static const char * rpmperlInitStringIO = "\
use IO::String;\n\
@@ -85,12 +86,15 @@
";
#endif
+#endif
rpmperl rpmperlNew(const char * fn, int flags)
{
+#if defined(WITH_PERLEMBED)
static char *embedding[] = { "", "-e", "0" };
-rpmperl perl = rpmperlGetPool(_rpmperlPool);
int xx;
+#endif
+rpmperl perl = rpmperlGetPool(_rpmperlPool);
if (fn)
perl->fn = xstrdup(fn);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmpython.c
$ cvs diff -u -r2.6 -r2.7 rpmpython.c
--- rpm/rpmio/rpmpython.c 13 Apr 2009 16:36:37 - 2.6
+++ rpm/rpmio/rpmpython.c 13 Apr 2009 18:07:31 - 2.7
@@ -44,6 +44,7 @@
}
/*...@unchecked@*/
+#if defined(WITH_PYTHONEMBED)
static const char * rpmpythonInitStringIO = "\
import rpm\n\
import sys\n\
@@ -51,6 +52,7 @@
stdout = sys.stdout\n\
sys.stdout = StringIO()\n\
";
+#endif
rpmpython rpmpythonNew(const char * fn, int flags)
{
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmruby.c
$ cvs diff -u -r2.5 -r2.6 rpmruby.c
--- rpm/rpmio/rpmruby.c 13 Apr 2009 16:32:43 - 2.5
+++ rpm/rpmio/rpmruby.c 13 Apr 2009 18:07:31 - 2.6
@@ -55,10 +55,12 @@
}
/*...@unchecked@*/
+#if defined(WITH_RUBYEMBED)
static const char * rpmrubyInitStringIO = "\
require 'stringio'\n\
$stdout = StringIO.new($result, \"w+\")\n\
";
+#endif
rpmruby rpmrubyNew(const char * fn, int flags)
{
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: pcre/ config.h.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: pcre Date: 13-Apr-2009 20:05:42 Branch: HEAD Handle: 2009041318054200 Modified files: pcreconfig.h.in Log: flush pcre/config.h.in as it always has a trivial change pending because of newer libtool usage Summary: RevisionChanges Path 1.2 +4 -0 pcre/config.h.in patch -p0 <<'@@ .' Index: pcre/config.h.in $ cvs diff -u -r1.1.1.1 -r1.2 config.h.in --- pcre/config.h.in 14 Jan 2009 20:19:43 - 1.1.1.1 +++ pcre/config.h.in 13 Apr 2009 18:05:42 - 1.2 @@ -123,6 +123,10 @@ "configure" can be used to override this default. */ #undef LINK_SIZE +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* The value of MATCH_LIMIT determines the default number of times the internal match() function can be called during a single execution of pcre_exec(). There is a runtime interface for setting a different limit. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 13-Apr-2009 19:47:14
Branch: HEAD Handle: 2009041317471400
Modified files:
rpm CHANGES
Log:
track complete list of changes in HEAD
Summary:
RevisionChanges Path
1.2921 +145 -0 rpm/CHANGES
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2920 -r1.2921 CHANGES
--- rpm/CHANGES 13 Apr 2009 16:32:42 - 1.2920
+++ rpm/CHANGES 13 Apr 2009 17:47:14 - 1.2921
@@ -824,6 +824,151 @@
=
+5.1.7 -> 5.1.8:
+- jbj: adjust loader maps for lua.
+- rse: fix building under all combinations (none/internal/external) of
Lua and PCRE
+- rse: upgrade devtool.conf and INSTALL to the latest tools from HEAD
+- jbj: EVRtuple: eliminate the old EVR parser.
+- jbj: yarn: convert rpmluav to usage mutex with refcounts
+- jbj: yarn: convert rpmlua to usage mutex with refcounts
+- jbj: popt: remove retrofits for popt < 1.14. use popt internal if
needed.
+- jbj: mire: teardown for platpat on exit needs to be done in order.
+- jbj: rpmwget: move to tools.
+- jbj: rpmio: more random line noise reduction, diff'ing against HEAD.
+- jbj: rpmio: backport HTTP transport from HEAD.
+- jbj: rpmio: add additional data elements for HTTP transport.
+- jbj: rpmiob: yet another place to use rpmiobSlurp instead.
+- jbj: backport rpmspecdump from HEAD.
+- jbj: lib: more random line noise reduction, diff'ing against HEAD.
+- jbj: delete ancient header+payload RSA signatures too using GPG
(#488953).
+- jbj: rpmrepo: compile in queryformat strings.
+- jbj: install/use deb:{md5sums,preinst,postinst,prerm,postrm}
queryformats.
+- jbj: install/use yum:{primary,filelists,other}.sqlite queryformats.
+- jbj: install/use yum:{primary,filelists,other}.xml queryformats.
+- jbj: install/use wnh:{primary,filelists,other}.yaml queryformats.
+- jbj: use poptReadFile with retrofit for popt < 1.15.
+- devzero2000: fix --orphandirs port alias ; add --danglinglink popt
alias
+- jbj: fix: eliminate a argvSplit() memory leak.
+- jbj: stub-in /usr/lib/rpm/helpers/makeshlibs proof-of-concept.
+- jbj: rude & crude backing store for --queryformat templates.
+- jbj: PLD: rpm-popt-aliases: Add --downgrade/--norepackage aliases.
+- jbj: PLD: rpm-notsc: Don't use rdtsc timing.
+- jbj: enable the PLD dependency filtering.
+- jbj: PLD: rpm-pld-autodep: add run-time disablers, attempt miRE's
instead.
+- jbj: PLD: rpm-pld-autodep: merge and simplify. entirely dysfunctional
...
+- jbj: lib: start reducing random line noise, diff'ing against HEAD.
+- jbj: add prototypes to remove compiler warnings.
+- jbj: bury file actions into iosm, replace XFA_SKIPPING with a
+iosmFileActionSkipped() call.
+- jbj: rpmdb: random line noise reduction, diff'ing against HEAD.
+- jbj: wire-up RPMTAG_FILEDIGESTALGO. wotta waste to pretend
"compatible" ...
+- jbj: yaml: add build scriptlet tags for --yaml/--xml display.
+- jbj: eliminate rpmal debugging code.
+- jbj: PLD: rpm-epoch0: Always add Epoch: 0 to packages.
+- jbj: handle "config(N) = E:V-R" within rpmns.c (but treat as a string).
+- jbj: yaml: backport the YAML analogue tag extensions to repo-md XML.
+- jbj: yaml: permit --without-syck, add some mac os x AutoFu/gcc
fiddle-ups.
+- jbj: yaml: add lsyck lua module to parse YAML.
+- jbj: finish backport and enable SUPPORT_DEBUGINFO_UPGRADE_MODEL.
+- jbj: misc: get rid of splitFoo prototypes, bury the last use in
rpmfi.c.
+- jbj: PCRE in -lrpmmisc, LUA in -lrpmio linking -lrpmmisc, instead.
+- jbj: update file manifests with backported files.
+- jbj: perl: fix: no need to include stringbuf.h any more.
+- jbj: fix: --noscripts/--nofdigests/--nocontexts need to use popt
callback.
+- jbj: rpmiob: fix: return iob to _rpmiobPool instead.
+- rse: add RPM Lua function rpm.hostname()
+- jbj: yarn: convert mire to usage mutex with refcounts
+ (unifying array <-> element mutexes by copying use/pool
+ pointers throughout the array).
+- jbj: rpmku: rework rpmiob handling to avoid extra
[CVS] RPM: rpm-5_1: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 19:46:09 Branch: rpm-5_1 Handle: 2009041317460800 Modified files: (Branch: rpm-5_1) rpm CHANGES Log: RPM 5.1.8 released Summary: RevisionChanges Path 1.2288.2.297+2 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.296 -r1.2288.2.297 CHANGES --- rpm/CHANGES 13 Apr 2009 16:39:45 - 1.2288.2.296 +++ rpm/CHANGES 13 Apr 2009 17:46:08 - 1.2288.2.297 @@ -1,3 +1,5 @@ +5.1.8 -> 5.1.9: + 5.1.7 -> 5.1.8: - jbj: adjust loader maps for lua. - rse: fix building under all combinations (none/internal/external) of Lua and PCRE @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 18:06:26 Branch: rpm-5_1 Handle: 2009041316062500 Modified files: (Branch: rpm-5_1) rpm devtool.conf Log: SQLite no longer knows about --disable-utf8, but instead a --disable-tcl is reasonable to get rid of the TCL warnings under configure-time Summary: RevisionChanges Path 2.205.2.39 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.205.2.38 -r2.205.2.39 devtool.conf --- rpm/devtool.conf 13 Apr 2009 15:53:46 - 2.205.2.38 +++ rpm/devtool.conf 13 Apr 2009 16:06:25 - 2.205.2.39 @@ -848,11 +848,11 @@ CC="$cc" \ LIBS="-lm" \ ./configure \ ---disable-utf8 \ --disable-readline \ --disable-threadsafe \ --disable-debug \ --disable-amalgamation \ +--disable-tcl \ --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: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 18:05:55 Branch: HEAD Handle: 2009041316055500 Modified files: rpm devtool.conf Log: SQLite no longer knows about --disable-utf8, but instead a --disable-tcl is reasonable to get rid of the TCL warnings under configure-time Summary: RevisionChanges Path 2.284 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.283 -r2.284 devtool.conf --- rpm/devtool.conf 13 Apr 2009 15:53:03 - 2.283 +++ rpm/devtool.conf 13 Apr 2009 16:05:55 - 2.284 @@ -1558,11 +1558,11 @@ CFLAGS="-O2 -g -fno-common $UNIVERSAL_CFLAGS" \ LDFLAGS="$UNIVERSAL_LDFLAGS" \ ./configure $UNIVERSAL_TARGET \ ---disable-utf8 \ --disable-readline \ --disable-threadsafe \ --disable-debug \ --disable-amalgamation \ +--disable-tcl \ --disable-shared make ) || exit $? @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ INSTALL devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 17:53:46 Branch: rpm-5_1 Handle: 2009041315534600 Modified files: (Branch: rpm-5_1) rpm INSTALL devtool.conf Log: use latest SQLite 3.6.13 Summary: RevisionChanges Path 2.93.2.12 +1 -1 rpm/INSTALL 2.205.2.38 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.93.2.11 -r2.93.2.12 INSTALL --- rpm/INSTALL 12 Apr 2009 19:41:19 - 2.93.2.11 +++ rpm/INSTALL 13 Apr 2009 15:53:46 - 2.93.2.12 @@ -34,7 +34,7 @@ OpenSSL optional 0.9.8 0.9.8k http://www.openssl.org/ Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/ Berkeley-DB [1] optional 4.5 4.7.25 http://www.oracle.com/database/berkeley-db.html -SQLite [1] optional 3.3 3.6.12 http://www.sqlite.org/ +SQLite [1] optional 3.3 3.6.13 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/ Bzip2 optional 1.0 1.0.5 http://www.bzip.org/ @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.205.2.37 -r2.205.2.38 devtool.conf --- rpm/devtool.conf 13 Apr 2009 14:52:40 - 2.205.2.37 +++ rpm/devtool.conf 13 Apr 2009 15:53:46 - 2.205.2.38 @@ -334,7 +334,7 @@ v_neon="0.28.4" v_beecrypt="4.1.2" v_db="4.7.25" -v_sqlite="3.6.12" +v_sqlite="3.6.13" v_lua="5.1.4" v_file="5.00" v_popt="1.15" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ INSTALL devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 17:53:03 Branch: HEAD Handle: 2009041315530300 Modified files: rpm INSTALL devtool.conf Log: use latest SQLite 3.6.13 Summary: RevisionChanges Path 2.120 +1 -1 rpm/INSTALL 2.283 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.119 -r2.120 INSTALL --- rpm/INSTALL 12 Apr 2009 19:42:56 - 2.119 +++ rpm/INSTALL 13 Apr 2009 15:53:03 - 2.120 @@ -34,7 +34,7 @@ OpenSSL optional 0.9.8 0.9.8k http://www.openssl.org/ Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/ Berkeley-DB [1] optional 4.5 4.7.25 http://www.oracle.com/database/berkeley-db.html -SQLite [1] optional 3.3 3.6.12 http://www.sqlite.org/ +SQLite [1] optional 3.3 3.6.13 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/ Bzip2 optional 1.0 1.0.5 http://www.bzip.org/ @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.282 -r2.283 devtool.conf --- rpm/devtool.conf 13 Apr 2009 14:52:27 - 2.282 +++ rpm/devtool.conf 13 Apr 2009 15:53:03 - 2.283 @@ -368,7 +368,7 @@ v_neon="0.28.4" v_beecrypt="4.1.2" v_db="4.7.25" -v_sqlite="3.6.12" +v_sqlite="3.6.13" v_lua="5.1.4" v_file="5.00" v_popt="1.15" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/misc/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 17:33:59 Branch: rpm-5_1 Handle: 2009041315335900 Modified files: (Branch: rpm-5_1) rpm/miscMakefile.am Log: except in 5.1.7 we always built with this override definition, so resurrect it. I currently don't know why it was necessary, but I'm sure it was because of library cross-dependencies Summary: RevisionChanges Path 1.32.4.11 +2 -2 rpm/misc/Makefile.am patch -p0 <<'@@ .' Index: rpm/misc/Makefile.am $ cvs diff -u -r1.32.4.10 -r1.32.4.11 Makefile.am --- rpm/misc/Makefile.am 13 Apr 2009 10:22:32 - 1.32.4.10 +++ rpm/misc/Makefile.am 13 Apr 2009 15:33:59 - 1.32.4.11 @@ -55,8 +55,8 @@ endif librpmmisc_la_DEPENDENCIES = \ @ALLOCA@ -#librpmmisc.la: $(librpmmisc_la_OBJECTS) $(librpmmisc_la_DEPENDENCIES) -#$(librpmmisc_la_LINK) -rpath $(usrlibdir) $(librpmmisc_la_OBJECTS) $(librpmmisc_la_LIBADD) +librpmmisc.la: $(librpmmisc_la_OBJECTS) $(librpmmisc_la_DEPENDENCIES) + $(librpmmisc_la_LINK) -rpath $(usrlibdir) $(librpmmisc_la_OBJECTS) $(librpmmisc_la_LIBADD) install-data-hook: if !ENABLE_BUILD_LAFILES @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: lua/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: lua Date: 13-Apr-2009 17:32:38 Branch: rpm-5_1 Handle: 2009041315323800 Modified files: (Branch: rpm-5_1) lua Makefile.am Log: for local copies of _THIRD PARTY_ libraries (which are built statically) we should not explicitly _link_ against 'noinst' dependency libraries as it causes 'multiple symbol definition' errors. Instead let the parent (RPM or any tool) link against those via rpmmisc (and this way just once). This restores to the status quo we had in the past and which was tested successfully on all major platforms Summary: RevisionChanges Path 1.17.2.10 +3 -3 lua/Makefile.am patch -p0 <<'@@ .' Index: lua/Makefile.am $ cvs diff -u -r1.17.2.9 -r1.17.2.10 Makefile.am --- lua/Makefile.am 13 Apr 2009 10:22:32 - 1.17.2.9 +++ lua/Makefile.am 13 Apr 2009 15:32:38 - 1.17.2.10 @@ -10,7 +10,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(srcdir)/local \ - -I$(builddir)/local + -I$(builddir)/local \ + @WITH_PCRE_CPPFLAGS@ if USE_LUA_CHKCONFIG AM_CPPFLAGS += \ -I$(srcdir)/chkconfig \ @@ -34,8 +35,7 @@ bin2c_CFLAGS = bin2c_LDADD = -liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ @WITH_PCRE_CPPFLAGS@ -liblua_la_LDFLAGS = @WITH_PCRE_LDFLAGS@ @WITH_PCRE_LIBS@ +liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ if USE_LUA_SHADOW liblua_la_CFLAGS += \ -DUSE_LUA_SHADOW @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 17:19:06 Branch: rpm-5_1 Handle: 2009041315190500 Modified files: (Branch: rpm-5_1) rpm configure.ac Log: Try to fix and better document PCRE Autoconf stuff. First, we should not check for pcreposix first, because for the internal case we know that it is available and for the external case the check is done manually afterwards anyway. That we replace -lpcre with _just_ -lpcreposix for the internal case is now better documented. Summary: RevisionChanges Path 2.289.2.22 +10 -3 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.289.2.21 -r2.289.2.22 configure.ac --- rpm/configure.ac 2 Apr 2009 14:21:19 - 2.289.2.21 +++ rpm/configure.ac 13 Apr 2009 15:19:05 - 2.289.2.22 @@ -1135,18 +1135,25 @@ AM_CONDITIONAL(USE_LUA_CHKCONFIG, [ test ".$USE_LUA_CHKCONFIG" = .yes ]) dnl # PCRE +dnl # use cases: +dnl # - RPM under WITH_PCRE uses +libpcre in addition to +dnl # - RPM under WITH_PCRE+WITH_PCRE_POSIX uses +libpcreposix instead of +dnl # - RPM/Lua under LUA_USE_PCRE uses +libpcre in addition to +dnl # attention: +dnl # - In the locally bundled PCRE all libpcre objects are embedded into libpcreposix +dnl # because of s/lib/noinst/ changes in pcre/Makefile.am. Here we have to link +dnl # against libpcreposix only! WITH_PCRE_INTERNAL=false RPM_CHECK_LIB( [PCRE], [pcre], -[pcreposix pcre], [pcre_compile], [pcre.h], +[pcre], [pcre_compile], [pcre.h], [yes,internal:external:none], [pcre], [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then WITH_PCRE_INTERNAL=true AC_DEFINE(HAVE_PCRE_H, 1, [Define to 1 if you have ]) - dnl XXX why isn't this set by RPM_CHECK_LIB?!? AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if you have the 'pcre' library (-lpcre).]) AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is available]) - WITH_PCRE_LIBS="-lpcreposix" + WITH_PCRE_LIBS="-lpcreposix" # override, not prepend! (see attention above) AC_SUBST(WITH_PCRE_LIBS) else dnl # make sure PCRE POSIX API can be really _USED_ by RPM @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 13-Apr-2009 16:52:40
Branch: rpm-5_1 Handle: 2009041314524000
Modified files: (Branch: rpm-5_1)
rpm devtool.conf
Log:
sync with HEAD
Summary:
RevisionChanges Path
2.205.2.37 +0 -3 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.205.2.36 -r2.205.2.37 devtool.conf
--- rpm/devtool.conf 13 Apr 2009 14:51:43 - 2.205.2.36
+++ rpm/devtool.conf 13 Apr 2009 14:52:40 - 2.205.2.37
@@ -1557,9 +1557,6 @@
gzip -d -c ../src/pcre-${v_pcre}.tar.gz | gnutar xf -
( cd pcre-${v_pcre}
patch -p0 <../../src/pcre-${v_pcre}.patch
-$SHTOOL subst \
--e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
-configure
CC="$UNIVERSAL_CC" \
CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
@@ .
__
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: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 13-Apr-2009 16:52:28
Branch: HEAD Handle: 2009041314522700
Modified files:
rpm devtool.conf
Log:
fix now included in pcre patch
Summary:
RevisionChanges Path
2.282 +0 -3 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.281 -r2.282 devtool.conf
--- rpm/devtool.conf 12 Apr 2009 19:42:56 - 2.281
+++ rpm/devtool.conf 13 Apr 2009 14:52:27 - 2.282
@@ -1601,9 +1601,6 @@
gzip -d -c ../../src/pcre-${v_pcre}.tar.gz | gnutar xf -
( cd pcre-${v_pcre}
patch -p0 <../../../src/pcre-${v_pcre}.patch
-$SHTOOL subst \
--e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
-configure
CC="$UNIVERSAL_CC" \
CPPFLAGS="$UNIVERSAL_CPPFLAGS" \
CFLAGS="-O2 -g $UNIVERSAL_CFLAGS" \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 13-Apr-2009 16:51:43
Branch: rpm-5_1 Handle: 2009041314514300
Modified files: (Branch: rpm-5_1)
rpm devtool.conf
Log:
sync with HEAD
Summary:
RevisionChanges Path
2.205.2.36 +0 -3 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.205.2.35 -r2.205.2.36 devtool.conf
--- rpm/devtool.conf 13 Apr 2009 10:22:58 - 2.205.2.35
+++ rpm/devtool.conf 13 Apr 2009 14:51:43 - 2.205.2.36
@@ -972,9 +972,6 @@
$gzip -d -c ../../src/pcre-${v_pcre}.tar.gz | $tar xf -
( cd pcre-${v_pcre}
$patch -p0 <../../../src/pcre-${v_pcre}.patch
-$SHTOOL subst \
--e '/LINENO: error: C[+]*
preprocessor/{N;N;N;N;s/.*/:/;}' \
-configure
CC="$cc" \
GREP="grep" \
./configure \
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmmalloc.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 13-Apr-2009 16:25:13
Branch: HEAD Handle: 2009041314251300
Modified files:
rpm/rpmio rpmmalloc.c
Log:
make pool memory leak message a debug message for now
Summary:
RevisionChanges Path
1.22+1 -1 rpm/rpmio/rpmmalloc.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmalloc.c
$ cvs diff -u -r1.21 -r1.22 rpmmalloc.c
--- rpm/rpmio/rpmmalloc.c 25 Mar 2009 20:26:47 - 1.21
+++ rpm/rpmio/rpmmalloc.c 13 Apr 2009 14:25:13 - 1.22
@@ -91,7 +91,7 @@
assert(pool->made == count);
#else
if (pool->made != count)
-fprintf(stderr, "==> FIXME: pool %s: made %d count %d\n", pool->name,
pool->made, count);
+rpmlog(RPMLOG_DEBUG, D_("pool %s: FIXME: made %d, count %d\n"), pool->name,
pool->made, count);
#endif
pool = _free(pool);
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/rpmio/ rpmmalloc.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 13-Apr-2009 16:24:42
Branch: rpm-5_1 Handle: 2009041314244200
Modified files: (Branch: rpm-5_1)
rpm/rpmio rpmmalloc.c
Log:
make pool memory leak message a debug message for now
Summary:
RevisionChanges Path
1.13.4.9+1 -1 rpm/rpmio/rpmmalloc.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmmalloc.c
$ cvs diff -u -r1.13.4.8 -r1.13.4.9 rpmmalloc.c
--- rpm/rpmio/rpmmalloc.c 25 Mar 2009 20:27:16 - 1.13.4.8
+++ rpm/rpmio/rpmmalloc.c 13 Apr 2009 14:24:42 - 1.13.4.9
@@ -90,7 +90,7 @@
assert(pool->made == count);
#else
if (pool->made != count)
-fprintf(stderr, "==> FIXME: pool %s: made %d count %d\n", pool->name,
pool->made, count);
+rpmlog(RPMLOG_DEBUG, D_("pool %s: FIXME: made %d, count %d\n"), pool->name,
pool->made, count);
#endif
pool = _free(pool);
}
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: lua/ Makefile.am rpm/ CHANGES Makefile.am rpm/buil...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm lua Date: 13-Apr-2009 12:22:33 Branch: rpm-5_1 Handle: 2009041310223102 Modified files: (Branch: rpm-5_1) lua Makefile.am rpm CHANGES Makefile.am rpm/build Makefile.am rpm/miscMakefile.am librpmmisc.vers rpm/rpmconstant Makefile.am rpm/rpmio Makefile.am Log: Fix building RPM 5.1 under all combinations (none/internal/external) of Lua and PCRE by... 1. partly reversing the recently introduced library dependency complexity related to Lua/PCRE and rpmio/rpmmisc. This was both too twisted and should be not really necessary once (see point 2) RPM is correctly built against PCRE again, 2. fixing the building of RPM against PCRE. Here (a) the order of PCRE before Lua had to be fixed (at least for the "internal" build case) and (b) the PCRE CPPFLAGS are now available everywhere. With those changes applied, the current RPM 5.1 was once again successfully built under all the following combinations (more do not exist AFAIK): Lua: PCRE: none none none internal none external internal none internal internal internal external external none external internal external external A similar change should be applied to HEAD soon, too. Summary: RevisionChanges Path 1.17.2.9+2 -2 lua/Makefile.am 1.2288.2.295+1 -0 rpm/CHANGES 2.215.2.11 +3 -2 rpm/Makefile.am 2.70.4.2+1 -0 rpm/build/Makefile.am 1.32.4.10 +2 -0 rpm/misc/Makefile.am 1.7.4.7 +58 -0 rpm/misc/librpmmisc.vers 1.9.4.2 +2 -1 rpm/rpmconstant/Makefile.am 1.162.2.26 +1 -2 rpm/rpmio/Makefile.am patch -p0 <<'@@ .' Index: lua/Makefile.am $ cvs diff -u -r1.17.2.8 -r1.17.2.9 Makefile.am --- lua/Makefile.am 31 Mar 2009 17:38:19 - 1.17.2.8 +++ lua/Makefile.am 13 Apr 2009 10:22:32 - 1.17.2.9 @@ -34,8 +34,8 @@ bin2c_CFLAGS = bin2c_LDADD = -liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ -DLUA_USE_POSIX -liblua_la_LDFLAGS = $(top_builddir)/misc/librpmmisc.la +liblua_la_CFLAGS = @WITH_LUA_SUBDIR_DEF@ @WITH_PCRE_CPPFLAGS@ +liblua_la_LDFLAGS = @WITH_PCRE_LDFLAGS@ @WITH_PCRE_LIBS@ if USE_LUA_SHADOW liblua_la_CFLAGS += \ -DUSE_LUA_SHADOW @@ . patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.294 -r1.2288.2.295 CHANGES --- rpm/CHANGES 13 Apr 2009 10:17:37 - 1.2288.2.294 +++ rpm/CHANGES 13 Apr 2009 10:22:31 - 1.2288.2.295 @@ -1,4 +1,5 @@ 5.1.7 -> 5.1.8: +- rse: fix building under all combinations (none/internal/external) of Lua and PCRE - rse: upgrade devtool.conf and INSTALL to the latest tools from HEAD - jbj: EVRtuple: eliminate the old EVR parser. - jbj: yarn: convert rpmluav to usage mutex with refcounts @@ . patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.215.2.10 -r2.215.2.11 Makefile.am --- rpm/Makefile.am 2 Apr 2009 14:21:19 - 2.215.2.10 +++ rpm/Makefile.am 13 Apr 2009 10:22:31 - 2.215.2.11 @@ -52,13 +52,13 @@ SUBDIRS += \ @WITH_DB_SUBDIR@ \ @WITH_ZLIB_SUBDIR@ \ - @WITH_FILE_SUBDIR@ \ @WITH_PCRE_SUBDIR@ \ + @WITH_LUA_SUBDIR@ \ + @WITH_FILE_SUBDIR@ \ @WITH_SYCK_SUBDIR@ \ @WITH_XAR_SUBDIR@ \ @WITH_XZ_SUBDIR@ \ misc \ - @WITH_LUA_SUBDIR@ \ rpmio \ rpmdb \ lib \ @@ -85,6 +85,7 @@ @WITH_ZLIB_CPPFLAGS@ \ @WITH_LUA_CPPFLAGS@ \ @WITH_FILE_CPPFLAGS@ \ + @WITH_PCRE_CPPFLAGS@ \ @WITH_XAR_CPPFLAGS@ \ @WITH_XZ_CPPFLAGS@ @@ . patch -p0 <<'@@ .' Index: rpm/build/Makefile.am $ cvs diff -u -r2.70.4.1 -r2.70.4.2 Makefile.am --- rpm/build/Makefile.am 16 Apr 2008 17:58:25 - 2.70.4.1 +++ rpm/build/Makefile.am 13 Apr 2009 10:22:32 - 2.70.4.2 @@ -19,6 +19,7 @@ @WI
[CVS] RPM: rpm-5_1: rpm/rpmdb/ rpmevr.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 12:19:47 Branch: rpm-5_1 Handle: 2009041310194700 Modified files: (Branch: rpm-5_1) rpm/rpmdb rpmevr.c Log: remove a static variable which is unused in RPM 5.1 at all Summary: RevisionChanges Path 1.29.2.8+0 -2 rpm/rpmdb/rpmevr.c patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.29.2.7 -r1.29.2.8 rpmevr.c --- rpm/rpmdb/rpmevr.c11 Apr 2009 16:48:51 - 1.29.2.7 +++ rpm/rpmdb/rpmevr.c13 Apr 2009 10:19:47 - 1.29.2.8 @@ -145,8 +145,6 @@ const char * evr_tuple_match = NULL; /*...@unchecked@*/ /*...@refcounted@*/ /*...@null@*/ miRE evr_tuple_mire = NULL; -/*...@unchecked@*/ -static int evr_tuple_nmire; static miRE rpmEVRmire(void) /*...@*/ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 13-Apr-2009 12:17:37 Branch: rpm-5_1 Handle: 2009041310173700 Modified files: (Branch: rpm-5_1) rpm CHANGES Log: Ops, forget to commit this file yesterday when I upgraded the devtool environment Summary: RevisionChanges Path 1.2288.2.294+1 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.293 -r1.2288.2.294 CHANGES --- rpm/CHANGES 11 Apr 2009 16:48:50 - 1.2288.2.293 +++ rpm/CHANGES 13 Apr 2009 10:17:37 - 1.2288.2.294 @@ -1,4 +1,5 @@ 5.1.7 -> 5.1.8: +- rse: upgrade devtool.conf and INSTALL to the latest tools from HEAD - jbj: EVRtuple: eliminate the old EVR parser. - jbj: yarn: convert rpmluav to usage mutex with refcounts - jbj: yarn: convert rpmlua to usage mutex with refcounts @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/rpmio/ macro.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 12-Apr-2009 22:15:25
Branch: rpm-5_1 Handle: 2009041220152500
Modified files: (Branch: rpm-5_1)
rpm/rpmio macro.c
Log:
fix building under RPM_VENDOR_OPENPKG after the XZ stuff was merged
into RPM 5.1
Summary:
RevisionChanges Path
2.193.2.12 +1 -0 rpm/rpmio/macro.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/macro.c
$ cvs diff -u -r2.193.2.11 -r2.193.2.12 macro.c
--- rpm/rpmio/macro.c 30 Mar 2009 14:27:37 - 2.193.2.11
+++ rpm/rpmio/macro.c 12 Apr 2009 20:15:25 - 2.193.2.12
@@ -2449,6 +2449,7 @@
|| (file_len > 5 && strcasecmp(file+file_len-5, ".lzma") == 0)) {
*compressed = COMPRESSED_LZMA;
return 0;
+} else
if (file_len > 4 && strcasecmp(file+file_len-3, ".xz") == 0) {
*compressed = COMPRESSED_XZ;
return 0;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES INSTALL devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 12-Apr-2009 21:42:57 Branch: HEAD Handle: 2009041219425600 Modified files: rpm CHANGES INSTALL devtool.conf Log: use new POPT 1.15 from devtool environment Summary: RevisionChanges Path 1.2918 +1 -0 rpm/CHANGES 2.119 +1 -1 rpm/INSTALL 2.281 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2917 -r1.2918 CHANGES --- rpm/CHANGES 12 Apr 2009 19:39:58 - 1.2917 +++ rpm/CHANGES 12 Apr 2009 19:42:56 - 1.2918 @@ -1,5 +1,6 @@ 5.2a3 -> 5.2a4: +- rse: use new POPT 1.15 from devtool environment - jbj: tcl: attach rpmtclIO to macro expansion buffer with Tcl_StackChannel. - jbj: ruby: attach $stdout to macro expansion buffer using StringIO. - jbj: python: attach sys.stdout to macro expansion buffer using cStringIO. @@ . patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.118 -r2.119 INSTALL --- rpm/INSTALL 12 Apr 2009 19:23:15 - 2.118 +++ rpm/INSTALL 12 Apr 2009 19:42:56 - 2.119 @@ -28,7 +28,7 @@ ISO C Compiler mandatory - - e.g. http://gcc.gnu.org/ POSIX make mandatory - - e.g. http://www.gnu.org/software/make/ Perlmandatory 5.8.0 5.10.0 http://www.perl.com/ -POPTmandatory 1.9 1.14http://rpm5.org/files/popt/ +POPTmandatory 1.9 1.15http://rpm5.org/files/popt/ BeeCryptmandatory 4.0 4.1.2 http://beecrypt.sourceforge.net/ 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/ @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.280 -r2.281 devtool.conf --- rpm/devtool.conf 12 Apr 2009 19:23:15 - 2.280 +++ rpm/devtool.conf 12 Apr 2009 19:42:56 - 2.281 @@ -371,7 +371,7 @@ v_sqlite="3.6.12" v_lua="5.1.4" v_file="5.00" -v_popt="1.14" +v_popt="1.15" v_libxml2="2.7.3" v_xar="1.5.2" v_pcre="7.9" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ INSTALL devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 12-Apr-2009 21:41:20 Branch: rpm-5_1 Handle: 2009041219411901 Modified files: (Branch: rpm-5_1) rpm INSTALL devtool.conf Log: upgrade to POPT 1.15 (technically still not mandatory for RPM 5.1) Summary: RevisionChanges Path 2.93.2.11 +1 -1 rpm/INSTALL 2.205.2.33 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.93.2.10 -r2.93.2.11 INSTALL --- rpm/INSTALL 12 Apr 2009 19:28:49 - 2.93.2.10 +++ rpm/INSTALL 12 Apr 2009 19:41:19 - 2.93.2.11 @@ -28,7 +28,7 @@ ISO C Compiler mandatory - - e.g. http://gcc.gnu.org/ POSIX make mandatory - - e.g. http://www.gnu.org/software/make/ Perlmandatory 5.8.0 5.10.0 http://www.perl.com/ -POPTmandatory 1.9 1.14http://rpm5.org/files/popt/ +POPTmandatory 1.9 1.15http://rpm5.org/files/popt/ BeeCryptmandatory 4.0 4.1.2 http://beecrypt.sourceforge.net/ 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/ @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.205.2.32 -r2.205.2.33 devtool.conf --- rpm/devtool.conf 12 Apr 2009 19:28:49 - 2.205.2.32 +++ rpm/devtool.conf 12 Apr 2009 19:41:20 - 2.205.2.33 @@ -337,7 +337,7 @@ v_sqlite="3.6.12" v_lua="5.1.4" v_file="5.00" -v_popt="1.14" +v_popt="1.15" v_libxml2="2.7.3" v_xar="1.5.2" v_pcre="7.9" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: popt Date: 12-Apr-2009 21:29:28 Branch: HEAD Handle: 2009041219292800 Modified files: poptCHANGES Log: Ok, we decided to still include those fixes into 1.15 Summary: RevisionChanges Path 1.109 +3 -3 popt/CHANGES patch -p0 <<'@@ .' Index: popt/CHANGES $ cvs diff -u -r1.108 -r1.109 CHANGES --- popt/CHANGES 12 Apr 2009 17:56:17 - 1.108 +++ popt/CHANGES 12 Apr 2009 19:29:28 - 1.109 @@ -1,9 +1,9 @@ -1.15 -> 1.16: + +1.14 -> 1.15: +- release popt-1.15. - rse: fix building under --disable-nls - rse: fix building under non GLIBC platforms where glob_pattern_p fallback has to be used - rse: fix building under platforms where FNM_EXTMATCH is not available - -1.14 -> 1.15: - jbj: poptReadFile: permit NULL if return values are not desired. - jbj: poptReadFile: add routine. - jbj: trim out escaped newline(s) from file content, other fixes. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ INSTALL devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 12-Apr-2009 21:28:49
Branch: rpm-5_1 Handle: 2009041219284900
Modified files: (Branch: rpm-5_1)
rpm INSTALL devtool.conf
Log:
upgrade to the latest third-party version
Summary:
RevisionChanges Path
2.93.2.10 +4 -4 rpm/INSTALL
2.205.2.32 +15 -14 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/INSTALL
$ cvs diff -u -r2.93.2.9 -r2.93.2.10 INSTALL
--- rpm/INSTALL 11 Apr 2009 09:52:24 - 2.93.2.9
+++ rpm/INSTALL 12 Apr 2009 19:28:49 - 2.93.2.10
@@ -10,7 +10,7 @@
NameType Minimum UsedURL
--- - --- ---
-
CVS mandatory 1.121.12.13 http://www.nongnu.org/cvs/
-Perlmandatory 5.8.0 5.8.8 http://www.perl.com/
+Perlmandatory 5.8.0 5.10.0 http://www.perl.com/
GNU m4 [0] mandatory 1.4.0 1.4.12 http://www.gnu.org/software/m4/
GNU autoconfmandatory 2.59b 2.63
http://www.gnu.org/software/autoconf/
GNU automakemandatory 1.8 1.10
http://www.gnu.org/software/automake/
@@ -31,10 +31,10 @@
POPTmandatory 1.9 1.14http://rpm5.org/files/popt/
BeeCryptmandatory 4.0 4.1.2 http://beecrypt.sourceforge.net/
Mozilla NSS optional 3.113.11.7
http://www.mozilla.org/projects/security/pki/nss/
-OpenSSL optional 0.9.8 0.9.8j http://www.openssl.org/
+OpenSSL optional 0.9.8 0.9.8k http://www.openssl.org/
Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/
Berkeley-DB [1] optional 4.5 4.7.25
http://www.oracle.com/database/berkeley-db.html
-SQLite [1] optional 3.3 3.6.11 http://www.sqlite.org/
+SQLite [1] optional 3.3 3.6.12 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/
Bzip2 optional 1.0 1.0.5 http://www.bzip.org/
@@ -42,7 +42,7 @@
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.8 http://www.pcre.org/
+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/
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.205.2.31 -r2.205.2.32 devtool.conf
--- rpm/devtool.conf 2 Apr 2009 14:21:19 - 2.205.2.31
+++ rpm/devtool.conf 12 Apr 2009 19:28:49 - 2.205.2.32
@@ -318,30 +318,31 @@
%standalone-modules
standalone_defines () {
# third-party development tools distribution versions
-v_m4="1.4.11"
-v_autoconf="2.62"
+v_m4="1.4.12"
+v_autoconf="2.63"
v_automake="1.10"
-v_libtool="2.2.6"
+v_libtool="2.2.6a"
+v_libtool_subdir="2.2.6"
v_gettext="0.17"
# third-party library distribution versions
v_zlib="1.2.3"
v_bzip2="1.0.5"
v_xz="4.999.8beta"
-v_openssl="0.9.8g"
+v_openssl="0.9.8k"
v_expat="2.0.1"
-v_neon="0.28.1"
+v_neon="0.28.4"
v_beecrypt="4.1.2"
v_db="4.7.25"
-v_sqlite="3.5.9"
+v_sqlite="3.6.12"
v_lua="5.1.4"
-v_file="4.24"
+v_file="5.00"
v_popt="1.14"
-v_libxml2="2.6.32"
+v_libxml2="2.7.3"
v_xar="1.5.2"
-v_pcre="7.7"
-v_uuid="1.6.1"
-v_config="20080417"
+v_pcre="7.9"
+v_uuid="1.6.2
[CVS] RPM: rpm/ INSTALL devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 12-Apr-2009 21:23:16
Branch: HEAD Handle: 2009041219231500
Modified files:
rpm INSTALL devtool.conf
Log:
upgrade to the latest third-party version
Summary:
RevisionChanges Path
2.118 +4 -4 rpm/INSTALL
2.280 +5 -7 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/INSTALL
$ cvs diff -u -r2.117 -r2.118 INSTALL
--- rpm/INSTALL 16 Mar 2009 13:15:20 - 2.117
+++ rpm/INSTALL 12 Apr 2009 19:23:15 - 2.118
@@ -10,7 +10,7 @@
NameType Minimum UsedURL
--- - --- ---
-
CVS mandatory 1.121.12.13 http://www.nongnu.org/cvs/
-Perlmandatory 5.8.0 5.8.8 http://www.perl.com/
+Perlmandatory 5.8.0 5.10.0 http://www.perl.com/
GNU m4 [0] mandatory 1.4.0 1.4.12 http://www.gnu.org/software/m4/
GNU autoconfmandatory 2.59b 2.63
http://www.gnu.org/software/autoconf/
GNU automakemandatory 1.8 1.10
http://www.gnu.org/software/automake/
@@ -31,10 +31,10 @@
POPTmandatory 1.9 1.14http://rpm5.org/files/popt/
BeeCryptmandatory 4.0 4.1.2 http://beecrypt.sourceforge.net/
Mozilla NSS optional 3.113.11.7
http://www.mozilla.org/projects/security/pki/nss/
-OpenSSL optional 0.9.8 0.9.8j http://www.openssl.org/
+OpenSSL optional 0.9.8 0.9.8k http://www.openssl.org/
Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/
Berkeley-DB [1] optional 4.5 4.7.25
http://www.oracle.com/database/berkeley-db.html
-SQLite [1] optional 3.3 3.6.11 http://www.sqlite.org/
+SQLite [1] optional 3.3 3.6.12 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/
Bzip2 optional 1.0 1.0.5 http://www.bzip.org/
@@ -42,7 +42,7 @@
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.8 http://www.pcre.org/
+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/
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.279 -r2.280 devtool.conf
--- rpm/devtool.conf 8 Apr 2009 19:56:55 - 2.279
+++ rpm/devtool.conf 12 Apr 2009 19:23:15 - 2.280
@@ -363,20 +363,20 @@
v_zlib="1.2.3"
v_bzip2="1.0.5"
v_xz="4.999.8beta"
-v_openssl="0.9.8j"
+v_openssl="0.9.8k"
v_expat="2.0.1"
v_neon="0.28.4"
v_beecrypt="4.1.2"
v_db="4.7.25"
-v_sqlite="3.6.11"
+v_sqlite="3.6.12"
v_lua="5.1.4"
v_file="5.00"
v_popt="1.14"
v_libxml2="2.7.3"
v_xar="1.5.2"
-v_pcre="7.8"
+v_pcre="7.9"
v_uuid="1.6.2"
-v_config="20090306"
+v_config="20090412"
# third-party distribution files
dist=""
@@ -687,6 +687,7 @@
rm -rf bzip2-${v_bzip2}
$gzip -d -c ../../src/bzip2-${v_bzip2}.tar.gz | $tar xf -
( cd bzip2-${v_bzip2}
+$patch -p0 <../../../src/bzip2-${v_bzip2}.patch
make CC="$cc" CFLAGS="-O" libbz2.a bzip2
) || exit $?
) || exit $?
@@ -1006,9 +1007,6 @@
$gzip -d -c ../../src/pcre-${v_pcre}.tar.gz | $tar xf -
( cd pcre-${v_pcre}
$patch -p0 <../../../src/pcre-${v_pcre
[CVS] RPM: popt/ CHANGES poptint.h
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: popt Date: 12-Apr-2009 19:56:17
Branch: HEAD Handle: 2009041217561700
Modified files:
poptCHANGES poptint.h
Log:
fix building under --disable-nls
Summary:
RevisionChanges Path
1.108 +1 -0 popt/CHANGES
1.41+3 -3 popt/poptint.h
patch -p0 <<'@@ .'
Index: popt/CHANGES
$ cvs diff -u -r1.107 -r1.108 CHANGES
--- popt/CHANGES 12 Apr 2009 17:55:20 - 1.107
+++ popt/CHANGES 12 Apr 2009 17:56:17 - 1.108
@@ -1,4 +1,5 @@
1.15 -> 1.16:
+- rse: fix building under --disable-nls
- rse: fix building under non GLIBC platforms where glob_pattern_p
fallback has to be used
- rse: fix building under platforms where FNM_EXTMATCH is not available
@@ .
patch -p0 <<'@@ .'
Index: popt/poptint.h
$ cvs diff -u -r1.40 -r1.41 poptint.h
--- popt/poptint.h18 Dec 2008 17:09:49 - 1.40
+++ popt/poptint.h12 Apr 2009 17:56:17 - 1.41
@@ -193,17 +193,17 @@
#endif
-#ifdef HAVE_LIBINTL_H
+#if defined(ENABLE_NLS) && defined(HAVE_LIBINTL_H)
#include
#endif
-#if defined(HAVE_GETTEXT) && !defined(__LCLINT__)
+#if defined(ENABLE_NLS) && defined(HAVE_GETTEXT) && !defined(__LCLINT__)
#define _(foo) gettext(foo)
#else
#define _(foo) foo
#endif
-#if defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
+#if defined(ENABLE_NLS) && defined(HAVE_DCGETTEXT) && !defined(__LCLINT__)
#define D_(dom, str) POPT_dgettext(dom, str)
#define POPT_(foo) D_("popt", foo)
#else
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: popt Date: 12-Apr-2009 19:55:21 Branch: HEAD Handle: 2009041217552000 Modified files: poptCHANGES Log: remember recent changes Summary: RevisionChanges Path 1.107 +4 -0 popt/CHANGES patch -p0 <<'@@ .' Index: popt/CHANGES $ cvs diff -u -r1.106 -r1.107 CHANGES --- popt/CHANGES 25 Jan 2009 17:38:53 - 1.106 +++ popt/CHANGES 12 Apr 2009 17:55:20 - 1.107 @@ -1,3 +1,7 @@ +1.15 -> 1.16: +- rse: fix building under non GLIBC platforms where glob_pattern_p fallback has to be used +- rse: fix building under platforms where FNM_EXTMATCH is not available + 1.14 -> 1.15: - jbj: poptReadFile: permit NULL if return values are not desired. - jbj: poptReadFile: add routine. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ poptconfig.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: popt Date: 12-Apr-2009 09:30:47
Branch: HEAD Handle: 2009041207304700
Modified files:
poptpoptconfig.c
Log:
Fix portability:
1. glob_pattern_p is a glibc thing. As we force -D_GNU_SOURCE in the
Autoconf stuff, we cannot use this as the check whether
glob_pattern_p() exists. Use __GLIBC__ instead.
2. FNM_EXTMATCH is available within RPM because of the local fnmatch()
implementation. But FNM_EXTMATCH is not portable enough, because many
systems (including BSD) lack it. So, use it conditionally only.
Summary:
RevisionChanges Path
1.50+6 -3 popt/poptconfig.c
patch -p0 <<'@@ .'
Index: popt/poptconfig.c
$ cvs diff -u -r1.49 -r1.50 poptconfig.c
--- popt/poptconfig.c 25 Jan 2009 17:38:53 - 1.49
+++ popt/poptconfig.c 12 Apr 2009 07:30:47 - 1.50
@@ -42,7 +42,7 @@
/*...@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/
#endif /* __LCLINT__ */
-#if !defined(_GNU_SOURCE)
+#if !defined(__GLIBC__)
/* Return nonzero if PATTERN contains any metacharacters.
Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
static int
@@ -72,7 +72,7 @@
}
return 0;
}
-#endif /* !defined(_GNU_SOURCE) */
+#endif /* !defined(__GLIBC__) */
/*...@unchecked@*/
static int poptGlobFlags = 0;
@@ -247,7 +247,10 @@
#if defined(HAVE_GLOB_H) && defined(HAVE_FNMATCH_H)
if (glob_pattern_p(s, 1)) {
/*...@-bitwisesigned@*/
- static int flags = FNM_EXTMATCH | FNM_PATHNAME | FNM_PERIOD;
+ static int flags = FNM_PATHNAME | FNM_PERIOD;
+#ifdef FNM_EXTMATCH
+ flags |= FNM_EXTMATCH;
+#endif
/*...@=bitwisesigned@*/
rc = fnmatch(s, con->appName, flags);
} else
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: popt/ configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: popt Date: 12-Apr-2009 09:24:40 Branch: HEAD Handle: 2009041207244000 Modified files: poptconfigure.ac Log: Errr.. no, "-D_GNU_SOURCE -D_REENTRANT" has nothing to do with GCC (it is a platform specific thing and not a compiler thing). So, first put it out of the condition (as it is in RPM, too). Summary: RevisionChanges Path 1.47+7 -9 popt/configure.ac patch -p0 <<'@@ .' Index: popt/configure.ac $ cvs diff -u -r1.46 -r1.47 configure.ac --- popt/configure.ac 23 Jan 2009 20:43:36 - 1.46 +++ popt/configure.ac 12 Apr 2009 07:24:40 - 1.47 @@ -20,24 +20,22 @@ AC_PROG_INSTALL AC_PROG_LIBTOOL -dnl dnl if CC is gcc, we can rebuild the dependencies (since the depend rule dnl requires gcc). If it's not, don't rebuild dependencies -- use what was dnl shipped with RPM. -dnl -if test X"$GCC" = "Xyes" ; then -CFLAGS="-Wall -W -D_GNU_SOURCE -D_REENTRANT $CFLAGS" +if test X"$GCC" = "Xyes"; then +CFLAGS="$CFLAGS -Wall -W" TARGET="depend allprogs" else TARGET="everything" -# -# let the Makefile know that we're done with `depend', since we don't -# have gcc we're not going to rebuild our dependencies at all. -# -echo > .depend-done +dnl let the Makefile know that we're done with `depend', since we don't +dnl have gcc we're not going to rebuild our dependencies at all. +echo >.depend-done fi AC_SUBST(TARGET) +CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT" + AC_GCC_TRADITIONAL AC_SYS_LARGEFILE @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ CHANGES INSTALL
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 11-Apr-2009 11:52:24 Branch: rpm-5_1 Handle: 2009041109522301 Modified files: (Branch: rpm-5_1) rpm CHANGES INSTALL Log: Upgrade devtool.conf and INSTALL to the latest tools from HEAD Summary: RevisionChanges Path 1.2288.2.290+1 -0 rpm/CHANGES 2.93.2.9+10 -10 rpm/INSTALL patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.289 -r1.2288.2.290 CHANGES --- rpm/CHANGES 6 Apr 2009 15:27:16 - 1.2288.2.289 +++ rpm/CHANGES 11 Apr 2009 09:52:23 - 1.2288.2.290 @@ -1,4 +1,5 @@ 5.1.7 -> 5.1.8: +- rse: upgrade devtool.conf and INSTALL to the latest tools from HEAD - jbj: mire: teardown for platpat on exit needs to be done in order. - jbj: rpmwget: move to tools. - jbj: rpmio: more random line noise reduction, diff'ing against HEAD. @@ . patch -p0 <<'@@ .' Index: rpm/INSTALL $ cvs diff -u -r2.93.2.8 -r2.93.2.9 INSTALL --- rpm/INSTALL 16 Mar 2009 13:16:41 - 2.93.2.8 +++ rpm/INSTALL 11 Apr 2009 09:52:24 - 2.93.2.9 @@ -11,10 +11,10 @@ --- - --- --- - CVS mandatory 1.121.12.13 http://www.nongnu.org/cvs/ Perlmandatory 5.8.0 5.8.8 http://www.perl.com/ -GNU m4 [0] mandatory 1.4.0 1.4.11 http://www.gnu.org/software/m4/ -GNU autoconfmandatory 2.59b 2.62 http://www.gnu.org/software/autoconf/ +GNU m4 [0] mandatory 1.4.0 1.4.12 http://www.gnu.org/software/m4/ +GNU autoconfmandatory 2.59b 2.63 http://www.gnu.org/software/autoconf/ GNU automakemandatory 1.8 1.10 http://www.gnu.org/software/automake/ -GNU libtool mandatory 1.5 2.2.6 http://www.gnu.org/software/libtool/ +GNU libtool mandatory 1.5 2.2.6a http://www.gnu.org/software/libtool/ GNU gettext mandatory 0.160.17 http://www.gnu.org/software/gettext/ --- - --- --- - @@ -27,23 +27,23 @@ --- - --- --- - ISO C Compiler mandatory - - e.g. http://gcc.gnu.org/ POSIX make mandatory - - e.g. http://www.gnu.org/software/make/ -Perlmandatory 5.8.0 5.8.8 http://www.perl.com/ +Perlmandatory 5.8.0 5.10.0 http://www.perl.com/ POPTmandatory 1.9 1.14http://rpm5.org/files/popt/ BeeCryptmandatory 4.0 4.1.2 http://beecrypt.sourceforge.net/ Mozilla NSS optional 3.113.11.7 http://www.mozilla.org/projects/security/pki/nss/ -OpenSSL optional 0.9.8 0.9.8g http://www.openssl.org/ -Neonoptional 0.26.0 0.28.1 http://www.webdav.org/neon/ +OpenSSL optional 0.9.8 0.9.8j http://www.openssl.org/ +Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/ Berkeley-DB [1] optional 4.5 4.7.25 http://www.oracle.com/database/berkeley-db.html -SQLite [1] optional 3.3 3.5.9 http://www.sqlite.org/ +SQLite [1] optional 3.3 3.6.11 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/ 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/ -File/magic [4] optional 4.0 4.24ftp://ftp.astron.com/pub/file/ +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.8 http://www.pcre.org/ -OSSP uuid optional 1.6.0 1.6.1 http://www.ossp.org/pkg/lib/uuid/ +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/ Electric Fence optional 2.1 2.1.13 http://perens.com/Free
[CVS] RPM: rpm/lib/ rpmchecksig.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 10-Apr-2009 20:01:03 Branch: HEAD Handle: 2009041018010300 Modified files: rpm/lib rpmchecksig.c Log: fix a few typos while I poke around here Summary: RevisionChanges Path 1.230 +3 -3 rpm/lib/rpmchecksig.c patch -p0 <<'@@ .' Index: rpm/lib/rpmchecksig.c $ cvs diff -u -r1.229 -r1.230 rpmchecksig.c --- rpm/lib/rpmchecksig.c 26 Mar 2009 18:07:31 - 1.229 +++ rpm/lib/rpmchecksig.c 10 Apr 2009 18:01:03 - 1.230 @@ -665,7 +665,7 @@ xx = headerPut(h, he, 0); he->p.ptr = _free(he->p.ptr); -/* XXX W2DO: tag value inheirited from parent? */ +/* XXX W2DO: tag value inherited from parent? */ he->tag = RPMTAG_BUILDHOST; he->t = RPM_STRING_TYPE; he->p.str = xstrdup(buildhost); @@ -679,7 +679,7 @@ he->p.ui32p = &tid; he->c = 1; xx = headerPut(h, he, 0); - /* XXX W2DO: tag value inheirited from parent? */ + /* XXX W2DO: tag value inherited from parent? */ he->tag = RPMTAG_BUILDTIME; he->t = RPM_UINT32_TYPE; he->p.ui32p = &tid; @@ -688,7 +688,7 @@ } #ifdef NOTYET -/* XXX W2DO: tag value inheirited from parent? */ +/* XXX W2DO: tag value inherited from parent? */ he->tag = RPMTAG_SOURCERPM; he->t = RPM_STRING_TYPE; he->p.str = fn; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmio.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 10-Apr-2009 15:17:02 Branch: HEAD Handle: 2009041013170100 Modified files: rpm/rpmio rpmio.c Log: get rid of even more compile-time warnings Summary: RevisionChanges Path 1.186 +10 -0 rpm/rpmio/rpmio.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmio.c $ cvs diff -u -r1.185 -r1.186 rpmio.c --- rpm/rpmio/rpmio.c 8 Apr 2009 17:31:56 - 1.185 +++ rpm/rpmio/rpmio.c 10 Apr 2009 13:17:01 - 1.186 @@ -3127,12 +3127,22 @@ extern rpmioPool _htPool; /*...@=shadow@*/ extern rpmioPool _rpmmgPool; +#if defined(WITH_LUA) extern rpmioPool _rpmluavPool; extern rpmioPool _rpmluaPool; +#endif +#if defined(WITH_TCL) extern rpmioPool _rpmtclPool; +#endif +#if defined(WITH_PERLEMBED) extern rpmioPool _rpmperlPool; +#endif +#if defined(WITH_PYTHONEMBED) extern rpmioPool _rpmpythonPool; +#endif +#if defined(WITH_RUBY) extern rpmioPool _rpmrubyPool; +#endif /*...@=nestedextern@*/ #if defined(WITH_LUA) @@ . __ 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: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 10-Apr-2009 15:14:24
Branch: HEAD Handle: 2009041013142400
Modified files:
rpm/rpmio rpmlua.c
Log:
rpmluaFini only used locally as a callback, so make it static to get
rid of compile-time warning
Summary:
RevisionChanges Path
2.70+1 -1 rpm/rpmio/rpmlua.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
$ cvs diff -u -r2.69 -r2.70 rpmlua.c
--- rpm/rpmio/rpmlua.c8 Apr 2009 06:09:59 - 2.69
+++ rpm/rpmio/rpmlua.c10 Apr 2009 13:14:24 - 2.70
@@ -86,7 +86,7 @@
/*...@=globstate@*/
}
-void rpmluaFini(void * _lua)
+static void rpmluaFini(void * _lua)
/*...@globals globalLuaState @*/
/*...@modifies globalLuaState @*/
{
@@ .
__
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: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 10-Apr-2009 15:12:31
Branch: HEAD Handle: 2009041013123100
Modified files:
rpm/rpmdb hdrfmt.c
Log:
get rid of compile-time warning
Summary:
RevisionChanges Path
1.135 +2 -0 rpm/rpmdb/hdrfmt.c
patch -p0 <<'@@ .'
Index: rpm/rpmdb/hdrfmt.c
$ cvs diff -u -r1.134 -r1.135 hdrfmt.c
--- rpm/rpmdb/hdrfmt.c4 Apr 2009 03:38:42 - 1.134
+++ rpm/rpmdb/hdrfmt.c10 Apr 2009 13:12:31 - 1.135
@@ -6013,7 +6013,9 @@
/*...@globals rpmGlobalMacroContext, h_errno, internalState @*/
/*...@modifies hsa, token, rpmGlobalMacroContext, internalState @*/
{
+#ifdef DYING /* XXX tagName() does this now */
char numbuf[64]; /* XXX big enuf for "Tag_0x01234567" */
+#endif
char * t, * te;
size_t i, j;
size_t numElements;
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES rpm/rpmio/ rpmlua.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 29-Mar-2009 00:13:47
Branch: HEAD Handle: 2009032823134700
Modified files:
rpm CHANGES
rpm/rpmio rpmlua.c
Log:
Add RPM Lua function rpm.hostname()
Summary:
RevisionChanges Path
1.2884 +1 -0 rpm/CHANGES
2.66+19 -0 rpm/rpmio/rpmlua.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2883 -r1.2884 CHANGES
--- rpm/CHANGES 28 Mar 2009 13:45:19 - 1.2883
+++ rpm/CHANGES 28 Mar 2009 23:13:47 - 1.2884
@@ -1,5 +1,6 @@
5.2a3 -> 5.2a4:
+- rse: add RPM Lua function rpm.hostname()
- jbj: fix: handle ./../foo paths correctly (#491388).
- jbj: rpmlib: rescusitate splint annotations.
- jbj: rpmdb: rescusitate splint annotations.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
$ cvs diff -u -r2.65 -r2.66 rpmlua.c
--- rpm/rpmio/rpmlua.c2 Mar 2009 00:45:55 - 2.65
+++ rpm/rpmio/rpmlua.c28 Mar 2009 23:13:47 - 2.66
@@ -1094,6 +1094,24 @@
return 1;
}
+static int rpm_hostname(lua_State *L)
+ /*...@globals internalState @*/
+ /*...@modifies L, internalState @*/
+{
+char hostname[1024];
+struct hostent *hbn;
+char *h;
+
+(void)gethostname(hostname, sizeof(hostname));
+if ((hbn = gethostbyname(hostname)) != NULL)
+h = hbn->h_name;
+else
+h = "localhost";
+lua_pushstring(L, (const char *)h);
+return 1;
+}
+
+
/*...@-readonlytrans -nullassign @*/
/*...@observer@*/ /*...@unchecked@*/
static const luaL_reg rpmlib[] = {
@@ -1112,6 +1130,7 @@
{"slurp", rpm_slurp},
{"sleep", rpm_sleep},
{"realpath", rpm_realpath},
+{"hostname", rpm_hostname},
{NULL, NULL}
};
/*...@=readonlytrans =nullassign @*/
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Mar-2009 15:00:46 Branch: HEAD Handle: 2009030714004600 Modified files: rpm CHANGES Log: I released a RPM 5.2a3 version for testing purposes by the community, hence we are now working towards 5.2a4 (or perhaps better 5.2b1 as RPM 5.2 should finally starting to stabilize and go towards 5.2.0) Summary: RevisionChanges Path 1.2809 +2 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2808 -r1.2809 CHANGES --- rpm/CHANGES 7 Mar 2009 13:53:12 - 1.2808 +++ rpm/CHANGES 7 Mar 2009 14:00:46 - 1.2809 @@ -1,4 +1,6 @@ +5.2a3 -> 5.2a4: + 5.2a2 -> 5.2a3: - rse: use Pthreads under --with-pthreads controlled WITH_PTHREADS and not existance-derived HAVE_PTHREADS_H - jbj: update po files (Translation Project). @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 07-Mar-2009 14:53:13
Branch: HEAD Handle: 2009030713531200
Modified files:
rpm CHANGES
Log:
remember 5.1.7 changes
Summary:
RevisionChanges Path
1.2808 +111 -0 rpm/CHANGES
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2807 -r1.2808 CHANGES
--- rpm/CHANGES 7 Mar 2009 13:38:09 - 1.2807
+++ rpm/CHANGES 7 Mar 2009 13:53:12 - 1.2808
@@ -687,6 +687,117 @@
=
+5.1.6 -> 5.1.7:
+- jbj: update po files (Translation Project).
+- jbj: eleminate duplicate rpmVersionCompare() routines.
+- afb: backport macosx ldflags fixes.
+- glen: markLinkedFailed if rpm file reopen failed during transaction to
avoid losing old pkg info from db
+- jbj: add rpmdsNSType() to -lrpm loader map.
+- jbj: update po files (Translation Project).
+- jbj: update PO and doxygen manifests.
+- jbj: include rpmgrep.1 with "make dist".
+- rpm.org: Don't try to create "" directories.
+- rpm.org: Don't bother calculating string sizes manually.
+- rpm.org: memory used by lua gets freed (just remove comment).
+- rpm.org: repeated read config -> free config needs globalLuaState ==
NULL.
+- rpm.org: Fix buffer overflow on oversized filelist
entries(susebz#397006).
+- jbj: pcre: finalize --with-pcre=internal building.
+- jbj: pcre: punish PLD with internal bloat until the trivial AutoFu
exists.
+- jbj: rpmdigest: avoid segfault on named pipes and other uglix fauna.
+- jbj: rpmbuild: use anchored patterns for data validation.
+- jbj: run "make check" to self consistency. worksforme.
+- jbj: add --whatneeds/--needswhat popt aliases.
+- jbj: backport the test harness for signature(). worksforme.
+- jbj: rpmbuild: enumerate all the lexical patterns in parsePreamble().
+- jbj: rpmbuild: enable pattern validation for simple package
identifiers.
+- jbj: rpmbuild: add tag data validation pattern checks.
+- jbj: EVRtuple: handle EVR_t opaquely in python labelCompare().
+- jbj: EVRtuple: postpone committing to single "missing" value for now.
+- jbj: EVRtuple: attempt rpmEVRparse() during parseRCPOT().
+no error returns from rpmEVRparse() to trigger the message yet,
todo++.
+- jbj: EVRtuple: teach --whatneeds/--needswhat to use EVR_t opaquely.
+- jbj: EVRtuple: add rpmEVR{new,free} creator and destructors.
+- jbj: EVRtuple: mark the old EVRD parser for destruction.
+- jbj: EVRtuple: use the new EVRD pattern parser, reverse the assert
check.
+- jbj: EVRtuple: precedence permutation for rpmdsCompare().
+- jbj: EVRtuple: precedence permutation for rpmVersionCompare().
+- jbj: EVRtuple: blueprint new <-> old parsers with an assert.
+- jbj: EVRtuple: parse EVRD using RPMMIRE_REGEX & evr_tuple_match.
+- jbj: EVRtuple: wire up evr_tuple_match RE pattern match.
+- jbj: EVRtuple: wire up evr_tuple_order precedence permutation.
+- jbj: EVRtuple: use array for tuple storage.
+- rse: EVRtuple: macro configuration parameterization.
+- jbj: add FNM_EXTMATCH to default flags w RPMMIRE_GLOB.
+- jbj: rpmsw: change bytes accumulator to unsigned long long.
+- proyvind: add new DistEpoch tag.
+- jbj: add getter/setter methods to pass a rpmdb using a header argument.
+- jbj: transFlags: regroup bits together in poptI table.
+- jbj: transFlags: use POPT_SET_BIT consistently, no callbacks needed.
+- jbj: transFlags: add --nopretrans/--noposttrans disablers.
+- jbj: transFlags: eliminate --nomd5, use --nofdigests instead.
+- jbj: transFlags: add RPMTRANS_FLAGS_NORPMDB and --norpmdb disablers.
+- jbj: transFlags: eliminate (never implemented) RPMTRANS_KEEP_OBSOLETES.
+- jbj: use poptSaneFile() when available (popt-1.15).
+- jbj: use poptReadConfigFiles() when available (popt-1.15).
+- jbj: rename s/hdrmd5ctx/hdrctx/ used by RSA to avoid legacy confusions.
+- jbj: backport misc. changes from HEAD.
+- jbj: backport OpenPKG no-hard-coded-ugid.
+- jbj: rpmku: create opaque keyutils keyring.
+- jbj: keyutils: permit configurable keyring.
+- jbj: rpmgc: display
[CVS] RPM: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Mar-2009 14:49:34 Branch: HEAD Handle: 2009030713493400 Modified files: rpm Makefile.am Log: try to fix RPM 5.2 snapshot tarballs Summary: RevisionChanges Path 2.227 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.226 -r2.227 Makefile.am --- rpm/Makefile.am 15 Feb 2009 13:55:30 - 2.226 +++ rpm/Makefile.am 7 Mar 2009 13:49:34 - 2.227 @@ -6,7 +6,7 @@ EXTRA_DIST = CHANGES CREDITS Doxyheader INSTALL \ autodeps/none autodeps/*.prov autodeps/*.req autogen.sh \ - db db3/configure xar \ + db db3/configure xar xz pcre \ lua/[A-Z]* lua/*.[ch] lua/local/l* \ file/src/[A-Z]* file/src/*.[ch] file/python file/magic file/doc file/[A-Z]* file/acinclude.m4 file/aclocal.m4 \ file/autogen.sh file/config* file/depcomp file/install-sh file/ltmain.sh file/missing file/mkinstalldirs \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES configure.ac rpm/lib/ fsm.c psm.c rpm/rpmio/ i...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 07-Mar-2009 14:38:10
Branch: HEAD Handle: 2009030713380901
Modified files:
rpm CHANGES configure.ac system.h
rpm/lib fsm.c psm.c
rpm/rpmio iosm.c rpmdav.c rpmdav.h rpmsq.c yarn.c
Log:
Use Pthreads under --with-pthreads controlled WITH_PTHREADS and not
existance-derived HAVE_PTHREADS_H. This way one can still
disable Pthreads usage under a platform where exists.
Summary:
RevisionChanges Path
1.2807 +1 -0 rpm/CHANGES
2.343 +1 -0 rpm/configure.ac
2.181 +2 -2 rpm/lib/fsm.c
2.344 +2 -2 rpm/lib/psm.c
1.33+2 -2 rpm/rpmio/iosm.c
2.94+2 -2 rpm/rpmio/rpmdav.c
2.35+1 -1 rpm/rpmio/rpmdav.h
1.42+7 -7 rpm/rpmio/rpmsq.c
2.6 +9 -9 rpm/rpmio/yarn.c
2.115 +2 -0 rpm/system.h
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2806 -r1.2807 CHANGES
--- rpm/CHANGES 6 Mar 2009 22:37:02 - 1.2806
+++ rpm/CHANGES 7 Mar 2009 13:38:09 - 1.2807
@@ -1,5 +1,6 @@
5.2a2 -> 5.2a3:
+- rse: use Pthreads under --with-pthreads controlled WITH_PTHREADS and
not existance-derived HAVE_PTHREADS_H
- jbj: update po files (Translation Project).
- jbj: yarn: lobotomize yarn.c conditioned on HAVE_PTHREAD_H.
- jbj: rpmz: toss the pbzip2 carcass into the compression cassoulet ...
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.342 -r2.343 configure.ac
--- rpm/configure.ac 6 Mar 2009 18:27:37 - 2.342
+++ rpm/configure.ac 7 Mar 2009 13:38:09 - 2.343
@@ -603,6 +603,7 @@
AS_HELP_STRING([--without-pthreads], [build RPM without POSIX pthreads]),
[ WITH_PTHREADS="$withval" ], [ WITH_PTHREADS=yes ])
if test ".$WITH_PTHREADS" = .yes; then
+AC_DEFINE(WITH_PTHREADS, 1, [Define to 1 for using Pthreads])
AC_CHECK_HEADERS(thread.h pthread.h synch.h semaphore.h)
AC_CHECK_LIB(pthread, pthread_mutex_trylock, [], [
AC_CHECK_LIB(pthread, __pthread_mutex_trylock, [], [
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/fsm.c
$ cvs diff -u -r2.180 -r2.181 fsm.c
--- rpm/lib/fsm.c 20 Dec 2008 08:09:47 - 2.180
+++ rpm/lib/fsm.c 7 Mar 2009 13:38:09 - 2.181
@@ -410,7 +410,7 @@
return dn;
}
-#if defined(HAVE_PTHREAD_H)
+#if defined(WITH_PTHREADS)
static void * fsmThread(void * arg)
/*...@globals h_errno, fileSystem, internalState @*/
/*...@modifies arg, fileSystem, internalState @*/
@@ -427,7 +427,7 @@
/*...@modifies fsm, fileSystem, internalState @*/
{
fsm->nstage = nstage;
-#if defined(HAVE_PTHREAD_H)
+#if defined(WITH_PTHREADS)
if (fsm->multithreaded)
return rpmsqJoin( rpmsqThread(fsmThread, fsm) );
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/psm.c
$ cvs diff -u -r2.343 -r2.344 psm.c
--- rpm/lib/psm.c 29 Dec 2008 22:42:25 - 2.343
+++ rpm/lib/psm.c 7 Mar 2009 13:38:09 - 2.344
@@ -1924,7 +1924,7 @@
return 0;
}
-#if defined(HAVE_PTHREAD_H)
+#if defined(WITH_PTHREADS)
static void * rpmpsmThread(void * arg)
/*...@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState
@*/
/*...@modifies arg, rpmGlobalMacroContext, fileSystem, internalState @*/
@@ -1941,7 +1941,7 @@
/*...@modifies psm, rpmGlobalMacroContext, fileSystem, internalState @*/
{
psm->nstage = nstage;
-#if defined(HAVE_PTHREAD_H)
+#if defined(WITH_PTHREADS)
if (_psm_threads)
return rpmsqJoin( rpmsqThread(rpmpsmThread, psm) );
#endif
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/iosm.c
$ cvs diff -u -r1.32 -r1.33 iosm.c
--- rpm/rpmio/iosm.c 16 Dec 2008 22:18:12 - 1.32
+++ rpm/rpmio/iosm.c 7 Mar 2009 13:38:10 - 1.33
@@ -437,7 +437,7 @@
return dn;
}
-#if defined(HAV
[CVS] RPM: rpm-5_1: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Mar-2009 13:54:47 Branch: rpm-5_1 Handle: 2009030712544700 Modified files: (Branch: rpm-5_1) rpm CHANGES Log: open door for 5.1.8 Summary: RevisionChanges Path 1.2288.2.191+2 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2288.2.190 -r1.2288.2.191 CHANGES --- rpm/CHANGES 6 Mar 2009 22:25:56 - 1.2288.2.190 +++ rpm/CHANGES 7 Mar 2009 12:54:47 - 1.2288.2.191 @@ -1,3 +1,5 @@ +5.1.7 -> 5.1.8: + 5.1.6 -> 5.1.7: - jbj: update po files (Translation Project). - jbj: eleminate duplicate rpmVersionCompare() routines. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Mar-2009 13:29:03 Branch: rpm-5_1 Handle: 2009030712290200 Modified files: (Branch: rpm-5_1) rpm/tools Makefile.am Log: RPM 5.1.6 already installed rpmgrep(1), so RPM 5.1.7 should do it, too Summary: RevisionChanges Path 2.107.2.8 +1 -2 rpm/tools/Makefile.am patch -p0 <<'@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.107.2.7 -r2.107.2.8 Makefile.am --- rpm/tools/Makefile.am 7 Mar 2009 12:26:50 - 2.107.2.7 +++ rpm/tools/Makefile.am 7 Mar 2009 12:29:02 - 2.107.2.8 @@ -40,8 +40,7 @@ $(top_builddir)/build/librpmbuild.la \ $(RPM_LDADD_COMMON) -bin_PROGRAMS = rpm2cpio rpmcache rpmdigest rpmmtree rpmrepo -noinst_PROGRAMS = rpmgrep +bin_PROGRAMS = rpm2cpio rpmcache rpmdigest rpmgrep rpmmtree rpmrepo dist_man_MANS = rpmgrep.1 pkglibdir = @USRLIBRPM@ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Mar-2009 13:26:50 Branch: rpm-5_1 Handle: 2009030712265000 Modified files: (Branch: rpm-5_1) rpm/tools Makefile.am Log: remove rpmmtree once as it is listed twice on bin_PROGRAMS Summary: RevisionChanges Path 2.107.2.7 +1 -1 rpm/tools/Makefile.am patch -p0 <<'@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.107.2.6 -r2.107.2.7 Makefile.am --- rpm/tools/Makefile.am 7 Mar 2009 12:04:36 - 2.107.2.6 +++ rpm/tools/Makefile.am 7 Mar 2009 12:26:50 - 2.107.2.7 @@ -40,7 +40,7 @@ $(top_builddir)/build/librpmbuild.la \ $(RPM_LDADD_COMMON) -bin_PROGRAMS = rpm2cpio rpmcache rpmdigest rpmmtree rpmmtree rpmrepo +bin_PROGRAMS = rpm2cpio rpmcache rpmdigest rpmmtree rpmrepo noinst_PROGRAMS = rpmgrep dist_man_MANS = rpmgrep.1 @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/tools/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 07-Mar-2009 13:04:36 Branch: rpm-5_1 Handle: 2009030712043600 Modified files: (Branch: rpm-5_1) rpm/tools Makefile.am Log: Make Automake happy, as it complained: tools/Makefile.am:64: variable `rpmgrep_SOURCES' is defined but no program or tools/Makefile.am:64: library has `rpmgrep' as canonic name (possible typo) tools/Makefile.am:65: variable `rpmgrep_LDADD' is defined but no program or tools/Makefile.am:65: library has `rpmgrep' as canonic name (possible typo) If "rpmgrep" should be really installed it later has to be moved from noinst_PROGRAMS to bin_PROGRAMS, of course. Summary: RevisionChanges Path 2.107.2.6 +1 -0 rpm/tools/Makefile.am patch -p0 <<'@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.107.2.5 -r2.107.2.6 Makefile.am --- rpm/tools/Makefile.am 17 Jan 2009 18:35:01 - 2.107.2.5 +++ rpm/tools/Makefile.am 7 Mar 2009 12:04:36 - 2.107.2.6 @@ -41,6 +41,7 @@ $(RPM_LDADD_COMMON) bin_PROGRAMS = rpm2cpio rpmcache rpmdigest rpmmtree rpmmtree rpmrepo +noinst_PROGRAMS = rpmgrep dist_man_MANS = rpmgrep.1 pkglibdir = @USRLIBRPM@ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-Mar-2009 23:59:45 Branch: rpm-5_1 Handle: 2009030622594500 Modified files: (Branch: rpm-5_1) rpm devtool.conf Log: fix RPM 5.1 branch checkout Summary: RevisionChanges Path 2.205.2.22 +1 -1 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.205.2.21 -r2.205.2.22 devtool.conf --- rpm/devtool.conf 5 Mar 2009 10:03:07 - 2.205.2.21 +++ rpm/devtool.conf 6 Mar 2009 22:59:45 - 2.205.2.22 @@ -8,7 +8,7 @@ MODULE_TAG_LUA="rpm-5_1" MODULE_TAG_FILE="rpm-5_1" MODULE_TAG_XAR="rpm-5_1" -MODULE_TAG_PCRE="" +MODULE_TAG_PCRE="rpm-5_1" %checkout for name in $MODULE_NAMES "$@"; do @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/build/ files.c rpm/lib/ rpmfi.h
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 06-Mar-2009 23:49:04
Branch: rpm-5_1 Handle: 2009030622490400
Modified files: (Branch: rpm-5_1)
rpm/build files.c
rpm/lib rpmfi.h
Log:
fix remaining compile-time warnings
Summary:
RevisionChanges Path
1.320.2.3 +1 -1 rpm/build/files.c
2.54.2.3+3 -0 rpm/lib/rpmfi.h
patch -p0 <<'@@ .'
Index: rpm/build/files.c
$ cvs diff -u -r1.320.2.2 -r1.320.2.3 files.c
--- rpm/build/files.c 17 Jan 2009 14:31:26 - 1.320.2.2
+++ rpm/build/files.c 6 Mar 2009 22:49:04 - 1.320.2.3
@@ -2080,7 +2080,7 @@
goto exit;
/*...@notreached@*/ break;
case RPMTAG_PUBKEYS:
- if ((xx = pgpReadPkts(fn, (const uint8_t **)&pkt, (size_t *)&pktlen))
<= 0) {
+ if ((xx = pgpReadPkts(fn, (uint8_t **)&pkt, (size_t *)&pktlen)) <= 0) {
rpmlog(RPMLOG_ERR, _("%s: public key read failed.\n"), fn);
goto exit;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmfi.h
$ cvs diff -u -r2.54.2.2 -r2.54.2.3 rpmfi.h
--- rpm/lib/rpmfi.h 10 Jan 2009 21:38:20 - 2.54.2.2
+++ rpm/lib/rpmfi.h 6 Mar 2009 22:49:04 - 2.54.2.3
@@ -592,6 +592,9 @@
extern const char * rpmfiFGroup(/*...@null@*/ rpmfi fi)
/*...@*/;
+extern int rpmfiSetFAction(rpmfi, int)
+ /*...@*/;
+
/** \ingroup rpmfi
* Return file info exclude patterns.
* @param fi file info set
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ yarn.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 06-Mar-2009 23:23:56
Branch: HEAD Handle: 2009030622235600
Modified files:
rpm/rpmio yarn.c
Log:
get rid of remaining compile-time warnings in case PTHREAD is not
available
Summary:
RevisionChanges Path
2.5 +6 -0 rpm/rpmio/yarn.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/yarn.c
$ cvs diff -u -r2.4 -r2.5 yarn.c
--- rpm/rpmio/yarn.c 6 Mar 2009 21:33:26 - 2.4
+++ rpm/rpmio/yarn.c 6 Mar 2009 22:23:56 - 2.5
@@ -361,6 +361,7 @@
};
/* mark the calling thread as done and alert yarnJoinAll() */
+#if defined(HAVE_PTHREAD_H)
static void yarnReenter(/*...@unused@*/ void * dummy)
/*...@globals threads, threads_lock, fileSystem, internalState @*/
/*...@modifies threads, threads_lock, fileSystem, internalState @*/
@@ -392,12 +393,14 @@
/* update the count of threads to be joined and alert yarnJoinAll() */
yarnTwist(&(threads_lock), BY, 1);
}
+#endif
/* all threads go through this routine so that just before the thread exits,
it marks itself as done in the threads list and alerts yarnJoinAll() so
that
the thread resources can be released -- use cleanup stack so that the
marking occurs even if the thread is cancelled */
/*...@null@*/
+#if defined(HAVE_PTHREAD_H)
static void * yarnIgnition(/*...@only@*/ void * arg)
/*...@*/
{
@@ -422,6 +425,7 @@
/* exit thread */
return NULL;
}
+#endif
/* not all POSIX implementations create threads as joinable by default, so
that
is made explicit here */
@@ -432,7 +436,9 @@
int ret;
yarnThread th;
struct capsule * capsule;
+#if defined(HAVE_PTHREAD_H)
pthread_attr_t attr;
+#endif
/* construct the requested call and argument for the yarnIgnition()
routine
(allocated instead of automatic so that we're sure this will still be
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_1: rpm/lib/ verify.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-Mar-2009 23:07:02 Branch: rpm-5_1 Handle: 2009030622070100 Modified files: (Branch: rpm-5_1) rpm/lib verify.c Log: ensure that rpmtsSetScriptFd prototype is available Summary: RevisionChanges Path 2.188.2.1 +1 -0 rpm/lib/verify.c patch -p0 <<'@@ .' Index: rpm/lib/verify.c $ cvs diff -u -r2.188 -r2.188.2.1 verify.c --- rpm/lib/verify.c 2 Apr 2008 18:35:26 - 2.188 +++ rpm/lib/verify.c 6 Mar 2009 22:07:01 - 2.188.2.1 @@ -7,6 +7,7 @@ #include #define _RPMPS_INTERNAL /* XXX rpmps needs iterator. */ +#define _RPMTS_INTERNAL /* XXX for rpmtsSetScriptFd */ #include #define _RPMSQ_INTERNAL @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ rpmz.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 06-Mar-2009 20:42:23
Branch: HEAD Handle: 2009030619422300
Modified files:
rpm/rpmio rpmz.c
Log:
use non-C99 comments to be more portable
Summary:
RevisionChanges Path
1.42+143 -143 rpm/rpmio/rpmz.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmz.c
$ cvs diff -u -r1.41 -r1.42 rpmz.c
--- rpm/rpmio/rpmz.c 24 Feb 2009 18:01:25 - 1.41
+++ rpm/rpmio/rpmz.c 6 Mar 2009 19:42:23 - 1.42
@@ -1,22 +1,22 @@
/**
- * \file rpmio/rpmrepo.c
+ * \file rpmio/rpmz.c
*/
-///
-//
-// Copyright (C) 2007 Lasse Collin
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-///
+/*
+ *
+ * Copyright (C) 2007 Lasse Collin
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ */
#include "system.h"
@@ -43,12 +43,12 @@
#endif
#ifdef NOTYET
-/// True if we should auto-adjust the compression settings to use less memory
-/// if memory usage limit is too low for the original settings.
+/* True if we should auto-adjust the compression settings to use less memory
+if memory usage limit is too low for the original settings. */
/*...@unchecked@*/
static bool auto_adjust = true;
-/// Indicate if no preset has been explicitly given. In that case, if we need
-/// to auto-adjust for lower memory usage, we won't print a warning.
+/* Indicate if no preset has been explicitly given. In that case, if we need
+to auto-adjust for lower memory usage, we won't print a warning. */
/*...@unchecked@*/
static bool preset_default = true;
#endif
@@ -135,17 +135,17 @@
}
}
-/// \brief Unlinks a file
-///
-/// This tries to verify that the file being unlinked really is the file that
-/// we want to unlink by verifying device and inode numbers. There's still
-/// a small unavoidable race, but this is much better than nothing (the file
-/// could have been moved/replaced even hours earlier).
+/* \brief Unlinks a file
+
+This tries to verify that the file being unlinked really is the file that
+we want to unlink by verifying device and inode numbers. There's still
+a small unavoidable race, but this is much better than nothing (the file
+could have been moved/replaced even hours earlier). */
static void
io_unlink(const char *fn, const struct stat *ost)
/*...@*/
{
-// On Windows, st_ino is meaningless, so don't bother testing it.
+/* On Windows, st_ino is meaningless, so don't bother testing it. */
#ifndef _WIN32
struct stat nsb;
@@ -153,8 +153,8 @@
|| nsb.st_dev != ost->st_dev || nsb.st_ino != ost->st_ino)
rpmlog(RPMLOG_ERR, _("%s: File seems to be moved, not removing\n"), fn);
else
-// There's a race condition between Lstat() and Unlink()
-// but at least we have tried to avoid removing wrong file.
+/* There's a race condition between Lstat() and Unlink()
+ but at least we have tried to avoid removing wrong file. */
if (S_ISREG(nsb.st_mode) && Unlink(fn))
rpmlog(RPMLOG_ERR, _("%s: Cannot remove: %s\n"), fn, strerror(errno));
#else
[CVS] RPM: rpm/ CHANGES INSTALL devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 06-Mar-2009 20:17:44
Branch: HEAD Handle: 2009030619174300
Modified files:
rpm CHANGES INSTALL devtool.conf
Log:
upgrade devtool environment to: GNU m4 1.4.12, Perl 5.10.0, OpenSSL
0.9.8j, NEON 0.28.4, SQLite 3.6.11, File 5.00
Summary:
RevisionChanges Path
1.2804 +1 -0 rpm/CHANGES
2.116 +6 -6 rpm/INSTALL
2.263 +7 -7 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2803 -r1.2804 CHANGES
--- rpm/CHANGES 6 Mar 2009 18:23:31 - 1.2803
+++ rpm/CHANGES 6 Mar 2009 19:17:43 - 1.2804
@@ -1,5 +1,6 @@
5.2a2 -> 5.2a3:
+- rse: upgrade devtool environment to: GNU m4 1.4.12, Perl 5.10.0,
OpenSSL 0.9.8j, NEON 0.28.4, SQLite 3.6.11, File 5.00
- rse: finally switch devtool from LZMA to XZ, too.
- rse: remove ugly --with-lzma to --with-xz hack (really not needed)
- rse: cleanup a few recently introduced compile-time warnings
@@ .
patch -p0 <<'@@ .'
Index: rpm/INSTALL
$ cvs diff -u -r2.115 -r2.116 INSTALL
--- rpm/INSTALL 6 Mar 2009 18:23:31 - 2.115
+++ rpm/INSTALL 6 Mar 2009 19:17:43 - 2.116
@@ -11,7 +11,7 @@
--- - --- ---
-
CVS mandatory 1.121.12.13 http://www.nongnu.org/cvs/
Perlmandatory 5.8.0 5.8.8 http://www.perl.com/
-GNU m4 [0] mandatory 1.4.0 1.4.11 http://www.gnu.org/software/m4/
+GNU m4 [0] mandatory 1.4.0 1.4.12 http://www.gnu.org/software/m4/
GNU autoconfmandatory 2.59b 2.63
http://www.gnu.org/software/autoconf/
GNU automakemandatory 1.8 1.10
http://www.gnu.org/software/automake/
GNU libtool mandatory 1.5 2.2.6a
http://www.gnu.org/software/libtool/
@@ -27,19 +27,19 @@
--- - --- ---
-
ISO C Compiler mandatory - - e.g. http://gcc.gnu.org/
POSIX make mandatory - - e.g.
http://www.gnu.org/software/make/
-Perlmandatory 5.8.0 5.8.8 http://www.perl.com/
+Perlmandatory 5.8.0 5.10.0 http://www.perl.com/
POPTmandatory 1.9 1.14http://rpm5.org/files/popt/
BeeCryptmandatory 4.0 4.1.2 http://beecrypt.sourceforge.net/
Mozilla NSS optional 3.113.11.7
http://www.mozilla.org/projects/security/pki/nss/
-OpenSSL optional 0.9.8 0.9.8i http://www.openssl.org/
-Neonoptional 0.26.0 0.28.1 http://www.webdav.org/neon/
+OpenSSL optional 0.9.8 0.9.8j http://www.openssl.org/
+Neonoptional 0.26.0 0.28.4 http://www.webdav.org/neon/
Berkeley-DB [1] optional 4.5 4.7.25
http://www.oracle.com/database/berkeley-db.html
-SQLite [1] optional 3.3 3.6.3 http://www.sqlite.org/
+SQLite [1] optional 3.3 3.6.11 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/
Bzip2 optional 1.0 1.0.5 http://www.bzip.org/
XZ Utils[3] optional 4.999.3 4.999.8 http://tukaani.org/xz/
-File/magic [4] optional 4.0 4.26ftp://ftp.astron.com/pub/file/
+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.8 http://www.pcre.org/
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.262 -r2.263 devtool.conf
--- rpm/devtool.conf 6 Mar 2009 18:23:31 - 2.262
+++ rpm/devtool.conf 6 Mar 2009 19:17:43 - 2.263
@@ -346,7 +346,7 @@
%standalone-modules
standalone_defines () {
# third-party development tools distribution versions
-v_m4="1.4.11"
+v_m4="1.4.12"
v_autoconf="2.63"
v_automake="1.10"
v_libtool="2.2.6a"
@@ -357,20 +357,20 @@
[CVS] RPM: rpm/ configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 06-Mar-2009 19:27:37
Branch: HEAD Handle: 2009030618273700
Modified files:
rpm configure.ac
Log:
The answer to this question is very simple: RPM_CHECK_LIB cannot provide
those defines because for internal/embedded copies of a third-party
library, RPM_CHECK_LIB cannot run the compile/link-time test at
all (as those libraries will be build later the first time) during
configure-time.
Summary:
RevisionChanges Path
2.342 +0 -1 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.341 -r2.342 configure.ac
--- rpm/configure.ac 6 Mar 2009 18:23:31 - 2.341
+++ rpm/configure.ac 6 Mar 2009 18:27:37 - 2.342
@@ -1282,7 +1282,6 @@
[ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
WITH_PCRE_INTERNAL=true
AC_DEFINE(HAVE_PCRE_H, 1, [Define to 1 if you have ])
- dnl XXX why isn't this set by RPM_CHECK_LIB?!?
AC_DEFINE(HAVE_LIBPCRE, 1, [Define to 1 if you have the 'pcre'
library (-lpcre).])
AC_DEFINE(WITH_PCRE_POSIX, 1, [Define as 1 if PCRE's POSIX API is
available])
WITH_PCRE_LIBS="-lpcreposix ${WITH_PCRE_LIBS}"
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/rpmio/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-Mar-2009 19:24:22 Branch: HEAD Handle: 2009030618242200 Modified files: rpm/rpmio .cvsignore Log: add missing entry for 'rpmgrep' to .cvsignore file Summary: RevisionChanges Path 1.32+1 -0 rpm/rpmio/.cvsignore patch -p0 <<'@@ .' Index: rpm/rpmio/.cvsignore $ cvs diff -u -r1.31 -r1.32 .cvsignore --- rpm/rpmio/.cvsignore 20 Jan 2009 23:02:23 - 1.31 +++ rpm/rpmio/.cvsignore 6 Mar 2009 18:24:22 - 1.32 @@ -16,6 +16,7 @@ lcov lookup3 rpmborg +rpmgrep rpmcpio rpmcurl rpmdigest @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ CHANGES INSTALL configure.ac devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 06-Mar-2009 19:23:31
Branch: HEAD Handle: 2009030618233100
Modified files:
rpm CHANGES INSTALL configure.ac devtool.conf
Log:
- finally switch devtool from LZMA to XZ, too.
- remove ugly --with-lzma to --with-xz hack in configure.ac
Summary:
RevisionChanges Path
1.2803 +2 -0 rpm/CHANGES
2.115 +1 -1 rpm/INSTALL
2.341 +0 -7 rpm/configure.ac
2.262 +12 -15 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.2802 -r1.2803 CHANGES
--- rpm/CHANGES 6 Mar 2009 18:20:44 - 1.2802
+++ rpm/CHANGES 6 Mar 2009 18:23:31 - 1.2803
@@ -1,5 +1,7 @@
5.2a2 -> 5.2a3:
+- rse: finally switch devtool from LZMA to XZ, too.
+- rse: remove ugly --with-lzma to --with-xz hack (really not needed)
- rse: cleanup a few recently introduced compile-time warnings
- jbj: rpmz: add attribution and debugging to rpmzq.
- jbj: rpmz: carve out job queue and buffer pool management from pigz.
@@ .
patch -p0 <<'@@ .'
Index: rpm/INSTALL
$ cvs diff -u -r2.114 -r2.115 INSTALL
--- rpm/INSTALL 15 Feb 2009 13:55:30 - 2.114
+++ rpm/INSTALL 6 Mar 2009 18:23:31 - 2.115
@@ -83,7 +83,7 @@
--- - --- ---
-
GNU zip optional - - http://www.gzip.org/
Bzip2 optional - - http://www.bzip.org/
-LZMA Utils optional - - http://tukaani.org/lzma/
+XZ optional - - http://tukaani.org/xz/
GNU tar optional - - http://www.gnu.org/software/tar/
GNU cpiooptional - - http://www.gnu.org/software/cpio/
UnZip optional - - http://www.info-zip.org/UnZip.html
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.340 -r2.341 configure.ac
--- rpm/configure.ac 21 Feb 2009 19:40:57 - 2.340
+++ rpm/configure.ac 6 Mar 2009 18:23:31 - 2.341
@@ -1099,13 +1099,6 @@
[no,external:none], [],
[], [])
-# --with-xz option was formerly known as --with-lzma
-if test ".${with_xz+set}" != .set; then
- if test "${with_lzma+set}" = set; then
-with_xz=$with_lzma
- fi
-fi
-
dnl # libLZMA
WITH_XZ_INTERNAL=false
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.261 -r2.262 devtool.conf
--- rpm/devtool.conf 16 Feb 2009 15:31:30 - 2.261
+++ rpm/devtool.conf 6 Mar 2009 18:23:31 - 2.262
@@ -72,7 +72,6 @@
--with-db-tools-integrated \
--with-zlib=external \
--with-xz=internal \
---without-lzma \
--with-file=internal \
--with-lua=internal \
--with-sqlite=external \
@@ -196,7 +195,6 @@
--with-db-tools-integrated \
--with-pcre \
--without-xz \
- --without-lzma \
--without-openssl \
--without-nss \
--without-gcrypt \
@@ -233,7 +231,6 @@
--with-db-tools-integrated \
--with-pcre \
--without-xz \
- --without-lzma \
--without-openssl \
--without-nss \
--without-gcrypt \
@@ -359,7 +356,7 @@
# third-party library distribution versions
v_zlib="1.2.3"
v_bzip2="1.0.5"
-v_lzma="4.999.3alpha"
+v_xz="4.999.8beta"
v_openssl="0.9.8i"
v_expat="2.0.1"
v_neon="0.28.1"
@@ -384,7 +381,7 @@
dist="${dist}
gettext-${v_gettext}.tar.gz,http://rpm5.org/files/3rd/,ftp://ftp.gnu.org/gnu/gettext/";
dist="${dist}
zlib-${v_zlib}.tar.gz,http://rpm5.org/files/3rd/,http://www.zlib.net/";
dist="${dist}
bzip2-${v_bzip2}.tar.gz,http://rpm5.org/files/3rd/,http://www.bzip.org/${v_bzip2}/";
-dist="${dist}
lzma-${v_lzma
[CVS] RPM: rpm/ CHANGES
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-Mar-2009 19:20:44 Branch: HEAD Handle: 2009030618204400 Modified files: rpm CHANGES Log: remember my changes Summary: RevisionChanges Path 1.2802 +1 -0 rpm/CHANGES patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.2801 -r1.2802 CHANGES --- rpm/CHANGES 6 Mar 2009 17:40:56 - 1.2801 +++ rpm/CHANGES 6 Mar 2009 18:20:44 - 1.2802 @@ -1,5 +1,6 @@ 5.2a2 -> 5.2a3: +- rse: cleanup a few recently introduced compile-time warnings - jbj: rpmz: add attribution and debugging to rpmzq. - jbj: rpmz: carve out job queue and buffer pool management from pigz. - jbj: rpmz: carve out an opaque trace logging subsystem from pigz. @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/build/ parsePreamble.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-Mar-2009 19:18:57 Branch: HEAD Handle: 2009030618185700 Modified files: rpm/build parsePreamble.c Log: fix syntax of pre-processor statement (nested comments not valid) Summary: RevisionChanges Path 2.188 +1 -1 rpm/build/parsePreamble.c patch -p0 <<'@@ .' Index: rpm/build/parsePreamble.c $ cvs diff -u -r2.187 -r2.188 parsePreamble.c --- rpm/build/parsePreamble.c 26 Feb 2009 17:49:59 - 2.187 +++ rpm/build/parsePreamble.c 6 Mar 2009 18:18:57 - 2.188 @@ -1199,7 +1199,7 @@ addMacro(spec->macros, "epoch", NULL, "0", RMIL_SPEC); } -#endif /* RPM_VENDOR_PLD /* rpm-epoch0 */ */ +#endif /* RPM_VENDOR_PLD rpm-epoch0 */ if (checkForRequired(pkg->header, NVR) != RPMRC_OK) return RPMRC_FAIL; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/tools/ rpmrepo.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-Mar-2009 19:18:01 Branch: HEAD Handle: 200903061818 Modified files: rpm/tools rpmrepo.c Log: remove compile-time warning by disabling unused POPT fallback function Summary: RevisionChanges Path 2.17+2 -0 rpm/tools/rpmrepo.c patch -p0 <<'@@ .' Index: rpm/tools/rpmrepo.c $ cvs diff -u -r2.16 -r2.17 rpmrepo.c --- rpm/tools/rpmrepo.c 26 Jan 2009 20:02:02 - 2.16 +++ rpm/tools/rpmrepo.c 6 Mar 2009 18:18:00 - 2.17 @@ -1823,6 +1823,7 @@ /*==*/ +#if 0 #if !defined(POPT_READFILE_TRIMNEWLINES) /* XXX popt < 1.15 */ #define POPT_READFILE_TRIMNEWLINES 1 /** @@ -1902,6 +1903,7 @@ /*...@=compdef =nullstate @*/ } #endif /* !defined(POPT_READFILE_TRIMNEWLINES) */ +#endif #if !defined(POPT_ARG_ARGV) /* XXX popt < 1.14 */ /** @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/lib/ depends.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: r...@rpm5.org Module: rpm Date: 06-Mar-2009 19:16:17 Branch: HEAD Handle: 2009030618161700 Modified files: rpm/lib depends.c Log: remove compile-time warning by disabling unused definition Summary: RevisionChanges Path 1.432 +2 -0 rpm/lib/depends.c patch -p0 <<'@@ .' Index: rpm/lib/depends.c $ cvs diff -u -r1.431 -r1.432 depends.c --- rpm/lib/depends.c 26 Jan 2009 22:36:04 - 1.431 +++ rpm/lib/depends.c 6 Mar 2009 18:16:17 - 1.432 @@ -2260,7 +2260,9 @@ static rpmuint32_t _autobits = _notpre(_ALL_REQUIRES_MASK); #define isAuto(_x) ((_x) & _autobits) #else +#if 0 static rpmuint32_t _autobits = 0x; +#endif #define isAuto(_x) (1) #endif @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm/ VENDOR rpm/rpmio/ ugid.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Ralf S. Engelschall
Root: /v/rpm/cvs Email: r...@rpm5.org
Module: rpm Date: 05-Jan-2009 20:49:14
Branch: HEAD Handle: 2009010519491400
Modified files:
rpm VENDOR
rpm/rpmio ugid.c
Log:
OpenPKG-specific change "no-hard-coded-ugid": do not make hard-coded
assumptions about any uid/gid, because OpenPKG can safely rely on the
/etc/passwd and /etc/group lookups for all uid/gid and has no need to
assume that for instance GID 0 is "root". Actually, such an assumption
is a portability problem as GID 0 under e.g. BSD is named "wheel" and
not "root", etc. As a result, things like "rpm -V" would report wrong
information, etc.
Summary:
RevisionChanges Path
2.66+11 -0 rpm/VENDOR
2.11+10 -0 rpm/rpmio/ugid.c
patch -p0 <<'@@ .'
Index: rpm/VENDOR
$ cvs diff -u -r2.65 -r2.66 VENDOR
--- rpm/VENDOR21 Dec 2008 17:16:47 - 2.65
+++ rpm/VENDOR5 Jan 2009 19:49:14 - 2.66
@@ -35,6 +35,17 @@
Characteristic: cross-platform multiple-instance use of RPM
+ Change: no-hard-coded-ugid
+ Purpose:do not make hard-coded assumptions about any uid/gid
+ Reason: OpenPKG can safely rely on the /etc/passwd and
/etc/group
+ lookups for all uid/gid and has no need to assume
+ that for instance GID 0 is "root". Actually, such
+ an assumption is a portability problem as GID 0
+ under e.g. BSD is named "wheel" and not "root",
+ etc. As a result, things like "rpm -V" would report
+ wrong information, etc.
+
+
Change: splitted-source-directory
Purpose:support so-called "splitted source directories", i.e.,
source files (listed on SourceX and PatchX headers)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/ugid.c
$ cvs diff -u -r2.10 -r2.11 ugid.c
--- rpm/rpmio/ugid.c 6 Oct 2007 19:40:23 - 2.10
+++ rpm/rpmio/ugid.c 5 Jan 2009 19:49:14 - 2.11
@@ -25,9 +25,11 @@
if (!thisUname) {
lastUnameLen = 0;
return -1;
+#if !defined(RPM_VENDOR_OPENPKG) /* no-hard-coded-ugid */
} else if (strcmp(thisUname, "root") == 0) {
*uid = 0;
return 0;
+#endif
}
thisUnameLen = strlen(thisUname);
@@ -69,9 +71,11 @@
if (thisGname == NULL) {
lastGnameLen = 0;
return -1;
+#if !defined(RPM_VENDOR_OPENPKG) /* no-hard-coded-ugid */
} else if (strcmp(thisGname, "root") == 0) {
*gid = 0;
return 0;
+#endif
}
thisGnameLen = strlen(thisGname);
@@ -91,6 +95,7 @@
/*...@=internalglobs@*/
grent = getgrnam(thisGname);
if (grent == NULL) {
+#if !defined(RPM_VENDOR_OPENPKG) /* no-hard-coded-ugid */
/* XXX The filesystem package needs group/lock w/o getgrnam. */
if (strcmp(thisGname, "lock") == 0) {
*gid = lastGid = 54;
@@ -100,6 +105,7 @@
*gid = lastGid = 12;
return 0;
} else
+#endif
return -1;
}
}
@@ -120,8 +126,10 @@
if (uid == (uid_t) -1) {
lastUid = (uid_t) -1;
return NULL;
+#if !defined(RPM_VENDOR_OPENPKG) /* no-hard-coded-ugid */
} else if (uid == (uid_t) 0) {
return "root";
+#endif
} else if (uid == lastUid) {
return lastUname;
} else {
@@ -151,8 +159,10 @@
if (gid == (gid_t) -1) {
lastGid = (gid_t) -1;
return NULL;
+#if !defined(RPM_VENDOR_OPENPKG) /* no-hard-coded-ugid */
} else if (gid == (gid_t) 0) {
return "root";
+#endif
} else if (gid == lastGid) {
return lastGname;
} else {
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
