Update changelog for release 1.7.15.

debian/changelog

@@ -1,3 +1,10 @@
+wine-compholio (1.7.15) unstable; urgency=low
+  * Fixed build dependencies for Debian Sid.
+  * Fixed free() of a const variable (Bug #1).
+  * Removed get_dir_unix_fd (no longer used, fixes compiling with "-Werror").
+  * Removed 'register user administrative tools shell folder' patch (accepted upstream).
+ -- Erich E. Hoover <erich.e.hoover@gmail.com>  Sun, 23 Mar 2014 12:53:32 +0100
+
 wine-compholio (1.7.14) unstable; urgency=low
   * Minor updates to the ACL patches.
   * Added Liberation Sans (SIL Open Font License) as an Arial replacement.

debian/control

@@ -96,7 +96,7 @@ Recommends: gettext,
             libgif4,
             libgnutls26,
             libgphoto2-6 | libgphoto2-2 (>= 2.4.6),
-            libgphoto2-port0 (>= 2.4.6),
+            libgphoto2-port10 | libgphoto2-port0 (>= 2.4.6),
             libjpeg8,
             libopenal1 (>= 1:1.12),
             libosmesa6,

patches/02-ACL_Extended_Attributes/0002-server-Unify-the-retrieval-of-security-attributes-fo.patch

@@ -1,20 +1,28 @@
-From bfad7f20bef7f8ef39e6354d0b47c0c349eac967 Mon Sep 17 00:00:00 2001
+From b83ae7cc77483519ed870ead3a167e83acbf1cff Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
 Date: Thu, 13 Feb 2014 15:45:48 -0700
 Subject: server: Unify the retrieval of security attributes for files and
  directories.
 
 ---
- server/change.c |   27 +++++----------------------
+ server/change.c |   32 +++++---------------------------
  server/file.c   |   34 ++++++++++++++++++++++------------
  server/file.h   |    2 ++
- 3 files changed, 29 insertions(+), 34 deletions(-)
+ 3 files changed, 29 insertions(+), 39 deletions(-)
 
 diff --git a/server/change.c b/server/change.c
-index 76fc9f7..0b7b979 100644
+index 76fc9f7..eb16923 100644
 --- a/server/change.c
 +++ b/server/change.c
-@@ -286,31 +286,14 @@ static int get_dir_unix_fd( struct dir *dir )
+@@ -278,39 +278,17 @@ static struct fd *dir_get_fd( struct object *obj )
+     return (struct fd *)grab_object( dir->fd );
+ }
+ 
+-static int get_dir_unix_fd( struct dir *dir )
+-{
+-    return get_unix_fd( dir->fd );
+-}
+-
  static struct security_descriptor *dir_get_sd( struct object *obj )
  {
      struct dir *dir = (struct dir *)obj;

patches/02-ACL_Extended_Attributes/0007-server-Inherit-security-attributes-from-parent-direc.patch

@@ -1,6 +1,6 @@
-From c361e711537ebbe23ef30dafe3eaa00923be804c Mon Sep 17 00:00:00 2001
+From 9c6061a4e74991b1b02a1532d5c109600504d91e Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Tue, 25 Feb 2014 10:40:03 -0700
+Date: Tue, 11 Mar 2014 11:09:00 -0600
 Subject: server: Inherit security attributes from parent directories on
  SetSecurityInfo.
 
@@ -8,12 +8,12 @@ Subject: server: Inherit security attributes from parent directories on
  dlls/advapi32/tests/security.c |   68 ++++++++++++++++++++++
  include/winnt.h                |    7 ++-
  server/fd.c                    |   13 ++++-
- server/file.c                  |  124 +++++++++++++++++++++++++++++++++++++++-
+ server/file.c                  |  125 +++++++++++++++++++++++++++++++++++++++-
  server/file.h                  |    1 +
- 5 files changed, 205 insertions(+), 8 deletions(-)
+ 5 files changed, 206 insertions(+), 8 deletions(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index fb3e17e..d5969c1 100644
+index 68b63a0..c981c1b 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
 @@ -3350,6 +3350,74 @@ static void test_GetNamedSecurityInfoA(void)
@@ -146,7 +146,7 @@ index fa8874c..9e6b9a8 100644
  
      if (orig->inode)
 diff --git a/server/file.c b/server/file.c
-index c115ff7..c57783b 100644
+index c115ff7..cb518f5 100644
 --- a/server/file.c
 +++ b/server/file.c
 @@ -324,6 +324,105 @@ struct security_descriptor *inherit_sd( const struct security_descriptor *parent
@@ -255,7 +255,7 @@ index c115ff7..c57783b 100644
  static struct security_descriptor *file_get_parent_sd( struct fd *root, char *parent_name,
                                                         int is_dir )
  {
-@@ -921,16 +1020,31 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner )
+@@ -921,16 +1020,32 @@ mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner )
      return new_mode & ~denied_mode;
  }
  
@@ -263,7 +263,8 @@ index c115ff7..c57783b 100644
 +int file_set_acls( struct object *obj, struct fd *fd, const struct security_descriptor *new_sd,
                     unsigned int set_info )
  {
-+    const struct security_descriptor *sd = new_sd, *parent_sd = NULL;
++    const struct security_descriptor *sd = new_sd;
++    struct security_descriptor *parent_sd = NULL;
      int unix_fd = get_unix_fd( fd );
      const SID *owner;
      struct stat st;
@@ -288,7 +289,7 @@ index c115ff7..c57783b 100644
      if (set_info & OWNER_SECURITY_INFORMATION)
      {
          owner = sd_get_owner( sd );
-@@ -962,10 +1076,14 @@ int file_set_acls( struct object *obj, struct fd *fd, const struct security_desc
+@@ -962,10 +1077,14 @@ int file_set_acls( struct object *obj, struct fd *fd, const struct security_desc
          if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1)
          {
              file_set_error();