sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Upgrade to version 3.1.6, which fixes numerous bugs, and one possible

Browse source 
security problem that was present in the unpatched 3.1.5.
* Update the master sites list.
* Configure more precisely several important directories, partly to
compensate for some of the new defaults, and partly to avoid potential
future security problems regarding remote users being able to read
files specified as config files. This vulnerability was patched
already, and the fix is included in this version. However, a little
paranoia never hurt anyone.
* Remove the patches, as they have either been made obsolete by the new
version, or as in the pthreads issue, I'm doing them differently in
the Makefile.
* Make the patching in the Makefile smarter.
* Put my name in the pkg-descr.... overlooked previously.
* Adjust the pkg-plist, and sort it since the bloat is the same either way.

Thanks to Palle Girgensohn <girgen@partitur.se> for the suggestion in the PR
to place the conf file in its own directory.

PR:	ports/26058
This commit is contained in:
Doug Barton 2002-02-04 07:22:00 +00:00
parent 47ce65cfd8
commit 246a59bb1a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=54191
7 changed files with 71 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
textproc/htdig/Makefile
View file

@ -6,42 +6,41 @@
#
PORTNAME= htdig
PORTVERSION= 3.1.5
PORTREVISION= 1
PORTVERSION= 3.1.6
CATEGORIES= textproc www
MASTER_SITES= http://www.htdig.org/files/ \
${MASTER_SITE_SUNSITE} \
ftp://ftp.ntua.gr/pub/www/htdig/ \
ftp://ftp.max.irk.ru/unix/net/www/ \
ftp://ftp.loxinfo.co.th/pub/unix/www/ \
ftp://ftp.htdig.org/pub/htdig/
MASTER_SITE_SUBDIR= apps/www/indexing
ftp://ftp.ntua.gr/pub/www/htdig/
MAINTAINER= DougB@FreeBSD.org
RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/www/apache13
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \
--with-image-dir=${PREFIX}/share/apache/icons \
--with-search-dir=${PREFIX}/share/apache/htdocs
CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/share/apache/cgi-bin \
--with-image-dir=${PREFIX}/share/apache/icons/htdig \
--with-search-dir=${PREFIX}/share/apache/htdocs \
--with-common-dir=${PREFIX}/share/htdig/common \
--with-database-dir=${PREFIX}/share/htdig/database \
--with-config-dir=${PREFIX}/etc/htdig \
--with-default-config-file=${PREFIX}/etc/htdig/htdig.conf
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
.for file in CONFIG CONFIG.in
@ ${CP} ${WRKSRC}/${file} ${WRKSRC}/${file}.Dist
@ ${SED} -e 's#/conf#/etc#' \
-e 's#/common#/share/htdig#' \
-e 's#/db#/share/htdig#' \
${WRKSRC}/CONFIG.in.Dist > ${WRKSRC}/CONFIG.in
${WRKSRC}/${file}.Dist > ${WRKSRC}/${file}
.endfor
.for file in dist/configure dist/configure.in docs/ref/program/thread.html
@ ${CP} ${WRKSRC}/db/${file} ${WRKSRC}/db/${file}.Dist
@ ${SED} -e 's#-lc_r#${PTHREAD_LIBS:S/"//g}#g' \
${WRKSRC}/db/${file}.Dist > ${WRKSRC}/db/${file}
.endfor
@ ${MV} ${WRKSRC}/CONFIG ${WRKSRC}/CONFIG.Dist
@ ${SED} -e 's#/conf#/etc#' \
-e 's#/common#/share/htdig#' \
-e 's#/db#/share/htdig#' \
${WRKSRC}/CONFIG.Dist > ${WRKSRC}/CONFIG
post-install:
@ ${MV} ${PREFIX}/etc/htdig/htdig.conf ${PREFIX}/etc/htdig/htdig.conf.sample
.include <bsd.port.mk>

2
textproc/htdig/distinfo
View file

@ -1 +1 @@
MD5 (htdig-3.1.5.tar.gz) = cbf4a0f2b703d9822db555a14dc96ed3
MD5 (htdig-3.1.6.tar.gz) = 7a2f20d8d6149efd8d119bb2ebf55f23

10
textproc/htdig/files/patch-DB2_db.cc.new
View file

@ -1,10 +0,0 @@
--- htlib/DB2_db.cc Thu Feb 24 18:29:11 2000
+++ htlib/DB2_db.cc.new Tue Dec 11 00:16:27 2001
@@ -44,7 +44,6 @@
#include <errno.h>
#include <stdlib.h>
#include <fstream.h>
-#include <malloc.h>
#include <unistd.h>
// Where do I need this for? I don't know.

22
textproc/htdig/files/patch-ab
View file

@ -1,22 +0,0 @@
--- 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
freebsd*) CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
- LIBS="-lc_r";;
+ LIBS="-pthread";;
irix*) CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";;
osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
solaris*) CPPFLAGS="-D_REENTRANT $CPPFLAGS"
--- 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
freebsd*) CPPFLAGS="-D_THREAD_SAFE $CPPFLAGS"
- LIBS="-lc_r";;
+ LIBS="-pthread";;
irix*) CPPFLAGS="-D_SGI_MP_SOURCE $CPPFLAGS";;
osf*) CPPFLAGS="-D_REENTRANT $CPPFLAGS";;
solaris*) CPPFLAGS="-D_REENTRANT $CPPFLAGS"

24
textproc/htdig/files/patch-htsearch_cc
View file

@ -1,24 +0,0 @@
--- htsearch/htsearch.cc.Dist Thu Feb 24 18:29:11 2000
+++ htsearch/htsearch.cc Mon Sep 24 23:57:28 2001
@@ -77,9 +77,18 @@
switch (c)
{
case 'c':
- configFile = optarg;
- override_config=1;
- break;
+ // The default is obviously to do this securely
+ // but if people want to shoot themselves in the foot...
+#ifndef ALLOW_INSECURE_CGI_CONFIG
+ if (!getenv("REQUEST_METHOD"))
+ {
+#endif
+ configFile = optarg;
+ override_config=1;
+#ifndef ALLOW_INSECURE_CGI_CONFIG
+ }
+#endif
+ break;
case 'v':
debug++;
break;

2
textproc/htdig/pkg-descr
View file

@ -12,4 +12,4 @@ HTTP 1.0 protocol.
WWW: http://www.htdig.org/
Bill Fumerola <billf@FreeBSD.org>
Doug Barton <DougB@FreeBSD.org>

90
textproc/htdig/pkg-plist
View file

@ -1,50 +1,56 @@
bin/htdig
bin/htdump
bin/htfuzzy
bin/htload
bin/htmerge
bin/htnotify
bin/rundig
etc/htdig.conf.sample
share/htdig/bad_words
share/htdig/english.0
share/htdig/english.aff
share/htdig/footer.html
share/htdig/header.html
share/htdig/long.html
share/htdig/nomatch.html
share/htdig/short.html
share/htdig/synonyms
share/htdig/syntax.html
share/htdig/wrapper.html
etc/htdig/htdig.conf.sample
share/apache/cgi-bin/htsearch
share/apache/htdocs/search.html
share/apache/icons/button1.gif
share/apache/icons/button1.png
share/apache/icons/button10.gif
share/apache/icons/button10.png
share/apache/icons/button2.gif
share/apache/icons/button2.png
share/apache/icons/button3.gif
share/apache/icons/button3.png
share/apache/icons/button4.gif
share/apache/icons/button4.png
share/apache/icons/button5.gif
share/apache/icons/button5.png
share/apache/icons/button6.gif
share/apache/icons/button6.png
share/apache/icons/button7.gif
share/apache/icons/button7.png
share/apache/icons/button8.gif
share/apache/icons/button8.png
share/apache/icons/button9.gif
share/apache/icons/button9.png
share/apache/icons/buttonl.gif
share/apache/icons/buttonl.png
share/apache/icons/buttonr.gif
share/apache/icons/buttonr.png
share/apache/icons/htdig.gif
share/apache/icons/htdig.png
share/apache/icons/star.gif
share/apache/icons/star.png
share/apache/icons/star_blank.gif
share/apache/icons/star_blank.png
share/apache/icons/htdig/button1.gif
share/apache/icons/htdig/button1.png
share/apache/icons/htdig/button10.gif
share/apache/icons/htdig/button10.png
share/apache/icons/htdig/button2.gif
share/apache/icons/htdig/button2.png
share/apache/icons/htdig/button3.gif
share/apache/icons/htdig/button3.png
share/apache/icons/htdig/button4.gif
share/apache/icons/htdig/button4.png
share/apache/icons/htdig/button5.gif
share/apache/icons/htdig/button5.png
share/apache/icons/htdig/button6.gif
share/apache/icons/htdig/button6.png
share/apache/icons/htdig/button7.gif
share/apache/icons/htdig/button7.png
share/apache/icons/htdig/button8.gif
share/apache/icons/htdig/button8.png
share/apache/icons/htdig/button9.gif
share/apache/icons/htdig/button9.png
share/apache/icons/htdig/buttonl.gif
share/apache/icons/htdig/buttonl.png
share/apache/icons/htdig/buttonr.gif
share/apache/icons/htdig/buttonr.png
share/apache/icons/htdig/htdig.gif
share/apache/icons/htdig/htdig.png
share/apache/icons/htdig/star.gif
share/apache/icons/htdig/star.png
share/apache/icons/htdig/star_blank.gif
share/apache/icons/htdig/star_blank.png
share/htdig/common/bad_words
share/htdig/common/english.0
share/htdig/common/english.aff
share/htdig/common/footer.html
share/htdig/common/header.html
share/htdig/common/long.html
share/htdig/common/nomatch.html
share/htdig/common/short.html
share/htdig/common/synonyms
share/htdig/common/syntax.html
share/htdig/common/wrapper.html
@dirrm etc/htdig
@dirrm share/apache/icons/htdig
@dirrm share/htdig/common
@dirrm share/htdig/database
@dirrm share/htdig