Userlists check installed updater-ng and some fixes

userlist-checker/check.sh

@@ -12,21 +12,23 @@ fi
 updater_version() {
 	[ "$1" = "deploy" ] && VBRANCH="" || VBRANCH="-$1"
 	curl https://repo.turris.cz/"$MODEL$VBRANCH"/packages/turrispackages/Packages | \
-		sed -n 's/^Filename: updater-ng_\([^_-]*\).*/v\1/p'
+		sed -n 's/^Filename: updater-ng_\([^_-]*\).*/\1/p'
 	# Note: tags are in form of vVERSION but version is in form of VERSION-RELEASE
 }
 
+UPDATER_TARGET_VERSION="$(updater_version "$BRANCH")"
+
 #################################################################################
 ## Prepare updater versions
 # 1045373e0977e42bf8ff23fda88d1d5dade690d5 - (v30) Version used in Turris Omnia factory (Turris OS 3.2)
 UPDATER_VERSIONS="1045373e0977e42bf8ff23fda88d1d5dade690d5"
-# v58.4.4 - used durring migration from old updater on Turris 1.x (Turris OS 3.7)
-UPDATER_VERSIONS="$UPDATER_VERSIONS v58.4.4"
+# v58.4.5 - used durring migration from old updater on Turris 1.x (Turris OS 3.7.2)
+UPDATER_VERSIONS="$UPDATER_VERSIONS v58.4.5"
 # Version in target branch
-UPDATER_VERSIONS="$UPDATER_VERSIONS $(updater_version "$BRANCH")"
+UPDATER_VERSIONS="$UPDATER_VERSIONS v$UPDATER_TARGET_VERSION"
 # Version in deploy branch
 [ "$BRANCH" = "deploy" ] || \
-	UPDATER_VERSIONS="$UPDATER_VERSIONS $(updater_version deploy)"
+	UPDATER_VERSIONS="$UPDATER_VERSIONS v$(updater_version deploy)"
 #################################################################################
 
 #################################################################################
@@ -63,7 +65,7 @@ git_pull() {
 		popd >/dev/null
 	else
 		pushd $1 >/dev/null
-		git fetch
+		git fetch --tags
 		if ! git diff --quiet HEAD origin/HEAD; then
 			git clean -Xdf
 			git reset --hard origin/master
@@ -102,16 +104,20 @@ git_pull .updater https://gitlab.labs.nic.cz/turris/updater.git
 
 mkdir -p .fake_bin
 export PATH="$(readlink -f $PWD/.fake_bin):$PATH"
-# Old updater versions don't support --usign option so use PATH for it
-cp .usign/usign .fake_bin/usign
 # Create fake reboot to not potentially reboot host if requested
 echo "#!/bin/sh
 echo Reboot faked!" > .fake_bin/reboot
 chmod +x .fake_bin/reboot
 
-[ "$BRANCH" = "deploy" ] && VBRANCH="" || VBRANCH="--branch $BRANCH"
+[ "$BRANCH" = "deploy" ] && UBRANCH="" || UBRANCH="--branch $BRANCH"
 run_test() {
-	fakeroot "$(dirname "$0")"/updater-medkit.sh --version "$VERSION" $VBRANCH --model "$MODEL"
+	# Run updater and generate root
+	fakeroot "$(dirname "$0")"/updater-medkit.sh --version "$VERSION" $UBRANCH --model "$MODEL" || exit 1
+	# Check version of updater (should be the one from target branch)
+	# TODO what if that is older version than the on in deploy
+	local CONTROL="root-$MODEL$VBRANCH-$VERSION/usr/lib/opkg/info/updater-ng.control"
+	[ -f "$CONTROL" ] && grep -q "Version: $UPDATER_TARGET_VERSION" "$CONTROL" || exit 1
+	rm -rf "root-$MODEL$VBRANCH-$VERSION"
 }
 ## Now build and test specified updater version
 for V in $UPDATER_VERSIONS; do
@@ -146,6 +152,13 @@ for V in $UPDATER_VERSIONS; do
 		echo "$L" >> userlists
 		run_test
 	done
+	# Test all userlists together
+	echo "== Testing all userlists together =="
+	echo base > userlists
+	for L in $LISTS; do
+		echo "$L" >> userlists
+	done
+	run_test
 
 	make -C .updater clean
 done

userlist-checker/patch-v58.4.4

+patch-v58.4.5
\ No newline at end of file

userlist-checker/patch-v59.0.3/0001-Reintroduce-updater-key.patch

+From 914dcb1a8ce105bace36aee8c2d2e6c858aea97c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
+Date: Mon, 10 Jul 2017 14:25:32 +0200
+Subject: [PATCH] Reintroduce updater key
+
+---
+ updater.pem | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 56 insertions(+)
+ create mode 100644 updater.pem
+
+diff --git a/updater.pem b/updater.pem
+new file mode 100644
+index 0000000..9e0d686
+--- /dev/null
++++ b/updater.pem
+@@ -0,0 +1,56 @@
++-----BEGIN CERTIFICATE-----
++MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVT
++MRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9i
++YWwgQ0EwHhcNMDIwNTIxMDQwMDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQG
++EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UEAxMSR2VvVHJ1c3Qg
++R2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2swYYzD9
++9BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjoBbdq
++fnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDv
++iS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU
++1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+
++bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5aszPeE4uwc2hGKceeoW
++MPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTA
++ephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVkDBF9qn1l
++uMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKIn
++Z57QzxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfS
++tQWVYrmm3ok9Nns4d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcF
++PseKUgzbFbS9bZvlxrFUaKnjaZC2mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Un
++hw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6pXE0zX5IJL4hmXXeXxx12E6nV
++5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvmMw==
++-----END CERTIFICATE-----
++-----BEGIN CERTIFICATE-----
++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
++e3NhUtRgGGzR1ek=
++-----END CERTIFICATE-----
++
+-- 
+2.13.0
+

userlist-checker/updater-medkit.sh

@@ -101,5 +101,4 @@ fi
 .updater/bin/pkgupdate --no-replan --usign=.usign/usign -R $ABSOUT --batch file://$UPDATER_CONF
 
 # Do cleanups
-rm -rf "$ROOT"
 rm -f $UPDATER_CONF