BitchX
Michał Kaps
ciril w faf.net.pl
Czw, 13 Lut 2003, 00:31:43 CET
Hello all
Skoro sie zobowiazalem to podsylam - 4 patche do BitchX'a + stary naprawiony
(i juz go nie trzeba haszowac w specu) + patch na speca, bylbym wdzieczny
jakby ktos to nalozyl.
--- SPECS/BitchX.spec.orig Thu Feb 13 00:14:57 2003
+++ SPECS/BitchX.spec Thu Feb 13 00:21:25 2003
@@ -5,7 +5,7 @@
Summary(pt_BR): Cliente IRC para o console do Linux
Name: BitchX
Version: 1.0c19
-Release: 1
+Release: 2
License: GPL
Group: Applications/Networking
Source0:
ftp://ftp.bitchx.com/pub/BitchX/source/ircii-pana-%{version}.tar.gz
@@ -15,6 +15,10 @@
Source4: %{name}.1.pl
Patch0: %{name}-config.h.patch
Patch1: %{name}-numver.patch
+Patch2: %{name}-dcc-force-port.patch
+Patch3: %{name}-doc.patch
+Patch4: %{name}-emacs.patch
+Patch5: %{name}-versioned-tcl.patch
Icon: BitchX.xpm
URL: http://www.bitchx.com/
BuildRequires: mysql-devel
@@ -60,6 +64,11 @@
%prep
%setup -q -n %{name}
%patch0 -p1
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p1
+%patch5 -p0
%build
CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
BitchX-doc.patch
--- configure.in.orig Wed Feb 12 23:39:12 2003
+++ configure.in Wed Feb 12 23:39:37 2003
@@ -880,7 +880,7 @@
IRCLIB="\${prefix}/BitchX"
IRCPATH="\$(DEFAULT_CTOOLZ_DIR):\$(DEFAULT_CTOOLZ_DIR)/plugins:.:\$(PLUGINDIR):\$(INSTALL_SCRIPT):\$(IRCLIB)"
TRANSLATION_PATH="\$(IRCLIB)/translation"
- HELPDIR="\$(IRCLIB)/help"
+ HELPDIR="\${datadir}/doc/BitchX"
INSTALL_WSERV="\$(IRCLIB)/wserv\$(EXEEXT)"
INSTALL_SCRBX="\$(IRCLIB)/scr-bx\$(EXEEXT)"
INSTALL_SCRIPT="\$(IRCLIB)/script"
BitchX-versioned-tcl.patch
--- configure.in.orig Wed Feb 12 23:41:53 2003
+++ configure.in Wed Feb 12 23:42:47 2003
@@ -575,7 +575,7 @@
tcllib=`echo $tcllib | sed
s w .a@@`
tcllib=`echo $tcllib | sed
s w libtcl@tcl@`
tclpath=`echo $file | sed
s@"$testname"@@`
- TCL_LIBS="-l$tcllib
-L$tclpath"
+ TCL_LIBS="$LIBS -L$withval
-ltcl8.3"
AC_MSG_RESULT(yes)
fi
fi
BitchX-emacs.patch
--- BitchX/source/keys.c.orig Sun Mar 24 10:31:07 2002
+++ BitchX/source/keys.c Wed Feb 12 23:49:13 2003
@@ -1319,17 +1319,17 @@
snew_key(0, 1, "BEGINNING_OF_LINE"); /* ^A */
snew_key(0, 2, "BOLD"); /* ^B */
snew_key(0, 4, "DELETE_CHARACTER"); /* ^D */
- snew_key(0, 5, "CHANGE_TO_SPLIT"); /* ^E */
+ snew_key(0, 5, "END_OF_LINE"); /* ^E */
snew_key(0, 6, "WHOLEFT"); /* ^F */
snew_key(0, 8, "BACKSPACE"); /* ^H (delete) */
snew_key(0, 9, "TAB_COMPLETION"); /* ^I (tab) */
snew_key(0, 10, "SEND_LINE"); /* ^J (enter) */
- snew_key(0, 11, "JOIN_LAST_INVITE"); /* ^K */
+ snew_key(0, 11, "ERASE_TO_END_OF_LINE"); /* ^K */
snew_key(0, 12, "REFRESH_SCREEN"); /* ^L (linefeed) */
snew_key(0, 13, "SEND_LINE"); /* ^M (return) */
snew_key(0, 14, "QUOTE_CHARACTER"); /* ^N */
- snew_key(0, 15, "IGNORE_NICK"); /* ^O */
+ snew_key(0, 15, "NEXT_WINDOW"); /* ^O */
snew_key(0, 16, "BACKWARD_HISTORY"); /* ^P */
snew_key(0, 17, "QUOTE_CHARACTER"); /* ^Q */
BitchX-dcc-force-port.patch
--- include/vars.h.old Sun Nov 4 17:18:23 2001
+++ include/vars.h Sun Nov 4 17:20:30 2001
@@ -89,6 +89,7 @@
DCC_BLOCK_SIZE_VAR,
DCC_DLDIR_VAR ,
DCC_FAST_VAR,
+ DCC_FORCE_PORT_VAR,
DCC_GET_LIMIT_VAR,
DCC_MAX_AUTOGET_SIZE_VAR ,
DCC_QUEUE_LIMIT_VAR,
--- source/vars.c.old Sun Nov 4 17:16:10 2001
+++ source/vars.c Sun Nov 4 17:15:55 2001
@@ -189,6 +189,7 @@
{ "DCC_BLOCK_SIZE",0, INT_TYPE_VAR,
DEFAULT_DCC_BLOCK_SIZE, NULL, NULL, 0, VIF_BITCHX },
{ "DCC_DLDIR",0, STR_TYPE_VAR, 0, NULL, NULL, 0,
VIF_BITCHX },
{ "DCC_FAST",0, BOOL_TYPE_VAR, DEFAULT_DCC_FAST,
NULL, NULL, 0, VIF_BITCHX },
+ { "DCC_FORCE_PORT",0, INT_TYPE_VAR, 0, NULL, NULL, 0,
VIF_BITCHX },
{ "DCC_GET_LIMIT",0, INT_TYPE_VAR, DEFAULT_DCC_GET_LIMIT,
NULL, NULL, 0, VIF_BITCHX },
{ "DCC_MAX_AUTOGET_SIZE",0, INT_TYPE_VAR,
DEFAULT_MAX_AUTOGET_SIZE, NULL, NULL, 0, VIF_BITCHX },
{ "DCC_QUEUE_LIMIT",0, INT_TYPE_VAR,
DEFAULT_DCC_QUEUE_LIMIT, NULL, NULL, 0, VIF_BITCHX },
--- source/dcc.c.old Sun Nov 4 17:16:25 2001
+++ source/dcc.c Sun Nov 4 17:18:00 2001
@@ -620,7 +620,9 @@
if (get_int_var(RANDOM_LOCAL_PORTS_VAR))
portnum = random_number(65535 - 1024) + 1024;
-
+ if (get_int_var(DCC_FORCE_PORT_VAR))
+ portnum = get_int_var(DCC_FORCE_PORT_VAR);
+
#ifdef DCC_CNCT_PEND
flags |= DCC_CNCT_PEND;
#endif
--- /root/devel/BUILD/modules.c Tue Feb 11 01:13:41 2003
+++ modules.c Tue Feb 11 01:13:58 2003
@@ -1321,7 +1321,7 @@
int check_version(unsigned long required)
{
-unsigned const major, minor, need_major, need_minor;
+unsigned long major, minor, need_major, need_minor;
major = bitchx_numver / 10000;
minor = (bitchx_numver / 100) % 100;
need_major = required / 10000;
BitchX.spec.diff
--- SPECS/BitchX.spec.orig Thu Feb 13 00:14:57 2003
+++ SPECS/BitchX.spec Thu Feb 13 00:21:25 2003
@@ -5,7 +5,7 @@
Summary(pt_BR): Cliente IRC para o console do Linux
Name: BitchX
Version: 1.0c19
-Release: 1
+Release: 2
License: GPL
Group: Applications/Networking
Source0:
ftp://ftp.bitchx.com/pub/BitchX/source/ircii-pana-%{version}.tar.gz
@@ -15,6 +15,10 @@
Source4: %{name}.1.pl
Patch0: %{name}-config.h.patch
Patch1: %{name}-numver.patch
+Patch2: %{name}-dcc-force-port.patch
+Patch3: %{name}-doc.patch
+Patch4: %{name}-emacs.patch
+Patch5: %{name}-versioned-tcl.patch
Icon: BitchX.xpm
URL: http://www.bitchx.com/
BuildRequires: mysql-devel
@@ -60,6 +64,11 @@
%prep
%setup -q -n %{name}
%patch0 -p1
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p1
+%patch5 -p0
%build
CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
pozdrawiam
--
Michał Kaps
FafNetowy SysAdmin
Więcej informacji o liście dyskusyjnej pld-devel-pl