Accepting request 144938 from network:utilities
- Add wireshark-suidflags.patch: Allow to pass SUID_{C,LD}FLAGS to introduce -fPIE -pie as needed for suid binaries - Add libtool BuildRequires and call to autoreconf, as above patch touches the build system. - Export SUID_{C,LD}FLAGS with appropriate flags. (forwarded request 144930 from dimstar) OBS-URL: https://build.opensuse.org/request/show/144938 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=62
This commit is contained in:
commit
bf47da2e04
14
wireshark-suidflags.patch
Normal file
14
wireshark-suidflags.patch
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
Index: wireshark-1.8.4/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- wireshark-1.8.4.orig/Makefile.am
|
||||||
|
+++ wireshark-1.8.4/Makefile.am
|
||||||
|
@@ -487,7 +487,8 @@ dumpcap_LDADD = \
|
||||||
|
@NSL_LIBS@ \
|
||||||
|
@CORESERVICES_FRAMEWORKS@ \
|
||||||
|
@LIBCAP_LIBS@
|
||||||
|
-dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS)
|
||||||
|
+dumpcap_CFLAGS = $(AM_CLEAN_CFLAGS) $(SUID_CFLAGS)
|
||||||
|
+dumpcap_LDFLAGS = $(SUID_LDFLAGS)
|
||||||
|
|
||||||
|
# Common headers
|
||||||
|
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Dec 10 09:29:02 UTC 2012 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
- Add wireshark-suidflags.patch: Allow to pass SUID_{C,LD}FLAGS to
|
||||||
|
introduce -fPIE -pie as needed for suid binaries
|
||||||
|
- Add libtool BuildRequires and call to autoreconf, as above patch
|
||||||
|
touches the build system.
|
||||||
|
- Export SUID_{C,LD}FLAGS with appropriate flags.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Nov 29 20:15:03 UTC 2012 - andreas.stieger@gmx.de
|
Thu Nov 29 20:15:03 UTC 2012 - andreas.stieger@gmx.de
|
||||||
|
|
||||||
|
@ -34,6 +34,8 @@ Patch1: %{name}-1.2.0-disable-warning-dialog.patch
|
|||||||
Patch2: %{name}-1.2.0-geoip.patch
|
Patch2: %{name}-1.2.0-geoip.patch
|
||||||
# PATCH-FIX-OPENSUSE wireshark-1.2.4-enable_lua.patch bnc#650434
|
# PATCH-FIX-OPENSUSE wireshark-1.2.4-enable_lua.patch bnc#650434
|
||||||
Patch4: %{name}-1.2.4-enable_lua.patch
|
Patch4: %{name}-1.2.4-enable_lua.patch
|
||||||
|
# PATCH-FEATURE-UPSTREAM wireshark-suidflags.patch -- Allow to specify sep. flags for SUID binaries.
|
||||||
|
Patch5: wireshark-suidflags.patch
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: cairo-devel
|
BuildRequires: cairo-devel
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
@ -45,6 +47,8 @@ BuildRequires: libgcrypt-devel
|
|||||||
BuildRequires: libgnutls-devel
|
BuildRequires: libgnutls-devel
|
||||||
BuildRequires: libpcap-devel
|
BuildRequires: libpcap-devel
|
||||||
BuildRequires: libsmi-devel
|
BuildRequires: libsmi-devel
|
||||||
|
# Needed for patch5
|
||||||
|
BuildRequires: libtool
|
||||||
# required for Lua support in openSUSE 12.2 and later [bnc#780669]
|
# required for Lua support in openSUSE 12.2 and later [bnc#780669]
|
||||||
%if 0%{?suse_version} >= 1220
|
%if 0%{?suse_version} >= 1220
|
||||||
BuildRequires: lua51-devel
|
BuildRequires: lua51-devel
|
||||||
@ -98,6 +102,7 @@ view the reconstructed stream of a TCP session.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch2
|
%patch2
|
||||||
%patch4
|
%patch4
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop
|
sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop
|
||||||
# run as root on 11.3 and older - bnc#349782
|
# run as root on 11.3 and older - bnc#349782
|
||||||
@ -107,6 +112,10 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
# Needed for patch5
|
||||||
|
autoreconf -fiv
|
||||||
|
export SUID_CFLAGS="-fPIE"
|
||||||
|
export SUID_LDFLAGS="-pie"
|
||||||
%configure --without-zlib
|
%configure --without-zlib
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user