2
0

Support for patching dependencies + ARM patch for bcrypt.

This commit is contained in:
Maarten Billemont 2014-11-21 09:39:30 -05:00
parent 5c4fc61a12
commit 2b8498f569
4 changed files with 19 additions and 6 deletions

View File

@ -66,12 +66,6 @@
# readwhile command [args] # readwhile command [args]
# Outputs the characters typed by the user into the terminal's input buffer while running the given command. # 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 [format] [arguments...]
# Log an event at a certain importance level. # Log an event at a certain importance level.
# The event is expressed as a printf(1) format argument. # The event is expressed as a printf(1) format argument.

View File

@ -133,6 +133,12 @@ fetchSource() (
echo >&2 "error: into: $PWD" echo >&2 "error: into: $PWD"
exit 1 exit 1
fi fi
for patch in "${patches[@]}"; do
echo
echo "Patching: ${PWD##*/}, for $patch..."
patch -p0 < ../"${PWD##*/}-$patch.patch"
done
) )
depend() { depend() {

View File

@ -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

View File

@ -1,3 +1,4 @@
home=http://www.openwall.com/crypt/ home=http://www.openwall.com/crypt/
pkg=http://www.openwall.com/crypt/crypt_blowfish-1.3.tar.gz pkg=http://www.openwall.com/crypt/crypt_blowfish-1.3.tar.gz
pkg_sha256=83fa01fca6996fe8d882b7f8e9ba0305a5664936100b01481ea3c6a8ce8d72fd pkg_sha256=83fa01fca6996fe8d882b7f8e9ba0305a5664936100b01481ea3c6a8ce8d72fd
patches=(arm)