[PR PATCH] uwsgi: fix wrong target names for plugins

[PR PATCH] uwsgi: fix wrong target names for plugins

[pfpulux]

[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]

There is a new pull request by pfpulux against master on the void-packages repository

https://github.com/pfpulux/void-packages uwsgi
https://github.com/void-linux/void-packages/pull/31611

uwsgi: fix wrong target names for plugins
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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/31611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-uwsgi-31611.patch --]
[-- Type: text/x-diff, Size: 1083 bytes --]

From c6ca8aac78962785cf13deec6ca1d1e6f67fd1f2 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 22 Jun 2021 14:01:06 +0200
Subject: [PATCH] uwsgi: fix wrong target names for plugins

---
 srcpkgs/uwsgi/template | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 507987723d7b..f0d94583bfcc 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,7 +1,7 @@
 # Template file for 'uwsgi'
 pkgname=uwsgi
 version=2.0.19.1
-revision=1
+revision=2
 hostmakedepends="python3"
 makedepends="python3-devel"
 short_desc="Fast, self-healing application container server"
@@ -44,13 +44,15 @@ do_install() {
 uwsgi-python3_package() {
 	short_desc="$short_desc (Python3 plugin)"
 	pkg_install() {
-		vcopy python3_plugin.so $_libdir
+		vmkdir usr/lib/uwsgi
+		vcopy python3_plugin.so usr/lib/uwsgi
 	}
 }
 
 uwsgi-cgi_package() {
 	short_desc="$short_desc (CGI plugin)"
 	pkg_install() {
-		vcopy cgi_plugin.so $_libdir
+		vmkdir usr/lib/uwsgi
+		vcopy cgi_plugin.so usr/lib/uwsgi
 	}
 }

Re: uwsgi: fix wrong target names for plugins

[pfpulux]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]

New comment by pfpulux on void-packages repository

https://github.com/void-linux/void-packages/pull/31611#issuecomment-865939194

Comment:
What should be use as license tag for [this](https://github.com/unbit/uwsgi/blob/master/LICENSE)?

Re: uwsgi: fix wrong target names for plugins

[paper42]

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/31611#issuecomment-865974853

Comment:
@pfpulux check #31463, what exactly does this PR fix?

Re: uwsgi: fix wrong target names for plugins

[pfpulux]

[-- Attachment #1: Type: text/plain, Size: 480 bytes --]

New comment by pfpulux on void-packages repository

https://github.com/void-linux/void-packages/pull/31611#issuecomment-866097054

Comment:
At the moment the subpackages `uwsgi-cgi`and `uwsgi-python3` write not in the folder `/usr/lib/uwsgi`, he write the file `/usr/lib/uwsgi`, so the plugins can't be found. This PR fix this.

Now the plugins for the subpackages are in place and can be found:

```
/usr/lib/uwsgi
├── cgi_plugin.so
└── python3_plugin.so
```

Re: uwsgi: fix wrong target names for plugins

[paper42]

[-- Attachment #1: Type: text/plain, Size: 409 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/31611#issuecomment-866125473

Comment:
Oh, sorry that I missed that, the version I have installed on my PC has the correct paths, I must have changed something and not checked. Could you remove the $_libdir variable now? Also maybe mentioning that the xlint license warning is a false warning would be nice.

Re: [PR PATCH] [Updated] uwsgi: fix wrong target names for plugins

[pfpulux]

[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]

There is an updated pull request by pfpulux against master on the void-packages repository

https://github.com/pfpulux/void-packages uwsgi
https://github.com/void-linux/void-packages/pull/31611

uwsgi: fix wrong target names for plugins
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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/31611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-uwsgi-31611.patch --]
[-- Type: text/x-diff, Size: 1030 bytes --]

From c8ce07e6ad8e7482af72dfaaeb0e7bbd5be55ce9 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 22 Jun 2021 14:01:06 +0200
Subject: [PATCH] uwsgi: fix wrong target names for plugins

---
 srcpkgs/uwsgi/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 507987723d7b..5de58911362c 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,7 +1,7 @@
 # Template file for 'uwsgi'
 pkgname=uwsgi
 version=2.0.19.1
-revision=1
+revision=2
 hostmakedepends="python3"
 makedepends="python3-devel"
 short_desc="Fast, self-healing application container server"
@@ -44,6 +44,7 @@ do_install() {
 uwsgi-python3_package() {
 	short_desc="$short_desc (Python3 plugin)"
 	pkg_install() {
+		vmkdir $_libdir
 		vcopy python3_plugin.so $_libdir
 	}
 }
@@ -51,6 +52,7 @@ uwsgi-python3_package() {
 uwsgi-cgi_package() {
 	short_desc="$short_desc (CGI plugin)"
 	pkg_install() {
+		vmkdir $_libdir
 		vcopy cgi_plugin.so $_libdir
 	}
 }

Re: [PR REVIEW] uwsgi: fix wrong target names for plugins

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 215 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31611#discussion_r656636880

Comment:
What do you think about using `vinstall`? I think it's more correct.

Re: [PR REVIEW] uwsgi: fix wrong target names for plugins

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31611#discussion_r656637158

Comment:
Instead of `vmkdir` + `vcopy`, just `vinstall`.

Re: uwsgi: fix wrong target names for plugins

[sgn]

[-- Attachment #1: Type: text/plain, Size: 275 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/31611#issuecomment-866507737

Comment:
> What should be use as license tag for [this](https://github.com/unbit/uwsgi/blob/master/LICENSE)?

`GPL-2.0-only WITH GCC-exception-2.0`

Re: [PR PATCH] [Updated] uwsgi: fix wrong target names for plugins

[pfpulux]

[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]

There is an updated pull request by pfpulux against master on the void-packages repository

https://github.com/pfpulux/void-packages uwsgi
https://github.com/void-linux/void-packages/pull/31611

uwsgi: fix wrong target names for plugins
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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/31611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-uwsgi-31611.patch --]
[-- Type: text/x-diff, Size: 1359 bytes --]

From abeb3f63b5005fc7ad8a61e5dc457957f6ca1749 Mon Sep 17 00:00:00 2001
From: Pulux <pulux@pf4sh.de>
Date: Tue, 22 Jun 2021 14:01:06 +0200
Subject: [PATCH] uwsgi: fix wrong target names for plugins

---
 srcpkgs/uwsgi/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 507987723d7b..3b2e8bf885f3 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,12 +1,12 @@
 # Template file for 'uwsgi'
 pkgname=uwsgi
 version=2.0.19.1
-revision=1
+revision=2
 hostmakedepends="python3"
 makedepends="python3-devel"
 short_desc="Fast, self-healing application container server"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-linking-exception"
+license="GPL-2.0-only WITH GCC-exception-2.0"
 homepage="http://projects.unbit.it/uwsgi"
 distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz"
 checksum=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b
@@ -44,13 +44,13 @@ do_install() {
 uwsgi-python3_package() {
 	short_desc="$short_desc (Python3 plugin)"
 	pkg_install() {
-		vcopy python3_plugin.so $_libdir
+		vinstall python3_plugin.so 644 $_libdir
 	}
 }
 
 uwsgi-cgi_package() {
 	short_desc="$short_desc (CGI plugin)"
 	pkg_install() {
-		vcopy cgi_plugin.so $_libdir
+		vinstall cgi_plugin.so 644 $_libdir
 	}
 }

Re: [PR PATCH] [Merged]: uwsgi: fix wrong target names for plugins

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]

There's a merged pull request on the void-packages repository

uwsgi: fix wrong target names for plugins
https://github.com/void-linux/void-packages/pull/31611

Description:
<!-- 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->