From 065de7d613dd3a4221988f33879fac2f05d930a7 Mon Sep 17 00:00:00 2001 From: Stoiko Ivanov Date: Thu, 17 Sep 2020 18:24:42 +0200 Subject: [PATCH] remove archive keys from proxmox-mailgateway and depend on proxmox-archive-keyring instead, which ships them for all Proxmox products. this commit mirrors cb0a97d1c0b52c3905b00b98652b8ead45c6cc31 from proxmox-ve Signed-off-by: Stoiko Ivanov --- debian/control | 3 ++- debian/lintian-overrides | 1 - debian/postinst | 2 ++ debian/postrm | 3 +++ debian/proxmox-mailgateway-container.install | 2 -- ...oxmox-mailgateway-container.lintian-overrides | 1 - debian/proxmox-mailgateway-container.maintscript | 1 + debian/proxmox-mailgateway.install | 2 -- debian/proxmox-mailgateway.maintscript | 2 ++ debian/proxmox-ve-release-5.x.gpg | Bin 1181 -> 0 bytes debian/proxmox-ve-release-6.x.gpg | Bin 1202 -> 0 bytes 11 files changed, 10 insertions(+), 7 deletions(-) delete mode 100644 debian/lintian-overrides delete mode 100644 debian/proxmox-mailgateway-container.install delete mode 100644 debian/proxmox-mailgateway-container.lintian-overrides create mode 120000 debian/proxmox-mailgateway-container.maintscript create mode 100644 debian/proxmox-mailgateway.maintscript delete mode 100644 debian/proxmox-ve-release-5.x.gpg delete mode 100644 debian/proxmox-ve-release-6.x.gpg diff --git a/debian/control b/debian/control index bae9cea..0f804a6 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Maintainer: Proxmox Support Team Package: proxmox-mailgateway Architecture: all Depends: libc6, + proxmox-archive-keyring, pve-kernel-5.4, pve-kernel-helper, pmg-api @@ -26,7 +27,7 @@ Description: Default Proxmox Kernel Headers Package: proxmox-mailgateway-container Architecture: all -Depends: libc6, pmg-api +Depends: libc6, pmg-api, proxmox-archive-keyring Replaces: proxmox-mailgateway Breaks: proxmox-mailgateway Provides: proxmox-mailgateway diff --git a/debian/lintian-overrides b/debian/lintian-overrides deleted file mode 100644 index 2a97eee..0000000 --- a/debian/lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -proxmox-mailgateway: package-installs-apt-keyring etc/apt/trusted.gpg.d/proxmox-ve-release-* diff --git a/debian/postinst b/debian/postinst index 2c339ab..a8ed163 100755 --- a/debian/postinst +++ b/debian/postinst @@ -12,4 +12,6 @@ case "$1" in ;; esac +#DEBHELPER# + exit 0 diff --git a/debian/postrm b/debian/postrm index 2ee5c14..6306c44 100755 --- a/debian/postrm +++ b/debian/postrm @@ -17,3 +17,6 @@ case "$1" in ;; esac +#DEBHELPER# + +exit 0 diff --git a/debian/proxmox-mailgateway-container.install b/debian/proxmox-mailgateway-container.install deleted file mode 100644 index aff0ac4..0000000 --- a/debian/proxmox-mailgateway-container.install +++ /dev/null @@ -1,2 +0,0 @@ -debian/proxmox-ve-release-5.x.gpg etc/apt/trusted.gpg.d/ -debian/proxmox-ve-release-6.x.gpg etc/apt/trusted.gpg.d/ diff --git a/debian/proxmox-mailgateway-container.lintian-overrides b/debian/proxmox-mailgateway-container.lintian-overrides deleted file mode 100644 index d324f05..0000000 --- a/debian/proxmox-mailgateway-container.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -proxmox-mailgateway-container: package-installs-apt-keyring etc/apt/trusted.gpg.d/proxmox-ve-release-* diff --git a/debian/proxmox-mailgateway-container.maintscript b/debian/proxmox-mailgateway-container.maintscript new file mode 120000 index 0000000..09191e6 --- /dev/null +++ b/debian/proxmox-mailgateway-container.maintscript @@ -0,0 +1 @@ +proxmox-mailgateway.maintscript \ No newline at end of file diff --git a/debian/proxmox-mailgateway.install b/debian/proxmox-mailgateway.install index f849d05..4183813 100644 --- a/debian/proxmox-mailgateway.install +++ b/debian/proxmox-mailgateway.install @@ -1,3 +1 @@ -debian/proxmox-ve-release-5.x.gpg etc/apt/trusted.gpg.d/ -debian/proxmox-ve-release-6.x.gpg etc/apt/trusted.gpg.d/ debian/grub/proxmox-mailgateway.cfg etc/default/grub.d/ diff --git a/debian/proxmox-mailgateway.maintscript b/debian/proxmox-mailgateway.maintscript new file mode 100644 index 0000000..5a234c1 --- /dev/null +++ b/debian/proxmox-mailgateway.maintscript @@ -0,0 +1,2 @@ +rm_conffile /etc/apt/trusted.gpg.d/proxmox-ve-release-5.x.gpg 6.2-2~~ +rm_conffile /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg 6.2-2~~ diff --git a/debian/proxmox-ve-release-5.x.gpg b/debian/proxmox-ve-release-5.x.gpg deleted file mode 100644 index 8488f4597a19764cefa9f505198cf9cade46a7a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/debian/proxmox-ve-release-6.x.gpg b/debian/proxmox-ve-release-6.x.gpg deleted file mode 100644 index efebf1c5fec7ca8522a06f4b42e04b554f9d079c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 -- 2.39.2