Accepting request 922162 from home:msmeissn:branches:security

- updated to 2.6.1-20210910
  - Add -DNCURSES_WIDECHAR=0 to programs using ncurses library.
  - Loosen pathname/domainname validation.
  - Limit wildcard recursion depth.
  - Remove "socket:[family=\\$:type=\\$:protocol=\\$]" from ANY_PATHNAME group.
  - Adjust to TOMOYO 2.6.
  - Rebase to ccs-tools 1.8.5-2.
- moved /sbin/tomoyo-init binary to /usr/sbin/tomoyo-init (bsc#1191101)

OBS-URL: https://build.opensuse.org/request/show/922162
OBS-URL: https://build.opensuse.org/package/show/security/tomoyo-tools?expand=0&rev=22

tomoyo-tools-2.5.0-20140601.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:118ef6ba1fbf7c0b83018c3a0d4d5485dfb9b5b7f647f37ce9f63841a3133c2a
-size 211411

tomoyo-tools-2.5.0-20140601.tar.gz.asc

@@ -1,17 +0,0 @@
------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-----

tomoyo-tools-2.6.1-20210910.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:47a12cdb1fe7bbd0b2e3486150fe1e754fa9c869aeefd42fd311c4022b78010a
+size 210975

tomoyo-tools-2.6.1-20210910.tar.gz.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAABAgAGBQJhO0frAAoJEEJfEo0MZPUqv/0P/AhsOxLmRAbZKcpVCy2pAZEk
+lLzKTGoitXtg+NGAZg6lK7Ob7bUPAXxnOUz2kwv4vGo2DTfXJDYXURNgVwgNW9SX
+HTOz05lUfwS4KWQ4tYUbsGIpEmv2yXwYDSuQ5N87RBEKLQjwSUWF1HyXbeabxHv7
+gFt/zbWlDoe11Zf4IkzWB/IKKZ57fxbM0hJMYu30hYQkWZeTpomTImKzAIMkiDWj
+vn6FWuCuAYM7WFVm99JPQddZUz30v6/i83uuh47OP238ej5BI4/PoRg22sRR8jVX
+pC/oFhXmQ7sPp/LDNWZsEQoSWFqhL2R8cG6k+gihcRyRxL8hmfKqaewZRA2r5G0Q
+G8In4KWwUFKvrWHN7gXKIQxkt3fVgZ1IYNtagTt0hrRHjIlzb0a3MXLlTjVzlTdC
+UKkw0KZOPhaLGngX/zAZ0Krb2ILdgZcpcra9lDIkftw7Kct2ybN+IHL2lsI2kkG2
+ZbB/NtrQZsQuP2SoYEastnydxXLYhk751JswDMgQh3mkTPUVFFeLUQYgY+o+piKt
+xRSbqOkJB1zkP9FDjmFc2RQyiJVMHOuy2kmheCpNv7rrz6TvoRUqGIizmql1/Jns
+k7md5DquHK/Lkn0t3zhIsAMdNbPLHYgEBMumhQQ9GhxWTKe69Q700Tu3lQYWsYPb
+s2JRJeh5J0FomrEhKPQD
+=UFPX
+-----END PGP SIGNATURE-----

tomoyo-tools.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Sep 29 11:23:05 UTC 2021 - Marcus Meissner <meissner@suse.com>
+
+- updated to 2.6.1-20210910
+  - Add -DNCURSES_WIDECHAR=0 to programs using ncurses library.
+  - Loosen pathname/domainname validation.
+  - Limit wildcard recursion depth.
+  - Remove "socket:[family=\\$:type=\\$:protocol=\\$]" from ANY_PATHNAME group.
+  - Adjust to TOMOYO 2.6.
+  - Rebase to ccs-tools 1.8.5-2.
+- moved /sbin/tomoyo-init binary to /usr/sbin/tomoyo-init (bsc#1191101)
+
 -------------------------------------------------------------------
 Tue Jun  9 06:58:58 UTC 2015 - meissner@suse.com
 

tomoyo-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package tomoyo-tools
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,20 +12,20 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define downloadver 2.5.0-20140601
+%define downloadver 2.6.1-20210910
 Name:           tomoyo-tools
-Version:        2.5.0.20140601
+Version:        2.6.1.20210910
 Release:        0
 Summary:        Userspace tools for TOMOYO Linux 2.4.x
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Development/Tools/Other
-Url:            http://sourceforge.jp/projects/tomoyo/
+URL:            http://sourceforge.jp/projects/tomoyo/
-Source0:        http://osdn.dl.sourceforge.jp/tomoyo/53357/tomoyo-tools-%{downloadver}.tar.gz
+Source0:        http://osdn.dl.sourceforge.jp/tomoyo/70710/tomoyo-tools-%{downloadver}.tar.gz
-Source1:        http://osdn.dl.sourceforge.jp/tomoyo/53357/tomoyo-tools-%{downloadver}.tar.gz.asc
+Source1:        http://osdn.dl.sourceforge.jp/tomoyo/70710/tomoyo-tools-%{downloadver}.tar.gz.asc
 # http://i-love.sakura.ne.jp/kumaneko-key
 Source2:        %name.keyring
 BuildRequires:  ncurses-devel
@@ -42,7 +42,7 @@ Please see http://tomoyo.sourceforge.jp/2.4/ for documentation.
 make %{?_smp_mflags} USRLIBDIR=%{_libdir} CFLAGS="-Wall %{optflags}"
 
 %install
-make INSTALLDIR=%{buildroot} USRLIBDIR=%{_libdir} install
+make INSTALLDIR=%{buildroot} USRLIBDIR=%{_libdir} SBINDIR=%{_sbindir} install
 
 %post -p /sbin/ldconfig
 
@@ -51,7 +51,7 @@ make INSTALLDIR=%{buildroot} USRLIBDIR=%{_libdir} install
 %files
 %defattr(-, root, root)
 %doc COPYING.tomoyo README.tomoyo
-%attr(700,root,root) /sbin/tomoyo-init
+%attr(700,root,root) %_sbindir/tomoyo-init
 %{_libdir}/lib*.so*
 %dir %{_libdir}/tomoyo
 %{_libdir}/tomoyo/*