From 0f411d505bf09ad27e396ff828c5152eebe16f27 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 23 Aug 2018 13:16:16 +0200
Subject: [PATCH] Upgrade virtualbox

---
 satellites/kbuild.sat     | 37 -------------------------------------
 satellites/opus.sat       | 14 ++++++++++++++
 satellites/virtualbox.sat | 30 +++++++++++++++++++++++++-----
 3 files changed, 39 insertions(+), 42 deletions(-)
 delete mode 100644 satellites/kbuild.sat
 create mode 100644 satellites/opus.sat

diff --git a/satellites/kbuild.sat b/satellites/kbuild.sat
deleted file mode 100644
index 8f07e5f..0000000
--- a/satellites/kbuild.sat
+++ /dev/null
@@ -1,37 +0,0 @@
-import 'misc/debian'
-
-name=kbuild
-dir_version=3127
-version=0.1.9998svn$dir_version+dfsg
-
-define_option '!bootstrap: Bootstrap this program'
-
-misc_debian_download -v "$dir_version" 1 \
-                     '4fc1123276a0d12103469972b2bb5c88' \
-                     'fbaf1e742fc99e099eb26765d7f98270'
-_
-
-cd "$name-$version"
-misc_debian_patch
-
-cat > SvnInfo.kmk << EOF
-KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk
-KBUILD_SVN_REV := $dir_version
-EOF
-
-option bootstrap kBuild/env.sh --full make -f bootstrap.gmk
-kBuild/env.sh kmk rebuild
-kBuild/env.sh kmk install \
-    NIX_INSTALL_DIR="/$dir_prefix" \
-    MY_INST_BIN="\$(MY_INST_ROOT)$dir_bin/" \
-    MY_INST_DATA="\$(MY_INST_ROOT)$dir_data/$name/" \
-    MY_INST_DOC="\$(MY_INST_ROOT)$dir_doc/$name/"
-
-cp -aT out/*/release/dist "$dir_install"
-install -Dm644 -t "$dir_install/$dir_prefix/$dir_man/man1" debian/manpages/kmk.1
-for x in $(ls out/*/release/dist/usr/bin/* | fgrep -vx 'kmk'); do
-    bin="$(basename "$x")"
-    ln -sf kmk.1 "$dir_install/$dir_prefix/$dir_man/man1/$bin.1"
-done
-
-# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/opus.sat b/satellites/opus.sat
new file mode 100644
index 0000000..5b3a10a
--- /dev/null
+++ b/satellites/opus.sat
@@ -0,0 +1,14 @@
+import 'compile/configure'
+
+name=opus
+version=1.2.1
+update_url="https://archive.mozilla.org/pub/$name/"
+
+dlextract "https://archive.mozilla.org/pub/$name/$name-$version.tar.gz" \
+          '54bc867f13066407bc7b95be1fede090'
+_
+
+cd "$name-$version"
+compile_configure -- --disable-static
+
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/virtualbox.sat b/satellites/virtualbox.sat
index acd1cf4..5a6d2fb 100644
--- a/satellites/virtualbox.sat
+++ b/satellites/virtualbox.sat
@@ -5,14 +5,23 @@ import 'misc/debian'
 
 name=VirtualBox
 deb_name=virtualbox
-version=5.2.8
+version=5.2.18
+version_kbuild_rev=3149
+version_kbuild=0.1.9998svn$version_kbuild_rev+dfsg
 
 define_option 'pam: Use PAM for authentication'
 
-misc_debian_download -r contrib -n "$deb_name" -O dfsg-2 \
-                     '7cc899dac8cf683ce1bbdc0fdbd73399'
+misc_debian_download -r contrib -n "$deb_name" -O dfsg-1 \
+                     'cf6ced2af27d76d8ed949659e4150886'
 dlfile "http://download.virtualbox.org/virtualbox/$orig_version/$name-$orig_version.tar.bz2" \
-       'e731ea9c5c31096ec4c2a3bfba26665c'
+       'd8e291525b84569356773eef507c49ce'
+
+( name=kbuild version="$version_kbuild"
+    misc_debian_download -V -v "$version_kbuild_rev" 3 \
+                         'e0d990b4900783060479514a1d4075f4' \
+                         '1a9b1e67651af062a032695926612954'
+)
+version_kbuild+="-3"
 _
 
 # Unpack and sanitize the source tarball
@@ -23,8 +32,19 @@ extract "${deb_name}_$version.debian.tar.xz"
 
     ./get-orig-source.sh --upstream-version "$orig_version"
 )
-
 mv debian "$name-$orig_version"
+
+# Build and install kbuild
+cat > "kbuild-$version_kbuild/SvnInfo.kmk" << EOF
+KBUILD_SVN_URL := http://svn.netlabs.org/repos/kbuild/trunk
+KBUILD_SVN_REV := $version_kbuild_rev
+EOF
+( cd "kbuild-$version_kbuild"
+    misc_debian_patch
+    kBuild/env.sh --full make -f bootstrap.gmk
+)
+mv "kbuild-$version_kbuild/kBuild" "$name-$orig_version"
+
 cd "$name-$orig_version"
 
 # Exclude some patches