From: Jeffery To <jeffery.to@gmail.com>
Date: Tue, 19 Feb 2019 15:09:58 +0000 (+0800)
Subject: obfsproxy: Use default compile
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c953f74843140dfbba5011444aca28be27e884ac;p=feed%2Fpackages.git

obfsproxy: Use default compile

This updates the package to use the default PyBuild/Compile, instead of
defining a custom Build/Compile.

This also updates the source url and adds a src package.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---

diff --git a/net/obfsproxy/Makefile b/net/obfsproxy/Makefile
index 177108f5c0..cca8f2b767 100644
--- a/net/obfsproxy/Makefile
+++ b/net/obfsproxy/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obfsproxy
 PKG_VERSION:=0.2.13
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://pypi.python.org/packages/source/o/obfsproxy
+PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/o/obfsproxy
 PKG_HASH:=1e26c2faef1cfcf856ddf60e9647058a7c78fb0d47f05b58a0f847ed7cc41a66
 
 PKG_LICENSE:=BSD-3-Clause
@@ -23,11 +23,18 @@ include $(INCLUDE_DIR)/package.mk
 include ../../lang/python/python-package.mk
 
 define Package/obfsproxy
-	SECTION:=net
-	CATEGORY:=Network
-	TITLE:=A pluggable transport proxy written in Python
-	URL:=https://www.torproject.org/projects/obfsproxy.html.en
-	DEPENDS:=+python-light +python-crypto +python-pyptlib +python-setuptools +python-twisted +python-yaml
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=A pluggable transport proxy written in Python
+  URL:=https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/
+  DEPENDS:= \
+      +python-light \
+      +python-crypto \
+      +python-pyptlib \
+      +python-setuptools \
+      +python-twisted \
+      +python-yaml
+  VARIANT:=python
 endef
 
 define Package/obfsproxy/description
@@ -42,10 +49,6 @@ define Package/obfsproxy/conffiles
 /etc/config/obfsproxy
 endef
 
-define Build/Compile
-	$(call Build/Compile/PyMod,,install --prefix="/usr" --root="$(PKG_INSTALL_DIR)")
-endef
-
 define PyPackage/obfsproxy/install
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/obfsproxy $(1)/usr/bin/
@@ -57,3 +60,4 @@ endef
 
 $(eval $(call PyPackage,obfsproxy))
 $(eval $(call BuildPackage,obfsproxy))
+$(eval $(call BuildPackage,obfsproxy-src))