[Pkg-samba-maint] [samba] 03/10: Refresh patch add-so-version-to-private-libraries

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to annotated tag debian/2%4.1.17+dfsg-1
in repository samba.

commit 32615f1dce067e847d7d869f5cb2785b6e23f8d8
Author: Ivo De Decker <ivodd at debian.org>
Date:   Sun Feb 22 20:07:17 2015 +0100

    Refresh patch add-so-version-to-private-libraries
---
 debian/changelog                                   |  1 +
 debian/patches/add-so-version-to-private-libraries | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d8042e..8442af1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ samba (2:4.1.16+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release. Fixes:
   - CVE-2014-8143: Elevation of privilege to Active Directory Domain
                    Controller
+  * Refresh patch add-so-version-to-private-libraries.
 
  -- Ivo De Decker <ivodd at debian.org>  Sun, 22 Feb 2015 19:53:54 +0100
 
diff --git a/debian/patches/add-so-version-to-private-libraries b/debian/patches/add-so-version-to-private-libraries
index 1e438ce..5cb9cc1 100644
--- a/debian/patches/add-so-version-to-private-libraries
+++ b/debian/patches/add-so-version-to-private-libraries
@@ -7,9 +7,11 @@ We also want dpkg-shlibdeps to generate correct dependency information
 for the private libraries in our binary packages, but dpkg-shlibdeps
 only works when the library has a version number.
 
---- a/buildtools/wafsamba/wafsamba.py
-+++ b/buildtools/wafsamba/wafsamba.py
-@@ -207,6 +207,9 @@
+Index: samba/buildtools/wafsamba/wafsamba.py
+===================================================================
+--- samba.orig/buildtools/wafsamba/wafsamba.py
++++ samba/buildtools/wafsamba/wafsamba.py
+@@ -209,6 +209,9 @@ def SAMBA_LIBRARY(bld, libname, source,
              raise Utils.WafError("public library '%s' must have header files" %
                         libname)
  
@@ -17,5 +19,5 @@ only works when the library has a version number.
 +        vnum = '0'
 +
      if target_type == 'PYTHON' or realname or not private_library:
-         bundled_name = libname.replace('_', '-')
-     else:
+         if keep_underscore:
+             bundled_name = libname

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git