Package: warzone2100
Version: 2.3.8-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d/patches/0002_miniupnpc8-compat.patch: Port usage of miniupnpc API
to version 1.6.
miniupnpc was recently upgraded to version 1.6 in Debian experimental and
Ubuntu precise; this patch provides a minimal port to the new version of
the API which supports ipv6 and UPNP lease times.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-3-generic (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJO36BXAAoJEL/srsug59jDkloP/jcJmpU5dfjJ7ykVqs4T8JSD
KTHj0GCF24LzItAwPadFH4BMbzDR3nr0UspxGZU+P+Bi1He/9u/vnqM5hYEdNYx8
qhYfOFhpnce1BdjDwNRueovRdIt1Yc0PeZBoSiRKNIToC8cJinP5rBJGZyOLInpQ
nqwJQmU4TuICs5lAJI2teZlZhyogo9hjuyCLqCcmmq0l6lPkePW3+v0VQ4dwWJTC
g5nw0zrrvjtQtbQYBsUZxi51nbvKaH3jXtmO8PeM6KrFvIWx23Z+tukZlTTnct4d
Oyi83s/jFfmiFn0RRr3S/TfOyRTvs9AU6Kd3nSKHVfyzSgK38Qeb6AMNRgyBMJlj
y3LQmSAhCFHkJiX0jFnLJ7FHTMGLjillesrrGkOK6Kd8/r39bmK+iOd2hlkjL84F
7bq/VREAx2BjqBhWH5cQcdIJ+HEFwIDH4mFCbuTo1eL78y3hhnHS+VdJ8TvlBdrD
Uxr2hYBr3sgPi6bVE+J4PKNMDDggo849GQ7RcTq4GIWci5sm3JxOkENrmZm1fvUL
oU7A2n2svVRXGYhIg2QMU2aVUgc8Z5UndYmfbsRIxuo4VrmKOxwmi6Bv+9Q/yS0g
3H6izo1rLOmYGuqURMpDuaNheo1xPnARrgX2zQnKh6lw3Z0/P+CG7ZDkv+oo4jpI
zvM2KFXwRThC8ip0BAUa
=Dqrg
-----END PGP SIGNATURE-----
diff -Nru warzone2100-2.3.8/debian/patches/0002_miniupnpc8-compat.patch warzone2100-2.3.8/debian/patches/0002_miniupnpc8-compat.patch
--- warzone2100-2.3.8/debian/patches/0002_miniupnpc8-compat.patch 1970-01-01 01:00:00.000000000 +0100
+++ warzone2100-2.3.8/debian/patches/0002_miniupnpc8-compat.patch 2011-12-07 16:28:19.000000000 +0000
@@ -0,0 +1,26 @@
+Description: Compatibility patch for miniupnpc 1.6
+Author: James Page <james.p...@ubuntu.com>
+Forwarded: no
+
+Index: warzone2100-2.3.8/lib/netplay/netplay.c
+===================================================================
+--- warzone2100-2.3.8.orig/lib/netplay/netplay.c 2011-12-07 12:40:35.000000000 +0000
++++ warzone2100-2.3.8/lib/netplay/netplay.c 2011-12-07 16:21:41.281012660 +0000
+@@ -2067,7 +2067,7 @@
+ if (NetPlay.isUPNP)
+ {
+ debug(LOG_NET, "Searching for UPnP devices for automatic port forwarding...");
+- devlist = upnpDiscover(2000, NULL, NULL, 0);
++ devlist = upnpDiscover(2000, NULL, NULL, 0, 0, NULL);
+ debug(LOG_NET, "UPnP device search finished.");
+ if (devlist)
+ {
+@@ -2129,7 +2129,7 @@
+ UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
+ sprintf(port_str, "%d", port);
+ r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype,
+- port_str, port_str, lanaddr, "Warzone 2100", "TCP", 0);
++ port_str, port_str, lanaddr, "Warzone 2100", "TCP", 0, 0);
+ if (r != UPNPCOMMAND_SUCCESS)
+ {
+ debug(LOG_NET, "AddPortMapping(%s, %s, %s) failed\n", port_str, port_str, lanaddr);
diff -Nru warzone2100-2.3.8/debian/patches/series warzone2100-2.3.8/debian/patches/series
--- warzone2100-2.3.8/debian/patches/series 2011-03-11 09:21:36.000000000 +0000
+++ warzone2100-2.3.8/debian/patches/series 2011-12-07 16:16:59.000000000 +0000
@@ -1 +1,2 @@
0001-Switch-to-using-external-miniupnpc.patch
+0002_miniupnpc8-compat.patch
