atasm: update to 1.09.

Pkgsrc changes:

- Regenerate Makefile patch
- Remove patch for GCC 2.95 introduced in 2004

ChangeLog:

September 21, 2011 version 1.07

- Introduced .BANKNUM operator
- Allow .SET 6 to forward reference labels
- Allow leading underscores in label names
- Fixed an error with command-line defines
- Allow character quoting of spaces and semicolons
- Allow comments to start without a preceding  space
- Fixed local label references inside of macros or macro parameters

May 26, 2014 version 1.08

- Initial support of list files with -g command-line parameter
- Allow .INCBIN to honor include paths
- Missing state files no longer segfault
- Double-forward defines now throw an error rather than silently generate
  bad code

March 20, 2021 version 1.09

- Fixed a problem with filename creation when saving output to an ATR image
- Fixed CVE-2019-19785: Stack-based buffer overflow in to_comma()
- Fixed CVE-2019-19786: Stack-based buffer overflow in parse_expr()
- Fixed CVE-2019-19787: Stack-based buffer overflow in get_signed_expression()

5 files changed, 43 insertions, 68 deletions

diff --git a/cross/atasm/Makefile b/cross/atasm/Makefile
index 26732c37594..c9af453a162 100644
--- a/cross/atasm/Makefile
+++ b/cross/atasm/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2020/04/23 19:42:41 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2021/03/21 10:21:07 fcambus Exp $
 #
 
-DISTNAME=	atasm106
-PKGNAME=	atasm-1.06
-PKGREVISION=	1
+DISTNAME=	atasm109
+PKGNAME=	atasm-1.09
 CATEGORIES=	devel cross emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=atasm/}
 EXTRACT_SUFX=	.zip
diff --git a/cross/atasm/distinfo b/cross/atasm/distinfo
index 9d65f3a3ae7..a4e3dcba7b9 100644
--- a/cross/atasm/distinfo
+++ b/cross/atasm/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 00:47:42 agc Exp $
+$NetBSD: distinfo,v 1.8 2021/03/21 10:21:07 fcambus Exp $
 
-SHA1 (atasm106.zip) = c016c2f6ee611e001dbd026923c29ce509979f1c
-RMD160 (atasm106.zip) = e9935d0e202bc668114af9d11fdbf396399cb6d3
-SHA512 (atasm106.zip) = 14d0266e2f38d94a0bdcdd29a1a96fdac6f736d5a92a563d8db2a6302ab1239cd5832ac79b90d7480eeaa588920e568b3c67b51417dbb18c2ea15e33f533f8a1
-Size (atasm106.zip) = 368360 bytes
-SHA1 (patch-aa) = e040580b87e68fc7ec2230fb22bc45b5d168ca83
-SHA1 (patch-ab) = 18c516a98ae5cbae3f8df7f38ca87bd1f47b9664
+SHA1 (atasm109.zip) = 2f2ca23937a92303ca75ac6002c38995999e521d
+RMD160 (atasm109.zip) = ced844bef7075114169693ee576c2697baf782e5
+SHA512 (atasm109.zip) = 7daed20c0fa4a2bf20372e6c102a5e0ef9072fc9fea59d2990209572167f71f4d432abf1176ea2365d894b9e3666f6290b93c25765c71d0741bc8bf144d5561e
+Size (atasm109.zip) = 397661 bytes
+SHA1 (patch-src_Makefile) = c2fa75d2920cf25006a47921f4c050971f2ebf81
diff --git a/cross/atasm/patches/patch-aa b/cross/atasm/patches/patch-aa
deleted file mode 100644
index df793729e63..00000000000
--- a/cross/atasm/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2014/12/15 12:37:01 jperkin Exp $
-
-Honor CC, CFLAGS and LDFLAGS from pkgsrc.
-
---- src/Makefile.orig	2009-03-17 20:39:26.000000000 +0000
-+++ src/Makefile
-@@ -12,15 +12,15 @@
- # if you are compiling under UNIX, change the above lines to 
- # reflect the location of zlib.  I use:
- USEZ    = -DZLIB_CAPABLE 
--ZLIB    = -lz
-+#ZLIB    = -lz
- UNIX    = -DUNIX
- 
- # Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use:
- #CFLAGS  = -g -Wall $(USEZ) $(DOS) $(UNIX) 
--CFLAGS  = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer -march=pentiumpro 
-+CFLAGS+  = $(USEZ) $(DOS) $(UNIX)
- 
- L       =  $(ZLIB) 
--CC      = gcc
-+#CC      = gcc
- DESTDIR	= /usr/local/bin
- MANDIR	= /usr/local/man/man1
- DOCDIR	= /usr/local/doc/atasm
-@@ -42,7 +42,8 @@ symbol.o: symbol.h inc_path.h atasm_err.
- 
- prog : $(OBJS)
- 	$(CC) -o atasm $(OBJS) $(L)
--  
-+	$(CC) $(LDFLAGS) -o atasm $(OBJS) $(L)
-+
- clean:  
- 	rm -f *.rej *.o *~ atasm atasm.1 atasm.exe
- 	cd ../tests && make clean
diff --git a/cross/atasm/patches/patch-ab b/cross/atasm/patches/patch-ab
deleted file mode 100644
index 89ae00f7b4f..00000000000
--- a/cross/atasm/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2014/12/09 15:10:47 mef Exp $
-
-Make this package build when using gcc 2.95.
-
---- symbol.c.orig	2009-03-18 05:39:26.000000000 +0900
-+++ src/symbol.c	2014-12-09 23:31:26.000000000 +0900
-@@ -150,6 +150,7 @@ void addUnk(char *unk) {
-       snprintf(buf,256,"=%.4x_%s=%s",invoked->orig->times,invoked->orig->name,unk);
-       unk=buf;
-     }
-+    {
-     look=isUnk(unk);
-     if (!look) {
-       unkLabel *u=(unkLabel *)malloc(sizeof(unkLabel));
-@@ -158,6 +159,7 @@ void addUnk(char *unk) {
-       unkLabels=u;
-       u->label=(char *)malloc(strlen(unk)+1);
-       strcpy(u->label,unk);
-+      }
-     }
-   }
- }
diff --git a/cross/atasm/patches/patch-src_Makefile b/cross/atasm/patches/patch-src_Makefile
new file mode 100644
index 00000000000..04be71ddacf
--- /dev/null
+++ b/cross/atasm/patches/patch-src_Makefile
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_Makefile,v 1.1 2021/03/21 10:21:07 fcambus Exp $
+
+Honor CC, CFLAGS and LDFLAGS from pkgsrc.
+
+--- src/Makefile.orig	2021-03-20 15:15:32.000000000 +0000
++++ src/Makefile
+@@ -12,15 +12,15 @@
+ # if you are compiling under UNIX, change the above lines to
+ # reflect the location of zlib.  I use:
+ USEZ    = -DZLIB_CAPABLE -I../zlib
+-ZLIB    = -L../zlib -lz
++#ZLIB    = -L../zlib -lz
+ UNIX    = -DUNIX
+ 
+ # Compiler flags, if you are using egcs, pgcs, or gcc >2.8.1 use:
+ #CFLAGS  = -g -Wall $(USEZ) $(DOS) $(UNIX) $(ARCH)
+-CFLAGS  = -Wall $(USEZ) $(DOS) $(UNIX) -O3 -fomit-frame-pointer $(ARCH)
++CFLAGS += $(USEZ) $(DOS) $(UNIX)
+ 
+ L       =  $(ZLIB)
+-CC      = gcc
++#CC      = gcc
+ DESTDIR	= /usr/local/bin
+ MANDIR	= /usr/local/man/man1
+ DOCDIR	= /usr/local/doc/atasm
+@@ -41,7 +41,7 @@ state2.o: symbol.h
+ symbol.o: symbol.h inc_path.h atasm_err.h
+ 
+ prog : $(OBJS)
+-	$(CC) -o atasm $(OBJS) $(L) $(ARCH)
++	$(CC) $(LDFLAGS) -o atasm $(OBJS) $(L) $(ARCH)
+ 
+ clean:
+ 	rm -f *.rej *.o *~ atasm atasm.1 atasm.exe