Rebase against 07cc9a34a87cd08c87ae198e4aeb8c9bb7f55175.

debian/changelog

@@ -1,3 +1,7 @@
+wine-staging (1.7.52) UNRELEASED; urgency=low
+  * Removed patch to fix possible memory leak in netprofm init_networks.
+ -- Sebastian Lackner <sebastian@fds-team.de>  Mon, 07 Sep 2015 16:51:25 +0200
+
 wine-staging (1.7.51) unstable; urgency=low
   * Update patchset for CSMT (commandstream multithreading), to keep in sync
     with upstream repository.

patches/netprofm-Coverity/0001-netprofm-Fix-possible-memory-leak-in-init_networks-C.patch

@@ -1,25 +0,0 @@
-From f92787d0eccc628d95a99f0e0db958f9af563c23 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Sun, 6 Sep 2015 12:53:26 +0200
-Subject: netprofm: Fix possible memory leak in init_networks (Coverity).
-
----
- dlls/netprofm/list.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c
-index 197ef68..c30522d 100644
---- a/dlls/netprofm/list.c
-+++ b/dlls/netprofm/list.c
-@@ -1681,7 +1681,7 @@ static void init_networks( struct list_manager *mgr )
-     if (ret != ERROR_BUFFER_OVERFLOW) return;
- 
-     if (!(buf = heap_alloc( size ))) return;
--    if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) return;
-+    if (GetAdaptersAddresses( WS_AF_UNSPEC, flags, NULL, buf, &size )) goto done;
- 
-     memset( &id, 0, sizeof(id) );
-     for (aa = buf; aa; aa = aa->Next)
--- 
-2.5.1
-

patches/patchinstall.sh

@@ -52,13 +52,13 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "253a587e471a653e1b5ed590280452f43679aa6d"
+	echo "07cc9a34a87cd08c87ae198e4aeb8c9bb7f55175"
 }
 
 # Show version information
 version()
 {
-	echo "Wine Staging 1.7.51"
+	echo "Wine Staging 1.7.52 (unreleased)"
 	echo "Copyright (C) 2014-2015 the Wine Staging project authors."
 	echo ""
 	echo "Patchset to be applied on upstream Wine:"
@@ -175,7 +175,6 @@ patch_enable_all ()
 	enable_msvcrt_Math_Precision="$1"
 	enable_msvcrt_StdHandle_RefCount="$1"
 	enable_msvfw32_Image_Size="$1"
-	enable_netprofm_Coverity="$1"
 	enable_ntdll_APC_Performance="$1"
 	enable_ntdll_APC_Start_Process="$1"
 	enable_ntdll_Activation_Context="$1"
@@ -622,9 +621,6 @@ patch_enable ()
 		msvfw32-Image_Size)
 			enable_msvfw32_Image_Size="$2"
 			;;
-		netprofm-Coverity)
-			enable_netprofm_Coverity="$2"
-			;;
 		ntdll-APC_Performance)
 			enable_ntdll_APC_Performance="$2"
 			;;
@@ -3785,18 +3781,6 @@ if test "$enable_msvfw32_Image_Size" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset netprofm-Coverity
-# |
-# | Modified files:
-# |   *	dlls/netprofm/list.c
-# |
-if test "$enable_netprofm_Coverity" -eq 1; then
-	patch_apply netprofm-Coverity/0001-netprofm-Fix-possible-memory-leak-in-init_networks-C.patch
-	(
-		echo '+    { "Sebastian Lackner", "netprofm: Fix possible memory leak in init_networks (Coverity).", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset ntdll-APC_Performance
 # |
 # | Modified files: