aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/freeradius/APKBUILD12
-rw-r--r--main/freeradius/freeradius-3010-send-acct-pings-to-acct-port.patch41
2 files changed, 49 insertions, 4 deletions
diff --git a/main/freeradius/APKBUILD b/main/freeradius/APKBUILD
index 52adc2782b..2e26ac6ae5 100644
--- a/main/freeradius/APKBUILD
+++ b/main/freeradius/APKBUILD
@@ -5,7 +5,7 @@
pkgname=freeradius
_realname=freeradius
pkgver=3.0.10
-pkgrel=1
+pkgrel=2
pkgdesc="RADIUS (Remote Authentication Dial-In User Service) server"
url="http://freeradius.org/"
arch="all"
@@ -33,6 +33,7 @@ source="ftp://ftp.freeradius.org/pub/freeradius/$_realname-server-$pkgver.tar.gz
freeradius-305-default-config.patch
fix-scopeid.patch
freeradius-310-ignore-callbacks-for-pseudo-content-types.patch
+ freeradius-3010-send-acct-pings-to-acct-port.patch
"
_builddir="$srcdir"/$_realname-server-$pkgver
@@ -300,7 +301,8 @@ d86558365a1deea4914ed139797805b0 musl-fix-headers.patch
ecd9ecfba4cf86a203de6faf8398c44a disable-cert-generation.patch
f8a7b00835f2108acc06af212cede16e freeradius-305-default-config.patch
5171fca6629baeb274a9b17e02683163 fix-scopeid.patch
-33381b3a80d2e091a0f0250edb66223e freeradius-310-ignore-callbacks-for-pseudo-content-types.patch"
+33381b3a80d2e091a0f0250edb66223e freeradius-310-ignore-callbacks-for-pseudo-content-types.patch
+b27235a8dc9f8e8fe6d0ea700d29cffa freeradius-3010-send-acct-pings-to-acct-port.patch"
sha256sums="e8825518bde1d9787f7f9ea1e9fec7ae5282af9c3362d2fa360f60c4db6f77ec freeradius-server-3.0.10.tar.gz
2d5b3e1af1299373182f2c8021bdf45c29db5d82b0a077b965a16ded32cb6292 freeradius.confd
a5208f13420c28446b85dfc48cb9193a4651c994d15cc2c9b0bc43734c66e8f0 freeradius.initd
@@ -308,7 +310,8 @@ a5208f13420c28446b85dfc48cb9193a4651c994d15cc2c9b0bc43734c66e8f0 freeradius.ini
008fa3a4da7b3c01df238bf492a8ccda4077289c02c553a60ad8f4439ec136a2 disable-cert-generation.patch
02cad546ffaf3f9be531cb45b96c7fb31f83c717e40ece4ff28a73c86f921f33 freeradius-305-default-config.patch
aad4796f06a5891b3d48d6ded926ffeb7b9fa84cc1c4a1f1be76bced02694023 fix-scopeid.patch
-c9797672a1aa5b67206239d34aea9fb0d550af892fc848515b0f48647fa033aa freeradius-310-ignore-callbacks-for-pseudo-content-types.patch"
+c9797672a1aa5b67206239d34aea9fb0d550af892fc848515b0f48647fa033aa freeradius-310-ignore-callbacks-for-pseudo-content-types.patch
+96e9628bd423fc89e0dd0c0211f83c3f5b940a9236ce12eb63e40dfcd7749f2e freeradius-3010-send-acct-pings-to-acct-port.patch"
sha512sums="7546d54ca9ae1189f17fa97a8c6f6e15486d61dda8819b15f883ba48fbd6629f4728ba41490b51cb08eb1399090c16eca1b559c22ee19f3a770f1ce7ce23a8d5 freeradius-server-3.0.10.tar.gz
e248159c0a44f722e405c51c8015d9ad672e42ad0d38ca28f8a051ff911aa4d3e630b9bd4543e9d610940bc4ae50c022594e219ce341b36abe85c572acad418b freeradius.confd
ba3c424d4eabb147c7aa3e31575a87ddb26b6a792d2a8714e73d8763e07854326a03a83991a7420246ca06bf0b93d0a6f23ec198f5e48647f9d25b40067e852a freeradius.initd
@@ -316,4 +319,5 @@ c49e5eec7497fccde5fd09dba1ea9b846e57bc88015bd81640aa531fb5c9b449f37136f42c85fe1d
09b78c6baa992f82ab81c43aad6792536a4708d460170f0a373e242a5fafe8db10662dc7fcef99a966b828ed91fa7fe38567c961c938de9a447f1ee03aebb142 disable-cert-generation.patch
b69b899da6f80dbdb7422847536e37461315ba587a07fedc1eee28b96be7d16993b758ccd34e3a271ce2937d72c6ddff878aec61a3a4c0750deaaa959d10ed5e freeradius-305-default-config.patch
41d478c0e40ff82fc36232964037c1ab8ffca9fdbb7dca02ed49319906e751c133b5d7bc7773c645cec6d9d39d1de69cba25e8d59afa8d6662563dd17f35f234 fix-scopeid.patch
-35533488015d5f4b829c2a6c962a437ca50c7d86bb0d650fc621770cddb3108e92e9fe5f88b3b9d7657fcc9b91e5b00162aa125ed9a4374229b930d62cc0d847 freeradius-310-ignore-callbacks-for-pseudo-content-types.patch"
+35533488015d5f4b829c2a6c962a437ca50c7d86bb0d650fc621770cddb3108e92e9fe5f88b3b9d7657fcc9b91e5b00162aa125ed9a4374229b930d62cc0d847 freeradius-310-ignore-callbacks-for-pseudo-content-types.patch
+412c817db0fa64a7906f252e5dc6d356834a4791c5c0ae242f6aa9abedd237b928114b0c2bedc3fc6c24e2ee41891597e44f5dea35373bfc4b27bc4cfdff764e freeradius-3010-send-acct-pings-to-acct-port.patch"
diff --git a/main/freeradius/freeradius-3010-send-acct-pings-to-acct-port.patch b/main/freeradius/freeradius-3010-send-acct-pings-to-acct-port.patch
new file mode 100644
index 0000000000..3dbd210e35
--- /dev/null
+++ b/main/freeradius/freeradius-3010-send-acct-pings-to-acct-port.patch
@@ -0,0 +1,41 @@
+--- a/src/main/process.c
++++ b/src/main/process.c
+@@ -3479,7 +3479,8 @@
+ fr_pair_make(request->proxy, &request->proxy->vps,
+ "Message-Authenticator", "0x00", T_OP_SET);
+
+- } else if (home->type == HOME_TYPE_AUTH) {
++ } else if ((home->type == HOME_TYPE_AUTH) ||
++ (home->type == HOME_TYPE_AUTH_ACCT)) {
+ request->proxy->code = PW_CODE_ACCESS_REQUEST;
+
+ fr_pair_make(request->proxy, &request->proxy->vps,
+@@ -3491,8 +3492,8 @@
+ fr_pair_make(request->proxy, &request->proxy->vps,
+ "Message-Authenticator", "0x00", T_OP_SET);
+
+- } else {
+ #ifdef WITH_ACCOUNTING
++ } else if (home->type == HOME_TYPE_ACCT) {
+ request->proxy->code = PW_CODE_ACCOUNTING_REQUEST;
+
+ fr_pair_make(request->proxy, &request->proxy->vps,
+@@ -3504,9 +3505,14 @@
+ vp = fr_pair_make(request->proxy, &request->proxy->vps,
+ "Event-Timestamp", "0", T_OP_SET);
+ vp->vp_date = now.tv_sec;
+-#else
+- rad_assert("Internal sanity check failed");
+ #endif
++
++ } else {
++ /*
++ * Unkown home server type.
++ */
++ talloc_free(request);
++ return;
+ }
+
+ vp = fr_pair_make(request->proxy, &request->proxy->vps,
+Only in b: src/main/process.c.orig
+Only in b: src/main/process.c.rej