From bc210da8862daec7d5250b84585e78eaad2f9a27 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:51:19 +0100 Subject: [PATCH 01/36] libbytesize: Add version 1.2 [Description][1]: > The libbytesize package is a library facilitates the common operations > with sizes in bytes. Create the bee file with the command below. ``` $ bee init https://github.com/storaged-project/libbytesize/releases/download/1.2/libbytesize-1.2.tar.gz creating libbytesize-1.2-0.bee from template '/etc/default/bee/templates/fallback' ``` [1]: http://www.linuxfromscratch.org/blfs/view/svn/general/libbytesize.html --- libbytesize-1.2-0.bee | 83 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 libbytesize-1.2-0.bee diff --git a/libbytesize-1.2-0.bee b/libbytesize-1.2-0.bee new file mode 100755 index 000000000..d5973f2e3 --- /dev/null +++ b/libbytesize-1.2-0.bee @@ -0,0 +1,83 @@ +#!/usr/bin/env beesh + +## 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://github.com/storaged-project/libbytesize/releases/download/${PKGVERSION}/libbytesize-${PKGVERSION}.tar.gz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## 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+=() + +############################################################################### +## 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/ +## From f3c15e5f98417e47c4a70e4def0904c987a5a0cf Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:53:12 +0100 Subject: [PATCH 02/36] libbytesize: Convert to versionless bee file --- libbytesize-1.2-0.bee => libbytesize.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libbytesize-1.2-0.bee => libbytesize.be0 (98%) diff --git a/libbytesize-1.2-0.bee b/libbytesize.be0 similarity index 98% rename from libbytesize-1.2-0.bee rename to libbytesize.be0 index d5973f2e3..90004bcca 100755 --- a/libbytesize-1.2-0.bee +++ b/libbytesize.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libbytesize-1.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.) From 5b8bb2da191750a7a2db29402b66fa02999e38d6 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:45:13 +0100 Subject: [PATCH 03/36] libblockdev: Add version 2.16 [Description][1]: > libblockdev is a C library supporting GObject introspection for > manipulation of block devices. It has a plugin-based architecture > where each technology (like LVM, Btrfs, MD RAID, Swap,...) is > implemented in a separate plugin, possibly with multiple > implementations (e.g. using LVM CLI or the new LVM DBus API). ``` $ bee init https://github.com/storaged-project/libblockdev/releases/download/2.16-1/libblockdev-2.16.tar.gz creating libblockdev-2.16-0.bee from template '/etc/default/bee/templates/fallback' ``` [1]: http://www.linuxfromscratch.org/blfs/view/svn/general/libblockdev.html --- libblockdev-2.16-0.bee | 83 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 libblockdev-2.16-0.bee diff --git a/libblockdev-2.16-0.bee b/libblockdev-2.16-0.bee new file mode 100755 index 000000000..9d91131e4 --- /dev/null +++ b/libblockdev-2.16-0.bee @@ -0,0 +1,83 @@ +#!/usr/bin/env beesh + +## 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://github.com/storaged-project/libblockdev/releases/download/${PKGVERSION}-1/libblockdev-${PKGVERSION}.tar.gz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## 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+=() + +############################################################################### +## 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/ +## From 70e65758800d28ae4201231bf4a253abd226315a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:47:07 +0100 Subject: [PATCH 04/36] libblockdev: Convert to versionless bee file --- libblockdev-2.16-0.bee => libblockdev.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libblockdev-2.16-0.bee => libblockdev.be0 (98%) diff --git a/libblockdev-2.16-0.bee b/libblockdev.be0 similarity index 98% rename from libblockdev-2.16-0.bee rename to libblockdev.be0 index 9d91131e4..c46842ba4 100755 --- a/libblockdev-2.16-0.bee +++ b/libblockdev.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libblockdev-2.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 ebe915c2df3d50d13cc004ba8b46390dcb9672c6 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:41:54 +0100 Subject: [PATCH 05/36] udisks: Update version from 2.1.8 to 2.7.6 https://github.com/storaged-project/udisks/blob/7246165b8913e01fe547a551c617acbe27d91a24/NEWS#L17 --- udisks.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/udisks.be0 b/udisks.be0 index 2489f0758..3845e24d0 100755 --- a/udisks.be0 +++ b/udisks.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION udisks-2.1.8-0 +# BEE_VERSION udisks-2.7.6-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,7 +9,7 @@ ## 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://udisks.freedesktop.org/releases/udisks-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://github.com/storaged-project/udisks/releases/download/udisks-${PKGVERSION}/udisks-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 6d1f3c1f2dd4f4e6bb2842649735218f9cc270e3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 27 Sep 2019 15:41:22 +0200 Subject: [PATCH 06/36] libbytesize: Update version from 1.2 to 2.1 https://github.com/storaged-project/libbytesize/blob/2.1/NEWS.rst --- libbytesize.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libbytesize.be0 b/libbytesize.be0 index 90004bcca..353e650f3 100755 --- a/libbytesize.be0 +++ b/libbytesize.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libbytesize-1.2-0 +# BEE_VERSION libbytesize-2.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.) From a0063b516fa9800c8beb2726331e4c08cff6c046 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 27 Sep 2019 15:45:22 +0200 Subject: [PATCH 07/36] pcre2: Add version 10.33 Needed by libbytesize. *** Libbytesize encountered the following issues during configuration: No package 'libpcre2-8' found --- pcre2.be0 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 pcre2.be0 diff --git a/pcre2.be0 b/pcre2.be0 new file mode 100755 index 000000000..ee06fc993 --- /dev/null +++ b/pcre2.be0 @@ -0,0 +1,35 @@ +#!/usr/bin/env beesh + +# BEE_VERSION pcre2-10.33-0 + +SRCURL[0]="https://downloads.sourceforge.net/pcre/pcre2-${PKGVERSION}.tar.bz2" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#} From f9673b04d4fc5c690521efa851a69eb5c9d5cec0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 27 Sep 2019 15:49:41 +0200 Subject: [PATCH 08/36] pcre2: Use Autotools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Linux From Scratch book uses it, so it’ll be easier to compare options. --- pcre2.be0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pcre2.be0 b/pcre2.be0 index ee06fc993..80abd2937 100755 --- a/pcre2.be0 +++ b/pcre2.be0 @@ -6,6 +6,8 @@ SRCURL[0]="https://downloads.sourceforge.net/pcre/pcre2-${PKGVERSION}.tar.bz2" # PATCHURL+=() +BEE_BUILDTYPE=autotools + # build_in_sourcedir # sourcesubdir_append src From 72d29730e3d7a9eb079ea18414d3ee031ced6d1c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 27 Sep 2019 15:50:18 +0200 Subject: [PATCH 09/36] pcre2: Do not build static version of library --- pcre2.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pcre2.be0 b/pcre2.be0 index 80abd2937..bbbda32ef 100755 --- a/pcre2.be0 +++ b/pcre2.be0 @@ -20,9 +20,10 @@ BEE_BUILDTYPE=autotools # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-static +} #mee_build() { # bee_build From 159d33aefe36275efdd95ab29c9b669c2bf187ad Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:59:07 +0100 Subject: [PATCH 10/36] volume-key: Add version 0.3.9 This is required by udisks2. --- volume_key-0.3.9-0.bee | 83 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100755 volume_key-0.3.9-0.bee diff --git a/volume_key-0.3.9-0.bee b/volume_key-0.3.9-0.bee new file mode 100755 index 000000000..350e4a1b6 --- /dev/null +++ b/volume_key-0.3.9-0.bee @@ -0,0 +1,83 @@ +#!/usr/bin/env beesh + +## 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://releases.pagure.org/volume_key/volume_key-${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+=() + +############################################################################### +## 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+=() + +############################################################################### +## 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/ +## From 20a85a4704efbd620cac6efb5fc2471e08c22100 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:11:42 +0200 Subject: [PATCH 11/36] volume_key: Convert to versionless bee file --- volume_key-0.3.9-0.bee => volume_key.be0 | 2 ++ 1 file changed, 2 insertions(+) rename volume_key-0.3.9-0.bee => volume_key.be0 (98%) diff --git a/volume_key-0.3.9-0.bee b/volume_key.be0 similarity index 98% rename from volume_key-0.3.9-0.bee rename to volume_key.be0 index 350e4a1b6..5399b9876 100755 --- a/volume_key-0.3.9-0.bee +++ b/volume_key.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION volume_key-0.3.9-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 8e4aaf29592244527c83db8d72a8e2b25cf97771 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:27:22 +0200 Subject: [PATCH 12/36] volume_key: Build without Python 2/3 bindings Fix the error below (thanks to our package wrappers): /dev/shm/bee-root/volume/volume_key-0.3.9-0/source/python/volume_key_wrap.c:125:10: fatal error: Python.h: No such file or directory #include ^~~~~~~~~~ compilation terminated. http://www.linuxfromscratch.org/blfs/view/svn/postlfs/volume_key.html > --without-python: This parameter prevents building the Python 2 bindings, if Python-2.7.16 is installed. --- volume_key.be0 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/volume_key.be0 b/volume_key.be0 index 5399b9876..db08cb115 100755 --- a/volume_key.be0 +++ b/volume_key.be0 @@ -53,9 +53,11 @@ SRCURL[0]="https://releases.pagure.org/volume_key/volume_key-${PKGVERSION}.tar.x # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --without-python \ + --without-python3 +} #mee_build() { # bee_build From 409ffadb0717bc2371e8e87645b83506a6c39075 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:33:42 +0200 Subject: [PATCH 13/36] volume_key: Update version from 0.3.9 to 0.3.12 --- volume_key.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/volume_key.be0 b/volume_key.be0 index db08cb115..77e2427c0 100755 --- a/volume_key.be0 +++ b/volume_key.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION volume_key-0.3.9-0 +# BEE_VERSION volume_key-0.3.12-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 2a1dede649356b0b07227f06a459b1698c511f1a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:40:30 +0200 Subject: [PATCH 14/36] volume_key: Enable Python bindings The configuration was fixed for volume_key 0.3.12. --- volume_key.be0 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/volume_key.be0 b/volume_key.be0 index 77e2427c0..4ccc5a4f8 100755 --- a/volume_key.be0 +++ b/volume_key.be0 @@ -54,9 +54,7 @@ SRCURL[0]="https://releases.pagure.org/volume_key/volume_key-${PKGVERSION}.tar.x #} mee_configure() { - bee_configure \ - --without-python \ - --without-python3 + bee_configure } #mee_build() { From bb9fc8a40366ae74845c64014176bb52763d1b05 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:53:33 +0200 Subject: [PATCH 15/36] libassuan: Strip trailing space --- libassuan-2.0.1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libassuan-2.0.1-0.bee b/libassuan-2.0.1-0.bee index 7fe1b6453..ee937469f 100755 --- a/libassuan-2.0.1-0.bee +++ b/libassuan-2.0.1-0.bee @@ -19,7 +19,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From f231ed36019c3b23e78ea5cebfca100e9ccfa452 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:54:06 +0200 Subject: [PATCH 16/36] libassuan: Securely download source archive over HTTPS --- libassuan-2.0.1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libassuan-2.0.1-0.bee b/libassuan-2.0.1-0.bee index ee937469f..caaefc0d6 100755 --- a/libassuan-2.0.1-0.bee +++ b/libassuan-2.0.1-0.bee @@ -1,6 +1,6 @@ #!/bin/env beesh -SRCURL[0]="ftp://ftp.gnupg.org/gcrypt/libassuan/libassuan-2.0.1.tar.bz2" +SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.0.1.tar.bz2" PATCHURL[0]="" From 67cec33d0a694b8f86ed5121173d5c00808c5319 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:54:29 +0200 Subject: [PATCH 17/36] libassuan: Use bee variable PKGVERSION --- libassuan-2.0.1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libassuan-2.0.1-0.bee b/libassuan-2.0.1-0.bee index caaefc0d6..d078e28c5 100755 --- a/libassuan-2.0.1-0.bee +++ b/libassuan-2.0.1-0.bee @@ -1,6 +1,6 @@ #!/bin/env beesh -SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-2.0.1.tar.bz2" +SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From 04cf8918179e442a8f1e72c64f1c6e358ca1d633 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:55:09 +0200 Subject: [PATCH 18/36] libassuan: Convert to versionless bee file --- libassuan-2.0.1-0.bee => libassuan.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libassuan-2.0.1-0.bee => libassuan.be0 (91%) diff --git a/libassuan-2.0.1-0.bee b/libassuan.be0 similarity index 91% rename from libassuan-2.0.1-0.bee rename to libassuan.be0 index d078e28c5..0f99dd49c 100755 --- a/libassuan-2.0.1-0.bee +++ b/libassuan.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION libassuan-2.0.1-0 + SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From ab7b535ca8da604ebdb868b3bc4f83483ce4994c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:56:16 +0200 Subject: [PATCH 19/36] libassuan: Use current minimal bee file template --- libassuan.be0 | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/libassuan.be0 b/libassuan.be0 index 0f99dd49c..69d1cba20 100755 --- a/libassuan.be0 +++ b/libassuan.be0 @@ -1,33 +1,35 @@ -#!/bin/env beesh +#!/usr/bin/env beesh # BEE_VERSION libassuan-2.0.1-0 SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKGVERSION}.tar.bz2" -PATCHURL[0]="" +# PATCHURL+=() -# BEE_CONFIGURE=compat +# build_in_sourcedir -# EXCLUDE="" +# sourcesubdir_append src +#mee_extract() { +# bee_extract "${@}" +#} +#mee_patch() { +# bee_patch "${@}" +#} -mee_extract() { - bee_extract ${@} -} +#mee_configure() { +# bee_configure +#} -mee_patch() { - bee_patch ${@} -} +#mee_build() { +# bee_build +#} -mee_configure() { - bee_configure -} +#mee_install() { +# bee_install +#} -mee_build() { - bee_build -} - -mee_install() { - bee_install -} +#mee_install_post() { +# exit +#} From 9fcf198c0034a7b8156d66b3d10a7e13473f3930 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:57:33 +0200 Subject: [PATCH 20/36] libassuan: Update version from 2.0.1 to 2.5.3 --- libassuan.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libassuan.be0 b/libassuan.be0 index 69d1cba20..05dbbabdc 100755 --- a/libassuan.be0 +++ b/libassuan.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libassuan-2.0.1-0 +# BEE_VERSION libassuan-2.5.3-0 SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/libassuan/libassuan-${PKGVERSION}.tar.bz2" From 40b264bf02d7e5f3291715959a87f85d8d7a553e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 11:08:08 +0200 Subject: [PATCH 21/36] gmime: Rebuild against GPGME 1.13.1 Increment revision to 1. --- gmime.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gmime.be0 b/gmime.be0 index a744fca82..3547de086 100755 --- a/gmime.be0 +++ b/gmime.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gmime-2.6.23-0 +# BEE_VERSION gmime-2.6.23-1 ## 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 c00e819d43eecd1c5cfd8fe0690bfa44f80d6d8c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:43:29 +0200 Subject: [PATCH 22/36] gpgme: Strip trailing space --- gpgme-1.3.0-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpgme-1.3.0-0.bee b/gpgme-1.3.0-0.bee index 9c9788610..c71563c82 100755 --- a/gpgme-1.3.0-0.bee +++ b/gpgme-1.3.0-0.bee @@ -19,7 +19,7 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure } mee_build() { From 22c53ccffce5c5258c6d261eae2d3ac29a69b50f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:43:50 +0200 Subject: [PATCH 23/36] gpgme: Securely download source archive over HTTPS --- gpgme-1.3.0-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpgme-1.3.0-0.bee b/gpgme-1.3.0-0.bee index c71563c82..1956ca574 100755 --- a/gpgme-1.3.0-0.bee +++ b/gpgme-1.3.0-0.bee @@ -1,6 +1,6 @@ #!/bin/env beesh -SRCURL[0]="ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-1.3.0.tar.bz2" +SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.3.0.tar.bz2" PATCHURL[0]="" From c9eb18128ad6919141199578db0c302c3cb12ec7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:44:22 +0200 Subject: [PATCH 24/36] gpgme: Use bee variable PKGVERSION --- gpgme-1.3.0-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpgme-1.3.0-0.bee b/gpgme-1.3.0-0.bee index 1956ca574..2140ed1f1 100755 --- a/gpgme-1.3.0-0.bee +++ b/gpgme-1.3.0-0.bee @@ -1,6 +1,6 @@ #!/bin/env beesh -SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.3.0.tar.bz2" +SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From d8329b08f16069ccca3acfd2db753958560d95d5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:45:12 +0200 Subject: [PATCH 25/36] gpgme: Convert to versionless bee file --- gpgme-1.3.0-0.bee => gpgme.be0 | 2 ++ 1 file changed, 2 insertions(+) rename gpgme-1.3.0-0.bee => gpgme.be0 (92%) diff --git a/gpgme-1.3.0-0.bee b/gpgme.be0 similarity index 92% rename from gpgme-1.3.0-0.bee rename to gpgme.be0 index 2140ed1f1..24e8cdb33 100755 --- a/gpgme-1.3.0-0.bee +++ b/gpgme.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION gpgme-1.3.0-0 + SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${PKGVERSION}.tar.bz2" PATCHURL[0]="" From 0dcabe9ba07066e3c28583d68348170d36c688da Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:46:35 +0200 Subject: [PATCH 26/36] ggpme: Use current minimal bee file template --- gpgme.be0 | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/gpgme.be0 b/gpgme.be0 index 24e8cdb33..d304fadc7 100755 --- a/gpgme.be0 +++ b/gpgme.be0 @@ -1,33 +1,35 @@ -#!/bin/env beesh +#!/usr/bin/env beesh # BEE_VERSION gpgme-1.3.0-0 SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${PKGVERSION}.tar.bz2" -PATCHURL[0]="" +# PATCHURL+=() -# BEE_CONFIGURE=compat +build_in_sourcedir -# EXCLUDE="" +# sourcesubdir_append src -B=${S} +#mee_extract() { +# bee_extract "${@}" +#} -mee_extract() { - bee_extract ${@} -} +#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 +#} -mee_install() { - bee_install -} +#mee_install_post() { +# exit +#} From b00f9d26338982038dd8f9eff4e5adfb0bb61bd2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:48:01 +0200 Subject: [PATCH 27/36] gpgme: Update version from 1.3.0 to 1.13.1 Needed for cryptsetup 2.0.6. --- gpgme.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gpgme.be0 b/gpgme.be0 index d304fadc7..157683067 100755 --- a/gpgme.be0 +++ b/gpgme.be0 @@ -1,12 +1,12 @@ #!/usr/bin/env beesh -# BEE_VERSION gpgme-1.3.0-0 +# BEE_VERSION gpgme-1.13.1-0 SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${PKGVERSION}.tar.bz2" # PATCHURL+=() -build_in_sourcedir +# build_in_sourcedir # sourcesubdir_append src From c63abd36b2f5d039be4db3d1d4fbef89086174ab Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 11:01:55 +0200 Subject: [PATCH 28/36] gpgme: Disable GPG tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GPG tests fail, because our GPG installation is outdated. Making all in gpgsm make[2]: Entering directory '/dev/shm/bee-root/gpgme/gpgme-1.13.1-0/build/tests/gpgsm' echo disable-crl-checks > ./gpgsm.conf echo 32100C27173EF6E9C4E9A25D3D69F86D37A4F939 > ./trustlist.txt GNUPGHOME=/dev/shm/bee-root/gpgme/gpgme-1.13.1-0/build/tests/gpgsm LC_ALL=C GPG_AGENT_INFO= top_srcdir=/dev/shm/bee-root/gpgme/gpgme-1.13.1-0/source gpgconf --kill all echo faked-system-time 1008241200 >> ./gpgsm.conf echo >> ./trustlist.txt /bin/sh: gpgconf: command not found make[2]: [Makefile:938: gpg-sample.stamp] Error 127 (ignored) /bin/mkdir -p ./private-keys-v1.d cp /dev/shm/bee-root/gpgme/gpgme-1.13.1-0/source/tests/gpgsm/32100C27173EF6E9C4E9A25D3D69F86D37A4F939 private-keys-v1.d/32100C27173EF6E9C4E9A25D3D69F86D37A4F939.key echo x > ./gpg-sample.stamp echo "agent-program `which gpg-agent`|--debug-quick-random" >> ./gpgsm.conf echo "# CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE" >> ./trustlist.txt GNUPGHOME=/dev/shm/bee-root/gpgme/gpgme-1.13.1-0/build/tests/gpgsm LC_ALL=C GPG_AGENT_INFO= top_srcdir=/dev/shm/bee-root/gpgme/gpgme-1.13.1-0/source gpgsm --import /dev/shm/bee-root/gpgme/gpgme-1.13.1-0/source/tests/gpgsm/cert_g10code_test1.der echo "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E S" >> ./trustlist.txt which: no gpg-agent in (/bin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/package/bin:/usr/local/bin:/home/pmenzel/bin:/home/pmenzel/.cargo/bin) /bin/sh: gpgsm: command not found make[2]: *** [Makefile:929: pubring-stamp] Error 127 make[2]: *** Waiting for unfinished jobs.... make[2]: Leaving directory '/dev/shm/bee-root/gpgme/gpgme-1.13.1-0/build/tests/gpgsm' make[1]: *** [Makefile:720: all-recursive] Error 1 make[1]: Leaving directory '/dev/shm/bee-root/gpgme/gpgme-1.13.1-0/build/tests' make: *** [Makefile:534: all-recursive] Error 1 Command exited with non-zero status 2 http://www.linuxfromscratch.org/blfs/view/svn/postlfs/gpgme.html > --disable-gpg-test: if this parameter is not passed to configure, the test programs are built during make stage, which requires GnuPG-2.2.17. This parameter is not needed if GnuPG-2.2.17 is installed. --- gpgme.be0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gpgme.be0 b/gpgme.be0 index 157683067..2a00af096 100755 --- a/gpgme.be0 +++ b/gpgme.be0 @@ -18,9 +18,10 @@ SRCURL[0]="https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-${PKGVERSION}.tar.bz2" # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-gpg-test +} #mee_build() { # bee_build From 236a033ff0cbac70365ff605ea0f273a42305424 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 11:09:36 +0200 Subject: [PATCH 29/36] dar: Rebuild against GPGME 1.13.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s technically not necessary, as the files are linked against `/usr/lib/libgpgme.so.11` and that stays the same. lrwxrwxrwx 1 root root 18 May 10 2011 /usr/lib/libgpgme.so.11 -> libgpgme.so.11.7.0 lrwxrwxrwx 1 root root 19 Sep 28 11:04 /usr/lib/libgpgme.so.11 -> libgpgme.so.11.22.1 But, do it anyways, as some other small fixes went in. Increment the revision to 1. --- dar.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dar.be0 b/dar.be0 index 0b4f87847..718e543d8 100755 --- a/dar.be0 +++ b/dar.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION dar-2.6.5-0 +# BEE_VERSION dar-2.6.5-1 SRCURL[0]="https://downloads.sourceforge.net/dar/dar/${PKGVERSION}/dar-${PKGVERSION}.tar.gz" @@ -36,4 +36,4 @@ mee_install_post() { rm -vfr ${D}/usr/include/dar rm -vf ${D}/usr/lib/libdar64.a rm -vf ${D}/usr/lib/pkgconfig/libdar64.pc -} \ No newline at end of file +} From 3e06a10009db5c861a79e809cac80238a085c36d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 11:10:10 +0200 Subject: [PATCH 30/36] dar: Do not build static version of library --- dar.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dar.be0 b/dar.be0 index 718e543d8..df7faf513 100755 --- a/dar.be0 +++ b/dar.be0 @@ -20,6 +20,7 @@ build_in_sourcedir mee_configure() { bee_configure \ + --disable-static \ --disable-build-html } @@ -34,6 +35,5 @@ mee_configure() { mee_install_post() { rm -vfr ${D}/usr/share/dar rm -vfr ${D}/usr/include/dar - rm -vf ${D}/usr/lib/libdar64.a rm -vf ${D}/usr/lib/pkgconfig/libdar64.pc } From c4f5e09d424774e7105143297202e109da6a7cff Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 11:12:41 +0200 Subject: [PATCH 31/36] dar: Use variables over hard coding paths Now, people can use a different prefix. --- dar.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dar.be0 b/dar.be0 index df7faf513..ae660a66c 100755 --- a/dar.be0 +++ b/dar.be0 @@ -33,7 +33,7 @@ mee_configure() { #} mee_install_post() { - rm -vfr ${D}/usr/share/dar - rm -vfr ${D}/usr/include/dar - rm -vf ${D}/usr/lib/pkgconfig/libdar64.pc + rm -vfr ${D}${DATADIR}/dar + rm -vfr ${D}${INCLUDEDIR}/dar + rm -vf ${D}${LIBDIR}/pkgconfig/libdar64.pc } From a0e4b27a8d66923be3529862e0d84fbc7c21fe93 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:18:20 +0200 Subject: [PATCH 32/36] cryptsetup: Add version 2.0.6 [Description][1]: > cryptsetup is used to set up transparent encryption of block devices > using the kernel crypto API. Needed by volume_key 0.3.6. checking for libcryptsetup... no configure: error: Package requirements (libcryptsetup) were not met: No package 'libcryptsetup' found [1]: http://www.linuxfromscratch.org/blfs/view/9.0/postlfs/cryptsetup.html --- cryptsetup.be0 | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 cryptsetup.be0 diff --git a/cryptsetup.be0 b/cryptsetup.be0 new file mode 100755 index 000000000..c59cf2046 --- /dev/null +++ b/cryptsetup.be0 @@ -0,0 +1,35 @@ +#!/usr/bin/env beesh + +# BEE_VERSION cryptsetup-2.0.6-0 + +SRCURL[0]="https://www.kernel.org/pub/linux/utils/cryptsetup/v${PKGVERSION[2]}/cryptsetup-${PKGVERSION}.tar.xz" + +# PATCHURL+=() + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} + +#mee_install_post() { +# exit +#} From 02c90ef76d27504e7e7f1a18ad4e41454397dcde Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 27 Sep 2019 15:37:32 +0200 Subject: [PATCH 33/36] libblockdev: Update version from 2.16 to 2.23 https://github.com/storaged-project/libblockdev/blob/2.23-1/NEWS.rst --- libblockdev.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libblockdev.be0 b/libblockdev.be0 index c46842ba4..c4b2bdd2e 100755 --- a/libblockdev.be0 +++ b/libblockdev.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libblockdev-2.16-0 +# BEE_VERSION libblockdev-2.23-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 45433c3e8ff40b6836fa91bbdb6e9f5effd494fc Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 27 Sep 2019 15:57:46 +0200 Subject: [PATCH 34/36] libblockdev: Disable dmraid, crypto, nvdimm and gtk-doc Fix the errors below: *** Libblockdev encountered the following issues during configuration: No package 'libcryptsetup' found libvolume_key.h not available Requested 'devmapper >= 1.02.93' but version of devmapper is 1.02.79 dmraid.h not available No package 'libndctl' found *** Libblockdev will not successfully build without these missing dependencies --- libblockdev.be0 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libblockdev.be0 b/libblockdev.be0 index c4b2bdd2e..da824261e 100755 --- a/libblockdev.be0 +++ b/libblockdev.be0 @@ -53,9 +53,16 @@ SRCURL[0]="https://github.com/storaged-project/libblockdev/releases/download/${P # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --without-gtk-doc \ + --without-dm \ + --without-lvm \ + --without-lvm-dbus \ + --without-mpath \ + --without-crypto \ + --without-nvdimm +} #mee_build() { # bee_build From 5510fb2997f2f314a9882a5f754db7cb4597f7c3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 28 Sep 2019 10:09:46 +0200 Subject: [PATCH 35/36] libblockdev: Build with crypto udisks2 requires this. --- libblockdev.be0 | 1 - 1 file changed, 1 deletion(-) diff --git a/libblockdev.be0 b/libblockdev.be0 index da824261e..7797c3374 100755 --- a/libblockdev.be0 +++ b/libblockdev.be0 @@ -60,7 +60,6 @@ mee_configure() { --without-lvm \ --without-lvm-dbus \ --without-mpath \ - --without-crypto \ --without-nvdimm } From 8771cdd3c3d7f5d411e3777fc25419540dc2895c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 27 Sep 2019 12:36:45 +0200 Subject: [PATCH 36/36] udisks: Update version from 2.1.8 to 2.8.4 [Version 2.7.6 was never built.] Changes: https://github.com/storaged-project/udisks/blob/7246165b8913e01fe547a551c617acbe27d91a24/NEWS#L17 --- udisks.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udisks.be0 b/udisks.be0 index 3845e24d0..bb2cfe94b 100755 --- a/udisks.be0 +++ b/udisks.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION udisks-2.7.6-0 +# BEE_VERSION udisks-2.8.4-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.)