aboutsummaryrefslogtreecommitdiff
path: root/textproc/htdig
diff options
context:
space:
mode:
authorKris Kennaway <kris@FreeBSD.org>2000-02-28 08:15:16 +0000
committerKris Kennaway <kris@FreeBSD.org>2000-02-28 08:15:16 +0000
commitaacec056013698f161d29ff2c10fc5ede8737b4a (patch)
tree639c2e4591e425d7a219a37b9ae52c5f01a9b0fc /textproc/htdig
parentb62cf310968d12854c16608e9c7ce83e6e0face2 (diff)
downloadports-aacec056013698f161d29ff2c10fc5ede8737b4a.tar.gz
ports-aacec056013698f161d29ff2c10fc5ede8737b4a.zip
Update to htdig 3.1.5, which fixes a security hole in the htsearch
cgi-bin. Submitted by: Doug Barton <doug@gorean.org>
Notes
Notes: svn path=/head/; revision=26404
Diffstat (limited to 'textproc/htdig')
-rw-r--r--textproc/htdig/Makefile13
-rw-r--r--textproc/htdig/distinfo3
-rw-r--r--textproc/htdig/files/patch-ab10
-rw-r--r--textproc/htdig/pkg-plist2
4 files changed, 12 insertions, 16 deletions
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index 2445ec8d6545..a67433079701 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: htdig
-# Version required: 3.1.3
+# Version required: 3.1.5
# Date created: 18 August 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= htdig-3.1.3
+DISTNAME= htdig-3.1.5
CATEGORIES= textproc www
MASTER_SITES= http://www.htdig.org/files/ \
${MASTER_SITE_SUNSITE} \
@@ -16,13 +16,9 @@ MASTER_SITES= http://www.htdig.org/files/ \
ftp://ftp.htdig.org/pub/htdig/
MASTER_SITE_SUBDIR= apps/www/indexing
-PATCH_SITES= http://www.htdig.org/files/contrib/other/
-PATCHFILES= htdig-3.1.3-urlparmbug.patch
-PATCH_DIST_STRIP= -p1
-
MAINTAINER= billf@FreeBSD.org
-RUN_DEPENDS= ${PREFIX}/share/apache:${PORTSDIR}/www/apache13
+RUN_DEPENDS= ${LOCALBASE}/share/apache:${PORTSDIR}/www/apache13
Y2K= http://www.htdig.org/FAQ.html#q1.7
@@ -33,6 +29,9 @@ CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \
BUILD_TARGET= depends all
post-patch:
+ @ ${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.Dist
+ @ ${SED} -e 's#(CONFIG_DIR)/htdig.conf#(CONFIG_DIR)/htdig.conf.sample#g' \
+ ${WRKSRC}/Makefile.in.Dist > ${WRKSRC}/Makefile.in
@ ${MV} ${WRKSRC}/CONFIG.in ${WRKSRC}/CONFIG.in.Dist
@ ${SED} -e 's#/conf#/etc#' \
diff --git a/textproc/htdig/distinfo b/textproc/htdig/distinfo
index 753b7be5cb8e..5096b867a3d9 100644
--- a/textproc/htdig/distinfo
+++ b/textproc/htdig/distinfo
@@ -1,2 +1 @@
-MD5 (htdig-3.1.3.tar.gz) = 02c8e8e04c01932111958d4cd7bdd674
-MD5 (htdig-3.1.3-urlparmbug.patch) = 3744a515fc90edbb7bd3cfe9d60d20d0
+MD5 (htdig-3.1.5.tar.gz) = cbf4a0f2b703d9822db555a14dc96ed3
diff --git a/textproc/htdig/files/patch-ab b/textproc/htdig/files/patch-ab
index 002b66eab1c6..8cac20bc895f 100644
--- a/textproc/htdig/files/patch-ab
+++ b/textproc/htdig/files/patch-ab
@@ -1,6 +1,5 @@
-diff -ur ../htdig-3.1.3.Dist/db/dist/configure ./db/dist/configure
---- ../htdig-3.1.3.Dist/db/dist/configure Wed Sep 22 09:18:15 1999
-+++ ./db/dist/configure Tue Oct 26 18:06:57 1999
+--- db/dist/configure.orig Thu Feb 24 18:29:00 2000
++++ db/dist/configure Sat Feb 26 13:25:13 2000
@@ -3056,7 +3056,7 @@
case "$host_os" in
@@ -10,9 +9,8 @@ diff -ur ../htdig-3.1.3.Dist/db/dist/configure ./db/dist/configure
irix*) CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";;
osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
solaris*) CPPFLAGS="-D_REENTRANT $CPPFLAGS"
-diff -ur ../htdig-3.1.3.Dist/db/dist/configure.in ./db/dist/configure.in
---- ../htdig-3.1.3.Dist/db/dist/configure.in Wed Sep 22 09:18:15 1999
-+++ ./db/dist/configure.in Tue Oct 26 18:06:46 1999
+--- db/dist/configure.in.orig Thu Feb 24 18:29:00 2000
++++ db/dist/configure.in Sat Feb 26 13:25:13 2000
@@ -405,7 +405,7 @@
dnl libraries for threaded applications
case "$host_os" in
diff --git a/textproc/htdig/pkg-plist b/textproc/htdig/pkg-plist
index b55d596ded73..485ff4771e63 100644
--- a/textproc/htdig/pkg-plist
+++ b/textproc/htdig/pkg-plist
@@ -3,7 +3,7 @@ bin/htfuzzy
bin/htmerge
bin/htnotify
bin/rundig
-etc/htdig.conf
+etc/htdig.conf.sample
share/htdig/bad_words
share/htdig/english.0
share/htdig/english.aff