rpms/rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix rpmk breakage

Browse Source
This commit is contained in:
Paul Nasrat 2006-04-27 17:52:50 +00:00
parent ef115724c8
commit 4fe8a5fe93
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
rpm-4.4.2-trust.patch
View File

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

5
rpm.spec
View File

@ -20,7 +20,7 @@ Name: rpm
%define version 4.4.2 %define version 4.4.2
Version: %{version} Version: %{version}
%{expand: %%define rpm_version %{version}} %{expand: %%define rpm_version %{version}}
Release: 19 Release: 20
Group: System Environment/Base Group: System Environment/Base
Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz Source: ftp://wraptastic.org/pub/rpm-4.4.x/rpm-%{rpm_version}.tar.gz
Source1: mono-find-provides Source1: mono-find-provides
@ -576,6 +576,9 @@ exit 0
%{__includedir}/popt.h %{__includedir}/popt.h
%changelog %changelog
* Thu Apr 27 2006 Paul Nasrat <pnasrat@redhat.com> - 4.4.2-20
- Update --trusted stubs for rpmk breakage
* Tue Apr 25 2006 Paul Nasrat <pnasrat@redhat.com> - 4.4.2-19 * Tue Apr 25 2006 Paul Nasrat <pnasrat@redhat.com> - 4.4.2-19
- Add --trusted stubs from upstream - Add --trusted stubs from upstream