From b0b3d5db348ec66d2183ef942114f4a4b8c53fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20B=C3=BChler?= Date: Wed, 31 Dec 2014 16:08:33 +0100 Subject: [PATCH] add more keys and sources; include wheezy-helpers by default for l2-jessie --- README.txt | 6 ++++ refresh-obs-keys.sh | 29 ++++++++++++++++++ sources.list.d/jenkins-ci.org.list | 1 + sources.list.d/lighttpd2-jessie.list | 4 +-- sources.list.d/obs-home-stbuehler-wheezy.list | 1 + sources.list.d/obs-openSUSE-Tools-wheezy.list | 1 + trusted.gpg.d/jenkins-ci.org.gpg | Bin 0 -> 5146 bytes trusted.gpg.d/obs-home-stbuehler.gpg | Bin 669 -> 669 bytes trusted.gpg.d/obs-openSUSE-Tools.gpg | Bin 0 -> 669 bytes 9 files changed, 40 insertions(+), 2 deletions(-) create mode 100755 refresh-obs-keys.sh create mode 100644 sources.list.d/jenkins-ci.org.list create mode 100644 sources.list.d/obs-home-stbuehler-wheezy.list create mode 100644 sources.list.d/obs-openSUSE-Tools-wheezy.list create mode 100644 trusted.gpg.d/jenkins-ci.org.gpg create mode 100644 trusted.gpg.d/obs-openSUSE-Tools.gpg diff --git a/README.txt b/README.txt index 94c3bc8..82bab09 100644 --- a/README.txt +++ b/README.txt @@ -1,3 +1,9 @@ * symlink the files you like into /etc/apt/* * create-gpgring.sh can create new files for trusted.gpg.d/ from public keys and should be preferred over apt-key add + +Key sources: + +* https://jenkins-ci.org/debian/jenkins-ci.org.key +* https://debian.lighttpd.net/jenkins-lighttpd.net.gpg +* `osc signkey` for OBS projects diff --git a/refresh-obs-keys.sh b/refresh-obs-keys.sh new file mode 100755 index 0000000..bdcdbcb --- /dev/null +++ b/refresh-obs-keys.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +set -e + +tmpdir=$(mktemp --tmpdir -d refresh-obs-keys-XXXXXXX) +trap 'rm -rf "${tmpdir}"' EXIT + +self=`readlink -f "$0"` +basedir=`dirname "${self}"` +keyringdir="${basedir}/trusted.gpg.d" + +cd "${tmpdir}" + +obs_get() { + local proj="$1" + local target="$2" + + echo "Fetching key for ${proj}" + osc signkey --notravers "${proj}" > "public.key" + + echo "Converting to keyring" + "${basedir}/create-gpgring.sh" -o "keyring.gpg" -- "public.key" + + mv "keyring.gpg" "${target}" +} + +obs_get "home:stbuehler" "${keyringdir}/obs-home-stbuehler.gpg" +obs_get "server:http" "${keyringdir}/obs-server-http.gpg" +obs_get "openSUSE:Tools" "${keyringdir}/obs-openSUSE-Tools.gpg" diff --git a/sources.list.d/jenkins-ci.org.list b/sources.list.d/jenkins-ci.org.list new file mode 100644 index 0000000..5d28261 --- /dev/null +++ b/sources.list.d/jenkins-ci.org.list @@ -0,0 +1 @@ +deb http://pkg.jenkins-ci.org/debian binary/ diff --git a/sources.list.d/lighttpd2-jessie.list b/sources.list.d/lighttpd2-jessie.list index dacb497..033b227 100644 --- a/sources.list.d/lighttpd2-jessie.list +++ b/sources.list.d/lighttpd2-jessie.list @@ -3,8 +3,8 @@ deb http://debian.lighttpd.net/lighttpd2 testing main -## no need for nightly helpers +## there should be no need for nightly helpers ## deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2-nightlies/Debian_7.0 ./ # use helpers from wheezy (7.0) repo -# deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2/Debian_7.0 ./ +deb http://download.opensuse.org/repositories/home:/stbuehler:/lighttpd2/Debian_7.0 ./ diff --git a/sources.list.d/obs-home-stbuehler-wheezy.list b/sources.list.d/obs-home-stbuehler-wheezy.list new file mode 100644 index 0000000..dd99a71 --- /dev/null +++ b/sources.list.d/obs-home-stbuehler-wheezy.list @@ -0,0 +1 @@ +deb http://download.opensuse.org/repositories/home:/stbuehler/Debian_7.0 ./ diff --git a/sources.list.d/obs-openSUSE-Tools-wheezy.list b/sources.list.d/obs-openSUSE-Tools-wheezy.list new file mode 100644 index 0000000..707c28b --- /dev/null +++ b/sources.list.d/obs-openSUSE-Tools-wheezy.list @@ -0,0 +1 @@ +deb http://download.opensuse.org/repositories/openSUSE:/Tools/Debian_7.0/ ./ diff --git a/trusted.gpg.d/jenkins-ci.org.gpg b/trusted.gpg.d/jenkins-ci.org.gpg new file mode 100644 index 0000000000000000000000000000000000000000..c14e43bb9eb53055583fad6ab24ac13d2aade299 GIT binary patch literal 5146 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 delta 76 zcmV-S0JHy{1)T-3?*R=`60!^e8v_Li4p;K@ll%cAE*0(oo+Z`iTqt^|%5=oq*SBKn i-9d+a-vFS6t^MaHi~vFmBu+hBo>o&No!TjrO#)D@Fd$0+ diff --git a/trusted.gpg.d/obs-openSUSE-Tools.gpg b/trusted.gpg.d/obs-openSUSE-Tools.gpg new file mode 100644 index 0000000000000000000000000000000000000000..f0a23b3f9966a64c9956bac0d84f134853fb3340 GIT binary patch literal 669 zcmV;O0%HA{0ipy)mRmCs1OSFNX?Z}lX0Y;yRM|UuC3jW}l$*WqHH{X<<<=hB7pmC1 z`vttLDhuydsFy1M{3FKy25K^7#Ev@ATn{5iqt{OeYnHg?j!PKr?TrHsQdK|lAW+=x zpxDcYs!A@&p2F%Ya>Iue+3{;Pb~F3IL)dxW38^uO^QH>h&=^*@L$?5+hklN5{XOJ| zZNrU1p_qMxg99j?1Ns9S8I(W--H*e3L9(u?CRC8D$!0vQQt2yph3;sR3y%kt3Ji8} zaDq+nu~2NVlkpcY{+wS$Gi=G=55{3(hKqkx%T=~UhaUjjo>z>qH3`ePkRWYJ{2yP! zo?c&Sq+GTHS>q;e%=cpcsnog=z5GZ(g0-=nKxLi-(NRWA&r;@N2%`#hhtY8)!Gq^A!JgZ zFmPLEMZq$ji-eBlv_5ZeWo}bdQ$;#dZ*OdKAWuS5AW(8|YGq?|AUtnyWo}bdQ$;#d zZ*OdKKw@=iY-BEPaAj_Db#rAdZ*pfoh-L&65dr`v1p-ut<}3mm0|f~Y4?6h<3ke7Z z0|EpU0tf>H76JnS0v-VZ7k~f?2@r*KI;HOZ{ptO<0H1N8sCukfATT`%yqEkxEP0Xp z{p|pq5fMTdjX{RCQumS)8 DNxvc7 literal 0 HcmV?d00001