[Pkg-amule-commits] [SCM] Git repository for pkg-amule branch, master, updated. debian/2.3.1-4-11-gad726a0

[Sandro Tosi]

The following commit has been merged in the master branch:
commit 117b5c6f78241f9f453b7036064c8c1c5c49a30f
Author: Sandro Tosi <morph at debian.org>
Date:   Thu May 3 21:30:39 2012 +0200

    Handle libupnp3->libupnp6 transition; thanks to Adam D. Barratt for the report and Nick Leverton for the patch; Closes: #670962

diff --git a/debian/patches/libupnp-fix-publisherurl.patch b/debian/patches/libupnp-fix-publisherurl.patch
new file mode 100644
index 0000000..f7c9a2d
--- /dev/null
+++ b/debian/patches/libupnp-fix-publisherurl.patch
@@ -0,0 +1,43 @@
+Description: Handle libupnp3->libupnp6 transition
+Author: Nick Leverton <nick at leverton.org>
+Forwarded: yes
+Bug: http://forum.amule.org/index.php?topic=19738
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=670962
+Index: amule/src/UPnPBase.cpp
+===================================================================
+--- amule.orig/src/UPnPBase.cpp	2011-04-12 00:27:41.647976495 +0200
++++ amule/src/UPnPBase.cpp	2012-05-03 19:44:43.141922709 +0200
+@@ -1299,7 +1299,7 @@
+ 		} else {
+ #if 0
+ 			TvCtrlPointHandleSubscribeUpdate(
+-				es_event->PublisherUrl,
++				UpnpString_get_String(es_event->PublisherUrl),
+ 				es_event->Sid,
+ 				es_event->TimeOut );
+ #endif
+@@ -1324,7 +1324,7 @@
+ 		int TimeOut = 1801;
+ 		int ret = UpnpSubscribe(
+ 			upnpCP->m_UPnPClientHandle,
+-			es_event->PublisherUrl,
++			UpnpString_get_String(es_event->PublisherUrl),
+ 			&TimeOut,
+ 			newSID);
+ 		if (ret != UPNP_E_SUCCESS) {
+@@ -1333,13 +1333,13 @@
+ 				msg.str(), es_event->ErrCode, NULL, NULL);
+ 		} else {
+ 			ServiceMap::iterator it =
+-				upnpCP->m_ServiceMap.find(es_event->PublisherUrl);
++				upnpCP->m_ServiceMap.find(UpnpString_get_String(es_event->PublisherUrl));
+ 			if (it != upnpCP->m_ServiceMap.end()) {
+ 				CUPnPService &service = *(it->second);
+ 				service.SetTimeout(TimeOut);
+ 				service.SetSID(newSID);
+ 				msg2 << "Re-subscribed to EventURL '" <<
+-					es_event->PublisherUrl <<
++					UpnpString_get_String(es_event->PublisherUrl) <<
+ 					"' with SID == '" <<
+ 					newSID << "'.";
+ 				AddDebugLogLineC(logUPnP, msg2);
diff --git a/debian/patches/series b/debian/patches/series
index af85bb3..4b1296d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ use_xdg-open_as_preview_default.diff
 fallocate.diff
 version_check.diff
 libs-use-dpkg-buildflags.diff
+libupnp-fix-publisherurl.patch

-- 
Git repository for pkg-amule