diff options
35 files changed, 392 insertions, 182 deletions
diff --git a/app-misc/lcdproc/files/lcdproc b/app-misc/lcdproc/files/lcdproc index 0879d5455816..781d36d34cfa 100644 --- a/app-misc/lcdproc/files/lcdproc +++ b/app-misc/lcdproc/files/lcdproc @@ -1,14 +1,10 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/files/lcdproc,v 1.3 2001/12/06 20:17:01 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/lcdproc/files/lcdproc,v 1.4 2001/12/23 23:25:19 azarah Exp $ + +# NB: Config is in /etc/conf.d/lcdproc -# Please don't change these variables. They are listed here as -# defaults for reference. Make your modifications in -# /etc/conf.d/lcdproc instead. -port="ttyS0" -driver="MtxOrb" -clients="C M T X" start() { ebegin "Starting LCDProc" diff --git a/app-text/dictd/dictd-1.5.5-r6.ebuild b/app-text/dictd/dictd-1.5.5-r6.ebuild index 9c00701fa26a..8719916c5e01 100644 --- a/app-text/dictd/dictd-1.5.5-r6.ebuild +++ b/app-text/dictd/dictd-1.5.5-r6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Michael Conrad Tilstra <michael@gentoo.org> <tadpol@tadpol.org> -# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.5.5-r6.ebuild,v 1.1 2001/10/18 21:10:36 danarmak Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/dictd-1.5.5-r6.ebuild,v 1.2 2001/12/23 23:25:19 azarah Exp $ A=${P}.tar.gz S=${WORKDIR}/${P} @@ -44,5 +44,7 @@ src_install () { #startups for dictd exeinto /etc/init.d newexe ${FILESDIR}/${PVR}/dictd.rc6 dictd + insinto /etc/conf.d + newins ${FILESDIR}/${PVR}/dictd.confd dictd } diff --git a/app-text/dictd/files/1.5.5-r6/dictd.confd b/app-text/dictd/files/1.5.5-r6/dictd.confd new file mode 100644 index 000000000000..91b9d43884bc --- /dev/null +++ b/app-text/dictd/files/1.5.5-r6/dictd.confd @@ -0,0 +1,7 @@ +# Config file for /etc/init.d/dictd + +EARGS="-s " +DICTDCONF=/etc/dict/dictd.conf +DLIBDIR=/usr/lib/dict +TMPCONF=/etc/dict/dictd.conf.$$ + diff --git a/app-text/dictd/files/1.5.5-r6/dictd.rc6 b/app-text/dictd/files/1.5.5-r6/dictd.rc6 index 2bc09a6dee11..6cdb07276aeb 100644 --- a/app-text/dictd/files/1.5.5-r6/dictd.rc6 +++ b/app-text/dictd/files/1.5.5-r6/dictd.rc6 @@ -1,12 +1,10 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.5.5-r6/dictd.rc6,v 1.3 2001/12/06 20:17:01 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/dictd/files/1.5.5-r6/dictd.rc6,v 1.4 2001/12/23 23:25:19 azarah Exp $ + +# NB: Config is in /etc/conf.d/dictd -EARGS="-s " -DICTDCONF=/etc/dict/dictd.conf -DLIBDIR=/usr/lib/dict -TMPCONF=/etc/dict/dictd.conf.$$ prepconfig() { if [ ! -e ${DICTDCONF} ] diff --git a/net-dialup/ppp/ppp-2.4.1-r6.ebuild b/net-dialup/ppp/ppp-2.4.1-r6.ebuild index d430c8901027..02c161a3f05d 100644 --- a/net-dialup/ppp/ppp-2.4.1-r6.ebuild +++ b/net-dialup/ppp/ppp-2.4.1-r6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r6.ebuild,v 1.3 2001/11/25 14:11:08 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r6.ebuild,v 1.4 2001/12/23 23:25:19 azarah Exp $ A="${P}.tar.gz" S=${WORKDIR}/${P} @@ -58,7 +58,7 @@ src_install() { doins etc.ppp/options # insinto /etc/modules.d -# doins ${FILESDIR}/${PVR}/modules.ppp +# doins ${FILESDIR}/modules.ppp dodoc PLUGINS README* SETUP Changes-2.3 FAQ diff --git a/net-fs/nfs-utils/files/nfs.confd b/net-fs/nfs-utils/files/nfs.confd new file mode 100644 index 000000000000..b759218b1277 --- /dev/null +++ b/net-fs/nfs-utils/files/nfs.confd @@ -0,0 +1,15 @@ +# Config file for /etc/init.d/nfs + +# This is a safety net to keep from running an NFS server unless the +# administrator really wants it. It's mostly historical because early +# versions of Gentoo didn't split nfs/nfsmount into two scripts. +# These days it might be safe to remove this eventually, since +# administrators specifically have to run "rc-update add nfs default" +# in order for the NFS server to run. +NFSSERVER=no + +# Number of servers to be started up by default +RPCNFSDCOUNT=8 + +# Options to pass to rpc.mountd +RPCMOUNTDOPTS="" diff --git a/net-fs/nfs-utils/files/nfs.rc6 b/net-fs/nfs-utils/files/nfs.rc6 new file mode 100644 index 000000000000..60fad1963f1a --- /dev/null +++ b/net-fs/nfs-utils/files/nfs.rc6 @@ -0,0 +1,125 @@ +#!/sbin/runscript +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.rc6,v 1.1 2001/12/23 23:25:19 azarah Exp $ + +#--------------------------------------------------------------------------- +# This script starts/stops the following +# rpc.statd if necessary (also checked by init.d/nfsmount) +# rpd.rquotad +# rpd.nfsd +# rpc.mountd +#--------------------------------------------------------------------------- + +# NB: Config is in /etc/conf.d/nfs + + +opts="start stop restart reload" + +# This variable is used for controlling whether or not to run exportfs -ua; +# see stop() for more information +RESTARTING=no + +depend() { + need net portmap +} + +start_statd() { + # Don't start rpc.statd if already started by init.d/nfsmount + killall -0 rpc.statd &>/dev/null && return 0 + ebegin "Starting NFS statd" + start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2 + eend $? "Error starting NFS statd" +} + +stop_statd() { + # Don't stop rpc.statd if it's in use by init.d/nfsmount. + mount -t nfs | grep -q . && return 0 + # Make sure it's actually running + killall -0 rpc.statd &>/dev/null || return 0 + # Okay, all tests passed, stop rpc.statd + ebegin "Stopping NFS statd" + start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2 + eend $? "Error stopping NFS statd" +} + +start() { + if [ "$NFSSERVER" = "yes" ] + then + start_statd + + if grep -q '^/' /etc/exports &>/dev/null; then + ebegin "Exporting NFS directories" + /sbin/exportfs -r 1>&2 + eend $? "Error exporting NFS directories" + fi + + ebegin "Starting NFS rquotad" + start-stop-daemon --start --quiet --exec /sbin/rpc.rquotad 1>&2 + eend $? "Error starting NFS rquotad" + + ebegin "Starting NFS daemon" + start-stop-daemon --start --quiet --exec \ + /sbin/rpc.nfsd -- $RPCNFSDCOUNT 1>&2 + eend $? "Error starting NFS daemon" + + # Check if we support NFSv3 + ebegin "Starting NFS mountd" + rpcinfo -u localhost nfs 3 &>/dev/null || \ + RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3" + start-stop-daemon --start --quiet --exec \ + /sbin/rpc.mountd -- $RPCMOUNTDOPTS 1>&2 + eend $? "Error starting NFS mountd" + fi +} + +stop() { + # Don't check NFSSERVER variable since it might have changed, + # instead use --oknodo to smooth things over + ebegin "Stopping NFS mountd" + start-stop-daemon --stop --quiet --oknodo \ + --exec /sbin/rpc.mountd 1>&2 + eend $? "Error stopping NFS mountd" + + ebegin "Stopping NFS daemon" + start-stop-daemon --stop --quiet --oknodo \ + --name nfsd --user root --signal 2 1>&2 + eend $? "Error stopping NFS daemon" + + ebegin "Stopping NFS rquotad" + start-stop-daemon --stop --quiet --oknodo \ + --exec /sbin/rpc.rquotad 1>&2 + eend $? "Error stopping NFS rquotad" + + # When restarting the NFS server, running "exportfs -ua" probably + # isn't what the user wants. Running it causes all entries listed + # in xtab to be removed from the kernel export tables, and the + # xtab file is cleared. This effectively shuts down all NFS + # activity, leaving all clients holding stale NFS filehandles, + # *even* when the NFS server has restarted. + # + # That's what you would want if you were shutting down the NFS + # server for good, or for a long period of time, but not when the + # NFS server will be running again in short order. In this case, + # then "exportfs -r" will reread the xtab, and all the current + # clients will be able to resume NFS activity, *without* needing + # to umount/(re)mount the filesystem. + if [ "$RESTARTING" = no ]; then + ebegin "Unexporting NFS directories" + /sbin/exportfs -ua 1>&2 + eend $? "Error unexporting NFS directories" + fi + + stop_statd +} + +reload() { + /sbin/exportfs -r +} + +restart() { + # See long comment in stop() regarding RESTARTING and exportfs -ua + RESTARTING=yes + stop + start +} diff --git a/net-fs/nfs-utils/files/nfsmount.rc6 b/net-fs/nfs-utils/files/nfsmount.rc6 new file mode 100644 index 000000000000..f1acd82d86c1 --- /dev/null +++ b/net-fs/nfs-utils/files/nfsmount.rc6 @@ -0,0 +1,42 @@ +#!/sbin/runscript +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.rc6,v 1.1 2001/12/23 23:25:19 azarah Exp $ + +depend() { + need net portmap +} + +start_statd() { + # Don't start rpc.statd if already started by init.d/nfs + killall -0 rpc.statd &>/dev/null && return 0 + ebegin "Starting NFS statd" + start-stop-daemon --start --quiet --exec /sbin/rpc.statd 1>&2 + eend $? "Error starting NFS statd" +} + +stop_statd() { + # Don't stop rpc.statd if it's in use by init.d/nfs + killall -0 nfsd &>/dev/null && return 0 + # Make sure it's actually running + killall -0 rpc.statd &>/dev/null || return 0 + # Okay, all tests passed, stop rpc.statd + ebegin "Stopping NFS statd" + start-stop-daemon --stop --quiet --exec /sbin/rpc.statd 1>&2 + eend $? "Error stopping NFS statd" +} + +start() { + start_statd + ebegin "Mounting NFS filesystems" + mount -a -t nfs + eend $? "Error mounting NFS filesystems" +} + +stop() { + ebegin "Unmounting NFS filesystems" + umount -a -t nfs + eend $? "Error unmounting NFS filesystems" + stop_statd +} + diff --git a/net-fs/nfs-utils/nfs-utils-0.3.1-r7.ebuild b/net-fs/nfs-utils/nfs-utils-0.3.1-r7.ebuild index 76a5e38608ba..28b5052c270f 100644 --- a/net-fs/nfs-utils/nfs-utils-0.3.1-r7.ebuild +++ b/net-fs/nfs-utils/nfs-utils-0.3.1-r7.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License, v2 or later # Originally written by Achim Gottinger <achim@gentoo.org> # Heavily updated for nfs-utils-0.3.1 by Aron Griffis <agriffis@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-0.3.1-r7.ebuild,v 1.2 2001/10/22 00:13:25 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-0.3.1-r7.ebuild,v 1.3 2001/12/23 23:25:19 azarah Exp $ S=$WORKDIR/$P DESCRIPTION="kernel NFS daemons" @@ -45,10 +45,10 @@ src_install() { dodoc linux-nfs/* dodir /etc/init.d exeinto /etc/init.d - newexe ${FILESDIR}/nfs-${PVR} nfs - newexe ${FILESDIR}/nfsmount-${PVR} nfsmount + newexe ${FILESDIR}/nfs.rc6 nfs + newexe ${FILESDIR}/nfsmount.rc6 nfsmount insinto /etc/conf.d - newins ${FILESDIR}/nfs.confd-${PVR} nfs + newins ${FILESDIR}/nfs.confd nfs # Don't create runlevels symlinks here. NFS is not something that # should be enabled by default. Administrators can use rc-update # to do it themselves. diff --git a/net-misc/omniORB/files/omniORB.rc6 b/net-misc/omniORB/files/omniORB.rc6 index c224c3370330..320d85addabf 100644 --- a/net-misc/omniORB/files/omniORB.rc6 +++ b/net-misc/omniORB/files/omniORB.rc6 @@ -1,12 +1,7 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/files/omniORB.rc6,v 1.3 2001/12/06 20:17:02 azarah Exp $ -#RCUPDATE:3 4:99:This line is required for script management - -SERVICE=omniORB -EXE1="/usr/bin/omniNames" -EXE2="/usr/bin/notifd" +# $Header: /var/cvsroot/gentoo-x86/net-misc/omniORB/files/omniORB.rc6,v 1.4 2001/12/23 23:25:19 azarah Exp $ depend() { need net @@ -19,24 +14,17 @@ start() { if [ "/var/log/omniORB/omninames*" ] ; then rm -f /var/log/omniORB/omninames* fi - ebegin "Starting ${SERVICE}" - exec $EXE1 -start 2809 -logdir /var/log/omniORB -errlog /var/log/omniORB/omniORB.errors 1>&2 & - exec $EXE2 -c /etc/omniorb/channel.cfg 1>&2 & - eend $? "Error starting ${SERVICE}." + ebegin "Starting omniORB" + exec /usr/bin/omniNames -start 2809 -logdir /var/log/omniORB \ + -errlog /var/log/omniORB/omniORB.errors 1>&2 & + exec /usr/bin/notifd -c /etc/omniorb/channel.cfg 1>&2 & + eend $? "Error starting omniORB." } stop() { - ebegin "Stopping ${SERVICE}" - killall $EXE1 1>&2 - killall $EXE2 1>&2 - eend $? "Error stopping ${SERVICE}." -} - -restart() { - stop - start + ebegin "Stopping omniORB" + killall /usr/bin/omniNames 1>&2 + killall /usr/bin/notifd 1>&2 + eend $? "Error stopping omniORB." } - - - diff --git a/net-misc/portsentry/files/portsentry.confd b/net-misc/portsentry/files/portsentry.confd new file mode 100644 index 000000000000..38f8969166d0 --- /dev/null +++ b/net-misc/portsentry/files/portsentry.confd @@ -0,0 +1,3 @@ +# Config file for /etc/init.d/portsentry + +#PORTSENTRY_MODES="udp tcp stcp atcp sudp audp diff --git a/net-misc/portsentry/files/portsentry.rc6 b/net-misc/portsentry/files/portsentry.rc6 index 9c06fdc79c1e..f0f3c9fbb93b 100644 --- a/net-misc/portsentry/files/portsentry.rc6 +++ b/net-misc/portsentry/files/portsentry.rc6 @@ -1,10 +1,10 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-misc/portsentry/files/portsentry.rc6,v 1.2 2001/12/06 20:17:02 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/portsentry/files/portsentry.rc6,v 1.3 2001/12/23 23:25:19 azarah Exp $ + +# NB: Config is in /etc/conf.d/portsentry -#you can put this in your rc.conf file if you wish -#PORTSENTRY_MODES="udp tcp stcp atcp sudp audp" depend() { need net @@ -18,7 +18,7 @@ checkconfig() { fi if [ -z "$PORTSENTRY_MODES" ] ; then eerror "You need to setup your PORTSENTRY_MODES first" - eerror "Check that you've enabled some or all of them" + eerror "Check /etc/conf.d/portsentry that you've enabled some or all of them" return 1 fi } diff --git a/net-misc/portsentry/portsentry-1.1-r6.ebuild b/net-misc/portsentry/portsentry-1.1-r6.ebuild index cb0c683f9076..bc44fdfd8111 100644 --- a/net-misc/portsentry/portsentry-1.1-r6.ebuild +++ b/net-misc/portsentry/portsentry-1.1-r6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Ben Lutgens <lamer@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-misc/portsentry/portsentry-1.1-r6.ebuild,v 1.1 2001/10/17 16:07:11 woodchip Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/portsentry/portsentry-1.1-r6.ebuild,v 1.2 2001/12/23 23:25:19 azarah Exp $ DESCRIPTION="Automated port scan detector and response tool" HOMEPAGE="http://www.psionic.com/abacus/portsentry/" @@ -46,4 +46,5 @@ src_install () { newins portsentry.conf portsentry.conf.sample exeinto /etc/init.d ; newexe ${FILESDIR}/portsentry.rc6 portsentry + insinto /etc/conf.d ; newins ${FILESDIR}/portsentry.confd portsentry } diff --git a/net-misc/snort/files/snort b/net-misc/snort/files/snort index e2a246c23a17..df073fe23d47 100644 --- a/net-misc/snort/files/snort +++ b/net-misc/snort/files/snort @@ -1,59 +1,24 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-misc/snort/files/snort,v 1.2 2001/12/06 20:17:02 azarah Exp $ -SERVICE=snort -opts="start stop restart" +# $Header: /var/cvsroot/gentoo-x86/net-misc/snort/files/snort,v 1.3 2001/12/23 23:25:19 azarah Exp $ -# Make sure this matches your IFACE -PIDFILE=/var/run/snort_eth0.pid -EXE=/usr/bin/snort +# NB: Config is in /etc/conf.d/snort -# comment out the next three lines after you've read them -einfo "Edit /etc/snort/snort.conf and /etc/init.d/snort" -exit 0; - -# Pick a mode options are -A - -#fast - fast alert mode, write the alert in a simple format with a -# timestamp, alert message, source and destination IPs/ports -# -# full - this is also the default alert mode, so if you specify nothing -# this will automatically be used -# -# unsock - send alerts to a UNIX socket that another program can listen on -# -# none - turn off alerting - -MODE="full" - -# Set this to the appropriate network you box lives on -NETWORK="192.168.1.1/24" - -# You probably don't want to change this, but in case you do -LOGDIR="/var/log/snort" - -# Probably not this either -CONF=/etc/snort/snort.conf -OPTS="-D -s -u nobody -dev -l $LOGDIR -h $NETWORK -c $CONF" depend() { need net } start() { - ebegin "Starting $SERVICE" - start-stop-daemon --start --quiet --exec $EXE -- $OPTS 2>&1 >/dev/null + ebegin "Starting snort" + start-stop-daemon --start --quiet --exec /usr/bin/snort \ + -- $OPTS 2>&1 >/dev/null eend $? } stop() { - ebegin "Stopping $SERVICE" + ebegin "Stopping snort" kill -9 `cat $PIDFILE` 2>&1 eend $? } - -restart() { - stop - start -} diff --git a/net-misc/snort/files/snort.confd b/net-misc/snort/files/snort.confd new file mode 100644 index 000000000000..e29219e95b9c --- /dev/null +++ b/net-misc/snort/files/snort.confd @@ -0,0 +1,33 @@ +# Config file for /etc/init.d/snort + +# Make sure this matches your IFACE +PIDFILE=/var/run/snort_eth0.pid + +# comment out the next three lines after you've read them +einfo "Edit /etc/snort/snort.conf and /etc/conf.d/snort" +exit 0; + +# Pick a mode options are -A + +#fast - fast alert mode, write the alert in a simple format with a +# timestamp, alert message, source and destination IPs/ports +# +# full - this is also the default alert mode, so if you specify nothing +# this will automatically be used +# +# unsock - send alerts to a UNIX socket that another program can listen on +# +# none - turn off alerting + +MODE="full" + +# Set this to the appropriate network you box lives on +NETWORK="192.168.1.1/24" + +# You probably don't want to change this, but in case you do +LOGDIR="/var/log/snort" + +# Probably not this either +CONF=/etc/snort/snort.conf +OPTS="-D -s -u nobody -dev -l $LOGDIR -h $NETWORK -c $CONF" + diff --git a/net-misc/snort/snort-1.7.ebuild b/net-misc/snort/snort-1.7.ebuild index 83e3721f9d7b..2d925e4482c6 100644 --- a/net-misc/snort/snort-1.7.ebuild +++ b/net-misc/snort/snort-1.7.ebuild @@ -1,13 +1,11 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Achim Gottinger achim@gentoo.org -# $Header: /var/cvsroot/gentoo-x86/net-misc/snort/snort-1.7.ebuild,v 1.3 2001/09/13 00:09:53 lamer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/snort/snort-1.7.ebuild,v 1.4 2001/12/23 23:25:19 azarah Exp $ -#P= -A="${P}.tar.gz" S=${WORKDIR}/${P} DESCRIPTION="Libpcap packet sniffer/logger/lightweight IDS" -SRC_URI="http://www.snort.org/Files/${A}" +SRC_URI="http://www.snort.org/Files/${P}.tar.gz" HOMEPAGE="http://www.snort.org" DEPEND="virtual/glibc >=net-libs/libpcap-0.5.2 @@ -20,43 +18,56 @@ RDEPEND="virtual/glibc sys-devel/perl src_compile() { - local myconf - if [ `use mysql` ] - then - myconf="--with-mysql-includes=/usr/include/mysql \ - --with-mysql-libraries=/usr/lib/mysql" - else - myconf="--without-mysql" - fi - if [ `use ssl` ] - then - myconf="$myconf --with-openssl" - else - myconf="$myconf --without-openssl" - fi - try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} \ - --enable-smbalerts --enable-pthreads \ - --without-odbc --without-postgresql --without-oracle $myconf - try make - + local myconf + if [ `use mysql` ] + then + myconf="--with-mysql-includes=/usr/include/mysql \ + --with-mysql-libraries=/usr/lib/mysql" + else + myconf="--without-mysql" + fi + if [ `use ssl` ] + then + myconf="$myconf --with-openssl" + else + myconf="$myconf --without-openssl" + fi + ./configure --prefix=/usr \ + --mandir=/usr/share/man \ + --host=${CHOST} \ + --enable-smbalerts \ + --enable-pthreads \ + --without-odbc \ + --without-postgresql \ + --without-oracle \ + $myconf || die + + make || die } -src_install () { - - try make DESTDIR=${D} install - insinto /usr/lib/snort/bin - doins contrib/create_mysql contrib/*.pl contrib/snortlog - dodoc AUTHORS BUGS ChangeLog COPYING CREDITS NEWS README.* - dodoc RULES.SAMPLE USAGE contrib/pgsql.php3 - insinto /etc/snort - doins ${FILESDIR}/snort.conf - insinto /usr/lib/snort - doins *lib - insinto /etc/init.d - doexe ${FILESDIR}/snort +src_install() { + + make DESTDIR=${D} install || die + insinto /usr/lib/snort/bin + + doins contrib/create_mysql contrib/*.pl contrib/snortlog + dodoc AUTHORS BUGS ChangeLog COPYING CREDITS NEWS README.* + dodoc RULES.SAMPLE USAGE contrib/pgsql.php3 + + insinto /etc/snort + doins ${FILESDIR}/snort.conf + + insinto /usr/lib/snort + doins *lib + + exeinto /etc/init.d + doexe ${FILESDIR}/snort + insinfo /etc/conf.d + newins ${FILESDIR}/snort.confd snort } pkg_postint() { + groupadd snort useradd -s /dev/null -g snort -s /bin/false snort } diff --git a/net-www/apache/apache-1.3.22-r6.ebuild b/net-www/apache/apache-1.3.22-r6.ebuild index e61b52103d99..deb26599ab12 100644 --- a/net-www/apache/apache-1.3.22-r6.ebuild +++ b/net-www/apache/apache-1.3.22-r6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Donny Davies <woodchip@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.22-r6.ebuild,v 1.1 2001/11/03 21:46:01 achim Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-1.3.22-r6.ebuild,v 1.2 2001/12/23 23:25:19 azarah Exp $ AV="1.3.22" MSV="2.8.5" @@ -63,6 +63,8 @@ src_install() { exeinto /etc/init.d newexe ${FILESDIR}/httpd.rc6 httpd + insinto /etc/conf.d + newins ${FILESDIR}/httpd.confd httpd insinto /etc/httpd doins ${FILESDIR}/httpd.conf } diff --git a/net-www/apache/files/httpd.confd b/net-www/apache/files/httpd.confd new file mode 100644 index 000000000000..c3388b44f21b --- /dev/null +++ b/net-www/apache/files/httpd.confd @@ -0,0 +1,3 @@ +# Config file for /etc/init.d/httpd + +#HTTPD_OPTS="-D SSL -D PHP4" diff --git a/net-www/apache/files/httpd.rc6 b/net-www/apache/files/httpd.rc6 index 5df2791cb0da..f6ed8b3c9aaf 100644 --- a/net-www/apache/files/httpd.rc6 +++ b/net-www/apache/files/httpd.rc6 @@ -1,10 +1,10 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/httpd.rc6,v 1.5 2001/12/06 20:17:02 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/files/httpd.rc6,v 1.6 2001/12/23 23:25:19 azarah Exp $ + +# Config is in /etc/conf.d/httpd -#you can put this in your rc.conf file if you wish -#HTTPD_OPTS="-D SSL -D PHP4" depend() { need net diff --git a/net-www/squid/files/squid.confd b/net-www/squid/files/squid.confd new file mode 100644 index 000000000000..66e6ec294470 --- /dev/null +++ b/net-www/squid/files/squid.confd @@ -0,0 +1,7 @@ +# Config file for /etc/init.d/squid + +# you may move these variables to your rc.conf file if you wish +SQUID_OPTS="-DYC" +# default 1024, maximum 4096; tune up if a busy cache +SQUID_MAXFD=1024 + diff --git a/net-www/squid/files/squid.rc6 b/net-www/squid/files/squid.rc6 index 7598b6c1d152..2d7b9fda6729 100644 --- a/net-www/squid/files/squid.rc6 +++ b/net-www/squid/files/squid.rc6 @@ -1,12 +1,10 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.rc6,v 1.2 2001/12/06 20:17:02 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/files/squid.rc6,v 1.3 2001/12/23 23:25:19 azarah Exp $ + +# Config is in /etc/conf.d/squid -# you may move these variables to your rc.conf file if you wish -SQUID_OPTS="-DYC" -# default 1024, maximum 4096; tune up if a busy cache -SQUID_MAXFD=1024 depend() { need net diff --git a/net-www/squid/squid-2.4.2s-r6.ebuild b/net-www/squid/squid-2.4.2s-r6.ebuild index 0d922f22c40e..3a30884fc2ad 100644 --- a/net-www/squid/squid-2.4.2s-r6.ebuild +++ b/net-www/squid/squid-2.4.2s-r6.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Donny Davies <woodchip@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.4.2s-r6.ebuild,v 1.2 2001/11/04 23:05:03 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/squid/squid-2.4.2s-r6.ebuild,v 1.3 2001/12/23 23:25:19 azarah Exp $ DESCRIPTION="A caching web proxy, with advanced features" HOMEPAGE="http://www.squid-cache.org/" @@ -99,4 +99,5 @@ src_install() { insinto /etc/pam.d ; newins ${FILESDIR}/squid.pam squid exeinto /etc/init.d ; newexe ${FILESDIR}/squid.rc6 squid + insinto /etc/conf.d ; newins ${FILESDIR}/squid.confd squid } diff --git a/net-www/wwwoffle/files/wwwoffled-online b/net-www/wwwoffle/files/wwwoffled-online index dddd467ef7a7..8c2dfb927520 100644 --- a/net-www/wwwoffle/files/wwwoffled-online +++ b/net-www/wwwoffle/files/wwwoffled-online @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/files/wwwoffled-online,v 1.2 2001/12/06 20:17:02 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/files/wwwoffled-online,v 1.3 2001/12/23 23:25:19 azarah Exp $ depend() { need wwwoffled net @@ -10,12 +10,12 @@ depend() { start() { ebegin "Starting wwwoffled-online" wwwoffle -online - eend $? "Started wwwoffled-online." "Error starting wwwoffled-online." + eend $? } stop() { ebegin "Stopping wwwoffled-online" wwwoffle -offline - eend $? "Stopped wwwoffled-online." "Error stopping wwwoffled-online." + eend $? } diff --git a/net-www/wwwoffle/files/wwwoffled.rc6 b/net-www/wwwoffle/files/wwwoffled.rc6 index 19305b6f7c5b..3e1a26bbf4bf 100644 --- a/net-www/wwwoffle/files/wwwoffled.rc6 +++ b/net-www/wwwoffle/files/wwwoffled.rc6 @@ -1,24 +1,24 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/files/wwwoffled.rc6,v 1.2 2001/12/06 20:17:02 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/wwwoffle/files/wwwoffled.rc6,v 1.3 2001/12/23 23:25:19 azarah Exp $ EXE=`which wwwoffled` -SERVICE='wwwoffled' depend() { - need localmount + need localmount } start() { - ebegin "Starting $SERVICE" - start-stop-daemon --start --quiet --exec $EXE -- -c /var/spool/wwwoffle/wwwoffle.conf - eend $? "Started $SERVICE." "Error starting $SERVICE." + ebegin "Starting wwwoffled" + start-stop-daemon --start --quiet --exec $EXE \ + -- -c /var/spool/wwwoffle/wwwoffle.conf + eend $? } stop() { - ebegin "Stopping $SERVICE" - start-stop-daemon --stop --quiet --exec $EXE - eend $? "Stopped $SERVICE." "Error stopping $SERVICE." + ebegin "Stopping wwwoffled" + start-stop-daemon --stop --quiet --exec $EXE + eend $? } diff --git a/sys-apps/apcupsd/files/apcupsd b/sys-apps/apcupsd/files/apcupsd index 905c0b051e44..85e7c0421422 100644 --- a/sys-apps/apcupsd/files/apcupsd +++ b/sys-apps/apcupsd/files/apcupsd @@ -1,20 +1,17 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/files/apcupsd,v 1.3 2001/12/06 20:17:02 azarah Exp $ - -SERVICE=apcupsd -EXE=/usr/sbin/apcupsd +# $Header: /var/cvsroot/gentoo-x86/sys-apps/apcupsd/files/apcupsd,v 1.4 2001/12/23 23:25:19 azarah Exp $ start() { rm -f /etc/apcupsd/powerfail - ebegin "Starting ${EXE}" - start-stop-daemon --start --quiet --exec ${EXE} -- 1>&2 - eend $? "Error starting ${EXE}." + ebegin "Starting APC UPS daemon" + start-stop-daemon --start --quiet --exec /usr/sbin/apcupsd -- 1>&2 + eend $? } stop() { - ebegin "Stopping ${EXE}" - start-stop-daemon --stop --quiet --exec ${EXE} -- 1>&2 - eend $? "Error stopping ${EXE}." + ebegin "Stopping APC UPS daemon" + start-stop-daemon --stop --quiet --exec /usr/sbin/apcupsd -- 1>&2 + eend $? } diff --git a/sys-apps/noflushd/files/noflushd.confd b/sys-apps/noflushd/files/noflushd.confd new file mode 100644 index 000000000000..66fdec75d380 --- /dev/null +++ b/sys-apps/noflushd/files/noflushd.confd @@ -0,0 +1,7 @@ +# Config file for /etc/init.d/noflushd + +#TIMEOUT=60 +#DISKS=/dev/discs/disc0/disc +#EXTRA= +#NOFLUSHD_OPTS="-n $TIMEOUT $DISKS $EXTRA" + diff --git a/sys-apps/noflushd/files/noflushd.rc6 b/sys-apps/noflushd/files/noflushd.rc6 index f0d4b13cd842..40b8d472d505 100644 --- a/sys-apps/noflushd/files/noflushd.rc6 +++ b/sys-apps/noflushd/files/noflushd.rc6 @@ -1,16 +1,10 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/files/noflushd.rc6,v 1.2 2001/12/06 20:17:02 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/files/noflushd.rc6,v 1.3 2001/12/23 23:25:19 azarah Exp $ -#NOTE: these variables will be moved to /etc/conf.d/noflushd soon, once -# the new initscript changes are done. Its only here temporarily. +# NB: Config is in /etc/conf.d/noflushd -#you can put these in your rc.conf file if you wish -#TIMEOUT=60 -#DISKS=/dev/discs/disc0/disc -#EXTRA= -#NOFLUSHD_OPTS="-n $TIMEOUT $DISKS $EXTRA" depend() { need localmount @@ -19,7 +13,7 @@ depend() { checkconfig() { if [ -z "$NOFLUSHD_OPTS" ] ; then eerror "You need to setup your NOFLUSHD_OPTS first" - eerror "Check that you've adjusted for your needs" + eerror "Check that you've adjusted /etc/conf.d/noflushd for your needs" return 1 fi } diff --git a/sys-apps/noflushd/noflushd-2.4-r6.ebuild b/sys-apps/noflushd/noflushd-2.4-r6.ebuild index a60bb71ec3d8..bfc0fc92e302 100644 --- a/sys-apps/noflushd/noflushd-2.4-r6.ebuild +++ b/sys-apps/noflushd/noflushd-2.4-r6.ebuild @@ -1,13 +1,12 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author: Dan Armak <danarmak@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.4-r6.ebuild,v 1.1 2001/10/18 20:09:25 woodchip Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/noflushd/noflushd-2.4-r6.ebuild,v 1.2 2001/12/23 23:25:19 azarah Exp $ # Note: the daemon's current 2.4 version has nothing to do with kernel versions -A=noflushd_2.4.orig.tar.gz +MY_P=${P/-/_}.orig S=${WORKDIR}/${P}.orig -SRC_URI="http://download.sourceforge.net/noflushd/${A}" - +SRC_URI="http://download.sourceforge.net/noflushd/${MY_P}.orig.tar.gz" HOMEPAGE="http://noflushd.sourceforge.net" DESCRIPTION="A daemon to spin down your disks and force accesses to be cached" @@ -16,8 +15,11 @@ DEPEND="virtual/glibc src_compile() { - ./configure --prefix=/usr --host=${CHOST} --mandir=/usr/share/man \ - --infodir=/usr/share/info --with-docdir=/usr/share/doc/${PF} || die + ./configure --prefix=/usr \ + --host=${CHOST} \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --with-docdir=/usr/share/doc/${PF} || die emake || die } @@ -29,6 +31,7 @@ src_install () { dodoc README NEWS exeinto /etc/init.d ; newexe ${FILESDIR}/noflushd.rc6 noflushd + insinto /etc/conf.d ; newins ${FILESDIR}/noflushd.confd noflushd } pkg_postinst() { diff --git a/sys-apps/sysklogd/files/sysklogd.confd b/sys-apps/sysklogd/files/sysklogd.confd new file mode 100644 index 000000000000..c9735739117d --- /dev/null +++ b/sys-apps/sysklogd/files/sysklogd.confd @@ -0,0 +1,6 @@ +# Config file for /etc/init.d/sysklogd + +SYSLOGD="-m 0" +# send warnings and above to the console +KLOGD="-c 3 -2" + diff --git a/sys-apps/sysklogd/files/sysklogd.rc6 b/sys-apps/sysklogd/files/sysklogd.rc6 index 9d59f953ff8d..d500c644815d 100644 --- a/sys-apps/sysklogd/files/sysklogd.rc6 +++ b/sys-apps/sysklogd/files/sysklogd.rc6 @@ -1,11 +1,10 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/files/sysklogd.rc6,v 1.6 2001/12/06 20:17:02 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/files/sysklogd.rc6,v 1.7 2001/12/23 23:25:19 azarah Exp $ + +# NB: Config is in /etc/conf.d/sysklogd -SYSLOGD="-m 0" -# send warnings and above to the console -KLOGD="-c 3 -2" depend() { diff --git a/sys-apps/sysklogd/sysklogd-1.4.1.ebuild b/sys-apps/sysklogd/sysklogd-1.4.1.ebuild index 26d1dd480f1f..0c24d593d169 100644 --- a/sys-apps/sysklogd/sysklogd-1.4.1.ebuild +++ b/sys-apps/sysklogd/sysklogd-1.4.1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2001 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author: Daniel Robbins <drobbins@gentoo.org>, Achim Gottinger <achim@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/sysklogd-1.4.1.ebuild,v 1.1 2001/11/10 12:33:41 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/sysklogd-1.4.1.ebuild,v 1.2 2001/12/23 23:25:19 azarah Exp $ S=${WORKDIR}/${P} DESCRIPTION="Standard log daemons" @@ -32,4 +32,6 @@ src_install() { doins ${FILESDIR}/syslog.conf exeinto /etc/init.d newexe ${FILESDIR}/sysklogd.rc6 sysklogd + insinto /etc/conf.d + newins ${FILESDIR}/sysklogd.confd sysklogd } diff --git a/sys-apps/xinetd/files/xinetd.confd b/sys-apps/xinetd/files/xinetd.confd new file mode 100644 index 000000000000..dd6da7488ad2 --- /dev/null +++ b/sys-apps/xinetd/files/xinetd.confd @@ -0,0 +1,3 @@ +# Config file for /etc/init.d/xinetd + +XINETD_OPTS="-stayalive -reuse" diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6 index 57e33d68ac94..9a81951f790c 100644 --- a/sys-apps/xinetd/files/xinetd.rc6 +++ b/sys-apps/xinetd/files/xinetd.rc6 @@ -1,10 +1,10 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.9 2001/12/06 20:17:03 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/files/xinetd.rc6,v 1.10 2001/12/23 23:25:19 azarah Exp $ + +# NB: Config is in /etc/conf.d/xinetd -#you may move this into your rc.conf file if you wish -XINETD_OPTS="-stayalive -reuse" depend() { need net diff --git a/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild b/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild index cb6f1868d62a..a9d0c6f7ca96 100644 --- a/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild +++ b/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License, v2 or later # Maintainer System Team <system@gentoo.org> # Author Achim Gottinger <achim@gentoo.org>, Donny Davies <woodchip@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild,v 1.1 2001/11/21 05:08:55 woodchip Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/xinetd/xinetd-2.3.3-r7.ebuild,v 1.2 2001/12/23 23:25:19 azarah Exp $ # NB: This ebuild introduces the /etc/xinetd.d includedir with a default # /etc/xinetd.conf file. Check your config files if you're upgrading @@ -31,12 +31,13 @@ src_compile() { src_install() { - into /usr ; dosbin xinetd/xinetd + into /usr ; dosbin xinetd/xinetd xinetd/itox exeinto /usr/sbin ; doexe ${FILESDIR}/xconv.pl newman xinetd/xinetd.conf.man xinetd.conf.5 newman xinetd/xinetd.log.man xinetd.log.8 newman xinetd/xinetd.man xinetd.8 + doman xinetd/itox.8 newdoc xinetd/sample.conf xinetd.conf.dist.sample newdoc ${FILESDIR}/xinetd.conf xinetd.conf.default @@ -44,5 +45,6 @@ src_install() { insinto /etc/xinetd.d ; doins ${FILESDIR}/etc.xinetd.d/* exeinto /etc/init.d ; newexe ${FILESDIR}/xinetd.rc6 xinetd + insinto /etc/conf.d ; newins ${FILESDIR}/xinetd.confd xinetd insinto /etc ; doins ${FILESDIR}/xinetd.conf } diff --git a/sys-libs/gpm/files/gpm.rc6 b/sys-libs/gpm/files/gpm.rc6 index 27801ce5394f..451f01d30b2e 100644 --- a/sys-libs/gpm/files/gpm.rc6 +++ b/sys-libs/gpm/files/gpm.rc6 @@ -1,9 +1,9 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6,v 1.5 2001/12/06 20:17:03 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/gpm/files/gpm.rc6,v 1.6 2001/12/23 23:25:19 azarah Exp $ -#NB: Config options moved to /etc/conf.d/gpm +#NB: Config is in /etc/conf.d/gpm depend() { |