Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 652574 - net-dns/dnscrypt-proxy-2.0.8 - Applying config-full-paths-r3.patch ... 2 out of 9 hunks FAILED -- saving rejects to file dnscrypt-proxy/example-dnscrypt-proxy.toml.rej
Summary: net-dns/dnscrypt-proxy-2.0.8 - Applying config-full-paths-r3.patch ... 2 out...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Georgy Yakovlev
URL:
Whiteboard:
Keywords: PATCH
Depends on:
Blocks:
 
Reported: 2018-04-05 08:25 UTC by Søren Dalby Larsen
Modified: 2018-04-05 14:12 UTC (History)
2 users (show)

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


Attachments
config-full-paths-r4.patch (config-full-paths-r4.patch,3.02 KB, patch)
2018-04-05 08:33 UTC, Søren Dalby Larsen
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Søren Dalby Larsen 2018-04-05 08:25:58 UTC
When emerging dnscrypt-proxy, the patch to apply full paths to config and log files fails to apply as the format has changed a bit.

Reproducible: Always

Steps to Reproduce:
1. emerge net-dns/dnscrypt-proxy

Actual Results:  
 * ERROR: net-dns/dnscrypt-proxy-2.0.8::gentoo failed (prepare phase):
 *   patch -p1  failed with /var/tmp/portage/net-dns/dnscrypt-proxy-2.0.8/files/config-full-paths-r3.patch
 *



I've created an updated patch to fix this.
Comment 1 Søren Dalby Larsen 2018-04-05 08:33:48 UTC
Created attachment 526588 [details, diff]
config-full-paths-r4.patch
Comment 2 matoro archtester 2018-04-05 13:22:24 UTC
Confirming this on amd64, armv6, and armv7.
Comment 3 Georgy Yakovlev archtester gentoo-dev 2018-04-05 13:48:08 UTC
Hey, sorry about that.
Old patch got in tree.

Here is the new one
https://raw.githubusercontent.com/gyakovlev/gentoo/ac1a4ec2a74fffeb279f04247b4306af58a5b57e/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch

PR fixing this is opened on github for some time, hopefully someone will merge it soon.
Comment 4 Larry the Git Cow gentoo-dev 2018-04-05 14:12:20 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd4bb972e24cc8ae1296db4e5082677e541ff36

commit 0bd4bb972e24cc8ae1296db4e5082677e541ff36
Author:     Georgy Yakovlev <ya@sysdump.net>
AuthorDate: 2018-04-05 00:35:59 +0000
Commit:     Andreas Sturmlechner <asturm@gentoo.org>
CommitDate: 2018-04-05 14:12:09 +0000

    net-dns/dnscrypt-proxy: fix failing patch
    
    Closes: https://bugs.gentoo.org/652574
    Package-Manager: Portage-2.3.28, Repoman-2.3.9
    Closes: https://github.com/gentoo/gentoo/pull/7816

 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild |  2 +-
 ...l-paths-r3.patch => config-full-paths-r8.patch} | 44 +++++-----------------
 2 files changed, 11 insertions(+), 35 deletions(-)