[patch] patch against hardened musl branch

0001-add-musl-based-htdig.patch (text/plain), 22.96 KB, created by DaggyStyle on 2015-01-10 14:21:56 UTC

From 17fb31143a1029e98bd326d0dc5505e9fcb4aed4 Mon Sep 17 00:00:00 2001
From: Dagg <[e-mail]>
Date: Sat, 10 Jan 2015 14:21:02 +0000
Subject: [PATCH] add musl based htdig

---
 www-misc/htdig/ChangeLog                           | 299 +++++++++++++++++++++
 www-misc/htdig/Manifest                            |   8 +
 .../0001-remove_rresvport_usage_on_musl.patch      |  20 ++
 .../htdig/files/htdig-3.2.0_beta6-as-needed.patch  |  61 +++++
 www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch  |  15 ++
 .../htdig/files/htdig-3.2.0_beta6-quoting.patch    |  26 ++
 www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild        |  68 +++++
 www-misc/htdig/metadata.xml                        |   5 +
 8 files changed, 502 insertions(+)
 create mode 100644 www-misc/htdig/ChangeLog
 create mode 100644 www-misc/htdig/Manifest
 create mode 100644 www-misc/htdig/files/0001-remove_rresvport_usage_on_musl.patch
 create mode 100644 www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
 create mode 100644 www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
 create mode 100644 www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
 create mode 100644 www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild
 create mode 100644 www-misc/htdig/metadata.xml

diff --git a/www-misc/htdig/ChangeLog b/www-misc/htdig/ChangeLog
new file mode 100644
index 0000000..f6bc625
--- /dev/null
+++ b/www-misc/htdig/ChangeLog
@@ -0,0 +1,299 @@
+# ChangeLog for www-misc/htdig
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.47 2013/05/02 04:13:35 patrick Exp $
+
+  02 May 2013; Patrick Lauer <[e-mail]> htdig-3.2.0_beta6-r3.ebuild:
+  Automake 1.13 fix
+
+  17 May 2012; Alexis Ballier <[e-mail]>
+  htdig-3.2.0_beta6-r3.ebuild:
+  keyword ~amd64-fbsd
+
+  20 Jan 2010; Raúl Porcel <[e-mail]>
+  htdig-3.2.0_beta6-r3.ebuild:
+  Add ~arm
+
+  01 Jan 2010; Jonathan Callen <[e-mail]>
+  htdig-3.2.0_beta6-r3.ebuild:
+  Add prefix keywords
+
+  13 Dec 2009; Jonathan Callen <[e-mail]> -files/3.1.6-ssl.patch,
+  -htdig-3.1.6-r7.ebuild, -htdig-3.1.6-r8.ebuild,
+  -files/htdig-3.1.6-unescaped-output.diff, htdig-3.2.0_beta6-r3.ebuild:
+  Drop some old versions; fix QA warnings; general cleanups
+
+  05 Dec 2007; <[e-mail]> -htdig-3.2.0_beta6-r2.ebuild:
+  Removed insecure htdig-3.2.0_beta6-r2 (sec bug #200285).
+
+  04 Dec 2007; Tobias Scherbaum <[e-mail]>
+  htdig-3.2.0_beta6-r3.ebuild:
+  ppc stable, bug #200285
+
+  04 Dec 2007; Markus Rothe <[e-mail]>
+  htdig-3.2.0_beta6-r3.ebuild:
+  Stable on ppc64; bug #200285
+
+  04 Dec 2007; Jeroen Roovers <[e-mail]> htdig-3.2.0_beta6-r3.ebuild:
+  Stable for HPPA (bug #200285).
+
+  04 Dec 2007; Raúl Porcel <[e-mail]>
+  htdig-3.2.0_beta6-r3.ebuild:
+  alpha/ia64/sparc stable wrt security #200285
+
+  04 Dec 2007; Steve Dibb <[e-mail]> htdig-3.2.0_beta6-r3.ebuild:
+  amd64 stable, bug 200285
+
+  03 Dec 2007; Markus Meier <[e-mail]> htdig-3.2.0_beta6-r3.ebuild:
+  x86 stable, security bug #200285
+
+*htdig-3.2.0_beta6-r3 (03 Dec 2007)
+
+  03 Dec 2007; <[e-mail]> +files/htdig-3.2.0_beta6-quoting.patch,
+  +htdig-3.2.0_beta6-r3.ebuild:
+  -m htdig-3.2.0_beta6-r3 fixes sec bug #200285.
+
+  25 Jun 2007; Raúl Porcel <[e-mail]>
+  htdig-3.2.0_beta6-r2.ebuild:
+  alpha stable wrt #178693
+
+  01 Jun 2007; Raúl Porcel <[e-mail]>
+  htdig-3.2.0_beta6-r2.ebuild:
+  ia64 stable wrt #178693
+
+  01 Jun 2007; nixnut <[e-mail]> htdig-3.2.0_beta6-r2.ebuild:
+  Stable on ppc wrt bug 178693
+
+  28 May 2007; Gustavo Zacarias <[e-mail]>
+  htdig-3.2.0_beta6-r2.ebuild:
+  Stable on sparc wrt #178693
+
+  28 May 2007; Brent Baude <[e-mail]> htdig-3.2.0_beta6-r2.ebuild:
+  Marking htdig-3.2.0_beta6-r2 ppc64 stable for bug 178693.
+
+  28 May 2007; Jeroen Roovers <[e-mail]> htdig-3.2.0_beta6-r2.ebuild:
+  Stable for HPPA (bug #178693).
+
+  27 May 2007; Markus Ullmann <[e-mail]>
+  htdig-3.2.0_beta6-r2.ebuild:
+  Stable on x86 wrt bug #178693
+
+  26 May 2007; Renat Lumpau <[e-mail]> htdig-3.2.0_beta6-r2.ebuild:
+  Fix bug 177278
+
+  25 May 2007; Jose Luis Rivero <[e-mail]>
+  htdig-3.2.0_beta6-r2.ebuild:
+  Add ~alpha wrt bug 176620
+
+  24 May 2007; Diego Pettenò <[e-mail]>
+  htdig-3.2.0_beta6-r2.ebuild:
+  Add ~x86-fbsd keyword, as per bug #176620.
+
+  02 May 2007; Jeroen Roovers <[e-mail]> htdig-3.2.0_beta6-r2.ebuild:
+  Marked ~hppa (bug #176620).
+
+  01 May 2007; Raúl Porcel <[e-mail]>
+  htdig-3.2.0_beta6-r2.ebuild:
+  Add ~ia64 wrt bug 176620
+
+  01 May 2007; Markus Rothe <[e-mail]>
+  htdig-3.2.0_beta6-r2.ebuild:
+  Added ~ppc64; bug #176620
+
+  22 Feb 2007; Markus Ullmann <[e-mail]> ChangeLog:
+  Redigest for Manifest2
+
+*htdig-3.2.0_beta6-r2 (03 Jan 2007)
+
+  03 Jan 2007; Renat Lumpau <[e-mail]> -htdig-3.2.0_beta6-r1.ebuild,
+  +htdig-3.2.0_beta6-r2.ebuild:
+  Add ssl support, bug #156003.
+
+  03 Jan 2007; Renat Lumpau <[e-mail]> -htdig-3.2.0_beta6.ebuild:
+  Housekeeping
+
+  03 Jan 2007; Renat Lumpau <[e-mail]>
+  +files/htdig-3.2.0_beta6-as-needed.patch, htdig-3.2.0_beta6-r1.ebuild:
+  fix for --as-needed, bug #155727.
+
+  05 May 2006; Jon Hood <[e-mail]> htdig-3.2.0_beta6-r1.ebuild:
+  Stable on amd64, bug #107062.
+
+*htdig-3.2.0_beta6-r1 (01 May 2006)
+*htdig-3.1.6-r8 (01 May 2006)
+
+  01 May 2006; Renat Lumpau <[e-mail]> -files/htdig-3.2.0-fpic.patch,
+  +files/3.1.6-ssl.patch, -files/CONFIG.in, +htdig-3.1.6-r8.ebuild,
+  +htdig-3.2.0_beta6-r1.ebuild:
+  Bye bye webapp.eclass: should fix #28049 , #107062 , #110528 , #125136 ; also
+  see #120830. Added https patch ( bug #52613 ). Misc housekeeping.
+
+  22 Mar 2006; Jeremy Huddleston <[e-mail]>
+  +files/htdig-3.2.0_beta6-gcc4.patch, htdig-3.2.0_beta6.ebuild:
+  Fixed compilation with gcc4.  Closes bug #126509.
+
+  06 Dec 2005; Renat Lumpau <[e-mail]> -files/reconfig,
+  htdig-3.2.0_beta6.ebuild:
+  Fixes for webapp-config-1.50
+
+  08 Sep 2005; Renat Lumpau <[e-mail]> htdig-3.1.6-r7.ebuild,
+  htdig-3.2.0_beta6.ebuild:
+  Added manual slotting wrt bug #104855
+
+  08 Sep 2005; Renat Lumpau <[e-mail]> -htdig-3.1.6-r4.ebuild:
+  Removing old obsolete version
+
+  01 Aug 2005; Danny van Dyk <[e-mail]>
+  htdig-3.2.0_beta6.ebuild:
+  Removed -fPIC patch and the real cause for BUG #98357. -Wno-deprecated made
+  configure misbehave.
+
+  10 Jul 2005; Danny van Dyk <[e-mail]>
+  +files/htdig-3.2.0-fpic.patch, htdig-3.2.0_beta6.ebuild:
+  Fixed BUG #98357 (-fPIC).
+
+*htdig-3.2.0_beta6 (06 Jul 2005)
+
+  06 Jul 2005; Renat Lumpau <[e-mail]> +files/reconfig,
+  +htdig-3.2.0_beta6.ebuild:
+  Added version.
+
+  12 Feb 2005; Jason Wever <[e-mail]> htdig-3.1.6-r7.ebuild:
+  Stable on sparc wrt security bug #80602.
+
+  10 Feb 2005; Michael Hanselmann <[e-mail]> htdig-3.1.6-r7.ebuild:
+  Stable on ppc.
+
+  10 Feb 2005; Jan Brinkmann <[e-mail]> htdig-3.1.6-r7.ebuild:
+  stable on amd64. see #80602
+
+*htdig-3.1.6-r7 (10 Feb 2005)
+
+  10 Feb 2005; Aaron Walker <[e-mail]>
+  +files/htdig-3.1.6-unescaped-output.diff, -htdig-3.1.6-r5.ebuild,
+  -htdig-3.1.6-r6.ebuild, +htdig-3.1.6-r7.ebuild:
+  Revision bump for sec bug 80602; stable on x86.
+
+  05 Sep 2004; Sven Wegener <[e-mail]> :
+  Fixed ChangeLog header.
+
+  29 Aug 2004; Renat Lumpau <[e-mail]> :
+  Symlink htsearch to /usr/bin, see bug #62087. Fix a typo in a dirname.
+
+*htdig-3.1.6-r5 (26 Aug 2004)
+
+  26 Aug 2004; Renat Lumpau <[e-mail]> +metadata.xml,
+  +htdig-3.1.6-r5.ebuild:
+  Added metadata.xml
+
+*htdig-3.1.6-r5 (26 Aug 2004)
+
+  26 Aug 2004; Renat Lumpau <[e-mail]> +htdig-3.1.6-r5.ebuild:
+  Convert to webapp.eclass. Closes #34594, 52592, and helps with #7728, 35275.
+
+*htdig-3.1.6-r4 (15 Aug 2004)
+
+  15 Aug 2004; Stuart Herbert <[e-mail]> +files/CONFIG.in,
+  +htdig-3.1.6-r4.ebuild:
+  Moved from net-www/htdig to www-misc/htdig.
+
+  23 Feb 2004; Michael Sterrett <[e-mail]> htdig-3.1.6-r4.ebuild:
+  header fix; mips needs deps before stable; move webapp-detect into unpack
+
+  15 Dec 2003; Stuart Herbert <[e-mail]> htdig-3.1.6-r4.ebuild:
+  Fix for bug #32636
+
+  16 Nov 2003; Martin Holzer <[e-mail]> htdig-3.1.6-r4.ebuild:
+  added webapps-apache.eclass. Closes #33622
+
+  16 Nov 2003; Brad House <[e-mail]> htdig-3.1.6-r4.ebuild:
+  mark stable on amd64
+
+  06 Dec 2002; Rodney Rees <[e-mail]> : changed sparc ~sparc keywords
+ 
+  30 Jul 2002; Dan Armak <[e-mail]> ChangeLog  :
+
+  Don't run rundig from pkg_postinst(). What this did was index the whole
+  www.htdig.org site! We certainly don't want that. Closes bug #5293.
+
+*htdig-3.1.6-r4 (27 May 2002)
+
+  29 Mar 2003; Jan Seidel <[e-mail]>
+  htdig-3.1.6-r4.ebuild :
+  Added mips to keywords
+
+  15 Feb 2003; Mark Guertin <[e-mail]> htdig-3.1.6-r4.ebuild :
+  set ppc in keywords
+
+  14 Jul 2002; Daniel Ahlberg <[e-mail]> htdig-3.1.6-r4.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  27 May 2002; Matthew Kennedy <[e-mail]>
+  htdig-3.1.6-r4.ebuild, files/digest-htdig-3.1.6-r4, ChangeLog :
+
+  Adds -Wno-deprecated to CPPFLAGS to allow compilation under
+  gcc3.1. Resolves bug #3091, thanks to [e-mail]
+  (Lars Pechan).
+
+*htdig-3.1.6-r3 (22 May 2002)
+
+  14 Jul 2002; Daniel Ahlberg <[e-mail]> htdig-3.1.6-r3.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  22 May 2002; Seemant Kulleen <[e-mail]> htdig-3.1.6-r3.ebuild
+  files/digest-htdig-3.1.6-r3 :
+
+  Fixes the /var/htdig/db directory, and pkg_postinst() now runs the first
+  run of rundig.  Thanks to [e-mail] (Steve Flack) in bug
+  #986.
+
+*htdig-3.1.6-r2 (25 Apr 2002)
+
+  14 Jul 2002; Daniel Ahlberg <[e-mail]> htdig-3.1.6-r2.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  25 Apr 2002; Seemant Kulleen <[e-mail]> htdig-3.1.6-r2.ebuild
+  files/digest-htdig-3.1.6-r2 :
+
+  More fixes from StuBear to place things in correct locations.
+
+*htdig-3.1.6-r1 (22 Apr 2002)
+
+  14 Jul 2002; Daniel Ahlberg <[e-mail]> htdig-3.1.6-r1.ebuild :
+  Added LICENSE, KEYWORDS, SLOT.
+
+  22 Apr 2002; Seemant Kulleen <[e-mail]> htdig-3.1.6-r1.ebuild
+  files/digest-htdig-3.1.6-r1:
+
+  [e-mail] (Stuart Bouyer) in bug report #1970 pointed
+  out that things were being installed into /usr/bin/bin instead of /usr/bin.
+
+*htdig-3.1.6 (15 Apr 2002)
+
+  15 Apr 2002; Seemant Kulleen <[e-mail]> htdig-3.1.6.ebuild
+  files/digest-htdig-3.1.6
+
+  Version bump. This puts the config files properly, etc etc. Needs heavy 
+  testing, though.
+
+  9 Mar 2002; Dan Armak <[e-mail]> changelog:
+  
+  It seems the patchfiles downloaded from the geocities site don't have a constant MD5.
+  I've put a copy on ibiblio/gentoo and the ebuild now fetches from there.
+
+*htdig-3.1.5-r2 (7 Mar 2002)
+
+  7 Mar 2002; Dan Armak <[e-mail]> Changelog:
+  
+  Added patches to make htdig work with kdevelop. This si only a temporary remedy and 
+  a big overhaul of the ebuild will come as soon as there's a new maintainer (not me!).
+  This closes bug #946.
+
+*htdig-3.1.5-r1 (1 Feb 2002)
+
+  1 Feb 2002; G.Bevin <[e-mail]> ChangeLog :
+  
+  Added initial ChangeLog which should be updated whenever the package is
+  updated in any way. This changelog is targetted to users. This means that the
+  comments should well explained and written in clean English. The details about
+  writing correct changelogs are explained in the skel.ChangeLog file which you
+  can find in the root directory of the portage repository.
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
new file mode 100644
index 0000000..60a0bf4
--- /dev/null
+++ b/www-misc/htdig/Manifest
@@ -0,0 +1,8 @@
+AUX 0001-remove_rresvport_usage_on_musl.patch 619 SHA256 6286ee4e20df336d4512216ecdef0a4bbe98d1b506490a06802b53d53d32ee09 SHA512 c50a4bab008ae713796324e5b6ab8b4013ea62168c3a0540662f5f5880033e40042fff943a177626226f7dc509ba4fc25184c94555c5d3d46d9c6510feb49bf7 WHIRLPOOL f8ed21100ae837aff91a7ba602d9a9e10c821b3fe05b8def313fab3c211149e3c2fe83ffe5004db2aff97b168f4af6b106c7de6c5f575d83c1a8d02f296581e0
+AUX htdig-3.2.0_beta6-as-needed.patch 2244 SHA256 3d0e74896a15f698532d4305f0a2257302ee0d275639b5f1d761cba51a6885fa SHA512 8b52aeb60be2cad7a5aadf02ed90044a67cba15d8fe3e3c3a715d99f2b6078d9f8c4dae145975ed0da8f4a973e46f91b5374422c1252cda4e84c6755e41015c4 WHIRLPOOL 81edca6c1d6bf415031fafde6b2cf9309f32eafdcb9c4c427e47e8b6f418e3147ab7ae9d24bd61f292a788d94c5200fa9f9492fc7123afe381f7d78630dc5e75
+AUX htdig-3.2.0_beta6-gcc4.patch 541 SHA256 729ea1d0fd415b5b144b2b95bba0575c4eef942f77adfbf54bb69e7da7dd58c3 SHA512 9acb44d1cbdbacbb0cb37d9c358e602cf5151bf06f3151da589c3697ddc2d13f576ca8fa7576b967369e8dbe7e41507f973aea60c4e7b99c447370fc0dcf7f5b WHIRLPOOL c01390007f0902619fbc1fbbbbb752ba77d20700ac75359a2cfb63dd18ddd004ffe85e2ef8c4c27f4007dd586cb23c2ceee503cb36a393573c7292a817ff881b
+AUX htdig-3.2.0_beta6-quoting.patch 1130 SHA256 d84222aa6895305c2ee87f9975bfc348a7872f63ee02a33e862b325f125b8109 SHA512 7edadb8cecb378eac8352e43ce12d5fa6af711f847f1e1ca0a49303daedffb1cef9795b74eb8cd64120e981c57c947f082f60d857985ee5ac0d54537fd6b4181 WHIRLPOOL f2be945441f52c0eba84153d5da1d403272f80dbdcc58fd8b3e300948a258839982bb08c51944251c4fe30926fc8de7f0ecc975f91f98d832687549739ab7b7e
+DIST htdig-3.2.0b6.tar.gz 3104936 SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064 WHIRLPOOL 63b0635873a24ad84c62fb85b6f9e645b3166630a4db52948604e6179f5f41978ef3c1b663122e8e5b74173c2e1cad269d4d92c5e678dcaf4dbac06d6b930cf3
+EBUILD htdig-3.2.0_beta6-r99.ebuild 1982 SHA256 541664804773436af98775d6fb34f06d75cb378e42ce9ebd23250a93890e15af SHA512 62bb8f3b99af233a66e341da98d99679dda0b1891dd3bee7208034ca51d4200debafe03c5b7d2043c3429e44b7b76b849600279503dfaf06ed903a5deb283ecd WHIRLPOOL a954b1c4c5197a343b269ca3348ec419f3feb6e1a82bc9498d284363966e71bdbf42e89bd2db2f574b150d59a5530b15cacbbde6928f4bb86937df8b0f839a89
+MISC ChangeLog 10239 SHA256 f9da00c5454e9aad45076e2acee71f57f68f0349308e11dd15b2e88f3dda7bdc SHA512 3ef21155530f5a94904225a8db0cc27df4e56d4fbeeec375608f9d1edee35c377abab903b115b06d00858628bb27cee960c97966c45cce145e0be1bdd70f514b WHIRLPOOL 783d617df3182ad08c1fc59243e3326c9ad9fa69f4abebeed7bb3b0a5d0034364e8b492615eb4f993f21060d3b807d5b17c52cbdb83a0c5957eedc2a16b3db8a
+MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
diff --git a/www-misc/htdig/files/0001-remove_rresvport_usage_on_musl.patch b/www-misc/htdig/files/0001-remove_rresvport_usage_on_musl.patch
new file mode 100644
index 0000000..ba9fab0
--- /dev/null
+++ b/www-misc/htdig/files/0001-remove_rresvport_usage_on_musl.patch
@@ -0,0 +1,20 @@
+--- htnet/Connection.cc.orig	2014-12-27 13:40:45.961149583 +0000
++++ htnet/Connection.cc	2014-12-27 13:45:45.967149583 +0000
+@@ -64,7 +64,7 @@
+ 
+ typedef void (*SIGNAL_HANDLER) (...);
+ 
+-#ifndef _MSC_VER /* _WIN32 */
++#if ! defined(_MSC_VER) && (defined(__GLIBC__) || defined(__UCLIBC__))
+ extern "C" {
+     int rresvport(int *);
+ }
+@@ -162,7 +162,7 @@ int Connection::Open(int priv)
+ 	int	aport = IPPORT_RESERVED - 1;
+ 
+ //  Native Windows (MSVC) has no rresvport
+-#ifndef _MSC_VER /* _WIN32 */
++#if ! defined(_MSC_VER) && (defined(__GLIBC__) || defined(__UCLIBC__))
+ 	sock = rresvport(&aport);
+ #else
+ 	return NOTOK;
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
new file mode 100644
index 0000000..bf455ea
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
@@ -0,0 +1,61 @@
+--- htdig-3.2.0b6/Makefile.config.orig	2006-11-19 08:49:57.000000000 -0800
++++ htdig-3.2.0b6/Makefile.config	2006-11-19 08:51:19.000000000 -0800
+@@ -22,10 +22,7 @@
+ 		$(LOCAL_DEFINES) $(PROFILING)
+ 
+ HTLIBS=		$(top_builddir)/htnet/libhtnet.la \
+-		$(top_builddir)/htcommon/libcommon.la \
+-		$(top_builddir)/htword/libhtword.la \
+ 		$(top_builddir)/htlib/libht.la \
+ 		$(top_builddir)/htcommon/libcommon.la \
+ 		$(top_builddir)/htword/libhtword.la \
+-		$(top_builddir)/db/libhtdb.la \
+-		$(top_builddir)/htlib/libht.la
++		$(top_builddir)/db/libhtdb.la 
+--- htdig-3.2.0b6/htlib/Makefile.am.orig	2006-11-19 09:13:47.000000000 -0800
++++ htdig-3.2.0b6/htlib/Makefile.am	2006-11-19 09:17:50.000000000 -0800
+@@ -1,7 +1,8 @@
+ include $(top_srcdir)/Makefile.config
+ 
+ pkglib_LTLIBRARIES = libht.la
+-
++libht_la_DEPENDENCIES = $(top_builddir)/db/libhtdb.la
++libht_la_LIBADD= $(top_builddir)/db/libhtdb.la
+ libht_la_SOURCES = Configuration.cc Database.cc Dictionary.cc \
+ 	DB2_db.cc IntObject.cc List.cc Object.cc \
+ 	ParsedString.cc Queue.cc QuotedStringList.cc Stack.cc \
+@@ -17,9 +18,6 @@
+ 	myqsort.c \
+ 	md5.cc mhash_md5.c 
+ 
+-libht_la_LIBADD=@LTLIBOBJS@
+-# this includes regex.c
+-
+ libht_la_LDFLAGS = -release $(HTDIG_MAJOR_VERSION).$(HTDIG_MINOR_VERSION).$(HTDIG_MICRO_VERSION) ${extra_ldflags}
+ 
+ pkginclude_HEADERS = \
+--- htdig-3.2.0b6/htword/Makefile.am.orig	2006-11-19 08:55:08.000000000 -0800
++++ htdig-3.2.0b6/htword/Makefile.am	2006-11-19 08:56:51.000000000 -0800
+@@ -10,7 +10,8 @@
+ LOCAL_DEFINES = 
+ 
+ pkglib_LTLIBRARIES = libhtword.la
+-
++libhtword_la_DEPENDENCIES = $(top_builddir)/htlib/libht.la
++libhtword_la_LIBADD = $(top_builddir)/htlib/libht.la
+ libhtword_la_SOURCES = \
+ 	WordBitCompress.cc \
+ 	WordContext.cc \
+
+--- htdig-3.2.0b6/htcommon/Makefile.am.orig	2006-11-19 09:32:39.000000000 -0800
++++ htdig-3.2.0b6/htcommon/Makefile.am	2006-11-19 09:33:42.000000000 -0800
+@@ -12,7 +12,8 @@
+ EXTRA_DIST=conf_lexer.cxx conf_parser.cxx
+ 
+ pkglib_LTLIBRARIES = libcommon.la
+-
++libcommon_la_DEPENDENCIES = $(top_builddir)/htword/libhtword.la
++libcommon_la_LIBADD = $(top_builddir)/htword/libhtword.la
+ libcommon_la_SOURCES = DocumentDB.cc DocumentRef.cc \
+ 	HtWordReference.cc HtWordList.cc defaults.cc \
+ 	HtURLCodec.cc URL.cc URLTrans.cc \
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
new file mode 100644
index 0000000..58dec13
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
@@ -0,0 +1,15 @@
+diff -Naurp htdig-3.2.0b6.orig/htsearch/Collection.h htdig-3.2.0b6/htsearch/Collection.h
+--- htdig-3.2.0b6.orig/htsearch/Collection.h	2004-05-28 06:15:24.000000000 -0700
++++ htdig-3.2.0b6/htsearch/Collection.h	2006-03-22 11:35:40.000000000 -0800
+@@ -36,9 +36,9 @@ public:
+                const char *docExcerpt);
+     ~Collection();
+ 
+-    void Collection::Open();
++    void Open();
+ 
+-    void Collection::Close(); 
++    void Close(); 
+ 
+     char *getWordFile() { return wordFile.get(); }
+     DocumentRef         *getDocumentRef(int id);
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
new file mode 100644
index 0000000..57b0e3b
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
@@ -0,0 +1,26 @@
+Index: htdig-3.2.0b6/htsearch/Display.cc
+===================================================================
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -137,7 +137,7 @@ Display::display(int pageNumber)
+       // Must temporarily stash the message in a String, since
+       // displaySyntaxError will overwrite the static temp used in form.
+ 
+-      String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++      String s("invalid sort method");
+ 
+       displaySyntaxError(s);
+       return;
+Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc
+===================================================================
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@ ResultFetch::fetch()
+         // Must temporarily stash the message in a String, since
+         // displaySyntaxError will overwrite the static temp used in form.
+ 
+-        String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++        String s("invalid sort method");
+ 
+         displaySyntaxError(s);
+         //return;
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild
new file mode 100644
index 0000000..97bda54
--- /dev/null
+++ b/www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild,v 1.12 2013/05/02 04:13:35 patrick Exp $
+
+inherit eutils autotools
+
+MY_PV=${PV/_beta/b}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DESCRIPTION="HTTP/HTML indexing and searching system"
+HOMEPAGE="http://www.htdig.org"
+SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="ssl"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+	app-arch/unzip
+	ssl? ( dev-libs/openssl )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-quoting.patch
+	epatch "${FILESDIR}"/0001-remove_rresvport_usage_on_musl.patch
+	epatch_user
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in db/configure.in || die
+	eautoreconf
+}
+
+src_compile() {
+	use prefix || EPREFIX=
+
+	econf \
+		--with-config-dir="${EPREFIX}"/etc/${PN} \
+		--with-default-config-file="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--with-database-dir="${EPREFIX}"/var/lib/${PN}/db \
+		--with-cgi-bin-dir="${EPREFIX}"/var/www/localhost/cgi-bin \
+		--with-search-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
+		--with-image-dir="${EPREFIX}"/var/www/localhost/htdocs/${PN} \
+		$(use_with ssl)
+
+#		--with-image-url-prefix="file://${EPREFIX}/var/www/localhost/htdocs/${PN}" \
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	use prefix || ED="${D}"
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ChangeLog README
+	dohtml -r htdoc
+
+	sed -i "s:${D}::g" \
+		"${ED}"/etc/${PN}/${PN}.conf \
+		"${ED}"/usr/bin/rundig \
+		|| die "sed failed (removing \${D} from installed files)"
+
+	# symlink htsearch so it can be easily found. see bug #62087
+	dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch
+}
diff --git a/www-misc/htdig/metadata.xml b/www-misc/htdig/metadata.xml
new file mode 100644
index 0000000..95c06f0
--- /dev/null
+++ b/www-misc/htdig/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>web-apps</herd>
+</pkgmetadata>
-- 
2.0.5