Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 522102 - dev-libs/openssl: openssl-1.0.1h-ipv6.patch creates a .rej file
Summary: dev-libs/openssl: openssl-1.0.1h-ipv6.patch creates a .rej file
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Library (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo's Team for Core System packages
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-09-04 00:16 UTC by Anthony Basile
Modified: 2014-09-11 05:19 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Anthony Basile gentoo-dev 2014-09-04 00:16:31 UTC
The hunk against apps/s_socket.c does not apply cleanly and throws a .rej.  This bug was hit in working on bug #522042.

# patch -p1 < /usr/portage/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch 
patching file apps/s_apps.h
patching file apps/s_client.c
Hunk #2 succeeded at 574 (offset 2 lines).
Hunk #3 succeeded at 620 (offset 2 lines).
Hunk #4 succeeded at 639 (offset 2 lines).
Hunk #5 succeeded at 966 (offset 2 lines).
Hunk #6 succeeded at 1289 (offset 2 lines).
Hunk #7 succeeded at 1315 (offset 2 lines).
patching file apps/s_server.c
Hunk #1 succeeded at 562 with fuzz 1 (offset 2 lines).
Hunk #2 succeeded at 957 (offset 6 lines).
Hunk #3 succeeded at 986 (offset 6 lines).
Hunk #4 succeeded at 1340 (offset 6 lines).
Hunk #5 succeeded at 1918 (offset 14 lines).
patching file apps/s_socket.c
patching file apps/s_socket.c.rej

Reproducible: Always
Comment 1 SpanKY gentoo-dev 2014-09-11 05:18:15 UTC
it does apply cleanly.  you're seeing the patch include a hunk that creates a .rej file itself.
Comment 2 SpanKY gentoo-dev 2014-09-11 05:19:26 UTC
should be all set now in the tree; thanks for the report!

Commit message: Delete bogus hunk that creates a .rej file
http://sources.gentoo.org/dev-libs/openssl/files/openssl-1.0.1h-ipv6.patch?r1=1.1&r2=1.2