From 2b8498f569285481d25128d9d0075d084d832ddf Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Fri, 21 Nov 2014 09:39:30 -0500
Subject: [PATCH] Support for patching dependencies + ARM patch for bcrypt.

---
 MasterPassword/C/bashlib              |  6 ------
 MasterPassword/C/build                |  6 ++++++
 MasterPassword/C/lib/bcrypt-arm.patch | 12 ++++++++++++
 MasterPassword/C/lib/bcrypt/.source   |  1 +
 4 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 MasterPassword/C/lib/bcrypt-arm.patch

diff --git a/MasterPassword/C/bashlib b/MasterPassword/C/bashlib
index 12ae2bbb..aad1d522 100755
--- a/MasterPassword/C/bashlib
+++ b/MasterPassword/C/bashlib
@@ -66,12 +66,6 @@
 #     readwhile command [args]
 # Outputs the characters typed by the user into the terminal's input buffer while running the given command.
 #
-#     pushqueue element ...
-# Pushes the given arguments as elements onto the queue.
-#
-#     popqueue
-# Pops one element off the queue.
-#
 #     log [format] [arguments...]
 # Log an event at a certain importance level.
 # The event is expressed as a printf(1) format argument.
diff --git a/MasterPassword/C/build b/MasterPassword/C/build
index 6df3c41b..d9cdf19c 100755
--- a/MasterPassword/C/build
+++ b/MasterPassword/C/build
@@ -133,6 +133,12 @@ fetchSource() (
         echo >&2 "error: into: $PWD"
         exit 1
     fi
+
+    for patch in "${patches[@]}"; do
+        echo
+        echo "Patching: ${PWD##*/}, for $patch..."
+        patch -p0 < ../"${PWD##*/}-$patch.patch"
+    done
 )
 depend() {
 
diff --git a/MasterPassword/C/lib/bcrypt-arm.patch b/MasterPassword/C/lib/bcrypt-arm.patch
new file mode 100644
index 00000000..e9b724c8
--- /dev/null
+++ b/MasterPassword/C/lib/bcrypt-arm.patch
@@ -0,0 +1,12 @@
+--- x86.S	2014-11-21 09:09:58.000000000 -0500
++++ x86.S	2014-11-21 09:11:01.000000000 -0500
+@@ -199,5 +199,9 @@
+ #endif
+ 
+ #if defined(__ELF__) && defined(__linux__)
++#if defined(__arm__)
++.section .note.GNU-stack,"",%progbits
++#else
+ .section .note.GNU-stack,"",@progbits
+ #endif
++#endif
diff --git a/MasterPassword/C/lib/bcrypt/.source b/MasterPassword/C/lib/bcrypt/.source
index aace4726..ffc55691 100644
--- a/MasterPassword/C/lib/bcrypt/.source
+++ b/MasterPassword/C/lib/bcrypt/.source
@@ -1,3 +1,4 @@
 home=http://www.openwall.com/crypt/
 pkg=http://www.openwall.com/crypt/crypt_blowfish-1.3.tar.gz
 pkg_sha256=83fa01fca6996fe8d882b7f8e9ba0305a5664936100b01481ea3c6a8ce8d72fd
+patches=(arm)