pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/freeradius - Bump package to 1.0.1nb1



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4b028f1e16e7
branches:  trunk
changeset: 481351:4b028f1e16e7
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Oct 02 12:06:03 2004 +0000

description:
- Bump package to 1.0.1nb1
- Move to options.mk framework to support SNMP, OpenLDAP, PostgreSQL and
  mySQL modules
- Add patches/patch-aj and patches/patch-ak for OpenLDAP and PostgreSQL builds
- Add extra PLIST's for OpenLDAP, PostgreSQL and mySQL modules

diffstat:

 net/freeradius/Makefile         |  11 +++++-
 net/freeradius/PLIST.ldap       |   5 ++
 net/freeradius/PLIST.mysql      |   5 ++
 net/freeradius/PLIST.pgsql      |   5 ++
 net/freeradius/distinfo         |   4 +-
 net/freeradius/options.mk       |  82 +++++++++++++++++++++++++++++++++++++++++
 net/freeradius/patches/patch-aj |  13 ++++++
 net/freeradius/patches/patch-ak |  12 ++++++
 8 files changed, 135 insertions(+), 2 deletions(-)

diffs (208 lines):

diff -r b6fcc3fca865 -r 4b028f1e16e7 net/freeradius/Makefile
--- a/net/freeradius/Makefile   Sat Oct 02 11:58:14 2004 +0000
+++ b/net/freeradius/Makefile   Sat Oct 02 12:06:03 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/09/23 19:51:21 adrianp Exp $
+# $NetBSD: Makefile,v 1.13 2004/10/02 12:06:03 adrianp Exp $
 
 DISTNAME=      freeradius-1.0.1
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.freeradius.org/pub/radius/ \
                ftp://ftp.Awfulhak.org/pub/radius/
@@ -9,6 +10,8 @@
 HOMEPAGE=      http://www.freeradius.org/
 COMMENT=       Free RADIUS server implementation
 
+.include "../../mk/bsd.prefs.mk"
+
 CONFLICTS+=            radiusd-cistron*
 USE_GNU_TOOLS+=                make
 GNU_CONFIGURE=         YES
@@ -17,6 +20,7 @@
 USE_PERL5=             YES
 PTHREAD_OPTS+=         native
 LIBTOOLIZE_PLIST=      NO
+PLIST_SRC=             ${WRKDIR}/.PLIST_SRC
 
 # This package currently breaks using our libtool.  It does not appear to use
 # libtool properly/fully and as a result the daemon does not compile correctly.
@@ -42,6 +46,8 @@
 CONFIGURE_ARGS+=       --without-rlm_sql_unixodbc
 CONFIGURE_ARGS+=       --without-snmp
 
+.include "options.mk"
+
 RCD_SCRIPTS=           radiusd
 
 OWN_DIRS=              ${VARBASE}/run/radiusd
@@ -71,6 +77,9 @@
 pre-build:
        cd ${WRKSRC} && ${LN} -s src/lib lib
 
+post-build:
+       @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
+
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
        ${INSTALL_DATA_DIR} ${EGDIR}/certs
diff -r b6fcc3fca865 -r 4b028f1e16e7 net/freeradius/PLIST.ldap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/PLIST.ldap Sat Oct 02 12:06:03 2004 +0000
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.ldap,v 1.1 2004/10/02 12:06:03 adrianp Exp $
+lib/rlm_ldap-${PKGVERSION}.so
+lib/rlm_ldap.a
+lib/rlm_ldap.la
+lib/rlm_ldap.so
diff -r b6fcc3fca865 -r 4b028f1e16e7 net/freeradius/PLIST.mysql
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/PLIST.mysql        Sat Oct 02 12:06:03 2004 +0000
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.mysql,v 1.1 2004/10/02 12:06:03 adrianp Exp $
+lib/rlm_sql_mysql-${PKGVERSION}.so
+lib/rlm_sql_mysql.a
+lib/rlm_sql_mysql.la
+lib/rlm_sql_mysql.so
diff -r b6fcc3fca865 -r 4b028f1e16e7 net/freeradius/PLIST.pgsql
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/PLIST.pgsql        Sat Oct 02 12:06:03 2004 +0000
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.pgsql,v 1.1 2004/10/02 12:06:03 adrianp Exp $
+lib/rlm_sql_postgresql-${PKGVERSION}.so
+lib/rlm_sql_postgresql.a
+lib/rlm_sql_postgresql.la
+lib/rlm_sql_postgresql.so
diff -r b6fcc3fca865 -r 4b028f1e16e7 net/freeradius/distinfo
--- a/net/freeradius/distinfo   Sat Oct 02 11:58:14 2004 +0000
+++ b/net/freeradius/distinfo   Sat Oct 02 12:06:03 2004 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.7 2004/09/23 19:51:22 adrianp Exp $
+$NetBSD: distinfo,v 1.8 2004/10/02 12:06:03 adrianp Exp $
 
 SHA1 (freeradius-1.0.1.tar.gz) = 54de3bf96a2eb7992408573002d458edba1b47b5
 Size (freeradius-1.0.1.tar.gz) = 2237745 bytes
 SHA1 (patch-ae) = 0c1b6c79329f41c35e3a783e61cc205cb78a4773
 SHA1 (patch-ah) = 49a5afd67ffea3bf871f57a3d8c2888baf765558
 SHA1 (patch-ai) = 4671a9cca166436f1563f322fc3d232780cfa0e3
+SHA1 (patch-aj) = 9c4e28033c8d05ca39e31055f828c7251cd0483d
+SHA1 (patch-ak) = 453f99d83d6a92bba08904e1510c23cd8d5448a1
diff -r b6fcc3fca865 -r 4b028f1e16e7 net/freeradius/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/options.mk Sat Oct 02 12:06:03 2004 +0000
@@ -0,0 +1,82 @@
+# $NetBSD: options.mk,v 1.1 2004/10/02 12:06:03 adrianp Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.freeradius
+PKG_SUPPORTED_OPTIONS= ldap postgresql73 postgresql74 mysql4 mysql3 snmp
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Can't support both versions of PostgreSQL
+###
+.if !empty(PKG_OPTIONS:Mpostgresql73) && !empty(PKG_OPTIONS:Mpostgresql74)
+PKG_FAIL_REASON+=      "PostgreSQL 7.3 and 7.4 cannot both be compiled in." \
+                       "Please change ${PKG_OPTIONS_VAR} to one or the other."
+.endif
+
+###
+### Can't support both versions of mySQL
+###
+.if !empty(PKG_OPTIONS:Mmysql3) && !empty(PKG_OPTIONS:Mmysql4)
+PKG_FAIL_REASON+=      "mySQL 3 and 4 cannot both be compiled in." \
+                       "Please change ${PKG_OPTIONS_VAR} to one or the other."
+.endif
+
+###
+### Use OpenLDAP for storing user details
+###
+.if !empty(PKG_OPTIONS:Mldap)
+.      include "../../databases/openldap/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-rlm_ldap
+PLIST_SRC+=            ${PKGDIR}/PLIST.ldap
+.endif
+
+###
+### Use PostgreSQL v7.3 for storing user details
+###
+.if !empty(PKG_OPTIONS:Mpostgresql73)
+.      include "../../databases/postgresql73-lib/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-rlm_sql_postgresql
+PLIST_SRC+=            ${PKGDIR}/PLIST.pgsql
+.endif
+
+###
+### Use PostgreSQL v7.4 for storing user details
+###
+.if !empty(PKG_OPTIONS:Mpostgresql74)
+.      include "../../databases/postgresql74-lib/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-rlm_sql_postgresql
+PLIST_SRC+=            ${PKGDIR}/PLIST.pgsql
+.endif
+
+###
+### Use mySQL v4.x for storing user details
+###
+.if !empty(PKG_OPTIONS:Mmysql4)
+.      include "../../databases/mysql4-client/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-rlm_sql_mysql
+PLIST_SRC+=            ${PKGDIR}/PLIST.mysql
+.endif
+
+###
+### Use mySQL v3.x for storing user details
+###
+.if !empty(PKG_OPTIONS:Mmysql3)
+.      include "../../databases/mysql-client/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-rlm_sql_mysql
+PLIST_SRC+=            ${PKGDIR}/PLIST.mysql
+.endif
+
+###
+### Compile in SNMP support
+###
+### Please note that snmp support is limited.  Freeradius looks like it's 
+### after the old ucd-snmp (v4.x) headers and ucd-snmp isn't in pkgsrc any
+### more.  Compatability mode on the current net-snmp (v5.x) does not seem
+### to work either.  So it will find a few snmp utilites but other than that
+### it's limited, at best.
+###
+###
+.if !empty(PKG_OPTIONS:Msnmp)
+.      include "../../net/net-snmp/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-snmp
+.endif
diff -r b6fcc3fca865 -r 4b028f1e16e7 net/freeradius/patches/patch-aj
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/patches/patch-aj   Sat Oct 02 12:06:03 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2004/10/02 12:06:03 adrianp Exp $
+
+--- src/modules/rlm_ldap/Makefile.in.orig      2004-09-29 15:44:13.000000000 +0100
++++ src/modules/rlm_ldap/Makefile.in   2004-09-29 15:45:55.000000000 +0100
+@@ -2,7 +2,7 @@
+ SRCS       = rlm_ldap.c
+ HEADERS    =
+ RLM_CFLAGS = @ldap_cflags@
+-RLM_LIBS   = @ldap_ldflags@
++RLM_LIBS   = @ldap_ldflags@ -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+ 
+ include ../rules.mak
+ 
diff -r b6fcc3fca865 -r 4b028f1e16e7 net/freeradius/patches/patch-ak
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/freeradius/patches/patch-ak   Sat Oct 02 12:06:03 2004 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ak,v 1.1 2004/10/02 12:06:03 adrianp Exp $
+
+--- src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in.orig    2004-09-29 16:33:07.000000000 +0100
++++ src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in 2004-09-29 16:33:38.000000000 +0100
+@@ -3,6 +3,6 @@
+ TARGET                = @targetname@
+ SRCS          = sql_postgresql.c
+ RLM_SQL_CFLAGS        = @postgresql_cflags@ $(INCLTDL)
+-RLM_SQL_LIBS  = @postgresql_ldflags@
++RLM_SQL_LIBS  = @postgresql_ldflags@ -L${LOCALBASE}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+ 
+ include ../rules.mak



Home | Main Index | Thread Index | Old Index