From e488a617eb9e16bd64984dac885f433727609ef9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:44:09 +0100 Subject: [PATCH 1/6] wireshark: Remove trailing space --- wireshark-2.0.2-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark-2.0.2-0.bee b/wireshark-2.0.2-0.bee index b7fa0bffe..07170cf9f 100755 --- a/wireshark-2.0.2-0.bee +++ b/wireshark-2.0.2-0.bee @@ -22,7 +22,7 @@ build_in_sourcedir #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From 3938d0e9957411c6f2cb82c99fde8633064c87c0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:44:39 +0100 Subject: [PATCH 2/6] wireshark: Convert to versionless bee file --- wireshark-2.0.2-0.bee => wireshark.be0 | 2 ++ 1 file changed, 2 insertions(+) rename wireshark-2.0.2-0.bee => wireshark.be0 (93%) diff --git a/wireshark-2.0.2-0.bee b/wireshark.be0 similarity index 93% rename from wireshark-2.0.2-0.bee rename to wireshark.be0 index 07170cf9f..abca6f264 100755 --- a/wireshark-2.0.2-0.bee +++ b/wireshark.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION wireshark-2.0.2-0 + SRCURL[0]="https://2.na.dl.wireshark.org/src/wireshark-${PKGVERSION}.tar.bz2" #SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PKGVERSION}.tar.bz2" From f7ab0f5c30883a500f484c0b108bf654c2a8671b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:49:00 +0100 Subject: [PATCH 3/6] wireshark: Use current bee file template Recreate bee file with the command below, and convert it to a versionless bee file. ``` $ bee init https://2.na.dl.wireshark.org/src/wireshark-2.0.2.tar.bz2 creating wireshark-2.0.2-0.bee from template '/etc/default/bee/templates/fallback' $ mv wireshark-2.0.2-0.bee wireshark.be0 $ vim wireshark.be0 ``` --- wireshark.be0 | 59 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/wireshark.be0 b/wireshark.be0 index abca6f264..daac1f87f 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -2,19 +2,51 @@ # BEE_VERSION wireshark-2.0.2-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.) + +############################################################################### +## 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/wireshark-${PKGVERSION}.tar.bz2" #SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PKGVERSION}.tar.bz2" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. -# BEE_CONFIGURE=compat +# PATCHURL+=() -BEE_BUILDTYPE=configure +############################################################################### +## Add filename patterns to the EXCLUDE array of files that should not +## be added to you package but may be present in the image directory. -# EXCLUDE=() +# EXCLUDE+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. build_in_sourcedir +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + +BEE_BUILDTYPE='autotools' + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + #mee_extract() { # bee_extract "${@}" #} @@ -34,3 +66,22 @@ build_in_sourcedir #mee_install() { # bee_install #} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 675efdfa549a156804757c6b6b49528d77c63d65 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:51:50 +0100 Subject: [PATCH 4/6] wireshark: Update download URL The old sources are in the directory `all-versions`. --- wireshark.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wireshark.be0 b/wireshark.be0 index daac1f87f..c13a24be9 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -9,8 +9,8 @@ ## 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/wireshark-${PKGVERSION}.tar.bz2" -#SRCURL[0]="http://wiresharkdownloads.riverbed.com/wireshark/src/wireshark-${PKGVERSION}.tar.bz2" +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" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From a6875d20a3b65a9f2803a7cb7451ea24d6cdceab Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 12:59:36 +0100 Subject: [PATCH 5/6] wireshark: Update version from 2.0.2 to 2.0.16 Version 2.0.16 was released on October 10th, 2017. The release notes are available online [1]. [1] https://www.wireshark.org/docs/relnotes/ --- wireshark.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark.be0 b/wireshark.be0 index c13a24be9..06252c438 100755 --- a/wireshark.be0 +++ b/wireshark.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION wireshark-2.0.2-0 +# BEE_VERSION wireshark-2.0.16-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.) From c57ede6a02caa2d716feb55b0ba61774ae341057 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 19 Dec 2017 13:07:30 +0100 Subject: [PATCH 6/6] wireshark: Patch source to enable Lua bindings with Lua 5.3.3 From [1]: > Optional patch: > http://www.linuxfromscratch.org/patches/blfs/7.10/wireshark-2.0.5-lua_5_3_1-1.patch > (allows building the LUA bindings if Lua-5.3.3 is installed and LUA is > not disabled by passing --without-lua to configure) Applies with a little offset. ``` [BEE] patch -N -p1 -i /dev/shm/bee-root/wireshark/files/wireshark-2.0.5-lua_5_3_1-1.patch patching file configure Hunk #1 succeeded at 38870 (offset 1275 lines). Hunk #2 succeeded at 38974 (offset 1275 lines). Hunk #3 succeeded at 38998 (offset 1275 lines). Hunk #4 succeeded at 39022 (offset 1275 lines). patching file epan/wslua/lua_bitop.c patching file epan/wslua/wslua_byte_array.c patching file epan/wslua/wslua_file.c Hunk #1 succeeded at 347 (offset 10 lines). patching file epan/wslua/wslua.h patching file epan/wslua/wslua_int64.c patching file epan/wslua/wslua_internals.c patching file epan/wslua/wslua_listener.c patching file epan/wslua/wslua_nstime.c patching file epan/wslua/wslua_struct.c patching file epan/wslua/wslua_tvb.c Hunk #3 succeeded at 223 (offset -1 lines). Hunk #4 succeeded at 241 (offset -1 lines). Hunk #5 succeeded at 836 (offset -1 lines). Hunk #6 succeeded at 917 (offset -1 lines). Hunk #7 succeeded at 961 (offset -1 lines). Hunk #8 succeeded at 1008 (offset -1 lines). Hunk #9 succeeded at 1108 (offset -1 lines). ``` With this patch, `Use Lua library : yes` is seen in the configure option summary. [1] http://www.linuxfromscratch.org/blfs/view/7.10/basicnet/wireshark.html --- wireshark.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark.be0 b/wireshark.be0 index 06252c438..1159b7af3 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+=() +PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/7.10/wireshark-2.0.5-lua_5_3_1-1.patch) ############################################################################### ## Add filename patterns to the EXCLUDE array of files that should not