diff options
| author | Leonardo Arena <rnalrd@gmail.com> | 2010-06-08 11:14:24 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@gmail.com> | 2010-06-08 11:14:24 +0000 |
| commit | 93d76f11f31a9352e06d56574b3d92b9f010dc19 (patch) | |
| tree | 401649ffad582e8e37582c874024e4f32fdeb4a1 /main/heimdal | |
| parent | 788f5feb8db8c71f02240def1ddedee1d9e288d3 (diff) | |
| download | aports-93d76f11f31a9352e06d56574b3d92b9f010dc19.tar.bz2 aports-93d76f11f31a9352e06d56574b3d92b9f010dc19.tar.xz | |
main/heimdal: upgrade to 1.3.3
Diffstat (limited to 'main/heimdal')
| -rw-r--r-- | main/heimdal/APKBUILD | 14 | ||||
| -rw-r--r-- | main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch | 26 |
2 files changed, 4 insertions, 36 deletions
diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index cb867c72a1..92a0eda1c0 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> # Contributor: Natanael Copa <ncopa@alpinelinux.org> pkgname=heimdal -pkgver=1.3.1 -pkgrel=5 +pkgver=1.3.3 +pkgrel=0 pkgdesc="An implementation of Kerberos 5" url="http://www.h5l.org/" license="BSD" @@ -20,9 +20,7 @@ source="http://www.h5l.org/dist/src/$pkgname-$pkgver.tar.gz 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 -return-invalid-enctype-for-weak-crypto.patch " # krb5.h needs com_err.h @@ -40,9 +38,7 @@ prepare() { 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 - patch -Np1 -i ../return-invalid-enctype-for-weak-crypto.patch || return 1 # name clash with ruserpass in netdb.h sed -i -e 's/ruserpass/ruserpw/g' appl/ftp/ftp/*.[ch] || return 1 @@ -169,7 +165,7 @@ kf() { mv $pkgdir/usr/bin/kf $subpkgdir/usr/bin/kf } -md5sums="4ce17deae040a3519e542f48fd901f21 heimdal-1.3.1.tar.gz +md5sums="963c09f1b14c41660be70b55fae9f163 heimdal-1.3.3.tar.gz 98e28f11f906c967aac22d6184102c9e 001_all_heimdal-no_libedit.patch 6d5571bdedba2e2423b90bccdbac2c0a 002_all_heimdal-fPIC.patch 2feec3924ee5230b54175b4d4000c872 003_all_heimdal-rxapps.patch @@ -177,6 +173,4 @@ md5sums="4ce17deae040a3519e542f48fd901f21 heimdal-1.3.1.tar.gz 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 -a8342f77a1aedb4f332983bcbf141827 return-invalid-enctype-for-weak-crypto.patch" +248ab80b44568171e432a23524f4fe39 heimdal-locate_plugin-header.patch" diff --git a/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch b/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch deleted file mode 100644 index c688794533..0000000000 --- a/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- heimdal-1.3.1-old/lib/krb5/cache.c Sat Nov 21 15:41:51 2009 -+++ heimdal-1.3.1/lib/krb5/cache.c Thu Jan 21 09:12:13 2010 -@@ -1347,10 +1347,11 @@ - * - */ - --struct krb5_cccol_cursor { -+struct krb5_cccol_cursor_data { - int idx; - krb5_cc_cache_cursor cursor; - }; -+/* typedef of krb5_cccol_cursor is in krb5.h */ - - /** - * Get a new cache interation cursor that will interate over all ---- heimdal-1.3.1-old/lib/krb5/krb5.h Sat Nov 21 15:41:51 2009 -+++ heimdal-1.3.1/lib/krb5/krb5.h Thu Jan 21 09:12:54 2010 -@@ -311,7 +311,7 @@ - NULL) - - typedef void *krb5_cc_cursor; --typedef struct krb5_cccol_cursor *krb5_cccol_cursor; -+typedef struct krb5_cccol_cursor_data *krb5_cccol_cursor; - - typedef struct krb5_ccache_data { - const struct krb5_cc_ops *ops; |