From 468b9d436b9a206765d733d41d77a8269e841767290605fc0d3a5776b7445b5d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Jul 2019 08:24:22 +0000 Subject: [PATCH 1/8] OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=16 --- usbguard.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usbguard.spec b/usbguard.spec index 4e3f616..1292981 100644 --- a/usbguard.spec +++ b/usbguard.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -26,7 +26,7 @@ Summary: A tool for implementing USB device usage policy # src/ThirdParty/Catch: Boost Software License - Version 1.0 License: GPL-2.0-or-later Group: System/Daemons -URL: https://usbguard.github.io +Url: https://usbguard.github.io Source0: https://github.com/USBGuard/usbguard/releases/download/usbguard-%{version}/usbguard-%{version}.tar.gz Source1: https://github.com/USBGuard/usbguard/releases/download/usbguard-%{version}/usbguard-%{version}.tar.gz.sig Source2: usbguard.keyring @@ -114,6 +114,7 @@ for interacting with the USBGuard daemon component. mkdir -p ./m4 autoreconf -i -s --no-recursive ./ +export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -pthread" %configure \ --disable-silent-rules \ --with-bundled-catch \ From eb072bd682f8d3986b6f60367bb5a6e87afc8ce0298ee7022621cd53a11a11fb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Jul 2019 08:36:41 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=17 --- usbguard-pthread.patch | 12 ++++++++++++ usbguard.spec | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 usbguard-pthread.patch diff --git a/usbguard-pthread.patch b/usbguard-pthread.patch new file mode 100644 index 0000000..491c58c --- /dev/null +++ b/usbguard-pthread.patch @@ -0,0 +1,12 @@ +Index: usbguard-0.7.4/Makefile.am +=================================================================== +--- usbguard-0.7.4.orig/Makefile.am ++++ usbguard-0.7.4/Makefile.am +@@ -343,6 +343,7 @@ usbguard_daemon_CPPFLAGS=\ + @audit_CFLAGS@ + + usbguard_daemon_LDADD=\ ++ -pthread \ + $(top_builddir)/libusbguard.la \ + @seccomp_LIBS@ \ + @libcapng_LIBS@ \ diff --git a/usbguard.spec b/usbguard.spec index 1292981..70d1a4c 100644 --- a/usbguard.spec +++ b/usbguard.spec @@ -33,6 +33,7 @@ Source2: usbguard.keyring Source3: usbguard-daemon.conf Source4: usbguard-rpmlintrc Patch0: usbguard-applet-qt_desktop_menu_categories.patch +Patch1: usbguard-pthread.patch BuildRequires: asciidoc BuildRequires: aspell BuildRequires: audit-devel @@ -109,12 +110,12 @@ for interacting with the USBGuard daemon component. %prep %setup -q -n usbguard-%{version} %patch0 -p1 +%patch1 -p1 %build mkdir -p ./m4 autoreconf -i -s --no-recursive ./ -export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -pthread" %configure \ --disable-silent-rules \ --with-bundled-catch \ From 172e2c3dfcfeb89d7d3a2b21f464cfd1efbf897b8abbcf03a4895c3bfd21bd1f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Jul 2019 08:57:07 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=18 --- usbguard-pthread.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usbguard-pthread.patch b/usbguard-pthread.patch index 491c58c..57f2a3e 100644 --- a/usbguard-pthread.patch +++ b/usbguard-pthread.patch @@ -2,11 +2,12 @@ Index: usbguard-0.7.4/Makefile.am =================================================================== --- usbguard-0.7.4.orig/Makefile.am +++ usbguard-0.7.4/Makefile.am -@@ -343,6 +343,7 @@ usbguard_daemon_CPPFLAGS=\ +@@ -342,6 +342,8 @@ usbguard_daemon_CPPFLAGS=\ + @libcapng_CFLAGS@ \ @audit_CFLAGS@ ++usbguard_daemon_LIBFLAGS= -pthread ++ usbguard_daemon_LDADD=\ -+ -pthread \ $(top_builddir)/libusbguard.la \ @seccomp_LIBS@ \ - @libcapng_LIBS@ \ From 7597e5752f31e8e510ed4f5163712ddc5b467ad7a2704bb9085d18faee762945 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Jul 2019 09:04:49 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=19 --- usbguard-pthread.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/usbguard-pthread.patch b/usbguard-pthread.patch index 57f2a3e..0ef969b 100644 --- a/usbguard-pthread.patch +++ b/usbguard-pthread.patch @@ -11,3 +11,12 @@ Index: usbguard-0.7.4/Makefile.am usbguard_daemon_LDADD=\ $(top_builddir)/libusbguard.la \ @seccomp_LIBS@ \ +@@ -607,6 +609,8 @@ nodist_usbguard_applet_qt_SOURCES=\ + src/GUI.Qt/SessionBlocker.moc.cpp \ + src/GUI.Qt/TargetDelegate.moc.cpp + ++usbguard_applet_qt_LIBFLAGS= -pthread ++ + usbguard_applet_qt_LDADD=\ + $(top_builddir)/libusbguard.la \ + @qt_LIBS@ From 509acb58d41c3d5ea66be9ff705a48dd65470185a74a0c83a9ea09d6d5bcaca5 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Jul 2019 09:13:18 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=20 --- usbguard-pthread.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usbguard-pthread.patch b/usbguard-pthread.patch index 0ef969b..3bfe5c0 100644 --- a/usbguard-pthread.patch +++ b/usbguard-pthread.patch @@ -15,7 +15,7 @@ Index: usbguard-0.7.4/Makefile.am src/GUI.Qt/SessionBlocker.moc.cpp \ src/GUI.Qt/TargetDelegate.moc.cpp -+usbguard_applet_qt_LIBFLAGS= -pthread ++usbguard_applet_qt_LIBADD= -pthread + usbguard_applet_qt_LDADD=\ $(top_builddir)/libusbguard.la \ From 0a9657e08b13785e1b212f44bbfb5a048d651c92ed88573be8f8604bcc360dbb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Jul 2019 09:19:15 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=21 --- usbguard-pthread.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/usbguard-pthread.patch b/usbguard-pthread.patch index 3bfe5c0..09a163f 100644 --- a/usbguard-pthread.patch +++ b/usbguard-pthread.patch @@ -11,12 +11,11 @@ Index: usbguard-0.7.4/Makefile.am usbguard_daemon_LDADD=\ $(top_builddir)/libusbguard.la \ @seccomp_LIBS@ \ -@@ -607,6 +609,8 @@ nodist_usbguard_applet_qt_SOURCES=\ - src/GUI.Qt/SessionBlocker.moc.cpp \ +@@ -608,6 +610,7 @@ nodist_usbguard_applet_qt_SOURCES=\ src/GUI.Qt/TargetDelegate.moc.cpp -+usbguard_applet_qt_LIBADD= -pthread -+ usbguard_applet_qt_LDADD=\ ++ -lpthread \ $(top_builddir)/libusbguard.la \ @qt_LIBS@ + From 05d0976653e0d571751c833b80b646c310bee424f32916584b7cc25022103e46 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Jul 2019 09:28:08 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=22 --- usbguard-pthread.patch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/usbguard-pthread.patch b/usbguard-pthread.patch index 09a163f..bca8152 100644 --- a/usbguard-pthread.patch +++ b/usbguard-pthread.patch @@ -2,16 +2,15 @@ Index: usbguard-0.7.4/Makefile.am =================================================================== --- usbguard-0.7.4.orig/Makefile.am +++ usbguard-0.7.4/Makefile.am -@@ -342,6 +342,8 @@ usbguard_daemon_CPPFLAGS=\ - @libcapng_CFLAGS@ \ +@@ -343,6 +343,7 @@ usbguard_daemon_CPPFLAGS=\ @audit_CFLAGS@ -+usbguard_daemon_LIBFLAGS= -pthread -+ usbguard_daemon_LDADD=\ ++ -lpthread \ $(top_builddir)/libusbguard.la \ @seccomp_LIBS@ \ -@@ -608,6 +610,7 @@ nodist_usbguard_applet_qt_SOURCES=\ + @libcapng_LIBS@ \ +@@ -608,6 +609,7 @@ nodist_usbguard_applet_qt_SOURCES=\ src/GUI.Qt/TargetDelegate.moc.cpp usbguard_applet_qt_LDADD=\ From 6756f90bb285d29d3034d2a346301c86bd79e49a06013bf8b69a7c42daadddc0 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 22 Jul 2019 09:50:34 +0000 Subject: [PATCH 8/8] - link against libpthread to make it build (bsc#1141377) - added usbguard-pthread.patch OBS-URL: https://build.opensuse.org/package/show/hardware/usbguard?expand=0&rev=23 --- usbguard.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usbguard.changes b/usbguard.changes index f66ea1e..66cc341 100644 --- a/usbguard.changes +++ b/usbguard.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 22 09:50:04 UTC 2019 - Marcus Meissner + +- link against libpthread to make it build (bsc#1141377) +- added usbguard-pthread.patch + ------------------------------------------------------------------- Wed May 22 13:38:28 UTC 2019 - Christophe Giboudeaux