main/heimdal: update to v1.3.1

7 files changed, 50 insertions, 109 deletions

diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD
index e717850d65c..8eb362284e5 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.2.1
-pkgrel=4
+pkgver=1.3.1
+pkgrel=0
 pkgdesc="An implementation of Kerberos 5"
 url="http://www.h5l.org/"
 license="BSD"
@@ -19,11 +19,8 @@ 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
-022_all_heimdal-as-needed.patch
-heimdal-system_sqlite.patch
-heimdal-r23235-kb5-libwind_la.patch
-heimdal-r23238-kb5_locl_h-wind_h.patch
-heimdal-autoconf-2.64.patch
+heimdal-c++-safe-krb5_cccol_cursor.patch
+heimdal-locate_plugin-header.patch
 "
 
 # krb5.h needs com_err.h
@@ -40,11 +37,8 @@ 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 -Np0 -i ../022_all_heimdal-as-needed.patch || return 1
-	patch -Np0 -i ../heimdal-system_sqlite.patch || return 1
-	patch -Np2 -i ../heimdal-r23235-kb5-libwind_la.patch || return 1
-	patch -Np2 -i ../heimdal-r23238-kb5_locl_h-wind_h.patch || return 1
-	patch -p1 -i ../heimdal-autoconf-2.64.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
 
 	# name clash with ruserpass in netdb.h
 	sed -i -e 's/ruserpass/ruserpw/g' appl/ftp/ftp/*.[ch] || return 1
@@ -83,9 +77,9 @@ package() {
 	install -m755 -D ../../heimdal-kpasswdd.init ${pkgdir}/etc/init.d/heimdal-kpasswdd
 
 	# Remove editline, we use libreadline
-	rm ${pkgdir}/usr/lib/libeditline.* || return 1
-	rm ${pkgdir}/usr/include/editline.h || return 1
-	rm ${pkgdir}/usr/share/man/man3/editline.* || return 1
+	#rm ${pkgdir}/usr/lib/libeditline.* || return 1
+	#rm ${pkgdir}/usr/include/editline.h || return 1
+	#rm ${pkgdir}/usr/share/man/man3/editline.* || return 1
 
 	# Rename daemons and their manpages
 	for i in telnetd ftpd rshd; do
@@ -157,15 +151,12 @@ kf() {
         mv $pkgdir/usr/bin/kf $subpkgdir/usr/bin/kf
 }
 
-md5sums="6e5028077e2a6b101a4a72801ba71b9e  heimdal-1.2.1.tar.gz
+md5sums="4ce17deae040a3519e542f48fd901f21  heimdal-1.3.1.tar.gz
 98e28f11f906c967aac22d6184102c9e  001_all_heimdal-no_libedit.patch
 6d5571bdedba2e2423b90bccdbac2c0a  002_all_heimdal-fPIC.patch
 2feec3924ee5230b54175b4d4000c872  003_all_heimdal-rxapps.patch
 45aeb207f360f9f4e9e0fabc8bfeecbc  005_all_heimdal-suid_fix.patch
 1b8665b771c4eb6b56ea8582c96e56e3  013_all_heimdal-pthread-lib.patch
 8208ae8c0b6ff5ab4f64af1693e9e396  014_all_heimdal-path.patch
-d7649e078c87d2ca997080f0deb527c0  022_all_heimdal-as-needed.patch
-949a389ebe7652861b2e178a7e0f1ed9  heimdal-system_sqlite.patch
-072f6b2550693adb30117394b1dd354e  heimdal-r23235-kb5-libwind_la.patch
-7b4537b0e8bde95214211091e55eacf5  heimdal-r23238-kb5_locl_h-wind_h.patch
-18826112861b7e47c908b27c90baafac  heimdal-autoconf-2.64.patch"
+7ebff9a320f18ed62f5fcb68c8fc18b8  heimdal-c++-safe-krb5_cccol_cursor.patch
+248ab80b44568171e432a23524f4fe39  heimdal-locate_plugin-header.patch"
diff --git a/main/heimdal/heimdal-autoconf-2.64.patch b/main/heimdal/heimdal-autoconf-2.64.patch
deleted file mode 100644
index 47b02bda79a..00000000000
--- a/main/heimdal/heimdal-autoconf-2.64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cf/roken-frag.m4.orig	2009-08-03 10:40:57.000000000 +0200
-+++ b/cf/roken-frag.m4	2009-08-03 10:41:09.000000000 +0200
-@@ -586,7 +586,7 @@
- #include <err.h>
- #endif])
- 
--AC_CHECK_DECLS([optarg, optind, opterr, optopt, environ],[],[][
-+AC_CHECK_DECLS([optarg, optind, opterr, optopt, environ],[],[],[
- #include <stdlib.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
diff --git a/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch b/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch
new file mode 100644
index 00000000000..c688794533b
--- /dev/null
+++ b/main/heimdal/heimdal-c++-safe-krb5_cccol_cursor.patch
@@ -0,0 +1,26 @@
+--- 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;
diff --git a/main/heimdal/heimdal-locate_plugin-header.patch b/main/heimdal/heimdal-locate_plugin-header.patch
new file mode 100644
index 00000000000..080fa556aac
--- /dev/null
+++ b/main/heimdal/heimdal-locate_plugin-header.patch
@@ -0,0 +1,12 @@
+diff -Naur heimdal-1.3.1-old/lib/krb5/locate_plugin.h heimdal-1.3.1/lib/krb5/locate_plugin.h
+--- heimdal-1.3.1-old/lib/krb5/locate_plugin.h	2009-11-22 01:41:51.000000000 +1000
++++ heimdal-1.3.1/lib/krb5/locate_plugin.h	2009-11-25 15:04:30.000000000 +1000
+@@ -36,6 +36,8 @@
+ #ifndef HEIMDAL_KRB5_LOCATE_PLUGIN_H
+ #define HEIMDAL_KRB5_LOCATE_PLUGIN_H 1
+ 
++#include <krb5.h>
++
+ #define KRB5_PLUGIN_LOCATE "service_locator"
+ 
+ enum locate_service_type {
diff --git a/main/heimdal/heimdal-r23235-kb5-libwind_la.patch b/main/heimdal/heimdal-r23235-kb5-libwind_la.patch
deleted file mode 100644
index 88c02e598c6..00000000000
--- a/main/heimdal/heimdal-r23235-kb5-libwind_la.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:41 UTC (rev 23234)
-+++ trunk/heimdal/lib/krb5/Makefile.am	2008-06-01 22:25:53 UTC (rev 23235)
-@@ -57,6 +57,7 @@
- 	$(LIB_com_err) \
- 	$(LIB_hcrypto) \
- 	$(top_builddir)/lib/asn1/libasn1.la \
-+	../wind/libwind.la \
- 	$(LIBADD_roken) \
- 	$(LIB_door_create) \
- 	$(LIB_dlopen)
diff --git a/main/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch b/main/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
deleted file mode 100644
index 5390b2cf69a..00000000000
--- a/main/heimdal/heimdal-r23238-kb5_locl_h-wind_h.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:24 UTC (rev 23237)
-+++ trunk/heimdal/lib/krb5/krb5_locl.h	2008-06-01 22:26:43 UTC (rev 23238)
-@@ -131,6 +131,8 @@
- #include <parse_time.h>
- #include <base64.h>
- 
-+#include <wind.h>
-+
- #include "crypto-headers.h"
-
-
diff --git a/main/heimdal/heimdal-system_sqlite.patch b/main/heimdal/heimdal-system_sqlite.patch
deleted file mode 100644
index 2f8254e4d6b..00000000000
--- a/main/heimdal/heimdal-system_sqlite.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur tmp-old/configure.in tmp-new/configure.in
---- configure.in	2008-06-08 08:06:38.000000000 +0000
-+++ configure.in	2008-06-08 08:15:29.000000000 +0000
-@@ -104,6 +104,8 @@
- 
- KRB_PTHREADS
- 
-+PKG_CHECK_MODULES([sqlite], [sqlite3])
-+
- AC_ARG_ENABLE(dce, 
- 	AS_HELP_STRING([--enable-dce],[if you want support for DCE/DFS PAG's]))
- if test "$enable_dce" = yes; then
-diff -Naur tmp-old/lib/Makefile.am tmp-new/lib/Makefile.am
---- lib/Makefile.am	2008-06-07 16:53:11.000000000 +0000
-+++ lib/Makefile.am	2008-06-07 16:55:58.000000000 +0000
-@@ -18,6 +18,6 @@
- dir_hcrypto = hcrypto
- endif
- 
--SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 sqlite \
-+SUBDIRS = roken vers editline $(dir_com_err) sl wind asn1 \
- 	$(dir_hcrypto) hx509 krb5 ntlm kafs gssapi hdb kadm5 \
- 	auth $(dir_45) $(dir_otp) $(dir_dce)
-diff -Naur tmp-old/lib/krb5/Makefile.am tmp-new/lib/krb5/Makefile.am
---- lib/krb5/Makefile.am	2008-06-07 16:54:02.000000000 +0000
-+++ lib/krb5/Makefile.am	2008-06-08 08:17:00.000000000 +0000
-@@ -2,7 +2,7 @@
- 
- include $(top_srcdir)/Makefile.am.common
- 
--AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err -I$(srcdir)/../sqlite
-+AM_CPPFLAGS += $(INCLUDE_krb4) $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err $(sqlite_CFLAGS)
- 
- bin_PROGRAMS = verify_krb5_conf
- 
-@@ -53,7 +53,7 @@
- 
- libkrb5_la_LIBADD = \
- 	$(LIB_pkinit) \
--	../sqlite/libsqlite.la \
-+	$(sqlite_LIBS) \
- 	$(LIB_com_err) \
- 	$(LIB_hcrypto) \
- 	$(top_builddir)/lib/asn1/libasn1.la \
-diff -Naur tmp-old/lib/krb5/scache.c tmp-new/lib/krb5/scache.c
---- lib/krb5/scache.c	2008-06-07 16:54:30.000000000 +0000
-+++ lib/krb5/scache.c	2008-06-07 17:01:43.000000000 +0000
-@@ -32,7 +32,7 @@
-  */
- 
- #include "krb5_locl.h"
--#include "sqlite3.h"
-+#include <sqlite3.h>
- 
- RCSID("$Id: heimdal-system_sqlite.patch,v 1.1 2008/06/11 07:27:47 mueli Exp $");
-