diff -r 08b1736686fa -r 804f172af162 libupnp/libupnp.patch
--- a/libupnp/libupnp.patch	Tue Aug 28 19:02:05 2012 +0200
+++ b/libupnp/libupnp.patch	Tue Aug 28 19:02:10 2012 +0200
@@ -1,48 +1,48 @@
-Index: upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
-diff -Nau upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c.orig upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
---- upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c.orig	2008-03-22 17:48:13.000000000 +0100
-+++ upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c	2009-01-12 16:05:10.847325711 +0100
-@@ -429,7 +429,11 @@
-      */
-     sigemptyset( &sigs_to_catch );
-     sigaddset( &sigs_to_catch, SIGINT );
+Index: upnp/sample/linux/tv_ctrlpt_main.c
+diff -Nau upnp/sample/linux/tv_ctrlpt_main.c.orig upnp/sample/linux/tv_ctrlpt_main.c
+--- upnp/sample/linux/tv_ctrlpt_main.c.orig	2008-03-22 17:48:13.000000000 +0100
++++ upnp/sample/linux/tv_ctrlpt_main.c	2009-01-12 16:05:10.847325711 +0100
+@@ -60,7 +60,11 @@
+ 	/* Catch Ctrl-C and properly shutdown */
+ 	sigemptyset(&sigs_to_catch);
+ 	sigaddset(&sigs_to_catch, SIGINT);
 +#if (defined(sun) && defined(__svr4__))
-+    sigwait( &sigs_to_catch );
++	sigwait(&sigs_to_catch);
 +#else
-     sigwait( &sigs_to_catch, &sig );
+ 	sigwait(&sigs_to_catch, &sig);
 +#endif
- 
-     SampleUtil_Print( "Shutting down on signal %d...", sig );
- #else
-Index: upnp/sample/tvcombo/linux/upnp_tv_combo_main.c
-diff -Nau upnp/sample/tvcombo/linux/upnp_tv_combo_main.c.orig upnp/sample/tvcombo/linux/upnp_tv_combo_main.c
---- upnp/sample/tvcombo/linux/upnp_tv_combo_main.c.orig	2009-01-12 16:12:00.406762331 +0100
-+++ upnp/sample/tvcombo/linux/upnp_tv_combo_main.c	2009-01-12 16:14:23.401611284 +0100
-@@ -477,7 +477,11 @@
-      */
-     sigemptyset( &sigs_to_catch );
-     sigaddset( &sigs_to_catch, SIGINT );
+ 	SampleUtil_Print("Shutting down on signal %d...\n", sig);
+ #endif
+ 	rc = TvCtrlPointStop();
+Index: upnp/sample/linux/tv_combo_main.c
+diff -Nau upnp/sample/linux/tv_combo_main.c.orig upnp/sample/linux/tv_combo_main.c
+--- upnp/sample/linux/tv_combo_main.c.orig	2009-01-12 16:12:00.406762331 +0100
++++ upnp/sample/linux/tv_combo_main.c	2009-01-12 16:14:23.401611284 +0100
+@@ -61,7 +61,11 @@
+ 	/* Catch Ctrl-C and properly shutdown */
+ 	sigemptyset(&sigs_to_catch);
+ 	sigaddset(&sigs_to_catch, SIGINT);
 +#if (defined(sun) && defined(__svr4__))
-+    sigwait( &sigs_to_catch );
++	sigwait(&sigs_to_catch);
 +#else
-     sigwait( &sigs_to_catch, &sig );
+ 	sigwait(&sigs_to_catch, &sig);
 +#endif
- 
-     SampleUtil_Print( "Shutting down on signal %d...\n", sig );
- #else
-Index: upnp/sample/tvdevice/linux/upnp_tv_device_main.c
-diff -Nau upnp/sample/tvdevice/linux/upnp_tv_device_main.c.orig upnp/sample/tvdevice/linux/upnp_tv_device_main.c
---- upnp/sample/tvdevice/linux/upnp_tv_device_main.c.orig	2008-03-22 18:04:30.000000000 +0100
-+++ upnp/sample/tvdevice/linux/upnp_tv_device_main.c	2009-01-12 16:19:03.504059810 +0100
-@@ -184,7 +184,11 @@
-      */
-     sigemptyset( &sigs_to_catch );
-     sigaddset( &sigs_to_catch, SIGINT );
+ 	SampleUtil_Print("Shutting down on signal %d...\n", sig);
+ #endif
+ 	TvDeviceStop();
+Index: upnp/sample/linux/tv_device_main.c
+diff -Nau upnp/sample/linux/tv_device_main.c.orig upnp/sample/linux/tv_device_main.c
+--- upnp/sample/linux/tv_device_main.c.orig	2008-03-22 18:04:30.000000000 +0100
++++ upnp/sample/linux/tv_device_main.c	2009-01-12 16:19:03.504059810 +0100
+@@ -59,7 +59,11 @@
+ 	/* Catch Ctrl-C and properly shutdown */
+ 	sigemptyset(&sigs_to_catch);
+ 	sigaddset(&sigs_to_catch, SIGINT);
 +#if (defined(sun) && defined(__svr4__))
-+    sigwait( &sigs_to_catch );
++	sigwait(&sigs_to_catch);
 +#else
-     sigwait( &sigs_to_catch, &sig );
+ 	sigwait(&sigs_to_catch, &sig);
 +#endif
- 
-     SampleUtil_Print( "Shutting down on signal %d...\n", sig );
- #else
+ 	SampleUtil_Print("Shutting down on signal %d...\n", sig);
+ #endif
+ 	rc = TvDeviceStop();