heimdal: Update to 7.7.1
* drop two patches included in this release. * one rebase * move to signed tarball
This commit is contained in:
Christoph Reiter
@@ -1,5 +1,5 @@
|
||||
--- heimdal-heimdal-7.5.0/lib/hcrypto/Makefile.am.orig 2018-06-27 08:49:04.243933000 +0300
|
||||
+++ heimdal-heimdal-7.5.0/lib/hcrypto/Makefile.am 2018-06-27 08:51:02.999799700 +0300
|
||||
--- heimdal-heimdal-7.7.1/lib/hcrypto/Makefile.am.orig 2022-11-15 16:56:44.000000000 +0100
|
||||
+++ heimdal-heimdal-7.7.1/lib/hcrypto/Makefile.am 2022-12-04 19:10:32.624493900 +0100
|
||||
@@ -9,6 +9,7 @@
|
||||
endif
|
||||
|
||||
@@ -8,17 +8,16 @@
|
||||
-I$(srcdir)/libtommath -DUSE_HCRYPTO_LTM=1
|
||||
|
||||
lib_LTLIBRARIES = libhcrypto.la
|
||||
@@ -296,9 +297,6 @@
|
||||
libtommath/bn_mp_to_signed_bin_n.c \
|
||||
@@ -294,8 +295,6 @@
|
||||
libtommath/bn_mp_to_unsigned_bin_n.c
|
||||
|
||||
-
|
||||
-$(libhcrypto_la_OBJECTS): hcrypto-link
|
||||
|
||||
-$(libhcrypto_la_OBJECTS) $(test_rand_OBJECTS): hcrypto-link
|
||||
-
|
||||
libhcrypto_la_CPPFLAGS = -DBUILD_HCRYPTO_LIB $(AM_CPPFLAGS)
|
||||
|
||||
if versionscript
|
||||
@@ -306,11 +304,6 @@
|
||||
@@ -303,11 +302,6 @@
|
||||
endif
|
||||
$(libhcrypto_la_OBJECTS): $(srcdir)/version-script.map
|
||||
|
||||
@@ -30,7 +29,7 @@
|
||||
do_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' -e 's,[@]exeext[@],$(exeext),g'
|
||||
|
||||
test_crypto: test_crypto.in Makefile
|
||||
@@ -323,7 +316,6 @@
|
||||
@@ -320,7 +314,6 @@
|
||||
crypto-test2 \
|
||||
error \
|
||||
hcrypto \
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
From fbc60f1f3f6a46cf17ca9c17dc55eb551eae4af5 Mon Sep 17 00:00:00 2001
|
||||
From: Quanah Gibson-Mount <quanah@symas.com>
|
||||
Date: Tue, 28 Apr 2020 20:16:40 +0000
|
||||
Subject: [PATCH] Fix #696 - Find python as part of the configure process
|
||||
instead of hard coding it.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
lib/wind/Makefile.am | 2 --
|
||||
2 files changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 29709561b6..68434d1a33 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -18,6 +18,7 @@ dnl Checks for programs.
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_C_O
|
||||
AC_PROG_CPP
|
||||
+AM_PATH_PYTHON
|
||||
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
|
||||
diff --git a/lib/wind/Makefile.am b/lib/wind/Makefile.am
|
||||
index 0b493118b3..4a34496fcf 100644
|
||||
--- a/lib/wind/Makefile.am
|
||||
+++ b/lib/wind/Makefile.am
|
||||
@@ -89,8 +89,6 @@ idn_lookup_SOURCES = idn-lookup.c
|
||||
|
||||
LDADD = libwind.la $(LIB_roken)
|
||||
|
||||
-PYTHON = python
|
||||
-
|
||||
if !MAINTAINER_MODE
|
||||
skip_python = test -f $@ ||
|
||||
endif
|
||||
@@ -1,29 +0,0 @@
|
||||
From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001
|
||||
From: Lars Wendler <polynomial-c@gentoo.org>
|
||||
Date: Wed, 17 Mar 2021 17:49:18 +0100
|
||||
Subject: [PATCH] autoconf-2.70 fix
|
||||
|
||||
autoconf-2.70 and newer are more strict with quoting etc. and thus generate
|
||||
a broken configure file:
|
||||
|
||||
configure: 20855: Syntax error: ")" unexpected (expecting "fi")
|
||||
|
||||
Gentoo-bug: https://bugs.gentoo.org/776241
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
---
|
||||
cf/check-var.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cf/check-var.m4 b/cf/check-var.m4
|
||||
index 2fd7bca6f0..71d6f70ca8 100644
|
||||
--- a/cf/check-var.m4
|
||||
+++ b/cf/check-var.m4
|
||||
@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo)
|
||||
if test "$ac_foo" = yes; then
|
||||
AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1,
|
||||
[Define if you have the `]$1[' variable.])
|
||||
- m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
|
||||
+ m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])])
|
||||
fi
|
||||
])
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
pkgbase=heimdal
|
||||
pkgname=('heimdal' 'heimdal-libs' 'heimdal-devel')
|
||||
pkgver=7.7.0
|
||||
pkgrel=4
|
||||
pkgver=7.7.1
|
||||
pkgrel=1
|
||||
pkgdesc="Implementation of Kerberos V5 libraries"
|
||||
arch=('i686' 'x86_64')
|
||||
url="https://www.h5l.org/"
|
||||
@@ -11,7 +11,7 @@ license=('custom')
|
||||
makedepends=('libdb-devel' 'libcrypt-devel' 'libedit-devel' 'libsqlite-devel' 'openssl-devel' 'perl-JSON' 'python' 'autotools' 'gcc') #libldap-devel
|
||||
options=('!libtool' '!emptydirs' 'staticlibs')
|
||||
groups=('net-utils')
|
||||
source=(https://github.com/heimdal/heimdal/archive/heimdal-${pkgver}.tar.gz
|
||||
source=(https://github.com/heimdal/heimdal/releases/download/heimdal-${pkgver}/heimdal-${pkgver}.tar.gz{,.sig}
|
||||
1.2.1-test-modules.patch
|
||||
1.5.2-hdbdir.patch
|
||||
1.5.2-install-catman.patch
|
||||
@@ -19,23 +19,21 @@ source=(https://github.com/heimdal/heimdal/archive/heimdal-${pkgver}.tar.gz
|
||||
1.5.3-missing-libs-pkg-config.patch
|
||||
1.5.3-fix-detect-libedit.patch
|
||||
7.5.0-hcrypto-build-fix.patch
|
||||
7.5.0-names-clash-with-openssl.patch
|
||||
7.7.0-find-python-706.patch
|
||||
7.7.0-fix-autoconf-2.71.patch)
|
||||
sha256sums=('f7d414d0914abb0e151a276b4de22cf4977fd6c28bd9ecdd990407b1138a945c'
|
||||
7.5.0-names-clash-with-openssl.patch)
|
||||
sha256sums=('117cb1ede7848db24cf27311c46f7f735a99f9c836c22e80aec92b91efe56644'
|
||||
'SKIP'
|
||||
'b18c9ca3f2db08cea0a4b7d7f07e8656360af848b3a30a5fa8d748240989da49'
|
||||
'a99f0f5b69d32524399b1343a4f08b2de43351828b5b45a938f72bacb0eb9085'
|
||||
'd68bb0f8f01cc748a6ef63c74a4a15c75553c2322e9bd2649c54cb23077d521b'
|
||||
'bf19c5d7326a0cf58a5b4922a9c96fb78807226bc40c2248417024b961dd559e'
|
||||
'5039112bbe27b814df115eca40607b957c13dd40bdc1d2d1ccc62b31fcfe87ac'
|
||||
'bb96587539084c2ea9e06da8d2b4c768edd8dd422587a045ea60d1aa3eeb6a8a'
|
||||
'f387721cc311a82ce2d4793187957d5323aa773538ea3268175741712534f8d4'
|
||||
'bfe321c0391d6f7e23abecc22e9941bcb79d0b67abb9975246a9f462ec32513b'
|
||||
'82120cf0fe00b6dc6f29cc2724dded4452eed860d977fd02568b0322093a0572'
|
||||
'3366bc224b97321d3ed830cf18269753404f6b5618ca4c71239be435a374f6da')
|
||||
'1886fcb422902f80246ee104bab79a95bf8c26442038fe32977f17653e45ee2f'
|
||||
'bfe321c0391d6f7e23abecc22e9941bcb79d0b67abb9975246a9f462ec32513b')
|
||||
validpgpkeys=('FB925C7AFA000F52B4BBD1ED9A077911BB7DC320') # Heimdal Security <heimdal-security@heimdal.team>
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/heimdal-heimdal-${pkgver}
|
||||
cd ${srcdir}/heimdal-${pkgver}
|
||||
|
||||
patch -p2 -i "${srcdir}"/1.2.1-test-modules.patch
|
||||
patch -p2 -i "${srcdir}"/1.5.2-hdbdir.patch
|
||||
@@ -43,18 +41,15 @@ prepare() {
|
||||
patch -p2 -i "${srcdir}"/1.5.2-roken-signal.patch
|
||||
patch -p1 -i "${srcdir}"/1.5.3-missing-libs-pkg-config.patch
|
||||
patch -p1 -i "${srcdir}"/1.5.3-fix-detect-libedit.patch
|
||||
|
||||
patch -p1 -i "${srcdir}"/7.5.0-hcrypto-build-fix.patch
|
||||
patch -p1 -i "${srcdir}"/7.5.0-names-clash-with-openssl.patch
|
||||
# https://github.com/heimdal/heimdal/pull/706
|
||||
patch -p1 -i "${srcdir}"/7.7.0-find-python-706.patch
|
||||
# https://github.com/heimdal/heimdal/pull/771
|
||||
patch -p1 -i "${srcdir}"/7.7.0-fix-autoconf-2.71.patch
|
||||
|
||||
./autogen.sh
|
||||
}
|
||||
|
||||
build() {
|
||||
cd ${srcdir}/heimdal-heimdal-${pkgver}
|
||||
cd ${srcdir}/heimdal-${pkgver}
|
||||
|
||||
./configure \
|
||||
--build=${CHOST} \
|
||||
@@ -85,7 +80,7 @@ build() {
|
||||
|
||||
setup() {
|
||||
local destdir=${srcdir}/dest
|
||||
cd ${srcdir}/heimdal-heimdal-${pkgver}
|
||||
cd ${srcdir}/heimdal-${pkgver}
|
||||
make DESTDIR=${destdir} install
|
||||
|
||||
# Remove daemons and their manpages
|
||||
@@ -110,10 +105,10 @@ setup() {
|
||||
|
||||
# install config
|
||||
# Do not install the config as this will conflict with krb5
|
||||
install -D -m644 ${srcdir}/heimdal-heimdal-${pkgver}/krb5.conf ${destdir}/etc/krb5/krb5.conf
|
||||
install -D -m644 ${srcdir}/heimdal-${pkgver}/krb5.conf ${destdir}/etc/krb5/krb5.conf
|
||||
|
||||
# Install the license
|
||||
install -Dm644 ${srcdir}/heimdal-heimdal-${pkgver}/LICENSE \
|
||||
install -Dm644 ${srcdir}/heimdal-${pkgver}/LICENSE \
|
||||
${destdir}/usr/share/licenses/${pkgname}/LICENSE
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user