--- scrollz-2.1.orig/include/config.h +++ scrollz-2.1/include/config.h @@ -47,7 +47,7 @@ * file and the ircII can find it, this setting is overridden. */ #ifndef DEFAULT_SERVER -# define DEFAULT_SERVER "change.this.to.a.server" +# define DEFAULT_SERVER "irc.debian.org" #endif /* @@ -134,7 +134,7 @@ #define DEFAULT_CTCP_REPLY_IGNORE_SECONDS 10 #define DEFAULT_DCC_BLOCK_SIZE 2048 #define DEFAULT_DISPLAY 1 -#define DEFAULT_DISPLAY_ENCODING "UTF-8" +#define DEFAULT_DISPLAY_ENCODING "ISO8859-1" #define DEFAULT_DISPLAY_ANSI 1 #define DEFAULT_EIGHT_BIT_CHARACTERS 1 #define DEFAULT_ENCRYPT_PROGRAM NULL @@ -158,10 +158,10 @@ #define DEFAULT_HYPER_DCC 0 #define DEFAULT_INDENT 1 #define DEFAULT_INPUT_ALIASES 0 -#define DEFAULT_INPUT_ENCODING "UTF-8" +#define DEFAULT_INPUT_ENCODING "ISO-8859-1" #define DEFAULT_INPUT_PROMPT NULL #define DEFAULT_INPUT_PROTECTION 1 -#define DEFAULT_IRC_ENCODING "UTF-8" +#define DEFAULT_IRC_ENCODING "ISO-8859-1" #define DEFAULT_INSERT_MODE 1 #define DEFAULT_INVERSE_VIDEO 1 #define DEFAULT_ISO2022_SUPPORT 0 --- scrollz-2.1.orig/include/irc.h +++ scrollz-2.1/include/irc.h @@ -131,6 +131,9 @@ # endif #endif +#include +#include + #ifdef HAVE_SYS_SELECT_H # include #endif --- scrollz-2.1.orig/debian/control +++ scrollz-2.1/debian/control @@ -0,0 +1,21 @@ +Source: scrollz +Section: net +Priority: optional +Maintainer: Mike Markley +Build-Depends: debhelper (>= 7), libncurses5-dev, libgnutls-dev, pkg-config +Standards-Version: 3.8.4 + +Package: scrollz +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Provides: irc +Description: An advanced ircII-based IRC client + ScrollZ is advanced IRC client based on ircII code. It adds features + normally found in ircII scripts like Toolz, PhoEniX, GargOyle or Lice. + . + The main difference between these scripts and ScrollZ is the code. Where + ircII scripts take a lot of disk and memory space and run slow, ScrollZ + only takes a couple of extra kilobytes compared to stock ircII client + yet runs faster than any ircII script. This was accomplished by using + C code instead of ircII scripting language. This reduces memory and + CPU usage and code tends to run way faster. --- scrollz-2.1.orig/debian/README.Debian +++ scrollz-2.1/debian/README.Debian @@ -0,0 +1,12 @@ +ScrollZ for Debian +------------------ + +Note that the upstream default for ScrollZ's scripts, helpfiles, etc. +is /usr/lib/scrollz. This has been changed to /usr/share/scrollz in +the Debian package. + +As of version 1.9.98.1, colors no longer work correctly in +INPUT_PROMPT. This is, per upstream, the result of changes in the ircII +source to support UTF-8. + + -- Mike Markley , Tue, 24 Oct 2006 12:45:59 -0700 --- scrollz-2.1.orig/debian/docs +++ scrollz-2.1/debian/docs @@ -0,0 +1,5 @@ +NEWS +README +README.ScrollZ +todo +doc/ScrollZ.doc --- scrollz-2.1.orig/debian/dirs +++ scrollz-2.1/debian/dirs @@ -0,0 +1 @@ +usr/lib/scrollz/bin --- scrollz-2.1.orig/debian/copyright +++ scrollz-2.1/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Mike Markley on +Thu, 5 Jul 2001 00:55:07 -0700. + +It was downloaded from http://www.scrollz.com/. + +Upstream Author: Flier + +Copyright: + +Redistribution and use in source and binary forms, with or without +modification, are permitted under the terms of the BSD License. + +THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + +One module of the source code, scandir.c is copyright (c) 1983 +by the Regents of the University of California, with modifications +by various contributors. All rights are reserved by the +University of California. + +On Debian GNU/Linux systems, the complete text of the BSD License can be +found in `/usr/share/common-licenses/BSD'. --- scrollz-2.1.orig/debian/menu +++ scrollz-2.1/debian/menu @@ -0,0 +1,2 @@ +?package(scrollz):needs="text" section="Applications/Network/Communication" \ + title="ScrollZ" command="/usr/bin/scrollz" --- scrollz-2.1.orig/debian/compat +++ scrollz-2.1/debian/compat @@ -0,0 +1 @@ +7 --- scrollz-2.1.orig/debian/changelog +++ scrollz-2.1/debian/changelog @@ -0,0 +1,120 @@ +scrollz (2.1-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: make[2]: *** No rule to make target `/usr/include/sys/stat.h', + needed by `alias.o'. Stop.": Apply patch from Ubuntu / Matthias Klose: + Work around build failure with multiarch glibc. + Closes: #640565 + LP: #832870 + + -- gregor herrmann Sun, 25 Sep 2011 14:35:56 +0200 + +scrollz (2.1-1) unstable; urgency=low + + * New upstream version. + * Dropped ignore patch (integrated upstream). + * Bumped to debhelper v7 and Standards-Version 3.8.4. + + -- Mike Markley Wed, 31 Mar 2010 22:55:39 -0700 + +scrollz (2.0-1) unstable; urgency=low + + * New upstream version. Closes: #532961 + * Patched to use pkg-config instead of libgnutls-config. Closes: #529846 + + -- Mike Markley Thu, 25 Jun 2009 20:57:47 -0700 + +scrollz (1.9.99-2) unstable; urgency=low + + * Applied patch from Klaus Ethgen to fix encoding issues. This changes + the default encoding to ISO8859-1, but attempts to detect the proper + codeset. Closes: #398345, #416197 + * Updated URL in debian/copyright. Closes: #470750 + * Enabled SSL support via GnuTLS. Closes: 486364 + + -- Mike Markley Sun, 13 Jul 2008 21:27:17 -0700 + +scrollz (1.9.99-1) unstable; urgency=low + + * New upstream version. + * Add patch for /ignore crash from upstream + + -- Mike Markley Thu, 23 Nov 2006 23:17:11 -0800 + +scrollz (1.9.98.1-1) unstable; urgency=low + + * New upstream version. + * Fix from upstream for crash on /set -STATUS_UPTIME (Closes: #379068) + + -- Mike Markley Wed, 18 Oct 2006 11:04:28 -0700 + +scrollz (1.9.5-2) unstable; urgency=low + + * Patch Makefile.in to modify installed help files in DESTDIR + instead of / (Closes: #353854) + + -- Mike Markley Tue, 21 Feb 2006 22:26:57 -0800 + +scrollz (1.9.5-1) unstable; urgency=low + + * New upstream version + * Remove unnecessary declarations of functions in rijndael-alg-ref.c + (Closes: #300292) + + -- Mike Markley Thu, 16 Feb 2006 02:56:53 -0800 + +scrollz (1.9-2) unstable; urgency=low + + * Fixed missing DESTDIRs in Makefile (Closes: #175078) + + -- Mike Markley Sun, 5 Jan 2003 04:07:40 -0800 + +scrollz (1.9-1) unstable; urgency=low + + * New upstream version + * postinst now checks for a man symlink from the old version since + 1.8m-3 did not handle it upon removal + + -- Mike Markley Tue, 31 Dec 2002 12:00:26 -0800 + +scrollz (1.8m-3) unstable; urgency=low + + * Moved to main + + -- Mike Markley Mon, 25 Mar 2002 00:47:01 -0800 + +scrollz (1.8m-2) unstable; urgency=low + + * Added Provides: irc + + -- Mike Markley Mon, 3 Dec 2001 02:42:45 -0800 + +scrollz (1.8m-1) unstable; urgency=low + + * New upstream release + * Removed manpage (integrated into upstream) + + -- Mike Markley Fri, 19 Oct 2001 02:09:18 -0700 + +scrollz (1.8l-3) unstable; urgency=low + + * Removed the autorecon command from edit.c (Closes: #107310) + + -- Mike Markley Fri, 3 Aug 2001 21:20:43 -0700 + +scrollz (1.8l-2) unstable; urgency=low + + * Changed section to non-US (closes: #104059) + + -- Mike Markley Mon, 9 Jul 2001 20:19:15 -0700 + +scrollz (1.8l-1) unstable; urgency=low + + * Initial Release. + * Changed some defaults in include/defs.h + + -- Mike Markley Thu, 5 Jul 2001 00:55:07 -0700 + +Local variables: +mode: debian-changelog +End: --- scrollz-2.1.orig/debian/links +++ scrollz-2.1/debian/links @@ -0,0 +1,2 @@ +usr/share/doc/scrollz/changelog usr/share/doc/scrollz/ChangeLog.ScrollZ +usr/share/man/man1/scrollz.1.gz usr/share/man/man1/scrollz-2.1.1.gz --- scrollz-2.1.orig/debian/rules +++ scrollz-2.1/debian/rules @@ -0,0 +1,60 @@ +#!/usr/bin/make -f + +MAKE_FLAGS = IRCLIB=\$${prefix}/share/scrollz INSTALL_IRCIO=\$${prefix}/lib/scrollz/bin/ircio INSTALL_IRCFLUSH=\$${prefix}/lib/scrollz/bin/ircflush INSTALL_WSERV=\$${prefix}/lib/scrollz/bin/wserv mandir=\$${prefix}/share/man/man1 + +configure: configure-stamp +configure-stamp: + dh_testdir + ./configure --prefix=/usr --mandir=\$${prefix}/share/man/man1 --infodir=\$${prefix}/share/info --enable-ipv6 --with-ssl DESTDIR=$(CURDIR)/debian/scrollz + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + $(MAKE) $(MAKE_FLAGS) everything + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + [ ! -f Makefile ] || $(MAKE) distclean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + $(MAKE) DESTDIR=$(CURDIR)/debian/scrollz $(MAKE_FLAGS) installeverything + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + dh_installexamples + dh_installmenu + dh_installinfo + dh_installchangelogs ChangeLog.ScrollZ + install -m 0644 ChangeLog $(CURDIR)/debian/scrollz/usr/share/doc/scrollz/ChangeLog.ircII + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- scrollz-2.1.orig/debian/postinst +++ scrollz-2.1/debian/postinst @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + version=`echo $2 | sed -e 's/-[0-9]$//'` + [ -L /usr/share/man/man1/scrollz-${version}.1.gz ] && rm /usr/share/man/man1/scrollz-${version}.1.gz +fi + +#DEBHELPER# --- scrollz-2.1.orig/debian/patches/scrollz-encoding.patch +++ scrollz-2.1/debian/patches/scrollz-encoding.patch @@ -0,0 +1,104 @@ +commit 7b34b964d0c2478a3c6dab9eabe69fe60b9ea97f +Author: Klaus Ethgen +Date: Wed Jun 18 21:49:11 2008 +0100 + + Fixing the encoding to stay in sync with the documentation. + + The INPUT_ENCODING was set wrong to UTF-8. But the documentation says that the + default is ISO-8859-1. + + This has the effect that scrollz do stop working when the first ISO-8859-1 + character > 0x7f is typed! The changes switch to the documented default and will + work also if the real input encoding is not right as ISO-8859-1 is a full 8bit + encoding. + + Please note that the historical default on IRC is allways a 8bit encoding. + + Futermore this will use the locale variables to set the encoding. + + Closes: #398345 + +diff --git a/include/config.h b/include/config.h +index 95ed923..73209ab 100644 +--- a/include/config.h ++++ b/include/config.h +@@ -132,7 +132,7 @@ + #define DEFAULT_CTCP_REPLY_IGNORE_SECONDS 10 + #define DEFAULT_DCC_BLOCK_SIZE 2048 + #define DEFAULT_DISPLAY 1 +-#define DEFAULT_DISPLAY_ENCODING "UTF-8" ++#define DEFAULT_DISPLAY_ENCODING "ISO8859-1" + #define DEFAULT_DISPLAY_ANSI 1 + #define DEFAULT_EIGHT_BIT_CHARACTERS 1 + #define DEFAULT_ENCRYPT_PROGRAM NULL +@@ -156,10 +156,10 @@ + #define DEFAULT_HYPER_DCC 0 + #define DEFAULT_INDENT 1 + #define DEFAULT_INPUT_ALIASES 0 +-#define DEFAULT_INPUT_ENCODING "UTF-8" ++#define DEFAULT_INPUT_ENCODING "ISO-8859-1" + #define DEFAULT_INPUT_PROMPT NULL + #define DEFAULT_INPUT_PROTECTION 1 +-#define DEFAULT_IRC_ENCODING "UTF-8" ++#define DEFAULT_IRC_ENCODING "ISO-8859-1" + #define DEFAULT_INSERT_MODE 1 + #define DEFAULT_INVERSE_VIDEO 1 + #define DEFAULT_ISO2022_SUPPORT 0 +diff --git a/include/irc.h b/include/irc.h +index 8610fd6..069faf1 100644 +--- a/include/irc.h ++++ b/include/irc.h +@@ -131,6 +131,9 @@ + # endif + #endif + ++#include ++#include ++ + #ifdef HAVE_SYS_SELECT_H + # include + #endif +diff --git a/source/vars.c b/source/vars.c +index 00a88a7..ebe0e61 100644 +--- a/source/vars.c ++++ b/source/vars.c +@@ -351,6 +351,13 @@ init_variables() + /**************************** PATCHED by Flier ******************************/ + int old_disp; + /****************************************************************************/ ++ char *charset; ++ ++ /* Switch the locale to the environment values to get the right charset */ ++ setlocale(LC_ALL, ""); ++ charset = nl_langinfo(CODESET); ++ /* Switch back to the locale used before (POSIX or C) to prevent side effects. */ ++ setlocale(LC_ALL, "C"); + + check_variable_order(); + +@@ -359,12 +366,22 @@ init_variables() + set_string_var(SHELL_VAR, DEFAULT_SHELL); + set_string_var(SHELL_FLAGS_VAR, DEFAULT_SHELL_FLAGS); + set_string_var(DECRYPT_PROGRAM_VAR, UP(DEFAULT_DECRYPT_PROGRAM)); +- set_string_var(DISPLAY_ENCODING_VAR, DEFAULT_DISPLAY_ENCODING); + set_string_var(ENCRYPT_PROGRAM_VAR, DEFAULT_ENCRYPT_PROGRAM); + set_string_var(CONTINUED_LINE_VAR, DEFAULT_CONTINUED_LINE); +- set_string_var(INPUT_ENCODING_VAR, DEFAULT_INPUT_ENCODING); ++ if (charset == NULL || charset[0] == '\0') ++ { ++ set_string_var(DISPLAY_ENCODING_VAR, DEFAULT_DISPLAY_ENCODING); ++ set_string_var(INPUT_ENCODING_VAR, DEFAULT_INPUT_ENCODING); ++ set_string_var(IRC_ENCODING_VAR, DEFAULT_IRC_ENCODING); ++ } ++ else ++ { ++ set_string_var(DISPLAY_ENCODING_VAR, charset); ++ set_string_var(INPUT_ENCODING_VAR, charset); ++ set_string_var(IRC_ENCODING_VAR, charset); ++ } ++ + set_string_var(INPUT_PROMPT_VAR, DEFAULT_INPUT_PROMPT); +- set_string_var(IRC_ENCODING_VAR, DEFAULT_IRC_ENCODING); + set_string_var(HIGHLIGHT_CHAR_VAR, DEFAULT_HIGHLIGHT_CHAR); + set_string_var(HISTORY_FILE_VAR, DEFAULT_HISTORY_FILE); + set_string_var(LASTLOG_LEVEL_VAR, DEFAULT_LASTLOG_LEVEL); --- scrollz-2.1.orig/debian/patches/rijndael-prototypes.diff +++ scrollz-2.1/debian/patches/rijndael-prototypes.diff @@ -0,0 +1,16 @@ +--- a/source/rijndael-alg-ref.c 2002-01-21 13:37:36.000000000 -0800 ++++ b/source/rijndael-alg-ref.c 2009-06-26 20:45:17.000000000 -0700 +@@ -35,13 +35,6 @@ + { 4, 4 } } + }; + +-word8 mul(word8, word8); +-void KeyAddition(word8 [][], word8 [][], word8); +-void Substitution(word8 [][], word8 box[], word8); +-void ShiftRow(word8 [][], word8, word8); +-void MixColumn(word8 [][], word8); +-void InvMixColumn(word8 [][], word8); +- + word8 mul(word8 a, word8 b) { + /* multiply two elements of GF(2^m) + * needed for MixColumn and InvMixColumn --- scrollz-2.1.orig/source/Makefile.in +++ scrollz-2.1/source/Makefile.in @@ -140,7 +140,7 @@ ../include/menu.h ../include/screen.h ../include/input.h \ ../include/output.h ../include/parse.h ../include/notify.h \ ../include/ignore.h ../include/exec.h ../include/ircterm.h \ - /usr/include/sys/stat.h ../include/myvars.h + ../include/myvars.h blowfish.o: blowfish.c ../include/irc.h ../include/defs.h \ ../include/celerity.h ../include/config.h ../include/irc_std.h \ ../include/debug.h ../include/struct.h ../include/mystructs.h \ --- scrollz-2.1.orig/source/rijndael-alg-ref.c +++ scrollz-2.1/source/rijndael-alg-ref.c @@ -35,13 +35,6 @@ { 4, 4 } } }; -word8 mul(word8, word8); -void KeyAddition(word8 [][], word8 [][], word8); -void Substitution(word8 [][], word8 box[], word8); -void ShiftRow(word8 [][], word8, word8); -void MixColumn(word8 [][], word8); -void InvMixColumn(word8 [][], word8); - word8 mul(word8 a, word8 b) { /* multiply two elements of GF(2^m) * needed for MixColumn and InvMixColumn --- scrollz-2.1.orig/source/vars.c +++ scrollz-2.1/source/vars.c @@ -363,6 +363,13 @@ /**************************** PATCHED by Flier ******************************/ int old_disp; /****************************************************************************/ + char *charset; + + /* Switch the locale to the environment values to get the right charset */ + setlocale(LC_ALL, ""); + charset = nl_langinfo(CODESET); + /* Switch back to the locale used before (POSIX or C) to prevent side effects. */ + setlocale(LC_ALL, "C"); check_variable_order(); @@ -371,12 +378,22 @@ set_string_var(SHELL_VAR, DEFAULT_SHELL); set_string_var(SHELL_FLAGS_VAR, DEFAULT_SHELL_FLAGS); set_string_var(DECRYPT_PROGRAM_VAR, UP(DEFAULT_DECRYPT_PROGRAM)); - set_string_var(DISPLAY_ENCODING_VAR, DEFAULT_DISPLAY_ENCODING); set_string_var(ENCRYPT_PROGRAM_VAR, DEFAULT_ENCRYPT_PROGRAM); set_string_var(CONTINUED_LINE_VAR, DEFAULT_CONTINUED_LINE); - set_string_var(INPUT_ENCODING_VAR, DEFAULT_INPUT_ENCODING); + if (charset == NULL || charset[0] == '\0') + { + set_string_var(DISPLAY_ENCODING_VAR, DEFAULT_DISPLAY_ENCODING); + set_string_var(INPUT_ENCODING_VAR, DEFAULT_INPUT_ENCODING); + set_string_var(IRC_ENCODING_VAR, DEFAULT_IRC_ENCODING); + } + else + { + set_string_var(DISPLAY_ENCODING_VAR, charset); + set_string_var(INPUT_ENCODING_VAR, charset); + set_string_var(IRC_ENCODING_VAR, charset); + } + set_string_var(INPUT_PROMPT_VAR, DEFAULT_INPUT_PROMPT); - set_string_var(IRC_ENCODING_VAR, DEFAULT_IRC_ENCODING); set_string_var(HIGHLIGHT_CHAR_VAR, DEFAULT_HIGHLIGHT_CHAR); set_string_var(HISTORY_FILE_VAR, DEFAULT_HISTORY_FILE); set_string_var(LASTLOG_LEVEL_VAR, DEFAULT_LASTLOG_LEVEL);