Attachment 908967 Details for Bug 1109616 – Difference between wireshark.spec from wireshark-1.8.10-7.el6_5 and proposed wireshark.spec

[patch] Difference between wireshark.spec from wireshark-1.8.10-7.el6_5 and proposed wireshark.spec

wireshark.spec.setcap.patch (text/plain), 3.18 KB, created by Evgueni Souleimanov on 2014-06-16 01:00:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Evgueni Souleimanov

Created: 2014-06-16 01:00:40 UTC

Size: 3.18 KB

patch

obsolete

>--- wireshark.el6.spec	2014-03-26 10:18:09.000000000 -0400
>+++ wireshark.spec	2014-06-15 20:17:37.000000000 -0400
>@@ -17,7 +17,7 @@
> %if %{svn_version}
> Release: 	0.%{svn_version}%{?dist}
> %else
>-Release: 	7%{?dist}
>+Release: 	7.2%{?dist}
> %endif
> License: 	GPL+
> Group: 		Applications/Internet
>@@ -26,8 +26,6 @@
> %else
> Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
> %endif
>-Source1:	wireshark.pam
>-Source2:	wireshark.console
> Source3:	wireshark.desktop
> Source4:	wireshark-autoconf.m4
> Source5:	wireshark-mime-package.xml
>@@ -182,11 +180,11 @@
> 
> %configure \
>    --bindir=%{_sbindir} \
>-   --enable-zlib \
>+   --with-zlib \
>    --enable-ipv6 \
>    --with-libsmi \
>    --with-gnu-ld \
>-   --enable-gtk2 \
>+   --with-gtk3=no \
>    --with-pic \
> %if %{with_adns}
>    --with-adns \
>@@ -205,8 +203,10 @@
> %endif
>    --with-ssl \
>    --disable-warnings-as-errors \
>-   --with-plugindir=%{_libdir}/%{name}/plugins/%{version} \
>-   --enable-aircap
>+   --with-plugins=%{_libdir}/%{name}/plugins/%{version} \
>+   --with-dumpcap-group="wireshark" \
>+   --enable-setcap-install \
>+   --enable-airpcap
> 
> # Remove rpath
> sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
>@@ -225,14 +225,6 @@
> # Symlink tshark to tethereal
> ln -s tshark $RPM_BUILD_ROOT%{_sbindir}/tethereal
> 
>-# install support files for usermode, gnome and kde
>-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d
>-install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/pam.d/wireshark
>-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps
>-install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/security/console.apps/wireshark
>-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
>-ln -s consolehelper $RPM_BUILD_ROOT/%{_bindir}/wireshark
>-
> # Install python stuff.
> mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
> install -m 644 tools/wireshark_be.py tools/wireshark_gen.py  $RPM_BUILD_ROOT%{python_sitelib}
>@@ -354,7 +346,7 @@
> %{_sbindir}/dftest
> %{_sbindir}/capinfos
> %{_sbindir}/randpkt
>-%{_sbindir}/dumpcap
>+%attr(0750, root, wireshark) %caps(cap_net_raw,cap_net_admin=eip) %{_sbindir}/dumpcap
> %{_sbindir}/tethereal
> %{_sbindir}/rawshark
> %{python_sitelib}/*
>@@ -371,8 +363,6 @@
> %{_mandir}/man1/dftest.*
> %{_mandir}/man1/randpkt.*
> %{_datadir}/wireshark
>-%config(noreplace) %{_sysconfdir}/pam.d/wireshark
>-%config(noreplace) %{_sysconfdir}/security/console.apps/wireshark
> %if %{with_lua}
> %exclude %{_datadir}/wireshark/init.lua
> %endif
>@@ -390,7 +380,6 @@
> %{_datadir}/icons/gnome/48x48/mimetypes/application-x-pcap.png
> %{_datadir}/icons/gnome/256x256/mimetypes/application-x-pcap.png
> %{_datadir}/mime/packages/wireshark.xml
>-%{_bindir}/wireshark
> %{_sbindir}/wireshark
> %{_mandir}/man1/wireshark.*
> 
>@@ -406,6 +395,17 @@
> %{_datadir}/aclocal/*
> 
> %changelog
>+* Sun Jun 15 2014 Evgueni Souleimanov <esoule@100500.ca> 1.8.10-7.2
>+- run Wireshark GUI as user, not root (remove pam configs)
>+- allow packet capture to users who are members of group
>+  wireshark (using setcap)
>+- replace unrecognized configure options with equivalent
>+  ones that are recognized:
>+    --with-zlib
>+    --with-gtk3=no
>+    --with-plugins
>+    --enable-airpcap
>+
> * Wed Mar 26 2014 Peter Hatina <phatina@redhat.com> 1.8.10-7
> - security patches
> - Resolves: CVE-2013-6337

Actions: View | Diff

Attachments on bug 1109616: 908966 | 908967