Skip to content
GitLab
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Sign in / Register
  • J jami-daemon
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 100
    • Issues 100
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Deployments
    • Deployments
    • Releases
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Insights
    • Issue
    • Repository
  • Wiki
    • Wiki
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • savoirfairelinux
  • jami-daemon
  • Issues
  • #53
Closed
Open
Created Sep 24, 2018 by szotsaki@szotsaki

gnutls.patch doesn't apply cleanly

8582866b brought in support for PJSIP 2.8. Unfortunately, applying gnutls.patch is not possible on a freshly downloaded pjproject-2.8.tar.bz2 file. The error message:

.../pjproject-2.8> patch -flp1 < gnutls.patch
patching file aconfigure
Hunk #1 FAILED at 644.
Hunk #2 succeeded at 1488 (offset 6 lines).
Hunk #3 FAILED at 7787.
Hunk #4 succeeded at 8267 with fuzz 2 (offset 296 lines).
2 out of 4 hunks FAILED -- saving rejects to file aconfigure.rej
patching file aconfigure.ac
Hunk #1 FAILED at 1533.
Hunk #2 succeeded at 1662 with fuzz 2 (offset 84 lines).
1 out of 2 hunks FAILED -- saving rejects to file aconfigure.ac.rej
patching file pjlib/build/Makefile
Hunk #1 FAILED at 35.
1 out of 1 hunk FAILED -- saving rejects to file pjlib/build/Makefile.rej
patching file pjlib/include/pj/compat/os_auto.h.in
Hunk #1 succeeded at 222 with fuzz 2 (offset 3 lines).
patching file pjlib/include/pj/config.h
Hunk #1 FAILED at 888.
Hunk #2 succeeded at 921 with fuzz 1 (offset 25 lines).
1 out of 2 hunks FAILED -- saving rejects to file pjlib/include/pj/config.h.rej
patching file pjlib/include/pj/ssl_sock.h
Hunk #1 succeeded at 189 with fuzz 2 (offset 5 lines).
patching file pjlib/src/pj/ssl_sock_common.c
Hunk #1 FAILED at 35.
1 out of 1 hunk FAILED -- saving rejects to file pjlib/src/pj/ssl_sock_common.c.rej
The next patch would create the file pjlib/src/pj/ssl_sock_gtls.c,
which already exists!  Applying it anyway.
patching file pjlib/src/pj/ssl_sock_gtls.c
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file pjlib/src/pj/ssl_sock_gtls.c.rej
patching file pjlib/src/pj/ssl_sock_ossl.c
Hunk #1 FAILED at 32.
1 out of 1 hunk FAILED -- saving rejects to file pjlib/src/pj/ssl_sock_ossl.c.rej
patching file pjmedia/src/pjmedia/transport_srtp.c
Hunk #1 FAILED at 31.
1 out of 1 hunk FAILED -- saving rejects to file pjmedia/src/pjmedia/transport_srtp.c.rej
patching file pjmedia/src/pjmedia/transport_srtp_sdes.c
Hunk #2 FAILED at 126.
1 out of 2 hunks FAILED -- saving rejects to file pjmedia/src/pjmedia/transport_srtp_sdes.c.rej

The PJSIP directory is freshly unpacked and no patches were applied before.

System: openSUSE Tumbleweed.

Assignee
Assign to
Time tracking