mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
Use syslog logging.
Fix segmentation fault problem. Update to 1999.01.10. Submitted by: Mikhail Teterin <mi@aldan.algebra.com>
This commit is contained in:
Shigeyuki Fukushima
parent
b83413c027
commit
710d966e30
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=21237
@ -1,13 +1,13 @@
|
||||
# New ports collection makefile for: wcolEpre
|
||||
# Version required: 980713_100245
|
||||
# Version required: 990110_150126
|
||||
# Date created: 17 July 1998
|
||||
# Whom: Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
|
||||
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
|
||||
#
|
||||
# $FreeBSD$
|
||||
#
|
||||
|
||||
DISTNAME= wcolEpre.980713_100245
|
||||
PKGNAME= wcolEpre-1998.07.13
|
||||
DISTNAME= wcolEpre.990110_150126
|
||||
PKGNAME= wcolEpre-1999.01.10
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://shika.aist-nara.ac.jp/products/DEST/Wcol/
|
||||
|
||||
@ -17,29 +17,44 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
STARTUP_SCRIPT=${PREFIX}/etc/rc.d/wcol.sh.sample
|
||||
# startup script
|
||||
WCOL_STARTUP= wcol.sh.sample
|
||||
STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/wcol.sh
|
||||
|
||||
# wcol pooldir
|
||||
DEFAULT_POOLDIR?=/var/spool/wcol
|
||||
MAKE_ENV+=DEFAULT_POOLDIR=${DEFAULT_POOLDIR}
|
||||
DEFAULT_POOLDIR?= /var/spool/wcol
|
||||
MAKE_ENV+= DEFAULT_POOLDIR=${DEFAULT_POOLDIR}
|
||||
|
||||
# wcol sample configuration file
|
||||
WCOL_CONF_DIST= ${WRKSRC}/wcol.conf-dist-FreeBSD
|
||||
WCOL_CONF= ${PREFIX}/etc/wcol.conf.sample
|
||||
|
||||
pre-patch:
|
||||
@${RM} -f ${WRKSRC}/../admin/killwcol.in
|
||||
@${MV} -f ${WRKSRC}/../admin/killwcol ${WRKSRC}/../admin/killwcol.in
|
||||
|
||||
pre-configure:
|
||||
@(cd ${WRKSRC} ; \
|
||||
${RM} -f ${WCOL_CONF_DIST} ; \
|
||||
${CAT} wcol.conf-dist | \
|
||||
${SED} -e "s;@@DEFAULT_POOLDIR@@;${DEFAULT_POOLDIR};g" \
|
||||
> ${WCOL_CONF_DIST} ; \
|
||||
${RM} -f ${WCOL_STARTUP} ; \
|
||||
${CAT} ${FILESDIR}/${WCOL_STARTUP} | \
|
||||
${SED} -e "s;@@DEFAULT_POOLDIR@@;${DEFAULT_POOLDIR};g" \
|
||||
-e "s;@@PREFIX@@;${PREFIX};g" \
|
||||
> ${WRKSRC}/${WCOL_STARTUP} ; \
|
||||
)
|
||||
|
||||
|
||||
post-install:
|
||||
@if [ ! -d ${DEFAULT_POOLDIR} ]; then \
|
||||
${ECHO} "Making wcol pool directory." ; \
|
||||
${MKDIR} ${DEFAULT_POOLDIR} ; \
|
||||
fi
|
||||
${TOUCH} /var/log/wcol.log
|
||||
|
||||
@${ECHO} "Installing sample configuration file."
|
||||
@${INSTALL_DATA} ${WRKSRC}/wcol.conf-dist ${PREFIX}/etc/wcol.conf.sample
|
||||
|
||||
@if [ ! -f ${STARTUP_SCRIPT} ]; then \
|
||||
${ECHO} "Installing ${STARTUP_SCRIPT} startup file." ; \
|
||||
${INSTALL_SCRIPT} ${FILESDIR}/wcol.sh.sample ${STARTUP_SCRIPT} ; \
|
||||
fi
|
||||
@${INSTALL_DATA} ${WCOL_CONF_DIST} ${WCOL_CONF}
|
||||
@${ECHO} "Installing ${STARTUP_SCRIPT} startup file."
|
||||
@${INSTALL_SCRIPT} ${WRKSRC}/wcol.sh.sample ${STARTUP_SCRIPT}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1 +1 @@
|
||||
MD5 (wcolEpre.980713_100245.tar.gz) = bb13951023278a6146d07af01aca5861
|
||||
MD5 (wcolEpre.990110_150126.tar.gz) = 123bff52d4b918a67062b9e71f64c86f
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- Makefile.in.orig Mon Jun 29 18:59:44 1998
|
||||
+++ Makefile.in Sat Sep 4 01:13:54 1999
|
||||
--- Makefile.in.orig Tue Dec 1 12:03:35 1998
|
||||
+++ Makefile.in Sat Sep 4 23:07:24 1999
|
||||
@@ -8,8 +8,8 @@
|
||||
|
||||
|
||||
@ -23,8 +23,16 @@
|
||||
+ -DDEFAULT_POOLDIR=\"${DEFAULT_POOLDIR}\" \
|
||||
-DLOGGING_LOCALTIME \
|
||||
-DMAX_REQUEST_QUEUE=2048 \
|
||||
-DMAX_HANDLER=4 -DNUM_HANDLER=4 \
|
||||
@@ -72,7 +76,7 @@
|
||||
- -DMAX_HANDLER=4 -DNUM_HANDLER=4 \
|
||||
+ -DMAX_HANDLER=2 -DNUM_HANDLER=2 \
|
||||
@@ -66,13 +70,14 @@
|
||||
-DSESSION_TIMEOUT=60000 -DSESSION_LIFETIME=3600000 \
|
||||
-DMAX_PROMPTER=2 -DNUM_PROMPTER=2 \
|
||||
-DMAX_SPEAKER=2 -DNUM_SPEAKER=2 \
|
||||
+ -DUSE_SYSLOG \
|
||||
-DUSE_ICP_NOTIFY \
|
||||
-DQUERY_TIMEOUT=2000
|
||||
|
||||
|
||||
LIBS = @LIBS@
|
||||
|
||||
@ -33,16 +41,6 @@
|
||||
|
||||
|
||||
###
|
||||
@@ -96,7 +100,8 @@
|
||||
ICP_OBJS = _icp.o socket.o hname.o msg.o base.o url.o mem.o sigs.o
|
||||
FLOOD_OBJS = flood.o icp.o socket.o hname.o msg.o base.o url.o mem.o sigs.o misc.o
|
||||
PLIST_OBJS = plist.o msg.o base.o url.o info.o mem.o misc.o \
|
||||
- args.o rglobal.o accept.o pstate.o conv.o
|
||||
+ args.o rglobal.o accept.o pstate.o conv.o \
|
||||
+ reaper.o sigs.o ipc.o eqsort.o
|
||||
|
||||
OBJS = $(WCOL_OBJS) $(SSTATE_OBJS) $(HSTATE_OBJS) $(REAPER_OBJS) \
|
||||
$(FTP_OBJS) $(PARSE_OBJS) $(JFILTER_OBJS) $(ICP_OBJS) $(FLOOD_OBJS) \
|
||||
@@ -155,6 +160,27 @@
|
||||
allclean:
|
||||
-$(MAKE) clean
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- wcol.conf-dist.orig Sat Sep 20 21:55:05 1997
|
||||
+++ wcol.conf-dist Mon Jul 13 03:48:00 1998
|
||||
+++ wcol.conf-dist Sun Sep 5 00:55:45 1999
|
||||
@@ -46,7 +46,7 @@
|
||||
#
|
||||
#
|
||||
@ -41,7 +41,7 @@
|
||||
#
|
||||
|
||||
-LogFile /var/tmp/wcol.log
|
||||
+LogFile /var/log/wcol.log
|
||||
+#LogFile /var/log/wcol.log
|
||||
|
||||
StateFile /var/tmp/wcol.state
|
||||
-PidFile /var/tmp/wcol.pid
|
||||
@ -49,21 +49,33 @@
|
||||
|
||||
|
||||
|
||||
@@ -388,7 +388,7 @@
|
||||
@@ -381,14 +381,17 @@
|
||||
# <num> is indicated number of handlers by integer. If it is not specified
|
||||
# wcol wake all handlers in MAX_HANDLER (It is defined in Makefile).
|
||||
#
|
||||
+# In the case of FreeBSD packages/ports:
|
||||
+# MAX_HANDLER is 2 in this wcol binary.
|
||||
+#
|
||||
# NumHandler <= MaxHandler <= MAX_HANDLER
|
||||
#
|
||||
# example:
|
||||
-# NumHandler 4
|
||||
+# NumHandler 2
|
||||
#
|
||||
|
||||
NumHandler 4
|
||||
-NumHandler 4
|
||||
-MaxHandler 8
|
||||
+MaxHandler 4
|
||||
+NumHandler 2
|
||||
+MaxHandler 2
|
||||
|
||||
|
||||
NumPrompter 1
|
||||
@@ -417,7 +417,7 @@
|
||||
@@ -417,7 +420,7 @@
|
||||
# CacheDir /var/tmp/www-pool
|
||||
#
|
||||
|
||||
-CacheDir /var/tmp/pool
|
||||
+CacheDir /var/spool/wcol
|
||||
+CacheDir @@DEFAULT_POOLDIR@@
|
||||
|
||||
|
||||
#
|
||||
|
||||
@ -1,8 +1,50 @@
|
||||
#!/bin/sh
|
||||
wcolspool=/var/spool/wcol
|
||||
wcol=/usr/local/wcol/wcol
|
||||
#
|
||||
# Startup for wcol daemon
|
||||
#
|
||||
|
||||
if [ -f $wcol ]; then
|
||||
echo -n ' wcol'
|
||||
$wcol >/dev/null 2>&1 &
|
||||
# default settings.
|
||||
wcol_program=@@PREFIX@@/wcol/wcol
|
||||
wcol_kill_program=@@PREFIX@@/wcol/killwcol
|
||||
wcol_conf=@@PREFIX@@/etc/wcol.conf
|
||||
wcol_spooldir=@@DEFAULT_POOLDIR@@
|
||||
wcol_pid=/var/run/wcol.pid
|
||||
|
||||
#
|
||||
# If there is a global system configuration file, suck it in.
|
||||
#
|
||||
if [ -f /etc/defaults/rc.conf ]; then
|
||||
. /etc/defaults/rc.conf
|
||||
elif [ -f /etc/rc.conf ]; then
|
||||
. /etc/rc.conf
|
||||
fi
|
||||
|
||||
case "$1" in
|
||||
'start')
|
||||
if [ "x${wcol_enable}" = "xYES" ] ; then
|
||||
if [ -f ${wcol_conf} -a -f ${wcol_program} ]; then
|
||||
if [ ! -d ${wcol_spooldir} ]; then
|
||||
/bin/mkdir ${wcol_spooldir}
|
||||
fi
|
||||
${wcol_program} >/dev/null 2>&1 &
|
||||
echo -n ' wcol'
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
'stop')
|
||||
if [ -f ${wcol_kill_program} ]; then
|
||||
${wcol_kill_program} >/dev/null 2>&1
|
||||
else
|
||||
PID=`cat ${wcol_pid}`
|
||||
if [ ! -z "$PID" ] ; then
|
||||
/bin/kill ${PID} >/dev/null 2>&1
|
||||
fi
|
||||
/bin/rm -f ${wcol_pid}
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Usage: wcol.sh { start | stop }"
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
|
||||
@ -8,14 +8,19 @@ WcolE - WWW Collector 5th generation
|
||||
|
||||
Wcol sample configuration file is ${PREFIX}/etc/wcol.conf.sample
|
||||
Wcol sample startup script is ${PREFIX}/etc/rc.d/wcol.sh.sample
|
||||
Wcol cache spool directory is /var/spool/wcol
|
||||
Wcol log directory is /var/log/wcol.log
|
||||
Wcol cache spool directory is ${DEFAULT_POOLDIR}
|
||||
Wcol pid file is /var/run/wcol.pid
|
||||
Wcol log is logged by syslog (facility: daemon).
|
||||
|
||||
You should prepare wcol config file: ${PREFIX}/etc/wcol.conf
|
||||
|
||||
(*) default ${PREFIX} is /usr/local
|
||||
(*) default ${DEFAULT_POOLDIR} is /var/spool/wcol
|
||||
|
||||
If you want to enable wcol at boot time, put in your /etc/rc.conf.local:
|
||||
|
||||
wcol_enable="YES"
|
||||
|
||||
---
|
||||
Shigeyuki FUKUSHIMA <shige@FreeBSD.ORG>
|
||||
Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
|
||||
WWW: http://shika.aist-nara.ac.jp/products/wcol/wcol.html
|
||||
|
||||
@ -12,8 +12,7 @@ wcol/pool_walk
|
||||
wcol/log_report
|
||||
wcol/log_transition
|
||||
etc/wcol.conf.sample
|
||||
etc/rc.d/wcol.sh.sample
|
||||
etc/rc.d/wcol.sh
|
||||
@exec mkdir -p /var/spool/wcol
|
||||
@exec touch /var/log/wcol.log
|
||||
@unexec rm -rf /var/spool/wcol
|
||||
@dirrm wcol
|
||||
|
||||
Loading…
Reference in New Issue
Block a user