From cf9639615ad7bbc31b506ab38b332814d76393e2 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 19 Dec 2017 13:15:06 +0100
Subject: [PATCH 1/3] wireshark: Update version from 2.0.16 to 2.4.3

Version 2.4.3 was released on November 30th, 2017. The release notes are
available online [1], where the notes for 2.4.0 [2] describe the changes in
the latest major release.

Due to [bug #14283 (Link against wrong libwiretap.so.5 and
libwsutil.so.6)][3], you need to remove the installed Wireshark package
before building this version.

The archive is now compressed with LZMA, so change the suffix.

[1]: https://www.wireshark.org/docs/relnotes/
[2]: https://www.wireshark.org/docs/relnotes/wireshark-2.4.0.html
[3]: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=14283
---
 wireshark.be0 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/wireshark.be0 b/wireshark.be0
index 1159b7af3..45eeb032a 100755
--- a/wireshark.be0
+++ b/wireshark.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION wireshark-2.0.16-0
+# BEE_VERSION wireshark-2.4.3-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -9,14 +9,14 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="https://2.na.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION}.tar.bz2"
-#SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/all-versions/wireshark-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://2.na.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION}.tar.xz"
+#SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/all-versions/wireshark-${PKGVERSION}.tar.xz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
 ## The sources will be patched in the order of the array.
 
-PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/7.10/wireshark-2.0.5-lua_5_3_1-1.patch)
+PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/wireshark-2.4.3-lua_5_3-1.patch)
 
 ###############################################################################
 ## Add filename patterns to the EXCLUDE array of files that should not

From 12eadb6f3e3876e34d62e500f5b64fd0bc3f9a5f Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 19 Dec 2017 13:35:17 +0100
Subject: [PATCH 2/3] wireshark: Store patch file locally

---
 wireshark.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wireshark.be0 b/wireshark.be0
index 45eeb032a..96419ca8f 100755
--- a/wireshark.be0
+++ b/wireshark.be0
@@ -16,7 +16,7 @@ SRCURL[0]="https://2.na.dl.wireshark.org/src/all-versions/wireshark-${PKGVERSION
 ## Add URLs/pathes to patch files to the PATCHURL array.
 ## The sources will be patched in the order of the array.
 
-PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/wireshark-2.4.3-lua_5_3-1.patch)
+PATCHURL+=(/src/mariux/patches/wireshark-2.4.3-lua_5_3-1.patch)
 
 ###############################################################################
 ## Add filename patterns to the EXCLUDE array of files that should not

From 34f2144f0cf07f11e57e35a0a9309b5067284293 Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Tue, 19 Dec 2017 13:39:26 +0100
Subject: [PATCH 3/3] wireshark: Build outside of source directory

---
 wireshark.be0 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wireshark.be0 b/wireshark.be0
index 96419ca8f..cda4e81f0 100755
--- a/wireshark.be0
+++ b/wireshark.be0
@@ -29,7 +29,7 @@ PATCHURL+=(/src/mariux/patches/wireshark-2.4.3-lua_5_3-1.patch)
 ## outside the source directory and needs to be built inside the source
 ## directory.
 
-build_in_sourcedir
+# build_in_sourcedir
 
 ###############################################################################
 ## bee cannot detect buildtypes specified in subdirectories.