summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Hammer <mueli@gentoo.org>2008-07-31 10:59:33 +0000
committerMichael Hammer <mueli@gentoo.org>2008-07-31 10:59:33 +0000
commitbababc0851fadfa78053f403501173e4952c5c06 (patch)
tree93b9a056993ad5cd2ba97d6d94e4e8d80bf34c95 /app-crypt
parent- metadata.xml -> GLEP56 (diff)
downloadhistorical-bababc0851fadfa78053f403501173e4952c5c06.tar.gz
historical-bababc0851fadfa78053f403501173e4952c5c06.tar.bz2
historical-bababc0851fadfa78053f403501173e4952c5c06.zip
added patches - were missing in last commit :(
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/heimdal/ChangeLog8
-rw-r--r--app-crypt/heimdal/Manifest6
-rw-r--r--app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch199
-rw-r--r--app-crypt/heimdal/files/heimdal-symlinked-manpages.patch32
-rw-r--r--app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild142
5 files changed, 241 insertions, 146 deletions
diff --git a/app-crypt/heimdal/ChangeLog b/app-crypt/heimdal/ChangeLog
index 383d230158e3..004cc354b16f 100644
--- a/app-crypt/heimdal/ChangeLog
+++ b/app-crypt/heimdal/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-crypt/heimdal
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.122 2008/07/31 10:52:13 mueli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/ChangeLog,v 1.123 2008/07/31 10:59:32 mueli Exp $
+
+ 31 Jul 2008; Michael Hammer <mueli@gentoo.org>
+ +files/heimdal-autoconf-ipv6-backport.patch,
+ +files/heimdal-symlinked-manpages.patch, -heimdal-1.2.1_rc1-r1.ebuild:
+ - removed heimdal 1.2.1 release candidate
+ - added patches for manpage symlinks and the ipv6 glibc bug
*heimdal-1.2.1 (31 Jul 2008)
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 02dada7803b9..3b16e7df46cb 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,15 +1,15 @@
AUX heimdal-0.7.2-as_needed.patch 853 RMD160 5c03f5008e395e87c48f89fe91828e0d034de7db SHA1 0b4dda9830d36185055b66976436545e3daa926b SHA256 640969f1ebe65bae204d45b076dbd488f62a4fd5cf6d96bdc5373423e71f39e3
+AUX heimdal-autoconf-ipv6-backport.patch 4521 RMD160 0ee4317834939d23bd34cce02034bd3de7eb1022 SHA1 768461c3a40d55ecae3872c8957249fef0e71201 SHA256 6a1f8d23072e5b5a2253e3eb0fc931a4dc7f0be8076466b0f8993e644de5248f
AUX heimdal-kdc-sans_pkinit.patch 500 RMD160 7ed56129127af088d4c10533abf178aa72bf3c8f SHA1 eda1939bf276bfc260981eb7ee770b4adde6070c SHA256 8d7f04189c897706ed8adae6cd81bab9bf5f2eb593d5e630c33eccd017bb8e4c
AUX heimdal-r23235-kb5-libwind_la.patch 270 RMD160 17784aca21208c3ae29b1e26a45e6394af8d55b5 SHA1 72466a7a8623d759121dbb765cd660b8582ad73c SHA256 0df907bf80298845480a415368bd492eb177fe4e8a11e83d2f1d124e9d889f5b
AUX heimdal-r23238-kb5_locl_h-wind_h.patch 328 RMD160 0cab54e8605b56ed0168e2f680bee2c1386ec035 SHA1 6058f52df83ce0f04ac9d70e8c465ea88d1dca62 SHA256 abb7522a6675cc362fdb9b95096a69423b5742ea311bca4c7100cf0f5a71c1ec
+AUX heimdal-symlinked-manpages.patch 1104 RMD160 e76c9089229a1a5a87807c306a73d5bb5be7936e SHA1 f256e1f9193d9dfb061086a221ce3567b6626cda SHA256 f8c45e49c0d4366e133d01172c92a01050b48fea21160da439563ca927598956
AUX heimdal-system_sqlite.patch 1861 RMD160 fa9cf71fef33b3e434f8d3a5bce5c51f0d3c97e5 SHA1 9255730737444febe78ebc47f246893e3887e880 SHA256 79abe4fae56218066b6827989d22d1e0ea1060c027f3698370d1cf7988b487de
DIST heimdal-0.7.2-gentoo-patches-0.2.tar.bz2 7500 RMD160 87240de8914b05c552ceb7d2f92e7de68dad21b7 SHA1 f4b33a9816e973bee0fb99b3791e57e019161111 SHA256 cfbec87dcbab67941de5897370fc9e0b3a085292f53cbeb20b8e9d2667109c05
DIST heimdal-0.7.2.tar.gz 4525734 RMD160 0f028a9d5a6a66e8efc0397e4d8c8adc2183b409 SHA1 a902e6ad7c31d940b588dc0235b348936f0d719d SHA256 28661862ac8cbbd62ddddbda7db760b622b903c88c06f2fbdbf7b97be47eac60
DIST heimdal-1.2.1.tar.gz 5234882 RMD160 055e858200e53108ac24760516ff9d58e4fee0d2 SHA1 68b013a68bca7d544d29af0f890b9c668ec16936 SHA256 4e32be8d42824f2c58dffa435300e2dd0f0c3bbc6931afcbd450122067f76493
-DIST heimdal-1.2.1rc1.tar.gz 5234689 RMD160 70e693e60c32edd33034b780808f715a77fa33e9 SHA1 20d3cb4a647c03e08d8e07f6911fccfaf260f6d3 SHA256 6a420676a8b8f141df5b89176665ca176de6ab776abca3f21898d4f6bb5b8ff2
DIST heimdal-gentoo-patches-0.2.tar.bz2 5215 RMD160 f6b87d3caf8f156fdcf7c61542ea612cdcd42d9a SHA1 2282ea687e2cc215bf77a61b9badfb4a347b2792 SHA256 c4074b06760e28ac9a9bd5f1bc54dd86f1c104463384ca2f79918029995bb45a
EBUILD heimdal-0.7.2-r3.ebuild 3545 RMD160 ab053bc40e0cc7692e7bc902798891afc0ddb4f7 SHA1 4b627bb6e3ce87a20c666c5cbf57c5a831ff6323 SHA256 108737e78593d09d97b9661e1f182e02b2911d5289d9b484d87f4869c30f56a1
EBUILD heimdal-1.2.1.ebuild 4122 RMD160 066e5421047e74a1fdd17e8217a3c07baecbe27f SHA1 e1bf13534537fe5238ee5506904e2575de2b31e5 SHA256 4e3a184defcb4846d3deecb46dce332c860af5f2e8617fceef333191b2437593
-EBUILD heimdal-1.2.1_rc1-r1.ebuild 3899 RMD160 f9640f3fb30dca47fb4dc87c422f76cc83363065 SHA1 35138ce8a9cf7674cc6adf104cbea80d04fc9737 SHA256 71857abcedb0df6779063ffc5bf1c3c5e1e26f9f0e3d5f69aa4475e340361b40
-MISC ChangeLog 20243 RMD160 86a22baa31cea50e17d9d48adf9ab0ac7b671d36 SHA1 88b6e86f1341fae2bf5ee2ecdb4a52711bd636f1 SHA256 ab0d09195ddc73c666711de7d7d204d817fa6e2dc2d9c3b9ee33a5672160a7d9
+MISC ChangeLog 20519 RMD160 8920f6fef7667848b2b2c82944d6e0fcc602f107 SHA1 d6f1f6373ccbf0bbccbbb3b8b674a24bd56a3d11 SHA256 baa985d6791e4f35cf0afd36964c60a857974d38c080dd1727faf78ce983e791
MISC metadata.xml 1086 RMD160 a5ee11683dbfe929a061ce2b4f1967ae61b86d5d SHA1 95cc60a2a78fb4cd71e336a9a05b47fdfa7d1715 SHA256 581e15be965c0fe6246010854acabb2fce21a7afdb9c669e46bacd5440514fec
diff --git a/app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch b/app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch
new file mode 100644
index 000000000000..82bb36cf22c9
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-autoconf-ipv6-backport.patch
@@ -0,0 +1,199 @@
+Index: cf/krb-ipv6.m4
+===================================================================
+--- cf/krb-ipv6.m4 (revision 23011)
++++ cf/krb-ipv6.m4 (working copy)
+@@ -2,94 +2,97 @@
+ dnl
+ dnl test for IPv6
+ dnl
++ac_cv_lib_ipv6=check
++
+ AC_DEFUN([AC_KRB_IPV6], [
+ AC_ARG_WITH(ipv6,
+ AS_HELP_STRING([--without-ipv6],[do not enable IPv6 support]),[
+-if test "$withval" = "no"; then
+- ac_cv_lib_ipv6=no
+-fi])
++ ac_cv_lib_ipv6="$withval"
++])
+ save_CFLAGS="${CFLAGS}"
+-AC_CACHE_CHECK([for IPv6 stack type], rk_cv_v6type,
+-[dnl check for different v6 implementations (by itojun)
+-v6type=unknown
+-v6lib=none
+
+-for i in v6d toshiba kame inria zeta linux; do
+- case $i in
+- v6d)
+- AC_EGREP_CPP(yes, [
++if test "X$ac_cv_lib_ipv6" != "Xno"; then
++
++ AC_CACHE_CHECK([for IPv6 stack type], rk_cv_v6type,
++ [dnl check for different v6 implementations (by itojun)
++ v6type=unknown
++ v6lib=none
++
++ for i in v6d toshiba kame inria zeta linux; do
++ case $i in
++ v6d)
++ AC_EGREP_CPP(yes, [
+ #include </usr/local/v6/include/sys/types.h>
+ #ifdef __V6D__
+ yes
+ #endif],
+- [v6type=$i; v6lib=v6;
+- v6libdir=/usr/local/v6/lib;
+- CFLAGS="-I/usr/local/v6/include $CFLAGS"])
+- ;;
+- toshiba)
+- AC_EGREP_CPP(yes, [
++ [v6type=$i; v6lib=v6;
++ v6libdir=/usr/local/v6/lib;
++ CFLAGS="-I/usr/local/v6/include $CFLAGS"])
++ ;;
++ toshiba)
++ AC_EGREP_CPP(yes, [
+ #include <sys/param.h>
+ #ifdef _TOSHIBA_INET6
+ yes
+ #endif],
+- [v6type=$i; v6lib=inet6;
+- v6libdir=/usr/local/v6/lib;
+- CFLAGS="-DINET6 $CFLAGS"])
+- ;;
+- kame)
+- AC_EGREP_CPP(yes, [
++ [v6type=$i; v6lib=inet6;
++ v6libdir=/usr/local/v6/lib;
++ CFLAGS="-DINET6 $CFLAGS"])
++ ;;
++ kame)
++ AC_EGREP_CPP(yes, [
+ #include <netinet/in.h>
+ #ifdef __KAME__
+ yes
+ #endif],
+- [v6type=$i; v6lib=inet6;
+- v6libdir=/usr/local/v6/lib;
+- CFLAGS="-DINET6 $CFLAGS"])
+- ;;
+- inria)
+- AC_EGREP_CPP(yes, [
++ [v6type=$i; v6lib=inet6;
++ v6libdir=/usr/local/v6/lib;
++ CFLAGS="-DINET6 $CFLAGS"])
++ ;;
++ inria)
++ AC_EGREP_CPP(yes, [
+ #include <netinet/in.h>
+ #ifdef IPV6_INRIA_VERSION
+ yes
+ #endif],
+- [v6type=$i; CFLAGS="-DINET6 $CFLAGS"])
+- ;;
+- zeta)
+- AC_EGREP_CPP(yes, [
++ [v6type=$i; CFLAGS="-DINET6 $CFLAGS"])
++ ;;
++ zeta)
++ AC_EGREP_CPP(yes, [
+ #include <sys/param.h>
+ #ifdef _ZETA_MINAMI_INET6
+ yes
+ #endif],
+- [v6type=$i; v6lib=inet6;
+- v6libdir=/usr/local/v6/lib;
+- CFLAGS="-DINET6 $CFLAGS"])
+- ;;
+- linux)
+- if test -d /usr/inet6; then
+- v6type=$i
+- v6lib=inet6
+- v6libdir=/usr/inet6
+- CFLAGS="-DINET6 $CFLAGS"
+- fi
+- ;;
+- esac
+- if test "$v6type" != "unknown"; then
+- break
+- fi
+-done
+-
+-if test "$v6lib" != "none"; then
+- for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do
+- if test -d $dir -a -f $dir/lib$v6lib.a; then
+- LIBS="-L$dir -l$v6lib $LIBS"
++ [v6type=$i; v6lib=inet6;
++ v6libdir=/usr/local/v6/lib;
++ CFLAGS="-DINET6 $CFLAGS"])
++ ;;
++ linux)
++ if test -d /usr/inet6; then
++ v6type=$i
++ v6lib=inet6
++ v6libdir=/usr/inet6
++ CFLAGS="-DINET6 $CFLAGS"
++ fi
++ ;;
++ esac
++ if test "$v6type" != "unknown"; then
+ break
+ fi
+ done
+-fi
+-])
+
+-AC_CACHE_CHECK([for IPv6], rk_cv_lib_ipv6, [
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
++ if test "$v6lib" != "none"; then
++ for dir in $v6libdir /usr/local/v6/lib /usr/local/lib; do
++ if test -d $dir -a -f $dir/lib$v6lib.a; then
++ LIBS="-L$dir -l$v6lib $LIBS"
++ break
++ fi
++ done
++ fi])
++
++ AC_CACHE_CHECK([for IPv6], rk_cv_lib_ipv6, [
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+ #endif
+@@ -103,7 +106,7 @@
+ #include <netinet/in6.h>
+ #endif
+ ]],
+-[[
++ [[
+ struct sockaddr_in6 sin6;
+ int s;
+
+@@ -114,8 +117,10 @@
+ sin6.sin6_addr = in6addr_any;
+ bind(s, (struct sockaddr *)&sin6, sizeof(sin6));
+ ]])],
+-[ac_cv_lib_ipv6=yes],
+-[ac_cv_lib_ipv6=no])])
++ [ac_cv_lib_ipv6=yes],
++ [ac_cv_lib_ipv6=no])])
++fi
++
+ if test "$ac_cv_lib_ipv6" = yes; then
+ AC_DEFINE(HAVE_IPV6, 1, [Define if you have IPv6.])
+ else
+Index: lib/roken/mini_inetd.c
+===================================================================
+--- lib/roken/mini_inetd.c (revision 14773)
++++ lib/roken/mini_inetd.c (working copy)
+@@ -83,10 +83,8 @@
+
+ for (i = 0, a = ai; a != NULL; a = a->ai_next) {
+ fds[i] = socket (a->ai_family, a->ai_socktype, a->ai_protocol);
+- if (fds[i] < 0) {
+- warn ("socket af = %d", a->ai_family);
++ if (fds[i] < 0)
+ continue;
+- }
+ socket_set_reuseaddr (fds[i], 1);
+ if (bind (fds[i], a->ai_addr, a->ai_addrlen) < 0) {
+ warn ("bind af = %d", a->ai_family);
diff --git a/app-crypt/heimdal/files/heimdal-symlinked-manpages.patch b/app-crypt/heimdal/files/heimdal-symlinked-manpages.patch
new file mode 100644
index 000000000000..3ccc9a22951c
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-symlinked-manpages.patch
@@ -0,0 +1,32 @@
+diff -NaurwB heimdal-1.2.1rc1.orig/cf/install-catman.sh heimdal-1.2.1rc1/cf/install-catman.sh
+--- heimdal-1.2.1rc1.orig/cf/install-catman.sh 2008-05-31 16:38:43.000000000 +0200
++++ heimdal-1.2.1rc1/cf/install-catman.sh 2008-07-11 01:17:51.000000000 +0200
+@@ -38,26 +38,18 @@
+ fi
+ if test "$cmd" = install ; then
+ target="$mandir/$link.$section"
+- for lncmd in "ln -f $mandir/$base.$section $target" \
+- "ln -s $base.$section $target" \
+- "cp -f $mandir/$base.$section $target"
+- do
++ lncmd="ln -sf $mandir/$base.$section $target"
+ if eval "$lncmd"; then
+ eval echo "$lncmd"
+ break
+ fi
+- done
+ if test "$catinstall" = yes -a -f "$srcdir/$c"; then
+ target="$catdir/$link.$suffix"
+- for lncmd in "ln -f $catdir/$base.$suffix $target" \
+- "ln -fs $base.$suffix $target" \
+- "cp -f $catdir/$base.$suffix $target"
+- do
++ lncmd="ln -sf $catdir/$base.$suffix $target"
+ if eval "$lncmd"; then
+ eval echo "$lncmd"
+ break
+ fi
+- done
+ fi
+ elif test "$cmd" = uninstall ; then
+ target="$mandir/$link.$section"
diff --git a/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild b/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild
deleted file mode 100644
index f658e8c2e5ef..000000000000
--- a/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/heimdal/heimdal-1.2.1_rc1-r1.ebuild,v 1.2 2008/06/14 17:43:27 mr_bones_ Exp $
-
-WANT_AUTOMAKE=latest
-WANT_AUTOCONF=latest
-
-inherit autotools libtool eutils virtualx toolchain-funcs flag-o-matic
-
-PATCHVER=0.2
-PATCH_P=${PN}-gentoo-patches-${PATCHVER}
-
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/snapshots/${P/_rc/rc}.tar.gz
- mirror://gentoo/${PATCH_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="berkdb ipv6 ssl threads X pkinit otp" # ldap ldap-shared <- circular dependency
-
-RDEPEND="ssl? ( dev-libs/openssl )
- berkdb? ( sys-libs/db )
- >=dev-db/sqlite-3.5.7
- sys-libs/ss
- sys-libs/com_err
- !virtual/krb5"
-# Sry for that - still have no cute solution to break circular dependency
-# I also want to point at http://www.h5l.org/manual/heimdal-1-1-branch/info/heimdal.html#Using-LDAP-to-store-the-database
-# I agree that it's not advicable to use LDAP as backend for kerberos
-# ldap? ( >=net-nds/openldap-2.3.0 )
-# ldap-shared? ( >=net-nds/openldap-2.3.0 )
-
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- >=sys-devel/autoconf-2.62"
-# >=sys-devel/libtool-2.2"
-PROVIDE="virtual/krb5"
-
-GENTOODIR=${WORKDIR}/gentoo
-S=${WORKDIR}/${P/_rc/rc}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- EPATCH_SUFFIX="patch" epatch "${GENTOODIR}"/patches
-
- epatch "${FILESDIR}"/heimdal-r23238-kb5_locl_h-wind_h.patch
- epatch "${FILESDIR}"/heimdal-r23235-kb5-libwind_la.patch
- epatch "${FILESDIR}"/heimdal-kdc-sans_pkinit.patch
- epatch "${FILESDIR}"/heimdal-system_sqlite.patch
-
- AT_M4DIR="cf" eautoreconf
-}
-
-src_compile() {
- local myconf=""
-
-# if use ldap || use ldap-shared ; then
-# myconf="${myconf} --with-openldap=/usr"
-# fi
-
- econf \
- $(use_with ipv6) \
- $(use_enable berkdb berkeley-db) \
- $(use_enable pkinit pk-init) \
- $(use_with ssl openssl) \
- $(use_with X x) \
- $(use_enable threads pthread-support) \
- $(use_enable otp) \
- --enable-kcm \
- --enable-shared \
- --enable-netinfo \
- --prefix=/usr \
- --libexecdir=/usr/sbin \
- ${myconf} || die "econf failed"
-# $(use_enable ldap-shared hdb-openldap-module) \
-
- local ltversion=`libtool --version |grep 'GNU libtool' |sed -e's/^.*(GNU libtool) \([0-9]\+\.[0-9]\+\(\.[0-9]\+\)\+\) .*$/\1/'`
- local ltmajor=`echo $ltversion |sed -e's/^\([0-9]\+\)\..*$/\1/'`
- local ltminor=`echo $ltversion |sed -e's/^[0-9]\+\.\([0-9]\+\)\..*$/\1/'`
- if [ $ltmajor -lt 2 ] || ( [ $ltmajor -eq 2 ] && [ $ltminor -lt 2 ] ); then
- ewarn "Using old libtool with a quick hack."
- sed -i -e's/ECHO=/echo=/' libtool
- fi
-
- emake || die "emake failed"
-
-}
-
-src_test() {
- addpredict /proc/fs/openafs/afs_ioctl
- addpredict /proc/fs/nnpfs/afs_ioctl
-
- if use X ; then
- KRB5_CONFIG="${S}"/krb5.conf Xmake check || die
- else
- KRB5_CONFIG="${S}"/krb5.conf make check || die
- fi
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
-
- dodoc ChangeLog README NEWS TODO
-
- # Begin client rename and install
- for i in {telnetd,ftpd,rshd}
- do
- mv "${D}"/usr/share/man/man8/{,k}${i}.8
- mv "${D}"/usr/sbin/{,k}${i}
- done
-
- for i in {rcp,rsh,telnet,ftp,su,login}
- do
- mv "${D}"/usr/share/man/man1/{,k}${i}.1
- mv "${D}"/usr/bin/{,k}${i}
- done
-
- mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
- mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
- doinitd "${GENTOODIR}"/configs/heimdal-kdc
- doinitd "${GENTOODIR}"/configs/heimdal-kadmind
- doinitd "${GENTOODIR}"/configs/heimdal-kpasswdd
- doinitd "${GENTOODIR}"/configs/heimdal-kcm
-
- insinto /etc
- newins "${GENTOODIR}"/configs/krb5.conf krb5.conf.example
-
- sed -i "s:/lib:/$(get_libdir):" "${D}"/etc/krb5.conf.example || die "sed failed"
-
-# if use ldap; then
-# insinto /etc/openldap/schema
-# doins "${GENTOODIR}"/configs/krb5-kdc.schema
-# fi
-
- # default database dir
- keepdir /var/heimdal
-}