From a84f9f8fb00c112d92c22e3529def5c3952eaece Mon Sep 17 00:00:00 2001 From: Chin-San Huang Date: Mon, 24 Dec 2007 05:31:20 +0000 Subject: - Update to 3.0.5. Submitted by: Ashish Shukla via mail --- irc/ctrlproxy/files/patch-Makefile | 13 ++++++------- irc/ctrlproxy/files/patch-lib__client.c | 15 +++++++++++++++ irc/ctrlproxy/files/patch-lib__network.c | 15 +++++++++++++++ irc/ctrlproxy/files/patch-lib__network.h | 14 ++++++++++++++ irc/ctrlproxy/files/patch-src__network.h | 14 -------------- 5 files changed, 50 insertions(+), 21 deletions(-) create mode 100644 irc/ctrlproxy/files/patch-lib__client.c create mode 100644 irc/ctrlproxy/files/patch-lib__network.c create mode 100644 irc/ctrlproxy/files/patch-lib__network.h delete mode 100644 irc/ctrlproxy/files/patch-src__network.h (limited to 'irc/ctrlproxy/files') diff --git a/irc/ctrlproxy/files/patch-Makefile b/irc/ctrlproxy/files/patch-Makefile index 99db5f2aadb5..ea05159aad67 100644 --- a/irc/ctrlproxy/files/patch-Makefile +++ b/irc/ctrlproxy/files/patch-Makefile @@ -1,25 +1,24 @@ --- Makefile.orig Sun Apr 15 14:17:58 2007 +++ Makefile Sat Jun 16 12:00:33 2007 -@@ -90,7 +90,7 @@ +@@ -108,7 +108,7 @@ ctrlproxy.pc Makefile.settings: configure Makefile.settings.in ctrlproxy.pc.in ./$< --install: all install-dirs install-bin install-header install-mods install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS) -+install: all install-dirs install-bin install-mods install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS) +-install: all install-dirs install-bin install-header install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS) ++install: all install-dirs install-bin install-data install-pkgconfig $(EXTRA_INSTALL_TARGETS) install-dirs: $(INSTALL) -d $(DESTDIR)$(modulesdir) -@@ -113,8 +113,6 @@ +@@ -133,7 +133,6 @@ install-doc:: doc $(INSTALL) -d $(DESTDIR)$(docdir) -- $(INSTALL) -m 0644 UPGRADING $(DESTDIR)$(docdir) - $(MAKE) -C doc install PACKAGE_VERSION=$(PACKAGE_VERSION) uninstall-doc: $(MAKE) -C doc uninstall -@@ -146,8 +144,8 @@ - -rmdir $(DESTDIR)$(modulesdir) +@@ -156,8 +154,8 @@ + $(INSTALL) -m 0644 config.admin $(DESTDIR)$(DEFAULT_CONFIG_DIR)/networks/admin install-pkgconfig: - $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig diff --git a/irc/ctrlproxy/files/patch-lib__client.c b/irc/ctrlproxy/files/patch-lib__client.c new file mode 100644 index 000000000000..282091e2a2d3 --- /dev/null +++ b/irc/ctrlproxy/files/patch-lib__client.c @@ -0,0 +1,15 @@ +--- lib/client.c.orig 2007-12-07 20:46:47.000000000 +0530 ++++ lib/client.c 2007-12-23 22:08:20.000000000 +0530 +@@ -277,8 +277,10 @@ + + c->incoming = NULL; + +- g_iconv_close(c->outgoing_iconv); +- g_iconv_close(c->incoming_iconv); ++ if (c->outgoing_iconv != (GIConv)-1) ++ g_iconv_close(c->outgoing_iconv); ++ if (c->incoming_iconv != (GIConv)-1) ++ g_iconv_close(c->incoming_iconv); + + if (c->exit_on_close) + exit(0); diff --git a/irc/ctrlproxy/files/patch-lib__network.c b/irc/ctrlproxy/files/patch-lib__network.c new file mode 100644 index 000000000000..5126cc91c4b5 --- /dev/null +++ b/irc/ctrlproxy/files/patch-lib__network.c @@ -0,0 +1,15 @@ +--- lib/network.c.orig 2007-12-07 20:46:47.000000000 +0530 ++++ lib/network.c 2007-12-23 22:45:38.000000000 +0530 +@@ -1261,8 +1261,10 @@ + ssl_free_client_credentials(s->ssl_credentials); + #endif + +- g_iconv_close(s->connection.incoming_iconv); +- g_iconv_close(s->connection.outgoing_iconv); ++ if (s->connection.incoming_iconv != (GIConv)-1) ++ g_iconv_close(s->connection.incoming_iconv); ++ if (s->connection.outgoing_iconv != (GIConv)-1) ++ g_iconv_close(s->connection.outgoing_iconv); + + g_free(s); + } diff --git a/irc/ctrlproxy/files/patch-lib__network.h b/irc/ctrlproxy/files/patch-lib__network.h new file mode 100644 index 000000000000..4f5a82083a6a --- /dev/null +++ b/irc/ctrlproxy/files/patch-lib__network.h @@ -0,0 +1,14 @@ +--- lib/network.h.orig Sun Apr 15 14:17:58 2007 ++++ lib/network.h Sat Jun 16 11:46:55 2007 +@@ -30,8 +30,11 @@ + #endif + + #include "state.h" ++#include + #include "isupport.h" + #include ++#include ++#include + + #define DEFAULT_NETWORK_CHARSET NULL + diff --git a/irc/ctrlproxy/files/patch-src__network.h b/irc/ctrlproxy/files/patch-src__network.h deleted file mode 100644 index 626d560ec2e0..000000000000 --- a/irc/ctrlproxy/files/patch-src__network.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/network.h.orig Sun Apr 15 14:17:58 2007 -+++ src/network.h Sat Jun 16 11:46:55 2007 -@@ -30,8 +30,11 @@ - #endif - - #include "state.h" -+#include - #include "isupport.h" - #include -+#include -+#include - - #define DEFAULT_NETWORK_CHARSET NULL - -- cgit v1.2.3