Просмотр исходного кода

Dpkg::Vendor::Debian: Do not mask PIE on m68k

The reason for this feature being masked on m68k was unspecified
breakage in openssh (see #451192), which does not appear to be present
any more. As such there's no apparent reason to mask it any longer.

Requested-by: Thorsten Glaser <tg@mirbsd.de>
Guillem Jover лет назад: 14
Родитель
Сommit
8020732bb5
2 измененных файлов с 4 добавлено и 2 удалено
  1. 2 0
      debian/changelog
  2. 2 2
      scripts/Dpkg/Vendor/Debian.pm

+ 2 - 0
debian/changelog

@@ -15,6 +15,8 @@ dpkg (1.16.4) UNRELEASED; urgency=low
     Suggested by Sven Joachim <svenjoac@gmx.de>. Closes: #391818
   * Add “gcc | c-compiler” to libdpkg-perl Suggests, due to Dpkg::Arch usage.
     Closes: #671198
+  * Do not mask PIE from dpkg-buildflags on m68k, it appears to work now.
+    Requested by Thorsten Glaser <tg@mirbsd.de>.
 
   [ Updated man page translations ]
   * German (Helge Kreutzmann).

+ 2 - 2
scripts/Dpkg/Vendor/Debian.pm

@@ -121,9 +121,9 @@ sub add_hardening_flags {
 
     # Mask features that are not available on certain architectures.
     if ($os !~ /^(linux|knetbsd|hurd)$/ or
-	$cpu =~ /^(hppa|m68k|mips|mipsel|avr32)$/) {
+	$cpu =~ /^(hppa|mips|mipsel|avr32)$/) {
 	# Disabled on non-linux/knetbsd/hurd (see #430455 and #586215).
-	# Disabled on hppa, m68k (#451192), mips/mipsel (#532821), avr32
+	# Disabled on hppa, mips/mipsel (#532821), avr32
 	#  (#574716).
 	$use_feature{"pie"} = 0;
     }