From 15d2578dbee6a4379180552e0ec3148c2522a94e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 2 Nov 2017 11:20:17 +0100 Subject: [PATCH 1/4] strace: Convert to versionless bee file --- strace-4.5.20-0.bee => strace.be0 | 2 ++ 1 file changed, 2 insertions(+) rename strace-4.5.20-0.bee => strace.be0 (90%) diff --git a/strace-4.5.20-0.bee b/strace.be0 similarity index 90% rename from strace-4.5.20-0.bee rename to strace.be0 index dd431e5a4..f0fe316db 100755 --- a/strace-4.5.20-0.bee +++ b/strace.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION strace-4.5.20-0 + PGRP=( system ) SRCURL="http://sourceforge.net/projects/strace/files/strace/${PV}/strace-${PV}.tar.bz2/download strace-${PV}.tar.bz2" From 1c4410dbeb08f5992d7a1365a2da319574a22e4c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 2 Nov 2017 11:20:42 +0100 Subject: [PATCH 2/4] strace: Update version from 4.5.20 to 4.19 strace 4.19 was released on September 5th, 2017. In the seven years a lot of stuff was improved. Especially the decoding of several syscalls. The change-log is available in the corresponding version folders, like [1] for 4.19. The published source archives are now compressed with LZMA, so change the file suffix. [1] https://sourceforge.net/projects/strace/files/strace/4.19/ --- strace.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strace.be0 b/strace.be0 index f0fe316db..57582d61a 100755 --- a/strace.be0 +++ b/strace.be0 @@ -1,10 +1,10 @@ #!/bin/env beesh -# BEE_VERSION strace-4.5.20-0 +# BEE_VERSION strace-4.19-0 PGRP=( system ) -SRCURL="http://sourceforge.net/projects/strace/files/strace/${PV}/strace-${PV}.tar.bz2/download strace-${PV}.tar.bz2" +SRCURL="http://sourceforge.net/projects/strace/files/strace/${PV}/strace-${PV}.tar.bz2/download strace-${PV}.tar.xz" # PATCHES="" From 7b075c7d45273afb634b64327026f5c3f4a598c8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 2 Nov 2017 11:26:24 +0100 Subject: [PATCH 3/4] strace: Securely download source archive over HTTPS --- strace.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strace.be0 b/strace.be0 index 57582d61a..c72ba2136 100755 --- a/strace.be0 +++ b/strace.be0 @@ -4,7 +4,7 @@ PGRP=( system ) -SRCURL="http://sourceforge.net/projects/strace/files/strace/${PV}/strace-${PV}.tar.bz2/download strace-${PV}.tar.xz" +SRCURL="https://sourceforge.net/projects/strace/files/strace/${PV}/strace-${PV}.tar.bz2/download strace-${PV}.tar.xz" # PATCHES="" From ff53e2d19de9bf09ff7acd07af6f38ec94f68e9d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 2 Nov 2017 11:28:23 +0100 Subject: [PATCH 4/4] strace: Re-create bee file Use the command below to re-create the bee file to use the latest template. ``` $ bee init https://sourceforge.net/projects/strace/files/strace/4.19/strace-4.19.tar.xz/download creating strace-4.19-0.bee from template '/etc/default/bee/templates/fallback' $ # convert to version less bee file again ``` --- strace.be0 | 90 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 76 insertions(+), 14 deletions(-) diff --git a/strace.be0 b/strace.be0 index c72ba2136..cb181bd88 100755 --- a/strace.be0 +++ b/strace.be0 @@ -1,23 +1,85 @@ -#!/bin/env beesh +#!/usr/bin/env beesh # BEE_VERSION strace-4.19-0 -PGRP=( system ) +## 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.) -SRCURL="https://sourceforge.net/projects/strace/files/strace/${PV}/strace-${PV}.tar.bz2/download strace-${PV}.tar.xz" +############################################################################### +## 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. -# PATCHES="" +SRCURL[0]="https://downloads.sourceforge.net/project/strace/strace/${PKGVERSION}/strace-${PKGVERSION}.tar.xz" -# EXCLUDE="" +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. -# mee_configure() { -# bee_configure -# } +# PATCHURL+=() -# mee_build() { -# bee_build -# } +############################################################################### +## 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. -# mee_install() { -# bee_install -# } +# 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 + + +############################################################################### +## 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 "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#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/ +##