rpms/rpm/devel rpm.spec,1.199,1.200 rpm-4.4.2-trust.patch,1.1,1.2

[fedora-cvs-commits at redhat.com]

Author: pnasrat

Update of /cvs/dist/rpms/rpm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32482

Modified Files:
	rpm.spec rpm-4.4.2-trust.patch 
Log Message:
Fix rpmk breakage



Index: rpm.spec
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- rpm.spec	25 Apr 2006 21:21:57 -0000	1.199
+++ rpm.spec	27 Apr 2006 17:52:50 -0000	1.200
@@ -20,7 +20,7 @@
 %define version 4.4.2
 Version: %{version}
 %{expand: %%define rpm_version %{version}}
-Release: 19
+Release: 20
 Group: System Environment/Base
 Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
 Source1: mono-find-provides
@@ -576,6 +576,9 @@
 %{__includedir}/popt.h
 
 %changelog
+* Thu Apr 27 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-20
+- Update --trusted stubs for rpmk breakage
+
 * Tue Apr 25 2006 Paul Nasrat <pnasrat at redhat.com> - 4.4.2-19
 - Add --trusted stubs from upstream
 

rpm-4.4.2-trust.patch:
 poptQV.c |   29 +++++++++++++++++++++--------
 rpmcli.h |    1 +
 2 files changed, 22 insertions(+), 8 deletions(-)

Index: rpm-4.4.2-trust.patch
===================================================================
RCS file: /cvs/dist/rpms/rpm/devel/rpm-4.4.2-trust.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rpm-4.4.2-trust.patch	25 Apr 2006 21:21:57 -0000	1.1
+++ rpm-4.4.2-trust.patch	27 Apr 2006 17:52:50 -0000	1.2
@@ -1,5 +1,5 @@
---- rpm-4.4.2/lib/poptQV.c.trust	2006-04-24 17:42:20.000000000 -0400
-+++ rpm-4.4.2/lib/poptQV.c	2006-04-24 17:44:05.000000000 -0400
+--- rpm-4.4.2/lib/poptQV.c.trust	2004-11-09 19:50:42.000000000 -0500
++++ rpm-4.4.2/lib/poptQV.c	2006-04-27 13:42:31.000000000 -0400
 @@ -31,6 +31,10 @@
  #define POPT_HDLIST		-1011
  #define POPT_FTSWALK		-1012
@@ -11,11 +11,10 @@
  /* ========== Query/Verify/Signature source args */
  static void rpmQVSourceArgCallback( /*@unused@*/ poptContext con,
  		/*@unused@*/ enum poptCallbackReason reason,
-@@ -87,6 +91,15 @@
- 	qva->qva_source |= RPMQV_DBOFFSET; 
- 	qva->qva_sourceCount++;
+@@ -240,6 +244,14 @@
+ 	qva->qva_flags |= VERIFY_SCRIPT;
  	break;
-+
+ 
 +    /* XXX perhaps POPT_ARG_INT instead of callback. */
 +    case POPT_TRUST:
 +    {	char * end = NULL;
@@ -27,7 +26,7 @@
      }
  }
  
-@@ -376,14 +389,6 @@
+@@ -376,14 +388,6 @@
          N_("don't verify package signature(s)"), NULL },
  #endif
  
@@ -42,7 +41,7 @@
      POPT_TABLEEND
  };
  
-@@ -408,6 +413,15 @@
+@@ -408,6 +412,15 @@
  	N_("sign package(s) (identical to --addsign)"), NULL },
   { "sign", '\0', POPT_ARGFLAG_DOC_HIDDEN, &rpmQVKArgs.sign, 0,
  	N_("generate signature"), NULL },
@@ -58,8 +57,8 @@
  
   { "nodigest", '\0', POPT_BIT_SET, &rpmQVKArgs.qva_flags, VERIFY_DIGEST,
          N_("don't verify package digest(s)"), NULL },
---- rpm-4.4.2/lib/rpmcli.h.trust	2006-04-24 17:42:28.000000000 -0400
-+++ rpm-4.4.2/lib/rpmcli.h	2006-04-24 17:42:33.000000000 -0400
+--- rpm-4.4.2/lib/rpmcli.h.trust	2005-01-04 11:35:05.000000000 -0500
++++ rpm-4.4.2/lib/rpmcli.h	2006-04-27 13:37:40.000000000 -0400
 @@ -280,6 +280,7 @@
  /*@only@*/ /*@null@*/
      const char * qva_queryFormat;/*!< Format for headerSprintf(). */