CVS commit: pkgsrc/security/botan-devel

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Feb  2 13:56:35 UTC 2018

Modified Files:
        pkgsrc/security/botan-devel: Makefile distinfo
Added Files:
        pkgsrc/security/botan-devel/patches: patch-configure.py

Log Message:
botan-devel: Leave pkgsrc to handle security features.  Fix SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/security/botan-devel/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/botan-devel/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/security/botan-devel/patches/patch-configure.py

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

Modified files:

Index: pkgsrc/security/botan-devel/Makefile
diff -u pkgsrc/security/botan-devel/Makefile:1.24 pkgsrc/security/botan-devel/Makefile:1.25
--- pkgsrc/security/botan-devel/Makefile:1.24   Mon Jan  1 21:18:10 2018
+++ pkgsrc/security/botan-devel/Makefile        Fri Feb  2 13:56:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2018/01/01 21:18:10 adam Exp $
+# $NetBSD: Makefile,v 1.25 2018/02/02 13:56:35 jperkin Exp $
 
 DISTNAME=      Botan-2.1.0
 PKGNAME=       ${DISTNAME:tl}
@@ -46,7 +46,7 @@ USE_TOOLS+=   gmake
 
 PY_PATCHPLIST= yes
 
-MAKE_FLAGS.SunOS+=     USER_APP_LINKS_TO=-lnsl
+LDFLAGS.SunOS+=        -lnsl -lsocket
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"

Index: pkgsrc/security/botan-devel/distinfo
diff -u pkgsrc/security/botan-devel/distinfo:1.13 pkgsrc/security/botan-devel/distinfo:1.14
--- pkgsrc/security/botan-devel/distinfo:1.13   Mon Apr 10 21:14:45 2017
+++ pkgsrc/security/botan-devel/distinfo        Fri Feb  2 13:56:35 2018
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.13 2017/04/10 21:14:45 joerg Exp $
+$NetBSD: distinfo,v 1.14 2018/02/02 13:56:35 jperkin Exp $
 
 SHA1 (Botan-2.1.0.tgz) = a754303f0fc5dc6e187dc80d1316f9fdb20cde1f
 RMD160 (Botan-2.1.0.tgz) = b736e1820aa4315095248ebdf119a5c6b493616d
 SHA512 (Botan-2.1.0.tgz) = af9ea35baf431500d380a360525e20e67dd17fdeaa442726019d544e9e423c301196cc17b09a3831f956ca9e62d7e99797f129b26fac10a653dd04e3ad1f4f4f
 Size (Botan-2.1.0.tgz) = 5073684 bytes
+SHA1 (patch-configure.py) = 188c466dc1427b65ef1790eabda04995442df6ed
 SHA1 (patch-src_build-data_os_openbsd.txt) = 4b187abcca4652a780386a6817033e4b6cdeafa8
 SHA1 (patch-src_build-data_os_solaris.txt) = de351e82e261c1f9e8668ecca606f3776cfa9eb2
 SHA1 (patch-src_lib_utils_locking__allocator_info.txt) = 30dd9043e1fa7befdf6933778e5c729fcb88263d

Added files:

Index: pkgsrc/security/botan-devel/patches/patch-configure.py
diff -u /dev/null pkgsrc/security/botan-devel/patches/patch-configure.py:1.1
--- /dev/null   Fri Feb  2 13:56:35 2018
+++ pkgsrc/security/botan-devel/patches/patch-configure.py      Fri Feb  2 13:56:35 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.py,v 1.1 2018/02/02 13:56:35 jperkin Exp $
+
+Leave pkgsrc to handle security features.
+
+--- configure.py.orig  2017-04-05 01:09:22.000000000 +0000
++++ configure.py
+@@ -1060,7 +1060,7 @@ class CompilerInfo(InfoObject): # pylint
+             if flag != None and flag != '' and flag not in abi_link:
+                 abi_link.append(flag)
+ 
+-        if options.with_stack_protector and self.stack_protector_flags != '':
++        if options.with_stack_protector and self.stack_protector_flags != '' and False:
+             abi_link.append(self.stack_protector_flags)
+ 
+         if options.with_coverage_info: