Hello community,
here is the log from the commit of package wireshark for openSUSE:Factory
checked in at 2017-05-17 17:19:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
and /work/SRC/openSUSE:Factory/.wireshark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireshark"
Wed May 17 17:19:14 2017 rev:124 rq:495559 version:2.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2017-04-20
20:55:22.470425141 +0200
+++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2017-05-17
17:20:22.459981525 +0200
@@ -1,0 +2,6 @@
+Wed May 17 09:51:33 UTC 2017 - astie...@suse.com
+
+- Allow opening capture files from desktop without asking for
+ privileged credentials. bsc#1025714
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.OGzrR7/_old 2017-05-17 17:20:23.571824719 +0200
+++ /var/tmp/diff_new_pack.OGzrR7/_new 2017-05-17 17:20:23.575824155 +0200
@@ -205,17 +205,16 @@
%if ! %{use_caps}
%patch1 -p1
+# open capture files without root privileges bsc#1025714
+for X in wireshark{,-gtk}.desktop; do
+ cp -pv $X ${X/wireshark/wireshark-file}
+ echo "NoDisplay=true" >> ${X/wireshark/wireshark-file}
+done
+sed -i '/^MimeType.*/d' wireshark{,-gtk}.desktop
# run as root if not using caps
-sed -i 's!^Exec=wireshark!Exec=%{_bindir}/xdg-su -c %{_bindir}/wireshark!'
wireshark.desktop
-%endif
-
-sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop
-%if %{with gtk}
-sed \
- -e 's/^Name.*Wireshark/& (GTK)/' \
- -e 's/^Icon=wireshark/&-gtk/' \
- -e '/Exec=/s/wireshark/&-gtk/g' %{name}.desktop > %{name}-gtk.desktop
+sed -i 's!^Exec=wireshark!Exec=%{_bindir}/xdg-su -c %{_bindir}/wireshark!'
wireshark{,-gtk}.desktop
%endif
+sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark*.desktop
%build
export CFLAGS="%{optflags} -fPIC"
@@ -300,6 +299,10 @@
install -D -m 0644 image/wsicon48.png
%{buildroot}%{_datadir}/pixmaps/wireshark-gtk.png
install -D -m 0644 wireshark-gtk.desktop
%{buildroot}%{_datadir}/applications/wireshark-gtk.desktop
%suse_update_desktop_file -n %{name}-gtk
+%if ! %{use_caps}
+install -D -m 0644 wireshark-file-gtk.desktop
%{buildroot}%{_datadir}/applications/wireshark-file-gtk.desktop
+%suse_update_desktop_file -n %{name}-file-gtk
+%endif
%else
# sometimes the gtk.desktop gets autoinstalled by make_install
rm -f %{buildroot}%{_datadir}/applications/wireshark-gtk.desktop
@@ -309,6 +312,10 @@
install -D -m 0644 image/wsicon48.png
%{buildroot}%{_datadir}/pixmaps/wireshark.png
install -D -m 0644 wireshark.desktop
%{buildroot}%{_datadir}/applications/wireshark.desktop
%suse_update_desktop_file %{name}
+%if ! %{use_caps}
+install -D -m 0644 wireshark-file.desktop
%{buildroot}%{_datadir}/applications/wireshark-file.desktop
+%suse_update_desktop_file %{name}-file
+%endif
%else
rm -f %{buildroot}%{_datadir}/applications/wireshark.desktop
%endif
@@ -398,6 +405,9 @@
%{_bindir}/wireshark-gtk
%{_bindir}/ethereal
%{_datadir}/applications/wireshark-gtk.desktop
+%if ! %{use_caps}
+%{_datadir}/applications/wireshark-file-gtk.desktop
+%endif
%{_datadir}/pixmaps/wireshark-gtk.png
%post ui-gtk
@@ -421,6 +431,9 @@
%dir %{_datadir}/appdata
%{_datadir}/appdata/wireshark.appdata.xml
%{_datadir}/applications/wireshark.desktop
+%if ! %{use_caps}
+%{_datadir}/applications/wireshark-file.desktop
+%endif
%{_datadir}/pixmaps/wireshark.png
%post ui-qt
