From d008aa7c12ed532de3d9fc835b0efbd3f5d20f29 Mon Sep 17 00:00:00 2001
From: Sérgio M. Basto <sergio@serjux.com>
Date: Apr 23 2021 14:10:13 +0000
Subject: Update Virtualbox Guest Additions to 6.1.20 (#1951631)


---

diff --git a/.gitignore b/.gitignore
index 1adf13c..dbf7e5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /VirtualBox-6.1.14a.tar.bz2
 /VirtualBox-6.1.16.tar.bz2
 /VirtualBox-6.1.18.tar.bz2
+/VirtualBox-6.1.20.tar.bz2
diff --git a/sources b/sources
index 7c4b750..d29c8cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (VirtualBox-6.1.18.tar.bz2) = 41cb4bd42429b09836c59ef9867dd3d35d0d5512ff6e515a7f8688ed444c079ce353a84f0d45b607ccf08424782d5de09b264f51b2c41a9ec34eb834458c293c
+SHA512 (VirtualBox-6.1.20.tar.bz2) = b5af4e04e1a52c85b20226a274fac93712b79d426c0268cce3f2a337616a03161a55522ecddd13844bfc24a6808ba3d651366e74ce657cc6f8fd64c34ae745a4
diff --git a/update_vbox.sh b/update_vbox.sh
index 7b3e058..e5424a5 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,8 @@
-VERSION=6.1.16
+VERSION=6.1.20
+BUG=1951631
 REL=1
-RAWHIDE=34
-BRANCHES="f33 f32 f31"
+RAWHIDE=35
+BRANCHES="f34 f33 f32"
 if [ -z "$1" ]
 then
       stage=0
@@ -9,12 +10,12 @@ else
       stage=$1
 fi
 
-git checkout master
+git checkout rawhide
 git pull
 if test $stage -le 0
 then
 echo STAGE 0
-rpmdev-bumpspec -n $VERSION -c "Update Virtualbox Guest Additions to ${VERSION}a" virtualbox-guest-additions.spec
+rpmdev-bumpspec -n $VERSION -c "Update Virtualbox Guest Additions to ${VERSION} (#${BUG})" virtualbox-guest-additions.spec
 spectool -g virtualbox-guest-additions.spec
 fedpkg new-sources ./VirtualBox-${VERSION}.tar.bz2
 fedpkg srpm && copr-cli build sergiomb/vboxfor23 virtualbox-guest-additions-$VERSION-$REL.fc$RAWHIDE.src.rpm
@@ -34,6 +35,6 @@ then
 echo STAGE 2
 for BRANCH in $BRANCHES ; do
 echo Press enter to build $BRANCH to continue; read dummy;
-git checkout $BRANCH && git merge master && git push && fedpkg build --nowait; git checkout master
+git checkout $BRANCH && git merge rawhide && git push && fedpkg build --nowait; git checkout rawhide
 done
 fi
diff --git a/virtualbox-guest-additions.spec b/virtualbox-guest-additions.spec
index 75854ff..bf8482f 100644
--- a/virtualbox-guest-additions.spec
+++ b/virtualbox-guest-additions.spec
@@ -1,8 +1,8 @@
 %global __provides_exclude_from %{_libdir}/VBoxGuestAdditions
 
 Name:       virtualbox-guest-additions
-Version:    6.1.18
-Release:    3%{?dist}
+Version:    6.1.20
+Release:    1%{?dist}
 Summary:    VirtualBox Guest Additions
 License:    GPLv2 or (GPLv2 and CDDL)
 URL:        https://www.virtualbox.org/wiki/VirtualBox
@@ -13,7 +13,7 @@ Source3:    VirtualBox-60-vboxguest.rules
 Source4:    vboxclient.service
 
 # Mainline vboxsf uses an option string rather then a custom binary data struct
-Patch2:     0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
+#Patch2:     0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
 # Do not show an error dialog when not running under vbox
 # Do not start VBoxClient --vmsvga-x11, we run VBoxClient --vmsvga as
 # a systemd service, this works with both Wayland and Xorg based sessions
@@ -178,6 +178,9 @@ getent passwd vboxadd >/dev/null || \
 
 
 %changelog
+* Fri Apr 23 2021 Sérgio Basto <sergio@serjux.com> - 6.1.20-1
+- Update Virtualbox Guest Additions to 6.1.20 (#1951631)
+
 * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 6.1.18-3
 - Rebuilt for updated systemd-rpm-macros
   See https://pagure.io/fesco/issue/2583.