3 files changed, 3 insertions, 117 deletions

diff --git a/main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch b/main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
deleted file mode 100644
index 52ef141863..0000000000
--- a/main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fc4c60f233ebe9fe85b7b03d0cf5deec4ab1b32d Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 16 Jun 2010 07:37:17 +0000
-Subject: [PATCH] Makefile: do not require lua pkgconfig unless you intend build lua module
-
----
- src/Makefile |   11 ++++++-----
- 1 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index 50f9664..bea288e 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,12 +1,9 @@
--PKGDEPS := openssl zlib lua
--
--ifeq ($(shell pkg-config --print-errors --exists $(PKGDEPS) || echo fail),fail)
--$(error Build dependencies are not met)
--endif
-+PKGDEPS := openssl zlib
- 
- # lua module
- ifneq ($(LUAAPK),)
- LIBAPK                 := YesPlease
-+PKGDEPS                        += lua
- shlibs-y               += apk.so
- apk.so-objs            := lua-apk.o
- CFLAGS_lua-apk.o       := -DAPK_VERSION=\"$(FULL_VERSION)\"
-@@ -16,6 +13,10 @@ install-LUA_LIB-y    := $(INSTALLDIR) $(DESTDIR)$(LUA_LIBDIR) \
-                           $(INSTALL) $(LUA_LIB-y) $(DESTDIR)$(LUA_LIBDIR)
- endif
- 
-+ifeq ($(shell pkg-config --print-errors --exists $(PKGDEPS) || echo fail),fail)
-+$(error Build dependencies are not met)
-+endif
-+
- progs-y                        += apk
- apk-objs               := apk.o add.o del.o fix.o update.o info.o \
-                           search.o upgrade.o cache.o ver.o index.o fetch.o \
--- 
-1.7.1
-
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 90cff68dc2..f64df8a815 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,14 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.0.5
-pkgrel=1
+pkgver=2.0.6
+pkgrel=0
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 subpackages="$pkgname-static"
 depends=
 makedepends="zlib-dev openssl-dev pkgconfig"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-        0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
-        apk-tools-static.patch
         "
 
 url="http://git.alpinelinux.org/cgit/apk-tools/"
@@ -22,9 +20,6 @@ prepare() {
                 *.patch) patch -p1 -i "$srcdir"/$i || return 1
                 esac
         done
-        # the patch includes a symlink
-        rm -f src/apk-static.c
-        ln -s apk.c src/apk-static.c
 }
 
 build() {
@@ -52,6 +47,4 @@ static() {
                 "$subpkgdir"/sbin/apk.static
 }
 
-md5sums="7f9234ab210557b064d7bd9b42833f0a  apk-tools-2.0.5.tar.bz2
-f63d483b724e8e9344ce8cb965d5ed22  0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
-3c1f21719a6c4aba51333cf0d88c5600  apk-tools-static.patch"
+md5sums="5933a61f91f44c5c534f8a62e6effb65  apk-tools-2.0.6.tar.bz2"
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"