From 14861a1c1ace4a3996ae6a20829c827371a5d03d Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 2 Nov 2021 03:24:54 +0100 Subject: heimdal: Update to version 7.7.0 Signed-off-by: Phil Sutter --- package/heimdal/Makefile | 12 +- package/heimdal/patches/heimdal_tinfo.patch | 23 +++ .../heimdal/patches/patch-cf_check-compile-et_m4 | 17 -- .../heimdal/patches/patch-lib_com_err_Makefile_am | 11 -- .../heimdal/patches/patch-lib_krb5_crypto-rand_c | 30 ---- package/heimdal/patches/patch-lib_roken_roken_h_in | 11 -- package/heimdal/src/cf/roken-h-process.pl | 184 --------------------- 7 files changed, 31 insertions(+), 257 deletions(-) create mode 100644 package/heimdal/patches/heimdal_tinfo.patch delete mode 100644 package/heimdal/patches/patch-cf_check-compile-et_m4 delete mode 100644 package/heimdal/patches/patch-lib_com_err_Makefile_am delete mode 100644 package/heimdal/patches/patch-lib_krb5_crypto-rand_c delete mode 100644 package/heimdal/patches/patch-lib_roken_roken_h_in delete mode 100644 package/heimdal/src/cf/roken-h-process.pl (limited to 'package/heimdal') diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile index ee1235a5e..53390c29d 100644 --- a/package/heimdal/Makefile +++ b/package/heimdal/Makefile @@ -4,13 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= heimdal -PKG_VERSION:= 1.5.3 -PKG_RELEASE:= 3 -PKG_HASH:= aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 +PKG_VERSION:= 7.7.0 +PKG_RELEASE:= 1 +PKG_HASH:= f02d3314d634cc55eb9cf04a1eae0d96b293e45a1f837de9d894e800161b7d1b PKG_DESCR:= kerberos server PKG_SECTION:= app/crypto +HOST_BUILDDEP:= ncurses-host PKG_URL:= http://www.h5l.org/ -PKG_SITES:= http://www.h5l.org/dist/src/ +PKG_SITES:= https://github.com/heimdal/heimdal/releases/download/heimdal-${PKG_VERSION}/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz @@ -21,6 +22,9 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,HEIMDAL,heimdal,$(PKG_VERSION)-${PKG_RELEASE})) +# patch changes configure.ac, have to recreate +AUTOTOOL_STYLE:= autoreconf + HOST_STYLE:= manual ifeq ($(OS_FOR_BUILD),Darwin) diff --git a/package/heimdal/patches/heimdal_tinfo.patch b/package/heimdal/patches/heimdal_tinfo.patch new file mode 100644 index 000000000..cd64c7553 --- /dev/null +++ b/package/heimdal/patches/heimdal_tinfo.patch @@ -0,0 +1,23 @@ + Found in Gentoo portage +--- heimdal-1.5/configure.ac.orig 2011-08-01 12:49:33.554689000 +0200 ++++ heimdal-1.5/configure.ac 2011-08-01 13:54:12.707009421 +0200 +@@ -444,7 +444,7 @@ + #endif + ],[0,0,0,0,0]) + +-AC_FIND_FUNC_NO_LIBS(tgetent, termcap ncurses curses,[ ++AC_FIND_FUNC_NO_LIBS(tgetent, tinfo ncurses curses termcap,[ + #ifdef HAVE_TERMCAP_H + #include + #endif +--- heimdal-1.5/lib/libedit/configure.ac~ 2011-07-30 22:43:29.000000000 +0200 ++++ heimdal-1.5/lib/libedit/configure.ac 2011-08-01 13:54:30.657009419 +0200 +@@ -33,7 +33,7 @@ + EL_MANTYPE + + +-AC_CHECK_LIB(curses, tgetent,, ++AC_CHECK_LIB(tinfo, tgetent,, + [AC_CHECK_LIB(ncurses, tgetent,, + [AC_MSG_ERROR([libcurses or libncurses are required!])] )] ) + diff --git a/package/heimdal/patches/patch-cf_check-compile-et_m4 b/package/heimdal/patches/patch-cf_check-compile-et_m4 deleted file mode 100644 index 0211e2b8f..000000000 --- a/package/heimdal/patches/patch-cf_check-compile-et_m4 +++ /dev/null @@ -1,17 +0,0 @@ ---- heimdal-1.5.3.orig/cf/check-compile-et.m4 2012-12-09 23:06:44.000000000 +0100 -+++ heimdal-1.5.3/cf/check-compile-et.m4 2014-04-24 11:55:02.000000000 +0200 -@@ -3,12 +3,12 @@ dnl - dnl CHECK_COMPILE_ET - AC_DEFUN([CHECK_COMPILE_ET], [ - --AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et]) -+AC_CHECK_PROG(COMPILE_ET, compile_et, [compile_et],[no]) - - krb_cv_compile_et="no" - krb_cv_com_err_need_r="" - krb_cv_compile_et_cross=no --if test "${COMPILE_ET}" = "compile_et"; then -+if test "${COMPILE_ET}" != no; then - - dnl We have compile_et. Now let's see if it supports `prefix' and `index'. - AC_MSG_CHECKING(whether compile_et has the features we need) diff --git a/package/heimdal/patches/patch-lib_com_err_Makefile_am b/package/heimdal/patches/patch-lib_com_err_Makefile_am deleted file mode 100644 index 9c2faa8d8..000000000 --- a/package/heimdal/patches/patch-lib_com_err_Makefile_am +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-1.5.3.orig/lib/com_err/Makefile.am 2012-12-09 23:06:44.000000000 +0100 -+++ heimdal-1.5.3/lib/com_err/Makefile.am 2014-05-27 11:51:26.000000000 +0200 -@@ -13,7 +13,7 @@ endif - - libcom_err_la_LIBADD = $(LIB_libintl) - --bin_PROGRAMS = compile_et -+libexec_heimdal_PROGRAMS = compile_et - - include_HEADERS = com_err.h com_right.h - diff --git a/package/heimdal/patches/patch-lib_krb5_crypto-rand_c b/package/heimdal/patches/patch-lib_krb5_crypto-rand_c deleted file mode 100644 index bb72effe0..000000000 --- a/package/heimdal/patches/patch-lib_krb5_crypto-rand_c +++ /dev/null @@ -1,30 +0,0 @@ ---- heimdal-1.5.3.orig/lib/krb5/crypto-rand.c 2012-12-09 23:06:44.000000000 +0100 -+++ heimdal-1.5.3/lib/krb5/crypto-rand.c 2015-11-03 19:30:39.336954603 +0100 -@@ -59,27 +59,6 @@ seed_something(void) - } else - seedfile[0] = '\0'; - -- /* Calling RAND_status() will try to use /dev/urandom if it exists so -- we do not have to deal with it. */ -- if (RAND_status() != 1) { --#ifndef _WIN32 -- krb5_context context; -- const char *p; -- -- /* Try using egd */ -- if (!krb5_init_context(&context)) { -- p = krb5_config_get_string(context, NULL, "libdefaults", -- "egd_socket", NULL); -- if (p != NULL) -- RAND_egd_bytes(p, ENTROPY_NEEDED); -- krb5_free_context(context); -- } --#else -- /* TODO: Once a Windows CryptoAPI RAND method is defined, we -- can use that and failover to another method. */ --#endif -- } -- - if (RAND_status() == 1) { - /* Update the seed file */ - if (seedfile[0]) 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 b571cc428..000000000 --- a/package/heimdal/patches/patch-lib_roken_roken_h_in +++ /dev/null @@ -1,11 +0,0 @@ ---- heimdal-1.5.3.orig/lib/roken/roken.h.in 2012-12-09 23:06:44.000000000 +0100 -+++ heimdal-1.5.3/lib/roken/roken.h.in 2014-04-24 10:36:35.000000000 +0200 -@@ -551,7 +551,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 diff --git a/package/heimdal/src/cf/roken-h-process.pl b/package/heimdal/src/cf/roken-h-process.pl deleted file mode 100644 index aa371a364..000000000 --- a/package/heimdal/src/cf/roken-h-process.pl +++ /dev/null @@ -1,184 +0,0 @@ -#!/usr/bin/perl - -require 'getopts.pl'; - -my $debug = 0; - -Getopts('dc:p:o:') || die "foo"; - -if ($opt_d) { - $debug = 1; -} - -die "missing arg" if (!defined $opt_c || !defined $opt_p || !defined $opt_o); - -my %defines; -my $IN; -my $OUT; - -print "parse config.h\n" if ($debug); - -open IN, $opt_c || die "failed open ${opt_c}"; - -my @nesting; - -push @nesting, 1; - -while () { - if (m/\s*#ifdef\s+(.*)/) { - my $var = $1; - if (defined $defines{$var}) { - push @nesting, 1; - } else { - push @nesting, 0; - } - next; - } elsif (m/\s*#ifndef\s+(.*)/) { - my $var = $1; - if (defined $defines{$var}) { - push @nesting, 0; - } else { - push @nesting, 1; - } - next; - } elsif (m/\s*#else/) { - my $var = pop @nesting; - $var = !$var; - push @nesting, $var; - next; - } elsif ($nesting[$#nesting] and m/\s*#define\s+(\w+)\s+(\S+)/) { - my $res = $2; - $res = 1 if (!defined $res); - $defines{$1} = $res; - } -} - -close IN; - -if ($debug) { - foreach my $i (keys %defines) { - print "k: $i v: $defines{$i}\n"; - } -} - -open IN, "$opt_p" || die "failed open ${opt_p}"; -open OUT, ">$opt_o" || die "failed open ${opt_o}"; - -print "parse roken.h.in\n" if ($debug); - -print OUT "/* This is an OS dependent, generated file */\n"; -print OUT "\n"; -print OUT "\n"; -print OUT "#ifndef __ROKEN_H__\n"; -print OUT "#define __ROKEN_H__\n"; -print OUT "\n"; - -@nesting = (1); - -while () { - if (m/\s*#ifdef\s+(.*)/) { - my $var = $1; - if (defined $defines{$var}) { - push @nesting, 1; - } else { - push @nesting, 0; - } - next; - } elsif (m/\s*#ifndef\s+(.*)/) { - my $var = $1; - if (defined $defines{$var}) { - push @nesting, 0; - } else { - push @nesting, 1; - } - next; - } elsif (m/\s*#if\s+(.*)/) { - my $res = parse_if($1); - print "line = $res: $1\n" if ($debug); - push @nesting, $res; - next; - } elsif (m/\s*#elif\s+(.*)/) { - my $res = pop @nesting; - if ($res gt 0) { - $res = -1; - } else { - my $res = parse_if($1); - } - push @nesting, $res; - next; - } elsif (m/\s*#else/) { - my $var = pop @nesting; - $var = !$var; - push @nesting, $var; - next; - } elsif (m/\s*#endif/) { - pop @nesting; - next; - } - print "line: $_\n" if ($debug); - print "nesting dep $#{nesting}\n" if ($debug); - my $i = 0, $t = 1; - while ($i le $#nesting) { - $t = 0 if ($nesting[$i] le 0); - print "nesting $i val $nesting[$i] -> $t\n" if ($debug); - $i++; - } - if ($t) { - print OUT; - } -} - -print OUT "\n"; -print OUT "#endif /* __ROKEN_H__ */\n"; - - -close IN; - -exit 0; - -sub parse_if -{ - my ($neg, $var); - - $_ = shift; - - if (m/^\s*$/) { - print "end $_\n" if ($debug); - return 1; - } elsif (m/^\(([^&]+)\&\&(.*)$/) { - print "$1 and $2\n" if ($debug); - return parse_if($1) and parse_if($2); - } elsif (m/^([^&]+)\&\&(.*)$/) { - print "$1 and $2\n" if ($debug); - return parse_if($1) and parse_if($2); - } elsif (m/^([^\|]+)\|\|(.*)$/) { - print "$1 or $2\n" if ($debug); - return parse_if($1) or parse_if($2); - } elsif (m/^\s*(\!)?\s*defined\((\w+)\)/) { - ($neg, $var) = ($1, $2); - print "def: ${neg}-defined(${var})\n" if ($debug); - my $res = defined $defines{$var}; - if ($neg eq "!") { - if ($res) { - $res = 0; - } else { - $res = 1; - } - } - print "res: $res\n" if ($debug); - return $res; - } elsif (m/^\s*(\!)?(\w+)/) { - ($neg, $var) = ($1, $2); - print "var: $neg $var\n" if ($debug); - my $res; - if (defined $defines{$var}) { - $res = $defines{$var}; - } else { - $res = 0; - } - $res = ! $res if ($neg =~ m/!/); - print "res: $res\n" if ($debug); - return $res; - } - die "failed parse: $_\n"; -} -- cgit v1.2.3