summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Beringer2017-07-13 17:49:16 +0200
committerIan Beringer2017-07-13 17:49:16 +0200
commit42a585b568db0de13e11d4bd9a807ad68bcdf3cb (patch)
tree6cc962e43ef15a5501364e1ff89a4270484d1e83
parentdab27bda50b2947420006610efb9b2d5a0d1e954 (diff)
downloadaur-42a585b568db0de13e11d4bd9a807ad68bcdf3cb.tar.gz
Update to 0.7.0.r25.g14ab2af
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD23
-rw-r--r--disable_usecase-tests.patch17
3 files changed, 14 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 35df4a856967..189a819b97bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = usbguard-git
pkgdesc = USBGuard is a software framework for implementing USB device authorization policies
- pkgver = 0.7.0.r0.ga7593ee
+ pkgver = 0.7.0.r25.g14ab2af
pkgrel = 1
url = https://github.com/dkopecek/usbguard
arch = i686
@@ -24,10 +24,8 @@ pkgbase = usbguard-git
backup = etc/usbguard/rules.conf
source = usbguard::git+https://github.com/dkopecek/usbguard.git
source = include.patch
- source = disable_usecase-tests.patch
sha256sums = SKIP
sha256sums = 3a6ddb78a7f5c01a6a83c0a3337dd79a184ecb8a88d3adce1087e8beb4ca9c3f
- sha256sums = 37d4e087b473c33b558724c9438ee26734243db707cc320385872f67e3db3bae
pkgname = usbguard-git
diff --git a/PKGBUILD b/PKGBUILD
index 28e9702fff77..20b2f29889c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=usbguard-git
_pkgname=usbguard
-pkgver=0.7.0.r0.ga7593ee
+pkgver=0.7.0.r25.g14ab2af
pkgrel=1
license=('GPL2')
pkgdesc='USBGuard is a software framework for implementing USB device authorization policies'
@@ -10,8 +10,12 @@ makedepends=("git" "libxslt")
depends=("libqb-git" "libsodium" "libcap-ng" "protobuf" "polkit" "qt5-base" "qt5-svg" "qt5-tools" "hicolor-icon-theme" "dbus-glib")
arch=("i686" "x86_64")
url='https://github.com/dkopecek/usbguard'
-source=("${_pkgname}::git+https://github.com/dkopecek/usbguard.git" "include.patch" "disable_usecase-tests.patch")
-sha256sums=('SKIP' '3a6ddb78a7f5c01a6a83c0a3337dd79a184ecb8a88d3adce1087e8beb4ca9c3f' '37d4e087b473c33b558724c9438ee26734243db707cc320385872f67e3db3bae')
+source=(
+ "${_pkgname}::git+https://github.com/dkopecek/usbguard.git"
+ "include.patch")
+sha256sums=(
+ 'SKIP'
+ '3a6ddb78a7f5c01a6a83c0a3337dd79a184ecb8a88d3adce1087e8beb4ca9c3f')
provides=("usbguard")
conflicts=("usbguard")
backup=(
@@ -20,7 +24,7 @@ backup=(
pkgver() {
cd "${srcdir}/${_pkgname}"
- git describe --long | sed 's/^usbguard-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ git describe --long | sed 's/^usbguard-//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
@@ -30,20 +34,19 @@ prepare() {
build() {
cd "${srcdir}/${_pkgname}"
patch -p1 <../include.patch
- patch -p1 <../disable_usecase-tests.patch
- ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc -sbindir=/usr/bin --libdir=/usr/lib \
+ ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sys=/etc -sbindir=/usr/bin --libdir=/usr/lib \
--enable-systemd \
--with-gui-qt=qt5 \
--with-bundled-catch \
--with-bundled-pegtl
- make
+ make
touch rules.conf
}
check() {
- cd "${srcdir}/${_pkgname}"
- make check
+ cd "${srcdir}/${_pkgname}"
+ make check
}
package() {
diff --git a/disable_usecase-tests.patch b/disable_usecase-tests.patch
deleted file mode 100644
index a891b35b4c15..000000000000
--- a/disable_usecase-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/Tests/Makefile.am b/src/Tests/Makefile.am
-index 4543e32..b01d616 100644
---- a/src/Tests/Makefile.am
-+++ b/src/Tests/Makefile.am
-@@ -57,11 +57,7 @@ TESTS=\
- test-regression \
- USB/test-descriptor-parser.sh \
- Packaging/spell-check.sh \
-- Rules/test-rules.sh \
-- UseCase/000_executable.sh \
-- UseCase/001_cli_policy.sh \
-- UseCase/002_cli_devices.sh \
-- UseCase/003_cli_devices_dummy.sh
-+ Rules/test-rules.sh
-
- check_PROGRAMS=\
- test-unit \