From f7fd23fc4938a708c8d405cff0166a78136e5336 Mon Sep 17 00:00:00 2001 From: wennmach Date: Thu, 7 Sep 2006 08:46:20 +0000 Subject: Update kth-krb4 to 1.2.2 (the current release). New in 1.2.2: * cross-realm disabled in the server Addresses PR pkg/31431 by Zafer Aydogan. While there, make package pkglint-clean. --- security/kth-krb4/Makefile | 27 ++++++++++----------------- security/kth-krb4/buildlink3.mk | 7 +++---- security/kth-krb4/distinfo | 17 +++++++++-------- security/kth-krb4/patches/patch-aa | 8 ++++---- security/kth-krb4/patches/patch-ac | 26 ++++++++++++++++++++++++++ security/kth-krb4/patches/patch-ad | 16 ++++++++++++++++ security/kth-krb4/patches/patch-ag | 15 --------------- security/kth-krb4/patches/patch-ah | 22 +--------------------- security/kth-krb4/patches/patch-ai | 13 +------------ 9 files changed, 70 insertions(+), 81 deletions(-) create mode 100644 security/kth-krb4/patches/patch-ac create mode 100644 security/kth-krb4/patches/patch-ad delete mode 100644 security/kth-krb4/patches/patch-ag diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index 035a1b4239d..39012222f23 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.45 2006/06/04 13:41:10 joerg Exp $ +# $NetBSD: Makefile,v 1.46 2006/09/07 08:46:20 wennmach Exp $ # -DISTNAME= krb4-1.2.1 -PKGNAME= kth-krb4-1.2.1 -PKGREVISION= 9 +DISTNAME= krb4-1.2.2 +PKGNAME= kth-krb4-1.2.2 +#PKGREVISION= 1 CATEGORIES= security net MASTER_SITES= ftp://ftp.pdc.kth.se/pub/krb/src/ @@ -11,6 +11,7 @@ MAINTAINER= wennmach@NetBSD.org HOMEPAGE= http://www.pdc.kth.se/kth-krb/ COMMENT= Kerberos IV distribution from KTH +CONFLICTS+= arla-[0-9]* CONFLICTS+= libdes-[0-9]* CRYPTO= yes @@ -37,21 +38,13 @@ PLIST_SUBST+= KRB4_PREFIX= .endif CONFIGURE_ARGS+= --program-transform=${KTH_KRB4_TRANSFORM:Q} -INFO_FILES= # PLIST +INFO_FILES= yes EXAMPLEDIR= ${PREFIX}/share/examples/kth-krb4 -# this hangs while compiling one of the files, at least with the -# toolchain as of 1.5ZC (20020329) -#.if ${MACHINE_ARCH} == "sparc64" -#BROKEN= toolchain problems on sparc64 (1.5ZC, 20020329) -#.endif - -post-patch: - @for file in ${WRKSRC}/lib/kafs/kafs.h; do \ - ${SED} -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' \ - $${file} > $${file}.fixed; \ - ${MV} -f $${file}.fixed $${file}; \ - done +SUBST_CLASSES+= paths +SUBST_FILES.paths= ${WRKSRC}/lib/kafs/kafs.h +SUBST_SED.paths+= -e 's|/usr/arla/etc/|${PKG_SYSCONFDIR}|g' +SUBST_STAGE.paths= post-patch post-install: ${INSTALL_DATA_DIR} ${EXAMPLEDIR} diff --git a/security/kth-krb4/buildlink3.mk b/security/kth-krb4/buildlink3.mk index 2077bb8c03b..cf6668d7a30 100644 --- a/security/kth-krb4/buildlink3.mk +++ b/security/kth-krb4/buildlink3.mk @@ -1,5 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2006/07/08 23:11:06 jlam Exp $ -# XXX BUILDLINK_DEPMETHOD.kth-krb4?= build +# $NetBSD: buildlink3.mk,v 1.8 2006/09/07 08:46:20 wennmach Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ KTH_KRB4_BUILDLINK3_MK:= ${KTH_KRB4_BUILDLINK3_MK}+ @@ -14,9 +13,9 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}kth-krb4 .if !empty(KTH_KRB4_BUILDLINK3_MK:M+) BUILDLINK_API_DEPENDS.kth-krb4+= kth-krb4>=1.1.1 -BUILDLINK_ABI_DEPENDS.kth-krb4+=kth-krb4>=1.2.1nb5 +BUILDLINK_ABI_DEPENDS.kth-krb4+= kth-krb4>=1.2.1nb5 BUILDLINK_ABI_DEPENDS.kth-krb4?= kth-krb4>=1.2.1nb6 -BUILDLINK_PKGSRCDIR.kth-krb4?= ../../security/kth-krb4 +BUILDLINK_PKGSRCDIR.kth-krb4?= ../../security/kth-krb4 .endif # KTH_KRB4_BUILDLINK3_MK BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/security/kth-krb4/distinfo b/security/kth-krb4/distinfo index 7a155476bc3..a92bb795ea0 100644 --- a/security/kth-krb4/distinfo +++ b/security/kth-krb4/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.10 2006/04/12 19:43:31 joerg Exp $ +$NetBSD: distinfo,v 1.11 2006/09/07 08:46:20 wennmach Exp $ -SHA1 (krb4-1.2.1.tar.gz) = 8134bf761d030210cc87fe3b4635ce4afe817c66 -RMD160 (krb4-1.2.1.tar.gz) = 7de9fed607b8b0b1018439be8b761bbdefc43ea4 -Size (krb4-1.2.1.tar.gz) = 1876149 bytes -SHA1 (patch-aa) = 65aa55f7dd1eb126397faca52504f893ded3dcd0 +SHA1 (krb4-1.2.2.tar.gz) = 41379763161d0b94646adb8847b83f92e5c985a4 +RMD160 (krb4-1.2.2.tar.gz) = 585f19767c610c31ca5be59d8cf61724739969f1 +Size (krb4-1.2.2.tar.gz) = 1876603 bytes +SHA1 (patch-aa) = 0585d1b3a0242c013dbe09b61c28049cbae0cb92 SHA1 (patch-ab) = 94e4abdeeb0263eac7207fac120e10d190fb0f30 -SHA1 (patch-ag) = 41e3b00986b886d820e8d120709c057e58c209af -SHA1 (patch-ah) = 87c87b38dcb3b9c16e2654122194a21bfeeb5180 -SHA1 (patch-ai) = 716ae2b9675d1d83e5e27edfa90c792d72b37ea5 +SHA1 (patch-ac) = 8e3f1ea92fdb45c1d48c5f1719dcf3eb0ed2a52d +SHA1 (patch-ad) = 48ebf93893662ecc10e56e0653351f80359b12b0 +SHA1 (patch-ah) = 5d09fc774b0d35070036aebd1339b32ed38137de +SHA1 (patch-ai) = dc9db52ff819cc08753e8fe98397187df1dd0310 diff --git a/security/kth-krb4/patches/patch-aa b/security/kth-krb4/patches/patch-aa index 48794d23a0a..0f8dfd21969 100644 --- a/security/kth-krb4/patches/patch-aa +++ b/security/kth-krb4/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2006/02/20 15:15:48 joerg Exp $ +$NetBSD: patch-aa,v 1.6 2006/09/07 08:46:20 wennmach Exp $ ---- appl/bsd/encrypt.c.orig 2006-02-17 15:53:23.000000000 +0000 -+++ appl/bsd/encrypt.c -@@ -63,7 +63,6 @@ RCSID("$Id: encrypt.c,v 1.6 2001/09/09 2 +--- appl/bsd/encrypt.c.orig 2001-09-09 22:27:22.000000000 +0200 ++++ appl/bsd/encrypt.c 2006-09-07 10:19:23.000000000 +0200 +@@ -63,7 +63,6 @@ *((c)++)=(unsigned char)(((l) )&0xff)) /* This has some uglies in it but it works - even over sockets. */ diff --git a/security/kth-krb4/patches/patch-ac b/security/kth-krb4/patches/patch-ac new file mode 100644 index 00000000000..bc66ae125db --- /dev/null +++ b/security/kth-krb4/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.4 2006/09/07 08:46:20 wennmach Exp $ + +Do not install the des executable, nor the des.1 man page. This avoids +a conflict with the openssl package, which installs an executable with +the same name (and functionality) into the same place. + +--- lib/des/Makefile.am.orig Mon Apr 1 11:48:01 2002 ++++ lib/des/Makefile.am Mon Apr 1 11:49:39 2002 +@@ -13,7 +13,7 @@ + + TESTS = destest mdtest md5crypt_test + CHECK_LOCAL = +-bin_PROGRAMS = des #rpw speed ++bin_PROGRAMS = + + des_SOURCES = des.c des_ver.h + +@@ -59,7 +59,7 @@ + EXTRA_libdes_la_SOURCES = dllmain.c passwd_dialog.aps passwd_dialog.clw \ + passwd_dialog.rc passwd_dialog.res passwd_dlg.c passwd_dlg.h resource.h + +-man_MANS = des.1 des_crypt.3 ++man_MANS = des_crypt.3 + + ## this is an awful lot of junk, but it's just as well to include everything + EXTRA_DIST = \ diff --git a/security/kth-krb4/patches/patch-ad b/security/kth-krb4/patches/patch-ad new file mode 100644 index 00000000000..22d3a688479 --- /dev/null +++ b/security/kth-krb4/patches/patch-ad @@ -0,0 +1,16 @@ +$NetBSD: patch-ad,v 1.5 2006/09/07 08:46:20 wennmach Exp $ + +Do not install man/man5/krb.equiv.5 to avoid a conflict with the +cyrus-imapd package. + +--- lib/krb/Makefile.am.orig Mon Apr 1 11:53:16 2002 ++++ lib/krb/Makefile.am Mon Apr 1 11:53:42 2002 +@@ -18,7 +18,7 @@ + noinst_PROGRAMS = sizetest + + man_MANS = kerberos.1 kerberos.3 krb_realmofhost.3 krb_sendauth.3 \ +- krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 krb.equiv.5 \ ++ krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 \ + krb.extra.5 krb.realms.5 + + diff --git a/security/kth-krb4/patches/patch-ag b/security/kth-krb4/patches/patch-ag deleted file mode 100644 index b04293c0a23..00000000000 --- a/security/kth-krb4/patches/patch-ag +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2002/09/24 00:17:51 jlam Exp $ - -Do not use hardwired paths to arla's configuration directory. - ---- lib/kafs/kafs.h.orig Thu Jun 8 14:08:13 2000 -+++ lib/kafs/kafs.h Thu Jun 8 14:08:51 2000 -@@ -181,7 +181,7 @@ - #define _PATH_CELLSERVDB _PATH_VICE "CellServDB" - #define _PATH_THESECELLS _PATH_VICE "TheseCells" - --#define _PATH_ARLA_VICE "/usr/arla/etc/" -+#define _PATH_ARLA_VICE "@PKG_SYSCONFDIR@/" - #define _PATH_ARLA_THISCELL _PATH_ARLA_VICE "ThisCell" - #define _PATH_ARLA_CELLSERVDB _PATH_ARLA_VICE "CellServDB" - #define _PATH_ARLA_THESECELLS _PATH_ARLA_VICE "TheseCells" diff --git a/security/kth-krb4/patches/patch-ah b/security/kth-krb4/patches/patch-ah index dc2ae16e083..236381e7f5b 100644 --- a/security/kth-krb4/patches/patch-ah +++ b/security/kth-krb4/patches/patch-ah @@ -1,29 +1,9 @@ -$NetBSD: patch-ah,v 1.3 2002/10/29 13:56:51 joda Exp $ +$NetBSD: patch-ah,v 1.4 2006/09/07 08:46:20 wennmach Exp $ Do not install the des executable, nor the des.1 man page. This avoids a conflict with the openssl package, which installs an executable with the same name (and functionality) into the same place. ---- lib/des/Makefile.am.orig Mon Apr 1 11:48:01 2002 -+++ lib/des/Makefile.am Mon Apr 1 11:49:39 2002 -@@ -13,7 +13,7 @@ - - TESTS = destest mdtest md5crypt_test - CHECK_LOCAL = --bin_PROGRAMS = des #rpw speed -+bin_PROGRAMS = - - des_SOURCES = des.c des_ver.h - -@@ -59,7 +59,7 @@ - EXTRA_libdes_la_SOURCES = dllmain.c passwd_dialog.aps passwd_dialog.clw \ - passwd_dialog.rc passwd_dialog.res passwd_dlg.c passwd_dlg.h resource.h - --man_MANS = des.1 des_crypt.3 -+man_MANS = des_crypt.3 - - ## this is an awful lot of junk, but it's just as well to include everything - EXTRA_DIST = \ --- lib/des/Makefile.in.orig Wed Oct 23 06:39:44 2002 +++ lib/des/Makefile.in Mon Oct 28 15:26:36 2002 @@ -213,7 +213,7 @@ diff --git a/security/kth-krb4/patches/patch-ai b/security/kth-krb4/patches/patch-ai index 9a6eab51e81..b0699961739 100644 --- a/security/kth-krb4/patches/patch-ai +++ b/security/kth-krb4/patches/patch-ai @@ -1,19 +1,8 @@ -$NetBSD: patch-ai,v 1.2 2002/04/05 11:32:22 wennmach Exp $ +$NetBSD: patch-ai,v 1.3 2006/09/07 08:46:20 wennmach Exp $ Do not install man/man5/krb.equiv.5 to avoid a conflict with the cyrus-imapd package. ---- lib/krb/Makefile.am.orig Mon Apr 1 11:53:16 2002 -+++ lib/krb/Makefile.am Mon Apr 1 11:53:42 2002 -@@ -18,7 +18,7 @@ - noinst_PROGRAMS = sizetest - - man_MANS = kerberos.1 kerberos.3 krb_realmofhost.3 krb_sendauth.3 \ -- krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 krb.equiv.5 \ -+ krb_set_tkt_string.3 kuserok.3 tf_util.3 krb.conf.5 \ - krb.extra.5 krb.realms.5 - - --- lib/krb/Makefile.in.orig Thu Apr 4 16:37:53 2002 +++ lib/krb/Makefile.in Thu Apr 4 16:38:11 2002 @@ -216,7 +216,7 @@ -- cgit v1.2.3