diff options
| -rw-r--r-- | main/heimdal/001_all_heimdal-no_libedit.patch | 10 | ||||
| -rw-r--r-- | main/heimdal/002_all_heimdal-fPIC.patch | 12 | ||||
| -rw-r--r-- | main/heimdal/APKBUILD | 36 | ||||
| -rw-r--r-- | main/heimdal/heimdal-1.4-make.patch | 88 | ||||
| -rw-r--r-- | main/heimdal/heimdal-1.5-use-perl-Getopt_Std.patch | 22 | ||||
| -rw-r--r-- | main/heimdal/heimdal_missing-include.patch | 11 | ||||
| -rw-r--r-- | main/heimdal/heimdal_missing_symbols.patch | 28 |
7 files changed, 79 insertions, 128 deletions
diff --git a/main/heimdal/001_all_heimdal-no_libedit.patch b/main/heimdal/001_all_heimdal-no_libedit.patch deleted file mode 100644 index a551bdce15..0000000000 --- a/main/heimdal/001_all_heimdal-no_libedit.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cf/krb-readline.m4 2005-06-16 18:28:32.000000000 +0200 -+++ cf/krb-readline.m4 2005-06-27 23:17:06.000000000 +0200 -@@ -6,7 +6,6 @@ - dnl el_init - - AC_DEFUN([KRB_READLINE],[ --AC_FIND_FUNC_NO_LIBS(el_init, edit, [], [], [$LIB_tgetent]) - if test "$ac_cv_func_el_init" = yes ; then - AC_CACHE_CHECK(for four argument el_init, ac_cv_func_el_init_four,[ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h> diff --git a/main/heimdal/002_all_heimdal-fPIC.patch b/main/heimdal/002_all_heimdal-fPIC.patch deleted file mode 100644 index c67dbae764..0000000000 --- a/main/heimdal/002_all_heimdal-fPIC.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- lib/editline/Makefile.am 2005-06-16 18:28:44.000000000 +0200 -+++ lib/editline/Makefile.am 2005-06-27 23:21:02.000000000 +0200 -@@ -41,6 +41,9 @@ - - EXTRA_DIST = $(man_MANS) - -+$(libeditline_la_OBJECTS): %.lo: %.c -+ $(LTCOMPILE) -fPIC -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$< -+ - snprintf.c: - $(LN_S) $(srcdir)/../roken/snprintf.c . - strdup.c: diff --git a/main/heimdal/APKBUILD b/main/heimdal/APKBUILD index 94368da4e8..faeb7e4556 100644 --- a/main/heimdal/APKBUILD +++ b/main/heimdal/APKBUILD @@ -1,28 +1,28 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> # Contributor: Natanael Copa <ncopa@alpinelinux.org> pkgname=heimdal -pkgver=1.4 -pkgrel=11 +pkgver=1.5 +pkgrel=2 pkgdesc="An implementation of Kerberos 5" arch="all" url="http://www.h5l.org/" license="BSD" depends= depends_dev="openssl-dev e2fsprogs-dev db-dev" -makedepends="autoconf automake db-dev e2fsprogs-dev>=1.41.9-r2 gawk libtool - openssl-dev pkgconfig readline-dev sqlite-dev" +makedepends="autoconf automake bash db-dev e2fsprogs-dev>=1.41.9-r2 gawk libtool + openssl-dev perl pkgconfig readline-dev sqlite-dev" install= subpackages="$pkgname-doc $pkgname-dev $pkgname-ftp $pkgname-telnet \ -$pkgname-su $pkgname-rsh $pkgname-rcp $pkgname-pagsh $pkgname-kf" + $pkgname-su $pkgname-rsh $pkgname-rcp $pkgname-pagsh $pkgname-kf" source="http://ftp4.de.freesbie.org/pub/misc/heimdal/src/$pkgname-$pkgver.tar.gz -001_all_heimdal-no_libedit.patch -002_all_heimdal-fPIC.patch -003_all_heimdal-rxapps.patch -005_all_heimdal-suid_fix.patch -014_all_heimdal-path.patch -heimdal-1.4-make.patch -telnetd.patch -" + 003_all_heimdal-rxapps.patch + 005_all_heimdal-suid_fix.patch + 014_all_heimdal-path.patch + telnetd.patch + heimdal_missing-include.patch + heimdal_missing_symbols.patch + heimdal-1.5-use-perl-Getopt_Std.patch + " _builddir="$srcdir/$pkgname-$pkgver" @@ -167,11 +167,11 @@ kf() { mv $pkgdir/usr/bin/kf $subpkgdir/usr/bin/kf } -md5sums="31d08bbf47a77827fe97ef3f52b4c9c4 heimdal-1.4.tar.gz -98e28f11f906c967aac22d6184102c9e 001_all_heimdal-no_libedit.patch -6d5571bdedba2e2423b90bccdbac2c0a 002_all_heimdal-fPIC.patch +md5sums="f717a9255e9140f18ce4d36728548b72 heimdal-1.5.tar.gz 2feec3924ee5230b54175b4d4000c872 003_all_heimdal-rxapps.patch 45aeb207f360f9f4e9e0fabc8bfeecbc 005_all_heimdal-suid_fix.patch 8208ae8c0b6ff5ab4f64af1693e9e396 014_all_heimdal-path.patch -fa1753ec676029cd59a3ef24da55c144 heimdal-1.4-make.patch -f320b91692b872e28f446f9cf1bc68bf telnetd.patch" +f320b91692b872e28f446f9cf1bc68bf telnetd.patch +8e127440fe11380c65fda40283326a46 heimdal_missing-include.patch +a14b9001271c3b794b083c25936ebe21 heimdal_missing_symbols.patch +dbe4106d1ca938587c948ee34121c020 heimdal-1.5-use-perl-Getopt_Std.patch" diff --git a/main/heimdal/heimdal-1.4-make.patch b/main/heimdal/heimdal-1.4-make.patch deleted file mode 100644 index e49903f27f..0000000000 --- a/main/heimdal/heimdal-1.4-make.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- lib/asn1/Makefile.am~ 2010-09-13 09:23:34.000000000 +0200 -+++ lib/asn1/Makefile.am 2010-10-02 12:08:31.833815205 +0200 -@@ -641,16 +641,16 @@ - - asn1parse.h: asn1parse.c - --$(gen_files_krb5) krb5_asn1.hx krb5_asn1-priv.hx: krb5_asn1_files --$(gen_files_pkinit) pkinit_asn1.hx pkinit_asn1-priv.hx: pkinit_asn1_files --$(gen_files_pkcs8) pkcs8_asn1.hx pkcs8_asn1-priv.hx: pkcs8_asn1_files --$(gen_files_pkcs9) pkcs9_asn1.hx pkcs9_asn1-priv.hx: pkcs9_asn1_files --$(gen_files_pkcs12) pkcs12_asn1.hx pkcs12_asn1-priv.hx: pkcs12_asn1_files --$(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx: digest_asn1_files --$(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx: kx509_asn1_files --$(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx: rfc2459_asn1_files --$(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx: cms_asn1_files --$(gen_files_test) test_asn1.hx test_asn1-priv.hx: test_asn1_files -+$(gen_files_krb5) krb5_asn1.hx krb5_asn1-priv.hx krb5_asn1-template.c: krb5_asn1_files -+$(gen_files_pkinit) pkinit_asn1.hx pkinit_asn1-priv.hx pkinit_asn1-template.c: pkinit_asn1_files -+$(gen_files_pkcs8) pkcs8_asn1.hx pkcs8_asn1-priv.hx pkcs8_asn1-template.c: pkcs8_asn1_files -+$(gen_files_pkcs9) pkcs9_asn1.hx pkcs9_asn1-priv.hx pkcs9_asn1-template.c: pkcs9_asn1_files -+$(gen_files_pkcs12) pkcs12_asn1.hx pkcs12_asn1-priv.hx pkcs12_asn1-template.c: pkcs12_asn1_files -+$(gen_files_digest) digest_asn1.hx digest_asn1-priv.hx digest_asn1-template.c: digest_asn1_files -+$(gen_files_kx509) kx509_asn1.hx kx509_asn1-priv.hx kx509_asn1-template.c: kx509_asn1_files -+$(gen_files_rfc2459) rfc2459_asn1.hx rfc2459_asn1-priv.hx rfc2459_asn1-template.c: rfc2459_asn1_files -+$(gen_files_cms) cms_asn1.hx cms_asn1-priv.hx cms_asn1-template.c: cms_asn1_files -+$(gen_files_test) test_asn1.hx test_asn1-priv.hx test_asn1-template.c: test_asn1_files - - rfc2459_asn1_files: asn1_compile$(EXEEXT) $(srcdir)/rfc2459.asn1 - $(ASN1_COMPILE) --preserve-binary=TBSCertificate --preserve-binary=TBSCRLCertList --preserve-binary=Name --sequence=GeneralNames --sequence=Extensions --sequence=CRLDistributionPoints $(srcdir)/rfc2459.asn1 rfc2459_asn1 || (rm -f rfc2459_asn1_files ; exit 1) ---- lib/kadm5/Makefile.am~ 2010-10-14 12:25:00.959390842 +0200 -+++ lib/kadm5/Makefile.am 2010-10-14 14:14:14.533473440 +0200 -@@ -159,6 +159,8 @@ - - kadm5_err.h: kadm5_err.et - -+$(dist_libkadm5clnt_la_SOURCES): $(nodist_libkadm5clnt_la_SOURCES) -+ - $(libkadm5clnt_la_OBJECTS) $(libkadm5srv_la_OBJECTS): $(srcdir)/kadm5-protos.h $(srcdir)/kadm5-private.h - - proto_opts = -q -R '^(_|kadm5_c_|kadm5_s_|kadm5_log)' -P comment ---- lib/otp/Makefile.am~ 2010-10-02 12:17:36.532815203 +0200 -+++ lib/otp/Makefile.am 2010-10-02 12:29:52.970815205 +0200 -@@ -74,3 +74,5 @@ - strlcpy.c \ - strlwr.c \ - strncasecmp.c -+ -+EXTRA_DIST = version-script.map ---- /dev/null 2010-10-02 12:15:38.061000000 +0200 -+++ lib/otp/version-script.map 2010-10-02 12:18:06.229815205 +0200 -@@ -0,0 +1,25 @@ -+HEIMDAL_OTP_1.0 { -+ global: -+ otp_challenge; -+ otp_checksum; -+ otp_db_close; -+ otp_db_open; -+ otp_delete; -+ otp_error; -+ otp_find_alg; -+ otp_get; -+ otp_parse; -+ otp_parse_altdict; -+ otp_parse_hex; -+ otp_parse_stddict; -+ otp_print_hex; -+ otp_print_hex_extended; -+ otp_print_stddict; -+ otp_print_stddict_extended; -+ otp_put; -+ otp_simple_get; -+ otp_verify_user; -+ otp_verify_user_1; -+ local: -+ *; -+}; -diff --git lib/krb5/version-script.map b/lib/krb5/version-script.map -index f31620c..39f5146 100644 ---- lib/krb5/version-script.map -+++ lib/krb5/version-script.map -@@ -105,6 +105,7 @@ HEIMDAL_KRB5_2.0 { - krb5_cc_get_type; - krb5_cc_get_version; - krb5_cc_initialize; -+ krb5_cc_last_change_time; - krb5_cc_move; - krb5_cc_new_unique; - krb5_cc_next_cred; diff --git a/main/heimdal/heimdal-1.5-use-perl-Getopt_Std.patch b/main/heimdal/heimdal-1.5-use-perl-Getopt_Std.patch new file mode 100644 index 0000000000..4f89ed2090 --- /dev/null +++ b/main/heimdal/heimdal-1.5-use-perl-Getopt_Std.patch @@ -0,0 +1,22 @@ +--- cf/make-proto.pl ++++ cf/make-proto.pl +@@ -1,8 +1,8 @@ + # Make prototypes from .c files + # $Id$ + +-##use Getopt::Std; +-require 'getopts.pl'; ++use Getopt::Std; ++##require 'getopts.pl'; + + my $comment = 0; + my $if_0 = 0; +@@ -13,7 +13,7 @@ + my $private_func_re = "^_"; + my %depfunction = (); + +-Getopts('x:m:o:p:dqE:R:P:') || die "foo"; ++getopts('x:m:o:p:dqE:R:P:') || die "foo"; + + if($opt_d) { + $debug = 1; diff --git a/main/heimdal/heimdal_missing-include.patch b/main/heimdal/heimdal_missing-include.patch new file mode 100644 index 0000000000..e245cf8fff --- /dev/null +++ b/main/heimdal/heimdal_missing-include.patch @@ -0,0 +1,11 @@ +--- base/test_base.c 2011-09-30 15:58:45.000000000 +0300 ++++ base/test_base.c 2011-12-27 23:04:50.482955923 +0200 +@@ -39,6 +39,8 @@ + #include "heimbase.h" + #include "heimbasepriv.h" + ++#include <stdlib.h> ++ + static void + memory_free(heim_object_t obj) + { diff --git a/main/heimdal/heimdal_missing_symbols.patch b/main/heimdal/heimdal_missing_symbols.patch new file mode 100644 index 0000000000..21b6975a8b --- /dev/null +++ b/main/heimdal/heimdal_missing_symbols.patch @@ -0,0 +1,28 @@ +Add missing symbols. Cherry picked from upstream master. +Bug #420821. + +--- lib/krb5/version-script.map 2012-01-10 21:53:51.000000000 +0000 ++++ lib/krb5/version-script.map 2012-06-13 16:23:26.000000000 +0000 +@@ -42,6 +42,7 @@ + krb5_auth_con_getrcache; + krb5_auth_con_getremoteseqnumber; + krb5_auth_con_getremotesubkey; ++ krb5_auth_con_getsendsubkey; + krb5_auth_con_init; + krb5_auth_con_removeflags; + krb5_auth_con_setaddrs; +@@ -383,6 +384,14 @@ + krb5_h_errno_to_heim_errno; + krb5_have_error_string; + krb5_hmac; ++ krb5_init_creds_init; ++ krb5_init_creds_set_service; ++ krb5_init_creds_set_keytab; ++ krb5_init_creds_get; ++ krb5_init_creds_set_password; ++ krb5_init_creds_free; ++ krb5_init_creds_get_creds; ++ krb5_init_creds_get_error; + krb5_init_context; + krb5_init_ets; + krb5_initlog; |