X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=net%2Ffreeradius2%2FMakefile;h=7a6d17a879695e7bc9ac6652a024eddf64415ba1;hb=986bfabff7d884ade4cca00ccf6710a4de9a1318;hp=99631374e0703772dc9929286045eadfa3899acb;hpb=38a63190fa7a63f4d0f9570396c0da7ab7b56b2f;p=packages.git

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 99631374e..7a6d17a87 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2008-2009 OpenWrt.org
+#
+# Copyright (C) 2008-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,21 +8,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freeradius2
-PKG_VERSION:=2.1.4
-PKG_RELEASE:=1
+PKG_VERSION:=2.1.9
+PKG_RELEASE:=3
 
 PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/freeradius/
-PKG_MD5SUM:=ba1fd573222ed5c8bead1cce1383a7a9
+PKG_MD5SUM:=5e16a0869acdf448b191c7e30f6507d8
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION)
+PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/freeradius2/Default
   SECTION:=net
   CATEGORY:=Network
-  URL:=http://www.freeradius2.org/
+  URL:=http://freeradius.org/
 endef
 
 define Package/freeradius2
@@ -295,6 +296,8 @@ CONFIGURE_ARGS+= \
 	--with-threads \
 	--with-openssl-includes="$(STAGING_DIR)/usr/include" \
 	--with-openssl-libraries="$(STAGING_DIR)/usr/lib" \
+	--with-system-libtool \
+	--with-system-libltdl \
 	--enable-strict-dependencies \
 	--with-raddbdir=/etc/freeradius2 \
 	--with-radacctdir=/var/db/radacct \
@@ -441,6 +444,7 @@ define Package/freeradius2/install
 	$(INSTALL_DIR) $(1)/etc/freeradius2
 	$(INSTALL_DIR) $(1)/etc/freeradius2/modules
 	$(INSTALL_DIR) $(1)/etc/freeradius2/sites
+	chmod 771 $(1)/etc/freeradius2
 	for f in clients.conf dictionary radiusd.conf policy.conf; do \
 		$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/$$$${f} $(1)/etc/freeradius2/ ; \
 	done
@@ -454,6 +458,8 @@ define Package/freeradius2/install
 	done
 	$(INSTALL_DIR) $(1)/usr/lib/freeradius2
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/freeradius2/libfreeradius-radius{,-*}.so $(1)/usr/lib/freeradius2
+	ln -s freeradius2/libfreeradius-radius-$(PKG_VERSION).so $(1)/usr/lib/
+	ln -s freeradius2/libfreeradius-eap-$(PKG_VERSION).so $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radiusd $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -461,17 +467,13 @@ define Package/freeradius2/install
 endef
 
 define Package/freeradius2-democerts/install
-	$(INSTALL_DIR) $(1)/etc/freeradius2
-	$(CP) $(PKG_INSTALL_DIR)/etc/freeradius2/certs $(1)/etc/freeradius2/
-	rm -rf $(1)/etc/freeradius2/certs/README
-	rm -rf $(1)/etc/freeradius2/certs/new*
-	rm -rf $(1)/etc/freeradius2/certs/demoCA/index*
-	rm -rf $(1)/etc/freeradius2/certs/demoCA/serial*
-	rm -rf $(1)/etc/freeradius2/certs/bootstrap
-	rm -rf $(1)/etc/freeradius2/certs/Makefile
-	rm -rf $(1)/etc/freeradius2/certs/ca.cnf
-	rm -rf $(1)/etc/freeradius2/certs/client.cnf
-	rm -rf $(1)/etc/freeradius2/certs/server.cnf
+	$(INSTALL_DIR) $(1)/etc/freeradius2/certs
+	$(CP) \
+		$(PKG_BUILD_DIR)/raddb/certs/ca.pem \
+		$(PKG_BUILD_DIR)/raddb/certs/dh \
+		$(PKG_BUILD_DIR)/raddb/certs/random \
+		$(PKG_BUILD_DIR)/raddb/certs/server.pem \
+		$(1)/etc/freeradius2/certs/
 endef
 
 define Package/freeradius2-utils/install