diff options
Diffstat (limited to 'sys-apps/apk-tools')
| -rw-r--r-- | sys-apps/apk-tools/Manifest | 1 | ||||
| -rw-r--r-- | sys-apps/apk-tools/apk-tools-2.6.6-r1.ebuild | 47 | ||||
| -rw-r--r-- | sys-apps/apk-tools/apk-tools-2.6.6-r2.ebuild | 49 | ||||
| -rw-r--r-- | sys-apps/apk-tools/apk-tools-2.6.6.ebuild | 46 | ||||
| -rw-r--r-- | sys-apps/apk-tools/files/apk-tools-2.6.6-fuzzy-versions.patch | 193 | ||||
| -rw-r--r-- | sys-apps/apk-tools/files/apk-tools-2.6.6-revisions-are-equal.patch | 28 | ||||
| -rw-r--r-- | sys-apps/apk-tools/files/apk-tools-2.6.6-use-sha256-signature.patch | 52 | ||||
| -rw-r--r-- | sys-apps/apk-tools/metadata.xml | 7 |
8 files changed, 0 insertions, 423 deletions
diff --git a/sys-apps/apk-tools/Manifest b/sys-apps/apk-tools/Manifest deleted file mode 100644 index f016871e5..000000000 --- a/sys-apps/apk-tools/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST apk-tools-2.6.6.tar.bz2 82728 SHA256 7e5e86c856ce236c7fd54605ee0b1dbf59920398d3b33f9f6ff0e5f98e6828af SHA512 f22fd3a20b78980e93d2f36acdaf05841d4fa25f7f9ebd1d97ac60b1e0f3b72cf9fdb94fb082d562ab66f46c1ba68350b44f1a6a3d16a4959d1a8fbd240151ab WHIRLPOOL 6bfdb7bf57500b5ce4bf868f85e8a15db9f8d25cb0bd5d4a1224641860191329f31b2d7c7575d09755188a749908bbe403b97efcba914c95d7a828c36f220cf9 diff --git a/sys-apps/apk-tools/apk-tools-2.6.6-r1.ebuild b/sys-apps/apk-tools/apk-tools-2.6.6-r1.ebuild deleted file mode 100644 index 94318cf68..000000000 --- a/sys-apps/apk-tools/apk-tools-2.6.6-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 2015-2016 Adélie Linux Team -# Distributed under the terms of the NCSA License - -EAPI=6 - -DESCRIPTION="The Alpine Linux Package Keeper (APK)" -HOMEPAGE="http://alpinelinux.org/" -SRC_URI="http://git.alpinelinux.org/cgit/apk-tools/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="arm mips ppc x86 x86_64 ~alpha ~arm64 ~hppa ~ppc64 ~sparc64" -IUSE="static" # lua - -DEPEND="dev-libs/libfetch[ssl]" -RDEPEND="${DEPEND} - >=dev-libs/openssl-1.0.1p - static? ( >=dev-libs/openssl-1.0.1p[static-libs] ) - sys-libs/zlib - static? ( sys-libs/zlib[static-libs] ) -" -# lua? ( dev-lang/lua:5.2 ) - -PATCHES=( - "${FILESDIR}"/${P}-use-sha256-signature.patch - "${FILESDIR}"/${P}-revisions-are-equal.patch - ) - -src_configure() { - #if ! use lua; then - echo 'LUAAPK=' >> "${S}"/config.mk - echo 'export LUAAPK' >> "${S}"/config.mk - #fi -} - -src_compile () { - export CFLAGS=-Wno-error=unused-result - emake - use static && emake static -} - -pkg_preinst () { - mkdir -p "${D}"/usr/sbin - mv "${D}"/sbin/apk "${D}"/usr/sbin/apk - use static && "${D}"/sbin/apk.static "${D}"/usr/sbin/apk.static - rmdir "${D}"/sbin -} diff --git a/sys-apps/apk-tools/apk-tools-2.6.6-r2.ebuild b/sys-apps/apk-tools/apk-tools-2.6.6-r2.ebuild deleted file mode 100644 index 26ac848df..000000000 --- a/sys-apps/apk-tools/apk-tools-2.6.6-r2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2015-2016 Adélie Linux Team -# Distributed under the terms of the NCSA License - -EAPI=6 - -DESCRIPTION="The Alpine Linux Package Keeper (APK)" -HOMEPAGE="http://alpinelinux.org/" -SRC_URI="http://git.alpinelinux.org/cgit/apk-tools/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="arm mips ppc x86 x86_64 ~alpha ~arm64 ~hppa ~ppc64 ~sparc64" -IUSE="static" # lua - -COMMON_DEPEND="dev-libs/libfetch[ssl]" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig" -RDEPEND="${COMMON_DEPEND} - >=dev-libs/openssl-1.0.1p - static? ( >=dev-libs/openssl-1.0.1p[static-libs] ) - sys-libs/zlib - static? ( sys-libs/zlib[static-libs] ) -" -# lua? ( dev-lang/lua:5.2 ) - -PATCHES=( - "${FILESDIR}"/${P}-use-sha256-signature.patch - "${FILESDIR}"/${P}-fuzzy-versions.patch - ) - -src_configure() { - #if ! use lua; then - echo 'LUAAPK=' >> "${S}"/config.mk - echo 'export LUAAPK' >> "${S}"/config.mk - #fi -} - -src_compile () { - export CFLAGS=-Wno-error=unused-result - emake - use static && emake static -} - -pkg_preinst () { - mkdir -p "${D}"/usr/sbin - mv "${D}"/sbin/apk "${D}"/usr/sbin/apk - use static && "${D}"/sbin/apk.static "${D}"/usr/sbin/apk.static - rmdir "${D}"/sbin -} diff --git a/sys-apps/apk-tools/apk-tools-2.6.6.ebuild b/sys-apps/apk-tools/apk-tools-2.6.6.ebuild deleted file mode 100644 index ea53f8223..000000000 --- a/sys-apps/apk-tools/apk-tools-2.6.6.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2015-2016 Adélie Linux Team -# Distributed under the terms of the NCSA License - -EAPI=6 - -DESCRIPTION="The Alpine Linux Package Keeper (APK)" -HOMEPAGE="http://alpinelinux.org/" -SRC_URI="http://git.alpinelinux.org/cgit/apk-tools/snapshot/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="arm mips ppc x86 x86_64 ~alpha ~arm64 ~hppa ~ppc64 ~sparc64" -IUSE="static" # lua - -DEPEND="dev-libs/libfetch[ssl]" -RDEPEND="${DEPEND} - >=dev-libs/openssl-1.0.1p - static? ( >=dev-libs/openssl-1.0.1p[static-libs] ) - sys-libs/zlib - static? ( sys-libs/zlib[static-libs] ) -" -# lua? ( dev-lang/lua:5.2 ) - -PATCHES=( - "${FILESDIR}"/${P}-use-sha256-signature.patch - ) - -src_configure() { - #if ! use lua; then - echo 'LUAAPK=' >> "${S}"/config.mk - echo 'export LUAAPK' >> "${S}"/config.mk - #fi -} - -src_compile () { - export CFLAGS=-Wno-error=unused-result - emake - use static && emake static -} - -pkg_preinst () { - mkdir -p "${D}"/usr/sbin - mv "${D}"/sbin/apk "${D}"/usr/sbin/apk - use static && "${D}"/sbin/apk.static "${D}"/usr/sbin/apk.static - rmdir "${D}"/sbin -} diff --git a/sys-apps/apk-tools/files/apk-tools-2.6.6-fuzzy-versions.patch b/sys-apps/apk-tools/files/apk-tools-2.6.6-fuzzy-versions.patch deleted file mode 100644 index 11843b218..000000000 --- a/sys-apps/apk-tools/files/apk-tools-2.6.6-fuzzy-versions.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 4d71ddcd8f4a370babdaba22cbf43c4a00524c5b Mon Sep 17 00:00:00 2001 -From: Andrew Wilcox <AWilcox@Wilcox-Tech.com> -Date: Sun, 18 Oct 2015 10:59:54 -0500 -Subject: [PATCH 1/3] Add ~ operator for fuzzy version matching. - ---- - src/add.c | 2 +- - src/apk_package.h | 1 + - src/apk_version.h | 1 + - src/package.c | 16 ++++++++++++---- - src/version.c | 9 +++++++-- - 5 files changed, 22 insertions(+), 7 deletions(-) - -diff --git a/src/add.c b/src/add.c -index 2df4dc8..742df07 100644 ---- a/src/add.c -+++ b/src/add.c -@@ -137,7 +137,7 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array - - apk_blob_pull_dep(&b, db, &dep); - if (APK_BLOB_IS_NULL(b) || b.len > 0) { -- apk_error("'%s' is not a valid dependency, format is name(@tag)([<>=]version)", -+ apk_error("'%s' is not a valid dependency, format is name(@tag)([<>~=]version)", - *parg); - return -1; - } -diff --git a/src/apk_package.h b/src/apk_package.h -index 1b0e2cf..30de39a 100644 ---- a/src/apk_package.h -+++ b/src/apk_package.h -@@ -73,6 +73,7 @@ struct apk_dependency { - unsigned repository_tag : 6; - unsigned conflict : 1; - unsigned result_mask : 3; -+ unsigned fuzzy : 1; - }; - APK_ARRAY(apk_dependency_array, struct apk_dependency); - -diff --git a/src/apk_version.h b/src/apk_version.h -index 4275343..01e401b 100644 ---- a/src/apk_version.h -+++ b/src/apk_version.h -@@ -26,6 +26,7 @@ - const char *apk_version_op_string(int result_mask); - int apk_version_result_mask(const char *str); - int apk_version_validate(apk_blob_t ver); -+int apk_version_compare_blob_fuzzy(apk_blob_t a, apk_blob_t b, int fuzzy); - int apk_version_compare_blob(apk_blob_t a, apk_blob_t b); - int apk_version_compare(const char *str1, const char *str2); - -diff --git a/src/package.c b/src/package.c -index 65f105d..24a4f94 100644 ---- a/src/package.c -+++ b/src/package.c -@@ -31,6 +31,7 @@ - - static const apk_spn_match_def apk_spn_dependency_comparer = { -- [7] = (1<<4) /*<*/ | (1<<5) /*=*/ | (1<<6) /*<*/, -+ [7] = (1<<4) /*<*/ | (1<<5) /*=*/ | (1<<6) /*>*/, -+ [15]= (1<<6) /*~*/, - }; - - static const apk_spn_match_def apk_spn_dependency_separator = { -@@ -190,9 +191,9 @@ void apk_blob_pull_dep(apk_blob_t *b, struct apk_database *db, struct apk_depend - { - struct apk_name *name; - apk_blob_t bdep, bname, bop, bver = APK_BLOB_NULL, btag; -- int mask = APK_DEPMASK_ANY, conflict = 0, tag = 0; -+ int mask = APK_DEPMASK_ANY, conflict = 0, tag = 0, fuzzy = 0; - -- /* [!]name[<,<=,=,>=,>,><]ver */ -+ /* [!]name[<,<=,<~,=,~,>~,>=,>,><]ver */ - if (APK_BLOB_IS_NULL(*b)) - goto fail; - -@@ -231,6 +232,9 @@ void apk_blob_pull_dep(apk_blob_t *b, struct apk_database *db, struct apk_depend - case '>': - mask |= APK_VERSION_GREATER; - break; -+ case '~': -+ fuzzy = 1; -+ mask |= APK_VERSION_FUZZY; // XXX implicit - case '=': - mask |= APK_VERSION_EQUAL; - break; -@@ -259,6 +264,7 @@ void apk_blob_pull_dep(apk_blob_t *b, struct apk_database *db, struct apk_depend - .repository_tag = tag, - .result_mask = mask, - .conflict = conflict, -+ .fuzzy = fuzzy - }; - return; - fail: -@@ -320,7 +326,8 @@ int apk_dep_is_provided(struct apk_dependency *dep, struct apk_provider *p) - default: - if (p->version == &apk_null_blob) - return dep->conflict; -- if (apk_version_compare_blob(*p->version, *dep->version) -+ if (apk_version_compare_blob_fuzzy(*p->version, *dep->version, -+ dep->fuzzy) - & dep->result_mask) - return !dep->conflict; - return dep->conflict; -@@ -341,7 +348,8 @@ int apk_dep_is_materialized(struct apk_dependency *dep, struct apk_package *pkg) - case APK_DEPMASK_ANY: - return !dep->conflict; - default: -- if (apk_version_compare_blob(*pkg->version, *dep->version) -+ if (apk_version_compare_blob_fuzzy(*pkg->version, *dep->version, -+ dep->fuzzy) - & dep->result_mask) - return !dep->conflict; - return dep->conflict; -diff --git a/src/version.c b/src/version.c -index 00c78d1..212a5d1 100644 ---- a/src/version.c -+++ b/src/version.c -@@ -186,7 +186,7 @@ int apk_version_validate(apk_blob_t ver) - return t == TOKEN_END; - } - --int apk_version_compare_blob(apk_blob_t a, apk_blob_t b) -+int apk_version_compare_blob_fuzzy(apk_blob_t a, apk_blob_t b, int fuzzy) - { - int at = TOKEN_DIGIT, bt = TOKEN_DIGIT, tt; - int av = 0, bv = 0; -@@ -215,7 +215,7 @@ int apk_version_compare_blob(apk_blob_t a, apk_blob_t b) - return APK_VERSION_GREATER; - - /* both have TOKEN_END or TOKEN_INVALID next? */ -- if (at == bt) -+ if (at == bt || fuzzy) - return APK_VERSION_EQUAL; - - /* leading version components and their values are equal, -@@ -235,6 +235,11 @@ int apk_version_compare_blob(apk_blob_t a, apk_blob_t b) - return APK_VERSION_EQUAL; - } - -+int apk_version_compare_blob(apk_blob_t a, apk_blob_t b) -+{ -+ return apk_version_compare_blob_fuzzy(a, b, 0); -+} -+ - int apk_version_compare(const char *str1, const char *str2) - { - return apk_version_compare_blob(APK_BLOB_STR(str1), APK_BLOB_STR(str2)); -diff --git a/src/apk_package.h b/src/apk_package.h -index 30de39a..9984080 100644 ---- a/src/apk_package.h -+++ b/src/apk_package.h -@@ -72,7 +72,7 @@ struct apk_dependency { - unsigned broken : 1; - unsigned repository_tag : 6; - unsigned conflict : 1; -- unsigned result_mask : 3; -+ unsigned result_mask : 4; - unsigned fuzzy : 1; - }; - APK_ARRAY(apk_dependency_array, struct apk_dependency); -diff --git a/src/apk_version.h b/src/apk_version.h -index 01e401b..e13c534 100644 ---- a/src/apk_version.h -+++ b/src/apk_version.h -@@ -18,9 +18,10 @@ - #define APK_VERSION_EQUAL 1 - #define APK_VERSION_LESS 2 - #define APK_VERSION_GREATER 4 -+#define APK_VERSION_FUZZY 8 - - #define APK_DEPMASK_ANY (APK_VERSION_EQUAL|APK_VERSION_LESS|\ -- APK_VERSION_GREATER) -+ APK_VERSION_FUZZY|APK_VERSION_GREATER) - #define APK_DEPMASK_CHECKSUM (APK_VERSION_LESS|APK_VERSION_GREATER) - - const char *apk_version_op_string(int result_mask); -diff --git a/src/version.c b/src/version.c -index 5a790b5..14c61d8 100644 ---- a/src/version.c -+++ b/src/version.c -@@ -147,6 +147,9 @@ const char *apk_version_op_string(int mask) - return "<="; - case APK_VERSION_EQUAL: - return "="; -+ case APK_VERSION_EQUAL|APK_VERSION_FUZZY: -+ case APK_VERSION_FUZZY: -+ return "~"; - case APK_VERSION_GREATER|APK_VERSION_EQUAL: - return ">="; - case APK_VERSION_GREATER: --- -2.9.2 - diff --git a/sys-apps/apk-tools/files/apk-tools-2.6.6-revisions-are-equal.patch b/sys-apps/apk-tools/files/apk-tools-2.6.6-revisions-are-equal.patch deleted file mode 100644 index d227d560c..000000000 --- a/sys-apps/apk-tools/files/apk-tools-2.6.6-revisions-are-equal.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 072a8a45280f38317f2d9676e0a4c5f973635e20 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 22 Jul 2016 04:32:12 -0500 -Subject: [PATCH] version: consider pkg-rX and pkg to be the same version - ---- - src/version.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/version.c b/src/version.c -index 212a5d1..5a790b5 100644 ---- a/src/version.c -+++ b/src/version.c -@@ -218,6 +218,11 @@ - if (at == bt) - return APK_VERSION_EQUAL; - -+ /* if only difference is pkgrev, they are equal. */ -+ if ((at == TOKEN_REVISION_NO && bt == TOKEN_END) || -+ (at == TOKEN_END && bt == TOKEN_REVISION_NO)) -+ return APK_VERSION_EQUAL; -+ - /* leading version components and their values are equal, - * now the non-terminating version is greater unless it's a suffix - * indicating pre-release */ --- -2.9.2 - diff --git a/sys-apps/apk-tools/files/apk-tools-2.6.6-use-sha256-signature.patch b/sys-apps/apk-tools/files/apk-tools-2.6.6-use-sha256-signature.patch deleted file mode 100644 index e13f8b563..000000000 --- a/sys-apps/apk-tools/files/apk-tools-2.6.6-use-sha256-signature.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0984ca854ce4b9fddbf1dc7503058406ded6e2cc Mon Sep 17 00:00:00 2001 -From: Andrew Wilcox <AWilcox@Wilcox-Tech.com> -Date: Sun, 18 Oct 2015 11:19:36 -0500 -Subject: [PATCH] package: use SHA256 for signature instead of SHA1 - ---- - src/apk_blob.h | 2 +- - src/package.c | 8 ++------ - 2 files changed, 3 insertions(+), 7 deletions(-) - -diff --git a/src/apk_blob.h b/src/apk_blob.h -index 2d2e30e..a879d27 100644 ---- a/src/apk_blob.h -+++ b/src/apk_blob.h -@@ -41,7 +41,7 @@ extern apk_blob_t apk_null_blob; - - /* Internal cointainer for MD5 or SHA1 */ - struct apk_checksum { -- unsigned char data[20]; -+ unsigned char data[40]; - unsigned char type; - }; - -diff --git a/src/package.c b/src/package.c -index 24a4f94..14993b3 100644 ---- a/src/package.c -+++ b/src/package.c -@@ -570,8 +570,7 @@ int apk_sign_ctx_process_file(struct apk_sign_ctx *ctx, - if (ctx->keys_fd < 0) - return 0; - -- if (strncmp(&fi->name[6], "RSA.", 4) == 0 || -- strncmp(&fi->name[6], "DSA.", 4) == 0) { -+ if (strncmp(&fi->name[6], "RSA.", 4) == 0) { - int fd = openat(ctx->keys_fd, &fi->name[10], O_RDONLY|O_CLOEXEC); - BIO *bio; - -@@ -581,10 +580,7 @@ int apk_sign_ctx_process_file(struct apk_sign_ctx *ctx, - bio = BIO_new_fp(fdopen(fd, "r"), BIO_CLOSE); - ctx->signature.pkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL); - if (ctx->signature.pkey != NULL) { -- if (fi->name[6] == 'R') -- ctx->md = EVP_sha1(); -- else -- ctx->md = EVP_dss1(); -+ ctx->md = EVP_sha256(); - } - BIO_free(bio); - } else --- -2.7.0 - diff --git a/sys-apps/apk-tools/metadata.xml b/sys-apps/apk-tools/metadata.xml deleted file mode 100644 index 9b51b7056..000000000 --- a/sys-apps/apk-tools/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <longdescription lang="en"> - APK is the Alpine Package Keeper, the package manager for AlpineLinux and Adélie Linux. - </longdescription> -</pkgmetadata> |