From 5cc4577a3a4577995ecb028ce82467b685793fdb Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mar 07 2005 16:44:05 +0000 Subject: - disable hkp by default --- diff --git a/rpm-4.4.1-hkp-disable.patch b/rpm-4.4.1-hkp-disable.patch new file mode 100644 index 0000000..50fc03c --- /dev/null +++ b/rpm-4.4.1-hkp-disable.patch @@ -0,0 +1,13 @@ +--- rpm-4.4.1/macros.in.fedora 2005-03-07 11:37:37.000000000 -0500 ++++ rpm-4.4.1/macros.in 2005-03-07 11:37:48.000000000 -0500 +@@ -658,8 +658,8 @@ + + # Horowitz Key Protocol server configuration + # +-%_hkp_keyserver hkp://pgp.mit.edu +-%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=0x ++#%_hkp_keyserver hkp://pgp.mit.edu ++#%_hkp_keyserver_query %{_hkp_keyserver}/pks/lookup?op=get&search=0x + + #============================================================================== + # ---- Transaction macros. diff --git a/rpm.spec b/rpm.spec index 56c7341..37a2403 100644 --- a/rpm.spec +++ b/rpm.spec @@ -20,11 +20,12 @@ Name: rpm %define version 4.4.1 Version: %{version} %{expand: %%define rpm_version %{version}} -Release: 4 +Release: 5 Group: System Environment/Base Source: ftp://jbj.org/pub/rpm-devel/rpm-%{rpm_version}.tar.gz Patch0: rpm-4.4.1-posttrans.patch Patch1: rpm-4.4.1-gcc4.patch +Patch2: rpm-4.4.1-hkp-disable.patch License: GPL Conflicts: patch < 2.5 %ifos linux @@ -134,6 +135,7 @@ shell-like rules. %setup -q %patch0 -p0 %patch1 -p1 +%patch2 -p1 %build @@ -504,6 +506,9 @@ exit 0 %{__includedir}/popt.h %changelog +* Mon Mar 7 2005 Jeremy Katz - 4.4.1-5 +- disable hkp by default + * Tue Mar 1 2005 Jeremy Katz - 4.4.1-4 - fix build with gcc 4