commit: 72409c3180b13b8b4f56f56d9303a389d0a60d9a
Author: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Sun Jul 6 14:02:48 2025 +0000
Commit: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
CommitDate: Sun Jul 6 14:02:48 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=72409c31
www-apps/anubis: add 1.20.0, drop 1.18.0
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>
www-apps/anubis/Manifest | 2 +-
.../{anubis-1.18.0.ebuild => anubis-1.20.0.ebuild} | 16 +++++------
www-apps/anubis/files/anubis.confd | 27 -------------------
www-apps/anubis/files/anubis.initd | 31 ----------------------
4 files changed, 8 insertions(+), 68 deletions(-)
diff --git a/www-apps/anubis/Manifest b/www-apps/anubis/Manifest
index 18753f0492..d3156a4af1 100644
--- a/www-apps/anubis/Manifest
+++ b/www-apps/anubis/Manifest
@@ -1,2 +1,2 @@
-DIST anubis-src-vendor-npm-1.18.0.tar.gz 6230012 BLAKE2B
e8bdc60a04dc3db70b140462c571cc41e7f355bd49b20871c6e809fc1cadcc9feca8d309f291080f658d589ea4f2f74c8aa2fe82d2e2a6d415a91044936017e7
SHA512
88600b313968a70344cda0e3ba1a3e2a582a0a59ef044c68c107b2d1abbac750f3052e81a7c7e0ae566f801e21d268688b5562c28f4a0b747bc5b3177429f288
DIST anubis-src-vendor-npm-1.19.1.tar.gz 10402990 BLAKE2B
08dd83c022d4accfa12c2966b571a747d9aa8b109bc4621af4f8b6edd266e16ab5ade0613416d5a63da9719ad49e4c514850454c1bd2545ebdb032e0b981cbe3
SHA512
74474a485eb916c2ed367e92aa66941e59dbb3f6183f7c74143911b860369f882d88de271b59cfbada2a134de8f77aab4bfce0d1571ef1e9d25a95d1be62499e
+DIST anubis-src-vendor-npm-1.20.0.tar.gz 12276418 BLAKE2B
9402e527ea9f5782e67e21e727ac20454fec7179123798396a14f09df4662dc22727ab5e1408c5bb105301da0060bd45ff24a4b0d867302b98d5e4bb6b92f30b
SHA512
23f0f673b7043de776ff45a95308c6e9b00c55e64ebccae4f159070fe2b34249d0d27cd4f9791b23e91d84eddbf3b19dbdf6b3aec353c5a2411ea6f2266435f6
diff --git a/www-apps/anubis/anubis-1.18.0.ebuild
b/www-apps/anubis/anubis-1.20.0.ebuild
similarity index 78%
rename from www-apps/anubis/anubis-1.18.0.ebuild
rename to www-apps/anubis/anubis-1.20.0.ebuild
index 9dfa9f8a2c..7abfd4ad99 100644
--- a/www-apps/anubis/anubis-1.18.0.ebuild
+++ b/www-apps/anubis/anubis-1.20.0.ebuild
@@ -17,13 +17,9 @@ LICENSE="Apache-2.0 BSD MIT OFL-1.1"
SLOT="0"
KEYWORDS="~amd64"
-DOCS=(
- # from yeetfile.js
- README.md
- data/{apps,bots,clients,common,crawlers}/.
- data/botPolicies.{json,yaml}
- docs/docs/.
-)
+DOCS=( README.md data docs/docs )
+
+RDEPEND="acct-user/anubis"
src_prepare() {
default
@@ -41,13 +37,15 @@ src_test() {
src_install() {
dobin var/anubis
+ newbin var/robots2policy anubis-robots2policy
systemd_dounit run/[email protected]
- newinitd "${FILESDIR}"/anubis.initd anubis
- newconfd "${FILESDIR}"/anubis.confd anubis
+ newinitd run/openrc/anubis.initd anubis
+ newconfd run/openrc/anubis.confd anubis
insinto /etc/anubis
doins run/default.env
+ find data -name '*.go' -delete || die
einstalldocs
}
diff --git a/www-apps/anubis/files/anubis.confd
b/www-apps/anubis/files/anubis.confd
deleted file mode 100644
index 9aca2fa2ff..0000000000
--- a/www-apps/anubis/files/anubis.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# The URL of the service that Anubis should forward valid requests to. Supports
-# Unix domain sockets.
-#ANUBIS_TARGET="http://localhost:3923";
-#ANUBIS_TARGET="unix:///path/to/socket"
-
-# The network address that Anubis listens on.
-#
-# If unset, listen on /run/anubis_${instance}/anubis.sock Unix socket instead.
-#ANUBIS_BIND_PORT=":8923"
-
-# The network address that Anubis serves Prometheus metrics on.
-#
-# If unset, listen on /run/anubis_${instance}/metrix.sock Unix socket instead.
-#ANUBIS_METRICS_BIND_PORT=":9090"
-
-# The difficulty of the challenge, or the number of leading zeroes that must be
-# in successful responses.
-#ANUBIS_DIFFICULTY=4
-
-# Configure the user[:group] Anubis will run as.
-#ANUBIS_USER="anubis:anubis"
-
-# Additional command-line options for Anubis.
-#ANUBIS_OPTS=""
diff --git a/www-apps/anubis/files/anubis.initd
b/www-apps/anubis/files/anubis.initd
deleted file mode 100644
index 16ef936d67..0000000000
--- a/www-apps/anubis/files/anubis.initd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-#
-# shellcheck shell=sh
-
-instance=${RC_SVCNAME#*.}
-
-supervisor="supervise-daemon"
-command="/usr/bin/anubis"
-command_args="\
- -bind ${ANUBIS_BIND_PORT:-/run/anubis_${instance?}/anubis.sock
-bind-network unix} \
- -metrics-bind
${ANUBIS_METRICS_BIND_PORT:-/run/anubis_${instance?}/metrics.sock
-metrics-bind-network unix} \
- -target ${ANUBIS_TARGET:-http://localhost:3923} \
- -difficulty ${ANUBIS_DIFFICULTY:-4} \
- ${ANUBIS_OPTS}
-"
-command_user="${ANUBIS_USER:-anubis:anubis}"
-command_background=1
-pidfile="/run/anubis_${instance?}/anubis.pid"
-
-start_pre() {
- if [ "${instance?}" = "${RC_SVCNAME?}" ]; then
- eerror "${RC_SVCNAME?} cannot be started directly. You must
create"
- eerror "symbolic links to it for the services you want to start"
- eerror "and add those to the appropriate runlevels."
- return 1
- fi
-
- checkpath -d -o "${command_user?}" "/run/anubis_${instance?}"
-}
