From 26c7841752d4bffa8474e459fefafeb2fe0374cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 12:36:55 +0000 Subject: [PATCH 01/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 2e473b1..7437bf4 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -18,7 +18,7 @@ Name: heimdal Version: 7.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -562,6 +562,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 7.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jul 12 2017 Ken Dreyer - 7.4.0-2 - Make test failures non-fatal From 8635a601e0ed278f527c9cf03dbc075915d4f7eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 23:25:40 +0000 Subject: [PATCH 02/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 7437bf4..7c64fb2 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -18,7 +18,7 @@ Name: heimdal Version: 7.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -562,6 +562,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 7.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 7.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From ea6faf4f42cc2d3221f926d8b0f9fab2b958c48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Mon, 23 Oct 2017 08:36:23 +0000 Subject: [PATCH 03/62] Backport fix to prevent wait() loop on non-existant child process --- heimdal-7.4.0-237cd892-fixwaitloop.patch | 56 ++++++++++++++++++++++++ heimdal.spec | 7 ++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 heimdal-7.4.0-237cd892-fixwaitloop.patch diff --git a/heimdal-7.4.0-237cd892-fixwaitloop.patch b/heimdal-7.4.0-237cd892-fixwaitloop.patch new file mode 100644 index 0000000..4766351 --- /dev/null +++ b/heimdal-7.4.0-237cd892-fixwaitloop.patch @@ -0,0 +1,56 @@ +commit 237cd892d9e9625b135f8c9d078d50dfa44bba91 +Author: Jeffrey Altman +Date: Sat Jul 22 10:39:41 2017 -0400 + + kdc: unused pid element is (pid_t)-1 not zero + + When the termination of a child process is observed by reap_kid() it + clears the pids[] element by assigning it the invalid pid value + (pid_t)-1. However, start_kdc() assumes that the unused pid[[] element + value is 0. As a result, each pid[] element's associated child process + can only be restarted once since start_kdc() will not be able to locate + an unused element. + + This change alters start_kdc() to initialize all elements of pids[] to + (pid_t)-1 and use that as the marker for unused elements. By doing so + start_kdc() can properly record child process pids and indefinitely + restart child processes as necessary. + + Change-Id: Ia93c9284ab21289994eca7fc9cf1278be7c00683 + +diff --git a/kdc/connect.c b/kdc/connect.c +index bc63f58a4..f98e6c749 100644 +--- a/kdc/connect.c ++++ b/kdc/connect.c +@@ -1122,9 +1122,11 @@ start_kdc(krb5_context context, + if (max_kdcs < 1) + max_kdcs = 1; + +- pids = calloc(max_kdcs, sizeof(*pids)); ++ pids = malloc(max_kdcs * sizeof(*pids)); + if (!pids) + krb5_err(context, 1, errno, "malloc"); ++ for (i = 0; i < max_kdcs; i++) ++ pids[i] = (pid_t)-1; + + /* + * We open a socketpair of which we hand one end to each of our kids. +@@ -1196,12 +1198,12 @@ start_kdc(krb5_context context, + sleep(10); + break; + default: +- for (i=0; i < max_kdcs; i++) { +- if (pids[i] == 0) { +- pids[i] = pid; +- break; +- } +- } ++ for (i = 0; i < max_kdcs; i++) { ++ if (pids[i] == (pid_t)-1) { ++ pids[i] = pid; ++ break; ++ } ++ } + kdc_log(context, config, 0, "KDC worker process started: %d", + pid); + num_kdcs++; diff --git a/heimdal.spec b/heimdal.spec index 7c64fb2..da6bd29 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -18,7 +18,7 @@ Name: heimdal Version: 7.4.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -53,6 +53,7 @@ Source31: %{name}-ipropd-slave-wrapper # klist, kswitch, and kvno are symlinks to "heimtools", and this utility needs # to know how to interpret the "heimdal-" prefixes. Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch +Patch2: heimdal-7.4.0-237cd892-fixwaitloop.patch BuildRequires: bison BuildRequires: flex @@ -178,6 +179,7 @@ PATH. %prep %setup -b 1 -qn %{name}-%{commit} %patch1 -p1 -b .cmds +%patch2 -p1 -b .fixwaitloop %if 0%{?need_autogen} ./autogen.sh @@ -562,6 +564,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Mon Oct 23 2017 Alexander Boström - 7.4.0-5 +- Backport fix to prevent wait() loop on non-existant child process + * Wed Aug 02 2017 Fedora Release Engineering - 7.4.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From e6b3cefd86edb4afea4721d7ead8e59419fa91f7 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Thu, 14 Dec 2017 08:46:21 -0700 Subject: [PATCH 04/62] Update to 7.5.0 GA release --- .gitignore | 2 ++ heimdal-generate-autoconf-tarball | 2 +- heimdal.spec | 11 +++++++---- sources | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2e0ede5..df86df0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ /heimdal-40d4229-autoconf.tar.gz /heimdal-7.4.0-a3d72c6.tar.gz /heimdal-a3d72c6-autoconf.tar.gz +/heimdal-3e58559-autoconf.tar.gz +/heimdal-7.5.0-3e58559.tar.gz diff --git a/heimdal-generate-autoconf-tarball b/heimdal-generate-autoconf-tarball index 2a85ecd..648b7d7 100755 --- a/heimdal-generate-autoconf-tarball +++ b/heimdal-generate-autoconf-tarball @@ -4,7 +4,7 @@ # It's useful to pregenerate this data before building in mock, because # GNU autoconf on RHEL 5 is too old to parse the autoconf syntax in Heimdal. -COMMIT=a3d72c604378e0bff787cc426f2b17f75b112dce +COMMIT=3e58559362dd3f485e6d6659d587a9169a131391 SHORT_COMMIT=${COMMIT:0:7} set -e diff --git a/heimdal.spec b/heimdal.spec index da6bd29..28eae0c 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -2,8 +2,8 @@ %global libdir %{_libdir}/heimdal %global bindir %{_exec_prefix}/lib/heimdal -%global commitdate 20170711 -%global commit a3d72c604378e0bff787cc426f2b17f75b112dce +%global commitdate 20171214 +%global commit 3e58559362dd3f485e6d6659d587a9169a131391 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %if 0%{?el5} %global need_autogen 0 @@ -17,8 +17,8 @@ %endif Name: heimdal -Version: 7.4.0 -Release: 5%{?dist} +Version: 7.5.0 +Release: 1%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -564,6 +564,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Dec 14 2017 Ken Dreyer - 7.5.0-1 +- Update to 7.5.0 GA release (CVE-2017-17439) + * Mon Oct 23 2017 Alexander Boström - 7.4.0-5 - Backport fix to prevent wait() loop on non-existant child process diff --git a/sources b/sources index 8cfdb0e..08fdec9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (heimdal-7.4.0-a3d72c6.tar.gz) = fe96fbd44fb5974ca79ed56945c41f95882573147e31211bc71321cc20bb1355f8936101c7c3744029ddee770d30e844153c9d0de3b498d7d10d1d523891a776 -SHA512 (heimdal-a3d72c6-autoconf.tar.gz) = 925add697a24de027fbccad87c8e1eba120766bae9844f776e6168edb3c8d03b97615845abb606f473b8573b0dff888fdc07dc6a35dd4d73997c00a0fe2e7e5c +SHA512 (heimdal-3e58559-autoconf.tar.gz) = 894acd512b8f1216f40abdcb24821c97a9a5089d71dc236d22e76f3ce0b00aca29d32cf76f348de736a9f120e3ce7dd4d213af1266cae7cf8ecd8234bf904536 +SHA512 (heimdal-7.5.0-3e58559.tar.gz) = 7f2ae83e447d8d994a6beb009d26860a936ff86d4d790f8816e1015c7875dc6cabee46a4f0af8cef23781bae15dc644441ae76448b86d7e8df27fb9fde85dbc3 From ef03dbc07a6c4565d4301376310b11000e0306b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 20 Jan 2018 23:06:53 +0100 Subject: [PATCH 05/62] Rebuilt for switch to libxcrypt --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 28eae0c..8dc2f81 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -18,7 +18,7 @@ Name: heimdal Version: 7.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -564,6 +564,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Sat Jan 20 2018 Björn Esser - 7.5.0-2 +- Rebuilt for switch to libxcrypt + * Thu Dec 14 2017 Ken Dreyer - 7.5.0-1 - Update to 7.5.0 GA release (CVE-2017-17439) From 84ed5706cbeffcdd0e6b7846faab035ae2d94f28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 16:12:23 +0000 Subject: [PATCH 06/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 8dc2f81..77bc20a 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -18,7 +18,7 @@ Name: heimdal Version: 7.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -564,6 +564,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 7.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Jan 20 2018 Björn Esser - 7.5.0-2 - Rebuilt for switch to libxcrypt From f96f9486700a96e53b6b4cc247d027d546ded115 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:30:14 +0100 Subject: [PATCH 07/62] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- heimdal.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 77bc20a..f38477b 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -94,7 +94,6 @@ BuildRequires: systemd-units %endif %if 0%{?el5} -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) %endif # Bundled libtommath (https://bugzilla.redhat.com/1118462) From 92f1a87d400d4eaa39a9c05fe9f12f8890e8b1cb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:15:07 +0100 Subject: [PATCH 08/62] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- heimdal.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index f38477b..d3d61ca 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -336,9 +336,6 @@ else touch %{name}.lang fi -%clean -rm -rf %{buildroot} - %post server %if 0%{?_with_systemd} %systemd_post heimdal-kdc.service From c804cde4f40b518d9376433e81e14ac11c04239b Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Thu, 15 Mar 2018 04:46:08 +0100 Subject: [PATCH 09/62] Update Python 2 dependency declarations to new packaging standards --- heimdal.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index d3d61ca..3c21db7 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -18,7 +18,7 @@ Name: heimdal Version: 7.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -82,7 +82,7 @@ BuildRequires: libdb-devel %if 0%{?need_autogen} BuildRequires: doxygen BuildRequires: graphviz -BuildRequires: python +BuildRequires: python2 %endif %if (0%{?rhel} && 0%{?rhel} < 7) BuildRequires: groff @@ -560,6 +560,10 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Mar 15 2018 Iryna Shcherbina - 7.5.0-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Wed Feb 07 2018 Fedora Release Engineering - 7.5.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 59ec01b366f9947786b35d6689e1f562c5f7f340 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 04:55:27 +0000 Subject: [PATCH 10/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 3c21db7..9692663 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -18,7 +18,7 @@ Name: heimdal Version: 7.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -560,6 +560,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 7.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 15 2018 Iryna Shcherbina - 7.5.0-4 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 993b86bad8c22363fdb7c665515744a9429e219d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 6 Jan 2019 18:05:43 +0100 Subject: [PATCH 11/62] Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) --- heimdal-7.5.0-explicit-python2.patch | 156 +++++++++++++++++++++++++++ heimdal.spec | 8 +- 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 heimdal-7.5.0-explicit-python2.patch diff --git a/heimdal-7.5.0-explicit-python2.patch b/heimdal-7.5.0-explicit-python2.patch new file mode 100644 index 0000000..a96b18a --- /dev/null +++ b/heimdal-7.5.0-explicit-python2.patch @@ -0,0 +1,156 @@ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/hx509/quote.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2 + # -*- coding: utf-8 -*- + # + # Copyright (c) 2010 Kungliga Tekniska Högskolan +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/Makefile.am ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am +@@ -89,7 +89,7 @@ idn_lookup_SOURCES = idn-lookup.c + + LDADD = libwind.la $(LIB_roken) + +-PYTHON = python ++PYTHON = python2 + + if !MAINTAINER_MODE + skip_python = test -f $@ || +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/UnicodeData.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-bidi.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-combining.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-errorlist.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-map.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-normalize.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-punycode-examples.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/generate.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc3454.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc4518.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/stringprep.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/util.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python2 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/windows/NTMakefile.w32 ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 +@@ -120,7 +120,7 @@ RC=rc + AWK_CMD=gawk.exe + YACC_CMD=bison.exe + LEX_CMD=flex.exe +-PYTHON=python.exe ++PYTHON=python2.exe + PERL=perl.exe + CMP=cmp.exe + MAKECAT=makecat.exe diff --git a/heimdal.spec b/heimdal.spec index 9692663..90d0988 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -18,7 +18,7 @@ Name: heimdal Version: 7.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -54,6 +54,8 @@ Source31: %{name}-ipropd-slave-wrapper # to know how to interpret the "heimdal-" prefixes. Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch Patch2: heimdal-7.4.0-237cd892-fixwaitloop.patch +# Use Python2 explicity. +Patch3: heimdal-7.5.0-explicit-python2.patch BuildRequires: bison BuildRequires: flex @@ -179,6 +181,7 @@ PATH. %setup -b 1 -qn %{name}-%{commit} %patch1 -p1 -b .cmds %patch2 -p1 -b .fixwaitloop +%patch3 -p1 -b .python2 %if 0%{?need_autogen} ./autogen.sh @@ -560,6 +563,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Sun Jan 06 2019 Björn Esser - 7.5.0-6 +- Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) + * Fri Jul 13 2018 Fedora Release Engineering - 7.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 18c1802bad0e596f7c0291e11e868aa380e06c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 6 Jan 2019 18:11:36 +0100 Subject: [PATCH 12/62] Remove el5 bits --- heimdal-generate-autoconf-tarball | 55 --------------------------- heimdal.spec | 62 ++----------------------------- sources | 1 - 3 files changed, 3 insertions(+), 115 deletions(-) delete mode 100755 heimdal-generate-autoconf-tarball diff --git a/heimdal-generate-autoconf-tarball b/heimdal-generate-autoconf-tarball deleted file mode 100755 index 648b7d7..0000000 --- a/heimdal-generate-autoconf-tarball +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -# Create a second tarball of the autogen'd files in Heimdal. -# It's useful to pregenerate this data before building in mock, because -# GNU autoconf on RHEL 5 is too old to parse the autoconf syntax in Heimdal. - -COMMIT=3e58559362dd3f485e6d6659d587a9169a131391 -SHORT_COMMIT=${COMMIT:0:7} - -set -e - -# Get the tarball -TARBALL=$(ls heimdal-*-$SHORT_COMMIT.tar.gz | tail -1) - -# Sanity check that the tarball exists -if [[ ! -f $TARBALL ]]; then - echo could not find a heimdal tarball for git commit $SHORT_COMMIT - exit 1 -fi - -# Untar, and set aside a "pristine" copy -tar xzf $TARBALL -cp -r heimdal-$COMMIT heimdal-$COMMIT-pristine - -# autogen -pushd heimdal-$COMMIT - ./autogen.sh -popd - -# Get a list of all chagned files from the "pristine" version. -CHANGES=$(diff -qr heimdal-${COMMIT}-pristine heimdal-${COMMIT} \ - | sed "s/^Only in heimdal-${COMMIT}//" \ - | sed "s/: /\//" \ - | sed "s/Files heimdal-${COMMIT}-pristine//" \ - | sed "s/and heimdal-${COMMIT}\/.* differ//" \ - | sed "s/^\///") - -# This tarball will contain only the new autoconf-generated files. -AUTOCONF_TARBALL=heimdal-${SHORT_COMMIT}-autoconf.tar -# (delete the old tarball if it exists.) -rm $AUTOCONF_TARBALL 2>/dev/null || : - -# Append each of the files in $CHANGES onto $AUTOCONF_TARBALL. -while read -r line; do - tar -f $AUTOCONF_TARBALL -r heimdal-$COMMIT/$line -done <<< "$CHANGES" - -# Compress the autoconf tarball. -gzip -f $AUTOCONF_TARBALL - -# We're done. -echo Created ${AUTOCONF_TARBALL}.gz - -# Clean up dirs -rm -rf heimdal-$COMMIT heimdal-$COMMIT-pristine diff --git a/heimdal.spec b/heimdal.spec index 90d0988..47bc59a 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -5,11 +5,6 @@ %global commitdate 20171214 %global commit 3e58559362dd3f485e6d6659d587a9169a131391 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%if 0%{?el5} -%global need_autogen 0 -%else -%global need_autogen 1 -%endif # Use systemd unit files on RHEL 7 and above. %if ! (0%{?rhel} && 0%{?rhel} < 7) @@ -22,15 +17,7 @@ Release: 6%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ -Group: System Environment/Libraries Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz -# We need Source1 (pregenerated autoconf files) on EL5. -# To create this tarball: -# 1. Download the Source0 tarball -# 2. Ensure the COMMIT sha1 is correct in heimdal-generate-autoconf-tarball -# 2. Run ./heimdal-generate-autoconf-tarball -Source1: %{name}-%{shortcommit}-autoconf.tar.gz -Source2: %{name}-generate-autoconf-tarball Source3: %{name}.sysconfig Source4: %{name}.sh Source5: %{name}.csh @@ -70,22 +57,16 @@ BuildRequires: pam-devel BuildRequires: perl(JSON) BuildRequires: sqlite-devel BuildRequires: texinfo -%if (0%{?rhel} && 0%{?rhel} < 6) -BuildRequires: e2fsprogs-devel -%else BuildRequires: libcom_err-devel BuildRequires: libcap-ng-devel -%endif %if (0%{?rhel} && 0%{?rhel} < 7) BuildRequires: db4-devel %else BuildRequires: libdb-devel %endif -%if 0%{?need_autogen} BuildRequires: doxygen BuildRequires: graphviz BuildRequires: python2 -%endif %if (0%{?rhel} && 0%{?rhel} < 7) BuildRequires: groff %else @@ -95,9 +76,6 @@ BuildRequires: groff-base BuildRequires: systemd-units %endif -%if 0%{?el5} -%endif - # Bundled libtommath (https://bugzilla.redhat.com/1118462) Provides: bundled(libtommath) = 0.42.0 @@ -118,7 +96,6 @@ by default since it is deemed too big a security risk by the packager. %package workstation Summary: Heimdal kerberos programs for use on workstations -Group: System Environment/Base %description workstation This package contains Heimdal Kerberos 5 programs and utilities for @@ -126,7 +103,6 @@ use on workstations (kinit, klist, kdestroy, kpasswd) %package server Summary: Heimdal kerberos server -Group: System Environment/Daemons Requires: logrotate %if 0%{?_with_systemd} Requires(preun): systemd @@ -149,7 +125,6 @@ set up Kerberos server. %package libs Summary: Heimdal kerberos shared libraries -Group: System Environment/Libraries Requires(post): info Requires(preun): info @@ -159,7 +134,6 @@ Heimdal packages. %package devel Summary: Header and other development files for Heimdal kerberos -Group: System Environment/Libraries Provides: %{name}-static = %{version}-%{release} %description devel @@ -168,7 +142,6 @@ kerberos headers/libraries. %package path Summary: Heimdal kerberos PATH manipulation -Group: System Environment/Base Requires: %{name}-libs # For /etc/profile.d Requires: setup @@ -178,14 +151,12 @@ This package prepends the Heimdal binary directory to the beginning of PATH. %prep -%setup -b 1 -qn %{name}-%{commit} +%setup -qn %{name}-%{commit} %patch1 -p1 -b .cmds %patch2 -p1 -b .fixwaitloop %patch3 -p1 -b .python2 -%if 0%{?need_autogen} - ./autogen.sh -%endif +./autogen.sh %build %ifarch i386 @@ -210,16 +181,8 @@ PATH. --with-libedit=%{_prefix} \ LIBS="-ltermcap" \ CFLAGS="-fPIC %{optflags} %{build_fix}" -%if 0%{?need_autogen} make %{?_smp_mflags} dist -%endif -# Building on EL5 with %{?_smp_mflags} passed causes -# the make to fail. So for EL5 don't do that. -%if 0%{?el5} -make -%else make %{?_smp_mflags} -%endif make %{?_smp_mflags} -C doc html %check @@ -227,7 +190,6 @@ make %{?_smp_mflags} -C doc html make check || : %install -rm -rf %{buildroot} make DESTDIR=%{buildroot} install # install the init files %if 0%{?_with_systemd} @@ -312,13 +274,9 @@ do done # If we have the prefixed name in one pkg we want it in all. -%if (0%{?rhel} && 0%{?rhel} <= 5) -ln -s kswitch %{buildroot}%{_bindir}/%{name}-kswitch -%else mv %{buildroot}%{_bindir}/{,%{name}-}kswitch ln -s %{_bindir}/%{name}-kswitch %{buildroot}%{bindir}/bin/kswitch mv %{buildroot}%{_mandir}/man1/{,%{name}-}kswitch.1 -%endif ln -s %{name}-kinit %{buildroot}%{_bindir}/kauth @@ -327,12 +285,6 @@ mv %{buildroot}%{_mandir}/man5/{,%{name}-}krb5.conf.5 rm %{buildroot}%{_mandir}/man5/qop.5 ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz -# Remove translations on EL5 to avoid a find-lang bug with --all-name. -# https://bugzilla.redhat.com/213041 -%if 0%{?el5} - find %{buildroot} -name '*.mo' | xargs rm -%endif - if find %{buildroot} -name '*.mo' | grep .; then %find_lang %{name} --all-name else @@ -511,13 +463,8 @@ fi %{bindir}/bin/kpasswd %{_mandir}/man1/%{name}-kpasswd.1* %{_prefix}/bin/heimdal-kswitch -%if (0%{?rhel} && 0%{?rhel} <= 5) -%{_prefix}/bin/kswitch -%{_mandir}/man1/kswitch.1* -%else %{bindir}/bin/kswitch %{_mandir}/man1/heimdal-kswitch.1* -%endif %{_prefix}/bin/otp %{_mandir}/man1/otp.1* %{_prefix}/bin/otpprint @@ -550,10 +497,6 @@ fi %{libdir}/windc.a %{_mandir}/man3/* %{_mandir}/man7/* -%if (0%{?rhel} && 0%{?rhel} < 6) -%{_bindir}/%{name}-compile_et -%{bindir}/bin/compile_et -%endif %{_libexecdir}/%{name}/asn1_compile %{_libexecdir}/%{name}/asn1_print %{_libexecdir}/%{name}/slc @@ -565,6 +508,7 @@ fi %changelog * Sun Jan 06 2019 Björn Esser - 7.5.0-6 - Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) +- Remove el5 bits * Fri Jul 13 2018 Fedora Release Engineering - 7.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 08fdec9..5a54af5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (heimdal-3e58559-autoconf.tar.gz) = 894acd512b8f1216f40abdcb24821c97a9a5089d71dc236d22e76f3ce0b00aca29d32cf76f348de736a9f120e3ce7dd4d213af1266cae7cf8ecd8234bf904536 SHA512 (heimdal-7.5.0-3e58559.tar.gz) = 7f2ae83e447d8d994a6beb009d26860a936ff86d4d790f8816e1015c7875dc6cabee46a4f0af8cef23781bae15dc644441ae76448b86d7e8df27fb9fde85dbc3 From 42645bca279a1e44fe6ff3d08741c5369fc77ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 6 Jan 2019 18:18:31 +0100 Subject: [PATCH 13/62] Drop unneeded scriptlets for newer distros --- heimdal.spec | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index 47bc59a..ae8ead2 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -345,29 +345,18 @@ fi fi %endif +%if (0%{?rhel} && 0%{?rhel} < 8) %post libs -%if 0%{?el5} || 0%{?el6} - /sbin/ldconfig - /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : -%else - %{_sbindir}/ldconfig - %{_sbindir}/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : -%endif +/sbin/ldconfig +/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun libs if [ $1 = 0 ] ; then - %if 0%{?el5} || 0%{?el6} - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : - %else - %{_sbindir}/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : - %endif + /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %postun libs -%if 0%{?el5} || 0%{?el6} - /sbin/ldconfig -%else - %{_sbindir}/ldconfig +/sbin/ldconfig %endif %files libs -f %{name}.lang @@ -509,6 +498,7 @@ fi * Sun Jan 06 2019 Björn Esser - 7.5.0-6 - Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) - Remove el5 bits +- Drop unneeded scriptlets for newer distros * Fri Jul 13 2018 Fedora Release Engineering - 7.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 5ea4c092a6f97b8e5e75136a3c6fa7ec0e194c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 6 Jan 2019 18:20:36 +0100 Subject: [PATCH 14/62] Use %%make_build and %%make_install macros --- heimdal.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index ae8ead2..a13eddc 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -181,16 +181,16 @@ PATH. --with-libedit=%{_prefix} \ LIBS="-ltermcap" \ CFLAGS="-fPIC %{optflags} %{build_fix}" -make %{?_smp_mflags} dist -make %{?_smp_mflags} -make %{?_smp_mflags} -C doc html +%make_build dist +%make_build +%make_build -C doc html %check # Several intermittent test failures here, so make this non-fatal: -make check || : +%make_build check || : %install -make DESTDIR=%{buildroot} install +%make_install # install the init files %if 0%{?_with_systemd} # install systemd service files @@ -499,6 +499,7 @@ fi - Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) - Remove el5 bits - Drop unneeded scriptlets for newer distros +- Use %%make_build and %%make_install macros * Fri Jul 13 2018 Fedora Release Engineering - 7.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 0e460978d556860d6dbe0da457ee32170c0cfe64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 6 Jan 2019 18:22:19 +0100 Subject: [PATCH 15/62] Do not run 'make dist', fixes FTBFS (#1604316) --- heimdal.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index a13eddc..1429694 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -181,7 +181,6 @@ PATH. --with-libedit=%{_prefix} \ LIBS="-ltermcap" \ CFLAGS="-fPIC %{optflags} %{build_fix}" -%make_build dist %make_build %make_build -C doc html @@ -497,6 +496,7 @@ fi %changelog * Sun Jan 06 2019 Björn Esser - 7.5.0-6 - Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) +- Do not run 'make dist', fixes FTBFS (#1604316) - Remove el5 bits - Drop unneeded scriptlets for newer distros - Use %%make_build and %%make_install macros From 14ca2a48b1091fd71ef029067812d7dfddff896d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 6 Jan 2019 18:24:16 +0100 Subject: [PATCH 16/62] Make sure 'krb5-types.h' is build, fixes FTBFS (#1604316) --- heimdal.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/heimdal.spec b/heimdal.spec index 1429694..29c3047 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -181,6 +181,7 @@ PATH. --with-libedit=%{_prefix} \ LIBS="-ltermcap" \ CFLAGS="-fPIC %{optflags} %{build_fix}" +%make_build -C include krb5-types.h %make_build %make_build -C doc html @@ -497,6 +498,7 @@ fi * Sun Jan 06 2019 Björn Esser - 7.5.0-6 - Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) - Do not run 'make dist', fixes FTBFS (#1604316) +- Make sure 'krb5-types.h' is build, fixes FTBFS (#1604316) - Remove el5 bits - Drop unneeded scriptlets for newer distros - Use %%make_build and %%make_install macros From f3cece45bd93837ba2d3bd78081e10d0acf33c54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 6 Jan 2019 18:26:15 +0100 Subject: [PATCH 17/62] Install license file using %%license in libs package --- heimdal.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/heimdal.spec b/heimdal.spec index 29c3047..d6445d9 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -380,6 +380,7 @@ fi %{_mandir}/man8/verify_krb5_conf.8* %{_libexecdir}/digest-service %doc %{_pkgdocdir} +%license LICENSE %files server %if 0%{?_with_systemd} @@ -502,6 +503,7 @@ fi - Remove el5 bits - Drop unneeded scriptlets for newer distros - Use %%make_build and %%make_install macros +- Install license file using %%license in libs package * Fri Jul 13 2018 Fedora Release Engineering - 7.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b16e064c02bb69dfb73eb8ca3ec0069c358ae61b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 14 Jan 2019 19:03:51 +0100 Subject: [PATCH 18/62] Rebuilt for libcrypt.so.2 (#1666033) --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index d6445d9..0c34c19 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -13,7 +13,7 @@ Name: heimdal Version: 7.5.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -496,6 +496,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Mon Jan 14 2019 Björn Esser - 7.5.0-7 +- Rebuilt for libcrypt.so.2 (#1666033) + * Sun Jan 06 2019 Björn Esser - 7.5.0-6 - Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) - Do not run 'make dist', fixes FTBFS (#1604316) From 41d36afb3c17fa51cf48d887392eec401ea67dda Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 02:11:44 +0000 Subject: [PATCH 19/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 0c34c19..0c72105 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -13,7 +13,7 @@ Name: heimdal Version: 7.5.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -496,6 +496,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 7.5.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 14 2019 Björn Esser - 7.5.0-7 - Rebuilt for libcrypt.so.2 (#1666033) From c49870996ef1d62f1f69b2375d410a70cb2ac442 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 08:22:18 +0000 Subject: [PATCH 20/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 0c72105..1b4448d 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -13,7 +13,7 @@ Name: heimdal Version: 7.5.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -496,6 +496,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 7.5.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 7.5.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From efea2f6787a0a96d1b19936d7f5700c059bf8c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 21 Dec 2019 00:07:55 +0100 Subject: [PATCH 21/62] Update to 7.7.0 Also - Remove upstreamed patch - New project URL - Update buildreqs - Add locale build fix --- .gitignore | 1 + heimdal-7.4.0-237cd892-fixwaitloop.patch | 56 ------------------------ heimdal.spec | 35 ++++++++------- sources | 2 +- 4 files changed, 20 insertions(+), 74 deletions(-) delete mode 100644 heimdal-7.4.0-237cd892-fixwaitloop.patch diff --git a/.gitignore b/.gitignore index df86df0..478d6c6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /heimdal-a3d72c6-autoconf.tar.gz /heimdal-3e58559-autoconf.tar.gz /heimdal-7.5.0-3e58559.tar.gz +/heimdal-7.7.0.tar.gz diff --git a/heimdal-7.4.0-237cd892-fixwaitloop.patch b/heimdal-7.4.0-237cd892-fixwaitloop.patch deleted file mode 100644 index 4766351..0000000 --- a/heimdal-7.4.0-237cd892-fixwaitloop.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 237cd892d9e9625b135f8c9d078d50dfa44bba91 -Author: Jeffrey Altman -Date: Sat Jul 22 10:39:41 2017 -0400 - - kdc: unused pid element is (pid_t)-1 not zero - - When the termination of a child process is observed by reap_kid() it - clears the pids[] element by assigning it the invalid pid value - (pid_t)-1. However, start_kdc() assumes that the unused pid[[] element - value is 0. As a result, each pid[] element's associated child process - can only be restarted once since start_kdc() will not be able to locate - an unused element. - - This change alters start_kdc() to initialize all elements of pids[] to - (pid_t)-1 and use that as the marker for unused elements. By doing so - start_kdc() can properly record child process pids and indefinitely - restart child processes as necessary. - - Change-Id: Ia93c9284ab21289994eca7fc9cf1278be7c00683 - -diff --git a/kdc/connect.c b/kdc/connect.c -index bc63f58a4..f98e6c749 100644 ---- a/kdc/connect.c -+++ b/kdc/connect.c -@@ -1122,9 +1122,11 @@ start_kdc(krb5_context context, - if (max_kdcs < 1) - max_kdcs = 1; - -- pids = calloc(max_kdcs, sizeof(*pids)); -+ pids = malloc(max_kdcs * sizeof(*pids)); - if (!pids) - krb5_err(context, 1, errno, "malloc"); -+ for (i = 0; i < max_kdcs; i++) -+ pids[i] = (pid_t)-1; - - /* - * We open a socketpair of which we hand one end to each of our kids. -@@ -1196,12 +1198,12 @@ start_kdc(krb5_context context, - sleep(10); - break; - default: -- for (i=0; i < max_kdcs; i++) { -- if (pids[i] == 0) { -- pids[i] = pid; -- break; -- } -- } -+ for (i = 0; i < max_kdcs; i++) { -+ if (pids[i] == (pid_t)-1) { -+ pids[i] = pid; -+ break; -+ } -+ } - kdc_log(context, config, 0, "KDC worker process started: %d", - pid); - num_kdcs++; diff --git a/heimdal.spec b/heimdal.spec index 1b4448d..6a244dc 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -2,22 +2,18 @@ %global libdir %{_libdir}/heimdal %global bindir %{_exec_prefix}/lib/heimdal -%global commitdate 20171214 -%global commit 3e58559362dd3f485e6d6659d587a9169a131391 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - # Use systemd unit files on RHEL 7 and above. %if ! (0%{?rhel} && 0%{?rhel} < 7) %global _with_systemd 1 %endif Name: heimdal -Version: 7.5.0 -Release: 9%{?dist} +Version: 7.7.0 +Release: 1%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT -URL: http://www.h5l.org/ -Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz +URL: http://www.heimdal.software/ +Source0: https://github.com/%{name}/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz Source3: %{name}.sysconfig Source4: %{name}.sh Source5: %{name}.csh @@ -40,14 +36,13 @@ Source31: %{name}-ipropd-slave-wrapper # klist, kswitch, and kvno are symlinks to "heimtools", and this utility needs # to know how to interpret the "heimdal-" prefixes. Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch -Patch2: heimdal-7.4.0-237cd892-fixwaitloop.patch # Use Python2 explicity. Patch3: heimdal-7.5.0-explicit-python2.patch +BuildRequires: gettext BuildRequires: bison BuildRequires: flex BuildRequires: libedit-devel -BuildRequires: libtermcap-devel BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: openldap-devel @@ -151,9 +146,8 @@ This package prepends the Heimdal binary directory to the beginning of PATH. %prep -%setup -qn %{name}-%{commit} +%setup -q %patch1 -p1 -b .cmds -%patch2 -p1 -b .fixwaitloop %patch3 -p1 -b .python2 ./autogen.sh @@ -185,6 +179,10 @@ PATH. %make_build %make_build -C doc html +# po/localefiles is not in the tarball, which causes install to fail +touch po/localefiles +%make_build -C po mo + %check # Several intermittent test failures here, so make this non-fatal: %make_build check || : @@ -285,11 +283,7 @@ mv %{buildroot}%{_mandir}/man5/{,%{name}-}krb5.conf.5 rm %{buildroot}%{_mandir}/man5/qop.5 ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz -if find %{buildroot} -name '*.mo' | grep .; then - %find_lang %{name} --all-name -else - touch %{name}.lang -fi +%find_lang %{name} --all-name %post server %if 0%{?_with_systemd} @@ -496,6 +490,13 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Fri Dec 20 2019 Alexander Boström - 7.7.0-1 +- Update to 7.7.0 +- Remove upstreamed patch +- New project URL +- Update buildreqs +- Add locale build fix + * Thu Jul 25 2019 Fedora Release Engineering - 7.5.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 5a54af5..0f6e83e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (heimdal-7.5.0-3e58559.tar.gz) = 7f2ae83e447d8d994a6beb009d26860a936ff86d4d790f8816e1015c7875dc6cabee46a4f0af8cef23781bae15dc644441ae76448b86d7e8df27fb9fde85dbc3 +SHA512 (heimdal-7.7.0.tar.gz) = 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99 From 50ae2a310d53ccba9654f630f97f07f97fcb91be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 21 Dec 2019 11:28:01 +0100 Subject: [PATCH 22/62] add timeout to make check --- heimdal.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index 6a244dc..43d14d8 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -185,7 +185,8 @@ touch po/localefiles %check # Several intermittent test failures here, so make this non-fatal: -%make_build check || : +# (timeout to debug hard to reproduce stuck build) +timeout 20m %make_build check || : %install %make_install @@ -490,6 +491,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Sat Dec 21 2019 Alexander Boström - 7.7.0-2 +- Set timeout on make check + * Fri Dec 20 2019 Alexander Boström - 7.7.0-1 - Update to 7.7.0 - Remove upstreamed patch From 2553f1aec288583110f578475720e2bbb56e86af Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 17 Jan 2020 12:01:54 -0700 Subject: [PATCH 23/62] - Fix configure tests compromised by LTO --- heimdal-7.7.0-configure.patch | 17 +++++++++++++++++ heimdal.spec | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 heimdal-7.7.0-configure.patch diff --git a/heimdal-7.7.0-configure.patch b/heimdal-7.7.0-configure.patch new file mode 100644 index 0000000..23f116c --- /dev/null +++ b/heimdal-7.7.0-configure.patch @@ -0,0 +1,17 @@ +--- a/cf/check-var.m4 2013-04-24 20:07:35.000000000 -0600 ++++ b/cf/check-var.m4 2020-01-07 11:36:36.493955390 -0700 +@@ -6,12 +6,12 @@ AC_MSG_CHECKING(for $1) + AC_CACHE_VAL(ac_cv_var_$1, [ + m4_ifval([$2],[ + AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2 +- void * foo(void) { return &$1; }]],[[foo()]])], ++ __attribute__ ((used)) void * foo(void) { return &$1; }]],[[foo()]])], + [ac_cv_var_$1=yes],[ac_cv_var_$1=no])]) + if test "$ac_cv_var_$1" != yes ; then + AC_LINK_IFELSE([AC_LANG_PROGRAM([[$2 + extern int $1; +-int foo(void) { return $1; }]],[[foo()]])], ++__attribute__ ((used)) int foo(void) { return $1; }]],[[foo()]])], + [ac_cv_var_$1=yes],[ac_cv_var_$1=no]) + fi + ]) diff --git a/heimdal.spec b/heimdal.spec index 43d14d8..4ea2f2f 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -38,6 +38,7 @@ Source31: %{name}-ipropd-slave-wrapper Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch # Use Python2 explicity. Patch3: heimdal-7.5.0-explicit-python2.patch +Patch4: heimdal-7.7.0-configure.patch BuildRequires: gettext BuildRequires: bison @@ -149,6 +150,7 @@ PATH. %setup -q %patch1 -p1 -b .cmds %patch3 -p1 -b .python2 +%patch4 -p1 -b .config ./autogen.sh @@ -158,6 +160,7 @@ PATH. %else %global build_fix "" %endif +autoreconf -ivf %configure \ --prefix=%{_prefix} \ --includedir=%{_includedir}/%{name} \ @@ -491,6 +494,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Fri Jan 17 2020 Jeff Law - 7.7.0-3 +- Fix configure tests compromised by LTO + * Sat Dec 21 2019 Alexander Boström - 7.7.0-2 - Set timeout on make check From 53b1a2c27f1ee27d71965c6573907da49957b240 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 04:12:34 +0000 Subject: [PATCH 24/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 4ea2f2f..cde65c0 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -494,6 +494,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 7.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 17 2020 Jeff Law - 7.7.0-3 - Fix configure tests compromised by LTO From 9e2fadea139d11018097501b8fe83441dbde4c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sat, 21 Mar 2020 14:34:00 +0100 Subject: [PATCH 25/62] Switch to Python 3 for building --- heimdal-7.7.0-58c8ad96-py3.patch | 296 +++++++++++++++++++++++++++++++ heimdal-7.7.0-pythonpath.patch | 156 ++++++++++++++++ heimdal.spec | 16 +- 3 files changed, 463 insertions(+), 5 deletions(-) create mode 100644 heimdal-7.7.0-58c8ad96-py3.patch create mode 100644 heimdal-7.7.0-pythonpath.patch diff --git a/heimdal-7.7.0-58c8ad96-py3.patch b/heimdal-7.7.0-58c8ad96-py3.patch new file mode 100644 index 0000000..61882ed --- /dev/null +++ b/heimdal-7.7.0-58c8ad96-py3.patch @@ -0,0 +1,296 @@ +commit 58c8ad967e765f703273c95140f7f7a7f1694ae0 +Author: Alexander Boström +Date: Sat Mar 21 13:56:33 2020 +0100 + + Changes generated by 2to3 for all Python sources. + +diff --git a/cf/symbol-version.py b/cf/symbol-version.py +index 414f06f8f..23666ecf8 100644 +--- a/cf/symbol-version.py ++++ b/cf/symbol-version.py +@@ -40,7 +40,7 @@ t_SYMBOL = r'[a-zA-Z_][a-zA-Z0-9_\.]*' + t_ignore = " \t\n" + + def t_error(t): +- print "Illegal character '%s'" % t.value[0] ++ print("Illegal character '%s'" % t.value[0]) + t.lexer.skip(1) + + import ply.lex as lex +@@ -51,7 +51,7 @@ symbols = [] + + def p_syms(p): + 'syms : SYMBOL "{" elements "}"' +- print "# %s" % p[1] ++ print("# %s" % p[1]) + + def p_elements(p): + '''elements : element +@@ -68,9 +68,9 @@ def p_element(p): + + def p_error(p): + if p: +- print "Syntax error at '%s'" % p.value ++ print("Syntax error at '%s'" % p.value) + else: +- print "Syntax error at EOF" ++ print("Syntax error at EOF") + + import ply.yacc as yacc + yacc.yacc() +@@ -82,4 +82,4 @@ for line in lines: + + for symbol in symbols: + if symbol[0] == "global": +- print "%s" % symbol[1] ++ print("%s" % symbol[1]) +diff --git a/lib/hx509/quote.py b/lib/hx509/quote.py +index 41887e5d4..95898d4c5 100644 +--- a/lib/hx509/quote.py ++++ b/lib/hx509/quote.py +@@ -76,26 +76,26 @@ chars[ord('>')] |= RFC2253_QUOTE + chars[ord('#')] |= RFC2253_QUOTE + chars[ord(';')] |= RFC2253_QUOTE + +-print "#define Q_CONTROL_CHAR 1" +-print "#define Q_PRINTABLE 2" +-print "#define Q_RFC2253_QUOTE_FIRST 4" +-print "#define Q_RFC2253_QUOTE_LAST 8" +-print "#define Q_RFC2253_QUOTE 16" +-print "#define Q_RFC2253_HEX 32" +-print "" +-print "#define Q_RFC2253 (Q_RFC2253_QUOTE_FIRST|Q_RFC2253_QUOTE_LAST|Q_RFC2253_QUOTE|Q_RFC2253_HEX)" +-print "\n" * 2 ++print("#define Q_CONTROL_CHAR 1") ++print("#define Q_PRINTABLE 2") ++print("#define Q_RFC2253_QUOTE_FIRST 4") ++print("#define Q_RFC2253_QUOTE_LAST 8") ++print("#define Q_RFC2253_QUOTE 16") ++print("#define Q_RFC2253_HEX 32") ++print("") ++print("#define Q_RFC2253 (Q_RFC2253_QUOTE_FIRST|Q_RFC2253_QUOTE_LAST|Q_RFC2253_QUOTE|Q_RFC2253_HEX)") ++print("\n" * 2) + + + + +-print "unsigned char char_map[] = {\n\t", ++print("unsigned char char_map[] = {\n\t", end=' ') + for x in range(0, 256): + if (x % 8) == 0 and x != 0: +- print "\n\t", +- print "0x%(char)02x" % { 'char' : chars[x] }, ++ print("\n\t", end=' ') ++ print("0x%(char)02x" % { 'char' : chars[x] }, end=' ') + if x < 255: +- print ", ", ++ print(", ", end=' ') + else: +- print "" +-print "};" ++ print("") ++print("};") +diff --git a/lib/wind/gen-bidi.py b/lib/wind/gen-bidi.py +index e2efcbb55..fdadcbec7 100644 +--- a/lib/wind/gen-bidi.py ++++ b/lib/wind/gen-bidi.py +@@ -42,7 +42,7 @@ import generate + import rfc3454 + + if len(sys.argv) != 3: +- print("usage: %s rfc3454.txt outdir" % sys.argv[0]) ++ print(("usage: %s rfc3454.txt outdir" % sys.argv[0])) + sys.exit(1) + + tables = rfc3454.read(sys.argv[1]) +diff --git a/lib/wind/gen-combining.py b/lib/wind/gen-combining.py +index 43e0d52eb..4e73840b5 100644 +--- a/lib/wind/gen-combining.py ++++ b/lib/wind/gen-combining.py +@@ -42,13 +42,13 @@ import generate + import UnicodeData + + if len(sys.argv) != 3: +- print("usage: %s UnicodeData.txt out-dir" % sys.argv[0]) ++ print(("usage: %s UnicodeData.txt out-dir" % sys.argv[0])) + sys.exit(1) + + ud = UnicodeData.read(sys.argv[1]) + + trans = {} +-for k,v in ud.items(): ++for k,v in list(ud.items()): + if int(v[2]) != 0 : + trans[k] = [int(v[2]), v[1]] + +diff --git a/lib/wind/gen-errorlist.py b/lib/wind/gen-errorlist.py +index 97646cf5a..345be300b 100644 +--- a/lib/wind/gen-errorlist.py ++++ b/lib/wind/gen-errorlist.py +@@ -44,13 +44,13 @@ import rfc4518 + import stringprep + + if len(sys.argv) != 3: +- print("usage: %s rfc3454.txt out-dir" % sys.argv[0]) ++ print(("usage: %s rfc3454.txt out-dir" % sys.argv[0])) + sys.exit(1) + + tables = rfc3454.read(sys.argv[1]) + t2 = rfc4518.read() + +-for x in t2.keys(): ++for x in list(t2.keys()): + tables[x] = t2[x] + + error_list = stringprep.get_errorlist() +@@ -85,7 +85,7 @@ const struct error_entry _wind_errorlist_table[] = { + + trans=[] + +-for t in error_list.keys(): ++for t in list(error_list.keys()): + for l in tables[t]: + m = re.search('^ *([0-9A-F]+)-([0-9A-F]+); *(.*) *$', l) + if m: +@@ -104,7 +104,7 @@ for x in trans: + (start, length, description, tables) = x + symbols = stringprep.symbols(error_list, tables) + if len(symbols) == 0: +- print("no symbol for %s" % description) ++ print(("no symbol for %s" % description)) + sys.exit(1) + errorlist_c.file.write(" {0x%x, 0x%x, %s}, /* %s: %s */\n" + % (start, length, symbols, ",".join(tables), description)) +diff --git a/lib/wind/gen-map.py b/lib/wind/gen-map.py +index dc10d6fae..c84d71cd2 100644 +--- a/lib/wind/gen-map.py ++++ b/lib/wind/gen-map.py +@@ -45,7 +45,7 @@ import stringprep + import util + + if len(sys.argv) != 3: +- print("usage: %s rfc3454.txt out-dir" % sys.argv[0]) ++ print(("usage: %s rfc3454.txt out-dir" % sys.argv[0])) + sys.exit(1) + + tables = rfc3454.read(sys.argv[1]) +@@ -114,7 +114,7 @@ trans = stringprep.sort_merge_trans(trans) + + for x in trans: + if x[0] == 0xad: +- print("fooresult %s" % ",".join(x[3])) ++ print(("fooresult %s" % ",".join(x[3]))) + + for x in trans: + (key, value, description, table) = x +@@ -130,7 +130,7 @@ for x in trans: + (key, value, description, tables) = x + symbols = stringprep.symbols(map_list, tables) + if len(symbols) == 0: +- print("no symbol for %s %s (%s)" % (key, description, tables)) ++ print(("no symbol for %s %s (%s)" % (key, description, tables))) + sys.exit(1) + v = value.split() + map_c.file.write(" {0x%x, %u, %u, %s}, /* %s: %s */\n" +diff --git a/lib/wind/gen-normalize.py b/lib/wind/gen-normalize.py +index daf3c3dc4..901a07fee 100644 +--- a/lib/wind/gen-normalize.py ++++ b/lib/wind/gen-normalize.py +@@ -43,8 +43,8 @@ import UnicodeData + import util + + if len(sys.argv) != 4: +- print("usage: %s UnicodeData.txt" +- " CompositionExclusions-3.2.0.txt out-dir" % sys.argv[0]) ++ print(("usage: %s UnicodeData.txt" ++ " CompositionExclusions-3.2.0.txt out-dir" % sys.argv[0])) + sys.exit(1) + + ud = UnicodeData.read(sys.argv[1]) +@@ -56,10 +56,10 @@ def sortedKeys(d): + return keys + + trans = dict([(k, [re.sub('<[a-zA-Z]+>', '', v[4]), v[0]]) +- for k,v in ud.items() if v[4]]) ++ for k,v in list(ud.items()) if v[4]]) + + maxLength = 0 +-for v in trans.values(): ++for v in list(trans.values()): + maxLength = max(maxLength, len(v[0].split())) + + normalize_h = generate.Header('%s/normalize_table.h' % sys.argv[3]) +@@ -135,7 +135,7 @@ exclusions = UnicodeData.read(sys.argv[2]) + + inv = dict([(''.join(["%05x" % int(x, 0x10) for x in v[4].split(' ')]), + [k, v[0]]) +- for k,v in ud.items() ++ for k,v in list(ud.items()) + if v[4] and not re.search('<[a-zA-Z]+> *', v[4]) and not k in exclusions]) + + table = 0 +@@ -162,7 +162,7 @@ def add(table, k, v): + + top = createTable() + +-for k,v in inv.items(): ++for k,v in list(inv.items()): + add(tables[top], k, v) + + next_table = [] +diff --git a/lib/wind/gen-punycode-examples.py b/lib/wind/gen-punycode-examples.py +index f2eddbb37..44d2c5d9a 100644 +--- a/lib/wind/gen-punycode-examples.py ++++ b/lib/wind/gen-punycode-examples.py +@@ -40,7 +40,7 @@ import sys + import generate + + if len(sys.argv) != 3: +- print("usage: %s rfc3492.txt" % sys.argv[0]) ++ print(("usage: %s rfc3492.txt" % sys.argv[0])) + sys.exit(1) + + f = open(sys.argv[1], 'r') +diff --git a/lib/wind/stringprep.py b/lib/wind/stringprep.py +index cff4d02a7..73c9d43c2 100644 +--- a/lib/wind/stringprep.py ++++ b/lib/wind/stringprep.py +@@ -38,7 +38,7 @@ import re + import string + + def _merge_table(res, source): +- for table in source.keys(): ++ for table in list(source.keys()): + res[table] = res.get(table, []) + source.get(table, []) + + name_error = ['C.1.2', 'C.2.2', 'C.3', 'C.4', 'C.5', 'C.6', 'C.7', 'C.8', 'C.9'] +@@ -57,21 +57,21 @@ def symbols(tabledict, tables): + list = list + tabledict.get(x, []) + if len(list) == 0: + return "" +- return "|".join(map(lambda x: "WIND_PROFILE_%s" % (x.upper()), list)) ++ return "|".join(["WIND_PROFILE_%s" % (x.upper()) for x in list]) + + def get_errorlist(): + d = dict() +- _merge_table(d, dict(map(lambda x: [x, ['name']], name_error))) +- _merge_table(d, dict(map(lambda x: [x, ['ldap']], ldap_error))) +- _merge_table(d, dict(map(lambda x: [x, ['sasl']], sasl_error))) ++ _merge_table(d, dict([[x, ['name']] for x in name_error])) ++ _merge_table(d, dict([[x, ['ldap']] for x in ldap_error])) ++ _merge_table(d, dict([[x, ['sasl']] for x in sasl_error])) + return d + + def get_maplist(): + d = dict() +- _merge_table(d, dict(map(lambda x: [x, ['name']], name_map))) +- _merge_table(d, dict(map(lambda x: [x, ['ldap']], ldap_map))) +- _merge_table(d, dict(map(lambda x: [x, ['ldap_case']], ldap_case_map))) +- _merge_table(d, dict(map(lambda x: [x, ['sasl']], sasl_map))) ++ _merge_table(d, dict([[x, ['name']] for x in name_map])) ++ _merge_table(d, dict([[x, ['ldap']] for x in ldap_map])) ++ _merge_table(d, dict([[x, ['ldap_case']] for x in ldap_case_map])) ++ _merge_table(d, dict([[x, ['sasl']] for x in sasl_map])) + return d + + def sort_merge_trans(trans): diff --git a/heimdal-7.7.0-pythonpath.patch b/heimdal-7.7.0-pythonpath.patch new file mode 100644 index 0000000..75fcef6 --- /dev/null +++ b/heimdal-7.7.0-pythonpath.patch @@ -0,0 +1,156 @@ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/hx509/quote.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + # -*- coding: utf-8 -*- + # + # Copyright (c) 2010 Kungliga Tekniska Högskolan +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/Makefile.am ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am +@@ -89,7 +89,7 @@ idn_lookup_SOURCES = idn-lookup.c + + LDADD = libwind.la $(LIB_roken) + +-PYTHON = python ++PYTHON = python3 + + if !MAINTAINER_MODE + skip_python = test -f $@ || +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/UnicodeData.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-bidi.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-combining.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-errorlist.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-map.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-normalize.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-punycode-examples.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/generate.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc3454.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc4518.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/stringprep.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/util.py ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/python ++#!/usr/bin/python3 + # -*- coding: iso-8859-1 -*- + + # $Id$ +Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 +=================================================================== +--- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/windows/NTMakefile.w32 ++++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 +@@ -120,7 +120,7 @@ RC=rc + AWK_CMD=gawk.exe + YACC_CMD=bison.exe + LEX_CMD=flex.exe +-PYTHON=python.exe ++PYTHON=python3.exe + PERL=perl.exe + CMP=cmp.exe + MAKECAT=makecat.exe diff --git a/heimdal.spec b/heimdal.spec index cde65c0..3dce8af 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -36,9 +36,9 @@ Source31: %{name}-ipropd-slave-wrapper # klist, kswitch, and kvno are symlinks to "heimtools", and this utility needs # to know how to interpret the "heimdal-" prefixes. Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch -# Use Python2 explicity. -Patch3: heimdal-7.5.0-explicit-python2.patch +Patch3: heimdal-7.7.0-pythonpath.patch Patch4: heimdal-7.7.0-configure.patch +Patch5: heimdal-7.7.0-58c8ad96-py3.patch BuildRequires: gettext BuildRequires: bison @@ -62,7 +62,7 @@ BuildRequires: libdb-devel %endif BuildRequires: doxygen BuildRequires: graphviz -BuildRequires: python2 +BuildRequires: python3 %if (0%{?rhel} && 0%{?rhel} < 7) BuildRequires: groff %else @@ -149,8 +149,9 @@ PATH. %prep %setup -q %patch1 -p1 -b .cmds -%patch3 -p1 -b .python2 +%patch3 -p1 -b .pythonpath %patch4 -p1 -b .config +%patch5 -p1 -b .2to3 ./autogen.sh @@ -494,6 +495,11 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Sat Mar 21 2020 Alexander Boström - 7.7.0-5 +- Add Python 3 code patch +- Use Python 3 binary path +- BuildRequire Python 3 + * Wed Jan 29 2020 Fedora Release Engineering - 7.7.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 8d4428f6f91a06ea9d8990e38af41ba0e67f4ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 31 Mar 2020 09:56:50 +0200 Subject: [PATCH 26/62] Do not buildrequire openldap-servers on RHEL8+ --- heimdal.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 3dce8af..9bcb09d 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -48,7 +48,11 @@ BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: openldap-devel #Required for tests/ldap +%if (0%{?rhel} && 0%{?rhel} > 7) +# but not available on RHEL 8 +%else BuildRequires: openldap-servers +%endif BuildRequires: pam-devel BuildRequires: perl(JSON) BuildRequires: sqlite-devel @@ -495,6 +499,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Tue Mar 31 2020 Alexander Boström - 7.7.0-6 +- Do not buildrequire openldap-servers on RHEL8+ + * Sat Mar 21 2020 Alexander Boström - 7.7.0-5 - Add Python 3 code patch - Use Python 3 binary path From b1bf433ee7ede9814b4170fc39c292acaa693c72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 00:49:43 +0000 Subject: [PATCH 27/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 9bcb09d..67c309e 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -499,6 +499,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 7.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Mar 31 2020 Alexander Boström - 7.7.0-6 - Do not buildrequire openldap-servers on RHEL8+ From 18f9d64aef041fbe7ee5c4f1c73c3232e08e1911 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 5 Jan 2021 05:30:46 +0000 Subject: [PATCH 28/62] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- heimdal.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/heimdal.spec b/heimdal.spec index 67c309e..37d854c 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -75,6 +75,7 @@ BuildRequires: groff-base %if 0%{?_with_systemd} BuildRequires: systemd-units %endif +BuildRequires: make # Bundled libtommath (https://bugzilla.redhat.com/1118462) Provides: bundled(libtommath) = 0.42.0 From 7fe48361007b8ff179c73496f5946c1b59a2be54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 13:25:19 +0000 Subject: [PATCH 29/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 37d854c..941e5cf 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -500,6 +500,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 7.7.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 7.7.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From a0465a4796cbbdb3c5ad088547aa71b532b8ccac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Tue, 13 Apr 2021 23:29:15 +0200 Subject: [PATCH 30/62] Backport autoconf-2.70 fix --- heimdal-7.7.0-22352b90-autoconf.patch | 27 +++++++++++++++++++++++++++ heimdal.spec | 7 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 heimdal-7.7.0-22352b90-autoconf.patch diff --git a/heimdal-7.7.0-22352b90-autoconf.patch b/heimdal-7.7.0-22352b90-autoconf.patch new file mode 100644 index 0000000..d69fec4 --- /dev/null +++ b/heimdal-7.7.0-22352b90-autoconf.patch @@ -0,0 +1,27 @@ +commit 22352b90e78e2d162b98b5ef6c84672c397be40a +Author: Lars Wendler +Date: Wed Mar 17 17:49:18 2021 +0100 + + autoconf-2.70 fix + + autoconf-2.70 and newer are more strict with quoting etc. and thus generate + a broken configure file: + + configure: 20855: Syntax error: ")" unexpected (expecting "fi") + + Gentoo-bug: https://bugs.gentoo.org/776241 + Signed-off-by: Lars Wendler + +diff --git a/cf/check-var.m4 b/cf/check-var.m4 +index 2fd7bca6f..71d6f70ca 100644 +--- a/cf/check-var.m4 ++++ b/cf/check-var.m4 +@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo) + if test "$ac_foo" = yes; then + AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, + [Define if you have the `]$1[' variable.]) +- m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2])) ++ m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])]) + fi + ]) + diff --git a/heimdal.spec b/heimdal.spec index 941e5cf..b4b1688 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -39,6 +39,7 @@ Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch Patch3: heimdal-7.7.0-pythonpath.patch Patch4: heimdal-7.7.0-configure.patch Patch5: heimdal-7.7.0-58c8ad96-py3.patch +Patch6: heimdal-7.7.0-22352b90-autoconf.patch BuildRequires: gettext BuildRequires: bison @@ -157,6 +158,7 @@ PATH. %patch3 -p1 -b .pythonpath %patch4 -p1 -b .config %patch5 -p1 -b .2to3 +%patch6 -p1 -b .ac270 ./autogen.sh @@ -500,6 +502,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Tue Apr 13 2021 Alexander Boström - 7.7.0-9 +- Backport autoconf-2.70 fix + * Tue Jan 26 2021 Fedora Release Engineering - 7.7.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 08b54b83ee4de1bb5c59ae837512d67869bb7e31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 07:34:02 +0000 Subject: [PATCH 31/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index b4b1688..1ebdede 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -502,6 +502,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 7.7.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Apr 13 2021 Alexander Boström - 7.7.0-9 - Backport autoconf-2.70 fix From 2d7622d0db884fb21430dba17177c228775b9de3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 12:16:50 +0000 Subject: [PATCH 32/62] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 1ebdede..f505eda 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -502,6 +502,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 7.7.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 7.7.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 9a37f9c4a3eb37ce6c8eb91c34243ee45c6d27bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 13:34:18 +0000 Subject: [PATCH 33/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index f505eda..8007c34 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -502,6 +502,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 7.7.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 7.7.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 12fd500368874f489d5b7da608bf923911bfeb6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Wed, 16 Nov 2022 17:59:15 +0100 Subject: [PATCH 34/62] Update to 7.7.1 Also - Remove upstreamed patch - Replace patch with sed command --- .gitignore | 1 + heimdal-7.7.0-22352b90-autoconf.patch | 27 ----- heimdal-7.7.0-pythonpath.patch | 156 -------------------------- heimdal.spec | 17 ++- sources | 2 +- 5 files changed, 13 insertions(+), 190 deletions(-) delete mode 100644 heimdal-7.7.0-22352b90-autoconf.patch delete mode 100644 heimdal-7.7.0-pythonpath.patch diff --git a/.gitignore b/.gitignore index 478d6c6..d4222f2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /heimdal-3e58559-autoconf.tar.gz /heimdal-7.5.0-3e58559.tar.gz /heimdal-7.7.0.tar.gz +/heimdal-7.7.1.tar.gz diff --git a/heimdal-7.7.0-22352b90-autoconf.patch b/heimdal-7.7.0-22352b90-autoconf.patch deleted file mode 100644 index d69fec4..0000000 --- a/heimdal-7.7.0-22352b90-autoconf.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 22352b90e78e2d162b98b5ef6c84672c397be40a -Author: Lars Wendler -Date: Wed Mar 17 17:49:18 2021 +0100 - - autoconf-2.70 fix - - autoconf-2.70 and newer are more strict with quoting etc. and thus generate - a broken configure file: - - configure: 20855: Syntax error: ")" unexpected (expecting "fi") - - Gentoo-bug: https://bugs.gentoo.org/776241 - Signed-off-by: Lars Wendler - -diff --git a/cf/check-var.m4 b/cf/check-var.m4 -index 2fd7bca6f..71d6f70ca 100644 ---- a/cf/check-var.m4 -+++ b/cf/check-var.m4 -@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo) - if test "$ac_foo" = yes; then - AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, - [Define if you have the `]$1[' variable.]) -- m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2])) -+ m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])]) - fi - ]) - diff --git a/heimdal-7.7.0-pythonpath.patch b/heimdal-7.7.0-pythonpath.patch deleted file mode 100644 index 75fcef6..0000000 --- a/heimdal-7.7.0-pythonpath.patch +++ /dev/null @@ -1,156 +0,0 @@ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/hx509/quote.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2010 Kungliga Tekniska Högskolan -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/Makefile.am -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am -@@ -89,7 +89,7 @@ idn_lookup_SOURCES = idn-lookup.c - - LDADD = libwind.la $(LIB_roken) - --PYTHON = python -+PYTHON = python3 - - if !MAINTAINER_MODE - skip_python = test -f $@ || -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/UnicodeData.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-bidi.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-combining.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-errorlist.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-map.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-normalize.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-punycode-examples.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/generate.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc3454.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc4518.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/stringprep.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/util.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python3 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/windows/NTMakefile.w32 -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 -@@ -120,7 +120,7 @@ RC=rc - AWK_CMD=gawk.exe - YACC_CMD=bison.exe - LEX_CMD=flex.exe --PYTHON=python.exe -+PYTHON=python3.exe - PERL=perl.exe - CMP=cmp.exe - MAKECAT=makecat.exe diff --git a/heimdal.spec b/heimdal.spec index 8007c34..e4b9db8 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -8,8 +8,8 @@ %endif Name: heimdal -Version: 7.7.0 -Release: 12%{?dist} +Version: 7.7.1 +Release: 1%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -36,10 +36,8 @@ Source31: %{name}-ipropd-slave-wrapper # klist, kswitch, and kvno are symlinks to "heimtools", and this utility needs # to know how to interpret the "heimdal-" prefixes. Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch -Patch3: heimdal-7.7.0-pythonpath.patch Patch4: heimdal-7.7.0-configure.patch Patch5: heimdal-7.7.0-58c8ad96-py3.patch -Patch6: heimdal-7.7.0-22352b90-autoconf.patch BuildRequires: gettext BuildRequires: bison @@ -155,10 +153,12 @@ PATH. %prep %setup -q %patch1 -p1 -b .cmds -%patch3 -p1 -b .pythonpath %patch4 -p1 -b .config %patch5 -p1 -b .2to3 -%patch6 -p1 -b .ac270 + +for f in lib/*/*.py; do + sed -i "$f" -re 's,^#!/usr/(local/|)bin/python,#!/usr/bin/python3,' +done ./autogen.sh @@ -502,6 +502,11 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Nov 16 2022 Alexander Boström - 7.7.1-1 +- Update to 7.7.1 +- Remove upstreamed patch +- Replace patch with sed command + * Thu Jul 21 2022 Fedora Release Engineering - 7.7.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 0f6e83e..bb412f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (heimdal-7.7.0.tar.gz) = 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99 +SHA512 (heimdal-7.7.1.tar.gz) = c77def1d32301caa8675297152a534919459a65bd1c5353cdc8795c07aa7a94fd319b697b98e02233ef25eaeedb36420edd139c1e22d68d54bb991343a11a369 From 341e18baf162250127b0c1e2f7f3173690e3637a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Mon, 21 Nov 2022 09:28:10 +0100 Subject: [PATCH 35/62] Delay service starts until after network is online (rhbz#2005501) --- heimdal-ipropd-master.service | 3 ++- heimdal-ipropd-slave.service | 3 ++- heimdal-kadmind.service | 3 ++- heimdal-kdc.service | 3 ++- heimdal-kpasswdd.service | 3 ++- heimdal.spec | 5 ++++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/heimdal-ipropd-master.service b/heimdal-ipropd-master.service index c873f72..7ab4f1f 100644 --- a/heimdal-ipropd-master.service +++ b/heimdal-ipropd-master.service @@ -1,7 +1,8 @@ [Unit] Description=Heimdal ipropd-master incremental propagation service Documentation=man:iprop(8) info:heimdal http://www.h5l.org/ -After=syslog.target network.target +After=syslog.target network.target network-online.target +Wants=network-online.target [Service] Type=forking diff --git a/heimdal-ipropd-slave.service b/heimdal-ipropd-slave.service index 8217190..aed25d9 100644 --- a/heimdal-ipropd-slave.service +++ b/heimdal-ipropd-slave.service @@ -1,7 +1,8 @@ [Unit] Description=Heimdal ipropd-slave incremental propagation service Documentation=man:iprop(8) info:heimdal http://www.h5l.org/ -After=syslog.target network.target +After=syslog.target network.target network-online.target +Wants=network-online.target [Service] Type=forking diff --git a/heimdal-kadmind.service b/heimdal-kadmind.service index 8765bc1..4e350f9 100644 --- a/heimdal-kadmind.service +++ b/heimdal-kadmind.service @@ -1,7 +1,8 @@ [Unit] Description=Heimdal kadmind remote administration service Documentation=man:heimdal-kadmind(8) info:heimdal http://www.h5l.org/ -After=syslog.target network.target +After=syslog.target network.target network-online.target +Wants=network-online.target [Service] Type=simple diff --git a/heimdal-kdc.service b/heimdal-kdc.service index e4461f5..ed0d851 100644 --- a/heimdal-kdc.service +++ b/heimdal-kdc.service @@ -1,7 +1,8 @@ [Unit] Description=Heimdal KDC is a Kerberos 5 Key Distribution Center server Documentation=man:kdc(8) info:heimdal http://www.h5l.org/ -After=syslog.target network.target +After=syslog.target network.target network-online.target +Wants=network-online.target [Service] Type=simple diff --git a/heimdal-kpasswdd.service b/heimdal-kpasswdd.service index 1876f97..0cc5d7b 100644 --- a/heimdal-kpasswdd.service +++ b/heimdal-kpasswdd.service @@ -1,7 +1,8 @@ [Unit] Description=Heimdal kpasswdd allows users to change their KDC passwords Documentation=man:kpasswdd(8) info:heimdal http://www.h5l.org/ -After=syslog.target network.target +After=syslog.target network.target network-online.target +Wants=network-online.target [Service] Type=simple diff --git a/heimdal.spec b/heimdal.spec index e4b9db8..2f3a2b0 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -502,6 +502,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Mon Nov 21 2022 Alexander Boström - 7.7.1-2 +- Delay service starts until after network is online (rhbz#2005501) + * Wed Nov 16 2022 Alexander Boström - 7.7.1-1 - Update to 7.7.1 - Remove upstreamed patch From 8f4386d212329953614a58b5aa84ac72854d46a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Mon, 21 Nov 2022 10:32:54 +0100 Subject: [PATCH 36/62] Restart services on upgrade --- heimdal.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index 2f3a2b0..cadb497 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -336,11 +336,11 @@ ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz %postun server %if 0%{?_with_systemd} - %systemd_postun heimdal-kdc.service - %systemd_postun heimdal-ipropd-master.service - %systemd_postun heimdal-ipropd-slave.service - %systemd_postun heimdal-kadmind.service - %systemd_postun heimdal-kpasswdd.service + %systemd_postun_with_restart heimdal-kdc.service + %systemd_postun_with_restart heimdal-ipropd-master.service + %systemd_postun_with_restart heimdal-ipropd-slave.service + %systemd_postun_with_restart heimdal-kadmind.service + %systemd_postun_with_restart heimdal-kpasswdd.service %else if [ $1 -eq 1 ] ; then /sbin/service heimdal-kdc condrestart >/dev/null 2>&1 || : @@ -502,6 +502,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Mon Nov 21 2022 Alexander Boström - 7.7.1-3 +- Restart services on upgrade + * Mon Nov 21 2022 Alexander Boström - 7.7.1-2 - Delay service starts until after network is online (rhbz#2005501) From 65647b989f961ff0c0b1972d18d18425f9478434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Mon, 21 Nov 2022 16:44:06 +0100 Subject: [PATCH 37/62] Update to 7.8.0 (#2143478) --- .gitignore | 1 + heimdal.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d4222f2..99877f4 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /heimdal-7.5.0-3e58559.tar.gz /heimdal-7.7.0.tar.gz /heimdal-7.7.1.tar.gz +/heimdal-7.8.0.tar.gz diff --git a/heimdal.spec b/heimdal.spec index cadb497..a1702a9 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -8,8 +8,8 @@ %endif Name: heimdal -Version: 7.7.1 -Release: 3%{?dist} +Version: 7.8.0 +Release: 1%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -502,6 +502,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Mon Nov 21 2022 Alexander Boström - 7.8.0-1 +- Update to 7.8.0 (#2143478) + * Mon Nov 21 2022 Alexander Boström - 7.7.1-3 - Restart services on upgrade diff --git a/sources b/sources index bb412f2..6a16981 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (heimdal-7.7.1.tar.gz) = c77def1d32301caa8675297152a534919459a65bd1c5353cdc8795c07aa7a94fd319b697b98e02233ef25eaeedb36420edd139c1e22d68d54bb991343a11a369 +SHA512 (heimdal-7.8.0.tar.gz) = 0167345aca77d65b7a1113874eee5b65ec6e1fec1f196d57e571265409fa35ef95a673a4fd4aafbb0ab5fb5b246b97412353a68d6613a8aff6393a9f1e72999e From 817968babca74bc978b4537cc2b3ce636b5ee4a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 12:04:28 +0000 Subject: [PATCH 38/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index a1702a9..388bd1a 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -9,7 +9,7 @@ Name: heimdal Version: 7.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/ @@ -502,6 +502,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 7.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Nov 21 2022 Alexander Boström - 7.8.0-1 - Update to 7.8.0 (#2143478) From 09dc64a66617ee78378b8c13ee710858437226da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Thu, 24 Nov 2022 20:54:33 +0100 Subject: [PATCH 39/62] Packaging fixes - Move libraries to a lib subdirectory - Include pkgconfig files (#1525462) (#1565954) (#1931072) --- heimdal-7.5.0-explicit-python2.patch | 156 --------------------- heimdal-ipropd-master.init | 102 -------------- heimdal-ipropd-slave.init | 102 -------------- heimdal-kadmind.init | 102 -------------- heimdal-kdc.init | 102 -------------- heimdal-kpasswdd.init | 103 -------------- heimdal.spec | 199 +++++++++------------------ 7 files changed, 67 insertions(+), 799 deletions(-) delete mode 100644 heimdal-7.5.0-explicit-python2.patch delete mode 100644 heimdal-ipropd-master.init delete mode 100644 heimdal-ipropd-slave.init delete mode 100644 heimdal-kadmind.init delete mode 100644 heimdal-kdc.init delete mode 100644 heimdal-kpasswdd.init diff --git a/heimdal-7.5.0-explicit-python2.patch b/heimdal-7.5.0-explicit-python2.patch deleted file mode 100644 index a96b18a..0000000 --- a/heimdal-7.5.0-explicit-python2.patch +++ /dev/null @@ -1,156 +0,0 @@ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/hx509/quote.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2010 Kungliga Tekniska Högskolan -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/Makefile.am -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am -@@ -89,7 +89,7 @@ idn_lookup_SOURCES = idn-lookup.c - - LDADD = libwind.la $(LIB_roken) - --PYTHON = python -+PYTHON = python2 - - if !MAINTAINER_MODE - skip_python = test -f $@ || -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/UnicodeData.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-bidi.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-combining.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-errorlist.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-map.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-normalize.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-punycode-examples.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/generate.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc3454.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc4518.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/stringprep.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/util.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/windows/NTMakefile.w32 -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 -@@ -120,7 +120,7 @@ RC=rc - AWK_CMD=gawk.exe - YACC_CMD=bison.exe - LEX_CMD=flex.exe --PYTHON=python.exe -+PYTHON=python2.exe - PERL=perl.exe - CMP=cmp.exe - MAKECAT=makecat.exe diff --git a/heimdal-ipropd-master.init b/heimdal-ipropd-master.init deleted file mode 100644 index 4931f0a..0000000 --- a/heimdal-ipropd-master.init +++ /dev/null @@ -1,102 +0,0 @@ -#! /bin/sh -# -# ipropd-master Startup script for Heimdal ipropd-master -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal ipropd-master - -### BEGIN INIT INFO -# Provides: ipropd-master -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal ipropd-master -# Description: Heimdal ipropd-master implements incremental propagation -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/ipropd-master -prog=ipropd-master -MASTER_ARGS="--detach" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${MASTER_ARGS}" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal-ipropd-slave.init b/heimdal-ipropd-slave.init deleted file mode 100644 index 78d60e9..0000000 --- a/heimdal-ipropd-slave.init +++ /dev/null @@ -1,102 +0,0 @@ -#! /bin/sh -# -# ipropd-slave Startup script for Heimdal ipropd-slave -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal ipropd-slave - -### BEGIN INIT INFO -# Provides: ipropd-slave -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal ipropd-slave -# Description: Heimdal ipropd-slave implements incremental propagation -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/ipropd-slave -prog=ipropd-slave -SLAVE_ARGS="--detach" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${SLAVE_ARGS} ${MASTER}" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal-kadmind.init b/heimdal-kadmind.init deleted file mode 100644 index 212c141..0000000 --- a/heimdal-kadmind.init +++ /dev/null @@ -1,102 +0,0 @@ -#! /bin/sh -# -# heimdal-kadmind Startup script for Heimdal kadmind -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal kadmind - -### BEGIN INIT INFO -# Provides: heimdal-kadmind -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal kadmind -# Description: Heimdal kadmind implements remote administration in Heimdal -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/heimdal-kadmind -prog=heimdal-kadmind -KADMIND_ARGS="" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${KADMIND_ARGS} &" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal-kdc.init b/heimdal-kdc.init deleted file mode 100644 index 625f2b9..0000000 --- a/heimdal-kdc.init +++ /dev/null @@ -1,102 +0,0 @@ -#! /bin/sh -# -# kdc Startup script for Heimdal kdc -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal kdc - -### BEGIN INIT INFO -# Provides: kdc -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal kdc -# Description: Heimdal KDC is a Kerberos 5 Key Distribution Center server -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/kdc -prog=kdc -KDC_ARGS="--detach" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${KDC_ARGS}" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal-kpasswdd.init b/heimdal-kpasswdd.init deleted file mode 100644 index a7dd64b..0000000 --- a/heimdal-kpasswdd.init +++ /dev/null @@ -1,103 +0,0 @@ -#! /bin/sh -# -# kpasswdd Startup script for Heimdal kpasswdd -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal kpasswdd - -### BEGIN INIT INFO -# Provides: kpasswdd -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal kpasswdd -# Description: Heimdal kpasswdd allows Kerberos 5 users to change \ -# their KDC passwords -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/kpasswdd -prog=kpasswdd -KPASSWD_ARGS="" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${KPASSWD_ARGS} &" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal.spec b/heimdal.spec index 388bd1a..fc75883 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -1,18 +1,13 @@ %global _hardened_build 1 -%global libdir %{_libdir}/heimdal -%global bindir %{_exec_prefix}/lib/heimdal - -# Use systemd unit files on RHEL 7 and above. -%if ! (0%{?rhel} && 0%{?rhel} < 7) - %global _with_systemd 1 -%endif +%global prefix %{_libdir}/%{name} +%global exec_prefix %{_exec_prefix}/lib/%{name} Name: heimdal Version: 7.8.0 -Release: 2%{?dist} +Release: 5%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT -URL: http://www.heimdal.software/ +URL: http://www.heimdal.software/heimdal Source0: https://github.com/%{name}/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz Source3: %{name}.sysconfig Source4: %{name}.sh @@ -20,11 +15,6 @@ Source5: %{name}.csh Source9: krb5.conf.sample Source10: %{name}.logrotate Source11: %{name}-bashrc -Source20: %{name}-kdc.init -Source21: %{name}-ipropd-master.init -Source22: %{name}-ipropd-slave.init -Source23: %{name}-kadmind.init -Source24: %{name}-kpasswdd.init Source25: %{name}-kdc.conf Source26: %{name}-kdc.service Source27: %{name}-ipropd-master.service @@ -58,22 +48,12 @@ BuildRequires: sqlite-devel BuildRequires: texinfo BuildRequires: libcom_err-devel BuildRequires: libcap-ng-devel -%if (0%{?rhel} && 0%{?rhel} < 7) -BuildRequires: db4-devel -%else BuildRequires: libdb-devel -%endif BuildRequires: doxygen BuildRequires: graphviz BuildRequires: python3 -%if (0%{?rhel} && 0%{?rhel} < 7) -BuildRequires: groff -%else BuildRequires: groff-base -%endif -%if 0%{?_with_systemd} BuildRequires: systemd-units -%endif BuildRequires: make # Bundled libtommath (https://bugzilla.redhat.com/1118462) @@ -104,16 +84,9 @@ use on workstations (kinit, klist, kdestroy, kpasswd) %package server Summary: Heimdal kerberos server Requires: logrotate -%if 0%{?_with_systemd} Requires(preun): systemd Requires(postun): systemd Requires(post): systemd -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -%endif Provides: heimdal-kdc = %{version}-%{release} Obsoletes: heimdal-kdc < 1.5 @@ -172,7 +145,7 @@ autoreconf -ivf %configure \ --prefix=%{_prefix} \ --includedir=%{_includedir}/%{name} \ - --libdir=%{libdir} \ + --libdir=%{prefix}/lib \ --enable-static \ --enable-shared \ --enable-pthread-support \ @@ -202,28 +175,16 @@ timeout 20m %make_build check || : %install %make_install # install the init files -%if 0%{?_with_systemd} - # install systemd service files - mkdir -p %{buildroot}%{_unitdir} - pushd %{buildroot}%{_unitdir} - install -p -D -m 644 %{SOURCE26} heimdal-kdc.service - install -p -D -m 644 %{SOURCE27} heimdal-ipropd-master.service - install -p -D -m 644 %{SOURCE28} heimdal-ipropd-slave.service - install -p -D -m 644 %{SOURCE29} heimdal-kadmind.service - install -p -D -m 644 %{SOURCE30} heimdal-kpasswdd.service - popd - install -p -D -m 755 %{SOURCE31} %{buildroot}%{_libexecdir}/ipropd-slave-wrapper -%else - # install legacy SysV init scripts - mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d - pushd %{buildroot}%{_sysconfdir}/rc.d/init.d - install -p -D -m 755 %{SOURCE20} heimdal-kdc - install -p -D -m 755 %{SOURCE21} heimdal-ipropd-master - install -p -D -m 755 %{SOURCE22} heimdal-ipropd-slave - install -p -D -m 755 %{SOURCE23} heimdal-kadmind - install -p -D -m 755 %{SOURCE24} heimdal-kpasswdd - popd -%endif +# install systemd service files +mkdir -p %{buildroot}%{_unitdir} +pushd %{buildroot}%{_unitdir} + install -p -D -m 644 %{SOURCE26} heimdal-kdc.service + install -p -D -m 644 %{SOURCE27} heimdal-ipropd-master.service + install -p -D -m 644 %{SOURCE28} heimdal-ipropd-slave.service + install -p -D -m 644 %{SOURCE29} heimdal-kadmind.service + install -p -D -m 644 %{SOURCE30} heimdal-kpasswdd.service +popd +install -p -D -m 755 %{SOURCE31} %{buildroot}%{_libexecdir}/ipropd-slave-wrapper install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/heimdal install -p -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/heimdal.sh install -p -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/profile.d/heimdal.csh @@ -240,8 +201,6 @@ install -d -m 755 %{buildroot}/%{_pkgdocdir} install -p -D -m 644 LICENSE %{buildroot}/%{_pkgdocdir}/LICENSE install -p -D -m 644 %{SOURCE9} %{buildroot}/%{_pkgdocdir}/krb5.conf.sample install -p -D -m 644 %{SOURCE11} %{buildroot}/%{_pkgdocdir}/bashrc -# we don't need pkgconfig file and info/dir -rm -rf %{buildroot}%{libdir}/pkgconfig rm -rf %{buildroot}%{_infodir}/dir # NOTICE: no support for X11 rm -f %{buildroot}%{_mandir}/man1/kx.1* @@ -257,10 +216,10 @@ find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF -%{_libdir}/%{name} +%{prefix}/lib EOF -mkdir -p %{buildroot}%{bindir}/bin +mkdir -p %{buildroot}%{exec_prefix}/bin mkdir -p %{buildroot}%{_mandir}/%{name}/man{1,5,8} # rename clashes with other pkgs from to heimdal- @@ -268,10 +227,10 @@ for prog in kadmin kadmind kdestroy kinit klist kpasswd krb5-config ktutil su pa do if [ -e %{buildroot}%{_bindir}/${prog} ]; then mv %{buildroot}%{_bindir}/{,%{name}-}${prog} - ln -s %{_bindir}/%{name}-${prog} %{buildroot}%{bindir}/bin/${prog} + ln -s %{_bindir}/%{name}-${prog} %{buildroot}%{exec_prefix}/bin/${prog} elif [ -e %{buildroot}%{_sbindir}/${prog} ]; then mv %{buildroot}%{_sbindir}/{,%{name}-}${prog} - ln -s %{_sbindir}/%{name}-${prog} %{buildroot}%{bindir}/bin/${prog} + ln -s %{_sbindir}/%{name}-${prog} %{buildroot}%{exec_prefix}/bin/${prog} elif [ -e %{buildroot}%{_libexecdir}/${prog} ]; then mv %{buildroot}%{_libexecdir}/{,%{name}-}${prog} fi @@ -285,7 +244,7 @@ done # If we have the prefixed name in one pkg we want it in all. mv %{buildroot}%{_bindir}/{,%{name}-}kswitch -ln -s %{_bindir}/%{name}-kswitch %{buildroot}%{bindir}/bin/kswitch +ln -s %{_bindir}/%{name}-kswitch %{buildroot}%{exec_prefix}/bin/kswitch mv %{buildroot}%{_mandir}/man1/{,%{name}-}kswitch.1 ln -s %{name}-kinit %{buildroot}%{_bindir}/kauth @@ -298,58 +257,25 @@ ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz %find_lang %{name} --all-name %post server -%if 0%{?_with_systemd} - %systemd_post heimdal-kdc.service - %systemd_post heimdal-ipropd-master.service - %systemd_post heimdal-ipropd-slave.service - %systemd_post heimdal-kadmind.service - %systemd_post heimdal-kpasswdd.service -%else - /sbin/chkconfig --add heimdal-kdc - /sbin/chkconfig --add heimdal-ipropd-master - /sbin/chkconfig --add heimdal-ipropd-slave - /sbin/chkconfig --add heimdal-kadmind - /sbin/chkconfig --add heimdal-kpasswdd -%endif +%systemd_post heimdal-kdc.service +%systemd_post heimdal-ipropd-master.service +%systemd_post heimdal-ipropd-slave.service +%systemd_post heimdal-kadmind.service +%systemd_post heimdal-kpasswdd.service %preun server -%if 0%{?_with_systemd} - %systemd_preun heimdal-kdc.service - %systemd_preun heimdal-ipropd-master.service - %systemd_preun heimdal-ipropd-slave.service - %systemd_preun heimdal-kadmind.service - %systemd_preun heimdal-kpasswdd.service -%else - if [ $1 -eq 0 ] ; then - /sbin/service heimdal-kdc stop >/dev/null 2>&1 || : - /sbin/chkconfig --del heimdal-kdc - /sbin/service heimdal-ipropd-master stop >/dev/null 2>&1 || : - /sbin/chkconfig --del heimdal-ipropd-master - /sbin/service heimdal-ipropd-slave stop >/dev/null 2>&1 || : - /sbin/chkconfig --del heimdal-ipropd-slave - /sbin/service heimdal-kadmind stop >/dev/null 2>&1 || : - /sbin/chkconfig --del heimdal-kadmind - /sbin/service heimdal-kpasswdd stop >/dev/null 2>&1 || : - /sbin/chkconfig --del >/dev/null - fi -%endif +%systemd_preun heimdal-kdc.service +%systemd_preun heimdal-ipropd-master.service +%systemd_preun heimdal-ipropd-slave.service +%systemd_preun heimdal-kadmind.service +%systemd_preun heimdal-kpasswdd.service %postun server -%if 0%{?_with_systemd} - %systemd_postun_with_restart heimdal-kdc.service - %systemd_postun_with_restart heimdal-ipropd-master.service - %systemd_postun_with_restart heimdal-ipropd-slave.service - %systemd_postun_with_restart heimdal-kadmind.service - %systemd_postun_with_restart heimdal-kpasswdd.service -%else - if [ $1 -eq 1 ] ; then - /sbin/service heimdal-kdc condrestart >/dev/null 2>&1 || : - /sbin/service heimdal-ipropd-master condrestart >/dev/null 2>&1 || : - /sbin/service heimdal-ipropd-slave condrestart >/dev/null 2>&1 || : - /sbin/service heimdal-kadmind condrestart >/dev/null 2>&1 || : - /sbin/service heimdal-kpasswdd condrestart >/dev/null 2>&1 || : - fi -%endif +%systemd_postun_with_restart heimdal-kdc.service +%systemd_postun_with_restart heimdal-ipropd-master.service +%systemd_postun_with_restart heimdal-ipropd-slave.service +%systemd_postun_with_restart heimdal-kadmind.service +%systemd_postun_with_restart heimdal-kpasswdd.service %if (0%{?rhel} && 0%{?rhel} < 8) %post libs @@ -366,12 +292,13 @@ fi %endif %files libs -f %{name}.lang -%dir %{bindir} -%dir %{bindir}/bin -%dir %{libdir} +%dir %{exec_prefix} +%dir %{exec_prefix}/bin +%dir %{prefix} +%dir %{prefix}/lib %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -%{libdir}/lib*.so* -%{libdir}/windc.so* +%{prefix}/lib/lib*.so.* +%{prefix}/lib/windc.so.* %{_infodir}/heimdal.info* %{_infodir}/hx509.info* %{_mandir}/man5/%{name}-krb5.conf.5* @@ -389,11 +316,7 @@ fi %license LICENSE %files server -%if 0%{?_with_systemd} %{_unitdir}/*.service -%else -%{_initrddir}/* -%endif %{_sysconfdir}/logrotate.d/heimdal %config(noreplace) %{_sysconfdir}/sysconfig/heimdal %dir %attr(700,root,root) %{_localstatedir}/heimdal @@ -415,9 +338,7 @@ fi %{_mandir}/man8/ipropd-master.8* %{_libexecdir}/ipropd-slave %{_mandir}/man8/ipropd-slave.8* -%if 0%{?_with_systemd} %{_libexecdir}/ipropd-slave-wrapper -%endif %{_libexecdir}/%{name}-kadmind %{_mandir}/man8/%{name}-kadmind.8* %{_libexecdir}/kdc @@ -433,14 +354,14 @@ fi %{_prefix}/bin/bsearch %{_mandir}/man1/bsearch.1* %{_prefix}/bin/%{name}-pagsh -%{bindir}/bin/pagsh +%{exec_prefix}/bin/pagsh %{_mandir}/man1/%{name}-pagsh.1* %{_prefix}/bin/gsstool %{_prefix}/bin/heimtools %{_prefix}/bin/hxtool %{_prefix}/bin/idn-lookup %{_prefix}/bin/%{name}-kdestroy -%{bindir}/bin/kdestroy +%{exec_prefix}/bin/kdestroy %{_mandir}/man1/%{name}-kdestroy.1* %{_prefix}/bin/kf %{_mandir}/man1/kf.1* @@ -449,59 +370,73 @@ fi %{_libexecdir}/kimpersonate %{_mandir}/man8/kimpersonate.8* %{_prefix}/bin/%{name}-kinit -%{bindir}/bin/kinit +%{exec_prefix}/bin/kinit %{_prefix}/bin/kauth %{_mandir}/man1/%{name}-kinit.1* %{_prefix}/bin/%{name}-klist -%{bindir}/bin/klist +%{exec_prefix}/bin/klist %{_mandir}/man1/%{name}-klist.1* %{_prefix}/bin/%{name}-kpasswd -%{bindir}/bin/kpasswd +%{exec_prefix}/bin/kpasswd %{_mandir}/man1/%{name}-kpasswd.1* %{_prefix}/bin/heimdal-kswitch -%{bindir}/bin/kswitch +%{exec_prefix}/bin/kswitch %{_mandir}/man1/heimdal-kswitch.1* %{_prefix}/bin/otp %{_mandir}/man1/otp.1* %{_prefix}/bin/otpprint %{_mandir}/man1/otpprint.1* %{_bindir}/%{name}-kadmin -%{bindir}/bin/kadmin +%{exec_prefix}/bin/kadmin %{_mandir}/man1/%{name}-kadmin.1* %{_libexecdir}/kcm %{_mandir}/man8/kcm.8* %{_libexecdir}/kfd %{_mandir}/man8/kfd.8* %{_bindir}/%{name}-ktutil -%{bindir}/bin/ktutil +%{exec_prefix}/bin/ktutil %{_mandir}/man1/%{name}-ktutil.1* # NOTICE: no support for X11 #%%{_libexecdir}/kxd #%%{_mandir}/man8/kxd.8* #%%{_mandir}/cat8/kxd.8* %attr(04550,root,root) %{_prefix}/bin/%{name}-su -%{bindir}/bin/su +%{exec_prefix}/bin/su %{_mandir}/man1/%{name}-su.1* %files devel %dir %{_libexecdir}/%{name} %{_bindir}/%{name}-krb5-config -%{bindir}/bin/krb5-config +%{exec_prefix}/bin/krb5-config %{_mandir}/man1/%{name}-krb5-config.1* %{_includedir}/* -%{libdir}/lib*.a -%{libdir}/windc.a +%{prefix}/lib/lib*.a +%{prefix}/lib/lib*.so +%{prefix}/lib/windc.a +%{prefix}/lib/windc.so %{_mandir}/man3/* %{_mandir}/man7/* %{_libexecdir}/%{name}/asn1_compile %{_libexecdir}/%{name}/asn1_print %{_libexecdir}/%{name}/slc +%{prefix}/lib/pkgconfig/*.pc %files path %{_sysconfdir}/profile.d/%{name}.sh %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Mar 08 2023 Alexander Boström - 7.8.0-5 +- Remove conditionals prior to RHEL7 + +* Wed Mar 08 2023 Alexander Boström - 7.8.0-4 +- remove _with_systemd conditional +- remove unused source files + +* Wed Mar 08 2023 Alexander Boström - 7.8.0-3 +- Move libraries to a lib subdirectory +- Include pkgconfig files (#1525462) (#1565954) (#1931072) + * Thu Jan 19 2023 Fedora Release Engineering - 7.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 9c74d75349d70b53a77611abbea7891253b94881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Thu, 24 Nov 2022 20:54:33 +0100 Subject: [PATCH 40/62] Packaging fixes - Move libraries to a lib subdirectory - Include pkgconfig files (#1525462) (#1565954) (#1931072) --- heimdal.spec | 64 ++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index 388bd1a..d3bdf6c 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -1,6 +1,6 @@ %global _hardened_build 1 -%global libdir %{_libdir}/heimdal -%global bindir %{_exec_prefix}/lib/heimdal +%global prefix %{_libdir}/%{name} +%global exec_prefix %{_exec_prefix}/lib/%{name} # Use systemd unit files on RHEL 7 and above. %if ! (0%{?rhel} && 0%{?rhel} < 7) @@ -9,10 +9,10 @@ Name: heimdal Version: 7.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT -URL: http://www.heimdal.software/ +URL: http://www.heimdal.software/heimdal Source0: https://github.com/%{name}/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz Source3: %{name}.sysconfig Source4: %{name}.sh @@ -172,7 +172,7 @@ autoreconf -ivf %configure \ --prefix=%{_prefix} \ --includedir=%{_includedir}/%{name} \ - --libdir=%{libdir} \ + --libdir=%{prefix}/lib \ --enable-static \ --enable-shared \ --enable-pthread-support \ @@ -240,8 +240,6 @@ install -d -m 755 %{buildroot}/%{_pkgdocdir} install -p -D -m 644 LICENSE %{buildroot}/%{_pkgdocdir}/LICENSE install -p -D -m 644 %{SOURCE9} %{buildroot}/%{_pkgdocdir}/krb5.conf.sample install -p -D -m 644 %{SOURCE11} %{buildroot}/%{_pkgdocdir}/bashrc -# we don't need pkgconfig file and info/dir -rm -rf %{buildroot}%{libdir}/pkgconfig rm -rf %{buildroot}%{_infodir}/dir # NOTICE: no support for X11 rm -f %{buildroot}%{_mandir}/man1/kx.1* @@ -257,10 +255,10 @@ find %{buildroot} -type f -name '*.la' -exec rm -f {} ';' mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/ cat >> %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf << EOF -%{_libdir}/%{name} +%{prefix}/lib EOF -mkdir -p %{buildroot}%{bindir}/bin +mkdir -p %{buildroot}%{exec_prefix}/bin mkdir -p %{buildroot}%{_mandir}/%{name}/man{1,5,8} # rename clashes with other pkgs from to heimdal- @@ -268,10 +266,10 @@ for prog in kadmin kadmind kdestroy kinit klist kpasswd krb5-config ktutil su pa do if [ -e %{buildroot}%{_bindir}/${prog} ]; then mv %{buildroot}%{_bindir}/{,%{name}-}${prog} - ln -s %{_bindir}/%{name}-${prog} %{buildroot}%{bindir}/bin/${prog} + ln -s %{_bindir}/%{name}-${prog} %{buildroot}%{exec_prefix}/bin/${prog} elif [ -e %{buildroot}%{_sbindir}/${prog} ]; then mv %{buildroot}%{_sbindir}/{,%{name}-}${prog} - ln -s %{_sbindir}/%{name}-${prog} %{buildroot}%{bindir}/bin/${prog} + ln -s %{_sbindir}/%{name}-${prog} %{buildroot}%{exec_prefix}/bin/${prog} elif [ -e %{buildroot}%{_libexecdir}/${prog} ]; then mv %{buildroot}%{_libexecdir}/{,%{name}-}${prog} fi @@ -285,7 +283,7 @@ done # If we have the prefixed name in one pkg we want it in all. mv %{buildroot}%{_bindir}/{,%{name}-}kswitch -ln -s %{_bindir}/%{name}-kswitch %{buildroot}%{bindir}/bin/kswitch +ln -s %{_bindir}/%{name}-kswitch %{buildroot}%{exec_prefix}/bin/kswitch mv %{buildroot}%{_mandir}/man1/{,%{name}-}kswitch.1 ln -s %{name}-kinit %{buildroot}%{_bindir}/kauth @@ -366,12 +364,13 @@ fi %endif %files libs -f %{name}.lang -%dir %{bindir} -%dir %{bindir}/bin -%dir %{libdir} +%dir %{exec_prefix} +%dir %{exec_prefix}/bin +%dir %{prefix} +%dir %{prefix}/lib %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf -%{libdir}/lib*.so* -%{libdir}/windc.so* +%{prefix}/lib/lib*.so.* +%{prefix}/lib/windc.so.* %{_infodir}/heimdal.info* %{_infodir}/hx509.info* %{_mandir}/man5/%{name}-krb5.conf.5* @@ -433,14 +432,14 @@ fi %{_prefix}/bin/bsearch %{_mandir}/man1/bsearch.1* %{_prefix}/bin/%{name}-pagsh -%{bindir}/bin/pagsh +%{exec_prefix}/bin/pagsh %{_mandir}/man1/%{name}-pagsh.1* %{_prefix}/bin/gsstool %{_prefix}/bin/heimtools %{_prefix}/bin/hxtool %{_prefix}/bin/idn-lookup %{_prefix}/bin/%{name}-kdestroy -%{bindir}/bin/kdestroy +%{exec_prefix}/bin/kdestroy %{_mandir}/man1/%{name}-kdestroy.1* %{_prefix}/bin/kf %{_mandir}/man1/kf.1* @@ -449,59 +448,66 @@ fi %{_libexecdir}/kimpersonate %{_mandir}/man8/kimpersonate.8* %{_prefix}/bin/%{name}-kinit -%{bindir}/bin/kinit +%{exec_prefix}/bin/kinit %{_prefix}/bin/kauth %{_mandir}/man1/%{name}-kinit.1* %{_prefix}/bin/%{name}-klist -%{bindir}/bin/klist +%{exec_prefix}/bin/klist %{_mandir}/man1/%{name}-klist.1* %{_prefix}/bin/%{name}-kpasswd -%{bindir}/bin/kpasswd +%{exec_prefix}/bin/kpasswd %{_mandir}/man1/%{name}-kpasswd.1* %{_prefix}/bin/heimdal-kswitch -%{bindir}/bin/kswitch +%{exec_prefix}/bin/kswitch %{_mandir}/man1/heimdal-kswitch.1* %{_prefix}/bin/otp %{_mandir}/man1/otp.1* %{_prefix}/bin/otpprint %{_mandir}/man1/otpprint.1* %{_bindir}/%{name}-kadmin -%{bindir}/bin/kadmin +%{exec_prefix}/bin/kadmin %{_mandir}/man1/%{name}-kadmin.1* %{_libexecdir}/kcm %{_mandir}/man8/kcm.8* %{_libexecdir}/kfd %{_mandir}/man8/kfd.8* %{_bindir}/%{name}-ktutil -%{bindir}/bin/ktutil +%{exec_prefix}/bin/ktutil %{_mandir}/man1/%{name}-ktutil.1* # NOTICE: no support for X11 #%%{_libexecdir}/kxd #%%{_mandir}/man8/kxd.8* #%%{_mandir}/cat8/kxd.8* %attr(04550,root,root) %{_prefix}/bin/%{name}-su -%{bindir}/bin/su +%{exec_prefix}/bin/su %{_mandir}/man1/%{name}-su.1* %files devel %dir %{_libexecdir}/%{name} %{_bindir}/%{name}-krb5-config -%{bindir}/bin/krb5-config +%{exec_prefix}/bin/krb5-config %{_mandir}/man1/%{name}-krb5-config.1* %{_includedir}/* -%{libdir}/lib*.a -%{libdir}/windc.a +%{prefix}/lib/lib*.a +%{prefix}/lib/lib*.so +%{prefix}/lib/windc.a +%{prefix}/lib/windc.so %{_mandir}/man3/* %{_mandir}/man7/* %{_libexecdir}/%{name}/asn1_compile %{_libexecdir}/%{name}/asn1_print %{_libexecdir}/%{name}/slc +%{prefix}/lib/pkgconfig/*.pc %files path %{_sysconfdir}/profile.d/%{name}.sh %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Mar 08 2023 Alexander Boström - 7.8.0-3 +- Move libraries to a lib subdirectory +- Include pkgconfig files (#1525462) (#1565954) (#1931072) + * Thu Jan 19 2023 Fedora Release Engineering - 7.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 5b91e8048b90b0c65f7798158e4f5f8a8f3a3db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Thu, 24 Nov 2022 21:03:26 +0100 Subject: [PATCH 41/62] Packaging cleanup - remove obsolete _with_systemd conditional - remove unused source files --- heimdal-7.5.0-explicit-python2.patch | 156 --------------------------- heimdal-ipropd-master.init | 102 ------------------ heimdal-ipropd-slave.init | 102 ------------------ heimdal-kadmind.init | 102 ------------------ heimdal-kdc.init | 102 ------------------ heimdal-kpasswdd.init | 103 ------------------ heimdal.spec | 126 ++++++---------------- 7 files changed, 30 insertions(+), 763 deletions(-) delete mode 100644 heimdal-7.5.0-explicit-python2.patch delete mode 100644 heimdal-ipropd-master.init delete mode 100644 heimdal-ipropd-slave.init delete mode 100644 heimdal-kadmind.init delete mode 100644 heimdal-kdc.init delete mode 100644 heimdal-kpasswdd.init diff --git a/heimdal-7.5.0-explicit-python2.patch b/heimdal-7.5.0-explicit-python2.patch deleted file mode 100644 index a96b18a..0000000 --- a/heimdal-7.5.0-explicit-python2.patch +++ /dev/null @@ -1,156 +0,0 @@ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/hx509/quote.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/hx509/quote.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - # -*- coding: utf-8 -*- - # - # Copyright (c) 2010 Kungliga Tekniska Högskolan -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/Makefile.am -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/Makefile.am -@@ -89,7 +89,7 @@ idn_lookup_SOURCES = idn-lookup.c - - LDADD = libwind.la $(LIB_roken) - --PYTHON = python -+PYTHON = python2 - - if !MAINTAINER_MODE - skip_python = test -f $@ || -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/UnicodeData.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/UnicodeData.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-bidi.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-bidi.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-combining.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-combining.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-errorlist.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-errorlist.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-map.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-map.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-normalize.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-normalize.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/gen-punycode-examples.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/gen-punycode-examples.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/generate.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/generate.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc3454.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc3454.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/rfc4518.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/rfc4518.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/stringprep.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/stringprep.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/lib/wind/util.py -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/lib/wind/util.py -@@ -1,4 +1,4 @@ --#!/usr/local/bin/python -+#!/usr/bin/python2 - # -*- coding: iso-8859-1 -*- - - # $Id$ -Index: heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 -=================================================================== ---- heimdal-3e58559362dd3f485e6d6659d587a9169a131391.orig/windows/NTMakefile.w32 -+++ heimdal-3e58559362dd3f485e6d6659d587a9169a131391/windows/NTMakefile.w32 -@@ -120,7 +120,7 @@ RC=rc - AWK_CMD=gawk.exe - YACC_CMD=bison.exe - LEX_CMD=flex.exe --PYTHON=python.exe -+PYTHON=python2.exe - PERL=perl.exe - CMP=cmp.exe - MAKECAT=makecat.exe diff --git a/heimdal-ipropd-master.init b/heimdal-ipropd-master.init deleted file mode 100644 index 4931f0a..0000000 --- a/heimdal-ipropd-master.init +++ /dev/null @@ -1,102 +0,0 @@ -#! /bin/sh -# -# ipropd-master Startup script for Heimdal ipropd-master -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal ipropd-master - -### BEGIN INIT INFO -# Provides: ipropd-master -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal ipropd-master -# Description: Heimdal ipropd-master implements incremental propagation -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/ipropd-master -prog=ipropd-master -MASTER_ARGS="--detach" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${MASTER_ARGS}" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal-ipropd-slave.init b/heimdal-ipropd-slave.init deleted file mode 100644 index 78d60e9..0000000 --- a/heimdal-ipropd-slave.init +++ /dev/null @@ -1,102 +0,0 @@ -#! /bin/sh -# -# ipropd-slave Startup script for Heimdal ipropd-slave -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal ipropd-slave - -### BEGIN INIT INFO -# Provides: ipropd-slave -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal ipropd-slave -# Description: Heimdal ipropd-slave implements incremental propagation -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/ipropd-slave -prog=ipropd-slave -SLAVE_ARGS="--detach" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${SLAVE_ARGS} ${MASTER}" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal-kadmind.init b/heimdal-kadmind.init deleted file mode 100644 index 212c141..0000000 --- a/heimdal-kadmind.init +++ /dev/null @@ -1,102 +0,0 @@ -#! /bin/sh -# -# heimdal-kadmind Startup script for Heimdal kadmind -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal kadmind - -### BEGIN INIT INFO -# Provides: heimdal-kadmind -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal kadmind -# Description: Heimdal kadmind implements remote administration in Heimdal -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/heimdal-kadmind -prog=heimdal-kadmind -KADMIND_ARGS="" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${KADMIND_ARGS} &" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal-kdc.init b/heimdal-kdc.init deleted file mode 100644 index 625f2b9..0000000 --- a/heimdal-kdc.init +++ /dev/null @@ -1,102 +0,0 @@ -#! /bin/sh -# -# kdc Startup script for Heimdal kdc -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal kdc - -### BEGIN INIT INFO -# Provides: kdc -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal kdc -# Description: Heimdal KDC is a Kerberos 5 Key Distribution Center server -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/kdc -prog=kdc -KDC_ARGS="--detach" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${KDC_ARGS}" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal-kpasswdd.init b/heimdal-kpasswdd.init deleted file mode 100644 index a7dd64b..0000000 --- a/heimdal-kpasswdd.init +++ /dev/null @@ -1,103 +0,0 @@ -#! /bin/sh -# -# kpasswdd Startup script for Heimdal kpasswdd -# -# chkconfig: - 39 61 -# description: Starts and stops the Heimdal kpasswdd - -### BEGIN INIT INFO -# Provides: kpasswdd -# Required-Start: $local_fs $network $named -# Required-Stop: $local_fs $network -# Default-Start: -# Default-Stop: -# Short-Description: Starts and stops the Heimdal kpasswdd -# Description: Heimdal kpasswdd allows Kerberos 5 users to change \ -# their KDC passwords -### END INIT INFO - -[ -f /etc/rc.d/init.d/functions ] && . /etc/rc.d/init.d/functions - -exec=/usr/libexec/kpasswdd -prog=kpasswdd -KPASSWD_ARGS="" -[ -e /etc/sysconfig/heimdal ] && . /etc/sysconfig/heimdal -args="${KPASSWD_ARGS} &" - -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon "$exec $args" - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc "$prog" - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? - diff --git a/heimdal.spec b/heimdal.spec index d3bdf6c..f435341 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -2,14 +2,9 @@ %global prefix %{_libdir}/%{name} %global exec_prefix %{_exec_prefix}/lib/%{name} -# Use systemd unit files on RHEL 7 and above. -%if ! (0%{?rhel} && 0%{?rhel} < 7) - %global _with_systemd 1 -%endif - Name: heimdal Version: 7.8.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/heimdal @@ -20,11 +15,6 @@ Source5: %{name}.csh Source9: krb5.conf.sample Source10: %{name}.logrotate Source11: %{name}-bashrc -Source20: %{name}-kdc.init -Source21: %{name}-ipropd-master.init -Source22: %{name}-ipropd-slave.init -Source23: %{name}-kadmind.init -Source24: %{name}-kpasswdd.init Source25: %{name}-kdc.conf Source26: %{name}-kdc.service Source27: %{name}-ipropd-master.service @@ -71,9 +61,7 @@ BuildRequires: groff %else BuildRequires: groff-base %endif -%if 0%{?_with_systemd} BuildRequires: systemd-units -%endif BuildRequires: make # Bundled libtommath (https://bugzilla.redhat.com/1118462) @@ -104,16 +92,9 @@ use on workstations (kinit, klist, kdestroy, kpasswd) %package server Summary: Heimdal kerberos server Requires: logrotate -%if 0%{?_with_systemd} Requires(preun): systemd Requires(postun): systemd Requires(post): systemd -%else -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts -%endif Provides: heimdal-kdc = %{version}-%{release} Obsoletes: heimdal-kdc < 1.5 @@ -202,28 +183,16 @@ timeout 20m %make_build check || : %install %make_install # install the init files -%if 0%{?_with_systemd} - # install systemd service files - mkdir -p %{buildroot}%{_unitdir} - pushd %{buildroot}%{_unitdir} - install -p -D -m 644 %{SOURCE26} heimdal-kdc.service - install -p -D -m 644 %{SOURCE27} heimdal-ipropd-master.service - install -p -D -m 644 %{SOURCE28} heimdal-ipropd-slave.service - install -p -D -m 644 %{SOURCE29} heimdal-kadmind.service - install -p -D -m 644 %{SOURCE30} heimdal-kpasswdd.service - popd - install -p -D -m 755 %{SOURCE31} %{buildroot}%{_libexecdir}/ipropd-slave-wrapper -%else - # install legacy SysV init scripts - mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d - pushd %{buildroot}%{_sysconfdir}/rc.d/init.d - install -p -D -m 755 %{SOURCE20} heimdal-kdc - install -p -D -m 755 %{SOURCE21} heimdal-ipropd-master - install -p -D -m 755 %{SOURCE22} heimdal-ipropd-slave - install -p -D -m 755 %{SOURCE23} heimdal-kadmind - install -p -D -m 755 %{SOURCE24} heimdal-kpasswdd - popd -%endif +# install systemd service files +mkdir -p %{buildroot}%{_unitdir} +pushd %{buildroot}%{_unitdir} + install -p -D -m 644 %{SOURCE26} heimdal-kdc.service + install -p -D -m 644 %{SOURCE27} heimdal-ipropd-master.service + install -p -D -m 644 %{SOURCE28} heimdal-ipropd-slave.service + install -p -D -m 644 %{SOURCE29} heimdal-kadmind.service + install -p -D -m 644 %{SOURCE30} heimdal-kpasswdd.service +popd +install -p -D -m 755 %{SOURCE31} %{buildroot}%{_libexecdir}/ipropd-slave-wrapper install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/heimdal install -p -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/profile.d/heimdal.sh install -p -D -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/profile.d/heimdal.csh @@ -296,58 +265,25 @@ ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz %find_lang %{name} --all-name %post server -%if 0%{?_with_systemd} - %systemd_post heimdal-kdc.service - %systemd_post heimdal-ipropd-master.service - %systemd_post heimdal-ipropd-slave.service - %systemd_post heimdal-kadmind.service - %systemd_post heimdal-kpasswdd.service -%else - /sbin/chkconfig --add heimdal-kdc - /sbin/chkconfig --add heimdal-ipropd-master - /sbin/chkconfig --add heimdal-ipropd-slave - /sbin/chkconfig --add heimdal-kadmind - /sbin/chkconfig --add heimdal-kpasswdd -%endif +%systemd_post heimdal-kdc.service +%systemd_post heimdal-ipropd-master.service +%systemd_post heimdal-ipropd-slave.service +%systemd_post heimdal-kadmind.service +%systemd_post heimdal-kpasswdd.service %preun server -%if 0%{?_with_systemd} - %systemd_preun heimdal-kdc.service - %systemd_preun heimdal-ipropd-master.service - %systemd_preun heimdal-ipropd-slave.service - %systemd_preun heimdal-kadmind.service - %systemd_preun heimdal-kpasswdd.service -%else - if [ $1 -eq 0 ] ; then - /sbin/service heimdal-kdc stop >/dev/null 2>&1 || : - /sbin/chkconfig --del heimdal-kdc - /sbin/service heimdal-ipropd-master stop >/dev/null 2>&1 || : - /sbin/chkconfig --del heimdal-ipropd-master - /sbin/service heimdal-ipropd-slave stop >/dev/null 2>&1 || : - /sbin/chkconfig --del heimdal-ipropd-slave - /sbin/service heimdal-kadmind stop >/dev/null 2>&1 || : - /sbin/chkconfig --del heimdal-kadmind - /sbin/service heimdal-kpasswdd stop >/dev/null 2>&1 || : - /sbin/chkconfig --del >/dev/null - fi -%endif +%systemd_preun heimdal-kdc.service +%systemd_preun heimdal-ipropd-master.service +%systemd_preun heimdal-ipropd-slave.service +%systemd_preun heimdal-kadmind.service +%systemd_preun heimdal-kpasswdd.service %postun server -%if 0%{?_with_systemd} - %systemd_postun_with_restart heimdal-kdc.service - %systemd_postun_with_restart heimdal-ipropd-master.service - %systemd_postun_with_restart heimdal-ipropd-slave.service - %systemd_postun_with_restart heimdal-kadmind.service - %systemd_postun_with_restart heimdal-kpasswdd.service -%else - if [ $1 -eq 1 ] ; then - /sbin/service heimdal-kdc condrestart >/dev/null 2>&1 || : - /sbin/service heimdal-ipropd-master condrestart >/dev/null 2>&1 || : - /sbin/service heimdal-ipropd-slave condrestart >/dev/null 2>&1 || : - /sbin/service heimdal-kadmind condrestart >/dev/null 2>&1 || : - /sbin/service heimdal-kpasswdd condrestart >/dev/null 2>&1 || : - fi -%endif +%systemd_postun_with_restart heimdal-kdc.service +%systemd_postun_with_restart heimdal-ipropd-master.service +%systemd_postun_with_restart heimdal-ipropd-slave.service +%systemd_postun_with_restart heimdal-kadmind.service +%systemd_postun_with_restart heimdal-kpasswdd.service %if (0%{?rhel} && 0%{?rhel} < 8) %post libs @@ -388,11 +324,7 @@ fi %license LICENSE %files server -%if 0%{?_with_systemd} %{_unitdir}/*.service -%else -%{_initrddir}/* -%endif %{_sysconfdir}/logrotate.d/heimdal %config(noreplace) %{_sysconfdir}/sysconfig/heimdal %dir %attr(700,root,root) %{_localstatedir}/heimdal @@ -414,9 +346,7 @@ fi %{_mandir}/man8/ipropd-master.8* %{_libexecdir}/ipropd-slave %{_mandir}/man8/ipropd-slave.8* -%if 0%{?_with_systemd} %{_libexecdir}/ipropd-slave-wrapper -%endif %{_libexecdir}/%{name}-kadmind %{_mandir}/man8/%{name}-kadmind.8* %{_libexecdir}/kdc @@ -504,6 +434,10 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Mar 08 2023 Alexander Boström - 7.8.0-4 +- remove _with_systemd conditional +- remove unused source files + * Wed Mar 08 2023 Alexander Boström - 7.8.0-3 - Move libraries to a lib subdirectory - Include pkgconfig files (#1525462) (#1565954) (#1931072) From a6bee7d6e0620355ec08c250b7138208f6398ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Thu, 24 Nov 2022 21:05:56 +0100 Subject: [PATCH 42/62] Remove conditionals prior to RHEL7 --- heimdal.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index f435341..fc75883 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/heimdal @@ -48,19 +48,11 @@ BuildRequires: sqlite-devel BuildRequires: texinfo BuildRequires: libcom_err-devel BuildRequires: libcap-ng-devel -%if (0%{?rhel} && 0%{?rhel} < 7) -BuildRequires: db4-devel -%else BuildRequires: libdb-devel -%endif BuildRequires: doxygen BuildRequires: graphviz BuildRequires: python3 -%if (0%{?rhel} && 0%{?rhel} < 7) -BuildRequires: groff -%else BuildRequires: groff-base -%endif BuildRequires: systemd-units BuildRequires: make @@ -434,6 +426,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Mar 08 2023 Alexander Boström - 7.8.0-5 +- Remove conditionals prior to RHEL7 + * Wed Mar 08 2023 Alexander Boström - 7.8.0-4 - remove _with_systemd conditional - remove unused source files From a37b5d8b105138ad10c01085cb3b06e6943cfa12 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 13 Apr 2023 13:29:14 +0200 Subject: [PATCH 43/62] Port configure script to C99 Related to: --- heimdal-configure-c99.patch | 32 ++++++++++++++++++++++++++++++++ heimdal.spec | 7 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 heimdal-configure-c99.patch diff --git a/heimdal-configure-c99.patch b/heimdal-configure-c99.patch new file mode 100644 index 0000000..b78b3c5 --- /dev/null +++ b/heimdal-configure-c99.patch @@ -0,0 +1,32 @@ +Avoid implicit function declarations in the configure tests, to +prevent build failures with future compilers. + +Submitted upstream: + +diff --git a/cf/find-func-no-libs2.m4 b/cf/find-func-no-libs2.m4 +index 5e5ed0e69ba60f7b..a6b3ad6d347adc94 100644 +--- a/cf/find-func-no-libs2.m4 ++++ b/cf/find-func-no-libs2.m4 +@@ -21,7 +21,7 @@ if eval "test \"\$ac_cv_func_$1\" != yes" ; then + *) ac_lib="-l$ac_lib" ;; + esac + LIBS="$6 $ac_lib $5 $ac_save_LIBS" +- AC_LINK_IFELSE([AC_LANG_PROGRAM([[$3]],[[$1($4)]])],[eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break]) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[char $1 (void);]],[[$1()]])],[eval "if test -n \"$ac_lib\";then ac_cv_funclib_$1=$ac_lib; else ac_cv_funclib_$1=yes; fi";break]) + done + eval "ac_cv_funclib_$1=\${ac_cv_funclib_$1-no}" + LIBS="$ac_save_LIBS" +diff --git a/cf/have-struct-field.m4 b/cf/have-struct-field.m4 +index bb7bcefbcc68a08c..3962d850645f88e4 100644 +--- a/cf/have-struct-field.m4 ++++ b/cf/have-struct-field.m4 +@@ -7,7 +7,8 @@ dnl AC_HAVE_STRUCT_FIELD(struct, field, headers) + AC_DEFUN([AC_HAVE_STRUCT_FIELD], [ + define(cache_val, translit(ac_cv_type_$1_$2, [A-Z ], [a-z_])) + AC_CACHE_CHECK([for $2 in $1], cache_val,[ +-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$3]], ++AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ++$3]], + [[$1 x; memset(&x, 0, sizeof(x)); x.$2]])], + [cache_val=yes], + [cache_val=no]) diff --git a/heimdal.spec b/heimdal.spec index fc75883..24e9138 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/heimdal @@ -28,6 +28,7 @@ Source31: %{name}-ipropd-slave-wrapper Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch Patch4: heimdal-7.7.0-configure.patch Patch5: heimdal-7.7.0-58c8ad96-py3.patch +Patch6: heimdal-configure-c99.patch BuildRequires: gettext BuildRequires: bison @@ -128,6 +129,7 @@ PATH. %patch1 -p1 -b .cmds %patch4 -p1 -b .config %patch5 -p1 -b .2to3 +%patch6 -p1 for f in lib/*/*.py; do sed -i "$f" -re 's,^#!/usr/(local/|)bin/python,#!/usr/bin/python3,' @@ -426,6 +428,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Apr 13 2023 Florian Weimer - 7.8.0-6 +- Port configure script to C99 + * Wed Mar 08 2023 Alexander Boström - 7.8.0-5 - Remove conditionals prior to RHEL7 From 75998ab1d11c9482ac60d81c7558198609ad3f27 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 06:13:37 +0000 Subject: [PATCH 44/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 24e9138..fe0e14c 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/heimdal @@ -428,6 +428,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 7.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Apr 13 2023 Florian Weimer - 7.8.0-6 - Port configure script to C99 From a09d1e2986e00ac2e6f85e9f98ac56241453cc45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 22:02:06 +0000 Subject: [PATCH 45/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index fe0e14c..95c7b3e 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/heimdal @@ -428,6 +428,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 7.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 7.8.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b8b4396f077108da52b8688208ca3242dbf8769e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 21:35:57 +0000 Subject: [PATCH 46/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 95c7b3e..af05c6f 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/heimdal @@ -428,6 +428,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 7.8.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 7.8.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c7421dc24b1c729c1afd60fb1e5fe80869cd3a79 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 47/62] Eliminate use of obsolete %patchN syntax (#2283636) --- heimdal.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index af05c6f..b67d6fa 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -126,10 +126,10 @@ PATH. %prep %setup -q -%patch1 -p1 -b .cmds -%patch4 -p1 -b .config -%patch5 -p1 -b .2to3 -%patch6 -p1 +%patch -P1 -p1 -b .cmds +%patch -P4 -p1 -b .config +%patch -P5 -p1 -b .2to3 +%patch -P6 -p1 for f in lib/*/*.py; do sed -i "$f" -re 's,^#!/usr/(local/|)bin/python,#!/usr/bin/python3,' From 0082205083e3929080491b779bc8d4ea3db1a84b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 09:10:37 +0000 Subject: [PATCH 48/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index b67d6fa..56e4dd3 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.heimdal.software/heimdal @@ -428,6 +428,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 7.8.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 7.8.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d29fb6498e81c120f5cc927b8d2e9fe2e122ef62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 08:43:11 +0200 Subject: [PATCH 49/62] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- heimdal.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index 56e4dd3..72850a6 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,9 +4,10 @@ Name: heimdal Version: 7.8.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A Kerberos 5 implementation without export restrictions -License: BSD and MIT +# Automatically converted from old format: BSD and MIT - review is highly recommended. +License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT URL: http://www.heimdal.software/heimdal Source0: https://github.com/%{name}/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz Source3: %{name}.sysconfig @@ -428,6 +429,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Mon Sep 02 2024 Miroslav Suchý - 7.8.0-11 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 7.8.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 6758147f2fc7f88c95c6a3341c0bb230f34344d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 20 Jan 2025 07:28:21 +0000 Subject: [PATCH 50/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- heimdal.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index 72850a6..e502e47 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A Kerberos 5 implementation without export restrictions # Automatically converted from old format: BSD and MIT - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT @@ -429,6 +429,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Mon Jan 20 2025 Fedora Release Engineering - 7.8.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 02 2024 Miroslav Suchý - 7.8.0-11 - convert license to SPDX From ea01676f3035dc42ad36e3552d169977ee3ed8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:54:36 +0100 Subject: [PATCH 51/62] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- heimdal.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/heimdal.spec b/heimdal.spec index e502e47..cb18ae8 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A Kerberos 5 implementation without export restrictions # Automatically converted from old format: BSD and MIT - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT @@ -57,6 +57,7 @@ BuildRequires: python3 BuildRequires: groff-base BuildRequires: systemd-units BuildRequires: make +BuildRequires: libxcrypt-devel # Bundled libtommath (https://bugzilla.redhat.com/1118462) Provides: bundled(libtommath) = 0.42.0 @@ -429,6 +430,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Sat Feb 01 2025 Björn Esser - 7.8.0-13 +- Add explicit BR: libxcrypt-devel + * Mon Jan 20 2025 Fedora Release Engineering - 7.8.0-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 866928d33bfe491d874504933e1ca648201d2795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Wed, 4 Jun 2025 22:15:56 +0200 Subject: [PATCH 52/62] Add upstream patch for autoconf 2.72 --- heimdal-7.8.0-1b57b62d-ac272.patch | 21 +++++++++++++++++++++ heimdal.spec | 7 ++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 heimdal-7.8.0-1b57b62d-ac272.patch diff --git a/heimdal-7.8.0-1b57b62d-ac272.patch b/heimdal-7.8.0-1b57b62d-ac272.patch new file mode 100644 index 0000000..3308699 --- /dev/null +++ b/heimdal-7.8.0-1b57b62d-ac272.patch @@ -0,0 +1,21 @@ +commit 1b57b62d82a478c1fade350f0fb1d57031a8734e +Author: Bernd Kuhls +Date: Sat Feb 10 09:33:48 2024 +0100 + + cf/largefile.m4: Fix build with autoconf-2.72 + + Fixes https://github.com/heimdal/heimdal/issues/1201 + +diff --git a/cf/largefile.m4 b/cf/largefile.m4 +index 5c54897be..cdbbc5543 100644 +--- a/cf/largefile.m4 ++++ b/cf/largefile.m4 +@@ -10,7 +10,7 @@ dnl with generated code, such as lex + if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then + CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files" + fi +-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then ++if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then + CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" + fi + ]) diff --git a/heimdal.spec b/heimdal.spec index cb18ae8..32dd9ae 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A Kerberos 5 implementation without export restrictions # Automatically converted from old format: BSD and MIT - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT @@ -30,6 +30,7 @@ Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch Patch4: heimdal-7.7.0-configure.patch Patch5: heimdal-7.7.0-58c8ad96-py3.patch Patch6: heimdal-configure-c99.patch +Patch7: heimdal-7.8.0-1b57b62d-ac272.patch BuildRequires: gettext BuildRequires: bison @@ -132,6 +133,7 @@ PATH. %patch -P4 -p1 -b .config %patch -P5 -p1 -b .2to3 %patch -P6 -p1 +%patch -P7 -p1 for f in lib/*/*.py; do sed -i "$f" -re 's,^#!/usr/(local/|)bin/python,#!/usr/bin/python3,' @@ -430,6 +432,9 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* Wed Mar 08 2023 Alexander Boström - 7.8.0-14 +- Add upstream patch for autoconf 2.72 + * Sat Feb 01 2025 Björn Esser - 7.8.0-13 - Add explicit BR: libxcrypt-devel From fadb71703bcdf1b9dd32ecf4081d262774d6e143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Wed, 4 Jun 2025 22:16:17 +0200 Subject: [PATCH 53/62] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 453 ++++++++++++++++++++++++++++++++++++++++++++++++++ heimdal.spec | 456 +-------------------------------------------------- 2 files changed, 455 insertions(+), 454 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..37d9cd9 --- /dev/null +++ b/changelog @@ -0,0 +1,453 @@ +* Wed Mar 08 2023 Alexander Boström - 7.8.0-14 +- Add upstream patch for autoconf 2.72 + +* Sat Feb 01 2025 Björn Esser - 7.8.0-13 +- Add explicit BR: libxcrypt-devel + +* Mon Jan 20 2025 Fedora Release Engineering - 7.8.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Mon Sep 02 2024 Miroslav Suchý - 7.8.0-11 +- convert license to SPDX + +* Thu Jul 18 2024 Fedora Release Engineering - 7.8.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 7.8.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 7.8.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 7.8.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Apr 13 2023 Florian Weimer - 7.8.0-6 +- Port configure script to C99 + +* Wed Mar 08 2023 Alexander Boström - 7.8.0-5 +- Remove conditionals prior to RHEL7 + +* Wed Mar 08 2023 Alexander Boström - 7.8.0-4 +- remove _with_systemd conditional +- remove unused source files + +* Wed Mar 08 2023 Alexander Boström - 7.8.0-3 +- Move libraries to a lib subdirectory +- Include pkgconfig files (#1525462) (#1565954) (#1931072) + +* Thu Jan 19 2023 Fedora Release Engineering - 7.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Nov 21 2022 Alexander Boström - 7.8.0-1 +- Update to 7.8.0 (#2143478) + +* Mon Nov 21 2022 Alexander Boström - 7.7.1-3 +- Restart services on upgrade + +* Mon Nov 21 2022 Alexander Boström - 7.7.1-2 +- Delay service starts until after network is online (rhbz#2005501) + +* Wed Nov 16 2022 Alexander Boström - 7.7.1-1 +- Update to 7.7.1 +- Remove upstreamed patch +- Replace patch with sed command + +* Thu Jul 21 2022 Fedora Release Engineering - 7.7.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 7.7.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 7.7.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Apr 13 2021 Alexander Boström - 7.7.0-9 +- Backport autoconf-2.70 fix + +* Tue Jan 26 2021 Fedora Release Engineering - 7.7.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 7.7.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Mar 31 2020 Alexander Boström - 7.7.0-6 +- Do not buildrequire openldap-servers on RHEL8+ + +* Sat Mar 21 2020 Alexander Boström - 7.7.0-5 +- Add Python 3 code patch +- Use Python 3 binary path +- BuildRequire Python 3 + +* Wed Jan 29 2020 Fedora Release Engineering - 7.7.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Jan 17 2020 Jeff Law - 7.7.0-3 +- Fix configure tests compromised by LTO + +* Sat Dec 21 2019 Alexander Boström - 7.7.0-2 +- Set timeout on make check + +* Fri Dec 20 2019 Alexander Boström - 7.7.0-1 +- Update to 7.7.0 +- Remove upstreamed patch +- New project URL +- Update buildreqs +- Add locale build fix + +* Thu Jul 25 2019 Fedora Release Engineering - 7.5.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 7.5.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jan 14 2019 Björn Esser - 7.5.0-7 +- Rebuilt for libcrypt.so.2 (#1666033) + +* Sun Jan 06 2019 Björn Esser - 7.5.0-6 +- Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) +- Do not run 'make dist', fixes FTBFS (#1604316) +- Make sure 'krb5-types.h' is build, fixes FTBFS (#1604316) +- Remove el5 bits +- Drop unneeded scriptlets for newer distros +- Use %%make_build and %%make_install macros +- Install license file using %%license in libs package + +* Fri Jul 13 2018 Fedora Release Engineering - 7.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Mar 15 2018 Iryna Shcherbina - 7.5.0-4 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + +* Wed Feb 07 2018 Fedora Release Engineering - 7.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Jan 20 2018 Björn Esser - 7.5.0-2 +- Rebuilt for switch to libxcrypt + +* Thu Dec 14 2017 Ken Dreyer - 7.5.0-1 +- Update to 7.5.0 GA release (CVE-2017-17439) + +* Mon Oct 23 2017 Alexander Boström - 7.4.0-5 +- Backport fix to prevent wait() loop on non-existant child process + +* Wed Aug 02 2017 Fedora Release Engineering - 7.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 7.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed Jul 12 2017 Ken Dreyer - 7.4.0-2 +- Make test failures non-fatal + +* Tue Jul 11 2017 Ken Dreyer - 7.4.0-1 +- Update to 7.4.0 GA release (CVE-2017-11103) + +* Mon Apr 17 2017 Ken Dreyer - 7.3.0-1 +- Update to 7.3.0 GA release (CVE-2017-6594) + +* Fri Feb 10 2017 Fedora Release Engineering - 7.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Dec 29 2016 Ken Dreyer - 7.1.0-1 +- Update to 7.1.0 GA release +- Drop all remaining xinetd bits + +* Wed Feb 03 2016 Fedora Release Engineering - 1.6.0-0.13.20150115gitc25f45a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Aug 10 2015 Ken Dreyer - 1.6.0-0.12.20150115gitc25f45a +- Fix ld.so.conf.d file conflict between 32-bit and 64-bit packages + (rhbz#1244316) +- Mark ld.so.conf.d as %%config(noreplace) + +* Wed Jun 17 2015 Fedora Release Engineering - 1.6.0-0.11.20150115gitc25f45a +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu Jan 15 2015 Ken Dreyer - 1.6.0-0.10.20150115gitc25f45a +- Update git snapshot to latest tip of heimdal-1-6-branch +- Remove upstreamed patches +- Add virtual provides for bundled(libtommath) (RHBZ #1118462) + +* Sat Aug 16 2014 Fedora Release Engineering - 1.6.0-0.10.20140621gita5adc06 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Mon Jul 07 2014 Ken Dreyer - 1.6.0-0.9.20140621gita5adc06 +- Remove OpenSSL BR and go back to using hcrypto with bundled libtommath. + OpenSSL is not thread safe without callbacks (RHBZ #1118462) + +* Tue Jul 01 2014 Ken Dreyer - 1.6.0-0.8.20140621gita5adc06 +- Patch for parallel build failure in kadm5. Thanks Jakub Čajka. +- Remove comments about X11 binaries (we will never ship those). + +* Sun Jun 22 2014 Ken Dreyer - 1.6.0-0.7.20140621gita5adc06 +- Update git snapshot to latest tip of heimdal-1-6-branch + +* Sat Jun 07 2014 Ken Dreyer - 1.6.0-0.6.20140606git966108b +- Update git snapshot to latest tip of heimdal-1-6-branch +- Don't ship xinetd support if the distro has systemd (RHBZ #613001) + +* Fri May 30 2014 Ken Dreyer - 1.6.0-0.5.20140529gitddde77b +- Update git snapshot to latest tip of heimdal-1-6-branch +- Use /sbin path in %%pre/%%post scripts for EL6 and EL5 +- Install login.users(5) normally, since it doesn't conflict with anything + (RHBZ #613001) +- Don't ship ftpusers(5) (RHBZ #613001) +- Patch heimtools to deal with the commands' "heimdal-" prefixes (RHBZ #613001) +- Use "simple" systemd service type for kdc, kadmind, kpasswdd +- Add "--detach" flag in heimdal-ipropd-slave-wrapper to match the systemd + forking service type +- Patch kadmind to handle systemd's restrictions on setpgid() (RHBZ #613001) + +* Thu May 22 2014 Ken Dreyer - 1.6.0-0.4.20140522git229d8c7 +- Update git snapshot to latest tip of heimdal-1-6-branch +- Drop upstreamed text-fx patch +- Install Texinfo files (RHBZ #613001) +- Add Provides: heimdal-static to -devel subpackage (RHBZ #613001) +- Drop %%defattr (RHBZ #613001) +- Add text content to kadmind.acl to help users (and remove a zero-length file) +- Install profile.d scripts with non-executable permissions +- Remove .la files +- Patch to remove AC_PROG_LIBTOOL macro +- Reload xinetd when using systemd +- Require logrotate and setup, since we drop config files into directories that + these packages own. +- Add unowned Heimdal directories in %%files +- Replace "heimdal" with %%{name} in %%files +- Do not BR libcap-ng-devel on EL5 + +* Tue Apr 29 2014 Ken Dreyer - 1.6.0-0.3.20140429gitd60ba47 +- Add BR libdb-devel on Fedora (RHBZ #613001) +- Add BR openssl-devel and libcap-ng-devel (RHBZ #613001) +- Only set BuildRoot on el5 +- Alphabetize non-conditional BuildRequires +- Remove duplicate BR openldap-devel + +* Tue Apr 29 2014 Ken Dreyer - 1.6.0-0.2.20140326git7e6b55 +- Update git snapshot to latest tip of heimdal-1-6-branch +- Rename Source11 with "heimdal-" prefix +- Use newer macro for UnversionedDocdirs change + +* Mon Jan 06 2014 Ken Dreyer - 1.6.0-0.1.20140106git46a508 +- Package git snapshot from master branch + +* Wed Oct 16 2013 Ken Dreyer - 1.5.3-24.20130903gitb074e0b +- Disable autogen and parallel make on EL5 +- Add pregenerated autoconf tarball as Source1 +- Add script to pregenerate autoconf files as Source2 + +* Tue Sep 10 2013 Alexander Boström - 1.5.3-23.20130903gitb074e0b +- Fix build. (Problem with symlinks to kcc.) + +* Thu Sep 05 2013 Alexander Boström - 1.5.3-22.20130903gitb074e0b +- Rename rename kcc to heimdal-kcc (conflicts in el5 and fedora) +- Rename kswitch to heimdal-kswitch in el6 too + +* Tue Sep 03 2013 Alexander Boström - 1.5.3-21.20130903gitb074e0b +- Update to latest git snapshot of heimdal-1-5-branch +- remove upstreamed patch + +* Tue Sep 03 2013 Alexander Boström - 1.5.3-20.20130813gitdcc7c13 +- Split ipv6_loopbacks_fix.patch into one backport and one smaller change + +* Tue Aug 20 2013 Ken Dreyer - 1.5.3-19.20130813gitdcc7c13 +- Build against libedit instead of readline (avoid GPL entanglements) + +* Tue Aug 13 2013 Ken Dreyer - 1.5.3-18.20130813gitdcc7c13 +- Update to latest git snapshot of heimdal-1-5-branch +- remove upstreamed texinfo patches + +* Tue Aug 13 2013 Alexander Boström - 1.5.3-17.20130730gitd9b3691 +- remove workaround for bogus check-iprop check failure + +* Mon Aug 12 2013 Alexander Boström - 1.5.3-16.20130730gitd9b3691 +- buildreq groff on el6 and older +- remove most comments from sysconfig file +- systemd: only use /etc/sysconfig/heimdal to specify the iprop master + host, via a wrapper script +- systemd: use Type=forking +- make systemd the default, check for known sysv systems + +* Mon Aug 12 2013 Ken Dreyer - 1.5.3-15.20130812git29f0a90 +- Update to latest git snapshot of heimdal-1-5-branch + +* Mon Aug 12 2013 Alexander Boström - 1.5.3-14.20130730gitd9b3691 +- do not ghost files in owned directory + +* Mon Aug 12 2013 Alexander Boström - 1.5.3-13.20130730gitd9b3691 +- use global instead of define + +* Mon Aug 12 2013 Alexander Boström - 1.5.3-12.20130730gitd9b3691 +- add doc references to unit files + +* Mon Aug 12 2013 Alexander Boström - 1.5.3-11.20130730gitd9b3691 +- add missing req on xinetd +- remove slash after buildroot macro usage +- preserve timestamps of installed files +- move slaves config file to /etc +- no attributes on symlinks +- only ghost own the slave-stats file + +* Fri Aug 09 2013 Ken Dreyer - 1.5.3-10.20130730gitd9b3691 +- add systemd files and _with_systemd conditional +- remove "--detach" from sysconfig comments +- tweak kadmind service description +- add comments about texinfo patches + +* Fri Aug 09 2013 Alexander Boström - 1.5.3-9.20130730gitd9b3691 +- SysV scriptlets and initscript cleanups +- xinetd services ipv6 enabled + +* Thu Aug 08 2013 Ken Dreyer - 1.5.3-8.20130730gitd9b3691 +- Add Debian's texinfo patch to hx509, plus my own hacks for 5.1 + +* Thu Aug 08 2013 Ken Dreyer - 1.5.3-7.20130730gitd9b3691 +- Add missing groff buildreq on F19 and above +- Tweak Summary + +* Thu Aug 08 2013 Alexander Boström - 1.5.3-6 +- Add missing buildreqs + +* Thu Aug 08 2013 Alexander Boström - 1.5.3-5 +- Update to post 1.5.3 snapshot, deprecating a couple of patches +- Add autogen.sh and extra BRs, build fixes. + +* Thu Aug 08 2013 Alexander Boström - 1.5.3-4 +- No autoreconf +- More robust ?rhel macro usage +- BR libcom_err-devel instead of e2fsprogs-devel (but not on el5) +- el5 build fixes + +* Tue Aug 06 2013 Alexander Boström - 1.5.3-3 +- Add heimdal-des-key-selection.patch + +* Tue Aug 06 2013 Alexander Boström - 1.5.3-2 +- Use upstream tarball. +- Remove unused patches. +- Fix heimdal-kdc.conf +- Handle the case of no .mo files + +* Tue Aug 06 2013 Ken Dreyer - 1.5.3-1 +- Update to 1.5.3 (tag from Git) +- Use the find_lang macro to include the translation files +- Add Getopt patch in order to build with Fedora's newer Perl +- Adjust Group to satisfy rpmlint +- Remove macros from comments to satisfy rpmlint + +* Mon Jul 29 2013 Alexander Boström - 1.5.2-3.kth.19 +- really fix prefix munge patch +- fix texi build + +* Wed Jul 3 2013 Alexander Boström - 1.5.2-3.kth.18 +- fix prefix munge patch + +* Tue Jul 2 2013 Alexander Boström - 1.5.2-3.kth.17 +- rename kswitch to heimdal-kswitch (except on el6) + +* Tue Jul 2 2013 Alexander Boström - 1.5.2-3.kth.16 +- ignore missing otp binaries + +* Fri Jun 28 2013 Alexander Boström - 1.5.2-3.kth.15 +- fix license, fix macro-in-changelog + +* Fri Jun 28 2013 Alexander Boström - 1.5.2-3.kth.14 +- enable dns_lookup_realm and dns_lookup_kdc in the sample config file +- changed logrotate conf, postrotate should not be required +- add kdc.conf +- move kadmind.acl to sysconfdir + +* Thu Jun 27 2013 Alexander Boström - 1.5.2-3.kth.13 +- fix qop man symlink + +* Thu Jun 27 2013 Alexander Boström - 1.5.2-3.kth.12 +- workstation does not require xinetd +- fix paths in xinetd confs + +* Wed Jun 26 2013 Alexander Boström - 1.5.2-3.kth.11 +- fix symlinks + +* Wed Jun 26 2013 Alexander Boström - 1.5.2-3.kth.10 +- provide/obsolete heimdal-kdc + +* Wed Apr 10 2013 Alexander Boström - 1.5.2-3.kth.9 +- make PATH manipulation an optional subpackage + +* Wed Apr 10 2013 Alexander Boström - 1.5.2-3.kth.8 +- rename to heimdal-* instead of *.heimdal + +* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.7 +- split init script into multiple services + +* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.6 +- move su to the workstation subpkg + +* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.5 +- Add symlinks in the bin dir. + +* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.4 +- Reuse /etc/security/access.conf from PAM. + +* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.3 +- move daemon binaries to regular libexec dir, with executable name suffix + +* Mon Apr 8 2013 Alexander Boström - 1.5.2-3.kth.2 +- move binaries from /usr/lib64/heimdal/bin to /usr/lib/heimdal/bin + +* Mon Apr 8 2013 Alexander Boström - 1.5.2-3.kth.1 +- disable tests + +* Wed Jul 4 2012 Rok Papež, ARNES - 1.5.2-3 + - updated to upstream 1.5.2 + - added support for Fedora 17 + - fixed wrong PATH on x86_64 + - fixed IPv6 and multiple interfaces bug in krb5_parse_address: + https://bugzilla.redhat.com/show_bug.cgi?id=808147 + - added support for .heimdal prefix to kcc + +* Tue Oct 4 2011 Rok Papež, ARNES - 1.5.1-1 + - updated to upstream 1.5.1 + +* Tue Sep 27 2011 Rok Papež, ARNES - 1.5.1.pre20110912git-2 + - FESCo updates: https://fedorahosted.org/fesco/ticket/577 + - Implicit requires removed, rpmbuild can figure them out itself + - Implicit provides removed, we are NOT compatible with krb5 + - Enable hardened build: + https://fedoraproject.org/wiki/Packaging:Guidelines#PIE + https://fedoraproject.org/wiki/User:Kevin/DRAFT_When_to_use_PIE_compiler_flags + - Merged updates from Orion Poplawski + +* Mon Sep 12 2011 Rok Papež, ARNES - 1.5.1.pre20110912git-1.arnes + - Updated to Heimdal 1.5.1.pre20110912git + +* Tue Nov 30 2010 Rok Papež, ARNES - 1.4.1rc1-1.arnes + - Updated to Heimdal 1.4.1rc1 + +* Fri Jul 09 2010 Rok Papež, ARNES - 1.3.3-1.arnes + - Updated to Heimdal 1.3.3 + +* Wed Apr 21 2010 Rok Papež, ARNES - 1.3.2-2.arnes + - Updated to Heimdal 1.3.2 + +* Thu Sep 17 2009 Rok Papež, ARNES - 1.3.0pre9-1 + - Updated to Heimdal 1.3.0pre9 + - Building on CentOS 5.3 i386 and Fedora 11 x86_64. + +* Wed Jun 10 2009 Rok Papež, ARNES - 1.2.1-9 + - Fixed build for CentOS 4.7 (thanks to Nitzan Zaifman for bugreport) + +* Mon Jun 8 2009 Rok Papež, ARNES - 1.2.1-8 + - Fixed paths for building on CentOS 5.3 + - Rebuilt for CentOS 5.3 + - removed obsolete X11 dependency + +* Thu Feb 19 2009 Mitja Mihelic, ARNES - 1.2.1-7 + - added dependency on xinetd for heimdal-workstation + +* Tue Jan 20 2009 Rok Papež, ARNES + - Fixed permissions + +* Wed Oct 8 2008 Rok Papež, ARNES + - New specs for Heimdel 1.2.1, suggestions taken from both PDC and Mandrake specs file. + - Need to be compatible with MIT Kerberos 5 installation. + - Let MIT have priority diff --git a/heimdal.spec b/heimdal.spec index 32dd9ae..457b553 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -4,7 +4,7 @@ Name: heimdal Version: 7.8.0 -Release: 14%{?dist} +Release: %autorelease Summary: A Kerberos 5 implementation without export restrictions # Automatically converted from old format: BSD and MIT - review is highly recommended. License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT @@ -432,456 +432,4 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog -* Wed Mar 08 2023 Alexander Boström - 7.8.0-14 -- Add upstream patch for autoconf 2.72 - -* Sat Feb 01 2025 Björn Esser - 7.8.0-13 -- Add explicit BR: libxcrypt-devel - -* Mon Jan 20 2025 Fedora Release Engineering - 7.8.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Sep 02 2024 Miroslav Suchý - 7.8.0-11 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 7.8.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jan 24 2024 Fedora Release Engineering - 7.8.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 7.8.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 7.8.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Apr 13 2023 Florian Weimer - 7.8.0-6 -- Port configure script to C99 - -* Wed Mar 08 2023 Alexander Boström - 7.8.0-5 -- Remove conditionals prior to RHEL7 - -* Wed Mar 08 2023 Alexander Boström - 7.8.0-4 -- remove _with_systemd conditional -- remove unused source files - -* Wed Mar 08 2023 Alexander Boström - 7.8.0-3 -- Move libraries to a lib subdirectory -- Include pkgconfig files (#1525462) (#1565954) (#1931072) - -* Thu Jan 19 2023 Fedora Release Engineering - 7.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Nov 21 2022 Alexander Boström - 7.8.0-1 -- Update to 7.8.0 (#2143478) - -* Mon Nov 21 2022 Alexander Boström - 7.7.1-3 -- Restart services on upgrade - -* Mon Nov 21 2022 Alexander Boström - 7.7.1-2 -- Delay service starts until after network is online (rhbz#2005501) - -* Wed Nov 16 2022 Alexander Boström - 7.7.1-1 -- Update to 7.7.1 -- Remove upstreamed patch -- Replace patch with sed command - -* Thu Jul 21 2022 Fedora Release Engineering - 7.7.0-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 20 2022 Fedora Release Engineering - 7.7.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 7.7.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Apr 13 2021 Alexander Boström - 7.7.0-9 -- Backport autoconf-2.70 fix - -* Tue Jan 26 2021 Fedora Release Engineering - 7.7.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 7.7.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Mar 31 2020 Alexander Boström - 7.7.0-6 -- Do not buildrequire openldap-servers on RHEL8+ - -* Sat Mar 21 2020 Alexander Boström - 7.7.0-5 -- Add Python 3 code patch -- Use Python 3 binary path -- BuildRequire Python 3 - -* Wed Jan 29 2020 Fedora Release Engineering - 7.7.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Jeff Law - 7.7.0-3 -- Fix configure tests compromised by LTO - -* Sat Dec 21 2019 Alexander Boström - 7.7.0-2 -- Set timeout on make check - -* Fri Dec 20 2019 Alexander Boström - 7.7.0-1 -- Update to 7.7.0 -- Remove upstreamed patch -- New project URL -- Update buildreqs -- Add locale build fix - -* Thu Jul 25 2019 Fedora Release Engineering - 7.5.0-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 7.5.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jan 14 2019 Björn Esser - 7.5.0-7 -- Rebuilt for libcrypt.so.2 (#1666033) - -* Sun Jan 06 2019 Björn Esser - 7.5.0-6 -- Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) -- Do not run 'make dist', fixes FTBFS (#1604316) -- Make sure 'krb5-types.h' is build, fixes FTBFS (#1604316) -- Remove el5 bits -- Drop unneeded scriptlets for newer distros -- Use %%make_build and %%make_install macros -- Install license file using %%license in libs package - -* Fri Jul 13 2018 Fedora Release Engineering - 7.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Mar 15 2018 Iryna Shcherbina - 7.5.0-4 -- Update Python 2 dependency declarations to new packaging standards - (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) - -* Wed Feb 07 2018 Fedora Release Engineering - 7.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Sat Jan 20 2018 Björn Esser - 7.5.0-2 -- Rebuilt for switch to libxcrypt - -* Thu Dec 14 2017 Ken Dreyer - 7.5.0-1 -- Update to 7.5.0 GA release (CVE-2017-17439) - -* Mon Oct 23 2017 Alexander Boström - 7.4.0-5 -- Backport fix to prevent wait() loop on non-existant child process - -* Wed Aug 02 2017 Fedora Release Engineering - 7.4.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 7.4.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Jul 12 2017 Ken Dreyer - 7.4.0-2 -- Make test failures non-fatal - -* Tue Jul 11 2017 Ken Dreyer - 7.4.0-1 -- Update to 7.4.0 GA release (CVE-2017-11103) - -* Mon Apr 17 2017 Ken Dreyer - 7.3.0-1 -- Update to 7.3.0 GA release (CVE-2017-6594) - -* Fri Feb 10 2017 Fedora Release Engineering - 7.1.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Dec 29 2016 Ken Dreyer - 7.1.0-1 -- Update to 7.1.0 GA release -- Drop all remaining xinetd bits - -* Wed Feb 03 2016 Fedora Release Engineering - 1.6.0-0.13.20150115gitc25f45a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Aug 10 2015 Ken Dreyer - 1.6.0-0.12.20150115gitc25f45a -- Fix ld.so.conf.d file conflict between 32-bit and 64-bit packages - (rhbz#1244316) -- Mark ld.so.conf.d as %%config(noreplace) - -* Wed Jun 17 2015 Fedora Release Engineering - 1.6.0-0.11.20150115gitc25f45a -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu Jan 15 2015 Ken Dreyer - 1.6.0-0.10.20150115gitc25f45a -- Update git snapshot to latest tip of heimdal-1-6-branch -- Remove upstreamed patches -- Add virtual provides for bundled(libtommath) (RHBZ #1118462) - -* Sat Aug 16 2014 Fedora Release Engineering - 1.6.0-0.10.20140621gita5adc06 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Mon Jul 07 2014 Ken Dreyer - 1.6.0-0.9.20140621gita5adc06 -- Remove OpenSSL BR and go back to using hcrypto with bundled libtommath. - OpenSSL is not thread safe without callbacks (RHBZ #1118462) - -* Tue Jul 01 2014 Ken Dreyer - 1.6.0-0.8.20140621gita5adc06 -- Patch for parallel build failure in kadm5. Thanks Jakub Čajka. -- Remove comments about X11 binaries (we will never ship those). - -* Sun Jun 22 2014 Ken Dreyer - 1.6.0-0.7.20140621gita5adc06 -- Update git snapshot to latest tip of heimdal-1-6-branch - -* Sat Jun 07 2014 Ken Dreyer - 1.6.0-0.6.20140606git966108b -- Update git snapshot to latest tip of heimdal-1-6-branch -- Don't ship xinetd support if the distro has systemd (RHBZ #613001) - -* Fri May 30 2014 Ken Dreyer - 1.6.0-0.5.20140529gitddde77b -- Update git snapshot to latest tip of heimdal-1-6-branch -- Use /sbin path in %%pre/%%post scripts for EL6 and EL5 -- Install login.users(5) normally, since it doesn't conflict with anything - (RHBZ #613001) -- Don't ship ftpusers(5) (RHBZ #613001) -- Patch heimtools to deal with the commands' "heimdal-" prefixes (RHBZ #613001) -- Use "simple" systemd service type for kdc, kadmind, kpasswdd -- Add "--detach" flag in heimdal-ipropd-slave-wrapper to match the systemd - forking service type -- Patch kadmind to handle systemd's restrictions on setpgid() (RHBZ #613001) - -* Thu May 22 2014 Ken Dreyer - 1.6.0-0.4.20140522git229d8c7 -- Update git snapshot to latest tip of heimdal-1-6-branch -- Drop upstreamed text-fx patch -- Install Texinfo files (RHBZ #613001) -- Add Provides: heimdal-static to -devel subpackage (RHBZ #613001) -- Drop %%defattr (RHBZ #613001) -- Add text content to kadmind.acl to help users (and remove a zero-length file) -- Install profile.d scripts with non-executable permissions -- Remove .la files -- Patch to remove AC_PROG_LIBTOOL macro -- Reload xinetd when using systemd -- Require logrotate and setup, since we drop config files into directories that - these packages own. -- Add unowned Heimdal directories in %%files -- Replace "heimdal" with %%{name} in %%files -- Do not BR libcap-ng-devel on EL5 - -* Tue Apr 29 2014 Ken Dreyer - 1.6.0-0.3.20140429gitd60ba47 -- Add BR libdb-devel on Fedora (RHBZ #613001) -- Add BR openssl-devel and libcap-ng-devel (RHBZ #613001) -- Only set BuildRoot on el5 -- Alphabetize non-conditional BuildRequires -- Remove duplicate BR openldap-devel - -* Tue Apr 29 2014 Ken Dreyer - 1.6.0-0.2.20140326git7e6b55 -- Update git snapshot to latest tip of heimdal-1-6-branch -- Rename Source11 with "heimdal-" prefix -- Use newer macro for UnversionedDocdirs change - -* Mon Jan 06 2014 Ken Dreyer - 1.6.0-0.1.20140106git46a508 -- Package git snapshot from master branch - -* Wed Oct 16 2013 Ken Dreyer - 1.5.3-24.20130903gitb074e0b -- Disable autogen and parallel make on EL5 -- Add pregenerated autoconf tarball as Source1 -- Add script to pregenerate autoconf files as Source2 - -* Tue Sep 10 2013 Alexander Boström - 1.5.3-23.20130903gitb074e0b -- Fix build. (Problem with symlinks to kcc.) - -* Thu Sep 05 2013 Alexander Boström - 1.5.3-22.20130903gitb074e0b -- Rename rename kcc to heimdal-kcc (conflicts in el5 and fedora) -- Rename kswitch to heimdal-kswitch in el6 too - -* Tue Sep 03 2013 Alexander Boström - 1.5.3-21.20130903gitb074e0b -- Update to latest git snapshot of heimdal-1-5-branch -- remove upstreamed patch - -* Tue Sep 03 2013 Alexander Boström - 1.5.3-20.20130813gitdcc7c13 -- Split ipv6_loopbacks_fix.patch into one backport and one smaller change - -* Tue Aug 20 2013 Ken Dreyer - 1.5.3-19.20130813gitdcc7c13 -- Build against libedit instead of readline (avoid GPL entanglements) - -* Tue Aug 13 2013 Ken Dreyer - 1.5.3-18.20130813gitdcc7c13 -- Update to latest git snapshot of heimdal-1-5-branch -- remove upstreamed texinfo patches - -* Tue Aug 13 2013 Alexander Boström - 1.5.3-17.20130730gitd9b3691 -- remove workaround for bogus check-iprop check failure - -* Mon Aug 12 2013 Alexander Boström - 1.5.3-16.20130730gitd9b3691 -- buildreq groff on el6 and older -- remove most comments from sysconfig file -- systemd: only use /etc/sysconfig/heimdal to specify the iprop master - host, via a wrapper script -- systemd: use Type=forking -- make systemd the default, check for known sysv systems - -* Mon Aug 12 2013 Ken Dreyer - 1.5.3-15.20130812git29f0a90 -- Update to latest git snapshot of heimdal-1-5-branch - -* Mon Aug 12 2013 Alexander Boström - 1.5.3-14.20130730gitd9b3691 -- do not ghost files in owned directory - -* Mon Aug 12 2013 Alexander Boström - 1.5.3-13.20130730gitd9b3691 -- use global instead of define - -* Mon Aug 12 2013 Alexander Boström - 1.5.3-12.20130730gitd9b3691 -- add doc references to unit files - -* Mon Aug 12 2013 Alexander Boström - 1.5.3-11.20130730gitd9b3691 -- add missing req on xinetd -- remove slash after buildroot macro usage -- preserve timestamps of installed files -- move slaves config file to /etc -- no attributes on symlinks -- only ghost own the slave-stats file - -* Fri Aug 09 2013 Ken Dreyer - 1.5.3-10.20130730gitd9b3691 -- add systemd files and _with_systemd conditional -- remove "--detach" from sysconfig comments -- tweak kadmind service description -- add comments about texinfo patches - -* Fri Aug 09 2013 Alexander Boström - 1.5.3-9.20130730gitd9b3691 -- SysV scriptlets and initscript cleanups -- xinetd services ipv6 enabled - -* Thu Aug 08 2013 Ken Dreyer - 1.5.3-8.20130730gitd9b3691 -- Add Debian's texinfo patch to hx509, plus my own hacks for 5.1 - -* Thu Aug 08 2013 Ken Dreyer - 1.5.3-7.20130730gitd9b3691 -- Add missing groff buildreq on F19 and above -- Tweak Summary - -* Thu Aug 08 2013 Alexander Boström - 1.5.3-6 -- Add missing buildreqs - -* Thu Aug 08 2013 Alexander Boström - 1.5.3-5 -- Update to post 1.5.3 snapshot, deprecating a couple of patches -- Add autogen.sh and extra BRs, build fixes. - -* Thu Aug 08 2013 Alexander Boström - 1.5.3-4 -- No autoreconf -- More robust ?rhel macro usage -- BR libcom_err-devel instead of e2fsprogs-devel (but not on el5) -- el5 build fixes - -* Tue Aug 06 2013 Alexander Boström - 1.5.3-3 -- Add heimdal-des-key-selection.patch - -* Tue Aug 06 2013 Alexander Boström - 1.5.3-2 -- Use upstream tarball. -- Remove unused patches. -- Fix heimdal-kdc.conf -- Handle the case of no .mo files - -* Tue Aug 06 2013 Ken Dreyer - 1.5.3-1 -- Update to 1.5.3 (tag from Git) -- Use the find_lang macro to include the translation files -- Add Getopt patch in order to build with Fedora's newer Perl -- Adjust Group to satisfy rpmlint -- Remove macros from comments to satisfy rpmlint - -* Mon Jul 29 2013 Alexander Boström - 1.5.2-3.kth.19 -- really fix prefix munge patch -- fix texi build - -* Wed Jul 3 2013 Alexander Boström - 1.5.2-3.kth.18 -- fix prefix munge patch - -* Tue Jul 2 2013 Alexander Boström - 1.5.2-3.kth.17 -- rename kswitch to heimdal-kswitch (except on el6) - -* Tue Jul 2 2013 Alexander Boström - 1.5.2-3.kth.16 -- ignore missing otp binaries - -* Fri Jun 28 2013 Alexander Boström - 1.5.2-3.kth.15 -- fix license, fix macro-in-changelog - -* Fri Jun 28 2013 Alexander Boström - 1.5.2-3.kth.14 -- enable dns_lookup_realm and dns_lookup_kdc in the sample config file -- changed logrotate conf, postrotate should not be required -- add kdc.conf -- move kadmind.acl to sysconfdir - -* Thu Jun 27 2013 Alexander Boström - 1.5.2-3.kth.13 -- fix qop man symlink - -* Thu Jun 27 2013 Alexander Boström - 1.5.2-3.kth.12 -- workstation does not require xinetd -- fix paths in xinetd confs - -* Wed Jun 26 2013 Alexander Boström - 1.5.2-3.kth.11 -- fix symlinks - -* Wed Jun 26 2013 Alexander Boström - 1.5.2-3.kth.10 -- provide/obsolete heimdal-kdc - -* Wed Apr 10 2013 Alexander Boström - 1.5.2-3.kth.9 -- make PATH manipulation an optional subpackage - -* Wed Apr 10 2013 Alexander Boström - 1.5.2-3.kth.8 -- rename to heimdal-* instead of *.heimdal - -* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.7 -- split init script into multiple services - -* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.6 -- move su to the workstation subpkg - -* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.5 -- Add symlinks in the bin dir. - -* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.4 -- Reuse /etc/security/access.conf from PAM. - -* Tue Apr 9 2013 Alexander Boström - 1.5.2-3.kth.3 -- move daemon binaries to regular libexec dir, with executable name suffix - -* Mon Apr 8 2013 Alexander Boström - 1.5.2-3.kth.2 -- move binaries from /usr/lib64/heimdal/bin to /usr/lib/heimdal/bin - -* Mon Apr 8 2013 Alexander Boström - 1.5.2-3.kth.1 -- disable tests - -* Wed Jul 4 2012 Rok Papež, ARNES - 1.5.2-3 - - updated to upstream 1.5.2 - - added support for Fedora 17 - - fixed wrong PATH on x86_64 - - fixed IPv6 and multiple interfaces bug in krb5_parse_address: - https://bugzilla.redhat.com/show_bug.cgi?id=808147 - - added support for .heimdal prefix to kcc - -* Tue Oct 4 2011 Rok Papež, ARNES - 1.5.1-1 - - updated to upstream 1.5.1 - -* Tue Sep 27 2011 Rok Papež, ARNES - 1.5.1.pre20110912git-2 - - FESCo updates: https://fedorahosted.org/fesco/ticket/577 - - Implicit requires removed, rpmbuild can figure them out itself - - Implicit provides removed, we are NOT compatible with krb5 - - Enable hardened build: - https://fedoraproject.org/wiki/Packaging:Guidelines#PIE - https://fedoraproject.org/wiki/User:Kevin/DRAFT_When_to_use_PIE_compiler_flags - - Merged updates from Orion Poplawski - -* Mon Sep 12 2011 Rok Papež, ARNES - 1.5.1.pre20110912git-1.arnes - - Updated to Heimdal 1.5.1.pre20110912git - -* Tue Nov 30 2010 Rok Papež, ARNES - 1.4.1rc1-1.arnes - - Updated to Heimdal 1.4.1rc1 - -* Fri Jul 09 2010 Rok Papež, ARNES - 1.3.3-1.arnes - - Updated to Heimdal 1.3.3 - -* Wed Apr 21 2010 Rok Papež, ARNES - 1.3.2-2.arnes - - Updated to Heimdal 1.3.2 - -* Thu Sep 17 2009 Rok Papež, ARNES - 1.3.0pre9-1 - - Updated to Heimdal 1.3.0pre9 - - Building on CentOS 5.3 i386 and Fedora 11 x86_64. - -* Wed Jun 10 2009 Rok Papež, ARNES - 1.2.1-9 - - Fixed build for CentOS 4.7 (thanks to Nitzan Zaifman for bugreport) - -* Mon Jun 8 2009 Rok Papež, ARNES - 1.2.1-8 - - Fixed paths for building on CentOS 5.3 - - Rebuilt for CentOS 5.3 - - removed obsolete X11 dependency - -* Thu Feb 19 2009 Mitja Mihelic, ARNES - 1.2.1-7 - - added dependency on xinetd for heimdal-workstation - -* Tue Jan 20 2009 Rok Papež, ARNES - - Fixed permissions - -* Wed Oct 8 2008 Rok Papež, ARNES - - New specs for Heimdel 1.2.1, suggestions taken from both PDC and Mandrake specs file. - - Need to be compatible with MIT Kerberos 5 installation. - - Let MIT have priority +%autochangelog From a2513dfe4b16a80f29f4e6367a6c81979ad7d54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Wed, 4 Jun 2025 22:19:47 +0200 Subject: [PATCH 54/62] Remove conditionals prior to RHEL8 --- heimdal.spec | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index 457b553..1937811 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -40,7 +40,7 @@ BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: openldap-devel #Required for tests/ldap -%if (0%{?rhel} && 0%{?rhel} > 7) +%if (0%{?rhel}) # but not available on RHEL 8 %else BuildRequires: openldap-servers @@ -283,20 +283,6 @@ ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz %systemd_postun_with_restart heimdal-kadmind.service %systemd_postun_with_restart heimdal-kpasswdd.service -%if (0%{?rhel} && 0%{?rhel} < 8) -%post libs -/sbin/ldconfig -/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : - -%preun libs -if [ $1 = 0 ] ; then - /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : -fi - -%postun libs -/sbin/ldconfig -%endif - %files libs -f %{name}.lang %dir %{exec_prefix} %dir %{exec_prefix}/bin From 85127810bc2b9c12bb81c0908d950571518aa949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Wed, 4 Jun 2025 22:20:16 +0200 Subject: [PATCH 55/62] Remove compatibility prior to RHEL8 --- heimdal.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index 1937811..090d0c4 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -63,11 +63,6 @@ BuildRequires: libxcrypt-devel # Bundled libtommath (https://bugzilla.redhat.com/1118462) Provides: bundled(libtommath) = 0.42.0 -# This macro was added in Fedora 20. Use the old version if it's undefined -# on older Fedoras and RHELs prior to RHEL 8. -# https://fedoraproject.org/wiki/Changes/UnversionedDocdirs -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - %description Kerberos 5 is a network authentication and single sign-on system. Heimdal is a free Kerberos 5 implementation without export restrictions From 6ae8987ff31e26519f6f4b0089b9383e19717967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Fri, 6 Jun 2025 15:08:03 +0200 Subject: [PATCH 56/62] Move static libraries to a separate subpackage --- heimdal.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index 090d0c4..ce04ccc 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -106,12 +106,19 @@ Heimdal packages. %package devel Summary: Header and other development files for Heimdal kerberos -Provides: %{name}-static = %{version}-%{release} %description devel Contains files needed to compile and link software using the Heimdal kerberos headers/libraries. +%package static +Summary: Static libraries for Heimdal kerberos +Requires: %{name}-devel = %{version}-%{release} + +%description static +Contains files needed to statically link software using the Heimdal +kerberos headers/libraries. + %package path Summary: Heimdal kerberos PATH manipulation Requires: %{name}-libs @@ -397,9 +404,7 @@ ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz %{exec_prefix}/bin/krb5-config %{_mandir}/man1/%{name}-krb5-config.1* %{_includedir}/* -%{prefix}/lib/lib*.a %{prefix}/lib/lib*.so -%{prefix}/lib/windc.a %{prefix}/lib/windc.so %{_mandir}/man3/* %{_mandir}/man7/* @@ -408,6 +413,10 @@ ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz %{_libexecdir}/%{name}/slc %{prefix}/lib/pkgconfig/*.pc +%files static +%{prefix}/lib/lib*.a +%{prefix}/lib/windc.a + %files path %{_sysconfdir}/profile.d/%{name}.sh %{_sysconfdir}/profile.d/%{name}.csh From b20565f6271712051231ad22c1f13c45a6c1a6d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sun, 6 Jul 2025 18:32:40 +0200 Subject: [PATCH 57/62] Deduplicate man3 files --- heimdal.spec | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/heimdal.spec b/heimdal.spec index ce04ccc..e1cd606 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -262,6 +262,20 @@ mv %{buildroot}%{_mandir}/man5/{,%{name}-}krb5.conf.5 rm %{buildroot}%{_mandir}/man5/qop.5 ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz +sha256sum %{buildroot}%{_mandir}/man3/*.3 | sort >man3hash +firsthash="X"; firstname="X" +while read hash path; do + name="${path##*/}" + if [ "$hash" != "$firsthash" ]; then + firsthash="$hash" + firstname="${path##*/}" + else + rm "$path" + ln -s "$firstname".gz "$path".gz + fi +done Date: Sun, 6 Jul 2025 18:33:37 +0200 Subject: [PATCH 58/62] Run make check with -j1 --- heimdal.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index e1cd606..1e2e8b5 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -176,9 +176,7 @@ touch po/localefiles %make_build -C po mo %check -# Several intermittent test failures here, so make this non-fatal: -# (timeout to debug hard to reproduce stuck build) -timeout 20m %make_build check || : +%make_build -j1 check %install %make_install From 48d6ff9ffd7fed1e5b54ec956d667434775ac0ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sun, 6 Jul 2025 20:12:17 +0200 Subject: [PATCH 59/62] Backport upstream patch: Fix check-ldap slapd start race --- heimdal-7.8.0-e93a1357-slapdtest.patch | 31 ++++++++++++++++++++++++++ heimdal.spec | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 heimdal-7.8.0-e93a1357-slapdtest.patch diff --git a/heimdal-7.8.0-e93a1357-slapdtest.patch b/heimdal-7.8.0-e93a1357-slapdtest.patch new file mode 100644 index 0000000..8faa4e8 --- /dev/null +++ b/heimdal-7.8.0-e93a1357-slapdtest.patch @@ -0,0 +1,31 @@ +From e93a13576532db5d46b365b73829e6c1600d48ff Mon Sep 17 00:00:00 2001 +From: Nicolas Williams +Date: Thu, 27 Dec 2018 13:32:46 -0600 +Subject: [PATCH] Fix check-ldap slapd start race + +We start slapd in the foreground (-d0) but backgrounded in the shell, +then we wait 4 seconds. This causes a race condition however. This +commit makes the slapd-init script more robust and limits the wait to +however many seconds (up to 30) that slapd needs to start service. + +diff --git a/tests/ldap/slapd-init.in b/tests/ldap/slapd-init.in +index a3975aa67..f6e9fe93a 100644 +--- a/tests/ldap/slapd-init.in ++++ b/tests/ldap/slapd-init.in +@@ -44,5 +44,15 @@ cp "`which slapd`" . || true # fails if running + + echo "starting slapd" + ./slapd -d0 -f "${srcdir}/slapd.conf" -h ldapi://.%2Fldap-socket & ++slapd_pid=$! ++ ++tries=0 ++while kill -0 $slapd_pid && [ ! -S ldap-socket ] && ++ ! ldapsearch -l 2 -w '' -D '' -b "o=TEST,dc=H5L,dc=SE" -s base -H ldapi://.%2Fldap-socket >/dev/null && ++ [ $tries -lt 30 ]; do ++ sleep 1 ++ tries=`expr 1 + $tries` ++done + +-sleep 4 ++kill -0 $slapd_pid || exit 1 ++[ -S ldap-socket ] || exit 1 diff --git a/heimdal.spec b/heimdal.spec index 1e2e8b5..b2c070a 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -31,6 +31,7 @@ Patch4: heimdal-7.7.0-configure.patch Patch5: heimdal-7.7.0-58c8ad96-py3.patch Patch6: heimdal-configure-c99.patch Patch7: heimdal-7.8.0-1b57b62d-ac272.patch +Patch8: heimdal-7.8.0-e93a1357-slapdtest.patch BuildRequires: gettext BuildRequires: bison @@ -136,6 +137,7 @@ PATH. %patch -P5 -p1 -b .2to3 %patch -P6 -p1 %patch -P7 -p1 +%patch -P8 -p1 for f in lib/*/*.py; do sed -i "$f" -re 's,^#!/usr/(local/|)bin/python,#!/usr/bin/python3,' From e1a2c457c9cae8059cb0e2f402b36cb866f05d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Sun, 6 Jul 2025 20:58:24 +0200 Subject: [PATCH 60/62] Disable failing check-slapd --- heimdal.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/heimdal.spec b/heimdal.spec index b2c070a..ccb92a6 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -143,6 +143,9 @@ for f in lib/*/*.py; do sed -i "$f" -re 's,^#!/usr/(local/|)bin/python,#!/usr/bin/python3,' done +# FIXME check-slapd fails +for f in tests/Makefile.{in,am}; do sed -i $f -re 's, ldap , ,'; done + ./autogen.sh %build From 0502ce5abee0c77c108db8bf68f3655c39f32376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Bostr=C3=B6m?= Date: Mon, 7 Jul 2025 20:42:11 +0200 Subject: [PATCH 61/62] Migrated SPDX license tag from LicenseRef-Callaway-* --- heimdal.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/heimdal.spec b/heimdal.spec index ccb92a6..ccf485b 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -6,8 +6,8 @@ Name: heimdal Version: 7.8.0 Release: %autorelease Summary: A Kerberos 5 implementation without export restrictions -# Automatically converted from old format: BSD and MIT - review is highly recommended. -License: LicenseRef-Callaway-BSD AND LicenseRef-Callaway-MIT +# Tracked at https://github.com/abstrm/heimdal/blob/heimdal-7.8.0-spdx/doc/copyright.texi +License: BSD-2-Clause AND BSD-3-Clause AND HPND-export-US AND HPND-export2-US AND LicenseRef-Fedora-Public-Domain URL: http://www.heimdal.software/heimdal Source0: https://github.com/%{name}/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz Source3: %{name}.sysconfig From 30dab138351a5947076461c232e25f12fb7ae62b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 16:57:43 +0000 Subject: [PATCH 62/62] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild