[PR PATCH] wireguard-tools: include contrib/ contents in package.

[PR PATCH] wireguard-tools: include contrib/ contents in package.

[ericonr]

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

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

https://github.com/ericonr/void-packages qg
https://github.com/void-linux/void-packages/pull/31995

wireguard-tools: include contrib/ contents in package.
Other distros are putting them in /usr/share/wireguard-tools/examples,
so we also do that for consistency.

@leahneukirchen 

<!-- 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
- [ ] 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/31995.patch is attached

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

From ab45308802f92e6ecee5cd7a83dd3e9b1e3832bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 16 Jul 2021 02:51:39 -0300
Subject: [PATCH] wireguard-tools: include contrib/ contents in package.

Other distros are putting them in /usr/share/wireguard-tools/examples,
so we also do that for consistency.
---
 srcpkgs/wireguard-tools/template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wireguard-tools/template b/srcpkgs/wireguard-tools/template
index fdff0618751c..ddf93471eed7 100644
--- a/srcpkgs/wireguard-tools/template
+++ b/srcpkgs/wireguard-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'wireguard-tools'
 pkgname=wireguard-tools
 version=1.0.20210424
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_install_args="WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes"
@@ -20,4 +20,7 @@ post_extract() {
 
 post_install() {
 	vsv wireguard
+
+	vmkdir usr/share/$pkgname/examples
+	vcopy ../contrib/* usr/share/$pkgname/examples
 }

Re: [PR PATCH] [Updated] wireguard-tools: include contrib/ contents in package.

[ericonr]

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

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

https://github.com/ericonr/void-packages qg
https://github.com/void-linux/void-packages/pull/31995

wireguard-tools: include contrib/ contents in package.
Other distros are putting them in /usr/share/wireguard-tools/examples,
so we also do that for consistency.

@leahneukirchen 

<!-- 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
- [ ] 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/31995.patch is attached

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

From adcd084649f3c04357dc74bc5eb818a59eb99020 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 16 Jul 2021 02:51:39 -0300
Subject: [PATCH] wireguard-tools: include contrib/ contents in package.

Other distros are putting them in /usr/share/wireguard-tools/examples,
so we also do that for consistency.

Also move patching to post_patch and use vsed.
---
 srcpkgs/wireguard-tools/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wireguard-tools/template b/srcpkgs/wireguard-tools/template
index fdff0618751c..aa70e19af90a 100644
--- a/srcpkgs/wireguard-tools/template
+++ b/srcpkgs/wireguard-tools/template
@@ -1,11 +1,12 @@
 # Template file for 'wireguard-tools'
 pkgname=wireguard-tools
 version=1.0.20210424
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_install_args="WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes"
 depends="openresolv"
+checkdepends="clang-analyzer"
 short_desc="Fast, modern, secure VPN tunnel - userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
@@ -14,10 +15,13 @@ distfiles="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${vers
 checksum=b288b0c43871d919629d7e77846ef0b47f8eeaa9ebc9cedeee8233fc6cc376ad
 make_dirs="/etc/wireguard 0700 root root"
 
-post_extract() {
-	sed -i 's/^CFLAGS /override &/' ${build_wrksrc}/Makefile
+post_patch() {
+	vsed -i 's/^CFLAGS /override &/' ${build_wrksrc}/Makefile
 }
 
 post_install() {
 	vsv wireguard
+
+	vmkdir usr/share/$pkgname/examples
+	vcopy ../contrib/* usr/share/$pkgname/examples
 }

Re: [PR PATCH] [Updated] wireguard-tools: include contrib/ contents in package.

[ericonr]

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

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

https://github.com/ericonr/void-packages qg
https://github.com/void-linux/void-packages/pull/31995

wireguard-tools: include contrib/ contents in package.
Other distros are putting them in /usr/share/wireguard-tools/examples,
so we also do that for consistency.

@leahneukirchen 

<!-- 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
- [ ] 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/31995.patch is attached

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

From 3f20d6bbb0442ec6604f3c415d2b694fdbacacaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Fri, 16 Jul 2021 02:51:39 -0300
Subject: [PATCH] wireguard-tools: include contrib/ contents in package.

Other distros are putting them in /usr/share/wireguard-tools/examples,
so we also do that for consistency.

Also move patching to post_patch and use vsed.
---
 srcpkgs/wireguard-tools/template | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/wireguard-tools/template b/srcpkgs/wireguard-tools/template
index fdff0618751c..8a0f85eecb23 100644
--- a/srcpkgs/wireguard-tools/template
+++ b/srcpkgs/wireguard-tools/template
@@ -1,11 +1,13 @@
 # Template file for 'wireguard-tools'
 pkgname=wireguard-tools
 version=1.0.20210424
-revision=1
+revision=2
 build_wrksrc="src"
 build_style=gnu-makefile
 make_install_args="WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes"
 depends="openresolv"
+# FIXME: clang-analyzer should depend on perl
+checkdepends="clang-analyzer perl"
 short_desc="Fast, modern, secure VPN tunnel - userland tools"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="GPL-2.0-only"
@@ -14,10 +16,13 @@ distfiles="https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${vers
 checksum=b288b0c43871d919629d7e77846ef0b47f8eeaa9ebc9cedeee8233fc6cc376ad
 make_dirs="/etc/wireguard 0700 root root"
 
-post_extract() {
-	sed -i 's/^CFLAGS /override &/' ${build_wrksrc}/Makefile
+post_patch() {
+	vsed -i 's/^CFLAGS /override &/' Makefile
 }
 
 post_install() {
 	vsv wireguard
+
+	vmkdir usr/share/$pkgname/examples
+	vcopy ../contrib/* usr/share/$pkgname/examples
 }

Re: [PR PATCH] [Merged]: wireguard-tools: include contrib/ contents in package.

[ericonr]

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

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

wireguard-tools: include contrib/ contents in package.
https://github.com/void-linux/void-packages/pull/31995

Description:
Other distros are putting them in /usr/share/wireguard-tools/examples,
so we also do that for consistency.

@leahneukirchen 

<!-- 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
- [ ] 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
-->