mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-14 00:56:25 +02:00
main/krb5: fix build with autoconf 2.73
Fix missing `AC_INIT` macro during `autoreconf` with autoconf 2.73. ``` autoreconf: error: configure.ac: AC_INIT not found; not an autoconf script? ```
This commit is contained in:
mio
parent
bd669d1a19
commit
92bc4f0d36
@ -1,7 +1,7 @@
|
||||
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
|
||||
pkgname=krb5
|
||||
pkgver=1.22.2
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="The Kerberos network authentication system"
|
||||
url="https://web.mit.edu/kerberos/www/"
|
||||
arch="all"
|
||||
@ -25,6 +25,8 @@ source="https://web.mit.edu/kerberos/dist/krb5/$_maj_min/krb5-$pkgver.tar.gz
|
||||
krb5kadmind.initd
|
||||
krb5kdc.initd
|
||||
krb5kpropd.initd
|
||||
|
||||
autoconf-2.73.patch
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$pkgver/src"
|
||||
|
||||
@ -133,4 +135,5 @@ sha512sums="
|
||||
43b9885b7eb8d0d60920def688de482f2b1701288f9acb1bb21dc76b2395428ff304961959eb04ba5eafd0412bae35668d6d2c8223424b9337bc051eadf51682 krb5kadmind.initd
|
||||
ede15f15bbbc9d0227235067abe15245bb9713aea260d397379c63275ce74aea0db6c91c15d599e40c6e89612d76f3a0f8fdd21cbafa3f30d426d4310d3e2cec krb5kdc.initd
|
||||
45be0d421efd41e9dd056125a750c90856586e990317456b68170d733b03cba9ecd18ab87603b20e49575e7839fb4a6d628255533f2631f9e8ddb7f3cc493a90 krb5kpropd.initd
|
||||
9ace8b2fba6d33d2ff5a3d8ddc6548c7683046642832b32777688b5caddf003631108dd97641d6bcd0af2845d3825f293a90a15287a5e86a92e29227c4561839 autoconf-2.73.patch
|
||||
"
|
||||
|
||||
92
main/krb5/autoconf-2.73.patch
Normal file
92
main/krb5/autoconf-2.73.patch
Normal file
@ -0,0 +1,92 @@
|
||||
Patch-Source: https://github.com/krb5/krb5/pull/1485
|
||||
Paths adapted for $builddir.
|
||||
---
|
||||
From b7290e0cab5b7e39cd4aa7c098beb18a886d4a1d Mon Sep 17 00:00:00 2001
|
||||
From: Samuel Cabrero <scabrero@suse.com>
|
||||
Date: Tue, 17 Feb 2026 16:57:40 +0100
|
||||
Subject: [PATCH] Make configure.ac work with autoconf 2.73
|
||||
|
||||
autoreconf requires "AC_INIT" to appear in configure.ac. Prior to
|
||||
autoconf 2.73, our indirect invocation via K5_AC_INIT() was
|
||||
sufficient, but now the regular expression match checks for word
|
||||
boundaries. Get rid of K5_AC_INIT(), moving the version extraction
|
||||
code from aclocal.m4 to a new file version.m4. In the moved
|
||||
versioning code, use m4_fatal() to simplify error handling.
|
||||
|
||||
[ghudson@mit.edu: made the m4_fatal() change; rewrote commit message]
|
||||
|
||||
ticket: 9202 (new)
|
||||
---
|
||||
src/aclocal.m4 | 24 ------------------------
|
||||
src/configure.ac | 4 +++-
|
||||
src/version.m4 | 14 ++++++++++++++
|
||||
3 files changed, 17 insertions(+), 25 deletions(-)
|
||||
create mode 100644 src/version.m4
|
||||
|
||||
diff --git a/src/aclocal.m4 b/src/aclocal.m4
|
||||
index bd75a8d732..f6dc817bfb 100644
|
||||
--- a/aclocal.m4
|
||||
+++ b/aclocal.m4
|
||||
@@ -16,30 +16,6 @@ ac_config_fragdir=$ac_reltopdir/config
|
||||
AC_CONFIG_AUX_DIR(K5_TOPDIR/config)
|
||||
])dnl
|
||||
dnl
|
||||
-dnl Version info.
|
||||
-dnl
|
||||
-pushdef([x],esyscmd([sed -n 's/#define \([A-Z0-9_]*\)[ \t]*\(.*\)/\1=\2/p' < ]K5_TOPDIR/patchlevel.h))
|
||||
-define([PL_KRB5_MAJOR_RELEASE],regexp(x,[KRB5_MAJOR_RELEASE=\(.*\)],[\1]))
|
||||
-ifelse(PL_KRB5_MAJOR_RELEASE,,[errprint([Can't determine KRB5_MAJOR_RELEASE value from patchlevel.h.
|
||||
-]) m4exit(1) dnl sometimes that does not work?
|
||||
-builtin(m4exit,1)])
|
||||
-define([PL_KRB5_MINOR_RELEASE],regexp(x,[KRB5_MINOR_RELEASE=\(.*\)],[\1]))
|
||||
-ifelse(PL_KRB5_MINOR_RELEASE,,[errprint([Can't determine KRB5_MINOR_RELEASE value from patchlevel.h.
|
||||
-]) m4exit(1) dnl sometimes that does not work?
|
||||
-builtin(m4exit,1)])
|
||||
-define([PL_KRB5_PATCHLEVEL],regexp(x,[KRB5_PATCHLEVEL=\(.*\)],[\1]))
|
||||
-ifelse(PL_KRB5_PATCHLEVEL,,[errprint([Can't determine KRB5_PATCHLEVEL value from patchlevel.h.
|
||||
-]) m4exit(1) dnl sometimes that does not work?
|
||||
-builtin(m4exit,1)])
|
||||
-define([PL_KRB5_RELTAIL],regexp(x,[KRB5_RELTAIL="\(.*\)"],[\1]))
|
||||
-dnl RELTAIL is allowed to not be defined.
|
||||
-popdef([x])
|
||||
-define([K5_VERSION],PL_KRB5_MAJOR_RELEASE.PL_KRB5_MINOR_RELEASE[]ifelse(PL_KRB5_PATCHLEVEL,0,,.PL_KRB5_PATCHLEVEL)ifelse(PL_KRB5_RELTAIL,,,-PL_KRB5_RELTAIL))
|
||||
-define([K5_BUGADDR],krb5-bugs@mit.edu)
|
||||
-define([K5_AC_INIT],[AC_INIT(Kerberos 5, K5_VERSION, K5_BUGADDR, krb5)
|
||||
-AC_CONFIG_SRCDIR($1)
|
||||
-build_dynobj=no])
|
||||
-dnl
|
||||
dnl drop in standard rules for all configure files -- CONFIG_RULES
|
||||
dnl
|
||||
AC_DEFUN(CONFIG_RULES,[dnl
|
||||
diff --git a/src/configure.ac b/src/configure.ac
|
||||
index ed67245018..f1cbe4b13c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1,4 +1,6 @@
|
||||
-K5_AC_INIT([aclocal.m4])
|
||||
+m4_include([version.m4])
|
||||
+AC_INIT(Kerberos 5, K5_VERSION, K5_BUGADDR, krb5)
|
||||
+AC_CONFIG_SRCDIR([aclocal.m4])
|
||||
|
||||
# If $runstatedir isn't set by autoconf (<2.70), set it manually.
|
||||
if test x"$runstatedir" = x; then
|
||||
diff --git a/src/version.m4 b/src/version.m4
|
||||
new file mode 100644
|
||||
index 0000000000..4b08edde52
|
||||
--- /dev/null
|
||||
+++ b/version.m4
|
||||
@@ -0,0 +1,14 @@
|
||||
+define([K5_TOPDIR],[.])dnl
|
||||
+dnl
|
||||
+pushdef([x],esyscmd([sed -n 's/#define \([A-Z0-9_]*\)[ \t]*\(.*\)/\1=\2/p' < ]K5_TOPDIR/patchlevel.h))
|
||||
+define([PL_KRB5_MAJOR_RELEASE],regexp(x,[KRB5_MAJOR_RELEASE=\(.*\)],[\1]))
|
||||
+ifelse(PL_KRB5_MAJOR_RELEASE,,[m4_fatal([Can't determine KRB5_MAJOR_RELEASE value from patchlevel.h.])])
|
||||
+define([PL_KRB5_MINOR_RELEASE],regexp(x,[KRB5_MINOR_RELEASE=\(.*\)],[\1]))
|
||||
+ifelse(PL_KRB5_MINOR_RELEASE,,[m4_fatal([Can't determine KRB5_MINOR_RELEASE value from patchlevel.h.])])
|
||||
+define([PL_KRB5_PATCHLEVEL],regexp(x,[KRB5_PATCHLEVEL=\(.*\)],[\1]))
|
||||
+ifelse(PL_KRB5_PATCHLEVEL,,[m4_fatal([Can't determine KRB5_PATCHLEVEL value from patchlevel.h.])])
|
||||
+define([PL_KRB5_RELTAIL],regexp(x,[KRB5_RELTAIL="\(.*\)"],[\1]))
|
||||
+dnl RELTAIL is allowed to not be defined.
|
||||
+popdef([x])
|
||||
+m4_define([K5_VERSION],PL_KRB5_MAJOR_RELEASE.PL_KRB5_MINOR_RELEASE[]ifelse(PL_KRB5_PATCHLEVEL,0,,.PL_KRB5_PATCHLEVEL)ifelse(PL_KRB5_RELTAIL,,,-PL_KRB5_RELTAIL))
|
||||
+m4_define([K5_BUGADDR],krb5-bugs@mit.edu)
|
||||
Loading…
x
Reference in New Issue
Block a user