From 9eeb445ba2b32a7087f60eb309214afecce0664e Mon Sep 17 00:00:00 2001 From: Josef Schlehofer <josef.schlehofer@nic.cz> Date: Thu, 27 Jun 2019 11:04:42 +0200 Subject: [PATCH] patches: packages: flup: the patch should be against 18.06 instead of master --- ...-add-Python3-variant-and-src-package.patch | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/patches/packages/backport/0033-flup-add-Python3-variant-and-src-package.patch b/patches/packages/backport/0033-flup-add-Python3-variant-and-src-package.patch index 404cb3837..d0dc1cc46 100644 --- a/patches/packages/backport/0033-flup-add-Python3-variant-and-src-package.patch +++ b/patches/packages/backport/0033-flup-add-Python3-variant-and-src-package.patch @@ -1,38 +1,35 @@ -From a5b2ba9b4d6ec4045a1b534561d5e5eae262b0fe Mon Sep 17 00:00:00 2001 +From bee27bcfde6acb2a680e9647c9c1ea5344ac3be9 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer <pepe.schlehofer@gmail.com> -Date: Tue, 18 Jun 2019 14:23:10 +0200 +Date: Thu, 27 Jun 2019 11:02:18 +0200 Subject: [PATCH] flup: add Python3 variant and src package -- Add PKG_LICENSE_FILES -- Reorder things in Makefile -- Add dependency python3-logging otherwise I cannot import -flup.server.ajp -flup.server.scgi - -Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com> --- - lang/python/flup/Makefile | 53 ++++++++++++++++++++++++++++----------- - 1 file changed, 38 insertions(+), 15 deletions(-) + lang/python/flup/Makefile | 63 ++++++++++++++++++++++++++------------- + 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/lang/python/flup/Makefile b/lang/python/flup/Makefile -index 099828dc3..77ed6aadf 100644 +index 4a0142f32..77ed6aadf 100644 --- a/lang/python/flup/Makefile +++ b/lang/python/flup/Makefile -@@ -9,39 +9,62 @@ include $(TOPDIR)/rules.mk +@@ -8,40 +8,63 @@ + include $(TOPDIR)/rules.mk PKG_NAME:=flup - PKG_VERSION:=1.0.3 --PKG_RELEASE:=2 +-PKG_VERSION:=1.0.2 +-PKG_RELEASE:=1 -PKG_LICENSE:=BSD-3-Clause ++PKG_VERSION:=1.0.3 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/f/flup - PKG_HASH:=5eb09f26eb0751f8380d8ac43d1dfb20e1d42eca0fa45ea9289fa532a79cd159 +-PKG_SOURCE_URL:=http://pypi.python.org/packages/source/f/flup/ +-PKG_HASH:=4bad317a5fc1ce3d4fe5e9b6d846ec38a8023e16876785d4f88102f2c8097dd9 ++PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/f/flup ++PKG_HASH:=5eb09f26eb0751f8380d8ac43d1dfb20e1d42eca0fa45ea9289fa532a79cd159 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-flup-$(PKG_VERSION) + - PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> ++PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=PKG-INFO @@ -47,10 +44,12 @@ index 099828dc3..77ed6aadf 100644 +define Package/flup/Default SECTION:=lang CATEGORY:=Languages +- MAINTAINER:=Gergely Kiss <mail.gery@gmail.com> + SUBMENU:=Python TITLE:=Random assortment of WSGI servers - URL:=https://www.saddi.com/software/flup/ +- URL:=http://www.saddi.com/software/flup/ - DEPENDS:=+python ++ URL:=https://www.saddi.com/software/flup/ endef -define Package/flup/description -- GitLab