oasis

commit: 1ca4fead3ad93f56a30e2c45923e05b2b319f8a4
parent 586af6692a7d7894e384f31ca4536b732e08dbf7
Author: Michael Forney <mforney@mforney.org>
Date:   Fri,  4 Sep 2020 00:34:45 -0700

nasm: Update to 2.15.05

Diffstat:
M
pkg/nasm/.gitignore
2
+-
M
pkg/nasm/patch/0001-Remove-date-from-version-info-to-make-build-reproduc.patch
14
+++++++-------
M
pkg/nasm/sha256
2
+-
M
pkg/nasm/url
2
+-
M
pkg/nasm/ver
2
+-

5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pkg/nasm/.gitignore b/pkg/nasm/.gitignore
@@ -1,2 +1,2 @@
-/nasm-2.15.04.tar.gz
+/nasm-2.15.05.tar.gz
 /src
diff --git a/pkg/nasm/patch/0001-Remove-date-from-version-info-to-make-build-reproduc.patch b/pkg/nasm/patch/0001-Remove-date-from-version-info-to-make-build-reproduc.patch
@@ -1,4 +1,4 @@
-From 62c2b6a0314a2c7123f9925a45b694d7119227f6 Mon Sep 17 00:00:00 2001
+From b6860ea26851edb599bfe0e2d08d212c6a7aaeec Mon Sep 17 00:00:00 2001
 From: Val Lorentz <progval@progval.net>
 Date: Sun, 29 Jan 2017 17:39:54 -0800
 Subject: [PATCH] Remove date from version info to make build reproducible
@@ -12,10 +12,10 @@ Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
  4 files changed, 4 insertions(+), 6 deletions(-)
 
 diff --git a/asm/nasm.c b/asm/nasm.c
-index 7c64569f..9659bf15 100644
+index e5ae89af..70024db5 100644
 --- a/asm/nasm.c
 +++ b/asm/nasm.c
-@@ -973,8 +973,8 @@ static const struct textargs textopts[] = {
+@@ -977,8 +977,8 @@ static const struct textargs textopts[] = {
  
  static void show_version(void)
  {
@@ -42,7 +42,7 @@ index 01e0c557..7424b282 100644
                  case 'u':	/* -u for -b 32, -uu for -b 64 */
  		    if (bits < 64)
 diff --git a/include/ver.h b/include/ver.h
-index ab6e9784..4b26499c 100644
+index a5bbf384..7a6ce42a 100644
 --- a/include/ver.h
 +++ b/include/ver.h
 @@ -41,7 +41,6 @@
@@ -52,9 +52,9 @@ index ab6e9784..4b26499c 100644
 -extern const char nasm_date[];
  extern const char nasm_compile_options[];
  
- extern const char *nasm_comment(void);
+ extern bool reproducible;
 diff --git a/nasmlib/ver.c b/nasmlib/ver.c
-index 9f80f79c..f711f332 100644
+index 96260b6c..8f02eaca 100644
 --- a/nasmlib/ver.c
 +++ b/nasmlib/ver.c
 @@ -36,7 +36,6 @@
@@ -66,5 +66,5 @@ index 9f80f79c..f711f332 100644
  #ifdef DEBUG
      " with -DDEBUG"
 -- 
-2.27.0
+2.28.0
 
diff --git a/pkg/nasm/sha256 b/pkg/nasm/sha256
@@ -1 +1 @@
-8ff3bf164c4f21337d3405a987be7a04f02913bc773453afe66124a9e109a0d5  nasm-2.15.04.tar.gz
+9182a118244b058651c576baa9d0366ee05983c4d4ae1d9ddd3236a9f2304997  nasm-2.15.05.tar.gz
diff --git a/pkg/nasm/url b/pkg/nasm/url
@@ -1 +1 @@
-url = "http://www.nasm.us/pub/nasm/releasebuilds/2.15.04/nasm-2.15.04.tar.gz"
+url = "http://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.gz"
diff --git a/pkg/nasm/ver b/pkg/nasm/ver
@@ -1 +1 @@
-2.15.04 r0
+2.15.05 r0