Merge pull request #4853 from StevenHessing/noddos

[feed/packages.git] / net / transmission / Makefile

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 5a8a6be99d8382e65d3ba2cc625a6f32583adcfe..f6cb8b99c1f6058ee9bb5e9acb5ab0c7762122ab 100644 (file)
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -8,12 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=transmission
-PKG_VERSION:=2.92
-PKG_RELEASE:=3
+PKG_VERSION:=2.92+git
+PKG_RELEASE:=4
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://github.com/transmission/transmission-releases/raw/master
-PKG_MD5SUM:=3fce404a436e3cd7fde80fb6ed61c264
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/transmission/transmission.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=35fea28d1a37875ef7480ac061754df617805b19
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=aeeb8dfd918bd2cf4fb6fbdf58bd822e9b509df1ba5ec408888edd161123ef8e
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -45,11 +48,11 @@ define Package/transmission-daemon-openssl
   VARIANT:=openssl
 endef
 
-define Package/transmission-daemon-polarssl
+define Package/transmission-daemon-mbedtls
   $(call Package/transmission-daemon/Default)
-  TITLE+= (with PolarSSL)
-  DEPENDS+=+libpolarssl
-  VARIANT:=polarssl
+  TITLE+= (with mbed TLS)
+  DEPENDS+=+libmbedtls
+  VARIANT:=mbedtls
 endef
 
 define Package/transmission-cli/Default
@@ -64,11 +67,11 @@ define Package/transmission-cli-openssl
   VARIANT:=openssl
 endef
 
-define Package/transmission-cli-polarssl
+define Package/transmission-cli-mbedtls
   $(call Package/transmission-cli/Default)
-  TITLE+= (with PolarSSL)
-  DEPENDS+=+libpolarssl
-  VARIANT:=polarssl
+  TITLE+= (with mbed TLS)
+  DEPENDS+=+libmbedtls
+  VARIANT:=mbedtls
 endef
 
 define Package/transmission-remote/Default
@@ -83,17 +86,17 @@ define Package/transmission-remote-openssl
   VARIANT:=openssl
 endef
 
-define Package/transmission-remote-polarssl
+define Package/transmission-remote-mbedtls
   $(call Package/transmission-remote/Default)
-  TITLE+= (with PolarSSL)
-  DEPENDS+=+libpolarssl
-  VARIANT:=polarssl
+  TITLE+= (with mbed TLS)
+  DEPENDS+=+libmbedtls
+  VARIANT:=mbedtls
 endef
 
 define Package/transmission-web
   $(call Package/transmission/template)
   TITLE+= (webinterface)
-  DEPENDS:=@(PACKAGE_transmission-daemon-openssl||PACKAGE_transmission-daemon-polarssl)
+  DEPENDS:=@(PACKAGE_transmission-daemon-openssl||PACKAGE_transmission-daemon-mbedtls)
 endef
 
 
@@ -104,19 +107,19 @@ define Package/transmission-daemon/Default/description
  This package contains the daemon itself.
 endef
 Package/transmission-daemon-openssl/description = $(Package/transmission-daemon/Default/description)
-Package/transmission-daemon-polarssl/description = $(Package/transmission-daemon/Default/description)
+Package/transmission-daemon-mbedtls/description = $(Package/transmission-daemon/Default/description)
 
 define Package/transmission-cli/Default/description
  CLI utilities for transmission.
 endef
 Package/transmission-cli-openssl/description = $(Package/transmission-cli/Default/description)
-Package/transmission-cli-polarssl/description = $(Package/transmission-cli/Default/description)
+Package/transmission-cli-mbedtls/description = $(Package/transmission-cli/Default/description)
 
 define Package/transmission-remote/Default/description
  CLI remote interface for transmission.
 endef
 Package/transmission-remote-openssl/description = $(Package/transmission-remote/Default/description)
-Package/transmission-remote-polarssl/description = $(Package/transmission-remote/Default/description)
+Package/transmission-remote-mbedtls/description = $(Package/transmission-remote/Default/description)
 
 define Package/transmission-web/description
  Webinterface resources for transmission.
@@ -125,7 +128,7 @@ endef
 define Package/transmission-daemon-openssl/conffiles
 /etc/config/transmission
 endef
-Package/transmission-daemon-polarssl/conffiles = $(Package/transmission-daemon-openssl/conffiles)
+Package/transmission-daemon-mbedtls/conffiles = $(Package/transmission-daemon-openssl/conffiles)
 
 
 CONFIGURE_VARS += \
@@ -143,9 +146,12 @@ ifeq ($(BUILD_VARIANT),openssl)
        --with-crypto=openssl
 endif
 
-ifeq ($(BUILD_VARIANT),polarssl)
+ifeq ($(BUILD_VARIANT),mbedtls)
   CONFIGURE_ARGS += \
        --with-crypto=polarssl
+  CONFIGURE_VARS += \
+       MBEDTLS_CFLAGS="-I$(STAGING_DIR)/usr/include/mbedtls" \
+       MBEDTLS_LIBS="-lmbedtls -lmbedcrypto"
 endif
 
 MAKE_FLAGS += \
@@ -153,6 +159,11 @@ MAKE_FLAGS += \
 
 TARGET_CFLAGS += -std=gnu99
 
+define Build/Configure
+       ( cd $(PKG_BUILD_DIR); ./autogen.sh $(CONFIGURE_ARGS))
+       $(call Build/Configure/Default,$CONFIGURE_ARGS)
+endef
+
 define Package/transmission-daemon-openssl/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-daemon $(1)/usr/bin/
@@ -161,7 +172,7 @@ define Package/transmission-daemon-openssl/install
        $(INSTALL_DIR) $(1)/etc/config
        $(INSTALL_CONF) files/transmission.config $(1)/etc/config/transmission
 endef
-Package/transmission-daemon-polarssl/install = $(Package/transmission-daemon-openssl/install)
+Package/transmission-daemon-mbedtls/install = $(Package/transmission-daemon-openssl/install)
 
 define Package/transmission-cli-openssl/install
        $(INSTALL_DIR) $(1)/usr/bin
@@ -171,13 +182,13 @@ define Package/transmission-cli-openssl/install
                        $(PKG_INSTALL_DIR)/usr/bin/transmission-show \
                        $(1)/usr/bin/
 endef
-Package/transmission-cli-polarssl/install = $(Package/transmission-cli-openssl/install)
+Package/transmission-cli-mbedtls/install = $(Package/transmission-cli-openssl/install)
 
 define Package/transmission-remote-openssl/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-remote $(1)/usr/bin/
 endef
-Package/transmission-remote-polarssl/install = $(Package/transmission-remote-openssl/install)
+Package/transmission-remote-mbedtls/install = $(Package/transmission-remote-openssl/install)
 
 define Package/transmission-web/install
        $(INSTALL_DIR) $(1)/usr/share/transmission
@@ -185,9 +196,9 @@ define Package/transmission-web/install
 endef
 
 $(eval $(call BuildPackage,transmission-daemon-openssl))
-$(eval $(call BuildPackage,transmission-daemon-polarssl))
+$(eval $(call BuildPackage,transmission-daemon-mbedtls))
 $(eval $(call BuildPackage,transmission-cli-openssl))
-$(eval $(call BuildPackage,transmission-cli-polarssl))
+$(eval $(call BuildPackage,transmission-cli-mbedtls))
 $(eval $(call BuildPackage,transmission-remote-openssl))
-$(eval $(call BuildPackage,transmission-remote-polarssl))
+$(eval $(call BuildPackage,transmission-remote-mbedtls))
 $(eval $(call BuildPackage,transmission-web))