Skip to content
This repository was archived by the owner on Feb 27, 2023. It is now read-only.

Commit 5956193

Browse files
authored
Revert "Fix certificate errors (#602)" (#603)
This reverts commit bc19c36.
1 parent 891e9e7 commit 5956193

File tree

4 files changed

+11
-146
lines changed

4 files changed

+11
-146
lines changed

buildroot/package/arora/arora-fix-cert-errors.patch

Lines changed: 0 additions & 125 deletions
This file was deleted.

buildroot/package/ca-certificates/Config.in

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ config BR2_PACKAGE_CA_CERTIFICATES
66
connections.
77

88
It includes, among others, certificate authorities used by the
9-
Debian infrastructure and those shipped with Mozilla's
10-
browsers.
9+
Debian infrastructure and those shipped with Mozilla's browsers.
1110

12-
https://salsa.debian.org/debian/ca-certificates
11+
http://anonscm.debian.org/gitweb/?p=collab-maint/ca-certificates.git
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
# hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc :
2-
sha1 47d4584eae85fc905e4994766eb3930a8a84e2e1 ca-certificates_20190110.tar.xz
3-
sha256 ee4bf0f4c6398005f5b5ca4e0b87b82837ac5c3b0280a1cb3a63c47555c3a675 ca-certificates_20190110.tar.xz
4-
5-
# Locally computed
6-
sha256 80fd11117df5543d5cf17bfd951b0ead213f7867d0b09f09c6d5a5eca3ff7422 debian/copyright
2+
sha1 6013ce6a3bf13e73a7e1feddcd17f5b2c09e5bd3 ca-certificates_20141019.tar.xz
3+
sha256 684902d3f4e9ad27829f4af0d9d2d588afed03667997579b9c2be86fcd1eb73a ca-certificates_20141019.tar.xz

buildroot/package/ca-certificates/ca-certificates.mk

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,34 @@
44
#
55
################################################################################
66

7-
CA_CERTIFICATES_VERSION = 20190110
7+
CA_CERTIFICATES_VERSION = 20141019
88
CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz
9-
CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20190513T145054Z/pool/main/c/ca-certificates
9+
CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/ca-certificates
1010
CA_CERTIFICATES_DEPENDENCIES = host-openssl host-python
11-
CA_CERTIFICATES_LICENSE = GPL-2.0+ (script), MPL-2.0 (data)
11+
CA_CERTIFICATES_LICENSE = GPLv2+ (script), MPLv2.0 (data)
1212
CA_CERTIFICATES_LICENSE_FILES = debian/copyright
1313

1414
define CA_CERTIFICATES_BUILD_CMDS
15-
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) clean all
15+
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all
1616
endef
1717

1818
define CA_CERTIFICATES_INSTALL_TARGET_CMDS
1919
$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/ca-certificates
2020
$(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs
21-
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
21+
$(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR)
2222
rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates
2323

2424
# Remove any existing certificates under /etc/ssl/certs
2525
rm -f $(TARGET_DIR)/etc/ssl/certs/*
2626

2727
# Create symlinks to certificates under /etc/ssl/certs
28-
# and generate the bundle
2928
cd $(TARGET_DIR) ;\
30-
for i in `find usr/share/ca-certificates -name "*.crt" | LC_COLLATE=C sort` ; do \
29+
for i in `find usr/share/ca-certificates -name "*.crt"` ; do \
3130
ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\
32-
cat $$i ;\
33-
done >$(@D)/ca-certificates.crt
31+
done
3432

3533
# Create symlinks to the certificates by their hash values
3634
$(HOST_DIR)/usr/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs
37-
38-
# Install the certificates bundle
39-
$(INSTALL) -D -m 644 $(@D)/ca-certificates.crt \
40-
$(TARGET_DIR)/etc/ssl/certs/ca-certificates.crt
4135
endef
4236

4337
$(eval $(generic-package))

0 commit comments

Comments
 (0)