# Retrieved from upstream:
# https://github.com/pjsip/pjproject/commit/742f7dc252ded778a8b677937791c02e2fbc0dde
diff --git a/Makefile b/Makefile
index 31a6d39d4..74e246a44 100644
--- a/Makefile
+++ b/Makefile
@@ -121,9 +121,10 @@ cmp_wav:
 
 install:
 	mkdir -p $(DESTDIR)$(libdir)/
-	cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/
 	if [ "$(PJ_EXCLUDE_PJSUA2)x" = "x" ] ; then \
-	    cp -af $(PJ_DIR)/pjsip/lib/libpjsua2-$(LIB_SUFFIX) $(DESTDIR)$(libdir)/; \
+	    cp -af $(APP_LIBXX_FILES) $(DESTDIR)$(libdir)/; \
+	else \
+	    cp -af $(APP_LIB_FILES) $(DESTDIR)$(libdir)/; \
 	fi
 	mkdir -p $(DESTDIR)$(includedir)/
 	for d in pjlib pjlib-util pjnath pjmedia pjsip; do \
' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=25078818e93c8b2bad1654953f36e539835eef16'>refs</a><a class='active' href='/guix/log/tests/ed25519.key'>log</a><a href='/guix/tree/tests/ed25519.key?id=25078818e93c8b2bad1654953f36e539835eef16'>tree</a><a href='/guix/commit/tests/ed25519.key?id=25078818e93c8b2bad1654953f36e539835eef16'>commit</a><a href='/guix/diff/tests/ed25519.key?id=25078818e93c8b2bad1654953f36e539835eef16'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/ed25519.key'>
<input type='hidden' name='id' value='25078818e93c8b2bad1654953f36e539835eef16'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=25078818e93c8b2bad1654953f36e539835eef16'>root</a>/<a href='/guix/log/tests?id=25078818e93c8b2bad1654953f36e539835eef16'>tests</a>/<a href='/guix/log/tests/ed25519.key?id=25078818e93c8b2bad1654953f36e539835eef16'>ed25519.key</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/ed25519.key?id=25078818e93c8b2bad1654953f36e539835eef16&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-05-04 09:56:12 +0200'>2020-05-04</span></td><td><a href='/guix/commit/tests/ed25519.key?id=43408e304ffb1149f35cb539b40d673d567c9116'>Add (guix openpgp).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/openpgp.scm, tests/openpgp.scm, tests/civodul.key,
tests/dsa.key, tests/ed25519.key, tests/rsa.key,
tests/ed25519.sec: New files.
* Makefile.am (MODULES): Add guix/openpgp.scm.
(SCM_TESTS): Add tests/openpgp.scm.
(EXTRA_DIST): Add tests/*.key and tests/ed25519.sec.
</span></span></td><td>Ludovic Courtès</td></tr>
5-04 09:56:13 +0200'>2020-05-04</span></td><td><a href='/guix/commit/tests/openpgp.scm?id=bd8126558dc7a022d7853d803d7134ffa1b7bc52'>openpgp: 'lookup-key-by-{id,fingerprint}' return the key first.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, 'lookup-key-by-{id,fingerprint}' would always return the
list of packets where the primary key is first.  Thus, the caller would
need to use 'find' to actually find the requested key.

* guix/openpgp.scm (keyring-insert): Always add KEY to PACKETS.
(lookup-key-by-id, lookup-key-by-fingerprint): Change to return the key
as the first value.
(verify-openpgp-signature): Remove now unneeded call to 'find'.
* tests/openpgp.scm ("get-openpgp-keyring"): Adjust accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-05-04 09:56:12 +0200'>2020-05-04</span></td><td><a href='/guix/commit/tests/openpgp.scm?id=b45fa0a123bec8d023e5520dfb381bfc73313929'>openpgp: 'verify-openpgp-signature' looks up by fingerprint when possible.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/openpgp.scm (verify-openpgp-signature): Use
'lookup-key-by-fingerprint' when SIG contains a fingerprint.
Honor FINGERPRINT in the 'find' predicate.  Upon missing-key, return
FINGERPRINT if available.
* tests/openpgp.scm ("verify-openpgp-signature, missing key"): Adjust
expected value accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-05-04 09:56:12 +0200'>2020-05-04</span></td><td><a href='/guix/commit/tests/openpgp.scm?id=efe1f0122c61b8932671d07419f0200c170a994e'>openpgp: Add 'lookup-key-by-fingerprint'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/openpgp.scm (&lt;openpgp-keyring&gt;)[table]: Rename to...
[ids]: ... this.
[fingerprints]: New field.
(keyring-insert, lookup-key-by-fingerprint): New procedures.
(%empty-keyring): Adjust.
(get-openpgp-keyring): Manipulate KEYRING instead of its vhash, use
'keyring-insert'.
* tests/openpgp.scm ("get-openpgp-keyring"): Test
'lookup-key-by-fingerprint'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-05-04 09:56:12 +0200'>2020-05-04</span></td><td><a href='/guix/commit/tests/openpgp.scm?id=7b2b3a13cc2d9b043f37b2e7ba0f147c08de8fad'>openpgp: Store the issuer key id and fingerprint in &lt;openpgp-signature&gt;.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/openpgp.scm (&lt;openpgp-signature&gt;)[issuer, issuer-fingerprint]:
New fields.
(openpgp-signature-issuer, openpgp-signature-issuer-fingerprint): Remove.
(verify-openpgp-signature): Use 'openpgp-signature-issuer-key-id'.
(get-signature): Initialize 'issuer' and 'issuer-fingerprint'.
* tests/openpgp.scm ("get-openpgp-detached-signature/ascii"): Adjust
accordingly.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-05-04 09:56:12 +0200'>2020-05-04</span></td><td><a href='/guix/commit/tests/openpgp.scm?id=4459c7859c286ab54fa3a9901c8a17591b04c516'>openpgp: Decode the issuer-fingerprint signature subpacket.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/openpgp.scm (SUBPACKET-ISSUER-FINGERPRINT): New variable.
(openpgp-signature-issuer-fingerprint): New procedure.
(key-id-matches-fingerprint?): New procedure.
(get-signature): Look for the 'issuer and 'issuer-fingerprint
subpackets.  Ensure the issuer key ID matches the fingerprint when both
are available.
(parse-subpackets): Handle SUBPACKET-ISSUER-FINGERPRINT.
* tests/openpgp.scm (%rsa-key-fingerprint)
(%dsa-key-fingerprint, %ed25519-key-fingerprint): New variables.
* tests/openpgp.scm ("get-openpgp-detached-signature/ascii"): Check the
result of 'openpgp-signature-issuer-fingerprint'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-05-04 09:56:12 +0200'>2020-05-04</span></td><td><a href='/guix/commit/tests/openpgp.scm?id=43408e304ffb1149f35cb539b40d673d567c9116'>Add (guix openpgp).</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/openpgp.scm, tests/openpgp.scm, tests/civodul.key,
tests/dsa.key, tests/ed25519.key, tests/rsa.key,
tests/ed25519.sec: New files.
* Makefile.am (MODULES): Add guix/openpgp.scm.
(SCM_TESTS): Add tests/openpgp.scm.
(EXTRA_DIST): Add tests/*.key and tests/ed25519.sec.
</span></span></td><td>Ludovic Courtès</td></tr>