pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2005Q1]: pkgsrc/security/mit-krb5 Pullup ticket 444 - requeste...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a9782e5ef930
branches:  pkgsrc-2005Q1
changeset: 491042:a9782e5ef930
user:      salo <salo%pkgsrc.org@localhost>
date:      Fri May 13 10:08:52 2005 +0000

description:
Pullup ticket 444 - requested by Johnny C. Lam
security update for mit-krb5

Revisions pulled up:
- pkgsrc/security/mit-krb5/Makefile             1.17-1.18, 1.20
- pkgsrc/security/mit-krb5/PLIST                1.6-1.8
- pkgsrc/security/mit-krb5/buildlink3.mk        1.4
- pkgsrc/security/mit-krb5/distinfo             1.9-1.10
- pkgsrc/security/mit-krb5/files/kadmind.sh     1.2
- pkgsrc/security/mit-krb5/files/kdc.sh         1.2
- pkgsrc/security/mit-krb5/patches/patch-aa     1.2
- pkgsrc/security/mit-krb5/patches/patch-ab     1.2
- pkgsrc/security/mit-krb5/patches/patch-ac     1.2
- pkgsrc/security/mit-krb5/patches/patch-ad     1.2
- pkgsrc/security/mit-krb5/patches/patch-ae     1.2
- pkgsrc/security/mit-krb5/patches/patch-af     1.3
- pkgsrc/security/mit-krb5/patches/patch-ag     1.3
- pkgsrc/security/mit-krb5/patches/patch-ai     removed
- pkgsrc/security/mit-krb5/patches/patch-aj     1.2
- pkgsrc/security/mit-krb5/patches/patch-ak     1.1
- pkgsrc/security/mit-krb5/patches/patch-al     1.1

   Module Name:         pkgsrc
   Committed By:        jlam
   Date:                Sun Apr 10 07:15:25 UTC 2005

   Modified Files:
        pkgsrc/security/mit-krb5: Makefile PLIST distinfo
        pkgsrc/security/mit-krb5/files: kadmind.sh kdc.sh
        pkgsrc/security/mit-krb5/patches: patch-aa patch-ab patch-ac patch-ad
            patch-ae patch-af patch-ag patch-aj
   Added Files:
        pkgsrc/security/mit-krb5/patches: patch-ak
   Removed Files:
        pkgsrc/security/mit-krb5/patches: patch-ai

   Log Message:
   Updated security/mit-krb5 to krb5-1.4.
   Changes from version 1.3.6 include:

   * Merged Athena telnetd changes for creating a new option for requiring
       encryption.
   * Add implementation of the RPCSEC_GSS authentication flavor to the RPC
       library.
   * The kadmind4 backwards-compatibility admin server and the v5passwdd
       backwards-compatibility password-changing server have been removed.
   * Thread safety for krb5 libraries.
   * Yarrow code now uses AES.
   * Merged Athena changes to allow ftpd to require encrypted passwords.
   * Incorporate gss_krb5_set_allowable_enctypes() and
       gss_krb5_export_lucid_sec_context(), which are needed for NFSv4.
   * Fix heap buffer overflow in password history mechanism.
       [MITKRB5-SA-2004-004]
---
   Module Name:         pkgsrc
   Committed By:        jlam
   Date:                Sun Apr 10 07:45:31 UTC 2005

   Modified Files:
        pkgsrc/security/mit-krb5: PLIST

   Log Message:
   Remove the examples directory on deinstallation.
---
   Module Name:         pkgsrc
   Committed By:        jlam
   Date:                Sun Apr 10 07:46:51 UTC 2005

   Modified Files:
        pkgsrc/security/mit-krb5: Makefile distinfo
   Added Files:
        pkgsrc/security/mit-krb5/patches: patch-al

   Log Message:
   Patch from http://web.mit.edu/kerberos/advisories/2005-001-patch_1.4.txt
   which fixes MITKRB5-SA-2005-001 (CAN-2005-0468 & CAN-2005-0469) relating
   to buffer overflows in the telnet client.  Bump PKGREVISION to 1.
---
   Module Name:         pkgsrc
   Committed By:        jlam
   Date:                Mon Apr 11 22:44:54 UTC 2005

   Modified Files:
        pkgsrc/security/mit-krb5: PLIST

   Log Message:
   The FTP daemon is always named "kftpd" regardless of whether prefix-cmds
   is a PKG_OPTION.
---
   Module Name:         pkgsrc
   Committed By:        jlam
   Date:                Thu Apr 14 23:07:55 UTC 2005

   Modified Files:
        pkgsrc/security/mit-krb5: Makefile

   Log Message:
   Remove unused section... MIT krb5 apparently now detects NetBSD's utmpx
   implementation correctly on NetBSD>=2.0.
---
   Module Name:         pkgsrc
   Committed By:        salo
   Date:                Sat Apr 16 14:32:53 UTC 2005

   Modified Files:
        pkgsrc/security/mit-krb5: buildlink3.mk

   Log Message:
   Bump BUILDLINK_RECOMMENDED for latest security fix. (hi jlam!)

diffstat:

 security/mit-krb5/Makefile         |  30 ++++-------
 security/mit-krb5/PLIST            |  29 +++++++++-
 security/mit-krb5/buildlink3.mk    |   4 +-
 security/mit-krb5/distinfo         |  27 +++++-----
 security/mit-krb5/files/kadmind.sh |  15 +----
 security/mit-krb5/files/kdc.sh     |  15 +----
 security/mit-krb5/patches/patch-aa |  20 +++---
 security/mit-krb5/patches/patch-ab |   8 +-
 security/mit-krb5/patches/patch-ac |  10 +-
 security/mit-krb5/patches/patch-ad |  62 ++++++++++++------------
 security/mit-krb5/patches/patch-ae |  15 ++---
 security/mit-krb5/patches/patch-af |  56 ++++++++++++---------
 security/mit-krb5/patches/patch-ag |  19 +++---
 security/mit-krb5/patches/patch-ai |  13 -----
 security/mit-krb5/patches/patch-aj |   6 +-
 security/mit-krb5/patches/patch-ak |  22 ++++++++
 security/mit-krb5/patches/patch-al |  96 ++++++++++++++++++++++++++++++++++++++
 17 files changed, 280 insertions(+), 167 deletions(-)

diffs (truncated from 843 to 300 lines):

diff -r ea25e824efdb -r a9782e5ef930 security/mit-krb5/Makefile
--- a/security/mit-krb5/Makefile        Thu May 12 23:54:15 2005 +0000
+++ b/security/mit-krb5/Makefile        Fri May 13 10:08:52 2005 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.16 2004/12/28 02:47:49 reed Exp $
+# $NetBSD: Makefile,v 1.16.2.1 2005/05/13 10:08:52 salo Exp $
 
-DISTNAME=      krb5-1.3.6
+DISTNAME=      krb5-1.4
 PKGNAME=       mit-${DISTNAME:S/-signed$//}
 PKGREVISION=   1
 CATEGORIES=    security
-MASTER_SITES=  http://web.mit.edu/kerberos/dist/krb5/1.3/
+MASTER_SITES=  http://web.mit.edu/kerberos/dist/krb5/1.4/
 DISTFILES=     ${DISTNAME}-signed${EXTRACT_SUFX}
 EXTRACT_SUFX=  .tar
 
@@ -44,14 +44,6 @@
 CONFIGURE_ARGS+=       --without-tcl
 MAKE_ENV+=             ROOT_USER=${ROOT_USER}
 
-# XXX Force using the BSD utmp interface on NetBSD until the configure
-# XXX scripts can be taught how to properly detect our utmpx
-# XXX implementation.
-#
-.if ${OPSYS} == "NetBSD"
-CONFIGURE_ENV+=                ac_cv_func_setutent=no
-.endif
-
 .if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS])
 PKG_DEFAULT_OPTIONS+=  prefix-cmds
 .endif
@@ -82,7 +74,7 @@
 #
 SUBST_CLASSES+=                mit-krb5
 SUBST_STAGE.mit-krb5=  pre-configure
-SUBST_FILES.mit-krb5=  include/krb5/stock/osconf.h
+SUBST_FILES.mit-krb5=  appl/bsd/Makefile.in include/krb5/stock/osconf.h
 SUBST_SED.mit-krb5=    -e "/KRB5_PATH_RLOGIN/s,/rlogin,/${KRB5_PREFIX}rlogin,g"
 
 INFO_FILES=    krb425.info krb5-admin.info krb5-install.info krb5-user.info
@@ -92,7 +84,9 @@
                        ${ROOT_USER} ${ROOT_GROUP} 0700
 RCD_SCRIPTS=           kadmind kdc
 
-INSTALLATION_DIRS=     bin info lib sbin
+INSTALLATION_DIRS=     bin include/gssapi include/gssrpc info lib      \
+                       man/man1 man/man5 man/man8 sbin                 \
+                       share/examples/krb5
 
 # The MIT krb5 distribution is actually a tar file that contains the
 # real .tar.gz distfile and a PGP signature.
@@ -110,11 +104,11 @@
        done
 
 post-install:
-       cd ${WRKSRC}/../doc; for info in ${INFO_FILES}; do              \
-               ${INSTALL_MAN} $$info ${PREFIX}/${INFO_DIR} ;           \
-               for file in $$info-[0-9]*; do                           \
-                       if [ -f "$$file" ]; then                        \
-                               ${INSTALL_MAN} $$file ${PREFIX}/${INFO_DIR}; \
+       cd ${WRKSRC}/../doc; for i in ${INFO_FILES}; do                 \
+               ${INSTALL_MAN} $$i ${PREFIX}/${INFO_DIR};               \
+               for f in $$i-[0-9]*; do                                 \
+                       if ${TEST} -f "$$f"; then                       \
+                               ${INSTALL_MAN} "$$f" ${PREFIX}/${INFO_DIR}; \
                        fi;                                             \
                done;                                                   \
        done
diff -r ea25e824efdb -r a9782e5ef930 security/mit-krb5/PLIST
--- a/security/mit-krb5/PLIST   Thu May 12 23:54:15 2005 +0000
+++ b/security/mit-krb5/PLIST   Fri May 13 10:08:52 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2004/09/22 08:09:52 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5.4.1 2005/05/13 10:08:52 salo Exp $
 bin/compile_et
 bin/gss-client
 bin/kdestroy
@@ -16,11 +16,26 @@
 bin/sclient
 bin/sim_client
 bin/uuclient
-bin/v5passwd
 include/com_err.h
 include/gssapi/gssapi.h
 include/gssapi/gssapi_generic.h
 include/gssapi/gssapi_krb5.h
+include/gssrpc/auth.h
+include/gssrpc/auth_gss.h
+include/gssrpc/auth_gssapi.h
+include/gssrpc/auth_unix.h
+include/gssrpc/clnt.h
+include/gssrpc/netdb.h
+include/gssrpc/pmap_clnt.h
+include/gssrpc/pmap_prot.h
+include/gssrpc/pmap_rmt.h
+include/gssrpc/rename.h
+include/gssrpc/rpc.h
+include/gssrpc/rpc_msg.h
+include/gssrpc/svc.h
+include/gssrpc/svc_auth.h
+include/gssrpc/types.h
+include/gssrpc/xdr.h
 include/krb5.h
 include/profile.h
 lib/libcom_err.la
@@ -32,13 +47,14 @@
 lib/libkadm5srv.la
 lib/libkdb5.la
 lib/libkrb5.la
-man/man1/compile_et.1
+lib/libkrb5support.la
 man/man1/kdestroy.1
 man/man1/kerberos.1
 man/man1/kftp.1
 man/man1/kinit.1
 man/man1/klist.1
 man/man1/kpasswd.1
+man/man1/krb5-config.1
 man/man1/krb5-send-pr.1
 man/man1/${KRB5_PREFIX}rcp.1
 man/man1/${KRB5_PREFIX}rlogin.1
@@ -47,7 +63,6 @@
 man/man1/${KRB5_PREFIX}telnet.1
 man/man1/kvno.1
 man/man1/sclient.1
-man/man1/v5passwd.1
 man/man5/.k5login.5
 man/man5/kdc.conf.5
 man/man5/krb5.conf.5
@@ -85,10 +100,14 @@
 sbin/sim_server
 sbin/sserver
 sbin/uuserver
-sbin/v5passwdd
 share/et/et_c.awk
 share/et/et_h.awk
+share/examples/krb5/kdc.conf
+share/examples/krb5/krb5.conf
+share/examples/krb5/services.append
 share/gnats/mit
 @dirrm share/gnats
+@dirrm share/examples/krb5
 @dirrm share/et
+@dirrm include/gssrpc
 @dirrm include/gssapi
diff -r ea25e824efdb -r a9782e5ef930 security/mit-krb5/buildlink3.mk
--- a/security/mit-krb5/buildlink3.mk   Thu May 12 23:54:15 2005 +0000
+++ b/security/mit-krb5/buildlink3.mk   Fri May 13 10:08:52 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.3.4.1 2005/05/13 10:08:52 salo Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 MIT_KRB5_BUILDLINK3_MK:=       ${MIT_KRB5_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
 
 .if !empty(MIT_KRB5_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mit-krb5+=           mit-krb5>=1.3.1
-BUILDLINK_RECOMMENDED.mit-krb5+=       mit-krb5>=1.3.4nb3
+BUILDLINK_RECOMMENDED.mit-krb5+=       mit-krb5>=1.4nb1
 BUILDLINK_PKGSRCDIR.mit-krb5?=         ../../security/mit-krb5
 .endif # MIT_KRB5_BUILDLINK3_MK
 
diff -r ea25e824efdb -r a9782e5ef930 security/mit-krb5/distinfo
--- a/security/mit-krb5/distinfo        Thu May 12 23:54:15 2005 +0000
+++ b/security/mit-krb5/distinfo        Fri May 13 10:08:52 2005 +0000
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 13:10:08 agc Exp $
+$NetBSD: distinfo,v 1.8.2.1 2005/05/13 10:08:52 salo Exp $
 
-SHA1 (krb5-1.3.6-signed.tar) = 5d9c7a594a0fc972d220e5bc345e8680a89e7b6d
-RMD160 (krb5-1.3.6-signed.tar) = baa36413ab629f2f7180043c4836d2c23553ae53
-Size (krb5-1.3.6-signed.tar) = 6533120 bytes
-SHA1 (patch-aa) = 2f4e62e7c8cdee2f58f8dd5b385faea0253c0aa5
-SHA1 (patch-ab) = b9f2f54f9ecfe9eaa168bb68b695a454ac044b9d
-SHA1 (patch-ac) = e1282a6f00e439d83444f5d8f81dceab863ab1d5
-SHA1 (patch-ad) = 819bfde3e63b70db6204d03fe22f33641b2a1568
-SHA1 (patch-ae) = 7e55b4e13b538ea44fe08d4db2e125c7c91c4d4b
-SHA1 (patch-af) = 7c6799dcfa50a405e27119ede6763bda73e85462
-SHA1 (patch-ag) = aadf6c229815fb9780016644728f5cf615c075d8
+SHA1 (krb5-1.4-signed.tar) = fa354aaaeb5ac5039653ebd249b1e3f9273a7a29
+RMD160 (krb5-1.4-signed.tar) = 0231e55c56f3d6d20aee3ca1bcb77b0eeaeabaae
+Size (krb5-1.4-signed.tar) = 6625280 bytes
+SHA1 (patch-aa) = 17e0934ea2ef21b3457fba54cf3d1c36de2da479
+SHA1 (patch-ab) = 8d6904b80e8576085acbaa3ac0cd17824c7b301d
+SHA1 (patch-ac) = d0777e6005cd1249c7c6406068973f6959d11302
+SHA1 (patch-ad) = 02d4b5b4a54f18d27ef73394dc7cb9cdcd791b25
+SHA1 (patch-ae) = fc6d5e11cd827cdfbe1bfc3a3c7ca9f5a71c17d7
+SHA1 (patch-af) = c9631743e3c93aee2aab5c8a370e9bebfc4084e5
+SHA1 (patch-ag) = 52a794b5fa0d1573bb2c9e7c4d233212d767d0e0
 SHA1 (patch-ah) = 59a6bfc341a22234b38db406abe83b0d6d358a9f
-SHA1 (patch-ai) = 51ebf1d271f1e399da1a8d2ed03ad10014414d35
-SHA1 (patch-aj) = 573d4b9cbffcf80635356e300eb88fe72de82667
+SHA1 (patch-aj) = 5c633571ea932ce349065cbb4c3bf482cc971675
+SHA1 (patch-ak) = 9d95372fd8edddbf0366e83a51d7a0b8a507f218
+SHA1 (patch-al) = dbfae9ee81ba7b0367bc874fe60d1c256f8c5cf1
diff -r ea25e824efdb -r a9782e5ef930 security/mit-krb5/files/kadmind.sh
--- a/security/mit-krb5/files/kadmind.sh        Thu May 12 23:54:15 2005 +0000
+++ b/security/mit-krb5/files/kadmind.sh        Fri May 13 10:08:52 2005 +0000
@@ -1,24 +1,17 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: kadmind.sh,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
+# $NetBSD: kadmind.sh,v 1.1.1.1.8.1 2005/05/13 10:08:52 salo Exp $
 #
 # PROVIDE: kadmind
 # REQUIRE: kdc
 # BEFORE:  SERVERS
 
-if [ -f /etc/rc.subr ]; then
-       . /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="kadmind"
 rcvar=$name
 command="@PREFIX@/sbin/${name}"
 required_files="@PKG_SYSCONFDIR@/krb5.conf @MIT_KRB5_STATEDIR@/krb5kdc/kdc.conf"
 
-if [ -f /etc/rc.subr ]; then
-       load_rc_config $name
-       run_rc_command "$1"
-else
-       @ECHO@ -n " ${name}"
-       ${command} ${kadmind_flags}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff -r ea25e824efdb -r a9782e5ef930 security/mit-krb5/files/kdc.sh
--- a/security/mit-krb5/files/kdc.sh    Thu May 12 23:54:15 2005 +0000
+++ b/security/mit-krb5/files/kdc.sh    Fri May 13 10:08:52 2005 +0000
@@ -1,24 +1,17 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: kdc.sh,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
+# $NetBSD: kdc.sh,v 1.1.1.1.8.1 2005/05/13 10:08:52 salo Exp $
 #
 # PROVIDE: kdc
 # REQUIRE: NETWORKING
 # BEFORE:  SERVERS
 
-if [ -f /etc/rc.subr ]; then
-       . /etc/rc.subr
-fi
+. /etc/rc.subr
 
 name="kdc"
 rcvar=$name
 command="@PREFIX@/sbin/krb5kdc"
 required_files="@PKG_SYSCONFDIR@/krb5.conf @MIT_KRB5_STATEDIR@/krb5kdc/kdc.conf"
 
-if [ -f /etc/rc.subr ]; then
-       load_rc_config $name
-       run_rc_command "$1"
-else
-       @ECHO@ -n " ${name}"
-       ${command} ${kdc_flags}
-fi
+load_rc_config $name
+run_rc_command "$1"
diff -r ea25e824efdb -r a9782e5ef930 security/mit-krb5/patches/patch-aa
--- a/security/mit-krb5/patches/patch-aa        Thu May 12 23:54:15 2005 +0000
+++ b/security/mit-krb5/patches/patch-aa        Fri May 13 10:08:52 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/30 18:07:18 jlam Exp $
+$NetBSD: patch-aa,v 1.1.1.1.8.1 2005/05/13 10:08:52 salo Exp $
 
---- aclocal.m4.orig    Wed May 28 00:06:24 2003
+--- aclocal.m4.orig    2005-01-14 19:10:44.000000000 -0500
 +++ aclocal.m4
-@@ -970,8 +970,10 @@ dnl Pull in the necessary stuff to creat
+@@ -1113,8 +1113,10 @@ dnl Pull in the necessary stuff to creat
  
  AC_DEFUN(KRB5_BUILD_LIBRARY,
  [KRB5_BUILD_LIBRARY_WITH_DEPS
@@ -15,7 +15,7 @@
  
  dnl
  dnl KRB5_BUILD_LIBRARY_STATIC
-@@ -1015,6 +1017,9 @@ AC_SUBST(SHLIBVEXT)
+@@ -1162,6 +1164,9 @@ AC_SUBST(SHLIBVEXT)
  AC_SUBST(SHLIBSEXT)
  AC_SUBST(DEPLIBEXT)
  AC_SUBST(PFLIBEXT)
@@ -25,7 +25,7 @@
  AC_SUBST(LIBINSTLIST)])
  
  dnl
-@@ -1028,6 +1033,7 @@ AC_SUBST(OBJLISTS)
+@@ -1175,6 +1180,7 @@ AC_SUBST(OBJLISTS)
  AC_SUBST(STOBJEXT)
  AC_SUBST(SHOBJEXT)
  AC_SUBST(PFOBJEXT)
@@ -33,7 +33,7 @@
  AC_SUBST(PICFLAGS)
  AC_SUBST(PROFFLAGS)])
  
-@@ -1077,6 +1083,8 @@ else
+@@ -1226,6 +1232,8 @@ else



Home | Main Index | Thread Index | Old Index