From f775194ecca10b7877d512e7f53ff44d521f5b33 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 17 Mar 2006 22:59:01 +0000 Subject: [PATCH] Added radiusclient-ng (dependency for OpenSER) Corrected dependency for OpenSER (wrong typo for menuconfig symbols) SVN-Revision: 3396 --- openwrt/package/Config.in | 1 + openwrt/package/Makefile | 2 + openwrt/package/openser/Config.in | 4 +- openwrt/package/radiusclient-ng/Config.in | 25 ++++++ openwrt/package/radiusclient-ng/Makefile | 80 +++++++++++++++++++ .../ipkg/libradiusclient-ng.control | 4 + .../ipkg/radiusclient-ng.control | 5 ++ .../patches/01-cross_compile.patch | 29 +++++++ 8 files changed, 148 insertions(+), 2 deletions(-) create mode 100644 openwrt/package/radiusclient-ng/Config.in create mode 100644 openwrt/package/radiusclient-ng/Makefile create mode 100644 openwrt/package/radiusclient-ng/ipkg/libradiusclient-ng.control create mode 100644 openwrt/package/radiusclient-ng/ipkg/radiusclient-ng.control create mode 100644 openwrt/package/radiusclient-ng/patches/01-cross_compile.patch diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in index 76109712a9..b777915976 100644 --- a/openwrt/package/Config.in +++ b/openwrt/package/Config.in @@ -114,6 +114,7 @@ source "package/libpng/Config.in" source "package/popt/Config.in" # libpopt source "package/postgresql/Config.in" # libpq source "package/libpthread/Config.in" +source "package/radiusclient-ng/Config.in" # libradiusclient-ng source "package/readline/Config.in" # libreadline source "package/cyrus-sasl/Config.in" # libsasl2 source "package/speex/Config.in" # libspeex diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index bcf06cda85..b86cfd11e8 100644 --- a/openwrt/package/Makefile +++ b/openwrt/package/Makefile @@ -88,6 +88,7 @@ package-$(BR2_PACKAGE_PPTP) += pptp package-$(BR2_PACKAGE_PPTPD) += pptpd package-$(BR2_PACKAGE_QUAGGA) += quagga package-$(BR2_PACKAGE_RADVD) += radvd +package-$(BR2_COMPILE_RADIUSCLIENT_NG) += radiusclient-ng package-$(BR2_PACKAGE_READLINE) += readline package-$(BR2_PACKAGE_ROBOCFG) += robocfg package-$(BR2_PACKAGE_RSYNC) += rsync @@ -154,6 +155,7 @@ nfs-server-compile: portmap-compile nmap-compile: uclibc++-compile pcre-compile libpcap-compile nocatsplash-compile: glib-compile openldap-compile: cyrus-sasl-compile openssl-compile +openser-compile: libradiusclient-ng-compile mysql-compile openssh-compile: zlib-compile openssl-compile openssl-compile: zlib-compile openswan-compile: gmp-compile diff --git a/openwrt/package/openser/Config.in b/openwrt/package/openser/Config.in index 59ffe760ce..9bb743a9b4 100644 --- a/openwrt/package/openser/Config.in +++ b/openwrt/package/openser/Config.in @@ -10,7 +10,7 @@ config BR2_PACKAGE_OPENSER config BR2_PACKAGE_OPENSER_MOD_MYSQL tristate "openser-mod-mysql - MySQL support" default m - select BR2_COMPILE_MYSQL + select BR2_PACKAGE_LIBMYSQLCLIENT select BR2_PACKAGE_OPENSER help Enable MySQL support @@ -34,7 +34,7 @@ config BR2_PACKAGE_OPENSER_MOD_AUTH_RADIUS tristate "openser-mod-auth-radius - Authentication with RADIUS support" default m select BR2_PACKAGE_OPENSER - select BR2_PACAKGE_LIBRADIUSCLIENT_NG + select BR2_PACKAGE_LIBRADIUSCLIENT_NG help Authentication against RADIUS diff --git a/openwrt/package/radiusclient-ng/Config.in b/openwrt/package/radiusclient-ng/Config.in new file mode 100644 index 0000000000..b88b94b0f8 --- /dev/null +++ b/openwrt/package/radiusclient-ng/Config.in @@ -0,0 +1,25 @@ +config BR2_COMPILE_RADIUSCLIENT_NG + tristate + default n + depends BR2_PACKAGE_LIBRADIUSCLIENT_NG + +config BR2_PACKAGE_LIBRADIUSCLIENT_NG + tristate "libradiusclient-ng - RADIUS client library" + default m if CONFIG_DEVEL + select BR2_COMPILE_RADIUSCLIENT_NG + help + Developpment library from radiusclient-ng + +config BR2_PACKAGE_RADIUSCLIENT_NG + tristate " radiusclient-ng - RADIUS client" + default m if CONFIG_DEVEL + select BR2_PACKAGE_LIBOPENSSL + select BR2_PACKAGE_LIBRADIUSCLIENT_NG + help + Purpose of this project is to build portable, easy-to-use and standard compliant + library suitable for developing free and commercial software that need support + for a RADIUS protocol (RFCs 2128 and 2139). + + http://developer.berlios.de/projects/radiusclient-ng/ + + Depends: libopenssl diff --git a/openwrt/package/radiusclient-ng/Makefile b/openwrt/package/radiusclient-ng/Makefile new file mode 100644 index 0000000000..88070c6be5 --- /dev/null +++ b/openwrt/package/radiusclient-ng/Makefile @@ -0,0 +1,80 @@ +# $Id: Makefile 1146 2005-06-05 13:32:28Z nbd $ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=radiusclient-ng +PKG_VERSION:=0.5.2 +PKG_RELEASE:=1 +PKG_MD5SUM:=c54eb70e964bdd22dd44b39a9b4df8ca + +PKG_SOURCE_URL:=http://download.berlios.de/radiusclient-ng/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(TOPDIR)/package/rules.mk + +$(eval $(call PKG_template,RADIUSCLIENT_NG,radiusclient-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) +$(eval $(call PKG_template,LIBRADIUSCLIENT_NG,libradiusclient-ng,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) + +$(PKG_BUILD_DIR)/.configured: + (cd $(PKG_BUILD_DIR); rm -rf config.cache; \ + $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ + LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + ac_cv_func_getdomainname=yes \ + ./configure \ + --target=$(GNU_TARGET_NAME) \ + --host=$(GNU_TARGET_NAME) \ + --build=$(GNU_HOST_NAME) \ + --program-prefix="" \ + --program-suffix="" \ + --prefix=/usr \ + --exec-prefix=/usr \ + --bindir=/usr/bin \ + --datadir=/usr/share \ + --includedir=/usr/include \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --mandir=/usr/share/man \ + --sbindir=/usr/sbin \ + --sysconfdir=/etc \ + $(DISABLE_NLS) \ + $(DISABLE_LARGEFILE) \ + ); + touch $@ + +$(PKG_BUILD_DIR)/.built: + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR=$(PKG_INSTALL_DIR) \ + install-exec install-data + touch $@ + +$(IPKG_RADIUSCLIENT_NG): + mkdir -p $(IDIR_RADIUSCLIENT_NG)/usr + cp -fpR $(PKG_INSTALL_DIR)/usr/sbin $(IDIR_RADIUSCLIENT_NG)/usr/ + cp -fpR $(PKG_INSTALL_DIR)/etc $(IDIR_RADIUSCLIENT_NG)/ + $(RSTRIP) $(IDIR_RADIUSCLIENT_NG)/ + $(IPKG_BUILD) $(IDIR_RADIUSCLIENT_NG) $(PACKAGE_DIR) + +$(IPKG_LIBRADIUSCLIENT_NG): + mkdir -p $(IDIR_LIBRADIUSCLIENT_NG)/usr + cp -fpR $(PKG_INSTALL_DIR)/usr/lib $(IDIR_LIBRADIUSCLIENT_NG)/usr/ + $(RSTRIP) $(IDIR_LIBRADIUSCLIENT_NG)/ + $(IPKG_BUILD) $(IDIR_LIBRADIUSCLIENT_NG) $(PACKAGE_DIR) + +$(STAGING_DIR)/usr/lib/libradiusclient-ng.so: $(PKG_BUILD_DIR)/.built + mkdir -p $(STAGING_DIR)/usr/include + cp -fpR $(PKG_INSTALL_DIR)/usr/include/ $(STAGING_DIR)/usr/ + mkdir -p $(STAGING_DIR)/usr/lib/ + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libradiusclient-ng{a,la,so}* $(STAGING_DIR)/usr/lib/ + touch $@ + +mostlyclean: + $(MAKE) -C $(PKG_BUILD_DIR) clean + rm -f $(PKG_BUILD_DIR)/.built diff --git a/openwrt/package/radiusclient-ng/ipkg/libradiusclient-ng.control b/openwrt/package/radiusclient-ng/ipkg/libradiusclient-ng.control new file mode 100644 index 0000000000..8b8726cd22 --- /dev/null +++ b/openwrt/package/radiusclient-ng/ipkg/libradiusclient-ng.control @@ -0,0 +1,4 @@ +Package: libradiusclient-ng +Section: libs +Description: RADIUS client library +Priority: optional diff --git a/openwrt/package/radiusclient-ng/ipkg/radiusclient-ng.control b/openwrt/package/radiusclient-ng/ipkg/radiusclient-ng.control new file mode 100644 index 0000000000..d11a837bdc --- /dev/null +++ b/openwrt/package/radiusclient-ng/ipkg/radiusclient-ng.control @@ -0,0 +1,5 @@ +Package: radiusclient-ng +Section: net +Description: RADIUS client +Priority: optional +Depends: libopenssl diff --git a/openwrt/package/radiusclient-ng/patches/01-cross_compile.patch b/openwrt/package/radiusclient-ng/patches/01-cross_compile.patch new file mode 100644 index 0000000000..fa45afb12d --- /dev/null +++ b/openwrt/package/radiusclient-ng/patches/01-cross_compile.patch @@ -0,0 +1,29 @@ +diff -urN radiusclient-ng-0.5.2/configure radiusclient-ng-0.5.2.new/configure +--- radiusclient-ng-0.5.2/configure 2005-11-07 22:18:59.000000000 +0100 ++++ radiusclient-ng-0.5.2.new/configure 2006-03-10 01:51:59.489383320 +0100 +@@ -23791,8 +23791,7 @@ + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling + See \`config.log' for more details." >&5 + echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++See \`config.log' for more details." >&2;} } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +diff -urN radiusclient-ng-0.5.2/etc/Makefile.in radiusclient-ng-0.5.2.new/etc/Makefile.in +--- radiusclient-ng-0.5.2/etc/Makefile.in 2005-11-08 00:15:35.000000000 +0100 ++++ radiusclient-ng-0.5.2.new/etc/Makefile.in 2006-03-10 01:58:29.345116240 +0100 +@@ -376,9 +376,9 @@ + <$(srcdir)/radiusclient.conf.in >radiusclient.conf + + install-data-local: servers +- $(mkinstalldirs) $(pkgsysconfdir); \ +- echo " $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers"; \ +- $(INSTALL) -m 600 $(srcdir)/servers $(pkgsysconfdir)/servers ++ $(mkinstalldirs) $(DESTDIR)/$(pkgsysconfdir); \ ++ echo " $(INSTALL) -m 600 $(srcdir)/servers $(DESTDIR)/$(pkgsysconfdir)/servers"; \ ++ $(INSTALL) -m 600 $(srcdir)/servers $(DESTDIR)/$(pkgsysconfdir)/servers + + uninstall-local: + rm -f $(pkgsysconfdir)/servers -- 2.30.2