[pkgsrc/trunk]: pkgsrc/net/dante Use a bigger hammer to disable ssp for inter...

[rhialto <rhialto%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/75453a2fbc06
branches:  trunk
changeset: 391522:75453a2fbc06
user:      rhialto <rhialto%pkgsrc.org@localhost>
date:      Sat Feb 09 19:51:09 2019 +0000

description:
Use a bigger hammer to disable ssp for interposition.c.

cwrapper also adds -D__FORTIFY_SOURCE=2.

diffstat:

 net/dante/Makefile                           |   3 ++-
 net/dante/distinfo                           |   4 ++--
 net/dante/patches/patch-dlib_Makefile.in     |  27 ---------------------------
 net/dante/patches/patch-dlib_interposition.c |  23 +++++++++++++++++++++++
 4 files changed, 27 insertions(+), 30 deletions(-)

diffs (85 lines):

diff -r 7ed2340c6d4c -r 75453a2fbc06 net/dante/Makefile
--- a/net/dante/Makefile        Sat Feb 09 17:20:44 2019 +0000
+++ b/net/dante/Makefile        Sat Feb 09 19:51:09 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2017/02/12 01:01:19 mef Exp $
+# $NetBSD: Makefile,v 1.26 2019/02/09 19:51:09 rhialto Exp $
 
 DISTNAME=      dante-1.4.2
+PKGREVISION=    1
 CATEGORIES=    net security
 MASTER_SITES=  http://www.inet.no/dante/files/
 
diff -r 7ed2340c6d4c -r 75453a2fbc06 net/dante/distinfo
--- a/net/dante/distinfo        Sat Feb 09 17:20:44 2019 +0000
+++ b/net/dante/distinfo        Sat Feb 09 19:51:09 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2017/02/12 01:01:19 mef Exp $
+$NetBSD: distinfo,v 1.17 2019/02/09 19:51:09 rhialto Exp $
 
 SHA1 (dante-1.4.2.tar.gz) = 671c4df0f0689620c8e7cfe43bae3d7f89c8cc4e
 RMD160 (dante-1.4.2.tar.gz) = 8d48b6efa0d551215943c31dc140a0dccac950b9
@@ -6,4 +6,4 @@
 Size (dante-1.4.2.tar.gz) = 1307254 bytes
 SHA1 (patch-aa) = a201b0ec844a2dd610cd4bfb5ffce2f37132fc77
 SHA1 (patch-ab) = 77890d2eab9f2e487c571c5c3a1b7f181918f382
-SHA1 (patch-dlib_Makefile.in) = ac3f8687b9437fec2306a92c8ce91c57df79de0f
+SHA1 (patch-dlib_interposition.c) = 9af00c8251e71b519e0dfdffaa3c27303e33881f
diff -r 7ed2340c6d4c -r 75453a2fbc06 net/dante/patches/patch-dlib_Makefile.in
--- a/net/dante/patches/patch-dlib_Makefile.in  Sat Feb 09 17:20:44 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-dlib_Makefile.in,v 1.2 2017/02/12 01:01:19 mef Exp $
-
-o Do not use ssp(3) when compiling interposition.c:
-
-    interposition.c:1616:1: error: redefinition of 'read'
-     read(d, buf, nbytes)
-     ^
-    In file included from /usr/include/ssp/stdio.h:34:0,
-                     from /usr/include/stdio.h:597,
-                     from ../include/osdep.h:158,
-                     from ../include/common.h:56,
-                     from interposition.c:47:
-    /usr/include/ssp/unistd.h:39:1: note: previous definition of 'read' was here
-     __ssp_redirect0(ssize_t, read, (int __fd, void *__buf, size_t __len), \
-     ^
-
---- dlib/Makefile.in.orig      2017-02-03 23:17:27.000000000 +0900
-+++ dlib/Makefile.in   2017-02-12 09:45:51.954887981 +0900
-@@ -592,7 +592,7 @@ distclean-compile:
- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
- 
- libdsocks_la-interposition.lo: interposition.c
--@am__fastdepCC_TRUE@  $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libdsocks_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) 
$(AM_CFLAGS) $(CFLAGS) -MT libdsocks_la-interposition.lo -MD -MP -MF $(DEPDIR)/libdsocks_la-interposition.Tpo -c -o libdsocks_la-interposition.lo `test -f 'interposition.c' || echo 
'$(srcdir)/'`interposition.c
-+      @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libdsocks_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) 
$(CPPFLAGS:S/-D_FORTIFY_SOURCE=2//) $(AM_CFLAGS) $(CFLAGS) -MT libdsocks_la-interposition.lo -MD -MP -MF $(DEPDIR)/libdsocks_la-interposition.Tpo -c -o libdsocks_la-interposition.lo `test -f 
'interposition.c' || cho '$(srcdir)/'`interposition.c
- @am__fastdepCC_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/libdsocks_la-interposition.Tpo $(DEPDIR)/libdsocks_la-interposition.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@     $(AM_V_CC)source='interposition.c' object='libdsocks_la-interposition.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@     DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
diff -r 7ed2340c6d4c -r 75453a2fbc06 net/dante/patches/patch-dlib_interposition.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/dante/patches/patch-dlib_interposition.c      Sat Feb 09 19:51:09 2019 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-dlib_interposition.c,v 1.1 2019/02/09 19:51:09 rhialto Exp $
+
+o Do not use ssp(3) when compiling interposition.c:
+
+    interposition.c:1728:1: error: redefinition of 'read'
+     read(d, buf, nbytes)
+     ^
+    In file included from /usr/include/ssp/stdio.h:34:0,
+                    from /usr/include/stdio.h:597,
+                    from ../include/osdep.h:158,
+                    from ../include/common.h:56,
+                    from interposition.c:47:
+    /usr/include/ssp/unistd.h:39:1: note: previous definition of 'read' was here
+     __ssp_redirect0(ssize_t, read, (int __fd, void *__buf, size_t __len), \
+     ^
+
+--- dlib/interposition.c.orig  2017-01-31 08:17:38.000000000 +0000
++++ dlib/interposition.c
+@@ -1,3 +1,4 @@
++#undef _FORTIFY_SOURCE
+ /*
+  * Copyright (c) 1997, 1998, 1999, 2000, 2001, 2004, 2008, 2009, 2010, 2011,
+  *               2012, 2013, 2016, 2017