[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 22-May-2010 17:35:14
Branch: rpm-5_3 Handle: 2010052215351001
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
Log:
- permit --with-neon=internal.
- beecrypt: permit --with-beecrypt=internal (w manual checkout/autogen)
Summary:
RevisionChanges Path
1.3296.2.34 +2 -0 rpm/CHANGES
2.432.2.11 +39 -46 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.33 -r1.3296.2.34 CHANGES
--- rpm/CHANGES 21 May 2010 04:23:19 - 1.3296.2.33
+++ rpm/CHANGES 22 May 2010 15:35:10 - 1.3296.2.34
@@ -15,6 +15,8 @@
- jbj: fix: save chroot value across embedded scriptlet execution.
from Przemyslaw Iskra .
- jbj: tests: "make check" for CentOS5.4 passes.
+- jbj: permit --with-neon=internal.
+- jbj: beecrypt: permit --with-beecrypt=internal (w manual
checkout/autogen)
5.3a1 -> 5.3.0
- jbj: tag the rpm-5.3.0 tarball.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.10 -r2.432.2.11 configure.ac
--- rpm/configure.ac 4 May 2010 15:55:10 - 2.432.2.10
+++ rpm/configure.ac 22 May 2010 15:35:11 - 2.432.2.11
@@ -8,7 +8,7 @@
AC_PREREQ(2.63)
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
-AC_INIT([rpm],[5.3.0],[PACKAGE_BUGREPORT_DEFAULT])
+AC_INIT([rpm],[5.3.1],[PACKAGE_BUGREPORT_DEFAULT])
PACKAGE_TIMESTAMP="2009" dnl # [-MM[-DD[ HH[:MM
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
@@ -1167,13 +1167,6 @@
[popt], [poptGetContext], [popt.h],
[yes,external], [],
[], [AC_MSG_ERROR([mandatory POPT library not found])])
-PROVIDES_POPT_ARGFLAG_TOGGLE=no
-AC_MSG_CHECKING(if defines POPT_ARGFLAG_TOGGLE)
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]],
[[printf("%d",POPT_ARGFLAG_TOGGLE)]])],[PROVIDES_POPT_ARGFLAG_TOGGLE=yes],[])
-AC_MSG_RESULT($PROVIDES_POPT_ARGFLAG_TOGGLE)
-if test ".$PROVIDES_POPT_ARGFLAG_TOGGLE" = .no; then
- AC_MSG_ERROR([Your version of POPT is too old])
-fi
HAVE_RPM_COMPRESSION=no
dnl # ZLib
@@ -1218,13 +1211,11 @@
RPM_CHECK_LIB(
[BeeCrypt], [beecrypt],
[beecrypt], [mpfprintln], [beecrypt/api.h],
-[yes,external], [],
+[yes,internal:external], [beecrypt:include],
[], [ AC_MSG_ERROR([mandatory BeeCrypt library not found]) ])
if test ".$WITH_BEECRYPT" = .no; then
AC_MSG_ERROR([BEECRYPT is mandatory])
fi
-AC_CHECK_HEADER([beecrypt/sha224.h], [],
- AC_MSG_ERROR([Your version of BEECRYPT is too old]))
dnl # GCrypt
RPM_CHECK_LIB(
@@ -1291,49 +1282,51 @@
], [])
AC_SUBST(WITH_SEMANAGE_SEMODULE)
-dnl # Expat
-dnl RPM_CHECK_LIB(
-dnl [Expat], [expat],
-dnl [expat], [XML_SetXmlDeclHandler], [expat.h],
-dnl [no,external:none], [],
-dnl [ AC_DEFINE(WITH_EXPAT, 1, [Define if building with Expat])
-dnl ], [])
+# Expat
+RPM_CHECK_LIB(
+[Expat], [expat],
+[expat], [XML_SetXmlDeclHandler], [expat.h],
+[no,external:none], [],
+[ AC_DEFINE(WITH_EXPAT, 1, [Define if building with Expat])
+], [])
-dnl # Libtasn1
-dnl RPM_CHECK_LIB(
-dnl [Libtasn1], [libtasn1],
-dnl [tasn1], [asn1_array2tree], [libtasn1.h],
-dnl [no,external:none], [],
-dnl [ AC_DEFINE(WITH_LIBTASN1, 1, [Define if building with Libtasn1])
-dnl ], [])
+# Libtasn1
+RPM_CHECK_LIB(
+[Libtasn1], [libtasn1],
+[tasn1], [asn1_array2tree], [libtasn1.h],
+[no,external:none], [],
+[ AC_DEFINE(WITH_LIBTASN1, 1, [Define if building with Libtasn1])
+], [])
-dnl # Pakchois
-dnl RPM_CHECK_LIB(
-dnl [Pakchois], [pakchois],
-dnl [pakchois], [pakchois_module_load], [pakchois/pakchois.h],
-dnl [no,external:none], [],
-dnl [ AC_DEFINE(WITH_PAKCHOIS, 1, [Define if building with Pakchois])
-dnl ], [])
+# Pakchois
+RPM_CHECK_LIB(
+[Pakchois], [pakchois],
+[pakchois], [pakchois_module_load], [pakchois/pakchois.h],
+[no,external:none], [],
+[ AC_DEFINE(WITH_PAKCHOIS, 1, [Define if building with Pakchois])
+], [])
-dnl # GnuTLS
-dnl RPM_CHECK_LIB(
-dnl [GnuTLS], [gnutls],
-dnl [gnutls], [gnutls_global_init]
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Bernhard Rosenkraenzer Root: /v/rpm/cvs Email: b...@rpm5.org Module: rpm Date: 30-Aug-2010 10:36:39 Branch: rpm-5_3 Handle: 2010083008363801 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac Log: Support building with Python 2.7.x Summary: RevisionChanges Path 1.3296.2.69 +1 -0 rpm/CHANGES 2.432.2.15 +3 -3 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.68 -r1.3296.2.69 CHANGES --- rpm/CHANGES 27 Aug 2010 13:04:10 - 1.3296.2.68 +++ rpm/CHANGES 30 Aug 2010 08:36:38 - 1.3296.2.69 @@ -1,5 +1,6 @@ 5.3.3 -> 5.3.4: - jbj: permit building --without-sqlite again. +- bero: Support building with Python 2.7.x 5.3.2 -> 5.3.3: - jbj: finalize for release. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.14 -r2.432.2.15 configure.ac --- rpm/configure.ac 25 Aug 2010 14:09:02 - 2.432.2.14 +++ rpm/configure.ac 30 Aug 2010 08:36:39 - 2.432.2.15 @@ -1042,14 +1042,14 @@ AC_ARG_WITH(python, AS_HELP_STRING([--with-python], [build with RPM Python language bindings]), [ if test ".$withval" != .no; then case "$withval" in - 2.x|2.3|2.4|2.5|2.6) + 2.x|2.3|2.4|2.5|2.6|2.7) python_version=$withval ;; yes) - python_version="2.6 2.5 2.4 2.3 2.x" + python_version="2.7 2.6 2.5 2.4 2.3 2.x" ;; *) - AC_MSG_WARN([--with-python only supports values "2.x", "2.3", "2.4", "2.5", or "2.6" ignoring...]) + AC_MSG_WARN([--with-python only supports values "2.x", "2.3", "2.4", "2.5", "2.6" or "2.7" ignoring...]) python_version="" ;; esac @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 25-Oct-2010 23:03:39 Branch: rpm-5_3 Handle: 2010102521033800 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac Log: - start 5.3.6 development. Summary: RevisionChanges Path 1.3296.2.104+3 -0 rpm/CHANGES 2.432.2.32 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.103 -r1.3296.2.104 CHANGES --- rpm/CHANGES 23 Oct 2010 20:23:49 - 1.3296.2.103 +++ rpm/CHANGES 25 Oct 2010 21:03:38 - 1.3296.2.104 @@ -1,4 +1,7 @@ +5.3.5 -> 5.3.6: + 5.3.4 -> 5.3.5: +- jbj: release 5.3.5. - jbj: stub-in a disabler for "FILE ACID". - jbj: i18n: update po files (Translation Project). - jbj: beecrypt: fix: polluted builds due to my brain fart. revert. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.31 -r2.432.2.32 configure.ac --- rpm/configure.ac 25 Oct 2010 05:25:04 - 2.432.2.31 +++ rpm/configure.ac 25 Oct 2010 21:03:38 - 2.432.2.32 @@ -8,7 +8,7 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.3.5],[PACKAGE_BUGREPORT_DEFAULT]) +AC_INIT([rpm],[5.3.6],[PACKAGE_BUGREPORT_DEFAULT]) PACKAGE_TIMESTAMP="2010-09-18" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 29-Dec-2010 16:12:11 Branch: rpm-5_3 Handle: 2010122915121000 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac Log: - version++. Summary: RevisionChanges Path 1.3296.2.144+4 -2 rpm/CHANGES 2.432.2.44 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.143 -r1.3296.2.144 CHANGES --- rpm/CHANGES 29 Dec 2010 15:04:04 - 1.3296.2.143 +++ rpm/CHANGES 29 Dec 2010 15:12:10 - 1.3296.2.144 @@ -1,3 +1,5 @@ +5.3.7 -> 5.3.8: + 5.3.6 -> 5.3.7: - jbj: remove markReplacedFiles. - jbj: i18n: update po files (Translation Project). @@ -14,8 +16,8 @@ - proyvind: rpm4compat: add RPMTAG_FILENAMES & RPMDBI_LABEL. - proyvind: perl: start on adding back some missing functionality from RPM4: RPM::Sign, RPM::Transaction::importpubkey, RPM::Transaction::checkrpm. - - proyvind: rpmconstant: update constants. - - proyvind: rpmconstant: fix rpmh2tbl to error out for constants not found. +- proyvind: rpmconstant: update constants. +- proyvind: rpmconstant: fix rpmh2tbl to error out for constants not found. 5.3.5 -> 5.3.6: - jbj: release rpm-5.3.6 (in a *.src.rpm). @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.43 -r2.432.2.44 configure.ac --- rpm/configure.ac 23 Dec 2010 15:50:56 - 2.432.2.43 +++ rpm/configure.ac 29 Dec 2010 15:12:10 - 2.432.2.44 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.3.7],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2010-12-01" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.3.8],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2010-12-29" 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-5_3: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Matthew Dawkins Root: /v/rpm/cvs Email: mdawk...@rpm5.org Module: rpm Date: 02-Mar-2011 16:48:54 Branch: rpm-5_3 Handle: 2011030215485301 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac Log: - mdawkins: tagged 5.3.9 release in configure.ac Submitted by: MDawkins Summary: RevisionChanges Path 1.3296.2.169+3 -0 rpm/CHANGES 2.432.2.48 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.168 -r1.3296.2.169 CHANGES --- rpm/CHANGES 2 Mar 2011 14:32:25 - 1.3296.2.168 +++ rpm/CHANGES 2 Mar 2011 15:48:53 - 1.3296.2.169 @@ -1,3 +1,6 @@ +5.3.9 -> 5.3.10 + - mdawkins: tagged 5.3.9 release in configure.ac + 5.3.8 -> 5.3.9: - mdawkins: updated changelog information for snapshot releases in rpm.spec, rpm.spec.in - mdawkins : i18n update sl.po sv.po @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.47 -r2.432.2.48 configure.ac --- rpm/configure.ac 25 Feb 2011 09:28:25 - 2.432.2.47 +++ rpm/configure.ac 2 Mar 2011 15:48:54 - 2.432.2.48 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.3.8],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2010-12-29" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.3.9],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2011-03-02" 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-5_3: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Matthew Dawkins Root: /v/rpm/cvs Email: mdawk...@rpm5.org Module: rpm Date: 02-Apr-2011 05:20:15 Branch: rpm-5_3 Handle: 2011040203201400 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac Log: mdawkins: tagged 5.3.10 release in configure.ac Summary: RevisionChanges Path 1.3296.2.198+3 -0 rpm/CHANGES 2.432.2.53 +6 -6 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.197 -r1.3296.2.198 CHANGES --- rpm/CHANGES 2 Apr 2011 02:33:35 - 1.3296.2.197 +++ rpm/CHANGES 2 Apr 2011 03:20:14 - 1.3296.2.198 @@ -1,3 +1,6 @@ +5.3.10 -> 5.3.11 +- mdawkins: tagged 5.3.10 release in configure.ac + 5.3.9 -> 5.3.10 - proyvind: rpmjs: port to SpiderMonkey 1.8.5 API. - mdawkins: updated changelog information for snapshot releases in rpm.spec.in @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.52 -r2.432.2.53 configure.ac --- rpm/configure.ac 2 Apr 2011 02:33:35 - 2.432.2.52 +++ rpm/configure.ac 2 Apr 2011 03:20:14 - 2.432.2.53 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.3.9],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2011-03-02" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.3.10],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2011-04-01" dnl # [-MM[-DD[ HH[:MM AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION]) AC_MSG_HEADER([INITIALIZATION]) @@ -1601,12 +1601,12 @@ WITH_JS_SUBDIR="" WITH_SPIDERMONKEY_SUBDIR="" RPM_CHECK_LIB( -[JavaScript], [mozjs185], -[mozjs185], [JS_NewContext], [jsapi.h], -[no,internal:external:none], [mozjs185:src:src], +[JavaScript], [js], +[js], [JS_NewContext], [jsapi.h], +[no,internal:external:none], [js:src:src], [ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then WITH_SPIDERMONKEY_SUBDIR="$WITH_JS_SUBDIR/src" - AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'mozjs' library (-lmozjs185).]) + AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'js' library (-ljs).]) else WITH_JS_SUBDIR=js fi @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Matthew Dawkins Root: /v/rpm/cvs Email: mdawk...@rpm5.org Module: rpm Date: 02-May-2011 06:36:29 Branch: rpm-5_3 Handle: 2011050204362801 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac Log: tagged 5.3.11 release in configure.ac Submitted by: mdawkins Summary: RevisionChanges Path 1.3296.2.217+3 -0 rpm/CHANGES 2.432.2.56 +2 -2 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.216 -r1.3296.2.217 CHANGES --- rpm/CHANGES 1 May 2011 17:35:12 - 1.3296.2.216 +++ rpm/CHANGES 2 May 2011 04:36:29 - 1.3296.2.217 @@ -1,3 +1,6 @@ +5.3.11 -> 5.3.12 +- mdawkins: tagged 5.3.11 release in configure.ac + 5.3.10 -> 5.3.11 - mdawkins: i18n update cs.po da.po de.po es.po fi.po fr.po id.po is.po it.po ja.po ko.po nb.po nl.po pa.po pl.po pt.po pt_BR.po ru.po sk.po sl.po sr.po sv.po tr.po @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.55 -r2.432.2.56 configure.ac --- rpm/configure.ac 20 Apr 2011 16:17:08 - 2.432.2.55 +++ rpm/configure.ac 2 May 2011 04:36:28 - 2.432.2.56 @@ -8,8 +8,8 @@ AC_PREREQ(2.63) m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org]) -AC_INIT([rpm],[5.3.10],[PACKAGE_BUGREPORT_DEFAULT]) -PACKAGE_TIMESTAMP="2011-04-01" dnl # [-MM[-DD[ HH[:MM +AC_INIT([rpm],[5.3.11],[PACKAGE_BUGREPORT_DEFAULT]) +PACKAGE_TIMESTAMP="2011-05-02" 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-5_3: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 06-May-2011 17:42:53
Branch: rpm-5_3 Handle: 2011050615425201
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
Log:
in configure.ac distinguish properly redhat from fedora
Summary:
RevisionChanges Path
1.3296.2.223+1 -0 rpm/CHANGES
2.432.2.58 +1 -0 rpm/configure.ac
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.222 -r1.3296.2.223 CHANGES
--- rpm/CHANGES 6 May 2011 15:37:25 - 1.3296.2.222
+++ rpm/CHANGES 6 May 2011 15:42:52 - 1.3296.2.223
@@ -1,4 +1,5 @@
5.3.11 -> 5.3.12
+- devzero2000: in configure.ac distinguish properly redhat from
fedora
- devzero2000: add preliminary change for momonga buildboot
- devzero2000: fix typo in repackage_dir for macros/openmamba.in
- devzero2000: fix bugurl for macros/openmamba.in
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.57 -r2.432.2.58 configure.ac
--- rpm/configure.ac 6 May 2011 15:37:25 - 2.432.2.57
+++ rpm/configure.ac 6 May 2011 15:42:53 - 2.432.2.58
@@ -1953,6 +1953,7 @@
case "${target_vendor}" in
unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark|momonga)
test -f /etc/momonga-release && RPMCANONVENDOR=momonga
+ test -f /etc/fedora-release && RPMCANONVENDOR=fedora
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
test -f /etc/pld-release && RPMCANONVENDOR=pld
test -f /etc/mandriva-release &&RPMCANONVENDOR=mandriva
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 23-May-2011 14:37:24 Branch: rpm-5_3 Handle: 2011052312372301 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac Log: added missing ac_config_files per openmamba vendor macro Summary: RevisionChanges Path 1.3296.2.234+1 -0 rpm/CHANGES 2.432.2.60 +1 -1 rpm/configure.ac patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.233 -r1.3296.2.234 CHANGES --- rpm/CHANGES 18 May 2011 13:45:46 - 1.3296.2.233 +++ rpm/CHANGES 23 May 2011 12:37:23 - 1.3296.2.234 @@ -1,4 +1,5 @@ 5.3.11 -> 5.3.12 +- devzero2000: added missing ac_config_files per openmamba vendor macro - devzero2000: Sort file list for debuginfo extraction. (inspired by Robert Schiele http://lists.rpm.org/pipermail/rpm-list/2011-May/000894.html) - proyvind: update doxygen input filename paths. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.59 -r2.432.2.60 configure.ac --- rpm/configure.ac 7 May 2011 22:58:27 - 2.432.2.59 +++ rpm/configure.ac 23 May 2011 12:37:24 - 2.432.2.60 @@ -2312,7 +2312,7 @@ rpmdb/DB_CONFIG macros/macros macros/macros.rpmbuild macros/cmake macros/gstreamer macros/java macros/kernel macros/libtool -macros/mandriva macros/mono macros/perl macros/pkgconfig macros/php +macros/mandriva macros/openmamba macros/mono macros/perl macros/pkgconfig macros/php macros/python macros/ruby macros/selinux macros/tcl doc/Makefile doc/manual/Makefile doc/fr/Makefile doc/ja/Makefile doc/ko/Makefile @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 01-May-2010 07:19:53
Branch: rpm-5_3 Handle: 2010050105194901
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac devtool.conf
Log:
- jbj: tests: "make check" for ununtu 10.04 passes.
Summary:
RevisionChanges Path
1.3296.2.22 +1 -0 rpm/CHANGES
2.432.2.9 +1 -1 rpm/configure.ac
2.333.2.9 +64 -0 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.21 -r1.3296.2.22 CHANGES
--- rpm/CHANGES 30 Apr 2010 22:41:53 - 1.3296.2.21
+++ rpm/CHANGES 1 May 2010 05:19:50 - 1.3296.2.22
@@ -1,4 +1,5 @@
5.3a1 -> 5.3b1
+- jbj: tests: "make check" for ununtu 10.04 passes.
- jbj: perl: repair "make test" by changing the tests.
- jbj: dist: don't bother distributing tbdb.c
- jbj: lua: fix: attempt to create %{pkgbindir} if it doesn't exists.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.8 -r2.432.2.9 configure.ac
--- rpm/configure.ac 27 Apr 2010 16:17:28 - 2.432.2.8
+++ rpm/configure.ac 1 May 2010 05:19:49 - 2.432.2.9
@@ -1492,7 +1492,7 @@
WITH_TCL_SUBDIR=""
RPM_CHECK_LIB(
[Tcl], [tcl],
-[tcl], [Tcl_CreateInterp], [tcl.h],
+[tcl8.5 tcl], [Tcl_CreateInterp], [tcl.h],
[no,external:none], [],
[
], [])
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.333.2.8 -r2.333.2.9 devtool.conf
--- rpm/devtool.conf 28 Apr 2010 14:30:27 - 2.333.2.8
+++ rpm/devtool.conf 1 May 2010 05:19:50 - 2.333.2.9
@@ -331,6 +331,70 @@
--enable-build-debug \
--enable-maintainer-mode
+# ubuntu 10.04 Lucid Lynx
+%ubuntu10
+%autogen
+%configure \
+--verbose \
+--prefix=/usr \
+--with-db=internal \
+--with-db-sql \
+--with-db-tools-integrated \
+--with-zlib=external \
+--with-bzip2=external \
+--with-xz=internal \
+--with-file=internal \
+--with-lua=internal \
+--with-tcl \
+--with-sqlite=external \
+--with-syck=internal \
+--with-readline=external \
+--without-augeas \
+--with-beecrypt=external \
+--with-openssl=external \
+--with-nss=external \
+--with-gcrypt=external \
+--with-expat=external \
+--with-libtasn1=external \
+--with-pakchois=external \
+--with-gnutls=external \
+--with-neon=external \
+--with-pcre=internal \
+--without-uuid \
+--with-attr \
+--with-acl \
+--with-xar=internal \
+--with-popt=external \
+--with-keyutils=external \
+--with-pthreads \
+--with-libelf \
+--without-cudf \
+--without-ficl \
+--without-aterm \
+--without-nix \
+--without-bash \
+--without-rc \
+--without-js \
+--without-gpsee \
+--with-python \
+--with-pythonembed=/usr/lib:/usr/include/python2.6 \
+--with-perl \
+--without-perlembed \
+--without-ruby \
+--without-selinux \
+--without-sepol \
+--without-semanage \
+--without-squirrel \
+--with-build-extlibdep \
+--with-build-maxextlibdep \
+--with-valgrind \
+--disable-openmp \
+--enable-build-pic \
+--enable-build-versionscript \
+--enable-build-warnings \
+--enable-build-debug \
+--enable-maintainer-mode
+
# CC=ccache env UMASK=022 distcc cc
# CFLAGS=-O2 -g -m32 -march=pentium-mmx -fasynchronous-unwind-tables
-I/usr/include/python2.5 -I/usr/include/beecrypt
# CXX=ccache env UMASK=022 distcc g++
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac system.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 22-Sep-2010 22:27:32 Branch: rpm-5_3 Handle: 2010092220273101 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac system.h Log: - macosx: avoid uuid_t typedef, permit --with-uuid. - macosx: add -fnested-functions (when available). Summary: RevisionChanges Path 1.3296.2.79 +2 -0 rpm/CHANGES 2.432.2.19 +5 -1 rpm/configure.ac 2.128.2.1 +2 -0 rpm/system.h patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.78 -r1.3296.2.79 CHANGES --- rpm/CHANGES 21 Sep 2010 22:08:47 - 1.3296.2.78 +++ rpm/CHANGES 22 Sep 2010 20:27:31 - 1.3296.2.79 @@ -1,4 +1,6 @@ 5.3.3 -> 5.3.4: +- jbj: macosx: avoid uuid_t typedef, permit --with-uuid. +- jbj: macosx: add -fnested-functions (when available). - jbj: i18n: update po files (Translation Project). - jbj: ruby: stick with ruby-1.8.6 (1.9.2p0 needs work). - jbj: yarn: add yarnLaunchStack() to create a yarnThread with a stack. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.18 -r2.432.2.19 configure.ac --- rpm/configure.ac 21 Sep 2010 15:54:12 - 2.432.2.18 +++ rpm/configure.ac 22 Sep 2010 20:27:32 - 2.432.2.19 @@ -188,7 +188,7 @@ dnl # -fno-delete-null-pointer as the kernel does http://patchwork.kernel.org/patch/36060/ if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then dnl # GNU GCC (usually "gcc") - for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions + for c in -fno-delete-null-pointer-checks -D_FORTIFY_SOURCE=2 -fstack-protector -fexceptions -fnested-functions do my_save_cflags="$CFLAGS" CFLAGS=$c @@ -1678,6 +1678,9 @@ fi dnl # OSSP uuid +dnl XXX hack-o-round typedef __darwin_uuid_t uuid_t; in Mac OS X +mv confdefs.h confdefs.h-SAVE +grep -v 'define HAVE_UNISTD_H' confdefs.h-SAVE > confdefs.h RPM_CHECK_LIB( [OSSP uuid], [uuid], [ossp-uuid uuid], [uuid_import], [uuid.h], @@ -1687,6 +1690,7 @@ WITH_LUA_SUBDIR_DEF="$WITH_LUA_SUBDIR_DEF -DLUA_USE_UUID" fi ], []) +mv confdefs.h-SAVE confdefs.h dnl # Syck RPM_CHECK_LIB( @@ . patch -p0 <<'@@ .' Index: rpm/system.h $ cvs diff -u -r2.128 -r2.128.2.1 system.h --- rpm/system.h 21 Mar 2010 00:34:58 - 2.128 +++ rpm/system.h 22 Sep 2010 20:27:32 - 2.128.2.1 @@ -61,7 +61,9 @@ /* should be included before any preprocessor test of _POSIX_VERSION. */ #ifdef HAVE_UNISTD_H +#define uuid_t unistd_uuid_t /* XXX Mac OS X dares to be different. */ #include +#undef unistd_uuid_t /* XXX Mac OS X dares to be different. */ #if defined(__LCLINT__) /*...@-superuser -declundef -incondefs @*/ /* LCL: modifies clause missing */ extern int chroot (const char *__path) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac devtool.conf
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 06-May-2011 17:37:26
Branch: rpm-5_3 Handle: 2011050615372500
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac devtool.conf
Log:
add preliminary change for momonga buildboot
Summary:
RevisionChanges Path
1.3296.2.222+1 -0 rpm/CHANGES
2.432.2.57 +2 -1 rpm/configure.ac
2.333.2.76 +74 -0 rpm/devtool.conf
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.221 -r1.3296.2.222 CHANGES
--- rpm/CHANGES 6 May 2011 15:16:07 - 1.3296.2.221
+++ rpm/CHANGES 6 May 2011 15:37:25 - 1.3296.2.222
@@ -1,4 +1,5 @@
5.3.11 -> 5.3.12
+- devzero2000: add preliminary change for momonga buildboot
- devzero2000: fix typo in repackage_dir for macros/openmamba.in
- devzero2000: fix bugurl for macros/openmamba.in
- mdawkins: a few fixes for macros/openmamba.in
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.56 -r2.432.2.57 configure.ac
--- rpm/configure.ac 2 May 2011 04:36:28 - 2.432.2.56
+++ rpm/configure.ac 6 May 2011 15:37:25 - 2.432.2.57
@@ -1951,7 +1951,8 @@
esac
RPMCANONVENDOR="$target_vendor"
case "${target_vendor}" in
-unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark)
+unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark|momonga)
+ test -f /etc/momonga-release && RPMCANONVENDOR=momonga
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
test -f /etc/pld-release && RPMCANONVENDOR=pld
test -f /etc/mandriva-release &&RPMCANONVENDOR=mandriva
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.333.2.75 -r2.333.2.76 devtool.conf
--- rpm/devtool.conf 31 Mar 2011 22:57:44 - 2.333.2.75
+++ rpm/devtool.conf 6 May 2011 15:37:25 - 2.333.2.76
@@ -1436,6 +1436,80 @@
--without-xar \
--without-keyutils
+# momonga 7 (FC14 derived i think)
+%momonga
+%autogen
+%configure \
+--verbose \
+--prefix=/usr \
+--enable-shared \
+--with-db \
+--with-dbsql \
+--without-db-tools-integrated \
+--with-zlib \
+--with-bzip2 \
+--with-xz \
+--with-file \
+--with-path-magic=/usr/share/file/magic \
+--with-lua=internal \
+--with-tcl \
+--without-sqlite \
+--with-syck=internal \
+--with-readline \
+--without-augeas \
+--with-beecrypt=internal \
+--without-java \
+--with-openssl \
+--with-nss \
+--with-gcrypt \
+--without-tomcrypt \
+--without-tpm \
+--without-libtasn1 \
+--without-pakchois \
+--without-gnutls \
+--with-neon=internal \
+--without-libproxy \
+--with-expat \
+--with-pcre \
+--enable-utf8 \
+--without-uuid \
+--with-attr \
+--with-acl \
+--without-xar \
+--with-popt \
+--with-keyutils \
+--with-pthreads \
+--with-libelf \
+--without-cudf \
+--without-ficl \
+--without-aterm \
+--without-nix \
+--without-bash \
+--without-rc \
+--without-js \
+--without-gpsee \
+--with-python \
+--with-pythonembed=/usr/lib:/usr/include/python2.6 \
+--with-perl \
+--without-perlembed \
+--with-ruby \
+--without-selinux \
+--without-sepol \
+--without-semanage \
+--without-squirrel \
+--with-build-extlibdep \
+--with-build-maxextlibdep \
+--with-valgrind \
+--enable-build-pic \
+--enable-build-versionscript \
+--enable-build-warnings \
+--enable-build-debug \
+--with-vendor=fedora \
+--enable-rpmvercmp-digits-beat-alpha \
+--enable-maintainer-mode \
+--enable-rpm-lua-extensions-based-on-rpmlib \
+
--with-extra-path-macros=/usr/lib/rpm/macros:/usr/lib/rpm/%{_target}/mac
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm.spec.in
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 02-Jun-2011 19:22:48
Branch: rpm-5_3 Handle: 2011060217224700
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac rpm.spec.in
Log:
updated changelog in rpm.spec.in
tagged 5.3.12 release in configure.ac
Submitted by: mdawkins
Summary:
RevisionChanges Path
1.3296.2.235+4 -0 rpm/CHANGES
2.432.2.61 +2 -2 rpm/configure.ac
2.456.4.9 +3 -0 rpm/rpm.spec.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.234 -r1.3296.2.235 CHANGES
--- rpm/CHANGES 23 May 2011 12:37:23 - 1.3296.2.234
+++ rpm/CHANGES 2 Jun 2011 17:22:47 - 1.3296.2.235
@@ -1,3 +1,7 @@
+5.3.12 -> 5.3.13
+ - mdawkins: updated changelog in rpm.spec.in
+- mdawkins: tagged 5.3.12 release in configure.ac
+
5.3.11 -> 5.3.12
- devzero2000: added missing ac_config_files per openmamba vendor macro
- devzero2000: Sort file list for debuginfo extraction.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.60 -r2.432.2.61 configure.ac
--- rpm/configure.ac 23 May 2011 12:37:24 - 2.432.2.60
+++ rpm/configure.ac 2 Jun 2011 17:22:47 - 2.432.2.61
@@ -8,8 +8,8 @@
AC_PREREQ(2.63)
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
-AC_INIT([rpm],[5.3.11],[PACKAGE_BUGREPORT_DEFAULT])
-PACKAGE_TIMESTAMP="2011-05-02" dnl # [-MM[-DD[ HH[:MM
+AC_INIT([rpm],[5.3.12],[PACKAGE_BUGREPORT_DEFAULT])
+PACKAGE_TIMESTAMP="2011-06-02" dnl # [-MM[-DD[ HH[:MM
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
AC_MSG_HEADER([INITIALIZATION])
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpm.spec.in
$ cvs diff -u -r2.456.4.8 -r2.456.4.9 rpm.spec.in
--- rpm/rpm.spec.in 11 May 2011 12:53:33 - 2.456.4.8
+++ rpm/rpm.spec.in 2 Jun 2011 17:22:47 - 2.456.4.9
@@ -657,6 +657,9 @@
###%{_rpmhome}/lib/librpmjsm.so
%changelog
+* Thu Jun 02 2011 mdawkins 5.3.12-0.20110602
+- new snapshot date 20110602 for release 5.3.12
+
* Fri Apr 01 2011 mdawkins 5.3.9-0.20110401
- new snapshot date 20110401 for release 5.3.9
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/scripts/ Makefile.am...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 19-Sep-2010 05:28:52
Branch: rpm-5_3 Handle: 2010091903285001
Added files: (Branch: rpm-5_3)
rpm/scripts ruby-config wdj_srpm_mongo
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/scripts Makefile.am
Log:
- autofu: hot-wire ruby-1.9.2p0 embedding.
- ruby: add a ruby-config helper for RPM_CHECK_LIB().
Summary:
RevisionChanges Path
1.3296.2.74 +2 -0 rpm/CHANGES
2.432.2.17 +1 -4 rpm/configure.ac
1.65.2.2+3 -3 rpm/scripts/Makefile.am
1.1.2.1 +57 -0 rpm/scripts/ruby-config
1.1.2.2 +25 -0 rpm/scripts/wdj_srpm_mongo
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.73 -r1.3296.2.74 CHANGES
--- rpm/CHANGES 18 Sep 2010 19:47:28 - 1.3296.2.73
+++ rpm/CHANGES 19 Sep 2010 03:28:50 - 1.3296.2.74
@@ -1,4 +1,6 @@
5.3.3 -> 5.3.4:
+- jbj: autofu: hot-wire ruby-1.9.2p0 embedding.
+- jbj: ruby: add a ruby-config helper for RPM_CHECK_LIB().
- jbj: tests: mark mtree breakage on rhel6 for fixing.
- jbj: mongo: handle endianness at runtime, remove MONGO_BIG_ENDIAN.
- jbj: mongo: replace internal md5 digest with rpmDigestInit().
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.16 -r2.432.2.17 configure.ac
--- rpm/configure.ac 18 Sep 2010 18:25:03 - 2.432.2.16
+++ rpm/configure.ac 19 Sep 2010 03:28:51 - 2.432.2.17
@@ -1484,17 +1484,14 @@
dnl # Ruby
WITH_RUBY_SUBDIR=""
-WITH_RUBY_CPPFLAGS=""
RPM_CHECK_LIB(
[Ruby], [ruby],
-[ruby], [ruby_init], [ruby.h],
+[ruby-static], [ruby_init], [ruby.h],
[no,external:none], [],
[ AC_DEFINE(WITH_RUBYEMBED, 1, [Define to 1 if you want embedded Ruby])
WITH_RUBY_SUBDIR=ruby
- WITH_RUBY_CPPFLAGS="-I`ruby -rrbconfig -e 'puts
RbConfig::expand(RbConfig::CONFIG[[\"rubyhdrdir\"]])'` -I`ruby -rrbconfig -e
'puts RbConfig::expand(\"#{RbConfig::CONFIG[\"rubyhdrdir\"]}/$(arch)\")'`"
], [])
AC_SUBST(WITH_RUBY_SUBDIR)
-AC_SUBST(WITH_RUBY_CPPFLAGS)
dnl # Squirrel
RPM_CHECK_LIB(
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
$ cvs diff -u -r1.65.2.1 -r1.65.2.2 Makefile.am
--- rpm/scripts/Makefile.am 24 May 2010 11:33:12 - 1.65.2.1
+++ rpm/scripts/Makefile.am 19 Sep 2010 03:28:51 - 1.65.2.2
@@ -27,10 +27,10 @@
php.prov php.req rpm2cpio \
rpmdb_loadcvt rpmdiff rpmdiff.cgi \
rpm.daily rpm.log rpm.xinetd \
- rpmsort rt-reloc-wrapper.sh symset-table \
+ rpmsort rt-reloc-wrapper.sh ruby-config symset-table \
sql.prov sql.req symclash.py symclash.sh tcl.req tgpg trpm u_pkg.sh \
vcheck vpkg-provides.sh vpkg-provides2.sh \
- wdj_srpm \
+ wdj_srpm wdj_srpm_mongo \
wnh_filelists_yaml wnh_other_yaml wnh_primary_yaml \
xiu_stdenv \
yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
@@ -71,7 +71,7 @@
deb_Packages deb_Sources \
deb_control deb_md5sums deb_postinst deb_postrm deb_preinst deb_prerm \
nix_meta \
- wdj_srpm \
+ wdj_srpm wdj_srpm_mongo \
wnh_filelists_yaml wnh_other_yaml wnh_primary_yaml \
xiu_stdenv \
yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/ruby-config
$ cvs diff -u -r0 -r1.1.2.1 ruby-config
--- /dev/null 2010-09-19 05:22:01.0 +0200
+++ ruby-config 2010-09-19 05:28:52.371608970 +0200
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+prefix=/usr/lib/rpm
+exec_prefix=/usr/lib/rpm
+exec_prefix_set=no
+includedir="${prefix}/include"
+libdir="${prefix}/lib"
+version=1.9.1
+platform=i686-linux
+
+usage="\
+Usage: ruby-config [--prefix] [--exec-prefix] [--version] [--cppflags]
[--libs]"
+
+if test $# -eq 0; then
+ echo "${usage}" 1>&2
+ exit 1
+fi
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case $1 in
+--prefix=*)
+ prefix=$optarg
+ if test $exe
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac devtool.conf rpm/rpmio/ ...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 21-Sep-2010 17:54:13
Branch: rpm-5_3 Handle: 2010092115541101
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac devtool.conf
rpm/rpmio rpmruby.c
Log:
- ruby: stick with ruby-1.8.6 (1.9.2p0 needs work).
- yarn: add yarnLaunchStack() to create a yarnThread with a stack.
Summary:
RevisionChanges Path
1.3296.2.77 +2 -1 rpm/CHANGES
2.432.2.18 +1 -1 rpm/configure.ac
2.333.2.22 +1 -1 rpm/devtool.conf
2.12.2.10 +23 -14 rpm/rpmio/rpmruby.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.76 -r1.3296.2.77 CHANGES
--- rpm/CHANGES 20 Sep 2010 18:17:34 - 1.3296.2.76
+++ rpm/CHANGES 21 Sep 2010 15:54:11 - 1.3296.2.77
@@ -1,5 +1,6 @@
5.3.3 -> 5.3.4:
-- yarn: add yarnLaunchStack() to create a yarnThread with a stack.
+- jbj: ruby: stick with ruby-1.8.6 (1.9.2p0 needs work).
+- jbj: yarn: add yarnLaunchStack() to create a yarnThread with a stack.
- jbj: ruby: don't load stringio for now, there's a segfault here.
- jbj: ruby: wire-up a global interpreter always.
- jbj: autofu: hot-wire ruby-1.9.2p0 embedding.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.17 -r2.432.2.18 configure.ac
--- rpm/configure.ac 19 Sep 2010 03:28:51 - 2.432.2.17
+++ rpm/configure.ac 21 Sep 2010 15:54:12 - 2.432.2.18
@@ -1486,7 +1486,7 @@
WITH_RUBY_SUBDIR=""
RPM_CHECK_LIB(
[Ruby], [ruby],
-[ruby-static], [ruby_init], [ruby.h],
+[ruby], [ruby_init], [ruby.h],
[no,external:none], [],
[ AC_DEFINE(WITH_RUBYEMBED, 1, [Define to 1 if you want embedded Ruby])
WITH_RUBY_SUBDIR=ruby
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
$ cvs diff -u -r2.333.2.21 -r2.333.2.22 devtool.conf
--- rpm/devtool.conf 18 Sep 2010 22:03:51 - 2.333.2.21
+++ rpm/devtool.conf 21 Sep 2010 15:54:12 - 2.333.2.22
@@ -129,7 +129,7 @@
--with-pythonembed=/usr/lib:/usr/include/python2.6 \
--with-perl \
--without-perlembed \
---with-ruby=/usr/lib/ruby/1.8/i386-linux \
+ --with-ruby \
--with-selinux \
--with-sepol \
--with-semanage \
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmruby.c
$ cvs diff -u -r2.12.2.9 -r2.12.2.10 rpmruby.c
--- rpm/rpmio/rpmruby.c 20 Sep 2010 19:27:05 - 2.12.2.9
+++ rpm/rpmio/rpmruby.c 21 Sep 2010 15:54:12 - 2.12.2.10
@@ -1,7 +1,7 @@
#include "system.h"
-#include
-/* XXX grrr, ruby.h includes its own config.h too. */
+#if defined(WITH_RUBYEMBED)
+/* XXX ruby-1.8.6 grrr, ruby.h includes its own config.h too. */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -11,7 +11,6 @@
#undef PACKAGE_STRING
#undef PACKAGE_BUGREPORT
-#if defined(WITH_RUBYEMBED)
#undef xmalloc
#undef xcalloc
#undef xrealloc
@@ -39,6 +38,7 @@
rpmruby _rpmrubyI = NULL;
/*==*/
+#if defined(HAVE_RUBY_DEFINES_H) /* XXX ruby-1.9.2p0 */
/* puts the Ruby coroutine in control */
static void _rpmruby_main_to_ruby(rpmruby ruby)
{
@@ -155,11 +155,13 @@
Trace((zlog, "-- %s: ended", __FUNCTION__));
return NULL;
}
+#endif /* HAVE_RUBY_DEFINES_H */
int rpmrubyRunThread(rpmruby ruby)
{
int ec = 0;
+#if defined(HAVE_RUBY_DEFINES_H) /* XXX ruby-1.9.2p0 */
yarnPossess(ruby->ruby_coroutine_lock);
yarnPossess(ruby->main_coroutine_lock);
@@ -177,6 +179,8 @@
yarnRelease(ruby->ruby_coroutine_lock);
/* Reap the ruby thread. */
ruby->thread = yarnJoin(ruby->thread);
+ec = 0;
+#endif /* HAVE_RUBY_DEFINES_H */
return ec;
}
@@ -191,9 +195,12 @@
/* XXX FIXME: 0x4000 => xruby.c wrapper without interpreter. */
if (ruby->flags & 0x4000) {
- ruby->zlog = rpmzLogDump(ruby->zlog, NULL);
ruby->main_coroutine_lock = yarnFreeLock(ruby->main_coroutine_lock);
ruby->ruby_coroutine_l
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/rpmio/ rpmbc.h
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 18-Oct-2010 07:18:47 Branch: rpm-5_3 Handle: 2010101805184601 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac rpm/rpmio rpmbc.h Log: - beecrypt: fix: polluted builds due to my brain fart. revert. Summary: RevisionChanges Path 1.3296.2.101+1 -0 rpm/CHANGES 2.432.2.30 +1 -1 rpm/configure.ac 2.7.2.4 +20 -20 rpm/rpmio/rpmbc.h patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.100 -r1.3296.2.101 CHANGES --- rpm/CHANGES 18 Oct 2010 04:22:04 - 1.3296.2.100 +++ rpm/CHANGES 18 Oct 2010 05:18:46 - 1.3296.2.101 @@ -1,4 +1,5 @@ 5.3.4 -> 5.3.5: +- jbj: beecrypt: fix: polluted builds due to my brain fart. revert. - jbj: popt: permit builds with --with-popt=internal all over again. todo++. - jbj: tests: fix: eliminate the need to jump start "make check" by copy macros from within tree to /usr/lib/rpm. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.29 -r2.432.2.30 configure.ac --- rpm/configure.ac 18 Oct 2010 04:22:04 - 2.432.2.29 +++ rpm/configure.ac 18 Oct 2010 05:18:46 - 2.432.2.30 @@ -1225,7 +1225,7 @@ RPM_CHECK_LIB( [BeeCrypt], [beecrypt], [beecrypt], [mpfprintln], [beecrypt/api.h], -[yes,internal:external], [beecrypt:include/beecrypt], +[yes,internal:external], [beecrypt:include], [], [ AC_MSG_ERROR([mandatory BeeCrypt library not found]) ]) if test ".$WITH_BEECRYPT" = .no; then AC_MSG_ERROR([BEECRYPT is mandatory]) @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmbc.h $ cvs diff -u -r2.7.2.3 -r2.7.2.4 rpmbc.h --- rpm/rpmio/rpmbc.h 17 Oct 2010 18:24:28 - 2.7.2.3 +++ rpm/rpmio/rpmbc.h 18 Oct 2010 05:18:47 - 2.7.2.4 @@ -5,32 +5,32 @@ * \file rpmio/rpmbc.h */ -#include +#include #include #include #include /* Drag in the beecrypt includes. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /** */ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/lib/ depends.c
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Pinto Elia
Root: /v/rpm/cvs Email: devzero2...@rpm5.org
Module: rpm Date: 25-Feb-2011 10:28:26
Branch: rpm-5_3 Handle: 2011022509282501
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/lib depends.c
Log:
permit in configure phase to enable the
optional-dirname-and-symlink-deps used by Mandriva and Ark today
(ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
Summary:
RevisionChanges Path
1.3296.2.165+3 -0 rpm/CHANGES
2.432.2.47 +13 -0 rpm/configure.ac
1.461.2.2 +4 -4 rpm/lib/depends.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.164 -r1.3296.2.165 CHANGES
--- rpm/CHANGES 24 Feb 2011 19:33:49 - 1.3296.2.164
+++ rpm/CHANGES 25 Feb 2011 09:28:25 - 1.3296.2.165
@@ -1,4 +1,7 @@
5.3.8 -> 5.3.9:
+- devzero2000: permit in configure phase to enable the
+ optional-dirname-and-symlink-deps used by Mandriva and Ark today
+ (ref
https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu)
- proyvind: use expanded %{___NVRA} for 'rpm --last'.
- devzero2000: merge Suse patch. Set "%_specfile" macro in the build so
that people can
do specfile manipulation/data extraction in the build.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.46 -r2.432.2.47 configure.ac
--- rpm/configure.ac 9 Jan 2011 03:58:11 - 2.432.2.46
+++ rpm/configure.ac 25 Feb 2011 09:28:25 - 2.432.2.47
@@ -351,6 +351,19 @@
[ENABLE_BUILD_LAFILES],
[test ".$do_build_lafiles" = .yes])
+dnl # optional sysmlink and parentdir dependency
+AC_ARG_ENABLE(
+[dirname-and-symlink-deps],
+AS_HELP_STRING([--disable-dirname-and-symlink-deps],[permit to disable
via macro the automatic dirname and symlink dependecy]),
+[ do_optional_dirname_and_symlink_deps=$enableval ],
+[ do_optional_dirname_and_symlink_deps=yes ])
+
+AS_IF([test "x$do_optional_dirname_and_symlink_deps" != xyes],
+ [
+ AC_DEFINE([RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS],[1],[permit to disable
via macro the automatic dirname and symlink dependecy])
+ ])
+
+
dnl # FIXME: partly Linux-specific only!?
dnl # (but at least it usually doesn't harm on other platforms)
CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT"
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
$ cvs diff -u -r1.461.2.1 -r1.461.2.2 depends.c
--- rpm/lib/depends.c 8 Jan 2011 23:12:14 - 1.461.2.1
+++ rpm/lib/depends.c 25 Feb 2011 09:28:26 - 1.461.2.2
@@ -1569,7 +1569,7 @@
int terminate = 2; /* XXX terminate if rc >= terminate */
int rc;
int ourrc = 0;
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
int dirname_deps;
int symlink_deps;
#endif
@@ -1648,7 +1648,7 @@
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
dirname_deps =
rpmExpandNumeric("%{?_check_dirname_deps}%{?!_check_dirname_deps:1}");
if (dirname_deps) {
#endif
@@ -1692,7 +1692,7 @@
/*@switchbreak@*/ break;
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
}
symlink_deps =
rpmExpandNumeric("%{?_check_symlink_deps}%{?!_check_symlink_deps:1}");
@@ -1740,7 +1740,7 @@
/*@switchbreak@*/ break;
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
}
#endif
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/lib/ rpmluaext.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 25-Mar-2011 17:24:57 Branch: rpm-5_3 Handle: 2011032516245601 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac rpm/lib rpmluaext.c Log: permit in configure phase to enable the --enable-rpm-lua-extensions-based-on-rpmlib used by OpenPKG today and, for rpm.vercmp, by rpm.org (ref https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu) Submitted by: Elia Pinto Summary: RevisionChanges Path 1.3296.2.178+3 -0 rpm/CHANGES 2.432.2.50 +12 -0 rpm/configure.ac 2.8.4.1 +1 -1 rpm/lib/rpmluaext.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.177 -r1.3296.2.178 CHANGES --- rpm/CHANGES 23 Mar 2011 20:51:31 - 1.3296.2.177 +++ rpm/CHANGES 25 Mar 2011 16:24:56 - 1.3296.2.178 @@ -1,4 +1,7 @@ 5.3.9 -> 5.3.10 +- devzero2000: permit in configure phase to enable the + --enable-rpm-lua-extensions-based-on-rpmlib used by OpenPKG today + and, for rpm.vercmp, by rpm.org (ref https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu) - proyvind: always run %clean so it won't be required in .spec file. - jbj: checksig: check explictly for per-item failures after iterating. - jbj: install: check explictly for per-item failures after iterating. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.49 -r2.432.2.50 configure.ac --- rpm/configure.ac 24 Mar 2011 22:44:31 - 2.432.2.49 +++ rpm/configure.ac 25 Mar 2011 16:24:56 - 2.432.2.50 @@ -364,6 +364,18 @@ ]) +dnl # Adds RPM Lua extensions based on rpmlib functionality +AC_ARG_ENABLE( +[rpm-lua-extensions-based-on-rpmlib], +AS_HELP_STRING([--enable-rpm-lua-extensions-based-on-rpmlib],[Adds RPM Lua extensions based on rpmlib functionality (default:no)]), +[ do_rpm_lua_extensions_based_on_rpmlib=$enableval ], +[ do_rpm_lua_extensions_based_on_rpmlib=no ]) + +AS_IF([test "x$do_rpm_lua_extensions_based_on_rpmlib" != xno], + [ + AC_DEFINE([RPM_LUA_EXTENSIONS_BASED_ON_RPMLIB],[1],[Adds RPM Lua extensions based on rpmlib functionality]) + ]) + dnl # FIXME: partly Linux-specific only!? dnl # (but at least it usually doesn't harm on other platforms) CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT" @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmluaext.c $ cvs diff -u -r2.8 -r2.8.4.1 rpmluaext.c --- rpm/lib/rpmluaext.c 26 Mar 2009 18:07:31 - 2.8 +++ rpm/lib/rpmluaext.c 25 Mar 2011 16:24:57 - 2.8.4.1 @@ -2,7 +2,7 @@ * \file lib/rpmluaext.c */ -#if defined(RPM_VENDOR_OPENPKG) /* rpm-lua-extensions-based-on-rpm-lib-functionality */ +#if defined(RPM_VENDOR_OPENPKG) || defined(RPM_LUA_EXTENSIONS_BASED_ON_RPMLIB) /* rpm-lua-extensions-based-on-rpm-lib-functionality */ #include "system.h" @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/rpmdb/ rpmevr.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 20-Apr-2011 18:17:09 Branch: rpm-5_3 Handle: 2011042016170801 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac rpm/rpmdb rpmevr.c Log: permit in configure phase to --enable-rpmvercmp-digits-beat-alpha for reverting to the old rpmvercmp behavior where digits beat alpha as used by Mandriva, Fedora, Suse and other (ref https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu) Summary: RevisionChanges Path 1.3296.2.215+4 -0 rpm/CHANGES 2.432.2.55 +13 -0 rpm/configure.ac 1.36.2.3+1 -1 rpm/rpmdb/rpmevr.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.214 -r1.3296.2.215 CHANGES --- rpm/CHANGES 20 Apr 2011 11:00:34 - 1.3296.2.214 +++ rpm/CHANGES 20 Apr 2011 16:17:08 - 1.3296.2.215 @@ -1,4 +1,8 @@ 5.3.10 -> 5.3.11 +- devzero2000: permit in configure phase to + --enable-rpmvercmp-digits-beat-alpha for reverting to the old rpmvercmp + behavior where digits beat alpha as used by Mandriva, Fedora, Suse + and other (ref https://blueprints.launchpad.net/rpm/+spec/rpm-split-vendor-config-in-autofu) - proyvind: add a uClibc(...) dependency for libraries linked against uClibc to avoid conflicting duplicates (mandriva only for now) - devzero2000: get rid of rindex everywhere: use SUSv3 strrchr instead @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.54 -r2.432.2.55 configure.ac --- rpm/configure.ac 10 Apr 2011 10:57:59 - 2.432.2.54 +++ rpm/configure.ac 20 Apr 2011 16:17:08 - 2.432.2.55 @@ -376,6 +376,19 @@ AC_DEFINE([RPM_LUA_EXTENSIONS_BASED_ON_RPMLIB],[1],[Adds RPM Lua extensions based on rpmlib functionality]) ]) +dnl # Permit to revert to the old rpmvercmp behavior where digits beat alpha +dnl # called in VENDOR old-comparision-behaviour +AC_ARG_ENABLE( +[rpmvercmp-digits-beat-alpha], +AS_HELP_STRING([--enable-rpmvercmp-digits-beat-alpha],[Permit in RPM version comparison that digits beat alpha (default:no)]), +[ do_rpmvercmp_digits_beat_alpha=$enableval ], +[ do_rpmvercmp_digits_beat_alpha=no ]) + +AS_IF([test "x$do_rpmvercmp_digits_beat_alpha" != xno], + [ + AC_DEFINE([RPMVERCMP_DIGITS_BEAT_ALPHA],[1],[Permit in RPM version comparison that digits beat alpha]) + ]) + dnl # FIXME: partly Linux-specific only!? dnl # (but at least it usually doesn't harm on other platforms) CFLAGS="$CFLAGS -D_GNU_SOURCE -D_REENTRANT" @@ . patch -p0 <<'@@ .' Index: rpm/rpmdb/rpmevr.c $ cvs diff -u -r1.36.2.2 -r1.36.2.3 rpmevr.c --- rpm/rpmdb/rpmevr.c17 Jan 2011 11:28:06 - 1.36.2.2 +++ rpm/rpmdb/rpmevr.c20 Apr 2011 16:17:09 - 1.36.2.3 @@ -48,7 +48,7 @@ /* XXX Force digits to beat alphas. See bugzilla #50977. */ /*@unchecked@*/ -#if defined(RPM_VENDOR_MANDRIVA) /* old-comparision-behaviour */ +#if defined(RPM_VENDOR_MANDRIVA) || defined(RPMVERCMP_DIGITS_BEAT_ALPHA) /* old-comparision-behaviour */ static int _invert_digits_alphas_comparison = -1; #else static int _invert_digits_alphas_comparison = 1; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/tools/ dbconvert.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Pinto Elia Root: /v/rpm/cvs Email: devzero2...@rpm5.org Module: rpm Date: 28-Jun-2011 14:31:12 Branch: rpm-5_3 Handle: 2011062812311101 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac rpm/tools dbconvert.c Log: merge from HEAD afb patch portability of endian Summary: RevisionChanges Path 1.3296.2.241+1 -0 rpm/CHANGES 2.432.2.62 +2 -2 rpm/configure.ac 2.1.4.5 +10 -1 rpm/tools/dbconvert.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.240 -r1.3296.2.241 CHANGES --- rpm/CHANGES 28 Jun 2011 12:03:34 - 1.3296.2.240 +++ rpm/CHANGES 28 Jun 2011 12:31:11 - 1.3296.2.241 @@ -1,4 +1,5 @@ 5.3.12 -> 5.3.13 +- devzero2000: merge afb patch portability of endian - proyvind: check-multiarch-files: remove unnecessary import of MDK::Common, causing undesired dependency from perl dependency generator. - proyvind: fix broken %optflags for i686-linux macros. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.61 -r2.432.2.62 configure.ac --- rpm/configure.ac 2 Jun 2011 17:22:47 - 2.432.2.61 +++ rpm/configure.ac 28 Jun 2011 12:31:11 - 2.432.2.62 @@ -628,8 +628,8 @@ dnl # standard headers (generic) AC_CHECK_HEADERS([dnl fcntl.h getopt.h grp.h memory.h netdb.h pwd.h utime.h dnl -signal.h sys/ipc.h sys/socket.h sys/select.h sys/time.h dnl -sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl +signal.h sys/endian.h sys/ipc.h sys/socket.h sys/select.h dnl +sys/time.h sys/types.h sys/stdtypes.h sys/mman.h sys/resource.h dnl sys/utsname.h sys/prctl.h sys/wait.h netinet/in_systm.h dnl machine/types.h mntent.h sys/mnttab.h sys/systemcfg.h dnl sys/param.h sys/mount.h sys/mntctl.h sys/vmount.h dnl @@ . patch -p0 <<'@@ .' Index: rpm/tools/dbconvert.c $ cvs diff -u -r2.1.4.4 -r2.1.4.5 dbconvert.c --- rpm/tools/dbconvert.c 10 Apr 2011 10:17:22 - 2.1.4.4 +++ rpm/tools/dbconvert.c 28 Jun 2011 12:31:12 - 2.1.4.5 @@ -18,9 +18,18 @@ #include #include +#ifdef HAVE_SYS_ENDIAN_H +#include +#endif +#ifdef __APPLE__ +#include + +#define htobe32(x) OSSwapHostToBigInt32(x) +#define htole32(x) OSSwapHostToLittleInt32(x) +#endif /* __APPLE__ */ #if BYTE_ORDER == LITTLE_ENDIAN #define bswap32(x) htobe32(x) -#elif __BYTE_ORDER == BIG_ENDIAN +#elif BYTE_ORDER == BIG_ENDIAN #define bswap32(x) htole32(x) #endif @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/db3/ configure rpm/ ...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 25-Apr-2010 14:40:47 Branch: rpm-5_3 Handle: 2010042512404502 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac devtool.conf rpm/db3 configure rpm/misclibrpmmisc.vers rpm/rpmdb Makefile.am db3.c rpm/tests/ref .alldigests rpm/tools .cvsignore Makefile.am db_tool.c Log: - upgrade from db-4.8.26 to db-5.0.21. Summary: RevisionChanges Path 1.3296.2.11 +1 -0 rpm/CHANGES 2.432.2.2 +17 -3 rpm/configure.ac 1.38.2.1+3 -1 rpm/db3/configure 2.333.2.4 +1 -1 rpm/devtool.conf 1.26.2.2+7 -0 rpm/misc/librpmmisc.vers 1.124.2.1 +20 -5 rpm/rpmdb/Makefile.am 1.150.2.1 +17 -80 rpm/rpmdb/db3.c 1.38.2.2+100 -100 rpm/tests/ref/.alldigests 1.48.2.1+3 -1 rpm/tools/.cvsignore 2.157.2.1 +21 -9 rpm/tools/Makefile.am 2.4.2.1 +20 -1 rpm/tools/db_tool.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.10 -r1.3296.2.11 CHANGES --- rpm/CHANGES 25 Apr 2010 12:27:06 - 1.3296.2.10 +++ rpm/CHANGES 25 Apr 2010 12:40:45 - 1.3296.2.11 @@ -1,4 +1,5 @@ 5.3a1 -> 5.3b1 +- jbj: upgrade from db-4.8.26 to db-5.0.21. - jbj: misc: expose st_foreach/st_free_table in loader maps. cpuinfo #ifdef? - jbj: tests: fix: invoke check-files from in-tree w "make check". - jbj: devtool: stub-in a configuration for Caixa Magica 14. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.1 -r2.432.2.2 configure.ac --- rpm/configure.ac 23 Apr 2010 17:48:51 - 2.432.2.1 +++ rpm/configure.ac 25 Apr 2010 12:40:45 - 2.432.2.2 @@ -1343,7 +1343,7 @@ DBLIBSRCS="" RPM_CHECK_LIB( [Berkeley-DB], [db], -[db-4.8 db], [db_create], [db.h], +[db-5.0 db], [db_create], [db.h], [yes,internal:external], [db3], [ DBLIBSRCS="$DBLIBSRCS db3.c" AM_CONDITIONAL(WITH_DB, [ true ]) @@ -1365,24 +1365,38 @@ fi ]) +dnl RPM_CHECK_LIB( +dnl [Berkeley DB SQL], [dbsql], +dnl [db_sql-5.0 db_sql], [sqlite3_open], [], +dnl [yes,internal:external:none], [db3/sql], +dnl [], +dnl []) + RPM_CHECK_LIB( [SQLite], [sqlite], [sqlite3], [sqlite3_open], [sqlite3.h], [no,external:none], [], [ DBLIBSRCS="$DBLIBSRCS sqlite.c" ], []) + DBLIBOBJS=`echo $DBLIBSRCS | sed -e "s/\.c/\.lo/g"` + AC_SUBST(DBLIBSRCS) AC_SUBST(DBLIBOBJS) + AC_ARG_WITH(db-largefile, AS_HELP_STRING([--with-db-largefile], [build Berkeley-DB with LARGEFILE support])) AC_ARG_WITH(db-mutex, AS_HELP_STRING([--with-db-mutex=ARG], [build Berkeley-DB with MUTEX type ARG])) AC_ARG_WITH(db-rpc, AS_HELP_STRING([--with-db-rpc], [build Berkeley-DB with RPC support])) -AC_ARG_WITH(db-sql, AS_HELP_STRING([--with-db-sql], [build Berkeley-DB with db_sql support (db-4.8.24 or later)])) AC_ARG_WITH(db-tools-integrated, AS_HELP_STRING([--with-db-tools-integrated], [install integrated Berkeley-DB tools])) + AM_CONDITIONAL(WITH_DB_RPC, test ".$with_db_rpc" = .yes) -AM_CONDITIONAL(WITH_DB_SQL, test ".$with_db_sql" = .yes) AM_CONDITIONAL(WITH_DB_TOOLS_INTEGRATED, test ".$with_db_tools_integrated" = .yes) +dnl # determine whether the db sqlite3 tool/library should be built +dnl XXX hot-wire --with-dbsql; --with-dbsql=external will need RPM_CHECK_LIB +AM_CONDITIONAL(WITH_DBSQL, true) +AM_CONDITIONAL(WITH_DBSQL_CODEGEN, true) + dnl # determine default RPM DB API and configuration DBAPI=0 case ".$DBLIBSRCS" in @@ . patch -p0 <<'@@ .' Index: rpm/db3/configure $ cvs diff -u -r1.38 -r1.38.2.1 configure --- rpm/db3/configure 21 Mar 2010 00:33:16 - 1.38 +++ rpm/db3/configure 25 Apr 2010 12:40:46 - 1.38.2.1 @@ -43,7 +43,9 @@ # XXX Berkeley DB fails to find a locking scheme if CC=g++ CC="$CC" CFLAGS="$CFLAGS" $db_dist/configure "$@" \ --enable-shared --enable-static \ - --with-uniquename=_rpmdb --srcdir=$db_dist || exit 1 + --with-crytography=yes \ + --enable-sql --enable-amalgamation --enable-sql_codegen \ + --
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/db3/ .cvsignore rpm/...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm xz Date: 27-Apr-2010 18:17:29 Branch: rpm-5_3 Handle: 201004271541252164 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac devtool.conf rpm/db3 .cvsignore rpm/tests/ref .alldigests manifest showrc Removed files:(Branch: rpm-5_3) xz/m4 ltversion.m4 Log: - tests: "make check" for RHEL6 beta passes. Summary: RevisionChanges Path 1.3296.2.16 +1 -0 rpm/CHANGES 2.432.2.8 +12 -1 rpm/configure.ac 1.14.2.1+4 -2 rpm/db3/.cvsignore 2.333.2.6 +34 -32 rpm/devtool.conf 1.38.2.4+100 -100 rpm/tests/ref/.alldigests 1.14.2.2+0 -1 rpm/tests/ref/manifest 1.23.2.3+9 -11 rpm/tests/ref/showrc 1.3 +0 -23 xz/m4/ltversion.m4 patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.15 -r1.3296.2.16 CHANGES --- rpm/CHANGES 25 Apr 2010 19:52:26 - 1.3296.2.15 +++ rpm/CHANGES 27 Apr 2010 16:17:27 - 1.3296.2.16 @@ -1,4 +1,5 @@ 5.3a1 -> 5.3b1 +- jbj: tests: "make check" for RHEL6 beta passes. - jbj: tests: add band-aid to resurrect "make check-Caixa" CM12>CM14 upgrade - jbj: tests: use /usr/bin/wget to avoid discussing transport issues. - jbj: tests: fix: re-add %__check_files that dropped out somewehere. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.7 -r2.432.2.8 configure.ac --- rpm/configure.ac 27 Apr 2010 12:55:57 - 2.432.2.7 +++ rpm/configure.ac 27 Apr 2010 16:17:28 - 2.432.2.8 @@ -1685,8 +1685,19 @@ fi ], []) +dnl # FIXME: AutoFu tests for and -lacl are needed w/o --with-xar +RPM_CHECK_LIB( +[ATTR], [attr], +[attr], [attr_get], [sys/xattr.h], +[no,external:none], [], +[], []) +RPM_CHECK_LIB( +[ACL], [acl], +[acl], [acl_free], [sys/acl.h], +[no,external:none], [], +[], []) + dnl # XAR -dnl # FIXME: AutoFu test for is needed. RPM_CHECK_LIB( [XAR], [xar], [xar], [xar_open], [xar.h], @@ . patch -p0 <<'@@ .' Index: rpm/db3/.cvsignore $ cvs diff -u -r1.14 -r1.14.2.1 .cvsignore --- rpm/db3/.cvsignore6 Dec 2009 17:11:47 - 1.14 +++ rpm/db3/.cvsignore27 Apr 2010 16:17:28 - 1.14.2.1 @@ -18,12 +18,15 @@ db_dump db_hotbackup db_load +db_log_verify db_printlog db_recover -db_sql +db_sql_codegen db_stat db_upgrade db_verify +dbsql +sql db3libobjs btree_ext.h clib_ext.h @@ -54,4 +57,3 @@ txn_ext.h xa_ext.h gen_db_server.c -db_codegen @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.333.2.5 -r2.333.2.6 devtool.conf --- rpm/devtool.conf 25 Apr 2010 14:21:16 - 2.333.2.5 +++ rpm/devtool.conf 27 Apr 2010 16:17:28 - 2.333.2.6 @@ -74,18 +74,18 @@ --verbose \ --prefix=/usr \ --with-db=internal \ - --with-db-sql \ +--with-db-sql \ --with-db-tools-integrated \ --with-zlib=external \ --with-bzip2=external \ ---with-xz=external \ +--with-xz=internal \ --with-file=internal \ --with-lua=internal \ --with-tcl=external \ --with-sqlite=external \ --with-syck=internal \ --with-readline=external \ ---with-augeas=external \ +--without-augeas \ --with-beecrypt=external \ --with-openssl=external \ --with-nss=external \ @@ -96,8 +96,10 @@ --with-gnutls=external \ --with-neon=external \ --with-pcre=internal \ ---with-uuid=system \ ---with-xar=/usr/lib:/usr/include/xar \ +--without-uuid \ +--with-attr \ +--with-acl \ +--with-xar=internal \ --with-popt=external \ --with-keyutils=external \ --with-pthreads \ @@ -113,12 +115,12 @@ --with-python \ --with-pythonembed=/usr/lib:/usr/include/python2.6 \ --with-perl \ ---with-perlembed=/usr/lib/perl5/5.10
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/tests/ref/ .alldiges...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 04-May-2010 17:55:11
Branch: rpm-5_3 Handle: 2010050415551001
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/tests/ref .alldigests showrc version
Log:
- tag the rpm-5.3.0 tarball.
Summary:
RevisionChanges Path
1.3296.2.23 +5 -2 rpm/CHANGES
2.432.2.10 +1 -1 rpm/configure.ac
1.38.2.6+200 -200 rpm/tests/ref/.alldigests
1.23.2.5+2 -2 rpm/tests/ref/showrc
1.4.2.1 +2 -2 rpm/tests/ref/version
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.22 -r1.3296.2.23 CHANGES
--- rpm/CHANGES 1 May 2010 05:19:50 - 1.3296.2.22
+++ rpm/CHANGES 4 May 2010 15:55:10 - 1.3296.2.23
@@ -1,5 +1,8 @@
-5.3a1 -> 5.3b1
-- jbj: tests: "make check" for ununtu 10.04 passes.
+5.3.0 -> 5.3.1:
+
+5.3a1 -> 5.3.0
+- jbj: tag the rpm-5.3.0 tarball.
+- jbj: tests: "make check" for ubuntu 10.04 passes.
- jbj: perl: repair "make test" by changing the tests.
- jbj: dist: don't bother distributing tbdb.c
- jbj: lua: fix: attempt to create %{pkgbindir} if it doesn't exists.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.9 -r2.432.2.10 configure.ac
--- rpm/configure.ac 1 May 2010 05:19:49 - 2.432.2.9
+++ rpm/configure.ac 4 May 2010 15:55:10 - 2.432.2.10
@@ -8,7 +8,7 @@
AC_PREREQ(2.63)
m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
-AC_INIT([rpm],[5.3.DEVEL],[PACKAGE_BUGREPORT_DEFAULT])
+AC_INIT([rpm],[5.3.0],[PACKAGE_BUGREPORT_DEFAULT])
PACKAGE_TIMESTAMP="2009" dnl # [-MM[-DD[ HH[:MM
AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/ref/.alldigests
$ cvs diff -u -r1.38.2.5 -r1.38.2.6 .alldigests
--- rpm/tests/ref/.alldigests 28 Apr 2010 13:29:11 - 1.38.2.5
+++ rpm/tests/ref/.alldigests 4 May 2010 15:55:10 - 1.38.2.6
@@ -2998,106 +2998,106 @@
crc64:7e931a2bec8358cf ref/rpmdb.sql
adler32:a5238c46 ref/rpmdb.sql
jlu32:01e83fa8 ref/rpmdb.sql
-md2:e7e8fa575f58087c7da9ab751434cb50 ref/showrc
-md4:df1b0a34a9a587656f7ee12131e488c1 ref/showrc
-md5:b6baef3e7cf7d4e78851f96c98aeb51d ref/showrc
-sha1:9a84fbbe4baa8fe35b6efded2ec4a0ac0e23b330 ref/showrc
-sha224:73f91b4c5811c512cf3e3a89c1c87d01afab2ca6cb575a2d91ac1a3c ref/showrc
-sha256:ffa93aea56934c8c78325e204e0d267fb8f33c3700bfca39ddeb94895f3163cc
ref/showrc
-sha384:a15f9165afe039c7dca906f3b5c3e6c3d16873c2207d42f94ff12edbac996bc7e38647a574ff7f6782c1b0ee2681ef5d
ref/showrc
-sha512:c3280a031c0db031356d4f6d6ed39485dc0c608073c6e431c5452e23cda2d2341a2519e5a72efa81060fd65d4cb8ce7ad787e6b3a1f7dcc5f3b4e8b56ba52cd4
ref/showrc
-skein-224:082050536a76ed6584b63a0ac825e17e819a2689b31568a24b29d4de
ref/showrc
-skein-256:4f6d33a788bf2b00f070ba0a2fee0464c0a555762aefcfc243430588c6975293
ref/showrc
-skein-384:49146bd59115ca515e65c277bc9ab3f0f5b5e81d923fc2b4b1d00644fc248e6734392c31dc77bf8b3d3a58660f4c0226
ref/showrc
-skein-512:e507588ca86de25db825fca3af126fdf468338e98e86c8df2fea7adcfad7f8d3bc50d789deaa3b0ffc38eaaf6ce295ac017b717aabca207467af3d022c1854ea
ref/showrc
-skein-1024:95eefe736de70552b89a6e1f7f5c11b1ae2b174c72e5b2102703115e174841335ffb33945f674df556b01bca58ba24d8d0a24d12a39e78c7c2f5ce136a51973cfb225da83816c39ed4b8417cbb017a3dcda15cbb7eba103785e1f8a5cd075bd3d007b33722a61a44a0bca07502bebb3d3417761b34f09335251b95364d426a2b
ref/showrc
-arirang-224:b97da13c1d6f05d1d12e8376ab4a0bef72393dee9dd8a3afe64f8d95
ref/showrc
-arirang-256:27a32cc3ec8403fcacdfa66b6a8f36d9e3395357e1bc2998330035757b69f211
ref/showrc
-arirang-384:a9e54310cf843d079ab0d04dab3090c324fdd5c8e5ac4c9c1d104370b3176c91e9b715dd984724a4c4229aab4cc58485
ref/showrc
-arirang-512:4f7ca45552a844d7df7a0698773a94b78ceaa0654db2acfe46241c24b5d96a21838ff547b279268d9cf28a928f43ad37dbb7fa72f5db926a9c061bc767c7edd3
ref/showrc
-blake-224:05a0f85db42c94fc98e883dfa607908ab83f8628b458f0367630514b
ref/showrc
-blake-256:f9c06bf52c8b97e3693a2224fed8305cdd5d7b6937929c2986aafe2cd71af737
ref/showrc
-blake-384:753eeb4f0b42450492556cc25fcbc59f24a20d51089de997d353765ef7693b1c5c8fffdc33d1f921b3e9c2c182536147
ref/showrc
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/lib/ rpmgi.c rpminst...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 29-Sep-2010 16:55:01
Branch: rpm-5_3 Handle: 2010092914545902
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/lib rpmgi.c rpminstall.c
rpm/rpmio iosm.c librpmio.vers rpmio.h rpmrpc.c
Log:
- add Fadvise wrapper for posix_dadvise(2).
Summary:
RevisionChanges Path
1.3296.2.86 +1 -0 rpm/CHANGES
2.432.2.23 +4 -3 rpm/configure.ac
2.72.2.2+4 -0 rpm/lib/rpmgi.c
1.226.2.1 +5 -2 rpm/lib/rpminstall.c
1.42.2.1+6 -0 rpm/rpmio/iosm.c
2.163.2.10 +1 -0 rpm/rpmio/librpmio.vers
1.96.2.1+7 -0 rpm/rpmio/rpmio.h
2.97.2.1+58 -0 rpm/rpmio/rpmrpc.c
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.85 -r1.3296.2.86 CHANGES
--- rpm/CHANGES 29 Sep 2010 02:30:47 - 1.3296.2.85
+++ rpm/CHANGES 29 Sep 2010 14:54:59 - 1.3296.2.86
@@ -1,4 +1,5 @@
5.3.4 -> 5.3.5:
+- jbj: add Fadvise wrapper for posix_dadvise(2).
- jbj: fix: eliminate dueling --noorder options.
- jbj: solvedb's never need a chroot prefix.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.22 -r2.432.2.23 configure.ac
--- rpm/configure.ac 28 Sep 2010 00:39:26 - 2.432.2.22
+++ rpm/configure.ac 29 Sep 2010 14:54:59 - 2.432.2.23
@@ -789,9 +789,10 @@
ftok getaddrinfo getattrlist getcwd getdelim getline getmode getnameinfo
dnl
getpassphrase getxattr getwd iconv inet_aton lchflags lchmod lchown dnl
lgetxattr lsetxattr lutimes madvise mempcpy mkdtemp mkstemp mtrace dnl
-posix_fallocate putenv realpath regcomp __secure_getenv setattrlist dnl
-setenv setlocale setmode setproctitle setxattr sigaddset sigdelset dnl
-sigemptyset sighold sigrelse sigpause sigprocmask sigsuspend sigaction
dnl
+posix_fadvise posix_fallocate putenv realpath regcomp __secure_getenv dnl
+setattrlist setenv setlocale setmode setproctitle setxattr dnl
+sigaddset sigdelset sigemptyset sighold sigrelse sigpause dnl
+sigprocmask sigsuspend sigaction dnl
stpcpy stpncpy strcspn strdup strerror strmode strndup strspn strstr dnl
strtol strtoul dnl
])
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpmgi.c
$ cvs diff -u -r2.72.2.1 -r2.72.2.2 rpmgi.c
--- rpm/lib/rpmgi.c 18 Sep 2010 18:25:05 - 2.72.2.1
+++ rpm/lib/rpmgi.c 29 Sep 2010 14:55:00 - 2.72.2.2
@@ -107,6 +107,10 @@
}
fn = _free(fn);
+#if defined(POSIX_FADV_WILLNEED)
+(void) Fadvise(fd, 0, 0, POSIX_FADV_WILLNEED);
+#endif
+
return fd;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/rpminstall.c
$ cvs diff -u -r1.226 -r1.226.2.1 rpminstall.c
--- rpm/lib/rpminstall.c 10 Feb 2010 14:57:41 - 1.226
+++ rpm/lib/rpminstall.c 29 Sep 2010 14:55:00 - 1.226.2.1
@@ -138,7 +138,6 @@
}
}
- /*...@-type@*/ /* FIX: still necessary? */
if (fd == NULL || Ferror(fd)) {
rpmlog(RPMLOG_ERR, _("open of %s failed: %s\n"), filename,
Fstrerror(fd));
@@ -148,7 +147,11 @@
}
} else
fd = fdLink(fd, "persist (showProgress)");
- /*...@=type@*/
+
+#if defined(POSIX_FADV_WILLNEED)
+ (void) Fadvise(fd, 0, 0, POSIX_FADV_WILLNEED);
+#endif
+
/*...@+voidabstract@*/
return (void *)fd;
/*...@=voidabstract@*/
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/iosm.c
$ cvs diff -u -r1.42 -r1.42.2.1 iosm.c
--- rpm/rpmio/iosm.c 8 Mar 2010 22:17:51 - 1.42
+++ rpm/rpmio/iosm.c 29 Sep 2010 14:55:00 - 1.42.2.1
@@ -2596,6 +2596,9 @@
rc = IOSMERR_OPEN_FAILED;
break;
}
+#if defined(POSIX_FADV_SEQUENTIAL)
+ (void) Fadvise(iosm->rfd, 0, 0, POSIX_FADV_SEQUENTIAL);
+#endif
if (iosm->debug && (stage & IOSM_SYSCALL))
rpmlog(RPMLOG_DEBUG, " %8s (%s, \"r\") rfd %p rdbuf %p\n", cur,
iosm->path, iosm->rfd, iosm->rdbuf);
@@ -2626,6 +2629,9 @@
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac devtool.conf rpm/lib/ rp...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Nov-2010 22:34:03 Branch: rpm-5_3 Handle: 2010110421340201 Modified files: (Branch: rpm-5_3) rpm CHANGES configure.ac devtool.conf rpm/lib rpmds.c Log: - autofu: fix: older elfutils (centos4) doesn't have gelf_getnote(). Summary: RevisionChanges Path 1.3296.2.117+1 -0 rpm/CHANGES 2.432.2.37 +3 -0 rpm/configure.ac 2.333.2.62 +49 -0 rpm/devtool.conf 2.167.2.4 +2 -2 rpm/lib/rpmds.c patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3296.2.116 -r1.3296.2.117 CHANGES --- rpm/CHANGES 3 Nov 2010 14:09:45 - 1.3296.2.116 +++ rpm/CHANGES 4 Nov 2010 21:34:02 - 1.3296.2.117 @@ -1,4 +1,5 @@ 5.3.5 -> 5.3.6: +- jbj: autofu: fix: older elfutils (centos4) doesn't have gelf_getnote(). - jbj: tests: add a check-convert target. - jbj: rpmdb: double the defaults for locking tunables. - jbj: rpmdb: fix: don't bother excluding RPM_CHAR_TYPE sanity check. @@ . patch -p0 <<'@@ .' Index: rpm/configure.ac $ cvs diff -u -r2.432.2.36 -r2.432.2.37 configure.ac --- rpm/configure.ac 31 Oct 2010 18:53:07 - 2.432.2.36 +++ rpm/configure.ac 4 Nov 2010 21:34:02 - 2.432.2.37 @@ -994,6 +994,9 @@ AC_CHECK_LIB([elf], [gelf_getvernaux], [ AC_DEFINE(HAVE_GELF_GETVERNAUX, 1, [Define to 1 if you have the gelf_getvernaux() function.]) ]) +AC_CHECK_LIB([elf], [gelf_getnote], [ +AC_DEFINE(HAVE_GELF_GETNOTE, 1, [Define to 1 if you have the gelf_getnote() function.]) +]) AC_DEFINE(HAVE_LIBELF, 1, [Define to 1 if you have ELF library]) WITH_LIBELF_DEBUGEDIT="debugedit" LIBS="$LIBS -lelf" @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.333.2.61 -r2.333.2.62 devtool.conf --- rpm/devtool.conf 2 Nov 2010 21:21:09 - 2.333.2.61 +++ rpm/devtool.conf 4 Nov 2010 21:34:02 - 2.333.2.62 @@ -823,6 +823,55 @@ --enable-build-debug \ --enable-maintainer-mode +# CentOS 4.x +%centos4 +%autogen +%configure \ +--verbose \ +--prefix=/usr \ +--with-db \ +--with-dbsql \ +--without-db-tools-integrated \ +--with-zlib \ +--with-bzip2 \ +--without-xz \ +--with-file \ +--with-path-magic=/usr/share/file/magic \ +--without-augeas \ +--with-beecrypt=internal \ +--without-java \ +--without-openssl \ +--without-nss \ +--without-gcrypt \ +--without-tomcrypt \ +--with-pcre \ +--enable-utf8 \ +--without-uuid \ +--with-popt=internal \ +--with-pthreads=yes \ +--with-libelf \ +--without-js \ +--without-gpsee \ +--without-lua \ +--with-neon=internal \ +--without-libproxy \ +--without-gssapi \ +--with-expat \ +--with-syck=internal \ +--without-keyutils \ +--without-xar \ +--without-sqlite \ +--without-selinux \ +--without-sepol \ +--without-semanage \ +--without-ruby \ +--without-perl \ +--without-python \ +--enable-build-static \ +--enable-build-warnings \ +--enable-build-debug \ +--enable-maintainer-mode + # CentOS 5.x %centos %autogen @@ . patch -p0 <<'@@ .' Index: rpm/lib/rpmds.c $ cvs diff -u -r2.167.2.3 -r2.167.2.4 rpmds.c --- rpm/lib/rpmds.c 25 Oct 2010 05:26:17 - 2.167.2.3 +++ rpm/lib/rpmds.c 4 Nov 2010 21:34:03 - 2.167.2.4 @@ -2991,7 +2991,7 @@ continue; /*...@notreached@*/ /*...@switchbreak@*/ break; case SHT_NOTE: -#if !defined(__sun__)/* XXX OpenIndiana is ELF notes challenged. */ +#if defined(HAVE_GELF_GETNOTE) /* XXX OpenIndiana & older elfutils haven't. */ if (!(shdr->sh_flags & SHF_ALLOC))
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/rpmio/ rpmssl.c rpms...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 06-Nov-2010 14:31:30
Branch: rpm-5_3 Handle: 2010110613311708
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/rpmio rpmssl.c rpmssl.h
Log:
- openssl: older openssl-0.9.7a uses OPENSSL_NO_EC disabler.
- openssl: older openssl-0.9.7a lacks 2 keygen methods.
Summary:
RevisionChanges Path
1.3296.2.119+2 -0 rpm/CHANGES
2.432.2.39 +6 -0 rpm/configure.ac
2.23.2.4+23 -8 rpm/rpmio/rpmssl.c
2.6.4.3 +6 -0 rpm/rpmio/rpmssl.h
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.118 -r1.3296.2.119 CHANGES
--- rpm/CHANGES 6 Nov 2010 13:27:27 - 1.3296.2.118
+++ rpm/CHANGES 6 Nov 2010 13:31:17 - 1.3296.2.119
@@ -1,4 +1,6 @@
5.3.5 -> 5.3.6:
+- jbj: openssl: older openssl-0.9.7a uses OPENSSL_NO_EC disabler.
+- jbj: openssl: older openssl-0.9.7a lacks 2 keygen methods.
- jbj: nss: older nss-3.12.2.0 lacks certain error returns.
- jbj: autofu: fix: older elfutils (centos4) doesn't have gelf_getnote().
- jbj: tests: add a check-convert target.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.38 -r2.432.2.39 configure.ac
--- rpm/configure.ac 6 Nov 2010 00:49:22 - 2.432.2.38
+++ rpm/configure.ac 6 Nov 2010 13:31:18 - 2.432.2.39
@@ -1256,6 +1256,12 @@
[crypto], [ERR_load_CRYPTO_strings], [openssl/crypto.h],
[no,external:none], [],
[ AC_DEFINE(WITH_SSL, 1, [Define if building with OpenSSL])
+ AC_CHECK_LIB([openssl], [RSA_generate_key_ex], [
+ AC_DEFINE(HAVE_RSA_GENERATE_KEY_EX, 1, [Define to 1 if you have
the RSA_generate_key_ex() function.])
+ ])
+ AC_CHECK_LIB([openssl], [DSA_generate_parameters_ex], [
+ AC_DEFINE(HAVE_DSA_GENERATE_PARAMETERS_EX, 1, [Define to 1 if you
have the DSA_generate_parameters_ex() function.])
+ ])
], [])
dnl # TomCrypt
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmssl.c
$ cvs diff -u -r2.23.2.3 -r2.23.2.4 rpmssl.c
--- rpm/rpmio/rpmssl.c16 Aug 2010 15:07:15 - 2.23.2.3
+++ rpm/rpmio/rpmssl.c6 Nov 2010 13:31:25 - 2.23.2.4
@@ -17,8 +17,6 @@
#include
#endif
-#include /* XXX for OPENSSL_NO_ECDSA */
-
#include "debug.h"
#if defined(WITH_SSL)
@@ -242,21 +240,29 @@
rpmssl ssl = dig->impl;
int rc = 0; /* assume failure. */
static unsigned long _e = 0x10001;
-BIGNUM * bn = BN_new();
if (ssl->nbits == 0) ssl->nbits = 1024; /* XXX FIXME */
-assert(bn);
assert(ssl->nbits);
-if ((ssl->rsa = RSA_new()) != NULL
- && BN_set_word(bn, _e)
- && RSA_generate_key_ex(ssl->rsa, ssl->nbits, bn, NULL))
+#if defined(HAVE_RSA_GENERATE_KEY_EX)
+{BIGNUM * bn = BN_new();
+assert(bn);
+ if ((ssl->rsa = RSA_new()) != NULL
+ && BN_set_word(bn, _e)
+ && RSA_generate_key_ex(ssl->rsa, ssl->nbits, bn, NULL))
+ rc = 1;
+ if (bn) BN_free(bn);
+}
+#else
+/* XXX older & deprecated API in openssl-0.97a (Centos4/s390x) */
+if ((ssl->rsa = RSA_generate_key(ssl->nbits, _e, NULL, NULL)) != NULL)
rc = 1;
+#endif
+
if (!rc && ssl->rsa) {
RSA_free(ssl->rsa);
ssl->rsa = NULL;
}
-if (bn) BN_free(bn);
SPEW(!rc, rc, dig);
@@ -334,11 +340,20 @@
if (ssl->nbits == 0) ssl->nbits = 1024; /* XXX FIXME */
assert(ssl->nbits);
+#if defined(HAVE_DSA_GENERATE_PARAMETERS_EX)
if ((ssl->dsa = DSA_new()) != NULL
&& DSA_generate_parameters_ex(ssl->dsa, ssl->nbits,
NULL, 0, NULL, NULL, NULL)
&& DSA_generate_key(ssl->dsa))
rc = 1;
+#else
+/* XXX older & deprecated API in openssl-0.97a (Centos4/s390x) */
+if ((ssl->dsa = DSA_generate_parameters(ssl->nbits,
+ NULL, 0, NULL, NULL, NULL, NULL)) != NULL
+ && DSA_generate_key(ssl->dsa))
+ rc = 1;
+#endif
+
if (!rc && ssl->dsa) {
DSA_free(ssl->dsa);
ssl->dsa = NULL;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmssl.h
$ c
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/js/ Makefile.am rpma...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Per Ãyvind Karlsen
Root: /v/rpm/cvs Email: pkarl...@rpm5.org
Module: rpm Date: 02-Apr-2011 04:33:36
Branch: rpm-5_3 Handle: 2011040202333501
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/js Makefile.am rpmaug-js.c rpmjs-debug.h
Log:
rpmjs: port to SpiderMonkey 1.8.5 API.
Summary:
RevisionChanges Path
1.3296.2.197+1 -0 rpm/CHANGES
2.432.2.52 +4 -4 rpm/configure.ac
1.43.2.2+1 -1 rpm/js/Makefile.am
1.11.2.1+22 -16 rpm/js/rpmaug-js.c
1.7.2.1 +4 -4 rpm/js/rpmjs-debug.h
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.196 -r1.3296.2.197 CHANGES
--- rpm/CHANGES 1 Apr 2011 20:43:44 - 1.3296.2.196
+++ rpm/CHANGES 2 Apr 2011 02:33:35 - 1.3296.2.197
@@ -1,4 +1,5 @@
5.3.9 -> 5.3.10
+- proyvind: rpmjs: port to SpiderMonkey 1.8.5 API.
- mdawkins: updated changelog information for snapshot releases in
rpm.spec.in
- mdawkins: i18n update cs.po da.po de.po es.po fi.po fr.po id.po
is.po it.po ja.po ko.po nb.po nl.po pa.po pl.po pt.po pt_BR.po
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.51 -r2.432.2.52 configure.ac
--- rpm/configure.ac 1 Apr 2011 05:22:44 - 2.432.2.51
+++ rpm/configure.ac 2 Apr 2011 02:33:35 - 2.432.2.52
@@ -1601,12 +1601,12 @@
WITH_JS_SUBDIR=""
WITH_SPIDERMONKEY_SUBDIR=""
RPM_CHECK_LIB(
-[JavaScript], [js],
-[js], [JS_NewContext], [jsapi.h],
-[no,internal:external:none], [js:src:src],
+[JavaScript], [mozjs185],
+[mozjs185], [JS_NewContext], [jsapi.h],
+[no,internal:external:none], [mozjs185:src:src],
[ if test ".$RPM_CHECK_LIB_LOCATION" = .internal; then
WITH_SPIDERMONKEY_SUBDIR="$WITH_JS_SUBDIR/src"
- AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'js' library
(-ljs).])
+ AC_DEFINE(HAVE_LIBJS, 1, [Define to 1 if you have the 'mozjs'
library (-lmozjs185).])
else
WITH_JS_SUBDIR=js
fi
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/Makefile.am
$ cvs diff -u -r1.43.2.1 -r1.43.2.2 Makefile.am
--- rpm/js/Makefile.am18 Sep 2010 19:47:29 - 1.43.2.1
+++ rpm/js/Makefile.am2 Apr 2011 02:33:36 - 1.43.2.2
@@ -22,7 +22,7 @@
-I$(top_srcdir)/misc \
@WITH_DB_CPPFLAGS@ \
@WITH_FILE_CPPFLAGS@ \
- @WITH_JS_CPPFLAGS@ \
+ @WITH_MOZJS185_CPPFLAGS@ \
@WITH_LUA_CPPFLAGS@ \
@WITH_GPSEE_CPPFLAGS@ \
@WITH_SYCK_CPPFLAGS@ \
@@ .
patch -p0 <<'@@ .'
Index: rpm/js/rpmaug-js.c
$ cvs diff -u -r1.11 -r1.11.2.1 rpmaug-js.c
--- rpm/js/rpmaug-js.c10 Jan 2010 18:29:12 - 1.11
+++ rpm/js/rpmaug-js.c2 Apr 2011 02:33:36 - 1.11.2.1
@@ -303,18 +303,18 @@
}
static JSFunctionSpec rpmaug_funcs[] = {
-JS_FS("defvar", rpmaug_defvar, 0,0,0),
-JS_FS("get", rpmaug_get, 0,0,0),
-JS_FS("set", rpmaug_set, 0,0,0),
-JS_FS("insert", rpmaug_insert, 0,0,0),
-JS_FS("rm", rpmaug_rm, 0,0,0),
-JS_FS("remove", rpmaug_rm, 0,0,0),
-JS_FS("mv", rpmaug_mv, 0,0,0),
-JS_FS("move",rpmaug_mv, 0,0,0),
-JS_FS("match", rpmaug_match, 0,0,0),
-JS_FS("save",rpmaug_save,0,0,0),
-JS_FS("load",rpmaug_load,0,0,0),
-JS_FS("print", rpmaug_print, 0,0,0),
+JS_FS("defvar", rpmaug_defvar, 0,0),
+JS_FS("get", rpmaug_get, 0,0),
+JS_FS("set", rpmaug_set, 0,0),
+JS_FS("insert", rpmaug_insert, 0,0),
+JS_FS("rm", rpmaug_rm, 0,0),
+JS_FS("remove", rpmaug_rm, 0,0),
+JS_FS("mv", rpmaug_mv, 0,0),
+JS_FS("move",rpmaug_mv, 0,0),
+JS_FS("match", rpmaug_match, 0,0),
+JS_FS("save",rpmaug_save,0,0),
+JS_FS("load",rpmaug_load,0,0),
+JS_FS("print", r
[CVS] RPM: rpm-5_3: rpm/ CHANGES configure.ac rpm/lib/ depends.c poptI...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Matthew Dawkins
Root: /v/rpm/cvs Email: mdawk...@rpm5.org
Module: rpm Date: 08-May-2011 00:58:29
Branch: rpm-5_3 Handle: 2011050722582702
Modified files: (Branch: rpm-5_3)
rpm CHANGES configure.ac
rpm/lib depends.c poptI.c
rpm/macros openmamba.in
Log:
applied vendor Openmamba patches
Submitted by: mdawkins
Summary:
RevisionChanges Path
1.3296.2.224+1 -0 rpm/CHANGES
2.432.2.59 +6 -2 rpm/configure.ac
1.461.2.3 +4 -4 rpm/lib/depends.c
2.57.2.1+1 -1 rpm/lib/poptI.c
1.1.2.5 +4 -11 rpm/macros/openmamba.in
patch -p0 <<'@@ .'
Index: rpm/CHANGES
$ cvs diff -u -r1.3296.2.223 -r1.3296.2.224 CHANGES
--- rpm/CHANGES 6 May 2011 15:42:52 - 1.3296.2.223
+++ rpm/CHANGES 7 May 2011 22:58:27 - 1.3296.2.224
@@ -1,4 +1,5 @@
5.3.11 -> 5.3.12
+ - mdawkins: applied vendor Openmamba patches
- devzero2000: in configure.ac distinguish properly redhat from
fedora
- devzero2000: add preliminary change for momonga buildboot
- devzero2000: fix typo in repackage_dir for macros/openmamba.in
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
$ cvs diff -u -r2.432.2.58 -r2.432.2.59 configure.ac
--- rpm/configure.ac 6 May 2011 15:42:53 - 2.432.2.58
+++ rpm/configure.ac 7 May 2011 22:58:27 - 2.432.2.59
@@ -1951,7 +1951,7 @@
esac
RPMCANONVENDOR="$target_vendor"
case "${target_vendor}" in
-unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark|momonga)
+unknown|pc|ibm|redhat|pld|mandriva|conectiva|lvr|yellowdog|caos|crux|ark|momonga|openmamba)
test -f /etc/momonga-release && RPMCANONVENDOR=momonga
test -f /etc/fedora-release && RPMCANONVENDOR=fedora
test -f /etc/redhat-release && RPMCANONVENDOR=redhat
@@ -1963,6 +1963,7 @@
test -f /etc/caos-release &&RPMCANONVENDOR=caos
test -f /usr/bin/crux &&RPMCANONVENDOR=crux
test -f /etc/ark-release && RPMCANONVENDOR=ark
+ test -f /etc/openmamba-release && RPMCANONVENDOR=openmamba
;;
esac
RPMCANONOS="$target_os_noversion"
@@ -2261,7 +2262,7 @@
AC_MSG_CHECKING([if building for a specfic vendor])
AC_ARG_WITH(
[vendor],
-AS_HELP_STRING([--with-vendor=VENDOR], [build with a supported vendor's
specific set of changes: mandriva, ark, fedora]),
+AS_HELP_STRING([--with-vendor=VENDOR], [build with a supported vendor's
specific set of changes: mandriva, ark, fedora, openmamba]),
[if test ".$withval" != .no; then
case "$withval" in
"mandriva")
@@ -2274,6 +2275,9 @@
"fedora")
AC_DEFINE([RPM_VENDOR_FEDORA], 1, Vendor is Fedora)
;;
+ "openmamba")
+ AC_DEFINE([RPM_VENDOR_OPENMAMBA], 1, Vendor is openmamba)
+ ;;
esac
AC_MSG_RESULT([$withval])
else
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/depends.c
$ cvs diff -u -r1.461.2.2 -r1.461.2.3 depends.c
--- rpm/lib/depends.c 25 Feb 2011 09:28:26 - 1.461.2.2
+++ rpm/lib/depends.c 7 May 2011 22:58:28 - 1.461.2.3
@@ -1569,7 +1569,7 @@
int terminate = 2; /* XXX terminate if rc >= terminate */
int rc;
int ourrc = 0;
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_VENDOR_OPENMAMBA) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS)
/* optional-dirname-and-symlink-deps */
int dirname_deps;
int symlink_deps;
#endif
@@ -1648,7 +1648,7 @@
}
}
-#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS) /*
optional-dirname-and-symlink-deps */
+#if defined(RPM_VENDOR_MANDRIVA) || defined(RPM_VENDOR_ARK) ||
defined(RPM_VENDOR_OPENMAMBA) || defined(RPM_OPTIONAL_DIRNAME_AND_SYMLINK_DEPS)
/* optional-dirname-and-symlink-deps */
dirname_deps =
rpmExpandNumeric("%{?_check_dirname_deps}%{?!_check_dirname_deps:1}");
if (
