Stuart Henderson <st...@openbsd.org> writes:
> On 2015/11/12 02:17, Jérémie Courrèges-Anglas wrote:
>> Stuart Henderson <st...@openbsd.org> writes:
>>
>> > Here (after rather a lot of pain) is a port for FreeRADIUS 3.0.10.
>> > The config isn't directly compatible with 2.x (at least the files have
>> > moved around), and in addition future 3.x versions are going to require
>> > c++11 features *INCLUDING TLS* so I'd like to import it in parallel to
>> > the existing version as net/freeradius3, keeping 2.x around for those
>> > who want to continue using it, and in case there are arch issues.
>> >
>> > Are others alright with this approach? Any comments or OKs to import?
>> > Thanks!
>>
>> I'm fine with this approach. The port looks fine, except for two minor
>> nits:
>> - patch-doc_README hardcodes /usr/local
>
> It's subst'ed in post-configure - I hate it when I do 'make; make
> update-patches' and it changes the ${TRUEPREFIX} back to /usr/local,
> and given the PLISTs there is already enough work to do when updating
> this beast ;)
Oops, indeed. :-]
> (As req'd by gsoares I have changed this from perl to sed -i).
>
>> - patch-src_main_detail_c should use %lld, not %llu
>
> Fixed, thanks.
>
>> Wouldn't a FR2/FR3 conflict marker be needed?
>
> Correct - there are markers in this port already, diff for FR2 below.
ok jca@ for the import and the diff below.
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/Makefile,v
> retrieving revision 1.65
> diff -u -p -r1.65 Makefile
> --- Makefile 7 Nov 2015 14:51:08 -0000 1.65
> +++ Makefile 12 Nov 2015 09:55:23 -0000
> @@ -11,8 +11,7 @@ COMMENT-pgsql= freeradius pgsql rlm addo
> COMMENT-ldap= freeradius ldap rlm addon
>
> V= 2.2.9
> -REVISION-main= 1
> -REVISION-mysql= 0
> +REVISION= 2
> DISTNAME= freeradius-server-$V
> EXTRACT_SUFX= .tar.bz2
>
> Index: pkg/PLIST-iodbc
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-iodbc,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST-iodbc
> --- pkg/PLIST-iodbc 17 Jul 2014 00:20:51 -0000 1.4
> +++ pkg/PLIST-iodbc 12 Nov 2015 09:55:23 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST-iodbc,v 1.4 2014/07/17 00:20:51 sthen Exp $
> +@conflict freeradius-iodbc-*
> lib/freeradius/rlm_sql_iodbc.so
> share/doc/freeradius/mssql
> share/examples/freeradius/sql/mssql/
> Index: pkg/PLIST-ldap
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-ldap,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-ldap
> --- pkg/PLIST-ldap 17 Jul 2014 00:20:51 -0000 1.5
> +++ pkg/PLIST-ldap 12 Nov 2015 09:55:23 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST-ldap,v 1.5 2014/07/17 00:20:51 sthen Exp $
> +@conflict freeradius-ldap-*
> @conflict freeradius-server-<2.1.8
> lib/freeradius/rlm_ldap.so
> share/doc/freeradius/examples/iplanet.ldif
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-main,v
> retrieving revision 1.30
> diff -u -p -r1.30 PLIST-main
> --- pkg/PLIST-main 7 Nov 2015 14:51:08 -0000 1.30
> +++ pkg/PLIST-main 12 Nov 2015 09:55:23 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST-main,v 1.30 2015/11/07 14:51:08 sthen Exp $
> +@conflict freeradius-*
> @conflict radiusd-cistron-*
> @conflict radiusd-lucent-*
> @pkgpath net/freeradius
> Index: pkg/PLIST-mysql
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-mysql,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST-mysql
> --- pkg/PLIST-mysql 8 Nov 2015 11:04:48 -0000 1.8
> +++ pkg/PLIST-mysql 12 Nov 2015 09:55:23 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST-mysql,v 1.8 2015/11/08 11:04:48 sthen Exp $
> +@conflict freeradius-mysql-*
> @conflict freeradius-server-<2.2.9p1
> lib/freeradius/rlm_sql_mysql.so
> @mode 640
> Index: pkg/PLIST-pgsql
> ===================================================================
> RCS file: /cvs/ports/net/freeradius/pkg/PLIST-pgsql,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST-pgsql
> --- pkg/PLIST-pgsql 17 Jul 2014 00:20:51 -0000 1.5
> +++ pkg/PLIST-pgsql 12 Nov 2015 09:55:23 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST-pgsql,v 1.5 2014/07/17 00:20:51 sthen Exp $
> +@conflict freeradius-pgsql-*
> @conflict freeradius-<2.1.8
> lib/freeradius/rlm_sql_postgresql.so
> share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
