From 578d2b2f6d58d5041c801d61a67e6637077fe0b87411a161df3c399052a7217d Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Wed, 8 Apr 2015 12:51:42 +0000
Subject: [PATCH] Accepting request 294688 from home:posophe:branches:security

update

OBS-URL: https://build.opensuse.org/request/show/294688
OBS-URL: https://build.opensuse.org/package/show/security/tomoyo-tools?expand=0&rev=17
---
 tomoyo-tools-2.5.0-20120805.tar.gz     |  3 ---
 tomoyo-tools-2.5.0-20120805.tar.gz.asc |  7 -------
 tomoyo-tools-2.5.0-20140601.tar.gz     |  3 +++
 tomoyo-tools-2.5.0-20140601.tar.gz.asc | 17 +++++++++++++++++
 tomoyo-tools.changes                   | 19 +++++++++++++++++++
 tomoyo-tools.spec                      | 12 +++++-------
 6 files changed, 44 insertions(+), 17 deletions(-)
 delete mode 100644 tomoyo-tools-2.5.0-20120805.tar.gz
 delete mode 100644 tomoyo-tools-2.5.0-20120805.tar.gz.asc
 create mode 100644 tomoyo-tools-2.5.0-20140601.tar.gz
 create mode 100644 tomoyo-tools-2.5.0-20140601.tar.gz.asc

diff --git a/tomoyo-tools-2.5.0-20120805.tar.gz b/tomoyo-tools-2.5.0-20120805.tar.gz
deleted file mode 100644
index 326581b..0000000
--- a/tomoyo-tools-2.5.0-20120805.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02775b3f48dd08011775cf2b43dec788f7858f74201883eee0705594a25a75dc
-size 210535
diff --git a/tomoyo-tools-2.5.0-20120805.tar.gz.asc b/tomoyo-tools-2.5.0-20120805.tar.gz.asc
deleted file mode 100644
index d4cd367..0000000
--- a/tomoyo-tools-2.5.0-20120805.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEABECAAYFAlAeHZAACgkQUDraOEuXWpgL8QCfcxAabrb18Y47tKOQ4RRGIK9u
-M0cAoJ9cWSnrdlSenQTgQUjp+1uK0zxK
-=/2C4
------END PGP SIGNATURE-----
diff --git a/tomoyo-tools-2.5.0-20140601.tar.gz b/tomoyo-tools-2.5.0-20140601.tar.gz
new file mode 100644
index 0000000..ea6ab8e
--- /dev/null
+++ b/tomoyo-tools-2.5.0-20140601.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:118ef6ba1fbf7c0b83018c3a0d4d5485dfb9b5b7f647f37ce9f63841a3133c2a
+size 211411
diff --git a/tomoyo-tools-2.5.0-20140601.tar.gz.asc b/tomoyo-tools-2.5.0-20140601.tar.gz.asc
new file mode 100644
index 0000000..b0b35dc
--- /dev/null
+++ b/tomoyo-tools-2.5.0-20140601.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABAgAGBQJTipqIAAoJEEJfEo0MZPUqHzgQANI2NlDmzbohY9EUg2WLI1Uu
+TQHMzNuB7b4dJGheArv/xfOk1/q6C+d3y55CVqlTr6kP6XAPjD2Si8ZSczDuyqQi
+1b7dYRlYDwsOKSzPAyJDeyCjbe0tnEoIzRhX2FBbknEgUSfk+zfbIQ/kS2ZjeHaI
+hDQNdFiot12rCJiGPJt9uJ7UDK27cJQAG7G25kLU9VOxvdXvq9hZGKjpz1sZBjgO
+nXU5G8gtYziI/4If6xW647VZrykmbg+SHGjd3dEgRNKe2uyDwZSQwvmC/wx6+F/X
+pjeML3WHyZB78Mo2xj+EkkPnoXYsv07cKtcxwx/F2Z6GvcToNUrOEQvaL5eSJosA
+mpY6SFfFN0qaK6UA5OZabbkoLAGx9Rrc00B0MytdexwIolFQdbQLjrtQF6bkDJCC
+x7j8gMiNTXPjJAyi8sm2raciAOmJeBMZ/208Gsui/O/ARCuXsYSzD7vwDT9vHIUS
+/yGZUL7A3on0vEW6iiapw9QmbUk9ptaGpPw0XCMtpmKtH4T/uiIph8Q57GZpqs76
+VGCPNKvpK8CCzh5zEbWIXm+Br2e6E0vyI4nFYvflT5D4icaJrXi9byVOZMfvQrGe
+TT2nwiAvHik614ABhSKZ73mXkvp6RILs9vw5Vs0owuHZyv0WO17LWGsgczwByPQ9
+1F+JDK2wCo/SpO4Hnfgy
+=QYeK
+-----END PGP SIGNATURE-----
diff --git a/tomoyo-tools.changes b/tomoyo-tools.changes
index 6500c15..5169a35 100644
--- a/tomoyo-tools.changes
+++ b/tomoyo-tools.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Apr  7 01:27:27 UTC 2015 - p.drouand@gmail.com
+
+- Update to version 2.5.0-20140601
+  * /usr/sbin/tomoyo-editpolicy
+    Print "acl_group $N" correctly when using offline mode.
+- Changes from version 20140105
+  * /usr/lib/tomoyo/init_policy
+    Add path to systemd.
+  * /usr/sbin/tomoyo-queryd
+    Use poll() rather than select().
+- Changes from version 20130406
+  * Fix compile warning from clang.
+- Changes from version 20130214
+  * Change Makefile's build flags (fix bdo#674723)
+  * Change / to /* in rpm's %files section because Fedora 18 complains
+    conflicts.
+- Remove gpg verify requirement; obs handles it
+
 -------------------------------------------------------------------
 Tue Jan 29 12:28:35 UTC 2013 - meissner@suse.com
 
diff --git a/tomoyo-tools.spec b/tomoyo-tools.spec
index 2f76dec..0b01c06 100644
--- a/tomoyo-tools.spec
+++ b/tomoyo-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tomoyo-tools
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%define downloadver 2.5.0-20120805
+%define downloadver 2.5.0-20140601
 
 BuildRequires:  ncurses-devel
 
@@ -25,12 +25,11 @@ Summary:        Userspace tools for TOMOYO Linux 2.4.x
 License:        GPL-2.0
 Group:          Development/Tools/Other
 Url:            http://sourceforge.jp/projects/tomoyo/
-Version:        2.5.0.20120805
+Version:        2.5.0.20140601
 Release:        0
 Source0:        http://osdn.dl.sourceforge.jp/tomoyo/53357/tomoyo-tools-%{downloadver}.tar.gz
 Source1:        http://osdn.dl.sourceforge.jp/tomoyo/53357/tomoyo-tools-%{downloadver}.tar.gz.asc
 Source2:        %{name}.keyring
-BuildRequires:  gpg-offline
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -38,7 +37,6 @@ This package contains userspace tools for administrating TOMOYO Linux 2.4.
 Please see http://tomoyo.sourceforge.jp/2.4/ for documentation.
 
 %prep
-%gpg_verify %{S:1}
 %setup -q -n %{name}
 
 %build
@@ -58,7 +56,7 @@ make INSTALLDIR=$RPM_BUILD_ROOT USRLIBDIR=%_libdir install
 %_libdir/lib*.so*
 %dir %_libdir/tomoyo
 %_libdir/tomoyo/*
-/usr/sbin/*
-/usr/share/man/man8/*
+%{_sbindir}/*
+%{_mandir}/man8/*
 
 %changelog