From f1b8f5947df19601581e14053bf32ff9d0bad607 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 16:12:40 +0100 Subject: [PATCH 01/14] libpcap: Convert to versionless bee file --- libpcap-1.0.0-0.bee => libpcap.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libpcap-1.0.0-0.bee => libpcap.be0 (91%) diff --git a/libpcap-1.0.0-0.bee b/libpcap.be0 similarity index 91% rename from libpcap-1.0.0-0.bee rename to libpcap.be0 index 64b457b35..f4ef80d9e 100755 --- a/libpcap-1.0.0-0.bee +++ b/libpcap.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION libpcap-1.0.0-0 + SRCURL[0]="http://www.tcpdump.org/release/libpcap-1.0.0.tar.gz" PATCHURL[0]="" From dabe943dd56a80477b2cc2f16c995d47592f96fe Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 16:13:05 +0100 Subject: [PATCH 02/14] libpcap: Strip trailing space --- libpcap.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpcap.be0 b/libpcap.be0 index f4ef80d9e..6c82adb2e 100755 --- a/libpcap.be0 +++ b/libpcap.be0 @@ -20,7 +20,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From 609bf84de4ada2d8c7f67779da3a3ccb812befa2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 16:13:21 +0100 Subject: [PATCH 03/14] libpcap: Remove blank line at end of file --- libpcap.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/libpcap.be0 b/libpcap.be0 index 6c82adb2e..0ab5103ec 100755 --- a/libpcap.be0 +++ b/libpcap.be0 @@ -32,4 +32,3 @@ mee_install() { bee_install } - From f1672ffa39fe4a96c030ba5ed4c1f0f1856fa48d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 16:13:50 +0100 Subject: [PATCH 04/14] libpcap: Securely download source archive over HTTPS --- libpcap.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpcap.be0 b/libpcap.be0 index 0ab5103ec..4d8e3731c 100755 --- a/libpcap.be0 +++ b/libpcap.be0 @@ -2,7 +2,7 @@ # BEE_VERSION libpcap-1.0.0-0 -SRCURL[0]="http://www.tcpdump.org/release/libpcap-1.0.0.tar.gz" +SRCURL[0]="https://www.tcpdump.org/release/libpcap-1.0.0.tar.gz" PATCHURL[0]="" From 78180e2c78d40d0df418fd3398206c6b8b089376 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 16:14:16 +0100 Subject: [PATCH 05/14] libpcap: Use bee variable `PKGVERSION` --- libpcap.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpcap.be0 b/libpcap.be0 index 4d8e3731c..050611552 100755 --- a/libpcap.be0 +++ b/libpcap.be0 @@ -2,7 +2,7 @@ # BEE_VERSION libpcap-1.0.0-0 -SRCURL[0]="https://www.tcpdump.org/release/libpcap-1.0.0.tar.gz" +SRCURL[0]="https://www.tcpdump.org/release/libpcap-${PKGVERSION}.tar.gz" PATCHURL[0]="" From ff291e0bb6ba08070dc5c568d5d89048e3f723eb Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 16:30:03 +0100 Subject: [PATCH 06/14] libpcap: Use current bee file template --- libpcap.be0 | 77 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 15 deletions(-) diff --git a/libpcap.be0 b/libpcap.be0 index 050611552..d5f605441 100755 --- a/libpcap.be0 +++ b/libpcap.be0 @@ -1,34 +1,81 @@ -#!/bin/env beesh +#!/usr/bin/env beesh # BEE_VERSION libpcap-1.0.0-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://www.tcpdump.org/release/libpcap-${PKGVERSION}.tar.gz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. -PGRP=( uncategorized ) +# PATCHURL+=() +############################################################################### +## 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. -B=${S} +build_in_sourcedir -# BEE_CONFIGURE=compat +############################################################################### +## 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. -# EXCLUDE="" +# sourcesubdir_append src -mee_patch() { - bee_patch -} -mee_configure() { - bee_configure -} +############################################################################### +## 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_build() { - bee_build -} +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} mee_install() { mkdir -p ${D}${BINDIR} 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 cc5e31c3ebaa123a0fde7bb48a066fd8661decb8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 16:46:39 +0100 Subject: [PATCH 07/14] libpcap: Update version from 1.0.0 to 1.9.0 The current version is from 2011, so update to the current version. The change-log is available [online][1]. 1. Additionally, remove the unneeded hacks. It builds and installs just fine without any changes. 2. Disable Bluetooth support, as it causes build failures, and we do not need it, [1]: https://www.tcpdump.org/libpcap-changes.txt --- libpcap.be0 | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libpcap.be0 b/libpcap.be0 index d5f605441..a823b2d92 100755 --- a/libpcap.be0 +++ b/libpcap.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libpcap-1.0.0-0 +# BEE_VERSION libpcap-1.9.0-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.) @@ -22,7 +22,7 @@ SRCURL[0]="https://www.tcpdump.org/release/libpcap-${PKGVERSION}.tar.gz" ## 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. @@ -47,19 +47,18 @@ build_in_sourcedir # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --enable-bluetooth=no +} #mee_build() { # bee_build #} -mee_install() { - mkdir -p ${D}${BINDIR} - - bee_install -} +#mee_install() { +# bee_install +#} ## by default this may be 'make install DESTDIR="${D}"' ############################################################################### From 0453123dcf01d4a39955873b72c700a02448b234 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 17:13:08 +0100 Subject: [PATCH 08/14] tcpdump: Convert to versionless bee file --- tcpdump-4.1.1-0.bee => tcpdump.be0 | 2 ++ 1 file changed, 2 insertions(+) rename tcpdump-4.1.1-0.bee => tcpdump.be0 (90%) diff --git a/tcpdump-4.1.1-0.bee b/tcpdump.be0 similarity index 90% rename from tcpdump-4.1.1-0.bee rename to tcpdump.be0 index 18bde57ca..25176fbff 100755 --- a/tcpdump-4.1.1-0.bee +++ b/tcpdump.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION tcpdump-4.1.1-0 + SRCURL[0]="http://www.tcpdump.org/release/tcpdump-4.1.1.tar.gz" PATCHURL[0]="" From de65fee4e2dac07867dc4a83fff60489b2faed80 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 17:13:46 +0100 Subject: [PATCH 09/14] tcpdump: Strip trailing space --- tcpdump.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcpdump.be0 b/tcpdump.be0 index 25176fbff..b99d87540 100755 --- a/tcpdump.be0 +++ b/tcpdump.be0 @@ -19,7 +19,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From 287ac238a68152bad64609e0ab87ce088a233b55 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 17:14:00 +0100 Subject: [PATCH 10/14] tcpdump: Remove blank line at end of file --- tcpdump.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/tcpdump.be0 b/tcpdump.be0 index b99d87540..fe7fb117f 100755 --- a/tcpdump.be0 +++ b/tcpdump.be0 @@ -29,4 +29,3 @@ mee_build() { mee_install() { bee_install } - From a8bad5839952a3f63ead7675f2f231fa49f8d203 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 17:14:26 +0100 Subject: [PATCH 11/14] tcpdump: Securely download source archive over HTTPS --- tcpdump.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcpdump.be0 b/tcpdump.be0 index fe7fb117f..c3c1583dd 100755 --- a/tcpdump.be0 +++ b/tcpdump.be0 @@ -2,7 +2,7 @@ # BEE_VERSION tcpdump-4.1.1-0 -SRCURL[0]="http://www.tcpdump.org/release/tcpdump-4.1.1.tar.gz" +SRCURL[0]="https://www.tcpdump.org/release/tcpdump-4.1.1.tar.gz" PATCHURL[0]="" From 302fb989ead88bc2fa8c869857cbed9437205576 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 17:14:40 +0100 Subject: [PATCH 12/14] tcpdump: Use bee variable `PKGVERSION` --- tcpdump.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcpdump.be0 b/tcpdump.be0 index c3c1583dd..6e3ee9df0 100755 --- a/tcpdump.be0 +++ b/tcpdump.be0 @@ -2,7 +2,7 @@ # BEE_VERSION tcpdump-4.1.1-0 -SRCURL[0]="https://www.tcpdump.org/release/tcpdump-4.1.1.tar.gz" +SRCURL[0]="https://www.tcpdump.org/release/tcpdump-${PKGVERSION}.tar.gz" PATCHURL[0]="" From 31c0cb5e85cbdb09701ce58d6f01a65a0d4a761b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 17:15:32 +0100 Subject: [PATCH 13/14] tcpdump: Use current bee file template --- tcpdump.be0 | 82 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 17 deletions(-) diff --git a/tcpdump.be0 b/tcpdump.be0 index 6e3ee9df0..952999cb6 100755 --- a/tcpdump.be0 +++ b/tcpdump.be0 @@ -1,31 +1,79 @@ -#!/bin/env beesh +#!/usr/bin/env beesh # BEE_VERSION tcpdump-4.1.1-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://www.tcpdump.org/release/tcpdump-${PKGVERSION}.tar.gz" -PATCHURL[0]="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## 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. -PGRP=( uncategorized ) +# sourcesubdir_append src +############################################################################### +## 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}" -# BEE_CONFIGURE=compat +#mee_extract() { +# bee_extract "${@}" +#} -# EXCLUDE="" +#mee_patch() { +# bee_patch "${@}" +#} -mee_patch() { - bee_patch -} +#mee_configure() { +# bee_configure +#} -mee_configure() { - bee_configure -} +#mee_build() { +# bee_build +#} -mee_build() { - bee_build -} +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' -mee_install() { - bee_install -} +############################################################################### +## +## 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 95a65071137ffd632f422ace705c5b0d557a3c65 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 17 Jan 2019 17:16:04 +0100 Subject: [PATCH 14/14] tcpdump: Update version from 4.1.1 to 4.9.2 Rebuild tcpdump against libpcap 1.9.2, so that [the new syntax for opening a socket is used][1]. > "For compatibility with Linux 2.0, the obsolete socket(PF_INET, > SOCK_RAW, protocol) syntax is still supported to open a > packet(7) socket. This is deprecated and should be replaced by > socket(PF_PACKET, SOCK_RAW, protocol) instead. The main > difference is the new sockaddr_ll address structure for generic > link layer information instead of sockaddr_pkt." - ip(7) The change-log is available [online][2]. [1]: https://stackoverflow.com/questions/6060550/what-is-the-correct-replacement-for-pf-inet-sock-packet [2]: https://www.tcpdump.org/tcpdump-changes.txt --- tcpdump.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcpdump.be0 b/tcpdump.be0 index 952999cb6..2b7986a82 100755 --- a/tcpdump.be0 +++ b/tcpdump.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION tcpdump-4.1.1-0 +# BEE_VERSION tcpdump-4.9.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.)