diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-23 13:56:41 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-23 14:05:17 +0000 |
| commit | ec0a35ab05242d2f0ad23529f1e94ccaa5b4753a (patch) | |
| tree | 29239b95cef15e02f3ca0c17e3ebcd0b20dde152 /main/apk-tools/apk-tools-static.patch | |
| parent | 45af5bda242ec3f6b0a43af9cae6e90b511601ad (diff) | |
| download | aports-ec0a35ab05242d2f0ad23529f1e94ccaa5b4753a.tar.bz2 aports-ec0a35ab05242d2f0ad23529f1e94ccaa5b4753a.tar.xz | |
main/apk-tools: upgrade to 2.0.6
fixes #427
Diffstat (limited to 'main/apk-tools/apk-tools-static.patch')
| -rw-r--r-- | main/apk-tools/apk-tools-static.patch | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/main/apk-tools/apk-tools-static.patch b/main/apk-tools/apk-tools-static.patch deleted file mode 100644 index c122964b45..0000000000 --- a/main/apk-tools/apk-tools-static.patch +++ /dev/null @@ -1,65 +0,0 @@ -commit dd6008995a8e8509d71ffa906c837e7a320e8a15 -Author: Timo Teräs <timo.teras@iki.fi> -Date: Wed Jun 30 16:53:56 2010 +0300 - - static build: do not use openssl engines - - We want minimal static build. And this now also breaks with our openssl - since it tries to automatically dlopen some of the engine modules. - -diff --git a/.gitignore b/.gitignore -index f6f9cf6..2b22f52 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -1,4 +1,5 @@ - apk -+apk.static - *.o - *.d - *.cmd -diff --git a/src/Makefile b/src/Makefile -index bea288e..c9cda6a 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -41,9 +41,10 @@ endif - - CFLAGS_ALL += -D_ATFILE_SOURCE - CFLAGS_apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -+CFLAGS_apk-static.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -DOPENSSL_NO_ENGINE - - progs-$(STATIC) += apk.static --apk.static-objs := $(apk-objs) -+apk.static-objs := $(filter-out apk.o,$(apk-objs)) apk-static.o - LDFLAGS_apk.static := -static - LDFLAGS_apk += -nopie -L$(obj) - -diff --git a/src/apk-static.c b/src/apk-static.c -new file mode 120000 -index 0000000..bf745af ---- /dev/null -+++ b/src/apk-static.c -@@ -0,0 +1 @@ -+apk.c -\ No newline at end of file -diff --git a/src/apk.c b/src/apk.c -index 81bb950..4196f74 100644 ---- a/src/apk.c -+++ b/src/apk.c -@@ -12,13 +12,17 @@ - #include <stdio.h> - #include <fcntl.h> - #include <ctype.h> -+#include <errno.h> - #include <stdarg.h> - #include <stdlib.h> - #include <string.h> - #include <getopt.h> - #include <sys/stat.h> - -+#include <openssl/crypto.h> -+#ifndef OPENSSL_NO_ENGINE - #include <openssl/engine.h> -+#endif - - #include "apk_defines.h" - #include "apk_database.h" |