[packages/keyutils/DEVEL] - updated to 1.5.11 - key.dns_resolver depends on MIT Kerberos now; added disable-krb5 patch to disa

[qboosh]

commit 0ac6a4d63c268e690d13b3517d9e52d977d902d8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 1 21:19:16 2018 +0200

    - updated to 1.5.11
    - key.dns_resolver depends on MIT Kerberos now; added disable-krb5 patch to disable this part

 keyutils-disable-krb5.patch | 19 +++++++++++++++++++
 keyutils.spec               | 15 ++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)
---
diff --git a/keyutils.spec b/keyutils.spec
index 812510b..6836cb6 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -5,19 +5,23 @@
 %else
 %bcond_without	glibc24		# build for older glibc
 %endif
+%bcond_without	krb5		# key.dns_resolver (requires MIT Kerberos)
 
 Summary:	Linux Key Management Utilities
 Summary(pl.UTF-8):	Narzędzia do linuksowego zarządzania kluczami
 Name:		keyutils
-Version:	1.5.10
+Version:	1.5.11
 Release:	1
 License:	LGPL v2+ (library), GPL v2+ (utility)
 Group:		Base
 Source0:	http://people.redhat.com/~dhowells/keyutils/%{name}-%{version}.tar.bz2
-# Source0-md5:	3771676319bc7b84b1549b5c63ff5243
+# Source0-md5:	bcc0984181572461850a37c39f8b167a
 Patch0:		helpers.patch
+Patch1:		%{name}-disable-krb5.patch
+URL:		https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git
 BuildRequires:	rpmbuild(macros) >= 1.402
-%{!?with_glibc24:BuildRequires:	glibc-devel >= 6:2.4}
+%{?with_glibc24:BuildRequires:	glibc-devel >= 6:2.4}
+%{?with_krb5:BuildRequires:	krb5-devel}
 Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -76,6 +80,9 @@ Statyczna biblioteka do zarządzania linuksowymi kluczami.
 %prep
 %setup -q
 %patch0 -p1
+%if %{without krb5}
+%patch1 -p1
+%endif
 
 %build
 %{__make} -j1 \
@@ -106,7 +113,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README
 %attr(755,root,root) /bin/keyctl
+%if %{with krb5}
 %attr(755,root,root) /sbin/key.dns_resolver
+%endif
 %attr(755,root,root) /sbin/request-key
 %dir %{_datadir}/keyutils
 %attr(755,root,root) %{_datadir}/keyutils/*.sh
diff --git a/keyutils-disable-krb5.patch b/keyutils-disable-krb5.patch
new file mode 100644
index 0000000..d905fc4
--- /dev/null
+++ b/keyutils-disable-krb5.patch
@@ -0,0 +1,19 @@
+--- keyutils-1.5.11/Makefile.orig	2018-05-11 16:30:30.000000000 +0200
++++ keyutils-1.5.11/Makefile	2018-09-01 20:26:06.474216636 +0200
+@@ -95,7 +95,7 @@
+ # Normal build rule
+ #
+ ###############################################################################
+-all: keyctl request-key key.dns_resolver
++all: keyctl request-key
+ 
+ ###############################################################################
+ #
+@@ -176,7 +176,6 @@
+ 	$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
+ 	$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
+ 	$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh
+-	$(INSTALL) -D key.dns_resolver $(DESTDIR)$(SBINDIR)/key.dns_resolver
+ 	$(INSTALL) -D -m 0644 request-key.conf $(DESTDIR)$(ETCDIR)/request-key.conf
+ 	mkdir -p $(DESTDIR)$(ETCDIR)/request-key.d
+ 	mkdir -p $(DESTDIR)$(MAN1)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/keyutils.git/commitdiff/0ac6a4d63c268e690d13b3517d9e52d977d902d8