summaryrefslogtreecommitdiff
path: root/sys-apps/apk-tools/files
diff options
context:
space:
mode:
authorAndrew Wilcox <AWilcox@Wilcox-Tech.com>2016-03-26 22:07:10 -0500
committerAndrew Wilcox <AWilcox@Wilcox-Tech.com>2016-03-26 22:07:10 -0500
commitb605605d7ce603c9bae7f17b0a9b90979d8fc4e9 (patch)
tree1e356cfbd836c6e9ce3e3c8fff4cc34544582917 /sys-apps/apk-tools/files
parent16bdd1a8be055200ea6249f49e149312cfbf8b4a (diff)
downloadpackages-b605605d7ce603c9bae7f17b0a9b90979d8fc4e9.tar.gz
packages-b605605d7ce603c9bae7f17b0a9b90979d8fc4e9.tar.bz2
packages-b605605d7ce603c9bae7f17b0a9b90979d8fc4e9.tar.xz
packages-b605605d7ce603c9bae7f17b0a9b90979d8fc4e9.zip
Remove eutils.eclass
All uses of it have been replaced with EAPI=6.
Diffstat (limited to 'sys-apps/apk-tools/files')
-rw-r--r--sys-apps/apk-tools/files/apk-tools-2.6.4-glibc-add-missing-headers.patch12
-rw-r--r--sys-apps/apk-tools/files/apk-tools-2.6.4-use-sha256-signature.patch52
2 files changed, 0 insertions, 64 deletions
diff --git a/sys-apps/apk-tools/files/apk-tools-2.6.4-glibc-add-missing-headers.patch b/sys-apps/apk-tools/files/apk-tools-2.6.4-glibc-add-missing-headers.patch
deleted file mode 100644
index f299e9ac9..000000000
--- a/sys-apps/apk-tools/files/apk-tools-2.6.4-glibc-add-missing-headers.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/blob.c b/src/blob.c
-index 07ea6f3..9147afa 100644
---- a/src/blob.c
-+++ b/src/blob.c
-@@ -12,6 +12,7 @@
- #include <malloc.h>
- #include <string.h>
- #include <stdio.h>
-+#include <stdint.h>
-
- #include "apk_blob.h"
- #include "apk_hash.h"
diff --git a/sys-apps/apk-tools/files/apk-tools-2.6.4-use-sha256-signature.patch b/sys-apps/apk-tools/files/apk-tools-2.6.4-use-sha256-signature.patch
deleted file mode 100644
index e13f8b563..000000000
--- a/sys-apps/apk-tools/files/apk-tools-2.6.4-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
-