From 5ee464ef4d5c792664e93f72472a9698782601c2 Mon Sep 17 00:00:00 2001
From: Ruben Rodriguez <ruben@trisquel.info>
Date: Mon, 8 Oct 2018 22:49:05 -0400
Subject: [PATCH] Backport ring and opendht from cosmic

---
 helpers/make-opendht | 4 ++--
 helpers/make-ring    | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/helpers/make-opendht b/helpers/make-opendht
index a93800e9..f6a57361 100644
--- a/helpers/make-opendht
+++ b/helpers/make-opendht
@@ -18,11 +18,11 @@
 #
 
 VERSION=1
-EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu bionic main universe'
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu cosmic main universe'
 REPOKEY=7638D0442B90D010
 
 . ./config
 
-changelog "Backported from bionic"
+changelog "Backported from cosmic"
 
 compile
diff --git a/helpers/make-ring b/helpers/make-ring
index 98ea8ae6..065dca65 100644
--- a/helpers/make-ring
+++ b/helpers/make-ring
@@ -32,11 +32,13 @@
 #   softhsm2
 
 VERSION=1
-EXTERNAL='deb-src http://ftp.us.debian.org/debian testing main'
-REPOKEY="04EE7237B7D453EC"
+EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu cosmic main universe'
+REPOKEY=7638D0442B90D010
 
 . ./config
 
-changelog "Backported from debian testing"
+sed 's/--disable-downloads/--disable-downloads --disable-nettle/' -i debian/rules
+
+changelog "Backported from cosmic"
 
 compile
-- 
GitLab