From 7cbb6f7df6ca79ea5b4778554190f38ef6c42004 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Thu, 9 Jul 2015 14:55:50 +0200
Subject: [PATCH 146/257] etc/pkg: Add and install ElectroBSD.conf and a pubkey
 file

... for testing purposes.

While at it, detach FreeBSD.conf and the corresponding
fingerprint file from the build.

Obtained from: ElectroBSD
---
 etc/pkg/ElectroBSD.conf                         | 21 +++++++++++++++++++++
 etc/pkg/Makefile                                |  2 +-
 etc/pkg/electrobsd-test-repo.pub                | 14 ++++++++++++++
 share/keys/pkg/trusted/Makefile                 |  2 +-
 share/keys/pkg/trusted/electrobsd-test-key.conf |  2 ++
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 etc/pkg/ElectroBSD.conf
 create mode 100644 etc/pkg/electrobsd-test-repo.pub
 create mode 100644 share/keys/pkg/trusted/electrobsd-test-key.conf

diff --git a/etc/pkg/ElectroBSD.conf b/etc/pkg/ElectroBSD.conf
new file mode 100644
index 000000000000..4bf82d992bee
--- /dev/null
+++ b/etc/pkg/ElectroBSD.conf
@@ -0,0 +1,21 @@
+ElectroBSD: {
+  # Note that accessing this repository requires a local proxy
+  # that port forwards the incomming http requests to an authorized
+  # Tor client that forwards them to: http://gkpssb7hd77qznoa.onion/
+  #
+  # To get the required secret you have to ask someone who knows it and
+  # come up with a good reason why you want to run unreproducible packages
+  # instead of building your packages from source.
+  #
+  # Example bootstrapping setup:
+  # Your server:  pkg -> sshd
+  #                        |
+  # Your client:            --> ssh -> privoxy -> tor
+  #                                                |
+  # Outside your control:                          --> Tor network -> Tor HS
+  url: "http://127.0.0.1:8000/packages/${ABI}/",
+  mirror_type: "NONE",
+  signature_type: "pubkey",
+  pubkey: "/etc/pkg/electrobsd-test-repo.pub",
+  enabled: yes
+}
diff --git a/etc/pkg/Makefile b/etc/pkg/Makefile
index abc8c64ca5cb..614989f36674 100644
--- a/etc/pkg/Makefile
+++ b/etc/pkg/Makefile
@@ -2,7 +2,7 @@
 
 NO_OBJ=
 
-FILES=	FreeBSD.conf
+FILES=	ElectroBSD.conf electrobsd-test-repo.pub
 
 FILESDIR=	/etc/pkg
 FILESMODE=	644
diff --git a/etc/pkg/electrobsd-test-repo.pub b/etc/pkg/electrobsd-test-repo.pub
new file mode 100644
index 000000000000..ee213cb062b1
--- /dev/null
+++ b/etc/pkg/electrobsd-test-repo.pub
@@ -0,0 +1,14 @@
+-----BEGIN PUBLIC KEY-----
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtwIgcSgQT2QJvxwDiKhh
+xYidaxWaJL/EHXnYH8TpiujNeg8yZUCiT07MChw/wO3KrVY3SlhFkl8MHnwaFWNS
+jSJFNQIHoVo8of0juDXhIMMY0DTVFVpSfgq+Ea0SrVZawQchcc7XODjp7mQOH0Nz
+Z0FUpQ4z7TsdrPV/Kj/SQteK7Q0qAnDGT5GBxb+4m5qmNbv74GVpWmxJ5kC4OY3g
+v8oTRZ5wG/mf5nKG+QXGKbcfoK+fd+NL9gp5awhvnp5cRo2+ZrQvnYKy5ym9O+jM
+9hv5bL7OYIW7gErPdQd0+SFejcDg4TamY824krkjgIf7pnRVAuuSHiy8PaHmmNMd
+StFo8IW6687C0X4gNuaPtR1TCkVZugrgev/w5GPp765HmE4WvrtPU4u9/EvWO2L6
+2bHmsJqNIGyq1lfHk/cx49CEhDPjRcYin8MKKzRFUR7CWiNDBz2GK6Lcfd78cG5I
+HGJAthhi3rOOnLsTMuIQ/+GkVCDNwweLxSoLQUzGnheHqBjYyZSfZ8u9I/OKtwp3
+OMhGOD1/yuRaat+QER5VwiDP3AxcIlq6aNNytJW6l/kZZLVsr99YmROyYsTps0Zm
+OXqxQFsZ6zzlYO95HP4ITJ7ubk84YPTvxbQ6LqsijqRI322aNvxxeEWyFxXpyCpp
+uq50HtVoVX1a4ONsh/9l75sCAwEAAQ==
+-----END PUBLIC KEY-----
diff --git a/share/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile
index e55977c0a9a9..f55afc979969 100644
--- a/share/keys/pkg/trusted/Makefile
+++ b/share/keys/pkg/trusted/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FILES=	pkg.freebsd.org.2013102301
+FILES=	electrobsd-test-key.conf
 
 FILESDIR=	${SHAREDIR}/keys/pkg/trusted
 FILESMODE=	644
diff --git a/share/keys/pkg/trusted/electrobsd-test-key.conf b/share/keys/pkg/trusted/electrobsd-test-key.conf
new file mode 100644
index 000000000000..e81a919e0ab2
--- /dev/null
+++ b/share/keys/pkg/trusted/electrobsd-test-key.conf
@@ -0,0 +1,2 @@
+function: "sha256"
+fingerprint: "8b1ef90f16ccc99342fb204f7ff57cdd31449e5ce1baa10c0b1b09593c44219d"
-- 
2.11.0