diff options
| author | joerg <joerg> | 2015-04-14 14:23:14 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-04-14 14:23:14 +0000 |
| commit | b08ca0913e526e95ea50a966616032e4b79edf3d (patch) | |
| tree | 56e97664f4432ff478397ad33fac69c31fbb6372 | |
| parent | 3f282df9488efe1ce81385ef12f2f1adaa576c2b (diff) | |
| download | pkgsrc-b08ca0913e526e95ea50a966616032e4b79edf3d.tar.gz | |
Since @ is used to start line comments on ARM, use % for the section
type when on ARM.
| -rw-r--r-- | security/beecrypt/distinfo | 5 | ||||
| -rw-r--r-- | security/beecrypt/patches/patch-acinclude.m4 | 17 | ||||
| -rw-r--r-- | security/beecrypt/patches/patch-configure | 17 |
3 files changed, 35 insertions, 4 deletions
diff --git a/security/beecrypt/distinfo b/security/beecrypt/distinfo index 898770566c4..0b38d16f7af 100644 --- a/security/beecrypt/distinfo +++ b/security/beecrypt/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.6 2012/01/26 06:05:04 sbd Exp $ +$NetBSD: distinfo,v 1.7 2015/04/14 14:23:14 joerg 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 --git a/security/beecrypt/patches/patch-acinclude.m4 b/security/beecrypt/patches/patch-acinclude.m4 new file mode 100644 index 00000000000..32a2935c91a --- /dev/null +++ b/security/beecrypt/patches/patch-acinclude.m4 @@ -0,0 +1,17 @@ +$NetBSD: patch-acinclude.m4,v 1.1 2015/04/14 14:23:14 joerg 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 --git a/security/beecrypt/patches/patch-configure b/security/beecrypt/patches/patch-configure index 4a517e2d6e7..1dc89dd3129 100644 --- a/security/beecrypt/patches/patch-configure +++ b/security/beecrypt/patches/patch-configure @@ -1,8 +1,21 @@ -$NetBSD: patch-configure,v 1.1 2012/01/26 06:05:04 sbd Exp $ +$NetBSD: patch-configure,v 1.2 2015/04/14 14:23:14 joerg 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) |