Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 529384

Summary: www-misc/htdig-3.2.0_beta6-r3: fix compilation on musl branch
Product: Gentoo Linux Reporter: DaggyStyle <daggs>
Component: Current packagesAssignee: Gentoo musl team <musl>
Status: RESOLVED FIXED    
Severity: normal CC: blueness, gentoo, web-apps
Priority: Normal Keywords: InOverlay, PATCH
Version: unspecified   
Hardware: All   
OS: Linux   
Whiteboard: hardened-devel repo, musl overlay
Package list:
Runtime testing required: ---
Bug Depends on:    
Bug Blocks: 430702    
Attachments: patch
more accurate fix
patch against hardened musl branch

Description DaggyStyle 2014-11-15 20:48:08 UTC
this patch allow www-misc/htdig-3.2.0_beta6-r3 to compile and run under gentoo over musl


Reproducible: Always
Comment 1 DaggyStyle 2014-11-15 20:49:22 UTC
Created attachment 389452 [details, diff]
patch
Comment 2 DaggyStyle 2014-12-27 13:56:53 UTC
Created attachment 392516 [details, diff]
more accurate fix
Comment 3 Anthony Basile gentoo-dev 2015-01-03 16:38:15 UTC
please make a single commit against hardened-dev::musl overlay and upload the patch
Comment 4 DaggyStyle 2015-01-10 14:21:56 UTC
Created attachment 393606 [details, diff]
patch against hardened musl branch
Comment 5 Anthony Basile gentoo-dev 2015-01-31 21:22:50 UTC
(In reply to DaggyStyle from comment #4)
> Created attachment 393606 [details, diff] [details, diff]
> patch against hardened musl branch

Thanks!

A few points about future patches --- to amke my life even easier!

1. Remove the ChangeLog.  We don't need to replicate that.

2. Remove any files that we don't need for the ebuild from files.  We don't need to duplicate that either.  (There are none here, but there were in other patches you submitted.)

3. Make your commit message something like this:

  www-misc/htdig: rresvport() not supported in musl
Comment 6 Anthony Basile gentoo-dev 2015-03-08 01:58:27 UTC
Reopening so we can get this upstream.
Comment 7 Felix Janda 2015-03-08 12:24:25 UTC
Upstream looks kind of dead (last entry to Changelog in CVS is from 2005,
same for the mailing list).

But I think it would be preferable to have the musl patch in the portage
tree rather than in the overlay (might stay forever). (The check for
__UCLIBC__ can be removed since uclibc also exports __GLIBC__.)
Comment 8 Anthony Basile gentoo-dev 2015-03-08 16:16:06 UTC
(In reply to Felix Janda from comment #7)
> Upstream looks kind of dead (last entry to Changelog in CVS is from 2005,
> same for the mailing list).
> 
> But I think it would be preferable to have the musl patch in the portage
> tree rather than in the overlay (might stay forever). (The check for
> __UCLIBC__ can be removed since uclibc also exports __GLIBC__.)

yeah i kinda figured.  I was responding to vapier's point that we really should be getting these patches upstream.  may not be always possible though.
Comment 9 Felix Janda 2016-11-20 13:41:20 UTC
Submitted a pull request to get this fixed in the main tree:

https://github.com/gentoo/gentoo/pull/2869
Comment 10 Patrice Clement gentoo-dev 2017-06-13 19:32:02 UTC
commit e4cd88b4c016eb7cbf610ffe1d3a67d2dc332975 (HEAD -> master, origin/master, origin/HEAD)
Author:     Felix Janda <felix.janda@posteo.de>
AuthorDate: Tue Jun 13 21:29:45 2017 +0200
Commit:     Patrice Clement <monsieurp@gentoo.org>
CommitDate: Tue Jun 13 21:31:07 2017 +0200

www-misc/htdig: add patch for musl. EAPI 6 bump.

Gentoo-Bug: https://bugs.gentoo.org/529384

Package-Manager: Portage-2.3.5, Repoman-2.3.1

.../htdig/files/htdig-3.2.0_beta6-as-needed.patch  |  4 +-
www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch  |  4 +-
www-misc/htdig/files/htdig-3.2.0_beta6-musl.patch  | 33 ++++++++++++
www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild         | 63 ++++++++++++++++++++++
4 files changed, 100 insertions(+), 4 deletions(-)
create mode 100644 www-misc/htdig/files/htdig-3.2.0_beta6-musl.patch
create mode 100644 www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild

Merged, thanks!