Trying to update Jami, patching pjproject fails

Trying to update Jami, patching pjproject fails

[Jan Wielkiewicz]

Hello Guix,

I'm trying to update Jami to the latest version, but the 13th patch for
pjproject fails. I can just comment that out, but that would be just a
hack. Anyone knows why would it fail? It seems to work in upstream Jami,
because I already tried several releases to make sure.
I'm using the 20201005.1.392ac4d release.
By the way, I saw someone overhauled pjproject, good job.

This is what happens:

ring-project/daemon/contrib/src/pjproject/0001-android.patch
ring-project/daemon/contrib/src/pjproject/0001-rfc6544.patch
ring-project/daemon/contrib/src/pjproject/0001-win-config.patch
ring-project/daemon/contrib/src/pjproject/0002-rfc2466.patch
ring-project/daemon/contrib/src/pjproject/0002-win-vs-gnutls.patch
ring-project/daemon/contrib/src/pjproject/0003-add-tcp-keep-alive.patch
ring-project/daemon/contrib/src/pjproject/0003-win-vs2017-props.patch
ring-project/daemon/contrib/src/pjproject/0004-multiple_listeners.patch
ring-project/daemon/contrib/src/pjproject/0005-fix_ebusy_turn.patch
ring-project/daemon/contrib/src/pjproject/0006-ignore_ipv6_on_transport_check.patch
ring-project/daemon/contrib/src/pjproject/0007-pj_ice_sess.patch
ring-project/daemon/contrib/src/pjproject/0008-fix_ioqueue_ipv6_sendto.patch
ring-project/daemon/contrib/src/pjproject/0009-add-config-site.patch
ring-project/daemon/contrib/src/pjproject/0010-fix-pkgconfig.patch
ring-project/daemon/contrib/src/pjproject/0011-fix-tcp-death-detection.patch
ring-project/daemon/contrib/src/pjproject/0012-fix-turn-shutdown-crash.patch
ring-project/daemon/contrib/src/pjproject/0013-Assign-unique-local-preferences-for-candidates-with-.patch
ring-project/daemon/contrib/src/pjproject/0014-Add-new-compile-time-setting-PJ_ICE_ST_USE_TURN_PERM.patch
ring-project/daemon/contrib/src/pjproject/0015-update-local-preference-for-peer-reflexive-candidate.patch
ring-project/daemon/contrib/src/pjproject/0016-use-addrinfo-instead-CFHOST.patch
ring-project/daemon/contrib/src/pjproject/SHA512SUMS
ring-project/daemon/contrib/src/pjproject/package.json
ring-project/daemon/contrib/src/pjproject/rules.mak
ring-project/daemon/contrib/src/pjproject/sip_td_timeout.patch
patching file pjnath/include/pjnath/ice_session.h
patching file pjnath/include/pjnath/ice_strans.h
patching file pjnath/include/pjnath/stun_session.h
patching file pjnath/include/pjnath/stun_sock.h
patching file pjnath/include/pjnath/turn_sock.h
patching file pjnath/src/pjnath-test/concur_test.c
patching file pjnath/src/pjnath-test/sess_auth.c
patching file pjnath/src/pjnath-test/stun_sock_test.c
patching file pjnath/src/pjnath/ice_session.c
patching file pjnath/src/pjnath/ice_strans.c
patching file pjnath/src/pjnath/nat_detect.c
patching file pjnath/src/pjnath/stun_session.c
patching file pjnath/src/pjnath/stun_sock.c
patching file pjnath/src/pjnath/stun_transaction.c
patching file pjnath/src/pjnath/turn_session.c
patching file pjnath/src/pjnath/turn_sock.c
patching file pjnath/src/pjturn-client/client_main.c
patching file pjnath/src/pjturn-srv/allocation.c
patching file pjnath/src/pjturn-srv/server.c
patching file pjsip-apps/src/samples/icedemo.c
patching file pjsip/src/pjsua-lib/pjsua_core.c
patching file pjnath/src/pjnath/ice_session.c
Hunk #1 succeeded at 30 (offset 1 line).
Hunk #2 succeeded at 728 (offset 10 lines).
Hunk #3 succeeded at 883 with fuzz 2 (offset 11 lines).
patching file pjlib/include/pj/sock.h
patching file pjlib/src/pj/sock_bsd.c
patching file pjlib/src/pj/sock_common.c
patching file pjlib/src/pj/sock_uwp.cpp
patching file pjlib/src/pj/symbols.c
patching file pjnath/include/pjnath/ice_session.h
Hunk #1 succeeded at 628 (offset -11 lines).
patching file pjnath/include/pjnath/ice_strans.h
patching file pjnath/src/pjnath/ice_session.c
patching file pjnath/src/pjnath/ice_strans.c
Hunk #2 succeeded at 1314 with fuzz 1 (offset -9 lines).
Hunk #3 succeeded at 1937 (offset -3 lines).
patching file pjsip/src/pjsip/sip_transport.c
patching file pjnath/include/pjnath/turn_session.h
patching file pjnath/include/pjnath/turn_sock.h
patching file pjnath/src/pjnath/ice_strans.c
Hunk #1 succeeded at 1934 (offset -3 lines).
patching file pjnath/src/pjnath/turn_session.c
patching file pjnath/src/pjnath/turn_sock.c
Hunk #6 succeeded at 1066 (offset -5 lines).
patching file pjsip/src/pjsip/sip_transport.c
Hunk #1 succeeded at 2252 (offset 4 lines).
patching file pjnath/include/pjnath/ice_strans.h
patching file pjnath/src/pjnath/ice_strans.c
Hunk #1 succeeded at 1946 (offset -3 lines).
patching file pjlib/src/pj/ioqueue_common_abs.c
patching file pjlib/src/pj/ioqueue_common_abs.h
patching file pjlib/include/pj/config_site.h
patching file Makefile
Hunk #1 succeeded at 129 (offset -3 lines).
patching file aconfigure.ac
patching file build.mak.in
patching file libpjproject.pc.in
patching file pjlib/include/pj/sock.h
patching file pjlib/src/pj/sock_bsd.c
patching file pjlib/src/pj/sock_common.c
patching file pjlib/src/pj/sock_uwp.cpp
patching file pjlib/src/pj/symbols.c
patching file pjnath/src/pjnath/turn_sock.c
Hunk #1 succeeded at 1492 (offset 96 lines).
patching file pjnath/src/pjnath/ice_session.c
Hunk #1 succeeded at 1506 (offset 209 lines).
patching file pjnath/src/pjnath/ice_strans.c
Hunk #1 succeeded at 460 (offset 42 lines).
Hunk #2 succeeded at 529 with fuzz 2 (offset 49 lines).
Hunk #3 succeeded at 589 with fuzz 1 (offset 49 lines).
Hunk #4 FAILED at 680.
1 out of 4 hunks FAILED -- saving rejects to file
pjnath/src/pjnath/ice_strans.c.rej command "patch" "--force" "-p1" "-i"
"sfl-patches/0013-Assign-unique-local-preferences-for-candidates-with-.patch"
failed with status 1 builder for
`/gnu/store/spfmrdl2g01rwd8lr3nwd2wlz45jwlmv-pjproject-jami-2.10.drv'
failed with exit code 1 build of
/gnu/store/spfmrdl2g01rwd8lr3nwd2wlz45jwlmv-pjproject-jami-2.10.drv
failed View build log at
'/var/log/guix/drvs/sp/fmrdl2g01rwd8lr3nwd2wlz45jwlmv-pjproject-jami-2.10.drv.bz2'.
cannot build derivation
`/gnu/store/xiw6p51mjapvkmwyi1xs74gmhmvmbw04-libring-20201005.1.392ac4d.drv':
1 dependencies couldn't be built cannot build derivation
`/gnu/store/q2hx2ws9282mfz2927d1zpchxq6p96m1-libringclient-20201005.1.392ac4d.drv':
1 dependencies couldn't be built cannot build derivation
`/gnu/store/ifqj0ya0m51xmra98rmxzcq78vr9jvx8-jami-20201005.1.392ac4d.drv':
1 dependencies couldn't be built guix build: error: build of
`/gnu/store/ifqj0ya0m51xmra98rmxzcq78vr9jvx8-jami-20201005.1.392ac4d.drv'
failed


Jan Wielkiewicz

Re: Trying to update Jami, patching pjproject fails

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 877 bytes --]

Hi Jan!

Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> writes:

> patching file pjnath/src/pjnath/ice_strans.c
> Hunk #1 succeeded at 460 (offset 42 lines).
> Hunk #2 succeeded at 529 with fuzz 2 (offset 49 lines).
> Hunk #3 succeeded at 589 with fuzz 1 (offset 49 lines).
> Hunk #4 FAILED at 680.
> 1 out of 4 hunks FAILED -- saving rejects to file
> pjnath/src/pjnath/ice_strans.c.rej command "patch" "--force" "-p1" "-i"
> "sfl-patches/0013-Assign-unique-local-preferences-for-candidates-with-.patch"
> failed with status 1 builder for

If you build with the -K flag you should find the .rej files in the
corresponding /tmp folder.  This and the patch at line 680 should tell
you more what's not compatible.

I suggest you ask upstream about this incompatibility, they must know
what's going on :)

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]