Browse Source

Dpkg::Build::Info: Whitelist other DPKG_ namespaced variables

Guillem Jover 7 years ago
parent
commit
08ac6a92b4
3 changed files with 14 additions and 3 deletions
  1. 3 0
      debian/changelog
  2. 10 2
      scripts/Dpkg/Build/Info.pm
  3. 1 1
      scripts/t/Dpkg_Build_Info.t

+ 3 - 0
debian/changelog

@@ -1,6 +1,9 @@
 dpkg (1.18.16) UNRELEASED; urgency=medium
 
   [ Guillem Jover ]
+  * Perl modules:
+    - Whitelist DPKG_GENSYMBOLS_CHECK_LEVEL, DPKG_ROOT, DPKG_ADMINDIR and
+      DPKG_DATADIR environment variables in Dpkg::Build::Info.
   * Documentation:
     - State the current working directory used when running dpkg-buildpackage
       hooks.

+ 10 - 2
scripts/Dpkg/Build/Info.pm

@@ -63,8 +63,16 @@ my @env_whitelist = (
     qw(DEB_BUILD_OPTIONS DEB_BUILD_PROFILES),
     # DEB_flag_{SET,STRIP,APPEND,PREPEND} will be recorded after being merged
     # with system config and user config.
-    qw(DEB_VENDOR),           # See deb-vendor(1).
-    qw(DPKG_ORIGINS_DIR),     # See Dpkg::Vendor(3).
+    # See deb-vendor(1).
+    qw(DEB_VENDOR),
+    # See dpkg(1).
+    qw(DPKG_ROOT DPKG_ADMINDIR),
+    # See dpkg-architecture(1).
+    qw(DPKG_DATADIR),
+    # See Dpkg::Vendor(3).
+    qw(DPKG_ORIGINS_DIR),
+    # See dpkg-gensymbols(1).
+    qw(DPKG_GENSYMBOLS_CHECK_LEVEL),
     # See <https://reproducible-builds.org/specs/source-date-epoch>.
     qw(SOURCE_DATE_EPOCH),
 );

+ 1 - 1
scripts/t/Dpkg_Build_Info.t

@@ -22,7 +22,7 @@ BEGIN {
     use_ok('Dpkg::Build::Info');
 }
 
-is(scalar Dpkg::Build::Info::get_build_env_whitelist(), 46,
+is(scalar Dpkg::Build::Info::get_build_env_whitelist(), 50,
    'whitelisted environment variables array');
 
 1;