| 1 |
commit: b5e6e07976edfe078377eff92ac13e41fc675b75 |
| 2 |
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 3 |
AuthorDate: Thu Feb 3 08:08:28 2022 +0000 |
| 4 |
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in> |
| 5 |
CommitDate: Thu Feb 3 08:35:29 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b5e6e079 |
| 7 |
|
| 8 |
net-misc/gmid: add 1.8, drop 1.7.4 |
| 9 |
|
| 10 |
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in> |
| 11 |
|
| 12 |
net-misc/gmid/Manifest | 3 +- |
| 13 |
net-misc/gmid/files/gmid.service | 21 ++++++++++ |
| 14 |
.../gmid/{gmid-1.7.4.ebuild => gmid-1.8.ebuild} | 48 ++++++++++++---------- |
| 15 |
.../gmid/{gmid-1.7.4.ebuild => gmid-9999.ebuild} | 48 ++++++++++++---------- |
| 16 |
4 files changed, 77 insertions(+), 43 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest |
| 19 |
index 4f673292d..52d03e95c 100644 |
| 20 |
--- a/net-misc/gmid/Manifest |
| 21 |
+++ b/net-misc/gmid/Manifest |
| 22 |
@@ -1,3 +1,4 @@ |
| 23 |
-DIST gmid-1.7.4.tar.gz 81988 BLAKE2B 4dc2ec0e89aeb0b2c627927f35a9996f3d91c91b0266f351c6b64f1ba52e0f425cc48add1bdee6f5434f2a486ddd76db8c9e574ac9cbaea3e2a34b16bf0ee9ad SHA512 3dd2cae5597d1b88eec8f2f3b8e60ccc3e2034cbaa30382d982cf0435f1a243643d40c5d00aa7d1c7abae9c9f6751b38f7d6741ec08f7ee280bc2db99263d19e |
| 24 |
DIST gmid-1.7.5.sha.sig 708 BLAKE2B ae5c1ee80e7994c9d8b1b630c01b9dea121f08d2d8efd2a6ccfa129badaa680da037c2a0b955497ba81224e0faf2ca95a9ce11076aadf4012321648bdd5cde81 SHA512 b2ca1974188199eae71aab4d7cc740b7101adc7b3ebe36aa5690aa638e03e028f6f8cd6798fda2586543e2ca71981d95d0921fa58775dd8d66898650d9299578 |
| 25 |
DIST gmid-1.7.5.tar.gz 82100 BLAKE2B 15d5ff725019193dd0394ad7d0f641d036064355118c37980c899b8c84b226eff2ebd5c8f0b17d5575e44f26d93b9492ef48efac6d7d93c4f1972dfb965e4e3d SHA512 eb7951f93746fe133291ac4136837b07d768997241fe913650ecd75d98153479e417c34a4e687ca30dc08f904dcc738d16834910ca21b100e3a220d7ed715507 |
| 26 |
+DIST gmid-1.8.sha.sig 888 BLAKE2B 283d9996dc279591bc6537fd3be5666b55ab8e81ae0284d7de867e7d34560cf51502fcd26126f294600785d57f94ac316b545c3bb3788d0db57397ccfebb0524 SHA512 dbb08dbd890c869e09dc9bd528efd6912fb40e8f18bf07601d64c935155b51e7ec8d7722c68b816262f5df78babd0e18e1f98b9df4835960a519595aed744e1d |
| 27 |
+DIST gmid-1.8.tar.gz 141057 BLAKE2B 299514df69c35ea0b5ac8e83261025a3a34a419998e4c3833c4f0f8abff6e526222b3c5b0ae69dffd5b2605efe9c0c27ef870fc8eee34f6059095ca7f18706a6 SHA512 ba1c755909004b8399a2323be6a5325fe5a712c0c845630cadabd83d1fb9dd636b4ac077df5b644c04b4701f1b8a92ca02126dcb5c82019ce5a46beefdc42dd5 |
| 28 |
|
| 29 |
diff --git a/net-misc/gmid/files/gmid.service b/net-misc/gmid/files/gmid.service |
| 30 |
new file mode 100644 |
| 31 |
index 000000000..9c5d14cc8 |
| 32 |
--- /dev/null |
| 33 |
+++ b/net-misc/gmid/files/gmid.service |
| 34 |
@@ -0,0 +1,21 @@ |
| 35 |
+[Unit] |
| 36 |
+Description=The gmid Gemini server |
| 37 |
+Documentation=https://gmid.omarpolo.com/ |
| 38 |
+After=network-online.target syslog.target |
| 39 |
+Wants=network-online.target |
| 40 |
+ |
| 41 |
+[Service] |
| 42 |
+Type=simple |
| 43 |
+User=gemini |
| 44 |
+Group=gemini |
| 45 |
+ExecStart=/usr/bin/gmid -f -c /etc/gmid.conf |
| 46 |
+ExecStop=/bin/kill -TERM $MAINPID |
| 47 |
+ExecReload=/bin/kill -HUP $MAINPID |
| 48 |
+Restart=on-failure |
| 49 |
+RestartSec=30 |
| 50 |
+StandardOutput=journal |
| 51 |
+StandardError=inherit |
| 52 |
+SyslogIdentifier=gmid |
| 53 |
+ |
| 54 |
+[Install] |
| 55 |
+WantedBy=multi-user.target |
| 56 |
|
| 57 |
diff --git a/net-misc/gmid/gmid-1.7.4.ebuild b/net-misc/gmid/gmid-1.8.ebuild |
| 58 |
similarity index 66% |
| 59 |
copy from net-misc/gmid/gmid-1.7.4.ebuild |
| 60 |
copy to net-misc/gmid/gmid-1.8.ebuild |
| 61 |
index 10cb49b3a..7b929d7cc 100644 |
| 62 |
--- a/net-misc/gmid/gmid-1.7.4.ebuild |
| 63 |
+++ b/net-misc/gmid/gmid-1.8.ebuild |
| 64 |
@@ -1,11 +1,12 @@ |
| 65 |
-# Copyright 1999-2021 Gentoo Authors |
| 66 |
+# Copyright 1999-2022 Gentoo Authors |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
EAPI=8 |
| 70 |
|
| 71 |
SSL_DAYS=36500 |
| 72 |
SSL_CERT_MANDATORY=1 |
| 73 |
-inherit ssl-cert systemd toolchain-funcs |
| 74 |
+VERIFY_SIG_METHOD="signify" |
| 75 |
+inherit ssl-cert systemd toolchain-funcs verify-sig |
| 76 |
|
| 77 |
DESCRIPTION="Simple and secure Gemini server" |
| 78 |
HOMEPAGE="https://gmid.omarpolo.com" |
| 79 |
@@ -14,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then |
| 80 |
EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git" |
| 81 |
inherit git-r3 |
| 82 |
else |
| 83 |
- SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz" |
| 84 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 85 |
+ SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz |
| 86 |
+ verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )" |
| 87 |
+ KEYWORDS="~amd64 ~x86" |
| 88 |
fi |
| 89 |
|
| 90 |
LICENSE="BSD ISC MIT" |
| 91 |
@@ -28,24 +30,35 @@ DEPEND=" |
| 92 |
acct-user/gemini |
| 93 |
dev-libs/imsg-compat |
| 94 |
dev-libs/libevent:= |
| 95 |
- dev-libs/libretls |
| 96 |
+ dev-libs/libretls:= |
| 97 |
dev-libs/openssl:= |
| 98 |
" |
| 99 |
+RDEPEND="${DEPEND}" |
| 100 |
BDEPEND=" |
| 101 |
virtual/pkgconfig |
| 102 |
virtual/yacc |
| 103 |
" |
| 104 |
-RDEPEND="${DEPEND}" |
| 105 |
+if [[ ${PV} != 9999 ]]; then |
| 106 |
+ BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )" |
| 107 |
+fi |
| 108 |
|
| 109 |
-DOCS=( README.md ChangeLog contrib/README ) |
| 110 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub" |
| 111 |
|
| 112 |
-src_prepare() { |
| 113 |
- default |
| 114 |
+DOCS=( README.md ChangeLog contrib/README ) |
| 115 |
|
| 116 |
- sed \ |
| 117 |
- -e "s:/usr/local/bin/gmid:/usr/bin/gmid:" \ |
| 118 |
- -e "s:/etc/gmid.conf:/etc/gmid/gmid.conf:" \ |
| 119 |
- -i contrib/gmid.service || die |
| 120 |
+src_unpack() { |
| 121 |
+ if [[ ${PV} == 9999 ]]; then |
| 122 |
+ git-r3_src_unpack |
| 123 |
+ else |
| 124 |
+ if use verify-sig; then |
| 125 |
+ # Too many levels of symbolic links |
| 126 |
+ cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die |
| 127 |
+ cd "${WORKDIR}" || die |
| 128 |
+ verify-sig_verify_signed_checksums \ |
| 129 |
+ ${P}.sha.sig sha256 ${P}.tar.gz |
| 130 |
+ fi |
| 131 |
+ default |
| 132 |
+ fi |
| 133 |
} |
| 134 |
|
| 135 |
src_configure() { |
| 136 |
@@ -66,13 +79,6 @@ src_configure() { |
| 137 |
fi |
| 138 |
} |
| 139 |
|
| 140 |
-src_compile() { |
| 141 |
- emake gmid |
| 142 |
- if use test ; then |
| 143 |
- emake -C regress gg data puny-test fcgi-test |
| 144 |
- fi |
| 145 |
-} |
| 146 |
- |
| 147 |
src_test() { |
| 148 |
emake regress |
| 149 |
} |
| 150 |
@@ -86,7 +92,7 @@ src_install() { |
| 151 |
insinto /usr/share/vim/vimfiles |
| 152 |
doins -r contrib/vim/* |
| 153 |
|
| 154 |
- systemd_dounit contrib/gmid.service |
| 155 |
+ systemd_dounit "${FILESDIR}"/gmid.service |
| 156 |
newinitd "${FILESDIR}"/gmid.initd gmid |
| 157 |
newconfd "${FILESDIR}"/gmid.confd gmid |
| 158 |
|
| 159 |
|
| 160 |
diff --git a/net-misc/gmid/gmid-1.7.4.ebuild b/net-misc/gmid/gmid-9999.ebuild |
| 161 |
similarity index 66% |
| 162 |
rename from net-misc/gmid/gmid-1.7.4.ebuild |
| 163 |
rename to net-misc/gmid/gmid-9999.ebuild |
| 164 |
index 10cb49b3a..7b929d7cc 100644 |
| 165 |
--- a/net-misc/gmid/gmid-1.7.4.ebuild |
| 166 |
+++ b/net-misc/gmid/gmid-9999.ebuild |
| 167 |
@@ -1,11 +1,12 @@ |
| 168 |
-# Copyright 1999-2021 Gentoo Authors |
| 169 |
+# Copyright 1999-2022 Gentoo Authors |
| 170 |
# Distributed under the terms of the GNU General Public License v2 |
| 171 |
|
| 172 |
EAPI=8 |
| 173 |
|
| 174 |
SSL_DAYS=36500 |
| 175 |
SSL_CERT_MANDATORY=1 |
| 176 |
-inherit ssl-cert systemd toolchain-funcs |
| 177 |
+VERIFY_SIG_METHOD="signify" |
| 178 |
+inherit ssl-cert systemd toolchain-funcs verify-sig |
| 179 |
|
| 180 |
DESCRIPTION="Simple and secure Gemini server" |
| 181 |
HOMEPAGE="https://gmid.omarpolo.com" |
| 182 |
@@ -14,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then |
| 183 |
EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git" |
| 184 |
inherit git-r3 |
| 185 |
else |
| 186 |
- SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz" |
| 187 |
- KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
| 188 |
+ SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz |
| 189 |
+ verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )" |
| 190 |
+ KEYWORDS="~amd64 ~x86" |
| 191 |
fi |
| 192 |
|
| 193 |
LICENSE="BSD ISC MIT" |
| 194 |
@@ -28,24 +30,35 @@ DEPEND=" |
| 195 |
acct-user/gemini |
| 196 |
dev-libs/imsg-compat |
| 197 |
dev-libs/libevent:= |
| 198 |
- dev-libs/libretls |
| 199 |
+ dev-libs/libretls:= |
| 200 |
dev-libs/openssl:= |
| 201 |
" |
| 202 |
+RDEPEND="${DEPEND}" |
| 203 |
BDEPEND=" |
| 204 |
virtual/pkgconfig |
| 205 |
virtual/yacc |
| 206 |
" |
| 207 |
-RDEPEND="${DEPEND}" |
| 208 |
+if [[ ${PV} != 9999 ]]; then |
| 209 |
+ BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )" |
| 210 |
+fi |
| 211 |
|
| 212 |
-DOCS=( README.md ChangeLog contrib/README ) |
| 213 |
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub" |
| 214 |
|
| 215 |
-src_prepare() { |
| 216 |
- default |
| 217 |
+DOCS=( README.md ChangeLog contrib/README ) |
| 218 |
|
| 219 |
- sed \ |
| 220 |
- -e "s:/usr/local/bin/gmid:/usr/bin/gmid:" \ |
| 221 |
- -e "s:/etc/gmid.conf:/etc/gmid/gmid.conf:" \ |
| 222 |
- -i contrib/gmid.service || die |
| 223 |
+src_unpack() { |
| 224 |
+ if [[ ${PV} == 9999 ]]; then |
| 225 |
+ git-r3_src_unpack |
| 226 |
+ else |
| 227 |
+ if use verify-sig; then |
| 228 |
+ # Too many levels of symbolic links |
| 229 |
+ cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die |
| 230 |
+ cd "${WORKDIR}" || die |
| 231 |
+ verify-sig_verify_signed_checksums \ |
| 232 |
+ ${P}.sha.sig sha256 ${P}.tar.gz |
| 233 |
+ fi |
| 234 |
+ default |
| 235 |
+ fi |
| 236 |
} |
| 237 |
|
| 238 |
src_configure() { |
| 239 |
@@ -66,13 +79,6 @@ src_configure() { |
| 240 |
fi |
| 241 |
} |
| 242 |
|
| 243 |
-src_compile() { |
| 244 |
- emake gmid |
| 245 |
- if use test ; then |
| 246 |
- emake -C regress gg data puny-test fcgi-test |
| 247 |
- fi |
| 248 |
-} |
| 249 |
- |
| 250 |
src_test() { |
| 251 |
emake regress |
| 252 |
} |
| 253 |
@@ -86,7 +92,7 @@ src_install() { |
| 254 |
insinto /usr/share/vim/vimfiles |
| 255 |
doins -r contrib/vim/* |
| 256 |
|
| 257 |
- systemd_dounit contrib/gmid.service |
| 258 |
+ systemd_dounit "${FILESDIR}"/gmid.service |
| 259 |
newinitd "${FILESDIR}"/gmid.initd gmid |
| 260 |
newconfd "${FILESDIR}"/gmid.confd gmid |
Archives