1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00

[MAINTAINER UPDATE] irc/ircd-ru New release (1.0.7 > 1.0.7-02-stable)

and some minor changes in port

	Released new version ircd-ru (1.0.7-02-stable).
	Cleaning port.

PR:		ports/55761
Submitted by:	Khamushkin Ilya <ilya@ircd.ru>
This commit is contained in:
Edwin Groothuis 2003-08-23 13:34:20 +00:00
parent 384325efe4
commit 0c6f5a4e72
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=87553
11 changed files with 54 additions and 627 deletions

View File

@ -7,53 +7,58 @@
PORTNAME= ircd-ru
PORTVERSION= 1.0.7
PORTREVISION= 1
CATEGORIES= russian irc
MASTER_SITES= http://www.ircd.ru/pub/ircd-RU/
DISTNAME= ircd-RU-${PORTVERSION}-release
MASTER_SITES= ftp://ftp.ircd.ru/pub/ircd-RU/ ftp://ftp.ircd.ru/pub/ircd-RU/old/
DISTNAME= ircd-RU-${PORTVERSION}-02-stable
MAINTAINER= ilya@ircd.ru
COMMENT= An irc daemon with translation schemes and other useful features
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
PLIST_SUB= VARDIR=/var
# irc.wenet.ru specific options
.if defined(WITH_WENET)
CONFIGURE_ARGS+=--enable-wenet
CFLAGS+= -g
CONFIGURE_ARGS+=--enable-wenet XFLAGS=-g
.endif
# enable hub support
.if defined(WITH_HUB)
CONFIGURE_ARGS+= --enable-hub
CONFIGURE_ARGS+=--enable-hub
.endif
# enable RC4 crypt (server<>server connection)
# enable RC4 crypt (server to server connection)
.if defined(WITH_ENCRYPTION)
CONFIGURE_ARGS+= --enable-encryption
CONFIGURE_ARGS+=--enable-encryption
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
.endif
# log to file instead of syslog
.if defined(WITH_SYSLOGFILE)
CONFIGURE_ARGS+= --enable-syslogfile
CONFIGURE_ARGS+=--enable-syslogfile
.endif
# enable dronemodule support
.if defined(WITH_DRONEMODULE)
CONFIGURE_ARGS+= --enable-dronemodule
CONFIGURE_ARGS+=--enable-dronemodule
.endif
# enable authmodule support
.if defined(WITH_AUTHMODULE)
CONFIGURE_ARGS+=--enable-authmodule
.endif
# enable DNSBL support
.if defined(WITH_DNSBL)
CONFIGURE_ARGS+= --enable-dnsbl
CONFIGURE_ARGS+=--enable-dnsbl
.endif
# enable select I/O
.if defined(WITH_SELECT)
CONFIGURE_ARGS+= --enable-select
CONFIGURE_ARGS+=--enable-select
.endif
pre-build:
@ -66,7 +71,7 @@ pre-install:
@${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
post-install:
@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd.sh ${LOCALBASE}/etc/rc.d
@${INSTALL_SCRIPT} -m 555 ${FILESDIR}/ircd.sh.sample ${LOCALBASE}/etc/rc.d
@${CHOWN} -R ircd:ircd ${LOCALBASE}/etc/ircd-ru
@${CHOWN} -R ircd:ircd ${LOCALBASE}/share/ircd-ru
@${CHOWN} -R ircd:ircd ${LOCALBASE}/share/doc/ircd-ru

View File

@ -1 +1 @@
MD5 (ircd-RU-1.0.7-release.tar.bz2) = 6e63d109fe97ee06c87123e84f04f41e
MD5 (ircd-RU-1.0.7-02-stable.tar.bz2) = 7fe6336ca79fd29b5c2f088f250591a8

View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Wed Apr 16 07:44:27 2003
+++ Makefile.in Wed Aug 6 14:47:03 2003
--- Makefile.in.orig Sun Aug 10 21:53:09 2003
+++ Makefile.in Sun Aug 10 21:53:46 2003
@@ -30,7 +30,7 @@
# Profile linker flags
PROFILELDFLAGS=-pg

View File

@ -1,38 +0,0 @@
--- configure.orig 13 Jul 2003 04:56:13 -0000 1.1.1.3.2.27
+++ configure 30 Jul 2003 12:52:16 -0000
@@ -308,7 +308,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CPP EGREP SET_MAKE RM CP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA DM_SRC MAKEFILE_SYNCIO ENCRYPT_SRC BASENAME DIRNAME GMPINC GMPINCFN GMP_LIBS Z_LIBS Z_INCS CONFIG_SERVICES_NAME CONFIG_SERVER_KLINE_ADDRESS CONFIG_NETWORK_KLINE_ADDRESS CONFIG_STAFF_ADDRESS CONFIG_NETWORK_NAME CONFIG_NOILINE_MESSAGE CONFIG_SERVERFULL_MESSAGE CONFIG_USE_SSADMIN_MODE CONFIG_HIDE_NETWORK_TOPOLOGY CONFIG_USE_SERVER_BANNED_URL CONFIG_SERVER_BANNED_URL CONFIG_USE_NETWORK_BANNED_URL CONFIG_NETWORK_BANNED_URL CONFIG_USE_SERVER_BLACKLISTED_URL CONFIG_SERVER_BLACKLISTED_URL CONFIG_USE_NETWORK_BLACKLISTED_URL CONFIG_NETWORK_BLACKLISTED_URL CONFIG_USE_NETWORK_EXPLOITED_URL CONFIG_NETWORK_EXPLOITED_URL CONFIG_USE_NETWORK_DCCALLOW_URL CONFIG_NETWORK_DCCALLOW_URL CONFIG_USE_NETWORK_INVREG_URL CONFIG_NETWORK_INVREG_URL CONFIG_HUB CONFIG_USE_SYSLOGFILE CONFIG_DO_DNSBL DNSBL_SRC INSTALL_GREP BIN_SUF LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CPP EGREP SET_MAKE RM CP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA DM_SRC MAKEFILE_SYNCIO ENCRYPT_SRC BASENAME DIRNAME GMPINC GMPINCFN GMP_LIBS Z_LIBS Z_INCS CONFIG_SERVICES_NAME CONFIG_SERVER_KLINE_ADDRESS CONFIG_NETWORK_KLINE_ADDRESS CONFIG_STAFF_ADDRESS CONFIG_NETWORK_NAME CONFIG_NOILINE_MESSAGE CONFIG_SERVERFULL_MESSAGE CONFIG_USE_SSADMIN_MODE CONFIG_HIDE_NETWORK_TOPOLOGY CONFIG_USE_SERVER_BANNED_URL CONFIG_SERVER_BANNED_URL CONFIG_USE_NETWORK_BANNED_URL CONFIG_NETWORK_BANNED_URL CONFIG_USE_SERVER_BLACKLISTED_URL CONFIG_SERVER_BLACKLISTED_URL CONFIG_USE_NETWORK_BLACKLISTED_URL CONFIG_NETWORK_BLACKLISTED_URL CONFIG_USE_NETWORK_EXPLOITED_URL CONFIG_NETWORK_EXPLOITED_URL CONFIG_USE_NETWORK_DCCALLOW_URL CONFIG_NETWORK_DCCALLOW_URL CONFIG_USE_NETWORK_INVREG_URL CONFIG_NETWORK_INVREG_URL CONFIG_HUB CONFIG_USE_SYSLOGFILE CONFIG_DO_DNSBL DNSBL_SRC AWKSP BIN_SUF LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -6407,12 +6407,12 @@
-grepresult=`echo 'a b' | egrep 'a\W+b'`
-if test "$grepresult" = "a b"; then
-INSTALL_GREP="egrep '#define\W+"
+awkresult=`echo 'a b' | awk '/a\W+b/ {print $0}'`
+if test "$awkresult" = "a b"; then
+AWKSP="\W+"
else
-echo "poor grep implementation workaround enabled"
-INSTALL_GREP="grep '#define."
+echo "GNU awk implementation not available"
+AWKSP="."
fi
@@ -7154,7 +7154,7 @@
s,@CONFIG_USE_SYSLOGFILE@,$CONFIG_USE_SYSLOGFILE,;t t
s,@CONFIG_DO_DNSBL@,$CONFIG_DO_DNSBL,;t t
s,@DNSBL_SRC@,$DNSBL_SRC,;t t
-s,@INSTALL_GREP@,$INSTALL_GREP,;t t
+s,@AWKSP@,$AWKSP,;t t
s,@BIN_SUF@,$BIN_SUF,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t

View File

@ -1,23 +0,0 @@
--- configure.in.orig 25 Jun 2003 16:52:49 -0000 1.1.1.3.2.26
+++ configure.in 30 Jul 2003 12:52:16 -0000
@@ -912,14 +912,14 @@
AC_SUBST(CONFIG_DO_DNSBL)
AC_SUBST(DNSBL_SRC)
-grepresult=`echo 'a b' | egrep 'a\W+b'`
-if test "$grepresult" = "a b"; then
-INSTALL_GREP="egrep '#define\W+"
+awkresult=`echo 'a b' | awk '/a\W+b/ {print $0}'`
+if test "$awkresult" = "a b"; then
+AWKSP="\W+"
else
-echo "poor grep implementation workaround enabled"
-INSTALL_GREP="grep '#define."
+echo "GNU awk implementation not available"
+AWKSP="."
fi
-AC_SUBST(INSTALL_GREP)
+AC_SUBST(AWKSP)
dnl don't add more of these unless it's critical. Trying to get rid of them.
AC_MSG_CHECKING(operating system)

View File

@ -1,442 +0,0 @@
--- tools/install_ircd.in.orig 17 Apr 2003 13:10:36 -0000 1.1.8.9
+++ tools/install_ircd.in 30 Jul 2003 12:52:17 -0000
@@ -5,63 +5,99 @@
# $Id: install_ircd.in,v 1.1.8.9 2003/04/17 13:10:36 rzhe Exp $
-DPATH=`@INSTALL_GREP@DPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-SPATH=${DPATH}/`@INSTALL_GREP@SPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-CPDIR=${DPATH}/`@INSTALL_GREP@CPDIR' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-MDIR=${DPATH}/`@INSTALL_GREP@MDIR' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-CPATH=${DPATH}/`@INSTALL_GREP@CPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-KPATH=${DPATH}/`@INSTALL_GREP@KPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-MPATH=${DPATH}/`@INSTALL_GREP@MPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-SMPATH=${DPATH}/`@INSTALL_GREP@SMPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-LPATH=${DPATH}/`@INSTALL_GREP@LPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-PPATH=${DPATH}/`@INSTALL_GREP@PPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-HPATH=${DPATH}/`@INSTALL_GREP@HPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-EPATH=${DPATH}/`@INSTALL_GREP@EPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-MCPATH=${DPATH}/`@INSTALL_GREP@MCPATH' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-USE_USERLOGFILE=`@INSTALL_GREP@USE_USERLOGFILE' include/config.h`; #'
-USE_OPERLOGFILE=`@INSTALL_GREP@USE_OPERLOGFILE' include/config.h`; #'
-USE_SYSLOGFILE=`@INSTALL_GREP@USE_SYSLOGFILE' include/config.h`; #'
-FNAME_USERLOG=`@INSTALL_GREP@FNAME_USERLOG' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-FNAME_OPERLOG=`@INSTALL_GREP@FNAME_OPERLOG' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-FNAME_SYSLOG=`@INSTALL_GREP@FNAME_SYSLOG' include/paths.h|awk '{print $3}'|tr -d \"`; #'
-
-dir_SPATH=`dirname ${SPATH}`;
-dir_CPATH=`dirname ${CPATH}`;
-dir_MPATH=`dirname ${MPATH}`;
-dir_SMPATH=`dirname ${SMPATH}`;
-dir_KPATH=`dirname ${KPATH}`;
-dir_LPATH=`dirname ${LPATH}`;
-dir_PPATH=`dirname ${PPATH}`;
-dir_HPATH=`dirname ${HPATH}`;
-dir_EPATH=`dirname ${EPATH}`;
-dir_MCPATH=`dirname ${MCPATH}`;
-if [ ! -z "${USE_USERLOGFILE}" ] ; then
- FNAME_USERLOG=${DPATH}/${FNAME_USERLOG};
- dir_FNAME_USERLOG=`dirname ${FNAME_USERLOG}`;
-fi;
-if [ ! -z "${USE_OPERLOGFILE}" ] ; then
- FNAME_OPERLOG=${DPATH}/${FNAME_OPERLOG}
- dir_FNAME_OPERLOG=`dirname ${FNAME_OPERLOG}`;
-fi;
-if [ ! -z "${USE_SYSLOGFILE}" ] ; then
- FNAME_SYSLOG=${DPATH}/${FNAME_SYSLOG};
- dir_FNAME_SYSLOG=`dirname ${FNAME_SYSLOG}`;
-fi;
-
-CONF=${dir_CPATH}/example.conf;
-MOTD=${dir_MPATH}/example.motd;
-SMOTD=${dir_SMPATH}/example.smotd;
-KLINE=${dir_KPATH}/kline.conf;
-
-IRCD_SRC='src/ircd@BIN_SUF@';
-CHKCONF_SRC='tools/chkconf@BIN_SUF@';
-FIXKLINES_SRC='tools/fixklines@BIN_SUF@';
-MKPASSWD_SRC='tools/mkpasswd@BIN_SUF@';
-VICONF_SRC='tools/viconf@BIN_SUF@';
-CHKCONF_DST=${dir_SPATH}/chkconf@BIN_SUF@;
-FIXKLINES_DST=${dir_SPATH}/fixklines@BIN_SUF@;
-MKPASSWD_DST=${dir_SPATH}/mkpasswd@BIN_SUF@;
-VICONF_DST=${dir_SPATH}/viconf@BIN_SUF@;
+DPATH=`awk '/^#define@AWKSP@DPATH/ {print $3}' include/paths.h | tr -d \"`
+SPATH=`awk '/^#define@AWKSP@SPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $SPATH | awk '/^\// {print $1}'` ] ; then
+ SPATH=$DPATH/$SPATH
+fi
+CPDIR=`awk '/^#define@AWKSP@CPDIR/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $CPDIR | awk '/^\// {print $1}'` ] ; then
+ CPDIR=$DPATH/$CPDIR
+fi
+MDIR=`awk '/^#define@AWKSP@MDIR/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $MDIR | awk '/^\// {print $1}'` ] ; then
+ MDIR=$DPATH/$MDIR
+fi
+CPATH=`awk '/^#define@AWKSP@CPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $CPATH | awk '/^\// {print $1}'` ] ; then
+ CPATH=$DPATH/$CPATH
+fi
+KPATH=`awk '/^#define@AWKSP@KPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $KPATH | awk '/^\// {print $1}'` ] ; then
+ KPATH=$DPATH/$KPATH
+fi
+MPATH=`awk '/^#define@AWKSP@MPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $MPATH | awk '/^\// {print $1}'` ] ; then
+ MPATH=$DPATH/$MPATH
+fi
+SMPATH=`awk '/^#define@AWKSP@SMPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $SMPATH | awk '/^\// {print $1}'` ] ; then
+ SMPATH=$DPATH/$SMPATH
+fi
+LPATH=`awk '/^#define@AWKSP@LPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $LPATH | awk '/^\// {print $1}'` ] ; then
+ LPATH=$DPATH/$LPATH
+fi
+PPATH=`awk '/^#define@AWKSP@PPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $PPATH | awk '/^\// {print $1}'` ] ; then
+ PPATH=$DPATH/$PPATH
+fi
+HPATH=`awk '/^#define@AWKSP@HPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $HPATH | awk '/^\// {print $1}'` ] ; then
+ HPATH=$DPATH/$HPATH
+fi
+EPATH=`awk '/^#define@AWKSP@EPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $EPATH | awk '/^\// {print $1}'` ] ; then
+ EPATH=$DPATH/$EPATH
+fi
+MCPATH=`awk '/^#define@AWKSP@MCPATH/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $MCPATH | awk '/^\// {print $1}'` ] ; then
+ MCPATH=$DPATH/$MCPATH
+fi
+USE_USERLOGFILE=`awk '/^#define@AWKSP@USE_USERLOGFILE/ {print $2}' include/config.h`
+USE_OPERLOGFILE=`awk '/^#define@AWKSP@USE_OPERLOGFILE/ {print $2}' include/config.h`
+USE_SYSLOGFILE=`awk '/^#define@AWKSP@USE_SYSLOGFILE/ {print $2}' include/config.h`
+FNAME_USERLOG=`awk '/^#define@AWKSP@FNAME_USERLOG/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $FNAME_USERLOG | awk '/^\// {print $1}'` ] ; then
+ FNAME_USERLOG=$DPATH/$FNAME_USERLOG
+fi
+FNAME_OPERLOG=`awk '/^#define@AWKSP@FNAME_OPERLOG/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $FNAME_OPERLOG | awk '/^\// {print $1}'` ] ; then
+ FNAME_OPERLOG=$DPATH/$FNAME_OPERLOG
+fi
+FNAME_SYSLOG=`awk '/^#define@AWKSP@FNAME_SYSLOG/ {print $3}' include/paths.h | tr -d \"`
+if [ -z `echo $FNAME_SYSLOG | awk '/^\// {print $1}'` ] ; then
+ FNAME_SYSLOG=$DPATH/$FNAME_SYSLOG
+fi
+
+dir_SPATH=`dirname $SPATH`
+dir_CPATH=`dirname $CPATH`
+dir_MPATH=`dirname $MPATH`
+dir_SMPATH=`dirname $SMPATH`
+dir_KPATH=`dirname $KPATH`
+dir_LPATH=`dirname $LPATH`
+dir_PPATH=`dirname $PPATH`
+dir_HPATH=`dirname $HPATH`
+dir_EPATH=`dirname $EPATH`
+dir_MCPATH=`dirname $MCPATH`
+if [ ! -z $USE_USERLOGFILE ] ; then
+ dir_FNAME_USERLOG=`dirname $FNAME_USERLOG`
+fi
+if [ ! -z $USE_OPERLOGFILE ] ; then
+ dir_FNAME_OPERLOG=`dirname $FNAME_OPERLOG`
+fi
+if [ ! -z $USE_SYSLOGFILE ] ; then
+ dir_FNAME_SYSLOG=`dirname $FNAME_SYSLOG`
+fi
+
+CONF=$dir_CPATH/example.conf
+MOTD=$dir_MPATH/example.motd
+SMOTD=$dir_SMPATH/example.smotd
+KLINE=$dir_KPATH/kline.conf
+
+IRCD_SRC='src/ircd@BIN_SUF@'
+MKPASSWD_SRC='tools/mkpasswd@BIN_SUF@'
+MKPASSWD_DST=$dir_SPATH/mkpasswd@BIN_SUF@
# DPATH = directory,
# SPATH = server executable,
@@ -81,178 +117,157 @@
# install ircd, save old one as ircd.old
-if [ ! -f ${SPATH} ] ; then
- echo installing ${IRCD_SRC} as ${SPATH} ...;
- ./install-sh -c -m 755 ${IRCD_SRC} ${SPATH};
+if [ ! -f $SPATH ] ; then
+ echo installing $IRCD_SRC as $SPATH ...
+ ./install-sh -c -m 755 $IRCD_SRC $SPATH
else
- echo installing ${IRCD_SRC} as ${SPATH} ...;
- echo previous ${SPATH} saved as ${SPATH}.old ...;
- mv ${SPATH} ${SPATH}.old;
- ./install-sh -c -m 755 ${IRCD_SRC} ${SPATH};
-fi;
+ echo installing $IRCD_SRC as $SPATH ...
+ echo previous $SPATH saved as $SPATH.old ...
+ mv $SPATH $SPATH.old;
+ ./install-sh -c -m 755 $IRCD_SRC $SPATH
+fi
# try to install tools, unless it already exists.
-#if [ ! -f ${CHKCONF_DST} ] ; then
-# echo installing ${CHKCONF_SRC} as ${CHKCONF_DST} ...;
-# ./install-sh -c -m 755 ${CHKCONF_SRC} ${CHKCONF_DST};
-#else
-# echo You already have an ${CHKCONF_DST} file;
-#fi;
-
-#if [ ! -f ${FIXKLINES_DST} ] ; then
-# echo installing ${FIXKLINES_SRC} as ${FIXKLINES_DST} ...;
-# ./install-sh -c -m 755 ${FIXKLINES_SRC} ${FIXKLINES_DST};
-#else
-# echo You already have an ${FIXKLINES_DST} file;
-#fi;
-
-if [ ! -f ${MKPASSWD_DST} ] ; then
- echo installing ${MKPASSWD_SRC} as ${MKPASSWD_DST} ...;
- ./install-sh -c -m 755 ${MKPASSWD_SRC} ${MKPASSWD_DST};
+if [ ! -f $MKPASSWD_DST ] ; then
+ echo installing $MKPASSWD_SRC as $MKPASSWD_DST ...
+ ./install-sh -c -m 755 $MKPASSWD_SRC $MKPASSWD_DST
else
- echo You already have an ${MKPASSWD_DST} file;
-fi;
-
-#if [ ! -f ${VICONF_DST} ] ; then
-# echo installing ${VICONF_SRC} as ${VICONF_DST} ...;
-# ./install-sh -c -m 755 ${VICONF_SRC} ${VICONF_DST};
-#else
-# echo You already have an ${VICONF_DST} file;
-#fi;
+ echo You already have an $MKPASSWD_DST file
+fi
# try to install codepages.
-if [ ! -d ${CPDIR} ] ; then
- echo creating ${CPDIR} directory ...;
- ./install-sh -d ${CPDIR};
-fi;
+if [ ! -d $CPDIR ] ; then
+ echo creating $CPDIR directory ...
+ ./install-sh -d $CPDIR
+fi
-echo installing codepages ...;
+echo installing codepages ...
for i in codepages/*.cp
do
- ./install-sh -c -m 644 $i ${CPDIR}/`basename $i`;
+ ./install-sh -c -m 644 $i $CPDIR/`basename $i`
done
# try to create modules directory, unless it already exists.
-if [ ! -d ${MDIR} ] ; then
- echo creating ${MDIR} directory ...;
- ./install-sh -d ${MDIR};
-fi;
+if [ ! -d $MDIR ] ; then
+ echo creating $MDIR directory ...
+ ./install-sh -d $MDIR
+fi
# try to install their .conf file.
-echo installing a sample ${CONF} ...;
-./install-sh -c -m 644 doc/example.conf ${CONF};
+echo installing a sample $CONF ...
+./install-sh -c -m 644 doc/example.conf $CONF
# try to install their .motd file.
-echo installing a sample ${MOTD} ...;
-./install-sh -c -m 644 doc/example.motd ${MOTD};
+echo installing a sample $MOTD ...
+./install-sh -c -m 644 doc/example.motd $MOTD
# try to install their .smotd file.
-echo installing a sample ${SMOTD} ...;
-./install-sh -c -m 644 doc/example.smotd ${SMOTD};
+echo installing a sample $SMOTD ...
+./install-sh -c -m 644 doc/example.smotd $SMOTD
-echo installing other samples ...;
-./install-sh -c -m 644 doc/ru_RU.KOI8-R/example.conf ${dir_CPATH}/ru_RU.KOI8-R/example.conf;
-./install-sh -c -m 644 doc/ru_RU.CP1251/example.motd ${dir_MPATH}/ru_RU.CP1251/example.motd;
-./install-sh -c -m 644 doc/ru_RU.CP1251/example.smotd ${dir_SMPATH}/ru_RU.CP1251/example.smotd;
+echo installing other samples ...
+./install-sh -c -m 644 doc/ru_RU.KOI8-R/example.conf $dir_CPATH/ru_RU.KOI8-R/example.conf
+./install-sh -c -m 644 doc/ru_RU.CP1251/example.motd $dir_MPATH/ru_RU.CP1251/example.motd
+./install-sh -c -m 644 doc/ru_RU.CP1251/example.smotd $dir_SMPATH/ru_RU.CP1251/example.smotd
# try to install their kpath file unless it already exists.
-if [ ! -d ${dir_KPATH} ] ; then
- echo creating ${dir_KPATH} directory ...;
- ./install-sh -d ${dir_KPATH};
-fi;
-
-if [ ! -f ${KPATH} ] ; then
- echo touching ${KPATH} ...;
- touch ${KPATH};
+if [ ! -d $dir_KPATH ] ; then
+ echo creating $dir_KPATH directory ...
+ ./install-sh -d $dir_KPATH
+fi
+
+if [ ! -f $KPATH ] ; then
+ echo touching $KPATH ...
+ touch $KPATH
else
- echo You already have an ${KPATH} file;
-fi;
+ echo You already have an $KPATH file
+fi
# try to install their opers.txt file.
-echo installing opers.txt as ${HPATH} ...;
-./install-sh -c -m 644 opers.txt ${HPATH};
+echo installing opers.txt as $HPATH ...
+./install-sh -c -m 644 opers.txt $HPATH
-echo installing other docs to ${dir_HPATH} ...;
-./install-sh -c -m 644 doc/README.Ilines ${dir_HPATH}/README.Ilines;
-./install-sh -c -m 644 doc/ru_RU.KOI8-R/FAQ.ircd-RU ${dir_HPATH}/ru_RU.KOI8-R/FAQ.ircd-RU;
-./install-sh -c -m 644 doc/ru_RU.KOI8-R/README.ircd-RU ${dir_HPATH}/ru_RU.KOI8-R/README.ircd-RU;
+echo installing other docs to $dir_HPATH ...
+./install-sh -c -m 644 doc/README.Ilines $dir_HPATH/README.Ilines
+./install-sh -c -m 644 doc/ru_RU.KOI8-R/FAQ.ircd-RU $dir_HPATH/ru_RU.KOI8-R/FAQ.ircd-RU
+./install-sh -c -m 644 doc/ru_RU.KOI8-R/README.ircd-RU $dir_HPATH/ru_RU.KOI8-R/README.ircd-RU
# try to prepare directory for logs and create log files, unless they already
# exists.
-if [ ! -d ${dir_LPATH} ] ; then
- echo creating ${dir_LPATH} directory ...;
- ./install-sh -d ${dir_LPATH};
-fi;
-
-if [ -n "${dir_FNAME_USERLOG}" ] && [ ! -d ${dir_FNAME_USERLOG} ] ; then
- echo creating ${dir_FNAME_USERLOG} directory ...;
- ./install-sh -d ${dir_FNAME_USERLOG};
-fi;
-
-if [ -n "${dir_FNAME_OPERLOG}" ] && [ ! -d ${dir_FNAME_OPERLOG} ] ; then
- echo creating ${dir_FNAME_OPERLOG} directory ...;
- ./install-sh -d ${dir_FNAME_OPERLOG};
-fi;
-
-if [ -n "${dir_FNAME_SYSLOG}" ] && [ ! -d ${dir_FNAME_SYSLOG} ] ; then
- echo creating ${dir_FNAME_SYSLOG} directory ...;
- ./install-sh -d ${dir_FNAME_SYSLOG};
-fi;
-
-if [ ! -z "${USE_USERLOGFILE}" ] ; then
- if [ ! -f ${FNAME_USERLOG} ] ; then
- echo touching ${FNAME_USERLOG} ...;
- touch ${FNAME_USERLOG};
+if [ ! -d $dir_LPATH ] ; then
+ echo creating $dir_LPATH directory ...
+ ./install-sh -d $dir_LPATH
+fi
+
+if [ -n $dir_FNAME_USERLOG ] && [ ! -d $dir_FNAME_USERLOG ] ; then
+ echo creating $dir_FNAME_USERLOG directory ...
+ ./install-sh -d $dir_FNAME_USERLOG
+fi
+
+if [ -n $dir_FNAME_OPERLOG ] && [ ! -d $dir_FNAME_OPERLOG ] ; then
+ echo creating $dir_FNAME_OPERLOG directory ...
+ ./install-sh -d $dir_FNAME_OPERLOG
+fi
+
+if [ -n $dir_FNAME_SYSLOG ] && [ ! -d $dir_FNAME_SYSLOG ] ; then
+ echo creating $dir_FNAME_SYSLOG directory ...
+ ./install-sh -d $dir_FNAME_SYSLOG
+fi
+
+if [ ! -z $USE_USERLOGFILE ] ; then
+ if [ ! -f $FNAME_USERLOG ] ; then
+ echo touching $FNAME_USERLOG ...
+ touch $FNAME_USERLOG
else
- echo You already have an ${FNAME_USERLOG} file;
- fi;
-fi;
-
-if [ ! -z "${USE_OPERLOGFILE}" ] ; then
- if [ ! -f ${FNAME_OPERLOG} ] ; then
- echo touching ${FNAME_OPERLOG} ...;
- touch ${FNAME_OPERLOG};
+ echo You already have an $FNAME_USERLOG file
+ fi
+fi
+
+if [ ! -z $USE_OPERLOGFILE ] ; then
+ if [ ! -f $FNAME_OPERLOG ] ; then
+ echo touching $FNAME_OPERLOG ...
+ touch $FNAME_OPERLOG
else
- echo You already have an ${FNAME_OPERLOG} file;
- fi;
-fi;
-
-if [ ! -z "${USE_SYSLOGFILE}" ] ; then
- if [ ! -f ${FNAME_SYSLOG} ] ; then
- echo touching ${FNAME_SYSLOG} ...;
- touch ${FNAME_SYSLOG};
+ echo You already have an $FNAME_OPERLOG file
+ fi
+fi
+
+if [ ! -z $USE_SYSLOGFILE ] ; then
+ if [ ! -f $FNAME_SYSLOG ] ; then
+ echo touching $FNAME_SYSLOG ...
+ touch $FNAME_SYSLOG
else
- echo You already have an ${FNAME_SYSLOG} file;
- fi;
-fi;
+ echo You already have an $FNAME_SYSLOG file
+ fi
+fi
# try to create run directory, unless it already exists.
-if [ ! -d ${dir_PPATH} ] ; then
- echo creating ${dir_PPATH} directory ...;
- ./install-sh -d ${dir_PPATH};
-fi;
+if [ ! -d $dir_PPATH ] ; then
+ echo creating $dir_PPATH directory ...
+ ./install-sh -d $dir_PPATH
+fi
# try to create directory for EPATH, unless it already exists.
-if [ ! -d ${dir_EPATH} ] ; then
- echo creating ${dir_EPATH} directory ...;
- ./install-sh -d ${dir_EPATH};
-fi;
+if [ ! -d $dir_EPATH ] ; then
+ echo creating $dir_EPATH directory ...
+ ./install-sh -d $dir_EPATH
+fi
# try to create directory for MCPATH, unless it already exists.
-if [ ! -d ${dir_MCPATH} ] ; then
- echo creating ${dir_MCPATH} directory ...;
- ./install-sh -d ${dir_MCPATH};
-fi;
+if [ ! -d $dir_MCPATH ] ; then
+ echo creating $dir_MCPATH directory ...
+ ./install-sh -d $dir_MCPATH
+fi

View File

@ -1,65 +0,0 @@
--- src/ircd.c.orig 10 Jun 2003 06:40:53 -0000 1.1.1.5.2.21
+++ src/ircd.c 24 Jul 2003 07:33:40 -0000
@@ -666,6 +666,14 @@
FILE *dumpfp=NULL;
+static void prefix_path(char *dst, const char *path)
+{
+ if (path[0] == '/')
+ strlcpy(dst, path, MAXPATHLEN);
+ else
+ snprintf(dst, MAXPATHLEN, "%s/%s", dpath, path);
+}
+
int main(int argc, char *argv[])
{
int portarg = 0, fd;
@@ -869,33 +877,33 @@
exit(1);
}
- snprintf(HELPFILE, MAXPATHLEN, "%s/%s", dpath, HPATH);
- snprintf(MOTD, MAXPATHLEN, "%s/%s", dpath, MPATH);
- snprintf(SHORTMOTD, MAXPATHLEN, "%s/%s", dpath, SMPATH);
- snprintf(MYNAME, MAXPATHLEN, "%s/%s", dpath, SPATH);
- snprintf(CONFIGFILE, MAXPATHLEN, "%s/%s", dpath, CPATH);
+ prefix_path(HELPFILE, HPATH);
+ prefix_path(MOTD, MPATH);
+ prefix_path(SHORTMOTD, SMPATH);
+ prefix_path(MYNAME, SPATH);
+ prefix_path(CONFIGFILE, CPATH);
#ifdef KPATH
- snprintf(KLINEFILE, MAXPATHLEN, "%s/%s", dpath, KPATH);
+ prefix_path(KLINEFILE, KPATH);
#endif
- snprintf(IRCD_PIDFILE, MAXPATHLEN, "%s/%s", dpath, PPATH);
- snprintf(ENTFILE, MAXPATHLEN, "%s/%s", dpath, EPATH);
- snprintf(MCFILE, MAXPATHLEN, "%s/%s", dpath, MCPATH);
+ prefix_path(IRCD_PIDFILE, PPATH);
+ prefix_path(ENTFILE, EPATH);
+ prefix_path(MCFILE, MCPATH);
#if defined(DEBUGMODE) || defined(DNS_DEBUG)
- snprintf(LOGFILE, MAXPATHLEN, "%s/%s", dpath, LPATH);
+ prefix_path(LOGFILE, LPATH);
#else
snprintf(LOGFILE, MAXPATHLEN, "%s", "/dev/null");
#endif
#ifdef USE_USERLOGFILE
- snprintf(ULFILE, MAXPATHLEN, "%s/%s", dpath, FNAME_USERLOG);
+ prefix_path(ULFILE, FNAME_USERLOG);
#endif
#ifdef USE_OPERLOGFILE
- snprintf(OLFILE, MAXPATHLEN, "%s/%s", dpath, FNAME_OPERLOG);
+ prefix_path(OLFILE, FNAME_OPERLOG);
#endif
#ifdef USE_SYSLOGFILE
- snprintf(SLFILE, MAXPATHLEN, "%s/%s", dpath, FNAME_SYSLOG);
+ prefix_path(SLFILE, FNAME_SYSLOG);
#endif
#ifdef DUMP_DEBUG
- snprintf(DUMPFILE, MAXPATHLEN, "%s/%s", dpath, "dump.log");
+ prefix_path(DUMPFILE, "dump.log");
#endif
#ifdef CHDIRTOROOT

View File

@ -1,22 +1,17 @@
--- include/paths.h.in.orig Thu Apr 17 16:10:36 2003
+++ include/paths.h.in Fri Jul 25 15:54:43 2003
@@ -30,7 +30,7 @@
* You must define these to something, even if you don't really want them. All
* paths except FNAME_USERLOG, FNAME_OPERLOG and FNAME_SYSLOG are mandatory.
*
- * ALL PATHS AFTER DPATH ARE ***RELATIVE*** TO DPATH!
+ * ALL DEFAULT PATHS AFTER DPATH ARE ***RELATIVE*** TO DPATH!
*
* DPATH = Install directory, you can run the configure script with
* --prefix=<DPATH> argument to override the default DPATH.
@@ -54,25 +54,25 @@
--- include/paths.h.in.orig Sun Aug 10 21:29:06 2003
+++ include/paths.h.in Sun Aug 10 21:30:46 2003
@@ -55,26 +55,26 @@
#define DPATH "@prefix@"
-#define SPATH "bin/ircd@BIN_SUF@"
+#define SPATH "sbin/ircd@BIN_SUF@"
#define BDIR "bin"
-#define CPDIR "codepages"
-#define MDIR "modules"
-
+#define CPDIR "share/ircd-ru/codepages"
+#define MDIR "share/ircd-ru/modules"
-#define CPATH "etc/ircd.conf"
-#define KPATH "etc/kline.conf"
-#define MPATH "etc/ircd.motd"
@ -24,33 +19,26 @@
-#define LPATH "var/log/ircd.log"
-#define PPATH "var/run/ircd.pid"
-#define HPATH "doc/opers.txt"
-
-#define EPATH ".ircd.entropy"
-#define MCPATH ".maxclients"
-
-
-#define FNAME_USERLOG "var/log/users"
-#define FNAME_OPERLOG "var/log/opers"
-#define FNAME_SYSLOG "var/log/syslog"
+#define SPATH "sbin/ircd@BIN_SUF@"
+#define CPDIR "share/ircd-ru/codepages"
+#define MDIR "share/ircd-ru/modules"
+
+#define CPATH "etc/ircd-ru/ircd.conf"
+#define KPATH "etc/ircd-ru/kline.conf"
+#define KPATH "etc/ircd-ru/kline.conf"
+#define MPATH "etc/ircd-ru/ircd.motd"
+#define SMPATH "etc/ircd-ru/ircd.smotd"
+#define LPATH "/var/log/ircd-ru/ircd.log"
+#define PPATH "/var/run/ircd-ru/ircd.pid"
+#define HPATH "share/doc/ircd-ru/opers.txt"
+
-#define EPATH ".ircd.entropy"
-#define MCPATH ".maxclients"
+#define EPATH "/var/run/ircd-ru/.ircd.entropy"
+#define MCPATH "/var/run/ircd-ru/.maxclients"
+
+
+#define FNAME_USERLOG "/var/log/ircd-ru/users"
-#define FNAME_USERLOG "var/log/users"
-#define FNAME_OPERLOG "var/log/opers"
-#define FNAME_SYSLOG "var/log/syslog"
+#define FNAME_USERLOG "/var/log/ircd-ru/users"
+#define FNAME_OPERLOG "/var/log/ircd-ru/opers"
+#define FNAME_SYSLOG "/var/log/ircd-ru/syslog"
#endif
#endif /* !__PATHS_H__ */

View File

@ -7,9 +7,11 @@ This port create user ircd and group ircd
You should now edit /usr/local/ircd-RU/etc/ircd.conf
to suit your needs.
(cp example.conf ircd.conf; vi ircd.conf)
(cp ircd.conf-dist ircd.conf; vi ircd.conf)
You may then start the server by running:
cd /usr/local/etc/rc.d/
mv ircd.sh.sample ircd.sh
/usr/local/etc/rc.d/ircd.sh start
----------------------------------------------------

View File

@ -1,15 +1,15 @@
sbin/ircd
sbin/mkpasswd
etc/ircd-ru/example.conf
etc/ircd-ru/example.motd
etc/ircd-ru/example.smotd
etc/ircd-ru/ru_RU.CP1251/example.motd
etc/ircd-ru/ru_RU.CP1251/example.smotd
etc/ircd-ru/ru_RU.KOI8-R/example.conf
bin/ircdpasswd
etc/ircd-ru/ircd.conf-dist
etc/ircd-ru/ircd.motd-dist
etc/ircd-ru/ircd.smotd-dist
etc/ircd-ru/ru_RU.CP1251/ircd.motd-dist
etc/ircd-ru/ru_RU.CP1251/ircd.smotd-dist
etc/ircd-ru/ru_RU.KOI8-R/ircd.conf-dist
share/doc/ircd-ru/README.Ilines
share/doc/ircd-ru/opers.txt
share/doc/ircd-ru/ru_RU.KOI8-R/FAQ.ircd-RU
share/doc/ircd-ru/ru_RU.KOI8-R/README.ircd-RU
share/doc/ircd-ru/ru_RU.KOI8-R/FAQ
share/doc/ircd-ru/ru_RU.KOI8-R/README
share/ircd-ru/codepages/cp1251.cp
share/ircd-ru/codepages/cp866.cp
share/ircd-ru/codepages/iso8859-5.cp
@ -20,7 +20,7 @@ share/ircd-ru/codepages/translit.cp
@dirrm etc/ircd-ru/ru_RU.KOI8-R
@dirrm share/ircd-ru/codepages
@dirrm share/ircd-ru/modules
@dirrm share/ircd-ru/
@dirrm share/ircd-ru
@dirrm share/doc/ircd-ru/ru_RU.KOI8-R
@dirrm share/doc/ircd-ru
@exec mkdir -m 755 %%VARDIR%%/log/ircd-ru
@ -29,5 +29,5 @@ share/ircd-ru/codepages/translit.cp
@exec chown ircd:ircd %%VARDIR%%/run/ircd-ru
@unexec rm -R %%VARDIR%%/run/ircd-ru > /dev/null
@unexec rm -R %%VARDIR%%/log/ircd-ru > /dev/null
@unexec rm /usr/local/etc/rc.d/ircd.sh
@unexec rm /usr/local/etc/rc.d/ircd.sh.sample
@unexec echo 'To completely remove this port delete user ircd, group ircd and remove etc/ircd-ru'