Compare commits

..

74 commits

Author SHA1 Message Date
Fedora Release Engineering
30dab13835 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 16:57:43 +00:00
Alexander Boström
0502ce5abe Migrated SPDX license tag from LicenseRef-Callaway-* 2025-07-07 20:42:11 +02:00
Alexander Boström
e1a2c457c9 Disable failing check-slapd 2025-07-06 21:02:18 +02:00
Alexander Boström
48d6ff9ffd Backport upstream patch: Fix check-ldap slapd start race 2025-07-06 21:02:12 +02:00
Alexander Boström
34d27af06a Run make check with -j1 2025-07-06 18:57:35 +02:00
Alexander Boström
b20565f627 Deduplicate man3 files 2025-07-06 18:57:29 +02:00
Alexander Boström
6ae8987ff3 Move static libraries to a separate subpackage 2025-07-06 17:11:26 +02:00
Alexander Boström
85127810bc Remove compatibility prior to RHEL8 2025-06-04 22:20:16 +02:00
Alexander Boström
a2513dfe4b Remove conditionals prior to RHEL8 2025-06-04 22:19:47 +02:00
Alexander Boström
fadb71703b Convert to %autorelease and %autochangelog
[skip changelog]
2025-06-04 22:16:17 +02:00
Alexander Boström
866928d33b Add upstream patch for autoconf 2.72 2025-06-04 22:15:56 +02:00
Björn Esser
ea01676f30
Add explicit BR: libxcrypt-devel
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
2025-02-01 19:54:36 +01:00
Fedora Release Engineering
6758147f2f Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-20 07:28:21 +00:00
Miroslav Suchý
d29fb6498e convert license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-09-02 08:43:11 +02:00
Fedora Release Engineering
0082205083 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 09:10:37 +00:00
Software Management Team
c7421dc24b Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:47 +02:00
Fedora Release Engineering
b8b4396f07 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-24 21:35:57 +00:00
Fedora Release Engineering
a09d1e2986 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-20 22:02:06 +00:00
Fedora Release Engineering
75998ab1d1 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 06:13:37 +00:00
Florian Weimer
a37b5d8b10 Port configure script to C99
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2023-04-13 13:29:14 +02:00
Alexander Boström
32e796347b Merge in missing history... 2023-03-08 17:15:51 +01:00
Alexander Boström
a6bee7d6e0 Remove conditionals prior to RHEL7 2023-03-08 17:14:34 +01:00
Alexander Boström
5b91e8048b Packaging cleanup
- remove obsolete _with_systemd conditional
- remove unused source files
2023-03-08 17:14:34 +01:00
Alexander Boström
9c74d75349 Packaging fixes
- Move libraries to a lib subdirectory
- Include pkgconfig files (#1525462) (#1565954) (#1931072)
2023-03-08 17:14:30 +01:00
Alexander Boström
09dc64a666 Packaging fixes
- Move libraries to a lib subdirectory
- Include pkgconfig files (#1525462) (#1565954) (#1931072)
2023-03-08 15:58:31 +01:00
Fedora Release Engineering
817968babc Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 12:04:28 +00:00
Alexander Boström
65647b989f Update to 7.8.0 (#2143478) 2022-11-21 16:44:06 +01:00
Alexander Boström
8f4386d212 Restart services on upgrade 2022-11-21 10:32:54 +01:00
Alexander Boström
341e18baf1 Delay service starts until after network is online (rhbz#2005501) 2022-11-21 09:28:10 +01:00
Alexander Boström
12fd500368 Update to 7.7.1
Also
- Remove upstreamed patch
- Replace patch with sed command
2022-11-16 17:59:15 +01:00
Fedora Release Engineering
9a37f9c4a3 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 13:34:18 +00:00
Fedora Release Engineering
2d7622d0db - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 12:16:50 +00:00
Fedora Release Engineering
08b54b83ee - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 07:34:02 +00:00
Alexander Boström
a0465a4796 Backport autoconf-2.70 fix 2021-04-13 23:29:15 +02:00
Fedora Release Engineering
7fe4836100 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 13:25:19 +00:00
Tom Stellard
18f9d64aef Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-05 05:30:46 +00:00
Fedora Release Engineering
b1bf433ee7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 00:49:43 +00:00
Alexander Boström
8d4428f6f9 Do not buildrequire openldap-servers on RHEL8+ 2020-03-31 09:56:50 +02:00
Alexander Boström
9e2fadea13 Switch to Python 3 for building 2020-03-21 19:35:25 +01:00
Fedora Release Engineering
53b1a2c27f - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 04:12:34 +00:00
Jeff Law
2553f1aec2 - Fix configure tests compromised by LTO 2020-01-17 12:01:54 -07:00
Alexander Boström
50ae2a310d add timeout to make check 2019-12-21 11:28:01 +01:00
Alexander Boström
efea2f6787 Update to 7.7.0
Also
- Remove upstreamed patch
- New project URL
- Update buildreqs
- Add locale build fix
2019-12-21 00:07:55 +01:00
Fedora Release Engineering
c49870996e - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 08:22:18 +00:00
Fedora Release Engineering
41d36afb3c - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 02:11:44 +00:00
Björn Esser
b16e064c02
Rebuilt for libcrypt.so.2 (#1666033) 2019-01-14 19:03:51 +01:00
Björn Esser
f3cece45bd
Install license file using %%license in libs package 2019-01-06 18:45:30 +01:00
Björn Esser
14ca2a48b1
Make sure 'krb5-types.h' is build, fixes FTBFS (#1604316) 2019-01-06 18:45:25 +01:00
Björn Esser
0e460978d5
Do not run 'make dist', fixes FTBFS (#1604316) 2019-01-06 18:44:59 +01:00
Björn Esser
5ea4c092a6
Use %%make_build and %%make_install macros 2019-01-06 18:33:53 +01:00
Björn Esser
42645bca27
Drop unneeded scriptlets for newer distros 2019-01-06 18:33:53 +01:00
Björn Esser
18c1802bad
Remove el5 bits 2019-01-06 18:33:52 +01:00
Björn Esser
993b86bad8
Add patch to explicitly use python2 binary, fixes FTBFS (#1604316) 2019-01-06 18:14:44 +01:00
Fedora Release Engineering
59ec01b366 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 04:55:27 +00:00
Iryna Shcherbina
c804cde4f4 Update Python 2 dependency declarations to new packaging standards 2018-03-15 04:46:08 +01:00
Igor Gnatenko
92f1a87d40
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 <ignatenkobrain@fedoraproject.org>
2018-02-14 07:15:07 +01:00
Igor Gnatenko
f96f948670 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 <ignatenkobrain@fedoraproject.org>
2018-02-13 23:30:14 +01:00
Fedora Release Engineering
84ed5706cb - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 16:12:23 +00:00
Björn Esser
ef03dbc07a
Rebuilt for switch to libxcrypt 2018-01-20 23:06:53 +01:00
Ken Dreyer
e6b3cefd86 Update to 7.5.0 GA release 2017-12-14 08:47:11 -07:00
Alexander Boström
ea6faf4f42 Backport fix to prevent wait() loop on non-existant child process 2017-10-23 08:36:23 +00:00
Fedora Release Engineering
8635a601e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-02 23:25:40 +00:00
Fedora Release Engineering
26c7841752 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 12:36:55 +00:00
Ken Dreyer
dc95922ab6 Make test failures non-fatal 2017-07-12 09:01:02 -06:00
Ken Dreyer
e629c2164c fix older 7.4.0 changelog
bad copy & paste, whoops
2017-07-12 09:00:33 -06:00
Ken Dreyer
ee3eace3a8 Update to 7.3.0 GA release 2017-07-11 11:50:16 -06:00
Ken Dreyer
fee7f79fe1 Update to 7.3.0 GA release (CVE-2017-6594) 2017-04-17 12:21:54 -06:00
Fedora Release Engineering
cd96aca2b7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 12:35:45 +00:00
Ken Dreyer
ce0bf9b867 Update to 7.1.0 GA release
Changelog:
- Update to 7.1.0 GA release
- Drop all remaining xinetd bits
2016-12-29 12:36:52 -07:00
Dennis Gilmore
db6edbc0e5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-03 23:45:18 +00:00
Ken Dreyer
3df783c75d Fix ld.so.conf.d file conflict
between 32-bit and 64-bit packages

(... and mark it as noreplace)

Resolves: rhbz#1244316
2015-08-10 10:36:18 -06:00
Dennis Gilmore
14248f0ad6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 10:22:17 +00:00
Ken Dreyer
85acad51be Update git snapshot to latest tip of heimdal-1-6-branch
- Remove upstreamed patches
- Add virtual provides for bundled(libtommath) (RHBZ #1118462)
2015-01-15 10:13:41 -07:00
Peter Robinson
299a9e4704 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-16 20:21:39 +00:00
30 changed files with 1025 additions and 1444 deletions

13
.gitignore vendored
View file

@ -1,2 +1,11 @@
/heimdal-1.6.0-a5adc06.tar.gz
/heimdal-a5adc06-autoconf.tar.gz
/heimdal-7.1.0-7195232.tar.gz
/heimdal-7195232-autoconf.tar.gz
/heimdal-7.3.0-40d4229.tar.gz
/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
/heimdal-7.7.0.tar.gz
/heimdal-7.7.1.tar.gz
/heimdal-7.8.0.tar.gz

453
changelog Normal file
View file

@ -0,0 +1,453 @@
* Wed Mar 08 2023 Alexander Boström <abo@root.snowtree.se> - 7.8.0-14
- Add upstream patch for autoconf 2.72
* Sat Feb 01 2025 Björn Esser <besser82@fedoraproject.org> - 7.8.0-13
- Add explicit BR: libxcrypt-devel
* Mon Jan 20 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Mon Sep 02 2024 Miroslav Suchý <msuchy@redhat.com> - 7.8.0-11
- convert license to SPDX
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Apr 13 2023 Florian Weimer <fweimer@redhat.com> - 7.8.0-6
- Port configure script to C99
* Wed Mar 08 2023 Alexander Boström <abo@root.snowtree.se> - 7.8.0-5
- Remove conditionals prior to RHEL7
* Wed Mar 08 2023 Alexander Boström <abo@root.snowtree.se> - 7.8.0-4
- remove _with_systemd conditional
- remove unused source files
* Wed Mar 08 2023 Alexander Boström <abo@root.snowtree.se> - 7.8.0-3
- Move libraries to a lib subdirectory
- Include pkgconfig files (#1525462) (#1565954) (#1931072)
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Mon Nov 21 2022 Alexander Boström <abo@root.snowtree.se> - 7.8.0-1
- Update to 7.8.0 (#2143478)
* Mon Nov 21 2022 Alexander Boström <abo@root.snowtree.se> - 7.7.1-3
- Restart services on upgrade
* Mon Nov 21 2022 Alexander Boström <abo@root.snowtree.se> - 7.7.1-2
- Delay service starts until after network is online (rhbz#2005501)
* Wed Nov 16 2022 Alexander Boström <abo@root.snowtree.se> - 7.7.1-1
- Update to 7.7.1
- Remove upstreamed patch
- Replace patch with sed command
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.7.0-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 7.7.0-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.7.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Apr 13 2021 Alexander Boström <abo@root.snowtree.se> - 7.7.0-9
- Backport autoconf-2.70 fix
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.7.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.7.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Mar 31 2020 Alexander Boström <abo@root.snowtree.se> - 7.7.0-6
- Do not buildrequire openldap-servers on RHEL8+
* Sat Mar 21 2020 Alexander Boström <abo@root.snowtree.se> - 7.7.0-5
- Add Python 3 code patch
- Use Python 3 binary path
- BuildRequire Python 3
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.7.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Jan 17 2020 Jeff Law <law@redhat.com> - 7.7.0-3
- Fix configure tests compromised by LTO
* Sat Dec 21 2019 Alexander Boström <abo@root.snowtree.se> - 7.7.0-2
- Set timeout on make check
* Fri Dec 20 2019 Alexander Boström <abo@root.snowtree.se> - 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 <releng@fedoraproject.org> - 7.5.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.5.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Jan 14 2019 Björn Esser <besser82@fedoraproject.org> - 7.5.0-7
- Rebuilt for libcrypt.so.2 (#1666033)
* Sun Jan 06 2019 Björn Esser <besser82@fedoraproject.org> - 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 <releng@fedoraproject.org> - 7.5.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Mar 15 2018 Iryna Shcherbina <ishcherb@redhat.com> - 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 <releng@fedoraproject.org> - 7.5.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 7.5.0-2
- Rebuilt for switch to libxcrypt
* Thu Dec 14 2017 Ken Dreyer <ktdreyer@ktdreyer.com> - 7.5.0-1
- Update to 7.5.0 GA release (CVE-2017-17439)
* Mon Oct 23 2017 Alexander Boström <abo@root.snowtree.se> - 7.4.0-5
- Backport fix to prevent wait() loop on non-existant child process
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.4.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Wed Jul 12 2017 Ken Dreyer <ktdreyer@ktdreyer.com> - 7.4.0-2
- Make test failures non-fatal
* Tue Jul 11 2017 Ken Dreyer <ktdreyer@ktdreyer.com> - 7.4.0-1
- Update to 7.4.0 GA release (CVE-2017-11103)
* Mon Apr 17 2017 Ken Dreyer <ktdreyer@ktdreyer.com> - 7.3.0-1
- Update to 7.3.0 GA release (CVE-2017-6594)
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Dec 29 2016 Ken Dreyer <ktdreyer@ktdreyer.com> - 7.1.0-1
- Update to 7.1.0 GA release
- Drop all remaining xinetd bits
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-0.13.20150115gitc25f45a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Mon Aug 10 2015 Ken Dreyer <ktdreyer@ktdreyer.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.6.0-0.11.20150115gitc25f45a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu Jan 15 2015 Ken Dreyer <ktdreyer@ktdreyer.com> - 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 <rel-eng@lists.fedoraproject.org> - 1.6.0-0.10.20140621gita5adc06
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Mon Jul 07 2014 Ken Dreyer <ktdreyer@ktdreyer.com> - 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 <ktdreyer@ktdreyer.com> - 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 <ktdreyer@ktdreyer.com> - 1.6.0-0.7.20140621gita5adc06
- Update git snapshot to latest tip of heimdal-1-6-branch
* Sat Jun 07 2014 Ken Dreyer <ktdreyer@ktdreyer.com> - 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 <ktdreyer@ktdreyer.com> - 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 <ktdreyer@ktdreyer.com> - 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 <ktdreyer@ktdreyer.com> - 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 <ktdreyer@ktdreyer.com> - 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 <ktdreyer@ktdreyer.com> - 1.6.0-0.1.20140106git46a508
- Package git snapshot from master branch
* Wed Oct 16 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 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 <abo@kth.se> - 1.5.3-23.20130903gitb074e0b
- Fix build. (Problem with symlinks to kcc.)
* Thu Sep 05 2013 Alexander Boström <abo@kth.se> - 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 <abo@kth.se> - 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 <abo@kth.se> - 1.5.3-20.20130813gitdcc7c13
- Split ipv6_loopbacks_fix.patch into one backport and one smaller change
* Tue Aug 20 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 1.5.3-19.20130813gitdcc7c13
- Build against libedit instead of readline (avoid GPL entanglements)
* Tue Aug 13 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 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 <abo@kth.se> - 1.5.3-17.20130730gitd9b3691
- remove workaround for bogus check-iprop check failure
* Mon Aug 12 2013 Alexander Boström <abo@kth.se> - 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 <ktdreyer@ktdreyer.com> - 1.5.3-15.20130812git29f0a90
- Update to latest git snapshot of heimdal-1-5-branch
* Mon Aug 12 2013 Alexander Boström <abo@kth.se> - 1.5.3-14.20130730gitd9b3691
- do not ghost files in owned directory
* Mon Aug 12 2013 Alexander Boström <abo@kth.se> - 1.5.3-13.20130730gitd9b3691
- use global instead of define
* Mon Aug 12 2013 Alexander Boström <abo@kth.se> - 1.5.3-12.20130730gitd9b3691
- add doc references to unit files
* Mon Aug 12 2013 Alexander Boström <abo@kth.se> - 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 <ktdreyer@ktdreyer.com> - 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 <abo@kth.se> - 1.5.3-9.20130730gitd9b3691
- SysV scriptlets and initscript cleanups
- xinetd services ipv6 enabled
* Thu Aug 08 2013 Ken Dreyer <ktdreyer@ktdreyer.com> - 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 <ktdreyer@ktdreyer.com> - 1.5.3-7.20130730gitd9b3691
- Add missing groff buildreq on F19 and above
- Tweak Summary
* Thu Aug 08 2013 Alexander Boström <abo@kth.se> - 1.5.3-6
- Add missing buildreqs
* Thu Aug 08 2013 Alexander Boström <abo@kth.se> - 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 <abo@kth.se> - 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 <abo@kth.se> - 1.5.3-3
- Add heimdal-des-key-selection.patch
* Tue Aug 06 2013 Alexander Boström <abo@kth.se> - 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 <ktdreyer@ktdreyer.com> - 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 <abo@kth.se> - 1.5.2-3.kth.19
- really fix prefix munge patch
- fix texi build
* Wed Jul 3 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.18
- fix prefix munge patch
* Tue Jul 2 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.17
- rename kswitch to heimdal-kswitch (except on el6)
* Tue Jul 2 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.16
- ignore missing otp binaries
* Fri Jun 28 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.15
- fix license, fix macro-in-changelog
* Fri Jun 28 2013 Alexander Boström <abo@kth.se> - 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 <abo@kth.se> - 1.5.2-3.kth.13
- fix qop man symlink
* Thu Jun 27 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.12
- workstation does not require xinetd
- fix paths in xinetd confs
* Wed Jun 26 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.11
- fix symlinks
* Wed Jun 26 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.10
- provide/obsolete heimdal-kdc
* Wed Apr 10 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.9
- make PATH manipulation an optional subpackage
* Wed Apr 10 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.8
- rename to heimdal-* instead of *.heimdal
* Tue Apr 9 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.7
- split init script into multiple services
* Tue Apr 9 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.6
- move su to the workstation subpkg
* Tue Apr 9 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.5
- Add symlinks in the bin dir.
* Tue Apr 9 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.4
- Reuse /etc/security/access.conf from PAM.
* Tue Apr 9 2013 Alexander Boström <abo@kth.se> - 1.5.2-3.kth.3
- move daemon binaries to regular libexec dir, with executable name suffix
* Mon Apr 8 2013 Alexander Boström <abo@kth.se> - 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 <abo@kth.se> - 1.5.2-3.kth.1
- disable tests
* Wed Jul 4 2012 Rok Papež, ARNES <rok.papez@arnes.si> - 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 <rok.papez@arnes.si> - 1.5.1-1
- updated to upstream 1.5.1
* Tue Sep 27 2011 Rok Papež, ARNES <aaa-podpora@arnes.si> - 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 <aaa-podpora@arnes.si> - 1.5.1.pre20110912git-1.arnes
- Updated to Heimdal 1.5.1.pre20110912git
* Tue Nov 30 2010 Rok Papež, ARNES <aaa-podpora@arnes.si> - 1.4.1rc1-1.arnes
- Updated to Heimdal 1.4.1rc1
* Fri Jul 09 2010 Rok Papež, ARNES <aaa-podpora@arnes.si> - 1.3.3-1.arnes
- Updated to Heimdal 1.3.3
* Wed Apr 21 2010 Rok Papež, ARNES <aaa-podpora@arnes.si> - 1.3.2-2.arnes
- Updated to Heimdal 1.3.2
* Thu Sep 17 2009 Rok Papež, ARNES <aaa-podpora@arnes.si> - 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 <aaa-podpora@arnes.si> - 1.2.1-9
- Fixed build for CentOS 4.7 (thanks to Nitzan Zaifman for bugreport)
* Mon Jun 8 2009 Rok Papež, ARNES <aaa-podpora@arnes.si> - 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 <aaa-podpora@arnes.si> - 1.2.1-7
- added dependency on xinetd for heimdal-workstation
* Tue Jan 20 2009 Rok Papež, ARNES <aaa-podpora@arnes.si>
- Fixed permissions
* Wed Oct 8 2008 Rok Papež, ARNES <aaa-podpora@arnes.si>
- 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

View file

@ -1,35 +0,0 @@
commit 748bf6e0c68e888b88b15e0925c03baba46fe24c
Author: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Thu May 22 15:45:06 2014 -0600
configure: update libtool initialization macro
According to the GNU Libtool NEWS file, LT_INIT has superceded
AC_PROG_LIBTOOL since version 1.9b (2004-08-29).
diff --git a/cf/roken-frag.m4 b/cf/roken-frag.m4
index 5c82d27..b6f362d 100644
--- a/cf/roken-frag.m4
+++ b/cf/roken-frag.m4
@@ -17,7 +17,7 @@ AC_REQUIRE([AC_PROG_CC])
AC_REQUIRE([AC_PROG_AWK])
AC_REQUIRE([AC_OBJEXT])
AC_REQUIRE([AC_EXEEXT])
-AC_REQUIRE([AC_PROG_LIBTOOL])
+AC_REQUIRE([LT_INIT])
AC_REQUIRE([AC_MIPS_ABI])
diff --git a/configure.ac b/configure.ac
index 6ee5f8e..51746e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl Checks for programs.
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CPP
-AC_PROG_LIBTOOL
+LT_INIT
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

View file

@ -1,30 +0,0 @@
From d285d8ea09d63e5c4634ad3f52df5a7b05bd48ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C4=8Cajka?= <jcajka@redhat.com>
Date: Tue, 1 Jul 2014 13:13:43 -0600
Subject: [PATCH] kadm5: fix race in Makefile with kadm5_err.h
When running make with -j4, occasionally kadm5 fails due to a missing
header file kadm5_err.h. Fix the race condition.
Reported at https://bugzilla.redhat.com/1115164
Reviewed-by: Ken Dreyer <ktdreyer@ktdreyer.com>
---
lib/kadm5/Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
index f8be3b1..1b399b1 100644
--- a/lib/kadm5/Makefile.am
+++ b/lib/kadm5/Makefile.am
@@ -155,6 +155,7 @@ iprop-commands.c iprop-commands.h: iprop-commands.in
$(SLC) $(srcdir)/iprop-commands.in
$(libkadm5srv_la_OBJECTS): kadm5_err.h
+$(libkadm5clnt_la_OBJECTS): kadm5_err.h
$(iprop_log_OBJECTS): iprop-commands.h
client_glue.lo server_glue.lo: $(srcdir)/common_glue.c
--
1.9.0

View file

@ -1,16 +1,19 @@
commit 6fa462442e098ba8edde2c95dbc630d1c4910e9b
Author: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Wed May 28 15:00:44 2014 -0600
From 15d0c5593079f0c75b0e3ed9209e549e5d2e7822 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Wed, 28 May 2014 15:00:44 -0600
Subject: [PATCH 1/2] Fedora: add heimdal- prefixes to heimtools cmds
Fedora: add heimdal- prefixes to heimtools cmds
The Fedora Heimdal package renames the klist and kswitch commands in
/usr/bin to use "heimdal-" prefixes in order to avoid conflicting with
MIT's utilities.
Add these "heimdal-" names to the heimtools command configuration so
that heimtools will recognize the commands under the new names as well
as the old names.
The Fedora Heimdal package renames the klist and kswitch commands in
/usr/bin to use "heimdal-" prefixes in order to avoid conflicting with
MIT's utilities.
Add these "heimdal-" names to the heimtools command configuration so
that heimtools will recognize the commands under the new names as well
as the old names.
---
kuser/heimtools-commands.in | 2 ++
kuser/heimtools.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/kuser/heimtools-commands.in b/kuser/heimtools-commands.in
index b22a8c5..62388ce 100644
@ -47,3 +50,6 @@ index 70b23d6..c1ef60e 100644
}, **p = aliases;
while (*p && strcmp(name, *p) != 0)
--
1.9.3

View file

@ -1,37 +0,0 @@
From 97a0361523e1b7b2f302bb6aa47f8beeb6759691 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Thu, 27 Mar 2014 10:07:29 -0600
Subject: [PATCH] remove hdb ldap create declarations
The hdb_ldap_create and hdb_ldapi_create prototypes use the "static"
keyword, but the functions themselves are not implemented as static.
Heimdal's buildsystem dynamically adds function declarations to
hdb-protos.h based on the actual function implementations. Those
declarations in hdb-protos.h are not declared as static.
Since the build system generates the declarations dynamically, just
remove them from hdb-ldap.c.
(cherry picked from commit 10519ce50d3aaa8e40bb9e1e0dee5da847648f42)
---
lib/hdb/hdb-ldap.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lib/hdb/hdb-ldap.c b/lib/hdb/hdb-ldap.c
index 767d88e..caf892e 100644
--- a/lib/hdb/hdb-ldap.c
+++ b/lib/hdb/hdb-ldap.c
@@ -44,9 +44,6 @@
static krb5_error_code LDAP__connect(krb5_context context, HDB *);
static krb5_error_code LDAP_close(krb5_context context, HDB *);
-static krb5_error_code hdb_ldap_create(krb5_context context, HDB **, const char *);
-static krb5_error_code hdb_ldapi_create(krb5_context context, HDB **, const char *);
-
static krb5_error_code
LDAP_message2entry(krb5_context context, HDB * db, LDAPMessage * msg,
int flags, hdb_entry_ex * ent);
--
1.9.0

View file

@ -1,24 +0,0 @@
commit ccd3f1982361edcaf28a132de60ca9cc5ecda933
Author: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Sat May 31 02:00:58 2014 -0600
kadmin: handle systemd setpgid failure
When running as a service under systemd, kadmin cannot successfully use
setpgid(). The call fails with EPERM. Do not treat this as a fatal
error; instead, allow kadmind to continue starting up.
diff --git a/kadmin/kadm_conn.c b/kadmin/kadm_conn.c
index e959d03..58aceb8 100644
--- a/kadmin/kadm_conn.c
+++ b/kadmin/kadm_conn.c
@@ -189,7 +189,8 @@ wait_for_connection(krb5_context contextp,
pgrp = getpid();
- if(setpgid(0, pgrp) < 0)
+ /* systemd may cause setpgid to fail with EPERM */
+ if(setpgid(0, pgrp) < 0 && errno != EPERM)
err(1, "setpgid");
signal(SIGTERM, terminate);

View file

@ -0,0 +1,296 @@
commit 58c8ad967e765f703273c95140f7f7a7f1694ae0
Author: Alexander Boström <abo@root.snowtree.se>
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):

View file

@ -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
])

View file

@ -0,0 +1,21 @@
commit 1b57b62d82a478c1fade350f0fb1d57031a8734e
Author: Bernd Kuhls <bernd@kuhls.net>
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
])

View file

@ -0,0 +1,31 @@
From e93a13576532db5d46b365b73829e6c1600d48ff Mon Sep 17 00:00:00 2001
From: Nicolas Williams <nico@twosigma.com>
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

View file

@ -0,0 +1,32 @@
Avoid implicit function declarations in the configure tests, to
prevent build failures with future compilers.
Submitted upstream: <https://github.com/heimdal/heimdal/pull/1085>
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 <string.h>
+$3]],
[[$1 x; memset(&x, 0, sizeof(x)); x.$2]])],
[cache_val=yes],
[cache_val=no])

View file

@ -1,13 +0,0 @@
# default: off
# description: Heimdal Kerberized FTP daemon
service ftp
{
port = 21
socket_type = stream
wait = no
user = root
server = /usr/libexec/heimdal-ftpd
log_on_failure += USERID
disable = yes
flags = IPv6
}

View file

@ -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=a5adc061079ddab92b9520e9c55f1c157c354f38
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

View file

@ -1,12 +0,0 @@
# default: off
# description: Heimdal database propagation receiver
service krb5_prop
{
flags = REUSE IPv6
socket_type = stream
wait = no
user = root
server = /usr/libexec/hpropd
log_on_failure += USERID
disable = yes
}

View file

@ -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 $?

View file

@ -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

View file

@ -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 $?

View file

@ -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

View file

@ -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 $?

View file

@ -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

View file

@ -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 $?

View file

@ -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

View file

@ -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 $?

View file

@ -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

View file

@ -1,12 +0,0 @@
# default: off
# description: Heimdal Kerberized Remote Shell daemon
service rsh
{
socket_type = stream
wait = no
user = root
server = /usr/libexec/heimdal-rshd
log_on_failure += USERID
disable = yes
flags = IPv6
}

View file

@ -1,13 +0,0 @@
# default: off
# description: Heimdal Kerberized telnet daemon
service telnet
{
port = 23
socket_type = stream
wait = no
user = root
server = /usr/libexec/heimdal-telnetd
log_on_failure += USERID
disable = yes
flags = IPv6
}

File diff suppressed because it is too large Load diff

View file

@ -1,36 +0,0 @@
From d6eecd38430dc9fceacd6eeea19880d2f6c555d3 Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Wed, 16 Oct 2013 15:57:55 -0600
Subject: [PATCH] Fedora: ipv6 loopbacks fix
---
lib/krb5/addr_families.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/lib/krb5/addr_families.c b/lib/krb5/addr_families.c
index 10b1024..981bbeb 100644
--- a/lib/krb5/addr_families.c
+++ b/lib/krb5/addr_families.c
@@ -1161,6 +1161,7 @@ krb5_parse_address(krb5_context context,
{
int i, n;
struct addrinfo *ai, *a;
+ struct addrinfo hint;
int error;
int save_errno;
@@ -1180,7 +1181,10 @@ krb5_parse_address(krb5_context context,
}
}
- error = getaddrinfo (string, NULL, NULL, &ai);
+ // if not parsed as numeric address, do a name lookup
+ memset(&hint, 0x00, sizeof(hint));
+ hint.ai_family = AF_UNSPEC;
+ error = getaddrinfo (string, NULL, &hint, &ai);
if (error) {
krb5_error_code ret2;
save_errno = errno;
--
1.8.3.1

View file

@ -1,2 +1 @@
55a89a5de5eda3e3dd7c463d945f3042 heimdal-1.6.0-a5adc06.tar.gz
f8675615a0565448bd13153806c222af heimdal-a5adc06-autoconf.tar.gz
SHA512 (heimdal-7.8.0.tar.gz) = 0167345aca77d65b7a1113874eee5b65ec6e1fec1f196d57e571265409fa35ef95a673a4fd4aafbb0ab5fb5b246b97412353a68d6613a8aff6393a9f1e72999e