Accepting request 126080 from games:tools

- allow reading /etc/ssl/openssl.cnf in apparmor profile (bnc#768692)
- fix path to sed and grep due to usr move in 12.2

OBS-URL: https://build.opensuse.org/request/show/126080
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mumble?expand=0&rev=17

mumble.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 25 14:58:45 UTC 2012 - lnussel@suse.de
+
+- allow reading /etc/ssl/openssl.cnf in apparmor profile (bnc#768692)
+- fix path to sed and grep due to usr move in 12.2
+
 -------------------------------------------------------------------
 Mon Feb 20 08:49:15 UTC 2012 - lnussel@suse.de
 

mumble.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %if 0%{?suse_version} > 1100
 %bcond_without pulseaudio
@@ -58,15 +57,19 @@ BuildRequires:  avahi-compat-libdns_sd-devel
 BuildRequires:  libcelt-devel
 Requires:       libcelt0 > 0.7.0
 %endif
-BuildRequires:  libsndfile-devel
-BuildRequires:  libogg-devel
 BuildRequires:  libcap-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libsndfile-devel
 %if %{with system_speex}
 BuildRequires:  speex-devel
 %endif
-BuildRequires:  boost-devel gcc-c++
+BuildRequires:  boost-devel
+BuildRequires:  gcc-c++
 %if 0%{?suse_version}
-BuildRequires:  alsa-devel libqt4-devel pkg-config update-desktop-files
+BuildRequires:  alsa-devel
+BuildRequires:  libqt4-devel
+BuildRequires:  pkg-config
+BuildRequires:  update-desktop-files
 %if 0%{?suse_version} > 1020
 BuildRequires:  libopenssl-devel
 %else
@@ -74,22 +77,30 @@ BuildRequires:  openssl-devel
 %endif
 %endif
 %if 0%{?fedora_version}
-BuildRequires:  alsa-lib-devel libXevie-devel openssl-devel pkgconfig qt4-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  libXevie-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  qt4-devel
 %endif
 %if %{with ice}
 BuildRequires:  ice-devel
 %endif
 %if 0%{?mandriva_version}
-BuildRequires:  -alsa-plugins alsa-lib-devel libxevie-devel openssl-devel pkgconfig qt4-devel qt4-linguist
+BuildRequires:  -alsa-plugins
+BuildRequires:  alsa-lib-devel
+BuildRequires:  libxevie-devel
 BuildRequires:  libxi-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig
+BuildRequires:  qt4-devel
+BuildRequires:  qt4-linguist
 %endif
 %if %{with pulseaudio}
 BuildRequires:  pulseaudio-devel
 %endif
 Version:        1.2.3%{?snapshot:_%snapshot}
-Release:        1
-License:        BSD-3-Clause
-Group:          Productivity/Multimedia/Sound/Utilities
+Release:        0
 %if 0%{!?snapshot:1}
 Source:         http://downloads.sourceforge.net/project/mumble/Mumble/%{version}/mumble-%{version}.tar.gz
 Source1:        http://downloads.sourceforge.net/project/mumble/Mumble/%{version}/mumble-%{version}.tar.gz.sig
@@ -110,6 +121,8 @@ Patch99:        mumble-1.1.4-sle10glx.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://mumble.sourceforge.net/
 Summary:        Voice Communication Client for Gamers
+License:        BSD-3-Clause
+Group:          Productivity/Multimedia/Sound/Utilities
 %if 0%{?suse_version}
 Requires:       qt-sql-sqlite
 %if 0%{?suse_version} == 1030
@@ -149,7 +162,6 @@ characters, and has echo cancellation so the sound from your loudspeakers
 won't be audible to other players.
 
 %package server
-License:        BSD-3-Clause
 Summary:        Voice Communication Server for Gamers
 Group:          Productivity/Multimedia/Sound/Utilities
 Requires:       qt-sql-sqlite
@@ -325,6 +337,9 @@ install -D -m 0755 release/mumble11x %{buildroot}%{_bindir}/mumble11x
 install -D -m 0755 release/murmurd "%{buildroot}%{_sbindir}/murmurd"
 install -D -m 0755 %{SOURCE2} %{buildroot}/etc/init.d/mumble-server
 install -D -m 0755 %{SOURCE3} %{buildroot}/etc/apparmor.d/usr.sbin.murmurd
+%if 0%{?suse_version} < 1220
+sed -i -e 's,/usr/bin/grep,/bin/grep,;s,/usr/bin/sed,/bin/sed,' %{buildroot}/etc/apparmor.d/usr.sbin.murmurd
+%endif
 install -d -m 0755 %{buildroot}%{_bindir}
 # can be launched as user too but apparmor profile doesn't make
 # sense in that case. So use link to avoid the profile.

murmur.apparmor

@@ -7,6 +7,7 @@
   #include <abstractions/ssl_certs>
   #include <abstractions/user-tmp>
 
+  /etc/ssl/openssl.cnf r,
   /etc/ssl/certs/** r,
   deny /usr/share/ssl/ r,
   deny /usr/share/ssl/** r,
@@ -40,8 +41,8 @@
     /proc/meminfo r,
     /usr/bin/getopt rix,
     /usr/bin/head rix,
-    /bin/grep rix,
-    /bin/sed rix,
+    /usr/bin/grep rix,
+    /usr/bin/sed rix,
     /usr/bin/cut rix,
     /usr/bin/lsb_release r,
     /etc/SuSE-release r,