CVS commit: pkgsrc/graphics/s10sh

["Pierre Pronchery" <khorben%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   khorben
Date:           Sat Feb 10 00:33:27 UTC 2018

Modified Files:
        pkgsrc/graphics/s10sh: Makefile distinfo
        pkgsrc/graphics/s10sh/patches: patch-ab

Log Message:
Add support for CFLAGS and LDFLAGS to graphics/s10sh

This notably fixes RELRO for this package.

Bump PKGREVISION as this changes the resulting binary.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/s10sh/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/s10sh/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/graphics/s10sh/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/s10sh/Makefile
diff -u pkgsrc/graphics/s10sh/Makefile:1.16 pkgsrc/graphics/s10sh/Makefile:1.17
--- pkgsrc/graphics/s10sh/Makefile:1.16 Sun Jan 14 14:58:40 2018
+++ pkgsrc/graphics/s10sh/Makefile      Sat Feb 10 00:33:26 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2018/01/14 14:58:40 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2018/02/10 00:33:26 khorben Exp $
 #
 
 DISTNAME=      s10sh-0.2.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  http://www.kyuzz.org/antirez/s10sh-src/
 
@@ -12,6 +12,8 @@ COMMENT=      USB/serial userspace driver for
 
 HAS_CONFIGURE= yes
 CONFIGURE_ENV+=        LOCALBASE=${LOCALBASE}
+MAKE_FLAGS+=   CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
 
 INSTALLATION_DIRS=     bin
 

Index: pkgsrc/graphics/s10sh/distinfo
diff -u pkgsrc/graphics/s10sh/distinfo:1.11 pkgsrc/graphics/s10sh/distinfo:1.12
--- pkgsrc/graphics/s10sh/distinfo:1.11 Mon Nov  9 05:26:40 2015
+++ pkgsrc/graphics/s10sh/distinfo      Sat Feb 10 00:33:26 2018
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.11 2015/11/09 05:26:40 dholland Exp $
+$NetBSD: distinfo,v 1.12 2018/02/10 00:33:26 khorben Exp $
 
 SHA1 (s10sh-0.2.0.tar.gz) = a8ada7c84ff64be98a1195612d48e2042f293eba
 RMD160 (s10sh-0.2.0.tar.gz) = 2b0ef13958bde03b2e9056bc023e3dd0c84747b4
 SHA512 (s10sh-0.2.0.tar.gz) = bd0c93b2e0c775d20b969344c8438ad86dcf3d21efd83b59e1dab2ce30b28b46e8082a24f8cecb7c4735f78e15fe3d6b2e7f597d61ef8e4c36961b4691ff9355
 Size (s10sh-0.2.0.tar.gz) = 172203 bytes
 SHA1 (patch-aa) = 1708337ee44567e66e227903e0ae15101670ed31
-SHA1 (patch-ab) = 83e20d2bbda9de83a3db5a5990f6cc7f1fb1a18c
+SHA1 (patch-ab) = 8ec917430104471117405dafd81415a342c93509
 SHA1 (patch-ac) = c4163858852f2d2153f4740989b212102d8436cf
 SHA1 (patch-ad) = 6e4164e2040508253075d5f482a527de9ff33d61
 SHA1 (patch-ae) = f22ee8feef8a8d99c91ecbdfc5dfd7e1751788b9

Index: pkgsrc/graphics/s10sh/patches/patch-ab
diff -u pkgsrc/graphics/s10sh/patches/patch-ab:1.1.1.1 pkgsrc/graphics/s10sh/patches/patch-ab:1.2
--- pkgsrc/graphics/s10sh/patches/patch-ab:1.1.1.1      Wed Mar 28 16:52:42 2001
+++ pkgsrc/graphics/s10sh/patches/patch-ab      Sat Feb 10 00:33:27 2018
@@ -1,12 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/28 16:52:42 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2018/02/10 00:33:27 khorben Exp $
 
---- Makefile.in.orig   Tue Mar 13 14:46:18 2001
-+++ Makefile.in        Wed Mar 28 18:12:35 2001
-@@ -4,12 +4,13 @@
+--- Makefile.in.orig   2001-03-13 13:46:18.000000000 +0000
++++ Makefile.in
+@@ -3,13 +3,16 @@
+ OPTIONS=@HAVE_READLINE@ @HAVE_USB_SUPPORT@
  LIBS=@LIBREADLINE@ @LIBTERMCAP@
  CC=gcc
- CCOPT=-O2 -Wall -g @LIBUSBHEADER@
+-CCOPT=-O2 -Wall -g @LIBUSBHEADER@
 -OBJECTS=main.o crc.o usb.o serial.o common.o bar.o @LIBUSB@
++CFLAGS=-O2
++CCOPT=$(CFLAGS) -Wall -g @LIBUSBHEADER@
++LDFLAGS=
 +OBJECTS=main.o crc.o usb.o serial.o common.o bar.o
 +LOBJECTS= $(OBJECTS) @LIBUSB@
  
@@ -14,7 +18,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/03/28 1
  
  s10sh: $(OBJECTS)
 -      $(CC) $(CCOPT) -o s10sh $(OBJECTS) $(LIBS)
-+      $(CC) $(CCOPT) -o s10sh $(LOBJECTS) $(LIBS)
++      $(CC) $(CCOPT) -o s10sh $(LDFLAGS) $(LOBJECTS) $(LIBS)
  
  .c.o:
        $(CC) $(CCOPT) -c $< $(OPTIONS)