Merge pull request #550 from freedomofpress/bump-to-0.3.0

SecureDrop Workstation 0.3.0~rc1

VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0~rc1

rpm-build/SPECS/securedrop-workstation-dom0-config.spec

@@ -1,12 +1,12 @@
 Name:		securedrop-workstation-dom0-config
-Version:	0.2.4
+Version:	0.3.0~rc1
 Release:	1%{?dist}
 Summary:	SecureDrop Workstation
 
 Group:		Library
 License:	GPLv3+
 URL:		https://github.com/freedomofpress/securedrop-workstation
-Source0:	securedrop-workstation-dom0-config-0.2.4.tar.gz
+Source0:	securedrop-workstation-dom0-config-0.3.0-rc1.tar.gz
 
 BuildArch:      noarch
 BuildRequires:	python3-setuptools
@@ -28,7 +28,7 @@ configuration over time.
 %undefine py_auto_byte_compile
 
 %prep
-%setup -q
+%setup -n securedrop-workstation-dom0-config-0.3.0-rc1
 
 %build
 %{__python3} setup.py build
@@ -106,6 +106,13 @@ find /srv/salt -maxdepth 1 -type f -iname '*.top' \
     | xargs qubesctl top.enable > /dev/null
 
 %changelog
+* Mon May 11 2020 SecureDrop Team <[email protected] - 0.3.0~rc1
+- Removes package updates from sd-log AppVM config
+- Permit whitelisting VMs for copy/paste & copying logs via tags
+- Safely shut down sys-usb; tweak logging
+- Clear Salt cache and synchronize Salt before installing/uninstalling
+- Logs more VM state info in updater
+
 * Mon Mar 30 2020 SecureDrop Team <[email protected]> - 0.2.4
 - Adjusts VM reboot order, to stabilize updater behavior
 

update_version.sh

@@ -17,16 +17,26 @@ if [ -z "$OLD_VERSION" ]; then
   exit 1
 fi
 
+if [[ $NEW_VERSION == *-rc* ]]; then
+  echo "Release candidates should use the versioning 0.x.y~rcZ!"
+  exit 1
+fi
+
+NEW_SDIST_VERSION=$(echo "$NEW_VERSION" | sed -r -e 's/~/-/')
+OLD_SDIST_VERSION=$(echo "$OLD_VERSION" | sed -r -e 's/~/-/')
+
 # Update the version in rpm-build/SPECS/securedrop-workstation-dom0-config.spec and setup.py
 # We just change Source0 and Version fields in the rpm spec. The spec file also contains the changelog entries,
 # and we don't want to increment those versions.
 if [[ "$OSTYPE" == "darwin"* ]]; then
     # The empty '' after sed -i is required on macOS to indicate no backup file should be saved.
     sed -i '' "s@$(echo "${OLD_VERSION}" | sed 's/\./\\./g')@$NEW_VERSION@g" VERSION
-    sed -i '' -e "/Source0/s/$OLD_VERSION/$NEW_VERSION/" rpm-build/SPECS/securedrop-workstation-dom0-config.spec
+    sed -i '' -e "/Source0/s/$OLD_SDIST_VERSION/$NEW_SDIST_VERSION/" rpm-build/SPECS/securedrop-workstation-dom0-config.spec
     sed -i '' -e "/Version/s/$OLD_VERSION/$NEW_VERSION/" rpm-build/SPECS/securedrop-workstation-dom0-config.spec
+    sed -i '' -e "/\%setup -n securedrop-workstation-dom0-config-/s/$OLD_SDIST_VERSION/$NEW_SDIST_VERSION/" rpm-build/SPECS/securedrop-workstation-dom0-config.spec
 else
     sed -i "s@$(echo "${OLD_VERSION}" | sed 's/\./\\./g')@$NEW_VERSION@g" VERSION
-    sed -i -e "/Source0/s/$OLD_VERSION/$NEW_VERSION/" rpm-build/SPECS/securedrop-workstation-dom0-config.spec
+    sed -i -e "/Source0/s/$OLD_SDIST_VERSION/$NEW_SDIST_VERSION/" rpm-build/SPECS/securedrop-workstation-dom0-config.spec
     sed -i -e "/Version/s/$OLD_VERSION/$NEW_VERSION/" rpm-build/SPECS/securedrop-workstation-dom0-config.spec
+    sed -i -e "/\%setup -n securedrop-workstation-dom0-config-/s/$OLD_SDIST_VERSION/$NEW_SDIST_VERSION/" rpm-build/SPECS/securedrop-workstation-dom0-config.spec
 fi