Github messages for voidlinux
 help / color / mirror / Atom feed
* [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
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).