From 2bfa030b1508cb0f50edc1a86609e56d0f914e4403f4dc53ae622956e04b8118 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 25 Jun 2012 14:59:24 +0000 Subject: [PATCH 1/3] - allow reading /etc/ssl/openssl.cnf in apparmor profile (bnc#768692) OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=27 --- mumble.changes | 5 +++++ mumble.spec | 34 +++++++++++++++++++++++----------- murmur.apparmor | 1 + 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/mumble.changes b/mumble.changes index add856e..dc60915 100644 --- a/mumble.changes +++ b/mumble.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 25 14:58:45 UTC 2012 - lnussel@suse.de + +- allow reading /etc/ssl/openssl.cnf in apparmor profile (bnc#768692) + ------------------------------------------------------------------- Mon Feb 20 08:49:15 UTC 2012 - lnussel@suse.de diff --git a/mumble.spec b/mumble.spec index 074a074..61fb45b 100644 --- a/mumble.spec +++ b/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 diff --git a/murmur.apparmor b/murmur.apparmor index a23d7a6..a5e830a 100644 --- a/murmur.apparmor +++ b/murmur.apparmor @@ -7,6 +7,7 @@ #include #include + /etc/ssl/openssl.cnf r, /etc/ssl/certs/** r, deny /usr/share/ssl/ r, deny /usr/share/ssl/** r, From fd074353cff4d8f38dec51211662d22a78875cba92be6bb0da2785d4397b5696 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 26 Jun 2012 07:30:17 +0000 Subject: [PATCH 2/3] - fix path to sed and grep due to usr move in 12.2 OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=28 --- mumble.changes | 1 + mumble.spec | 3 +++ murmur.apparmor | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/mumble.changes b/mumble.changes index dc60915..2a47574 100644 --- a/mumble.changes +++ b/mumble.changes @@ -2,6 +2,7 @@ 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 diff --git a/mumble.spec b/mumble.spec index 61fb45b..d5211ef 100644 --- a/mumble.spec +++ b/mumble.spec @@ -337,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 -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. diff --git a/murmur.apparmor b/murmur.apparmor index a5e830a..e062800 100644 --- a/murmur.apparmor +++ b/murmur.apparmor @@ -41,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, From 1eb86a936be3b0a3c3dab1a1d7a0cc2fe83b076cb2e4f23e415b2af4062b222a Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Tue, 26 Jun 2012 07:30:52 +0000 Subject: [PATCH 3/3] fix OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=29 --- mumble.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mumble.spec b/mumble.spec index d5211ef..e5d4944 100644 --- a/mumble.spec +++ b/mumble.spec @@ -338,7 +338,7 @@ 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 -e 's,/usr/bin/grep,/bin/grep,;s,/usr/bin/sed,/bin/sed,' %{buildroot}/etc/apparmor.d/usr.sbin.murmurd +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