CVS commit: pkgsrc/net/dante

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Sat Feb  9 19:51:09 UTC 2019

Modified Files:
        pkgsrc/net/dante: Makefile distinfo
Added Files:
        pkgsrc/net/dante/patches: patch-dlib_interposition.c
Removed Files:
        pkgsrc/net/dante/patches: patch-dlib_Makefile.in

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

cwrapper also adds -D__FORTIFY_SOURCE=2.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/dante/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/dante/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/net/dante/patches/patch-dlib_Makefile.in
cvs rdiff -u -r0 -r1.1 pkgsrc/net/dante/patches/patch-dlib_interposition.c

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

Modified files:

Index: pkgsrc/net/dante/Makefile
diff -u pkgsrc/net/dante/Makefile:1.25 pkgsrc/net/dante/Makefile:1.26
--- pkgsrc/net/dante/Makefile:1.25      Sun Feb 12 01:01:19 2017
+++ pkgsrc/net/dante/Makefile   Sat Feb  9 19:51:09 2019
@@ -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/
 

Index: pkgsrc/net/dante/distinfo
diff -u pkgsrc/net/dante/distinfo:1.16 pkgsrc/net/dante/distinfo:1.17
--- pkgsrc/net/dante/distinfo:1.16      Sun Feb 12 01:01:19 2017
+++ pkgsrc/net/dante/distinfo   Sat Feb  9 19:51:09 2019
@@ -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 @@ SHA512 (dante-1.4.2.tar.gz) = 38d4e3086f
 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

Added files:

Index: pkgsrc/net/dante/patches/patch-dlib_interposition.c
diff -u /dev/null pkgsrc/net/dante/patches/patch-dlib_interposition.c:1.1
--- /dev/null   Sat Feb  9 19:51:09 2019
+++ pkgsrc/net/dante/patches/patch-dlib_interposition.c Sat Feb  9 19:51:09 2019
@@ -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