From 3e996d198dae68acb51a498881ec6f2eeb902831 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 19 Feb 2018 11:49:07 +0100 Subject: [PATCH 01/76] sysvinit: Remove version 2.88dsf-2 The functionality is replaced by systemd. --- sysvinit-2.88dsf-2.bee | 44 ------------------------------------------ 1 file changed, 44 deletions(-) delete mode 100755 sysvinit-2.88dsf-2.bee diff --git a/sysvinit-2.88dsf-2.bee b/sysvinit-2.88dsf-2.bee deleted file mode 100755 index 574e65c8e..000000000 --- a/sysvinit-2.88dsf-2.bee +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/env beesh - -PGRP=( core ) - -SRCURL[0]="http://ftp.twaren.net/Unix/NonGNU/sysvinit/sysvinit-2.88dsf.tar.bz2" - -PATCHES[0]="" - -# EXCLUDE="" - -B=${S} - -mee_patch() { - bee_patch - sed -i 's@Sending processes@& configured via /etc/inittab@g' \ - src/init.c - sed -i -e 's/utmpdump wall/utmpdump/' \ - -e 's/mountpoint.1 wall.1/mountpoint.1/' src/Makefile -} - -mee_configure() { - true -} - -mee_build() { - bee_build -C src -} - -mee_install() { - bee_install ROOT=${D} -C src install - rm ${D}/bin/mountpoint - rm ${D}/sbin/sulogin - rm ${D}/usr/bin/last - rm ${D}/usr/bin/lastb - rm ${D}/usr/bin/mesg - rm ${D}/usr/bin/utmpdump - rm ${D}/usr/share/man/man1/last.1 - rm ${D}/usr/share/man/man1/lastb.1 - rm ${D}/usr/share/man/man1/mesg.1 - rm ${D}/usr/share/man/man1/utmpdump.1 - rm ${D}/usr/share/man/man1/mountpoint.1 - rm ${D}/usr/share/man/man8/sulogin.8 -} - From 146e78c839470707db2ae1dd7b0279e3bf4cf00a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 6 Feb 2018 13:43:34 +0100 Subject: [PATCH 02/76] systemd: Use current bee file template Recreate the bee file with the command below, and add back customizations. ``` $ bee init -f http://www.freedesktop.org/software/systemd/systemd-27.tar.bz2 creating systemd-27-0.bee from template '/etc/default/bee/templates/fallback' ``` --- systemd-27-0.bee | 81 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 68 insertions(+), 13 deletions(-) diff --git a/systemd-27-0.bee b/systemd-27-0.bee index dfca9af52..697f30e59 100755 --- a/systemd-27-0.bee +++ b/systemd-27-0.bee @@ -1,18 +1,55 @@ -#!/bin/env beesh +#!/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]="http://www.freedesktop.org/software/systemd/systemd-${PKGVERSION}.tar.bz2" -PGRP=( uncategorized ) +############################################################################### +## 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. -# BEE_CONFIGURE=compat +# 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 -mee_patch() { - bee_patch -} + +############################################################################### +## 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 \ @@ -23,11 +60,29 @@ mee_configure() { --with-rootdir="" } -mee_build() { - bee_build -} +#mee_build() { +# bee_build +#} -mee_install() { - bee_install -} +#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 71730d5292344b3037706d16c795f987f2243dc1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 6 Feb 2018 13:46:39 +0100 Subject: [PATCH 03/76] systemd: Securely download source archive Use HTTPS to securely download the source archive. --- systemd-27-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd-27-0.bee b/systemd-27-0.bee index 697f30e59..7b1595b0d 100755 --- a/systemd-27-0.bee +++ b/systemd-27-0.bee @@ -7,7 +7,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]="http://www.freedesktop.org/software/systemd/systemd-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://www.freedesktop.org/software/systemd/systemd-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 5b77bcddebfe754b0e505ff3afcd4ba9ca56bdf4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 6 Feb 2018 13:47:34 +0100 Subject: [PATCH 04/76] systemd: Convert to versionless bee file --- systemd-27-0.bee => systemd.be0 | 2 ++ 1 file changed, 2 insertions(+) rename systemd-27-0.bee => systemd.be0 (98%) diff --git a/systemd-27-0.bee b/systemd.be0 similarity index 98% rename from systemd-27-0.bee rename to systemd.be0 index 7b1595b0d..902938e2c 100755 --- a/systemd-27-0.bee +++ b/systemd.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION systemd-27-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 1dbe426bcab04e6ad098578dd6a2798d470b2bd8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 6 Feb 2018 13:59:31 +0100 Subject: [PATCH 05/76] systemd: Update version from 27 to 237 Convert configure to Meson, and update URL. --- systemd.be0 | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/systemd.be0 b/systemd.be0 index 902938e2c..f2cf53ddd 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION systemd-27-0 +# BEE_VERSION systemd-237-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://www.freedesktop.org/software/systemd/systemd-${PKGVERSION}.tar.bz2" +SRCURL[0]="https://github.com/systemd/systemd/archive/v${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. @@ -55,11 +55,17 @@ SRCURL[0]="https://www.freedesktop.org/software/systemd/systemd-${PKGVERSION}.ta mee_configure() { bee_configure \ - --with-distro=other \ - --with-sysvinit-path="" \ - --with-sysvrcd-path="" \ - --with-pamlibdir="/lib/security" \ - --with-rootdir="" + -Dblkid=true \ + -Dbuildtype=release \ + -Ddefault-dnssec=no \ + -Dfirstboot=false \ + -Dinstall-tests=false \ + -Dldconfig=false \ + -Drootprefix= \ + -Drootlibdir=/lib \ + -Dsplit-usr=true \ + -Dsysusers=false \ + -Db_lto=false } #mee_build() { From 5940c3c7e3bca14b5a83b4e0e20360f5322af648 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 19 Feb 2018 11:54:44 +0100 Subject: [PATCH 06/76] systemd: Create Sysvinit compatibilty symlinks [1] [1] http://www.linuxfromscratch.org/lfs/view/8.2-systemd-rc1/chapter06/systemd.html --- systemd.be0 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/systemd.be0 b/systemd.be0 index f2cf53ddd..a008e741d 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -77,6 +77,14 @@ mee_configure() { #} ## by default this may be 'make install DESTDIR="${D}"' +mee_install_post() { + mkdir ${D}/sbin + for tool in runlevel reboot shutdown poweroff halt telinit; do + ln -sfv ../bin/systemctl ${D}/sbin/${tool} + done + ln -sfv ../lib/systemd/systemd ${D}/sbin/init +} + ############################################################################### ## ## Additional hints: From 7654d2637cbe1c2d3e1bdd3718879864b4996267 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 19 Feb 2018 12:22:16 +0100 Subject: [PATCH 07/76] systemd: Remove force switch from `ln` We want to know, if there is an error. --- systemd.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd.be0 b/systemd.be0 index a008e741d..ee3bf7abf 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -80,9 +80,9 @@ mee_configure() { mee_install_post() { mkdir ${D}/sbin for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -sfv ../bin/systemctl ${D}/sbin/${tool} + ln -sv ../bin/systemctl ${D}/sbin/${tool} done - ln -sfv ../lib/systemd/systemd ${D}/sbin/init + ln -sv ../lib/systemd/systemd ${D}/sbin/init } ############################################################################### From 1094b811718e918fb7a4d3b43877c0eaa0c609a8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 19 Feb 2018 12:22:49 +0100 Subject: [PATCH 08/76] systemd: Hard link `/bin/systemd` to `/lib/systemd/systemd` @donald [comments] (https://github.molgen.mpg.de/mariux64/bee-files/pull/621#issuecomment-4766): > `CONFIG_CMDLINE="init=/bin/systemd"` should be removed. ( Quote > menuconfig: "systems with fully functional boot loaders (i.e. > non-embedded) should leave this option set to 'N' "). But currently we > have a lot of kernels running with that config. So we (1) either need to > provide /bin/systemd or (2) create some logic in initramfs/init if > `INIT=/bin/systemd` and it doesn't exist. I'd vote for option *2*, > because when the config is removed from the kernel, we need to provide > the default in initramfs anyway. We could treat `init=/bin/systemd` the > same as no value given, knowing that this is an obsoleted usage only. > > Then there are our few leftover lilo systems which have > append="init=/bin/systemd" ini /etc/lilo.conf. But these can be changed > easily. Now, the package contains the following file. ``` hrwxr-xr-x root/system 0 2018-02-19 12:46 /lib/systemd/systemd link to /bin/systemd ``` --- systemd.be0 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/systemd.be0 b/systemd.be0 index ee3bf7abf..43c141319 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -83,6 +83,9 @@ mee_install_post() { ln -sv ../bin/systemctl ${D}/sbin/${tool} done ln -sv ../lib/systemd/systemd ${D}/sbin/init + + # Support Linux kernels built with `CONFIG_CMDLINE="init=/bin/systemd"` + ln -v ${D}/lib/systemd/systemd ${D}/bin/systemd } ############################################################################### From 729ad5f88cd13d37ee3ae2729ff6e03d624a62f3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 12 Feb 2018 18:54:17 +0100 Subject: [PATCH 09/76] dbus: Use current bee file template Recreate the bee file with the command below, and add back customizations. ``` $ bee init -f -o dbus-1.4.0-2.bee http://dbus.freedesktop.org/releases/dbus/dbus-1.4.0.tar.gz creating dbus-1.4.0-2.bee from template '/etc/default/bee/templates/fallback' ``` --- dbus-1.4.0-2.bee | 74 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/dbus-1.4.0-2.bee b/dbus-1.4.0-2.bee index 87c361f04..acb967624 100755 --- a/dbus-1.4.0-2.bee +++ b/dbus-1.4.0-2.bee @@ -1,18 +1,56 @@ -#!/bin/env beesh +#!/usr/bin/env beesh -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[0]="http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz" +############################################################################### +## 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[0]="" +SRCURL[0]="http://dbus.freedesktop.org/releases/dbus/dbus-${PKGVERSION}.tar.gz" -# EXCLUDE="" +############################################################################### +## 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 LIBEXECDIR=/usr/lib/dbus-1.0 -B=${S} +############################################################################### +## 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() { systemdsystemunitdir=$(pkg-config --variable=systemdsystemunitdir systemd) @@ -25,7 +63,25 @@ mee_build() { make check } -mee_install() { - bee_install -} +#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 290fd377c0d40cf06e92d966be3a3e32b238fac8 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 12 Feb 2018 18:57:09 +0100 Subject: [PATCH 10/76] dbus: Convert to versionless bee file --- dbus-1.4.0-2.bee => dbus.be0 | 2 ++ 1 file changed, 2 insertions(+) rename dbus-1.4.0-2.bee => dbus.be0 (98%) diff --git a/dbus-1.4.0-2.bee b/dbus.be0 similarity index 98% rename from dbus-1.4.0-2.bee rename to dbus.be0 index acb967624..f0c35db99 100755 --- a/dbus-1.4.0-2.bee +++ b/dbus.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION dbus-1.4.0-2 + ## 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 530c69dc0d973e9fc8bce7e3c024bbdd59769196 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 19 Feb 2018 10:07:22 +0100 Subject: [PATCH 11/76] dbus: Securely download source archive Use HTTPS to securely download the source archive. --- dbus.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbus.be0 b/dbus.be0 index f0c35db99..8a4f6e003 100755 --- a/dbus.be0 +++ b/dbus.be0 @@ -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]="http://dbus.freedesktop.org/releases/dbus/dbus-${PKGVERSION}.tar.gz" +SRCURL[0]="https://dbus.freedesktop.org/releases/dbus/dbus-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 0f6592a1f980462d41c1799a7dcbc719742c45da Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 12 Feb 2018 18:57:50 +0100 Subject: [PATCH 12/76] dbus: Update version from 1.4.0 to 1.12.4 --- dbus.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbus.be0 b/dbus.be0 index 8a4f6e003..297d33254 100755 --- a/dbus.be0 +++ b/dbus.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION dbus-1.4.0-2 +# BEE_VERSION dbus-1.12.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.) From 9f04eda7943f0a5c89388abe13f1362aeef89f46 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 13 Feb 2018 10:56:10 +0100 Subject: [PATCH 13/76] dbus: Wrap long lines --- dbus.be0 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dbus.be0 b/dbus.be0 index 297d33254..bdf424f8f 100755 --- a/dbus.be0 +++ b/dbus.be0 @@ -57,7 +57,9 @@ LIBEXECDIR=/usr/lib/dbus-1.0 mee_configure() { systemdsystemunitdir=$(pkg-config --variable=systemdsystemunitdir systemd) - bee_configure --with-dbus-user=dbus --with-systemdsystemunitdir=${systemdsystemunitdir} + bee_configure \ + --with-dbus-user=dbus \ + --with-systemdsystemunitdir=${systemdsystemunitdir} } mee_build() { From 4ebc7a1dcb28bdd9a0fc7ee6a119bca39cdd328e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 13 Feb 2018 10:56:32 +0100 Subject: [PATCH 14/76] dbus: Ensure to build with systemd support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pass `--enable-system` to the configure script to Ensure, that D-Bus is built with systemd support. By default, the build still succeeds, but systemd support is disabled, if the configure script doesn’t find the right version. --- dbus.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/dbus.be0 b/dbus.be0 index bdf424f8f..5ebde0de5 100755 --- a/dbus.be0 +++ b/dbus.be0 @@ -59,6 +59,7 @@ mee_configure() { bee_configure \ --with-dbus-user=dbus \ + --enable-systemd \ --with-systemdsystemunitdir=${systemdsystemunitdir} } From 09a2a7161c1e6602a1439c661a525821e194cc15 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 11:12:47 +0100 Subject: [PATCH 15/76] dbus: Build outside of source directory --- dbus.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbus.be0 b/dbus.be0 index 5ebde0de5..e3a3e710c 100755 --- a/dbus.be0 +++ b/dbus.be0 @@ -28,7 +28,7 @@ SRCURL[0]="https://dbus.freedesktop.org/releases/dbus/dbus-${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. From 7c8f087c7594c6457b5eff41cdcd66ed1ee36062 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 11:21:56 +0100 Subject: [PATCH 16/76] dbus: Move system socket from `/var/run` to `/run` [1]: https://github.com/systemd/systemd/issues/8197 [2]: https://bugs.freedesktop.org/show_bug.cgi?id=101628 --- dbus.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/dbus.be0 b/dbus.be0 index e3a3e710c..453fb0e9b 100755 --- a/dbus.be0 +++ b/dbus.be0 @@ -60,6 +60,7 @@ mee_configure() { bee_configure \ --with-dbus-user=dbus \ --enable-systemd \ + --with-system-socket=/run/dbus/system_bus_socket \ --with-systemdsystemunitdir=${systemdsystemunitdir} } From e225444e8f0640cad44231602a3b9da22ae3e029 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 11:51:25 +0100 Subject: [PATCH 17/76] util-linux: Rebuild for systemd/udev update Increment the revision. --- util-linux.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-linux.be0 b/util-linux.be0 index 04a61702d..23b26f8d2 100755 --- a/util-linux.be0 +++ b/util-linux.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION util-linux-2.31.1-0 +# BEE_VERSION util-linux-2.31.1-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 6a7b54773899eabff746338ede873da28cb23a4b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 12:09:50 +0100 Subject: [PATCH 18/76] xorg-server: Rebuild for systemd/udev update Fix the error below. ``` /usr/libexec/Xorg: error while loading shared libraries: libudev.so.0: cannot open shared object file: No such file or directory ``` Increment the revision. --- xorg-server.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-server.be0 b/xorg-server.be0 index 3c420fdf5..038aa5e5d 100755 --- a/xorg-server.be0 +++ b/xorg-server.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xorg-server-1.19.6-0 +# BEE_VERSION xorg-server-1.19.6-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 a31a8a8ca8ae14aebb9303a0940a0b8070119253 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 12:53:37 +0100 Subject: [PATCH 19/76] pulseaudio: Securely download source archive Use HTTPS to securely download the source archive. --- pulseaudio.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulseaudio.be0 b/pulseaudio.be0 index d993448a4..dbaeddf13 100755 --- a/pulseaudio.be0 +++ b/pulseaudio.be0 @@ -2,7 +2,7 @@ # BEE_VERSION pulseaudio-10.0-0 -SRCURL[0]="http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PKGVERSION}.tar.xz" +SRCURL[0]="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PKGVERSION}.tar.xz" PATCHURL[0]="" From e6f8728cdf520d83c597d3f312d310b806031231 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 12:53:47 +0100 Subject: [PATCH 20/76] pulseaudio: Update version from 10.0 to 11.1 --- pulseaudio.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulseaudio.be0 b/pulseaudio.be0 index dbaeddf13..e42d724e0 100755 --- a/pulseaudio.be0 +++ b/pulseaudio.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION pulseaudio-10.0-0 +# BEE_VERSION pulseaudio-11.1-0 SRCURL[0]="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PKGVERSION}.tar.xz" From 03c54997d56fc5a201fe9b6a1106682b7c1e5f8d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 14:51:11 +0100 Subject: [PATCH 21/76] libgudev: Add version 232 [Description][1]: > The libgudev package contains GObject bindings for libudev. Disable [umockdev][2], as we do not have it installed, and do not need it. ``` checking for UMOCKDEV... no configure: error: Package requirements (umockdev-1.0) were not met: No package 'umockdev-1.0' found ``` Use `scripts/TEMPLATE.be0` to create bee file. [1]: http://www.linuxfromscratch.org/blfs/view/cvs/general/libgudev.html [2]: https://github.com/martinpitt/umockdev --- libgudev.be0 | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100755 libgudev.be0 diff --git a/libgudev.be0 b/libgudev.be0 new file mode 100755 index 000000000..5a336209e --- /dev/null +++ b/libgudev.be0 @@ -0,0 +1,86 @@ +#!/usr/bin/env beesh + +# BEE_VERSION libgudev-232-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://ftp.gnome.org/pub/gnome/sources/libgudev/${PKGVERSION}/libgudev-${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 \ + --disable-umockdev +} + +#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 a0390b9374b03a3c7b78fe8eb1db21e48b1bed15 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:45:24 +0200 Subject: [PATCH 22/76] libusb: Remove blank line at end of file --- libusb-1.0.19-0.bee | 1 - 1 file changed, 1 deletion(-) diff --git a/libusb-1.0.19-0.bee b/libusb-1.0.19-0.bee index 4b6265cd6..e3ccede01 100755 --- a/libusb-1.0.19-0.bee +++ b/libusb-1.0.19-0.bee @@ -23,4 +23,3 @@ mee_build() { mee_install() { bee_install } - From 6177024477b8958842666c55d424919e96f48101 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:45:36 +0200 Subject: [PATCH 23/76] libusb: Securely download source archive Use HTTPS to securely download the source archive. --- libusb-1.0.19-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libusb-1.0.19-0.bee b/libusb-1.0.19-0.bee index e3ccede01..bb898016a 100755 --- a/libusb-1.0.19-0.bee +++ b/libusb-1.0.19-0.bee @@ -2,7 +2,7 @@ PGRP=( uncategorized ) -SRCURL[0]="http://downloads.sourceforge.net/libusb/libusb-1.0.19.tar.bz2" +SRCURL[0]="https://downloads.sourceforge.net/libusb/libusb-1.0.19.tar.bz2" PATCHES[0]="" From d7bcc5e3a0dca2b1051d4230b7c2c69d56e86ea0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:46:15 +0200 Subject: [PATCH 24/76] libusb: Use package version variable in source URL --- libusb-1.0.19-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libusb-1.0.19-0.bee b/libusb-1.0.19-0.bee index bb898016a..63da5173c 100755 --- a/libusb-1.0.19-0.bee +++ b/libusb-1.0.19-0.bee @@ -2,7 +2,7 @@ PGRP=( uncategorized ) -SRCURL[0]="https://downloads.sourceforge.net/libusb/libusb-1.0.19.tar.bz2" +SRCURL[0]="https://downloads.sourceforge.net/libusb/libusb-${PKGVERSION}.tar.bz2" PATCHES[0]="" From ae99eb42f50fcc63952ed3d01bd23fe103240dd4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:46:50 +0200 Subject: [PATCH 25/76] libusb: Convert to versionless bee file --- libusb-1.0.19-0.bee => libusb.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libusb-1.0.19-0.bee => libusb.be0 (90%) diff --git a/libusb-1.0.19-0.bee b/libusb.be0 similarity index 90% rename from libusb-1.0.19-0.bee rename to libusb.be0 index 63da5173c..eab36555c 100755 --- a/libusb-1.0.19-0.bee +++ b/libusb.be0 @@ -1,5 +1,7 @@ #!/bin/env beesh +# BEE_VERSION libusb-1.0.19-0 + PGRP=( uncategorized ) SRCURL[0]="https://downloads.sourceforge.net/libusb/libusb-${PKGVERSION}.tar.bz2" From aa06bb878fa499d1b3fab5a844a127ee42f6e602 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:47:12 +0200 Subject: [PATCH 26/76] libusb: Rebuild for systemd/udev update ``` $ ldd /usr/lib/libusb-1.0.so linux-vdso.so.1 (0x00007ffe22b5c000) libudev.so.0 => not found libpthread.so.0 => /lib/libpthread.so.0 (0x00007ff7378e6000) libc.so.6 => /lib/libc.so.6 (0x00007ff73753a000) /lib64/ld-linux-x86-64.so.2 (0x000056413bd22000) ``` Building UPower gives the warning below. ``` CCLD upowerd /usr/bin/ld: warning: libudev.so.0, needed by /usr/lib/gcc/x86_64-unknown-linux-gnu/5.3.0/../../../../lib64/libusb-1.0.so, not found (try using -rpath or -rpath-link) ``` Increment the version number by two, as there is already a higher revision, which has never been installed on the distmaster though. --- libusb.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libusb.be0 b/libusb.be0 index eab36555c..72efeb906 100755 --- a/libusb.be0 +++ b/libusb.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION libusb-1.0.19-0 +# BEE_VERSION libusb-1.0.19-2 PGRP=( uncategorized ) From d510b58fab77b78bad6330955abb7715dd601f5b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:54:51 +0200 Subject: [PATCH 27/76] libusb: Disable static library building Do not build the static libraries. ``` [BEE] /src/mariux/beeroot/packages/libusb-1.0.19-2.x86_64.bee.tar.bz2 -rw-r--r-- root/system 1169 2016-09-07 17:52 CONTENT -rwxr-xr-x root/system 320 2016-09-07 17:52 BUILD -rw-r--r-- root/system 435 2016-09-07 17:52 META drwxr-xr-x root/system 0 2016-09-07 17:52 /usr/include/libusb-1.0/ -rw-r--r-- root/system 70156 2016-09-07 17:52 /usr/include/libusb-1.0/libusb.h -rw-r--r-- root/system 297 2016-09-07 17:52 /usr/lib/pkgconfig/libusb-1.0.pc -rw-r--r-- root/system 589040 2016-09-07 17:52 /usr/lib/libusb-1.0.a lrwxrwxrwx root/system 0 2016-09-07 17:52 /usr/lib/libusb-1.0.so -> libusb-1.0.so.0.1.0 lrwxrwxrwx root/system 0 2016-09-07 17:52 /usr/lib/libusb-1.0.so.0 -> libusb-1.0.so.0.1.0 -rwxr-xr-x root/system 341632 2016-09-07 17:52 /usr/lib/libusb-1.0.so.0.1.0 [BEE] -> saving bee-file libusb.be0 .. ``` ``` $ ldd /usr/lib/libusb-1.0.so linux-vdso.so.1 (0x00007ffe22b5c000) libudev.so.0 => not found libpthread.so.0 => /lib/libpthread.so.0 (0x00007ff7378e6000) libc.so.6 => /lib/libc.so.6 (0x00007ff73753a000) /lib64/ld-linux-x86-64.so.2 (0x000056413bd22000) $ ldd /usr/lib/libusb-1.0.so linux-vdso.so.1 (0x00007fffa95f3000) libudev.so.1 => /lib/libudev.so.1 (0x00007fab9e9bd000) libpthread.so.0 => /lib/libpthread.so.0 (0x00007fab9e79f000) libc.so.6 => /lib/libc.so.6 (0x00007fab9e3f3000) libresolv.so.2 => /lib/libresolv.so.2 (0x00007fab9e1dc000) libcap.so.2 => /usr/lib/libcap.so.2 (0x00007fab9dfd7000) librt.so.1 => /lib/librt.so.1 (0x00007fab9ddce000) libm.so.6 => /lib/libm.so.6 (0x00007fab9dacd000) /lib64/ld-linux-x86-64.so.2 (0x000055acaf5f5000) ``` --- libusb.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libusb.be0 b/libusb.be0 index 72efeb906..23cf7c1af 100755 --- a/libusb.be0 +++ b/libusb.be0 @@ -15,7 +15,8 @@ mee_patch() { } mee_configure() { - bee_configure + bee_configure \ + --disable-static } mee_build() { From e9e1c0481e52f5839f761d83c113a61e18d70487 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 15:22:53 +0100 Subject: [PATCH 28/76] libusb: Update version from 1.0.19 to 1.0.21 Change-log from file `[ChangeLog][1]`: > 2016-10-01: v1.0.21: > * Core: Refactor code related to transfer flags and timeout handling > * Darwin: Ignore root hub simulation devices > * Darwin: Improved support for OS X El Capitan > * Darwin: Work around devices with buggy endpoint descriptors > * Darwin: Do not use objc_registerThreadWithCollector after its deprecation > * Darwin: Use C11 atomics on 10.12+ as the OS atomics are now deprecated > * Linux: Support preallocating kernel memory for zerocopy USB > * Linux: Deal with receiving POLLERR before all transfers have completed > * Solaris: Add solaris backend > * Windows: Add Visual Studio 2015 support > * Windows: Add usbdk backend > * Prevent attempts to recursively handle events > * Fix race condition in handle_timeout() > * Allow transferred argument to be optional in bulk APIs > * Various other bug fixes and improvements > > 2015-09-13: v1.0.20 > * Add Haiku support > * Fix multiple memory and resource leaks (#16, #52, #76, #81) > * Fix possible deadlock when executing transfer callback > * New libusb_free_pollfds() API > * Darwin: Fix devices not being detected on OS X 10.8 (#48) > * Linux: Allow larger isochronous transfer submission (#23) > * Windows: Fix broken builds Cygwin/MinGW builds and compiler warnings > * Windows: Fix broken bus number lookup > * Windows: Improve submission of control requests for composite devices > * Examples: Add two-stage load support to fxload (#12) > * Correctly report cancellations due to timeouts > * Improve efficiency of event handling > * Improve speed of transfer submission in multi-threaded environments > * Various other bug fixes and improvements > The (#xx) numbers are libusb issue numbers, see ie: > https://github.com/libusb/libusb/issues/16 [1]: https://github.com/libusb/libusb/blob/master/ChangeLog --- libusb.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libusb.be0 b/libusb.be0 index 23cf7c1af..df04272e0 100755 --- a/libusb.be0 +++ b/libusb.be0 @@ -1,6 +1,6 @@ #!/bin/env beesh -# BEE_VERSION libusb-1.0.19-2 +# BEE_VERSION libusb-1.0.21-0 PGRP=( uncategorized ) From cc87c4d7383def5b0158773f0358f4a00c7d80d9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 15:30:12 +0100 Subject: [PATCH 29/76] xf86-input-evdev: Rebuild against systemd/udev v237 Increment the revision number. --- xf86-input-evdev.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xf86-input-evdev.be0 b/xf86-input-evdev.be0 index b6612c962..a2eca49bf 100755 --- a/xf86-input-evdev.be0 +++ b/xf86-input-evdev.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xf86-input-evdev-2.10.5-0 +# BEE_VERSION xf86-input-evdev-2.10.5-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 d7912df09185e20d9f7a2e0f5c70d8ac58c865f3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:18:26 +0200 Subject: [PATCH 30/76] upower: Strip trailing space --- upower-0.9.16-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upower-0.9.16-0.bee b/upower-0.9.16-0.bee index e5eac6e7c..5cf8dfddc 100755 --- a/upower-0.9.16-0.bee +++ b/upower-0.9.16-0.bee @@ -25,7 +25,7 @@ PATCHURL[0]="" #} #mee_configure() { -# bee_configure +# bee_configure #} #mee_build() { From dd19e858662d5707aed9efdb616f217da06d07fa Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:19:26 +0200 Subject: [PATCH 31/76] upower: Disable static library buidling > --disable-static: This switch prevents installation of static versions > of the libraries. [1] http://www.linuxfromscratch.org/~thomasp/blfs-book-xsl/general/upower.html --- upower-0.9.16-0.bee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/upower-0.9.16-0.bee b/upower-0.9.16-0.bee index 5cf8dfddc..7f0999aa6 100755 --- a/upower-0.9.16-0.bee +++ b/upower-0.9.16-0.bee @@ -24,9 +24,10 @@ PATCHURL[0]="" # bee_patch "${@}" #} -#mee_configure() { -# bee_configure -#} +mee_configure() { + bee_configure \ + --disable-static +} #mee_build() { # bee_build From 5b4cbc76ad75964b9c5f38283a035d1d2dea12ae Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:19:39 +0200 Subject: [PATCH 32/76] upower: Rebuild for systemd/udev update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ``` $ sudo journalctl -u upower -b Sep 07 16:54:58 keineahnung.molgen.mpg.de systemd[1]: Starting Daemon for power management... Sep 07 16:54:58 keineahnung.molgen.mpg.de upowerd[741]: /usr/lib/upower/upowerd: error while loading shared libraries: libudev.so.0: cannot open shared object file: No such file or directory Sep 07 16:54:58 keineahnung.molgen.mpg.de systemd[1]: upower.service: Main process exited, code=exited, status=127/n/a Sep 07 16:54:58 keineahnung.molgen.mpg.de systemd[1]: Failed to start Daemon for power management. Sep 07 16:54:58 keineahnung.molgen.mpg.de systemd[1]: upower.service: Unit entered failed state. Sep 07 16:54:58 keineahnung.molgen.mpg.de systemd[1]: upower.service: Failed with result 'exit-code'. […] ``` --- upower-0.9.16-0.bee => upower-0.9.16-1.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename upower-0.9.16-0.bee => upower-0.9.16-1.bee (100%) diff --git a/upower-0.9.16-0.bee b/upower-0.9.16-1.bee similarity index 100% rename from upower-0.9.16-0.bee rename to upower-0.9.16-1.bee From dcf6270c616373cfde8b36407d887ff631528665 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 15:43:43 +0100 Subject: [PATCH 33/76] upower: Securely download source archive Use HTTPS to securely download the source archive. --- upower-0.9.16-1.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upower-0.9.16-1.bee b/upower-0.9.16-1.bee index 7f0999aa6..a1e830a61 100755 --- a/upower-0.9.16-1.bee +++ b/upower-0.9.16-1.bee @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -SRCURL[0]="http://upower.freedesktop.org/releases/upower-${PKGVERSION}.tar.xz" +SRCURL[0]="https://upower.freedesktop.org/releases/upower-${PKGVERSION}.tar.xz" PATCHURL[0]="" From 1fc1e1772f5c5ae4a1a5a8620633aac1a04eedba Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 15:52:54 +0100 Subject: [PATCH 34/76] xf86-video-amdgpu: Rebuild for systemd/udev update `sousage.pl` says, that `libudev.so.0` is used by `/usr/lib/xorg/modules/drivers/amdgpu_drv.so`. Increment the revision number. --- xf86-video-amdgpu.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xf86-video-amdgpu.be0 b/xf86-video-amdgpu.be0 index 87a6fec5f..46849644c 100755 --- a/xf86-video-amdgpu.be0 +++ b/xf86-video-amdgpu.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xf86-video-amdgpu-1.4.0-0 +# BEE_VERSION xf86-video-amdgpu-1.4.0-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 000926a57da392a07be788ffb695a7a295172e72 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 15:56:40 +0100 Subject: [PATCH 35/76] xf86-video-nouveau: Rebuild for systemd/udev update `sousage.pl` says, that `libudev.so.0` is used by `/usr/lib/xorg/modules/drivers/nouveau_drv.so`. Increment the revision number. --- xf86-video-nouveau.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xf86-video-nouveau.be0 b/xf86-video-nouveau.be0 index 3d0ea6844..ca6dbce3e 100755 --- a/xf86-video-nouveau.be0 +++ b/xf86-video-nouveau.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xf86-video-nouveau-1.0.15-0 +# BEE_VERSION xf86-video-nouveau-1.0.15-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 e7ce0070fb2d5326cf4b725b04682b08f2a03a93 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Sep 2016 17:41:12 +0200 Subject: [PATCH 36/76] gvfs: Rebuild for systemd/udev update Rebuilding UPower gives the error below. ``` /usr/bin/ld: warning: libudev.so.0, needed by /usr/lib/gcc/x86_64-unknown-linux-gnu/5.3.0/../../../../lib64/libusb-1.0.so, not found (try using -rpath or -rpath-link) ``` --- gvfs.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gvfs.be0 b/gvfs.be0 index 892e80332..9d0efba62 100755 --- a/gvfs.be0 +++ b/gvfs.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION gvfs-1.24.0-2 +# BEE_VERSION gvfs-1.24.0-3 ## 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 bce930ef0d2d1f29b1cbb0041feb696b78f34c63 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:07:51 +0100 Subject: [PATCH 37/76] gnome-session: Securely download source archive Use HTTPS to securely download the source archive. --- gnome-session-3.4.1-1.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnome-session-3.4.1-1.bee b/gnome-session-3.4.1-1.bee index 9f32bef3d..32b29f53e 100755 --- a/gnome-session-3.4.1-1.bee +++ b/gnome-session-3.4.1-1.bee @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -SRCURL[0]="http://ftp.gnome.org/pub/gnome/sources/gnome-session/${PKGVERSION[2]}/gnome-session-${PKGVERSION}.tar.xz" +SRCURL[0]="https://ftp.gnome.org/pub/gnome/sources/gnome-session/${PKGVERSION[2]}/gnome-session-${PKGVERSION}.tar.xz" mee_install_post() { start_cmd mv ${D}${DATADIR}/xsessions{,.available} From 02460711b9aec62078f5a96cb7085704cdf0a3d1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:08:25 +0100 Subject: [PATCH 38/76] gnome-session: Rebuild for systemd/udev update Rebuild Upower gives the error below. ``` /usr/bin/gnome-session: error while loading shared libraries: libupower-glib.so.1: cannot open shared object file: No such file or directory ``` --- gnome-session-3.4.1-1.bee => gnome-session-3.4.1-2.bee | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gnome-session-3.4.1-1.bee => gnome-session-3.4.1-2.bee (100%) diff --git a/gnome-session-3.4.1-1.bee b/gnome-session-3.4.1-2.bee similarity index 100% rename from gnome-session-3.4.1-1.bee rename to gnome-session-3.4.1-2.bee From 853098fc4cf5396e7de25f5167bd4cffd9d14ad1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:36:57 +0100 Subject: [PATCH 39/76] libatasmart: Use current bee file template Recreate the bee file with the command below. ``` $ bee init -f -o libatasmart-0.17-0.bee http://0pointer.de/public/libatasmart-0.17.tar.gz creating libatasmart-0.17-0.bee from template '/etc/default/bee/templates/fallback' ``` --- libatasmart-0.17-0.bee | 89 +++++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 18 deletions(-) diff --git a/libatasmart-0.17-0.bee b/libatasmart-0.17-0.bee index 70137879c..ec1d73dd6 100755 --- a/libatasmart-0.17-0.bee +++ b/libatasmart-0.17-0.bee @@ -1,30 +1,83 @@ -#!/bin/env beesh +#!/usr/bin/env beesh -SRCURL[0]="http://0pointer.de/public/libatasmart-0.17.tar.gz" +## 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.) -PATCHURL[0]="" +############################################################################### +## 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. -PGRP=( uncategorized ) +SRCURL[0]="http://0pointer.de/public/libatasmart-${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+=() -# BEE_CONFIGURE=compat +############################################################################### +## 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+=() -mee_patch() { - bee_patch -} +############################################################################### +## 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. -mee_configure() { - bee_configure -} +# build_in_sourcedir -mee_build() { - bee_build -} +############################################################################### +## 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. -mee_install() { - bee_install -} +# 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 04808564f9fd05639b477cac97168c2964ff3c50 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:38:06 +0100 Subject: [PATCH 40/76] libatasmart: Convert to versionless bee file --- libatasmart-0.17-0.bee => libatasmart.be0 | 2 ++ 1 file changed, 2 insertions(+) rename libatasmart-0.17-0.bee => libatasmart.be0 (98%) diff --git a/libatasmart-0.17-0.bee b/libatasmart.be0 similarity index 98% rename from libatasmart-0.17-0.bee rename to libatasmart.be0 index ec1d73dd6..9c099a2fd 100755 --- a/libatasmart-0.17-0.bee +++ b/libatasmart.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION libatasmart-0.17-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 a07d239eb2b34abcd51b65fe88fecb4c83ff0f0d Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:38:22 +0100 Subject: [PATCH 41/76] libatasmart: Update version from 0.17 to 0.19 The archive is compressed with LZMA instead of LZ77. So change the suffix. --- libatasmart.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libatasmart.be0 b/libatasmart.be0 index 9c099a2fd..36cd133ea 100755 --- a/libatasmart.be0 +++ b/libatasmart.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION libatasmart-0.17-0 +# BEE_VERSION libatasmart-0.19-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]="http://0pointer.de/public/libatasmart-${PKGVERSION}.tar.gz" +SRCURL[0]="http://0pointer.de/public/libatasmart-${PKGVERSION}.tar.xz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 55b80ec29b48fd7bff338fd5eab70b1524962959 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 8 Sep 2016 17:58:47 +0200 Subject: [PATCH 42/76] qt5: Securely download source archive Use HTTPS to securely download the source archive. --- qt5-5.4.1-0.bee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-5.4.1-0.bee b/qt5-5.4.1-0.bee index f8668ac30..7d6ff86e7 100755 --- a/qt5-5.4.1-0.bee +++ b/qt5-5.4.1-0.bee @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -SRCURL=(http://download.qt.io/official_releases/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-opensource-src-${PKGVERSION}.tar.gz) +SRCURL=(https://download.qt.io/official_releases/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-opensource-src-${PKGVERSION}.tar.gz) PATCHURL[0]="https://bugreports.qt.io/secure/attachment/46929/qtwebkit.diff" From 957d5582761d43b9c0e5ebf79782e79ebf97cc44 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 8 Sep 2016 18:43:24 +0200 Subject: [PATCH 43/76] qt5: Update version from 5.4.1 to 5.10.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Update the version from Qt 5.4.1 to 5.10.1. This fixes build issues with GCC 5. ``` make[3]: Entering directory '/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/Source/JavaScriptCore' g++ -fdebug-types-section -Wl,-O1 -Wl,-rpath,/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/lib -Wl,-rpath,/usr/local/qt5/lib -o ../../bin/jsc .obj/jsc.o -Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/Source/JavaScriptCore/ -Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/Source/WTF/ -licui18n -licuuc -licudata -lglib-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -L/scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtbase/lib -lQt5Core -lpthread -lpthread /scratch/local/bee-root/qt5/qt5-5.4.1-1/source/qtwebkit/Source/JavaScriptCore//.obj/runtime/JSArray.o: In function `JSC::JSArray::push(JSC::ExecState*, JSC::JSValue)': JSArray.cpp:(.text+0x31c1): undefined reference to `void JSC::JSObject::putByIndexBeyondVectorLengthWithoutAttributes<(unsigned char)20>(JSC::ExecState*, unsigned int, JSC::JSValue)' collect2: error: ld returned 1 exit status Makefile.jsc:98: recipe for target '../../bin/jsc' failed make[3]: *** [../../bin/jsc] Error 1 ``` 2. Rebuild for systemd/udev update. ``` $ readelf -d /usr/local/qt5/plugins/platforms/libqxcb.so | grep udev 0x0000000000000001 (NEEDED) Shared library: [libudev.so.0] ``` sousage ``` /usr/local/qt5/lib/libQt5SerialPort.so.5.4.1 qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/generic/libqevdevkeyboardplugin.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/generic/libqevdevmouseplugin.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/generic/libqevdevtabletplugin.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/generic/libqevdevtouchplugin.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/platforms/libqeglfs.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/platforms/libqkms.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/platforms/libqlinuxfb.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/platforms/libqminimal.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/platforms/libqminimalegl.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/platforms/libqoffscreen.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/platforms/libqxcb.so qt5-5.4.1-0.x86_64 /usr/local/qt5/plugins/platformthemes/libqgtk2.so qt5-5.4.1-0.x86_64 /usr/sbin/mount.zfs zfs-0.7.3-0.x86_64 ``` [1] https://bugreports.qt.io/browse/QTBUG-44829 [2] https://codereview.qt-project.org/#/c/107921/ qt5: Remove patch It doesn’t apply anymore. qt5: Update from 5.4.2 to 5.7.0 5.4 has too many build problems with GCC 5. Originally it was built with GCC 4.9. --- qt5-5.4.1-0.bee => qt5-5.10.1-0.bee | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) rename qt5-5.4.1-0.bee => qt5-5.10.1-0.bee (61%) diff --git a/qt5-5.4.1-0.bee b/qt5-5.10.1-0.bee similarity index 61% rename from qt5-5.4.1-0.bee rename to qt5-5.10.1-0.bee index 7d6ff86e7..ec72f85b3 100755 --- a/qt5-5.4.1-0.bee +++ b/qt5-5.10.1-0.bee @@ -1,8 +1,6 @@ #!/usr/bin/env beesh -SRCURL=(https://download.qt.io/official_releases/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-opensource-src-${PKGVERSION}.tar.gz) - -PATCHURL[0]="https://bugreports.qt.io/secure/attachment/46929/qtwebkit.diff" +SRCURL=(https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz) PREFIX=/usr/local/qt5 @@ -10,11 +8,6 @@ build_in_sourcedir # BEE_MAKEFLAGS=-j1 -mee_patch() { - perl -i -pe 's"/Source"/qtwebkit/Source"' $F/qtwebkit.diff - bee_patch -} - mee_configure() { start_cmd ${S}/configure \ -prefix ${PREFIX} \ From 349181988f332c0b5e942587b2bcb66084ec5572 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 17:16:47 +0100 Subject: [PATCH 44/76] qt5: Convert to versionless bee file --- qt5-5.10.1-0.bee => qt5.be0 | 2 ++ 1 file changed, 2 insertions(+) rename qt5-5.10.1-0.bee => qt5.be0 (95%) diff --git a/qt5-5.10.1-0.bee b/qt5.be0 similarity index 95% rename from qt5-5.10.1-0.bee rename to qt5.be0 index ec72f85b3..f9f5d62c7 100755 --- a/qt5-5.10.1-0.bee +++ b/qt5.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION qt5-5.10.1-0 + SRCURL=(https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz) PREFIX=/usr/local/qt5 From bd46994bcc5a77747d3bcb0fc34f801b0531c1e6 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 17:20:14 +0100 Subject: [PATCH 45/76] qt5: Use common syntax for `SRCURL` --- qt5.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5.be0 b/qt5.be0 index f9f5d62c7..3b9764683 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -2,7 +2,7 @@ # BEE_VERSION qt5-5.10.1-0 -SRCURL=(https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz) +SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/single/qt-everywhere-src-${PKGVERSION}.tar.xz" PREFIX=/usr/local/qt5 From 663c3b36cb74d317cef6fad58cd3f2826947971f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 17 Feb 2018 17:14:58 +0100 Subject: [PATCH 46/76] qt5: Do not build QtWebengine as it fails to build [Qt WebEngine fails to build with the error below.][1] ``` ../../3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc:274:40: error: call of overloaded 'abs(const float&)' is ambiguous std::max(std::abs(*result_x.first), std::abs(*result_x.second)); ^ ``` [1]: https://forum.qt.io/topic/85932/qt-5-10-fails-to-compile/4 --- qt5.be0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qt5.be0 b/qt5.be0 index 3b9764683..ba20523c0 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -19,7 +19,8 @@ mee_configure() { -sysconfdir ${SYSCONFDIR} \ -nomake examples \ -opensource \ - -confirm-license + -confirm-license \ + -skip qtwebengine } mee_build() { From f1c8804bd48c65885eda867e7e3e45cd6fe88546 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 17 Feb 2018 17:16:53 +0100 Subject: [PATCH 47/76] qt5: Build outside source directory CMake supports this without problems. --- qt5.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5.be0 b/qt5.be0 index ba20523c0..9e5fa7fbd 100755 --- a/qt5.be0 +++ b/qt5.be0 @@ -6,7 +6,7 @@ SRCURL[0]="https://download.qt.io/archive/qt/${PKGVERSION[2]}/${PKGVERSION}/sing PREFIX=/usr/local/qt5 -build_in_sourcedir +# build_in_sourcedir # BEE_MAKEFLAGS=-j1 From 20398b04073ae8ed32c71f2af8f0424422d03269 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:27:02 +0100 Subject: [PATCH 48/76] udisks: Use current bee file template Recreate the bee file with the command below. ``` $ bee init -f -o udisks-1.0.2-0.bee http://hal.freedesktop.org/releases/udisks-1.0.2.tar.gz creating udisks-1.0.2-0.bee from template '/etc/default/bee/templates/fallback' ``` --- udisks-1.0.2-0.bee | 89 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 71 insertions(+), 18 deletions(-) diff --git a/udisks-1.0.2-0.bee b/udisks-1.0.2-0.bee index f009a7201..adc229529 100755 --- a/udisks-1.0.2-0.bee +++ b/udisks-1.0.2-0.bee @@ -1,30 +1,83 @@ -#!/bin/env beesh +#!/usr/bin/env beesh -SRCURL[0]="http://hal.freedesktop.org/releases/udisks-1.0.2.tar.gz" +## 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.) -PATCHURL[0]="" +############################################################################### +## 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. -PGRP=( uncategorized ) +SRCURL[0]="http://hal.freedesktop.org/releases/udisks-${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+=() -# BEE_CONFIGURE=compat +############################################################################### +## 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+=() -mee_patch() { - bee_patch -} +############################################################################### +## 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. -mee_configure() { - bee_configure -} +# build_in_sourcedir -mee_build() { - bee_build -} +############################################################################### +## 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. -mee_install() { - bee_install -} +# 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 41186ff1f576b18df7da449dd2ef1cec94cc492a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 16 Feb 2018 16:31:21 +0100 Subject: [PATCH 49/76] udisks: Convert to versionless bee file --- udisks-1.0.2-0.bee => udisks.be0 | 2 ++ 1 file changed, 2 insertions(+) rename udisks-1.0.2-0.bee => udisks.be0 (98%) diff --git a/udisks-1.0.2-0.bee b/udisks.be0 similarity index 98% rename from udisks-1.0.2-0.bee rename to udisks.be0 index adc229529..c4bc2214e 100755 --- a/udisks-1.0.2-0.bee +++ b/udisks.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION udisks-1.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.) From 507f4269f1a47ec57157dd817faad8c6a9aa7743 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 17 Feb 2018 18:51:01 +0100 Subject: [PATCH 50/76] udisks: Securely download source archive Use HTTPS to securely download the source archive. --- udisks.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/udisks.be0 b/udisks.be0 index c4bc2214e..801ce5582 100755 --- a/udisks.be0 +++ b/udisks.be0 @@ -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]="http://hal.freedesktop.org/releases/udisks-${PKGVERSION}.tar.gz" +SRCURL[0]="https://hal.freedesktop.org/releases/udisks-${PKGVERSION}.tar.gz" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From 6728774f43d80c314e04fe9e33edcbf68b6fcfc0 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 17 Feb 2018 18:59:46 +0100 Subject: [PATCH 51/76] udisks: Update version from 1.0.2 to 2.1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 2.1.8, used in [Beyond Linux From Scratch 8.0][1], is the last version, that doesn’t require the newer storaged dependencies. This could be changed later on. Note, the user space tools changed. `udiskctl` is the new tool. [1]: http://www.linuxfromscratch.org/blfs/view/8.0/general/udisks2.html --- udisks.be0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/udisks.be0 b/udisks.be0 index 801ce5582..2489f0758 100755 --- a/udisks.be0 +++ b/udisks.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION udisks-1.0.2-0 +# BEE_VERSION udisks-2.1.8-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://hal.freedesktop.org/releases/udisks-${PKGVERSION}.tar.gz" +SRCURL[0]="https://udisks.freedesktop.org/releases/udisks-${PKGVERSION}.tar.bz2" ############################################################################### ## Add URLs/pathes to patch files to the PATCHURL array. From a719ca3c7058b2f66c9a1c7a5846d05ef6815c96 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Sat, 17 Feb 2018 18:28:33 +0100 Subject: [PATCH 52/76] vlc: Update version from 2.2.6 to 3.0.0 Add patch to fix `SSIZE_MAX` build issue in 3.0.1, and [patch the source to build with Lua 5.3.3][1]. [1]: http://www.linuxfromscratch.org/blfs/view/svn/multimedia/vlc.html --- vlc.be0 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/vlc.be0 b/vlc.be0 index 4ce14aebb..7fff003f5 100755 --- a/vlc.be0 +++ b/vlc.be0 @@ -1,10 +1,11 @@ #!/usr/bin/env beesh -# BEE_VERSION vlc-2.2.6-0 +# BEE_VERSION vlc-3.0.0-0 SRCURL[0]="https://download.videolan.org/pub/videolan/vlc/${PKGVERSION}/vlc-${PKGVERSION}.tar.xz" -PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/vlc-2.2.6-ffmpeg3-1.patch" +# http://git.videolan.org/?p=vlc.git;a=commitdiff;h=8311cdc09fa06a192cc5ca34368d2116e57bb936 +PATCHURL+=(/src/mariux/patches/vlc.git-8311cdc09fa06a192cc5ca34368d2116e57bb936.patch) # EXCLUDE+=() @@ -17,13 +18,14 @@ PATCHURL[0]="http://www.linuxfromscratch.org/patches/blfs/svn/vlc-2.2.6-ffmpeg3- # bee_extract "${@}" #} -#mee_patch() { -# bee_patch "${@}" -#} +mee_patch() { + bee_patch "${@}" + start_cmd sed -i '/luaL_checkint(/s/checkint/checkinteger/' modules/lua/{demux,libs/*}.c +} mee_configure() { - CFLAGS="-DLUA_COMPAT_5_1" \ - bee_configure --disable-atmo + BUILDCC=gcc \ + bee_configure } mee_build() { From 121312a371a5228d0cff59139d14dc5c8a7922e1 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 19 Feb 2018 14:53:01 +0100 Subject: [PATCH 53/76] udev: Remove version 164-2 Udev was integrated into systemd, and is included in systemd v237. --- udev-164-2.bee | 37 ------------------------------------- 1 file changed, 37 deletions(-) delete mode 100755 udev-164-2.bee diff --git a/udev-164-2.bee b/udev-164-2.bee deleted file mode 100755 index 892cb861e..000000000 --- a/udev-164-2.bee +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/env beesh - -PGRP=( core ) - -UDEVCONFIG=20100128 - -SRCURL[0]="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.bz2" -SRCURL[1]="http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-${UDEVCONFIG}.tar.bz2" - - -PATCHES[0]="" - -EXCLUDE="^/usr/share/gtk-doc" - -SBINDIR=/sbin -LIBEXECDIR=/lib/udev - -mee_configure() { - - systemdsystemunitdir=$(pkg-config --variable=systemdsystemunitdir systemd) - - bee_configure \ - --with-rootlibdir=/lib \ - --disable-introspection \ - --with-systemdsystemunitdir=${systemdsystemunitdir} -} - -mee_build() { - bee_build -} - -mee_install() { - bee_install - cd ${S}/udev-config-${UDEVCONFIG} - make install DESTDIR=${D} -} - From 56f143e47fe981f6d166bf0d6c1d33753c057dd4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 1 Mar 2018 15:50:17 +0100 Subject: [PATCH 54/76] systemd: Do not mount `/tmp` as tmpfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s preferred to put it on disk, so mask the unit. --- systemd.be0 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/systemd.be0 b/systemd.be0 index 43c141319..aba139f71 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -86,6 +86,9 @@ mee_install_post() { # Support Linux kernels built with `CONFIG_CMDLINE="init=/bin/systemd"` ln -v ${D}/lib/systemd/systemd ${D}/bin/systemd + + # Do not use tmpfs for `/tmp` + ln -vs /dev/null ${D}/etc/systemd/system/tmp.mount } ############################################################################### From 45a6f30b637a739ac834a55e7779230e9e7ba622 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 1 Mar 2018 16:36:46 +0100 Subject: [PATCH 55/76] systemd: Configure our default NTP servers Copy the server names from `/etc/ntp.time.conf`. --- systemd.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd.be0 b/systemd.be0 index aba139f71..e8ac5eaf4 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -58,6 +58,7 @@ mee_configure() { -Dblkid=true \ -Dbuildtype=release \ -Ddefault-dnssec=no \ + -Dntp-servers='zeit.fu-berlin.de ntps1-0.cs.tu-berlin.de time.fu-berlin.de' \ -Dfirstboot=false \ -Dinstall-tests=false \ -Dldconfig=false \ From e66584008620ba6e2eaeaa8c0343d2c89804f61f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 1 Mar 2018 16:40:35 +0100 Subject: [PATCH 56/76] systemd: Use 141.14.16.1 as default DNS server No entry for IPv6 is added. Note, this is added as `FallbackDNS`. --- systemd.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd.be0 b/systemd.be0 index e8ac5eaf4..cd1f8f23f 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -58,6 +58,7 @@ mee_configure() { -Dblkid=true \ -Dbuildtype=release \ -Ddefault-dnssec=no \ + -Ddns-servers='141.14.16.1' \ -Dntp-servers='zeit.fu-berlin.de ntps1-0.cs.tu-berlin.de time.fu-berlin.de' \ -Dfirstboot=false \ -Dinstall-tests=false \ From a176999d2903a2db74f0a656611dff78979140d9 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 1 Mar 2018 16:41:06 +0100 Subject: [PATCH 57/76] systemd: Use DNSSEC by default --- systemd.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd.be0 b/systemd.be0 index cd1f8f23f..36a05c23d 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -57,7 +57,7 @@ mee_configure() { bee_configure \ -Dblkid=true \ -Dbuildtype=release \ - -Ddefault-dnssec=no \ + -Ddefault-dnssec=yes \ -Ddns-servers='141.14.16.1' \ -Dntp-servers='zeit.fu-berlin.de ntps1-0.cs.tu-berlin.de time.fu-berlin.de' \ -Dfirstboot=false \ From 61313bf1498e5cbd5ec5f803af08294a59fe6ea7 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Thu, 1 Mar 2018 16:44:07 +0100 Subject: [PATCH 58/76] ntp: Remove version 4.2.8p8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We only need a client, so use systemd-timesyncd. From systemd-timesyncd(8): > The systemd-timesyncd service specifically implements only SNTP. This > minimalistic service will set the system clock for large offsets or > slowly adjust it for smaller deltas. More complex use cases are not > covered by systemd-timesyncd. > timedatectl(1)´s set-ntp command may be used to enable and start, or > disable and stop this service. ``` $ timedatectl Local time: Mon 2018-03-05 13:09:59 UTC Universal time: Mon 2018-03-05 13:09:59 UTC RTC time: Mon 2018-03-05 13:09:59 Time zone: n/a (UTC, +0000) System clock synchronized: yes systemd-timesyncd.service active: yes RTC in local TZ: no ``` --- ntp.be0 | 85 --------------------------------------------------------- 1 file changed, 85 deletions(-) delete mode 100755 ntp.be0 diff --git a/ntp.be0 b/ntp.be0 deleted file mode 100755 index 9acee98dd..000000000 --- a/ntp.be0 +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION ntp-4.2.8p8-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.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PKGVERSION[2]}/ntp-${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 build -## outside the source directory and need to be build 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 49a6517dad2e111ba9daf9f97cd63e52236a43cd Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 15:46:36 +0100 Subject: [PATCH 59/76] unbound: Remove version 1.6.8 systemd 237 comes with systemd-resolved, which we want to use. --- unbound.be0 | 94 ----------------------------------------------------- 1 file changed, 94 deletions(-) delete mode 100755 unbound.be0 diff --git a/unbound.be0 b/unbound.be0 deleted file mode 100755 index 6c25cb728..000000000 --- a/unbound.be0 +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/env beesh - -# BEE_VERSION unbound-1.6.8-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.unbound.net/downloads/unbound-${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 build -## outside the source directory and need to be build 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 \ - --disable-static \ - --with-pidfile="/var/unbound/unbound.pid" \ - --with-rootkey-file="/var/unbound/root.key" -} - -mee_build() { - bee_build - ln -sf ${S}/testdata ${B}/testdata - start_cmd make check -} - -#mee_install() { -# bee_install -#} -## by default this may be 'make install DESTDIR="${D}"' - -mee_install_post() { - start_cmd mv ${D}/etc/unbound/unbound.conf{,.sample} -} - -############################################################################### -## -## 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 ac39ad3f2179a35be310a523fdf018b9ee646ae2 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 19 Feb 2018 12:46:59 +0100 Subject: [PATCH 60/76] scripts: Add script to update systemd from version 27 to 237 --- scripts/update-systemd-from-27-to-237.sh | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100755 scripts/update-systemd-from-27-to-237.sh diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh new file mode 100755 index 000000000..e5cd85553 --- /dev/null +++ b/scripts/update-systemd-from-27-to-237.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -x + +bee remove sysvinit-2.88dsf-2.x86_64 udev-164-2.x86_64 +bee install -f systemd-237-0 +bee update -f dbus-1.12.4-0 +systemctl daemon-reexec +systemctl restart dbus.service # restarts GDM +#bee remove consolekit-0.4.4-0.x86_64 # needed by GDM to log in +#bee update fhs-3.0 # good idea? Removes /var/run? +bee update -f util-linux-2.31.1-1 xorg-server pulseaudio libgudev libusb xf86-input-evdev upower xf86-video-amdgpu xf86-video-nouveau gvfs-1.24.0-3 gnome-session-3.4.1-2 libatasmart qt5 udisks vlc-3.0.0-0 +bee remove systemd-27-0.x86_64 +bee update -f systemd-237-0 +systemctl daemon-reload +systemctl disable console-kit-daemon + +sed -i '/pam_ck_connector.so/d' /etc/pam.d/system-auth +sed -i 's/required pam_systemd.so create-session=1 kill-user=0 kill-session=0/optional pam_systemd.so/' /etc/pam.d/system-auth + +echo "You can migrate to system-networkd." + +systemctl stop ntp +systemctl stop unbound +systemctl disable ntp +systemctl disable unbound +systemctl daemon-reload +bee remove ntp-4.2.8p8-0.x86_64 +ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf From 7897beea8a144306aaf0ce01492578ac095f032a Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 12:44:08 +0100 Subject: [PATCH 61/76] scripts/update-systemd-from-27-to-237.sh: Use the stub resolver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From the manual page systemd-resolved(8): > /ETC/RESOLV.CONF > Four modes of handling /etc/resolv.conf (see resolv.conf(5)) > are supported: > > · systemd-resolved maintains the > /run/systemd/resolve/stub-resolv.conf file for > compatibility with traditional Linux programs. This file > may be symlinked from /etc/resolv.conf. This file lists the > 127.0.0.53 DNS stub (see above) as the only DNS server. It > also contains a list of search domains that are in use by > systemd-resolved. The list of search domains is always kept > up-to-date. […] --- scripts/update-systemd-from-27-to-237.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh index e5cd85553..a3cf42cea 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-237.sh @@ -26,4 +26,4 @@ systemctl disable ntp systemctl disable unbound systemctl daemon-reload bee remove ntp-4.2.8p8-0.x86_64 -ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf +ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf From 3c9e4ec27dfd003328c1a4caba582478c9fab386 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 13:46:13 +0100 Subject: [PATCH 62/76] scripts/update-systemd-from-27-to-237.sh: Configure systemd-resolved Add the search domain `molgen.mpg.de`. --- scripts/update-systemd-from-27-to-237.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh index a3cf42cea..4e3fce7e6 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-237.sh @@ -26,4 +26,8 @@ systemctl disable ntp systemctl disable unbound systemctl daemon-reload bee remove ntp-4.2.8p8-0.x86_64 + ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf +mkdir -p /etc/systemd/resolved.conf.d/ +echo -e "[Resolve]\\nDomains=molgen.mpg.de" >> /etc/systemd/resolved.conf.d/domains.conf +systemctl restart systemd-resolved From f0781ea82aebafabf4ee17e7f7e0936d791e01bc Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 17:01:58 +0100 Subject: [PATCH 63/76] udev_compat: Add udev/gudev compatibility package Several packages still depend on these shared library versions, so add a compatibility package to avoid rebuilding them. A lot of them are KDE packages. --- udev_compat.be0 | 89 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100755 udev_compat.be0 diff --git a/udev_compat.be0 b/udev_compat.be0 new file mode 100755 index 000000000..545b00145 --- /dev/null +++ b/udev_compat.be0 @@ -0,0 +1,89 @@ +#!/usr/bin/env beesh + +# BEE_VERSION udev_compat-1.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]="" + +############################################################################### +## 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() { + cd ${D} + tar xpf /src/mariux/beeroot/packages/udev-164-2.x86_64.bee.tar.bz2 \ + /lib/libudev.so.0.9.3 \ + /lib/libudev.so.0 \ + /lib/libgudev-1.0.so.0.0.1 +} +## 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 0c5fb175773720c3006f16d05c233048c899a3a4 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 13:57:40 +0100 Subject: [PATCH 64/76] scripts/update-systemd-from-27-to-237.sh: Error out if required hostconfig tag is not present --- scripts/update-systemd-from-27-to-237.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh index 4e3fce7e6..3f3a36558 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-237.sh @@ -2,6 +2,11 @@ set -x +if ! { hostconfig mx64; }; then + echo "Please update the tag to *mx64* in `hostconfig` first." + exit 1 +fi + bee remove sysvinit-2.88dsf-2.x86_64 udev-164-2.x86_64 bee install -f systemd-237-0 bee update -f dbus-1.12.4-0 From e2b1296c6a84bcc78b4332188b74720ccf2af1c3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Fri, 2 Mar 2018 16:49:46 +0100 Subject: [PATCH 65/76] systemd: Add `convert-mxnetctl-to-udev-rule.go` udev rules work as expected, so use them. --- scripts/convert-mxnetctl-to-udev-rule.go | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 scripts/convert-mxnetctl-to-udev-rule.go diff --git a/scripts/convert-mxnetctl-to-udev-rule.go b/scripts/convert-mxnetctl-to-udev-rule.go new file mode 100644 index 000000000..24c8988b7 --- /dev/null +++ b/scripts/convert-mxnetctl-to-udev-rule.go @@ -0,0 +1,28 @@ +package main + +import ( + "bufio" + "fmt" + "os" + "strings" +) + +func main() { + // Open the file and scan it. + f, _ := os.Open("/etc/local/mxnet") + scanner := bufio.NewScanner(f) + + for scanner.Scan() { + line := scanner.Text() + + // Split the line on commas. + parts := strings.Split(line, " ") + + // Loop over the parts from the string. + for i := range parts { + fmt.Println(parts[i]) + } + // Write a newline. + fmt.Println() + } +} From 149ac2d8abbd0d92d0da320bb8b0f36866291978 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 14:32:59 +0100 Subject: [PATCH 66/76] scripts/update-systemd-from-27-to-237.sh: Disable IPv6 --- scripts/update-systemd-from-27-to-237.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh index 3f3a36558..8249be195 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-237.sh @@ -36,3 +36,12 @@ ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf mkdir -p /etc/systemd/resolved.conf.d/ echo -e "[Resolve]\\nDomains=molgen.mpg.de" >> /etc/systemd/resolved.conf.d/domains.conf systemctl restart systemd-resolved + +cat > /etc/systemd/network/no-ipv6.network <<-EOF + [Match] + Name=* + + [Network] + LinkLocalAddressing=no + IPv6AcceptRA=no +EOF From faed74cc9e145416970d0409c6a97054c7e7b71c Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 14:53:09 +0100 Subject: [PATCH 67/76] scripts/update-systemd-from-27-to-237.sh: Disable systemd-networkd Currently, systemd-networkd assigns IPv6 addresses, which is unwanted. --- scripts/update-systemd-from-27-to-237.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh index 8249be195..13664b251 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-237.sh @@ -37,6 +37,9 @@ mkdir -p /etc/systemd/resolved.conf.d/ echo -e "[Resolve]\\nDomains=molgen.mpg.de" >> /etc/systemd/resolved.conf.d/domains.conf systemctl restart systemd-resolved +systemctl stop systemd-networkd +systemctl disable systemd-networkd + cat > /etc/systemd/network/no-ipv6.network <<-EOF [Match] Name=* From c4dcfe7c32e8030a674880d03477a6de2184c70b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 15:15:15 +0100 Subject: [PATCH 68/76] scripts/update-systemd-from-27-to-237.sh: Remove systemd-networkd configuration --- scripts/update-systemd-from-27-to-237.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh index 13664b251..b19892efe 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-237.sh @@ -39,12 +39,3 @@ systemctl restart systemd-resolved systemctl stop systemd-networkd systemctl disable systemd-networkd - -cat > /etc/systemd/network/no-ipv6.network <<-EOF - [Match] - Name=* - - [Network] - LinkLocalAddressing=no - IPv6AcceptRA=no -EOF From cee66e013611b15f1da4936772c6017a4b7bd81f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 16:20:22 +0100 Subject: [PATCH 69/76] scripts/update-systemd-from-27-to-237.sh: Disable LLMNR in systemd-resolved [1] https://de.wikipedia.org/wiki/Link-local_Multicast_Name_Resolution [2] https://github.com/systemd/systemd/issues/6224#issuecomment-312639959 [3] https://github.com/systemd/systemd/issues/2514#issuecomment-179203186 [4] https://github.com/systemd/systemd/issues/4821#issuecomment-264995354 --- scripts/update-systemd-from-27-to-237.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh index b19892efe..c1326d59f 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-237.sh @@ -35,6 +35,7 @@ bee remove ntp-4.2.8p8-0.x86_64 ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf mkdir -p /etc/systemd/resolved.conf.d/ echo -e "[Resolve]\\nDomains=molgen.mpg.de" >> /etc/systemd/resolved.conf.d/domains.conf +echo -e "[Resolve]\\nLLMNR=no" >> /etc/systemd/resolved.conf.d/disable-llmnr.conf systemctl restart systemd-resolved systemctl stop systemd-networkd From 576d5d62db6e0f478e07ba195de0afcd16dc1927 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 17:04:33 +0100 Subject: [PATCH 70/76] scripts/update-systemd-from-27-to-237.sh: Install udev_compat --- scripts/update-systemd-from-27-to-237.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh index c1326d59f..1e4c9c1de 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-237.sh @@ -17,6 +17,7 @@ systemctl restart dbus.service # restarts GDM bee update -f util-linux-2.31.1-1 xorg-server pulseaudio libgudev libusb xf86-input-evdev upower xf86-video-amdgpu xf86-video-nouveau gvfs-1.24.0-3 gnome-session-3.4.1-2 libatasmart qt5 udisks vlc-3.0.0-0 bee remove systemd-27-0.x86_64 bee update -f systemd-237-0 +bee install udev_compat-1.0-0 systemctl daemon-reload systemctl disable console-kit-daemon From 188946fd6989551da1af550a05b3d44370956d02 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 5 Mar 2018 17:16:59 +0100 Subject: [PATCH 71/76] scripts/update-systemd-from-27-to-237.sh: Ensure to load `/etc/sysctl.conf` --- scripts/update-systemd-from-27-to-237.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-237.sh index 1e4c9c1de..76b8f16de 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-237.sh @@ -39,5 +39,8 @@ echo -e "[Resolve]\\nDomains=molgen.mpg.de" >> /etc/systemd/resolved.conf.d/doma echo -e "[Resolve]\\nLLMNR=no" >> /etc/systemd/resolved.conf.d/disable-llmnr.conf systemctl restart systemd-resolved +ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf + +# just to be sure systemctl stop systemd-networkd systemctl disable systemd-networkd From 2101a721198d665182bf34aa5c9a268b53b652fd Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 7 Mar 2018 15:42:19 +0100 Subject: [PATCH 72/76] Revert "unbound: Remove version 1.6.8" This reverts commit 6aa5581eb19314750c5f563c87dd26a11eb4775a. Some GnuTLS files are linked against some libunbound.so.2`, so keep the unbound package around, despite using Unbound anymore. ``` MISS libunbound.so.2 /usr/bin/danetool MISS libunbound.so.2 /usr/bin/gnutls-cli MISS libunbound.so.2 /usr/lib/libgnutls-dane.so.0.4.1 ``` --- unbound.be0 | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100755 unbound.be0 diff --git a/unbound.be0 b/unbound.be0 new file mode 100755 index 000000000..6c25cb728 --- /dev/null +++ b/unbound.be0 @@ -0,0 +1,94 @@ +#!/usr/bin/env beesh + +# BEE_VERSION unbound-1.6.8-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.unbound.net/downloads/unbound-${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 build +## outside the source directory and need to be build 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 \ + --disable-static \ + --with-pidfile="/var/unbound/unbound.pid" \ + --with-rootkey-file="/var/unbound/root.key" +} + +mee_build() { + bee_build + ln -sf ${S}/testdata ${B}/testdata + start_cmd make check +} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +mee_install_post() { + start_cmd mv ${D}/etc/unbound/unbound.conf{,.sample} +} + +############################################################################### +## +## 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 f3ea14f19ed4c80f5ee0686843ca5938d5466f91 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 12 Mar 2018 13:06:25 +0100 Subject: [PATCH 73/76] systemd: Do not kill user sessions by default From the manual page logind.conf(5): > KillUserProcesses= > Takes a boolean argument. Configures whether the processes of a > user should be killed when the user logs out. If true, the scope > unit corresponding to the session and all processes inside that > scope will be terminated. If false, the scope is "abandoned", see > systemd.scope(5), and processes are not killed. Defaults to "yes", > but see the options KillOnlyUsers= and KillExcludeUsers= below. > > In addition to session processes, user process may run under the > user manager unit user@.service. Depending on the linger settings, > this may allow users to run processes independent of their login > sessions. See the description of enable-linger in loginctl(1). > > Note that setting KillUserProcesses=yes will break tools like > screen(1) and tmux(1), unless they are moved out of the session > scope. See example in systemd-run(1). --- systemd.be0 | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd.be0 b/systemd.be0 index 36a05c23d..d98ba2b79 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -67,6 +67,7 @@ mee_configure() { -Drootlibdir=/lib \ -Dsplit-usr=true \ -Dsysusers=false \ + -Ddefault-kill-user-processes=false \ -Db_lto=false } From 15ab4c7a8fadbfc82b95c52ca32b7ad686bbfa5e Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 12 Mar 2018 13:10:39 +0100 Subject: [PATCH 74/76] systemd: Update version from 237 to 238 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Announcement][1]: > CHANGES WITH 238: > > * The MemoryAccounting= unit property now defaults to on. After > discussions with the upstream control group maintainers we learnt > that the negative impact of cgroup memory accounting on current > kernels is finally relatively minimal, so that it should be safe to > enable this by default without affecting system performance. Besides > memory accounting only task accounting is turned on by default, all > other forms of resource accounting (CPU, IO, IP) remain off for now, > because it's not clear yet that their impact is small enough to move > from opt-in to opt-out. We recommend downstreams to leave memory > accounting on by default if kernel 4.14 or higher is are primarily > used. On very resource constrained systems or when support for old > kernels is a necessity, -Dmemory-accounting-default=false can be > used to revert this change. > > * rpm scriptlets to update the udev hwdb and rules > (%udev_hwdb_update, %udev_rules_update) and the journal catalog > (%journal_catalog_update) from the upgrade scriptlets of individual > packages now do nothing. Transfiletriggers have been added which will > perform those updates once at the end of the transaction. > > Similar transfiletriggers have been added to execute any sysctl.d and > binfmt.d rules. Thus, it should be unnecessary to provide any > scriptlets to execute this configuration from package installation > scripts. > > * systemd-sysusers gained a mode where the configuration to execute > is specified on the command line, but this configuration is not > executed directly, but instead it is merged with the configuration on > disk, and the result is executed. This is useful for package > installation scripts which want to create the user before installing > any files on disk (in case some of those files are owned by that > user), while still allowing local admin overrides. > > This functionality is exposed to rpm scriplets through a new > %sysusers_create_package macro. Old %sysusers_create and > %sysusers_create_inline macros are deprecated. > > A transfiletrigger for sysusers.d configuration is now installed, > which means that it should be uncessary to call systemd-sysusers > from package installation scripts, unless the package installs any > files owned by those newly-created users, in which case > %sysusers_create_package should be used. > > * Analogous change has been done for systemd-tmpfiles: it gained a > mode where the command-line configuration is merged with the > configuration on disk. This is exposed as the new > %tmpfiles_create_package macro, and %tmpfiles_create is deprecated. A > transfiletrigger is installed for tmpfiles.d, hence it should be > unnecessary to call systemd-tmpfiles from package installation > scripts. > > * sysusers.d configuration for a user may now also specify the group > number, in addition to the user number ("u username 123:456"), or > without the user number ("u username -:456"). > > * Configution items for systemd-sysusers can now be specified as > positional arguments when the new --inline switch is used. > > * The login shell of users created through sysusers.d may now be > specified (previously, it was always /bin/sh for root and > /sbin/nologin for other users). > > * systemd-analyze gained a new --global switch to look at global > user configuration. It also gained a unit-paths verb to list the unit > load paths that are compiled into systemd (which can be used with > --systemd, --user, or --global). > > * udevadm trigger gained a new --settle/-w option to wait for any > triggered events to finish (but just those, and not any other events > which are triggered meanwhile). > > * The action that systemd-logind takes when the lid is closed and > the machine is connected to external power can now be configured > using HandleLidSwitchExternalPower= in logind.conf. Previously, this > action was determined by HandleLidSwitch=, and, for backwards > compatibility, is still is, if HandleLidSwitchExternalPower= is not > explicitly set. > > * journalctl will periodically call sd_journal_process() to make it > resilient against inotify queue overruns when journal files are > rotated very quickly. > > * Two new functions in libsystemd — sd_bus_get_n_queued_read and > sd_bus_get_n_queued_write — may be used to check the number of > pending bus messages. > > * systemd gained a new > org.freedesktop.systemd1.Manager.AttachProcessesToUnit dbus call > which can be used to migrate foreign processes to scope and service > units. The primary user for this new API is systemd itself: the > systemd --user instance uses this call of the systemd --system > instance to migrate processes if it itself gets the request to > migrate processes and the kernel refuses this due to access > restrictions. Thanks to this "systemd-run --scope --user …" works > again in pure cgroups v2 environments when invoked from the user > session scope. > > * A new TemporaryFileSystem= setting can be used to mask out part of > the real file system tree with tmpfs mounts. This may be combined > with BindPaths= and BindReadOnlyPaths= to hide files or directories > not relevant to the unit, while still allowing some paths lower in > the tree to be accessed. > > ProtectHome=tmpfs may now be used to hide user home and runtime > directories from units, in a way that is mostly equivalent to > "TemporaryFileSystem=/home /run/user /root". > > * Non-service units are now started with KeyringMode=shared by > default. This means that mount and swapon and other mount tools have > access to keys in the main keyring. > > * /sys/fs/bpf is now mounted automatically. > > * QNX virtualization is now detected by systemd-detect-virt and may > be used in ConditionVirtualization=. > > * IPAccounting= may now be enabled also for slice units. > > * A new -Dsplit-bin= build configuration switch may be used to > specify whether bin and sbin directories are merged, or if they > should be included separately in $PATH and various listings of > executable directories. The build configuration scripts will try to > autodetect the proper values of -Dsplit-usr= and -Dsplit-bin= based > on build system, but distributions are encouraged to configure this > explicitly. > > * A new -Dok-color= build configuration switch may be used to change > the colour of "OK" status messages. > > * UPGRADE ISSUE: serialization of units using JoinsNamespaceOf= with > PrivateNetwork=yes was buggy in previous versions of systemd. This > means that after the upgrade and daemon-reexec, any such units must > be restarted. > > * INCOMPATIBILITY: as announced in the NEWS for 237, > systemd-tmpfiles will not exclude read-only files owned by root from > cleanup. > > Contributions from: Alan Jenkins, Alexander F Rødseth, Alexis > Jeandet, Andika Triwidada, Andrei Gherzan, Ansgar Burchardt, > antizealot1337, Batuhan Osman Taşkaya, Beniamino Galvani, Bill > Yodlowsky, Caio Marcelo de Oliveira Filho, CuBiC, Daniele Medri, > Daniel Mouritzen, Daniel Rusek, Davide Cavalca, Dimitri John Ledkov, > Douglas Christman, Evgeny Vereshchagin, Faalagorn, Filipe > Brandenburger, Franck Bui, futpib, Giacomo Longo, Gunnar Hjalmarsson, > Hans de Goede, Hermann Gausterer, Iago López Galeiras, Jakub Filak, > Jan Synacek, Jason A. Donenfeld, Javier Martinez Canillas, Jérémy > Rosen, Lennart Poettering, Lucas Werkmeister, Mao Huang, Marco > Gulino, Michael Biebl, Michael Vogt, MilhouseVH, Neal Gompa (ニール・ゴン > パ), Oleander Reis, Olof Mogren, Patrick Uiterwijk, Peter Hutterer, > Peter Portante, Piotr Drąg, Robert Antoni Buj Gelonch, Sergey > Ptashnick, Shawn Landden, Shuang Liu, Simon Fowler, SjonHortensius, > snorreflorre, Susant Sahani, Sylvain Plantefève, Thomas Blume, Thomas > Haller, Vito Caputo, Yu Watanabe, Zbigniew Jędrzejewski-Szmek, Марко > М. Костић (Marko M. Kostić) [1]: https://lists.freedesktop.org/archives/systemd-devel/2018-March/040469.html --- systemd.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd.be0 b/systemd.be0 index d98ba2b79..045b42778 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION systemd-237-0 +# BEE_VERSION systemd-238-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 b72c69f3bf2ac5d7fde09e6e4fe5016df8245f8b Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 12 Mar 2018 13:16:26 +0100 Subject: [PATCH 75/76] systemd: Remove manual symlink creation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It looks like, systemd does it for us now with the script `tools/meson-make-symlink.sh`. No idea, why it wasn’t the case in systemd 237. ``` [BEE] => entering mee_install_post() .. mkdir: cannot create directory ‘/dev/shm/bee-root/systemd/systemd-238-0/image/sbin’: File exists ``` --- systemd.be0 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/systemd.be0 b/systemd.be0 index 045b42778..ecfcd60f4 100755 --- a/systemd.be0 +++ b/systemd.be0 @@ -81,12 +81,6 @@ mee_configure() { ## by default this may be 'make install DESTDIR="${D}"' mee_install_post() { - mkdir ${D}/sbin - for tool in runlevel reboot shutdown poweroff halt telinit; do - ln -sv ../bin/systemctl ${D}/sbin/${tool} - done - ln -sv ../lib/systemd/systemd ${D}/sbin/init - # Support Linux kernels built with `CONFIG_CMDLINE="init=/bin/systemd"` ln -v ${D}/lib/systemd/systemd ${D}/bin/systemd From 2a4733017729075fc248de0660b9629ed76b6a9f Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 12 Mar 2018 13:42:38 +0100 Subject: [PATCH 76/76] scripts/update-systemd: Install systemd 238 --- ...emd-from-27-to-237.sh => update-systemd-from-27-to-238.sh} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename scripts/{update-systemd-from-27-to-237.sh => update-systemd-from-27-to-238.sh} (96%) diff --git a/scripts/update-systemd-from-27-to-237.sh b/scripts/update-systemd-from-27-to-238.sh similarity index 96% rename from scripts/update-systemd-from-27-to-237.sh rename to scripts/update-systemd-from-27-to-238.sh index 76b8f16de..d496750d0 100755 --- a/scripts/update-systemd-from-27-to-237.sh +++ b/scripts/update-systemd-from-27-to-238.sh @@ -8,7 +8,7 @@ if ! { hostconfig mx64; }; then fi bee remove sysvinit-2.88dsf-2.x86_64 udev-164-2.x86_64 -bee install -f systemd-237-0 +bee install -f systemd-238-0 bee update -f dbus-1.12.4-0 systemctl daemon-reexec systemctl restart dbus.service # restarts GDM @@ -16,7 +16,7 @@ systemctl restart dbus.service # restarts GDM #bee update fhs-3.0 # good idea? Removes /var/run? bee update -f util-linux-2.31.1-1 xorg-server pulseaudio libgudev libusb xf86-input-evdev upower xf86-video-amdgpu xf86-video-nouveau gvfs-1.24.0-3 gnome-session-3.4.1-2 libatasmart qt5 udisks vlc-3.0.0-0 bee remove systemd-27-0.x86_64 -bee update -f systemd-237-0 +bee update -f systemd-238-0 bee install udev_compat-1.0-0 systemctl daemon-reload systemctl disable console-kit-daemon