From 39a9c680c9523b19f12220459e64ec156d96e674582fe49d87c171cbb84bd0c3 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 7 Dec 2016 10:14:54 +0000 Subject: [PATCH 1/2] Accepting request 444617 from home:stroeder:branches:network:ldap added 0001-krb5-1.15-build-fix.patch OBS-URL: https://build.opensuse.org/request/show/444617 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=177 --- 0001-krb5-1.15-build-fix.patch | 12 ++++++++++++ sssd.changes | 5 +++++ sssd.spec | 4 ++++ 3 files changed, 21 insertions(+) create mode 100644 0001-krb5-1.15-build-fix.patch diff --git a/0001-krb5-1.15-build-fix.patch b/0001-krb5-1.15-build-fix.patch new file mode 100644 index 0000000..0350510 --- /dev/null +++ b/0001-krb5-1.15-build-fix.patch @@ -0,0 +1,12 @@ +--- src/external/pac_responder.m4.orig 2016-12-07 10:15:59.944342273 +0100 ++++ src/external/pac_responder.m4 2016-12-07 10:16:01.412349552 +0100 +@@ -16,7 +16,8 @@ + Kerberos\ 5\ release\ 1.11* | \ + Kerberos\ 5\ release\ 1.12* | \ + Kerberos\ 5\ release\ 1.13* | \ +- Kerberos\ 5\ release\ 1.14*) ++ Kerberos\ 5\ release\ 1.14* | \ ++ Kerberos\ 5\ release\ 1.15*) + krb5_version_ok=yes + AC_MSG_RESULT([yes]) + ;; diff --git a/sssd.changes b/sssd.changes index 34aef48..f398ed3 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 7 09:24:22 UTC 2016 - michael@stroeder.com + +- build fix for MIT Kerberos 1.15 + ------------------------------------------------------------------- Wed Oct 19 22:21:30 UTC 2016 - michael@stroeder.com diff --git a/sssd.spec b/sssd.spec index 90b7900..3854691 100644 --- a/sssd.spec +++ b/sssd.spec @@ -32,6 +32,9 @@ Source4: sssd.service Source5: %name.keyring BuildRoot: %{_tmppath}/%{name}-%{version}-build +# see https://build.opensuse.org/request/show/443977 +Patch1: 0001-krb5-1.15-build-fix.patch + %define servicename sssd %define sssdstatedir %_localstatedir/lib/sss %define dbpath %sssdstatedir/db @@ -378,6 +381,7 @@ Security Services Daemon (sssd). %prep %setup -q +%patch1 -p0 %build %if 0%{?suse_version} < 1210 From e4721490fb91ab775e55f6b7b85eab8d418ce97940de728ccf97d54509c84350 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 7 Dec 2016 10:52:05 +0000 Subject: [PATCH 2/2] document the patch, mention it... meh OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=178 --- 0001-krb5-1.15-build-fix.patch | 37 +++++++++++++++++++++++++--------- sssd.changes | 5 +++-- sssd.spec | 2 +- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/0001-krb5-1.15-build-fix.patch b/0001-krb5-1.15-build-fix.patch index 0350510..e6ebb32 100644 --- a/0001-krb5-1.15-build-fix.patch +++ b/0001-krb5-1.15-build-fix.patch @@ -1,12 +1,29 @@ ---- src/external/pac_responder.m4.orig 2016-12-07 10:15:59.944342273 +0100 -+++ src/external/pac_responder.m4 2016-12-07 10:16:01.412349552 +0100 -@@ -16,7 +16,8 @@ +From: Jan Engelhardt +Date: 2016-12-07 11:36:34.201377440 +0100 +Upstream: no + +build: unlock all krb5 versions + +The check is really stupid (like testing for "2.6.*" kernel was elsewhere), as +it prevents using future versions. The check should have tested +for {1.[0-9]:reject} instead. + +Anyway, unlock all versions. The minimum requirement is enforced +in openSUSE by way of the spec file. +--- + src/external/pac_responder.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: sssd-1.14.2/src/external/pac_responder.m4 +=================================================================== +--- sssd-1.14.2.orig/src/external/pac_responder.m4 ++++ sssd-1.14.2/src/external/pac_responder.m4 +@@ -11,7 +11,7 @@ then + AC_MSG_CHECKING(for supported MIT krb5 version) + KRB5_VERSION="`$KRB5_CONFIG --version`" + case $KRB5_VERSION in +- Kerberos\ 5\ release\ 1.9* | \ ++ Kerberos\ 5\ release\ 1.* | \ + Kerberos\ 5\ release\ 1.10* | \ Kerberos\ 5\ release\ 1.11* | \ Kerberos\ 5\ release\ 1.12* | \ - Kerberos\ 5\ release\ 1.13* | \ -- Kerberos\ 5\ release\ 1.14*) -+ Kerberos\ 5\ release\ 1.14* | \ -+ Kerberos\ 5\ release\ 1.15*) - krb5_version_ok=yes - AC_MSG_RESULT([yes]) - ;; diff --git a/sssd.changes b/sssd.changes index f398ed3..5fff7f9 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- -Wed Dec 7 09:24:22 UTC 2016 - michael@stroeder.com +Wed Dec 7 10:39:30 UTC 2016 - jengelh@inai.de -- build fix for MIT Kerberos 1.15 +- Add 0001-krb5-1.15-build-fix.patch to unlock building + against future KRB versions. ------------------------------------------------------------------- Wed Oct 19 22:21:30 UTC 2016 - michael@stroeder.com diff --git a/sssd.spec b/sssd.spec index 3854691..1cb5545 100644 --- a/sssd.spec +++ b/sssd.spec @@ -381,7 +381,7 @@ Security Services Daemon (sssd). %prep %setup -q -%patch1 -p0 +%patch -P 1 -p1 %build %if 0%{?suse_version} < 1210