diff --git a/.gitignore b/.gitignore index 4e9c9a7..4331216 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/heimdal-1.6.0-a5adc06.tar.gz -/heimdal-a5adc06-autoconf.tar.gz -/heimdal-1.6.0-c25f45a.tar.gz -/heimdal-c25f45a-autoconf.tar.gz +/heimdal-7.1.0-7195232.tar.gz +/heimdal-7195232-autoconf.tar.gz diff --git a/heimdal-1.6.0-c25f45a-ipv6-loopbacks-fix.patch b/heimdal-1.6.0-c25f45a-ipv6-loopbacks-fix.patch deleted file mode 100644 index 529f894..0000000 --- a/heimdal-1.6.0-c25f45a-ipv6-loopbacks-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From cad1d75c0461c63646917cf959dfb7f224e4dba3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rok=20Pape=C5=BE=2C=20ARNES?= -Date: Wed, 16 Oct 2013 15:57:55 -0600 -Subject: [PATCH 2/2] ipv6 loopbacks fix - -Fix IPv6 and multiple interfaces bug in krb5_parse_address. See -discussion at https://bugzilla.redhat.com/808147 ---- - 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.9.3 - diff --git a/heimdal-ftpd.xinetd b/heimdal-ftpd.xinetd deleted file mode 100644 index ff35f51..0000000 --- a/heimdal-ftpd.xinetd +++ /dev/null @@ -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 -} diff --git a/heimdal-generate-autoconf-tarball b/heimdal-generate-autoconf-tarball index e092d90..2d41028 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=c25f45a4c0cd252402484316b23582e1d4555fd6 +COMMIT=719523251eba1d2635b63f9245005b0a02cdec6d SHORT_COMMIT=${COMMIT:0:7} set -e diff --git a/heimdal-hpropd.xinetd b/heimdal-hpropd.xinetd deleted file mode 100644 index b12750e..0000000 --- a/heimdal-hpropd.xinetd +++ /dev/null @@ -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 -} diff --git a/heimdal-rshd.xinetd b/heimdal-rshd.xinetd deleted file mode 100644 index 28e9f07..0000000 --- a/heimdal-rshd.xinetd +++ /dev/null @@ -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 -} diff --git a/heimdal-telnetd.xinetd b/heimdal-telnetd.xinetd deleted file mode 100644 index b9c32d4..0000000 --- a/heimdal-telnetd.xinetd +++ /dev/null @@ -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 -} diff --git a/heimdal.spec b/heimdal.spec index 2bb1a6e..b67a49e 100644 --- a/heimdal.spec +++ b/heimdal.spec @@ -2,8 +2,8 @@ %global libdir %{_libdir}/heimdal %global bindir %{_exec_prefix}/lib/heimdal -%global commitdate 20150115 -%global commit c25f45a4c0cd252402484316b23582e1d4555fd6 +%global commitdate 20161219 +%global commit 719523251eba1d2635b63f9245005b0a02cdec6d %global shortcommit %(c=%{commit}; echo ${c:0:7}) %if 0%{?el5} %global need_autogen 0 @@ -17,8 +17,8 @@ %endif Name: heimdal -Version: 1.6.0 -Release: 0.13.%{commitdate}git%{shortcommit}%{?dist} +Version: 7.1.0 +Release: 1%{?dist} Summary: A Kerberos 5 implementation without export restrictions License: BSD and MIT URL: http://www.h5l.org/ @@ -34,13 +34,9 @@ Source2: %{name}-generate-autoconf-tarball Source3: %{name}.sysconfig Source4: %{name}.sh Source5: %{name}.csh -Source6: %{name}-rshd.xinetd -Source7: %{name}-ftpd.xinetd -Source8: %{name}-telnetd.xinetd Source9: krb5.conf.sample Source10: %{name}.logrotate Source11: %{name}-bashrc -Source12: %{name}-hpropd.xinetd Source20: %{name}-kdc.init Source21: %{name}-ipropd-master.init Source22: %{name}-ipropd-slave.init @@ -58,10 +54,6 @@ Source31: %{name}-ipropd-slave-wrapper # to know how to interpret the "heimdal-" prefixes. Patch1: heimdal-1.6.0-c25f45a-rename-commands.patch -# Submitted upstream at https://github.com/heimdal/heimdal/pull/119 -# Seems to have originated from https://bugzilla.redhat.com/808147 -Patch2: heimdal-1.6.0-c25f45a-ipv6-loopbacks-fix.patch - BuildRequires: bison BuildRequires: flex BuildRequires: libedit-devel @@ -130,27 +122,6 @@ Group: System Environment/Base This package contains Heimdal Kerberos 5 programs and utilities for use on workstations (kinit, klist, kdestroy, kpasswd) -%package appl-clients -Summary: Heimdal kerberized client applications -Group: System Environment/Base -# For the login.access symlink. -Requires: pam - -%description appl-clients -This package contains Heimdal Kerberos-aware versions of the telnet, ftp, -rcp, rsh, and rlogin clients. While these have been replaced by tools such -as OpenSSH in most environments, they remain in use in others. - -%package appl-servers -Summary: Heimdal kerberized server applications -Group: System Environment/Daemons -Requires: xinetd - -%description appl-servers -This package contains Heimdal Kerberos-aware versions of the pop3, telnet, -ftp, rcp, rsh, and rlogin servers. While these have been replaced by -tools such as OpenSSH in most environments, they remain in use in others. - %package server Summary: Heimdal kerberos server Group: System Environment/Daemons @@ -164,7 +135,6 @@ Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts -Requires: xinetd %endif Provides: heimdal-kdc = %{version}-%{release} Obsoletes: heimdal-kdc < 1.5 @@ -208,7 +178,6 @@ PATH. %prep %setup -b 1 -qn %{name}-%{commit} %patch1 -p1 -b .cmds -%patch2 -p1 -b .getaddrinfo %if 0%{?need_autogen} ./autogen.sh @@ -281,13 +250,6 @@ make DESTDIR=%{buildroot} install 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 -%if ! 0%{?_with_systemd} -mkdir -p %{buildroot}%{_sysconfdir}/xinetd.d/ -install -p -D -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/xinetd.d/heimdal-rshd -install -p -D -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/xinetd.d/heimdal-ftpd -install -p -D -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/xinetd.d/heimdal-telnetd -install -p -D -m 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/xinetd.d/heimdal-hpropd -%endif install -p -D -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/logrotate.d/heimdal mkdir -p %{buildroot}%{_localstatedir}/heimdal/ install -p -D -m 755 %{SOURCE25} %{buildroot}%{_sysconfdir}/heimdal-kdc.conf @@ -325,7 +287,7 @@ mkdir -p %{buildroot}%{bindir}/bin mkdir -p %{buildroot}%{_mandir}/%{name}/man{1,5,8} # rename clashes with other pkgs from to heimdal- -for prog in kadmin kadmind kdestroy kinit klist kpasswd krb5-config ktutil ftp ftpd rcp rsh rshd telnet telnetd login su pagsh compile_et +for prog in kadmin kadmind kdestroy kinit klist kpasswd krb5-config ktutil su pagsh compile_et do if [ -e %{buildroot}%{_bindir}/${prog} ]; then mv %{buildroot}%{_bindir}/{,%{name}-}${prog} @@ -357,14 +319,9 @@ ln -s %{name}-kinit %{buildroot}%{_bindir}/kauth mv %{buildroot}%{_mandir}/man5/{,%{name}-}krb5.conf.5 -# Essentially a duplicate of ftpusers(5) from man-pages. Don't ship. -rm %{buildroot}%{_mandir}/man5/ftpusers.5 - rm %{buildroot}%{_mandir}/man5/qop.5 ln -s mech.5.gz %{buildroot}%{_mandir}/man5/qop.5.gz -ln -s /etc/security/access.conf %{buildroot}%{_sysconfdir}/login.access - # Remove translations on EL5 to avoid a find-lang bug with --all-name. # https://bugzilla.redhat.com/213041 %if 0%{?el5} @@ -380,20 +337,6 @@ fi %clean rm -rf %{buildroot} -%post appl-servers -%if 0%{?_with_systemd} - # We do not support xinetd on newer distros that have systemd. -%else - /sbin/service xinetd reload > /dev/null 2>&1 || : -%endif - -%postun appl-servers -%if 0%{?_with_systemd} - # We do not support xinetd on newer distros that have systemd. -%else - /sbin/service xinetd reload > /dev/null 2>&1 || : -%endif - %post server %if 0%{?_with_systemd} %systemd_post heimdal-kdc.service @@ -407,7 +350,6 @@ rm -rf %{buildroot} /sbin/chkconfig --add heimdal-ipropd-slave /sbin/chkconfig --add heimdal-kadmind /sbin/chkconfig --add heimdal-kpasswdd - /sbin/service xinetd reload > /dev/null 2>&1 || : %endif %preun server @@ -447,7 +389,6 @@ rm -rf %{buildroot} /sbin/service heimdal-kadmind condrestart >/dev/null 2>&1 || : /sbin/service heimdal-kpasswdd condrestart >/dev/null 2>&1 || : fi - /sbin/service xinetd reload > /dev/null 2>&1 || : %endif %post libs @@ -502,7 +443,6 @@ fi %{_unitdir}/*.service %else %{_initrddir}/* -%config(noreplace) %{_sysconfdir}/xinetd.d/heimdal-hpropd %endif %{_sysconfdir}/logrotate.d/heimdal %config(noreplace) %{_sysconfdir}/sysconfig/heimdal @@ -580,67 +520,24 @@ fi %{_mandir}/man1/otp.1* %{_prefix}/bin/otpprint %{_mandir}/man1/otpprint.1* -%{_prefix}/bin/pfrom -%{_mandir}/man1/pfrom.1* -%{_sbindir}/%{name}-kadmin +%{_bindir}/%{name}-kadmin %{bindir}/bin/kadmin -%{_mandir}/man8/%{name}-kadmin.8* +%{_mandir}/man1/%{name}-kadmin.1* %{_libexecdir}/kcm %{_mandir}/man8/kcm.8* %{_libexecdir}/kfd %{_mandir}/man8/kfd.8* -%{_sbindir}/%{name}-ktutil +%{_bindir}/%{name}-ktutil %{bindir}/bin/ktutil -%{_mandir}/man8/%{name}-ktutil.8* +%{_mandir}/man1/%{name}-ktutil.1* # NOTICE: no support for X11 #%%{_libexecdir}/kxd #%%{_mandir}/man8/kxd.8* #%%{_mandir}/cat8/kxd.8* -%{_libexecdir}/popper -%{_mandir}/man8/popper.8* -# TODO: PUSH needs to go to bin!!! -%{_libexecdir}/push -%{_mandir}/man8/push.8* %attr(04550,root,root) %{_prefix}/bin/%{name}-su %{bindir}/bin/su %{_mandir}/man1/%{name}-su.1* -%files appl-clients -%config(noreplace) %{_sysconfdir}/login.access -%{_prefix}/bin/%{name}-ftp -%{bindir}/bin/ftp -%{_mandir}/man1/%{name}-ftp.1* -%{_prefix}/bin/%{name}-login -%{bindir}/bin/login -%{_mandir}/man1/%{name}-login.1* -%{_mandir}/man5/login.access.5* -%{_prefix}/bin/%{name}-rcp -%{bindir}/bin/rcp -%{_mandir}/man1/%{name}-rcp.1* -%{_prefix}/bin/%{name}-rsh -%{bindir}/bin/rsh -%{_mandir}/man1/%{name}-rsh.1* -%{_prefix}/bin/%{name}-telnet -%{bindir}/bin/telnet -%{_mandir}/man1/%{name}-telnet.1* -# NOTICE: no support for X11 -#%%{_prefix}/bin/rxtelnet -#%%{_mandir}/man1/rxtelnet.1* -#%%{_mandir}/cat1/rxtelnet.1* - -%files appl-servers -%if ! 0%{?_with_systemd} -%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}-ftpd -%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}-rshd -%config(noreplace) %{_sysconfdir}/xinetd.d/%{name}-telnetd -%endif -%{_libexecdir}/%{name}-telnetd -%{_mandir}/man8/%{name}-telnetd.8* -%{_libexecdir}/%{name}-ftpd -%{_mandir}/man8/%{name}-ftpd.8* -%{_libexecdir}/%{name}-rshd -%{_mandir}/man8/%{name}-rshd.8* - %files devel %dir %{_libexecdir}/%{name} %{_bindir}/%{name}-krb5-config @@ -664,6 +561,10 @@ fi %{_sysconfdir}/profile.d/%{name}.csh %changelog +* 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 diff --git a/sources b/sources index cd6d673..ea4bd0c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ecfee6465dca889a889e6a79b080e4a7 heimdal-1.6.0-c25f45a.tar.gz -aad41eff6eb4730361f57ed9f4d06070 heimdal-c25f45a-autoconf.tar.gz +SHA512 (heimdal-7.1.0-7195232.tar.gz) = 89c1915e59e0dd47a3a312023a67092cb9113113326d6432fff413b5ecfe4af74be241bac79ac47c318693357e9d9c45cf6ff8fa54b3c8152f9f7f69cd29f04a +SHA512 (heimdal-7195232-autoconf.tar.gz) = 0870985f3fa9edb340a7fd839c7c6100cc3d5427659e80623d9df19a2393db9c9cc025d81c8458bcf9158061e427dd9e42fd863d928b8964c2f592d5f0c6fed7