Hello community,
here is the log from the commit of package wireshark for openSUSE:Factory
checked in at 2012-12-14 11:23:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wireshark (Old)
and /work/SRC/openSUSE:Factory/.wireshark.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wireshark", Maintainer is "cy...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/wireshark/wireshark.changes 2012-11-30
12:32:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.wireshark.new/wireshark.changes 2012-12-14
11:23:08.000000000 +0100
@@ -1,0 +2,9 @@
+Mon Dec 10 09:29:02 UTC 2012 - dims...@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.
+
+-------------------------------------------------------------------
New:
----
wireshark-suidflags.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wireshark.spec ++++++
--- /var/tmp/diff_new_pack.OD9654/_old 2012-12-14 11:23:11.000000000 +0100
+++ /var/tmp/diff_new_pack.OD9654/_new 2012-12-14 11:23:11.000000000 +0100
@@ -34,6 +34,8 @@
Patch2: %{name}-1.2.0-geoip.patch
# PATCH-FIX-OPENSUSE wireshark-1.2.4-enable_lua.patch bnc#650434
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: cairo-devel
BuildRequires: flex
@@ -45,6 +47,8 @@
BuildRequires: libgnutls-devel
BuildRequires: libpcap-devel
BuildRequires: libsmi-devel
+# Needed for patch5
+BuildRequires: libtool
# required for Lua support in openSUSE 12.2 and later [bnc#780669]
%if 0%{?suse_version} >= 1220
BuildRequires: lua51-devel
@@ -98,6 +102,7 @@
%setup -q
%patch2
%patch4
+%patch5 -p1
sed -i 's/^Icon=wireshark.png$/Icon=wireshark/' wireshark.desktop
# run as root on 11.3 and older - bnc#349782
@@ -107,6 +112,10 @@
%endif
%build
+# Needed for patch5
+autoreconf -fiv
+export SUID_CFLAGS="-fPIE"
+export SUID_LDFLAGS="-pie"
%configure --without-zlib
make %{?_smp_mflags}
++++++ wireshark-suidflags.patch ++++++
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 \
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
