From f14ca0920daaf12df242ee37a586be451f3ccb65 Mon Sep 17 00:00:00 2001 From: Thibaut Notteboom Date: Sun, 19 Feb 2017 22:54:09 +0000 Subject: network/heimdal: Updated for version 7.1.0. Signed-off-by: David Spencer --- .../0e0351776a48a69ec704085e554a0653d8179452.patch | 21 ----- .../115f88a3e7901541a67964d41bbd2a1866cfc521.patch | 51 ---------- .../1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch | 29 ------ network/heimdal/README | 8 +- .../a1d7f1f3e3cc6717f32a517053015585c47177ba.patch | 49 ---------- network/heimdal/config/heimdal.csh | 8 -- network/heimdal/config/heimdal.sh | 10 -- network/heimdal/config/kadmind.acl | 5 + network/heimdal/config/kdc.conf | 11 +-- network/heimdal/config/krb5.conf | 18 ++++ network/heimdal/config/rc.heimdal | 36 ------- network/heimdal/config/rc.ipropd-master | 36 +++++++ network/heimdal/config/rc.ipropd-slave | 37 ++++++++ network/heimdal/config/rc.kadmind | 34 +++++++ network/heimdal/config/rc.kdc | 34 +++++++ network/heimdal/config/rc.kpasswdd | 34 +++++++ network/heimdal/doinst.sh | 15 +-- network/heimdal/heimdal.SlackBuild | 103 +++++++++++---------- network/heimdal/heimdal.info | 8 +- network/heimdal/heimdal_disable-check-iprop.patch | 14 +++ network/heimdal/inittab-heimdal.patch | 21 ----- network/heimdal/slack-desc | 2 +- 22 files changed, 285 insertions(+), 299 deletions(-) delete mode 100644 network/heimdal/0e0351776a48a69ec704085e554a0653d8179452.patch delete mode 100644 network/heimdal/115f88a3e7901541a67964d41bbd2a1866cfc521.patch delete mode 100644 network/heimdal/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch delete mode 100644 network/heimdal/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch delete mode 100644 network/heimdal/config/heimdal.csh delete mode 100644 network/heimdal/config/heimdal.sh create mode 100644 network/heimdal/config/kadmind.acl create mode 100644 network/heimdal/config/krb5.conf delete mode 100644 network/heimdal/config/rc.heimdal create mode 100644 network/heimdal/config/rc.ipropd-master create mode 100644 network/heimdal/config/rc.ipropd-slave create mode 100644 network/heimdal/config/rc.kadmind create mode 100644 network/heimdal/config/rc.kdc create mode 100644 network/heimdal/config/rc.kpasswdd create mode 100644 network/heimdal/heimdal_disable-check-iprop.patch delete mode 100644 network/heimdal/inittab-heimdal.patch (limited to 'network') diff --git a/network/heimdal/0e0351776a48a69ec704085e554a0653d8179452.patch b/network/heimdal/0e0351776a48a69ec704085e554a0653d8179452.patch deleted file mode 100644 index 0d00c5c2fc..0000000000 --- a/network/heimdal/0e0351776a48a69ec704085e554a0653d8179452.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0e0351776a48a69ec704085e554a0653d8179452 Mon Sep 17 00:00:00 2001 -From: Eray Aslan -Date: Mon, 8 Apr 2013 09:54:18 -0700 -Subject: [PATCH] @end should only appear at a line beginning - -Signed-off-by: Love Hornquist Astrand ---- - doc/win2k.texi | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/doc/win2k.texi b/doc/win2k.texi -index 0452b4d..0fefeee 100644 ---- a/doc/win2k.texi -+++ b/doc/win2k.texi -@@ -311,4 +311,5 @@ Other useful programs include these: - - @itemize @bullet - @item pwdump2 --@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize -+@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm} -+@end itemize diff --git a/network/heimdal/115f88a3e7901541a67964d41bbd2a1866cfc521.patch b/network/heimdal/115f88a3e7901541a67964d41bbd2a1866cfc521.patch deleted file mode 100644 index 5c00cb86b6..0000000000 --- a/network/heimdal/115f88a3e7901541a67964d41bbd2a1866cfc521.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 115f88a3e7901541a67964d41bbd2a1866cfc521 Mon Sep 17 00:00:00 2001 -From: Ken Dreyer -Date: Thu, 8 Aug 2013 18:21:15 -0600 -Subject: [PATCH] more texinfo 5.1 hacks - -For hx509.texi, we need the copyright macros for both html and info. -Just remove the "ifhtml" conditionals. - -For whatis.texi, texinfo 5.1 inserts the sub{} macro inline with no -newlines, so there are errors about @html not being at the end of a -line, etc. ---- - doc/hx509.texi | 2 -- - doc/whatis.texi | 2 ++ - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/doc/hx509.texi b/doc/hx509.texi -index b44cbea..d050c21 100644 ---- a/doc/hx509.texi -+++ b/doc/hx509.texi -@@ -39,14 +39,12 @@ - @def@copyrightstart{} - @def@copyrightend{} - @end iftex --@ifinfo - @macro copynext - @end macro - @macro copyrightstart - @end macro - @macro copyrightend - @end macro --@end ifinfo - - @page - @copyrightstart -diff --git a/doc/whatis.texi b/doc/whatis.texi -index 891e275..7d83725 100644 ---- a/doc/whatis.texi -+++ b/doc/whatis.texi -@@ -43,9 +43,11 @@ services can authenticate each other. - - @ifhtml - @macro sub{arg} -+ - @html - \arg\ - @end html -+ - @end macro - @end ifhtml - diff --git a/network/heimdal/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch b/network/heimdal/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch deleted file mode 100644 index 835c1b1ff6..0000000000 --- a/network/heimdal/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1846c7a35d1091d3b6140c56befd7fee0a91dcbb Mon Sep 17 00:00:00 2001 -From: Love Hornquist Astrand -Date: Mon, 8 Apr 2013 10:15:15 -0700 -Subject: [PATCH] make @iftex case work in texinfo-5.1 - ---- - doc/whatis.texi | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/doc/whatis.texi b/doc/whatis.texi -index 8c1f45d..891e275 100644 ---- a/doc/whatis.texi -+++ b/doc/whatis.texi -@@ -35,10 +35,11 @@ services can authenticate each other. - @end macro - @end ifinfo - --@tex --@def@xsub#1{$_{#1}$} --@global@let@sub=@xsub --@end tex -+@iftex -+@macro sub{arg} -+@textsubscript{\arg\} -+@end macro -+@end iftex - - @ifhtml - @macro sub{arg} diff --git a/network/heimdal/README b/network/heimdal/README index b231d58243..41e6e229b2 100644 --- a/network/heimdal/README +++ b/network/heimdal/README @@ -1,10 +1,12 @@ Heimdal is a free implementation of Kerberos 5. The goals are to: * have an implementation that can be freely used by anyone -* be protocol compatible with existing implementations and, if not - in conflict, with RFC 4120 (and any future updated RFC). +* be protocol compatible with existing implementations and, if not + in conflict, with RFC 4120 (and any future updated RFC). RFC 4120 replaced RFC 1510. * be reasonably compatible with the M.I.T Kerberos V5 API * have support for Kerberos V5 over GSS-API (RFC1964) -* include the most important and useful application programs +* include the most important and useful application programs (rsh, telnet, popper, etc.) * include enough backwards compatibility with Kerberos V4 + +This package conflicts with krb5. diff --git a/network/heimdal/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch b/network/heimdal/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch deleted file mode 100644 index 848b06717b..0000000000 --- a/network/heimdal/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a1d7f1f3e3cc6717f32a517053015585c47177ba Mon Sep 17 00:00:00 2001 -From: Daniel Schepler -Date: Thu, 8 Aug 2013 17:12:49 -0600 -Subject: [PATCH] fix for texinfo 5.1 - -Signed-off-by: Ken Dreyer ---- - doc/hx509.texi | 18 ++++++++++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/doc/hx509.texi b/doc/hx509.texi -index c927357..b44cbea 100644 ---- a/doc/hx509.texi -+++ b/doc/hx509.texi -@@ -34,9 +34,20 @@ - @subtitle 2008 - @author Love Hörnquist Åstrand - -+@iftex - @def@copynext{@vskip 20pt plus 1fil} - @def@copyrightstart{} - @def@copyrightend{} -+@end iftex -+@ifinfo -+@macro copynext -+@end macro -+@macro copyrightstart -+@end macro -+@macro copyrightend -+@end macro -+@end ifinfo -+ - @page - @copyrightstart - Copyright (c) 1994-2008 Kungliga Tekniska Högskolan -@@ -183,6 +194,13 @@ This manual is for version @value{VERSION} of hx509. - * CMS signing and encryption:: - * Certificate matching:: - * Software PKCS 11 module:: -+* Creating a CA certificate:: -+* Issuing certificates:: -+* Issuing CRLs:: -+* Application requirements:: -+* CMS background:: -+* Matching syntax:: -+* How to use the PKCS11 module:: - - @detailmenu - --- The Detailed Node Listing --- diff --git a/network/heimdal/config/heimdal.csh b/network/heimdal/config/heimdal.csh deleted file mode 100644 index be96ce7347..0000000000 --- a/network/heimdal/config/heimdal.csh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/csh - -setenv MANPATH ${MANPATH}:/usr/heimdal/man - -setenv PATH "${PATH}:/usr/heimdal/bin" -if ( x"$uid" == x"0" ) then - setenv PATH "${PATH}:/usr/heimdal/sbin" -endif diff --git a/network/heimdal/config/heimdal.sh b/network/heimdal/config/heimdal.sh deleted file mode 100644 index 561d30a296..0000000000 --- a/network/heimdal/config/heimdal.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -MANPATH="$MANPATH:/usr/heimdal/man" -export MANPATH - -PATH="${PATH}:/usr/heimdal/bin" -if [ x"${EUID}" == x"0" ]; then - PATH="${PATH}:/usr/heimdal/sbin" -fi -export PATH diff --git a/network/heimdal/config/kadmind.acl b/network/heimdal/config/kadmind.acl new file mode 100644 index 0000000000..d8885f53b6 --- /dev/null +++ b/network/heimdal/config/kadmind.acl @@ -0,0 +1,5 @@ +# Leave this section out on the clients +# See the kadmind(8) man page for a full description of this file. + +# joe/admin@EXAMPLE.COM all +# mallory/admin@EXAMPLE.COM add,get-keys host/*@EXAMPLE.COM diff --git a/network/heimdal/config/kdc.conf b/network/heimdal/config/kdc.conf index 180b8ab69e..d63d571f61 100644 --- a/network/heimdal/config/kdc.conf +++ b/network/heimdal/config/kdc.conf @@ -1,20 +1,15 @@ # Leave this section out on the clients +# See the kdc(8) man page for a full description of this file. [kdc] # Space seperated list of addresses to listen for requests on. #addresses = 192.168.0.1 172.16.0.1 10.0.0.1 - - # Following directive is needed when KDC starts atomatically - require-preauth = no - - # database key file - key-file = /var/heimdal/key-file + addresses = 0.0.0.0 # Check the addresses in the ticket when processing TGS requests. - check-ticket-addresses = TRUE + #check-ticket-addresses = TRUE # Permit tickets with no addresses. #allow-null-ticket-addresses = TRUE # Permit anonymous tickets with no addresses. #allow-anonymous = TRUE - diff --git a/network/heimdal/config/krb5.conf b/network/heimdal/config/krb5.conf new file mode 100644 index 0000000000..9c945893cd --- /dev/null +++ b/network/heimdal/config/krb5.conf @@ -0,0 +1,18 @@ +[libdefaults] + default_realm = MY.REALM + clockskew = 300 + +[realms] + MY.REALM = { + kdc = MY.COMPUTER + } + OTHER.REALM = { + kdc = OTHER.COMPUTER + } +[domain_realm] + .my.domain = MY.REALM + +[logging] + kdc = SYSLOG:DEBUG:AUTH + admin_server = SYSLOG:DEBUG:AUTH + default = SYSLOG:DEBUG:AUTH diff --git a/network/heimdal/config/rc.heimdal b/network/heimdal/config/rc.heimdal deleted file mode 100644 index 7c0b93fe72..0000000000 --- a/network/heimdal/config/rc.heimdal +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -heimdal_start() { - if [ -r /var/heimdal/kdc.conf -a -x /usr/heimdal/libexec/kdc ]; then - echo "Starting the Kerberos service: /usr/heimdal/libexec/kdc --detach" - /usr/heimdal/libexec/kdc --detach - fi - -} - -heimdal_stop() { - killall kdc - -} - -heimdal_restart() { - heimdal_stop - sleep 1 - heimdal_start - -} - -case "$1" in -'start') - heimdal_start - ;; -'stop') - heimdal_stop - ;; -'restart') - heimdal_restart - ;; -*) - echo "Usage: $0 start|stop|restart" -esac - diff --git a/network/heimdal/config/rc.ipropd-master b/network/heimdal/config/rc.ipropd-master new file mode 100644 index 0000000000..744943b4c5 --- /dev/null +++ b/network/heimdal/config/rc.ipropd-master @@ -0,0 +1,36 @@ +#!/bin/sh + +HOSTNAME=`hostname -f` + +ipropd_master_start() { + if [ -x /usr/libexec/ipropd-master ]; then + echo "Starting the ipropd-master service: /usr/libexec/ipropd-master --detach" + /usr/libexec/ipropd-master --detach --hostname=$HOSTNAME + fi +} + +ipropd_master_stop() { + killall ipropd-master +} + +ipropd_master_restart() { + ipropd-master_stop + sleep 1 + ipropd-master_start +} + +case "$1" in + 'start') + ipropd_master_start + ;; + 'stop') + ipropd_master_stop + ;; + 'restart') + ipropd_master_restart + ;; + *) + echo "Usage: $0 start|stop|restart" + ;; +esac + diff --git a/network/heimdal/config/rc.ipropd-slave b/network/heimdal/config/rc.ipropd-slave new file mode 100644 index 0000000000..6b1a8c7274 --- /dev/null +++ b/network/heimdal/config/rc.ipropd-slave @@ -0,0 +1,37 @@ +#!/bin/sh + +KEYTAB=/etc/iprop.keytab +HOSTNAME=`hostname -f` + +ipropd_slave_start() { + if [ -x /usr/libexec/ipropd-slave ]; then + echo "Starting the ipropd-slave service: /usr/libexec/ipropd-slave --detach" + /usr/libexec/ipropd-slave --detach --keytab=$KEYTAB --hostname=$HOSTNAME + fi +} + +ipropd_slave_stop() { + killall ipropd-slave +} + +ipropd_slave_restart() { + ipropd-slave_stop + sleep 1 + ipropd-slave_start +} + +case "$1" in + 'start') + ipropd_slave_start + ;; + 'stop') + ipropd_slave_stop + ;; + 'restart') + ipropd_slave_restart + ;; + *) + echo "Usage: $0 start|stop|restart" + ;; +esac + diff --git a/network/heimdal/config/rc.kadmind b/network/heimdal/config/rc.kadmind new file mode 100644 index 0000000000..23b5447078 --- /dev/null +++ b/network/heimdal/config/rc.kadmind @@ -0,0 +1,34 @@ +#!/bin/sh + +kadmind_start() { + if [ -x /usr/libexec/kadmind ]; then + echo "Starting the kadmind service: /usr/libexec/kadmind" + /usr/libexec/kadmind --detach + fi +} + +kadmind_stop() { + killall kadmind +} + +kadmind_restart() { + kadmind_stop + sleep 1 + kadmind_start +} + +case "$1" in + 'start') + kadmind_start + ;; + 'stop') + kadmind_stop + ;; + 'restart') + kadmind_restart + ;; + *) + echo "Usage: $0 start|stop|restart" + ;; +esac + diff --git a/network/heimdal/config/rc.kdc b/network/heimdal/config/rc.kdc new file mode 100644 index 0000000000..3233794801 --- /dev/null +++ b/network/heimdal/config/rc.kdc @@ -0,0 +1,34 @@ +#!/bin/sh + +kdc_start() { + if [ -x /usr/libexec/kdc ]; then + echo "Starting the kdc service: /usr/libexec/kdc --detach" + /usr/libexec/kdc --detach + fi +} + +kdc_stop() { + killall kdc +} + +kdc_restart() { + kdc_stop + sleep 1 + kdc_start +} + +case "$1" in + 'start') + kdc_start + ;; + 'stop') + kdc_stop + ;; + 'restart') + kdc_restart + ;; + *) + echo "Usage: $0 start|stop|restart" + ;; +esac + diff --git a/network/heimdal/config/rc.kpasswdd b/network/heimdal/config/rc.kpasswdd new file mode 100644 index 0000000000..f712ee8e45 --- /dev/null +++ b/network/heimdal/config/rc.kpasswdd @@ -0,0 +1,34 @@ +#!/bin/sh + +kpasswdd_start() { + if [ -x /usr/libexec/kpasswdd ]; then + echo "Starting the kpasswdd service: /usr/libexec/kpasswdd" + /usr/libexec/kpasswdd --detach + fi +} + +kpasswdd_stop() { + killall kpasswdd +} + +kpasswdd_restart() { + kpasswdd_stop + sleep 1 + kpasswdd_start +} + +case "$1" in + 'start') + kpasswdd_start + ;; + 'stop') + kpasswdd_stop + ;; + 'restart') + kpasswdd_restart + ;; + *) + echo "Usage: $0 start|stop|restart" + ;; +esac + diff --git a/network/heimdal/doinst.sh b/network/heimdal/doinst.sh index 34f71599e5..3176f057e6 100644 --- a/network/heimdal/doinst.sh +++ b/network/heimdal/doinst.sh @@ -22,10 +22,11 @@ preserve_perms() { config $NEW } -preserve_perms etc/rc.d/rc.heimdal.new -config etc/krb5.conf-sample.new -config var/heimdal/kdc.conf-sample.new -config etc/profile.d/heimdal.sh.new -config etc/profile.d/heimdal.csh.new - - +preserve_perms etc/rc.d/rc.kdc.new +preserve_perms etc/rc.d/rc.kadmind.new +preserve_perms etc/rc.d/rc.kpasswdd.new +preserve_perms etc/rc.d/rc.ipropd-master.new +preserve_perms etc/rc.d/rc.ipropd-slave.new +config etc/krb5.conf.new +config var/heimdal/kdc.conf.new +config var/heimdal/kadmind.acl.new diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild index 8a0ebe70b4..0a77e3413a 100644 --- a/network/heimdal/heimdal.SlackBuild +++ b/network/heimdal/heimdal.SlackBuild @@ -2,22 +2,35 @@ # Slackware build script for KTH Heimdal Kerberos -# Written by Menno Duursma -# Modified by the SlackBuilds.org project -# Modified by Thibaut Notteboom - -# This program is free software. It comes without any warranty. -# Granted WTFPL, Version 2, as published by Sam Hocevar. See -# http://sam.zoy.org/wtfpl/COPYING for more details. +# Copyright 2010 Menno Duurma +# Copyright 2011-2017 Thibaut Notteboom, Paris, FRANCE +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=heimdal -VERSION=${VERSION:-1.5.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-7.1.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -28,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -57,74 +70,62 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Fix build failure with texinfo-6.1 -# https://github.com/heimdal/heimdal/commits/master/doc -patch -p1 < $CWD/0e0351776a48a69ec704085e554a0653d8179452.patch -patch -p1 < $CWD/1846c7a35d1091d3b6140c56befd7fee0a91dcbb.patch -patch -p1 < $CWD/a1d7f1f3e3cc6717f32a517053015585c47177ba.patch -patch -p1 < $CWD/115f88a3e7901541a67964d41bbd2a1866cfc521.patch +patch -p0 < $CWD/heimdal_disable-check-iprop.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="-lpthread" \ ./configure \ - --prefix=/usr/heimdal \ + --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --infodir=/usr/info \ - --mandir=/usr/heimdal/man \ + --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --with-berkeley-db-include=/usr/include/db48 \ --with-openldap=/usr \ --with-readline=/usr \ --with-sqlite3=/usr \ + --with-berkeley-db-include=/usr/include/db48 \ --with-x \ - --without-ipv6 \ + --with-ipv6 \ --without-hesiod \ --enable-kcm \ --enable-pthread-support \ --disable-otp \ - --disable-static + --disable-static \ + --build=$ARCH-slackware-linux -make -j1 +make make -j1 check -make -j1 install-strip DESTDIR=$PKG +make install-strip DESTDIR=$PKG + +mkdir -p $PKG/etc/rc.d +cat $CWD/config/krb5.conf > $PKG/etc/krb5.conf.new +cat $CWD/config/rc.kdc > $PKG/etc/rc.d/rc.kdc.new +cat $CWD/config/rc.kadmind > $PKG/etc/rc.d/rc.kadmind.new +cat $CWD/config/rc.kpasswdd > $PKG/etc/rc.d/rc.kpasswdd.new +cat $CWD/config/rc.ipropd-master > $PKG/etc/rc.d/rc.ipropd-master.new +cat $CWD/config/rc.ipropd-slave > $PKG/etc/rc.d/rc.ipropd-slave.new + +mkdir -p $PKG/var/heimdal +cat $CWD/config/kdc.conf > $PKG/var/heimdal/kdc.conf.new +cat $CWD/config/kadmind.acl > $PKG/var/heimdal/kadmind.acl.new -rm -rf $PKG/usr/heimdal/man/cat? -find $PKG/usr/heimdal/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/heimdal/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +rm -rf $PKG/usr/man/cat? +find $PKG/usr/man -type f -exec gzip -9f {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* ( cd $PKG/usr/info ; ln -s heimdal.info.gz heimdal ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a [A-Z][A-Z]* ChangeLog* etc/services.append $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/{init-creds,layman.asc,mdate-sh} $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/inittab-heimdal.patch > $PKG/usr/doc/$PRGNAM-$VERSION/inittab-heimdal.patch +cp -a \ + ChangeLog* NEWS README TODO etc/services.append \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -# Add sample krb5.conf file (may not be needed) -mkdir -p $PKG/etc -cat krb5.conf > $PKG/etc/krb5.conf-sample.new - -# Create directory for the KDC to use -mkdir -p $PKG/var/heimdal - -# Add sample kdc.conf file (may not be needed) -cat $CWD/config/kdc.conf > $PKG/var/heimdal/kdc.conf-sample.new - -# Include a KDC rc-file for the admin to consider -mkdir -p $PKG/etc/rc.d -cat $CWD/config/rc.heimdal > $PKG/etc/rc.d/rc.heimdal.new - -# Add heimdal to INFOPATH, MANPATH, and PATH -mkdir -p $PKG/etc/profile.d -install -m 0755 $CWD/config/heimdal.sh $PKG/etc/profile.d/heimdal.sh.new -install -m 0755 $CWD/config/heimdal.csh $PKG/etc/profile.d/heimdal.csh.new - mkdir $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/network/heimdal/heimdal.info b/network/heimdal/heimdal.info index 764dfe32e5..eda24284ad 100644 --- a/network/heimdal/heimdal.info +++ b/network/heimdal/heimdal.info @@ -1,10 +1,10 @@ PRGNAM="heimdal" -VERSION="1.5.2" +VERSION="7.1.0" HOMEPAGE="http://www.h5l.org" -DOWNLOAD="http://www.h5l.org/dist/src/heimdal-1.5.2.tar.gz" -MD5SUM="bb23d9dbdafd395d816f7abc598481a1" +DOWNLOAD="https://github.com/heimdal/heimdal/releases/download/heimdal-7.1.0/heimdal-7.1.0.tar.gz" +MD5SUM="bbeedb8eae6f81b12cbbaada4faaeb47" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Thibaut Notteboom" -EMAIL="tib@tibux.org" +EMAIL="thibaut.notteboom@gmail.com" diff --git a/network/heimdal/heimdal_disable-check-iprop.patch b/network/heimdal/heimdal_disable-check-iprop.patch new file mode 100644 index 0000000000..f4690a661b --- /dev/null +++ b/network/heimdal/heimdal_disable-check-iprop.patch @@ -0,0 +1,14 @@ +--- tests/kdc/check-iprop.in.orig 2017-02-17 18:56:52.410046232 +0100 ++++ tests/kdc/check-iprop.in 2017-02-17 18:57:49.242104243 +0100 +@@ -31,6 +31,11 @@ + # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + # SUCH DAMAGE. + ++# check-iprop is known to fail and there is no easy way out ++# http://article.gmane.org/gmane.comp.encryption.kerberos.heimdal.general/5408 ++# http://article.gmane.org/gmane.comp.encryption.kerberos.heimdal.general/5409 ++exit 77 ++ + top_builddir="@top_builddir@" + env_setup="@env_setup@" + objdir="@objdir@" diff --git a/network/heimdal/inittab-heimdal.patch b/network/heimdal/inittab-heimdal.patch deleted file mode 100644 index 14e59246d9..0000000000 --- a/network/heimdal/inittab-heimdal.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- /etc/inittab 2011-11-22 00:05:33.883260270 +0100 -+++ /etc/inittab-heimdal 2011-11-21 23:45:38.922009963 +0100 -@@ -49,12 +49,12 @@ - pg::powerokwait:/sbin/genpowerfail stop - - # These are the standard console login getties in multiuser mode: --c1:12345:respawn:/sbin/agetty 38400 tty1 linux --c2:12345:respawn:/sbin/agetty 38400 tty2 linux --c3:12345:respawn:/sbin/agetty 38400 tty3 linux --c4:12345:respawn:/sbin/agetty 38400 tty4 linux --c5:12345:respawn:/sbin/agetty 38400 tty5 linux --c6:12345:respawn:/sbin/agetty 38400 tty6 linux -+c1:12345:respawn:/sbin/agetty -l /usr/heimdal/bin/login 38400 tty1 linux -+c2:12345:respawn:/sbin/agetty -l /usr/heimdal/bin/login 38400 tty2 linux -+c3:12345:respawn:/sbin/agetty -l /usr/heimdal/bin/login 38400 tty3 linux -+c4:12345:respawn:/sbin/agetty -l /usr/heimdal/bin/login 38400 tty4 linux -+c5:12345:respawn:/sbin/agetty -l /usr/heimdal/bin/login 38400 tty5 linux -+c6:12345:respawn:/sbin/agetty -l /usr/heimdal/bin/login 38400 tty6 linux - - # Local serial lines: - #s1:12345:respawn:/sbin/agetty -L ttyS0 9600 vt100 diff --git a/network/heimdal/slack-desc b/network/heimdal/slack-desc index 3fd791baf3..417279b350 100644 --- a/network/heimdal/slack-desc +++ b/network/heimdal/slack-desc @@ -16,4 +16,4 @@ heimdal: (key distribution center) ``kerberized'' versions of programs such heimdal: as such as login and ftp/ftpd , telnet/telnetd and administration heimdal: utilities such as ``klist'' and ``kadmin''. krb and GSSAPI libs. heimdal: -heimdal: This package installs in /usr/heimdal to avoid naming conflicts. +heimdal: This package conflicts with krb5. -- cgit v1.2.3