Fri Jan 25 15:17:57 UTC 2008

Author: pmatilai

Update of /cvs/pkgs/rpms/rpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12704

Modified Files:
	.cvsignore rpm.spec sources 
Added Files:
	rpm-4.4.2.3-nss.patch rpm-4.4.2.3-queryformat-arch.patch 
Removed Files:
	rpm-4.4.2.2-base64-unsigned-char.patch 
	rpm-4.4.2.2-cryptoinit.patch rpm-4.4.2.2-debugedit-fpc.patch 
	rpm-4.4.2.2-gcc43.patch rpm-4.4.2.2-no-targetreset.patch 
	rpm-4.4.2.2-nonutf-comment.patch rpm-4.4.2.2-nss.patch 
	rpm-4.4.2.2-osgideps.patch rpm-4.4.2.2-problem-nevra.patch 
	rpm-4.4.2.2-pyproblem.patch 
	rpm-4.4.2.2-secondary-arch-macros.patch 
Log Message:
- update to 4.4.2.3-rc1
- merge nss-related patches into one
- change default queryformat to include arch
- resolves (documentation): #159638, #233232, #332271, #350401
- resolves (build): #124300, #140597, #124995, #147383, #220449
- resolves (query): #244236, #323221, #60288
- resolves (general): #223931, #164021, #83006, #205080, #217258, #428979


rpm-4.4.2.3-nss.patch:

--- NEW FILE rpm-4.4.2.3-nss.patch ---
diff -r ec9e6c427068 Makefile.am
--- a/Makefile.am	Wed Oct 24 16:02:51 2007 +0300
+++ b/Makefile.am	Thu Nov 01 10:56:58 2007 +0100
@@ -10,14 +10,14 @@ EXTRA_DIST = CHANGES ChangeLog CREDITS D
 	po/*.in po/*.po po/rpm.pot \
 	rpm.magic rpmpopt-$(VERSION) rpmqv.c 
 
-SUBDIRS = po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_BEECRYPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts doc .
+SUBDIRS = po misc @WITH_ZLIB_SUBDIR@ @WITH_ELFUTILS_SUBDIR@ @WITH_MAGIC_SUBDIR@ @WITH_DB_SUBDIR@ @WITH_SQLITE3_SUBDIR@ @WITH_POPT_SUBDIR@ @WITH_NEON_SUBDIR@ lua rpmio rpmdb lib build @WITH_PYTHON_SUBDIR@ tools scripts doc .
 
 INCLUDES = \
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
-	@WITH_BEECRYPT_INCLUDE@ \
+	@WITH_NSS_INCLUDE@ \
 	@WITH_POPT_INCLUDE@ \
 	-I$(top_srcdir)/misc \
 	@WITH_LIBELF_INCLUDE@ \
@@ -25,7 +25,7 @@ INCLUDES = \
 
 staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
 
-myLDFLAGS = @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
+myLDFLAGS = @WITH_LIBELF_LIB@
 
 myLDADD = \
 	$(top_builddir)/lib/librpm.la \
@@ -33,6 +33,7 @@ myLDADD = \
 	$(top_builddir)/rpmio/librpmio.la \
 	@WITH_POPT_LIB@ \
 	@WITH_ZLIB_LIB@ \
+	@WITH_NSS_LIB@ \
 	@LIBMISC@
 
 rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
@@ -71,7 +72,7 @@ rpmd.o:	$(top_srcdir)/rpmqv.c
 
 rpmi_SOURCES =
 #rpmi_LDFLAGS =		$(myLDFLAGS) $(staticLDFLAGS)
-#rpmi_LDADD =		rpmi.o $(myLDADD) @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@
+#rpmi_LDADD =		rpmi.o $(myLDADD) @WITH_LIBELF_LIB@
 rpmi_LDFLAGS =		$(myLDFLAGS)
 rpmi_LDADD =		rpmi.o $(myLDADD)
 rpmi.o:	$(top_srcdir)/rpmqv.c
@@ -112,7 +113,6 @@ lint:
 		`make -s sources -C lib` \
 		`make -s sources -C rpmdb` \
 		`make -s sources -C rpmio` \
-		`make -s sources -C beecrypt` \
 		`make -s sources -C file/src` \
 		`make -s sources -C popt`
 
diff -r ec9e6c427068 autogen.sh
--- a/autogen.sh	Wed Oct 24 16:02:51 2007 +0300
+++ b/autogen.sh	Thu Nov 01 10:56:58 2007 +0100
@@ -48,9 +48,6 @@ if [ -d zlib ]; then
 if [ -d zlib ]; then
     (echo "--- zlib"; cd zlib; ./autogen.sh --noconfigure "$@")
 fi
-if [ -d beecrypt ]; then
-    (echo "--- beecrypt"; cd beecrypt; ./autogen.sh --noconfigure "$@")
-fi
 if [ -d elfutils ]; then
     (echo "--- elfutils"; cd elfutils; ./autogen.sh --noconfigure "$@")
 fi
diff -r ec9e6c427068 build/Makefile.am
--- a/build/Makefile.am	Wed Oct 24 16:02:51 2007 +0300
+++ b/build/Makefile.am	Thu Nov 01 10:56:58 2007 +0100
@@ -9,7 +9,7 @@ INCLUDES = -I. \
 	-I$(top_srcdir)/lib \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
-	@WITH_BEECRYPT_INCLUDE@ \
+	@WITH_NSS_INCLUDE@ \
 	@WITH_MAGIC_INCLUDE@ \
 	@WITH_POPT_INCLUDE@ \
 	@WITH_LIBELF_INCLUDE@ \
diff -r ec9e6c427068 configure.ac
--- a/configure.ac	Wed Oct 24 16:02:51 2007 +0300
+++ b/configure.ac	Thu Nov 01 10:56:58 2007 +0100
@@ -463,34 +463,32 @@ AC_SUBST(WITH_LIBDWARF_DEBUGEDIT)
 AC_SUBST(WITH_LIBDWARF_DEBUGEDIT)
 
 #=================
-# Check for beecrypt library. Prefer external, otherwise internal.
-WITH_BEECRYPT_SUBDIR=
-WITH_BEECRYPT_INCLUDE=
-WITH_BEECRYPT_LIB=
-AC_CHECK_HEADER([beecrypt/beecrypt.h], [
-  AC_CHECK_LIB(beecrypt, mpfprintln, [
-    AC_DEFINE(HAVE_LIBBEECRYPT, 1, [Define to 1 if you have the 'beecrypt' library (-lbeecrypt).])
-    AC_CHECK_HEADER([beecrypt/api.h], [
-      AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the <beecrypt/api.h> header file.])
-    ])
-    WITH_BEECRYPT_INCLUDE="-I${includedir}/beecrypt"
-    WITH_BEECRYPT_LIB="-lbeecrypt"
+# Check for NSS library.
+WITH_NSS_INCLUDE=
+WITH_NSS_LIB=
+check=`pkg-config --version 2>/dev/null`
+if test -n "$check"; then
+  addlib=$(pkg-config --libs nss | sed 's/-lsmime3//;s/-lssl3//')
+  addcppflags=$(pkg-config --cflags nss)
+else
+# Without pkg-config, we'll kludge in some defaults
+  addlib="-lnss3 -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
+  addcppflags="-I/usr/include/nss3 -I/usr/include/nspr4"
+fi
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$save_CPPFLAGS $addcppflags"
+AC_CHECK_HEADER([nss3/nss.h], [
+  AC_CHECK_LIB(nss3, NSS_NoDB_Init, [
+    AC_DEFINE(HAVE_LIBNSS, 1, [Define to 1 if you have the 'NSS' library (-lnss3).])
+    WITH_NSS_INCLUDE="$addcppflags"
+    WITH_NSS_LIB="$addlib"
   ])
 ],[
-  if test -d beecrypt ; then
-    AC_DEFINE(HAVE_LIBBEECRYPT, 1, [Define to 1 if you have the 'beecrypt' library (-lbeecrypt).])
-    WITH_BEECRYPT_SUBDIR=beecrypt
-    WITH_BEECRYPT_INCLUDE="-I\${top_srcdir}/${WITH_BEECRYPT_SUBDIR}"
-    WITH_BEECRYPT_LIB="\${top_builddir}/${WITH_BEECRYPT_SUBDIR}/libbeecrypt.la"
-  fi
-
-   if test -z "${WITH_BEECRYPT_LIB}" ; then
-       AC_MSG_ERROR([rpm requires beecrypt]) 
-   fi
-])
-AC_SUBST(WITH_BEECRYPT_SUBDIR)
-AC_SUBST(WITH_BEECRYPT_INCLUDE)
-AC_SUBST(WITH_BEECRYPT_LIB)
+  AC_MSG_ERROR([rpm requires NSS]) 
+])
+CPPFLAGS="$save_CPPFLAGS"
+AC_SUBST(WITH_NSS_INCLUDE)
+AC_SUBST(WITH_NSS_LIB)
 
 #=================
 # Check for neon library. Prefer external, otherwise internal.
diff -r ec9e6c427068 lib/Makefile.am
--- a/lib/Makefile.am	Wed Oct 24 16:02:51 2007 +0300
+++ b/lib/Makefile.am	Thu Nov 01 10:56:58 2007 +0100
@@ -9,7 +9,7 @@ INCLUDES = -I. \
 	-I$(top_srcdir)/build \
 	-I$(top_srcdir)/rpmdb \
 	-I$(top_srcdir)/rpmio \
-	@WITH_BEECRYPT_INCLUDE@ \
+	@WITH_NSS_INCLUDE@ \
 	@WITH_POPT_INCLUDE@ \
 	-I$(top_srcdir)/misc \
 	@INCPATH@
diff -r ec9e6c427068 lib/formats.c
--- a/lib/formats.c	Wed Oct 24 16:02:51 2007 +0300
+++ b/lib/formats.c	Thu Nov 01 10:56:58 2007 +0100
@@ -210,23 +210,17 @@ static /*@only@*/ char * base64Format(in
 	int lc;
 	/* XXX HACK ALERT: element field abused as no. bytes of binary data. */
 	size_t ns = element;
-	size_t nt = ((ns + 2) / 3) * 4;
+	size_t nt = 0;
 
 /*@-boundswrite@*/
-	/*@-globs@*/
-	/* Add additional bytes necessary for eol string(s). */
-	if (b64encode_chars_per_line > 0 && b64encode_eolstr != NULL) {
-	    lc = (nt + b64encode_chars_per_line - 1) / b64encode_chars_per_line;
-        if (((nt + b64encode_chars_per_line - 1) % b64encode_chars_per_line) != 0)
-            ++lc;
-	    nt += lc * strlen(b64encode_eolstr);
+	if ((enc = b64encode(data, ns, -1)) != NULL) {
+		nt = strlen(enc);
 	}
-	/*@=globs@*/
 
 	val = t = xmalloc(nt + padding + 1);
 
 	*t = '\0';
-	if ((enc = b64encode(data, ns)) != NULL) {
+	if (enc != NULL) {
 	    t = stpcpy(t, enc);
 	    enc = _free(enc);
 	}
@@ -310,16 +304,13 @@ static /*@only@*/ char * xmlFormat(int_3
 	xtag = "string";
 	break;
     case RPM_BIN_TYPE:
-    {	int cpl = b64encode_chars_per_line;
-/*@-mods@*/
-	b64encode_chars_per_line = 0;
-/*@=mods@*/
-/*@-formatconst@*/
-	s = base64Format(type, data, formatPrefix, padding, element);
-/*@=formatconst@*/
-/*@-mods@*/
-	b64encode_chars_per_line = cpl;
-/*@=mods@*/
+    {	
[...1686 lines suppressed...]
-				return plainchar - plaintext_out;
-			}
-			fragment = (char)base64_decode_value(*codechar++);
-		} while (fragment < 0);
-		*plainchar++ |= (fragment & 0x030) >> 4;
-		*plainchar    = (fragment & 0x00f) << 4;
-
-		do {
-			if (codechar == code_in+length_in)
-			{
-				return plainchar - plaintext_out;
-			}
-			fragment = (char)base64_decode_value(*codechar++);
-		} while (fragment < 0);
-		*plainchar++ |= (fragment & 0x03c) >> 2;
-		*plainchar    = (fragment & 0x003) << 6;
-
-		do {
-			if (codechar == code_in+length_in)
-			{
-				return plainchar - plaintext_out;
-			}
-			fragment = (char)base64_decode_value(*codechar++);
-		} while (fragment < 0);
-		*plainchar++   |= (fragment & 0x03f);
+			fragment = base64_decode_value(*codechar++);
+		} while (fragment < 0);
+		*plainchar    = (char)((fragment & 0x03f) << 2);
+
+		do {
+			if (codechar == code_in+length_in)
+			{
+				return plainchar - plaintext_out;
+			}
+			fragment = base64_decode_value(*codechar++);
+		} while (fragment < 0);
+		*plainchar++ |= (char)((fragment & 0x030) >> 4);
+		*plainchar    = (char)((fragment & 0x00f) << 4);
+
+		do {
+			if (codechar == code_in+length_in)
+			{
+				return plainchar - plaintext_out;
+			}
+			fragment = base64_decode_value(*codechar++);
+		} while (fragment < 0);
+		*plainchar++ |= (char)((fragment & 0x03c) >> 2);
+		*plainchar    = (char)((fragment & 0x003) << 6);
+
+		do {
+			if (codechar == code_in+length_in)
+			{
+				return plainchar - plaintext_out;
+			}
+			fragment = base64_decode_value(*codechar++);
+		} while (fragment < 0);
+		*plainchar++   |= (char)(fragment & 0x03f);
 	}
 	/* control should not reach here */
 	return plainchar - plaintext_out;
diff -up rpm-4.4.2.2/rpmio/digest.c.nss-init rpm-4.4.2.2/rpmio/digest.c
--- rpm-4.4.2.2/rpmio/digest.c.nss-init	2007-11-15 15:00:41.000000000 +0200
+++ rpm-4.4.2.2/rpmio/digest.c	2007-11-15 15:00:41.000000000 +0200
@@ -78,9 +78,6 @@ rpmDigestInit(pgpHashAlgo hashalgo, rpmD
     HASH_HashType type;
     DIGEST_CTX ctx = xcalloc(1, sizeof(*ctx));
 
-    if (NSS_NoDB_Init(NULL) != SECSuccess)
-	return NULL;
-
     ctx->flags = flags;
 
     type = getHashType(hashalgo);
diff -up rpm-4.4.2.2/rpmio/rpmpgp.h.nss-init rpm-4.4.2.2/rpmio/rpmpgp.h
--- rpm-4.4.2.2/rpmio/rpmpgp.h.nss-init	2007-11-15 15:00:41.000000000 +0200
+++ rpm-4.4.2.2/rpmio/rpmpgp.h	2007-11-15 15:00:41.000000000 +0200
@@ -1380,6 +1380,15 @@ unsigned int pgpCRC(const byte *octets, 
 }
 
 /** \ingroup rpmio
+ * Perform cryptography initialization.
+ * It must be called before any cryptography can be used within rpm.
+ * It's not normally necessary to call it directly as it's called in
+ * general rpm initialization routines.
+ * @return		0 on success, -1 on failure
+ */
+int rpmInitCrypto(void);
+
+/** \ingroup rpmio
  * Duplicate a digest context.
  * @param octx		existing digest context
  * @return		duplicated digest context
diff -up rpm-4.4.2.2/rpmio/rpmpgp.c.nss-init rpm-4.4.2.2/rpmio/rpmpgp.c
--- rpm-4.4.2.2/rpmio/rpmpgp.c.nss-init	2007-11-15 15:00:41.000000000 +0200
+++ rpm-4.4.2.2/rpmio/rpmpgp.c	2007-11-15 15:00:41.000000000 +0200
@@ -17,6 +17,8 @@ static int _debug = 0;
 /*@unchecked@*/
 static int _print = 0;
 
+static int _crypto_initialized = 0;
+
 /*@unchecked@*/ /*@null@*/
 static pgpDig _dig = NULL;
 
@@ -1094,7 +1096,6 @@ int pgpPrtPkt(const byte *pkt, unsigned 
 pgpDig pgpNewDig(void)
 {
     pgpDig dig = xcalloc(1, sizeof(*dig));
-    NSS_NoDB_Init(NULL);
 
     return dig;
 }
@@ -1404,5 +1405,18 @@ char * pgpArmorWrap(int atype, const uns
 
     return val;
 }
-
 /*@=boundsread@*/
+
+int rpmInitCrypto(void) {
+    int rc = 0;
+
+    if (!_crypto_initialized && NSS_NoDB_Init(NULL) != SECSuccess) {
+        rc = -1;
+    } else {
+        _crypto_initialized = 1;
+    }
+
+    return rc;
+}
+
+
diff -up rpm-4.4.2.2/tools/debugedit.c.nss-init rpm-4.4.2.2/tools/debugedit.c
--- rpm-4.4.2.2/tools/debugedit.c.nss-init	2007-11-15 15:01:42.000000000 +0200
+++ rpm-4.4.2.2/tools/debugedit.c	2007-11-15 15:02:23.000000000 +0200
@@ -1318,6 +1318,8 @@ handle_build_id (DSO *dso, Elf_Data *bui
   void *digest = NULL;
   size_t len;
 
+  rpmInitCrypto();
+
   while (i-- > 0)
     {
       algorithm = algorithms[i];
diff -up rpm-4.4.2.2/lib/rpmrc.c.nss-init rpm-4.4.2.2/lib/rpmrc.c
--- rpm-4.4.2.2/lib/rpmrc.c.nss-init	2007-09-11 09:28:15.000000000 +0300
+++ rpm-4.4.2.2/lib/rpmrc.c	2007-11-15 15:00:41.000000000 +0200
@@ -1850,6 +1850,10 @@ static int rpmReadRC(/*@null@*/ const ch
 
 int rpmReadConfigFiles(const char * file, const char * target)
 {
+    /* Initialize crypto engine as early as possible */
+    if (rpmInitCrypto() < 0) {
+	return -1;
+    }	
 
     /* Preset target macros */
     /*@-nullstate@*/	/* FIX: target can be NULL */
diff -up rpm-4.4.2.2/tools/debugedit.c.gcc43 rpm-4.4.2.2/tools/debugedit.c
--- rpm-4.4.2.2/tools/debugedit.c.gcc43	2008-01-04 08:57:09.000000000 +0200
+++ rpm-4.4.2.2/tools/debugedit.c	2008-01-04 08:58:40.000000000 +0200
@@ -1353,12 +1353,6 @@ handle_build_id (DSO *dso, Elf_Data *bui
      or Elf64 object, only that we are consistent in what bits feed the
      hash so it comes out the same for the same file contents.  */
   {
-    inline void process (const void *data, size_t size);
-    inline void process (const void *data, size_t size)
-    {
-      rpmDigestUpdate(ctx, data, size);
-    }
-
     union
     {
       GElf_Ehdr ehdr;
@@ -1387,7 +1381,7 @@ handle_build_id (DSO *dso, Elf_Data *bui
 	  goto bad;
 	if (elf64_xlatetom (&x, &x, dso->ehdr.e_ident[EI_DATA]) == NULL)
 	  goto bad;
-	process (x.d_buf, x.d_size);
+	rpmDigestUpdate(ctx, x.d_buf, x.d_size);
       }
 
     x.d_type = ELF_T_SHDR;
@@ -1399,14 +1393,14 @@ handle_build_id (DSO *dso, Elf_Data *bui
 	  u.shdr.sh_offset = 0;
 	  if (elf64_xlatetom (&x, &x, dso->ehdr.e_ident[EI_DATA]) == NULL)
 	    goto bad;
-	  process (x.d_buf, x.d_size);
+	  rpmDigestUpdate(ctx, x.d_buf, x.d_size);
 
 	  if (u.shdr.sh_type != SHT_NOBITS)
 	    {
 	      Elf_Data *d = elf_rawdata (dso->scn[i], NULL);
 	      if (d == NULL)
 		goto bad;
-	      process (d->d_buf, d->d_size);
+	      rpmDigestUpdate(ctx, d->d_buf, d->d_size);
 	    }
 	}
   }

rpm-4.4.2.3-queryformat-arch.patch:

--- NEW FILE rpm-4.4.2.3-queryformat-arch.patch ---
diff -up rpm-4.4.2.3-rc1/macros.in.qfmt rpm-4.4.2.3-rc1/macros.in
--- rpm-4.4.2.3-rc1/macros.in.qfmt	2008-01-25 16:52:39.000000000 +0200
+++ rpm-4.4.2.3-rc1/macros.in	2008-01-25 16:57:31.000000000 +0200
@@ -791,7 +791,7 @@ print (t)\
 # Default headerSprintf() output format string for rpm -qa
 #
 # XXX	Note: escaped %% for use in headerSprintf()
-%_query_all_fmt		%%{name}-%%{version}-%%{release}
+%_query_all_fmt		%%{name}-%%{version}-%%{release}%%|arch?{.%%{arch}}:{}|
 
 #
 # Default path to the file used for transaction fcmtl lock.


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	3 Oct 2007 10:56:24 -0000	1.22
+++ .cvsignore	25 Jan 2008 15:17:21 -0000	1.23
@@ -1 +1 @@
-rpm-4.4.2.2.tar.gz
+rpm-4.4.2.3-rc1.tar.gz


Index: rpm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -r1.275 -r1.276
--- rpm.spec	15 Jan 2008 13:43:25 -0000	1.275
+++ rpm.spec	25 Jan 2008 15:17:21 -0000	1.276
@@ -5,11 +5,11 @@
 
 Summary: The RPM package management system
 Name: rpm
-Version: 4.4.2.2
-Release: 13%{?dist}
+Version: 4.4.2.3
+Release: 0.1.rc1
 Group: System Environment/Base
 Url: http://www.rpm.org/
-Source: http://rpm.org/releases/rpm-4.4.x/%{name}-%{version}.tar.gz
+Source: http://rpm.org/releases/rpm-4.4.x/%{name}-%{version}-rc1.tar.gz
 Patch1: rpm-4.4.1-prereq.patch
 Patch2: rpm-4.4.2-ghost-conflicts.patch
 Patch3: rpm-4.4.2-trust.patch
@@ -17,19 +17,10 @@
 Patch5: rpm-4.4.2-rpmfc-skip.patch
 Patch6: rpm-4.4.2.2-matchpathcon.patch
 Patch7: rpm-4.4.2.1-no-popt.patch
-Patch8: rpm-4.4.2.2-nonutf-comment.patch
-Patch9: rpm-4.4.2.2-osgideps.patch
-Patch10: rpm-4.4.2.2-debugedit-fpc.patch
-Patch11: rpm-4.4.2.2-pyproblem.patch
-Patch12: rpm-4.4.2.2-problem-nevra.patch
-Patch13: rpm-4.4.2.2-nss.patch
-Patch14: rpm-4.4.2.2-base64-unsigned-char.patch
-Patch15: rpm-4.4.2.2-cryptoinit.patch
-Patch16: rpm-4.4.2.2-gcc43.patch
-Patch17: rpm-4.4.2.2-secondary-arch-macros.patch
-Patch18: rpm-4.4.2.2-no-targetreset.patch
-Patch19: rpm-4.4.2.2-pkgconfig-path.patch
-Patch20: rpm-4.4.2.2-autofoo.patch
+Patch8: rpm-4.4.2.3-nss.patch
+Patch9: rpm-4.4.2.2-autofoo.patch
+Patch10: rpm-4.4.2.2-pkgconfig-path.patch
+Patch11: rpm-4.4.2.3-queryformat-arch.patch
 
 # XXX Beware, this is one murky license, partially GPL/LGPL dual-licensed
 # and several different components with their own licenses included...
@@ -41,9 +32,6 @@
 Requires: crontabs
 Requires: logrotate
 
-# XXX temporary
-Source2: find-debuginfo.sh
-
 # XXX for autoreconf due to popt removal
 BuildRequires: autoconf automake libtool
 # XXX generally assumed to be installed but make it explicit as rpm
@@ -143,7 +131,7 @@
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}-rc1
 %patch1 -p1 -b .prereq
 %patch2 -p1 -b .ghostconflicts
 %patch3 -p1 -b .trust
@@ -151,19 +139,10 @@
 %patch5 -p1 -b .fcskip
 %patch6 -p1 -b .matchpathcon
 %patch7 -p1 -b .no-popt
-%patch8 -p1 -b .nonutf-comment
-%patch9 -p1 -b .osgideps
-%patch10 -p1 -b .debugedit-fpc
-%patch11 -p1 -b .pyproblem
-%patch12 -p1 -b .problem-nevra
-%patch13 -p1 -b .nss
-%patch14 -p1 -b .base64
-%patch15 -p1 -b .nss-init
-%patch16 -p1 -b .gcc43
-%patch17 -p1 -b .archmacros
-%patch18 -p1 -b .notargetreset
-%patch19 -p1 -b .pkgconfig-path
-%patch20 -p1 -b .autofoo
+%patch8 -p1 -b .nss
+%patch9 -p1 -b .autofoo
+%patch10 -p1 -b .pkgconfig-path
+%patch11 -p1 -b .qfmt-arch
 
 # force external popt
 rm -rf popt/
@@ -171,9 +150,6 @@
 # XXX for popt removal 
 autoreconf
 
-# new buildid-aware debuginfo 
-cp -f %{SOURCE2} scripts/find-debuginfo.sh
-
 %build
 
 # XXX pull in updated config.guess and config.sub as done by %%configure
@@ -418,6 +394,15 @@
 %endif
 
 %changelog
+* Fri Jan 25 2008 Panu Matilainen <pmatilai at redhat.com> 4.4.2.3-0.1.rc1
+- update to 4.4.2.3-rc1 
+- merge nss-related patches into one
+- change default queryformat to include arch 
+- resolves (documentation): #159638, #233232, #332271, #350401
+- resolves (build): #124300, #140597, #124995, #147383, #220449
+- resolves (query): #244236, #323221, #60288
+- resolves (general): #223931, #164021, #83006, #205080, #217258, #428979
+
 * Fri Jan 11 2008 Panu Matilainen <pmatilai at redhat.com> 4.4.2.2-13
 - lose the useless rpm user+group, use root:root like everything else
 - install x86 arch macros on x86_64 (#194123)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rpm/devel/sources,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- sources	3 Oct 2007 10:56:24 -0000	1.128
+++ sources	25 Jan 2008 15:17:21 -0000	1.129
@@ -1 +1 @@
-15faa7ebd9791ade1a2f8181821ac259  rpm-4.4.2.2.tar.gz
+b3614e3f01195af2bc9af57d50e2be5c  rpm-4.4.2.3-rc1.tar.gz


--- rpm-4.4.2.2-base64-unsigned-char.patch DELETED ---


--- rpm-4.4.2.2-cryptoinit.patch DELETED ---


--- rpm-4.4.2.2-debugedit-fpc.patch DELETED ---


--- rpm-4.4.2.2-gcc43.patch DELETED ---


--- rpm-4.4.2.2-no-targetreset.patch DELETED ---


--- rpm-4.4.2.2-nonutf-comment.patch DELETED ---


--- rpm-4.4.2.2-nss.patch DELETED ---


--- rpm-4.4.2.2-osgideps.patch DELETED ---


--- rpm-4.4.2.2-problem-nevra.patch DELETED ---


--- rpm-4.4.2.2-pyproblem.patch DELETED ---


--- rpm-4.4.2.2-secondary-arch-macros.patch DELETED ---


