diff --git a/qemu b/qemu deleted file mode 100644 index 698d43aa..00000000 --- a/qemu +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/permissions.d/qemu - -# qemu / kvm (bnc#765948) -/usr/lib/qemu-bridge-helper root:root 4755 -/usr/lib64/qemu-bridge-helper root:root 4755 diff --git a/qemu-tools-rpmlintrc b/qemu-tools-rpmlintrc index fc521fb9..712d57d8 100644 --- a/qemu-tools-rpmlintrc +++ b/qemu-tools-rpmlintrc @@ -1,4 +1,4 @@ # This line is mandatory to access the configuration functions from Config import * -setBadness('permissions-unauthorized-file', 0) +setBadness('permissions-file-setuid-bit', 0) diff --git a/qemu.changes b/qemu.changes index 2ed7a5d5..14f56bd2 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 13 13:44:28 UTC 2012 - brogers@suse.com + +- don't use permissions.d + ------------------------------------------------------------------- Wed Jun 13 08:19:01 UTC 2012 - agraf@suse.com diff --git a/qemu.paranoid b/qemu.paranoid deleted file mode 100644 index 97e8421d..00000000 --- a/qemu.paranoid +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/permissions.d/qemu.paranoid - -# qemu / kvm (bnc#765948) -/usr/lib/qemu-bridge-helper root:root 0755 -/usr/lib64/qemu-bridge-helper root:root 0755 diff --git a/qemu.spec b/qemu.spec index 1303f92e..c64b7c1d 100644 --- a/qemu.spec +++ b/qemu.spec @@ -51,8 +51,6 @@ Patch0023: 0023-linux-user-Ignore-broken-loop-ioctl.patch Source300: rpmlintrc Source301: qemu-tools-rpmlintrc Source302: bridge.conf -Source303: qemu -Source304: qemu.paranoid Source400: update_git.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel @@ -111,7 +109,7 @@ as PC and PowerMac systems. Summary: Universal CPU emulator -- Tools Group: System/Emulators/PC Provides: qemu:%_libexecdir/qemu-bridge-helper -Requires: permissions +PreReq: permissions %description tools QEMU is an extremely well-performing CPU emulator that allows you to @@ -211,8 +209,6 @@ install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf -install -D -m 644 %{SOURCE303} %{buildroot}%{_sysconfdir}/permissions.d/qemu -install -D -m 644 %{SOURCE304} %{buildroot}%{_sysconfdir}/permissions.d/qemu.paranoid %ifnarch %ix86 x86_64 ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386 %endif @@ -256,8 +252,6 @@ rm -rf ${RPM_BUILD_ROOT} %_bindir/qemu-io %verify(not mode) %attr(4755, root, root) %_libexecdir/qemu-bridge-helper %config %_sysconfdir/%name/bridge.conf -%config %attr(644,root,root) %_sysconfdir/permissions.d/qemu -%config %attr(644,root,root) %_sysconfdir/permissions.d/qemu.paranoid %files linux-user %defattr(-, root, root) diff --git a/qemu.spec.in b/qemu.spec.in index 6b565902..5d8c037b 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -29,8 +29,6 @@ PATCH_FILES Source300: rpmlintrc Source301: qemu-tools-rpmlintrc Source302: bridge.conf -Source303: qemu -Source304: qemu.paranoid Source400: update_git.sh BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: SDL-devel @@ -89,7 +87,7 @@ as PC and PowerMac systems. Summary: Universal CPU emulator -- Tools Group: System/Emulators/PC Provides: qemu:%_libexecdir/qemu-bridge-helper -Requires: permissions +PreReq: permissions %description tools QEMU is an extremely well-performing CPU emulator that allows you to @@ -167,8 +165,6 @@ install -m 755 scripts/qemu-binfmt-conf.sh $RPM_BUILD_ROOT/%_sbindir install -d -m 755 $RPM_BUILD_ROOT/%_libexecdir install -m 755 dynamic/qemu-bridge-helper $RPM_BUILD_ROOT/%_libexecdir install -D -m 644 %{SOURCE302} $RPM_BUILD_ROOT/%{_sysconfdir}/qemu/bridge.conf -install -D -m 644 %{SOURCE303} %{buildroot}%{_sysconfdir}/permissions.d/qemu -install -D -m 644 %{SOURCE304} %{buildroot}%{_sysconfdir}/permissions.d/qemu.paranoid %ifnarch %ix86 x86_64 ln -sf ../../../emul/ia32-linux $RPM_BUILD_ROOT/usr/share/qemu/qemu-i386 %endif @@ -212,8 +208,6 @@ rm -rf ${RPM_BUILD_ROOT} %_bindir/qemu-io %verify(not mode) %attr(4755, root, root) %_libexecdir/qemu-bridge-helper %config %_sysconfdir/%name/bridge.conf -%config %attr(644,root,root) %_sysconfdir/permissions.d/qemu -%config %attr(644,root,root) %_sysconfdir/permissions.d/qemu.paranoid %files linux-user %defattr(-, root, root)