Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c4016c5f5e6531c2fcebaa4cb85c6bc29a74a34d
commit c4016c5f5e6531c2fcebaa4cb85c6bc29a74a34d Author: DeX77 <[email protected]> Date: Fri Dec 1 11:22:16 2017 +0100 usbguard-0.7.1-1-x86_64 * version bump diff --git a/source/apps-extra/usbguard/FrugalBuild b/source/apps-extra/usbguard/FrugalBuild index 0f8a517..728e36f 100644 --- a/source/apps-extra/usbguard/FrugalBuild +++ b/source/apps-extra/usbguard/FrugalBuild @@ -2,25 +2,23 @@ # Maintainer: DeX77 <[email protected]> pkgname=usbguard -pkgver=0.7.0 -pkgrel=6 +pkgver=0.7.1 +pkgrel=1 pkgdesc='USBGuard is a software framework for implementing USB device authorization policies' -makedepends=('libxslt' 'qt5-tools>=5.9.2' 'qt5-svg>=5.9.2') +makedepends=('libxslt' 'qt5-tools>=5.9.2' 'qt5-svg>=5.9.2' 'ruby-asciidoctor') depends=("libqb" "libsodium>=1.0.15" "libcap-ng" "protobuf>=3.5.0" "polkit" "dbus-glib") groups=('apps-extra') archs=("x86_64") _F_github_author="dkopecek" Finclude github -source=("${url}/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz" \ - kernel4.13.patch ) +source=("${url}/releases/download/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz") backup=("etc/usbguard/usbguard-daemon.conf" "etc/usbguard/rules.conf") Fconfopts=" --enable-systemd \ --with-gui-qt=qt5 \ --with-bundled-catch \ --with-bundled-pegtl" _F_gnome_iconcache="y" -sha1sums=('2c02be1055e2d45cf621da24436fdec4801521e0' \ - '54027f6a545c17b063307d78dfb203b7b5fd3886') +sha1sums=('ab4c9d6fc5c84fc4f02e5f4fcf995f705ba151bb') subpkgs=("$pkgname-applet-qt") subdescs=("USBGuard QT Applet") diff --git a/source/apps-extra/usbguard/kernel4.13.patch b/source/apps-extra/usbguard/kernel4.13.patch deleted file mode 100644 index 936cc06..0000000 --- a/source/apps-extra/usbguard/kernel4.13.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -Naur usbguard-0.7.0/src/Library/SysFSDevice.cpp usbguard-0.7.0.new/src/Library/SysFSDevice.cpp ---- usbguard-0.7.0/src/Library/SysFSDevice.cpp 2017-01-29 18:52:18.000000000 +0100 -+++ usbguard-0.7.0.new/src/Library/SysFSDevice.cpp 2017-09-25 10:31:30.000000000 +0200 -@@ -114,6 +114,21 @@ - { - return _sysfs_parent_path; - } -+ -+ bool SysFSDevice::hasAttribute(const std::string& name) const -+ { -+ struct ::stat st; -+ -+ if (::fstatat(_sysfs_dirfd, name.c_str(), &st, AT_SYMLINK_NOFOLLOW) != 0) { -+ if (errno == ENOENT) { -+ return false; -+ } -+ throw ErrnoException("SysFSDevice::hasAttribute", name, errno); -+ } -+ -+ return S_ISREG(st.st_mode); -+ } -+ - - int SysFSDevice::openAttribute(const String& name) const - { -diff -Naur usbguard-0.7.0/src/Library/SysFSDevice.hpp usbguard-0.7.0.new/src/Library/SysFSDevice.hpp ---- usbguard-0.7.0/src/Library/SysFSDevice.hpp 2017-01-06 11:00:07.000000000 +0100 -+++ usbguard-0.7.0.new/src/Library/SysFSDevice.hpp 2017-09-25 10:31:47.000000000 +0200 -@@ -36,6 +36,7 @@ - const String& getName() const; - const UEvent& getUEvent() const; - const String& getParentPath() const; -+ bool hasAttribute(const std::string& name) const; - String readAttribute(const String& name, bool strip_last_null = false, bool optional = false) const; - void setAttribute(const String& name, const String& value); - int openAttribute(const String& name) const; -diff -Naur usbguard-0.7.0/src/Library/UEventDeviceManager.cpp usbguard-0.7.0.new/src/Library/UEventDeviceManager.cpp ---- usbguard-0.7.0/src/Library/UEventDeviceManager.cpp 2017-01-29 18:52:18.000000000 +0100 -+++ usbguard-0.7.0.new/src/Library/UEventDeviceManager.cpp 2017-09-25 10:27:17.000000000 +0200 -@@ -572,7 +572,12 @@ - const String devtype = uevent.getAttribute("DEVTYPE"); - const String action = uevent.getAttribute("ACTION"); - -- if (subsystem != "usb" || devtype != "usb_device") { -+ /* -+ * We don't care about the event if it's not from the "usb" subsystem. -+ * The device type attribute value is checked later based on the data -+ * read from the sysfs uevent file in the device directory. -+ */ -+ if (subsystem != "usb") { - USBGUARD_LOG(Debug) << "Ignoring non-USB device:" - << " subsystem=" << subsystem - << " devtype=" << devtype -@@ -602,8 +607,13 @@ - if (sysfs_device.getUEvent().hasAttribute("DEVTYPE")) { - const String devtype = sysfs_device.getUEvent().getAttribute("DEVTYPE"); - if (devtype != "usb_device") { -- USBGUARD_LOG(Warning) << sysfs_devpath << ": UEvent DEVTYPE mismatch." -- << " Expected \"usb_device\", got \"" << devtype << "\""; -+ USBGUARD_LOG(Debug) << sysfs_devpath << ": UEvent DEVTYPE != usb_device. Ignoring event."; -+ return; -+ } -+ } -+ else { -+ if (!sysfs_device.hasAttribute("descriptors")) { -+ USBGUARD_LOG(Debug) << sysfs_devpath << ": UEvent doesn't refer to a device with a descriptors file. Ignoring event."; - return; - } - } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
