- don't build with sqlite3 if <sqlite3.h> is missing.rpm-4.4.1-release

CVS patchset: 7764
CVS date: 2005/02/14 01:34:12

27 files changed, 43 insertions, 30 deletions

diff --git a/CHANGES b/CHANGES
index 35a248acd..7367206ad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -28,6 +28,7 @@
 	- use waitpid rather than SIGCHLD reaper.
 	- rip out DB_PRIVATE revert if not NPTL, it's not the right thing to do.
 	- don't classify files in /dev (#146623).
+	- don't build with sqlite3 if <sqlite3.h> is missing.
 
 4.3.3 -> 4.4:
 	- pentium3/pentium4 arch support (pluto@PLD).
diff --git a/build/rpmfc.c b/build/rpmfc.c
index fe69792b5..01b9be4f4 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.c
@@ -1095,6 +1095,7 @@ int rpmfcApply(rpmfc fc)
 	    }
 	}
 
+	if (fc->fcolor->vals[fc->ix])
 	for (fcat = rpmfcApplyTable; fcat->func != NULL; fcat++) {
 	    if (!(fc->fcolor->vals[fc->ix] & fcat->colormask))
 		/*@innercontinue@*/ continue;
@@ -1216,8 +1217,8 @@ assert(s != NULL);
 /*@-branchstate@*/
 	if (slen >= sizeof(".pm") && !strcmp(s+slen-(sizeof(".pm")-1), ".pm"))
 	    ftype = "Perl5 module source text";
-	/* XXX skip all files in /dev/, as they are usually %dev dummies. */
-	else if (slen >= sizeof("/dev/") && strncmp(s, "/dev/", sizeof("/dev/")-1))
+	/* XXX skip all files in /dev/ which are (or should be) %dev dummies. */
+	else if (slen >= fc->brlen+sizeof("/dev/") && !strncmp(s+fc->brlen, "/dev/", sizeof("/dev/")-1))
 	    ftype = "";
 	else {
 	    ftype = magic_file(ms, s);
@@ -1525,6 +1526,7 @@ int rpmfcGenerateDepends(const Spec spec, Package pkg)
     fc->skipProv = !pkg->autoProv;
     fc->skipReq = !pkg->autoReq;
     fc->tracked = 0;
+    fc->brlen = (spec->buildRootURL ? strlen(spec->buildRootURL) : 0);
 
     /* Copy (and delete) manually generated dependencies to dictionary. */
     if (!fc->skipProv) {
diff --git a/build/rpmfc.h b/build/rpmfc.h
index f7dcb8802..4f1af360f 100644
--- a/build/rpmfc.h
+++ b/build/rpmfc.h
@@ -23,6 +23,7 @@ struct rpmfc_s {
     int skipProv;	/*!< Don't auto-generate Provides:? */
     int skipReq;	/*!< Don't auto-generate Requires:? */
     int tracked;	/*!< Versioned Provides: tracking dependency added? */
+    size_t brlen;	/*!< strlen(spec->buildRoot) */
 
     ARGV_t fn;		/*!< (#files) file names */
     ARGI_t fcolor;	/*!< (#files) file colors */
diff --git a/configure.ac b/configure.ac
index 864a2ae6d..8b8fb6af0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -520,11 +520,19 @@ dnl ------------------ with    internal db
 AC_DEFINE(HAVE_DB3_DB_H, 1, [Define if you have the <db3/db.h> header file])
 WITH_DB_SUBDIR=db3
 WITH_INTERNAL_DB=1
-AC_DEFINE(HAVE_SQLITE3_H, 1, [Define if you have the <sqlite3.h> header file])
-WITH_SQLITE3=1
-WITH_SQLITE3_INCLUDE=
-WITH_SQLITE3_LIB=-lsqlite3
-DBLIBSRCS="db3.c sqlite.c"
+DBLIBSRCS="db3.c"
+
+AC_CHECK_HEADER([sqlite3.h], [
+  AC_DEFINE(HAVE_SQLITE3_H, 1, [Define if you have the <sqlite3.h> header file])
+  WITH_SQLITE3=1
+  WITH_SQLITE3_INCLUDE=
+  WITH_SQLITE3_LIB=-lsqlite3
+  DBLIBSRCS="$DBLIBSRCS sqlite.c"
+],[
+  WITH_SQLITE3=0
+  WITH_SQLITE3_INCLUDE=
+  WITH_SQLITE3_LIB=
+])
 
 AC_SUBST(WITH_DB_SUBDIR)
 AC_SUBST(WITH_INTERNAL_DB)
diff --git a/po/cs.po b/po/cs.po
index c68537883..d63b4aaf8 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2001-07-24 10:02+0100\n"
 "Last-Translator: Milan Kerslager <kerslage@linux.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
diff --git a/po/da.po b/po/da.po
index 91d22a84e..125dadf33 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2001-04-05 23:03GMT\n"
 "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
diff --git a/po/de.po b/po/de.po
index b0dfa239f..97f9c2dbe 100644
--- a/po/de.po
+++ b/po/de.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 1998-08-03 18:02+02:00\n"
 "Last-Translator: Karl Eichwalder <ke@SuSE.DE>\n"
 "Language-Team: German <de@li.org>\n"
diff --git a/po/fi.po b/po/fi.po
index c64a40dff..267048571 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 1998-05-02 21:41:47-0400\n"
 "Last-Translator: Raimo Koski <rkoski@pp.weppi.fi>\n"
 "Language-Team: Finnish <linux@sot.com>\n"
diff --git a/po/fr.po b/po/fr.po
index eb0b968f3..e2b0b4df3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RPM 4.2.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2003-07-06 01:36+0200\n"
 "Last-Translator: RPM French Translation <rpm-fr@livna.org>\n"
 "Language-Team: RPM French Translation <rpm-fr@livna.org>\n"
diff --git a/po/gl.po b/po/gl.po
index 4bffd94ee..97f512585 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2001-01-13 22:31+0100\n"
 "Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
diff --git a/po/is.po b/po/is.po
index 5da0f524e..af392562f 100644
--- a/po/is.po
+++ b/po/is.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2001-07-12 13:25+0000\n"
 "Last-Translator: Richard Allen <ra@hp.is>\n"
 "Language-Team: is <kde-isl@mmedia.is>\n"
diff --git a/po/ja.po b/po/ja.po
index e3e84eacc..f245c89ea 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 1999-12-01 22:49 +JST\n"
 "Last-Translator: Kanda Mitsuru <kanda@nn.iij4u.or.jp>\n"
 "Language-Team: JRPM <jrpm@linux.or.jp>\n"
diff --git a/po/ko.po b/po/ko.po
index 3de0d324f..45ba8cd2a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2002-03-04 17:17+0900\n"
 "Last-Translator: Jong-Hoon Ryu <redhat4u@netian.com>\n"
 "Language-Team: GNU Translation project <ko@li.org>\n"
diff --git a/po/no.po b/po/no.po
index c54927573..f95b232f1 100644
--- a/po/no.po
+++ b/po/no.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2001-06-27 12:24+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
diff --git a/po/pl.po b/po/pl.po
index 90bf9e843..cbe704523 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.3-20030515\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2003-06-08 22:42+0200\n"
 "Last-Translator: Arkadiusz Miskiewicz <arekm@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
diff --git a/po/pt.po b/po/pt.po
index 51f50ec35..cfedf5af1 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2002-02-14 10:51+0000\n"
 "Last-Translator: José Nuno Coelho Sanarra Pires <jncp@rnl.ist.utl.pt>\n"
 "Language-Team: pt <morais@kde.org\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 96c481579..46fd564b6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2004-02-29 07:48+0500\n"
 "Last-Translator: Arnaldo Carvalho de Melo <acme@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese\n"
diff --git a/po/ro.po b/po/ro.po
index e34e6f27e..6bad7e7de 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 1999-04-10 12:00+EST\n"
 "Last-Translator: Cristian Gafton <gafton@redhat.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
diff --git a/po/rpm.pot b/po/rpm.pot
index 8f6bdf709..a186691e4 100644
--- a/po/rpm.pot
+++ b/po/rpm.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/po/ru.po b/po/ru.po
index 1349cfc67..c4901b5b5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2002-08-27 13:36-0400\n"
 "Last-Translator: Eugene Kanter, <eugene@blackcatlinux.com>\n"
 "Language-Team: Black Cat Linux Team <blackcat-support@blackcatlinux.com>\n"
diff --git a/po/sk.po b/po/sk.po
index 62171431e..5a6a2668e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 1999-04-08 21:37+02:00\n"
 "Last-Translator: Stanislav Meduna <stano@eunet.sk>\n"
 "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n"
diff --git a/po/sl.po b/po/sl.po
index 6742cca25..53debef59 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,13 +1,13 @@
 # -*- mode:po; coding:iso-latin-2; -*- Slovenian messages for Redhat pkg. mngr.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Primož Peterlin <primoz.peterlin@biofiz.mf.uni-lj.si>, 2000.
-# $Id: sl.po,v 1.389.2.17 2005/02/13 04:28:57 jbj Exp $
+# $Id: sl.po,v 1.389.2.18 2005/02/14 01:34:15 jbj Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2000-10-08 19:05+0200\n"
 "Last-Translator: Grega Fajdiga <gregor.fajdiga@telemach.net>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
diff --git a/po/sr.po b/po/sr.po
index 14cf40005..936128b1e 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2004-02-29 07:48+0500\n"
 "Last-Translator: unknown\n"
 "Language-Team: unknown\n"
diff --git a/po/sv.po b/po/sv.po
index a759ba0d2..ccefab942 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2003-02-05 12:40+0100\n"
 "Last-Translator: Göran Uddeborg <goeran@uddeborg.pp.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
diff --git a/po/tr.po b/po/tr.po
index b139c1d27..528ed54ca 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpm 4.0.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-12 23:26-0500\n"
+"POT-Creation-Date: 2005-02-13 17:18-0500\n"
 "PO-Revision-Date: 2001-07-05 08:02+300\n"
 "Last-Translator: Nilgun Belma Buguner <nilgun@technologist.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
diff --git a/rpm.spec.in b/rpm.spec.in
index 9e84fabb0..90dac47d1 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -502,6 +502,7 @@ exit 0
 %changelog
 * Sun Feb 13 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-1
 - don't classify files in /dev (#146623).
+- don't build with sqlite3 if <sqlite3.h> is missing.
 
 * Sat Feb 12 2005 Jeff Johnson <jbj@jbj.org> 4.4.1-0.24
 - zlib: uniqify certain symbols to prevent name space pollution.
diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c
index c49e9cd1a..1b59c36af 100644
--- a/rpmio/rpmsq.c
+++ b/rpmio/rpmsq.c
@@ -206,7 +206,7 @@ fprintf(stderr, "    Insert(%p): %p\n", ME(), sq);
 	    sq->child = 0;
 	    sq->reaped = 0;
 	    sq->status = 0;
-	    sq->reaper = 0;
+	    sq->reaper = 1;
 /*@-bounds@*/
 	    sq->pipes[0] = sq->pipes[1] = -1;
 /*@=bounds@*/