Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Sep 2020 22:20:29 +0000 (UTC)
From:      Ryan Steinmetz <zi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r549967 - in head: . net/freeradius3
Message-ID:  <202009242220.08OMKTfU051171@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zi
Date: Thu Sep 24 22:20:29 2020
New Revision: 549967
URL: https://svnweb.freebsd.org/changeset/ports/549967

Log:
  - Convert PYTHON support to use python 3.x
  - Add note to UPDATING
  
  PR:		249743
  Submitted by:	Steve Wills <swills@FreeBSD.org>

Modified:
  head/UPDATING
  head/net/freeradius3/Makefile
  head/net/freeradius3/pkg-plist

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Thu Sep 24 22:15:28 2020	(r549966)
+++ head/UPDATING	Thu Sep 24 22:20:29 2020	(r549967)
@@ -5,6 +5,18 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20200924:
+  AFFECTS: users of net/freeradius3, who need python support
+  AUTHOR: zi@FreeBSD.org
+
+  FreeRADIUS 3.x currently uses python 2.7 for rlm_python support, which has
+  been deprecated and will be removed from the tree at the end of this year.
+
+  Starting in 3.0.21_2, the PYTHON option has been converted to use python 3.x.
+
+  Users should verify their python scripts are 3.x compatible and upgrade to
+  3.0.21_2 (or higher) to bring in python 3.x suppoort.
+
 20200921:
   AFFECTS: users of database/postgresql* and other software using PostgreSQL to run
   AUTHOR: kbowling@FreeBSD.org

Modified: head/net/freeradius3/Makefile
==============================================================================
--- head/net/freeradius3/Makefile	Thu Sep 24 22:15:28 2020	(r549966)
+++ head/net/freeradius3/Makefile	Thu Sep 24 22:20:29 2020	(r549967)
@@ -3,7 +3,7 @@
 
 PORTNAME=	freeradius
 DISTVERSION=	3.0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -32,6 +32,7 @@ USE_RC_SUBR=	radiusd
 
 SHEBANG_FILES=	src/modules/rlm_counter/rad_counter scripts/sql/radsqlrelay
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--without-rlm_python
 # Prevent /root/.rnd leftover
 MAKE_ARGS+=	HOME=/dev/null
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -102,11 +103,12 @@ PERL_USES=			perl5
 PGSQL_USES=			pgsql
 PGSQL_VARS=			_REQUIRE+=postgresql
 PGSQL_CONFIGURE_WITH=		rlm_sql_postgresql
-PYTHON_CONFIGURE_WITH=		rlm_python
-PYTHON_CONFIGURE_ON=		--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
-				--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR}
-PYTHON_USES=			python:2.7 gettext-runtime
-PYTHON_VARS=			SHEBANG_FILES+=src/modules/rlm_python/*.py
+PYTHON_CONFIGURE_WITH=		rlm_python3
+PYTHON_CONFIGURE_ON=		--with-rlm-python3-lib-dir=${PYTHON_LIBDIR} \
+				--with-rlm-python3-config-bin=${PYTHON_CMD}-config \
+				--with-rlm-python3-include-dir=${PYTHON_INCLUDEDIR}
+PYTHON_USES=			python gettext-runtime
+PYTHON_VARS=			SHEBANG_FILES+=src/modules/rlm_python3/*.py
 REDIS_CONFIGURE_WITH=		rlm_redis rlm_rediswho
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
 REST_CONFIGURE_WITH=		rlm_rest

Modified: head/net/freeradius3/pkg-plist
==============================================================================
--- head/net/freeradius3/pkg-plist	Thu Sep 24 22:15:28 2020	(r549966)
+++ head/net/freeradius3/pkg-plist	Thu Sep 24 22:20:29 2020	(r549967)
@@ -226,9 +226,9 @@ include/freeradius/vqp.h
 %%LIBDIR%%/rlm_preprocess.a
 %%LIBDIR%%/rlm_preprocess.la
 %%LIBDIR%%/rlm_preprocess.so
-%%PYTHON%%%%LIBDIR%%/rlm_python.a
-%%PYTHON%%%%LIBDIR%%/rlm_python.la
-%%PYTHON%%%%LIBDIR%%/rlm_python.so
+%%PYTHON%%%%LIBDIR%%/rlm_python3.a
+%%PYTHON%%%%LIBDIR%%/rlm_python3.la
+%%PYTHON%%%%LIBDIR%%/rlm_python3.so
 %%LIBDIR%%/rlm_radutmp.a
 %%LIBDIR%%/rlm_radutmp.la
 %%LIBDIR%%/rlm_radutmp.so
@@ -612,8 +612,8 @@ sbin/radmin
 %%PERL%%%%EXAMPLESDIR%%/raddb/mods-config/perl/example.pl
 %%EXAMPLESDIR%%/raddb/mods-config/preprocess/hints
 %%EXAMPLESDIR%%/raddb/mods-config/preprocess/huntgroups
-%%PYTHON%%%%EXAMPLESDIR%%/raddb/mods-config/python/example.py
-%%PYTHON%%%%EXAMPLESDIR%%/raddb/mods-config/python/radiusd.py
+%%PYTHON%%%%EXAMPLESDIR%%/raddb/mods-config/python3/example.py
+%%PYTHON%%%%EXAMPLESDIR%%/raddb/mods-config/python3/radiusd.py
 %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/mysql/dailycounter.conf
 %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/mysql/expire_on_login.conf
 %%EXAMPLESDIR%%/raddb/mods-config/sql/counter/mysql/monthlycounter.conf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009242220.08OMKTfU051171>