[CVS] RPM: rpm-5_4: rpm/ CHANGES 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: 18-Mar-2012 03:58:20 Branch: rpm-5_4 Handle: 2012031802581900 Modified files: (Branch: rpm-5_4) rpm CHANGES devtool.conf Log: - pcre: upgrade to pcre-8.30 and re-add --with-pcre=internal. Summary: RevisionChanges Path 1.3501.2.229+1 -0 rpm/CHANGES 2.365.2.45 +13 -13 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/CHANGES $ cvs diff -u -r1.3501.2.228 -r1.3501.2.229 CHANGES --- rpm/CHANGES 10 Mar 2012 19:42:28 - 1.3501.2.228 +++ rpm/CHANGES 18 Mar 2012 02:58:19 - 1.3501.2.229 @@ -1,4 +1,5 @@ 5.4.7 -> 5.4.8: +- jbj: pcre: upgrade to pcre-8.30 and re-add --with-pcre=internal. - jbj: perl-URPM: configure/build perl-URPM from checkout. - jbj: gpsee: do pull+update separately: fetch is version specific. - jbj: devtool: fix: translate dash to underscore for release tag envvar. @@ . patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.44 -r2.365.2.45 devtool.conf --- rpm/devtool.conf 17 Mar 2012 15:56:52 - 2.365.2.44 +++ rpm/devtool.conf 18 Mar 2012 02:58:19 - 2.365.2.45 @@ -3,7 +3,7 @@ ## %common -MODULE_NAMES="beecrypt gpsee libgit2 lua neon perl-URPM popt rc syck" +MODULE_NAMES="beecrypt gpsee libgit2 lua neon pcre perl-URPM popt rc syck" MODULE_TAG_BASH="" # XXX bash is GPLv2 and cannot be bundled w RPM MODULE_TAG_BEECRYPT="rpm-5_4" MODULE_TAG_DB="" @@ -276,8 +276,8 @@ --with-neon=external \ --without-libproxy \ --with-expat \ ---with-pcre \ ---enable-utf8 \ +--with-pcre=internal \ +--enable-utf \ --with-uuid=/opt/local/lib:/opt/local/include/ossp \ --without-attr \ --without-acl \ @@ -343,8 +343,8 @@ --with-neon=external \ --without-libroxy \ --with-expat \ ---with-pcre \ ---enable-utf8 \ +--with-pcre=internal \ +--enable-utf \ --with-uuid=/opt/local/lib:/opt/local/include/ossp \ --without-attr \ --without-acl \ @@ -411,8 +411,8 @@ --with-neon=internal \ --without-libproxy \ --with-expat \ ---with-pcre \ ---enable-utf8 \ +--with-pcre=internal \ +--enable-utf \ --without-uuid \ --with-attr \ --with-acl \ @@ -485,8 +485,8 @@ --with-neon=internal \ --without-libproxy \ --with-expat \ ---with-pcre \ ---enable-utf8 \ +--with-pcre=internal \ +--enable-utf \ --with-uuid=system \ --with-attr \ --with-acl \ @@ -562,8 +562,8 @@ --with-neon=internal \ --without-libproxy \ --with-expat \ ---with-pcre \ ---enable-utf8 \ +--with-pcre=internal \ +--enable-utf \ --with-uuid=system \ --with-attr \ --with-acl \ @@ -638,8 +638,8 @@ --with-neon=internal \ --without-libproxy \ --with-expat \ ---with-pcre \ ---enable-utf8 \ +--with-pcre=internal \ +--enable-utf \ --with-uuid=system \ --with-attr \ --with-acl \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: pcre/ .cvsignore 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: pcre Date: 18-Mar-2012 03:51:52 Branch: HEAD Handle: 2012031802515100 Modified files: pcre.cvsignore Makefile.am Log: - pcre: typo and cruft. Summary: RevisionChanges Path 1.9 +1 -0 pcre/.cvsignore 1.9 +1 -1 pcre/Makefile.am patch -p0 <<'@@ .' Index: pcre/.cvsignore $ cvs diff -u -r1.8 -r1.9 .cvsignore --- pcre/.cvsignore 27 Aug 2010 18:06:17 - 1.8 +++ pcre/.cvsignore 18 Mar 2012 02:51:51 - 1.9 @@ -12,6 +12,7 @@ configure install-sh libpcre.pc +libpcre16.pc libpcrecpp.pc libpcreposix.pc libtool @@ . patch -p0 <<'@@ .' Index: pcre/Makefile.am $ cvs diff -u -r1.8 -r1.9 Makefile.am --- pcre/Makefile.am 18 Mar 2012 02:40:34 - 1.8 +++ pcre/Makefile.am 18 Mar 2012 02:51:51 - 1.9 @@ -18,7 +18,7 @@ NEWS \ README -dist_noinst_DATA = \ +dist_noinst_DATA += \ doc/html/index.html \ doc/html/pcre.html \ doc/html/pcre16.html \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tests/ dir2symlink-1-1.src.rpm dir2symlink.spe...
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: 17-Mar-2012 22:29:40
Branch: rpm-5_4 Handle: 2012031721294000
Modified files: (Branch: rpm-5_4)
rpm/tests dir2symlink-1-1.src.rpm dir2symlink.spec
Log:
- tests: fix: DIR -> SYMLINK in ruby improvements.
Summary:
RevisionChanges Path
1.1.2.3 BLOBrpm/tests/dir2symlink-1-1.src.rpm
1.1.2.3 +7 -10 rpm/tests/dir2symlink.spec
(cd rpm/tests && \
uudecode <<'@@ .' && \
mv dir2symlink-1-1.src.rpm dir2symlink-1-1.src.rpm.orig && \
xdelta patch dir2symlink-1-1.src.rpm.xdelta dir2symlink-1-1.src.rpm.orig
dir2symlink-1-1.src.rpm && \
rm -f dir2symlink-1-1.src.rpm.orig dir2symlink-1-1.src.rpm.xdelta)
Index: rpm/tests/dir2symlink-1-1.src.rpm
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/dir2symlink.spec
$ cvs diff -u -r1.1.2.2 -r1.1.2.3 dir2symlink.spec
--- rpm/tests/dir2symlink.spec17 Mar 2012 21:00:11 - 1.1.2.2
+++ rpm/tests/dir2symlink.spec17 Mar 2012 21:29:40 - 1.1.2.3
@@ -122,34 +122,32 @@
%if 1
%post -n dir2symlink-ruby-1 -p
#XXX no output displayed by
-print "--- post(ruby) arg " + ARGV[0] + " ..."
-print "Create a /tmp/ruby.d directory."
+$stderr.puts "--- post(ruby) arg " + ARGV[0] + " ..."
+$stderr.puts "Create a /tmp/ruby.d directory."
%preun -n dir2symlink-ruby-2 -p
#XXX no output displayed by
-print "--- preun(ruby) arg " + ARGV[0] + " ..."
-if ARGV[0] <= 1
- print "Undo the DIR -> SYMLINK change."
+$stderr.puts "--- preun(ruby) arg " + ARGV[0] + " ..."
+if Integer(ARGV[0]) <= 1
+ $stderr.puts "Undo the DIR -> SYMLINK change."
File::unlink("/tmp/ruby.d")
File::rename("/tmp/.ruby.d", "/tmp/ruby.d")
end
%pretrans -n dir2symlink-ruby-2 -p
#XXX no output displayed by
-print "--- pretrans(ruby) arg " + ARGV[0] + " ..."
-print "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
+$stderr.puts "--- pretrans(ruby) arg " + ARGV[0] + " ..."
+$stderr.puts "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
File::rename("/tmp/ruby.d", "/tmp/.ruby.d")
File::symlink("/tmp/.ruby.d", "/tmp/ruby.d")
%endif
%if 1
%post -n dir2symlink-tcl-1 -p
-#XXX no output displayed by
puts stderr "--- post(tcl) arg [lindex $argv 0] ..."
puts stderr "Create a /tmp/tcl.d directory."
%preun -n dir2symlink-tcl-2 -p
-#XXX no output displayed by
puts stderr "--- preun(tcl) arg [lindex $argv 0] ..."
if { [lindex $argv 0] <= 1 } {
puts stderr "Undo the DIR -> SYMLINK change."
@@ -158,7 +156,6 @@
}
%pretrans -n dir2symlink-tcl-2 -p
-#XXX no output displayed by
puts stderr "--- pretrans(tcl) arg [lindex $argv 0] ..."
puts stderr "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
file rename /tmp/tcl.d /tmp/.tcl.d
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tests/ Makefile.am dir2symlink-1-1.src.rpm dir...
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: 17-Mar-2012 22:00:13
Branch: rpm-5_4 Handle: 2012031721001001
Modified files: (Branch: rpm-5_4)
rpm/tests Makefile.am dir2symlink-1-1.src.rpm
dir2symlink.spec
Log:
- tests: fix: DIR -> SYMLINK in tcl.
Summary:
RevisionChanges Path
1.95.2.53 +1 -1 rpm/tests/Makefile.am
1.1.2.2 BLOBrpm/tests/dir2symlink-1-1.src.rpm
1.1.2.2 +11 -11 rpm/tests/dir2symlink.spec
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
$ cvs diff -u -r1.95.2.52 -r1.95.2.53 Makefile.am
--- rpm/tests/Makefile.am 17 Mar 2012 00:33:30 - 1.95.2.52
+++ rpm/tests/Makefile.am 17 Mar 2012 21:00:10 - 1.95.2.53
@@ -964,7 +964,7 @@
@-${rpm} -U lua-test/lua-test-*.noarch.rpm
@-${rpm} -e lua-test
-INTERPRETERS = lua perl # tcl ruby # python
+INTERPRETERS = lua perl tcl # ruby # python
check-dir2symlink:
@echo "=== $@ ==="
@-for i in ${INTERPRETERS}; do \
@@ .
(cd rpm/tests && \
uudecode <<'@@ .' && \
mv dir2symlink-1-1.src.rpm dir2symlink-1-1.src.rpm.orig && \
xdelta patch dir2symlink-1-1.src.rpm.xdelta dir2symlink-1-1.src.rpm.orig
dir2symlink-1-1.src.rpm && \
rm -f dir2symlink-1-1.src.rpm.orig dir2symlink-1-1.src.rpm.xdelta)
Index: rpm/tests/dir2symlink-1-1.src.rpm
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/dir2symlink.spec
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 dir2symlink.spec
--- rpm/tests/dir2symlink.spec17 Mar 2012 00:23:27 - 1.1.2.1
+++ rpm/tests/dir2symlink.spec17 Mar 2012 21:00:11 - 1.1.2.2
@@ -145,24 +145,24 @@
%if 1
%post -n dir2symlink-tcl-1 -p
#XXX no output displayed by
-puts "--- post(tcl) arg $argv[0] ..."
-puts "Create a /tmp/tcl.d directory."
+puts stderr "--- post(tcl) arg [lindex $argv 0] ..."
+puts stderr "Create a /tmp/tcl.d directory."
%preun -n dir2symlink-tcl-2 -p
#XXX no output displayed by
-puts "--- preun(tcl) arg $argv[0] ..."
-if { arg[2] <= 1 } {
- puts "Undo the DIR -> SYMLINK change."
- unlink /tmp/tcl.d
- rename /tmp/.tcl.d /tmp/tcl.d
+puts stderr "--- preun(tcl) arg [lindex $argv 0] ..."
+if { [lindex $argv 0] <= 1 } {
+ puts stderr "Undo the DIR -> SYMLINK change."
+ file delete /tmp/tcl.d
+ file rename /tmp/.tcl.d /tmp/tcl.d
}
%pretrans -n dir2symlink-tcl-2 -p
#XXX no output displayed by
-puts "--- pretrans(tcl) arg $argv[0] ..."
-puts "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
-rename /tmp/tcl.d /tmp/.tcl.d
-file link -symbolic /tmp/.tcl.d /tmp/tcl.d
+puts stderr "--- pretrans(tcl) arg [lindex $argv 0] ..."
+puts stderr "Rename DIR.d -> .DIR.d and create SYMLINK .DIR.d <- DIR.d."
+file rename /tmp/tcl.d /tmp/.tcl.d
+file link -symbolic /tmp/tcl.d /tmp/.tcl.d
%endif
%if 1
@@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ .cvsignore Makefile.am librpmio.vers 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: 17-Mar-2012 20:25:03
Branch: rpm-5_4 Handle: 2012031719250300
Added files: (Branch: rpm-5_4)
rpm/rpmio todbc.c
Modified files: (Branch: rpm-5_4)
rpm/rpmio .cvsignore Makefile.am librpmio.vers rpmodbc.c
rpmodbc.h
Log:
- rpmodbc: WIP.
Summary:
RevisionChanges Path
1.41.2.2+1 -0 rpm/rpmio/.cvsignore
1.293.2.9 +4 -1 rpm/rpmio/Makefile.am
2.199.2.7 +11 -0 rpm/rpmio/librpmio.vers
1.1.2.2 +282 -1 rpm/rpmio/rpmodbc.c
1.1.2.2 +50 -1 rpm/rpmio/rpmodbc.h
1.1.2.1 +68 -0 rpm/rpmio/todbc.c
patch -p0 <<'@@ .'
Index: rpm/rpmio/.cvsignore
$ cvs diff -u -r1.41.2.1 -r1.41.2.2 .cvsignore
--- rpm/rpmio/.cvsignore 29 Feb 2012 04:22:27 - 1.41.2.1
+++ rpm/rpmio/.cvsignore 17 Mar 2012 19:25:03 - 1.41.2.2
@@ -46,6 +46,7 @@
tmacro
tmagic
tmire
+todbc
tperl
tput
tpw
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.293.2.8 -r1.293.2.9 Makefile.am
--- rpm/rpmio/Makefile.am 17 Mar 2012 15:53:15 - 1.293.2.8
+++ rpm/rpmio/Makefile.am 17 Mar 2012 19:25:03 - 1.293.2.9
@@ -19,7 +19,7 @@
rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \
rpmpbzip2 rpmpigz rpmtar rpmz \
tasn tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic \
- tmire tperl tpython tput tpw trpmio tsexp tsvn tsw ttcl \
+ tmire todbc tperl tpython tput tpw trpmio tsexp tsvn tsw ttcl \
dumpasn1 lookup3
noinst_PROGRAMS =
@@ -369,6 +369,9 @@
tmire_SOURCES = tmire.c
tmire_LDADD = $(RPMIO_LDADD_COMMON)
+todbc_SOURCES = todbc.c
+todbc_LDADD = $(RPMIO_LDADD_COMMON)
+
tperl_SOURCES = tperl.c
tperl_LDADD = $(RPMIO_LDADD_COMMON)
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
$ cvs diff -u -r2.199.2.6 -r2.199.2.7 librpmio.vers
--- rpm/rpmio/librpmio.vers 9 Mar 2012 15:51:57 - 2.199.2.6
+++ rpm/rpmio/librpmio.vers 17 Mar 2012 19:25:03 - 2.199.2.7
@@ -553,6 +553,17 @@
rpmnixNew;
_rpmnss_init;
rpmnssImplVecs;
+_rpmodbc_debug;
+rpmodbcColumns;
+rpmodbcConnect;
+rpmodbcDisconnect;
+rpmodbcFetch;
+rpmodbcListDataSources;
+rpmodbcListDrivers;
+rpmodbcNCols;
+rpmodbcNew;
+rpmodbcPrepare;
+rpmodbcTables;
_rpmperl_debug;
rpmperlNew;
rpmperlRun;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmodbc.c
$ cvs diff -u -r1.1.2.1 -r1.1.2.2 rpmodbc.c
--- rpm/rpmio/rpmodbc.c 17 Mar 2012 15:53:15 - 1.1.2.1
+++ rpm/rpmio/rpmodbc.c 17 Mar 2012 19:25:03 - 1.1.2.2
@@ -4,10 +4,15 @@
#include "system.h"
+#if defined(HAVE_SQLEXT_H)
+#include
+#endif
+
#include
#include/* for *Pool methods */
#include
#include
+
#define _RPMODBC_INTERNAL
#include
@@ -16,12 +21,282 @@
/*@unchecked@*/
int _rpmodbc_debug = -1;
+#define SPEW(_t, _rc, _odbc)\
+ { if ((_t) || _rpmodbc_debug ) \
+ fprintf(stderr, "<-- %s(%p) rc %d\n", __FUNCTION__, (_odbc), \
+ (_rc)); \
+ }
+
+/*==*/
+
+int rpmodbcConnect(rpmodbc odbc,
+ const char * db, const char * u, const char * pw)
+{
+int rc = -1;
+
+fprintf(stderr, "--> %s(%p,%s,%s,%s)\n", __FUNCTION__, odbc, db, u, pw);
+odbc->db = xstrdup(db);
+odbc->u = xstrdup(u);
+odbc->pw = xstrdup(pw);
+
+#if defined(WITH_UNIXODBC)
+assert(odbc->env);
+if (odbc->dbc == NULL) {
+ SQLAllocHandle(SQL_HANDLE_DBC, odbc->env, &odbc->dbc);
+assert(odbc->dbc);
+}
+
+rc = SQLConnect(odbc->dbc,
+ (SQLCHAR *) db, SQL_NTS,
+ (SQLCHAR *) u, SQL_NTS,
+ (SQLCHAR *) pw, SQL_NTS);
+#endif
+
+SPEW(0, rc, odbc);
+return rc;
+}
+
+int rpmodbcDisconnect(rpmodbc odbc)
+{
+int rc = 0;
+
+#if defined(WITH_UNIXODBC)
+assert(odbc->env);
+assert(odbc->dbc);
+SQLDisconnect(odbc->dbc);
+SQLFreeHand
[CVS] RPM: rpm-5_4: rpm/ 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: 17-Mar-2012 16:56:52 Branch: rpm-5_4 Handle: 2012031715565200 Modified files: (Branch: rpm-5_4) rpm devtool.conf Log: - odbc: throw the stubs into the waterfalls. Summary: RevisionChanges Path 2.365.2.44 +1 -0 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.43 -r2.365.2.44 devtool.conf --- rpm/devtool.conf 11 Mar 2012 20:29:46 - 2.365.2.43 +++ rpm/devtool.conf 17 Mar 2012 15:56:52 - 2.365.2.44 @@ -515,6 +515,7 @@ --with-libgit2=internal \ --with-apr \ --with-subversion \ +--with-unixodbc \ --without-squirrel \ --with-build-extlibdep \ --with-build-maxextlibdep \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ Makefile.am poptIO.c rpmio.c rpmodbc.c ...
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 17-Mar-2012 16:53:16
Branch: rpm-5_4 Handle: 2012031715531500
Added files: (Branch: rpm-5_4)
rpm/rpmio rpmodbc.c rpmodbc.h
Modified files: (Branch: rpm-5_4)
rpm/rpmio Makefile.am poptIO.c rpmio.c
Log:
- odbc: stub in a ctor/dtor.
Summary:
RevisionChanges Path
1.293.2.8 +2 -2 rpm/rpmio/Makefile.am
1.94.2.2+3 -0 rpm/rpmio/poptIO.c
1.230.2.4 +3 -0 rpm/rpmio/rpmio.c
1.1.2.1 +56 -0 rpm/rpmio/rpmodbc.c
1.1.2.1 +84 -0 rpm/rpmio/rpmodbc.h
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
$ cvs diff -u -r1.293.2.7 -r1.293.2.8 Makefile.am
--- rpm/rpmio/Makefile.am 10 Mar 2012 16:15:36 - 1.293.2.7
+++ rpm/rpmio/Makefile.am 17 Mar 2012 15:53:15 - 1.293.2.8
@@ -92,7 +92,7 @@
rpmcdsa.h rpmcudf.h rpmcvs.h rpmdav.h rpmdir.h rpmficl.h rpmgc.h
rpmgit.h rpmhash.h \
rpmhkp.h rpmhook.h rpmio_internal.h rpmjs.h rpmjsio.h rpmkeyring.h \
rpmku.h rpmltc.h rpmlua.h rpmmg.h rpmnix.h rpmnss.h \
- rpmperl.h rpmpython.h rpmruby.h rpmsm.h rpmsp.h \
+ rpmodbc.h rpmperl.h rpmpython.h rpmruby.h rpmsm.h rpmsp.h \
rpmsq.h rpmsql.h rpmsquirrel.h rpmssl.h rpmsvn.h rpmsx.h rpmsyck.h \
rpmtcl.h rpmtpm.h rpmurl.h rpmuuid.h rpmxar.h rpmz.h rpmzq.h \
tar.h ugid.h rpmio-stub.h
@@ -111,7 +111,7 @@
rpmhash.c rpmhkp.c rpmhook.c rpmio.c rpmiob.c rpmio-stub.c \
rpmjs.c rpmjsio.c rpmkeyring.c rpmku.c \
rpmlog.c rpmltc.c rpmlua.c rpmmalloc.c rpmmg.c rpmnix.c rpmnss.c \
- rpmperl.c rpmpgp.c rpmpython.c rpmrpc.c rpmruby.c rpmsm.c rpmsp.c \
+ rpmodbc.c rpmperl.c rpmpgp.c rpmpython.c rpmrpc.c rpmruby.c rpmsm.c
rpmsp.c \
rpmsq.c rpmsql.c rpmsquirrel.c rpmssl.c rpmsvn.c rpmsw.c rpmsx.c \
rpmsyck.c rpmtcl.c rpmtpm.c rpmuuid.c rpmxar.c rpmzlog.c rpmzq.c \
strcasecmp.c strtolocale.c tar.c url.c ugid.c xzdio.c yarn.c
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
$ cvs diff -u -r1.94.2.1 -r1.94.2.2 poptIO.c
--- rpm/rpmio/poptIO.c10 Mar 2012 17:41:15 - 1.94.2.1
+++ rpm/rpmio/poptIO.c17 Mar 2012 15:53:15 - 1.94.2.2
@@ -40,6 +40,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -663,6 +664,8 @@
N_("Debug Mongo DB connection"), NULL},
{ "nixdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmnix_debug,
-1,
N_("Debug embedded Nix interpreter"), NULL},
+ { "rpmodbcdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmodbc_debug, -1,
+ N_("Debug embedded ODBC interface"), NULL},
{ "rpmperldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmperl_debug, -1,
N_("Debug embedded Perl interpreter"), NULL},
{ "rpmpythondebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmpython_debug, -1,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmio.c
$ cvs diff -u -r1.230.2.3 -r1.230.2.4 rpmio.c
--- rpm/rpmio/rpmio.c 9 Mar 2012 23:14:03 - 1.230.2.3
+++ rpm/rpmio/rpmio.c 17 Mar 2012 15:53:15 - 1.230.2.4
@@ -72,6 +72,7 @@
#include
#include /* XXX rpmioClean() calls rpmluaFree() */
#include
+#include
#include
#include
#include
@@ -3245,6 +3246,7 @@
#ifdef NOTYET
extern rpmioPool _rpmnixPool;
#endif
+extern rpmioPool _rpmodbcPool;
extern rpmioPool _rpmperlPool;
extern rpmioPool _rpmpythonPool;
extern rpmioPool _rpmrubyPool;
@@ -3293,6 +3295,7 @@
_rpmbagPool = rpmioFreePool(_rpmbagPool);
_rpmcvsPool = rpmioFreePool(_rpmcvsPool);
_rpmgitPool = rpmioFreePool(_rpmgitPool);
+_rpmodbcPool = rpmioFreePool(_rpmodbcPool);
_rpmsvnPool = rpmioFreePool(_rpmsvnPool);
_rpmtpmPool = rpmioFreePool(_rpmtpmPool);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmodbc.c
$ cvs diff -u -r0 -r1.1.2.1 rpmodbc.c
--- /dev/null 2012-03-17 16:45:29.0 +0100
+++ rpmodbc.c 2012-03-17 16:53:16.061331748 +0100
@@ -0,0 +1,56 @@
+/** \ingroup rpmio
+ * \file rpmio/rpmodbc.c
+ */
+
+#include "system.h"
+
+#include
+#include/* for *Pool m
