Merge lp:~cyphermox/xchat-gnome/update-to-0.26.2+git into lp:~ubuntu-desktop/xchat-gnome/ubuntu

[Mathieu Trudel-Lapierre]

[Didier Roche-Tolomelli (didrocks)]

Hey Mathieu, thanks for your nice work there :)

Some little fixes to take into consideration:

* NOCONFIGURE=1 ./autogen.sh; \
-> you will need automake and such in the builder chroot in that case. I would suggest using dh_autoreconf (and build-dep on dh-autoreconf then) rather.

* debian/control:
-> all changes aren't listed/explained

review: Needs Fixing

[lp:~cyphermox/xchat-gnome/update-to-0.26.2+git]

23. By Mathieu Trudel-Lapierre on 2010-12-13

Further explain changes in debian/control. Thanks Didier Roche for the review
and hints for this.

24. By Mathieu Trudel-Lapierre on 2010-12-13

Revise autogen/autoreconf use to properly handle reconfiguration due to using
a git snaphost (which aren't configured yet) and due to the changes we make
through patches to the build process:

debian/rules: run dh_autoreconf to take into account build process changes
for the various patches (and also because a snapshot from git is not
configured yet).

Thanks didrocks for review and advice.

25. By Mathieu Trudel-Lapierre on 2010-12-13

debian/control: add Build-Depends on dh-autoreconf for added dh_autoreconf.

[Mathieu Trudel-Lapierre (cyphermox)]

> Hey Mathieu, thanks for your nice work there :)
>
> Some little fixes to take into consideration:
>
Hey Didier, thanks for the input.

> * NOCONFIGURE=1 ./autogen.sh; \
> -> you will need automake and such in the builder chroot in that case. I
> would suggest using dh_autoreconf (and build-dep on dh-autoreconf then)
> rather.
Thanks, done.

>
> * debian/control:
> -> all changes aren't listed/explained
I'll assume you meant more "explained", than listed, because I don't see a change I didn't mention. However, I added some more details about the "why" the changes were made.

[lp:~cyphermox/xchat-gnome/update-to-0.26.2+git]

26. By Mathieu Trudel-Lapierre on 2010-12-13

Update control.in as well with Build-Depends changes:
debian/control{,.in}: Drop Build-Depends on libgnome, libgnomeui, since they
are no longer required by configure.

27. By Mathieu Trudel-Lapierre on 2010-12-13

Also update control.in:
debian/control{,.in}: Add Build-Depends on libsm-dev >= 1.0.0, new
dependency introduced in 0.26.2.

28. By Mathieu Trudel-Lapierre on 2010-12-13

Again, also update control.in:
debian/control{,.in}: add Build-Depends on dh-autoreconf for the added call
to dh_autoreconf.

29. By Mathieu Trudel-Lapierre on 2010-12-13

Update control.in (I swear, this will get into my brain soon :)
debian/control{,.in}: change libnotify build-depends to libnotify4-dev
(>= 0.7.0) so that the notify-osd plugin will build properly (the
NOTIFY_CHECK_VERSION macro isn't available otherwise).

[Robert Ancell (robert-ancell)]

Looks good. Note I changed the version from 0.26.2+git to 0.26.1+git as the git version is still marked as 0.26.1.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-26 14:30:43 +0000
+++ debian/changelog	2010-12-13 21:37:17 +0000
@@ -1,3 +1,32 @@
+xchat-gnome (1:0.26.2+git20101206.557c940-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream snapshot from Git: 2010-12-06, rev 557c940.
+  * debian/control{,.in}: Drop Build-Depends on libgnome, libgnomeui, since they
+    are no longer required by configure.
+  * debian/control{,.in}: Add Build-Depends on libsm-dev >= 1.0.0, new
+    dependency introduced in 0.26.2.
+  * debian/patches/10_obey_nick_suffix.patch: dropped, applied upstream.
+  * debian/patches/11_topic_return.patch: dropped, applied upstream.
+  * debian/patches/21_add_gui_info_ptr.patch: dropped, applied upstream. 
+  * debian/patches/50_serverlist_update.patch: dropped, applied upstream. The
+    freenode port changes are split to 51_freenode_default_port_8001.patch.
+  * debian/patches/51_freenode_default_port_8001.patch: avoid connecting to
+    ports in the 6660-6669 range for Freenode to workaround an old DCC exploit.
+  * debian/patches/98_autoconf.patch: dropped. It doesn't apply to building
+    from git.
+  * debian/rules: run dh_autoreconf to take into account build process changes
+    for the various patches (and also because a snapshot from git is not
+    configured yet).
+  * debian/control{,.in}: add Build-Depends on dh-autoreconf for the added call
+    to dh_autoreconf.
+  * debian/control{,.in}: change libnotify build-depends to libnotify4-dev
+    (>= 0.7.0) so that the notify-osd plugin will build properly (the
+    NOTIFY_CHECK_VERSION macro isn't available otherwise).
+  * debian/patches/98_ice_depends_for_eggsmclient.patch: add missing ice
+    dependency for the egg_smclient parts, which will allow linking to succeed.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 13 Dec 2010 14:59:33 -0500
+
 xchat-gnome (1:0.26.1-1ubuntu3) maverick; urgency=low
 
   * Update description (LP: #596022)
 
=== modified file 'debian/control'
--- debian/control	2010-07-26 14:30:43 +0000
+++ debian/control	2010-12-13 21:37:17 +0000
@@ -6,11 +6,12 @@
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xchat-gnome/ubuntu
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5.0.0),
+               dh-autoreconf,
                gnome-pkg-tools,
                autotools-dev,
                cdbs (>= 0.4.41),
                libgtk2.0-dev (>= 2.14.0),
-               libgnomeui-dev (>= 2.16.0),
+               libsm-dev (>= 1.0.0),
                libglade2-dev (>= 2.3.2),
                libgconf2-dev (>= 2.8.0),
                libxft-dev,
@@ -21,13 +22,12 @@
                libdbus-glib-1-dev (>= 0.60),
                libtool,
                libgnutls-dev,
-               libnotify-dev (>= 0.3.2),
+               libnotify4-dev (>= 0.7.0),
                libsexy-dev (>= 0.1.11),
                gnome-doc-utils,
                libssl-dev,
                dpkg-dev (>= 1.13.19),
                libglib2.0-dev (>= 2.18.0),
-               libgnome2-dev (>= 2.16.0),
                liblaunchpad-integration-dev (>= 0.1.17),
 	       libcanberra-gtk-dev (>= 0.3)
 Standards-Version: 3.8.0
 
=== modified file 'debian/control.in'
--- debian/control.in	2010-07-26 14:30:43 +0000
+++ debian/control.in	2010-12-13 21:37:17 +0000
@@ -6,12 +6,13 @@
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xchat-gnome/ubuntu
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 5.0.0),
+               dh-autoreconf,
                gnome-pkg-tools,
                autotools-dev,
                cdbs (>= 0.4.41),
                libcanberra-gtk-dev (>= 0.3),
                libgtk2.0-dev (>= 2.14.0),
-               libgnomeui-dev (>= 2.16.0),
+               libsm-dev (>= 1.0.0),
                libglade2-dev (>= 2.3.2),
                libgconf2-dev (>= 2.8.0),
                libxft-dev,
@@ -22,13 +23,12 @@
                libdbus-glib-1-dev (>= 0.60),
                libtool,
                libgnutls-dev,
-               libnotify-dev (>= 0.3.2),
+               libnotify4-dev (>= 0.7.0),
                libsexy-dev (>= 0.1.11),
                gnome-doc-utils,
                libssl-dev,
                dpkg-dev (>= 1.13.19),
                libglib2.0-dev (>= 2.18.0),
-               libgnome2-dev (>= 2.16.0),
                liblaunchpad-integration-dev (>= 0.1.17)
 Standards-Version: 3.8.1
 
 
=== removed file 'debian/patches/10_obey_nick_suffix.patch'
--- debian/patches/10_obey_nick_suffix.patch	2009-06-15 11:30:47 +0000
+++ debian/patches/10_obey_nick_suffix.patch	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
---- src/fe-gnome/text-entry.c.orig	2009-06-13 11:24:05.451097417 +0200
-+++ src/fe-gnome/text-entry.c	2009-06-13 14:01:09.839088698 +0200
-@@ -563,7 +563,7 @@
- 				g_free (p);
- 				pos = g_utf8_strlen ((char *) options->data, -1) + start;
- 			} else {
--				npt = g_strdup_printf ("%s: ", (char *) options->data);
-+				npt = g_strdup_printf ("%s%c ", (char *) options->data, prefs.nick_suffix[0]);
- 				pos = g_utf8_strlen ((char *) options->data, -1) + 2;
- 			}
- 		} else {
-@@ -577,7 +577,7 @@
- 				g_free (p);
- 				pos = g_utf8_strlen ((char *) options->data, -1) + start;
- 			} else {
--				npt = g_strdup_printf ("%s: %s", (char *) options->data, at_cursor);
-+				npt = g_strdup_printf ("%s%c %s", (char *) options->data, prefs.nick_suffix[0], at_cursor);
- 				pos = g_utf8_strlen ((char *) options->data, -1) + 2;
- 			}
- 		}
 
=== removed file 'debian/patches/11_topic_return.patch'
--- debian/patches/11_topic_return.patch	2009-06-15 11:30:47 +0000
+++ debian/patches/11_topic_return.patch	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
---- src/fe-gnome/topic-label.c.orig	2009-06-13 13:11:20.943589693 +0200
-+++ src/fe-gnome/topic-label.c	2009-06-13 13:13:42.527593315 +0200
-@@ -315,6 +315,7 @@
- topic_entry_activate (GtkTextBuffer *textbuffer, GtkTextIter *arg1, gchar *text, gint len, GtkDialog *dialog)
- {
- 	if (strncmp (text, "\n", len) == 0) {
-+		g_signal_stop_emission_by_name (G_OBJECT (textbuffer), "insert-text");
- 		gtk_dialog_response (dialog, GTK_RESPONSE_OK);
- 	}
- }
 
=== removed file 'debian/patches/21_add_gui_info_ptr.patch'
--- debian/patches/21_add_gui_info_ptr.patch	2010-01-06 03:24:38 +0000
+++ debian/patches/21_add_gui_info_ptr.patch	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-#
-# Description: Implement win_ptr in xchat_get_info 
-# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/503665
-# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=606176
-#
-
-diff --git a/src/fe-gnome/fe-gnome.c b/src/fe-gnome/fe-gnome.c
-index fd32bd9..beadab0 100644
---- a/src/fe-gnome/fe-gnome.c
-+++ b/src/fe-gnome/fe-gnome.c
-@@ -773,8 +773,12 @@ fe_gui_info (session * sess, int info_type)
- void *
- fe_gui_info_ptr (session *sess, int info_type)
- {
--	return NULL;
--	/* FIXME implement? */
-+        switch (info_type)
-+        {
-+        case 0: /* native window pointer (for plugins) */
-+                return GTK_WINDOW (gui.main_window);
-+        }
-+        return NULL;
- }
- 
- void
 
=== removed file 'debian/patches/50_serverlist_update.patch'
--- debian/patches/50_serverlist_update.patch	2009-04-13 10:24:16 +0000
+++ debian/patches/50_serverlist_update.patch	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-Modify default port for irc.freenode.com to 8001 to prevent dcc exploit.
-Fix Oz.net servers list wrongly referring to OzNet (LP: #146434).
-
-diff -Nur xchat-gnome-0.18/src/common/servlist.c xchat-gnome-0.18.new/src/common/servlist.c
---- a/src/common/servlist.c	2007-06-13 02:03:18.000000000 +0200
-+++ b/src/common/servlist.c	2008-02-14 13:00:03.000000000 +0100
-@@ -207,7 +207,7 @@
- 	{0,			"irc.vendetta.com"},
- 
- 	{"FreeNode",	0},
--	{0,				"irc.freenode.net"},
-+	{0,				"irc.freenode.net/8001"},
- 
- /*	{"Freeworld",	0},
- 	{0,			"kabel.freeworld.nu"},
-@@ -337,8 +337,15 @@
- 	{"OtherNet",	0},
- 	{0,			"irc.othernet.org"},
- 
--	{"OzNet",	0},
--	{0,			"irc.oz.org"},
-+	{"Oz.org",	0},
-+ 	{0,			"irc.oz.org"},
-+	{0,			"germany.oz.org"},
-+	{0,			"sandiego.oz.org"},
-+	{0,			"us.oz.org"},
-+	{0,			"au.oz.org"},
-+	{0,			"rockhampton.oz.org"},
-+	{0,			"wollongong.oz.org"},
-+	{0,			"waix.oz.org"},	
- 
- 	{"PTlink",	0},
- 	{0,			"irc.PTlink.net"},
-
 
=== added file 'debian/patches/51_freenode_default_port_8001.patch'
--- debian/patches/51_freenode_default_port_8001.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/51_freenode_default_port_8001.patch	2010-12-13 21:37:17 +0000
@@ -0,0 +1,31 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Drop ports 666x for FreeNode to workaround a possible DCC exploit.
+
+Since ports 800x are available for connections to FreeNode, this avoids
+exposing users an old vulnerability on some routers where a malformed DCC SEND
+command sent to a client would cause them to get disconnected. Such routers
+usually try to check what goes on on common IRC ports (6660-6669), so just
+staying clear from this range is a little safer.
+
+This is an old patch ported so that it still works, but given the
+CVEs are from back in 2006, it's likely it could be dropped without
+problems.
+
+For reference, the CVEs at play were CVE-2006-1067 [1] and
+CVE-2006-1068 [2].
+
+ [1] - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1067
+ [2] - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1068
+
+--- a/src/common/servlist.c	2010-12-09 11:40:03.000000000 -0500
++++ b/src/common/servlist.c	2010-12-09 11:40:25.500695002 -0500
+@@ -207,9 +207,6 @@
+ 	{0,			"irc.vendetta.com"},
+ 
+ 	{"FreeNode",	0},
+-	{0,				"irc.freenode.net/6665"},
+-	{0,				"irc.freenode.net/6666"},
+-	{0,				"irc.freenode.net/6667"},
+ 	{0,				"irc.freenode.net/8000"},
+ 	{0,				"irc.freenode.net/8001"},
+ 	{0,				"irc.freenode.net/8002"},
 
=== removed file 'debian/patches/98_autoconf.patch'
--- debian/patches/98_autoconf.patch	2009-04-13 10:48:16 +0000
+++ debian/patches/98_autoconf.patch	1970-01-01 00:00:00 +0000
@@ -1,83 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' xchat-gnome-0.26.1/configure xchat-gnome-0.26.1.new/configure
---- xchat-gnome-0.26.1/configure	2009-04-12 19:48:10.000000000 +0200
-+++ xchat-gnome-0.26.1.new/configure	2009-04-13 12:32:37.000000000 +0200
-@@ -13818,6 +13818,7 @@
-                   glib-2.0 >= \$GLIB_REQUIRED \\
- 		  gio-2.0 >= \$GLIB_REQUIRED \\
-                   gtk+-2.0 >= \$GTK_REQUIRED \\
-+		  launchpad-integration \\
-                   libglade-2.0 >= \$LIBGLADE_REQUIRED \\
- 		  libgnome-2.0 >= \$LIBGNOME_REQUIRED \\
-                   libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED \\
-@@ -13828,6 +13829,7 @@
-                   glib-2.0 >= $GLIB_REQUIRED \
- 		  gio-2.0 >= $GLIB_REQUIRED \
-                   gtk+-2.0 >= $GTK_REQUIRED \
-+		  launchpad-integration \
-                   libglade-2.0 >= $LIBGLADE_REQUIRED \
- 		  libgnome-2.0 >= $LIBGNOME_REQUIRED \
-                   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
-@@ -13841,6 +13843,7 @@
-                   glib-2.0 >= $GLIB_REQUIRED \
- 		  gio-2.0 >= $GLIB_REQUIRED \
-                   gtk+-2.0 >= $GTK_REQUIRED \
-+		  launchpad-integration \
-                   libglade-2.0 >= $LIBGLADE_REQUIRED \
- 		  libgnome-2.0 >= $LIBGNOME_REQUIRED \
-                   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
-@@ -13863,6 +13866,7 @@
-                   glib-2.0 >= \$GLIB_REQUIRED \\
- 		  gio-2.0 >= \$GLIB_REQUIRED \\
-                   gtk+-2.0 >= \$GTK_REQUIRED \\
-+		  launchpad-integration \\
-                   libglade-2.0 >= \$LIBGLADE_REQUIRED \\
- 		  libgnome-2.0 >= \$LIBGNOME_REQUIRED \\
-                   libgnomeui-2.0 >= \$LIBGNOMEUI_REQUIRED \\
-@@ -13873,6 +13877,7 @@
-                   glib-2.0 >= $GLIB_REQUIRED \
- 		  gio-2.0 >= $GLIB_REQUIRED \
-                   gtk+-2.0 >= $GTK_REQUIRED \
-+		  launchpad-integration \
-                   libglade-2.0 >= $LIBGLADE_REQUIRED \
- 		  libgnome-2.0 >= $LIBGNOME_REQUIRED \
-                   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
-@@ -13886,6 +13891,7 @@
-                   glib-2.0 >= $GLIB_REQUIRED \
- 		  gio-2.0 >= $GLIB_REQUIRED \
-                   gtk+-2.0 >= $GTK_REQUIRED \
-+		  launchpad-integration \
-                   libglade-2.0 >= $LIBGLADE_REQUIRED \
- 		  libgnome-2.0 >= $LIBGNOME_REQUIRED \
-                   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
-@@ -13914,6 +13920,7 @@
-                   glib-2.0 >= $GLIB_REQUIRED \
- 		  gio-2.0 >= $GLIB_REQUIRED \
-                   gtk+-2.0 >= $GTK_REQUIRED \
-+		  launchpad-integration \
-                   libglade-2.0 >= $LIBGLADE_REQUIRED \
- 		  libgnome-2.0 >= $LIBGNOME_REQUIRED \
-                   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
-@@ -13925,6 +13932,7 @@
-                   glib-2.0 >= $GLIB_REQUIRED \
- 		  gio-2.0 >= $GLIB_REQUIRED \
-                   gtk+-2.0 >= $GTK_REQUIRED \
-+		  launchpad-integration \
-                   libglade-2.0 >= $LIBGLADE_REQUIRED \
- 		  libgnome-2.0 >= $LIBGNOME_REQUIRED \
-                   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
-@@ -13939,6 +13947,7 @@
-                   glib-2.0 >= $GLIB_REQUIRED \
- 		  gio-2.0 >= $GLIB_REQUIRED \
-                   gtk+-2.0 >= $GTK_REQUIRED \
-+		  launchpad-integration \
-                   libglade-2.0 >= $LIBGLADE_REQUIRED \
- 		  libgnome-2.0 >= $LIBGNOME_REQUIRED \
-                   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
-@@ -13959,6 +13968,7 @@
-                   glib-2.0 >= $GLIB_REQUIRED \
- 		  gio-2.0 >= $GLIB_REQUIRED \
-                   gtk+-2.0 >= $GTK_REQUIRED \
-+		  launchpad-integration \
-                   libglade-2.0 >= $LIBGLADE_REQUIRED \
- 		  libgnome-2.0 >= $LIBGNOME_REQUIRED \
-                   libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \
 
=== added file 'debian/patches/98_ice_depends_for_eggsmclient.patch'
--- debian/patches/98_ice_depends_for_eggsmclient.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/98_ice_depends_for_eggsmclient.patch	2010-12-13 21:37:17 +0000
@@ -0,0 +1,17 @@
+From: Mathieu Trudel-Lapierre <[e-mail]>
+Subject: Add a compile-time check for libICE, which is required by libsm.
+
+Adding a check for ice in configure (for EGG_SMCLIENT) makes sure
+ICE is added to EGG_SMCLIENT_CFLAGS, but more importantly to
+EGG_SMCLIENT_LIBS, so that linking has -lICE and doesn't bork.
+
+--- configure.ac.orig	2010-12-09 12:53:46.000000000 -0500
++++ configure.ac	2010-12-09 12:54:20.190695001 -0500
+@@ -72,6 +72,7 @@
+ PKG_CHECK_MODULES([EGG_SMCLIENT], [\
+                   gtk+-2.0 >= $GTK_REQUIRED \
+                   sm >= $SM_REQUIRED \
++                  ice \
+                   ])
+ AC_SUBST(EGG_SMCLIENT_CFLAGS)
+ AC_SUBST(EGG_SMCLIENT_LIBS)
 
=== modified file 'debian/rules'
--- debian/rules	2009-06-15 11:30:47 +0000
+++ debian/rules	2010-12-13 21:37:17 +0000
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+include /usr/share/cdbs/1/rules/autoreconf.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk