From 531515ac6bcce0a23270b0a57316f33041fff5aa Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Sun, 23 Feb 2020 16:58:09 +0100
Subject: [PATCH 1/2] fix android-x86 net; upgrades

---
 n/calibre-web/SlackBuild        | 8 +++++++-
 n/calibre-web/rc                | 2 +-
 xap/android-x86/SlackBuild      | 2 +-
 xap/android-x86/android-x86.sh  | 2 +-
 y/minecraft-launcher/SlackBuild | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/n/calibre-web/SlackBuild b/n/calibre-web/SlackBuild
index 6ce2b32f..bcf2a4b9 100755
--- a/n/calibre-web/SlackBuild
+++ b/n/calibre-web/SlackBuild
@@ -1,6 +1,8 @@
 #!/bin/sh
 
 # variables
+RUNNING_USER=${RUNNING_USER:-gwh}
+RUNNING_GROUP=${RUNNING_GROUP:-users}
 BUILD=${BUILD:-1}
 
 TAG=cyco
@@ -28,9 +30,11 @@ VERSION="$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d
 
 mkdir -p $PKG/opt
 cp -r $REPOSITORY $PKG/opt/
+chown -R ${RUNNING_USER}:${RUNNING_GROUP} $PKG/opt/$PRGNAM
 
 mkdir -p $PKG/etc/rc.d/
 cp -r $CWD/rc $PKG/etc/rc.d/rc.$PRGNAM
+sed -i "s|RUNNING_USER|$RUNNING_USER|" $PKG/etc/rc.d/rc.$PRGNAM
 
 cd $PKG/opt/$PRGNAM
 # change default password
@@ -40,11 +44,13 @@ pip3 install --target vendor -r requirements.txt
 
 # correction
 cd $PKG
-chown -R root:root *
 
 # embaumement
 mkdir -p $PKG/install
 
+# cat <<EOF > $PKG/install/doinst
+# chown -R ${RUNNING_USER}:${RUNNING_GROUP} /opt/$PRGNAM
+# EOF
 
 cat <<EOF > $PKG/install/slack-desc
 # HOW TO EDIT THIS FILE:
diff --git a/n/calibre-web/rc b/n/calibre-web/rc
index 18fda095..4d960e19 100755
--- a/n/calibre-web/rc
+++ b/n/calibre-web/rc
@@ -1,7 +1,7 @@
 #!/bin/bash
 #Slackware startup deamon script
 
-USER=root
+USER=RUNNING_USER
 
 DAEMON="python3 /opt/calibre-web/cps.py"
 PIDFILE=/var/run/calibre-web.pid
diff --git a/xap/android-x86/SlackBuild b/xap/android-x86/SlackBuild
index 36a082fb..47b023c4 100755
--- a/xap/android-x86/SlackBuild
+++ b/xap/android-x86/SlackBuild
@@ -3,7 +3,7 @@
 CWD=$(pwd)
 
 PRGNAM=$(basename $CWD)
-VERSION=${VERSION:-8.1-r2}
+VERSION=${VERSION:-9.0-rc2}
 BUILD=1
 TAG=cyco
 ARCH=$(uname -m)
diff --git a/xap/android-x86/android-x86.sh b/xap/android-x86/android-x86.sh
index 16b06c6a..65728791 100755
--- a/xap/android-x86/android-x86.sh
+++ b/xap/android-x86/android-x86.sh
@@ -43,7 +43,7 @@ elif [ -d $ANDROID_DATA_DIR/data ]; then
     fi
 fi
 
-NET="-net nic,model=e1000 -net user -netdev user,id=mynet,hostfwd=tcp::5555-:5555 -device virtio-net-pci,netdev=mynet"
+NET="-netdev user,id=mynet,hostfwd=tcp::$port-:5555 -device virtio-net-pci,netdev=mynet"
 QEMU_DISPLAY="-vga std -display gtk"
 
 run_qemu()
diff --git a/y/minecraft-launcher/SlackBuild b/y/minecraft-launcher/SlackBuild
index 93e707a6..1229f602 100755
--- a/y/minecraft-launcher/SlackBuild
+++ b/y/minecraft-launcher/SlackBuild
@@ -3,7 +3,7 @@
 CWD=$(pwd)
 
 PRGNAM=$(basename $CWD)
-VERSION=${VERSION:-2.1.5965} #$(wget -O - -o /dev/null http://status.calibre-ebook.com/latest)}
+VERSION=${VERSION:-2.1.9618}
 ARCH=$(uname -m)
 BUILD=${BUILD:-1}
 TAG=${TAG:-cyco}

From adaf743605a5063d2046cc5e7edf54d22aac9517 Mon Sep 17 00:00:00 2001
From: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
Date: Wed, 26 Feb 2020 18:23:13 +0100
Subject: [PATCH 2/2] up version

Signed-off-by: Gwenhael Le Moine <gwenhael.le.moine@gmail.com>
---
 y/minecraft-launcher/SlackBuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/y/minecraft-launcher/SlackBuild b/y/minecraft-launcher/SlackBuild
index 147c5b96..b8396548 100755
--- a/y/minecraft-launcher/SlackBuild
+++ b/y/minecraft-launcher/SlackBuild
@@ -4,6 +4,7 @@ CWD=$(pwd)
 
 PRGNAM=$(basename $CWD)
 VERSION=${VERSION:-2.1.11314}
+
 ARCH=$(uname -m)
 BUILD=${BUILD:-1}
 TAG=${TAG:-cyco}