[csw-devel] SF.net SVN: gar:[17858] csw/mgar/pkg/freeradius/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Apr 24 17:42:17 CEST 2012
Revision: 17858
http://gar.svn.sourceforge.net/gar/?rev=17858&view=rev
Author: dmichelsen
Date: 2012-04-24 15:42:16 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
freeradius/trunk: Complete rework
Modified Paths:
--------------
csw/mgar/pkg/freeradius/trunk/Makefile
csw/mgar/pkg/freeradius/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/freeradius/trunk/files/cswusergroup
Modified: csw/mgar/pkg/freeradius/trunk/Makefile
===================================================================
--- csw/mgar/pkg/freeradius/trunk/Makefile 2012-04-24 14:53:30 UTC (rev 17857)
+++ csw/mgar/pkg/freeradius/trunk/Makefile 2012-04-24 15:42:16 UTC (rev 17858)
@@ -1,52 +1,129 @@
NAME = freeradius
-VERSION = 2.1.10
+VERSION = 2.1.12
CATEGORIES = server
GARTYPE = v2
DESCRIPTION = A free RADIUS server implementation
-define BLURB
- A free RADIUS server implementation
-endef
MASTER_SITES = ftp://ftp.freeradius.org:/pub/freeradius/
-DISTFILES = $(NAME)-server-$(VERSION).tar.gz
+DISTFILES += $(NAME)-server-$(VERSION).tar.gz
+DISTFILES += $(DISTNAME).tar.gz
DISTFILES += cswfreeradius
DISTFILES += server.pem
DISTFILES += ca.pem
-DISTFILES += cswusergroup
DISTNAME = $(NAME)-server-$(VERSION)
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+VENDOR_URL = http://freeradius.org/
-SPKG_SOURCEURL = http://freeradius.org/
-
LICENSE = LICENSE
-GARCOMPILER = GCC4
-# Disable USERGROUP until we can work out a way to get PRESERVECONF to play
-# nicely with PROTOTYPE_GROUP
-#USERGROUP = $(sysconfdir)/pkg/CSW$(NAME)/cswusergroup
+BUILD_DEP_PKGS += CSWlibgdbm-dev
+BUILD_DEP_PKGS += CSWlibkrb5-dev
+BUILD_DEP_PKGS += CSWlibreadline-dev
-# Stripping libtool breaks the build in versions <=2.1.7
-#STRIP_LIBTOOL = 1
+PACKAGES += CSWfreeradius
+SPKG_DESC_CSWfreeradius = A free RADIUS server implementation
+RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibpcap1
+RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibssl0-9-8
+RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibgdbm4
+RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibltdl7
+RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibgcc-s1
-## Some of the RLM Submodules don't seem to pick up the include paths without
-## setting CFLAGS
-EXTRA_CFLAGS = -I/opt/csw/include
+# These may be problematic, override for now
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/etc/opt/csw/freeradius/radiusd.conf.CSW
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/dictionary.5
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/Simultaneous-Use
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/ldap_howto.rst
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/rlm_sqlcounter
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/supervise-radiusd.rst
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/share/doc/freeradius/performance-testing
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/sbin/radiusd
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/sbin/checkrad
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/local|root/opt/csw/bin/radwho
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/share|root/opt/csw/share/man/man5/dictionary.5
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/share|root/opt/csw/share/doc/freeradius/mssql
+CHECKPKG_OVERRIDES_CSWfreeradius += file-with-bad-content|/usr/share|root/opt/csw/share/doc/freeradius/ldap_howto.rst
+
+PACKAGES += CSWfreeradius-krb5
+SPKG_DESC_CSWfreeradius-krb5 = Kerberos 5 Module rlm_krb5 for FreeRADIUS
+PKGFILES_CSWfreeradius-krb5 += $(raddbdir)/modules/krb5.CSW
+PKGFILES_CSWfreeradius-krb5 += $(docdir)/rlm_krb5
+PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5\.so
+PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5-2\.1\.[0-9]+\.so
+RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWfreeradius
+RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWlibgcc-s1
+
+PACKAGES += CSWfreeradius-ldap
+SPKG_DESC_CSWfreeradius-ldap = LDAP Module rlm_ldap for FreeRADIUS
+PKGFILES_CSWfreeradius-ldap += $(raddbdir)/ldap\.attrmap\.CSW
+PKGFILES_CSWfreeradius-ldap += $(raddbdir)/modules/ldap\.CSW
+PKGFILES_CSWfreeradius-ldap += $(docdir)/ldap_howto\.rst
+PKGFILES_CSWfreeradius-ldap += $(docdir)/RADIUS-LDAP-eDirectory
+PKGFILES_CSWfreeradius-ldap += $(docdir)/rlm_ldap
+PKGFILES_CSWfreeradius-ldap += $(docdir)/examples/openldap.schema
+PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap\.so
+PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap-2\.1\.[0-9]+\.so
+RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWlibldap-r2-4-2
+RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWfreeradius
+RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWlibgcc-s1
+
+## Disabling Perl due to linker issues and weird makefiles
+#PACKAGES += CSWfreeradius-perl
+SPKG_DESC_CSWfreeradius-perl = Perl Module rlm_perl for FreeRADIUS
+RUNTIME_DEP_PKGS_CSWfreeradius-perl += CSWperl
+RUNTIME_DEP_PKGS_CSWfreeradius-perl += CSWfreeradius
+PKGFILES_CSWfreeradius-perl += $(raddbdir)/example.pl
+rlm_perl_inc = $(shell /opt/csw/bin/perl -e 'use Config; print "$$Config{archlib}\n"')/CORE
+# CONFIGURE_ARGS += --with-rlm_perl_include_dir=$(rlm_perl_inc)
+CONFIGURE_ARGS += --without-rlm_perl
+EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/example.pl
+EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/modules/perl
+
+## Disabling Postgresql because it's going to take a bunch of weird
+## Makefile hackery of these non-automake Makefiles to get the RPATH right
+#BUILD_DEP_PKGS += CSWpostgresql
+#rlm_pgsql_lib = $(shell /opt/csw/postgresql/bin/$(ISA)/pg_config --libdir)
+#rlm_pgsql_inc = $(shell /opt/csw/postgresql/bin/$(ISA)/pg_config --includedir)
+#CONFIGURE_ARGS += --with-rlm_sql_postgresql_lib_dir=$(rlm_pgsql_lib)
+#CONFIGURE_ARGS += --with-rlm_sql_postgresql_include_dir=$(rlm_pgsql_inc)
+## Comment out the following lines when building PostgreSQL support
+CONFIGURE_ARGS += --without-rlm_sql_postgresql
+EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/postgresql
+EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/postgresql/.*
+## End pgsql exclusion lines
+
+## Disabling MySQL because it's going to take a bunch of weird
+## Makefile hackery of these non-automake Makefiles to get the RPATH right
+#BUILD_DEP_PKGS += CSWmysql5devel
+#CONFIGURE_ARGS += --with-mysql-lib-dir=/opt/csw/mysql5/lib/$(ISA)/mysql
+#CONFIGURE_ARGS += --with-mysql-include-dir=/opt/csw/mysql5/include
+## Comment out the following lines when building mysql support
+CONFIGURE_ARGS += --without-rlm_sql_mysql
+EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql
+EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql/.*
+## End mysql exclusion lines
+GARCOMPILER = GCC4
+
+CSWfreeradius_usergroup = radius:radius:FreeRADIUS:/var/opt/csw/freeradius:/bin/false::
+
+# Some of the RLM Submodules don't seem to pick up the include paths from CPPFLAGS
+EXTRA_CFLAGS = $(CPPFLAGS)
+
# Put libraries (including all of the modules) in /opt/csw/lib/freeradius
-libdir = $(abspath $(libdir_install)/$(NAME)/$(MM_LIBDIR))
+libdir = $(abspath $(libdir_install)/freeradius/$(MM_LIBDIR))
-# Put the config in the recommended /etc/opt/csw tree
-sysconfdir = /etc$(prefix)
-raddbdir = $(sysconfdir)/freeradius
-# move all of the var stuff to /var/opt/csw
-localstatedir = /var$(prefix)
+raddbdir = $(sysconfdir)/freeradius
# This should match the variable run_dir in radiusd.conf
radius_run_dir = $(localstatedir)/run/radius
-## Configuration directory
+# Configuration directory
PRESERVECONF += $(raddbdir)/.*\.conf
PRESERVECONF += $(raddbdir)/acct_users
PRESERVECONF += $(raddbdir)/attrs.*
@@ -81,7 +158,7 @@
EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sites-enabled/control-socket
EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sites-enabled/inner-tunnel
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += $(DIRPATHS)
CONFIGURE_ARGS += CC=$(CC) CXX=$(CXX) F77=$(F77) FC=$(FC)
CONFIGURE_ARGS += CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
CONFIGURE_ARGS += CPPFLAGS="$(CPPFLAGS)" FCFLAGS="$(FCFLAGS)"
@@ -103,147 +180,50 @@
CONFIGURE_ARGS += --without-rlm_sql_freetds
CONFIGURE_ARGS += --without-rlm_sql_iodbc
CONFIGURE_ARGS += --without-rlm_sql_sybase
+
CONFIGURE_ARGS += --without-rlm_sql_db2
EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mssql
EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mssql/.*
+
CONFIGURE_ARGS += --without-rlm_sql_oracle
EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/oracle
EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/oracle/.*
-## Individual Package definitions start here
+# There is no testsuite
+TEST_SCRIPTS =
-PACKAGES += CSWfreeradius
-CATALOGNAME_CSWfreeradius = $(NAME)
-SPKG_DESC_CSWfreeradius = $(DESCRIPTION)
-RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibpython2-6-1-0
-RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibpcap
-RUNTIME_DEP_PKGS_CSWfreeradius += CSWosslrt
-RUNTIME_DEP_PKGS_CSWfreeradius += CSWgdbm
-RUNTIME_DEP_PKGS_CSWfreeradius += CSWlibltdl7
-RUNTIME_DEP_PKGS_CSWfreeradius += CSWreadline
-RUNTIME_DEP_PKGS_CSWfreeradius += CSWgcc4corert
-
-## Kerberos
-PACKAGES += CSWfreeradius-krb5
-CATALOGNAME_CSWfreeradius-krb5 = freeradius_krb5
-SPKG_DESC_CSWfreeradius-krb5 = Kerberos 5 Module rlm_krb5 for FreeRADIUS
-PKGFILES_CSWfreeradius-krb5 += $(raddbdir)/modules/krb5.CSW
-PKGFILES_CSWfreeradius-krb5 += $(docdir)/rlm_krb5
-PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5\.so
-PKGFILES_CSWfreeradius-krb5 += /opt/csw/lib/freeradius/rlm_krb5-2\.1\.[0-9]+\.so
-RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWkrb5lib
-RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWfreeradius
-RUNTIME_DEP_PKGS_CSWfreeradius-krb5 += CSWgcc4corert
-
-## LDAP
-PACKAGES += CSWfreeradius-ldap
-CATALOGNAME_CSWfreeradius-ldap = freeradius_ldap
-SPKG_DESC_CSWfreeradius-ldap = LDAP Module rlm_ldap for FreeRADIUS
-PKGFILES_CSWfreeradius-ldap += $(raddbdir)/ldap\.attrmap\.CSW
-PKGFILES_CSWfreeradius-ldap += $(raddbdir)/modules/ldap\.CSW
-PKGFILES_CSWfreeradius-ldap += $(docdir)/ldap_howto\.rst
-PKGFILES_CSWfreeradius-ldap += $(docdir)/RADIUS-LDAP-eDirectory
-PKGFILES_CSWfreeradius-ldap += $(docdir)/rlm_ldap
-PKGFILES_CSWfreeradius-ldap += $(docdir)/examples/openldap.schema
-PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap\.so
-PKGFILES_CSWfreeradius-ldap += /opt/csw/lib/freeradius/rlm_ldap-2\.1\.[0-9]+\.so
-RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWoldaprt
-RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWfreeradius
-RUNTIME_DEP_PKGS_CSWfreeradius-ldap += CSWgcc4corert
-
-## Perl support
-## Disabling Perl due to linker issues and weird makefiles
-#PACKAGES += CSWfreeradius-perl
-#CATALOGNAME_CSWfreeradius-perl = freeradius-perl
-#SPKG_DESC_CSWfreeradius-perl = Perl Module rlm_perl for FreeRADIUS
-#RUNTIME_DEP_PKGS_CSWfreeradius-perl += CSWperl
-#RUNTIME_DEP_PKGS_CSWfreeradius-perl += CSWfreeradius
-#PKGFILES_CSWfreeradius-perl += $(raddbdir)/example.pl
-#rlm_perl_inc = $(shell /opt/csw/bin/perl -e 'use Config; print "$$Config{archlib}\n"')/CORE
-#CONFIGURE_ARGS += --with-rlm_perl_include_dir=$(rlm_perl_inc)
-## Comment out the following lines when building Perl
-CONFIGURE_ARGS += --without-rlm_perl
-EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/example.pl
-EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/modules/perl
-## End perl exclusion lines
-
-## PostgreSQL support
-## Disabling Postgresql because it's going to take a bunch of weird
-## Makefile hackery of these non-automake Makefiles to get the RPATH right
-#BUILD_DEP_PKGS += CSWpostgresql
-#rlm_pgsql_lib = $(shell /opt/csw/postgresql/bin/$(ISA)/pg_config --libdir)
-#rlm_pgsql_inc = $(shell /opt/csw/postgresql/bin/$(ISA)/pg_config --includedir)
-#CONFIGURE_ARGS += --with-rlm_sql_postgresql_lib_dir=$(rlm_pgsql_lib)
-#CONFIGURE_ARGS += --with-rlm_sql_postgresql_include_dir=$(rlm_pgsql_inc)
-## Comment out the following lines when building PostgreSQL support
-CONFIGURE_ARGS += --without-rlm_sql_postgresql
-EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/postgresql
-EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/postgresql/.*
-## End pgsql exclusion lines
-
-## Disabling MySQL because it's going to take a bunch of weird
-## Makefile hackery of these non-automake Makefiles to get the RPATH right
-#BUILD_DEP_PKGS += CSWmysql5devel
-#CONFIGURE_ARGS += --with-mysql-lib-dir=/opt/csw/mysql5/lib/$(ISA)/mysql
-#CONFIGURE_ARGS += --with-mysql-include-dir=/opt/csw/mysql5/include
-## Comment out the following lines when building mysql support
-CONFIGURE_ARGS += --without-rlm_sql_mysql
-EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql
-EXTRA_MERGE_EXCLUDE_FILES += $(raddbdir)/sql/mysql/.*
-## End mysql exclusion lines
-
-
-# No tests available
-TEST_TARGET =
-
INSTALL_ARGS += R=$(DESTDIR)
INITSMF = /etc/opt/csw/init.d/cswfreeradius
# Fix permissions on the radiusd rundir (disabled for now)
-#PROTOTYPE_MODIFIERS += rundir
-#PROTOTYPE_FILES_rundir = $(radius_run_dir)
-#PROTOTYPE_USER_rundir = radius
-#PROTOTYPE_GROUP_rundir = radius
-#PROTOTYPE_CLASS_rundir = ugfiles
+PROTOTYPE_MODIFIERS += rundir
+PROTOTYPE_FILES_rundir = $(radius_run_dir)
+PROTOTYPE_USER_rundir = radius
+PROTOTYPE_GROUP_rundir = radius
+PROTOTYPE_CLASS_rundir = ugfiles
# Fix permissions on the configuration directory
-#PROTOTYPE_MODIFIERS += raddb
-#PROTOTYPE_FILES_raddb = $(raddbdir)
-#PROTOTYPE_FILES_raddb += $(raddbdir)/.*
-#PROTOTYPE_USER_raddb = radius
-#PROTOTYPE_GROUP_raddb = radius
+PROTOTYPE_MODIFIERS += raddb
+PROTOTYPE_FILES_raddb = $(raddbdir)
+PROTOTYPE_FILES_raddb += $(raddbdir)/.*
+PROTOTYPE_USER_raddb = radius
+PROTOTYPE_GROUP_raddb = radius
+PROTOTYPE_CLASS_raddb = ugfiles
include gar/category.mk
PATH := /opt/csw/gnu:$(PATH)
post-install-modulated:
- ### Copy init script
@echo "Installing init script..."
ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- ginstall $(WORKDIR)/cswfreeradius \
- $(DESTDIR)/etc/opt/csw/init.d/cswfreeradius
-
- # Copy self-signed sample cert
+ ginstall $(WORKDIR)/cswfreeradius $(DESTDIR)/etc/opt/csw/init.d/cswfreeradius
@echo "Installing sample certificate files..."
ginstall -m 640 $(FILEDIR)/ca.pem $(DESTDIR)/$(raddbdir)/certs/
ginstall -m 640 $(FILEDIR)/server.pem $(DESTDIR)/$(raddbdir)/certs/
-
- # Copy cswusergroup - disabled, see comments near USERGROUP line
- #@echo "Installing cswusergroup support file..."
- #ginstall -D $(FILEDIR)/cswusergroup \
- # $(DESTDIR)$(sysconfdir)/pkg/CSW$(NAME)/cswusergroup
-
- # Create PID dir
@echo "Creating PID file directory"
- ginstall -D $(DESTDIR)$(radius_run_dir)
-
- # Relax the permissions on the dictionary file since it contains no
- # secrets and radclient needs it
+ ginstall -d $(DESTDIR)$(radius_run_dir)
@echo "Relaxing permissions on dictionary file"
chmod 644 $(DESTDIR)$(raddbdir)/dictionary
-
- # Set the Make cookie
@$(MAKECOOKIE)
-
Modified: csw/mgar/pkg/freeradius/trunk/checksums
===================================================================
--- csw/mgar/pkg/freeradius/trunk/checksums 2012-04-24 14:53:30 UTC (rev 17857)
+++ csw/mgar/pkg/freeradius/trunk/checksums 2012-04-24 15:42:16 UTC (rev 17858)
@@ -1 +1 @@
-e552704fc1b46d51176e575afa96dcc6 freeradius-server-2.1.10.tar.gz
+dcbaed16df8ccff672ba132a08bf8510 freeradius-server-2.1.12.tar.gz
Deleted: csw/mgar/pkg/freeradius/trunk/files/cswusergroup
===================================================================
--- csw/mgar/pkg/freeradius/trunk/files/cswusergroup 2012-04-24 14:53:30 UTC (rev 17857)
+++ csw/mgar/pkg/freeradius/trunk/files/cswusergroup 2012-04-24 15:42:16 UTC (rev 17858)
@@ -1 +0,0 @@
-radius:radius:FreeRADIUS:/var/opt/csw/freeradius:/bin/false::
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list