hi
added new irrsi layout to select between irssi with openssl and without
openssl....
greets
Am Mittwoch 21 Januar 2009 17:59:10 schrieb Puchu:
> Hi,
>
> i updated this programs
>
> vnstat
> htop
> irssi - uses some patches from svn
>
> any suggestions?
> if not, please apply.
>
> greets puchu
Index: patches/130-svn-4640.patch
===================================================================
--- patches/130-svn-4640.patch (Revision 0)
+++ patches/130-svn-4640.patch (Revision 0)
@@ -0,0 +1,82 @@
+r4640 | jilles | 2007-11-17 16:35:47 +0000 (Sat, 17 Nov 2007) | 4 lines
+
+Do not allow /ping by itself to ctcp ping a channel.
+This is like the new /ver behaviour.
+Bug #542, patch by Geert with tweaks by exg
+
+Index: trunk/src/fe-common/irc/fe-irc-commands.c
+===================================================================
+--- trunk/src/fe-common/irc/fe-irc-commands.c (revision 4639)
++++ trunk/src/fe-common/irc/fe-irc-commands.c (revision 4640)
+@@ -298,7 +298,7 @@
+ cmd_params_free(free_arg);
+ }
+
+-/* SYNTAX: VER [<target>] */
++/* SYNTAX: VER [<nick> | <channel> | *] */
+ static void cmd_ver(gchar *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
+ {
+ char *str;
+Index: trunk/src/irc/core/irc-commands.c
+===================================================================
+--- trunk/src/irc/core/irc-commands.c (revision 4639)
++++ trunk/src/irc/core/irc-commands.c (revision 4640)
+@@ -504,7 +504,7 @@
+ cmd_params_free(free_arg);
+ }
+
+-/* SYNTAX: PING <nicks> */
++/* SYNTAX: PING [<nick> | <channel> | *] */
+ static void cmd_ping(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item)
+ {
+ GTimeVal tv;
+@@ -512,10 +512,9 @@
+
+ CMD_IRC_SERVER(server);
+
+- if (*data == '\0' || strcmp(data, "*") == 0) {
+- if (!IS_IRC_ITEM(item))
+- cmd_return_error(CMDERR_NOT_JOINED);
+-
++ if (*data == '\0') {
++ if (!IS_QUERY(item))
++ cmd_return_error(CMDERR_NOT_ENOUGH_PARAMS);
+ data = window_item_get_target(item);
+ }
+
+Index: trunk/docs/help/in/ping.in
+===================================================================
+--- trunk/docs/help/in/ping.in (revision 4639)
++++ trunk/docs/help/in/ping.in (revision 4640)
+@@ -1,10 +1,10 @@
+
+ @SYNTAX:ping@
+
+-Sends CTCP PING to another IRC client. This is used
+-to find out the speed of IRC network. When the PING
+-reply comes in, irssi shows the interval time between
+-sending the request and receiving the reply.
++Sends CTCP PING to another IRC client or to an IRC channel.
++This is used to find out the speed of IRC network. When
++the PING reply comes in, irssi shows the interval time
++between sending the request and receiving the reply.
+
+ See also: CTCP
+
+Index: trunk/docs/help/in/ver.in
+===================================================================
+--- trunk/docs/help/in/ver.in (revision 4639)
++++ trunk/docs/help/in/ver.in (revision 4640)
+@@ -1,9 +1,9 @@
+
+ @SYNTAX:ver@
+
+-Sends a CTCP VERSION request to the nick. This is used
+-to find out which client and/or script the nick
+-is using.
++Sends a CTCP VERSION request to a nick or channel.
++This is used to find out which client and/or
++script the nick is using.
+
+ See also: CTCP
+
Index: patches/110-svn-4627.patch
===================================================================
--- patches/110-svn-4627.patch (Revision 0)
+++ patches/110-svn-4627.patch (Revision 0)
@@ -0,0 +1,18 @@
+r4627 | exg | 2007-10-22 13:27:56 +0000 (Mon, 22 Oct 2007) | 3 lines
+
+Handle server == NULL case in skip_target, fix regression with irssi-icb.
+Patch by Stuart Henderson, bug #539.
+
+Index: trunk/src/fe-common/irc/fe-irc-messages.c
+===================================================================
+--- trunk/src/fe-common/irc/fe-irc-messages.c (revision 4626)
++++ trunk/src/fe-common/irc/fe-irc-messages.c (revision 4627)
+@@ -44,7 +44,7 @@
+ const char *val, *chars;
+
+ /* Quick check */
+- if (server->prefix[(int)(unsigned char)*target] == 0)
++ if (server == NULL || server->prefix[(int)(unsigned char)*target] == 0)
+ return target;
+
+ /* Hack: for bahamut 1.4 which sends neither STATUSMSG nor
Index: patches/120-svn-4637.patch
===================================================================
--- patches/120-svn-4637.patch (Revision 0)
+++ patches/120-svn-4637.patch (Revision 0)
@@ -0,0 +1,22 @@
+r4637 | jilles | 2007-11-03 00:24:55 +0000 (Sat, 03 Nov 2007) | 3 lines
+
+Fix mode display in whois with unreal (379 numeric).
+Bug #479
+
+Index: trunk/src/fe-common/irc/fe-whois.c
+===================================================================
+--- trunk/src/fe-common/irc/fe-whois.c (revision 4636)
++++ trunk/src/fe-common/irc/fe-whois.c (revision 4637)
+@@ -113,8 +113,10 @@
+
+ g_return_if_fail(data != NULL);
+
+- params = event_get_params(data, 6, NULL, &nick,
+- NULL, NULL, NULL, &modes);
++ params = event_get_params(data, 3 | PARAM_FLAG_GETREST,
++ NULL, &nick, &modes);
++ if (!strncmp(modes, "is using modes ", 15))
++ modes += 15;
+ printformat(server, nick, MSGLEVEL_CRAP,
+ IRCTXT_WHOIS_MODES, nick, modes);
+ g_free(params);
Index: patches/200-term-curses.patch
===================================================================
--- patches/200-term-curses.patch (Revision 0)
+++ patches/200-term-curses.patch (Revision 0)
@@ -0,0 +1,20 @@
+diff -burN irssi-0.8.12/src/fe-text/term-curses.h irssi-0.8.12.patch/src/fe-text/term-curses.h
+--- irssi-0.8.12/src/fe-text/term-curses.h 1970-01-01 01:00:00.000000000 +0100
++++ irssi-0.8.12.patch/src/fe-text/term-curses.h 2009-01-21 17:46:07.394255098 +0100
+@@ -0,0 +1,16 @@
++#if defined(USE_NCURSES) && !defined(RENAMED_NCURSES)
++# include <ncurses.h>
++#else
++# include <curses.h>
++#endif
++
++#ifdef HAVE_CUIX
++#include <form.h>
++#include <panel.h>
++#endif
++
++struct _TERM_WINDOW {
++ int x, y;
++ int width, height;
++ WINDOW *win;
++};
Index: patches/140-svn-4829.patch
===================================================================
--- patches/140-svn-4829.patch (Revision 0)
+++ patches/140-svn-4829.patch (Revision 0)
@@ -0,0 +1,19 @@
+r4829 | exg | 2008-05-17 11:42:23 +0200 (Sa, 17 Mai 2008) | 4 lines
+
+Pass NULL to settings_set_str to reset recode_fallback to its default
+value rather than hardcoding the string, fixes also a possible invalid
+g_free reported by Sven Wegener.
+
+Index: irssi/src/fe-common/core/fe-recode.c
+===================================================================
+--- irssi/src/fe-common/core/fe-recode.c (revision 4828)
++++ irssi/src/fe-common/core/fe-recode.c (revision 4829)
+@@ -160,7 +160,7 @@
+ if (!is_valid_charset(recode_fallback)) {
+ signal_emit("error command", 2, GINT_TO_POINTER(CMDERR_INVALID_CHARSET), recode_fallback);
+ g_free(recode_fallback);
+- recode_fallback = is_valid_charset(old_recode_fallback) ? g_strdup(old_recode_fallback) : "ISO8859-1";
++ recode_fallback = is_valid_charset(old_recode_fallback) ? g_strdup(old_recode_fallback) : NULL;
+ settings_set_str("recode_fallback", recode_fallback);
+ }
+
Index: patches/100-cross_compiling_fix.patch
===================================================================
--- patches/100-cross_compiling_fix.patch (Revision 14134)
+++ patches/100-cross_compiling_fix.patch (Arbeitskopie)
@@ -1,54 +0,0 @@
-diff -ruN irssi-0.8.10.orig/configure irssi-0.8.10/configure
---- irssi-0.8.10.orig/configure 2005-12-11 23:46:06.000000000 +0100
-+++ irssi-0.8.10/configure 2006-02-24 13:19:21.570891250 +0100
-@@ -21848,13 +21848,6 @@
-
- echo "$as_me:$LINENO: checking size of off_t" >&5
- echo $ECHO_N "checking size of off_t... $ECHO_C" >&6
--if test "$cross_compiling" = yes; then
-- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -21872,35 +21865,8 @@
- }
-
- _ACEOF
--rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
--
-- sizeof_off_t=`cat conftestval`
-- rm -f conftestval
--
--else
-- echo "$as_me: program exited with status $ac_status" >&5
--echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--
-- { { echo "$as_me:$LINENO: error: Unsupported off_t size" >&5
--echo "$as_me: error: Unsupported off_t size" >&2;}
-- { (exit 1); exit 1; }; }
--
--fi
-+ sizeof_off_t=8
- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
- echo "$as_me:$LINENO: result: $sizeof_off_t" >&5
- echo "${ECHO_T}$sizeof_off_t" >&6
-
Index: patches/100-svn-4612.patch
===================================================================
--- patches/100-svn-4612.patch (Revision 0)
+++ patches/100-svn-4612.patch (Revision 0)
@@ -0,0 +1,30 @@
+r4612 | Geert | 2007-10-11 16:02:27 +0000 (Thu, 11 Oct 2007) | 2 lines
+
+Fix broken URI.
+
+Index: trunk/src/fe-text/irssi.c
+===================================================================
+--- trunk/src/fe-text/irssi.c (revision 4611)
++++ trunk/src/fe-text/irssi.c (revision 4612)
+@@ -86,7 +86,7 @@
+ "Looks like this is the first time you've run irssi.\n"
+ "This is just a reminder that you really should go read\n"
+ "startup-HOWTO if you haven't already. You can find it\n"
+- "and more irssi beginner info at http://irssi.org/help/\n";
++ "and more irssi beginner info at http://www.irssi.org\n";
+ "\n"
+ "For the truly impatient people who don't like any automatic\n"
+ "window creation or closing, just type: /MANUAL-WINDOWS";
+Index: trunk/irssi.conf
+===================================================================
+--- trunk/irssi.conf (revision 4611)
++++ trunk/irssi.conf (revision 4612)
+@@ -124,7 +124,7 @@
+ prompt = "{prompt $[.15]itemname}";
+ prompt_empty = "{prompt $winname}";
+ topic = " $topic";
+- topic_empty = " Irssi v$J - http://irssi.org/help/";;
++ topic_empty = " Irssi v$J - http://www.irssi.org";;
+
+ # all of these treated specially, they're only displayed when needed
+ lag = "{sb Lag: $0-}";
Index: Makefile
===================================================================
--- Makefile (Revision 14134)
+++ Makefile (Arbeitskopie)
@@ -9,45 +9,98 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=irssi
-PKG_VERSION:=0.8.10
+PKG_VERSION:=0.8.12
PKG_RELEASE:=1
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)a.tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://irssi.org/files/
-PKG_MD5SUM:=38e616bccb6a34ff6d91690317c2fa19
+PKG_MD5SUM:=e407b557b3cfc7c91ce4de2571dd79cb
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
-define Package/irssi
+define Package/irssi/Default
SUBMENU:=Instant Messaging
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+glib1 +libncurses
+ DEPENDS:=+glib2 +libncurses
TITLE:=console irc client
URL:=http://irssi.org/
endef
-define Build/Configure
+define Package/irssi/Default/description
+ Irssi is a terminal based IRC client for UNIX systems.
+endef
+
+define Package/irssi
+$(call Package/irssi/Default)
+ TITLE+= (without OpenSSL support)
+endef
+
+define Package/irssi/description
+$(call Package/irssi/Default/description)
+ This package is built without OpenSSL support.
+endef
+
+define Package/irssi-openssl
+$(call Package/irssi/Default)
+ TITLE+= (with OpenSSL support)
+endef
+
+define Package/irssi-openssl/description
+$(call Package/irssi/Default/description)
+ This package is built with OpenSSL support.
+endef
+
+define Build/Template
+
+$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
+ -$(MAKE) -C $(PKG_BUILD_DIR) clean
$(call Build/Configure/Default, \
--with-perl=no \
- --with-glib1 \
--with-glib-prefix="$(STAGING_DIR)/usr" \
--with-textui \
--without-terminfo \
--without-bot \
--without-file-offset-size \
- --without-ssl \
- --disable-ssl \
--disable-ipv6 \
--disable-proxy \
- )
-endef
+ $(3))
+ $(MAKE) -C $(PKG_BUILD_DIR)
+ ( cd $(PKG_BUILD_DIR); mv -f src/fe-text/irssi $(PKG_NAME)-$(2) )
+ touch $$@
-define Package/irssi/install
- $(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/fe-text/irssi $(1)/usr/bin/
+$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
+
+define Package/$(1)/install
+ $(INSTALL_DIR) $$(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME)-$(2) $$(1)/usr/bin/$(PKG_NAME)
endef
+endef
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib/libiconv/include -I$(STAGING_DIR)/usr/lib/libintl/include
+EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib/libiconv/lib -L$(STAGING_DIR)/usr/lib/libintl/lib
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_irssi),)
+ define Build/without-ssl
+ $(call Build/Template,irssi,without-ssl, \
+ --without-ssl \
+ --disable-ssl \
+ )
+ endef
+endif
+$(eval $(Build/without-ssl))
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_irssi-openssl),)
+ define Build/with-openssl
+ $(call Build/Template,irssi-openssl,with-openssl, \
+ --with-ssl="$(STAGING_DIR)/usr" \
+ )
+ endef
+endif
+$(eval $(Build/with-openssl))
+
$(eval $(call BuildPackage,irssi))
+$(eval $(call BuildPackage,irssi-openssl))
+
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
