commit:     5921dd829647c67b900a994522325dc2e0fcb1ed
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Thu Dec 23 12:16:17 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 30 20:52:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5921dd82

net-dialup/freeradius: bump to 3.0.25

Closes: https://bugs.gentoo.org/719984
Closes: https://bugs.gentoo.org/721040
Closes: https://bugs.gentoo.org/784143
Closes: https://bugs.gentoo.org/816972
Closes: https://bugs.gentoo.org/818205
Closes: https://github.com/gentoo/gentoo/pull/23479
Signed-off-by: Tomáš Mózes <hydrapolic <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-dialup/freeradius/Manifest                 |   1 +
 net-dialup/freeradius/files/radius.conf-r6     |  22 ++
 net-dialup/freeradius/freeradius-3.0.25.ebuild | 267 +++++++++++++++++++++++++
 3 files changed, 290 insertions(+)

diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index b3bca2a66368..9c312f87501d 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,3 +1,4 @@
+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

diff --git a/net-dialup/freeradius/files/radius.conf-r6 
b/net-dialup/freeradius/files/radius.conf-r6
new file mode 100644
index 000000000000..50d2a1ce1f14
--- /dev/null
+++ b/net-dialup/freeradius/files/radius.conf-r6
@@ -0,0 +1,22 @@
+# 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=/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"
+
+# If you use ldap, start the ldap server prior to FreeRADIUS to avoid
+# startup crashes.
+#rc_use="ldap"

diff --git a/net-dialup/freeradius/freeradius-3.0.25.ebuild 
b/net-dialup/freeradius/freeradius-3.0.25.ebuild
new file mode 100644
index 000000000000..9479f1209c3d
--- /dev/null
+++ b/net-dialup/freeradius/freeradius-3.0.25.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools pam python-single-r1 systemd
+
+MY_PV=$(ver_rs 1- "_")
+
+DESCRIPTION="Highly configurable free RADIUS server"
+HOMEPAGE="https://freeradius.org/";
+SRC_URI="https://github.com/FreeRADIUS/freeradius-server/archive/release_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+S="${WORKDIR}/freeradius-server-release_${MY_PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+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-basic )
+       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} )"
+
+# 721040
+QA_SONAME="usr/lib.*/libfreeradius-.*.so"
+
+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-r6" 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."
+               chown root:radius "${ROOT}"/etc/raddb/certs || die
+               chown root:radius "${ROOT}"/etc/raddb/certs/ca.pem || die
+               chown root:radius 
"${ROOT}"/etc/raddb/certs/server.{key,crt,pem} || die
+       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
+}

Reply via email to