From be62073690d8f59062bf50971dca9d8dc990274d Mon Sep 17 00:00:00 2001
From: Peter Marquardt <wwwutz@molgen.mpg.de>
Date: Tue, 29 Oct 2019 16:47:02 +0100
Subject: [PATCH 1/2] util-linux: update to 2.34

- fix bee in/excludes
- enable color selection
- disable nls
- be chatty
- let user decide to complete
- fix disabled program selection
---
 util-linux.be0 | 82 +++++++++++---------------------------------------
 1 file changed, 17 insertions(+), 65 deletions(-)

diff --git a/util-linux.be0 b/util-linux.be0
index 0f619e5f2..e7f110bfb 100755
--- a/util-linux.be0
+++ b/util-linux.be0
@@ -1,59 +1,15 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION util-linux-2.33.1-0
+# BEE_VERSION util-linux-2.34-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.kernel.org/pub/linux/utils/util-linux/v${PKGVERSION[2]}/util-linux-${PKGVERSION}.tar.xz"
-
-###############################################################################
-## Add URLs/pathes to patch files to the PATCHURL array.
-## The sources will be patched in the order of the array.
+SRCURL[0]="https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${PKGVERSION}/util-linux-${PKGVERSION}.tar.xz"
 
 # 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+=(/usr/bin/chfn)
-EXCLUDE+=(/usr/bin/chsh)
-EXCLUDE+=(/usr/bin/login)
-EXCLUDE+=(/usr/bin/su)
-EXCLUDE+=(/usr/sbin/nologin)
-EXCLUDE+=(/usr/share/man/man1/chfn.1)
-EXCLUDE+=(/usr/share/man/man1/chsh.1)
-EXCLUDE+=(/usr/share/man/man1/login.1)
-EXCLUDE+=(/usr/share/man/man1/su.1)
-EXCLUDE+=(/usr/share/man/man8/nologin.8)
-
-###############################################################################
-## 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 "${@}"
 #}
@@ -64,10 +20,20 @@ EXCLUDE+=(/usr/share/man/man8/nologin.8)
 
 mee_configure() {
     bee_configure \
+        CFLAGS='-fPIC -g -O2' \
         ADJTIME_PATH=/var/lib/hwclock/adjtime \
-    	--without-python
+        --without-python \
+        --disable-nls \
+        --disable-colors-default \
+        --disable-silent-rules \
+        --disable-bash-completion \
+        --disable-nologin \
+        --disable-login \
+        --disable-su \
+        --disable-chfn-chsh
 }
 
+
 #mee_build() {
 #    bee_build
 #}
@@ -75,22 +41,8 @@ mee_configure() {
 #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/
-##
+#mee_install_post() {
+#    cd $D;find . -ls
+#    exit
+#}

From 2866c85f502611f2be57bee68d3e5661cf66bf8b Mon Sep 17 00:00:00 2001
From: Paul Menzel <pmenzel@molgen.mpg.de>
Date: Thu, 31 Oct 2019 13:43:38 +0100
Subject: [PATCH 2/2] util-linux: Ship bash completion files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Revert part of the previous commit to ship the bash completion files.
Usage of those is disabled by default, and users have to explicitly
enable them in their environment, like `~/.bashrc`.

Money quote: “Ich find’s trotzdem ’ne Pest.”.

Increment revision to 1.
---
 util-linux.be0 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util-linux.be0 b/util-linux.be0
index e7f110bfb..2a147106a 100755
--- a/util-linux.be0
+++ b/util-linux.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION util-linux-2.34-0
+# BEE_VERSION util-linux-2.34-1
 
 SRCURL[0]="https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${PKGVERSION}/util-linux-${PKGVERSION}.tar.xz"
 
@@ -26,7 +26,6 @@ mee_configure() {
         --disable-nls \
         --disable-colors-default \
         --disable-silent-rules \
-        --disable-bash-completion \
         --disable-nologin \
         --disable-login \
         --disable-su \