Bug#837394: Better fix for the angband PIE FTBFS

2016-11-28 Thread Markus Koschany 
Control: tags -1 pending

On Thu, 10 Nov 2016 09:26:26 + Chris Carr  wrote:
> Thank you. The plan is to update to new upstream 4.x but this should still
> work.

Hi,

I've just uploaded an NMU versioned as 1:3.5.1-2.2 and applied Adrian's
patch. Otherwise the package would have been removed from testing
tomorrow. I'm attaching the debdiff. If you still plan to update to the
latest release, then I suggest to do it rather sooner than later because
the freeze is approaching quickly.

Regards,

Markus
diff -Nru angband-3.5.1/debian/changelog angband-3.5.1/debian/changelog
--- angband-3.5.1/debian/changelog  2016-01-05 15:16:39.0 +0100
+++ angband-3.5.1/debian/changelog  2016-11-28 18:38:29.0 +0100
@@ -1,3 +1,11 @@
+angband (1:3.5.1-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply pie.patch and fix FTBFS due to extra hardening.
+Thanks to Adrian Bunk for the patch. (Closes: #837394)
+
+ -- Markus Koschany   Mon, 28 Nov 2016 18:38:29 +0100
+
 angband (1:3.5.1-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru angband-3.5.1/debian/patches/pie.patch 
angband-3.5.1/debian/patches/pie.patch
--- angband-3.5.1/debian/patches/pie.patch  1970-01-01 01:00:00.0 
+0100
+++ angband-3.5.1/debian/patches/pie.patch  2016-11-28 18:38:29.0 
+0100
@@ -0,0 +1,20 @@
+Description: Fix the build with PIE as default
+ Use -r instead of -Wl,-r so that gcc no longer always
+ passes -r to ld.
+ .
+ -r and -pie cannot be used together in the linker,
+ and position independent is already relocatable.
+Author: Adrian Bunk 
+Bug-Debian: https://bugs.debian.org/837394
+
+--- angband-3.5.1.orig/src/Makefile
 angband-3.5.1/src/Makefile
+@@ -32,7 +32,7 @@ win/angband.res: win/angband.rc
+   $(RC) $< -O coff -o $@
+ 
+ angband.o: $(OBJECTS)
+-  $(LD) -nostdlib -Wl,-r -o $@ $(OBJECTS)
++  $(LD) -nostdlib -r -o $@ $(OBJECTS)
+   @printf "%10s %-20s\n" LINK $@
+ 
+ tests: angband.o
diff -Nru angband-3.5.1/debian/patches/series 
angband-3.5.1/debian/patches/series
--- angband-3.5.1/debian/patches/series 2016-01-05 15:16:39.0 +0100
+++ angband-3.5.1/debian/patches/series 2016-11-28 18:38:29.0 +0100
@@ -4,3 +4,4 @@
 desktop-keywords.patch
 manpage.patch
 correct-paths.patch
+pie.patch


signature.asc
Description: OpenPGP digital signature

Processed: Re: Bug#837394: Better fix for the angband PIE FTBFS

2016-11-28 Thread Debian Bug Tracking System 
Processing control commands:

> tags -1 pending
Bug #837394 [src:angband] angband: FTBFS with bindnow and PIE enabled
Added tag(s) pending.

-- 
837394: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837394
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

Bug#837394: Better fix for the angband PIE FTBFS

2016-11-10 Thread Chris Carr 
Thank you. The plan is to update to new upstream 4.x but this should still
work.

On 10 Nov 2016 9:09 a.m., "Adrian Bunk"  wrote:

> A fix for the angband PIE FTBFS that does not disable PIE is attached.
>
> cu
> Adrian
>
> --
>
>"Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
>"Only a promise," Lao Er said.
>Pearl S. Buck - Dragon Seed
>
>

Bug#837394: Better fix for the angband PIE FTBFS

2016-11-10 Thread Adrian Bunk 
A fix for the angband PIE FTBFS that does not disable PIE is attached.

cu
Adrian

-- 

   "Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
   "Only a promise," Lao Er said.
   Pearl S. Buck - Dragon Seed

Description: Fix the build with PIE as default
 Use -r instead of -Wl,-r so that gcc no longer always
 passes -r to ld.
 .
 -r and -pie cannot be used together in the linker,
 and position independent is already relocatable.
Author: Adrian Bunk 
Bug-Debian: https://bugs.debian.org/837394

--- angband-3.5.1.orig/src/Makefile
+++ angband-3.5.1/src/Makefile
@@ -32,7 +32,7 @@ win/angband.res: win/angband.rc
 	$(RC) $< -O coff -o $@
 
 angband.o: $(OBJECTS)
-	$(LD) -nostdlib -Wl,-r -o $@ $(OBJECTS)
+	$(LD) -nostdlib -r -o $@ $(OBJECTS)
 	@printf "%10s %-20s\n" LINK $@
 
 tests: angband.o