From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7FF8138334 for ; Thu, 13 Jun 2019 19:51:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE996E0907; Thu, 13 Jun 2019 19:51:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9ED86E0907 for ; Thu, 13 Jun 2019 19:51:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7C0D346043 for ; Thu, 13 Jun 2019 19:51:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3FBBC2A5 for ; Thu, 13 Jun 2019 19:51:38 +0000 (UTC) From: "Aaron W. Swenson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron W. Swenson" Message-ID: <1560455393.9eb376c782868c81a284901adfdffe0143ee79d3.titanofold@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dialup/freeradius/files/, net-dialup/freeradius/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dialup/freeradius/files/freeradius-3.0.18-systemd-service.patch net-dialup/freeradius/freeradius-3.0.18-r1.ebuild X-VCS-Directories: net-dialup/freeradius/ net-dialup/freeradius/files/ X-VCS-Committer: titanofold X-VCS-Committer-Name: Aaron W. Swenson X-VCS-Revision: 9eb376c782868c81a284901adfdffe0143ee79d3 X-VCS-Branch: master Date: Thu, 13 Jun 2019 19:51:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b97937b7-69a2-459c-bb8e-669f8618cfd3 X-Archives-Hash: 1e2928a78780e9f4a251bebbc97bd7a6 commit: 9eb376c782868c81a284901adfdffe0143ee79d3 Author: Daniele Rondina gmail com> AuthorDate: Sun Jun 9 09:21:32 2019 +0000 Commit: Aaron W. Swenson gentoo org> CommitDate: Thu Jun 13 19:49:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb376c7 net-dialup/freeradius: Bump v.3.0.18-r1 and review freeradius.service Package-Manager: Portage-2.3.62, Repoman-2.3.12 Closes: https://bugs.gentoo.org/681696 Signed-off-by: Daniele Rondina gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11492 Signed-off-by: Aaron W. Swenson gentoo.org> .../files/freeradius-3.0.18-systemd-service.patch | 34 +++ net-dialup/freeradius/freeradius-3.0.18-r1.ebuild | 244 +++++++++++++++++++++ 2 files changed, 278 insertions(+) diff --git a/net-dialup/freeradius/files/freeradius-3.0.18-systemd-service.patch b/net-dialup/freeradius/files/freeradius-3.0.18-systemd-service.patch new file mode 100644 index 00000000000..3da4b422f5d --- /dev/null +++ b/net-dialup/freeradius/files/freeradius-3.0.18-systemd-service.patch @@ -0,0 +1,34 @@ +diff --git a/debian/freeradius.service b/debian/freeradius.service +index 99873c0..97efc66 100644 +--- a/debian/freeradius.service ++++ b/debian/freeradius.service +@@ -17,12 +17,26 @@ Environment=HOSTNAME=%H + # a leak somewhere. + MemoryLimit=2G + +-RuntimeDirectory=freeradius ++RuntimeDirectory=radiusd + RuntimeDirectoryMode=0775 +-ExecStartPre=/usr/sbin/freeradius $FREERADIUS_OPTIONS -Cx -lstdout +-ExecStart=/usr/sbin/freeradius $FREERADIUS_OPTIONS ++Group=radius ++User=radius ++ExecStartPre=/usr/sbin/radiusd $RADIUSD_OPTS -Cx -lstdout ++ExecStart=/usr/sbin/radiusd -f $RADIUSD_OPTS ++ExecReload=/usr/sbin/radiusd -C $RADIUSD_OPTS ++ExecReload=/bin/kill -HUP $MAINPID + Restart=on-failure + RestartSec=5 ++ReadOnlyDirectories=/etc/raddb/ ++ReadWriteDirectories=/var/log/radius/ ++# Security options (https://github.com/FreeRADIUS/freeradius-server/issues/2637) ++NoNewPrivileges=true ++CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW ++PrivateTmp=true ++ProtectControlGroups=true ++ProtectKernelModules=true ++ProtectKernelTunables=true ++SystemCallArchitectures=native + + [Install] + WantedBy=multi-user.target diff --git a/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild new file mode 100644 index 00000000000..44d5b7baa7e --- /dev/null +++ b/net-dialup/freeradius/freeradius-3.0.18-r1.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +inherit autotools pam python-single-r1 systemd user + +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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +LICENSE="GPL-2" +SLOT="0" + +IUSE=" + debug firebird iodbc kerberos ldap libressl memcached mysql odbc oracle pam + pcap postgres python readline rest samba sqlite ssl redis +" +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) +RDEPEND="!net-dialup/cistronradius + !net-dialup/gnuradius + dev-lang/perl:= + sys-libs/gdbm:= + sys-libs/talloc + python? ( ${PYTHON_DEPS} ) + readline? ( sys-libs/readline:0= ) + pcap? ( net-libs/libpcap ) + memcached? ( dev-libs/libmemcached ) + mysql? ( dev-db/mysql-connector-c ) + postgres? ( dev-db/postgresql:= ) + firebird? ( dev-db/firebird ) + pam? ( virtual/pam ) + rest? ( dev-libs/json-c:= ) + samba? ( net-fs/samba ) + redis? ( dev-libs/hiredis:= ) + ssl? ( + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + ) + ldap? ( net-nds/openldap ) + kerberos? ( virtual/krb5 ) + sqlite? ( dev-db/sqlite:3 ) + odbc? ( dev-db/unixODBC ) + iodbc? ( dev-db/libiodbc ) + oracle? ( dev-db/oracle-instantclient-basic )" +DEPEND="${RDEPEND}" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( + "${FILESDIR}"/${P}-libressl.patch + "${FILESDIR}"/${P}-systemd-service.patch +) + +pkg_setup() { + enewgroup radius + enewuser radius -1 -1 /var/log/radius radius + + 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. + + 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 ; } + use python || { rm -r src/modules/rlm_python || die ; } + use rest || { rm -r src/modules/rlm_rest || die ; } + use redis || { rm -r src/modules/rlm_redis{,who} || die ; } + # can't just nuke rlm_mschap because many modules rely on smbdes.h + use samba || { rm -r src/modules/rlm_mschap/{configure,*.mk} || 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 + + default + + 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) + ) + # fix bug #77613 + if has_version app-crypt/heimdal; then + myeconfargs+=( --enable-heimdal-krb5 ) + 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 + + fowners -R root:radius /etc/raddb + fowners -R radius:radius /var/log/radius + + pamd_mimic_system radiusd auth account password session + + dodoc CREDITS + + rm "${ED}/usr/sbin/rc.radiusd" || die + + newinitd "${FILESDIR}/radius.init-r3" radiusd + newconfd "${FILESDIR}/radius.conf-r4" radiusd + + systemd_newtmpfilesd "${FILESDIR}"/freeradius.tmpfiles freeradius.conf + 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 -R root:radius "${ROOT}"/etc/raddb/certs + 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 +}