diff options
author | adrianp <adrianp@pkgsrc.org> | 2004-10-02 12:06:03 +0000 |
---|---|---|
committer | adrianp <adrianp@pkgsrc.org> | 2004-10-02 12:06:03 +0000 |
commit | 4b525e39441ebac6e193d31b2594de776834bcb4 (patch) | |
tree | 92006e371bc9da635d2054c53ed5be445f276095 /net/freeradius | |
parent | 09425312107581d3662bf9714574fc18ec6a13f7 (diff) | |
download | pkgsrc-4b525e39441ebac6e193d31b2594de776834bcb4.tar.gz |
- 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 (limited to 'net/freeradius')
-rw-r--r-- | net/freeradius/Makefile | 11 | ||||
-rw-r--r-- | net/freeradius/PLIST.ldap | 5 | ||||
-rw-r--r-- | net/freeradius/PLIST.mysql | 5 | ||||
-rw-r--r-- | net/freeradius/PLIST.pgsql | 5 | ||||
-rw-r--r-- | net/freeradius/distinfo | 4 | ||||
-rw-r--r-- | net/freeradius/options.mk | 82 | ||||
-rw-r--r-- | net/freeradius/patches/patch-aj | 13 | ||||
-rw-r--r-- | net/freeradius/patches/patch-ak | 12 |
8 files changed, 135 insertions, 2 deletions
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index eb21a1b9c45..7df3d034b91 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -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 @@ MAINTAINER= tech-pkg@NetBSD.org 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_PKGINSTALL= YES 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_oracle 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 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 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 --git a/net/freeradius/PLIST.ldap b/net/freeradius/PLIST.ldap new file mode 100644 index 00000000000..63e3cf3c330 --- /dev/null +++ b/net/freeradius/PLIST.ldap @@ -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 --git a/net/freeradius/PLIST.mysql b/net/freeradius/PLIST.mysql new file mode 100644 index 00000000000..56a8efa2a58 --- /dev/null +++ b/net/freeradius/PLIST.mysql @@ -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 --git a/net/freeradius/PLIST.pgsql b/net/freeradius/PLIST.pgsql new file mode 100644 index 00000000000..1f93ca4f067 --- /dev/null +++ b/net/freeradius/PLIST.pgsql @@ -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 --git a/net/freeradius/distinfo b/net/freeradius/distinfo index a5aef54d26a..60ea71e811a 100644 --- a/net/freeradius/distinfo +++ b/net/freeradius/distinfo @@ -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 --git a/net/freeradius/options.mk b/net/freeradius/options.mk new file mode 100644 index 00000000000..70f2140c934 --- /dev/null +++ b/net/freeradius/options.mk @@ -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 --git a/net/freeradius/patches/patch-aj b/net/freeradius/patches/patch-aj new file mode 100644 index 00000000000..14b970f31b4 --- /dev/null +++ b/net/freeradius/patches/patch-aj @@ -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 --git a/net/freeradius/patches/patch-ak b/net/freeradius/patches/patch-ak new file mode 100644 index 00000000000..f92fa5d3dc9 --- /dev/null +++ b/net/freeradius/patches/patch-ak @@ -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 |