Merging debian version 3.2.5+dfsg-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 42 insertions, 5 deletions

diff --git a/debian/changelog b/debian/changelog
index c827507..77485aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+freeradius (3.2.5+dfsg-2) unstable; urgency=medium
+
+  * Fix parallel builds
+  * Fix python3 autopkgtest
+  * freeradius-utils: add perl modules needed for radsecret, run radsecret
+    in autopkgtest instead of radlast (which needs wtmp)
+  * d/freeradius.service: Use MemoryMax= instead of MemoryLimit=
+    (Closes: #1072253)
+
+ -- Bernhard Schmidt <berni@debian.org>  Wed, 10 Jul 2024 22:45:00 +0200
+
 freeradius (3.2.5+dfsg-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-updates, remaining changes:
diff --git a/debian/control b/debian/control
index 1261e2e..8f41d38 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,7 @@ Depends: freeradius-common,
          libfreeradius3 (= ${binary:Version}),
          ${dist:Depends},
          ${misc:Depends},
+         ${perl:Depends},
          ${shlibs:Depends}
 Provides: radius-server
 Recommends: freeradius-utils
@@ -102,16 +103,21 @@ Conflicts: radiusd-livingston, yardradius
 Depends: freeradius-common,
          freeradius-config,
          libfreeradius3 (= ${binary:Version}),
+         libconvert-base32-perl,
+         libcrypt-urandom-perl,
          ${dist:Depends},
          ${misc:Depends},
+         ${perl:Depends},
          ${shlibs:Depends}
 Recommends: libdbi-perl
 Description: FreeRADIUS client utilities
  This package contains various client programs and utilities from
  the FreeRADIUS Server project, including:
   - radclient
+  - radcrypt
   - radeapclient
   - radlast
+  - radsecret
   - radsniff
   - radsqlrelay
   - radtest
diff --git a/debian/freeradius.service b/debian/freeradius.service
index 3e2f2fd..e40b858 100644
--- a/debian/freeradius.service
+++ b/debian/freeradius.service
@@ -20,7 +20,7 @@ Environment=HOSTNAME=%H
 # Limit memory to 2G this is fine for %99.99 of deployments.  FreeRADIUS
 # is not memory hungry, if it's using more than this, then there's probably
 # a leak somewhere.
-MemoryLimit=2G
+MemoryMax=2G
 
 # Ensure the daemon can still write its pidfile after it drops
 # privileges. Combination of options that work on a variety of
diff --git a/debian/patches/fix-parallel-build.patch b/debian/patches/fix-parallel-build.patch
new file mode 100644
index 0000000..1e0bf63
--- /dev/null
+++ b/debian/patches/fix-parallel-build.patch
@@ -0,0 +1,16 @@
+Description: Use system libtool to install radsecret
+  ${PROGRAM_INSTALL} points to a local jlibtool instance, which might
+  not compiled be yet with parallel building. ${INSTALL} is used in
+  all other .mk files
+Forwarded: https://github.com/FreeRADIUS/freeradius-server/issues/5365
+Author: Bernhard Schmidt <berni@debian.org>
+Last-Update: 2024-07-10
+
+--- a/src/main/radsecret.mk
++++ b/src/main/radsecret.mk
+@@ -2,4 +2,4 @@
+ 
+ $(R)/$(bindir)/radsecret: ${top_srcdir}/src/main/radsecret
+ 	@$(ECHO) INSTALL radsecret
+-	$(Q)${PROGRAM_INSTALL} -c -m 755 $< $@
++	$(Q)${INSTALL} -c -m 755 $< $@
diff --git a/debian/patches/series b/debian/patches/series
index 816e30a..5dfbaa2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ debian-local/0001-Rename-radius-to-freeradius.patch
 debian-local/0010-version.c-disable-openssl-version-check.patch
 dont-install-tests.diff
 snakeoil-certs.diff
+fix-parallel-build.patch
diff --git a/debian/tests/clients b/debian/tests/clients
index aeda754..d705e01 100644
--- a/debian/tests/clients
+++ b/debian/tests/clients
@@ -23,7 +23,7 @@ for client in "${VERSION_CLIENTS[@]}"; do
     fi
 done
 
-ALONE_CLIENTS=('radlast')
+ALONE_CLIENTS=('radsecret')
 for client in "${ALONE_CLIENTS[@]}"; do
     RET=$($client 2>&1 > /dev/null)
 
diff --git a/debian/tests/rlm_python3-data/ubuntu_example.py.mods-config b/debian/tests/rlm_python3-data/ubuntu_example.py.mods-config
index 5b6330f..7788559 100644
--- a/debian/tests/rlm_python3-data/ubuntu_example.py.mods-config
+++ b/debian/tests/rlm_python3-data/ubuntu_example.py.mods-config
@@ -2,6 +2,9 @@
 
 import radiusd
 
+def get_attribute(p, attribute):
+  return [x[1] for x in p if x[0] == attribute][0]
+
 def instantiate(p):
   radiusd.radlog(radiusd.L_INFO, '*** example.py instantiate ***')
   return radiusd.RLM_MODULE_OK
@@ -9,8 +12,8 @@ def instantiate(p):
 def authorize(p):
   radiusd.radlog(radiusd.L_INFO, '*** example.py authorize ***')
   # whatever password was supplied
-  config = ( ('Cleartext-Password', p[1][1]), )
-  if p[0][1] == "ubuntu":
+  config = ( ('Cleartext-Password', get_attribute(p, 'User-Password')), )
+  if get_attribute(p, 'User-Name') == "ubuntu":
       msg = "Hello ubuntu!"
       status = radiusd.RLM_MODULE_OK
       reply = ( ('Reply-Message', msg), )
diff --git a/debian/tests/rlm_python3-test b/debian/tests/rlm_python3-test
index ddf0982..12e775d 100644
--- a/debian/tests/rlm_python3-test
+++ b/debian/tests/rlm_python3-test
@@ -18,7 +18,7 @@ ln -sf /etc/freeradius/3.0/mods-available/python3 \
     /etc/freeradius/3.0/mods-enabled
 
 # restart
-systemctl restart freeradius.service
+service freeradius restart
 
 echo "Test that \"ubuntu\" can login with any password"
 result=0