From 5782397d77cd243c1174c98051158febe3a21641 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 29 Apr 2013 17:59:12 +0200 Subject: update to latest upstream --- package/heimdal/Makefile | 10 ++++----- package/heimdal/patches/patch-Makefile_in | 26 +++++++++------------- package/heimdal/patches/patch-configure | 8 +++---- package/heimdal/patches/patch-kdc_config_c | 18 --------------- package/heimdal/patches/patch-kdc_kdc-replay_c | 18 --------------- .../heimdal/patches/patch-lib_hcrypto_Makefile_in | 12 ---------- .../heimdal/patches/patch-lib_roken_Makefile_in | 8 +++---- package/heimdal/patches/patch-ltmain_sh | 11 --------- 8 files changed, 24 insertions(+), 87 deletions(-) delete mode 100644 package/heimdal/patches/patch-kdc_config_c delete mode 100644 package/heimdal/patches/patch-kdc_kdc-replay_c delete mode 100644 package/heimdal/patches/patch-lib_hcrypto_Makefile_in delete mode 100644 package/heimdal/patches/patch-ltmain_sh (limited to 'package/heimdal') diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index 785dfeefb..1647234a5 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= heimdal -PKG_VERSION:= 1.4 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 31d08bbf47a77827fe97ef3f52b4c9c4 +PKG_VERSION:= 1.5.2 +PKG_RELEASE:= 1 +PKG_MD5SUM:= bb23d9dbdafd395d816f7abc598481a1 PKG_DESCR:= Kerberos 5 server PKG_SECTION:= crypto PKG_BUILDDEP:= openssl ncurses e2fsprogs readline @@ -86,7 +86,7 @@ post-extract: ${MAKE} -C ${WRKBUILD}/include ${MAKE} -C ${WRKBUILD}/lib/roken ${MAKE} -C ${WRKBUILD}/lib/vers - ${MAKE} -C ${WRKBUILD}/lib/editline + ${MAKE} -C ${WRKBUILD}/lib/libedit ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT) LDFLAGS="-all-static" ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) LDFLAGS="-all-static" ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) LDFLAGS="-all-static" @@ -151,7 +151,7 @@ endif ${IDIR_LIBHEIMDAL}/usr/lib/heimdal # heimdal client libs ${INSTALL_DIR} ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal - ${CP} ${WRKINST}/usr/lib/heimdal/libeditline.so* \ + ${CP} ${WRKINST}/usr/lib/heimdal/libheimedit.so* \ ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal ${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* \ ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal diff --git a/package/heimdal/patches/patch-Makefile_in b/package/heimdal/patches/patch-Makefile_in index d1883a559..d0c4cf0e3 100644 --- a/package/heimdal/patches/patch-Makefile_in +++ b/package/heimdal/patches/patch-Makefile_in @@ -1,24 +1,20 @@ ---- heimdal-1.4.orig/Makefile.in 2010-09-13 09:24:25.000000000 +0200 -+++ heimdal-1.4/Makefile.in 2011-01-12 14:10:53.848658254 +0100 -@@ -114,8 +114,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE - distdir dist dist-all distcheck +--- heimdal-1.5.2.orig/Makefile.in 2012-01-11 14:04:33.000000000 +0100 ++++ heimdal-1.5.2/Makefile.in 2013-04-29 16:39:03.000000000 +0200 +@@ -116,7 +116,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE ETAGS = etags CTAGS = ctags --DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm appl doc \ -- tools tests packages etc po -+DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm \ -+ tools packages etc + DIST_SUBDIRS = include base lib kuser kdc admin kadmin kpasswd kcm \ +- appl tools tests packages etc po doc ++ tools tests packages etc po doc DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) -@@ -392,8 +392,8 @@ LIB_kafs = $(top_builddir)/lib/kafs/libk - @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la +@@ -400,7 +400,7 @@ LIB_heimbase = $(top_builddir)/base/libh @DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la @KCM_TRUE@kcm_dir = kcm --SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) appl \ -- doc tools tests packages etc po -+SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) \ -+ tools packages etc + SUBDIRS = include base lib kuser kdc admin kadmin kpasswd $(kcm_dir) \ +- appl tools tests packages etc po $(am__append_1) ++ tools tests packages etc po $(am__append_1) ACLOCAL_AMFLAGS = -I cf EXTRA_DIST = \ - TODO \ + NTMakefile \ diff --git a/package/heimdal/patches/patch-configure b/package/heimdal/patches/patch-configure index 29a003f6b..6a8d652d3 100644 --- a/package/heimdal/patches/patch-configure +++ b/package/heimdal/patches/patch-configure @@ -1,6 +1,6 @@ ---- heimdal-1.4.orig/configure 2010-09-13 09:24:11.000000000 +0200 -+++ heimdal-1.4/configure 2011-01-11 18:51:09.154898347 +0100 -@@ -26892,7 +26892,7 @@ rm -fr conftest* +--- heimdal-1.5.2.orig/configure 2012-01-11 14:04:10.000000000 +0100 ++++ heimdal-1.5.2/configure 2013-04-29 16:35:46.000000000 +0200 +@@ -28318,7 +28318,7 @@ rm -fr conftest* fi if test "${krb_cv_compile_et_cross}" = yes ; then @@ -9,7 +9,7 @@ elif test "${krb_cv_compile_et}" = "yes"; then krb_cv_save_LIBS="${LIBS}" LIBS="${LIBS} -lcom_err" -@@ -26928,6 +26928,7 @@ else +@@ -28354,6 +28354,7 @@ else krb_cv_com_err="no" fi diff --git a/package/heimdal/patches/patch-kdc_config_c b/package/heimdal/patches/patch-kdc_config_c deleted file mode 100644 index 104086102..000000000 --- a/package/heimdal/patches/patch-kdc_config_c +++ /dev/null @@ -1,18 +0,0 @@ ---- heimdal-1.4.orig/kdc/config.c 2010-09-13 09:23:34.000000000 +0200 -+++ heimdal-1.4/kdc/config.c 2011-01-12 13:55:17.454913780 +0100 -@@ -347,6 +347,7 @@ configure(krb5_context context, int argc - - #endif - -+#ifdef PKINIT - if (config->enable_pkinit) { - if (config->pkinit_kdc_identity == NULL) - krb5_errx(context, 1, "pkinit enabled but no identity"); -@@ -361,6 +362,7 @@ configure(krb5_context context, int argc - config->pkinit_kdc_revoke); - - } -+#endif - - return config; - } diff --git a/package/heimdal/patches/patch-kdc_kdc-replay_c b/package/heimdal/patches/patch-kdc_kdc-replay_c deleted file mode 100644 index 504e4962f..000000000 --- a/package/heimdal/patches/patch-kdc_kdc-replay_c +++ /dev/null @@ -1,18 +0,0 @@ ---- heimdal-1.4.orig/kdc/kdc-replay.c 2010-09-13 09:23:34.000000000 +0200 -+++ heimdal-1.4/kdc/kdc-replay.c 2011-01-12 14:08:08.048658301 +0100 -@@ -86,6 +86,7 @@ main(int argc, char **argv) - if (ret) - krb5_err(context, 1, ret, "krb5_kdc_set_dbinfo"); - -+#ifdef PKINIT - if (config->enable_pkinit) { - if (config->pkinit_kdc_identity == NULL) - krb5_errx(context, 1, "pkinit enabled but no identity"); -@@ -100,6 +101,7 @@ main(int argc, char **argv) - config->pkinit_kdc_revoke); - - } -+#endif - - if (argc != 2) - errx(1, "argc != 2"); diff --git a/package/heimdal/patches/patch-lib_hcrypto_Makefile_in b/package/heimdal/patches/patch-lib_hcrypto_Makefile_in deleted file mode 100644 index fb16d3504..000000000 --- a/package/heimdal/patches/patch-lib_hcrypto_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ ---- heimdal-1.4.orig/lib/hcrypto/Makefile.in 2010-09-13 09:24:20.000000000 +0200 -+++ heimdal-1.4/lib/hcrypto/Makefile.in 2011-01-11 20:11:30.955611146 +0100 -@@ -716,6 +716,9 @@ imathsource = \ - imath/iprime.h - - ltmsources = \ -+ libtommath/tommath.h \ -+ libtommath/tommath_class.h \ -+ libtommath/tommath_superclass.h \ - libtommath/bncore.c \ - libtommath/bn_mp_init.c \ - libtommath/bn_mp_clear.c \ diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in b/package/heimdal/patches/patch-lib_roken_Makefile_in index a5b84a201..38ad2996b 100644 --- a/package/heimdal/patches/patch-lib_roken_Makefile_in +++ b/package/heimdal/patches/patch-lib_roken_Makefile_in @@ -1,6 +1,6 @@ ---- heimdal-1.4.orig/lib/roken/Makefile.in 2010-09-13 09:24:23.000000000 +0200 -+++ heimdal-1.4/lib/roken/Makefile.in 2010-11-10 19:56:51.764995802 +0100 -@@ -726,9 +726,6 @@ getifaddrs-test$(EXEEXT): $(getifaddrs_t +--- heimdal-1.5.2.orig/lib/roken/Makefile.in 2012-01-11 14:04:30.000000000 +0100 ++++ heimdal-1.5.2/lib/roken/Makefile.in 2013-04-29 16:35:46.000000000 +0200 +@@ -747,9 +747,6 @@ getifaddrs-test$(EXEEXT): $(getifaddrs_t hex-test$(EXEEXT): $(hex_test_OBJECTS) $(hex_test_DEPENDENCIES) @rm -f hex-test$(EXEEXT) $(LINK) $(hex_test_OBJECTS) $(hex_test_LDADD) $(LIBS) @@ -10,7 +10,7 @@ parse_bytes-test$(EXEEXT): $(parse_bytes_test_OBJECTS) $(parse_bytes_test_DEPENDENCIES) @rm -f parse_bytes-test$(EXEEXT) $(LINK) $(parse_bytes_test_OBJECTS) $(parse_bytes_test_LDADD) $(LIBS) -@@ -1977,18 +1974,18 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok +@@ -2033,18 +2030,18 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok .hin.h: cp $< $@ diff --git a/package/heimdal/patches/patch-ltmain_sh b/package/heimdal/patches/patch-ltmain_sh deleted file mode 100644 index fcf6dad2c..000000000 --- a/package/heimdal/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-1.4.orig/ltmain.sh 2010-09-13 09:24:01.000000000 +0200 -+++ heimdal-1.4/ltmain.sh 2011-01-15 20:52:41.000000000 +0100 -@@ -4238,7 +4238,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" -- cgit v1.2.3