commit: 88428fef1da8b47ccadd5fb27c19c2ed8e59591c
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 21:01:20 2017 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 21:01:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=88428fef
www-misc/htdig: fixed in the tree, bug #529384
www-misc/htdig/Manifest | 7 ---
.../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 | 8 ---
7 files changed, 205 deletions(-)
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
deleted file mode 100644
index 69cbebe..0000000
--- a/www-misc/htdig/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-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 1782 SHA256
dd98a24929ee7dc3485c9188e6c95b370e74364ed14664ddde10cad94955a32b SHA512
f4ff5c7411d3eea5467e5f1c8cf2c3068646ca7a03c2e3d166fb21e85c01c39cf657181604cb23b92834c9d0a1bf3a54140dd75d948b64c104f918bbde5615ca
WHIRLPOOL
a563878d46a99435fa75ea09f7113cc25bce3a73eabe49c75b37fc0532c01c1af096097b98a42071024fa5091383d1ef464c4aa2972e2c9ea8b7c9b4904ab260
-MISC metadata.xml 246 SHA256
f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512
1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
WHIRLPOOL
fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85
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
deleted file mode 100644
index ba9fab0..0000000
--- a/www-misc/htdig/files/0001-remove_rresvport_usage_on_musl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index bf455ea..0000000
--- a/www-misc/htdig/files/htdig-3.2.0_beta6-as-needed.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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
deleted file mode 100644
index 58dec13..0000000
--- a/www-misc/htdig/files/htdig-3.2.0_beta6-gcc4.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 57b0e3b..0000000
--- a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index c907a77..0000000
--- a/www-misc/htdig/htdig-3.2.0_beta6-r99.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="amd64 arm ~mips ppc x86"
-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
deleted file mode 100644
index f2f2ba9..0000000
--- a/www-misc/htdig/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
- <email>web-a...@gentoo.org</email>
- <name>Gentoo Webapps</name>
-</maintainer>
-</pkgmetadata>
