[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: rules.d/debhelper.mk: only install pt_chown when built.



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

aurel32 pushed a commit to branch jessie
in repository glibc.

commit b50b318bc5d563273a764e633357404fb4eb1b75
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Thu Feb 18 23:35:25 2016 +0100

    rules.d/debhelper.mk: only install pt_chown when built.
---
 debian/changelog            | 1 +
 debian/rules.d/debhelper.mk | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f5a4559..8b6054e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ glibc (2.19-18+deb8u4) UNRELEASED; urgency=medium
       - Fixes bug18240 failing with a timeout on machines with a lot of swap.
   * patches/any/cvs-grantpt-pty-owner.diff: new patch from upstream to
     improve granpt when /dev/pts is not mounted with the correct options.
+  * rules.d/debhelper.mk: only install pt_chown when built.
   * sysdeps/linux.mk: don't build pt_chown (CVE-2013-2207). Closes: #717544.
 
  -- Aurelien Jarno <aurel32@debian.org>  Tue, 16 Feb 2016 23:02:13 +0100
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index 5a41212..f4e8277 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -170,6 +170,7 @@ $(stamp)debhelper-common:
 	  case $$y in \
 	    *.install) \
 	      sed -e "s/^#.*//" -i $$y ; \
+	      $(if $(filter $(pt_chown),no),sed -e "/pt_chown/d" -i $$y ;) \
 	      ;; \
 	  esac; \
 	done

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


Reply to: