From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] uwsgi: update to 2.0.19.1.
Date: Mon, 14 Jun 2021 13:13:06 +0200 [thread overview]
Message-ID: <20210614111306.pZloEOVR6fOND9hjTtbNLMJkTYiC3ndyi-S0T7Dpy3U@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31463@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1734 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages uwsgi-2.0.19.1
https://github.com/void-linux/void-packages/pull/31463
uwsgi: update to 2.0.19.1.
* remove uwsgi-python (python2 plugin)
* add cgi plugin as a uwsgi-cgi subpackage
* clarify the license
* simplify the template
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/31463.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-uwsgi-2.0.19.1-31463.patch --]
[-- Type: text/x-diff, Size: 4118 bytes --]
From b8c03a24852095c9123b4bad11a6243fc4e2d4fd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sun, 13 Jun 2021 18:51:55 +0200
Subject: [PATCH] uwsgi: update to 2.0.19.1.
* remove uwsgi-python (python2 plugin)
* add cgi plugin as a uwsgi-cgi subpackage
* clarify the license
* simplify the template
---
srcpkgs/removed-packages/template | 1 +
srcpkgs/{uwsgi-python => uwsgi-cgi} | 0
srcpkgs/uwsgi/template | 63 ++++++++++-------------------
3 files changed, 23 insertions(+), 41 deletions(-)
rename srcpkgs/{uwsgi-python => uwsgi-cgi} (100%)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 09bd3a3ab01d..1f12ce001046 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -293,6 +293,7 @@ replaces="
ttyload-git<=20141117_4
tuxc<=1.1_3
urlmatch-git<=20141116_2
+ uwsgi-python<=2.0.18_3
v8<=3.24.35.33_4
volnoti<=0.1_1
vte<=0.28.2_16
diff --git a/srcpkgs/uwsgi-python b/srcpkgs/uwsgi-cgi
similarity index 100%
rename from srcpkgs/uwsgi-python
rename to srcpkgs/uwsgi-cgi
diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 1446c355e1ec..507987723d7b 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,45 +1,28 @@
# Template file for 'uwsgi'
pkgname=uwsgi
-version=2.0.18
-revision=3
-hostmakedepends="python python3"
-makedepends="python-devel python3-devel"
+version=2.0.19.1
+revision=1
+hostmakedepends="python3"
+makedepends="python3-devel"
short_desc="Fast, self-healing application container server"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-linking-exception"
homepage="http://projects.unbit.it/uwsgi"
distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz"
-checksum=4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583
+checksum=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b
_libdir=usr/lib/uwsgi
-subpackages="uwsgi-python uwsgi-python3"
-case "$XBPS_TARGET_MACHINE" in
- armv[67]l-musl) subpackages="uwsgi-python" ;;
- aarch64-musl) makedepends+=" gettext-devel" ;;
-esac
-
pre_configure() {
- sed -e "s|uc.get('plugin_dir')|'.'|" \
- -i uwsgiconfig.py
- sed -e "s|\(plugin_dir =\).*|\1 /$_libdir|" \
- -i buildconf/base.ini
+ vsed -i uwsgiconfig.py -e "s|uc.get('plugin_dir')|'.'|"
+ vsed -i buildconf/base.ini -e "s|\(plugin_dir =\).*|\1 /$_libdir|"
}
do_build() {
local _cflags="$CFLAGS"
local _ldflags="$LDFLAGS"
- python2 uwsgiconfig.py --build core
-
- if [ "$CROSS_BUILD" ]; then
- _cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py2_inc}
- -I${XBPS_CROSS_BASE}/usr/include"
- _ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py2_lib}
- -L${XBPS_CROSS_BASE}/usr/lib"
- fi
- CFLAGS="$_cflags" LDFLAGS="$_ldflags" python2 uwsgiconfig.py \
- --plugin plugins/python core python
+ python3 uwsgiconfig.py --build core
if [ "$CROSS_BUILD" ]; then
_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py3_inc}
@@ -47,29 +30,27 @@ do_build() {
_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py3_lib}
-L${XBPS_CROSS_BASE}/usr/lib"
fi
- case "$subpackages" in
- *uwsgi-python3*)
- CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
- --plugin plugins/python core python3
- ;;
- esac
+
+ CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
+ --plugin plugins/python core python3
+ CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
+ --plugin plugins/cgi core cgi
}
do_install() {
- mkdir -p $PKGDESTDIR/usr/bin $PKGDESTDIR/$_libdir
- cp uwsgi $PKGDESTDIR/usr/bin
- cp *_plugin.so $PKGDESTDIR/$_libdir
+ vbin uwsgi
}
-uwsgi-python_package() {
- short_desc="$short_desc (Python2 plugin)"
+uwsgi-python3_package() {
+ short_desc="$short_desc (Python3 plugin)"
pkg_install() {
- vmove $_libdir/python_plugin.so
+ vcopy python3_plugin.so $_libdir
}
}
-uwsgi-python3_package() {
- short_desc="$short_desc (Python3 plugin)"
+
+uwsgi-cgi_package() {
+ short_desc="$short_desc (CGI plugin)"
pkg_install() {
- vmove $_libdir/python3_plugin.so
+ vcopy cgi_plugin.so $_libdir
}
}
next prev parent reply other threads:[~2021-06-14 11:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-13 18:28 [PR PATCH] " paper42
2021-06-13 18:36 ` [PR PATCH] [Updated] " paper42
2021-06-13 18:40 ` paper42
2021-06-14 3:08 ` [PR REVIEW] " ericonr
2021-06-14 11:13 ` paper42 [this message]
2021-06-17 2:28 ` [PR PATCH] [Merged]: " ericonr
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210614111306.pZloEOVR6fOND9hjTtbNLMJkTYiC3ndyi-S0T7Dpy3U@z \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).