Index: head/devel/nasm/files/patch-output_outelf32.c =================================================================== --- head/devel/nasm/files/patch-output_outelf32.c (revision 448263) +++ head/devel/nasm/files/patch-output_outelf32.c (nonexistent) @@ -1,11 +0,0 @@ ---- output/outelf32.c.orig -+++ output/outelf32.c -@@ -1702,7 +1702,7 @@ - * the source-file, the n_desc field should be set to the number - * of remaining stabs - */ -- WRITE_STAB(sptr, fileidx[0], 0, 0, 0, strlen(allfiles[0] + 12)); -+ WRITE_STAB(sptr, fileidx[0], 0, 0, 0, stabstrlen); - - /* this is the stab for the main source file */ - WRITE_STAB(sptr, fileidx[mainfileindex], N_SO, 0, 0, 0); Property changes on: head/devel/nasm/files/patch-output_outelf32.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/nasm/files/patch-elf64-alignment =================================================================== --- head/devel/nasm/files/patch-elf64-alignment (revision 448263) +++ head/devel/nasm/files/patch-elf64-alignment (nonexistent) @@ -1,54 +0,0 @@ -From 1f0cb0f2c1ba632c0fab02424928cfb756a9160c Mon Sep 17 00:00:00 2001 -From: Ed Maste -Date: Thu, 16 Apr 2015 00:59:52 +0300 -Subject: [PATCH] output: elf64 -- increase .symtab and .rel* alignment to 8 - -Discovered while working on ELF Tool Chain elfcopy (strip), -which originally crashed on an assert while processing -a nasm-generated ELF object. - -The .symtab and .rela.text sections report 4 byte alignment, -but require 8. - -As an aside, see https://sourceforge.net/p/elftoolchain/tickets/485/ for a -discussion of the ELF Tool Chain issue that this bug exposed. - -With my WIP elfcopy change and nasm-assembled jccolss2-64.o from libjpeg-turbo: - -% strip -o /dev/null --strip-debug jccolss2-64.o -strip: section .symtab alignment 4 increased to 8 -strip: section .rela.text alignment 4 increased to 8 - -http://bugzilla.nasm.us/show_bug.cgi?id=3392307 - -Signed-off-by: Ed Maste -Signed-off-by: Cyrill Gorcunov ---- - output/outelf64.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git output/outelf64.c output/outelf64.c -index 241e345..19bd845 100644 ---- output/outelf64.c -+++ output/outelf64.c -@@ -1084,7 +1084,7 @@ static void elf_write(void) - - /* .symtab */ - elf_section_header(p - shstrtab, SHT_SYMTAB, 0, symtab, true, -- symtablen, sec_strtab, symtablocal, 4, 24); -+ symtablen, sec_strtab, symtablocal, 8, 24); - p += strlen(p) + 1; - - /* .strtab */ -@@ -1096,7 +1096,7 @@ static void elf_write(void) - for (i = 0; i < nsects; i++) - if (sects[i]->head) { - elf_section_header(p - shstrtab, SHT_RELA, 0, sects[i]->rel, true, -- sects[i]->rellen, sec_symtab, i + 1, 4, 24); -+ sects[i]->rellen, sec_symtab, i + 1, 8, 24); - p += strlen(p) + 1; - } - --- -1.7.6.6.GIT - Property changes on: head/devel/nasm/files/patch-elf64-alignment ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/nasm/files/patch-output_outelf64.c =================================================================== --- head/devel/nasm/files/patch-output_outelf64.c (revision 448263) +++ head/devel/nasm/files/patch-output_outelf64.c (nonexistent) @@ -1,11 +0,0 @@ ---- output/outelf64.c.orig -+++ output/outelf64.c -@@ -1772,7 +1772,7 @@ - * the source-file, the n_desc field should be set to the number - * of remaining stabs - */ -- WRITE_STAB(sptr, fileidx[0], 0, 0, 0, strlen(allfiles[0] + 12)); -+ WRITE_STAB(sptr, fileidx[0], 0, 0, 0, stabstrlen); - - /* this is the stab for the main source file */ - WRITE_STAB(sptr, fileidx[mainfileindex], N_SO, 0, 0, 0); Property changes on: head/devel/nasm/files/patch-output_outelf64.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/nasm/Makefile =================================================================== --- head/devel/nasm/Makefile (revision 448263) +++ head/devel/nasm/Makefile (revision 448264) @@ -1,37 +1,36 @@ # Created by: Murray Stokely # $FreeBSD$ PORTNAME= nasm -PORTVERSION= 2.11.08 -PORTREVISION= 1 +PORTVERSION= 2.13.01 PORTEPOCH= 1 CATEGORIES= devel lang MASTER_SITES= http://www.nasm.us/pub/nasm/releasebuilds/${PORTVERSION}/ MAINTAINER= serio.jeffrey@gmail.com COMMENT= General-purpose multi-platform x86 and amd64 assembler LICENSE= BSD2CLAUSE GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_func_strspn=yes USES= tar:xz gmake MAKE_ARGS+= INSTALLROOT=${STAGEDIR} INSTALL_TARGET= install #needed for RDOFF_INSTALL_TARGET OPTIONS_DEFINE= RDOFF DOCS OPTIONS_DEFAULT=RDOFF OPTIONS_SUB= yes RDOFF_DESC= Install tools to handle RDOFF object files RDOFF_INSTALL_TARGET= install_rdf DOCS_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}-xdoc${EXTRACT_SUFX} PORTDOCS= * post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}) ${INSTALL_DATA} ${WRKSRC}/doc/nasmdoc.txt ${STAGEDIR}${DOCSDIR} .include Index: head/devel/nasm/distinfo =================================================================== --- head/devel/nasm/distinfo (revision 448263) +++ head/devel/nasm/distinfo (revision 448264) @@ -1,4 +1,5 @@ -SHA256 (nasm-2.11.08.tar.xz) = c99467c7072211c550d147640d8a1a0aa4d636d4d8cf849f3bf4317d900a1f7f -SIZE (nasm-2.11.08.tar.xz) = 764872 -SHA256 (nasm-2.11.08-xdoc.tar.xz) = b7d4467c5955349157cf780e0fd2160bf301c31c9bc30dc4fa2b280eda966a8c -SIZE (nasm-2.11.08-xdoc.tar.xz) = 753676 +TIMESTAMP = 1496184527 +SHA256 (nasm-2.13.01.tar.xz) = aa0213008f0433ecbe07bb628506a5c4be8079be20fc3532a5031fd639db9a5e +SIZE (nasm-2.13.01.tar.xz) = 800244 +SHA256 (nasm-2.13.01-xdoc.tar.xz) = c195465b464b01ca7562562af94869ae95505b5ecafd2431347d7a81f7679337 +SIZE (nasm-2.13.01-xdoc.tar.xz) = 702668