[dpkg] 09/187: build: Fix typo in SE Linux library detection code

Reiner Herrmann reiner at reiner-h.de
Sun Nov 6 12:46:18 UTC 2016


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

deki-guest pushed a commit to branch master
in repository dpkg.

commit ab756a6fda75316b9498d4275be5f8b8cf801557
Author: Guillem Jover <guillem at debian.org>
Date:   Mon Aug 29 00:33:44 2016 +0200

    build: Fix typo in SE Linux library detection code
    
    Although this only affected the static mode.
    
    Regression introduced in commit 067295e958dcc9af87d2adfd0c697e9f87ef7b73.
---
 debian/changelog | 2 ++
 m4/dpkg-libs.m4  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1ab8b88..6fd90bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     - Fix M4sh/Autoconf coding style. Add a new section to coding-style.txt
       describing M4sh/Autoconf.
     - Disable C++ exceptions for dselect.
+    - Fix typo in SE Linux library detection code, only affecting static
+      mode (not used in Debian). Regression introduced in dpkg 1.18.8.
 
   [ Updated manpages translations ]
   * German (Helge Kreutzmann).
diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4
index 08a1906..19c6899 100644
--- a/m4/dpkg-libs.m4
+++ b/m4/dpkg-libs.m4
@@ -95,7 +95,7 @@ AC_DEFUN([DPKG_LIB_SELINUX], [
       AC_DEFINE([WITH_LIBSELINUX], [1],
         [Define to 1 to compile in SELinux support])
       PKG_CHECK_EXISTS([libselinux], [
-        AS_IF([test "x$with_selinux" = "xstatic"], [
+        AS_IF([test "x$with_libselinux" = "xstatic"], [
           dpkg_selinux_libs="-Wl,-Bstatic "$($PKG_CONFIG --static --libs libselinux)" -Wl,-Bdynamic"
         ], [
           dpkg_selinux_libs=$($PKG_CONFIG --libs libselinux)

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



More information about the Reproducible-commits mailing list