diff --git a/0001-Allow-using-gssapi-for-lookaside-caches.patch b/0001-Allow-using-gssapi-for-lookaside-caches.patch new file mode 100644 index 0000000..a5bba3d --- /dev/null +++ b/0001-Allow-using-gssapi-for-lookaside-caches.patch @@ -0,0 +1,37 @@ +From 3f9b6951a805f62b04b74f44d5e0b4d4ac1b096d Mon Sep 17 00:00:00 2001 +From: Patrick Uiterwijk +Date: Fri, 14 Oct 2016 21:11:12 +0000 +Subject: [PATCH] Allow using gssapi for lookaside caches + +Signed-off-by: Patrick Uiterwijk +--- + src/pyrpkg/lookaside.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/pyrpkg/lookaside.py b/src/pyrpkg/lookaside.py +index f46da65..7aa1ae0 100644 +--- a/src/pyrpkg/lookaside.py ++++ b/src/pyrpkg/lookaside.py +@@ -214,6 +214,9 @@ class CGILookasideCache(object): + else: + self.log.warning("Missing certificate: %s" % self.ca_cert) + ++ c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_GSSNEGOTIATE) ++ c.setopt(pycurl.USERPWD, ':') ++ + try: + c.perform() + status = c.getinfo(pycurl.RESPONSE_CODE) +@@ -282,6 +285,9 @@ class CGILookasideCache(object): + else: + self.log.warning("Missing certificate: %s" % self.ca_cert) + ++ c.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_GSSNEGOTIATE) ++ c.setopt(pycurl.USERPWD, ':') ++ + try: + c.perform() + status = c.getinfo(pycurl.RESPONSE_CODE) +-- +2.7.4 + diff --git a/rpkg.spec b/rpkg.spec index d82f341..43fea5b 100644 --- a/rpkg.spec +++ b/rpkg.spec @@ -3,13 +3,15 @@ Name: rpkg Version: 1.46 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Utility for interacting with rpm+git packaging systems Group: Applications/System License: GPLv2+ and LGPLv2 URL: https://pagure.io/rpkg Source0: https://pagure.io/releases/rpkg/rpkg-%{version}.tar.gz +# Merged in master, but included here so that it reaches people faster +Patch0: 0001-Allow-using-gssapi-for-lookaside-caches.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pyrpkg >= %{version}-%{release} @@ -56,11 +58,12 @@ A python library for managing RPM package sources in a git repository. %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build -%{__python} doc/rpkg_man_page.py > rpkg.1 +%{__python} src/rpkg_man_page.py > rpkg.1 %install @@ -90,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Oct 25 2016 Lubomír Sedlář - 1.46-5 +- Allow using gssapi for lookaside caches + * Tue Sep 06 2016 Lubomír Sedlář - 1.46-4 - Update dependencies for python-argparse and python-hashlib