commit bitchx

31 Mar 2006

Hello community,

here is the log from the commit of package bitchx
checked in at Fri Mar 31 15:29:29 CEST 2006.

--------

--- bitchx/bitchx.changes	2006-01-25 21:34:38.000000000 +0100
+++ bitchx/bitchx.changes	2006-03-29 21:29:17.000000000 +0200
@@ -1,0 +2,18 @@
+Wed Mar 29 21:21:23 CEST 2006 - lmichnovic@suse.cz
+
+- fixed calling of different function that caused crashing on 64bit
+  arch, needed for 32bit too [#157927] (not_in_display.patch)
+- fixed cast to pointer from integer of different size on 64bit arch
+  (pointer_casting_64.patch)
+
+-------------------------------------------------------------------
+Thu Mar 16 21:16:37 CET 2006 - lmichnovic@suse.cz
+
+- creation of manpage fixed in mandir.patch  
+
+-------------------------------------------------------------------
+Thu Mar 16 19:21:04 CET 2006 - lmichnovic@suse.cz
+
+- fixed missing debuginfo.rpm
+
+-------------------------------------------------------------------

Old:
----
  BitchX-64bit.patch
  BitchX-gcc34.patch
  BitchX-non_static_decl.patch
  BitchX-overflow.patch
  bitchx-configs.dif

New:
----
  bitchx-64bit.patch
  bitchx-configs.patch
  bitchx-gcc34.patch
  bitchx-mandir.patch
  bitchx-non_static_decl.patch
  bitchx-not_in_display.patch
  bitchx-overflow.patch
  bitchx-pointer_casting_64.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ bitchx.spec ++++++
--- /var/tmp/diff_new_pack.zOXSQ7/_old	2006-03-31 15:28:40.000000000 +0200
+++ /var/tmp/diff_new_pack.zOXSQ7/_new	2006-03-31 15:28:40.000000000 +0200
@@ -1,11 +1,11 @@
 #
 # spec file for package bitchx (Version 1.1)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
@@ -19,16 +19,18 @@
 Summary:      An IRC Client
 URL:          http://www.bitchx.org/
 Version:      1.1
-Release:      7
+Release:        15
 Source:       ircii-pana-%{version}-final.tar.bz2
-Patch0:       bitchx-configs.dif
+Patch0:         bitchx-configs.patch
 Patch1:       bitchx-conf.patch
-Patch3:       BitchX-64bit.patch
-Patch4:       BitchX-gcc34.patch
-Patch5:       BitchX-non_static_decl.patch
-Patch6:       BitchX-overflow.patch
+Patch3:         bitchx-64bit.patch
+Patch4:         bitchx-gcc34.patch
+Patch5:         bitchx-non_static_decl.patch
+Patch6:         bitchx-overflow.patch
+Patch7:         bitchx-mandir.patch
+Patch8:         bitchx-not_in_display.patch
+Patch9:         bitchx-pointer_casting_64.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-Nosource:     0
 
 %description
 BitchX is one of the most well-known IRC clients for the text console.
@@ -49,7 +51,10 @@
 %patch4 -p1
 %patch5
 %patch6 -p1
-gzip -c9 < doc/BitchX.1  > BitchX.1.gz
+%patch7
+%patch8
+%patch9
+#gzip -c9 < doc/BitchX.1  > BitchX.1.gz
 rm -rf macros/sanity.m4
 
 %build
@@ -61,12 +66,16 @@
 	--mandir=%{_mandir} \
 	--enable-ipv6 \
 	--with-ssl
-make
+make %{?jobs:-j%jobs}
 
 %install
 make prefix=$RPM_BUILD_ROOT/usr/ install
 ln -sf BitchX-%{version}-final $RPM_BUILD_ROOT/usr/bin/BitchX
-install -D -m 644 BitchX.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/BitchX.1.gz
+pushd $RPM_BUILD_ROOT/%{_mandir}/man1/
+gzip -c9 < BitchX.1  > BitchX.1.gz
+popd
+#install -D -m 644 BitchX.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/BitchX.1.gz
+pwd
 ln -s BitchX.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/bitchx.1.gz
 ln -s BitchX $RPM_BUILD_ROOT/usr/bin/bitchx
 chmod 0644 $RPM_BUILD_ROOT/usr/lib/bx/help/findcomm.bz2
@@ -77,7 +86,7 @@
 %files
 %defattr(-,root,root)
 %doc BitchX.help BitchX.ircnames BitchX.quit BitchX.reasons
-%doc COMPILE-PROBLEMS Changelog INSTALL README  INSTALL 
+%doc COMPILE-PROBLEMS Changelog INSTALL README 
 %doc doc/*
 %doc %{_mandir}/man1/BitchX.1.gz
 %doc %{_mandir}/man1/bitchx.1.gz
@@ -88,6 +97,15 @@
 /usr/lib/bx/
 
 %changelog -n bitchx
+* Wed Mar 29 2006 - lmichnovic@suse.cz
+- fixed calling of different function that caused crashing on 64bit
+  arch, needed for 32bit too [#157927] (not_in_display.patch)
+- fixed cast to pointer from integer of different size on 64bit arch
+  (pointer_casting_64.patch)
+* Thu Mar 16 2006 - lmichnovic@suse.cz
+- creation of manpage fixed in mandir.patch
+* Thu Mar 16 2006 - lmichnovic@suse.cz
+- fixed missing debuginfo.rpm
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Mon Sep 05 2005 - pnemec@suse.cz

++++++ bitchx-64bit.patch ++++++
--- BitchX/include/module.h
+++ BitchX/include/module.h
@@ -15,7 +15,7 @@
 
 #include "struct.h"
 
-typedef int (*Function_ptr)();
+typedef long (*Function_ptr)();
 
 #ifdef WANT_DLL
 #ifdef HPUX
--- BitchX/include/modval.h
+++ BitchX/include/modval.h
@@ -318,7 +318,7 @@
 #define show_window(x) ((void) (global[SHOW_WINDOW]((Window *)x)))
 #define get_status_by_refnum(x, y) ((char *) (global[GET_STATUS_BY_REFNUM]((unsigned int)x, (unsigned int)y)))
 #define get_visible_by_refnum(x) ((int) (global[GET_VISIBLE_BY_REFNUM]((char *)x)))
-#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned int)x)))
+#define get_window_by_desc(x) ((Window *) (global[GET_WINDOW_BY_DESC]((unsigned long)x)))
 #define get_window_by_refnum(x) ((Window *) (global[GET_WINDOW_BY_REFNUM]((unsigned int)x)))
 #define get_window_by_name(x) ((Window *) (global[GET_WINDOW_BY_NAME]((char *)x)))
 #define next_window(x, y) ((void) (global[FUNC_NEXT_WINDOW]((char)x, (char *)y)))
++++++ bitchx-conf.patch ++++++
--- /var/tmp/diff_new_pack.zOXSQ7/_old	2006-03-31 15:28:40.000000000 +0200
+++ /var/tmp/diff_new_pack.zOXSQ7/_new	2006-03-31 15:28:40.000000000 +0200
@@ -1,6 +1,6 @@
 --- configure.in
 +++ configure.in
-@@ -982,7 +982,6 @@
+@@ -997,7 +997,6 @@
  dll/amp/Makefile
  dll/arcfour/Makefile
  dll/autocycle/Makefile

++++++ bitchx-configs.dif -> bitchx-configs.patch ++++++
--- bitchx/bitchx-configs.dif	2002-05-14 08:02:31.000000000 +0200
+++ bitchx/bitchx-configs.patch	2006-03-29 19:38:08.000000000 +0200
@@ -1,7 +1,6 @@
-diff -ur BitchX/include/color.h BitchX.mmj/include/color.h
---- BitchX/include/color.h	Mon Mar  5 20:38:48 2001
-+++ BitchX.mmj/include/color.h	Mon May 13 17:59:37 2002
-@@ -717,8 +717,8 @@
+--- BitchX/include/color.h
++++ BitchX/include/color.h
+@@ -759,8 +759,8 @@
  	
  #define DEFAULT_FORMAT_NICK_MSG_FSET "$0 $1 $2-"
  
@@ -12,10 +11,9 @@
  
  #define DEFAULT_FORMAT_STATUS_FSET "%4%W$0-"
  #define DEFAULT_FORMAT_STATUS1_FSET "%4%W$0-"
-diff -ur BitchX/include/config.h BitchX.mmj/include/config.h
---- BitchX/include/config.h	Sun Mar 24 10:31:04 2002
-+++ BitchX.mmj/include/config.h	Mon May 13 18:00:43 2002
-@@ -239,7 +239,7 @@
+--- BitchX/include/config.h
++++ BitchX/include/config.h
+@@ -225,7 +225,7 @@
   * in the client. defining this variable to 1 allows that happen. It also
   * adds a HEBREW_TOGGLE variable which can turn this feature on/off
   */
@@ -24,7 +22,7 @@
  
  /* if you use cidentd the filename is called .authlie instead of .noident.
   * as well some modifications to the format of the file were made. So we 
-@@ -325,7 +325,7 @@
+@@ -311,7 +311,7 @@
   *
   * Is here there any solution to use both fonts nethertheless ?
   */
@@ -33,7 +31,7 @@
  
  /*
   * If you use LINUX and non ISO8859-1 fonts with custom screen mapping,
-@@ -377,12 +377,12 @@
+@@ -363,12 +363,12 @@
  #define DEFAULT_MSGLOG ON
  #define DEFAULT_AUTO_NSLOOKUP OFF
  #define DEFAULT_ALT_CHARSET ON
@@ -49,7 +47,7 @@
  #define DEFAULT_AUTO_UNMARK_AWAY OFF
  #define DEFAULT_AUTO_WHOWAS OFF
  #define DEFAULT_BANTIME 600
-@@ -393,7 +393,7 @@
+@@ -379,7 +379,7 @@
  #define DEFAULT_BLINK_VIDEO ON
  #define DEFAULT_CHANNEL_NAME_WIDTH 10
  #define DEFAULT_CLOCK ON
@@ -58,7 +56,7 @@
  #define DEFAULT_COMMAND_MODE OFF
  #define DEFAULT_COMMENT_HACK ON
  #define DEFAULT_DCC_BLOCK_SIZE 2048
-@@ -430,7 +430,7 @@
+@@ -416,7 +416,7 @@
  #define DEFAULT_SEND_IGNORE_MSG OFF
  #define DEFAULT_SEND_OP_MSG ON
  #define DEFAULT_SHELL_LIMIT 0
@@ -67,7 +65,7 @@
  #define DEFAULT_SHOW_CHANNEL_NAMES ON
  #define DEFAULT_SHOW_END_OF_MSGS OFF
  #define DEFAULT_SHOW_NUMERICS OFF
-@@ -447,14 +447,14 @@
+@@ -433,14 +433,14 @@
  #define DEFAULT_SEND_AWAY_MSG OFF
  #define DEFAULT_SEND_CTCP_MSG ON
  #define DEFAULT_SOCKS_PORT 1080
@@ -84,7 +82,7 @@
  #define DEFAULT_DCC_AUTORENAME ON
  #define DEFAULT_DCC_AUTORESUME OFF
  #define DEFAULT_DCC_AUTORENAME_ON_NICKNAME OFF
-@@ -494,10 +494,10 @@
+@@ -480,10 +480,10 @@
  #define DEFAULT_AINV 0
  #define DEFAULT_ANNOY_KICK OFF
  #define DEFAULT_AOP_VAR OFF
@@ -98,7 +96,7 @@
  #if defined(__EMXPM__) || defined(WIN32)
  #define DEFAULT_CODEPAGE 437
  #endif
-@@ -508,16 +508,16 @@
+@@ -494,16 +494,16 @@
  #define DEFAULT_DEOP_ON_KICKFLOOD 3
  #define DEFAULT_KICK_IF_BANNED OFF
  #define DEFAULT_HACKING 0  /* 0 1 2 */
@@ -118,7 +116,7 @@
  #define DEFAULT_NICKFLOOD_TIME 30
  #ifdef __EMXPM__
  #define DEFAULT_NICKLIST 10
-@@ -589,7 +589,7 @@
+@@ -575,7 +575,7 @@
  #endif 
  /* _USE_LOCAL_CONFIG */
  
@@ -127,7 +125,7 @@
  #define DEFAULT_PROTECT_CHANNELS "*"
  #define DEFAULT_SHITLIST_REASON "Surplus Lamerz must go!!!!"
  #define DEFAULT_BEEP_ON_MSG "MSGS"
-@@ -602,7 +602,7 @@
+@@ -588,7 +588,7 @@
  #define DEFAULT_SHELL "/bin/sh"
  #define DEFAULT_SHELL_FLAGS "-c"
  #define DEFAULT_USERINFO ""
@@ -136,7 +134,7 @@
  #define DEFAULT_XTERM_OPTIONS "-bg black -fg white"
  #define DEFAULT_DCC_DLDIR "~"
  
-@@ -693,9 +693,7 @@
+@@ -679,9 +679,7 @@
  #undef WANT_CHATNET      /* define just for codelogic */
  #endif
  

++++++ bitchx-gcc34.patch ++++++
--- BitchX/source/term.c
+++ BitchX/source/term.c
@@ -92,7 +92,7 @@
 #endif
 
 extern  char    *getenv();
-extern	char	*tparm();
+extern	char	*tparm(const char *str, ...);
 
 /*
  * The old code assumed termcap. termcap is almost always present, but on
++++++ bitchx-mandir.patch ++++++
--- Makefile.in
+++ Makefile.in
@@ -297,7 +297,7 @@
 			cd $(top_srcdir)/doc; \
 			for i in BitchX.1; do \
 			if test -f $$i; then \
-				$(INSTALL_DATA) $$i $(mandir)/man1; \
+				$(INSTALL_DATA) $$i $(prefix)/share/man/man1; \
 			fi; \
 			done; \
 		fi; \
@@ -306,7 +306,7 @@
 		(xargs bzip2 -9f || xargs gzip -9f) || :) 2>/dev/null
 
 installdirs:
-	umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(mandir)/man1 $(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR)
+	umask 022; $(top_srcdir)/mkinstalldirs $(bindir) $(IRCLIB) $(prefix)/share/man/man1 $(TRANSLATION_PATH) $(INSTALL_SCRIPT) $(HELPDIR)
 
 local_installdirs:
 	umask 022; $(top_srcdir)/mkinstalldirs $(local_dir)/bin $(DEFAULT_CTOOLZ_DIR) $(DEFAULT_CTOOLZ_DIR)/plugins $(DEFAULT_CTOOLZ_DIR)/logs
++++++ bitchx-non_static_decl.patch ++++++
--- source/ctcp.c
+++ source/ctcp.c
@@ -176,7 +176,7 @@
 
 /* CDE do ops and unban logging */
 
-static char	*ctcp_type[] =
+char	*ctcp_type[] =
 {
 	"PRIVMSG",
 	"NOTICE"
--- source/timer.c
+++ source/timer.c
@@ -148,7 +148,7 @@
  * This is put here on purpose -- we dont want any of the above functions
  * to have any knowledge of this struct.
  */
-static TimerList *PendingTimers;
+TimerList *PendingTimers;
 static char *schedule_timer (TimerList *ntimer);
 
 static char *current_exec_timer = empty_string;
++++++ bitchx-not_in_display.patch ++++++
--- include/modval.h
+++ include/modval.h
@@ -169,7 +169,7 @@
 #define MatchingBracket(x, y, z) ((char *) (global[MATCHINGBRACKET]((char *)x, ( char)y, (char)z)))
 #define parse_number(x) ((int) (global[PARSE_NUMBER]((char **)x)))
 #define splitw(x, y) ((int) (global[SPLITW]((char *)x, (char ***)y)))
-#define unsplitw(x, y) ((char *) (global[UNSPLITW]((char ***)x, (char *)y)))
+#define unsplitw(x, y) ((char *) (global[UNSPLITW]((char ***)x, (int)y)))
 #define check_val(x) ((int) (global[CHECK_VAL]((char *)x)))
 #define on_off(x) ((char *) (global[ON_OFF]((int)x)))
 #define strextend(x, y, n) ((char *) (global[STREXTEND]((char *)x, (char)y, (int)n)))
@@ -279,7 +279,7 @@
 #define output_line(x) ((int) (global[OUTPUT_LINE]((const unsigned char *)x)))
 #define output_with_count(x, y, z) ((int) (global[OUTPUT_WITH_COUNT]((const unsigned char *)x, (int)y, (int)z)))
 #define scroll_window(x) ((void) (global[SCROLL_WINDOW]((Window *)x)))
-#define cursor_not_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Screen *)x)))
+#define cursor_not_in_display(x) ((void) (global[CURSOR_NOT_IN_DISPLAY]((Screen *)x)))
 #define cursor_in_display(x) ((void) (global[CURSOR_IN_DISPLAY]((Screen *)x)))
 #define is_cursor_in_display(x) ((int) (global[IS_CURSOR_IN_DISPLAY]((Screen *)x)))
 #define repaint_window(x, y, z) ((void) (global[REPAINT_WINDOW]((Window *)x, (int)y, (int)z)))
++++++ bitchx-overflow.patch ++++++
--- BitchX/source/server.c
+++ BitchX/source/server.c
@@ -151,7 +151,7 @@
 			if (x_debug & DEBUG_OUTBOUND)
 				yell("Closing server %d because [%s]",
 					   cs_index, message ? message : empty_string);
-			snprintf(buffer, BIG_BUFFER_SIZE, "QUIT :%s\n", message);
+			snprintf(buffer, sizeof(buffer), "QUIT :%s\n", message);
 #ifdef HAVE_SSL
 			if (get_server_ssl(cs_index))
 				SSL_write(server_list[cs_index].ssl_fd, buffer, strlen(buffer));
++++++ bitchx-pointer_casting_64.patch ++++++
++++     763 lines (skipped)


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

commit bitchx

root＠suse.de