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

Bug#812786: fixed in dose3 4.1-4



Control: reopen -1
Control: found -1 4.1-4


On Sun, 07 Feb 2016 18:20:25 +0000 Ralf Treinen <treinen@debian.org> wrote:
> Source: dose3
> Source-Version: 4.1-4
...

>  libdose3-ocaml-dev - OCaml libraries for package dependencies (development files)
> Closes: 810303 811569 812203 812786
> Changes:
>  dose3 (4.1-4) unstable; urgency=medium
>  .
>    * patch lexing-debian-fields: syntax of debian fields according to
>      debian policy. Patch taken from upstream. (closes: #811569)
>    * patch add-gnuhardened1-linux: compile on hardenend1-linux-amd64. Thanks
>      to Balint Reczey for the patch! (closes: #812786)
I'm sorry but I realized that I attached a wrong patch, not the one I
use. Please see the one fixing my mistake attached.

Thanks,
Balint
>From 520a8ee7767ffb0abc6e0c8b41e49e4530655fc8 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@balintreczey.hu>
Date: Mon, 8 Feb 2016 14:36:47 +0100
Subject: [PATCH] Fix adding hardened1-linux-<cpu>

---
 debian/patches/add-gnuhardened1-linux | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/patches/add-gnuhardened1-linux b/debian/patches/add-gnuhardened1-linux
index c7007f4..9eeca8b 100644
--- a/debian/patches/add-gnuhardened1-linux
+++ b/debian/patches/add-gnuhardened1-linux
@@ -1,17 +1,15 @@
 Author: Balint Reczey <balint@balintreczey.hu>
 Description: add support for hardened1-linux-amd64
 Debian-bug: 812786
-Upstream-commit: 9f3933227cc52a995c2d08595d99cb7ee1501c07
+Upstream-commit: 9f3933227cc52a995c2d08595d99cb7ee1501c07 + fix
 
-diff --git a/deb/architecture.ml b/deb/architecture.ml
-index 1fd7d0f..b7c1c27 100644
 --- a/deb/architecture.ml
 +++ b/deb/architecture.ml
-@@ -52,6 +52,7 @@ let triplettable = ref [
+@@ -52,6 +52,7 @@
    (("gnuabi64","linux","mips64"),    "mips64");             (* line 15 *)
    (("gnuspe","linux","powerpc"),     "powerpcspe");
    (("gnux32","linux","amd64"),       "x32");
-+  (("gnuhardened1","linux","<cpu>"), "<cpu>");
++  (("gnuhardened1","linux","<cpu>"), "hardened1-linux-<cpu>");
    (("gnu","linux","<cpu>"),          "<cpu>");
    (("gnu","kfreebsd","<cpu>"),       "kfreebsd-<cpu>");
    (("gnu","knetbsd","<cpu>"),        "knetbsd-<cpu>");      (* line 20 *)
-- 
2.1.4


Reply to: