Accepting request 316382 from network:utilities

1

OBS-URL: https://build.opensuse.org/request/show/316382
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=98
This commit is contained in:
Stephan Kulow 2015-07-14 15:44:43 +00:00 committed by Git OBS Bridge
commit ccffe89c13
7 changed files with 116 additions and 49 deletions

View File

@ -1,44 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
wireshark-1.12.5.tar.bz2: 29208507 bytes
MD5(wireshark-1.12.5.tar.bz2)=9ee199dde4f36a3d71f7b81dd6764e93
SHA1(wireshark-1.12.5.tar.bz2)=379686f0b6355ae2e6b3f7055578317a07ce5590
RIPEMD160(wireshark-1.12.5.tar.bz2)=ba455ae98be0241e219df83496b3b79c92f0497d
Wireshark-win64-1.12.5.exe: 29840448 bytes
MD5(Wireshark-win64-1.12.5.exe)=cd0e2251104e08fc84428c57d1fd787d
SHA1(Wireshark-win64-1.12.5.exe)=df31921df2ab5fd7986986f38fa14579210f24bc
RIPEMD160(Wireshark-win64-1.12.5.exe)=f0dc3e83eb9f6f32b07c77bfe2180683db9a09dc
Wireshark-win32-1.12.5.exe: 23597072 bytes
MD5(Wireshark-win32-1.12.5.exe)=66c22b82632d178e1207d54cc3ccc657
SHA1(Wireshark-win32-1.12.5.exe)=60f9a69d76ce98c790645336d16f0e4ba647af3e
RIPEMD160(Wireshark-win32-1.12.5.exe)=3263508ffa7259fe2e8d5a38acd311719a61aa51
WiresharkPortable-1.12.5.paf.exe: 29892320 bytes
MD5(WiresharkPortable-1.12.5.paf.exe)=e714fff8702028fd5c5ef54d6967732a
SHA1(WiresharkPortable-1.12.5.paf.exe)=29aa19cb85e86b6c0567c1708869241e639c846c
RIPEMD160(WiresharkPortable-1.12.5.paf.exe)=89b0e98e9177553f3c46092c70b8fe304a538dc7
Wireshark 1.12.5 Intel 32.dmg: 21866339 bytes
MD5(Wireshark 1.12.5 Intel 32.dmg)=9c8769145bbc85350dcc3da4821ee0a7
SHA1(Wireshark 1.12.5 Intel 32.dmg)=0abac1fccb69641b88403298361dbebcecee84fa
RIPEMD160(Wireshark 1.12.5 Intel 32.dmg)=087d26a9d15e4b4a8fc40a8b37b8496768c3a9c4
Wireshark 1.12.5 Intel 64.dmg: 26415405 bytes
MD5(Wireshark 1.12.5 Intel 64.dmg)=2b330fd3fa6d91757b80856b9b17ab44
SHA1(Wireshark 1.12.5 Intel 64.dmg)=72ab78277fff15618616746c9104d651654d8bfc
RIPEMD160(Wireshark 1.12.5 Intel 64.dmg)=003c6ec905c5f79c36390a35d341fd3d3f5a349d
patch-wireshark-1.12.4-to-1.12.5.bz2: 219623 bytes
MD5(patch-wireshark-1.12.4-to-1.12.5.bz2)=0f472eef369fe22104db470a40e9e0c7
SHA1(patch-wireshark-1.12.4-to-1.12.5.bz2)=aac68a04801d8735e2ae73bbb832576050e2af99
RIPEMD160(patch-wireshark-1.12.4-to-1.12.5.bz2)=44ed6f63b9e5e80a73ff1fc9bd3158f3c75f2e8b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlVSbO4ACgkQpw8IXSHylJosLACfQupn1OUF94QPaN9eN3Ku1xKV
pjcAn1J8oiHzN0W0P6MFA8XbP86MO6kz
=XUYb
-----END PGP SIGNATURE-----

44
SIGNATURES-1.12.6.txt Normal file
View File

@ -0,0 +1,44 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
wireshark-1.12.6.tar.bz2: 29166493 bytes
MD5(wireshark-1.12.6.tar.bz2)=25ad2bc1c2a21396827c238fcff51bf3
SHA1(wireshark-1.12.6.tar.bz2)=5b592bd0389b76d3bdee6a7336e9492f8162c94d
RIPEMD160(wireshark-1.12.6.tar.bz2)=46d0ceb05ea26670e73fc89928d54c0a00151cbe
Wireshark-win32-1.12.6.exe: 23603304 bytes
MD5(Wireshark-win32-1.12.6.exe)=96b6a71692b0b797a061a3e9e46833d0
SHA1(Wireshark-win32-1.12.6.exe)=a6322e2d20cabef08866cd02742604cd030dc18d
RIPEMD160(Wireshark-win32-1.12.6.exe)=2ab0e8b7b672697f23884dc6a36742a467833928
Wireshark-win64-1.12.6.exe: 29849552 bytes
MD5(Wireshark-win64-1.12.6.exe)=bbe1fc2c6c13aab82cf64d65612279fa
SHA1(Wireshark-win64-1.12.6.exe)=ccc854dba114876b3ad664d1d3e14441d68489c5
RIPEMD160(Wireshark-win64-1.12.6.exe)=7212d5b5edcbe538c5005861a06ba6cc22f44114
WiresharkPortable-1.12.6.paf.exe: 29897184 bytes
MD5(WiresharkPortable-1.12.6.paf.exe)=6a5d58c2299666106f0900f9768c5e93
SHA1(WiresharkPortable-1.12.6.paf.exe)=49fdfaa1647abd6454bd9b62ee159161fd4100b8
RIPEMD160(WiresharkPortable-1.12.6.paf.exe)=dc5b26ce1ce932d44806e9aef80560b4b3282825
Wireshark 1.12.6 Intel 64.dmg: 26426273 bytes
MD5(Wireshark 1.12.6 Intel 64.dmg)=6053a507504eaf140a8fe7afa5f83490
SHA1(Wireshark 1.12.6 Intel 64.dmg)=17fa83f241f309d354d6ca1c2ac2dc7099665cbc
RIPEMD160(Wireshark 1.12.6 Intel 64.dmg)=32cbc719d1bbd601cbdacd3fa63d1ceaa02ee9a0
Wireshark 1.12.6 Intel 32.dmg: 21853143 bytes
MD5(Wireshark 1.12.6 Intel 32.dmg)=c4ce6b014751ffc690c5fe49e45cb083
SHA1(Wireshark 1.12.6 Intel 32.dmg)=585d90ba21419a3e5d06c4d642211b80a5d975ae
RIPEMD160(Wireshark 1.12.6 Intel 32.dmg)=2356f84e676c4d065e99757de7264a4129aa09d8
patch-wireshark-1.12.5-to-1.12.6.bz2: 91186 bytes
MD5(patch-wireshark-1.12.5-to-1.12.6.bz2)=c87fedf5a9396c173f66621e53d94801
SHA1(patch-wireshark-1.12.5-to-1.12.6.bz2)=889a61158a5c104410d0bb3fd5d77f784d914784
RIPEMD160(patch-wireshark-1.12.5-to-1.12.6.bz2)=1ded2226c0667160ea4ddbd2fc7514d791f56957
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iEYEARECAAYFAlWBqocACgkQpw8IXSHylJoW4wCfVN7ngIum/xe9ZIaKtvH6eLQ+
FmcAoLibC8iaH/mkREbDB5FlUyeJeuyG
=95v9
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d0f177b2ef49e4deae4ff7d3299bdd295ba558a3934ce8ae489b2f13927cbd82
size 29208507

View File

@ -0,0 +1,47 @@
From: Andreas Stieger <astieger@suse.com>
Date: Mon, 13 Jul 2015 11:30:56 +0200
Subject: Compilation fails with qt5 5.4.1 and autotools due to lack of -fPIC
References: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=11230
Upstream: not yet
Workaround for compilation error on Factory:
[ 1248s] In file included from /usr/include/qt5/QtGui/qwindowdefs.h:37:0,
[ 1248s] from /usr/include/qt5/QtWidgets/qwidget.h:37,
[ 1248s] from /usr/include/qt5/QtWidgets/qframe.h:37,
[ 1248s] from /usr/include/qt5/QtWidgets/QFrame:1,
[ 1248s] from accordion_frame.h:25,
[ 1248s] from accordion_frame.cpp:26:
[ 1248s] /usr/include/qt5/QtCore/qglobal.h:1052:4: error: #error "You must build your code with position independent code if Qt was built with -reduce-relocations. " "Compile your code with -fPIC (-fPIE is not enough)."
[ 1248s] # error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\
[ 1248s] ^
Should be considered a temporary fix.
Some discussion: https://build.opensuse.org/request/show/314996
diff --git a/configure.ac b/configure.ac
index bcd6f9e..a39a96f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1071,18 +1071,18 @@ AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-needed])
# in the address space to make attacks more difficult.
#
CFLAGS_before_pie="$CFLAGS"
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIE)
+AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIC)
if test "x$CFLAGS" != "x$CFLAGS_before_pie"
then
# Restore CFLAGS
CFLAGS="$CFLAGS_before_pie"
LDFLAGS_before_pie="$LDFLAGS"
- AC_WIRESHARK_LDFLAGS_CHECK([-fPIE -pie])
+ AC_WIRESHARK_LDFLAGS_CHECK([-fPIC -pie])
if test "x$LDFLAGS" != "x$LDFLAGS_before_pie"
then
# We can use PIE
- PIE_CFLAGS="-fPIE"
+ PIE_CFLAGS="-fPIC"
PIE_LDFLAGS="-pie"
# Restore LDFLAGS

3
wireshark-1.12.6.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22ac0cc872f12cef9bb2cacfe0720eed8533dc5cea102d21de511620606cb3b6
size 29166493

View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Jul 13 09:35:18 UTC 2015 - astieger@suse.com
- Fix Factory with QT (PIE/PIC)
adding wireshark-1.12.6-fix-QT-PIC-PIE.patch
-------------------------------------------------------------------
Thu Jun 18 17:43:18 UTC 2015 - astieger@suse.com
- Wireshark 1.12.6
- The following vulnerabilities have been fixed:
* WCCP dissector crash
CVE-2015-4651 wnpa-sec-2015-19 boo#935157
* GSM DTAP dissector crash
CVE-2015-4652 wnpa-sec-2015-20 boo#935158
- Further bug fixes and updated protocol support as listed in:
https://www.wireshark.org/docs/relnotes/wireshark-1.12.6.html
-------------------------------------------------------------------
Sat May 23 05:18:26 UTC 2015 - crrodriguez@opensuse.org

View File

@ -25,7 +25,7 @@
%define use_gnutls 0%{?suse_version} >= 1310 || 0%{?suse_version} == 1110
Name: wireshark
Version: 1.12.5
Version: 1.12.6
Release: 0
Summary: A Network Traffic Analyser
License: GPL-2.0+ and GPL-3.0+
@ -43,6 +43,7 @@ Patch4: wireshark-1.10.0-enable_lua.patch
Patch5: wireshark-1.10.0-authors-pod2man.patch
Patch6: wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch
Patch7: wireshark-pkg-config.patch
Patch8: wireshark-1.12.6-fix-QT-PIC-PIE.patch
BuildRequires: bison
BuildRequires: cairo-devel
BuildRequires: flex
@ -190,6 +191,7 @@ sed \
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%build
# for patch6 wireshark-1.12.x-allow-gdk-pixbuf-deprecation.patch
@ -232,7 +234,7 @@ export PATH="%{_libdir}/qt5/bin:$PATH"
%endif
--with-gcrypt=yes \
--with-plugins=%{_libdir}/%{name}/plugins/%{version} \
--with-pic
--with-pic=yes
make %{?_smp_mflags} V=1