Package: xchat
Version: 2.6.4-2
Severity: normal
Tags: patch
Hi,
Attached is the diff for my xchat 2.6.4-2.1 NMU which I'll upload to
DELAYED-4.
--
Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D
Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u xchat-2.6.4/debian/changelog xchat-2.6.4/debian/changelog
--- xchat-2.6.4/debian/changelog
+++ xchat-2.6.4/debian/changelog
@@ -1,3 +1,12 @@
+xchat (2.6.4-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Make binNMUable (Closes: #387063, #387705).
+ * Remove bashisms from debian/rules (Closes: #331267, #376375).
+ * Pick random server out of rotations in all cases (Closes: #385374).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Sat, 16 Sep 2006 13:33:46 +0200
+
xchat (2.6.4-2) unstable; urgency=low
* The "End of a nightmare" release.
diff -u xchat-2.6.4/debian/control xchat-2.6.4/debian/control
--- xchat-2.6.4/debian/control
+++ xchat-2.6.4/debian/control
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Davide Puricelli (evo) <[EMAIL PROTECTED]>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>> 4), bison, libssl-dev, libglib2.0-dev,
libgtk2.0-dev (>= 2.0.6-1), libperl-dev, gettext (>= 0.10.37-1), libtool,
zlib1g-dev, perl (>= 5.8), python2.4-dev, tcl8.4-dev, autotools-dev, dpatch,
libdbus-glib-1-dev, libgtkspell-dev, gconf2
+Build-Depends: debhelper (>> 4), bison, libssl-dev, libglib2.0-dev,
libgtk2.0-dev (>= 2.0.6-1), libperl-dev, gettext (>= 0.10.37-1), libtool,
zlib1g-dev, perl (>= 5.8), python2.4-dev, tcl8.4-dev, autotools-dev, dpatch,
libdbus-glib-1-dev, libgtkspell-dev, gconf2, dpkg-dev (>= 1.13.19)
Package: xchat
Architecture: any
Provides: irc
Replaces: xchat-gnome (<< 1:0.11-1), xchat-common (<< 1.6.0-1)
-Depends: ${shlibs:Depends}, xchat-common (= ${Source-Version})
+Depends: ${shlibs:Depends}, xchat-common (= ${source:Version})
Suggests: libnet-google-perl
Conflicts: xchat-gnome (<< 1:0.11-1)
Description: IRC client for X similar to AmIRC
diff -u xchat-2.6.4/debian/rules xchat-2.6.4/debian/rules
--- xchat-2.6.4/debian/rules
+++ xchat-2.6.4/debian/rules
@@ -15,7 +15,8 @@
configure: patch-stamp configure-stamp
configure-stamp:
- cp -f /usr/share/misc/config.{sub,guess} .
+ cp -f /usr/share/misc/config.sub .
+ cp -f /usr/share/misc/config.guess .
CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --sysconfdir=/etc
--enable-python --enable-ipv6 \
--enable-japanese-conv --disable-mmx --enable-openssl --enable-zvt
--enable-tcl=/usr/lib/tcl8.4 \
--enable-dbus --enable-spell --disable-rpath
@@ -33,7 +34,9 @@
dh_testdir
dh_testroot
[ ! -f Makefile ] || $(MAKE) distclean
- rm -f config.{sub,guess,log}
+ rm -f config.sub
+ rm -f config.guess
+ rm -f config.log
rm -f xchat xchat-gnome
rm -f po/*.gmo
rm -f build-stamp install-stamp configure-stamp po/stamp-po
only in patch2:
unchanged:
--- xchat-2.6.4.orig/configure.in
+++ xchat-2.6.4/configure.in
@@ -708,12 +708,6 @@
AC_DEFINE(socklen_t, int)
fi
-dnl Mac OS X and Darwin use lookupd, which caches DNS queries by default
-AC_EGREP_CPP(lookupd, dnl
-[#if (defined(__APPLE__) && defined(__MACH__))
- lookupd
-#endif], AC_DEFINE([LOOKUPD],1,[Define to 1 if the system uses lookupd]))
-
dnl freebsd needs this
LIBS="$LIBS $INTLLIBS"
CFLAGS="$CFLAGS $CPPFLAGS"
only in patch2:
unchanged:
--- xchat-2.6.4.orig/src/common/network.c
+++ xchat-2.6.4/src/common/network.c
@@ -104,16 +104,13 @@
return NULL;
memset (&ns->addr, 0, sizeof (ns->addr));
-#ifdef LOOKUPD
+
int count = 0;
while (ns->ip4_hostent->h_addr_list[count]) count++;
memcpy (&ns->addr.sin_addr,
ns->ip4_hostent->h_addr_list[RAND_INT(count)],
ns->ip4_hostent->h_length);
-#else
- memcpy (&ns->addr.sin_addr, ns->ip4_hostent->h_addr,
- ns->ip4_hostent->h_length);
-#endif
+
ns->addr.sin_port = htons (port);
ns->addr.sin_family = AF_INET;
@@ -211,7 +208,6 @@
if (ret != 0)
return NULL;
-#ifdef LOOKUPD /* See note about lookupd above the IPv4 version of
net_resolve. */
struct addrinfo *tmp;
int count = 0;
@@ -221,7 +217,6 @@
count = RAND_INT(count);
while (count--) ns->ip6_hostent = ns->ip6_hostent->ai_next;
-#endif
/* find the numeric IP number */
ipstring[0] = 0;
only in patch2:
unchanged:
--- xchat-2.6.4.orig/src/common/server.c
+++ xchat-2.6.4/src/common/server.c
@@ -1672,9 +1672,7 @@
(LPTHREAD_START_ROUTINE)server_child,
serv, 0, (DWORD *)&pid));
#else
-#ifdef LOOKUPD
- rand(); /* CL: net_resolve calls rand() when LOOKUPD is set, so prepare
a different seed for each child. This method giver a bigger variation in seed
values than calling srand(time(0)) in the child itself. */
-#endif
+ rand(); /* CL: net_resolve calls rand(), so prepare a different seed
for each child. This method giver a bigger variation in seed values than
calling srand(time(0)) in the child itself. */
switch (pid = fork ())
{
case -1:
