cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to BitchX 1.0c18

Browse Source 
--
Based on patches from & the new maintainer:
Vincent Derrien <vincent.derrien@free.fr>
This commit is contained in:
brad 2002-03-01 00:18:11 +00:00
parent dc4fd8c063
commit e34fb70d38
10 changed files with 87 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/bitchx/Makefile
View File

@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.32 2001/05/06 19:29:21 brad Exp $
# $OpenBSD: Makefile,v 1.33 2002/03/01 00:18:11 brad Exp $
# $FreeBSD: Makefile,v 1.3 1998/07/21 11:38:44 eivind Exp $
COMMENT= "alternative ircII color client"
VERSION= 1.0c17
DISTNAME= BitchX-${VERSION}
PKGNAME= ${DISTNAME:L}p1
VERSION= 1.0c18
DISTNAME= ircii-pana-${VERSION}
PKGNAME= BitchX-${VERSION}
CATEGORIES= net
NEED_VERSION= 1.402
NEED_VERSION= 1.504
MASTER_SITES= ftp://ftp.bitchx.com/pub/BitchX/source/ \
ftp://ftp.bitchx.org/pub/BitchX/source/ \
ftp://bitchx.dimension6.com/pub/BitchX/source/
ftp://ftp.bitchx.org/pub/BitchX/source/
MAINTAINER= Brad Smith <brad@openbsd.org>
MAINTAINER= Vincent Derrien <vincent.derrien@free.fr>
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@ -25,10 +24,13 @@ SEPARATE_BUILD= concurrent
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu dest
FAKE_FLAGS= INSTALL="${INSTALL_PROGRAM}" INSTALL_DATA="${INSTALL_DATA}"
WRKDIST= ${WRKDIR}/BitchX
pre-build:
@mv -f ${WRKBUILD}/Makefile ${WRKBUILD}/Makefile.new
@sed -e s#bzip2#true#g ${WRKBUILD}/Makefile.new > \
${WRKBUILD}/Makefile
post-install:
@cd ${PREFIX}/bin && ln -sf BitchX-${VERSION} BitchX
@chown -R root.wheel ${PREFIX}/share/bitchx

3
net/bitchx/distinfo Normal file
View File

@ -0,0 +1,3 @@
MD5 (ircii-pana-1.0c18.tar.gz) = 737276281ae911c5e1e17b028ebee045
RMD160 (ircii-pana-1.0c18.tar.gz) = 98c36e40e2e43549378d715a098c7247d37170b8
SHA1 (ircii-pana-1.0c18.tar.gz) = b0a25ad0d2a36ad36f5640cdf9fe34022a00d8a5

3
net/bitchx/files/md5
View File

@ -1,3 +0,0 @@
MD5 (BitchX-1.0c17.tar.gz) = 4ab094ae58f0bacb14c3e480404215fd
RMD160 (BitchX-1.0c17.tar.gz) = d72992469847751e10b5d577a9030756c2a4aa12
SHA1 (BitchX-1.0c17.tar.gz) = 157677284062efdc694b1794eaa5e9e8002aeb28

61
net/bitchx/patches/patch-configure
View File

@ -1,47 +1,42 @@
--- configure.orig Tue Aug 29 03:14:44 2000
+++ configure Fri Sep 15 19:30:53 2000
@@ -8987,11 +8987,11 @@
MV="mv"
--- configure.orig Mon Jan 8 01:24:22 2001
+++ configure Thu Feb 28 18:06:38 2002
@@ -12004,11 +12004,11 @@ if test -n "$CYGWIN" -o -n "$EMXOS2" -o
mandir="\$(IRCLIB)"
else
INSTALL_IRC="\${bindir}/\$(_VERSION_)\$(EXEEXT)"
- IRCLIB="\${libdir}/bx"
+ IRCLIB="\${datadir}/bitchx"
IRCPATH="\$(DEFAULT_CTOOLZ_DIR):\$(DEFAULT_CTOOLZ_DIR)/plugins:.:\$(PLUGINDIR):\$(INSTALL_SCRIPT):\$(IRCLIB)"
TRANSLATION_PATH="\$(IRCLIB)/translation"
HELPDIR="\$(IRCLIB)/help"
- INSTALL_WSERV="\$(IRCLIB)/wserv\$(EXEEXT)"
+ INSTALL_WSERV="\${libexecdir}/wserv-bitchx\$(EXEEXT)"
INSTALL_SCRBX="\${bindir}/scr-bx\$(EXEEXT)"
INSTALL_SCRIPT="\$(IRCLIB)/script"
INSTALL_HELP_CMD="cp -pfr bitchx-docs/* \$(HELPDIR)"
@@ -12984,25 +12984,3 @@ chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
INSTALL_IRC=\${bindir}/\$\(_VERSION_\)
-IRCLIB=\${libdir}/bx
+IRCLIB=\${datadir}/bitchx
IRCPATH=\~/.BitchX:\~/.BitchX/plugins:.:$PLUGINDIR:\$\(INSTALL_SCRIPT\):\$\(IRCLIB\)
TRANSLATION_PATH=\$\(IRCLIB\)/translation
HELPDIR=\$\(IRCLIB\)/help
-INSTALL_WSERV=\$\(IRCLIB\)/wserv
+INSTALL_WSERV=\${libexecdir}/wserv-bitchx
INSTALL_SCRBX=\${bindir}/scr-bx
INSTALL_SCRIPT=\$\(IRCLIB\)/script
@@ -9467,30 +9467,3 @@
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
test "$no_create" = yes || $SHELL $CONFIG_STATUS || { (exit 1); exit; }
-
-
-
-echo $_VERSION_ \(C\) 1996-2000 Colten Edwards
-echo
-echo BitchX \(c\) 1996-2001 Colten Edwards
-echo ----------------------------------------------------------
-echo
-echo The configuration script has finished. You should look through and make any
-echo necessary changes to the file \"$srcdir/include/config.h\".
-echo When you are satisfied with your configuration settings, type \"make\" to compile
-echo $_VERSION_. When make finishes, you can type \"make install\" to install $_VERSION_
-echo globally \(if you\'re root\), or else you can type \"make install_local\" to
-echo install $_VERSION_ to your home directory.
-echo \*\*\* IMPORTANT\! PLEASE READ THE FOLLOWING\: \*\*\*
-echo
-echo \*\*\* IMPORTANT\! PLEASE READ THE FOLLOWING: \*\*\*
-echo
-echo We are trying to get statistics on the number of BitchX users. In the source
-echo We are trying to gather statistics on the number of BitchX users. In the source
-echo directory is the file \"cl.c\". This file contains a function that will send a
-echo single UDP packet to BitchX.com. The ONLY information that packet contains is
-echo the user\'s $_VERSION_ version and OS. This function does NOT interfere with the
-echo the user\'s BitchX version and OS. This function does NOT interfere with the
-echo client in any way, and does NOT receive any information back.
-echo
-echo We are interested in this information for statistical purposes and to improve
-echo support for various operating systems. YOU ARE NOT REQUIRED TO CONTRIBUTE TO
-echo THIS EFFORT. If you would like to disable this function, remove the line
-echo \"#define WANT_NOTIFY_BITCHX_COM ON\" from the file \"$srcdir/include/config.h\".
-echo \"\#define WANT_NOTIFY_BITCHX_COM ON\" from the file \"include/config.h\".
-echo
-echo The configuration script has finished. You should look through
-echo \"include/config.h\" and make any changes you would like to make.
-echo
-echo Now type \"$MAKE\" to compile BitchX.

11
net/bitchx/patches/patch-include_config.h
View File

@ -1,11 +0,0 @@
--- include/config.h.orig Wed Dec 1 22:53:07 1999
+++ include/config.h Wed Dec 1 22:53:28 1999
@@ -34,7 +34,7 @@
* too peruse this function all you like. It's not a BACKDOOR in any way,
* shape or form.
*/
-#define WANT_NOTIFY_BITCHX_COM ON
+#undef WANT_NOTIFY_BITCHX_COM
/*

11
net/bitchx/patches/patch-include_config_h Normal file
View File

@ -0,0 +1,11 @@
--- include/config.h.orig Mon Jan 8 06:24:22 2001
+++ include/config.h Wed Feb 27 19:57:16 2002
@@ -35,7 +35,7 @@
* too peruse this function all you like. It's not a BACKDOOR in any way,
* shape or form.
*/
-#define WANT_NOTIFY_BITCHX_COM ON
+#undef WANT_NOTIFY_BITCHX_COM ON
/*

14
net/bitchx/patches/patch-source_commands.c → net/bitchx/patches/patch-source_commands_c
View File

@ -1,10 +1,10 @@
--- source/commands.c.orig Fri Sep 15 22:45:24 2000
+++ source/commands.c Fri Sep 15 22:48:11 2000
@@ -2603,13 +2603,13 @@
--- source/commands.c.orig Mon Jan 8 01:24:22 2001
+++ source/commands.c Thu Feb 28 17:29:03 2002
@@ -2604,13 +2604,13 @@ BUILT_IN_COMMAND(e_hostname)
int i;
char *newhost = NULL;
#if !defined(__linux__) && !defined(__EMX__)
-#if _BSDI_VERSION < 199701
-#if defined(_BSDI_VERSION) && _BSDI_VERSION < 199701
+#if defined(_BSDI_VERSION) && _BSDI_VERSION < 199701 || defined(__OpenBSD__)
char device[80];
#endif
@ -16,7 +16,7 @@
if (!(p = path_search("netstat", "/sbin:/usr/sbin:/bin:/usr/bin")))
{
yell("No Netstat to be found");
@@ -2636,10 +2636,16 @@
@@ -2637,10 +2637,16 @@ BUILT_IN_COMMAND(e_hostname)
unlink(filename);
return;
}
@ -34,7 +34,7 @@
strncpy(device, p, 79);
bitchsay("Looking for hostnames on device %s", device);
#else
@@ -2654,7 +2660,7 @@
@@ -2655,7 +2661,7 @@ BUILT_IN_COMMAND(e_hostname)
if (strstr(comm, "inet6 addr") || strstr(comm, "inet addr"))
#else
if (strstr(comm, "inet addr"))
@ -43,7 +43,7 @@
{
/* inet addr:127.0.0.1 Mask:... */
/* inet6 addr: ::1/128 Scope:... */
@@ -2671,11 +2677,15 @@
@@ -2672,11 +2678,15 @@ BUILT_IN_COMMAND(e_hostname)
}
*q = 0;

22
net/bitchx/patches/patch-source_misc.c
View File

@ -1,22 +0,0 @@
--- source/misc.c.orig Tue Dec 12 17:05:45 2000
+++ source/misc.c Tue Dec 12 17:07:24 2000
@@ -2641,6 +2641,11 @@
switch(type)
{
case T_A :
+ if (dlen != sizeof(struct in_addr))
+ {
+ cp += dlen;
+ break;
+ }
rptr->re_he.h_length = dlen;
if (ans == 1)
rptr->re_he.h_addrtype=(class == C_IN) ?
@@ -2687,6 +2692,7 @@
*alias = NULL;
break;
default :
+ cp += dlen;
break;
}
}

39
net/bitchx/pkg/PLIST
View File

@ -1,12 +1,13 @@
@comment $OpenBSD: PLIST,v 1.10 2000/09/16 04:19:59 brad Exp $
@comment $OpenBSD: PLIST,v 1.11 2002/03/01 00:18:11 brad Exp $
bin/BitchX
bin/BitchX-${VERSION}
bin/scr-bx
libexec/wserv-bitchx
man/man1/BitchX.1
share/bitchx/BitchX.help
share/bitchx/BitchX.ircnames
share/bitchx/BitchX.kick
share/bitchx/BitchX.quit
share/bitchx/BitchX.reasons
share/bitchx/help/1_General/1_General
share/bitchx/help/1_General/4op
share/bitchx/help/1_General/about
@ -57,6 +58,7 @@ share/bitchx/help/1_General/dcc/activecount
share/bitchx/help/1_General/dcc/autoget
share/bitchx/help/1_General/dcc/autooverwrite
share/bitchx/help/1_General/dcc/autorename
share/bitchx/help/1_General/dcc/autoresume
share/bitchx/help/1_General/dcc/bot
share/bitchx/help/1_General/dcc/chat
share/bitchx/help/1_General/dcc/close
@ -466,7 +468,6 @@ share/bitchx/help/4_Misc/window/window
share/bitchx/help/5_Programming/5_Programming
share/bitchx/help/5_Programming/alias
share/bitchx/help/5_Programming/assign
share/bitchx/help/5_Programming/blah
share/bitchx/help/5_Programming/bless
share/bitchx/help/5_Programming/break
share/bitchx/help/5_Programming/call
@ -714,6 +715,7 @@ share/bitchx/help/6_Functions/numonchannel
share/bitchx/help/6_Functions/numwords
share/bitchx/help/6_Functions/onchannel
share/bitchx/help/6_Functions/open
share/bitchx/help/6_Functions/ovserver
share/bitchx/help/6_Functions/pad
share/bitchx/help/6_Functions/pattern
share/bitchx/help/6_Functions/pid
@ -916,12 +918,15 @@ share/bitchx/help/findcomm
share/bitchx/help/functions
share/bitchx/help/out
share/bitchx/script/actplug.gmz
share/bitchx/script/auto_resume
share/bitchx/script/bxglobal
share/bitchx/script/bxtcl.tcl
share/bitchx/script/example-.bitchxrc
share/bitchx/script/file.tcl
share/bitchx/script/fserve+vfs.tar.gz
share/bitchx/script/fserve.irc
share/bitchx/script/menu.bx
share/bitchx/script/query
share/bitchx/script/query.bx
share/bitchx/translation/ASCII
share/bitchx/translation/CP437
@ -956,21 +961,21 @@ share/bitchx/translation/SWEDISH_NAMES_COM
share/bitchx/translation/SWISS
share/bitchx/translation/UNITED_KINGDOM
share/bitchx/translation/UNITED_KINGDOM_COM
@dirrm share/bitchx/help/1_General/ctcp
@dirrm share/bitchx/help/1_General/dcc
@dirrm share/bitchx/help/1_General
@dirrm share/bitchx/help/2_Queries
@dirrm share/bitchx/help/3_Operators
@dirrm share/bitchx/help/4_Misc/bind
@dirrm share/bitchx/help/4_Misc/set
@dirrm share/bitchx/help/4_Misc/window
@dirrm share/bitchx/help/4_Misc
@dirrm share/bitchx/translation
@dirrm share/bitchx/script
@dirrm share/bitchx/help/8_Scripts
@dirrm share/bitchx/help/7_Docs
@dirrm share/bitchx/help/6_Functions
@dirrm share/bitchx/help/5_Programming/on
@dirrm share/bitchx/help/5_Programming
@dirrm share/bitchx/help/6_Functions
@dirrm share/bitchx/help/7_Docs
@dirrm share/bitchx/help/8_Scripts
@dirrm share/bitchx/help/4_Misc/window
@dirrm share/bitchx/help/4_Misc/set
@dirrm share/bitchx/help/4_Misc/bind
@dirrm share/bitchx/help/4_Misc
@dirrm share/bitchx/help/3_Operators
@dirrm share/bitchx/help/2_Queries
@dirrm share/bitchx/help/1_General/dcc
@dirrm share/bitchx/help/1_General/ctcp
@dirrm share/bitchx/help/1_General
@dirrm share/bitchx/help
@dirrm share/bitchx/script
@dirrm share/bitchx/translation
@dirrm share/bitchx

11
net/bitchx/pkg/SECURITY
View File

@ -1,11 +0,0 @@
$OpenBSD: SECURITY,v 1.1 2000/12/13 14:37:08 brad Exp $
patches/patch-source_misc.c
${WRKSRC}/source/misc.c
Fix a buffer overflow in the DNS resolution code. A buffer overflow
within the resolver code makes it possible to overwrite stack
variables by generating a malformed DNS packet. This problem makes
it possible to create a situation where a malicious user may be
able to execute code remotely with the UID and GID of the BitchX
client. It is necessary for an attacker to control their own DNS
to exploit this bug.