Date: Monday, November 23, 2009 @ 22:41:18 Author: allan Revision: 59457
upgpkg: heimdal 1.3.1-1 upstream update Added: heimdal/trunk/heimdal-c++-safe-krb5_cccol_cursor.patch Modified: heimdal/trunk/PKGBUILD Deleted: heimdal/trunk/022_all_heimdal-as-needed.patch heimdal/trunk/heimdal-autoconf-2.64.patch heimdal/trunk/heimdal-r23235-kb5-libwind_la.patch heimdal/trunk/heimdal-r23238-kb5_locl_h-wind_h.patch heimdal/trunk/heimdal-system_sqlite.patch ------------------------------------------+ 022_all_heimdal-as-needed.patch | 22 ---------- PKGBUILD | 59 ++++++++++------------------- heimdal-autoconf-2.64.patch | 11 ----- heimdal-c++-safe-krb5_cccol_cursor.patch | 28 +++++++++++++ heimdal-r23235-kb5-libwind_la.patch | 10 ---- heimdal-r23238-kb5_locl_h-wind_h.patch | 11 ----- heimdal-system_sqlite.patch | 56 --------------------------- 7 files changed, 50 insertions(+), 147 deletions(-) Deleted: 022_all_heimdal-as-needed.patch =================================================================== --- 022_all_heimdal-as-needed.patch 2009-11-24 03:26:16 UTC (rev 59456) +++ 022_all_heimdal-as-needed.patch 2009-11-24 03:41:18 UTC (rev 59457) @@ -1,22 +0,0 @@ ---- lib/roken/Makefile.am.old 2007-11-05 19:42:53.000000000 +0100 -+++ lib/roken/Makefile.am 2007-11-05 19:43:12.000000000 +0100 -@@ -107,7 +107,7 @@ - ifaddrs.hin \ - vis.hin - --libroken_la_LIBADD = @LTLIBOBJS@ -+libroken_la_LIBADD = @LTLIBOBJS@ $(LIB_crypt) - - $(LTLIBOBJS) $(libroken_la_OBJECTS): roken.h $(XHEADERS) - ---- lib/editline/Makefile.am.old 2007-11-05 19:46:08.000000000 +0100 -+++ lib/editline/Makefile.am 2007-11-05 20:06:54.000000000 +0100 -@@ -36,6 +36,8 @@ - unix.h \ - $(EXTRA_SOURCE) - -+libeditline_la_LIBADD = $(LIB_tgetent) -+ - EXTRA_SOURCE = $(ES) - - libel_compat_la_SOURCES = edit_compat.c edit_compat.h Modified: PKGBUILD =================================================================== --- PKGBUILD 2009-11-24 03:26:16 UTC (rev 59456) +++ PKGBUILD 2009-11-24 03:41:18 UTC (rev 59457) @@ -7,13 +7,14 @@ # pkgname=heimdal -pkgver=1.2.1 -pkgrel=7 +pkgver=1.3.1 +pkgrel=1 pkgdesc="Implementation of Kerberos V5 libraries" arch=('i686' 'x86_64') url="http://www.h5l.org/" license=('custom') -depends=('db>=4.8' 'openssl' 'e2fsprogs' 'sqlite3') +depends=('db>=4.8' 'openssl' 'sqlite3') +# re-add e2fsprogs once its libcom_err is compatible backup=(etc/krb5.conf) options=('!libtool' '!emptydirs') install=heimdal.install @@ -25,15 +26,11 @@ 012_all_heimdal-berkdb.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-kdc.rc kadmind.rc kpasswd.rc) -md5sums=('6e5028077e2a6b101a4a72801ba71b9e' +md5sums=('4ce17deae040a3519e542f48fd901f21' '98e28f11f906c967aac22d6184102c9e' '6d5571bdedba2e2423b90bccdbac2c0a' '2feec3924ee5230b54175b4d4000c872' @@ -41,18 +38,12 @@ '56f5d10d0ec40f2fda82ef144ffac1e0' '1b8665b771c4eb6b56ea8582c96e56e3' '8208ae8c0b6ff5ab4f64af1693e9e396' - 'd7649e078c87d2ca997080f0deb527c0' - '949a389ebe7652861b2e178a7e0f1ed9' - '072f6b2550693adb30117394b1dd354e' - '7b4537b0e8bde95214211091e55eacf5' - '9d1d39c3506474bf8258a364700e716c' + '522b08ae209126737413699b0c069c20' 'e59650992b9541a30dfce727a194f6e0' '1f2f86a67bbfddb7af581d35fdca9627' 'f8f1eca95b9d3f2b4ebf2417b71b81cf') build() { - #[ -e /usr/lib/libasn1.so ] && echo "## remove old heimdal pkg first ##" && return 1 - cd ${srcdir}/heimdal-${pkgver} patch -Np0 -i ${srcdir}/001_all_heimdal-no_libedit.patch || return 1 patch -Np0 -i ${srcdir}/002_all_heimal-fPIC.patch || return 1 @@ -61,11 +52,7 @@ patch -Np1 -i ${srcdir}/012_all_heimdal-berkdb.patch || return 1 patch -Np1 -i ${srcdir}/013_all_heimdal-pthread-lib.patch || return 1 patch -Np0 -i ${srcdir}/014_all_heimdal-path.patch || return 1 - patch -Np0 -i ${srcdir}/022_all_heimdal-as-needed.patch || return 1 - patch -Np0 -i ${srcdir}/heimdal-system_sqlite.patch || return 1 - patch -Np2 -i ${srcdir}/heimdal-r23235-kb5-libwind_la.patch || return 1 - patch -Np2 -i ${srcdir}/heimdal-r23238-kb5_locl_h-wind_h.patch || return 1 - patch -Np0 -i ${srcdir}/heimdal-autoconf-2.64.patch || return 1 + patch -Np1 -i ${srcdir}/heimdal-c++-safe-krb5_cccol_cursor.patch || return 1 sed -i -e 's|var/heimdal|var/lib/heimdal|g' configure.in \ doc/setup.texi doc/heimdal.info kadmin/kadmind.8 kdc/kdc.8 \ @@ -76,36 +63,32 @@ autoconf || return 1 automake || return 1 - export LDFLAGS="${LDFLAGS} -Wl,--as-needed" ./configure --prefix=/usr --enable-shared=yes --without-x \ - --sysconfdir=/etc --mandir=/usr/share/man \ + --sysconfdir=/etc --mandir=/usr/share/man \ --datadir=/var/lib/heimdal \ --localstatedir=/var/lib/heimdal \ --with-openssl=/usr \ --with-readline-lib=/usr/lib \ --with-readline-include=/usr/include/readline \ + --with-sqlite3-lib=/usr/lib \ + --with-sqlite3-include=/usr/include \ --libexecdir=/usr/sbin make || return 1 make DESTDIR=${pkgdir} install || return 1 - # Remove editline, we use libreadline. This library is broken anyways, so nobody misses it after removal - 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 - mv ${pkgdir}/usr/share/man/man8/${i}.8 ${pkgdir}/usr/share/man/man8/k${i}.8 || return 1 - mv ${pkgdir}/usr/sbin/${i} ${pkgdir}/usr/sbin/k${i} || return 1 + mv ${pkgdir}/usr/share/man/man8/{,k}${i}.8 || return 1 + mv ${pkgdir}/usr/sbin/{,k}${i} || return 1 done # Rename clients and their manpages for i in rcp rsh telnet ftp su login; do if [ -f ${pkgdir}/usr/share/man/man1/${i}.1 ]; then - mv ${pkgdir}/usr/share/man/man1/${i}.1 ${pkgdir}/usr/share/man/man1/k${i}.1 || return 1 + mv ${pkgdir}/usr/share/man/man1/{,k}${i}.1 || return 1 fi - mv ${pkgdir}/usr/bin/${i} ${pkgdir}/usr/bin/k${i} || return 1 + mv ${pkgdir}/usr/bin/{,k}${i} || return 1 done rm -rf ${pkgdir}/usr/share/man/cat{1,3,5,8} @@ -116,11 +99,13 @@ install -m755 ${srcdir}/${i}.rc ${pkgdir}/etc/rc.d/${i} || return 1 done - # Remove conflicts - rm ${pkgdir}/usr/share/man/man5/ftpusers.5* # man-pages + # Remove conflicts + rm ${pkgdir}/usr/share/man/man5/ftpusers.5* # man-pages + rm ${pkgdir}/usr/lib/libcom_err.{a,so} # e2fsprogs + rm ${pkgdir}/usr/bin/compile_et # e2fsprogs + rm ${pkgdir}/usr/share/man/man3/{DES,DH,EVP,OpenSSL,RAND,RSA}* # openssl (a bit overzealous...) # Install the license - install -d ${pkgdir}/usr/share/licenses/${pkgname} - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \ - ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1 + install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE \ + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1 } Deleted: heimdal-autoconf-2.64.patch =================================================================== --- heimdal-autoconf-2.64.patch 2009-11-24 03:26:16 UTC (rev 59456) +++ heimdal-autoconf-2.64.patch 2009-11-24 03:41:18 UTC (rev 59457) @@ -1,11 +0,0 @@ ---- cf/roken-frag.m4.orig 2009-08-03 10:40:57.000000000 +0200 -+++ 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> Added: heimdal-c++-safe-krb5_cccol_cursor.patch =================================================================== --- heimdal-c++-safe-krb5_cccol_cursor.patch (rev 0) +++ heimdal-c++-safe-krb5_cccol_cursor.patch 2009-11-24 03:41:18 UTC (rev 59457) @@ -0,0 +1,28 @@ +diff -Naur heimdal-1.3.1-old/lib/krb5/cache.c heimdal-1.3.1/lib/krb5/cache.c +--- heimdal-1.3.1-old/lib/krb5/cache.c 2009-11-22 01:41:51.000000000 +1000 ++++ heimdal-1.3.1/lib/krb5/cache.c 2009-11-23 22:27:15.000000000 +1000 +@@ -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 +diff -Naur heimdal-1.3.1-old/lib/krb5/krb5.h heimdal-1.3.1/lib/krb5/krb5.h +--- heimdal-1.3.1-old/lib/krb5/krb5.h 2009-11-22 01:41:51.000000000 +1000 ++++ heimdal-1.3.1/lib/krb5/krb5.h 2009-11-23 22:28:10.000000000 +1000 +@@ -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; Deleted: heimdal-r23235-kb5-libwind_la.patch =================================================================== --- heimdal-r23235-kb5-libwind_la.patch 2009-11-24 03:26:16 UTC (rev 59456) +++ heimdal-r23235-kb5-libwind_la.patch 2009-11-24 03:41:18 UTC (rev 59457) @@ -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) Deleted: heimdal-r23238-kb5_locl_h-wind_h.patch =================================================================== --- heimdal-r23238-kb5_locl_h-wind_h.patch 2009-11-24 03:26:16 UTC (rev 59456) +++ heimdal-r23238-kb5_locl_h-wind_h.patch 2009-11-24 03:41:18 UTC (rev 59457) @@ -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" - - Deleted: heimdal-system_sqlite.patch =================================================================== --- heimdal-system_sqlite.patch 2009-11-24 03:26:16 UTC (rev 59456) +++ heimdal-system_sqlite.patch 2009-11-24 03:41:18 UTC (rev 59457) @@ -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 $"); -