summaryrefslogtreecommitdiffstats
path: root/main/heimdal
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2010-01-27 20:28:56 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2010-01-27 20:28:56 +0000
commit0d27d156cab631adb3e31efa9f93195b4da9cd0a (patch)
tree452e913d3104a19b96ea445a1401d23ad3c8fca7 /main/heimdal
parent38c0e57b47fb699c1e7d87d31db5905f22ffb71b (diff)
main/heimdal: use e2fsprogs's com_err
real fix in there.
Diffstat (limited to 'main/heimdal')
-rw-r--r--main/heimdal/100-check-com_err-pthread.patch11
-rw-r--r--main/heimdal/APKBUILD8
2 files changed, 16 insertions, 3 deletions
diff --git a/main/heimdal/100-check-com_err-pthread.patch b/main/heimdal/100-check-com_err-pthread.patch
new file mode 100644
index 00000000000..f2a4b637b03
--- /dev/null
+++ b/main/heimdal/100-check-com_err-pthread.patch
@@ -0,0 +1,11 @@
+--- heimdal-1.3.1/cf/check-compile-et.m4.orig
++++ heimdal-1.3.1/cf/check-compile-et.m4
+@@ -61,7 +61,7 @@
+ elif test "${krb_cv_compile_et}" = "yes"; then
+ dnl Since compile_et seems to work, let's check libcom_err
+ krb_cv_save_LIBS="${LIBS}"
+- LIBS="${LIBS} -lcom_err"
++ LIBS="${LIBS} -lcom_err -lpthread"
+ AC_MSG_CHECKING(for com_err)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <com_err.h>]],[[
+ const char *p;
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index 03f7c72e7ba..911b05f007d 100644
--- a/main/heimdal/APKBUILD
+++ b/main/heimdal/APKBUILD
@@ -2,12 +2,12 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
pkgname=heimdal
pkgver=1.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="An implementation of Kerberos 5"
url="http://www.h5l.org/"
license="BSD"
depends=
-makedepends="gawk readline-dev e2fsprogs-dev sqlite-dev autoconf automake
+makedepends="gawk readline-dev e2fsprogs-dev>=1.41.9-r2 sqlite-dev autoconf automake
libtool pkgconfig"
install=
subpackages="$pkgname-doc $pkgname-dev $pkgname-ftp $pkgname-telnet \
@@ -19,6 +19,7 @@ source="http://www.h5l.org/dist/src/$pkgname-$pkgver.tar.gz
005_all_heimdal-suid_fix.patch
013_all_heimdal-pthread-lib.patch
014_all_heimdal-path.patch
+100-check-com_err-pthread.patch
heimdal-c++-safe-krb5_cccol_cursor.patch
heimdal-locate_plugin-header.patch
"
@@ -37,6 +38,7 @@ prepare() {
patch -Np0 -i ../005_all_heimdal-suid_fix.patch || return 1
patch -Np1 -i ../013_all_heimdal-pthread-lib.patch || return 1
patch -Np0 -i ../014_all_heimdal-path.patch || return 1
+ patch -Np1 -i ../100-check-com_err-pthread.patch || return 1
patch -Np1 -i ../heimdal-c++-safe-krb5_cccol_cursor.patch || return 1
patch -Np1 -i ../heimdal-locate_plugin-header.patch || return 1
@@ -57,7 +59,6 @@ build() {
./configure --prefix=/usr \
--enable-shared=yes --without-x \
--disable-berkeley-db \
- --disable-netinfo \
--with-readline-lib=/usr/lib \
--with-readline-include=/usr/include/readline \
--with-openssl=/usr
@@ -159,5 +160,6 @@ md5sums="4ce17deae040a3519e542f48fd901f21 heimdal-1.3.1.tar.gz
45aeb207f360f9f4e9e0fabc8bfeecbc 005_all_heimdal-suid_fix.patch
1b8665b771c4eb6b56ea8582c96e56e3 013_all_heimdal-pthread-lib.patch
8208ae8c0b6ff5ab4f64af1693e9e396 014_all_heimdal-path.patch
+e73205200f9641b5d969427ffb04282a 100-check-com_err-pthread.patch
7ebff9a320f18ed62f5fcb68c8fc18b8 heimdal-c++-safe-krb5_cccol_cursor.patch
248ab80b44568171e432a23524f4fe39 heimdal-locate_plugin-header.patch"