summaryrefslogtreecommitdiff
path: root/net-dialup/freeradius
diff options
context:
space:
mode:
Diffstat (limited to 'net-dialup/freeradius')
-rw-r--r--net-dialup/freeradius/Manifest11
-rw-r--r--net-dialup/freeradius/files/freeradius-3.0.20-py3-fixes.patch472
-rw-r--r--net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch57
-rw-r--r--net-dialup/freeradius/files/radius.conf-r416
-rw-r--r--net-dialup/freeradius/files/radius.conf-r518
-rw-r--r--net-dialup/freeradius/files/radius.init-r331
-rw-r--r--net-dialup/freeradius/freeradius-3.0.20-r5.ebuild271
-rw-r--r--net-dialup/freeradius/freeradius-3.0.21-r5.ebuild267
-rw-r--r--net-dialup/freeradius/freeradius-3.0.22-r4.ebuild267
9 files changed, 0 insertions, 1410 deletions
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index cb8cb5c0d224..2350bd843ce1 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,18 +1,7 @@
-AUX freeradius-3.0.20-py3-fixes.patch 15422 BLAKE2B 29f10c53b02603c2c854c0100056c01e02c1282a78731e67453101dc6be49d64f57e1f39b8a32459034939a1d47c74bca48270f119095deaa067942b2c2d3b5c SHA512 5a565aa55fab059995870c78f176fa525fca4bd8732c2a2ecc4f625a6635979a51b3fc53999fb7741bc2da37a6260afa43350f61490f0b3548ced5bc81dfdaea
-AUX freeradius-3.0.20-systemd-service.patch 2162 BLAKE2B 3aa32e5a15efa223aab7880b0cb651edca6695a3727b4df7692f656d1f34366a2a16c364c2a5b544a0ad04bca795be269d4d7dc37bc4c3c6d28387bc3e411ad8 SHA512 8a9f5ecaf559132932ed2e46151ff41e5570df3e844f33ee49004ace0aa7b458a6000ec0d1ed01c34b6236c3dde2ca72cb1031b4badcfa4d6826dbf16ca28259
-AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1c82f199e3962db57f3042498cf135b3a29c8a730695ed99612e490e0b3253f0644462d28f61215d SHA512 4142869fb61b2938232002c9cb5b843590785560da7db4f2b2a9c9d55c76d0e2d4a6cb946a5347dfa505cd82f5e86c7315cf71f3443a86632090cf4bd025748a
-AUX radius.conf-r5 498 BLAKE2B ef7cb32024e6aada08c78d76d6fdce67cfbd4729e00788616e1f0f1bf8fff4cc6586350644684297b8ef8a08ddc38f51c661c66720c85014de1127dbbe3cdd56 SHA512 f9ba8a46e53f93394c8b49ebb9fee899803d595349d7c3e6cc3920b2ae0629ec6307b2a65eb5d6e37ecfb9ff287e89ea98602b30ec9b07571d7a401737bda11e
AUX radius.conf-r6 599 BLAKE2B 35c97ec8a31577afc89bc4f6d7a1310624bea46c2a12ea3cc010fda237b47d5a543225f54d7d4a8b00c1e15f904b149414c597525dd8b6425f20785ca636798d SHA512 acc9b0b178096e44ebfb84228caab1c82bf2f7bb38be386755169bbfb628165b6ac57194ed5a35e566dd0a2d8425f6790b43228a715e633ae8f59e2ab2b574da
-AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb9104fe6e8bc2f662bddb4749e6fa57fda55d57ad41b2cb4014d5efcac557a2213f190a5dcc2f7b6 SHA512 826fd3fd576b09e7e590095b1ac63dfaec587a3b46ae1ccdec68134264fb689827aea4a446522bc2a253b9885469b6788a3dddc466ad47483dd62ef67262de49
AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892
DIST freeradius-3.0.25.tar.gz 5300245 BLAKE2B bf8908aa7bfabb9e15fa841457f176a4f2697bdec7994485516ef338908b46f2168260b7acf1a7120a687e543f0381bb787567bb4d564b9d14a3eb464a0e9ed6 SHA512 13382a53e6a1a4495c6f53e662ce21b80d73b6134a72f099f05495b64c56ae1a6c1cd1281311f1c3695d8532207fe5bd3d2026ed2c45f3cb5adb1011f1505ee7
-DIST freeradius-server-3.0.20.tar.gz 5002727 BLAKE2B f481ad22105694a4af3f0f0c1b4f6e395e8da0fe65274e32ebeed07e3c9b1869029e6ffbc655cfa41d5de2a1dcba54acee33a7a10d28bfbfce791b7ccd0fc57a SHA512 513ed0a5d9e6b9a8d89a9b02c86ff528a9ff14d928f4c1040ca44702465abd711588fe6afa35554cb2c8e8bd7f19dd5be3dbc78445c62c7b00bf5cbc4c621312
-DIST freeradius-server-3.0.21.tar.gz 5028506 BLAKE2B 3ccf9704a1f8b1ec5f6f066a475083fe7cefa793e8f53ecd287866fc505a832bf8031a4d07c2e07f79da6c6fb82e6a3435b0154d1f135167ebddfc9b8d401544 SHA512 85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa
-DIST freeradius-server-3.0.22.tar.gz 5248422 BLAKE2B b48170a02a354562dc2dd27230476d2ce0823fa2f577dde3f3947ee14653d912a562eb480c2d2ed53b0ff536f63ce4482b24f2777b4a41ff2ed4aba88f4c196e SHA512 8ee05350b1a5e811a51030a3ef0c511c58275407171f0ce41775e3695f3e9a4477e2fc288541015d314be5457154201d4e95f4c45cf7f503bc8829909c2551a8
DIST freeradius-server-3.2.0.tar.bz2 3399380 BLAKE2B 103cb1faf7efd78520dd613da51671ff37b870fcd356d7d11454d655cf460bcb4132cd91b99be70557242907dd5e4d741b6a776de81c37a24ab9d04a4fe5866b SHA512 e7aa7bfc5a6968cdb860bb565ebd45bc1b3f78a665a9888a8b8dacaa1c5256755468aed33bdffe39465f8678c1fb9d6f47f0dbcf0178dfdcb38d99e3bc4b747d
-EBUILD freeradius-3.0.20-r5.ebuild 7548 BLAKE2B 820b94e6639b22478d3e603fd2f85c98cbf727c841811c57eaf26f22ae9fb536424aa6b63fa969b46491293aa592a46d56832bd41457fac41c84c8143bdc0b8a SHA512 8a7814fa663bc205f2cb26a5562d6d36df648ad4f2ce7ed2e975c4bfbac71d278a8cf754df1d152edafd00dd81684e207f06b1b69e4b11b80d32e082d21489c1
-EBUILD freeradius-3.0.21-r5.ebuild 7445 BLAKE2B 3a315a69bd5e4fcc7df715e7541c3937aac6a7a769f4b6b737b78062f74d1b5b92b31937f6e8c49aa6c05a74a02f4413af234fa3ee9c4e1aabfb1eb9281ed102 SHA512 1a3c9fc215553675e93c1018c4ca8916f8d463a37df435af705afccebfa52897bb540ce885b1852a17d0b81076869c0c24f9c9fe9eb6c9bacece2b024f693db4
-EBUILD freeradius-3.0.22-r4.ebuild 7448 BLAKE2B 6296c54de4f3a36e5ddab9c818ab37fea97f15ac2f8a28d6303c760864176a5811125d4901c666edf49837580740131d31dabdc67802cab1cdfd1f6935cc3537 SHA512 61cedbe4bfba93b823a2d2424a40b920cc334cc8cfce67c58988addcf6fd223375edef571de10f5acbd72efd15cfcf7e4311150d7f51fe9484d50ab05953a246
EBUILD freeradius-3.0.25-r2.ebuild 7515 BLAKE2B 909f7f96fce8d9bb46a6003a6ee2714972d284332d12d071157ba05858325a1b42f244dc14d390aaa1ffb3e923eeb586a76b68258fee3d1feacbbc65e4b7fa0c SHA512 1dcb6401815df597de80b8fd4fec6fa78d66bdbe6ef03699df438c1656ea41d22c1f41927b6d6e6b2ca4ca5c419382fde39a80cb9d1ff6acc144375deaa829af
EBUILD freeradius-3.2.0.ebuild 8316 BLAKE2B bb3be96e63e2f2ddbf53aab7ab18956cda9e8316ba6f818e11d4d9239594983cd52a9ab5fd7ce587e361b606ac4a98d30ccfb65b6ed5deee8a49c1c600ca707d SHA512 368bb588d81ef6d439f0f49d2f452a076f1a13791d8b301c41958e6f18ecaeb9e69dbfeb8e9c7986deaa7ee3d7d5bed9028bc58cb4e6621eb30b1b786365d2cc
MISC metadata.xml 657 BLAKE2B 4ae124b2f8a4e2230ff696f06056c4d9ca2a03b989362b6465ba42b9a1d730f1f35776b3de8a455f40956d7d2e0746ddfeb304d13fa44f69347f88e97443a72a SHA512 21137127c400a99a024012defe01c3546178492ef608428e673008ae3e7d677f97a2b33bd6efbd6737b60144e0697cacb583e7d9b477187a109b3e7482d899b1
diff --git a/net-dialup/freeradius/files/freeradius-3.0.20-py3-fixes.patch b/net-dialup/freeradius/files/freeradius-3.0.20-py3-fixes.patch
deleted file mode 100644
index 83dc20090ed2..000000000000
--- a/net-dialup/freeradius/files/freeradius-3.0.20-py3-fixes.patch
+++ /dev/null
@@ -1,472 +0,0 @@
-diff --git a/raddb/mods-available/python3 b/raddb/mods-available/python3
-index 246dfd74ce..0593c69f1a 100644
---- a/raddb/mods-available/python3
-+++ b/raddb/mods-available/python3
-@@ -13,7 +13,7 @@ python3 {
- # item is GLOBAL TO THE SERVER. That is, you cannot have two
- # instances of the python module, each with a different path.
- #
--# python_path="/path/to/python/files:/another_path/to/python_files/"
-+# python_path="${modconfdir}/${.:name}:/another_path/to/python_files"
-
- module = example
-
-diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac
-index a00320fda4..295a2486d2 100644
---- a/src/modules/rlm_python3/configure.ac
-+++ b/src/modules/rlm_python3/configure.ac
-@@ -8,128 +8,75 @@ if test x$with_[]modname != xno; then
- AC_PROG_CC
- AC_PROG_CPP
-
-- dnl extra argument: --with-rlm-python3-bin
-- PYTHON3_BIN=
-- AC_ARG_WITH(rlm-python3-bin,
-- [ --with-rlm-python3-bin=PATH Path to python3 binary []],
-+ dnl extra argument: --with-rlm-python3-config-bin
-+ PYTHON3_CONFIG_BIN=
-+ AC_ARG_WITH(rlm-python3-config-bin,
-+ [ --with-rlm-python3-config-bin=PATH Path to python-config3 binary []],
- [ case "$withval" in
- no)
-- AC_MSG_ERROR(Need rlm-python3-bin)
-+ AC_MSG_ERROR(Need rlm-python3-config-bin)
- ;;
- yes)
- ;;
- *)
-- PYTHON3_BIN="$withval"
-+ PYTHON3_CONFIG_BIN="$withval"
- ;;
- esac ]
- )
-
-- if test "x$PYTHON3_BIN" = x; then
-- AC_CHECK_PROGS(PYTHON3_BIN, [ python3 ], not-found, [${PATH}:/usr/bin:/usr/local/bin])
-+ if test "x$PYTHON3_CONFIG_BIN" = x; then
-+ AC_CHECK_PROGS(PYTHON3_CONFIG_BIN, [ python3-config ], not-found, [${PATH}:/usr/bin:/usr/local/bin])
- fi
-
-- if test "x$PYTHON3_BIN" = "xnot-found"; then
-- fail="python-binary"
-- fi
--
-- dnl extra argument: --with-rlm-python3-lib-dir
-- PY_LIB_DIR=
-- AC_ARG_WITH(rlm-python3-lib-dir,
-- [ --with-rlm-python3-lib-dir=DIR Directory for Python library files []],
-- [ case "$withval" in
-- no)
-- AC_MSG_ERROR(Need rlm-python3-lib-dir)
-- ;;
-- yes)
-- ;;
-- *)
-- PY_LIB_DIR="$withval"
-- ;;
-- esac ]
-- )
--
-- dnl extra argument: --with-rlm-python3-include-dir
-- PY_INC_DIR=
-- AC_ARG_WITH(rlm-python3-include-dir,
-- [ --with-rlm-python3-include-dir=DIR Directory for Python include files []],
-- [ case "$withval" in
-- no)
-- AC_MSG_ERROR(Need rlm-python3-include-dir)
-- ;;
-- yes)
-- ;;
-- *)
-- PY_INC_DIR="$withval"
-- ;;
-- esac ]
-- )
--
-- if test x$fail = x; then
-- PY_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.prefix)'`
-- AC_MSG_NOTICE([Python sys.prefix \"${PY_PREFIX}\"])
--
-- PY_EXEC_PREFIX=`${PYTHON3_BIN} -c 'import sys ; print(sys.exec_prefix)'`
-- AC_MSG_NOTICE([Python sys.exec_prefix \"${PY_EXEC_PREFIX}\"])
--
-- PY_SYS_VERSION=`${PYTHON3_BIN} -c 'import sys ; print(sys.version[[0:3]])'`
-- AC_MSG_NOTICE([Python sys.version \"${PY_SYS_VERSION}\"])
--
-- if test "x$PY_LIB_DIR" = "x"; then
-- PY_LIB_DIR="$PY_EXEC_PREFIX/lib/python${PY_SYS_VERSION}/config"
-- PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python${PY_SYS_VERSION}/config"
-- fi
--
-- PY_MAKEFILE="$PY_EXEC_PREFIX/lib/python${PY_SYS_VERSION}/config/Makefile"
-- if test -f ${PY_MAKEFILE}; then
-- PY_LOCAL_MOD_LIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[[:blank:]]]/ /g;s/^ *//;s/ *$//'`
-- AC_MSG_NOTICE([Python local_mod_libs \"${PY_LOCAL_MOD_LIBS}\"])
--
-- PY_BASE_MOD_LIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[[:blank:]]]/ /g;s/^ *//;s/ *$//'`
-- AC_MSG_NOTICE([Python base_mod_libs \"${PY_BASE_MOD_LIBS}\"])
--
-- PY_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[[:blank:]]]/ /g;s/ / /g;s/^ *//;s/ *$//'`
-- PY_OTHER_LDFLAGS=`sed -n -e 's/^LINKFORSHARED=\(.*\)/\1/p' $PY_MAKEFILE | sed -e 's/[[[:blank:]]]/ /g;s/ / /g;s/^ *//;s/ *$//'`
-- AC_MSG_NOTICE([Python other_libs \"${PY_OTHER_LDFLAGS} ${PY_OTHER_LIBS}\"])
-- fi
-- PY_EXTRA_LIBS="$PY_LOCALMODLIBS $PY_BASE_MOD_LIBS $PY_OTHER_LIBS"
-+ if test "x$PYTHON3_CONFIG_BIN" = xnot-found; then
-+ fail="$fail python3-config"
-+ else
-+ dnl #
-+ dnl # It is necessary due to a weird behavior with 'python3-config'
-+ dnl #
-+ old_CFLAGS="$CFLAGS"
-+ unset CFLAGS
-+
-+ python3_cflags=`${PYTHON3_CONFIG_BIN} --cflags`
-+ AC_MSG_NOTICE([${PYTHON3_CONFIG_BIN}'s cflags were \"${python3_cflags}\"])
-+
-+ dnl # Convert -I to -isystem to get rid of warnings about issues in Python headers
-+ dnl # Strip -systemroot
-+ dnl # Strip optimisation flags (-O[0-9]?). We decide our optimisation level, not python.
-+ dnl # -D_FORTIFY_SOURCE needs -O.
-+ dnl # Strip debug symbol flags (-g[0-9]?). We decide on debugging symbols, not python
-+ dnl # Strip -W*, we decide what warnings are important
-+ dnl # Strip -DNDEBUG
-+ mod_cflags=`echo $python3_cflags | sed -e '\
-+ s/-I/-isystem/g;\
-+ s/-isysroot[[ =]]\{0,1\}[[^-]]*//g;\
-+ s/-O[[^[[:blank:]]]]*//g;\
-+ s/-Wp,-D_FORTIFY_SOURCE=[[[:digit:]]]//g;\
-+ s/-g[[^ ]]*//g;\
-+ s/-W[[^ ]]*//g;\
-+ s/-DNDEBUG[[[:blank:]]]*//g;
-+ '`
-+ AC_MSG_NOTICE([Sanitized cflags were \"${mod_cflags}\"])
-+
-+ python3_ldflags=`${PYTHON3_CONFIG_BIN} --ldflags`
-+ AC_MSG_NOTICE([${PYTHON3_CONFIG_BIN}'s ldflags were \"$python3_ldflags}\"])
-+
-+ dnl # Strip -Wl,-O1... Is -O even a valid linker flag??
-+ dnl # Strip -Wl,-Bsymbolic-functions as thats not always supported or required
-+ dnl # Strip -Xlinker -export-dynamic as it causes weird linking issues on Linux
-+ dnl # See: https://bugs.python.org/issue36508
-+ mod_ldflags=`echo $python3_ldflags | sed -e '\
-+ s/-Wl,-O[[[:digit:]]][[[:blank:]]]*//g;\
-+ s/-Wl,-Bsymbolic-functions[[[:blank:]]]*//g;\
-+ s/-Xlinker -export-dynamic//g;\
-+ s/-Wl,-stack_size,[[[:digit:]]]*[[[:blank:]]]//g;
-+ '`
-+ AC_MSG_NOTICE([Sanitized ldflags were \"${mod_ldflags}\"])
-
-- old_CFLAGS=$CFLAGS
-- CFLAGS="$CFLAGS $PY_CFLAGS"
-- smart_try_dir="$PY_PREFIX/include/python$PY_SYS_VERSION"
-- FR_SMART_CHECK_INCLUDE(Python.h)
- CFLAGS=$old_CFLAGS
-
-- if test "x$ac_cv_header_Python_h" = "xyes"; then
-- mod_cflags="$SMART_CPPFLAGS"
-- else
-- fail="$fail Python.h"
-- targetname=
-- fi
--
-- old_LIBS=$LIBS
-- LIBS="$LIBS $PY_LIB_LOC $PY_EXTRA_LIBS -lm"
-- smart_try_dir=$PY_LIB_DIR
-- FR_SMART_CHECK_LIB(python${PY_SYS_VERSION}, Py_Initialize)
-- LIBS=$old_LIBS
--
-- eval t=\${ac_cv_lib_${sm_lib_safe}_${sm_func_safe}}
-- if test "x$t" = "xyes"; then
-- mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS $SMART_LIBS -lm"
-- targetname=modname
-- else
-- FR_SMART_CHECK_LIB(python${PY_SYS_VERSION}m, Py_Initialize)
-- eval t=\${ac_cv_lib_${sm_lib_safe}_${sm_func_safe}}
-- if test "x$t" = "xyes"; then
-- mod_ldflags="$PY_LIB_LOC $PY_EXTRA_LIBS $SMART_LIBS -lm"
-- targetname=modname
-- else
-- targetname=
-- fail="$fail libpython$PY_SYS_VERSION"
-- fi
-- fi
-+ targetname="rlm_python3"
- fi
--
-- AC_CHECK_FUNCS([dl_iterate_phdr])
- else
- targetname=
- echo \*\*\* module modname is disabled.
-diff --git a/src/modules/rlm_python3/rlm_python3.c b/src/modules/rlm_python3/rlm_python3.c
-index 06187e4ffa..8e893a0eaa 100644
---- a/src/modules/rlm_python3/rlm_python3.c
-+++ b/src/modules/rlm_python3/rlm_python3.c
-@@ -67,8 +67,10 @@ static CONF_PARSER module_config[] = {
- A(preacct)
- A(accounting)
- A(checksimul)
-+#ifdef WITH_PROXY
- A(pre_proxy)
- A(post_proxy)
-+#endif
- A(post_auth)
- #ifdef WITH_COA
- A(recv_coa)
-@@ -98,7 +100,9 @@ static struct {
- A(L_AUTH)
- A(L_INFO)
- A(L_ERR)
-+#ifdef WITH_PROXY
- A(L_PROXY)
-+#endif
- A(L_ACCT)
- A(L_DBG_WARN)
- A(L_DBG_ERR)
-@@ -510,6 +514,7 @@ static rlm_rcode_t do_python_single(REQUEST *request, PyObject *pFunc, char cons
- goto finish;
- }
-
-+#ifdef WITH_PROXY
- /* fill proxy vps */
- if (request->proxy) {
- if (!mod_populate_vps(pArgs, 4, request->proxy->vps)) {
-@@ -517,10 +522,13 @@ static rlm_rcode_t do_python_single(REQUEST *request, PyObject *pFunc, char cons
- ret = RLM_MODULE_FAIL;
- goto finish;
- }
-- } else {
-+ } else
-+#endif
-+ {
- mod_populate_vps(pArgs, 4, NULL);
- }
-
-+#ifdef WITH_PROXY
- /* fill proxy_reply vps */
- if (request->proxy_reply) {
- if (!mod_populate_vps(pArgs, 5, request->proxy_reply->vps)) {
-@@ -528,7 +536,9 @@ static rlm_rcode_t do_python_single(REQUEST *request, PyObject *pFunc, char cons
- ret = RLM_MODULE_FAIL;
- goto finish;
- }
-- } else {
-+ } else
-+#endif
-+ {
- mod_populate_vps(pArgs, 5, NULL);
- }
-
-@@ -550,9 +560,14 @@ static rlm_rcode_t do_python_single(REQUEST *request, PyObject *pFunc, char cons
- PyDict_SetItemString(pDictInput, "request", PyTuple_GET_ITEM(pArgs, 0)) ||
- PyDict_SetItemString(pDictInput, "reply", PyTuple_GET_ITEM(pArgs, 1)) ||
- PyDict_SetItemString(pDictInput, "config", PyTuple_GET_ITEM(pArgs, 2)) ||
-- PyDict_SetItemString(pDictInput, "session-state", PyTuple_GET_ITEM(pArgs, 3)) ||
-+ PyDict_SetItemString(pDictInput, "session-state", PyTuple_GET_ITEM(pArgs, 3))
-+#ifdef WITH_PROXY
-+ ||
- PyDict_SetItemString(pDictInput, "proxy-request", PyTuple_GET_ITEM(pArgs, 4)) ||
-- PyDict_SetItemString(pDictInput, "proxy-reply", PyTuple_GET_ITEM(pArgs, 5))) {
-+ PyDict_SetItemString(pDictInput, "proxy-reply", PyTuple_GET_ITEM(pArgs, 5))
-+#endif
-+ ) {
-+
- ERROR("%s:%d, %s - PyDict_SetItemString failed", __func__, __LINE__, funcname);
- ret = RLM_MODULE_FAIL;
- goto finish;
-@@ -819,8 +834,10 @@ MOD_FUNC(authorize)
- MOD_FUNC(preacct)
- MOD_FUNC(accounting)
- MOD_FUNC(checksimul)
-+#ifdef WITH_PROXY
- MOD_FUNC(pre_proxy)
- MOD_FUNC(post_proxy)
-+#endif
- MOD_FUNC(post_auth)
- #ifdef WITH_COA
- MOD_FUNC(recv_coa)
-@@ -1102,7 +1119,7 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
- python_dlhandle = dlopen_libpython(RTLD_NOW | RTLD_GLOBAL);
- if (!python_dlhandle) WARN("Failed loading libpython symbols into global symbol table");
-
--#if PY_VERSION_HEX > 0x03050000
-+#if PY_VERSION_HEX >= 0x03050000
- {
- wchar_t *name;
-
-@@ -1110,13 +1127,6 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
- Py_SetProgramName(name); /* The value of argv[0] as a wide char string */
- PyMem_RawFree(name);
- }
--#elif PY_VERSION_HEX > 0x0300000
-- {
-- wchar_t *name;
--
-- MEM(name = _Py_char2wchar(main_config.name, NULL));
-- Py_SetProgramName(inst->wide_name); /* The value of argv[0] as a wide char string */
-- }
- #else
- {
- char *name;
-@@ -1163,37 +1173,34 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
- * the lifetime of the module.
- */
- if (inst->python_path) {
-+ char *p, *path;
-+ PyObject *sys = PyImport_ImportModule("sys");
-+ PyObject *sys_path = PyObject_GetAttrString(sys, "path");
-+
-+ memcpy(&p, &inst->python_path, sizeof(path));
-+
-+ for (path = strtok(p, ":"); path != NULL; path = strtok(NULL, ":")) {
- #if PY_VERSION_HEX > 0x03050000
-- {
-- wchar_t *path;
-- PyObject* sys = PyImport_ImportModule("sys");
-- PyObject* sys_path = PyObject_GetAttrString(sys,"path");
--
-- MEM(path = Py_DecodeLocale(inst->python_path, NULL));
-- PyList_Append(sys_path, PyUnicode_FromWideChar(path,-1));
-- PyObject_SetAttrString(sys,"path",sys_path);
-- PyMem_RawFree(path);
-- }
-+ wchar_t *py_path;
-+
-+ MEM(py_path = Py_DecodeLocale(path, NULL));
-+ PyList_Append(sys_path, PyUnicode_FromWideChar(py_path, -1));
-+ PyMem_RawFree(py_path);
- #elif PY_VERSION_HEX > 0x03000000
-- {
-- wchar_t *path;
-- PyObject* sys = PyImport_ImportModule("sys");
-- PyObject* sys_path = PyObject_GetAttrString(sys,"path");
--
-- MEM(path = _Py_char2wchar(inst->python_path, NULL));
-- PyList_Append(sys_path, PyUnicode_FromWideChar(path,-1));
-- PyObject_SetAttrString(sys,"path",sys_path);
-- }
--#else
-- {
-- char *path;
-+ wchar_t *py_path;
-
-- memcpy(&path, &inst->python_path, sizeof(path));
-- Py_SetPath(path);
-- }
-+ MEM(py_path = _Py_char2wchar(path, NULL));
-+ PyList_Append(sys_path, PyUnicode_FromWideChar(py_path, -1));
-+ PyMem_RawFree(py_path);
-+#else
-+ PyList_Append(sys_path, PyLong_FromString(path));
- #endif
-- }
-+ }
-
-+ PyObject_SetAttrString(sys, "path", sys_path);
-+ Py_DecRef(sys);
-+ Py_DecRef(sys_path);
-+ }
- } else {
- inst->module = main_module;
- Py_IncRef(inst->module);
-@@ -1220,7 +1227,7 @@ static int python_interpreter_init(rlm_python_t *inst, CONF_SECTION *conf)
- static int mod_instantiate(CONF_SECTION *conf, void *instance)
- {
- rlm_python_t *inst = instance;
-- int code = 0;
-+ int code = RLM_MODULE_OK;
-
- inst->name = cf_section_name2(conf);
- if (!inst->name) inst->name = cf_section_name1(conf);
-@@ -1245,8 +1252,10 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
- PYTHON_FUNC_LOAD(preacct);
- PYTHON_FUNC_LOAD(accounting);
- PYTHON_FUNC_LOAD(checksimul);
-+#ifdef WITH_PROXY
- PYTHON_FUNC_LOAD(pre_proxy);
- PYTHON_FUNC_LOAD(post_proxy);
-+#endif
- PYTHON_FUNC_LOAD(post_auth);
- #ifdef WITH_COA
- PYTHON_FUNC_LOAD(recv_coa);
-@@ -1257,12 +1266,14 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
- /*
- * Call the instantiate function.
- */
-- code = do_python_single(NULL, inst->instantiate.function, "instantiate", inst->pass_all_vps, inst->pass_all_vps_dict);
-- if (code < 0) {
-- error:
-- python_error_log(); /* Needs valid thread with GIL */
-- PyEval_SaveThread();
-- return -1;
-+ if (inst->instantiate.function) {
-+ code = do_python_single(NULL, inst->instantiate.function, "instantiate", inst->pass_all_vps, inst->pass_all_vps_dict);
-+ if (code < 0) {
-+ error:
-+ python_error_log(); /* Needs valid thread with GIL */
-+ PyEval_SaveThread();
-+ return -1;
-+ }
- }
- PyEval_SaveThread();
-
-@@ -1272,22 +1283,31 @@ static int mod_instantiate(CONF_SECTION *conf, void *instance)
- static int mod_detach(void *instance)
- {
- rlm_python_t *inst = instance;
-- int ret;
-+ int ret = RLM_MODULE_OK;
-
- /*
- * Call module destructor
- */
- PyEval_RestoreThread(inst->sub_interpreter);
-
-- ret = do_python_single(NULL, inst->detach.function, "detach", inst->pass_all_vps, inst->pass_all_vps_dict);
-+ if (inst->detach.function) ret = do_python_single(NULL, inst->detach.function, "detach", inst->pass_all_vps, inst->pass_all_vps_dict);
-
- #define PYTHON_FUNC_DESTROY(_x) python_function_destroy(&inst->_x)
- PYTHON_FUNC_DESTROY(instantiate);
-- PYTHON_FUNC_DESTROY(authorize);
- PYTHON_FUNC_DESTROY(authenticate);
-+ PYTHON_FUNC_DESTROY(authorize);
- PYTHON_FUNC_DESTROY(preacct);
- PYTHON_FUNC_DESTROY(accounting);
- PYTHON_FUNC_DESTROY(checksimul);
-+#ifdef WITH_PROXY
-+ PYTHON_FUNC_DESTROY(pre_proxy);
-+ PYTHON_FUNC_DESTROY(post_proxy);
-+#endif
-+ PYTHON_FUNC_DESTROY(post_auth);
-+#ifdef WITH_COA
-+ PYTHON_FUNC_DESTROY(recv_coa);
-+ PYTHON_FUNC_DESTROY(send_coa);
-+#endif
- PYTHON_FUNC_DESTROY(detach);
-
- Py_DecRef(inst->pythonconf_dict);
-@@ -1313,14 +1333,8 @@ static int mod_detach(void *instance)
- PyThreadState_Swap(main_interpreter); /* Swap to the main thread */
- Py_Finalize();
- dlclose(python_dlhandle);
--
--#if PY_VERSION_HEX > 0x03050000
-- //if (inst->wide_name) PyMem_RawFree(inst->wide_name);
-- //if (inst->wide_path) PyMem_RawFree(inst->wide_path);
--#endif
- }
-
--
- return ret;
- }
-
-@@ -1348,8 +1362,10 @@ module_t rlm_python3 = {
- [MOD_PREACCT] = mod_preacct,
- [MOD_ACCOUNTING] = mod_accounting,
- [MOD_SESSION] = mod_checksimul,
-+#ifdef WITH_PROXY
- [MOD_PRE_PROXY] = mod_pre_proxy,
- [MOD_POST_PROXY] = mod_post_proxy,
-+#endif
- [MOD_POST_AUTH] = mod_post_auth,
- #ifdef WITH_COA
- [MOD_RECV_COA] = mod_recv_coa,
diff --git a/net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch b/net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch
deleted file mode 100644
index 04223657d5f5..000000000000
--- a/net-dialup/freeradius/files/freeradius-3.0.20-systemd-service.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/debian/freeradius.service b/debian/freeradius.service
-index 378702d184..ee33c2a294 100644
---- a/debian/freeradius.service
-+++ b/debian/freeradius.service
-@@ -7,7 +7,6 @@ Documentation=man:radiusd(8) man:radiusd.conf(5) http://wiki.freeradius.org/ htt
- Type=notify
- WatchdogSec=60
- NotifyAccess=all
--EnvironmentFile=-/etc/default/freeradius
-
- # FreeRADIUS can do static evaluation of policy language rules based
- # on environmental variables which is very useful for doing per-host
-@@ -25,16 +24,15 @@ MemoryLimit=2G
- # Ensure the daemon can still write its pidfile after it drops
- # privileges. Combination of options that work on a variety of
- # systems. Test very carefully if you alter these lines.
--RuntimeDirectory=freeradius
-+RuntimeDirectory=radiusd
- RuntimeDirectoryMode=0775
- # This does not work on Debian Jessie:
--User=freerad
--Group=freerad
--# This does not work on Ubuntu Bionic:
--ExecStartPre=/bin/chown freerad:freerad /var/run/freeradius
-+User=radius
-+Group=radius
-
--ExecStartPre=/usr/sbin/freeradius $FREERADIUS_OPTIONS -Cx -lstdout
--ExecStart=/usr/sbin/freeradius -f $FREERADIUS_OPTIONS
-+ExecStartPre=/usr/sbin/radiusd $RADIUSD_OPTIONS -Cx -lstdout
-+ExecStart=/usr/sbin/radiusd -f $RADIUSD_OPTIONS
-+ExecReload=/bin/kill -HUP $MAINPID
- Restart=on-failure
- RestartSec=5
-
-@@ -42,7 +40,7 @@ RestartSec=5
- NoNewPrivileges=true
-
- # Allow binding to secure ports, broadcast addresses, and raw interfaces.
--#CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_CHOWN CAP_DAC_OVERRIDE
-+CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_CHOWN CAP_DAC_OVERRIDE
-
- # Private /tmp that isn't shared by other processes
- PrivateTmp=true
-@@ -60,10 +58,10 @@ ProtectKernelTunables=true
- SystemCallArchitectures=native
-
- # We shouldn't be writing to the configuration directory
--ReadOnlyDirectories=/etc/freeradius/
-+ReadOnlyDirectories=/etc/raddb/
-
- # We can read and write to the log directory.
--ReadWriteDirectories=/var/log/freeradius/
-+ReadWriteDirectories=/var/log/radius/
-
- [Install]
- WantedBy=multi-user.target
diff --git a/net-dialup/freeradius/files/radius.conf-r4 b/net-dialup/freeradius/files/radius.conf-r4
deleted file mode 100644
index a5760d29f7b9..000000000000
--- a/net-dialup/freeradius/files/radius.conf-r4
+++ /dev/null
@@ -1,16 +0,0 @@
-# Config file for /etc/init.d/radiusd
-
-# see man pages for radiusd run `radiusd -h`
-# for valid cmdline options
-#RADIUSD_OPTS=""
-
-# Change this value if you change it in /etc/raddb/radiusd.conf
-pidfile=/var/run/radiusd/radiusd.pid
-
-# Change these values if you change them in /etc/raddb/radiusd.conf
-RADIUSD_USER=radius
-RADIUSD_GROUP=radius
-
-# If you set up logging to syslog in /etc/raddb/radiusd.conf, you want
-# to uncomment the following line.
-#rc_use="logger"
diff --git a/net-dialup/freeradius/files/radius.conf-r5 b/net-dialup/freeradius/files/radius.conf-r5
deleted file mode 100644
index 7114c32ef923..000000000000
--- a/net-dialup/freeradius/files/radius.conf-r5
+++ /dev/null
@@ -1,18 +0,0 @@
-# Config file for /etc/init.d/radiusd
-
-# see man pages for radiusd run `radiusd -h`
-# for valid cmdline options
-#RADIUSD_OPTS=""
-
-# Change this value if you change it in /etc/raddb/radiusd.conf
-pidfile=/var/run/radiusd/radiusd.pid
-
-# Change these values if you change them in /etc/raddb/radiusd.conf
-RADIUSD_USER=radius
-RADIUSD_GROUP=radius
-
-RADIUSD_LOGPATH=/var/log/radius
-
-# If you set up logging to syslog in /etc/raddb/radiusd.conf, you want
-# to uncomment the following line.
-#rc_use="logger"
diff --git a/net-dialup/freeradius/files/radius.init-r3 b/net-dialup/freeradius/files/radius.init-r3
deleted file mode 100644
index 9c16ac59b41e..000000000000
--- a/net-dialup/freeradius/files/radius.init-r3
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command=/usr/sbin/radiusd
-command_args="${RADIUSD_OPTS}"
-pidfile="${pidfile:-/run/radiusd/radiusd.pid}"
-extra_started_commands="reload"
-
-depend() {
- need localmount
- use dns
-}
-
-start_pre() {
- if [ ! -f /etc/raddb/radiusd.conf ] ; then
- eerror "No /etc/raddb/radiusd.conf file exists!"
- return 1
- fi
-
- checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
- $(dirname ${pidfile}) /var/log/radius
- checkpath -m0750 -o "${RADIUSD_USER:-root}:${RADIUSD_GROUP:-root}" -d \
- $(dirname ${pidfile}) /run/radiusd
-}
-
-reload() {
- ebegin "Reloading radiusd"
- kill -HUP $(cat ${pidfile})
- eend $?
-}
diff --git a/net-dialup/freeradius/freeradius-3.0.20-r5.ebuild b/net-dialup/freeradius/freeradius-3.0.20-r5.ebuild
deleted file mode 100644
index e1d17f101601..000000000000
--- a/net-dialup/freeradius/freeradius-3.0.20-r5.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-inherit autotools pam python-single-r1 systemd
-
-MY_P="${PN}-server-${PV}"
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="
- ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
- ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
-"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="
- debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
- pcap postgres python readline redis rest samba sqlite ssl systemd
-"
-RESTRICT="test firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-# libs also if code is compliant, will be available in the next release.
-# (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-# linking of samba library if -samba is used.
-RDEPEND="acct-group/radius
- acct-user/radius
- !net-dialup/cistronradius
- dev-lang/perl:=
- sys-libs/gdbm:=
- sys-libs/talloc
- virtual/libcrypt:=
- firebird? ( dev-db/firebird )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- memcached? ( dev-libs/libmemcached )
- mysql? ( dev-db/mysql-connector-c:= )
- mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
- odbc? ( dev-db/unixODBC )
- oracle? ( dev-db/oracle-instantclient[sdk] )
- pam? ( sys-libs/pam )
- pcap? ( net-libs/libpcap )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- redis? ( dev-libs/hiredis:= )
- rest? ( dev-libs/json-c:= )
- samba? ( net-fs/samba )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/openssl:0=[-bindist(-)]
- )
- systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-systemd-service.patch
- # Fix rlm_python3 build
- # Backport from rlm_python changes to rlm_python3
- "${FILESDIR}"/${P}-py3-fixes.patch
-)
-
-pkg_setup() {
- if use python ; then
- python-single-r1_pkg_setup
- export PYTHONBIN="${EPYTHON}"
- fi
-}
-
-src_prepare() {
- # most of the configuration options do not appear as ./configure
- # switches. Instead it identifies the directories that are available
- # and run through them. These might check for the presence of
- # various libraries, in which case they are not built. To avoid
- # automagic dependencies, we just remove all the modules that we're
- # not interested in using.
-
- eapply_user
- default
-
- use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
- use ldap || { rm -r src/modules/rlm_ldap || die ; }
- use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
- use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
- use pam || { rm -r src/modules/rlm_pam || die ; }
- # Drop support of python2
- rm -r src/modules/rlm_python || die
- use python || { rm -r src/modules/rlm_python3 || die ; }
- use rest || { rm -r src/modules/rlm_rest || die ; }
- use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
- # Do not install ruby rlm module, bug #483108
- rm -r src/modules/rlm_ruby || die
-
- # these are all things we don't have in portage/I don't want to deal
- # with myself
- rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
- rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
- rm -r src/modules/rlm_opendirectory || die # requires some membership.h
- rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
- # sql drivers that are not part of experimental are loaded from a
- # file, so we have to remove them from the file itself when we
- # remove them.
- usesqldriver() {
- local flag=$1
- local driver=rlm_sql_${2:-${flag}}
-
- if ! use ${flag}; then
- rm -r src/modules/rlm_sql/drivers/${driver} || die
- sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
- fi
- }
-
- sed -i \
- -e 's:^#\tuser = :\tuser = :g' \
- -e 's:^#\tgroup = :\tgroup = :g' \
- -e 's:/var/run/radiusd:/run/radiusd:g' \
- -e '/^run_dir/s:${localstatedir}::g' \
- raddb/radiusd.conf.in || die
-
- # verbosity
- # build shared libraries using jlibtool --shared
- sed -i \
- -e '/$(LIBTOOL)/s|--quiet ||g' \
- -e 's:--mode=\(compile\|link\):& --shared:g' \
- Make.inc.in || die
-
- sed -i \
- -e 's|--silent ||g' \
- -e 's:--mode=\(compile\|link\):& --shared:g' \
- scripts/libtool.mk || die
-
- # crude measure to stop jlibtool from running ranlib and ar
- sed -i \
- -e '/LIBRARIAN/s|".*"|"true"|g' \
- -e '/RANLIB/s|".*"|"true"|g' \
- scripts/jlibtool.c || die
-
- usesqldriver mysql
- usesqldriver postgres postgresql
- usesqldriver firebird
- usesqldriver iodbc
- usesqldriver odbc unixodbc
- usesqldriver oracle
- usesqldriver sqlite
- usesqldriver mongodb mongo
-
- eautoreconf
-}
-
-src_configure() {
- # do not try to enable static with static-libs; upstream is a
- # massacre of libtool best practices so you also have to make sure
- # to --enable-shared explicitly.
- local myeconfargs=(
- --enable-shared
- --disable-static
- --disable-ltdl-install
- --with-system-libtool
- --with-system-libltdl
- --with-ascend-binary
- --with-udpfromto
- --with-dhcp
- --with-iodbc-include-dir=/usr/include/iodbc
- --with-experimental-modules
- --with-docdir=/usr/share/doc/${PF}
- --with-logdir=/var/log/radius
- $(use_enable debug developer)
- $(use_with ldap edir)
- $(use_with ssl openssl)
- $(use_with systemd systemd)
- )
- # fix bug #77613
- if has_version app-crypt/heimdal; then
- myeconfargs+=( --enable-heimdal-krb5 )
- fi
-
- if use python ; then
- myeconfargs+=(
- --with-rlm-python3-bin=${EPYTHON}
- --with-rlm-python3-config-bin=${EPYTHON}-config
- )
- fi
-
- use readline || export ac_cv_lib_readline=no
- use pcap || export ac_cv_lib_pcap_pcap_open_live=no
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # verbose, do not generate certificates
- emake \
- Q='' ECHO=true \
- LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
- dodir /etc
- diropts -m0750 -o root -g radius
- dodir /etc/raddb
- diropts -m0750 -o radius -g radius
- dodir /var/log/radius
- keepdir /var/log/radius/radacct
- diropts
-
- # verbose, do not install certificates
- # Parallel install fails (#509498)
- emake -j1 \
- Q='' ECHO=true \
- LOCAL_CERT_PRODUCTS='' \
- R="${D}" \
- install
-
- if use pam; then
- pamd_mimic_system radiusd auth account password session
- fi
-
- # fix #711756
- fowners -R radius:radius /etc/raddb
- fowners -R radius:radius /var/log/radius
-
- dodoc CREDITS
-
- rm "${ED}/usr/sbin/rc.radiusd" || die
-
- newinitd "${FILESDIR}/radius.init-r3" radiusd
- newconfd "${FILESDIR}/radius.conf-r4" radiusd
-
- if ! use systemd ; then
- # If systemd builtin is not enabled we need use Type=Simple
- # as systemd .service
- sed -i -e 's:^Type=.*::g' \
- -e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
- "${S}"/debian/freeradius.service
- fi
- systemd_dounit "${S}"/debian/freeradius.service
-
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-}
-
-pkg_config() {
- if use ssl; then
- cd "${ROOT}"/etc/raddb/certs || die
- ./bootstrap || die "Error while running ./bootstrap script."
- fowners root:radius "${ROOT}"/etc/raddb/certs
- fowners root:radius "${ROOT}"/etc/raddb/certs/ca.pem
- fowners root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem}
- fi
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} && use ssl; then
- elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
- elog "to start the radiusd service."
- fi
-}
diff --git a/net-dialup/freeradius/freeradius-3.0.21-r5.ebuild b/net-dialup/freeradius/freeradius-3.0.21-r5.ebuild
deleted file mode 100644
index 0446eb5f201c..000000000000
--- a/net-dialup/freeradius/freeradius-3.0.21-r5.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools pam python-single-r1 systemd
-
-MY_P="${PN}-server-${PV}"
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="
- ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
- ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
-"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="
- debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
- pcap postgres python readline redis rest samba sqlite ssl systemd
-"
-RESTRICT="test firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-# libs also if code is compliant, will be available in the next release.
-# (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-# linking of samba library if -samba is used.
-RDEPEND="acct-group/radius
- acct-user/radius
- !net-dialup/cistronradius
- dev-lang/perl:=
- sys-libs/gdbm:=
- sys-libs/talloc
- virtual/libcrypt:=
- firebird? ( dev-db/firebird )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- memcached? ( dev-libs/libmemcached )
- mysql? ( dev-db/mysql-connector-c:= )
- mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
- odbc? ( dev-db/unixODBC )
- oracle? ( dev-db/oracle-instantclient[sdk] )
- pam? ( sys-libs/pam )
- pcap? ( net-libs/libpcap )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- redis? ( dev-libs/hiredis:= )
- rest? ( dev-libs/json-c:= )
- samba? ( net-fs/samba )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/openssl:0=[-bindist(-)]
- )
- systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
- if use python ; then
- python-single-r1_pkg_setup
- export PYTHONBIN="${EPYTHON}"
- fi
-}
-
-src_prepare() {
- # most of the configuration options do not appear as ./configure
- # switches. Instead it identifies the directories that are available
- # and run through them. These might check for the presence of
- # various libraries, in which case they are not built. To avoid
- # automagic dependencies, we just remove all the modules that we're
- # not interested in using.
-
- eapply_user
- default
-
- use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
- use ldap || { rm -r src/modules/rlm_ldap || die ; }
- use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
- use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
- use pam || { rm -r src/modules/rlm_pam || die ; }
- # Drop support of python2
- rm -r src/modules/rlm_python || die
- use python || { rm -r src/modules/rlm_python3 || die ; }
- use rest || { rm -r src/modules/rlm_rest || die ; }
- use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
- # Do not install ruby rlm module, bug #483108
- rm -r src/modules/rlm_ruby || die
-
- # these are all things we don't have in portage/I don't want to deal
- # with myself
- rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
- rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
- rm -r src/modules/rlm_opendirectory || die # requires some membership.h
- rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
- # sql drivers that are not part of experimental are loaded from a
- # file, so we have to remove them from the file itself when we
- # remove them.
- usesqldriver() {
- local flag=$1
- local driver=rlm_sql_${2:-${flag}}
-
- if ! use ${flag}; then
- rm -r src/modules/rlm_sql/drivers/${driver} || die
- sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
- fi
- }
-
- sed -i \
- -e 's:^#\tuser = :\tuser = :g' \
- -e 's:^#\tgroup = :\tgroup = :g' \
- -e 's:/var/run/radiusd:/run/radiusd:g' \
- -e '/^run_dir/s:${localstatedir}::g' \
- raddb/radiusd.conf.in || die
-
- # verbosity
- # build shared libraries using jlibtool --shared
- sed -i \
- -e '/$(LIBTOOL)/s|--quiet ||g' \
- -e 's:--mode=\(compile\|link\):& --shared:g' \
- Make.inc.in || die
-
- sed -i \
- -e 's|--silent ||g' \
- -e 's:--mode=\(compile\|link\):& --shared:g' \
- scripts/libtool.mk || die
-
- # crude measure to stop jlibtool from running ranlib and ar
- sed -i \
- -e '/LIBRARIAN/s|".*"|"true"|g' \
- -e '/RANLIB/s|".*"|"true"|g' \
- scripts/jlibtool.c || die
-
- usesqldriver mysql
- usesqldriver postgres postgresql
- usesqldriver firebird
- usesqldriver iodbc
- usesqldriver odbc unixodbc
- usesqldriver oracle
- usesqldriver sqlite
- usesqldriver mongodb mongo
-
- eautoreconf
-}
-
-src_configure() {
- # do not try to enable static with static-libs; upstream is a
- # massacre of libtool best practices so you also have to make sure
- # to --enable-shared explicitly.
- local myeconfargs=(
- --enable-shared
- --disable-static
- --disable-ltdl-install
- --with-system-libtool
- --with-system-libltdl
- --with-ascend-binary
- --with-udpfromto
- --with-dhcp
- --with-iodbc-include-dir=/usr/include/iodbc
- --with-experimental-modules
- --with-docdir=/usr/share/doc/${PF}
- --with-logdir=/var/log/radius
- $(use_enable debug developer)
- $(use_with ldap edir)
- $(use_with ssl openssl)
- $(use_with systemd systemd)
- )
- # fix bug #77613
- if has_version app-crypt/heimdal; then
- myeconfargs+=( --enable-heimdal-krb5 )
- fi
-
- if use python ; then
- myeconfargs+=(
- --with-rlm-python3-bin=${EPYTHON}
- --with-rlm-python3-config-bin=${EPYTHON}-config
- )
- fi
-
- use readline || export ac_cv_lib_readline=no
- use pcap || export ac_cv_lib_pcap_pcap_open_live=no
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # verbose, do not generate certificates
- emake \
- Q='' ECHO=true \
- LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
- dodir /etc
- diropts -m0750 -o root -g radius
- dodir /etc/raddb
- diropts -m0750 -o radius -g radius
- dodir /var/log/radius
- keepdir /var/log/radius/radacct
- diropts
-
- # verbose, do not install certificates
- # Parallel install fails (#509498)
- emake -j1 \
- Q='' ECHO=true \
- LOCAL_CERT_PRODUCTS='' \
- R="${D}" \
- install
-
- if use pam; then
- pamd_mimic_system radiusd auth account password session
- fi
-
- # fix #711756
- fowners -R radius:radius /etc/raddb
- fowners -R radius:radius /var/log/radius
-
- dodoc CREDITS
-
- rm "${ED}/usr/sbin/rc.radiusd" || die
-
- newinitd "${FILESDIR}/radius.init-r4" radiusd
- newconfd "${FILESDIR}/radius.conf-r5" radiusd
-
- if ! use systemd ; then
- # If systemd builtin is not enabled we need use Type=Simple
- # as systemd .service
- sed -i -e 's:^Type=.*::g' \
- -e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
- "${S}"/debian/freeradius.service
- fi
- systemd_dounit "${S}"/debian/freeradius.service
-
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
- if use ssl; then
- cd "${ROOT}"/etc/raddb/certs || die
- ./bootstrap || die "Error while running ./bootstrap script."
- fowners root:radius "${ROOT}"/etc/raddb/certs
- fowners root:radius "${ROOT}"/etc/raddb/certs/ca.pem
- fowners root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem}
- fi
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} && use ssl; then
- elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
- elog "to start the radiusd service."
- fi
-}
diff --git a/net-dialup/freeradius/freeradius-3.0.22-r4.ebuild b/net-dialup/freeradius/freeradius-3.0.22-r4.ebuild
deleted file mode 100644
index 1f36dfb9b760..000000000000
--- a/net-dialup/freeradius/freeradius-3.0.22-r4.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit autotools pam python-single-r1 systemd
-
-MY_P="${PN}-server-${PV}"
-
-DESCRIPTION="Highly configurable free RADIUS server"
-SRC_URI="
- ftp://ftp.freeradius.org/pub/radius/${MY_P}.tar.gz
- ftp://ftp.freeradius.org/pub/radius/old/${MY_P}.tar.gz
-"
-HOMEPAGE="http://www.freeradius.org/"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="
- debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
- pcap postgres python readline redis rest samba sqlite ssl systemd
-"
-RESTRICT="test firebird? ( bindist )"
-
-# NOTE: Temporary freeradius doesn't support linking with mariadb client
-# libs also if code is compliant, will be available in the next release.
-# (http://lists.freeradius.org/pipermail/freeradius-devel/2018-October/013228.html)a
-
-# TODO: rlm_mschap works with both samba library or without. I need to avoid
-# linking of samba library if -samba is used.
-RDEPEND="acct-group/radius
- acct-user/radius
- !net-dialup/cistronradius
- dev-lang/perl:=
- sys-libs/gdbm:=
- sys-libs/talloc
- virtual/libcrypt:=
- firebird? ( dev-db/firebird )
- iodbc? ( dev-db/libiodbc )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap:= )
- memcached? ( dev-libs/libmemcached )
- mysql? ( dev-db/mysql-connector-c:= )
- mongodb? ( >=dev-libs/mongo-c-driver-1.13.0-r1 )
- odbc? ( dev-db/unixODBC )
- oracle? ( dev-db/oracle-instantclient[sdk] )
- pam? ( sys-libs/pam )
- pcap? ( net-libs/libpcap )
- postgres? ( dev-db/postgresql:= )
- python? ( ${PYTHON_DEPS} )
- readline? ( sys-libs/readline:0= )
- redis? ( dev-libs/hiredis:= )
- rest? ( dev-libs/json-c:= )
- samba? ( net-fs/samba )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- dev-libs/openssl:0=[-bindist(-)]
- )
- systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.20-systemd-service.patch
-)
-
-pkg_setup() {
- if use python ; then
- python-single-r1_pkg_setup
- export PYTHONBIN="${EPYTHON}"
- fi
-}
-
-src_prepare() {
- # most of the configuration options do not appear as ./configure
- # switches. Instead it identifies the directories that are available
- # and run through them. These might check for the presence of
- # various libraries, in which case they are not built. To avoid
- # automagic dependencies, we just remove all the modules that we're
- # not interested in using.
-
- eapply_user
- default
-
- use ssl || { rm -r src/modules/rlm_eap/types/rlm_eap_{tls,ttls,peap} || die ; }
- use ldap || { rm -r src/modules/rlm_ldap || die ; }
- use kerberos || { rm -r src/modules/rlm_krb5 || die ; }
- use memcached || { rm -r src/modules/rlm_cache/drivers/rlm_cache_memcached || die ; }
- use pam || { rm -r src/modules/rlm_pam || die ; }
- # Drop support of python2
- rm -r src/modules/rlm_python || die
- use python || { rm -r src/modules/rlm_python3 || die ; }
- use rest || { rm -r src/modules/rlm_rest || die ; }
- use redis || { rm -r src/modules/rlm_redis{,who} || die ; }
- # Do not install ruby rlm module, bug #483108
- rm -r src/modules/rlm_ruby || die
-
- # these are all things we don't have in portage/I don't want to deal
- # with myself
- rm -r src/modules/rlm_eap/types/rlm_eap_tnc || die # requires TNCS library
- rm -r src/modules/rlm_eap/types/rlm_eap_ikev2 || die # requires libeap-ikev2
- rm -r src/modules/rlm_opendirectory || die # requires some membership.h
- rm -r src/modules/rlm_sql/drivers/rlm_sql_{db2,freetds} || die
-
- # sql drivers that are not part of experimental are loaded from a
- # file, so we have to remove them from the file itself when we
- # remove them.
- usesqldriver() {
- local flag=$1
- local driver=rlm_sql_${2:-${flag}}
-
- if ! use ${flag}; then
- rm -r src/modules/rlm_sql/drivers/${driver} || die
- sed -i -e /${driver}/d src/modules/rlm_sql/stable || die
- fi
- }
-
- sed -i \
- -e 's:^#\tuser = :\tuser = :g' \
- -e 's:^#\tgroup = :\tgroup = :g' \
- -e 's:/var/run/radiusd:/run/radiusd:g' \
- -e '/^run_dir/s:${localstatedir}::g' \
- raddb/radiusd.conf.in || die
-
- # verbosity
- # build shared libraries using jlibtool --shared
- sed -i \
- -e '/$(LIBTOOL)/s|--quiet ||g' \
- -e 's:--mode=\(compile\|link\):& --shared:g' \
- Make.inc.in || die
-
- sed -i \
- -e 's|--silent ||g' \
- -e 's:--mode=\(compile\|link\):& --shared:g' \
- scripts/libtool.mk || die
-
- # crude measure to stop jlibtool from running ranlib and ar
- sed -i \
- -e '/LIBRARIAN/s|".*"|"true"|g' \
- -e '/RANLIB/s|".*"|"true"|g' \
- scripts/jlibtool.c || die
-
- usesqldriver mysql
- usesqldriver postgres postgresql
- usesqldriver firebird
- usesqldriver iodbc
- usesqldriver odbc unixodbc
- usesqldriver oracle
- usesqldriver sqlite
- usesqldriver mongodb mongo
-
- eautoreconf
-}
-
-src_configure() {
- # do not try to enable static with static-libs; upstream is a
- # massacre of libtool best practices so you also have to make sure
- # to --enable-shared explicitly.
- local myeconfargs=(
- --enable-shared
- --disable-static
- --disable-ltdl-install
- --with-system-libtool
- --with-system-libltdl
- --with-ascend-binary
- --with-udpfromto
- --with-dhcp
- --with-iodbc-include-dir=/usr/include/iodbc
- --with-experimental-modules
- --with-docdir=/usr/share/doc/${PF}
- --with-logdir=/var/log/radius
- $(use_enable debug developer)
- $(use_with ldap edir)
- $(use_with ssl openssl)
- $(use_with systemd systemd)
- )
- # fix bug #77613
- if has_version app-crypt/heimdal; then
- myeconfargs+=( --enable-heimdal-krb5 )
- fi
-
- if use python ; then
- myeconfargs+=(
- --with-rlm-python3-bin=${EPYTHON}
- --with-rlm-python3-config-bin=${EPYTHON}-config
- )
- fi
-
- use readline || export ac_cv_lib_readline=no
- use pcap || export ac_cv_lib_pcap_pcap_open_live=no
-
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- # verbose, do not generate certificates
- emake \
- Q='' ECHO=true \
- LOCAL_CERT_PRODUCTS=''
-}
-
-src_install() {
- dodir /etc
- diropts -m0750 -o root -g radius
- dodir /etc/raddb
- diropts -m0750 -o radius -g radius
- dodir /var/log/radius
- keepdir /var/log/radius/radacct
- diropts
-
- # verbose, do not install certificates
- # Parallel install fails (#509498)
- emake -j1 \
- Q='' ECHO=true \
- LOCAL_CERT_PRODUCTS='' \
- R="${D}" \
- install
-
- if use pam; then
- pamd_mimic_system radiusd auth account password session
- fi
-
- # fix #711756
- fowners -R radius:radius /etc/raddb
- fowners -R radius:radius /var/log/radius
-
- dodoc CREDITS
-
- rm "${ED}/usr/sbin/rc.radiusd" || die
-
- newinitd "${FILESDIR}/radius.init-r4" radiusd
- newconfd "${FILESDIR}/radius.conf-r5" radiusd
-
- if ! use systemd ; then
- # If systemd builtin is not enabled we need use Type=Simple
- # as systemd .service
- sed -i -e 's:^Type=.*::g' \
- -e 's:^WatchdogSec=.*::g' -e 's:^NotifyAccess=all.*::g' \
- "${S}"/debian/freeradius.service
- fi
- systemd_dounit "${S}"/debian/freeradius.service
-
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-pkg_config() {
- if use ssl; then
- cd "${ROOT}"/etc/raddb/certs || die
- ./bootstrap || die "Error while running ./bootstrap script."
- fowners root:radius "${ROOT}"/etc/raddb/certs
- fowners root:radius "${ROOT}"/etc/raddb/certs/ca.pem
- fowners root:radius "${ROOT}"/etc/raddb/certs/server.{key,crt,pem}
- fi
-}
-
-pkg_preinst() {
- if ! has_version ${CATEGORY}/${PN} && use ssl; then
- elog "You have to run \`emerge --config =${CATEGORY}/${PF}\` to be able"
- elog "to start the radiusd service."
- fi
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:23:49 +0000