diff options
author | Seemant Kulleen <seemant@gentoo.org> | 2007-04-03 20:51:40 +0000 |
---|---|---|
committer | Seemant Kulleen <seemant@gentoo.org> | 2007-04-03 20:51:40 +0000 |
commit | 402180541e509d0b08edcb09d66f55951db92e2e (patch) | |
tree | cf5d5532b1ea4a1e2795038a3c912a4a88cac50b /app-crypt | |
parent | remove old insecure version (diff) | |
download | gentoo-2-402180541e509d0b08edcb09d66f55951db92e2e.tar.gz gentoo-2-402180541e509d0b08edcb09d66f55951db92e2e.tar.bz2 gentoo-2-402180541e509d0b08edcb09d66f55951db92e2e.zip |
misc fixes
(Portage version: 2.1.2.3)
Diffstat (limited to 'app-crypt')
-rw-r--r-- | app-crypt/mit-krb5/ChangeLog | 11 | ||||
-rw-r--r-- | app-crypt/mit-krb5/files/digest-mit-krb5-1.5.2-r2 | 3 | ||||
-rw-r--r-- | app-crypt/mit-krb5/files/kdc.conf | 16 | ||||
-rw-r--r-- | app-crypt/mit-krb5/files/krb5.conf | 21 | ||||
-rw-r--r-- | app-crypt/mit-krb5/files/krb5.confd | 9 | ||||
-rw-r--r-- | app-crypt/mit-krb5/files/krb5.initd | 60 | ||||
-rw-r--r-- | app-crypt/mit-krb5/files/mit-krb5-notermcap.patch | 28 | ||||
-rw-r--r-- | app-crypt/mit-krb5/mit-krb5-1.4.3-r3.ebuild | 23 | ||||
-rw-r--r-- | app-crypt/mit-krb5/mit-krb5-1.5.2-r2.ebuild | 101 |
9 files changed, 125 insertions, 147 deletions
diff --git a/app-crypt/mit-krb5/ChangeLog b/app-crypt/mit-krb5/ChangeLog index afefa04781f9..383472932d02 100644 --- a/app-crypt/mit-krb5/ChangeLog +++ b/app-crypt/mit-krb5/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-crypt/mit-krb5 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.147 2007/04/03 20:19:13 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/ChangeLog,v 1.148 2007/04/03 20:51:40 seemant Exp $ + +*mit-krb5-1.5.2-r2 (03 Apr 2007) + + 03 Apr 2007; Seemant Kulleen <seemant@gentoo.org> -files/krb5.confd, + -files/kdc.conf, -files/krb5.conf, -files/krb5.initd, + -files/mit-krb5-notermcap.patch, mit-krb5-1.4.3-r3.ebuild, + +mit-krb5-1.5.2-r2.ebuild: + Added a warning about the db switch, closing bug #143605 by Olivier Calle, + and a suggestion from Doug Paul *mit-krb5-1.5.2-r1 (03 Apr 2007) diff --git a/app-crypt/mit-krb5/files/digest-mit-krb5-1.5.2-r2 b/app-crypt/mit-krb5/files/digest-mit-krb5-1.5.2-r2 new file mode 100644 index 000000000000..acc96e7682b6 --- /dev/null +++ b/app-crypt/mit-krb5/files/digest-mit-krb5-1.5.2-r2 @@ -0,0 +1,3 @@ +MD5 4d1452f775281f5da62e8fde0b517692 krb5-1.5.2-signed.tar 10086400 +RMD160 b8eca92373155eac0661721f0c65777673d4654e krb5-1.5.2-signed.tar 10086400 +SHA256 1db46e506fbc0b1a274cb00c3fda5b5e4de832ce40c209e4f6603adcdf2e770e krb5-1.5.2-signed.tar 10086400 diff --git a/app-crypt/mit-krb5/files/kdc.conf b/app-crypt/mit-krb5/files/kdc.conf deleted file mode 100644 index 3cf14aafc434..000000000000 --- a/app-crypt/mit-krb5/files/kdc.conf +++ /dev/null @@ -1,16 +0,0 @@ -[kdcdefaults] - kdc_ports = 88,750 - -[realms] - EXAMPLE.COM = { - database_name = /etc/krb5kdc/principal - admin_keytab = /etc/krb5kdc/kadm5.keytab - acl_file = /etc/krb5kdc/kadm5.acl - dict_file = /etc/krb5kdc/kadm5.dict - key_stash_file = /etc/krb5kdc/.k5.EXAMPLE.COM - kadmind_port = 749 - max_life = 10h 0m 0s - max_renewable_life = 7d 0h 0m 0s - master_key_type = des3-hmac-sha1 - supported_enctypes = des3-hmac-sha1:normal des-cbc-crc:normal - } diff --git a/app-crypt/mit-krb5/files/krb5.conf b/app-crypt/mit-krb5/files/krb5.conf deleted file mode 100644 index 3dc26ba531da..000000000000 --- a/app-crypt/mit-krb5/files/krb5.conf +++ /dev/null @@ -1,21 +0,0 @@ -[libdefaults] - renew_lifetime = 600 - default_realm = EXAMPLE.COM - default_tkt_enctypes = des3-hmac-sha1 des-cbc-crc - default_tgs_enctypes = des3-hmac-sha1 des-cbc-crc - -[realms] - EXAMPLE.COM = { - kdc = kerberos.example.com:88 - kdc = kerberos2.example.com:88 - admin_server = kerberos.example.com:749 - } - -[domain_realm] - .example.com = EXAMPLE.COM - example.com = EXAMPLE.COM - -[logging] - kdc = FILE:/var/log/krb5kdc.log - admin_server = FILE:/var/log/kadmin.log - default = FILE:/var/log/krb5lib.log diff --git a/app-crypt/mit-krb5/files/krb5.confd b/app-crypt/mit-krb5/files/krb5.confd deleted file mode 100644 index 56dbcfc5a291..000000000000 --- a/app-crypt/mit-krb5/files/krb5.confd +++ /dev/null @@ -1,9 +0,0 @@ -# Config file for /etc/init.d/conf - -# Uncomment the KRB5_KDC_MASTER line if this machine will serve as the -# master KDC. -#KRB5_KDC_MASTER=yes - -# Uncomment the KRB5_KDC line if this machine will serve as a backup KDC -#KRB5_KDC=yes - diff --git a/app-crypt/mit-krb5/files/krb5.initd b/app-crypt/mit-krb5/files/krb5.initd deleted file mode 100644 index d8072c07c785..000000000000 --- a/app-crypt/mit-krb5/files/krb5.initd +++ /dev/null @@ -1,60 +0,0 @@ -#!/sbin/runscript - -#--------------------------------------------------------------------------- -# This script starts/stops the following -# krb5kdc -# kadmind -#--------------------------------------------------------------------------- -# -# NB: Config is in /etc/krb5.conf -# KRB5_KDC set in /etc/conf.d/krb5 -# KRB5_KDC_MASTER set in /etc/conf.d/krb5 -# - -opts="start stop restart" - - -depend() { - need net -} - - -start() { - if [ -f /etc/krb5.conf ] - then - if [ -n "$KRB5_KDC$KRB5_KDC_MASTER" ]; then - daemon="Kerberos 5 KDC" - ebegin "Starting $daemon" - start-stop-daemon --start --quiet --exec /usr/sbin/krb5kdc 1>&2 - eend $? "Error starting $daemon" - fi - - if [ -n "$KRB5_KDC_MASTER" ]; then - daemon="Kerberos 5 Admin daemon" - ebegin "Starting $daemon" - start-stop-daemon --start --quiet --exec /usr/sbin/kadmind 1>&2 - eend $? "Error starting $daemon" - fi - fi -} - -stop() { - if [ -n "$KRB5_KDC$KRB5_KDC_MASTER" ]; then - daemon="Kerberos 5 KDC" - ebegin "Stopping $daemon" - start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/krb5kdc 1>&2 - eend $? "Error stopping $daemon" - fi - - if [ -n "$KRB5_KDC_MASTER" ]; then - daemon="Kerberos 5 Admin daemon" - ebegin "Stopping $daemon" - start-stop-daemon --stop --quiet --oknodo --exec /usr/sbin/kadmind 1>&2 - eend $? "Error stopping $daemon" - fi -} - -restart() { - svc_stop - svc_start -} diff --git a/app-crypt/mit-krb5/files/mit-krb5-notermcap.patch b/app-crypt/mit-krb5/files/mit-krb5-notermcap.patch deleted file mode 100644 index e4962884c665..000000000000 --- a/app-crypt/mit-krb5/files/mit-krb5-notermcap.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- src/appl/telnet/configure.in.old 2006-06-28 17:42:55.000000000 +0200 -+++ src/appl/telnet/configure.in 2006-06-28 17:43:03.000000000 +0200 -@@ -50,11 +50,9 @@ - #endif - ]) - dnl --AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) --LIBS="$LIBS -ltermcap", - AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", - AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses") --)) -+) - KRB5_AC_INET6 - AC_CHECK_FUNCS(setupterm) - AC_CHECK_HEADER(termios.h,AC_DEFINE(USE_TERMIO) ac_termio=1) -@@ -96,11 +94,9 @@ - dnl from old telnetd/configure.in - dnl - dnl AC_PROG_INSTALL --AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) --LIBS="$LIBS -ltermcap", - AC_CHECK_LIB(curses,setupterm,LIBS="$LIBS -lcurses", - AC_CHECK_LIB(ncurses,setupterm,LIBS="$LIBS -lncurses") --)) -+) - dnl ... whole termios.h/termio.h/NO_CC_T thing again ... - AC_HEADER_TIME - dnl KRB5_AC_INET6 diff --git a/app-crypt/mit-krb5/mit-krb5-1.4.3-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.4.3-r3.ebuild index 95eeb877e49d..a8b42d05638f 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.4.3-r3.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.4.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.3-r3.ebuild,v 1.11 2007/01/06 18:26:36 drizzt Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.4.3-r3.ebuild,v 1.12 2007/04/03 20:51:40 seemant Exp $ inherit eutils flag-o-matic versionator autotools @@ -14,7 +14,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar" LICENSE="as-is" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86" -IUSE="krb4 tcl ipv6 doc" +IUSE="krb4 tcl ipv6 doc berkdb" RDEPEND="!virtual/krb5 sys-libs/com_err @@ -24,6 +24,15 @@ DEPEND="${RDEPEND} doc? ( virtual/tetex )" PROVIDE="virtual/krb5" +pkg_setup() { + if use berkdb ; then + eerror "Please export your current kerberos db because" + eerror "we are now using the built-in db with its new locations" + eerror "Once you have exported your db, please set the -berkdb" + eerror "USE flag for this package" + fi +} + src_unpack() { unpack ${MY_P}-signed.tar unpack ./${MY_P}.tar.gz @@ -99,14 +108,4 @@ src_install() { pkg_postinst() { elog "See /usr/share/doc/${PF}/html/krb5-admin/index.html for documentation." - echo "" - echo "" - ewarn "PLEASE READ THIS" - ewarn "This release of mit-krb5 now depends on an external version" - ewarn "of the com_err library. Please make sure to run revdep-rebuild" - ewarn "to ensure the integrity of the linking on your system" - echo "" - epause 10 - ebeep - } diff --git a/app-crypt/mit-krb5/mit-krb5-1.5.2-r2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.5.2-r2.ebuild new file mode 100644 index 000000000000..3d15360252d0 --- /dev/null +++ b/app-crypt/mit-krb5/mit-krb5-1.5.2-r2.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.5.2-r2.ebuild,v 1.1 2007/04/03 20:51:40 seemant Exp $ + +inherit eutils flag-o-matic versionator autotools + +MY_P=${P/mit-} +P_DIR=$(get_version_component_range 1-2) +S=${WORKDIR}/${MY_P}/src +DESCRIPTION="MIT Kerberos V" +HOMEPAGE="http://web.mit.edu/kerberos/www/" +SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="krb4 tcl ipv6 doc" + +RDEPEND="!virtual/krb5 + sys-libs/com_err + sys-libs/ss + tcl? ( dev-lang/tcl )" +DEPEND="${RDEPEND} + doc? ( virtual/tetex )" +PROVIDE="virtual/krb5" + +src_unpack() { + unpack ${MY_P}-signed.tar + unpack ./${MY_P}.tar.gz + cd "${S}" + epatch "${FILESDIR}"/${PN}-lazyldflags.patch + epatch "${FILESDIR}"/${PN}-SA-2007-001-telnetd.patch + epatch "${FILESDIR}"/${PN}-SA-2007-002-syslog.patch + epatch "${FILESDIR}"/${PN}-SA-2007-003.patch + ebegin "Reconfiguring configure scripts (be patient)" + cd "${S}"/appl/telnet + eautoconf --force -I "${S}" + eend $? +} + +src_compile() { + econf \ + $(use_with krb4) \ + $(use_with tcl) \ + $(use_enable ipv6) \ + --enable-shared \ + --with-system-et --with-system-ss \ + --enable-dns-for-realm \ + --enable-kdc-replay-cache || die + + emake -j1 || die + + if use doc ; then + cd ../doc + for dir in api implement ; do + make -C ${dir} || die + done + fi +} + +src_test() { + einfo "Testing is being debugged, disabled for now" +} + +src_install() { + emake \ + DESTDIR="${D}" \ + EXAMPLEDIR=/usr/share/doc/${PF}/examples \ + install || die + + keepdir /var/lib/krb5kdc + + cd .. + dodoc README + dodoc doc/*.ps + doinfo doc/*.info* + dohtml -r doc/* + + use doc && dodoc doc/{api,implement}/*.ps + + for i in {telnetd,ftpd} ; do + mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8 + mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i} + done + + for i in {rcp,rlogin,rsh,telnet,ftp} ; do + mv "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1 + mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i} + done + + newinitd "${FILESDIR}"/mit-krb5kadmind.initd mit-krb5kadmind + newinitd "${FILESDIR}"/mit-krb5kdc.initd mit-krb5kdc + + insinto /etc + newins ${D}/usr/share/doc/${PF}/examples/krb5.conf krb5.conf.example + newins ${D}/usr/share/doc/${PF}/examples/kdc.conf kdc.conf.example +} + +pkg_postinst() { + elog "See /usr/share/doc/${PF}/html/krb5-admin/index.html for documentation." +} |