[PR PATCH] reaver: upgrade to 1.6.6

[PR PATCH] reaver: upgrade to 1.6.6

[heliocat]

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

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

https://github.com/heliocat/void-packages reaver
https://github.com/void-linux/void-packages/pull/30823

reaver: upgrade to 1.6.6
Removes a bunch of commented out old template stuff as well. This is tracked in source control so the history is always right there.

#### 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

@cipr3s 

A patch file from https://github.com/void-linux/void-packages/pull/30823.patch is attached

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

From 38b6b817204b1c9ee2076507fc4c4debdc36b651 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:22:15 -0700
Subject: [PATCH] reaver: upgrade to 1.6.6

---
 srcpkgs/reaver/template | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/reaver/template b/srcpkgs/reaver/template
index 67f2f9a29854..1fced473aa49 100644
--- a/srcpkgs/reaver/template
+++ b/srcpkgs/reaver/template
@@ -1,17 +1,16 @@
 # Template file for 'reaver'
 pkgname=reaver
-version=1.6.5
-revision=2
-build_style=gnu-configure
+version=1.6.6
+revision=1
 build_wrksrc="src"
-#conf_files="/etc/reaver/reaver.db"
+build_style=gnu-configure
 makedepends="libpcap-devel"
 short_desc="Brute force attack tool against Wifi Protected Setup (WPS)"
 maintainer="cipr3s <cipr3s@gmx.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/t6x/reaver-wps-fork-t6x"
 distfiles="https://github.com/t6x/reaver-wps-fork-t6x/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=342e9d265cf459bd2387205b73a63d1fc7582e268f0e9aec20613f3ec11b6a6b
+checksum=e329a0da0b6dd888916046535ff86a6aa144644561937954e560bb1810ab6702
 
 post_extract() {
 	case "$XBPS_TARGET_MACHINE" in
@@ -19,11 +18,3 @@ post_extract() {
 		;;
 	esac
 }
-
-#do_install() {
-#	# The Makefile's install target is broken (ignores destdir)
-#	vmkdir etc/${pkgname}
-#	vinstall ${pkgname}.db 644 etc/${pkgname}
-#	vbin wash
-#	vbin reaver
-#}

Re: [PR REVIEW] reaver: upgrade to 1.6.6

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30823#discussion_r631334257

Comment:
FWIW the current version of the package doesn't have the db file. Should that be fixed?

Re: [PR REVIEW] reaver: upgrade to 1.6.6

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30823#discussion_r631335248

Comment:
Can you check if this is still necessary? Also this should be an easy upstream patch, if you're up for it. `u_char` is just stupid.

Re: [PR REVIEW] reaver: upgrade to 1.6.6

[heliocat]

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

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/30823#discussion_r631382173

Comment:
Maybe I'm confused here but deleting a commented-out section should be a no-op.

Re: [PR PATCH] [Updated] reaver: upgrade to 1.6.6

[heliocat]

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

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

https://github.com/heliocat/void-packages reaver
https://github.com/void-linux/void-packages/pull/30823

reaver: upgrade to 1.6.6
Removes a bunch of commented out old template stuff as well. This is tracked in source control so the history is always right there.

#### 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

@cipr3s 

A patch file from https://github.com/void-linux/void-packages/pull/30823.patch is attached

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

From 7955ae53ea5e863bf7e2f341d7da34f15d3d617c Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:22:15 -0700
Subject: [PATCH] reaver: upgrade to 1.6.6

---
 srcpkgs/reaver/template | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/reaver/template b/srcpkgs/reaver/template
index 67f2f9a29854..2275ccd0881e 100644
--- a/srcpkgs/reaver/template
+++ b/srcpkgs/reaver/template
@@ -1,29 +1,13 @@
 # Template file for 'reaver'
 pkgname=reaver
-version=1.6.5
-revision=2
-build_style=gnu-configure
+version=1.6.6
+revision=1
 build_wrksrc="src"
-#conf_files="/etc/reaver/reaver.db"
+build_style=gnu-configure
 makedepends="libpcap-devel"
 short_desc="Brute force attack tool against Wifi Protected Setup (WPS)"
 maintainer="cipr3s <cipr3s@gmx.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/t6x/reaver-wps-fork-t6x"
 distfiles="https://github.com/t6x/reaver-wps-fork-t6x/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=342e9d265cf459bd2387205b73a63d1fc7582e268f0e9aec20613f3ec11b6a6b
-
-post_extract() {
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl) find -type f -exec sed -i "{}" -e"s;u_char;unsigned char;g" \;
-		;;
-	esac
-}
-
-#do_install() {
-#	# The Makefile's install target is broken (ignores destdir)
-#	vmkdir etc/${pkgname}
-#	vinstall ${pkgname}.db 644 etc/${pkgname}
-#	vbin wash
-#	vbin reaver
-#}
+checksum=e329a0da0b6dd888916046535ff86a6aa144644561937954e560bb1810ab6702

Re: [PR REVIEW] reaver: upgrade to 1.6.6

[heliocat]

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

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/30823#discussion_r631392912

Comment:
u_char is stupid but it looks like upstream fixed it a while ago (though not by changing the signature of things but instead making sure to pull in sys/types.h).

Re: [PR REVIEW] reaver: upgrade to 1.6.6

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30823#discussion_r631394261

Comment:
Just pointing out that maybe commenting the whole thing out wasn't the correct course of action. `do_install` installed a db file, that doesn't seem to be in the package anymore.

Re: [PR PATCH] [Updated] reaver: upgrade to 1.6.6

[heliocat]

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

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

https://github.com/heliocat/void-packages reaver
https://github.com/void-linux/void-packages/pull/30823

reaver: upgrade to 1.6.6
Removes a bunch of commented out old template stuff as well. This is tracked in source control so the history is always right there.

#### 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

@cipr3s 

A patch file from https://github.com/void-linux/void-packages/pull/30823.patch is attached

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

From e90ebe3b4c5a1125280a9988214a4b4665789f56 Mon Sep 17 00:00:00 2001
From: Colin Booth <colin@heliocat.net>
Date: Wed, 12 May 2021 11:22:15 -0700
Subject: [PATCH] reaver: upgrade to 1.6.6

Also cleans up past template mistakes made in the 1.4 to 1.6.5
transition:
Remove commented out lines referencing the sqlite database
Remove commented-out do_install override
Remove u_char -> unsigned char sed (u_char still present in source but
    upstream fixed build breaks.

reaver-wps-fork-t6x commit 46ccf2e268f7 has the database removal,
d559537b7021 has the u_char fix, and 8977bdf66e43 fixes the destdir
breakage that required the do_install override.

Fixes: 09da89673e64 ("reaver: update to 1.6.5")
---
 srcpkgs/reaver/template | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/reaver/template b/srcpkgs/reaver/template
index 67f2f9a29854..2275ccd0881e 100644
--- a/srcpkgs/reaver/template
+++ b/srcpkgs/reaver/template
@@ -1,29 +1,13 @@
 # Template file for 'reaver'
 pkgname=reaver
-version=1.6.5
-revision=2
-build_style=gnu-configure
+version=1.6.6
+revision=1
 build_wrksrc="src"
-#conf_files="/etc/reaver/reaver.db"
+build_style=gnu-configure
 makedepends="libpcap-devel"
 short_desc="Brute force attack tool against Wifi Protected Setup (WPS)"
 maintainer="cipr3s <cipr3s@gmx.com>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="https://github.com/t6x/reaver-wps-fork-t6x"
 distfiles="https://github.com/t6x/reaver-wps-fork-t6x/releases/download/v${version}/${pkgname}-${version}.tar.xz"
-checksum=342e9d265cf459bd2387205b73a63d1fc7582e268f0e9aec20613f3ec11b6a6b
-
-post_extract() {
-	case "$XBPS_TARGET_MACHINE" in
-	*-musl) find -type f -exec sed -i "{}" -e"s;u_char;unsigned char;g" \;
-		;;
-	esac
-}
-
-#do_install() {
-#	# The Makefile's install target is broken (ignores destdir)
-#	vmkdir etc/${pkgname}
-#	vinstall ${pkgname}.db 644 etc/${pkgname}
-#	vbin wash
-#	vbin reaver
-#}
+checksum=e329a0da0b6dd888916046535ff86a6aa144644561937954e560bb1810ab6702

Re: [PR REVIEW] reaver: upgrade to 1.6.6

[heliocat]

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

New review comment by heliocat on void-packages repository

https://github.com/void-linux/void-packages/pull/30823#discussion_r631415008

Comment:
Ah, fair. Updated the commit message to document that I'm cleaning up old badness.

Re: [PR PATCH] [Merged]: reaver: upgrade to 1.6.6

[ericonr]

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

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

reaver: upgrade to 1.6.6
https://github.com/void-linux/void-packages/pull/30823

Description:
Removes a bunch of commented out old template stuff as well. This is tracked in source control so the history is always right there.

#### 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

@cipr3s