From 587839f5069f5e3083eaab8814767c8d35a30c29 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Tue, 3 Mar 2015 14:40:32 +0700 Subject: network/krb5: Updated for version 1.11.6 + new maintainer. Signed-off-by: Willy Sudiarto Raharjo --- network/krb5/krb5.SlackBuild | 49 ++++++---------- network/krb5/krb5.info | 10 ++-- network/krb5/krb5_tcl.patch | 134 ------------------------------------------- 3 files changed, 24 insertions(+), 169 deletions(-) delete mode 100644 network/krb5/krb5_tcl.patch diff --git a/network/krb5/krb5.SlackBuild b/network/krb5/krb5.SlackBuild index 3e852bc64b101..34f235a6d9c53 100644 --- a/network/krb5/krb5.SlackBuild +++ b/network/krb5/krb5.SlackBuild @@ -3,35 +3,28 @@ # Slackware build script for krb5 # Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA +# Copyright 2015 Willy Sudiarto Raharjo # All rights reserved. # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials -# provided with the distribution. -# * Neither the name of Tom Canich nor the names of other contributors -# may be used to endorse or promote products derived from this -# software without specific prior written written permission. +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: # -# THIS SOFTWARE IS PROVIDED BY Tom Canich ''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 Tom Canich 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. +# 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=krb5 -VERSION=${VERSION:-1.11.4} +VERSION=${VERSION:-1.11.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,8 +66,6 @@ tar xvf $CWD/$PRGNAM-$VERSION-signed.tar -C $TMP tar xvf $TMP/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION/src -patch -p1 < $CWD/krb5_tcl.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -94,16 +85,14 @@ cat $CWD/config/kerberos.sh > $PKG/etc/profile.d/kerberos.sh cat $CWD/config/kerberos.csh > $PKG/etc/profile.d/kerberos.csh chmod 0755 $PKG/etc/profile.d/* -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/kerberos/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/kerberos/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - $CWD/README $CWD/README.krb5 $CWD/EXPORT \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $CWD/README $CWD/README.krb5 $CWD/EXPORT $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown -R root:root $PKG/usr/doc find $PKG/usr/doc -type f -exec chmod 0644 {} \; diff --git a/network/krb5/krb5.info b/network/krb5/krb5.info index 2c478698584e6..9fad55293ed94 100644 --- a/network/krb5/krb5.info +++ b/network/krb5/krb5.info @@ -1,10 +1,10 @@ PRGNAM="krb5" -VERSION="1.11.4" +VERSION="1.11.6" HOMEPAGE="http://web.mit.edu/kerberos/" -DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.4-signed.tar" -MD5SUM="138628ae154ff449bc41602c8de78e8b" +DOWNLOAD="http://web.mit.edu/kerberos/dist/krb5/1.11/krb5-1.11.6-signed.tar" +MD5SUM="0df98c56f5d53b4b2b17fe896325b8b0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Tom Canich" -EMAIL="tcanich@canich.net" +MAINTAINER="Willy Sudiarto Raharjo" +EMAIL="willysr@slackbuilds.org" diff --git a/network/krb5/krb5_tcl.patch b/network/krb5/krb5_tcl.patch deleted file mode 100644 index 37d47c51e82ec..0000000000000 --- a/network/krb5/krb5_tcl.patch +++ /dev/null @@ -1,134 +0,0 @@ ---- src/kadmin/testing/util/tcl_kadm5.c.orig 2013-11-22 16:22:36.690361910 +0700 -+++ src/kadmin/testing/util/tcl_kadm5.c 2013-11-22 16:44:15.022203082 +0700 -@@ -801,7 +801,7 @@ - return retcode; - } - if (argc != num_keysalts) { -- sprintf(interp->result, "%d keysalts specified, " -+ sprintf(Tcl_GetErrorLine(interp), "%d keysalts specified, " - "but num_keysalts is %d", argc, num_keysalts); - retcode = TCL_ERROR; - goto finished; -@@ -814,7 +814,7 @@ - goto finished; - } - if (argc1 != 2) { -- sprintf(interp->result, "wrong # fields in keysalt " -+ sprintf(Tcl_GetErrorLine(interp), "wrong # fields in keysalt " - "(%d should be 2)", argc1); - retcode = TCL_ERROR; - goto finished; -@@ -856,7 +856,7 @@ - *key_data = NULL; - if (list == NULL) { - if (n_key_data != 0) { -- sprintf(interp->result, "0 key_datas specified, " -+ sprintf(Tcl_GetErrorLine(interp), "0 key_datas specified, " - "but n_key_data is %d", n_key_data); - retcode = TCL_ERROR; - goto finished; -@@ -868,14 +868,14 @@ - return retcode; - } - if (argc != n_key_data) { -- sprintf(interp->result, "%d key_datas specified, " -+ sprintf(Tcl_GetErrorLine(interp), "%d key_datas specified, " - "but n_key_data is %d", argc, n_key_data); - retcode = TCL_ERROR; - goto finished; - } - - if (argc != 0) { -- sprintf(interp->result, "cannot parse key_data yet"); -+ sprintf(Tcl_GetErrorLine(interp), "cannot parse key_data yet"); - retcode = TCL_ERROR; - goto finished; - } -@@ -896,7 +896,7 @@ - *tlp = NULL; - if (list == NULL) { - if (n_tl_data != 0) { -- sprintf(interp->result, "0 tl_datas specified, " -+ sprintf(Tcl_GetErrorLine(interp), "0 tl_datas specified, " - "but n_tl_data is %d", n_tl_data); - retcode = TCL_ERROR; - goto finished; -@@ -908,7 +908,7 @@ - return retcode; - } - if (argc != n_tl_data) { -- sprintf(interp->result, "%d tl_datas specified, " -+ sprintf(Tcl_GetErrorLine(interp), "%d tl_datas specified, " - "but n_tl_data is %d", argc, n_tl_data); - retcode = TCL_ERROR; - goto finished; -@@ -929,7 +929,7 @@ - goto finished; - } - if (argc1 != 3) { -- sprintf(interp->result, "wrong # fields in tl_data " -+ sprintf(Tcl_GetErrorLine(interp), "wrong # fields in tl_data " - "(%d should be 3)", argc1); - retcode = TCL_ERROR; - goto finished; -@@ -949,7 +949,7 @@ - } - tl->tl_data_length = tmp; - if (tl->tl_data_length != strlen(argv1[2])) { -- sprintf(interp->result, "specified length %d does not " -+ sprintf(Tcl_GetErrorLine(interp), "specified length %d does not " - "match length %lu of string \"%s\"", tmp, - (unsigned long) strlen(argv1[2]), argv1[2]); - retcode = TCL_ERROR; -@@ -962,7 +962,7 @@ - tl = tl->tl_data_next; - } - if (tl != NULL) { -- sprintf(interp->result, "tl is not NULL!"); -+ sprintf(Tcl_GetErrorLine(interp), "tl is not NULL!"); - retcode = TCL_ERROR; - goto finished; - } -@@ -992,7 +992,7 @@ - } - - if (argc != 20) { -- sprintf(interp->result, -+ sprintf(Tcl_GetErrorLine(interp), - "wrong # args in config params structure (%d should be 20)", - argc); - retcode = TCL_ERROR; -@@ -1129,7 +1129,7 @@ - } - - if (argc != 12 && argc != 20) { -- sprintf(interp->result, -+ sprintf(Tcl_GetErrorLine(interp), - "wrong # args in principal structure (%d should be 12 or 20)", - argc); - retcode = TCL_ERROR; -@@ -1391,7 +1391,7 @@ - } - - if (argc != 7 && argc != 10) { -- sprintf(interp->result, "wrong # args in policy structure (%d should be 7 or 10)", -+ sprintf(Tcl_GetErrorLine(interp), "wrong # args in policy structure (%d should be 7 or 10)", - argc); - retcode = TCL_ERROR; - goto finished; ---- src/kadmin/testing/util/tcl_kadm5.h.orig 2013-11-22 16:33:21.532338510 +0700 -+++ src/kadmin/testing/util/tcl_kadm5.h 2013-11-22 16:33:35.462212999 +0700 -@@ -1,3 +1,12 @@ - /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ - - void Tcl_kadm5_init(Tcl_Interp *interp); -+ -+/* -+ * Beginning with 8.6, interp->errorLine isn't public visible anymore -+ * (TIP 330) -+*/ -+ -+#if (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6) -+# define Tcl_GetErrorLine(interp) (interp)->errorLine -+#endif -\ No newline at end of file -- cgit v1.2.3