aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Klitzing <aklitzing@gmail.com>2020-07-18 20:03:26 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-07-18 18:28:33 +0000
commit5b36b3bf7833e4ac68353e3158e34867fcc9141a (patch)
tree7935eb9429b8826af5771ffe0cfb1275b5bb44fe
parent263d36e20251786dc3429ffb769a55dde1dd78df (diff)
downloadaports-5b36b3bf7833e4ac68353e3158e34867fcc9141a.tar.gz
aports-5b36b3bf7833e4ac68353e3158e34867fcc9141a.tar.bz2
aports-5b36b3bf7833e4ac68353e3158e34867fcc9141a.tar.xz
main/uwsgi: upgrade to 2.0.19.1
-rw-r--r--main/uwsgi/APKBUILD10
-rw-r--r--main/uwsgi/close-fd.patch28
2 files changed, 4 insertions, 34 deletions
diff --git a/main/uwsgi/APKBUILD b/main/uwsgi/APKBUILD
index 8fa364d9a1..a742f14667 100644
--- a/main/uwsgi/APKBUILD
+++ b/main/uwsgi/APKBUILD
@@ -3,8 +3,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=uwsgi
-pkgver=2.0.18
-pkgrel=8
+pkgver=2.0.19.1
+pkgrel=0
pkgdesc="uWSGI application container server"
url="http://projects.unbit.it/uwsgi/"
arch="all"
@@ -39,7 +39,6 @@ source="http://projects.unbit.it/downloads/uwsgi-$pkgver.tar.gz
alpine.buildconf
musl-fix-python.patch
musl-ucontext.patch
- close-fd.patch
"
options="!check"
@@ -209,11 +208,10 @@ _plugin() {
esac
}
-sha512sums="6561703279bcc4a81311d033810ac066d0f113bab13b0942f3eef86cac29c584a6641b52476840d6895151aee5ed064ae2d03b18932cf7f47e62f4eeed76da61 uwsgi-2.0.18.tar.gz
+sha512sums="e18359c5ea3606d5de7fb3a0074d777e1c4b41f51f4b1a21f1446f32253058d7924286d9ed8a159d4c6e6c0ea64df7fc3c70b2933c3433b9a9cce39737e702bf uwsgi-2.0.19.1.tar.gz
1fef8a30e8e20b0322cf464a2adf744a4b46a35f4c9e104acacab4c99b913c5a0b537783bdfedf8900a4e7397e08079b675be2414beb571fd0b330985ac676cc uwsgi.initd
370202e143d0e041a2e36905346080d3ca592c9a74705a8c4e142a1307d22b921c10e673d683ca284ea27d184474ed86edd7723a6e590d35a562ad7cf6afa529 uwsgi.ini
2798c9d2e49e29292ffe6a5a29b866301c78d5f322fc5d07dfa9569efdaa5220237a5f6744652fbdd957be29311ddaff190541333f042cbf0e907dfa98ce3e2a readme.emperor
f3cff00926929a5bb40afafb65fd5228582af35fbf524562282020c4c4ae9c659231b2381f4b3cceb18e8f3f6c888c21bdd8ed4ddcd81e92fbc6a0891800ce38 alpine.buildconf
de68b16b44e554a79c073c9befa10566796316dbf4c375b4d6b633d80b0282694cca233f0a70f3d6570584324f14276826bbeb8f38b550c00087a05f9ba9227f musl-fix-python.patch
-d4b93e51619af5f8839cdc7279c69462947910df03104cfe6180d606403940fc60ad5dac66425ce8acbab67cc0c4f3e13126da0a329720cb03c67d447cd94ad9 musl-ucontext.patch
-be5859c38101f34630fbe0cce4213565fc4d8dd6c63dcc47fd44fa36c001b437677795db9abb470bcd522861c4936d49c43422846e0a8fff8730eac4ce8d75d3 close-fd.patch"
+d4b93e51619af5f8839cdc7279c69462947910df03104cfe6180d606403940fc60ad5dac66425ce8acbab67cc0c4f3e13126da0a329720cb03c67d447cd94ad9 musl-ucontext.patch"
diff --git a/main/uwsgi/close-fd.patch b/main/uwsgi/close-fd.patch
deleted file mode 100644
index d72940298c..0000000000
--- a/main/uwsgi/close-fd.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/plugins/cgi/cgi_plugin.c b/plugins/cgi/cgi_plugin.c
-index d640b5e5..1e687002 100644
---- a/plugins/cgi/cgi_plugin.c
-+++ b/plugins/cgi/cgi_plugin.c
-@@ -793,8 +793,21 @@ clear2:
- close(cgi_pipe[1]);
-
- // close all the fd > 2
-- for(i=3;i<(int)uwsgi.max_fd;i++) {
-- close(i);
-+ DIR *dirp = opendir("/proc/self/fd");
-+ if (dirp == NULL)
-+ dirp = opendir("/dev/fd");
-+ if (dirp != NULL) {
-+ struct dirent *dent;
-+ while ((dent = readdir(dirp)) != NULL) {
-+ int fd = atoi(dent->d_name);
-+ if ((fd > 2) && fd != dirfd(dirp))
-+ close(fd);
-+ }
-+ closedir(dirp);
-+ } else {
-+ for(i=3;i<(int)uwsgi.max_fd;i++) {
-+ close(i);
-+ }
- }
-
- // fill cgi env