Bug#877436: botan1.10: diff for NMU version 1.10.17-0.1

[Ondřej Surý]

No, please go ahead an upload directly.

Thanks for the NMU.

Ondrej

On 9 October 2017 at 11:33,  wrote:

> Control: tags 877436 + pending
>
> Dear Ondřej,
>
> I've prepared an NMU for botan1.10 (versioned as 1.10.17-0.1) and
> will upload it to DELAYED/4. Please feel free to tell me if I
> should delay it longer.
>
> Cheers,
> Chris
>
>
> diff -Nru botan1.10-1.10.16/botan_version.py botan1.10-1.10.17/botan_
> version.py
> --- botan1.10-1.10.16/botan_version.py  2017-04-05 01:07:02.0
> +
> +++ botan1.10-1.10.17/botan_version.py  2017-10-02 06:00:00.0
> +
> @@ -1,11 +1,11 @@
>
>  release_major = 1
>  release_minor = 10
> -release_patch = 16
> +release_patch = 17
>
>  release_so_abi_rev = 1
>
>  # These are set by the distribution script
> -release_vc_rev = 'git:3756c97d295d06ac19cec6736e05003afb10623e'
> -release_datestamp = 20170404
> -release_type = 'released'
> +release_vc_rev = 'git:f7fe6beb5b3b6f944aa7bac491a3455e48ef6ebb'
> +release_datestamp = 20171002
> +release_type = 'release'
> diff -Nru botan1.10-1.10.16/configure.py botan1.10-1.10.17/configure.py
> --- botan1.10-1.10.16/configure.py  2017-04-05 01:06:45.0 +
> +++ botan1.10-1.10.17/configure.py  2017-10-02 06:00:00.0 +
> @@ -59,9 +59,6 @@
>  logging.debug('Monotone reported revision %s' % (rev))
>
>  return 'mtn:' + rev
> -except OSError as e:
> -logging.debug('Error getting rev from monotone - %s' % (e[1]))
> -return 'unknown'
>  except Exception as e:
>  logging.debug('Error getting rev from monotone - %s' % (e))
>  return 'unknown'
> diff -Nru botan1.10-1.10.16/debian/changelog botan1.10-1.10.17/debian/
> changelog
> --- botan1.10-1.10.16/debian/changelog  2017-05-29 11:45:02.0
> +
> +++ botan1.10-1.10.17/debian/changelog  2017-10-09 09:19:15.0
> +
> @@ -1,3 +1,13 @@
> +botan1.10 (1.10.17-0.1) unstable; urgency=medium
> +
> +  * Non-maintainer upload.
> +  * New upstream release 1.10.17 (Closes: #877436)
> ++ [CVE-2017-14737]: Side channel affecting modular exponentiation
> ++ Upstream has imported Debian architecture support patches, removed
> +  them.
> +
> + -- Christian Hofstaedtler   Mon, 09 Oct 2017 09:19:15
> +
> +
>  botan1.10 (1.10.16-1) unstable; urgency=high
>
>* Update d/watch to match new upstream download directory
> diff -Nru 
> botan1.10-1.10.16/debian/patches/0001-add-mips64-mipsn32-support.patch
> botan1.10-1.10.17/debian/patches/0001-add-mips64-mipsn32-support.patch
> --- botan1.10-1.10.16/debian/patches/0001-add-mips64-mipsn32-support.patch
> 2017-05-29 11:45:02.0 +
> +++ botan1.10-1.10.17/debian/patches/0001-add-mips64-mipsn32-support.patch
> 1970-01-01 00:00:00.0 +
> @@ -1,64 +0,0 @@
> -From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= 
> -Date: Tue, 29 Nov 2016 15:10:20 +0100
> -Subject: add-mips64-mipsn32-support
> -
> 
> - src/build-data/arch/mipsn32.txt | 22 ++
> - src/build-data/cc/clang.txt |  2 ++
> - src/build-data/cc/gcc.txt   |  1 +
> - 3 files changed, 25 insertions(+)
> - create mode 100644 src/build-data/arch/mipsn32.txt
> -
> -diff --git a/src/build-data/arch/mipsn32.txt
> b/src/build-data/arch/mipsn32.txt
> -new file mode 100644
> -index 000..96ced25
>  /dev/null
> -+++ b/src/build-data/arch/mipsn32.txt
> -@@ -0,0 +1,22 @@
> -+
> -+mipsn32el # For Debian
> -+
> -+
> -+
> -+r4000
> -+r4100
> -+r4300
> -+r4400
> -+r4600
> -+r4560
> -+r5000
> -+r8000
> -+r1
> -+
> -+
> -+
> -+r4k -> r4000
> -+r5k -> r5000
> -+r8k -> r8000
> -+r10k -> r1
> -+
> -diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
> -index cbcfd89..23237e3 100644
>  a/src/build-data/cc/clang.txt
> -+++ b/src/build-data/cc/clang.txt
> -@@ -39,6 +39,8 @@ westmere  -> "-march=corei7 -maes"
> -
> - 
> - x86_64  -> "-m64"
> -+mips32  -> "-mabi=32"
> -+mipsn32  -> "-mabi=n32"
> - mips64  -> "-mabi=64"
> - s390-> "-m31"
> - s390x   -> "-m64"
> -diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
> -index 1fc6831..938c065 100644
>  a/src/build-data/cc/gcc.txt
> -+++ b/src/build-data/cc/gcc.txt
> -@@ -80,6 +80,7 @@ hppa  -> "-march=SUBMODEL" hppa
> - ia64  -> "-mtune=SUBMODEL"
> - m68k  -> "-mSUBMODEL"
> - mips32-> "-mips1 -mcpu=SUBMODEL" mips32-
> -+mipsn32-> "-mips3 -mcpu=SUBMODEL" mips64-
> - mips64-> "-mips3 -mcpu=SUBMODEL" mips64-
> - ppc32 -> "-mcpu=SUBMODEL" ppc
> - ppc64 -> "-mcpu=SUBMODEL" ppc
> diff -Nru botan1.10-1.10.16/debian/patches/0002-add-powerpc64le-support.patch
> botan1.10-1.10.17/debian/patches/0002-add-powerpc64le-support.patch
> --- botan1.10-1.10.16/debian/patches/0002-add-powerpc64le-support.patch
> 2017-05-29 11:45:02.0 +
> +++ botan1.10-1.10.17/debian/patches/0002-add-powerpc64le-support.patch
> 1970-01-01 00:00:00.0 +
> @@ -1,109 +0,0 @@
> -From: 

Bug#877436: botan1.10: diff for NMU version 1.10.17-0.1

[zeha]

Control: tags 877436 + pending

Dear Ondřej,

I've prepared an NMU for botan1.10 (versioned as 1.10.17-0.1) and
will upload it to DELAYED/4. Please feel free to tell me if I
should delay it longer.

Cheers,
Chris


diff -Nru botan1.10-1.10.16/botan_version.py botan1.10-1.10.17/botan_version.py
--- botan1.10-1.10.16/botan_version.py  2017-04-05 01:07:02.0 +
+++ botan1.10-1.10.17/botan_version.py  2017-10-02 06:00:00.0 +
@@ -1,11 +1,11 @@
 
 release_major = 1
 release_minor = 10
-release_patch = 16
+release_patch = 17
 
 release_so_abi_rev = 1
 
 # These are set by the distribution script
-release_vc_rev = 'git:3756c97d295d06ac19cec6736e05003afb10623e'
-release_datestamp = 20170404
-release_type = 'released'
+release_vc_rev = 'git:f7fe6beb5b3b6f944aa7bac491a3455e48ef6ebb'
+release_datestamp = 20171002
+release_type = 'release'
diff -Nru botan1.10-1.10.16/configure.py botan1.10-1.10.17/configure.py
--- botan1.10-1.10.16/configure.py  2017-04-05 01:06:45.0 +
+++ botan1.10-1.10.17/configure.py  2017-10-02 06:00:00.0 +
@@ -59,9 +59,6 @@
 logging.debug('Monotone reported revision %s' % (rev))
 
 return 'mtn:' + rev
-except OSError as e:
-logging.debug('Error getting rev from monotone - %s' % (e[1]))
-return 'unknown'
 except Exception as e:
 logging.debug('Error getting rev from monotone - %s' % (e))
 return 'unknown'
diff -Nru botan1.10-1.10.16/debian/changelog botan1.10-1.10.17/debian/changelog
--- botan1.10-1.10.16/debian/changelog  2017-05-29 11:45:02.0 +
+++ botan1.10-1.10.17/debian/changelog  2017-10-09 09:19:15.0 +
@@ -1,3 +1,13 @@
+botan1.10 (1.10.17-0.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New upstream release 1.10.17 (Closes: #877436)
++ [CVE-2017-14737]: Side channel affecting modular exponentiation
++ Upstream has imported Debian architecture support patches, removed
+  them.
+
+ -- Christian Hofstaedtler   Mon, 09 Oct 2017 09:19:15 +
+
 botan1.10 (1.10.16-1) unstable; urgency=high
 
   * Update d/watch to match new upstream download directory
diff -Nru 
botan1.10-1.10.16/debian/patches/0001-add-mips64-mipsn32-support.patch 
botan1.10-1.10.17/debian/patches/0001-add-mips64-mipsn32-support.patch
--- botan1.10-1.10.16/debian/patches/0001-add-mips64-mipsn32-support.patch  
2017-05-29 11:45:02.0 +
+++ botan1.10-1.10.17/debian/patches/0001-add-mips64-mipsn32-support.patch  
1970-01-01 00:00:00.0 +
@@ -1,64 +0,0 @@
-From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= 
-Date: Tue, 29 Nov 2016 15:10:20 +0100
-Subject: add-mips64-mipsn32-support
-

- src/build-data/arch/mipsn32.txt | 22 ++
- src/build-data/cc/clang.txt |  2 ++
- src/build-data/cc/gcc.txt   |  1 +
- 3 files changed, 25 insertions(+)
- create mode 100644 src/build-data/arch/mipsn32.txt
-
-diff --git a/src/build-data/arch/mipsn32.txt b/src/build-data/arch/mipsn32.txt
-new file mode 100644
-index 000..96ced25
 /dev/null
-+++ b/src/build-data/arch/mipsn32.txt
-@@ -0,0 +1,22 @@
-+
-+mipsn32el # For Debian
-+
-+
-+
-+r4000
-+r4100
-+r4300
-+r4400
-+r4600
-+r4560
-+r5000
-+r8000
-+r1
-+
-+
-+
-+r4k -> r4000
-+r5k -> r5000
-+r8k -> r8000
-+r10k -> r1
-+
-diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
-index cbcfd89..23237e3 100644
 a/src/build-data/cc/clang.txt
-+++ b/src/build-data/cc/clang.txt
-@@ -39,6 +39,8 @@ westmere  -> "-march=corei7 -maes"
- 
- 
- x86_64  -> "-m64"
-+mips32  -> "-mabi=32"
-+mipsn32  -> "-mabi=n32"
- mips64  -> "-mabi=64"
- s390-> "-m31"
- s390x   -> "-m64"
-diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
-index 1fc6831..938c065 100644
 a/src/build-data/cc/gcc.txt
-+++ b/src/build-data/cc/gcc.txt
-@@ -80,6 +80,7 @@ hppa  -> "-march=SUBMODEL" hppa
- ia64  -> "-mtune=SUBMODEL"
- m68k  -> "-mSUBMODEL"
- mips32-> "-mips1 -mcpu=SUBMODEL" mips32-
-+mipsn32-> "-mips3 -mcpu=SUBMODEL" mips64-
- mips64-> "-mips3 -mcpu=SUBMODEL" mips64-
- ppc32 -> "-mcpu=SUBMODEL" ppc
- ppc64 -> "-mcpu=SUBMODEL" ppc
diff -Nru botan1.10-1.10.16/debian/patches/0002-add-powerpc64le-support.patch 
botan1.10-1.10.17/debian/patches/0002-add-powerpc64le-support.patch
--- botan1.10-1.10.16/debian/patches/0002-add-powerpc64le-support.patch 
2017-05-29 11:45:02.0 +
+++ botan1.10-1.10.17/debian/patches/0002-add-powerpc64le-support.patch 
1970-01-01 00:00:00.0 +
@@ -1,109 +0,0 @@
-From: =?utf-8?q?Ond=C5=99ej_Sur=C3=BD?= 
-Date: Tue, 29 Nov 2016 15:10:20 +0100
-Subject: add-powerpc64le-support
-

- src/build-data/arch/ppc64.txt   |  5 -
- src/build-data/arch/ppc64le.txt | 21 +
- src/build-data/cc/gcc.txt   |  1 +
- src/math/mp/mp_asm64/info.txt   |  1 +
- src/utils/cpuid.cpp |  6 ++
- 5 files changed, 33