diff --git a/core/c/lib/bcrypt/.source b/core/c/lib/bcrypt/.source deleted file mode 100644 index ffc55691..00000000 --- a/core/c/lib/bcrypt/.source +++ /dev/null @@ -1,4 +0,0 @@ -home=http://www.openwall.com/crypt/ -pkg=http://www.openwall.com/crypt/crypt_blowfish-1.3.tar.gz -pkg_sha256=83fa01fca6996fe8d882b7f8e9ba0305a5664936100b01481ea3c6a8ce8d72fd -patches=(arm) diff --git a/core/c/lib/bcrypt/arm.patch b/core/c/lib/bcrypt/arm.patch deleted file mode 100644 index e9b724c8..00000000 --- a/core/c/lib/bcrypt/arm.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- 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/core/c/lib/scrypt/.source b/core/c/lib/scrypt/.source deleted file mode 100644 index 431f048d..00000000 --- a/core/c/lib/scrypt/.source +++ /dev/null @@ -1,4 +0,0 @@ -home=http://www.tarsnap.com/scrypt.html -git=https://github.com/Tarsnap/scrypt.git -pkg=https://www.tarsnap.com/scrypt/scrypt-1.2.1.tgz -pkg_sha256=4621f5e7da2f802e20850436219370092e9fcda93bd598f6d4236cce33f4c577 diff --git a/core/c/lib/scrypt/osx.patch b/core/c/lib/scrypt/osx.patch deleted file mode 100644 index cd8f1eed..00000000 --- a/core/c/lib/scrypt/osx.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -ruN /Users/lhunath/.src/scrypt/Makefile ./Makefile ---- /Users/lhunath/.src/scrypt/Makefile 2014-05-02 11:28:58.000000000 -0400 -+++ ./Makefile 2014-05-02 12:07:27.000000000 -0400 -@@ -2,11 +2,11 @@ - VER?= nosse - SRCS= main.c - LDADD+= -lcrypto --WARNS?= 6 -+WARNS?= 0 - - # We have a config file for FreeBSD - CFLAGS += -I . --CFLAGS += -DCONFIG_H_FILE=\"config_freebsd.h\" -+CFLAGS += -DCONFIG_H_FILE=\"config_osx.h\" - - # Include all possible object files containing built scrypt code. - CLEANFILES += crypto_scrypt-ref.o -diff -ruN /Users/lhunath/.src/scrypt/lib/util/memlimit.c ./lib/util/memlimit.c ---- /Users/lhunath/.src/scrypt/lib/util/memlimit.c 2014-05-02 11:28:58.000000000 -0400 -+++ ./lib/util/memlimit.c 2014-05-02 11:52:42.000000000 -0400 -@@ -75,7 +75,7 @@ - * have returned to us. - */ - if (usermemlen == sizeof(uint64_t)) -- usermem = *(uint64_t *)usermembuf; -+ usermem = *(uint64_t *)(void *)usermembuf; - else if (usermemlen == sizeof(uint32_t)) - usermem = SIZE_MAX; - else -diff -ruN /Users/lhunath/.src/scrypt/lib/util/memlimit.c ./lib/util/memlimit.c ---- /Users/lhunath/.src/scrypt/config_osx.h 1969-12-31 19:00:00.000000000 -0500 -+++ config_osx.h 2014-05-02 12:06:55.000000000 -0400 -@@ -0,0 +1,5 @@ -+/* A default configuration for FreeBSD, used if there is no config.h. */ -+ -+#define HAVE_POSIX_MEMALIGN 1 -+#define HAVE_SYSCTL_HW_USERMEM 1 -+#define HAVE_SYS_PARAM_H 1