twisted: Rename package, fix errors

This renames the Python 2 twisted package to python-twisted, and updates
dependents (i.e. obfsproxy) to reference the updated name.

This also fixes conflicts between the Python 2 and 3 packages. Twisted
installs some scripts to /usr/bin, and previously scripts for both
packages used the same names. This adds a "3" suffix to scripts
installed by python3-twisted.

This also adds python[3]-setuptools as a dependency, as the scripts
installed to /usr/bin depend on pkg_resources (part of setuptools).

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

diff --git a/lang/python/python-twisted/Makefile b/lang/python/python-twisted/Makefile
new file mode 100644 (file)
index 0000000..9ee9fcb
--- /dev/null
+++ b/lang/python/python-twisted/Makefile
@@ -0,0 +1,104 @@
+#
+# Copyright (C) 2006-2011, 2015-2018 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=python-twisted
+PKG_VERSION:=18.9.0
+PKG_RELEASE:=2
+
+PKG_SOURCE:=Twisted-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/T/Twisted
+PKG_HASH:=294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-twisted-$(PKG_VERSION)
+PKG_BUILD_DEPENDS:=libtirpc
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
+
+include $(INCLUDE_DIR)/package.mk
+include ../python-package.mk
+include ../python3-package.mk
+
+PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
+
+define Package/python-twisted/Default
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Python
+  URL:=http://twistedmatrix.com/
+endef
+
+define Package/python-twisted
+$(call Package/python-twisted/Default)
+  TITLE:=Python networking engine
+  DEPENDS:= \
+      +PACKAGE_python-twisted:python-light \
+      +PACKAGE_python-twisted:python-attrs \
+      +PACKAGE_python-twisted:python-automat \
+      +PACKAGE_python-twisted:python-constantly \
+      +PACKAGE_python-twisted:python-incremental \
+      +PACKAGE_python-twisted:python-hyperlink \
+      +PACKAGE_python-twisted:python-setuptools \
+      +PACKAGE_python-twisted:python-zope-interface
+  VARIANT:=python
+endef
+
+define Package/python3-twisted
+$(call Package/python-twisted/Default)
+  TITLE:=Python3 networking engine
+  DEPENDS:= \
+      +PACKAGE_python3-twisted:python3-light \
+      +PACKAGE_python3-twisted:python3-attrs \
+      +PACKAGE_python3-twisted:python3-automat \
+      +PACKAGE_python3-twisted:python3-constantly \
+      +PACKAGE_python3-twisted:python3-incremental \
+      +PACKAGE_python3-twisted:python3-hyperlink \
+      +PACKAGE_python3-twisted:python3-setuptools \
+      +PACKAGE_python3-twisted:python3-zope-interface
+  VARIANT:=python3
+endef
+
+define Package/python-twisted/description
+Twisted is a networking engine written in Python, supporting numerous
+protocols. It contains a web server, numerous chat clients, chat servers,
+mail servers, and more.
+endef
+
+define Package/python3-twisted/description
+$(call Package/python-twisted/description)
+.
+(Variant for Python3)
+endef
+
+define PyPackage/python-twisted/filespec
++|$(PYTHON_PKG_DIR)
+-|$(PYTHON_PKG_DIR)/twisted/conch/scripts/tkconch.py
+endef
+
+define Py3Package/python3-twisted/filespec
++|$(PYTHON3_PKG_DIR)
+-|$(PYTHON3_PKG_DIR)/twisted/conch/scripts/tkconch.py
+endef
+
+define Py3Package/python3-twisted/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+       for bin in $(1)/usr/bin/*; do \
+               mv $$$$$$$$bin $$$$$$$${bin}3 ; \
+       done
+endef
+
+$(eval $(call PyPackage,python-twisted))
+$(eval $(call BuildPackage,python-twisted))
+$(eval $(call BuildPackage,python-twisted-src))
+
+$(eval $(call Py3Package,python3-twisted))
+$(eval $(call BuildPackage,python3-twisted))
+$(eval $(call BuildPackage,python3-twisted-src))

diff --git a/lang/python/python-twisted/patches/001-omit-tkconch.patch b/lang/python/python-twisted/patches/001-omit-tkconch.patch
new file mode 100644 (file)
index 0000000..1ec4baf
--- /dev/null
+++ b/lang/python/python-twisted/patches/001-omit-tkconch.patch
@@ -0,0 +1,18 @@
+--- a/src/twisted/python/_setup.py
++++ b/src/twisted/python/_setup.py
+@@ -144,7 +144,6 @@ _CONSOLE_SCRIPTS = [
+     "conch = twisted.conch.scripts.conch:run",
+     "mailmail = twisted.mail.scripts.mailmail:run",
+     "pyhtmlizer = twisted.scripts.htmlizer:run",
+-    "tkconch = twisted.conch.scripts.tkconch:run",
+     "trial = twisted.scripts.trial:run",
+     "twist = twisted.application.twist._twist:Twist.main",
+     "twistd = twisted.scripts.twistd:run",
+--- a/src/twisted/python/twisted-completion.zsh
++++ b/src/twisted/python/twisted-completion.zsh
+@@ -1,4 +1,4 @@
+-#compdef twist twistd trial conch cftp ckeygen pyhtmlizer tkconch
++#compdef twist twistd trial conch cftp ckeygen pyhtmlizer
+ #
+ # This is the ZSH completion file for Twisted commands. It calls the current
+ # command-line with the special "--_shell-completion" option which is handled

diff --git a/lang/python/python-twisted/patches/002-omit-tests.patch b/lang/python/python-twisted/patches/002-omit-tests.patch
new file mode 100644 (file)
index 0000000..33ba77a
--- /dev/null
+++ b/lang/python/python-twisted/patches/002-omit-tests.patch
@@ -0,0 +1,37 @@
+--- a/src/twisted/python/_setup.py
++++ b/src/twisted/python/_setup.py
+@@ -169,11 +169,6 @@ class ConditionalExtension(Extension, object):
+ 
+ # The C extensions used for Twisted.
+ _EXTENSIONS = [
+-    ConditionalExtension(
+-        "twisted.test.raiser",
+-        sources=["src/twisted/test/raiser.c"],
+-        condition=lambda _: _isCPython),
+-
+     ConditionalExtension(
+         "twisted.internet.iocpreactor.iocpsupport",
+         sources=[
+@@ -238,12 +233,11 @@ def getSetupArgs(extensions=_EXTENSIONS):
+         "incremental >= 16.10.1",
+         "Automat >= 0.3.0",
+         "hyperlink >= 17.1.1",
+-        "PyHamcrest >= 1.9.0",
+         "attrs >= 17.4.0",
+     ]
+ 
+     arguments.update(dict(
+-        packages=find_packages("src"),
++        packages=find_packages("src", exclude=["*.test", "*.test.*"]),
+         use_incremental=True,
+         setup_requires=["incremental >= 16.10.1"],
+         install_requires=requirements,
+@@ -253,7 +247,7 @@ def getSetupArgs(extensions=_EXTENSIONS):
+         cmdclass=command_classes,
+         include_package_data=True,
+         exclude_package_data={
+-            "": ["*.c", "*.h", "*.pxi", "*.pyx", "build.bat"],
++            "": ["*.c", "*.h", "*.pxi", "*.pyx", "build.bat", "test/*"],
+         },
+         zip_safe=False,
+         extras_require=_EXTRAS_REQUIRE,

diff --git a/lang/python/twisted/Makefile b/lang/python/twisted/Makefile
deleted file mode 100644 (file)
index 16e3ff7..0000000
--- a/lang/python/twisted/Makefile
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# Copyright (C) 2006-2011, 2015-2018 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=twisted
-PKG_VERSION:=18.9.0
-PKG_RELEASE:=1
-
-PKG_SOURCE:=Twisted-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/T/Twisted
-PKG_HASH:=294be2c6bf84ae776df2fc98e7af7d6537e1c5e60a46d33c3ce2a197677da395
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-twisted-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=libtirpc
-
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
-
-include $(INCLUDE_DIR)/package.mk
-include ../python-package.mk
-include ../python3-package.mk
-
-PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xjf $(DL_DIR)/$(PKG_SOURCE)
-
-define Package/twisted/Default
-  SUBMENU:=Python
-  SECTION:=lang
-  CATEGORY:=Languages
-  URL:=http://twistedmatrix.com/
-endef
-
-define Package/twisted
-$(call Package/twisted/Default)
-  TITLE:=Python networking engine
-  DEPENDS:= \
-      +PACKAGE_twisted:python-light \
-      +PACKAGE_twisted:python-attrs \
-      +PACKAGE_twisted:python-automat \
-      +PACKAGE_twisted:python-constantly \
-      +PACKAGE_twisted:python-incremental \
-      +PACKAGE_twisted:python-hyperlink \
-      +PACKAGE_twisted:python-zope-interface
-  VARIANT:=python
-endef
-
-define Package/python3-twisted
-$(call Package/twisted/Default)
-  TITLE:=Python3 networking engine
-  DEPENDS:= \
-      +PACKAGE_python3-twisted:python3-light \
-      +PACKAGE_python3-twisted:python3-attrs \
-      +PACKAGE_python3-twisted:python3-automat \
-      +PACKAGE_python3-twisted:python3-constantly \
-      +PACKAGE_python3-twisted:python3-incremental \
-      +PACKAGE_python3-twisted:python3-hyperlink \
-      +PACKAGE_python3-twisted:python3-zope-interface
-  VARIANT:=python3
-endef
-
-define Package/twisted/description
-Twisted is a networking engine written in Python, supporting numerous
-protocols. It contains a web server, numerous chat clients, chat servers,
-mail servers, and more.
-endef
-
-define Package/python3-twisted/description
-$(call Package/twisted/description)
-.
-(Variant for Python3)
-endef
-
-define PyPackage/twisted/filespec
-+|/usr/bin
-+|$(PYTHON_PKG_DIR)
--|$(PYTHON_PKG_DIR)/twisted/conch/scripts/tkconch.py
-endef
-
-define Py3Package/python3-twisted/filespec
-+|/usr/bin
-+|$(PYTHON3_PKG_DIR)
--|$(PYTHON3_PKG_DIR)/twisted/conch/scripts/tkconch.py
-endef
-
-$(eval $(call PyPackage,twisted))
-$(eval $(call BuildPackage,twisted))
-$(eval $(call BuildPackage,twisted-src))
-
-$(eval $(call Py3Package,python3-twisted))
-$(eval $(call BuildPackage,python3-twisted))
-$(eval $(call BuildPackage,python3-twisted-src))

diff --git a/lang/python/twisted/patches/001-omit-tkconch.patch b/lang/python/twisted/patches/001-omit-tkconch.patch
deleted file mode 100644 (file)
index 1ec4baf..0000000
--- a/lang/python/twisted/patches/001-omit-tkconch.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/twisted/python/_setup.py
-+++ b/src/twisted/python/_setup.py
-@@ -144,7 +144,6 @@ _CONSOLE_SCRIPTS = [
-     "conch = twisted.conch.scripts.conch:run",
-     "mailmail = twisted.mail.scripts.mailmail:run",
-     "pyhtmlizer = twisted.scripts.htmlizer:run",
--    "tkconch = twisted.conch.scripts.tkconch:run",
-     "trial = twisted.scripts.trial:run",
-     "twist = twisted.application.twist._twist:Twist.main",
-     "twistd = twisted.scripts.twistd:run",
---- a/src/twisted/python/twisted-completion.zsh
-+++ b/src/twisted/python/twisted-completion.zsh
-@@ -1,4 +1,4 @@
--#compdef twist twistd trial conch cftp ckeygen pyhtmlizer tkconch
-+#compdef twist twistd trial conch cftp ckeygen pyhtmlizer
- #
- # This is the ZSH completion file for Twisted commands. It calls the current
- # command-line with the special "--_shell-completion" option which is handled

diff --git a/lang/python/twisted/patches/002-omit-tests.patch b/lang/python/twisted/patches/002-omit-tests.patch
deleted file mode 100644 (file)
index 33ba77a..0000000
--- a/lang/python/twisted/patches/002-omit-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/twisted/python/_setup.py
-+++ b/src/twisted/python/_setup.py
-@@ -169,11 +169,6 @@ class ConditionalExtension(Extension, object):
- 
- # The C extensions used for Twisted.
- _EXTENSIONS = [
--    ConditionalExtension(
--        "twisted.test.raiser",
--        sources=["src/twisted/test/raiser.c"],
--        condition=lambda _: _isCPython),
--
-     ConditionalExtension(
-         "twisted.internet.iocpreactor.iocpsupport",
-         sources=[
-@@ -238,12 +233,11 @@ def getSetupArgs(extensions=_EXTENSIONS):
-         "incremental >= 16.10.1",
-         "Automat >= 0.3.0",
-         "hyperlink >= 17.1.1",
--        "PyHamcrest >= 1.9.0",
-         "attrs >= 17.4.0",
-     ]
- 
-     arguments.update(dict(
--        packages=find_packages("src"),
-+        packages=find_packages("src", exclude=["*.test", "*.test.*"]),
-         use_incremental=True,
-         setup_requires=["incremental >= 16.10.1"],
-         install_requires=requirements,
-@@ -253,7 +247,7 @@ def getSetupArgs(extensions=_EXTENSIONS):
-         cmdclass=command_classes,
-         include_package_data=True,
-         exclude_package_data={
--            "": ["*.c", "*.h", "*.pxi", "*.pyx", "build.bat"],
-+            "": ["*.c", "*.h", "*.pxi", "*.pyx", "build.bat", "test/*"],
-         },
-         zip_safe=False,
-         extras_require=_EXTRAS_REQUIRE,

diff --git a/net/obfsproxy/Makefile b/net/obfsproxy/Makefile
index fbf308e412b728af5bbb58a1e686dc2ebbe8b8e7..177108f5c099b62fe33c666b46c41cda4cef6c18 100644 (file)
--- a/net/obfsproxy/Makefile
+++ b/net/obfsproxy/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obfsproxy
 PKG_VERSION:=0.2.13
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://pypi.python.org/packages/source/o/obfsproxy
@@ -27,7 +27,7 @@ define Package/obfsproxy
        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-yaml +twisted
+       DEPENDS:=+python-light +python-crypto +python-pyptlib +python-setuptools +python-twisted +python-yaml
 endef
 
 define Package/obfsproxy/description