--- ggz-grubby-0.0.14.orig/debian/patches/silc_1_1_api_changes.diff +++ ggz-grubby-0.0.14/debian/patches/silc_1_1_api_changes.diff @@ -0,0 +1,295 @@ +Index: grubby/src/netsilc.c +=================================================================== +--- grubby/src/netsilc.c (revision 9173) ++++ grubby/src/netsilc.c (revision 9174) +@@ -7,8 +7,16 @@ + * + ********************************************************************/ + ++/* Definition to switch between 1.0 and 1.1 API of SILC */ ++/*#define SILC_COMPAT 1*/ ++#undef SILC_COMPAT ++ + #include "net.h" ++#ifdef SILC_COMPAT + #include ++#else ++#include ++#endif + #include + + /* Prototypes */ +@@ -19,11 +27,19 @@ + static void silc_private_message(SilcClient client, SilcClientConnection conn, SilcClientEntry sender, + SilcMessagePayload payload, SilcMessageFlags flags, const unsigned char *message, SilcUInt32 message_len); + static void silc_notify(SilcClient client, SilcClientConnection conn, SilcNotifyType type, ...); ++ ++#ifdef SILC_COMPAT + static void silc_connected(SilcClient client, SilcClientConnection conn, SilcClientConnectionStatus status); + static void silc_disconnected(SilcClient client, SilcClientConnection conn, SilcStatus status, const char *message); + static void silc_failure(SilcClient client, SilcClientConnection conn, SilcProtocol protocol, void *failure); ++#else ++static void silc_connected(SilcClient client, SilcClientConnection conn, SilcClientConnectionStatus status, ++ SilcStatus error, const char *message, void *context); ++static void silc_running(SilcClient client, void *application); ++#endif + + /* Unused prototypes */ ++#ifdef SILC_COMPAT + static void no_silc_command(SilcClient client, SilcClientConnection conn, SilcClientCommandContext cmd_context, + bool success, SilcCommand command, SilcStatus status); + static void no_silc_command_reply(SilcClient client, SilcClientConnection conn, SilcCommandPayload cmd_payload, +@@ -32,14 +48,30 @@ + SilcGetAuthMeth completion, void *context); + static void no_silc_verify_public_key(SilcClient client, SilcClientConnection conn, SilcSocketType conn_type, + unsigned char *pk, SilcUInt32 pk_len, SilcSKEPKType pk_type, SilcVerifyPublicKey completion, void *context); ++static bool no_silc_key_agreement(SilcClient client, SilcClientConnection conn, SilcClientEntry client_entry, ++ const char *hostname, SilcUInt16 port, SilcKeyAgreementCallback *completion, void **context); ++#else ++static void no_silc_command_reply(SilcClient client, SilcClientConnection conn, SilcCommand command, ++ SilcStatus status, SilcStatus error, va_list ap); ++static void no_silc_command(SilcClient client, SilcClientConnection conn, ++ bool success, SilcCommand command, SilcStatus status, SilcUInt32 argc, unsigned char **argv); ++static void no_silc_get_auth_method(SilcClient client, SilcClientConnection conn, char *hostname, SilcUInt16 port, ++ SilcAuthMethod method, SilcGetAuthMeth completion, void *context); ++static void no_silc_verify_public_key(SilcClient client, SilcClientConnection conn, SilcConnectionType conn_type, ++ SilcPublicKey public_key, SilcVerifyPublicKey completion, void *context); ++static void no_silc_key_agreement(SilcClient client, SilcClientConnection conn, SilcClientEntry client_entry, ++ const char *hostname, SilcUInt16 protocol, SilcUInt16 port); ++#endif ++ + static void no_silc_ask_passphrase(SilcClient client, SilcClientConnection conn, SilcAskPassphrase completion, + void *context); +-static bool no_silc_key_agreement(SilcClient client, SilcClientConnection conn, SilcClientEntry client_entry, +- const char *hostname, SilcUInt16 port, SilcKeyAgreementCallback *completion, void **context); + static void no_silc_ftp(SilcClient client, SilcClientConnection conn, SilcClientEntry client_entry, + SilcUInt32 session_id, const char *hostname, SilcUInt16 port); ++ ++#ifdef SILC_COMPAT + static void no_silc_detach(SilcClient client, SilcClientConnection conn, const unsigned char *detach_data, + SilcUInt32 detach_data_len); ++#endif + + /* Globals */ + int status = NET_NOOP; +@@ -52,7 +84,9 @@ + + static SilcClient client; + static SilcClientConnection connection; ++#ifdef SILC_COMPAT + static SilcPKCS pkcs; ++#endif + static SilcPublicKey pubkey; + static SilcPrivateKey privkey; + static SilcChannelEntry lastchannel; +@@ -65,15 +99,21 @@ + silc_notify, + no_silc_command, + no_silc_command_reply, ++#ifdef SILC_COMPAT + silc_connected, + silc_disconnected, ++#endif + no_silc_get_auth_method, + no_silc_verify_public_key, + no_silc_ask_passphrase, ++#ifdef SILC_COMPAT + silc_failure, ++#endif + no_silc_key_agreement, + no_silc_ftp, ++#ifdef SILC_COMPAT + no_silc_detach ++#endif + }; + + /* Set up the logfile or close it again */ +@@ -209,7 +249,11 @@ + fprintf(stderr, "(SILC) >> silc_hmac_register_default returns %i\n", ret); + if(!ret) status = NET_ERROR; + ++#ifdef SILC_COMPAT + ret = silc_create_key_pair(NULL, 0, NULL, NULL, NULL, NULL, &pkcs, &pubkey, &privkey, FALSE); ++#else ++ ret = silc_create_key_pair(NULL, 0, NULL, NULL, NULL, NULL, &pubkey, &privkey, FALSE); ++#endif + fprintf(stderr, "(SILC) >> silc_create_key_pair returns %i\n", ret); + if(!ret) status = NET_ERROR; + +@@ -217,16 +261,32 @@ + fprintf(stderr, "(SILC) >> silc_pkcs_alloc returns %i\n", ret); + if(!ret) status = NET_ERROR;*/ + ++#ifdef SILC_COMPAT + client->pkcs = pkcs; + client->public_key = pubkey; + client->private_key = privkey; ++#endif + ++#ifdef SILC_COMPAT + ret = silc_client_init(client); ++#else ++ ret = silc_client_init(client, client->username, client->hostname, client->realname, silc_running, NULL); ++#endif + fprintf(stderr, "(SILC) >> silc_client_init returns %i\n", ret); + if(!ret) status = NET_ERROR; + ++#ifdef SILC_INIT + silc_client_connect_to_server(client, NULL, 706, strdup(host), NULL); ++#else ++ ret = silc_load_key_pair(NULL, NULL, NULL, &pubkey, &privkey); ++ fprintf(stderr, "(SILC) >> silc_load_key_pair returns %i\n", ret); ++ if(!ret) status = NET_ERROR; + ++ silc_client_run(client); ++ ++ silc_client_free(client); ++#endif ++ + /*status = NET_GOTREADY;*/ + } + +@@ -278,13 +338,23 @@ + { + case GURU_CHAT: + printf("> %s\n", token); ++#ifdef SILC_COMPAT + silc_client_send_channel_message(client, connection, + lastchannel, NULL, 0, (unsigned char*)token, strlen(token), TRUE); ++#else ++ silc_client_send_channel_message(client, connection, ++ lastchannel, NULL, 0, NULL, (unsigned char*)token, strlen(token)); ++#endif + break; + case GURU_PRIVMSG: + printf("-> %s: %s\n", output->player, token); ++#ifdef SILC_COMPAT + silc_client_send_channel_message(client, connection, + lastchannel, NULL, 0, (unsigned char*)token, strlen(token), TRUE); ++#else ++ silc_client_send_channel_message(client, connection, ++ lastchannel, NULL, 0, NULL, (unsigned char*)token, strlen(token)); ++#endif + break; + case GURU_ADMIN: + printf(">> %s\n", token); +@@ -393,7 +463,12 @@ + va_end(ap); + } + ++#ifdef SILC_COMPAT + static void silc_connected(SilcClient client, SilcClientConnection conn, SilcClientConnectionStatus status) ++#else ++static void silc_connected(SilcClient client, SilcClientConnection conn, SilcClientConnectionStatus status, ++ SilcStatus error, const char *message, void *context) ++#endif + { + char *statusstr; + +@@ -421,6 +496,7 @@ + /*status = NET_LOGIN;*/ + } + ++#ifdef SILC_COMPAT + static void silc_disconnected(SilcClient client, SilcClientConnection conn, SilcStatus status, const char *message) + { + fprintf(stderr, "(SILC) disconnected\n"); +@@ -434,21 +510,37 @@ + + status = NET_ERROR; + } ++#endif + ++#ifdef SILC_COMPAT + static void no_silc_command(SilcClient client, SilcClientConnection conn, SilcClientCommandContext cmd_context, + bool success, SilcCommand command, SilcStatus status) ++#else ++static void no_silc_command(SilcClient client, SilcClientConnection conn, ++ bool success, SilcCommand command, SilcStatus status, SilcUInt32 argc, unsigned char **argv) ++#endif + { + fprintf(stderr, "(SILC) (NO) command\n"); + } + ++#ifdef SILC_COMPAT + static void no_silc_command_reply(SilcClient client, SilcClientConnection conn, SilcCommandPayload cmd_payload, + bool success, SilcCommand command, SilcStatus status, ...) ++#else ++static void no_silc_command_reply(SilcClient client, SilcClientConnection conn, SilcCommand command, ++ SilcStatus status, SilcStatus error, va_list ap) ++#endif + { + fprintf(stderr, "(SILC) (NO) command reply\n"); + } + ++#ifdef SILC_COMPAT + static void no_silc_get_auth_method(SilcClient client, SilcClientConnection conn, char *hostname, SilcUInt16 port, + SilcGetAuthMeth completion, void *context) ++#else ++static void no_silc_get_auth_method(SilcClient client, SilcClientConnection conn, char *hostname, SilcUInt16 port, ++ SilcAuthMethod method, SilcGetAuthMeth completion, void *context) ++#endif + { + /*InternalGetAuthMethod internal;*/ + +@@ -463,12 +555,21 @@ + + silc_client_request_authentication_method(client, conn, + silc_get_auth_method_callback, internal);*/ +- ++ ++#ifdef SILC_COMPAT + (completion)(TRUE, SILC_AUTH_NONE, NULL, 0, context); ++#else ++ (completion)(SILC_AUTH_NONE, NULL, 0, context); ++#endif + } + ++#ifdef SILC_COMPAT + static void no_silc_verify_public_key(SilcClient client, SilcClientConnection conn, SilcSocketType conn_type, + unsigned char *pk, SilcUInt32 pk_len, SilcSKEPKType pk_type, SilcVerifyPublicKey completion, void *context) ++#else ++static void no_silc_verify_public_key(SilcClient client, SilcClientConnection conn, SilcConnectionType conn_type, ++ SilcPublicKey public_key, SilcVerifyPublicKey completion, void *context) ++#endif + { + fprintf(stderr, "(SILC) (NO) verify public key\n"); + +@@ -481,12 +582,15 @@ + fprintf(stderr, "(SILC) (NO) ask passphrase\n"); + } + ++#ifdef SILC_COMPAT + static bool no_silc_key_agreement(SilcClient client, SilcClientConnection conn, SilcClientEntry client_entry, + const char *hostname, SilcUInt16 port, SilcKeyAgreementCallback *completion, void **context) ++#else ++static void no_silc_key_agreement(SilcClient client, SilcClientConnection conn, SilcClientEntry client_entry, ++ const char *hostname, SilcUInt16 protocol, SilcUInt16 port) ++#endif + { + fprintf(stderr, "(SILC) (NO) key agreement\n"); +- +- return TRUE; + } + + static void no_silc_ftp(SilcClient client, SilcClientConnection conn, SilcClientEntry client_entry, +@@ -495,9 +599,19 @@ + fprintf(stderr, "(SILC) (NO) ftp\n"); + } + ++#ifdef SILC_COMPAT + static void no_silc_detach(SilcClient client, SilcClientConnection conn, const unsigned char *detach_data, + SilcUInt32 detach_data_len) + { + fprintf(stderr, "(SILC) (NO) detach\n"); + } ++#endif + ++#ifndef SILC_COMPAT ++static void silc_running(SilcClient client, void *application) ++{ ++ silc_client_connect_to_server(client, NULL, pubkey, privkey, ++ client->hostname, 706, silc_connected, NULL); ++} ++#endif ++ --- ggz-grubby-0.0.14.orig/debian/control +++ ggz-grubby-0.0.14/debian/control @@ -0,0 +1,29 @@ +Source: ggz-grubby +Section: games +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian GGZ Maintainers +Uploaders: Josef Spillner , Peter Eisentraut +Standards-Version: 3.7.2 +Build-Depends: cdbs, debhelper (>= 5), ggzcore-bin (>= 0.0.14.1-1ubuntu1), libggzmod-dev (>= 0.0.14), libperl-dev, ruby1.8-dev, ruby, python-dev + +Package: ggz-grubby +Architecture: any +Depends: ${perl:Depends}, ${shlibs:Depends}, ggzcore-bin (>= ${source:Upstream-Version}) +Recommends: python, ruby +Suggests: ggz-kde-client +Description: GGZ Gaming Zone: chat bot with the ability to play games + Grubby is a nice bot which is intended to run on GGZ servers, but it can + also access IRC networks. It is highly configurable, + extensible with plugins, and gets smarter the longer it runs. A more + serious use is to alert or notify other players, to remember messages + for them, or to translate some phrases. On top of this, grubby can also + be invited to some games and will give funny comments during the + gameplay. + . + For easy configuration, check out the kgrubby tool in ggz-kde-client. + . + This package is part of the GGZ Gaming Zone, a multiuser networked + gaming environment. + . + Web site: http://www.ggzgamingzone.org/ --- ggz-grubby-0.0.14.orig/debian/copyright +++ ggz-grubby-0.0.14/debian/copyright @@ -0,0 +1,19 @@ +This is the Debian GNU/Linux prepackaged version of ggz-grubby, +the GGZ chat bot. + +This software was first packaged for Debian by Stephen Zander + Sat, 12 Oct 2002 18:47:28 -0700 using upstream +sources obtained from http://ggz.sourceforge.net/. + +The current Debian packages are maintained by the pkg-ggz team at +. Upstream sources are +obtained from http://ftp.ggzgamingzone.org/pub/ggz/. + +Copyright: + The GGZ Gaming Zone + Copyright (C) 1999-2006 The GGZ Gaming Zone Development Team + +Contact the upstream authors at + +ggz-grubby is licenced under the GNU General Public Licence. See +/usr/share/common-licenses/GPL for details. --- ggz-grubby-0.0.14.orig/debian/changelog +++ ggz-grubby-0.0.14/debian/changelog @@ -0,0 +1,140 @@ +ggz-grubby (0.0.14-2ubuntu2) intrepid; urgency=low + + * No-change rebuild for perl, against fixed ggz-client-libs. + * Bump Build-Depends against ggzcore-bin. + + -- Steve Kowalik Sat, 27 Sep 2008 22:43:22 +1000 + +ggz-grubby (0.0.14-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Apply a patch from upstream SVN to build against the new libsilc. + - Tell CDBS to apply patches. + * Re-Enable silc support, and don't do what debian package maintainer is + telling us ;) + + -- Stephan Hermann Sat, 19 Jan 2008 18:49:33 +0100 + +ggz-grubby (0.0.14-2) unstable; urgency=low + + * Disabled SILC support, which is currently broken due to an API change + (closes: #432545) + + -- Peter Eisentraut Thu, 19 Jul 2007 21:45:34 +0200 + +ggz-grubby (0.0.14-1ubuntu1) gutsy; urgency=low + + * Rebuild for the libsilc-1.0-2 -> libsilc-1.1-2 transition. + * Tell CDBS to apply patches. + * Apply a patch from upstream SVN to build against the new libsilc. + * Munge Maintainer field as per spec. + + -- Steve Kowalik Fri, 13 Jul 2007 22:56:17 +1000 + +ggz-grubby (0.0.14-1) unstable; urgency=low + + * New upstream version. + + -- Josef Spillner Mon, 14 May 2007 21:02:05 +0200 + +ggz-grubby (0.0.13-4) unstable; urgency=high + + [ Josef Spillner ] + * Fixed dependencies even more (closes: #398394). + + [ Peter Eisentraut ] + * Build depend on python-dev instead of python-all-dev + + -- Peter Eisentraut Sat, 18 Nov 2006 09:12:36 +0100 + +ggz-grubby (0.0.13-3) unstable; urgency=high + + * Fixed build dependencies after dependency reshuffle in ggz-client-libs + (closes: #392145) + + -- Peter Eisentraut Tue, 10 Oct 2006 17:34:42 +0200 + +ggz-grubby (0.0.13-2) unstable; urgency=low + + * Changed maintainer to mailing list + * Updated standards version + * Changed build system to CDBS + * Updated to Debhelper level 5 + * Improved dependency information + * Added watch file + * Improved package description + + -- Peter Eisentraut Mon, 21 Aug 2006 07:53:34 +0200 + +ggz-grubby (0.0.13-1) unstable; urgency=low + + * New upstream version. + * More detailed licence breakdown in debian/copyright files. + + -- Josef Spillner Fri, 17 Mar 2006 21:39:00 +0100 + +ggz-grubby (0.0.12-1) unstable; urgency=low + + * New upstream version. + + -- Josef Spillner Sun, 25 Sep 2005 19:02:38 +0200 + +ggz-grubby (0.0.11+svn20050821-1) unstable; urgency=low + + * New snapshot. + + -- Josef Spillner Sun, 21 Aug 2005 10:44:42 +0200 + +ggz-grubby (0.0.11-1) unstable; urgency=low + + * New upstream version. + * Many changes to the packaging to ease maintenance. + * Updated URLs and other reflections on current upstream goals. + + -- Josef Spillner Sat, 20 Aug 2005 12:11:56 +0200 + +ggz-grubby (0.0.7-1.1) unstable; urgency=low + + * NMU. + * Depend on libggz-dev 0.0.7-1.1 due to its updated gcrypt dependency. + Closes: #264742 + + -- Matthias Urlichs Sun, 26 Sep 2004 14:02:54 +0200 + +ggz-grubby (0.0.7-1) unstable; urgency=low + + * New upstream release + + -- Stephen Zander Sat, 11 Oct 2003 00:00:00 -0700 + +ggz-grubby (0.0.6-2) unstable; urgency=low + + * Fix missing EMNABLE_NLS in grubby/src/i18n.c, + Closes: #189719 + + -- Stephen Zander Sun, 20 Apr 2003 01:26:24 -0700 + +ggz-grubby (0.0.6-1) unstable; urgency=low + + * New upstream release. + * Remove the build-depndency of libc6-dev, + Closes: #164764 + * Remove implicit assumptions about signed nature of char, + Closes: #165051 + + -- Stephen Zander Tue, 5 Nov 2002 22:49:35 -0800 + +ggz-grubby (0.0.5.0-1) unstable; urgency=low + + * Official Debian package. Appended .0 to the version to have this + package be prefered to upstream's unofficial packages, + Closes: + + -- Stephen Zander Sat, 12 Oct 2002 18:47:28 -0700 + +ggz-grubby (0.0.5-1) unstable; urgency=low + + * Initial Release. + + -- Josef Spillner Sat, 19 Jan 2002 18:13:21 +0100 + --- ggz-grubby-0.0.14.orig/debian/compat +++ ggz-grubby-0.0.14/debian/compat @@ -0,0 +1 @@ +5 --- ggz-grubby-0.0.14.orig/debian/watch +++ ggz-grubby-0.0.14/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://ftp.ggzgamingzone.org/pub/ggz/([0-9.]+)/ggz-grubby-([0-9.]+).tar.gz --- ggz-grubby-0.0.14.orig/debian/ggz-grubby.postinst +++ ggz-grubby-0.0.14/debian/ggz-grubby.postinst @@ -0,0 +1,5 @@ +#!/bin/sh -e + +ggz-config --install --force --noregistry=/usr/share/ggz/modules/ggz-grubby + +#DEBHELPER# --- ggz-grubby-0.0.14.orig/debian/ggz-grubby.prerm +++ ggz-grubby-0.0.14/debian/ggz-grubby.prerm @@ -0,0 +1,5 @@ +#!/bin/sh -e + +ggz-config --remove --noregistry=/usr/share/ggz/modules/ggz-grubby + +#DEBHELPER# --- ggz-grubby-0.0.14.orig/debian/svn-deblayout +++ ggz-grubby-0.0.14/debian/svn-deblayout @@ -0,0 +1 @@ +origDir=../upstream --- ggz-grubby-0.0.14.orig/debian/rules +++ ggz-grubby-0.0.14/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk + +DEB_CONFIGURE_EXTRA_FLAGS = --enable-noregistry=/usr/share/ggz/modules/ggz-grubby