app-crypt/monkeysphere: Start fixing tests
authorkristianf <devnull@localhost>
Sun, 16 Feb 2014 19:20:47 +0000 (20:20 +0100)
committerkristianf <devnull@localhost>
Sun, 16 Feb 2014 19:20:47 +0000 (20:20 +0100)
app-crypt/monkeysphere/Manifest
app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch [new file with mode: 0644]
app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch [new file with mode: 0644]
app-crypt/monkeysphere/monkeysphere-0.36-r2.ebuild

index 73b9eae..373593c 100644 (file)
@@ -1,7 +1,9 @@
 AUX monkeysphere-0.36_default_shell.patch 466 SHA256 637f4cf6e83ea01e5a981f940618127512ca1171498b0d03a7779d2b50e80124 SHA512 c77042e07372ae2b7434c03529a10afd5d13f99af025cecf53bd433341a3c70ada4cedd904de67090f36cd3dcd7f77f7a46b739116b1248b432803fc137fa7e8 WHIRLPOOL 295bc1d61f26f214020f1ac753a002911e2d775a6d7e46e847b091980d385245be12961b79949d77826ead3852e5058c45b512f28a44a36f20afd3a8f98538d0
+AUX monkeysphere-0.36_hd_od.patch 528 SHA256 f09320e4e69b12e8756e927f5965a59a7b437be6aa22f7ab22a3d6dc449313ab SHA512 412656731fced9ca5e7b1c253e8cacfc47bf45ce7ff28da9e1db1582aa84fa75f098cdd098dc6d33198eedbc87ea397569ebf0045b6291106481e7a11fb04e55 WHIRLPOOL 6fe6a702b8e21b05f6fc1aa8e0b46ea0c90ab66dc488c0792815750d85958dbbd31d2a1994e92b89e827bc562b0450594a3553d15466d4141e56b15e2894ddfe
 AUX monkeysphere-0.36_non_default_port.patch 418 SHA256 7d20a74a0ec3d49b93d1d881d22d5d13316b4c16c709cfab23782cd0ed03b41c SHA512 2a173500e0b659a79a7274e042e49a282f708cda0f6a78ce8fa126013e35c4f6f117e606b90ce31da5158e58ab52a236038a913cc98c5ae1fc8e04a5dcbf816e WHIRLPOOL 825bfa045f03444bdd301cac503a6932d0f75c52bfa72fa8f07e79a1ba359600c8f15e7a930d349bb8c2afa4aedc5f3a6e4f22436fccbf4f60a22060a66c8c4c
 AUX monkeysphere-0.36_openpgp2ssh_sanity_check.patch 1194 SHA256 e179ae2226f04f87bb0f64c3722a299ae628a0cce4eecb3e8a6fedb82ce2ddb6 SHA512 b14c421e5880407b3acb845b235c89c5338a1fc1285b514679de09371db38e42aa3371ef2916c57d5ab10f08bc19f5c864762ff7eaf0a054d2817bc6bcaab488 WHIRLPOOL f5e7b7ce0f8c8a10786d61563763113c6d8d6a67b662a23a5911a1e8f036bbcd578510217f17b2b531098881d5682dac0dbb432785f9072b8a7597b9059f7036
+AUX monkeysphere-0.36_tests_gnupg2.patch 2272 SHA256 381c351000d940e8b1e1a429265276266e590b5dc02c865e30780f723fa9fb9c SHA512 e75f82793419dd2e99aa95765e9d954437d0e78294ed4188a9e7fa246b85ddbcd755eb566a1e9a9c20f2f2634150d65caa0715993863f59f9146f5cc95457975 WHIRLPOOL 36ffb05c4362fb3b193187b3637263b95aef95b85ed70d6bb51a36bf8e8dba392b2363b401b8902b0a9ef7f91ddba304c8982d32815d273c9b009652d482e334
 AUX monkeysphere-0.36_userid_empty_line.patch 292 SHA256 bf3eefe21edd72ad813888bcd91a9c6cef8a90d0e5f8272f847cb278750ab787 SHA512 15b8e8ff71537e79d069d0f298326cc6705931c58ff1cf2f16c5486e587fe69f610dc1e0ebd0006e0bdef12f936685a0594dc3f9dbdadb928fba25a8e2982eb7 WHIRLPOOL bf27a00f18407a616e22340d10d15837fca21b659ab57fbd603718c49fb15533734d660ee061bc544cb281c6d4bb073aabff6c85d3f4b232b0872da512ae8964
 DIST monkeysphere_0.36.orig.tar.gz 98876 SHA256 6ae4edeff2cc29b6913346e15b61500ea7cc06d761a9f42e67de83b7d2607be7 SHA512 eb6776bd9996db8a5d6a1d16b5b06e6733069cbb3cb35f4e3965508575e084c6f08576f31c71429432daf93910d145804ecf155c3d7550a0f4550a056cb4f0c8 WHIRLPOOL c163d0be77d3c6d838f752c8f53d967b17aeafd798e4fca694a31bf55628fb57d18b6a4664ca9552bd3daf3b89b6f86452d430529985ca0a31c3c4aa48470bc0
-EBUILD monkeysphere-0.36-r2.ebuild 1318 SHA256 320169555e30760f876da8b712d54c67a64ad1f70efc996bd8bdd38c2dd04bd1 SHA512 c5ebed86f404b382f4453e4cbf38741aed671cd440c62bb2c7fe793da5a8bc2306feefc5c0a310b91fe4564609a36f78428a864841b363e040b30bee972fe398 WHIRLPOOL cf678ddb47325fc266c65ac7b9928771bdb2418709a9ca06c0a1ed5bffe3dad45d6d912efc381185cb9fa422b0c546c28238e4dea29ee59c190c729700b85dc7
+EBUILD monkeysphere-0.36-r2.ebuild 1478 SHA256 f0b8fc63943ed71dbd78b0315d2e862a30e233df44dc30709953eb4423a6cda1 SHA512 b5e2272a6e8084a05e5326525f2d456a9b7d3fec34810a6dac0fba7bd276662e8488a45fdcce4c9b44c5ae6281d97a6d4b95912e1ce1f612b77ee5ec60749f4e WHIRLPOOL c50634bc71e0efb1499607d7519a5eb23bbe3671612b4aee9bae65c942e6ebcc1deda84b104b16bd586aa7fb74d58f3990723f3816f257470499221d6c24c456
 MISC metadata.xml 209 SHA256 1395b5c18e78e85c534a39796fdd1d97be9e17d1800cca5e9a8b1341743f847c SHA512 ba9a5a751095aa33d737e0a6647b78f067497aad54ab0193a5aa2ec01c92a30f613ed85015f2ffda846acea85e892ea498b300f7ebae2e8f31c9cf3e4839db98 WHIRLPOOL b1d84fa003d98e38b81d14580a881417aac75958e924fcbad16cb8803b0b1e6831dc8fbfcb758d5b96e38c6f5f27bdc290bade36adb0a8d67121e169b7cbf2ff
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
new file mode 100644 (file)
index 0000000..7cdaa74
--- /dev/null
@@ -0,0 +1,14 @@
+diff -r 6150774ec7f4 tests/keytrans
+--- a/tests/keytrans   Sun Feb 16 20:11:02 2014 +0100
++++ b/tests/keytrans   Sun Feb 16 20:11:40 2014 +0100
+@@ -104,8 +104,8 @@
+     <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
+ diff -u \
+-    <(hd "$TEMPDIR"/secret.key) \
+-    <(hd "$TEMPDIR"/converted.secret.key)
++    <(od -xc "$TEMPDIR"/secret.key) \
++    <(od -xc "$TEMPDIR"/converted.secret.key)
+ KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:)
+ KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
new file mode 100644 (file)
index 0000000..7127344
--- /dev/null
@@ -0,0 +1,50 @@
+diff -r c13f4b11061e tests/keytrans
+--- a/tests/keytrans   Sun Feb 16 19:24:08 2014 +0100
++++ b/tests/keytrans   Sun Feb 16 19:27:42 2014 +0100
+@@ -131,9 +131,9 @@
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ uid:u::::$timestamp::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ EOF
+ diff -u "$TEMPDIR"/expectedout <(gpg --check-sigs --with-colons | grep -v ^tru)
+@@ -159,10 +159,10 @@
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
+-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
++rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
+ EOF
+@@ -190,15 +190,15 @@
+ cat >"$TEMPDIR"/expectedout <<EOF
+ pub:u:1024:1:$KEYID:$timestamp:::u:::scSC:
+ uid:u::::$timestamp::E90EC72E68C6C2A0751DADC70F54F60D27B88C3D::monkeymonkey:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ uid:r::::::8200BD0425CC70C7D698DF3FE412044EAAB83F94::testtest:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
+-rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
++rev:!::1:$KEYID:$revtime::::monkeymonkey:30x:::::8:
+ uid:u::::$timestamp::EDDC32D783E7F4C7B6982D9AE5DC4A61000648BA::baz:
+-sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:
++sig:!::1:$KEYID:$timestamp::::monkeymonkey:13x:::::8:
+ pub:-:1024:1:$NEWKEYID:$(($timestamp + 1)):::-:::caCA:
+ uid:-::::$(($timestamp + 1))::A0D708F51CC257DEFC01AEDE1E0A5F329DFD8F16::fubar:
+-sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:
++sig:!::1:$NEWKEYID:$(($timestamp + 1))::::fubar:13x:::::8:
+ EOF
+ echo "test: diff expected gpg list output"
index 2e97709..6be18b6 100644 (file)
@@ -12,17 +12,18 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
 SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-DEPEND=""
 KEYWORDS="~amd64 ~x86"
 
 DOCS=( README Changelog )
 
-RDEPEND="app-crypt/gnupg:0=
-       || ( net-analyzer/netcat:0= net-misc/socat:0= )
+DEPEND="app-crypt/gnupg:0=
+       net-misc/socat:0=
        dev-perl/Crypt-OpenSSL-RSA:0=
        dev-perl/Digest-SHA1:0=
        app-misc/lockfile-progs:0="
 
+RDEPEND="${DEPEND}"
+
 pkg_setup()
 {
        einfo "Creating named group and user"
@@ -35,8 +36,15 @@ src_prepare()
        epatch "${FILESDIR}/${P}_default_shell.patch"\
               "${FILESDIR}/${P}_non_default_port.patch"\
               "${FILESDIR}/${P}_userid_empty_line.patch"\
-              "${FILESDIR}/${P}_openpgp2ssh_sanity_check.patch" # Upstream bug https://labs.riseup.net/code/issues/6524
+              "${FILESDIR}/${P}_openpgp2ssh_sanity_check.patch"\
+              "${FILESDIR}/${P}_hd_od.patch"
+
        sed -i "s#share/doc/monkeysphere#share/doc/${PF}#" Makefile || die
+       
+       #Output format of gpg --check-sigs differ between 1.4 and 2.0 so test needs to be updated
+       if has_version '>=app-crypt/gnupg-2.0.0:0'; then
+               epatch "${FILESDIR}/${P}_tests_gnupg2.patch"
+       fi;
 }
 
 src_install()