From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B9D12696BF for ; Thu, 6 Aug 2020 17:18:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B6F641E35A for ; Thu, 6 Aug 2020 17:18:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id E1CBB1E34E for ; Thu, 6 Aug 2020 17:18:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id AEC784377D for ; Thu, 6 Aug 2020 17:18:04 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Thu, 6 Aug 2020 17:17:48 +0200 Message-Id: <20200806151750.1460435-2-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806151750.1460435-1-f.gruenbichler@proxmox.com> References: <20200806151750.1460435-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.042 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH proxmox-archive-keyring] initial commit X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Aug 2020 15:18:06 -0000 taking over from product-specific meta packages, which can now depend on proxmox-archive-keyring and drop their copies of the keys. Signed-off-by: Fabian Grünbichler --- note: new repo ;) Makefile | 31 +++++++++++++++++++++++++ debian/changelog | 5 ++++ debian/compat | 1 + debian/control | 12 ++++++++++ debian/copyright | 21 +++++++++++++++++ debian/proxmox-archive-keyring.docs | 1 + debian/proxmox-archive-keyring.install | 2 ++ debian/proxmox-release-buster.gpg | Bin 0 -> 1202 bytes debian/proxmox-release-stretch.gpg | Bin 0 -> 1181 bytes debian/rules | 28 ++++++++++++++++++++++ 10 files changed, 101 insertions(+) create mode 100644 Makefile create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/proxmox-archive-keyring.docs create mode 100644 debian/proxmox-archive-keyring.install create mode 100644 debian/proxmox-release-buster.gpg create mode 100644 debian/proxmox-release-stretch.gpg create mode 100755 debian/rules diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ddb0ef4 --- /dev/null +++ b/Makefile @@ -0,0 +1,31 @@ +include /usr/share/dpkg/pkg-info.mk + +PACKAGE=proxmox-archive-keyring + +GITVERSION:=$(shell git rev-parse HEAD) + +DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb + +BUILD_DIR=build + +all: deb +deb: ${DEB} + +${DEB}: debian + rm -rf ${BUILD_DIR} + mkdir -p ${BUILD_DIR}/debian + cp -ar debian/* ${BUILD_DIR}/debian/ + echo "git clone git://git.proxmox.com/git/proxmox-archive-keyring.git\\ngit checkout ${GITVERSION}" > ${BUILD_DIR}/debian/SOURCE + cd ${BUILD_DIR}; dpkg-buildpackage -b -uc -us + lintian ${DEB} + +.PHONY: upload +upload: ${DEB} + tar cf - ${DEB}|ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch ${ARCH} + +.PHONY: distclean +distclean: clean + +.PHONY: clean +clean: + rm -rf *~ ${BUILD_DIR} *.deb *.dsc *.changes *.buildinfo diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..42bc438 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +proxmox-archive-keyring (1.0) pbs pmg pve; urgency=medium + + * unify keyring handling for all products into single package + + -- Proxmox Support Team Thu, 6 Aug 2020 16:33:01 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..48082f7 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +12 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..692bc23 --- /dev/null +++ b/debian/control @@ -0,0 +1,12 @@ +Source: proxmox-archive-keyring +Section: misc +Priority: optional +Build-Depends: debhelper (>=12~), + lintian, +Maintainer: Proxmox Support Team + +Package: proxmox-archive-keyring +Architecture: all +Description: Proxmox APT archive keyring + This package contains the release keyrings used to sign APT repositories for + various Proxmox products. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..891c52f --- /dev/null +++ b/debian/copyright @@ -0,0 +1,21 @@ +Copyright (C) 2020 Proxmox Server Solutions GmbH + +This software is written by Proxmox Server Solutions GmbH + + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02110-1301 USA + +The complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. diff --git a/debian/proxmox-archive-keyring.docs b/debian/proxmox-archive-keyring.docs new file mode 100644 index 0000000..8696672 --- /dev/null +++ b/debian/proxmox-archive-keyring.docs @@ -0,0 +1 @@ +debian/SOURCE diff --git a/debian/proxmox-archive-keyring.install b/debian/proxmox-archive-keyring.install new file mode 100644 index 0000000..e8c35af --- /dev/null +++ b/debian/proxmox-archive-keyring.install @@ -0,0 +1,2 @@ +debian/proxmox-release-stretch.gpg etc/apt/trusted.gpg.d/ +debian/proxmox-release-buster.gpg etc/apt/trusted.gpg.d/ diff --git a/debian/proxmox-release-buster.gpg b/debian/proxmox-release-buster.gpg new file mode 100644 index 0000000000000000000000000000000000000000..efebf1c5fec7ca8522a06f4b42e04b554f9d079c GIT binary patch literal 1202 zcmV;j1Wo&y0u2OP@^=0K5CE#PtzH*^erG>N(h`YFy^<1#%GhkWYn&PUcK8mln{DvA zemc%?diZ9uI~#s^Og=|@y0dU<@g_J1z<WT5%+|A0-$WtpSP*0|U7468wdnrRAr?$fatadM*LL*-^8Y}g|(v$@K zn}DTGZy|Flj+qe5@|S9>_O^wba6F)0M`al>!N<}M_he(b3A_WfrFaqW{M=r3e5ZL|^#uoGb!XNgi0bQmb9<^%{Us{eoS`?!NTM3SG9+=aRv7Z!TNwTwQZ~~$?QA6XJYzQMsq3iOaXY+z zg3X7Zt@>eXqP>{t%t}<7>v6wpUjBGulmKN&?_{oEo}-pcYQ$zp?KHXuiz}8nPqs#i zleG{w+V54CZbJT7ZWu1wk+nu$-zac8>f+u=$j#fRUFfdv^BHX+LJJSUxe#&ln!s5Q zlwkwS{Zp-U+J68M0RRECNlxCFZDnqBAT};|AW~&) zWnpt=AWLO=AUtq#Z+LBQcr9{eY-M3{Wk7IpZ+LBQcrIgaZ9a(tR0I}P0viJb2@=c$00j#P2nPZN6$l9m3jzcd0s{d8 z9svRufB*^!5PR~0E{bl5;Lv3d0HaA4b5C@n+ay#v^r#-w+aDB49B&JeI*MjT0V=<` zEpT_0o{QzAK0XW+{c-~OOsv2v+_u{y35RSNv$3cUY2y6y^{3^{4YxZh%z701sd-+o zr*3(d27rcA2$utU>d;o6nLOVJ5vLsX>^g(xymn(;`{|s+sF>~jqg-0UV{-BMVZW|* z3Nz^|u+SHhs4{KKb~VB3dM*;ONn|_JXxWA~5#iu`)`;Yb$)P+?MJ!PrN2qBtz5zBm z><^9Qg&>4aDd>U~us)hmAHl!Ng6@UjK8UdYz9QR(=?<8T3Msg*&|bO4q&L83WGrsO zppvSf<=nf(5zTWi3D&6A1-zq?&DBTed|( zTzaESJ#}PJs5(1RNmVrRCbfI4qj|`}<^|K>@96i0@I)3ao&`W* QS%$d}Ac1>LWWW6HVu#o=bN~PV literal 0 HcmV?d00001 diff --git a/debian/proxmox-release-stretch.gpg b/debian/proxmox-release-stretch.gpg new file mode 100644 index 0000000000000000000000000000000000000000..8488f4597a19764cefa9f505198cf9cade46a7a7 GIT binary patch literal 1181 zcmV;O1Y-M{0u2OL!^(#N5CFlbWz^cmS$iU3j`tWHxifM%&-CJff@AGol zsH@ILM|Nb@iXiJR!?bucn(rCU?!EmI{EML$~s&c;(5!^@tb|ry{`aO#N9+z^lU6`^U=!f7Tc$! zoJu!T$l!B7y`0~@JAD*={9he%hY3_Mf^*m_n{^#=7AZ`V;vucOl(~YCCW7VZe`h<2?yaA!=_po7;jXswMD!B8Z8z zv~|Y_Wr@@QYUi%aIdM4CyU;e1HqVb+HdJ^)i{)PH%+mr(Dvyg5H|>w4qss@3b=}2B zJVsD78XMLlq!+f)>p@F#6Hg?f4tz~`wNZO%${Xjm>06*^Ldp3*24+}O`)fDgL+eY0 zly<6cva%?+#m{)d>C-*cJO03{B;`!5Q)oB~kK)iFk$rTH+FUqC)t^o&dlK4i?MM<{ z1SU1+FvTC!pxXcu0RRECNlxCFZDnqBAT=&{AW~&) zWnpt=AWLO=AUtq#Z+LBQcr9{eY-M3{Wk7IpZ+LBQcrIgaZ9a(tKLis22mmPs0$0Pz zhXNY|1ql+&0{{mL2?z%R0s#gU2m%QT3j`Jd0|5da0Rk6*0162Z4VoEH;_n6nIz$it zD62qC$c7Ov6A}vxxO3<;ku+a|R)os7jNY@JZ0P1f6_|CzlY;Si>S;2902em#|7NW2>mD{k4seJ&(fq zKbBzToOheFC9lLCveIcBXbe2>4;<$fAUb)={>gB0=oB}<=IWOsdVX6XII*|BN~?M$ zWHpZ-)zgJP<2#`Onrs!pt^LXQD@AhXs*iy{ zGRVl$2mg#JlKI=JbN2)Q^@YYqmVS#jA2w}xrp0`|ERjkM#gJ6>YiM-?0 zaGVG(Nrs}d?IiohfiKng(O8Fh`a?mMW0(T@+itGYCodZ!=xW5$W~QiniSA{$&RDk0 zDO5xvT6p{&cgVhKc5_1n_QDP5TpK`u=3se|ZVQ8}8h6U(82z8})ztXRz)7WwAwxA2 z&KNr8DY^SB8XS6U+M3NBD;MArAN}nLN+un7G|s#2IFOq*#h4IJ1CUQG9M6?lxOwS= v%Kl)1hf;D({;(*NGd#D)wu}8xdg|eIA%q2|pVoL}OgjDN+!-q6Et(MSB{?cK literal 0 HcmV?d00001 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..c482a3c --- /dev/null +++ b/debian/rules @@ -0,0 +1,28 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +install: + dh_install + dh_installdocs + dh_lintian + dh_installchangelogs + dh_installman + dh_strip_nondeterminism + dh_compress + dh_fixperms + +binary: install + dh_strip + dh_makeshlibs + dh_shlibdeps + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +.PHONY: build clean +build clean: -- 2.20.1