[pkgsrc/pkgsrc-2015Q1]: pkgsrc/security/beecrypt Pullup ticket #4664 - reques...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f928b4b52999
branches:  pkgsrc-2015Q1
changeset: 649170:f928b4b52999
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat Apr 18 21:55:54 2015 +0000

description:
Pullup ticket #4664 - requested by joerg
security/beecrypt: build fix

Revisions pulled up:
- security/beecrypt/distinfo                                    1.7
- security/beecrypt/patches/patch-acinclude.m4                  1.1
- security/beecrypt/patches/patch-configure                     1.2

---
   Module Name: pkgsrc
   Committed By:        joerg
   Date:                Tue Apr 14 14:23:14 UTC 2015

   Modified Files:
        pkgsrc/security/beecrypt: distinfo
        pkgsrc/security/beecrypt/patches: patch-configure
   Added Files:
        pkgsrc/security/beecrypt/patches: patch-acinclude.m4

   Log Message:
   Since @ is used to start line comments on ARM, use % for the section
   type when on ARM.

diffstat:

 security/beecrypt/distinfo                   |   5 +++--
 security/beecrypt/patches/patch-acinclude.m4 |  17 +++++++++++++++++
 security/beecrypt/patches/patch-configure    |  17 +++++++++++++++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diffs (62 lines):

diff -r 16bf01f11b31 -r f928b4b52999 security/beecrypt/distinfo
--- a/security/beecrypt/distinfo        Sat Apr 18 14:53:02 2015 +0000
+++ b/security/beecrypt/distinfo        Sat Apr 18 21:55:54 2015 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.6 2012/01/26 06:05:04 sbd Exp $
+$NetBSD: distinfo,v 1.6.26.1 2015/04/18 21:55:54 tron Exp $
 
 SHA1 (beecrypt-4.1.1.tar.gz) = 5731fd4c6f960a5e9474f1f87611f88667cf98da
 RMD160 (beecrypt-4.1.1.tar.gz) = f284c702ef7b0fe703a669c7a18f0a89eaaa6f93
 Size (beecrypt-4.1.1.tar.gz) = 774424 bytes
-SHA1 (patch-configure) = c0986fe4d454466fc5df600a489b18d776ce3632
+SHA1 (patch-acinclude.m4) = c35fe6952cda843d26a9d75cfe001a4d49431167
+SHA1 (patch-configure) = 80baba5bdb2848abb9bd451aeca959a3ae81f842
 SHA1 (patch-configure.ac) = a1154ecad02465b85384944b53e18d3fbbb9e9d8
diff -r 16bf01f11b31 -r f928b4b52999 security/beecrypt/patches/patch-acinclude.m4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/beecrypt/patches/patch-acinclude.m4      Sat Apr 18 21:55:54 2015 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-acinclude.m4,v 1.1.2.2 2015/04/18 21:55:54 tron Exp $
+
+--- acinclude.m4.orig  2015-04-10 14:47:05.000000000 +0000
++++ acinclude.m4
+@@ -904,7 +904,11 @@ EOF
+       AC_LANG_PUSH(C)
+     AC_TRY_COMPILE([],[{}],[
+       bc_cv_as_noexecstack=yes
+-      bc_gnu_stack='.section .note.GNU-stack,"",@progbits; .previous'
++      if [ $bc_target_arch = arm ]; then
++        bc_gnu_stack='.section .note.GNU-stack,"",%progbits; .previous'
++      else
++        bc_gnu_stack='.section .note.GNU-stack,"",@progbits; .previous'
++      fi
+       ],[
+       CFLAGS=$CFLAGS_save
+       CXXFLAGS=$CXXFLAGS_save
diff -r 16bf01f11b31 -r f928b4b52999 security/beecrypt/patches/patch-configure
--- a/security/beecrypt/patches/patch-configure Sat Apr 18 14:53:02 2015 +0000
+++ b/security/beecrypt/patches/patch-configure Sat Apr 18 21:55:54 2015 +0000
@@ -1,8 +1,21 @@
-$NetBSD: patch-configure,v 1.1 2012/01/26 06:05:04 sbd Exp $
+$NetBSD: patch-configure,v 1.1.26.1 2015/04/18 21:55:54 tron Exp $
 
 --- configure.orig     2004-11-19 12:33:58.000000000 +0000
 +++ configure
-@@ -31826,7 +31826,7 @@ case $target_os in
+@@ -6930,7 +6930,11 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+   (exit $ac_status); }; }; then
+ 
+       bc_cv_as_noexecstack=yes
+-      bc_gnu_stack='.section .note.GNU-stack,"",@progbits; .previous'
++      if [ $bc_target_arch = arm ]; then
++        bc_gnu_stack='.section .note.GNU-stack,"",%progbits; .previous'
++      else
++        bc_gnu_stack='.section .note.GNU-stack,"",@progbits; .previous'
++      fi
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -31826,7 +31830,7 @@ case $target_os in
  linux*)
    case $bc_target_arch in
    powerpc64 | s390x | x86_64)