Accepting request 252010 from network:utilities

Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/252010 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wireshark?expand=0&rev=88
2014-09-26 08:52:02 +00:00 · 2014-09-26 08:52:02 +00:00 · c5d4b80fdd
commit c5d4b80fdd
parent 6f527ca684 5d72bc11ad
7 changed files with 114 additions and 103 deletions
--- a/SIGNATURES-1.12.0.txt
+++ b/SIGNATURES-1.12.0.txt
@ -1,39 +0,0 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-wireshark-1.12.0.tar.bz2: 29033823 bytes
-MD5(wireshark-1.12.0.tar.bz2)=8dcfe451d8769901129809d2e19c1fb7
-SHA1(wireshark-1.12.0.tar.bz2)=c7a94a9ec90c1ff9be2a7d7b813276e433509df9
-RIPEMD160(wireshark-1.12.0.tar.bz2)=e4d398b1fc3b55b0b4b630ba69a2ab0547124e4a
-
-Wireshark-win32-1.12.0.exe: 28419192 bytes
-MD5(Wireshark-win32-1.12.0.exe)=81c8f3ec05338f721a3c17a281f91b92
-SHA1(Wireshark-win32-1.12.0.exe)=becdb61e0502343d9a402498e9a9a17481d25e01
-RIPEMD160(Wireshark-win32-1.12.0.exe)=bee348b7b7b8c7e1380cf456a65f56080e1b4a78
-
-Wireshark-win64-1.12.0.exe: 35531552 bytes
-MD5(Wireshark-win64-1.12.0.exe)=4ab55583c53abf719d33c76d6f92ccd7
-SHA1(Wireshark-win64-1.12.0.exe)=91fc8bde4680fe283d325cd053fa2b3813cccebf
-RIPEMD160(Wireshark-win64-1.12.0.exe)=d56ef9b64dc63ba3fb9613c904741730571d7a45
-
-WiresharkPortable-1.12.0.paf.exe: 29848288 bytes
-MD5(WiresharkPortable-1.12.0.paf.exe)=ca09838c3f8634ed683b9fa4a51607a8
-SHA1(WiresharkPortable-1.12.0.paf.exe)=c84a9eb6b29a61106badc053fb58f8fb6dc08bfd
-RIPEMD160(WiresharkPortable-1.12.0.paf.exe)=c1b9cb2ff36868fbb6cc6bf1661e3056852597e6
-
-Wireshark 1.12.0 Intel 64.dmg: 26335736 bytes
-MD5(Wireshark 1.12.0 Intel 64.dmg)=f1a91022042d39e0a8a68fb5d61c07db
-SHA1(Wireshark 1.12.0 Intel 64.dmg)=702f8eae3ad04b09a531fe2756857fdeba3d2481
-RIPEMD160(Wireshark 1.12.0 Intel 64.dmg)=1aa31348f61c12367c25e77cd3474a05207c0886
-
-Wireshark 1.12.0 Intel 32.dmg: 30160 bytes
-MD5(Wireshark 1.12.0 Intel 32.dmg)=6fae2bfa59532972e7f4dc4a7408354d
-SHA1(Wireshark 1.12.0 Intel 32.dmg)=c06f7a2ba0ffda44e241788c0b9696b1b9a3af42
-RIPEMD160(Wireshark 1.12.0 Intel 32.dmg)=5575194018cbdbe211d4364a01a04915df9a8983
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.14 (Darwin)
-
-iEYEARECAAYFAlParK0ACgkQpw8IXSHylJqa+gCeKtQWTmwOxI4JGEqjns3laLDp
-5OUAnRt4FWTWmycxHsuuYoNZbZVQ9+X4
-=IVoP
-----END PGP SIGNATURE-----
--- a/SIGNATURES-1.12.1.txt
+++ b/SIGNATURES-1.12.1.txt
@ -0,0 +1,44 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+wireshark-1.12.1.tar.bz2: 29059989 bytes
+MD5(wireshark-1.12.1.tar.bz2)=14b3e3d8979d1eb27ff085bb5f400e67
+SHA1(wireshark-1.12.1.tar.bz2)=e1508ea25ccf077c5a7fa2af3b88f3ae199f77fb
+RIPEMD160(wireshark-1.12.1.tar.bz2)=4ea802ca677dedf6fcff75a74e32c5f5289c0aed
+
+Wireshark-win32-1.12.1.exe: 28424840 bytes
+MD5(Wireshark-win32-1.12.1.exe)=a8c333c0503dc78bdd96cb973d6aff03
+SHA1(Wireshark-win32-1.12.1.exe)=d609c99f2b1260ab58f9926327ea6d35c7a85e21
+RIPEMD160(Wireshark-win32-1.12.1.exe)=028ed51bd88be918587831bf54d11f7025fec688
+
+Wireshark-win64-1.12.1.exe: 35534616 bytes
+MD5(Wireshark-win64-1.12.1.exe)=bcdab6542fd41bb1cd20536b3c484d75
+SHA1(Wireshark-win64-1.12.1.exe)=6bc5edd255639c1596c0d9f4a4834ec4ef92f945
+RIPEMD160(Wireshark-win64-1.12.1.exe)=08d1213c44e1cbf3382c7481aa38bcd005504a2c
+
+WiresharkPortable-1.12.1.paf.exe: 29862520 bytes
+MD5(WiresharkPortable-1.12.1.paf.exe)=a9ad0dcc637a36a2b7347a7644b338aa
+SHA1(WiresharkPortable-1.12.1.paf.exe)=e7e312be7e050584e172ccfc1ebd11cb04e61188
+RIPEMD160(WiresharkPortable-1.12.1.paf.exe)=c32e67a34cec37c4203bd0b1319efd7e6f0d1f86
+
+Wireshark 1.12.1 Intel 32.dmg: 21813952 bytes
+MD5(Wireshark 1.12.1 Intel 32.dmg)=8189243f2bbbb339b37cf983dfd62e87
+SHA1(Wireshark 1.12.1 Intel 32.dmg)=7f54e37733b0b8a45e2912f428b54a8ddc967233
+RIPEMD160(Wireshark 1.12.1 Intel 32.dmg)=250b0382fdb5c40a9b3e6048aebb3a58f48f1d77
+
+Wireshark 1.12.1 Intel 64.dmg: 26351560 bytes
+MD5(Wireshark 1.12.1 Intel 64.dmg)=ecedd8bcb023a6bfe35077dd46a3461f
+SHA1(Wireshark 1.12.1 Intel 64.dmg)=7c733b4e6beceb710ce10927b3158050a937f543
+RIPEMD160(Wireshark 1.12.1 Intel 64.dmg)=45c365871289ee246267dc66a35b345e7f921d35
+
+patch-wireshark-1.12.0-to-1.12.1.bz2: 573900 bytes
+MD5(patch-wireshark-1.12.0-to-1.12.1.bz2)=04535359d6f82a0033dc35a54a2d83f8
+SHA1(patch-wireshark-1.12.0-to-1.12.1.bz2)=99d5b1d81ad210d80164a7c47e97ee74f0ac4218
+RIPEMD160(patch-wireshark-1.12.0-to-1.12.1.bz2)=c183af8c36564ce7ff558a4c464d37596a36d678
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.14 (Darwin)
+
+iEYEARECAAYFAlQYiPIACgkQpw8IXSHylJo37QCfQEC4Qz/SjBByOv67/N9xHQZX
+H+8AoKbol61UWO2i5HK5fcb9chN4xJVK
+=5X4m
+-----END PGP SIGNATURE-----
--- a/wireshark-1.12.0-qt-QFont-stylename.patch
+++ b/wireshark-1.12.0-qt-QFont-stylename.patch
@ -1,57 +0,0 @@
-From: Andreas Stieger <andreas.stieger@gmx.de>
-Date: Fri, 8 Aug 2014 19:50:24 +0200
-Subject: [PATCH] Qt: Fix when build with Qt < 4.8.0
-Upstream: Committed
-References: https://www.wireshark.org/lists/wireshark-dev/201408/msg00074.html https://code.wireshark.org/review/#/c/3508/ https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff;h=020d0f89637faab8ec0e25e07d64eb66d96c2a72 
-
-Declared minimum requirement is Qt 4.6.0.
-QFont.styleName is not available in Qt < 4.8
-Fails on SLE11 with libqt4-devel-4.6.3-5.25.5:
-[  567s] qt_ui_utils.cpp: In function 'void smooth_font_size(QFont&)':
-[  567s] qt_ui_utils.cpp:58: error: 'class QFont' has no member named 'styleName'
-
---
- ui/qt/font_color_preferences_frame.cpp |    8 +++++++-
- ui/qt/qt_ui_utils.cpp                  |    4 ++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/ui/qt/font_color_preferences_frame.cpp b/ui/qt/font_color_preferences_frame.cpp
-index e9f4a5d..38c894c 100644
--- a/ui/qt/font_color_preferences_frame.cpp
-+++ b/ui/qt/font_color_preferences_frame.cpp
-@@ -81,9 +81,15 @@ void FontColorPreferencesFrame::updateWidgets()
- {
-     int margin = style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
- 
-+#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0)
-     ui->fontPushButton->setText(
-                cur_font_.family() + " "/* + cur_font_.styleName() + " "*/ +
-+                cur_font_.family() + " " +
-                 QString::number(cur_font_.pointSizeF(), 'f', 1));
-+#else
-+    ui->fontPushButton->setText(
-+                cur_font_.family() + " " + cur_font_.styleName() + " " +
-+                QString::number(cur_font_.pointSizeF(), 'f', 1));
-+#endif
-     ui->fontSampleLineEdit->setFont(cur_font_);
- 
-     QString line_edit_ss = QString("QLineEdit { margin-left: %1px; }").arg(margin);
-diff --git a/ui/qt/qt_ui_utils.cpp b/ui/qt/qt_ui_utils.cpp
-index 8ad29d2..f4a0621 100644
--- a/ui/qt/qt_ui_utils.cpp
-+++ b/ui/qt/qt_ui_utils.cpp
-@@ -55,7 +55,11 @@ QString gchar_free_to_qstring(gchar *glib_string) {
- 
- void smooth_font_size(QFont &font) {
-     QFontDatabase fdb;
-+#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0)
-+    QList<int> size_list = fdb.smoothSizes(font.family(), "");
-+#else
-     QList<int> size_list = fdb.smoothSizes(font.family(), font.styleName());
-+#endif
- 
-     if (size_list.size() < 2) return;
- 
-- 
-1.7.9.5
-
--- a/wireshark-1.12.0.tar.bz2
+++ b/wireshark-1.12.0.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f59fea1c5b35de90af681067e49113fee0dd7a901750a97fa25f4256dbf13c7
-size 29033823
--- a/wireshark-1.12.1.tar.bz2
+++ b/wireshark-1.12.1.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82b26bd416ec15903b27785e35a622687008a743342054e96eaaeaa249be584b
+size 29059989
--- a/wireshark.changes
+++ b/wireshark.changes
@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Wed Sep 17 23:27:49 UTC 2014 - andreas.stieger@gmx.de
+
+- install epan/wmem/*.h
+
+-------------------------------------------------------------------
+Wed Sep 17 22:22:18 UTC 2014 - andreas.stieger@gmx.de
+
+- Wireshark 1.12.1 [bnc#897055]
+- The following vulnerabilities have been fixed.
+  * MEGACO dissector infinite loop
+    wnpa-sec-2014-13 CVE-2014-6423
+  * Netflow dissector crash
+    wnpa-sec-2014-14 CVE-2014-6424
+  * CUPS dissector crash
+    wnpa-sec-2014-15 CVE-2014-6425
+  * HIP dissector infinite loop
+    wnpa-sec-2014-16 CVE-2014-6426
+  * RTSP dissector crash
+    wnpa-sec-2014-17 CVE-2014-6427
+  * SES dissector crash
+    wnpa-sec-2014-18 CVE-2014-6428
+  * Sniffer file parser crash
+    wnpa-sec-2014-19 CVE-2014-6429 CVE-2014-6430 CVE-2014-6431
+    CVE-2014-6432
+- drop wireshark-1.12.0-qt-QFont-stylename.patch, upstream
+- only build with --enable-gnutls where it has a compatible licence
+  as configure check was changed from a warning to an error
+  openSUSE 13.1 and up and SLE 11
+- add a desktop file for the QT user interface
+- Further bug fixes and updated protocol support as listed in:
+  https://www.wireshark.org/docs/relnotes/wireshark-1.12.1.html
+
 -------------------------------------------------------------------
 Mon Sep 15 02:24:53 UTC 2014 - crrodriguez@opensuse.org

--- a/wireshark.spec
+++ b/wireshark.spec
@ -22,9 +22,10 @@
 %define use_gtk3 0%{?suse_version} > 1140
 %bcond_without gtk
 %bcond_without qt
+%define use_gnutls 0%{?suse_version} >= 1310 || 0%{?suse_version} == 1110

 Name:           wireshark
-Version:        1.12.0
+Version:        1.12.1
 Release:        0
 Summary:        A Network Traffic Analyser
 License:        GPL-2.0+ and GPL-3.0+
@ -39,7 +40,6 @@ Patch1:         wireshark-1.2.0-disable-warning-dialog.patch
 Patch2:         wireshark-1.2.0-geoip.patch
 Patch4:         wireshark-1.10.0-enable_lua.patch
 Patch5:         wireshark-1.10.0-authors-pod2man.patch
-Patch6:         wireshark-1.12.0-qt-QFont-stylename.patch
 BuildRequires:  bison
 BuildRequires:  cairo-devel
 BuildRequires:  flex
@ -61,7 +61,6 @@ BuildRequires:  krb5-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libcares-devel
 BuildRequires:  libgcrypt-devel >= 1.1.92
-BuildRequires:  libgnutls-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  libsmi-devel
 BuildRequires:  lua-devel
@ -87,6 +86,17 @@ Recommends:     GeoIP
 %if 0%{?suse_version} >= 1230
 BuildRequires:  gpg-offline
 %endif
+%if 0%{?use_gnutls}
+# pull in licence compatible gnutls
+%if 0%{?suse_version} >= 1310
+BuildRequires:  pkgconfig(gnutls) >= 3.1.10
+%endif # >= 13.1
+%if 0%{?suse_version} == 1110
+BuildRequires:  libgnutls-devel >= 1.2.0
+BuildConflicts: libgnutls-devel >= 3.0.0
+%endif # SLE 11
+%endif # use_gnutls
+
 Requires:       wireshark-ui = %{version}

 %description
@ -160,8 +170,14 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark
 %endif
 %endif # with gtk

+%if %{with qt}
+sed \
+	-e 's/^Name.*Wireshark/& (QT)/' \
+	-e 's/^Icon=wireshark/&-qt/' \
+	-e '/Exec=/s/wireshark/&-qt/g' %{name}.desktop > %{name}-qt.desktop
+%endif # with qt
+
 %patch5 -p1
-%patch6 -p1

 %build

@ -188,7 +204,9 @@ sed -i 's!^Exec=wireshark!Exec=/usr/bin/xdg-su -c /usr/bin/wireshark!' wireshark
    --with-qt=no \
 %endif
    --with-ssl \
+%if 0%{?use_gnutls}
    --with-gnutls=yes \
+%endif
    --with-gcrypt=yes \
    --with-plugins=%{_libdir}/%{name}/plugins/%{version}

@ -213,6 +231,7 @@ mkdir -p "${IDIR}/epan/crypt"
 mkdir -p "${IDIR}/epan/ftypes"
 mkdir -p "${IDIR}/epan/dfilter"
 mkdir -p "${IDIR}/epan/dissectors"
+mkdir -p "${IDIR}/epan/wmem"
 mkdir -p "${IDIR}/wiretap"
 mkdir -p "${IDIR}/wsutil"
 install -m 644 color.h config.h register.h	"${IDIR}/"
@ -222,6 +241,7 @@ install -m 644 epan/crypt/*.h			"${IDIR}/epan/crypt"
 install -m 644 epan/ftypes/*.h			"${IDIR}/epan/ftypes"
 install -m 644 epan/dfilter/*.h			"${IDIR}/epan/dfilter"
 install -m 644 epan/dissectors/*.h		"${IDIR}/epan/dissectors"
+install -m 644 epan/wmem/*.h			"${IDIR}/epan/wmem"
 install -m 644 wiretap/*.h			"${IDIR}/wiretap"
 install -m 644 wsutil/*.h			"${IDIR}/wsutil"
 install -m 644 ws_symbol_export.h			"${IDIR}/"
@ -234,6 +254,14 @@ install -D -m 0644 wireshark.desktop %{buildroot}%{_datadir}/applications/wiresh
 %endif
 %endif

+%if %{with qt}
+install -D -m 0644 image/wsicon48.png %{buildroot}%{_datadir}/pixmaps/wireshark-qt.png
+install -D -m 0644 wireshark-qt.desktop %{buildroot}%{_datadir}/applications/wireshark-qt.desktop
+%if 0%{?suse_version}
+%suse_update_desktop_file %{name}-qt
+%endif
+%endif
+
 %clean
 rm -rf %{buildroot}

@ -294,6 +322,8 @@ getent group wireshark >/dev/null || groupadd wireshark
 %files ui-qt
 %defattr(-,root,root)
 %{_bindir}/wireshark-qt
+%{_datadir}/applications/wireshark-qt.desktop
+%{_datadir}/pixmaps/wireshark-qt.png

 %endif