diff options
Diffstat (limited to 'package/heimdal/patches')
| -rw-r--r-- | package/heimdal/patches/patch-Makefile_in | 24 | ||||
| -rw-r--r-- | package/heimdal/patches/patch-configure | 19 | ||||
| -rw-r--r-- | package/heimdal/patches/patch-kdc_config_c | 18 | ||||
| -rw-r--r-- | package/heimdal/patches/patch-kdc_kdc-replay_c | 18 | ||||
| -rw-r--r-- | package/heimdal/patches/patch-lib_hcrypto_Makefile_in | 12 | ||||
| -rw-r--r-- | package/heimdal/patches/patch-lib_roken_Makefile_in.orig | 27 | ||||
| -rw-r--r-- | package/heimdal/patches/patch-lib_roken_roken_h_in | 11 |
7 files changed, 91 insertions, 38 deletions
diff --git a/package/heimdal/patches/patch-Makefile_in b/package/heimdal/patches/patch-Makefile_in new file mode 100644 index 000000000..d1883a559 --- /dev/null +++ b/package/heimdal/patches/patch-Makefile_in @@ -0,0 +1,24 @@ +--- 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 + 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 + 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 + @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 + ACLOCAL_AMFLAGS = -I cf + EXTRA_DIST = \ + TODO \ diff --git a/package/heimdal/patches/patch-configure b/package/heimdal/patches/patch-configure new file mode 100644 index 000000000..29a003f6b --- /dev/null +++ b/package/heimdal/patches/patch-configure @@ -0,0 +1,19 @@ +--- 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* + fi + + if test "${krb_cv_compile_et_cross}" = yes ; then +- krb_cv_com_err="cross" ++ krb_cv_com_err="yes" + elif test "${krb_cv_compile_et}" = "yes"; then + krb_cv_save_LIBS="${LIBS}" + LIBS="${LIBS} -lcom_err" +@@ -26928,6 +26928,7 @@ else + krb_cv_com_err="no" + fi + ++krb_cv_com_err="yes" + if test "${krb_cv_com_err}" = "yes"; then + DIR_com_err="" + LIB_com_err="-lcom_err" diff --git a/package/heimdal/patches/patch-kdc_config_c b/package/heimdal/patches/patch-kdc_config_c new file mode 100644 index 000000000..104086102 --- /dev/null +++ b/package/heimdal/patches/patch-kdc_config_c @@ -0,0 +1,18 @@ +--- 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 new file mode 100644 index 000000000..504e4962f --- /dev/null +++ b/package/heimdal/patches/patch-kdc_kdc-replay_c @@ -0,0 +1,18 @@ +--- 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 new file mode 100644 index 000000000..fb16d3504 --- /dev/null +++ b/package/heimdal/patches/patch-lib_hcrypto_Makefile_in @@ -0,0 +1,12 @@ +--- 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.orig b/package/heimdal/patches/patch-lib_roken_Makefile_in.orig deleted file mode 100644 index 7d207e474..000000000 --- a/package/heimdal/patches/patch-lib_roken_Makefile_in.orig +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 18:57:00.174995995 +0100 -@@ -1977,18 +1977,13 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok - .hin.h: - cp $< $@ - --@CROSS_COMPILE_FALSE@roken.h: make-roken$(EXEEXT) --@CROSS_COMPILE_FALSE@ @./make-roken$(EXEEXT) > tmp.h ;\ --@CROSS_COMPILE_FALSE@ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ --@CROSS_COMPILE_FALSE@ else rm -f roken.h; mv tmp.h roken.h; fi -- --@CROSS_COMPILE_FALSE@make-roken.c: roken.h.in roken.awk --@CROSS_COMPILE_FALSE@ $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c -+roken.h: make-roken$(EXEEXT) -+ ./make-roken$(EXEEXT) > tmp.h ;\ -+ if [ -f roken.h ] && cmp -s tmp.h roken.h ; then rm -f tmp.h ; \ -+ else rm -f roken.h; mv tmp.h roken.h; fi - --@CROSS_COMPILE_TRUE@roken.h: $(top_srcdir)/cf/roken-h-process.pl roken.h.in --@CROSS_COMPILE_TRUE@ perl $(top_srcdir)/cf/roken-h-process.pl \ --@CROSS_COMPILE_TRUE@ -c $(top_builddir)/include/config.h \ --@CROSS_COMPILE_TRUE@ -p $(srcdir)/roken.h.in -o roken.h -+make-roken.c: roken.h.in roken.awk -+ $(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/package/heimdal/patches/patch-lib_roken_roken_h_in b/package/heimdal/patches/patch-lib_roken_roken_h_in deleted file mode 100644 index 59e9a2c52..000000000 --- a/package/heimdal/patches/patch-lib_roken_roken_h_in +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-1.4.orig/lib/roken/roken.h.in 2010-09-13 09:23:34.000000000 +0200 -+++ heimdal-1.4/lib/roken/roken.h.in 2010-11-10 19:46:45.916683899 +0100 -@@ -524,7 +524,7 @@ ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL ge - ROKEN_LIB_FUNCTION char * ROKEN_LIB_CALL strerror(int); - #endif - --#if (!defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R)) -+#if ( !defined(HAVE_STRERROR_R) && !defined(strerror_r)) || (!defined(STRERROR_R_PROTO_COMPATIBLE) && defined(HAVE_STRERROR_R)) - int ROKEN_LIB_FUNCTION rk_strerror_r(int, char *, size_t); - #else - #define rk_strerror_r strerror_r |