Date: Saturday, October 15, 2022 @ 21:05:25
Author: eworm
Revision: 1329243
upgpkg: freeradius 3.2.1-2
Added:
freeradius/trunk/0001-python-3-10.patch
freeradius/trunk/0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
Modified:
freeradius/trunk/PKGBUILD
Deleted:
freeradius/trunk/python310.patch
---------------------------------------------------------------+
0001-python-3-10.patch | 12 ++++
0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch | 25 ++++++++++
PKGBUILD | 12 +++-
python310.patch | 12 ----
4 files changed, 45 insertions(+), 16 deletions(-)
Added: 0001-python-3-10.patch
===================================================================
--- 0001-python-3-10.patch (rev 0)
+++ 0001-python-3-10.patch 2022-10-15 21:05:25 UTC (rev 1329243)
@@ -0,0 +1,12 @@
+diff -upr freeradius-server/src/modules/rlm_python/configure
freeradius-server/src/modules/rlm_python/configure
+--- freeradius-server/src/modules/rlm_python/configure 2021-10-07
22:46:04.000000000 +0300
++++ freeradius-server/src/modules/rlm_python/configure 2021-12-10
18:13:15.196401810 +0200
+@@ -2945,7 +2945,7 @@ $as_echo "$as_me: Python sys.prefix \"${
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.exec_prefix
\"${PY_EXEC_PREFIX}\"" >&5
+ $as_echo "$as_me: Python sys.exec_prefix \"${PY_EXEC_PREFIX}\"" >&6;}
+
+- PY_SYS_VERSION=`${PYTHON_BIN} -c 'import sys ;
print(sys.version[0:3])'`
++ PY_SYS_VERSION=`${PYTHON_BIN} -c 'import sys ;
print(".".join(map(str, sys.version_info[:2])))'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.version
\"${PY_SYS_VERSION}\"" >&5
+ $as_echo "$as_me: Python sys.version \"${PY_SYS_VERSION}\"" >&6;}
+
Added: 0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
===================================================================
--- 0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
(rev 0)
+++ 0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
2022-10-15 21:05:25 UTC (rev 1329243)
@@ -0,0 +1,25 @@
+From 882a598c5ce4ce235ecb23f22afc2141c92910f5 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <[email protected]>
+Date: Sat, 15 Oct 2022 22:38:42 +0200
+Subject: [PATCH 1/1] Fallback to `uname -n` on missing `hostname` in radtest
+
+This should work without inetutils being installed, so add a fallback.
+
+Signed-off-by: Christian Hesse <[email protected]>
+---
+ src/main/radtest.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/radtest.in b/src/main/radtest.in
+index 11e929147a..e15f92ed9b 100644
+--- a/src/main/radtest.in
++++ b/src/main/radtest.in
+@@ -100,7 +100,7 @@ if [ "$7" ]
+ then
+ nas=$7
+ else
+- nas=`hostname`
++ nas=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ fi
+
+ (
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-15 20:22:19 UTC (rev 1329242)
+++ PKGBUILD 2022-10-15 21:05:25 UTC (rev 1329243)
@@ -4,7 +4,7 @@
pkgname=freeradius
pkgver=3.2.1
-pkgrel=1
+pkgrel=2
pkgdesc='The premier open source RADIUS server'
arch=('x86_64')
url='https://freeradius.org/'
@@ -26,13 +26,15 @@
options=('!makeflags' 'debug')
validpgpkeys=('BF2384EC6938B9744B03E2A620E37C25995B4F85') # FreeRADIUS -
Package Signing [...] <[email protected]>
source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig}
- 'python310.patch'
+ '0001-python-3-10.patch'
+ '0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch'
'freeradius-sysusers.conf'
'freeradius-tmpfiles.conf'
'freeradius.service')
sha256sums=('32cd4eae3c24af2893aa5feff643bc9ac0755341b2b7e8dd622c6e9a23e9f256'
'SKIP'
- '58f415a4d05f2446d2514b98f5fd5d740d7bee400745d43a82d024a3d23ab253'
+ 'c9c7b0d409e15b65b49f925f5480f379312be7d9f7b9601d958a40f894befa73'
+ '280d451646153f2a5541f54215d437a5b86d03c732523e4e3c94dccc508d0f9a'
'8ecaca94c7d0f4806b326685312dd4e543ce9c6c183d3d7ad01c1a0197bdfb94'
'f536a9aa972e3e42a6b1a6d8ee17166eb721c7cba2e80f60473811497c7bd8bc'
'c469e1a3f9edad769da01c324779babe783ee85a9b53ce4638d3d2d09c7c8d4b')
@@ -39,7 +41,9 @@
prepare() {
cd "$srcdir"/freeradius-server-$pkgver
- patch -Np1 -i ../python310.patch
+
+ patch -Np1 < ../0001-python-3-10.patch
+ patch -Np1 < ../0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
}
build() {
Deleted: python310.patch
===================================================================
--- python310.patch 2022-10-15 20:22:19 UTC (rev 1329242)
+++ python310.patch 2022-10-15 21:05:25 UTC (rev 1329243)
@@ -1,12 +0,0 @@
-diff -upr freeradius-server-3.0.25.orig/src/modules/rlm_python/configure
freeradius-server-3.0.25/src/modules/rlm_python/configure
---- freeradius-server-3.0.25.orig/src/modules/rlm_python/configure
2021-10-07 22:46:04.000000000 +0300
-+++ freeradius-server-3.0.25/src/modules/rlm_python/configure 2021-12-10
18:13:15.196401810 +0200
-@@ -2945,7 +2945,7 @@ $as_echo "$as_me: Python sys.prefix \"${
- { $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.exec_prefix
\"${PY_EXEC_PREFIX}\"" >&5
- $as_echo "$as_me: Python sys.exec_prefix \"${PY_EXEC_PREFIX}\"" >&6;}
-
-- PY_SYS_VERSION=`${PYTHON_BIN} -c 'import sys ;
print(sys.version[0:3])'`
-+ PY_SYS_VERSION=`${PYTHON_BIN} -c 'import sys ;
print(".".join(map(str, sys.version_info[:2])))'`
- { $as_echo "$as_me:${as_lineno-$LINENO}: Python sys.version
\"${PY_SYS_VERSION}\"" >&5
- $as_echo "$as_me: Python sys.version \"${PY_SYS_VERSION}\"" >&6;}
-
