Date: Thursday, February 16, 2023 @ 20:04:55
Author: eworm
Revision: 1400878
upgpkg: freeradius 3.2.2-1: new upstream release
Modified:
freeradius/trunk/0001-python-3-10.patch
freeradius/trunk/PKGBUILD
Deleted:
freeradius/trunk/0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
---------------------------------------------------------------+
0001-python-3-10.patch | 17 +++---
0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch | 25 ----------
PKGBUILD | 11 +---
3 files changed, 13 insertions(+), 40 deletions(-)
Modified: 0001-python-3-10.patch
===================================================================
--- 0001-python-3-10.patch 2023-02-16 19:11:36 UTC (rev 1400877)
+++ 0001-python-3-10.patch 2023-02-16 20:04:55 UTC (rev 1400878)
@@ -1,12 +1,13 @@
-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
+diff --git a/src/modules/rlm_python/configure
b/src/modules/rlm_python/configure
+index 636acb13c8..9240afc015 100755
+--- a/src/modules/rlm_python/configure
++++ b/src/modules/rlm_python/configure
+@@ -2994,7 +2994,7 @@ $as_echo "$as_me: Python sys.prefix \"${PY_PREFIX}\""
>&6;}
+ { $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
+- 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;}
Deleted: 0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
===================================================================
--- 0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
2023-02-16 19:11:36 UTC (rev 1400877)
+++ 0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
2023-02-16 20:04:55 UTC (rev 1400878)
@@ -1,25 +0,0 @@
-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 2023-02-16 19:11:36 UTC (rev 1400877)
+++ PKGBUILD 2023-02-16 20:04:55 UTC (rev 1400878)
@@ -3,8 +3,8 @@
# Contributor: Daniel Micay <[email protected]>
pkgname=freeradius
-pkgver=3.2.1
-pkgrel=4
+pkgver=3.2.2
+pkgrel=1
pkgdesc='The premier open source RADIUS server'
arch=('x86_64')
url='https://freeradius.org/'
@@ -27,14 +27,12 @@
validpgpkeys=('BF2384EC6938B9744B03E2A620E37C25995B4F85') # FreeRADIUS -
Package Signing [...] <[email protected]>
source=("ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2"{,.sig}
'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'
+sha256sums=('8b31cb10b7b5ecfb03e22a9756e49484f98410e697798f3fd0ce1b3a135ba1fe'
'SKIP'
- 'c9c7b0d409e15b65b49f925f5480f379312be7d9f7b9601d958a40f894befa73'
- '280d451646153f2a5541f54215d437a5b86d03c732523e4e3c94dccc508d0f9a'
+ 'a84b6489f58083639d9b1854b1bd8610a0f672bcf2a6d902a78da0868fca1317'
'8ecaca94c7d0f4806b326685312dd4e543ce9c6c183d3d7ad01c1a0197bdfb94'
'f536a9aa972e3e42a6b1a6d8ee17166eb721c7cba2e80f60473811497c7bd8bc'
'c469e1a3f9edad769da01c324779babe783ee85a9b53ce4638d3d2d09c7c8d4b')
@@ -43,7 +41,6 @@
cd "$srcdir"/freeradius-server-$pkgver
patch -Np1 < ../0001-python-3-10.patch
- patch -Np1 < ../0002-Fallback-to-uname-n-on-missing-hostname-in-radtest.patch
}
build() {
