* [PR PATCH] usbguard: update to 1.1.2.
@ 2022-10-14 4:15 RunningDroid
2022-10-14 22:30 ` [PR PATCH] [Updated] " RunningDroid
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: RunningDroid @ 2022-10-14 4:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1334 bytes --]
There is a new pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_usbguard
https://github.com/void-linux/void-packages/pull/39944
usbguard: update to 1.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Most of musl.patch appears to have been merged upstream with modifications
A patch file from https://github.com/void-linux/void-packages/pull/39944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_usbguard-39944.patch --]
[-- Type: text/x-diff, Size: 4436 bytes --]
From 3f4b0f1c06d41693afdd169758fac43d9e4275ff Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 12 Oct 2022 02:08:04 -0400
Subject: [PATCH] usbguard: update to 1.1.2.
---
srcpkgs/usbguard/patches/musl.patch | 73 -----------------------------
srcpkgs/usbguard/template | 6 +--
2 files changed, 3 insertions(+), 76 deletions(-)
diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch
index 6ce934444841..cc2190720595 100644
--- a/srcpkgs/usbguard/patches/musl.patch
+++ b/srcpkgs/usbguard/patches/musl.patch
@@ -1,18 +1,5 @@
--- a/src/CLI/usbguard.cpp 2019-06-13 11:51:53.787863657 +0000
+++ b/src/CLI/usbguard.cpp 2019-08-23 01:52:34.233056882 +0000
-@@ -26,10 +26,8 @@
- #include <map>
- #include <iostream>
-
--#ifndef _GNU_SOURCE
-- #define _GNU_SOURCE
--#endif
--#include <cstring> /* GNU version of basename(3) */
-+#include <cstring>
-+#include <libgen.h>
-
- #include "usbguard.hpp"
- #include "usbguard-get-parameter.hpp"
@@ -99,7 +97,7 @@
static int usbguard_cli(int argc, char* argv[])
@@ -22,63 +9,3 @@
if (argc == 1) {
showTopLevelHelp();
---- a/src/CLI/usbguard-rule-parser.cpp 2019-06-13 11:51:53.783863704 +0000
-+++ b/src/CLI/usbguard-rule-parser.cpp 2019-08-23 01:52:34.234056870 +0000
-@@ -24,10 +24,8 @@
- #include "RuleParser.hpp"
-
- #include <iostream>
--#ifndef _GNU_SOURCE
-- #define _GNU_SOURCE
--#endif
- #include <cstring>
-+#include <libgen.h>
- #include <fstream>
-
- #include <getopt.h>
-@@ -43,8 +41,10 @@
-
- static void showHelp(std::ostream& stream, const char* usbguard_arg0)
- {
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] <rule_spec>" << std::endl;
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] -f <file>" << std::endl;
-+ char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] <rule_spec>" << std::endl;
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] -f <file>" << std::endl;
-+ free(usbguard_arg0_copy);
- stream << std::endl;
- stream << " Options:" << std::endl;
- stream << " -f, --file Interpret the argument as a path to a file that should be parsed." << std::endl;
---- a/src/DBus/gdbus-server.cpp 2019-06-28 08:45:27.616687137 +0000
-+++ b/src/DBus/gdbus-server.cpp 2019-08-23 01:52:34.274056367 +0000
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <iostream>
- #include <getopt.h>
-+#include <libgen.h>
- #include "DBusBridge.hpp"
-
- static usbguard::DBusBridge* dbus_bridge = nullptr;
-@@ -208,7 +209,9 @@
-
- static void showHelp(std::ostream& stream)
- {
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS]" << std::endl;
-+ char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS]" << std::endl;
-+ free(usbguard_arg0_copy);
- stream << std::endl;
- stream << " Options:" << std::endl;
- stream << " -s, --system Listen on the system bus." << std::endl;
---- a/src/Library/public/usbguard/Exception.hpp 2019-06-28 08:45:27.620687089 +0000
-+++ b/src/Library/public/usbguard/Exception.hpp 2019-08-23 01:52:34.323055751 +0000
-@@ -116,7 +116,8 @@
- static std::string reasonFromErrno(const int errno_value)
- {
- char buffer[1024];
-- return std::string(strerror_r(errno_value, buffer, sizeof buffer));
-+ strerror_r(errno_value, buffer, sizeof buffer);
-+ return std::string(buffer);
- }
- };
-
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index f6671163b6c4..b286058d2710 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
# Template file for 'usbguard'
pkgname=usbguard
-version=1.0.0
-revision=8
+version=1.1.2
+revision=1
build_style=gnu-configure
configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
conf_files="/etc/usbguard/*"
@@ -15,7 +15,7 @@ maintainer="Philoponus Bindle <philoponus-bindle@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://usbguard.github.io"
distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
-checksum=5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42
+checksum=dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934
post_install() {
vsv usbguard
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] usbguard: update to 1.1.2.
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
@ 2022-10-14 22:30 ` RunningDroid
2022-10-14 22:30 ` RunningDroid
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: RunningDroid @ 2022-10-14 22:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_usbguard
https://github.com/void-linux/void-packages/pull/39944
usbguard: update to 1.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Most of musl.patch appears to have been merged upstream with modifications
A patch file from https://github.com/void-linux/void-packages/pull/39944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_usbguard-39944.patch --]
[-- Type: text/x-diff, Size: 4521 bytes --]
From 8201037a9828a2c62ee4daf5abec203a47ab423f Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 12 Oct 2022 02:08:04 -0400
Subject: [PATCH] usbguard: update to 1.1.2.
---
srcpkgs/usbguard/patches/musl.patch | 73 -----------------------------
srcpkgs/usbguard/template | 7 +--
2 files changed, 4 insertions(+), 76 deletions(-)
diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch
index 6ce934444841..cc2190720595 100644
--- a/srcpkgs/usbguard/patches/musl.patch
+++ b/srcpkgs/usbguard/patches/musl.patch
@@ -1,18 +1,5 @@
--- a/src/CLI/usbguard.cpp 2019-06-13 11:51:53.787863657 +0000
+++ b/src/CLI/usbguard.cpp 2019-08-23 01:52:34.233056882 +0000
-@@ -26,10 +26,8 @@
- #include <map>
- #include <iostream>
-
--#ifndef _GNU_SOURCE
-- #define _GNU_SOURCE
--#endif
--#include <cstring> /* GNU version of basename(3) */
-+#include <cstring>
-+#include <libgen.h>
-
- #include "usbguard.hpp"
- #include "usbguard-get-parameter.hpp"
@@ -99,7 +97,7 @@
static int usbguard_cli(int argc, char* argv[])
@@ -22,63 +9,3 @@
if (argc == 1) {
showTopLevelHelp();
---- a/src/CLI/usbguard-rule-parser.cpp 2019-06-13 11:51:53.783863704 +0000
-+++ b/src/CLI/usbguard-rule-parser.cpp 2019-08-23 01:52:34.234056870 +0000
-@@ -24,10 +24,8 @@
- #include "RuleParser.hpp"
-
- #include <iostream>
--#ifndef _GNU_SOURCE
-- #define _GNU_SOURCE
--#endif
- #include <cstring>
-+#include <libgen.h>
- #include <fstream>
-
- #include <getopt.h>
-@@ -43,8 +41,10 @@
-
- static void showHelp(std::ostream& stream, const char* usbguard_arg0)
- {
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] <rule_spec>" << std::endl;
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] -f <file>" << std::endl;
-+ char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] <rule_spec>" << std::endl;
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] -f <file>" << std::endl;
-+ free(usbguard_arg0_copy);
- stream << std::endl;
- stream << " Options:" << std::endl;
- stream << " -f, --file Interpret the argument as a path to a file that should be parsed." << std::endl;
---- a/src/DBus/gdbus-server.cpp 2019-06-28 08:45:27.616687137 +0000
-+++ b/src/DBus/gdbus-server.cpp 2019-08-23 01:52:34.274056367 +0000
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <iostream>
- #include <getopt.h>
-+#include <libgen.h>
- #include "DBusBridge.hpp"
-
- static usbguard::DBusBridge* dbus_bridge = nullptr;
-@@ -208,7 +209,9 @@
-
- static void showHelp(std::ostream& stream)
- {
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS]" << std::endl;
-+ char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS]" << std::endl;
-+ free(usbguard_arg0_copy);
- stream << std::endl;
- stream << " Options:" << std::endl;
- stream << " -s, --system Listen on the system bus." << std::endl;
---- a/src/Library/public/usbguard/Exception.hpp 2019-06-28 08:45:27.620687089 +0000
-+++ b/src/Library/public/usbguard/Exception.hpp 2019-08-23 01:52:34.323055751 +0000
-@@ -116,7 +116,8 @@
- static std::string reasonFromErrno(const int errno_value)
- {
- char buffer[1024];
-- return std::string(strerror_r(errno_value, buffer, sizeof buffer));
-+ strerror_r(errno_value, buffer, sizeof buffer);
-+ return std::string(buffer);
- }
- };
-
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index f6671163b6c4..30f834c09cd8 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
# Template file for 'usbguard'
pkgname=usbguard
-version=1.0.0
-revision=8
+version=1.1.2
+revision=1
build_style=gnu-configure
configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
conf_files="/etc/usbguard/*"
@@ -15,10 +15,11 @@ maintainer="Philoponus Bindle <philoponus-bindle@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://usbguard.github.io"
distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
-checksum=5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42
+checksum=dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934
post_install() {
vsv usbguard
+ vcompletion scripts/usbguard-zsh-completion zsh
}
usbguard-devel_package() {
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: usbguard: update to 1.1.2.
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
2022-10-14 22:30 ` [PR PATCH] [Updated] " RunningDroid
@ 2022-10-14 22:30 ` RunningDroid
2023-01-13 2:34 ` github-actions
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: RunningDroid @ 2022-10-14 22:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by RunningDroid on void-packages repository
https://github.com/void-linux/void-packages/pull/39944#issuecomment-1279540787
Comment:
I noticed that upstream has ZSH completions but doesn't install them, so I've updated the template to install them
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: usbguard: update to 1.1.2.
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
2022-10-14 22:30 ` [PR PATCH] [Updated] " RunningDroid
2022-10-14 22:30 ` RunningDroid
@ 2023-01-13 2:34 ` github-actions
2023-01-13 19:26 ` RunningDroid
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: github-actions @ 2023-01-13 2:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/39944#issuecomment-1381238531
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: usbguard: update to 1.1.2.
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
` (2 preceding siblings ...)
2023-01-13 2:34 ` github-actions
@ 2023-01-13 19:26 ` RunningDroid
2023-01-15 11:20 ` [PR REVIEW] " paper42
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: RunningDroid @ 2023-01-13 19:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by RunningDroid on void-packages repository
https://github.com/void-linux/void-packages/pull/39944#issuecomment-1382292170
Comment:
Bumping because I'm still using this and 1.1.2 is still the latest version.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] usbguard: update to 1.1.2.
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
` (3 preceding siblings ...)
2023-01-13 19:26 ` RunningDroid
@ 2023-01-15 11:20 ` paper42
2023-01-16 5:21 ` [PR PATCH] [Updated] " RunningDroid
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: paper42 @ 2023-01-15 11:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/39944#discussion_r1070564668
Comment:
```suggestion
homepage="https://usbguard.github.io"
changelog="https://raw.githubusercontent.com/USBGuard/usbguard/main/CHANGELOG.md"
```
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] usbguard: update to 1.1.2.
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
` (4 preceding siblings ...)
2023-01-15 11:20 ` [PR REVIEW] " paper42
@ 2023-01-16 5:21 ` RunningDroid
2023-04-17 1:52 ` github-actions
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: RunningDroid @ 2023-01-16 5:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_usbguard
https://github.com/void-linux/void-packages/pull/39944
usbguard: update to 1.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Most of musl.patch appears to have been merged upstream with modifications
A patch file from https://github.com/void-linux/void-packages/pull/39944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_usbguard-39944.patch --]
[-- Type: text/x-diff, Size: 4670 bytes --]
From 1238c81cb07441915447ad2f8bc43eae05793ab1 Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 12 Oct 2022 02:08:04 -0400
Subject: [PATCH] usbguard: update to 1.1.2.
---
srcpkgs/usbguard/patches/musl.patch | 73 -----------------------------
srcpkgs/usbguard/template | 8 ++--
2 files changed, 5 insertions(+), 76 deletions(-)
diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch
index 6ce934444841..cc2190720595 100644
--- a/srcpkgs/usbguard/patches/musl.patch
+++ b/srcpkgs/usbguard/patches/musl.patch
@@ -1,18 +1,5 @@
--- a/src/CLI/usbguard.cpp 2019-06-13 11:51:53.787863657 +0000
+++ b/src/CLI/usbguard.cpp 2019-08-23 01:52:34.233056882 +0000
-@@ -26,10 +26,8 @@
- #include <map>
- #include <iostream>
-
--#ifndef _GNU_SOURCE
-- #define _GNU_SOURCE
--#endif
--#include <cstring> /* GNU version of basename(3) */
-+#include <cstring>
-+#include <libgen.h>
-
- #include "usbguard.hpp"
- #include "usbguard-get-parameter.hpp"
@@ -99,7 +97,7 @@
static int usbguard_cli(int argc, char* argv[])
@@ -22,63 +9,3 @@
if (argc == 1) {
showTopLevelHelp();
---- a/src/CLI/usbguard-rule-parser.cpp 2019-06-13 11:51:53.783863704 +0000
-+++ b/src/CLI/usbguard-rule-parser.cpp 2019-08-23 01:52:34.234056870 +0000
-@@ -24,10 +24,8 @@
- #include "RuleParser.hpp"
-
- #include <iostream>
--#ifndef _GNU_SOURCE
-- #define _GNU_SOURCE
--#endif
- #include <cstring>
-+#include <libgen.h>
- #include <fstream>
-
- #include <getopt.h>
-@@ -43,8 +41,10 @@
-
- static void showHelp(std::ostream& stream, const char* usbguard_arg0)
- {
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] <rule_spec>" << std::endl;
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] -f <file>" << std::endl;
-+ char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] <rule_spec>" << std::endl;
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] -f <file>" << std::endl;
-+ free(usbguard_arg0_copy);
- stream << std::endl;
- stream << " Options:" << std::endl;
- stream << " -f, --file Interpret the argument as a path to a file that should be parsed." << std::endl;
---- a/src/DBus/gdbus-server.cpp 2019-06-28 08:45:27.616687137 +0000
-+++ b/src/DBus/gdbus-server.cpp 2019-08-23 01:52:34.274056367 +0000
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <iostream>
- #include <getopt.h>
-+#include <libgen.h>
- #include "DBusBridge.hpp"
-
- static usbguard::DBusBridge* dbus_bridge = nullptr;
-@@ -208,7 +209,9 @@
-
- static void showHelp(std::ostream& stream)
- {
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS]" << std::endl;
-+ char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS]" << std::endl;
-+ free(usbguard_arg0_copy);
- stream << std::endl;
- stream << " Options:" << std::endl;
- stream << " -s, --system Listen on the system bus." << std::endl;
---- a/src/Library/public/usbguard/Exception.hpp 2019-06-28 08:45:27.620687089 +0000
-+++ b/src/Library/public/usbguard/Exception.hpp 2019-08-23 01:52:34.323055751 +0000
-@@ -116,7 +116,8 @@
- static std::string reasonFromErrno(const int errno_value)
- {
- char buffer[1024];
-- return std::string(strerror_r(errno_value, buffer, sizeof buffer));
-+ strerror_r(errno_value, buffer, sizeof buffer);
-+ return std::string(buffer);
- }
- };
-
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index f6671163b6c4..8625c80a7eda 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
# Template file for 'usbguard'
pkgname=usbguard
-version=1.0.0
-revision=8
+version=1.1.2
+revision=1
build_style=gnu-configure
configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
conf_files="/etc/usbguard/*"
@@ -14,11 +14,13 @@ short_desc="Tool for whitelisting and blacklisting USB devices"
maintainer="Philoponus Bindle <philoponus-bindle@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://usbguard.github.io"
+changelog="https://raw.githubusercontent.com/USBGuard/usbguard/main/CHANGELOG.md"
distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
-checksum=5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42
+checksum=dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934
post_install() {
vsv usbguard
+ vcompletion scripts/usbguard-zsh-completion zsh
}
usbguard-devel_package() {
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: usbguard: update to 1.1.2.
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
` (5 preceding siblings ...)
2023-01-16 5:21 ` [PR PATCH] [Updated] " RunningDroid
@ 2023-04-17 1:52 ` github-actions
2023-04-17 4:55 ` [PR PATCH] [Updated] " RunningDroid
2023-06-27 11:16 ` [PR PATCH] [Merged]: " Duncaen
8 siblings, 0 replies; 10+ messages in thread
From: github-actions @ 2023-04-17 1:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/39944#issuecomment-1510578659
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] usbguard: update to 1.1.2.
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
` (6 preceding siblings ...)
2023-04-17 1:52 ` github-actions
@ 2023-04-17 4:55 ` RunningDroid
2023-06-27 11:16 ` [PR PATCH] [Merged]: " Duncaen
8 siblings, 0 replies; 10+ messages in thread
From: RunningDroid @ 2023-04-17 4:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1335 bytes --]
There is an updated pull request by RunningDroid against master on the void-packages repository
https://github.com/RunningDroid/void-packages update_usbguard
https://github.com/void-linux/void-packages/pull/39944
usbguard: update to 1.1.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Most of musl.patch appears to have been merged upstream with modifications
A patch file from https://github.com/void-linux/void-packages/pull/39944.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update_usbguard-39944.patch --]
[-- Type: text/x-diff, Size: 4670 bytes --]
From 07e61279ad526a716791f49e1fa242830333f4db Mon Sep 17 00:00:00 2001
From: RunningDroid <runningdroid@zoho.com>
Date: Wed, 12 Oct 2022 02:08:04 -0400
Subject: [PATCH] usbguard: update to 1.1.2.
---
srcpkgs/usbguard/patches/musl.patch | 73 -----------------------------
srcpkgs/usbguard/template | 8 ++--
2 files changed, 5 insertions(+), 76 deletions(-)
diff --git a/srcpkgs/usbguard/patches/musl.patch b/srcpkgs/usbguard/patches/musl.patch
index 6ce934444841..cc2190720595 100644
--- a/srcpkgs/usbguard/patches/musl.patch
+++ b/srcpkgs/usbguard/patches/musl.patch
@@ -1,18 +1,5 @@
--- a/src/CLI/usbguard.cpp 2019-06-13 11:51:53.787863657 +0000
+++ b/src/CLI/usbguard.cpp 2019-08-23 01:52:34.233056882 +0000
-@@ -26,10 +26,8 @@
- #include <map>
- #include <iostream>
-
--#ifndef _GNU_SOURCE
-- #define _GNU_SOURCE
--#endif
--#include <cstring> /* GNU version of basename(3) */
-+#include <cstring>
-+#include <libgen.h>
-
- #include "usbguard.hpp"
- #include "usbguard-get-parameter.hpp"
@@ -99,7 +97,7 @@
static int usbguard_cli(int argc, char* argv[])
@@ -22,63 +9,3 @@
if (argc == 1) {
showTopLevelHelp();
---- a/src/CLI/usbguard-rule-parser.cpp 2019-06-13 11:51:53.783863704 +0000
-+++ b/src/CLI/usbguard-rule-parser.cpp 2019-08-23 01:52:34.234056870 +0000
-@@ -24,10 +24,8 @@
- #include "RuleParser.hpp"
-
- #include <iostream>
--#ifndef _GNU_SOURCE
-- #define _GNU_SOURCE
--#endif
- #include <cstring>
-+#include <libgen.h>
- #include <fstream>
-
- #include <getopt.h>
-@@ -43,8 +41,10 @@
-
- static void showHelp(std::ostream& stream, const char* usbguard_arg0)
- {
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] <rule_spec>" << std::endl;
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS] -f <file>" << std::endl;
-+ char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] <rule_spec>" << std::endl;
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS] -f <file>" << std::endl;
-+ free(usbguard_arg0_copy);
- stream << std::endl;
- stream << " Options:" << std::endl;
- stream << " -f, --file Interpret the argument as a path to a file that should be parsed." << std::endl;
---- a/src/DBus/gdbus-server.cpp 2019-06-28 08:45:27.616687137 +0000
-+++ b/src/DBus/gdbus-server.cpp 2019-08-23 01:52:34.274056367 +0000
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <iostream>
- #include <getopt.h>
-+#include <libgen.h>
- #include "DBusBridge.hpp"
-
- static usbguard::DBusBridge* dbus_bridge = nullptr;
-@@ -208,7 +209,9 @@
-
- static void showHelp(std::ostream& stream)
- {
-- stream << " Usage: " << ::basename(usbguard_arg0) << " [OPTIONS]" << std::endl;
-+ char *usbguard_arg0_copy = strdup(usbguard_arg0);
-+ stream << " Usage: " << ::basename(usbguard_arg0_copy) << " [OPTIONS]" << std::endl;
-+ free(usbguard_arg0_copy);
- stream << std::endl;
- stream << " Options:" << std::endl;
- stream << " -s, --system Listen on the system bus." << std::endl;
---- a/src/Library/public/usbguard/Exception.hpp 2019-06-28 08:45:27.620687089 +0000
-+++ b/src/Library/public/usbguard/Exception.hpp 2019-08-23 01:52:34.323055751 +0000
-@@ -116,7 +116,8 @@
- static std::string reasonFromErrno(const int errno_value)
- {
- char buffer[1024];
-- return std::string(strerror_r(errno_value, buffer, sizeof buffer));
-+ strerror_r(errno_value, buffer, sizeof buffer);
-+ return std::string(buffer);
- }
- };
-
diff --git a/srcpkgs/usbguard/template b/srcpkgs/usbguard/template
index f6671163b6c4..8625c80a7eda 100644
--- a/srcpkgs/usbguard/template
+++ b/srcpkgs/usbguard/template
@@ -1,7 +1,7 @@
# Template file for 'usbguard'
pkgname=usbguard
-version=1.0.0
-revision=8
+version=1.1.2
+revision=1
build_style=gnu-configure
configure_args="--with-crypto-library=sodium --with-bundled-catch --with-bundled-pegtl"
conf_files="/etc/usbguard/*"
@@ -14,11 +14,13 @@ short_desc="Tool for whitelisting and blacklisting USB devices"
maintainer="Philoponus Bindle <philoponus-bindle@protonmail.com>"
license="GPL-2.0-or-later"
homepage="https://usbguard.github.io"
+changelog="https://raw.githubusercontent.com/USBGuard/usbguard/main/CHANGELOG.md"
distfiles="https://github.com/USBGuard/usbguard/releases/download/usbguard-$version/usbguard-$version.tar.gz"
-checksum=5617986cd5dd1a2d311041648a1977d836cf4e33a4121d7f82599f21496abc42
+checksum=dcf5c90f3f93030e04df1baeb8d388b678c40dd48b135ea12a7be7dee8944934
post_install() {
vsv usbguard
+ vcompletion scripts/usbguard-zsh-completion zsh
}
usbguard-devel_package() {
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Merged]: usbguard: update to 1.1.2.
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
` (7 preceding siblings ...)
2023-04-17 4:55 ` [PR PATCH] [Updated] " RunningDroid
@ 2023-06-27 11:16 ` Duncaen
8 siblings, 0 replies; 10+ messages in thread
From: Duncaen @ 2023-06-27 11:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]
There's a merged pull request on the void-packages repository
usbguard: update to 1.1.2.
https://github.com/void-linux/void-packages/pull/39944
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
Most of musl.patch appears to have been merged upstream with modifications
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-06-27 11:16 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-14 4:15 [PR PATCH] usbguard: update to 1.1.2 RunningDroid
2022-10-14 22:30 ` [PR PATCH] [Updated] " RunningDroid
2022-10-14 22:30 ` RunningDroid
2023-01-13 2:34 ` github-actions
2023-01-13 19:26 ` RunningDroid
2023-01-15 11:20 ` [PR REVIEW] " paper42
2023-01-16 5:21 ` [PR PATCH] [Updated] " RunningDroid
2023-04-17 1:52 ` github-actions
2023-04-17 4:55 ` [PR PATCH] [Updated] " RunningDroid
2023-06-27 11:16 ` [PR PATCH] [Merged]: " Duncaen
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).