X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fgnutls%2FMakefile;h=42ee26f8b978f9c7df5f65a5f1357d2e1c8b350d;hp=2d28a7334822ea88e36f7e3f67b5e4800f6d3dc3;hb=b1ce79340eca4af8baa1dafc317a12e7818485c2;hpb=91255a638d57424935f70331d7b9ed82e1466bff

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 2d28a73348..42ee26f8b9 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2005-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,16 +9,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnutls
-PKG_VERSION:=2.0.0
-PKG_RELEASE:=1
+PKG_VERSION:=2.4.1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://josefsson.org/gnutls/releases/ \
-	http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
+PKG_SOURCE_URL:=http://www.mirrors.wiretapped.net/security/network-security/gnutls/ \
 	ftp://ftp.gnutls.org/pub/gnutls/ \
-	ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/ \
-	ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/
-PKG_MD5SUM:=181b2ff554a83e6cf85505ea16699d39
+	ftp://ftp.mirrors.wiretapped.net/pub/security/network-security/gnutls/ \
+	http://josefsson.org/gnutls/releases/
+PKG_MD5SUM:=573db36cb3f8472b0293cfa1f52c607a
+
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -61,15 +62,15 @@ endef
 
 define Package/gnutls-utils/description
 $(call Package/gnutls/Default/description)
- This package contains the GnuTLS gnutls-cli, gnutls-serv and psktool
- utilities.
+ This package contains the GnuTLS gnutls-cli, gnutls-serv, psktool,
+ and srptool utilities.
 endef
 
 
 define Package/libgnutls
 $(call Package/gnutls/Default)
  TITLE+= (library)
- DEPENDS+= +libgcrypt +libgpg-error
+ DEPENDS+= +zlib +libgcrypt +libgpg-error
 endef
 
 define Package/libgnutls/description
@@ -101,36 +102,15 @@ $(call Package/gnutls/Default/description)
  This package contains the GnuTLS OpenSSL compatibility layer shared library.
 endef
 
-
-# XXX: configure will disable any of theese if they're present regardless of
-# the "--enable" prefix
-#	--enable-anon-authentication \
-#	--enable-openpgp-authentication \
-#	--enable-psk-authentication \
-#	--enable-srp-authentication \
-#	--enable-tls-authorization \
-#
-# and the following prevents the library from building so it's ommited
-#	--disable-tls-authorization
-
 CONFIGURE_ARGS+= \
 	--enable-shared \
 	--enable-static \
-	--disable-anon-authentication \
 	--disable-openpgp-authentication \
-	--disable-psk-authentication \
-	--disable-srp-authentication \
-	--with-included-libtasn1 \
 	--with-included-libcfg \
-	--without-included-opencdk \
-	--with-libgcrypt \
+	--with-included-libtasn1 \
 	--with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
-	--without-libiconv-prefix \
-	--without-libintl-prefix \
-	--without-libopencdk-prefix \
 	--with-libreadline-prefix="$(STAGING_DIR)/usr" \
-	--without-lzo \
-	--without-zlib \
+	--with-libz-prefix="$(STAGING_DIR)/usr" \
 
 # XXX: AM_CFLAGS duplicates with CFLAGS
 MAKE_ARGS:= \
@@ -140,34 +120,20 @@ define Build/Configure
 	$(SED) 's,-I$$$${includedir},,g' $(PKG_BUILD_DIR)/configure
 	$(SED) 's,-L$$$${libdir},,g' $(PKG_BUILD_DIR)/configure
 	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
 endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(STAGING_DIR)/usr/bin/
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+	mkdir -p $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(2)/bin/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(1)/usr/lib/pkgconfig/
 endef
 
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/bin/libgnutls{,-extra}-config \
-		$(STAGING_DIR)/usr/include/gnutls \
-		$(STAGING_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc
-endef
-
-
 define Package/certtool/conffiles
 /etc/gnutls/certtool.cfg
 endef
@@ -176,14 +142,15 @@ define Package/certtool/install
 	$(INSTALL_DIR) $(1)/etc/gnutls
 	$(INSTALL_CONF) $(PKG_BUILD_DIR)/doc/certtool.cfg $(1)/etc/gnutls/
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
 endef
 
 
 define Package/gnutls-utils/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/psktool $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/psktool $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/srptool $(1)/usr/bin/
 endef