mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2024-09-20 11:23:16 +00:00
main/kea: upgrade to 2.6.1
This commit is contained in:
Lindsay Zhou
Jakub Jirutka
parent
24f5b0999c
commit
7e9307036e
4 changed files with 6 additions and 119 deletions
|
|
@ -6,8 +6,8 @@ pkgname=kea
|
|||
# NOTE: Upgrade only to even-numbered versions (e.g. 1.8.x, 1.10.x)!
|
||||
# Odd-numbered versions are development versions.
|
||||
# NOTE: When bumping, always rebuild all kea hooks (kea-* aports)!
|
||||
pkgver=2.4.1
|
||||
pkgrel=2
|
||||
pkgver=2.6.1
|
||||
pkgrel=0
|
||||
pkgdesc="DHCPv4 and DHCPv6 server from ISC"
|
||||
url="https://kea.isc.org/"
|
||||
arch="all"
|
||||
|
|
@ -57,8 +57,6 @@ source="https://ftp.isc.org/isc/kea/$pkgver/kea-$pkgver.tar.gz
|
|||
configs-fix-paths.patch
|
||||
put-LOCKFILE_DIR-to-runstatedir.patch
|
||||
move-api-files-to-doc.patch
|
||||
kea-admin-remove-builddir.patch
|
||||
python3.12.patch
|
||||
kea.initd.in
|
||||
kea.confd.in
|
||||
"
|
||||
|
|
@ -275,13 +273,11 @@ _install_initd() {
|
|||
}
|
||||
|
||||
sha512sums="
|
||||
b8a3b6f2cae213fd9826c37568c71d3458f52eed973dbe437a1d0974dafa026635a730d828c6ff03b32e030be57d75a7914a8ca313833e91d9996b6a05b2b224 kea-2.4.1.tar.gz
|
||||
9008df39883884db5fb4a6551d92262b465c186275bebd45358bdd25a637517c5613634f7541c226869dd8ca4118230726bf250b1d4c5198f3c5079527c72440 disable-db-tests.patch
|
||||
23a4c431117097538a15afd8a28016b49db5490f866aa03abd2bdfef5eaab5031491320acdf3097899d4b071cccff4b53c032ff076b13cab853e063aaa2810ec kea-2.6.1.tar.gz
|
||||
8e24478e237f4e46cc186666dc071ecec1c5eb898ce3c092cda49cfb43c54f18b34400e5896b9d9733f7db61892f8883bda6a73f837257e156fa71414557ea05 disable-db-tests.patch
|
||||
3439046a80de33b31bf3f12e3c9728e47119e245fb888a1e4484a443b20e7b364f0e15e10fa96b4fcfcec29e6d2828ba9ab728a83028546a9c28f30fc404512d configs-fix-paths.patch
|
||||
52de95e9b4de3e518b4fbbce19799230684a2924433e666c24b866e537ffeaea9cd16b0b41499a17dd3ed528be1f899e94e67f6e464d551149b850cdbf29c1b2 put-LOCKFILE_DIR-to-runstatedir.patch
|
||||
100b70f3ccecb46b98e9fd599ab6f0c3aa191d862d914ed84f4d34efea0cc119817d1e14b967c0f5024614af1ef6841a8d12e789945cad147d943965f194ece1 move-api-files-to-doc.patch
|
||||
eef973da24aaa3dd1b02925d6be1f59caa363a7721e2e4dd6bd8553b0c351961f7436b21c32cbc6acdf90cf99a7fe7daa954c8ce4dbd0eda36844f566b126c48 kea-admin-remove-builddir.patch
|
||||
8feb09cf184c3128b8f434e896f062d12e978a3fda435bb57389756cf0290ba993604fc2512101b7d7865c7be831d9fe6519c9e16885c7e737ea63513ed9135f python3.12.patch
|
||||
e2f77a403b1c84918c92acf8c22d4bd3ea3662d109c334aebb4f55f1821901fbf287f0c1ac03f5de56227e888edc63667f54a0ee51fa4b654479f4e14841d11a kea.initd.in
|
||||
eb45671073174e319cd4fedb61c5f8664370f701856569c675a5aaa280bde974bdabbc30e733379b2e61b32dc2e1e94808b79f141de7c209109e874b2b4b5e8f kea.confd.in
|
||||
"
|
||||
|
|
|
|||
|
|
@ -14,5 +14,5 @@ already initialized databases prepared for Kea tests.
|
|||
-SHTESTS += pgsql_tests.sh
|
||||
+#SHTESTS += pgsql_tests.sh
|
||||
endif
|
||||
|
||||
# Run tests on "make check".
|
||||
|
||||
# As with every file generated by ./configure, clean them up when running
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
Patch-Source: https://sources.debian.org/src/isc-kea/1.5.0-2/debian/patches/0003-kea_admin_fix/ (modified)
|
||||
--
|
||||
From: Kea <isc-kea@packages.debian.org>
|
||||
Date: Tue, 19 Feb 2019 12:39:35 +0000
|
||||
Subject: kea_admin_fix
|
||||
|
||||
Removed the fallback to the build version of kea-admin since it will not exist on users hosts.
|
||||
|
||||
--- a/src/bin/admin/kea-admin.in
|
||||
+++ b/src/bin/admin/kea-admin.in
|
||||
@@ -50,8 +50,6 @@
|
||||
# Include the installed admin-utils.sh if available. Fallback to sources otherwise.
|
||||
if test -f "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"; then
|
||||
. "@datarootdir@/@PACKAGE_NAME@/scripts/admin-utils.sh"
|
||||
-else
|
||||
- . "@abs_top_builddir@/src/bin/admin/admin-utils.sh"
|
||||
fi
|
||||
|
||||
# Find the installed kea-lfc if available. Fallback to sources otherwise.
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
From 9ba2f0ddbcf08d4d67baffa8779abff7042a1c96 Mon Sep 17 00:00:00 2001
|
||||
From: Karl Berry <karl@freefriends.org>
|
||||
Date: Tue, 25 Feb 2020 18:07:15 -0800
|
||||
Subject: python: support both Python 2 and 3 in py-compile
|
||||
|
||||
* lib/py-compile: check python major version and use imp
|
||||
or importlib accordingly, plus related changes. Original
|
||||
patch for Python 3 only from Gabriel Ganne at:
|
||||
https://lists.gnu.org/archive/html/automake-patches/2019-07/msg00002.html
|
||||
---
|
||||
lib/py-compile | 33 ++++++++++++++++++++++++++-------
|
||||
1 file changed, 26 insertions(+), 7 deletions(-)
|
||||
|
||||
(limited to 'lib/py-compile')
|
||||
|
||||
diff --git a/lib/py-compile b/lib/py-compile
|
||||
index f2be7d0..e56d98d 100755
|
||||
--- a/py-compile
|
||||
+++ b/py-compile
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# py-compile - Compile a Python program
|
||||
|
||||
-scriptversion=2018-03-07.03; # UTC
|
||||
+scriptversion=2020-02-19.23; # UTC
|
||||
|
||||
# Copyright (C) 2000-2020 Free Software Foundation, Inc.
|
||||
|
||||
@@ -115,8 +115,27 @@ else
|
||||
filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
|
||||
fi
|
||||
|
||||
+python_major=$($PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q')
|
||||
+if test -z "$python_major"; then
|
||||
+ echo "$me: could not determine $PYTHON major version, guessing 3" >&2
|
||||
+ python_major=3
|
||||
+fi
|
||||
+
|
||||
+# The old way to import libraries was deprecated.
|
||||
+if test "$python_major" -le 2; then
|
||||
+ import_lib=imp
|
||||
+ import_test="hasattr(imp, 'get_tag')"
|
||||
+ import_call=imp.cache_from_source
|
||||
+ import_arg2=', False' # needed in one call and not the other
|
||||
+else
|
||||
+ import_lib=importlib
|
||||
+ import_test="hasattr(sys.implementation, 'cache_tag')"
|
||||
+ import_call=importlib.util.cache_from_source
|
||||
+ import_arg2=
|
||||
+fi
|
||||
+
|
||||
$PYTHON -c "
|
||||
-import sys, os, py_compile, imp
|
||||
+import sys, os, py_compile, $import_lib
|
||||
|
||||
files = '''$files'''
|
||||
|
||||
@@ -129,15 +148,15 @@ for file in files.split():
|
||||
continue
|
||||
sys.stdout.write(file)
|
||||
sys.stdout.flush()
|
||||
- if hasattr(imp, 'get_tag'):
|
||||
- py_compile.compile(filepath, imp.cache_from_source(filepath), path)
|
||||
+ if $import_test:
|
||||
+ py_compile.compile(filepath, $import_call(filepath), path)
|
||||
else:
|
||||
py_compile.compile(filepath, filepath + 'c', path)
|
||||
sys.stdout.write('\n')" || exit $?
|
||||
|
||||
# this will fail for python < 1.5, but that doesn't matter ...
|
||||
$PYTHON -O -c "
|
||||
-import sys, os, py_compile, imp
|
||||
+import sys, os, py_compile, $import_lib
|
||||
|
||||
# pypy does not use .pyo optimization
|
||||
if hasattr(sys, 'pypy_translation_info'):
|
||||
@@ -153,8 +172,8 @@ for file in files.split():
|
||||
continue
|
||||
sys.stdout.write(file)
|
||||
sys.stdout.flush()
|
||||
- if hasattr(imp, 'get_tag'):
|
||||
- py_compile.compile(filepath, imp.cache_from_source(filepath, False), path)
|
||||
+ if $import_test:
|
||||
+ py_compile.compile(filepath, $import_call(filepath$import_arg2), path)
|
||||
else:
|
||||
py_compile.compile(filepath, filepath + 'o', path)
|
||||
sys.stdout.write('\n')" 2>/dev/null || :
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
Loading…
Reference in a new issue