diff -urN /usr/ports/net/freeradius2/Makefile freeradius2/Makefile --- /usr/ports/net/freeradius2/Makefile 2009-07-05 19:13:59.000000000 -0400 +++ freeradius2/Makefile 2009-08-04 09:39:55.000000000 -0400 @@ -51,6 +51,7 @@ FIREBIRD "With Firebird database support (EXPERIMENTAL)" off \ PERL "With Perl support" on \ PYTHON "With Python support" on \ + OCI8 "With Oracle support (EXPERIMENTAL)" off \ RUBY "With Ruby support (EXPERIMENTAL)" off \ DHCP "With DHCP support (EXPERIMENTAL)" off \ EXPERIMENTAL "Build experimental modules" off @@ -201,6 +202,19 @@ WITH_EXPERIMENTAL= yes .endif +# Oracle support is experimental under FreeBSD +.ifdef(WITH_OCI8) +EXTRA_PATCHES+= files/extra-patch-exec.c +CONFIGURE_ENV= ORACLE_HOME="${ORACLE_HOME}" +ORACLE_HOME?= ${LOCALBASE}/oracle8-client +BUILD_DEPENDS+= ${ORACLE_HOME}/lib/libclntst8.a:${PORTSDIR}/databases/oracle8-client +CONFIGURE_ARGS+=--with-oracle-home-dir=${ORACLE_HOME}/rdbms/demo +PLIST_SUB+= OCI8="" +.else +CONFIGURE_ARGS+=--without-rlm_sql_oracle +PLIST_SUB+= OCI8="@comment " +.endif + .ifdef(WITH_EXPERIMENTAL) CONFIGURE_ARGS+=--with-experimental-modules PLIST_SUB+= EXPM="" @@ -255,7 +269,6 @@ --without-rlm_opendirectory \ --without-rlm_sql_db2 \ --without-rlm_sql_iodbc \ - --without-rlm_sql_oracle \ --without-rlm_sql_sqlite \ --without-rlm_sql_sybase \ --with-vmps diff -urN /usr/ports/net/freeradius2/files/extra-patch-exec.c freeradius2/files/extra-patch-exec.c --- /usr/ports/net/freeradius2/files/extra-patch-exec.c 1969-12-31 19:00:00.000000000 -0500 +++ freeradius2/files/extra-patch-exec.c 2009-08-03 21:22:46.000000000 -0400 @@ -0,0 +1,11 @@ +--- src/main/exec.c 2008-12-05 11:37:56.000000000 -0500 ++++ src/main/exec.c 2009-01-18 17:43:32.000000000 -0500 +@@ -222,6 +222,8 @@ + output_pairs = NULL; + } + ++ signal(SIGCHLD, SIG_DFL); ++ + if (exec_wait) { + pid = rad_fork(); /* remember PID */ + } else { diff -urN /usr/ports/net/freeradius2/pkg-plist freeradius2/pkg-plist --- /usr/ports/net/freeradius2/pkg-plist 2009-07-05 19:13:59.000000000 -0400 +++ freeradius2/pkg-plist 2009-08-03 20:46:59.000000000 -0400 @@ -429,6 +429,11 @@ %%MYSQL%%%%LIBDIR%%/rlm_sql_mysql.a %%MYSQL%%%%LIBDIR%%/rlm_sql_mysql.la %%MYSQL%%%%LIBDIR%%/rlm_sql_mysql.so +%%OCI8%%%%LIBDIR%%/rlm_sql_oracle-%%PORTVERSION%%.la +%%OCI8%%%%LIBDIR%%/rlm_sql_oracle-%%PORTVERSION%%.so +%%OCI8%%%%LIBDIR%%/rlm_sql_oracle.a +%%OCI8%%%%LIBDIR%%/rlm_sql_oracle.la +%%OCI8%%%%LIBDIR%%/rlm_sql_oracle.so %%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql-%%PORTVERSION%%.la %%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql-%%PORTVERSION%%.so %%PGSQL%%%%LIBDIR%%/rlm_sql_postgresql.a