diff options
author | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2016-04-23 16:40:40 -0300 |
---|---|---|
committer | coadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu> | 2016-04-23 16:41:32 -0300 |
commit | ce11fd60dd39d4288dedededaf47cf4e8a7e7dce (patch) | |
tree | e0c37c8d4df843d4590137a042632ad4d4c40e07 /libre/p11-kit-static/libnssckbi-compat.patch | |
parent | e8422fe1669fa89d03034f9935f388145710ffaa (diff) | |
download | abslibre-ce11fd60dd39d4288dedededaf47cf4e8a7e7dce.tar.gz abslibre-ce11fd60dd39d4288dedededaf47cf4e8a7e7dce.tar.bz2 abslibre-ce11fd60dd39d4288dedededaf47cf4e8a7e7dce.zip |
remove unused static packages
Diffstat (limited to 'libre/p11-kit-static/libnssckbi-compat.patch')
-rw-r--r-- | libre/p11-kit-static/libnssckbi-compat.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/libre/p11-kit-static/libnssckbi-compat.patch b/libre/p11-kit-static/libnssckbi-compat.patch deleted file mode 100644 index d1b70a3bb..000000000 --- a/libre/p11-kit-static/libnssckbi-compat.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -upr p11-kit-0.23.1.orig/trust/Makefile.am p11-kit-0.23.1/trust/Makefile.am ---- p11-kit-0.23.1.orig/trust/Makefile.am 2014-11-12 12:58:50.000000000 +0200 -+++ p11-kit-0.23.1/trust/Makefile.am 2015-03-30 16:43:35.275993032 +0300 -@@ -61,6 +61,20 @@ p11_kit_trust_la_LDFLAGS = \ - - p11_kit_trust_la_SOURCES = $(TRUST_SRCS) - -+libnssckbi_compatdir = $(libdir) -+libnssckbi_compat_LTLIBRARIES = \ -+ libnssckbi-p11-kit.la -+ -+libnssckbi_p11_kit_la_CFLAGS = \ -+ -DLIBNSSCKBI_COMPAT \ -+ $(p11_kit_trust_la_CFLAGS) -+ -+libnssckbi_p11_kit_la_LIBADD = $(p11_kit_trust_la_LIBADD) -+ -+libnssckbi_p11_kit_la_LDFLAGS = $(p11_kit_trust_la_LDFLAGS) -+ -+libnssckbi_p11_kit_la_SOURCES = $(p11_kit_trust_la_SOURCES) -+ - libtrust_testable_la_LDFLAGS = \ - -no-undefined - -diff -upr p11-kit-0.23.1.orig/trust/module.c p11-kit-0.23.1/trust/module.c ---- p11-kit-0.23.1.orig/trust/module.c 2014-12-16 12:24:01.000000000 +0200 -+++ p11-kit-0.23.1/trust/module.c 2015-03-30 16:48:41.370360130 +0300 -@@ -196,7 +196,11 @@ create_tokens_inlock (p11_array *tokens, - const char *label; - } labels[] = { - { "~/", "User Trust" }, -+#ifdef LIBNSSCKBI_COMPAT -+ { DATA_DIR, "Builtin Object Token" }, -+#else - { DATA_DIR, "Default Trust" }, -+#endif - { SYSCONFDIR, "System Trust" }, - { NULL }, - }; -@@ -521,9 +525,15 @@ sys_C_GetSlotInfo (CK_SLOT_ID id, - info->flags = CKF_TOKEN_PRESENT; - strncpy ((char*)info->manufacturerID, MANUFACTURER_ID, 32); - -- /* If too long, copy the first 64 characters into buffer */ -- path = p11_token_get_path (token); -+#ifdef LIBNSSCKBI_COMPAT -+ /* Change description to match libnssckbi so HPKP works in Chromium */ -+ if (strcmp (p11_token_get_label (token), "Builtin Object Token" ) == 0) -+ path = "NSS Builtin Objects"; -+ else -+#endif -+ path = p11_token_get_path (token); - length = strlen (path); -+ /* If too long, copy the first 64 characters into buffer */ - if (length > sizeof (info->slotDescription)) - length = sizeof (info->slotDescription); - memset (info->slotDescription, ' ', sizeof (info->slotDescription)); |