* [gentoo-commits] repo/proj/guru:master commit in: net-misc/gmid/files/, net-misc/gmid/
@ 2021-03-30 8:53 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-03-30 8:53 UTC (permalink / raw
To: gentoo-commits
commit: 391278d559abf05ee79afa855fd04e0b28373d3c
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Mon Mar 29 18:33:01 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Mar 29 18:39:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=391278d5
net-misc/gmid: new package
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>
net-misc/gmid/Manifest | 1 +
net-misc/gmid/files/gmid.confd | 13 ++++++++
net-misc/gmid/files/gmid.initd | 53 ++++++++++++++++++++++++++++++++
net-misc/gmid/gmid-1.6.ebuild | 69 ++++++++++++++++++++++++++++++++++++++++++
net-misc/gmid/gmid-9999.ebuild | 69 ++++++++++++++++++++++++++++++++++++++++++
net-misc/gmid/metadata.xml | 15 +++++++++
6 files changed, 220 insertions(+)
diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
new file mode 100644
index 000000000..00cf99da9
--- /dev/null
+++ b/net-misc/gmid/Manifest
@@ -0,0 +1 @@
+DIST gmid-1.6.tar.gz 59402 BLAKE2B 1a13ae3f598a406e7920ad3a4f73cb230d70fe3bf4a1017d8d196ab80fdc0ffcf339ad79c64de93dc69d06e294132d714ad8ea1a5248dc69377e8d088f772d6c SHA512 cf118ac3b067b23d480006bccf36218ab0bf91d778092855a01706782fb0c68252157615d92d143d29deb8331422ef1263228b9eb53dd30e64a480b17c48af7a
diff --git a/net-misc/gmid/files/gmid.confd b/net-misc/gmid/files/gmid.confd
new file mode 100644
index 000000000..62027f6a4
--- /dev/null
+++ b/net-misc/gmid/files/gmid.confd
@@ -0,0 +1,13 @@
+# /etc/conf.d/gmid
+
+# Configuration file
+#GMID_CONFIGFILE="/etc/gmid/gmid.conf"
+
+# PID file
+#GMID_PIDFILE="/var/run/gmid.pid"
+
+# User to run gmid as
+#GMID_USER="gemini"
+
+# Group to run gmid as
+#GMID_GROUP="gemini"
diff --git a/net-misc/gmid/files/gmid.initd b/net-misc/gmid/files/gmid.initd
new file mode 100644
index 000000000..dfe3b0009
--- /dev/null
+++ b/net-misc/gmid/files/gmid.initd
@@ -0,0 +1,53 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_commands="configtest"
+extra_started_commands="reload"
+
+description="Simple and secure Gemini server"
+description_configtest="Run gmid's internal config check."
+description_reload="Reload the gmid configuration without losing connections."
+
+GMID_CONFIGFILE=${GMID_CONFIGFILE:-/etc/gmid/gmid.conf}
+
+command="/usr/bin/gmid"
+command_args="-c \"${GMID_CONFIGFILE}\""
+pidfile=${GMID_PIDFILE:-/var/run/gmid.pid}
+user=${GMID_USER:-gemini}
+group=${GMID_GROUP:-gemini}
+
+depend() {
+ need net
+ use dns logger netmount
+}
+
+start_pre() {
+ if [ "${RC_CMD}" != "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_pre() {
+ if [ "${RC_CMD}" = "restart" ]; then
+ configtest || return 1
+ fi
+}
+
+stop_post() {
+ rm -f ${pidfile}
+}
+
+reload() {
+ configtest || return 1
+ ebegin "Refreshing gmid's configuration"
+ start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+ eend $? "Failed to reload gmid"
+}
+
+configtest() {
+ ebegin "Checking gmid's configuration"
+ ${command} -c "${GMID_CONFIGFILE}" -n
+
+ eend $? "failed, please correct errors in the config file"
+}
diff --git a/net-misc/gmid/gmid-1.6.ebuild b/net-misc/gmid/gmid-1.6.ebuild
new file mode 100644
index 000000000..7f845df6f
--- /dev/null
+++ b/net-misc/gmid/gmid-1.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="simple and secure Gemini server"
+HOMEPAGE="
+ gemini://gemini.omarpolo.com/pages/gmid.gmi
+ https://www.omarpolo.com/pages/gmid.html
+"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.omarpolo.com/${PN}"
+ KEYWORDS=""
+else
+ SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="libressl"
+
+DEPEND="acct-user/gemini
+ dev-libs/libevent
+ !libressl? ( dev-libs/libretls )
+ libressl? ( dev-libs/libressl )"
+BDEPEND="sys-devel/flex
+ virtual/yacc"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md ChangeLog )
+
+src_prepare() {
+ default
+
+ # QA Notice: command not found
+ # remove `etags` from the "all" target
+ sed \
+ -e "s/^\(all: .*\) TAGS \(.*\)$/\1 \2/" \
+ -i Makefile || die
+}
+
+src_configure() {
+ # note: not an autoconf configure script
+ ./configure \
+ CC="$(tc-getCC)" \
+ PREFIX="${EPREFIX}"/usr/share \
+ BINDIR="${EPREFIX}"/usr/bin \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent" || die
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/gmid.initd gmid
+ newconfd "${FILESDIR}"/gmid.confd gmid
+}
+
+pkg_postinst() {
+ einfo "This gemini server can be run as a user with zero configuration.\n"
+ einfo "In order to use it with the init service you will need to generate a"
+ einfo "self-signed TLS certificate and key and set up the configuration"
+ einfo "file (see man 1 gmid for details)."
+}
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
new file mode 100644
index 000000000..7f845df6f
--- /dev/null
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="simple and secure Gemini server"
+HOMEPAGE="
+ gemini://gemini.omarpolo.com/pages/gmid.gmi
+ https://www.omarpolo.com/pages/gmid.html
+"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.omarpolo.com/${PN}"
+ KEYWORDS=""
+else
+ SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="libressl"
+
+DEPEND="acct-user/gemini
+ dev-libs/libevent
+ !libressl? ( dev-libs/libretls )
+ libressl? ( dev-libs/libressl )"
+BDEPEND="sys-devel/flex
+ virtual/yacc"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md ChangeLog )
+
+src_prepare() {
+ default
+
+ # QA Notice: command not found
+ # remove `etags` from the "all" target
+ sed \
+ -e "s/^\(all: .*\) TAGS \(.*\)$/\1 \2/" \
+ -i Makefile || die
+}
+
+src_configure() {
+ # note: not an autoconf configure script
+ ./configure \
+ CC="$(tc-getCC)" \
+ PREFIX="${EPREFIX}"/usr/share \
+ BINDIR="${EPREFIX}"/usr/bin \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent" || die
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/gmid.initd gmid
+ newconfd "${FILESDIR}"/gmid.confd gmid
+}
+
+pkg_postinst() {
+ einfo "This gemini server can be run as a user with zero configuration.\n"
+ einfo "In order to use it with the init service you will need to generate a"
+ einfo "self-signed TLS certificate and key and set up the configuration"
+ einfo "file (see man 1 gmid for details)."
+}
diff --git a/net-misc/gmid/metadata.xml b/net-misc/gmid/metadata.xml
new file mode 100644
index 000000000..2f806f847
--- /dev/null
+++ b/net-misc/gmid/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <upstream>
+ <maintainer>
+ <name>Omar Polo</name>
+ <email>op@omarpolo.com</email>
+ </maintainer>
+ <changelog>https://git.omarpolo.com/gmid/tree/ChangeLog</changelog>
+ </upstream>
+ <maintainer type="person">
+ <email>cyber@sysrq.in</email>
+ <name>Anna</name>
+ </maintainer>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-misc/gmid/files/, net-misc/gmid/
@ 2021-04-07 8:51 Andrew Ammerlaan
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Ammerlaan @ 2021-04-07 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 65433ba88a032d674582ad5cc387d6dc485b7985
Author: Anna Vyalkova <cyber <AT> sysrq <DOT> in>
AuthorDate: Wed Apr 7 06:55:17 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Apr 7 06:55:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=65433ba8
net-misc/gmid: fix initd script
It writes a valid PID file now
Other changes:
* add a reasonable default configuration file
* automatically generate a self-signed certificate for localhost
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Anna Vyalkova <cyber <AT> sysrq.in>
net-misc/gmid/files/gmid.conf | 8 ++++++++
net-misc/gmid/files/gmid.confd | 9 ---------
net-misc/gmid/files/gmid.initd | 7 +++----
net-misc/gmid/gmid-1.6.ebuild | 17 +++++++++++++++--
net-misc/gmid/gmid-9999.ebuild | 17 +++++++++++++++--
5 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/net-misc/gmid/files/gmid.conf b/net-misc/gmid/files/gmid.conf
new file mode 100644
index 000000000..c9b298c2a
--- /dev/null
+++ b/net-misc/gmid/files/gmid.conf
@@ -0,0 +1,8 @@
+user "gemini" # drop privileges
+
+server "localhost" {
+ root "/var/gemini/localhost"
+ auto index on
+ cert "/etc/ssl/gmid/gmid.crt"
+ key "/etc/ssl/gmid/gmid.key"
+}
diff --git a/net-misc/gmid/files/gmid.confd b/net-misc/gmid/files/gmid.confd
index 62027f6a4..497ddb58e 100644
--- a/net-misc/gmid/files/gmid.confd
+++ b/net-misc/gmid/files/gmid.confd
@@ -2,12 +2,3 @@
# Configuration file
#GMID_CONFIGFILE="/etc/gmid/gmid.conf"
-
-# PID file
-#GMID_PIDFILE="/var/run/gmid.pid"
-
-# User to run gmid as
-#GMID_USER="gemini"
-
-# Group to run gmid as
-#GMID_GROUP="gemini"
diff --git a/net-misc/gmid/files/gmid.initd b/net-misc/gmid/files/gmid.initd
index dfe3b0009..6607c7d2f 100644
--- a/net-misc/gmid/files/gmid.initd
+++ b/net-misc/gmid/files/gmid.initd
@@ -12,10 +12,9 @@ description_reload="Reload the gmid configuration without losing connections."
GMID_CONFIGFILE=${GMID_CONFIGFILE:-/etc/gmid/gmid.conf}
command="/usr/bin/gmid"
-command_args="-c \"${GMID_CONFIGFILE}\""
-pidfile=${GMID_PIDFILE:-/var/run/gmid.pid}
-user=${GMID_USER:-gemini}
-group=${GMID_GROUP:-gemini}
+command_args="-c \"${GMID_CONFIGFILE}\" -f"
+command_background=1
+pidfile="/var/run/gmid.pid"
depend() {
need net
diff --git a/net-misc/gmid/gmid-1.6.ebuild b/net-misc/gmid/gmid-1.6.ebuild
index da3b22779..3e844bfec 100644
--- a/net-misc/gmid/gmid-1.6.ebuild
+++ b/net-misc/gmid/gmid-1.6.ebuild
@@ -3,7 +3,10 @@
EAPI=7
-inherit toolchain-funcs
+SSL_DEPS_SKIP=1
+SSL_DAYS=36500
+
+inherit ssl-cert toolchain-funcs
DESCRIPTION="simple and secure Gemini server"
HOMEPAGE="https://www.omarpolo.com/pages/gmid.html"
@@ -53,13 +56,23 @@ src_configure() {
src_install() {
default
+ dodir /etc/gmid
+ cp "${FILESDIR}"/gmid.conf "${ED}"/etc/gmid/gmid.conf || die
+
newinitd "${FILESDIR}"/gmid.initd gmid
newconfd "${FILESDIR}"/gmid.confd gmid
+
+ keepdir /var/gemini/localhost
}
pkg_postinst() {
+ if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
+ install_cert /etc/ssl/${PN}/${PN}
+ chown gemini:gemini "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+ fi
+
einfo "This gemini server can be run as a user with zero configuration.\n"
einfo "In order to use it with the init service you will need to generate a"
- einfo "self-signed TLS certificate and key and set up the configuration"
+ einfo "self-signed TLS certificate and a key and set up the configuration"
einfo "file (see man 1 gmid for details)."
}
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index da3b22779..3e844bfec 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -3,7 +3,10 @@
EAPI=7
-inherit toolchain-funcs
+SSL_DEPS_SKIP=1
+SSL_DAYS=36500
+
+inherit ssl-cert toolchain-funcs
DESCRIPTION="simple and secure Gemini server"
HOMEPAGE="https://www.omarpolo.com/pages/gmid.html"
@@ -53,13 +56,23 @@ src_configure() {
src_install() {
default
+ dodir /etc/gmid
+ cp "${FILESDIR}"/gmid.conf "${ED}"/etc/gmid/gmid.conf || die
+
newinitd "${FILESDIR}"/gmid.initd gmid
newconfd "${FILESDIR}"/gmid.confd gmid
+
+ keepdir /var/gemini/localhost
}
pkg_postinst() {
+ if [[ ! -f "${EROOT}"/etc/ssl/${PN}/${PN}.key ]]; then
+ install_cert /etc/ssl/${PN}/${PN}
+ chown gemini:gemini "${EROOT}"/etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+ fi
+
einfo "This gemini server can be run as a user with zero configuration.\n"
einfo "In order to use it with the init service you will need to generate a"
- einfo "self-signed TLS certificate and key and set up the configuration"
+ einfo "self-signed TLS certificate and a key and set up the configuration"
einfo "file (see man 1 gmid for details)."
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-misc/gmid/files/, net-misc/gmid/
@ 2021-07-07 14:02 Florian Schmaus
0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2021-07-07 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 0903023cf4993efba41cd9e72bd3d2e444a3e7ca
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Mon Jul 5 20:44:15 2021 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul 5 22:01:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0903023c
net-misc/gmid: add 1.6.2 and tests
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-misc/gmid/Manifest | 2 +-
.../files/gmid-1.6.2-disable-runtime-test.patch | 10 ++++
...pidfile.patch => gmid-1.6.2-make-pidfile.patch} | 0
.../gmid/{gmid-1.6.1.ebuild => gmid-1.6.2.ebuild} | 68 +++++++++++++---------
net-misc/gmid/gmid-9999.ebuild | 62 +++++++++++++-------
5 files changed, 93 insertions(+), 49 deletions(-)
diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
index 636020c63..1a3dac3a9 100644
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1 +1 @@
-DIST gmid-1.6.1.tar.gz 59488 BLAKE2B 147c8eb4e1c7195405fdce9bef8260e1a3acb145e9dfd2cb3fb126e4445685a3a1826906b01699429e98a61db6bb2089ec3399a1403323b36adf2555afc61bf2 SHA512 b98592e4bb5b1121fad07dc1fcbdbc95ce69a5648b3c2d22dba974511ae265255be62a330125c2da9b0b357edc2f24065fd8b475013d3d2023a8eded2c01a490
+DIST gmid-1.6.2.tar.gz 60293 BLAKE2B 807f4e93d1ed0f2a69a9631504ffe28d5aee4efbba85b9e7d0a8eec5b4fb50a38285478651f196f57fbcf7b4d38ff462f78c37210720353af638d76b2b28e3e1 SHA512 053e2f95449d71c72052c422b1c51657ad48f662422a121452618c69e6bac9b23bbaa2b35b52d314eb7614b9a0f413504c87cd431bc756d455dd198c79270da8
diff --git a/net-misc/gmid/files/gmid-1.6.2-disable-runtime-test.patch b/net-misc/gmid/files/gmid-1.6.2-disable-runtime-test.patch
new file mode 100644
index 000000000..c6cb8c19c
--- /dev/null
+++ b/net-misc/gmid/files/gmid-1.6.2-disable-runtime-test.patch
@@ -0,0 +1,10 @@
+--- a/regress/Makefile
++++ b/regress/Makefile
+@@ -4,7 +4,6 @@
+
+ all: puny-test testdata iri_test cert.pem testca.pem valid.crt invalid.cert.pem
+ ./puny-test
+- ./runtime
+ ./iri_test
+
+ puny-test: puny-test.o ../puny.o ../utf8.o ../utils.o ../log.o ${COMPAT}
diff --git a/net-misc/gmid/files/gmid-1.6.1-make-pidfile.patch b/net-misc/gmid/files/gmid-1.6.2-make-pidfile.patch
similarity index 100%
rename from net-misc/gmid/files/gmid-1.6.1-make-pidfile.patch
rename to net-misc/gmid/files/gmid-1.6.2-make-pidfile.patch
diff --git a/net-misc/gmid/gmid-1.6.1.ebuild b/net-misc/gmid/gmid-1.6.2.ebuild
similarity index 57%
rename from net-misc/gmid/gmid-1.6.1.ebuild
rename to net-misc/gmid/gmid-1.6.2.ebuild
index dbf6b69ac..fc7a027df 100644
--- a/net-misc/gmid/gmid-1.6.1.ebuild
+++ b/net-misc/gmid/gmid-1.6.2.ebuild
@@ -3,33 +3,31 @@
EAPI=7
-SSL_DEPS_SKIP=1
SSL_DAYS=36500
-
inherit ssl-cert toolchain-funcs
DESCRIPTION="Simple and secure Gemini server"
HOMEPAGE="https://www.omarpolo.com/pages/gmid.html"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://git.omarpolo.com/${PN}"
-else
- SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
+SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
LICENSE="ISC"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+seccomp test"
+RESTRICT="!test? ( test )"
PATCHES=( "${FILESDIR}"/${P}-make-pidfile.patch )
-DEPEND="acct-user/gemini
+DEPEND="
+ acct-user/gemini
dev-libs/libevent
dev-libs/libretls
"
-BDEPEND="sys-devel/flex
- virtual/yacc"
+BDEPEND="
+ sys-devel/flex
+ virtual/pkgconfig
+ virtual/yacc
+"
RDEPEND="${DEPEND}"
DOCS=( README.md ChangeLog )
@@ -37,28 +35,46 @@ DOCS=( README.md ChangeLog )
src_prepare() {
default
- # QA Notice: command not found
- # remove `etags` from the "all" target
- sed \
- -e "s/^\(all: .*\) TAGS \(.*\)$/\1 \2/" \
- -i Makefile || die
+ if use seccomp && has usersandbox ${FEATURES} ; then
+ eapply "${FILESDIR}"/${P}-disable-runtime-test.patch
+ fi
}
src_configure() {
+ local conf_args
+
# note: not an autoconf configure script
- ./configure \
- CC="$(tc-getCC)" \
- PREFIX="${EPREFIX}"/usr/share \
- BINDIR="${EPREFIX}"/usr/bin \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent" || die
+ conf_args=(
+ CC="$(tc-getCC)"
+ PREFIX="${EPREFIX}"/usr/share
+ BINDIR="${EPREFIX}"/usr/bin
+ CFLAGS="${CFLAGS}"
+ LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent"
+ )
+ if ! use seccomp ; then
+ conf_args+=( --disable-sandbox )
+ fi
+
+ ./configure "${conf_args[@]}" || die
+}
+
+src_compile() {
+ emake gmid
+ if use test ; then
+ emake gg
+ emake -C regress puny-test testdata iri_test
+ fi
+}
+
+src_test() {
+ emake regress
}
src_install() {
default
- dodir /etc/gmid
- cp "${FILESDIR}"/gmid.conf "${ED}"/etc/gmid/gmid.conf || die
+ insinto /etc/gmid
+ doins "${FILESDIR}"/gmid.conf
newinitd "${FILESDIR}"/gmid.initd gmid
newconfd "${FILESDIR}"/gmid.confd gmid
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index a5f8bc23b..4818aacdb 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -3,50 +3,68 @@
EAPI=7
-SSL_DEPS_SKIP=1
SSL_DAYS=36500
-
-inherit ssl-cert toolchain-funcs
+inherit git-r3 ssl-cert toolchain-funcs
DESCRIPTION="Simple and secure Gemini server"
HOMEPAGE="https://www.omarpolo.com/pages/gmid.html"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://git.omarpolo.com/${PN}"
-else
- SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
+EGIT_REPO_URI="https://github.com/omar-polo/${PN}.git https://git.omarpolo.com/${PN}"
LICENSE="ISC"
SLOT="0"
+IUSE="+seccomp test"
+RESTRICT="
+ !test? ( test )
+ seccomp? ( test )
+"
-DEPEND="acct-user/gemini
+DEPEND="
+ acct-user/gemini
dev-libs/libevent
dev-libs/libretls
"
-BDEPEND="sys-devel/flex
- virtual/yacc"
+BDEPEND="
+ virtual/pkgconfig
+ virtual/yacc
+"
RDEPEND="${DEPEND}"
DOCS=( README.md ChangeLog )
src_configure() {
+ local conf_args
+
# note: not an autoconf configure script
- ./configure \
- CC="$(tc-getCC)" \
- PREFIX="${EPREFIX}"/usr/share \
- BINDIR="${EPREFIX}"/usr/bin \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent" || die
+ conf_args=(
+ CC="$(tc-getCC)"
+ PREFIX="${EPREFIX}"/usr/share
+ BINDIR="${EPREFIX}"/usr/bin
+ CFLAGS="${CFLAGS}"
+ LDFLAGS="${LDFLAGS} -ltls -lssl -lcrypto -levent"
+ )
+ if ! use seccomp ; then
+ conf_args+=( --disable-sandbox )
+ fi
+
+ ./configure "${conf_args[@]}" || die
+}
+
+src_compile() {
+ emake gmid
+ if use test ; then
+ emake -C regress gg puny-test testdata iri_test
+ fi
+}
+
+src_test() {
+ emake regress
}
src_install() {
default
- dodir /etc/gmid
- cp "${FILESDIR}"/gmid.conf "${ED}"/etc/gmid/gmid.conf || die
+ insinto /etc/gmid
+ doins "${FILESDIR}"/gmid.conf
newinitd "${FILESDIR}"/gmid.initd gmid
newconfd "${FILESDIR}"/gmid.confd gmid
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-misc/gmid/files/, net-misc/gmid/
@ 2022-02-04 11:44 Florian Schmaus
0 siblings, 0 replies; 5+ messages in thread
From: Florian Schmaus @ 2022-02-04 11:44 UTC (permalink / raw
To: gentoo-commits
commit: b5e6e07976edfe078377eff92ac13e41fc675b75
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Feb 3 08:08:28 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Feb 3 08:35:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b5e6e079
net-misc/gmid: add 1.8, drop 1.7.4
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-misc/gmid/Manifest | 3 +-
net-misc/gmid/files/gmid.service | 21 ++++++++++
.../gmid/{gmid-1.7.4.ebuild => gmid-1.8.ebuild} | 48 ++++++++++++----------
.../gmid/{gmid-1.7.4.ebuild => gmid-9999.ebuild} | 48 ++++++++++++----------
4 files changed, 77 insertions(+), 43 deletions(-)
diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
index 4f673292d..52d03e95c 100644
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1,3 +1,4 @@
-DIST gmid-1.7.4.tar.gz 81988 BLAKE2B 4dc2ec0e89aeb0b2c627927f35a9996f3d91c91b0266f351c6b64f1ba52e0f425cc48add1bdee6f5434f2a486ddd76db8c9e574ac9cbaea3e2a34b16bf0ee9ad SHA512 3dd2cae5597d1b88eec8f2f3b8e60ccc3e2034cbaa30382d982cf0435f1a243643d40c5d00aa7d1c7abae9c9f6751b38f7d6741ec08f7ee280bc2db99263d19e
DIST gmid-1.7.5.sha.sig 708 BLAKE2B ae5c1ee80e7994c9d8b1b630c01b9dea121f08d2d8efd2a6ccfa129badaa680da037c2a0b955497ba81224e0faf2ca95a9ce11076aadf4012321648bdd5cde81 SHA512 b2ca1974188199eae71aab4d7cc740b7101adc7b3ebe36aa5690aa638e03e028f6f8cd6798fda2586543e2ca71981d95d0921fa58775dd8d66898650d9299578
DIST gmid-1.7.5.tar.gz 82100 BLAKE2B 15d5ff725019193dd0394ad7d0f641d036064355118c37980c899b8c84b226eff2ebd5c8f0b17d5575e44f26d93b9492ef48efac6d7d93c4f1972dfb965e4e3d SHA512 eb7951f93746fe133291ac4136837b07d768997241fe913650ecd75d98153479e417c34a4e687ca30dc08f904dcc738d16834910ca21b100e3a220d7ed715507
+DIST gmid-1.8.sha.sig 888 BLAKE2B 283d9996dc279591bc6537fd3be5666b55ab8e81ae0284d7de867e7d34560cf51502fcd26126f294600785d57f94ac316b545c3bb3788d0db57397ccfebb0524 SHA512 dbb08dbd890c869e09dc9bd528efd6912fb40e8f18bf07601d64c935155b51e7ec8d7722c68b816262f5df78babd0e18e1f98b9df4835960a519595aed744e1d
+DIST gmid-1.8.tar.gz 141057 BLAKE2B 299514df69c35ea0b5ac8e83261025a3a34a419998e4c3833c4f0f8abff6e526222b3c5b0ae69dffd5b2605efe9c0c27ef870fc8eee34f6059095ca7f18706a6 SHA512 ba1c755909004b8399a2323be6a5325fe5a712c0c845630cadabd83d1fb9dd636b4ac077df5b644c04b4701f1b8a92ca02126dcb5c82019ce5a46beefdc42dd5
diff --git a/net-misc/gmid/files/gmid.service b/net-misc/gmid/files/gmid.service
new file mode 100644
index 000000000..9c5d14cc8
--- /dev/null
+++ b/net-misc/gmid/files/gmid.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=The gmid Gemini server
+Documentation=https://gmid.omarpolo.com/
+After=network-online.target syslog.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+User=gemini
+Group=gemini
+ExecStart=/usr/bin/gmid -f -c /etc/gmid.conf
+ExecStop=/bin/kill -TERM $MAINPID
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
+RestartSec=30
+StandardOutput=journal
+StandardError=inherit
+SyslogIdentifier=gmid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/gmid/gmid-1.7.4.ebuild b/net-misc/gmid/gmid-1.8.ebuild
similarity index 66%
copy from net-misc/gmid/gmid-1.7.4.ebuild
copy to net-misc/gmid/gmid-1.8.ebuild
index 10cb49b3a..7b929d7cc 100644
--- a/net-misc/gmid/gmid-1.7.4.ebuild
+++ b/net-misc/gmid/gmid-1.8.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
SSL_DAYS=36500
SSL_CERT_MANDATORY=1
-inherit ssl-cert systemd toolchain-funcs
+VERIFY_SIG_METHOD="signify"
+inherit ssl-cert systemd toolchain-funcs verify-sig
DESCRIPTION="Simple and secure Gemini server"
HOMEPAGE="https://gmid.omarpolo.com"
@@ -14,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git"
inherit git-r3
else
- SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz
+ verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )"
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="BSD ISC MIT"
@@ -28,24 +30,35 @@ DEPEND="
acct-user/gemini
dev-libs/imsg-compat
dev-libs/libevent:=
- dev-libs/libretls
+ dev-libs/libretls:=
dev-libs/openssl:=
"
+RDEPEND="${DEPEND}"
BDEPEND="
virtual/pkgconfig
virtual/yacc
"
-RDEPEND="${DEPEND}"
+if [[ ${PV} != 9999 ]]; then
+ BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )"
+fi
-DOCS=( README.md ChangeLog contrib/README )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub"
-src_prepare() {
- default
+DOCS=( README.md ChangeLog contrib/README )
- sed \
- -e "s:/usr/local/bin/gmid:/usr/bin/gmid:" \
- -e "s:/etc/gmid.conf:/etc/gmid/gmid.conf:" \
- -i contrib/gmid.service || die
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ else
+ if use verify-sig; then
+ # Too many levels of symbolic links
+ cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die
+ cd "${WORKDIR}" || die
+ verify-sig_verify_signed_checksums \
+ ${P}.sha.sig sha256 ${P}.tar.gz
+ fi
+ default
+ fi
}
src_configure() {
@@ -66,13 +79,6 @@ src_configure() {
fi
}
-src_compile() {
- emake gmid
- if use test ; then
- emake -C regress gg data puny-test fcgi-test
- fi
-}
-
src_test() {
emake regress
}
@@ -86,7 +92,7 @@ src_install() {
insinto /usr/share/vim/vimfiles
doins -r contrib/vim/*
- systemd_dounit contrib/gmid.service
+ systemd_dounit "${FILESDIR}"/gmid.service
newinitd "${FILESDIR}"/gmid.initd gmid
newconfd "${FILESDIR}"/gmid.confd gmid
diff --git a/net-misc/gmid/gmid-1.7.4.ebuild b/net-misc/gmid/gmid-9999.ebuild
similarity index 66%
rename from net-misc/gmid/gmid-1.7.4.ebuild
rename to net-misc/gmid/gmid-9999.ebuild
index 10cb49b3a..7b929d7cc 100644
--- a/net-misc/gmid/gmid-1.7.4.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
SSL_DAYS=36500
SSL_CERT_MANDATORY=1
-inherit ssl-cert systemd toolchain-funcs
+VERIFY_SIG_METHOD="signify"
+inherit ssl-cert systemd toolchain-funcs verify-sig
DESCRIPTION="Simple and secure Gemini server"
HOMEPAGE="https://gmid.omarpolo.com"
@@ -14,8 +15,9 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://git.omarpolo.com/${PN} https://github.com/omar-polo/${PN}.git"
inherit git-r3
else
- SRC_URI="https://git.omarpolo.com/${PN}/snapshot/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz
+ verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )"
+ KEYWORDS="~amd64 ~x86"
fi
LICENSE="BSD ISC MIT"
@@ -28,24 +30,35 @@ DEPEND="
acct-user/gemini
dev-libs/imsg-compat
dev-libs/libevent:=
- dev-libs/libretls
+ dev-libs/libretls:=
dev-libs/openssl:=
"
+RDEPEND="${DEPEND}"
BDEPEND="
virtual/pkgconfig
virtual/yacc
"
-RDEPEND="${DEPEND}"
+if [[ ${PV} != 9999 ]]; then
+ BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )"
+fi
-DOCS=( README.md ChangeLog contrib/README )
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub"
-src_prepare() {
- default
+DOCS=( README.md ChangeLog contrib/README )
- sed \
- -e "s:/usr/local/bin/gmid:/usr/bin/gmid:" \
- -e "s:/etc/gmid.conf:/etc/gmid/gmid.conf:" \
- -i contrib/gmid.service || die
+src_unpack() {
+ if [[ ${PV} == 9999 ]]; then
+ git-r3_src_unpack
+ else
+ if use verify-sig; then
+ # Too many levels of symbolic links
+ cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die
+ cd "${WORKDIR}" || die
+ verify-sig_verify_signed_checksums \
+ ${P}.sha.sig sha256 ${P}.tar.gz
+ fi
+ default
+ fi
}
src_configure() {
@@ -66,13 +79,6 @@ src_configure() {
fi
}
-src_compile() {
- emake gmid
- if use test ; then
- emake -C regress gg data puny-test fcgi-test
- fi
-}
-
src_test() {
emake regress
}
@@ -86,7 +92,7 @@ src_install() {
insinto /usr/share/vim/vimfiles
doins -r contrib/vim/*
- systemd_dounit contrib/gmid.service
+ systemd_dounit "${FILESDIR}"/gmid.service
newinitd "${FILESDIR}"/gmid.initd gmid
newconfd "${FILESDIR}"/gmid.confd gmid
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: net-misc/gmid/files/, net-misc/gmid/
@ 2024-01-26 10:35 David Roman
0 siblings, 0 replies; 5+ messages in thread
From: David Roman @ 2024-01-26 10:35 UTC (permalink / raw
To: gentoo-commits
commit: 6275d600d3a834d3cbcaa6e91c50abdbc0d0002e
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Jan 25 11:16:31 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Thu Jan 25 11:17:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6275d600
net-misc/gmid: add 2.0.1
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
net-misc/gmid/Manifest | 2 ++
net-misc/gmid/files/gmid.conf-r1 | 12 +++++++++++
.../gmid/{gmid-9999.ebuild => gmid-2.0.1.ebuild} | 24 ++++++++++++----------
net-misc/gmid/gmid-9999.ebuild | 24 ++++++++++++----------
4 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/net-misc/gmid/Manifest b/net-misc/gmid/Manifest
index 674e720be6..7598d362f8 100644
--- a/net-misc/gmid/Manifest
+++ b/net-misc/gmid/Manifest
@@ -1,2 +1,4 @@
DIST gmid-1.8.6.sha.sig 417 BLAKE2B b6b4735580d63d2a741cd26a45d7b418c7219425ce615a1ed767a14132938f880f860481e9f4e47d187efd68d33adb29287731b497a0e23576c9f25076afd21a SHA512 d9c2520abd668b4dd5d2def375e0aba2ba41940b93ff2941237e05ba92380d88f5037dbfe84f982d027fe7fbc0b5743af63b8abe83686cdf0d1ac9444247371f
DIST gmid-1.8.6.tar.gz 121648 BLAKE2B a5d30434603c7b45a12541baa2119377e313309499fcc33af1960f55c71b9dbb330e35f5d845f216a9452fb14670b775151174280fed6360d050e11a6621ddc3 SHA512 fce40e041a313c918acd0fdbe48d1a2d3d9e8907f8e8251c887cb0fcaf6e82b7128936dfc804241b00530d26901448752ac01b590819ed2aee10734c0f29eaae
+DIST gmid-2.0.1.sha256.sig 239 BLAKE2B b118bd39fc529a05112f405589ce2d1c44d4436b19edecb388709ff2cfe4f49ec15506082da6e8a9aecba7cd9ed2d308aafef5432f1692145d6eabe3b5e53683 SHA512 83eff56ffec7ed55338dfe1e48d670779008c523634c86050a63f333ed328541dcaeb1a0d3fccb01bdf2f6d3bbea20c2898bfbd115ee7590203c04bd24baa064
+DIST gmid-2.0.1.tar.gz 182989 BLAKE2B 4973711ee94babd0b0f470cf84f460343c39867753858817b7262d8ca3947e79b2e20fe004627e8acf00728a3b43db4bfddf446115acca8eadf190dcc6ef533f SHA512 38d29775968c40fe174b8ead3393c3cd77dd535dae18d3051eb9b98b248a56929d84909c07c3405ddc6035e7d1fc66ea856a2a1dd96e53ac8d30fd231c764478
diff --git a/net-misc/gmid/files/gmid.conf-r1 b/net-misc/gmid/files/gmid.conf-r1
new file mode 100644
index 0000000000..811a33b3af
--- /dev/null
+++ b/net-misc/gmid/files/gmid.conf-r1
@@ -0,0 +1,12 @@
+certdir = "/etc/ssl/gmid"
+
+user "gemini" # drop privileges
+
+server "localhost" {
+ listen on * port 1965;
+ cert $certdir "/gmid.crt"
+ key $certdir "/gmid.key"
+
+ root "/var/gemini/localhost"
+ auto index on
+}
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-2.0.1.ebuild
similarity index 83%
copy from net-misc/gmid/gmid-9999.ebuild
copy to net-misc/gmid/gmid-2.0.1.ebuild
index 6809adf5d8..f046fc3257 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz
- verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )"
+ verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.sha256.sig )"
KEYWORDS="~amd64 ~x86"
fi
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
DEPEND="
acct-user/gemini
- dev-libs/imsg-compat
dev-libs/libevent:=
dev-libs/libretls:=
dev-libs/openssl:=
@@ -43,21 +42,23 @@ if [[ ${PV} != 9999 ]]; then
BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )"
fi
-QA_CONFIG_IMPL_DECL_SKIP=1
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub"
DOCS=( README.md ChangeLog contrib/README )
+# not an autoconf configure script
+QA_CONFIG_IMPL_DECL_SKIP=( "*" )
+
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
else
if use verify-sig; then
# Too many levels of symbolic links
- cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die
+ cp "${DISTDIR}"/${P}.{sha256.sig,tar.gz} "${WORKDIR}" || die
cd "${WORKDIR}" || die
verify-sig_verify_signed_checksums \
- ${P}.sha.sig sha256 ${P}.tar.gz
+ ${P}.sha256.sig sha256 ${P}.tar.gz
fi
default
fi
@@ -69,14 +70,15 @@ src_configure() {
# note: not an autoconf configure script
conf_args=(
- PREFIX="${EPREFIX}"/usr
- MANDIR="${EPREFIX}"/usr/share/man
+ --prefix="${EPREFIX}"/usr
+ --mandir="${EPREFIX}"/usr/share/man
+ --sysconfdir="${EPREFIX}"/etc
+ --with-libtls=system
$(use_enable seccomp sandbox)
)
-
edo ./configure "${conf_args[@]}"
- if use seccomp && has usersandbox ${FEATURES} ; then
+ if use seccomp && has usersandbox ${FEATURES}; then
export SKIP_RUNTIME_TESTS=1
fi
}
@@ -85,7 +87,7 @@ src_install() {
default
insinto /etc/gmid
- doins "${FILESDIR}"/gmid.conf
+ newins "${FILESDIR}"/gmid.conf-r1 gmid.conf
insinto /usr/share/vim/vimfiles
doins -r contrib/vim/*
diff --git a/net-misc/gmid/gmid-9999.ebuild b/net-misc/gmid/gmid-9999.ebuild
index 6809adf5d8..f046fc3257 100644
--- a/net-misc/gmid/gmid-9999.ebuild
+++ b/net-misc/gmid/gmid-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.tar.gz
- verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/SHA256.sig -> ${P}.sha.sig )"
+ verify-sig? ( https://github.com/omar-polo/${PN}/releases/download/${PV}/${P}.sha256.sig )"
KEYWORDS="~amd64 ~x86"
fi
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
DEPEND="
acct-user/gemini
- dev-libs/imsg-compat
dev-libs/libevent:=
dev-libs/libretls:=
dev-libs/openssl:=
@@ -43,21 +42,23 @@ if [[ ${PV} != 9999 ]]; then
BDEPEND+="verify-sig? ( sec-keys/signify-keys-gmid:$(ver_cut 1-2) )"
fi
-QA_CONFIG_IMPL_DECL_SKIP=1
VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/signify-keys/${PN}-$(ver_cut 1-2).pub"
DOCS=( README.md ChangeLog contrib/README )
+# not an autoconf configure script
+QA_CONFIG_IMPL_DECL_SKIP=( "*" )
+
src_unpack() {
if [[ ${PV} == 9999 ]]; then
git-r3_src_unpack
else
if use verify-sig; then
# Too many levels of symbolic links
- cp "${DISTDIR}"/${P}.{sha.sig,tar.gz} "${WORKDIR}" || die
+ cp "${DISTDIR}"/${P}.{sha256.sig,tar.gz} "${WORKDIR}" || die
cd "${WORKDIR}" || die
verify-sig_verify_signed_checksums \
- ${P}.sha.sig sha256 ${P}.tar.gz
+ ${P}.sha256.sig sha256 ${P}.tar.gz
fi
default
fi
@@ -69,14 +70,15 @@ src_configure() {
# note: not an autoconf configure script
conf_args=(
- PREFIX="${EPREFIX}"/usr
- MANDIR="${EPREFIX}"/usr/share/man
+ --prefix="${EPREFIX}"/usr
+ --mandir="${EPREFIX}"/usr/share/man
+ --sysconfdir="${EPREFIX}"/etc
+ --with-libtls=system
$(use_enable seccomp sandbox)
)
-
edo ./configure "${conf_args[@]}"
- if use seccomp && has usersandbox ${FEATURES} ; then
+ if use seccomp && has usersandbox ${FEATURES}; then
export SKIP_RUNTIME_TESTS=1
fi
}
@@ -85,7 +87,7 @@ src_install() {
default
insinto /etc/gmid
- doins "${FILESDIR}"/gmid.conf
+ newins "${FILESDIR}"/gmid.conf-r1 gmid.conf
insinto /usr/share/vim/vimfiles
doins -r contrib/vim/*
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-01-26 10:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-04 11:44 [gentoo-commits] repo/proj/guru:master commit in: net-misc/gmid/files/, net-misc/gmid/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2024-01-26 10:35 David Roman
2021-07-07 14:02 Florian Schmaus
2021-04-07 8:51 Andrew Ammerlaan
2021-03-30 8:53 Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox