Compare commits
39 commits
79d2eec8e0
...
ada18c0f33
| Author | SHA1 | Date | |
|---|---|---|---|
| ada18c0f33 | |||
| 095312b5e1 | |||
| 683a65d413 | |||
| b170e8d63e | |||
| 90463605c5 | |||
| 8dd8c05554 | |||
| c7e383aa20 | |||
| bb6ab87a26 | |||
| d2fca097f5 | |||
| a4cb8b04d0 | |||
| 647d9f73fb | |||
| 8c469f6271 | |||
| 1d657f853b | |||
| fb855ed5c0 | |||
| 5f1649b345 | |||
| d06b6dd80e | |||
| b195cbaf52 | |||
| eb0b67a7b7 | |||
| 603403e52f | |||
| 6f311addf5 | |||
| 62fce94463 | |||
| 4418bb940b | |||
| 4a8857379e | |||
| 9a2481f449 | |||
| e3f2bf13c7 | |||
| def87e6341 | |||
| 8626a60584 | |||
| 438ace393b | |||
| 85396067ef | |||
| b65f88b1c8 | |||
| 017e8c454d | |||
| 3909beb22e | |||
| 6f14dcd411 | |||
| 1f7a521d07 | |||
| e39947a96c | |||
| 4c77d6a209 | |||
| da4daff037 | |||
| d5b968a110 | |||
| 1ccf775176 |
136 changed files with 1894 additions and 976 deletions
|
|
@ -1,9 +0,0 @@
|
|||
kind: pipeline
|
||||
type: docker
|
||||
name: default
|
||||
|
||||
steps:
|
||||
- name: run-pkgcheck
|
||||
image: gittr.ch/linux/pkgcheck:latest
|
||||
commands:
|
||||
- pkgcheck --color true scan --exit error,style --net .
|
||||
11
.forgejo/workflows/pkgckeck.yaml
Normal file
11
.forgejo/workflows/pkgckeck.yaml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
on: [push]
|
||||
jobs:
|
||||
pkgcheck:
|
||||
runs-on: docker
|
||||
container:
|
||||
image: gittr.ch/linux/pkgcheck:latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v6
|
||||
- name: Run repository checks
|
||||
run: pkgcheck --color true scan --exit error,style --net .
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
*apache_exporter-0 (29 Sep 2020)
|
||||
|
||||
29 Sep 2020; Manuel Friedli <manuel@gentoo.org> +apache_exporter-0.ebuild,
|
||||
+metadata.xml:
|
||||
acct-group/apache_exporter: Add apache_exporter group
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
EBUILD apache_exporter-0-r1.ebuild 313 BLAKE2B fb7380f4900675474ce6233a16568d7f44e8776323c99c861d9603dee02587c2598525aa98f62f29e0691fae6beab5fd771a77e9daa7bfffa74920c99b6709e3 SHA512 4d3b7418c32796407d6d5e6151725ffc1a7edb0d4049ead93b3d3c5be8567039898e3952315c93809502c0dc08eed8c8a255374631926d17c9b29ebd87614640
|
||||
MISC ChangeLog 184 BLAKE2B b5c4d627fa19b0ad55008fc0ddac8da82bf88db97eced218ec3467e75378ba3c9e0f10f96ab0180e73c7157e8e7742ddf76a9bd400d8303d6042e9d14946b0ea SHA512 6e03db912ce0300dd864f7b299f45c7fad6ab0a7493a7d11f8c3b0cec536bed2a1af99f660022e1da70ee0165c7807458cacf182199b590379fbff18039dd20b
|
||||
MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
|
||||
2
acct-group/beszel/Manifest
Normal file
2
acct-group/beszel/Manifest
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
EBUILD beszel-0.ebuild 311 BLAKE2B d4933baf6c5f02ecb4c8c328d9bb87518a78593cb533cc2c99f78a5dd4967d4df2e36c56225dbb81529b8bcf9020f467e4932e0eb17064bfb87b2a4bda4d59f8 SHA512 2a895dc33d05a0d2cfabb109cb40d5f832a472338dde91a0ba91af54653f85976558c554d5f6cd73a17298df4f9f526df5e5a7a1db1bf2fc3cfec3ce7a7b844c
|
||||
MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit acct-group
|
||||
DESCRIPTION="Group used for the apache_exporter prometheus plugin"
|
||||
DESCRIPTION="Group used for the Beszel monitoring hub and agent"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
# If you want this to persist across multiple machines, pick a real number!
|
||||
2
acct-group/forgejo-runner/Manifest
Normal file
2
acct-group/forgejo-runner/Manifest
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
EBUILD forgejo-runner-0.ebuild 294 BLAKE2B 27dd4f06693633609167dbbe0be573c3d2787b38d68628276d09d783511f6c8cef6b34bbbc054b6115a0c4678ec300e49293a0ee77f52f45339da670b34c76c6 SHA512 af7d7df55239ca13afa88b0f2b369bc8a5dd4a7c780137a8c8b676cbb914bfb80378879c7d4bfb7f3fad03d7dfe7e6ba6afec359a8d7defd56f2598bad283a36
|
||||
MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
|
||||
11
acct-group/forgejo-runner/forgejo-runner-0.ebuild
Normal file
11
acct-group/forgejo-runner/forgejo-runner-0.ebuild
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
# Copyright 2026-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit acct-group
|
||||
DESCRIPTION="Group used for the forgejo-runner"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
# If you want this to persist across multiple machines, pick a real number!
|
||||
ACCT_GROUP_ID="-1"
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
*apache_exporter-0 (29 Sep 2020)
|
||||
|
||||
29 Sep 2020; Manuel Friedli <manuel@gentoo.org> +apache_exporter-0.ebuild,
|
||||
+metadata.xml:
|
||||
acct-user/apache_exporter: Add apache_exporter user
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
EBUILD apache_exporter-0-r1.ebuild 285 BLAKE2B 3ebef60ccf6f3ab574ebb57cfded354341315a6666f9899e9da3705cd9cbeed51c9e48557d687b3a1654fbb550ecbe4c5da25024aaaecf4636a0a8ae6009f59a SHA512 5740192c74c377384d4dca214306f806c7d5cfa3090a563ce046724c029600910f914ecd58da8171b7c672372885a1373489d9e31f48bcccdc9e8448131fe4b6
|
||||
MISC ChangeLog 182 BLAKE2B 1c15e7bd0216404dcb5d506c17b2047f3ee1d8599538af368b4bb0f6c87eade074c5642d30dae17f8074b013bca3dda5a9cfee48999844baba66150223d7453b SHA512 355b1f10ab9cce522ebdabacc15dd8b2f3d7219a3f932a56be04a5f1cdfeaf883ca8c4857e2c9ac86b8ee8f19904cc7f003e8a34a3a0985c297d20c0bc032724
|
||||
MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
|
||||
2
acct-user/beszel-agent/Manifest
Normal file
2
acct-user/beszel-agent/Manifest
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
EBUILD beszel-agent-0-r1.ebuild 341 BLAKE2B bfe9ce024736a41f1f9981a3380f37c079fd7af14e697b5992609b9d412892b4001a22aca73e4a544675d118e0d9a0a61dbeaaef8e069986aa0dba5a88fd7d09 SHA512 adca3f5f0bb2276e15a235112e1dda76196000353c04242a4034a3f7151f8ae880e36959c24b9b8e464d72ed79e45cc40da541ef683317564bb25f72ab7242b7
|
||||
MISC metadata.xml 418 BLAKE2B 7a976f39a936b36e1cff641b9ac3d7b517a5a202f9fcca022349dce0950d2cf50850bcd686102b607da315bcc60471ce845a790ea465b77b3b81869a4a21be3e SHA512 201b80ab197ae1006f3d497f975cf74c68a8749991d3d671d6bb182e1c28dd56c45b41c1c1940a07d183a54f0df1ee32b9fcf7b310324cb2d486dd80b0996218
|
||||
19
acct-user/beszel-agent/beszel-agent-0-r1.ebuild
Normal file
19
acct-user/beszel-agent/beszel-agent-0-r1.ebuild
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# Copyright 2019-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit acct-user
|
||||
|
||||
DESCRIPTION="User for the Beszel monitoring agent"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="docker"
|
||||
|
||||
ACCT_USER_ID=-1
|
||||
ACCT_USER_GROUPS=( beszel )
|
||||
|
||||
pkg_setup() {
|
||||
use docker && ACCT_USER_GROUPS+=( docker )
|
||||
}
|
||||
|
||||
acct-user_add_deps
|
||||
11
acct-user/beszel-agent/metadata.xml
Normal file
11
acct-user/beszel-agent/metadata.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>manuel@fritteli.ch</email>
|
||||
<name>Manuel Friedli</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="docker">Add the user to the docker group in order to access docker stats. Beware that this will grant the user full access to docker!</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
2
acct-user/beszel-hub/Manifest
Normal file
2
acct-user/beszel-hub/Manifest
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
EBUILD beszel-hub-0.ebuild 264 BLAKE2B 452d10d678514cdf1445894ed484c9a109c4cd85d29c8a94b9c4880a72a72f798d13b5e24370604e30a0d9a83023343b49f96ad09283ce262a78229ff2e1cbd6 SHA512 485c7093a8a1e2424e77b2e137bc9397ce2a172501a8e6208efc00b60c851d06abef8458c315c2ac24d389450b87ef05a717ea761c5e1c93882152875de506b3
|
||||
MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
|
||||
|
|
@ -1,14 +1,14 @@
|
|||
# Copyright 2019-2022 Gentoo Authors
|
||||
# Copyright 2019-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit acct-user
|
||||
|
||||
DESCRIPTION="User for the apache_exporter prometheus plugin"
|
||||
DESCRIPTION="User for the Beszel monitoring hub"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
ACCT_USER_ID=-1
|
||||
ACCT_USER_GROUPS=( apache_exporter )
|
||||
ACCT_USER_GROUPS=( beszel )
|
||||
|
||||
acct-user_add_deps
|
||||
|
|
@ -5,7 +5,4 @@
|
|||
<email>manuel@fritteli.ch</email>
|
||||
<name>Manuel Friedli</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">prometheus/mysqld_exporter</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
2
acct-user/forgejo-runner/Manifest
Normal file
2
acct-user/forgejo-runner/Manifest
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
EBUILD forgejo-runner-0.ebuild 395 BLAKE2B c28b21d1e061ecbefda369bd2e50974980f517fa09506ed82ca72253f3bf36a7e879db9d1e271e2e9aa5c7bfcb63c76d1aca513ec2a51ee274d3a024ccda7661 SHA512 64c4f443e16516a9e7b9d3ad8e4a12caec6af432be9017a7503570afbf55fddb2d8c1d8d2108be2aab8aa8bd4d87149b78462115d569d0cb1f6711151db932d6
|
||||
MISC metadata.xml 326 BLAKE2B 3d235c638beabe1bbfa5e40fa3b16a6bb713f5bbbaf08f8d2338c969b8f7793cb9d6bfbff63ee7b880823030acb63fb091a4f283e9f933c981932866ea892976 SHA512 9d8bba960aac5bc5603d6eab68677eea0ca64df6277587e167e01aebdef453458d8d0fc5ab19b2bc5668789bbc4e70249a5bece95565c7263012428981f81ef9
|
||||
17
acct-user/forgejo-runner/forgejo-runner-0.ebuild
Normal file
17
acct-user/forgejo-runner/forgejo-runner-0.ebuild
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
# Copyright 2026-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit acct-user
|
||||
|
||||
DESCRIPTION="User for the forgejo-runner"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
ACCT_USER_ID=-1
|
||||
# forgejo-runner goes first, to make it the primary group
|
||||
ACCT_USER_GROUPS=( forgejo-runner docker )
|
||||
ACCT_USER_HOME=/var/lib/forgejo-runner
|
||||
ACCT_USER_HOME_PERMS=0750
|
||||
|
||||
acct-user_add_deps
|
||||
11
acct-user/forgejo-runner/metadata.xml
Normal file
11
acct-user/forgejo-runner/metadata.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>manuel@fritteli.ch</email>
|
||||
<name>Manuel Friedli</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="docker">Add the user to the docker group.</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
30 Apr 2022; Manuel Friedli <manuel@gentoo.org>
|
||||
-apache_exporter-0.8.0-r1.ebuild:
|
||||
app-metrics/apache_exporter: Prune old version.
|
||||
|
||||
30 Apr 2022; Manuel Friedli <manuel@gentoo.org> apache_exporter-0.11.0.ebuild:
|
||||
app-metrics/apache_exporter: Fix build.
|
||||
|
||||
*apache_exporter-0.11.0 (30 Apr 2022)
|
||||
|
||||
30 Apr 2022; Manuel Friedli <manuel@gentoo.org>
|
||||
+apache_exporter-0.11.0.ebuild, -apache_exporter-0.10.1.ebuild:
|
||||
app-metrics/apache_exporter: Add ebuild for 0.11.0
|
||||
|
||||
*apache_exporter-0.10.1 (12 Oct 2021)
|
||||
|
||||
12 Oct 2021; Manuel Friedli <manuel@gentoo.org>
|
||||
+apache_exporter-0.10.1.ebuild:
|
||||
app-metrics/apache_exporter: Bump version
|
||||
|
||||
*apache_exporter-0.8.0-r1 (29 Sep 2020)
|
||||
|
||||
29 Sep 2020; Manuel Friedli <manuel@gentoo.org>
|
||||
+apache_exporter-0.8.0-r1.ebuild, -apache_exporter-0.8.0.ebuild,
|
||||
files/apache_exporter.service:
|
||||
app-metrics/apache_exporter: Change location of sysconfig file
|
||||
|
||||
29 Sep 2020; Manuel Friedli <manuel@gentoo.org> -apache_exporter-0.7.0.ebuild:
|
||||
app-metrics/apache_exporter: Purge old ebuild
|
||||
|
||||
*apache_exporter-0.8.0 (29 Sep 2020)
|
||||
|
||||
29 Sep 2020; Manuel Friedli <manuel@gentoo.org> +apache_exporter-0.8.0.ebuild:
|
||||
app-metrics/apache_exporter: Add ebuild for versin 0.8.0. This is conforming
|
||||
to GLEP 81.
|
||||
|
||||
14 Nov 2019; <manuel@gentoo.org> apache_exporter-0.7.0.ebuild:
|
||||
app-metrics/apache_exporter: Fix ebuild again.
|
||||
|
||||
14 Nov 2019; <manuel@gentoo.org> apache_exporter-0.7.0.ebuild:
|
||||
app-metrics/apache_exporter: Fix ebuild for apache_exporter.
|
||||
|
||||
*node_exporter-0.18.1 (10 Nov 2019)
|
||||
|
||||
10 Nov 2019; <manuel@gentoo.org> +files/node_exporter-0.18.1-systemd.patch,
|
||||
+files/node_exporter-1.initd, +files/node_exporter.confd, +metadata.xml,
|
||||
+node_exporter-0.18.1.ebuild:
|
||||
app-metrics/node_exporter: Add systemd-patched ebuild fpr version 0.18.1.
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
AUX apache_exporter.confd 59 BLAKE2B 4466ae408352adc136fa882cf382c1562e8e0b6401edf8e5a8633d3736da20ecd3b2e10b0b2e6b2cbec30c74ea6aeac930863ff18568e2144544539306b79208 SHA512 eaf040d612155e8ed5359124283a591559b720170583a654a06d0b5e480cc9e99c1bcba97cffca03816f3c2b49d304e183f997067d325636ec71a33118a45df9
|
||||
AUX apache_exporter.initd 650 BLAKE2B 86d014a2bb4f98a54a5e98060884bb99d1ec4011ce028a981d9d39cc5a5292c39018a80df2a3f0ad4b97aa1a0da059e89ad151f0a0b3d13d6ba6386aa4a9d6d4 SHA512 42367bb35b79cb3c4946ae57e81fa918d94b9b5613469e1e070797ffc9ab7ae74aaa3ad244be35cef8fe5df043fb5e1a604449c3a416e01da7cb11ad95c2b5b1
|
||||
AUX apache_exporter.service 196 BLAKE2B b7429d240256bdbe594741900bd1715d7806f604d420b668c83ed2b4f66b32ba1ff142a54e04687182c0b24f43d58c6d74f5b319d69aaa4619d4b561a9567913 SHA512 a93847eb9407e94388a606972373a2e9c51ca46f16b8a87365d8544b680d1d0fbf47a6eb86865621375015a58c8b6480aeefa247f37c31fa0a84383a27a915f7
|
||||
AUX sysconfig.apache_exporter 11 BLAKE2B e83c8a1c6cf0d2269d032d80bfb5f37969adce8655298d49f942e19318e1fcabe7f618514ce65d9e0209959d5ccb38141e81fcccd65a754584eaf2db3b4fbd03 SHA512 f4d982f86de30c5b52b04c201cd38fffa87f860bef18af6ab85e856ae2081b919256b918b5f4821ee2fc4da0548d1a95c2522b29cddca57f694e2f26c1b1b2b9
|
||||
DIST apache_exporter-1.0.9-deps.tar.xz 80059112 BLAKE2B 6b3cd9d5b3b558c1da1f3b1b41c8c712bc2556aeb994201d048a58cdcdc15522e5c407a4dd31673f4e4bbc350edc727d4a70fa2772e8d1b4863289fcb75de197 SHA512 5c85a9f08b3b3adbe4b16b1df4ed95bb4135944dad4efc46330ef69afab63c02e708239288fe1fa6406a9c6a999750da8357b468dd59620066b4fb38604bb42e
|
||||
DIST apache_exporter-1.0.9.tar.gz 21212 BLAKE2B dc3840df7d9808434e1c4397283ffd963c73c6442559dda71a2228e9eb9123b39c99c987cd6d4413e2cca94c91c28bd073069c9699f584a10bf53ad5bbd04351 SHA512 3628b2719488323db46d09cb4d741096a84ae65b1506ee40091c0f86d095c7ad23c9e6a560a9d5ecf8a4bdd59b59559ac6f640bdd5734244d722e460c242d7a3
|
||||
EBUILD apache_exporter-1.0.9.ebuild 974 BLAKE2B 82a8ebef7723a6c85a5b4d03fc73a4f71c5c81d812a87a6a12c891ebb3edde96f86abea1ff663ca57370ad2a64f3d1d0ad6b4cf41407a0f8da9ec9bbd809858e SHA512 a126411c6baa069c23129ccf2593b72de8049378b7aa82dc27252ca299858e97ec44d15ad627545bcfcac58c5dc0258732c62209ce8800e13bca2e7827604e1a
|
||||
MISC ChangeLog 1784 BLAKE2B 711840e812185617076bb46a0932cf788ecb858410369aef3032da3e5a4a655f004d6f03fe2ea978d60e67bed11fc38632c2b794e9e344e14a85e6c5e8722886 SHA512 b95c61c77c453a542a101ae5aeb017b5801b6fe79a427cf1f1667e66956c94bc03e3ad49b75b2bdfaf33ad977fa1a9ff152fc782d2b223a21d4f3ffb82d2186d
|
||||
MISC metadata.xml 337 BLAKE2B bd72b6097fead5eaf80082790d3712ae0893b118140b62f58639f0e5c56bebf57dbd0ccd0ea19af82b2dce88c88c494d88290f98df4818e4fad3f4386398d171 SHA512 aee4825d8b90a8fd84fb558b9af4b7eb889fcf81bae6c7b317a9d69f62b06dd0f0bc2aa91aa2c32f10ff91fdbf64b341d7e5adc3c65a5225c7e0e92d7a6b7816
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit go-module systemd
|
||||
|
||||
DESCRIPTION="Prometheus exporter for apache metrics"
|
||||
HOMEPAGE="https://github.com/Lusitaniae/apache_exporter"
|
||||
SRC_URI="https://github.com/Lusitaniae/apache_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
SRC_URI+=" https://gentoo-overlay.friedli.info/${P}-deps.tar.xz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="acct-group/apache_exporter
|
||||
acct-user/apache_exporter"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_compile() {
|
||||
ego build
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin apache_exporter
|
||||
dodoc README.md
|
||||
newinitd "${FILESDIR}"/apache_exporter.initd apache_exporter
|
||||
newconfd "${FILESDIR}"/apache_exporter.confd apache_exporter
|
||||
|
||||
systemd_dounit "${FILESDIR}"/apache_exporter.service
|
||||
insinto /etc/sysconfig
|
||||
newins "${FILESDIR}/sysconfig.apache_exporter" apache_exporter
|
||||
|
||||
keepdir /var/log/apache_exporter
|
||||
fowners -R ${PN}:${PN} /var/log/apache_exporter
|
||||
}
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
# arguments for prometheus apache exporter
|
||||
command_args=""
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
# Copyright 2016-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
description="Prometheus apache metrics exporter"
|
||||
pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
|
||||
user=${user:-${RC_SVCNAME}}
|
||||
group=${group:-${RC_SVCNAME}}
|
||||
|
||||
command="/usr/bin/apache_exporter"
|
||||
command_args="${command_args:-}"
|
||||
command_background="true"
|
||||
start_stop_daemon_args="--user ${user} --group ${group} \
|
||||
--stdout /var/log/apache_exporter/${RC_SVCNAME}.log \
|
||||
--stderr /var/log/apache_exporter/${RC_SVCNAME}.log"
|
||||
|
||||
depend() {
|
||||
after net
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
checkpath -q -d -m 0755 -o ${user}:${group} /var/log/apache_exporter
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
[Unit]
|
||||
Description=Apache Exporter
|
||||
|
||||
[Service]
|
||||
User=apache_exporter
|
||||
EnvironmentFile=/etc/sysconfig/apache_exporter
|
||||
ExecStart=/usr/bin/apache_exporter $OPTIONS
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1 +0,0 @@
|
|||
OPTIONS=""
|
||||
6
app-metrics/beszel-agent/Manifest
Normal file
6
app-metrics/beszel-agent/Manifest
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
AUX beszel-agent.env 971 BLAKE2B d790affa194b71425af286b586b3fd1c8139a386a609982c462c33ddddb5235db4cc66c6ffda9a4cb8e71c83c5cd0bbfac7f178393333d498cb0c0e155603ebc SHA512 0307399529406e8b1ae3949dec8443b184a9a1801a4ff2cf968bc6936327f5acc76df06dd510d02a934f5e73539be4559b278d73b5bc945e755ccd68fa4ae998
|
||||
AUX beszel-agent.service 550 BLAKE2B 71381383813fc851ffe810772065cfe7aa0e160a63461017b78c3cb85e106ed4a562bf8d79a8a4659becbb6098703f13725c62f2805d224ec6289a62fd1fe4d8 SHA512 df913496480c0fc794ac6d1d937dba213c329a876b1e891551849376d7e138e5bb41145b5a5a6a528d186791804719809c22111f3ba1a3008d7ec131f856014d
|
||||
DIST beszel-0.18.3-vendor.tar.xz 29845172 BLAKE2B 7c1e7e40c60614553dfa312d1891a677a987be5191447670d14f07b0a95933d2b9884b11b6914e74d20166a9be20bf6e3a86f1d6f296cd953d049ed17bc4631a SHA512 b959211fcd7e3a8c5abb3d46dedca883fbd85493f502d716538d0c76bfa08796e40dd8000306f8f9dcfb20e3886847d272a695553e669910168a059ecd31b461
|
||||
DIST beszel-agent-0.18.3.tar.gz 1153782 BLAKE2B 13458446ed3d80c9409161bc17b54fbde6dc5da6cbf9d65c42a65c5ec236e34dcc7fe131173cb08cc9b5df30b435952bd36c643a87a29fd8a65d5b844de62aa5 SHA512 c4abbe9b28b79ec3206b401b29fcc6c49531c9b2e946909df11d3ac8430099d455d391e49d67503f8fa831b6c514d5efb7f67845f1ab4788e81ff80a9a4521cf
|
||||
EBUILD beszel-agent-0.18.3.ebuild 1121 BLAKE2B b0595e547466d5181bd384e22909c625246a13d5cd96c00cea6b25df504ce95c5d77f06d245aa4736b4b09ccbb1748ef1f8c39c6b01cbc1a009311864e41f1aa SHA512 f64031296fdeb6bff92c00e99663bcb952fa20ac8c2153af578d07f1053c925908c5b7f9e551d607073dbc98c0efa85cebe47c0ff04f2946be46d7b8cb7907e9
|
||||
MISC metadata.xml 327 BLAKE2B b22344ccf0ca03ad86f9ea95440de7498ca4bc7da459b2395d7b0eb0dbe0cab566a8a79f30fd8679eff6f89ddb0d28ebcbfd714d6d324992df52a69f20cef69d SHA512 3fd2a4502bb7a6eee7f12e9fc0c4cbfc1fd2b00074c2a21ceb63bc81d2b853b3e569b5370b36814614fcedefab2e27be33d81096f75d356a64e6e31aaf4ce34b
|
||||
44
app-metrics/beszel-agent/beszel-agent-0.18.3.ebuild
Normal file
44
app-metrics/beszel-agent/beszel-agent-0.18.3.ebuild
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
# Copyright 2022-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit go-module systemd
|
||||
|
||||
MY_P="beszel-${PV}"
|
||||
DESCRIPTION="Beszel Agent - Simple, lightweight server monitoring"
|
||||
HOMEPAGE="https://www.beszel.dev/"
|
||||
SRC_URI="https://github.com/henrygd/beszel/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://gentoo-overlay.friedli.info/${MY_P}-vendor.tar.xz"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
LICENSE="AGPL-3+"
|
||||
# Go dependency licenses
|
||||
LICENSE+=" AGPL-3 Apache-2.0 BSD GPL-3+ ISC MIT MPL-2.0 public-domain"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="acct-user/beszel-agent
|
||||
acct-group/beszel"
|
||||
|
||||
src_compile() {
|
||||
cd internal/cmd/agent
|
||||
ego build -ldflags "-w -s"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
newbin "${S}"/internal/cmd/agent/agent beszel-agent
|
||||
|
||||
dodir /etc/beszel-agent
|
||||
keepdir /var/lib/beszel-agent
|
||||
|
||||
insinto /etc/beszel-agent
|
||||
doins "${FILESDIR}"/beszel-agent.env
|
||||
|
||||
fowners -R beszel-agent:beszel /etc/beszel-agent /var/lib/beszel-agent
|
||||
fperms 0750 /etc/beszel-agent /var/lib/beszel-agent
|
||||
fperms 0600 /etc/beszel-agent/beszel-agent.env
|
||||
|
||||
systemd_dounit "${FILESDIR}"/beszel-agent.service
|
||||
}
|
||||
30
app-metrics/beszel-agent/files/beszel-agent.env
Normal file
30
app-metrics/beszel-agent/files/beszel-agent.env
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
# This is a sample config file. Adjust to your needs.
|
||||
# See https://beszel.dev/guide/environment-variables#agent for all available
|
||||
# variables.
|
||||
|
||||
# The default data directory. Only change this if you know what you're
|
||||
# doing.
|
||||
BESZEL_AGENT_DATA_DIR=/var/lib/beszel-agent
|
||||
|
||||
# The URL of your hub
|
||||
BESZEL_AGENT_HUB_URL=http://your-beszel-hub.example.com
|
||||
|
||||
# Public SSH key(s) used for authetication. Provided in hub.
|
||||
# Either specify the key(s) directly, ...
|
||||
# BESZEL_AGENT_KEY=
|
||||
|
||||
# ... or refer to a file containing the key(s). Uncomment one of the options.
|
||||
# BESZEL_AGENT_KEY_FILE=
|
||||
|
||||
# The network port to listen on. Can be port or host:port
|
||||
BESZEL_AGENT_LISTEN=127.0.0.1:45876
|
||||
|
||||
# The log level. One of debug, info, warn, error
|
||||
BESZEL_AGENT_LOG_LEVEL=info
|
||||
|
||||
# The WebSocket registration token. Provided in hub.
|
||||
# Either specify the token directly, ...
|
||||
# BESZEL_AGENT_TOKEN=
|
||||
|
||||
# ... or refer to a file containing the token. Uncomment one of the options.
|
||||
# BESZEL_AGENT_TOKEN_FILE=
|
||||
29
app-metrics/beszel-agent/files/beszel-agent.service
Normal file
29
app-metrics/beszel-agent/files/beszel-agent.service
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
[Unit]
|
||||
Description=Beszel Agent Service
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/beszel-agent
|
||||
EnvironmentFile=/etc/beszel-agent/beszel-agent.env
|
||||
Restart=on-failure
|
||||
RestartSec=5
|
||||
StateDirectory=beszel-agent
|
||||
|
||||
User=beszel-agent
|
||||
Group=beszel
|
||||
|
||||
# Security/sandboxing settings
|
||||
KeyringMode=private
|
||||
LockPersonality=yes
|
||||
NoNewPrivileges=yes
|
||||
ProtectClock=yes
|
||||
ProtectHome=read-only
|
||||
ProtectHostname=yes
|
||||
ProtectKernelLogs=yes
|
||||
ProtectSystem=strict
|
||||
RemoveIPC=yes
|
||||
RestrictSUIDSGID=true
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -6,6 +6,6 @@
|
|||
<name>Manuel Friedli</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">prometheus/node_exporter</remote-id>
|
||||
<remote-id type="github">henrygd/beszel</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
29 Sep 2020; Manuel Friedli <manuel@gentoo.org>
|
||||
-mysqld_exporter-0.11.0.ebuild:
|
||||
app-metrics/mysqld_exporter: Purge old ebuild
|
||||
|
||||
*mysqld_exporter-0.12.1_p20200622 (27 Sep 2020)
|
||||
|
||||
27 Sep 2020; Manuel Friedli <manuel@gentoo.org>
|
||||
+files/mysqld_exporter-0.12.1-skip-tests.patch,
|
||||
+mysqld_exporter-0.12.1_p20200622.ebuild:
|
||||
app-metrics/mysqld_exporter: Add new ebuild.
|
||||
|
||||
*mysqld_exporter-0.11.0 (11 Nov 2019)
|
||||
|
||||
11 Nov 2019; <manuel@gentoo.org> +files/mysqld_exporter-r1.confd,
|
||||
+files/mysqld_exporter-r1.initd, +files/mysqld_exporter.confd,
|
||||
+files/mysqld_exporter.logrotate, +files/mysqld_exporter.service,
|
||||
+metadata.xml, +mysqld_exporter-0.11.0.ebuild:
|
||||
app-metrics/mysqld_exporter: Add ebuild with systemd service file.
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
AUX mysqld_exporter-0.12.1-skip-tests.patch 545 BLAKE2B 02e01f23cb302dd128d47f48f9b20ded113ff37f2053e932b3d0ab510a22b14be6cb80779d2d545e774285d9772f8a6f7313c5a0c251d734e194fac992994185 SHA512 c4c808bae622797e47261824c8bfca7f7f8b04771c047440eb9ea923f45517ccc49f53cf71c7b51e3af8cd5b9c99911d80fce66e12487d87dc9d242381550cbc
|
||||
AUX mysqld_exporter-r1.confd 893 BLAKE2B bebec4ba675a5f7bfec52f0c1ad3b824f032258397dc9386892daa4d93ca1f7134c85e92c7662f9bd5b34d86478e2b3be2fc5b4adfb6fa1ece8d901ae530ec3e SHA512 3291e96479ece4f99de2c26e127469349f6197bc2764691fb4bffe5729fc9ce625fa84e2859649f0495260b339afa20edaa7bd2af99e6f161e6e6bbb153eee39
|
||||
AUX mysqld_exporter-r1.initd 2050 BLAKE2B f36d0d954e577f939f613887f86952ebf2460237df487b376237045bf1f0fae76ca0c1c7ba6359d2e702a817ff0b581984244c2263019b2f89d6d938e4b329eb SHA512 4b69f492cb240797247549f02f12577146d8df219ff51c92a494f126e0fc2382de4b1d92807669e7f2f385bff38009db0b117fe9c2c88da48e875452e35a404c
|
||||
AUX mysqld_exporter.confd 891 BLAKE2B 340b8d6b5f3fdc0a52851197cfd94b1d9d20fa3cda349c581a016c6cc7edd53cb7d86b634487551f916fd5c84294add402397cb9bf0fc2efb211b589dd571dd2 SHA512 ed4f949c8f5f88ad54c536342adf90be5d74922b54c383735a957e571aba341057830c7e8cdc0e45b53e439c5297d3ad70ba7bd178f77d10615787ed51bcc03f
|
||||
AUX mysqld_exporter.logrotate 68 BLAKE2B 04a9a0df5dae2a2afd3374cd6f6fd5d04df7629bc85ed63792ecc9e2b4772668d1f5b1fe4baf14b17c26a495ffa1ed3a7d748719db9a72f427587243505158d1 SHA512 3eb2e6bfa0eae0847c0b1e2e7fd990068cb0ad570d14463c88a8860d70ebc378b2e3bc4141f0a98e95304c972c765ae48dbff726b208ba825fe1f4e58765e462
|
||||
AUX mysqld_exporter.service 200 BLAKE2B 1053fe71dd3a1066ad5512f8ad2b40e34411365816b40f9c8f79b49a125099d0dc479c8cafce4ef4a5ca214859100324d04a1d429403dd08c4107e013f221acf SHA512 aaf7d1eb499aea03b435be24c0949f503f69759ce3507ccf08b81136ccde19d7720f42892924a701931a5ce8fdf297bf889725b789a538fed5e2f87568a95e38
|
||||
DIST mysqld_exporter-0.14.0_p20230328.tar.gz 92865 BLAKE2B 490219444b14006a356fa423b21c851693cf97f9aa6a9d20e8ee732ae8af5aed07aeda04a3419aebe26051f00c60f5655c3479c4ec3d5a2c9c18b44218cdc3b4 SHA512 a12aeb676ba81732310599344292f8cd5680abd14d8b380ae2d57198530de1969a5712619eca195e5d7b65abf518de7877789f494a9a4fbcebf42e3c8e35dac8
|
||||
DIST mysqld_exporter-fad2c0ccd8c0df8fed91a81463e930e4485fdfee-vendor.tar.xz 1473744 BLAKE2B 64f4f9dfee04522dbebdc9682c2619cc0f5c63b0835cfca50a37d0cce542e6a926968e23fe94a13d2e76cfbf931026cdcff74823c6c464b1b2f551bf0c70a5cf SHA512 aa10101fd5bc5a2fdef367c855f85d10ebb38b8a92969c5ebf786f011a287f9992559805b8ed24ea39da4db8aedbaf12893a2c6049ea7e90e989adf1ed13d79f
|
||||
EBUILD mysqld_exporter-0.14.0_p20230328.ebuild 2544 BLAKE2B ccf479f6a2ee54bc2cb4d2f37018615fec34556a318adce11817d393f4a20c23f1bdd9bdd92bd6b5b46dad443e8e3f30a276b85ab97577c7b537cab25b7a9960 SHA512 c8251f3821811130f2ff2957d1c5f1e228688034551537eb196642c19f7968822d2a11ad4cb9f097773d1e550a5ed3c5332ad57ce642fb56fbc774185942fcee
|
||||
MISC ChangeLog 733 BLAKE2B f524170f97aac958542aa79a0c383e2d018bb8aa7a886f34b8f801bd95199e6fec3d065b53ad91b793d48979fc33a8915a3d499eed52e3ea82fa2ae0ad1422d1 SHA512 9eb13634368e353219cf63f07167fb5841bd90041e6d2e1bb1026a37cb6dd141f016c07442547a1a3d79b290e478f27f80a8238725f92988e752342a58561da6
|
||||
MISC metadata.xml 339 BLAKE2B cc95303dfddecf9c81e77995bca8719a87cc74b9c3a95142bea4bc13d9fba4767ea7d5bdc56731e45f59a27a66dfd1e7ecb6924c737961ff30cd690c9ab250b5 SHA512 21cf66c2810306d975812118206a29d21f8ae3ed887c41c43fc66603a5901e261fe86d80e04160a7a31eaceec759f128e09b127a7c885fea0a3d06415743d022
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
--- a/collector/exporter_test.go
|
||||
+++ b/collector/exporter_test.go
|
||||
@@ -71,6 +71,8 @@ func TestExporter(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestGetMySQLVersion(t *testing.T) {
|
||||
+ t.Skip("Test requires running mysqld")
|
||||
+
|
||||
if testing.Short() {
|
||||
t.Skip("-short is passed, skipping test")
|
||||
}
|
||||
--- a/mysqld_exporter_test.go
|
||||
+++ b/mysqld_exporter_test.go
|
||||
@@ -142,6 +142,8 @@ type bin struct {
|
||||
|
||||
// TestBin builds, runs and tests binary.
|
||||
func TestBin(t *testing.T) {
|
||||
+ t.Skip("Test requires network access")
|
||||
+
|
||||
var err error
|
||||
binName := "mysqld_exporter"
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
# /etc/conf.d/mysqld_exporter
|
||||
|
||||
# PID file
|
||||
#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid"
|
||||
|
||||
# The termination timeout (start-stop-daemon parameter "retry") ensures
|
||||
# that the service will be terminated within a given time (60 + 5 seconds
|
||||
# per default) when you are stopping the service.
|
||||
#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5"
|
||||
|
||||
# User to run exporter as
|
||||
#EXPORTER_USER="mysqld_exporter"
|
||||
|
||||
# User group to run exporter as
|
||||
#EXPORTER_GROUP="mysqld_exporter"
|
||||
|
||||
# You can use this configuration option to pass additional options to the
|
||||
# start-stop-daemon, see start-stop-daemon(8) for more details.
|
||||
# Per default we wait 1000ms after we have started the service to ensure
|
||||
# that the daemon is really up and running.
|
||||
#EXPORTER_SSDARGS="--wait 1000"
|
||||
|
||||
# Exporter flags
|
||||
# See `mysqld_exporter --help` for more details
|
||||
EXPORTER_FLAGS="--log.level=info"
|
||||
#EXPORTER_FLAGS="${EXPORTER_FLAGS} --yourAdditionalFlag"
|
||||
|
|
@ -1,73 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
# Copyright 2016-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
description="Prometheus exporter for MySQL server metrics"
|
||||
|
||||
EXPORTER_FLAGS=${EXPORTER_FLAGS:-""}
|
||||
EXPORTER_USER=${EXPORTER_USER:-"mysqld_exporter"}
|
||||
EXPORTER_GROUP=${EXPORTER_GROUP:-"mysqld_exporter"}
|
||||
EXPORTER_PIDFILE=${EXPORTER_PIDFILE:-"/run/${RC_SVCNAME}.pid"}
|
||||
EXPORTER_SSDARGS=${EXPORTER_SSDARGS:-"--wait 1000"}
|
||||
EXPORTER_TERMTIMEOUT=${EXPORTER_TERMTIMEOUT:-"TERM/60/KILL/5"}
|
||||
|
||||
command="/usr/bin/mysqld_exporter"
|
||||
command_args="${EXPORTER_FLAGS}"
|
||||
command_background="true"
|
||||
start_stop_daemon_args="${EXPORTER_SSDARGS}"
|
||||
start_stop_daemon_args="${start_stop_daemon_args} --user ${EXPORTER_USER}"
|
||||
start_stop_daemon_args="${start_stop_daemon_args} --group ${EXPORTER_GROUP}"
|
||||
|
||||
# We are forcing log files because upstream is going to remove syslog support :/
|
||||
start_stop_daemon_args="${start_stop_daemon_args} --stdout /var/log/mysqld_exporter/${RC_SVCNAME}.log"
|
||||
start_stop_daemon_args="${start_stop_daemon_args} --stderr /var/log/mysqld_exporter/${RC_SVCNAME}.log"
|
||||
|
||||
getconfig() {
|
||||
local key="$1"
|
||||
local value_default="$2"
|
||||
local value=
|
||||
|
||||
if service_started; then
|
||||
value="$(service_get_value "${key}")"
|
||||
fi
|
||||
|
||||
if [ -z "${value}" ]; then
|
||||
# Value not explicitly set
|
||||
echo "${value_default}"
|
||||
else
|
||||
echo "${value}"
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
pidfile="$(getconfig pidfile ${EXPORTER_PIDFILE})"
|
||||
retry="$(getconfig retry ${EXPORTER_TERMTIMEOUT})"
|
||||
|
||||
configtest() {
|
||||
if test "${command_args#*config\.my-cnf}" = "${command_args}"; then
|
||||
local _default_config_file="/var/lib/mysqld_exporter/.my.cnf"
|
||||
if [ ! -s "${_default_config_file}" ]; then
|
||||
eerror "No MySQL credentials found in \"${_default_config_file}\"!"
|
||||
eerror "Either create that file and add credentials or specify another file via \"-config.my-cnf\" flag."
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
depend() {
|
||||
after net
|
||||
use mysql
|
||||
}
|
||||
|
||||
start_pre() {
|
||||
if [ "${RC_CMD}" != "restart" ]; then
|
||||
configtest || return 1
|
||||
fi
|
||||
}
|
||||
|
||||
start_post() {
|
||||
service_set_value retry "${EXPORTER_TERMTIMEOUT}"
|
||||
}
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
# /etc/conf.d/mysqld_exporter
|
||||
|
||||
# PID file
|
||||
#EXPORTER_PIDFILE="/run/${RC_SVCNAME}.pid"
|
||||
|
||||
# The termination timeout (start-stop-daemon parameter "retry") ensures
|
||||
# that the service will be terminated within a given time (60 + 5 seconds
|
||||
# per default) when you are stopping the service.
|
||||
#EXPORTER_TERMTIMEOUT="TERM/60/KILL/5"
|
||||
|
||||
# User to run exporter as
|
||||
#EXPORTER_USER="mysqld_exporter"
|
||||
|
||||
# User group to run exporter as
|
||||
#EXPORTER_GROUP="mysqld_exporter"
|
||||
|
||||
# You can use this configuration option to pass additional options to the
|
||||
# start-stop-daemon, see start-stop-daemon(8) for more details.
|
||||
# Per default we wait 1000ms after we have started the service to ensure
|
||||
# that the daemon is really up and running.
|
||||
#EXPORTER_SSDARGS="--wait 1000"
|
||||
|
||||
# Exporter flags
|
||||
# See `mysqld_exporter --help` for more details
|
||||
EXPORTER_FLAGS="-log.level=info"
|
||||
#EXPORTER_FLAGS="${EXPORTER_FLAGS} -yourAdditionalFlag"
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
/var/log/mysqld_exporter/*.log {
|
||||
missingok
|
||||
notifempty
|
||||
size 30k
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
[Unit]
|
||||
Description=MySqld Exporter
|
||||
|
||||
[Service]
|
||||
User=mysqld_exporter
|
||||
EnvironmentFile=/etc/conf.d/mysqld_exporter
|
||||
ExecStart=/usr/bin/mysqld_exporter $EXPORTER_FLAGS
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit go-module systemd
|
||||
# uncomment the first setting of MY_PV for a normal release
|
||||
# MY_PV="v${PV/_rc/-rc.}"
|
||||
# set MY_PV to the full commit hash for a snapshot release
|
||||
MY_PV_HASH=fad2c0ccd8c0df8fed91a81463e930e4485fdfee
|
||||
: ${MY_PV_HASH_FOR_VENDOR:=${MY_PV_HASH}}
|
||||
if [[ -n "${MY_PV_HASH}" ]]; then
|
||||
MY_PV=${MY_PV_HASH}
|
||||
MYSQLD_EXPORTER_COMMIT=${MY_PV_HASH:0:8}
|
||||
SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/${MY_PV}.tar.gz"
|
||||
else
|
||||
MY_PV=$PV
|
||||
MYSQLD_EXPORTER_COMMIT=
|
||||
SRC_URI_UPSTREAM="https://github.com/prometheus/mysqld_exporter/archive/refs/tags/v${PV}.tar.gz"
|
||||
fi
|
||||
MY_P=${PN}-${MY_PV}
|
||||
SRC_URI_VENDOR="https://dev.gentoo.org/~robbat2/distfiles/${MY_P}-vendor.tar.xz"
|
||||
|
||||
DESCRIPTION="Prometheus exporter for MySQL server metrics"
|
||||
HOMEPAGE="https://github.com/prometheus/mysqld_exporter"
|
||||
SRC_URI="
|
||||
${SRC_URI_UPSTREAM} -> ${P}.tar.gz
|
||||
${SRC_URI_VENDOR}
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_PV}"
|
||||
|
||||
LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
BDEPEND="dev-util/promu"
|
||||
|
||||
DEPEND="acct-group/mysqld_exporter
|
||||
acct-user/mysqld_exporter"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${PN}-0.12.1-skip-tests.patch )
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
if [[ -n $MYSQLD_EXPORTER_COMMIT ]]; then
|
||||
sed -i -e "s/{{.Revision}}/${MYSQLD_EXPORTER_COMMIT}/" .promu.yml || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
mkdir -p bin || die
|
||||
|
||||
promu build --prefix bin || die
|
||||
|
||||
# comment this for a normal release.
|
||||
mv bin/${PN}-${MY_PV} bin/${PN} || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/*
|
||||
dodoc {README,CHANGELOG,CONTRIBUTING}.md
|
||||
|
||||
keepdir /var/lib/mysqld_exporter /var/log/mysqld_exporter
|
||||
fowners ${PN}:${PN} /var/lib/mysqld_exporter /var/log/mysqld_exporter
|
||||
fperms 0770 /var/lib/mysqld_exporter
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}-r1.confd ${PN}
|
||||
|
||||
systemd_dounit "${FILESDIR}"/${PN}.service
|
||||
|
||||
insinto /etc/logrotate.d/
|
||||
newins "${FILESDIR}"/${PN}.logrotate ${PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -z "${REPLACING_VERSIONS}" ]]; then
|
||||
# This is a new installation
|
||||
elog "Create \"${EROOT}/var/lib/mysqld_exporter/.my.cnf\" to read MySQL credentials from file."
|
||||
else
|
||||
local _replacing_version=
|
||||
for _replacing_version in ${REPLACING_VERSIONS}; do
|
||||
if ! ver_test "${_replacing_version}" -ge "0.11.0"; then
|
||||
elog "Starting with ${PN}-0.11.0, command-line flags will require double dashes (--)."
|
||||
elog "You must update your configuration or ${PN} won't start."
|
||||
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
29 Sep 2020; Manuel Friedli <manuel@gentoo.org>
|
||||
-postfix_exporter-0.1.2.ebuild:
|
||||
app-metrics/postfix_exporter: Purge old ebuild
|
||||
|
||||
*postfix_exporter-0.2.0-r1 (29 Sep 2020)
|
||||
|
||||
29 Sep 2020; Manuel Friedli <manuel@gentoo.org>
|
||||
+postfix_exporter-0.2.0-r1.ebuild, -postfix_exporter-0.2.0.ebuild:
|
||||
app-metrics/postfix_exporter: Make v0.2.0 GLEP 81 conformant
|
||||
|
||||
*postfix_exporter-0.2.0 (19 Nov 2019)
|
||||
|
||||
19 Nov 2019; <manuel@gentoo.org> +files/postfix_exporter-1.confd,
|
||||
+postfix_exporter-0.2.0.ebuild:
|
||||
app-metrics/postfix_exporter: Add ebuild for version 0.2.0.
|
||||
|
||||
*postfix_exporter-0.1.2 (19 Nov 2019)
|
||||
|
||||
19 Nov 2019; <manuel@gentoo.org> +files/postfix_exporter.confd,
|
||||
+files/postfix_exporter.initd, +files/postfix_exporter.logrotated,
|
||||
+files/postfix_exporter.service, +metadata.xml,
|
||||
+postfix_exporter-0.1.2.ebuild:
|
||||
app-metrics/postfix_exporter: Add ebuild with systemd unit file.
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
AUX postfix_exporter-1.confd 891 BLAKE2B 7483607fd56a7cad95df4a1ba50306b1dd80226ad7caa7dc87de9d4de841546895df183f27232a9937c8c54df1d007f634150d238921226095be754281566591 SHA512 46650da87890f8d52efa2d28204c6f8bc31725cc5df2f7e762a7b6ee95857b5e8ca5ee529f5f2c9c96f174402aa002437300e6383c8de608338ce40a5a800cd9
|
||||
AUX postfix_exporter.confd 527 BLAKE2B c05b24a709dd2d4f67f048975fedae0ca78eaacf42918c56c20d7a1aba8568158ee573076bce0c77518b55db5a78fd36bb0d5bd79138e7a31e47d1b7cc47c7c7 SHA512 6275fc294668e64996053923be9c3c00246c2db5deaaa50b28ddc1f049f953f51d9923813c32ca8f809d409a8e843c0de49fafe3d1ed11f69f222e3e1bf25a77
|
||||
AUX postfix_exporter.initd 565 BLAKE2B 2bb9b4de2fdefd5e4be00415430eccd378dcb74254a308667679595269936a6acc02249a7c84f3d18f453efca7d64fd0a89748d601e97c8839130f0983285023 SHA512 4a525dfd6cac0d83ebf41b9f9265d1f06816bf25ed5753719451a187d71b7d4bdbc8669c6f34797e6c75ead5c489f18971435aae47396ec8c0c91554c5edbe3b
|
||||
AUX postfix_exporter.logrotated 105 BLAKE2B 5285292139b4412afa9ab5d0fbe19f17f8785e0f98784a18f400373ec2c079cd4302ebb458564f2f052fc77a9b94709c81445947dd46a108029e680a0fd2b81c SHA512 1c20e1718bdd91df38758d30af520db983146332659d06205112a662eb8f096c3671f7631bc835255fdcb0538c66224c244a523e94f12e08ccb7b85b953844b5
|
||||
AUX postfix_exporter.service 225 BLAKE2B 95517b7d089d79020d8376f14d82d01cefd572c35c83a6c51f9bbc40e2360a7b424ab19afb3f38cebdf591e06900de17ded91e4bea124fa953dd28627993744c SHA512 f95c8f9446306d86586866f494f2f3de7d6c226151d1a84855bb03cafbc1e130ee693f6ea4b521f36e628a465becde3df0ec16a13432134eefe33f51445d08f2
|
||||
DIST postfix_exporter-0.3.0-deps.tar.xz 10261848 BLAKE2B 3ab985ae873f53019b093266df90d4593b3a1755bafb6a0df600ae84411fd73f578cfeb6749fdfade5392ec55ec4df1916cf6b86f0ea0b5e04828dda50687789 SHA512 d591ef808fd3ccc7b48f37257ae6925b8ae491decef9ac679f13af08d0c6717b162a53cc2cd2ffb98361f38eaceaac24b2fba1db958fc9fa172fbe5060b639b1
|
||||
DIST postfix_exporter-0.3.0.tar.gz 26528 BLAKE2B 9d1b17917f4a6a6e73e1477e973454d9ce774d218463f151117e8772f77ea17c00536d0262789644716992c3c6ddcbf8b26d9c92eea77f9750e971e3a7c0d1d4 SHA512 1812d2ad95803290c12615975ba6e44c0a6f73dd0e10db927a9f1c58bfce27b71c9c2928f58623e263ba2737d2780f220e6a7fe0992e2607f290478eaa080b39
|
||||
EBUILD postfix_exporter-0.3.0-r2.ebuild 1037 BLAKE2B 71c5caa399bb6eef9c20b645a6af88c72862e2f9d928d6361a973ac3543a220975cd52b4a829fea891c72b23dc3f4fa012b68f956231b777ff279ebdf71e29ae SHA512 2acc5fa021736a6a1214735ab15dff136d6a17cd1f2fb42a44f8f5e3dd437b02f56d9eb8dc83f165ae4441f15dc7352b8cd9954ec008a72773d767b268058dae
|
||||
MISC ChangeLog 890 BLAKE2B de6961b87add10ea0b2597276ccf184a88fbe169bbfb1a30e17e48e8bfe5f35213f48a7fa0b597de95465cd9519370ceb81435eeba728618d910eecbd4e77dd3 SHA512 9b227ee69673fe8b7807a07af530d5e10a8840e65f93aac77be720632f11b117f5b2e9278947e6f81ed98afdd5354d07a0c23380ff5ddb4752a107fb5f8add7a
|
||||
MISC metadata.xml 255 BLAKE2B 1132f0657024f17717e5191a4992978685715f9abb96052db6399468506deaa85454efcaf58c7dcebfe5e1cf8948c767a7b001832d50c7d9dc162b0ff1395361 SHA512 36fb59a02d322553d6bfad2deeff884cc782c54bbb01a3fb344767fb43536905c43950df368e645d08ba9c48f3ec13c05b1d3c827fa12581c164623d2c174d73
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
# --postfix.logfile_path string
|
||||
# Path where Postfix writes log entries. This file will be truncated by this exporter. (default "/var/log/postfix_exporter_input.log")
|
||||
# --postfix.showq_path string
|
||||
# Path at which Postfix places its showq socket. (default "/var/spool/postfix/public/showq")
|
||||
# --web.listen-address string
|
||||
# Address to listen on for web interface and telemetry. (default ":9154")
|
||||
# --web.telemetry-path string
|
||||
# Path under which to expose metrics. (default "/metrics")
|
||||
# --systemd.enable
|
||||
# Read from the systemd journal instead of log
|
||||
# --systemd.unit string
|
||||
# Name of the Postfix systemd unit. (default "postfix.service")
|
||||
# --systemd.slice string
|
||||
# Name of the Postfix systemd slice. Overrides the systemd unit. (default "")
|
||||
# --systemd.journal_path string
|
||||
# Path to the systemd journal (default "")
|
||||
command_args=""
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
# -postfix.logfile_path string
|
||||
# Path where Postfix writes log entries. This file will be truncated by this exporter. (default "/var/log/postfix_exporter_input.log")
|
||||
# -postfix.showq_path string
|
||||
# Path at which Postfix places its showq socket. (default "/var/spool/postfix/public/showq")
|
||||
# -web.listen-address string
|
||||
# Address to listen on for web interface and telemetry. (default ":9154")
|
||||
# -web.telemetry-path string
|
||||
# Path under which to expose metrics. (default "/metrics")
|
||||
command_args=""
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
#!/sbin/openrc-run
|
||||
# Copyright 2016-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
description="Prometheus Exporter for Postfix Metrics"
|
||||
pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
|
||||
user=${user:-${RC_SVCNAME}}
|
||||
group=${group:-${RC_SVCNAME}}
|
||||
|
||||
command="/usr/bin/postfix_exporter"
|
||||
command_args="${command_args:-}"
|
||||
command_background="true"
|
||||
start_stop_daemon_args="--user ${user} --group ${group} \
|
||||
--stdout /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log \
|
||||
--stderr /var/log/${RC_SVCNAME}/${RC_SVCNAME}.log"
|
||||
|
||||
depend() {
|
||||
after net
|
||||
}
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
/var/log/postfix_exporter/postfix_exporter.log {
|
||||
missingok
|
||||
size 5M
|
||||
rotate 3
|
||||
compress
|
||||
copytruncate
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
[Unit]
|
||||
Description=Postfix Exporter
|
||||
|
||||
[Service]
|
||||
User=postfix_exporter
|
||||
Group=postfix_exporter
|
||||
EnvironmentFile=/etc/conf.d/postfix_exporter
|
||||
ExecStart=/usr/bin/postfix_exporter $command_args
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit go-module systemd
|
||||
|
||||
DESCRIPTION="Prometheus Exporter for Postfix"
|
||||
HOMEPAGE="https://github.com/kumina/postfix_exporter"
|
||||
SRC_URI="
|
||||
https://github.com/kumina/postfix_exporter/archive/${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~arthurzam/distfiles/app-metrics/${PN}/${P}-deps.tar.xz
|
||||
"
|
||||
|
||||
LICENSE="Apache-2.0 BSD MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="systemd"
|
||||
RESTRICT+=" test"
|
||||
|
||||
RDEPEND="
|
||||
acct-group/postfix_exporter
|
||||
acct-user/postfix_exporter
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
systemd? ( sys-apps/systemd )
|
||||
"
|
||||
|
||||
src_compile() {
|
||||
ego build -tags "$(usex systemd '' 'nosystemd')" -v -o bin/${PN}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/${PN}
|
||||
dodoc {CHANGELOG,README}.md
|
||||
keepdir /var/log/${PN}
|
||||
fowners ${PN}:${PN} /var/log/${PN}
|
||||
newinitd "${FILESDIR}"/${PN}.initd ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}-1.confd ${PN}
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
|
||||
systemd_dounit "${FILESDIR}"/${PN}.service
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
*prometheus-cpu-mem-monitor-0.0.0.1-r1 (29 Sep 2020)
|
||||
|
||||
29 Sep 2020; Manuel Friedli <manuel@gentoo.org>
|
||||
+prometheus-cpu-mem-monitor-0.0.0.1-r1.ebuild,
|
||||
-prometheus-cpu-mem-monitor-0.0.0.1.ebuild:
|
||||
app-metrics/prometheus-cpu-mem-monitor: GLEP 81 compatible
|
||||
|
||||
*prometheus-cpu-mem-monitor-0.0.0.1 (11 Nov 2019)
|
||||
|
||||
11 Nov 2019; <manuel@gentoo.org> +files/prometheus-cpu-mem-monitor.service,
|
||||
+files/prometheus-cpu-mem-monitor.sh, +files/prometheus-cpu-mem-monitor.timer,
|
||||
+metadata.xml, +prometheus-cpu-mem-monitor-0.0.0.1.ebuild:
|
||||
app-metrics/prometheus-cpu-mem-monitor: Add very first draft version
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
AUX prometheus-cpu-mem-monitor.service 243 BLAKE2B 6f774e36b2e1b2dbc1614a930f2e64da9b664a0bef6023bb69db571949266625f32ec057ac31be12f1ec2fbcb9c5d7a732377471f750b5346384c366808ba42a SHA512 7d21c89a0ebf577fe654ef93b7098b4ef40127892213e26141583d64a8fadc683799b0da588b8ddb4a692129de536e3c75dc80be83939ba7a5c47f45e84be7b2
|
||||
AUX prometheus-cpu-mem-monitor.sh 564 BLAKE2B 1fcff16c183709c569398795afbce2ab11e558badfb437b8e4048cde5102e7ae7fe58ea11f64cb1bce7754bdfd7f85bddcaaf4deefd2a658ca76b1973df9d8bc SHA512 dfbd52eb86dca8e0d576f262b98a4efe145524653a3cfe9ae51e14695d0a02d3fc7618e0f236b5200ef59b84d81acf373b3a49665dbc23c694f299a29569479e
|
||||
AUX prometheus-cpu-mem-monitor.timer 291 BLAKE2B d41b99088752863c3ffaf065279702a5ddec90edabe0fd7ec11d71b883756f370c4236aa1c4074b4d3869b02f29142aca4b5247dd49281299d5625a3fe4f3509 SHA512 2245655fec3417c44c64c04074f1f5c061e7c80a3b34ba0f683c12b74b1a7c5c46abec16bb78fca479381982d8286bab0919be223c2e9c08d26d3e80ced772a3
|
||||
EBUILD prometheus-cpu-mem-monitor-0.0.0.1-r2.ebuild 458 BLAKE2B 8f1583af1e7c008c3f5ebc3b1337ed4382110681ae171bb230eddffdeb719f739853486be3309e43ad871cffb6b6d3e88aeaad8a09beaa6bf4449dfe2f462bb2 SHA512 4aed822725bf83b66093e6813c786349cf1bb935c396efff1b8257b84f92df660d4bcfc0e125e8de8d158a13899629e6a4aea8273a2e70ba72204cb060c3f88e
|
||||
MISC ChangeLog 604 BLAKE2B 3eeac06192d3c27598c59618e7a800beed43b282e16abbf3d69e1aebbe43b8c525c6d9981802b04ba92ca67a5f4bccac41bc2458b4fd031775af2beb54d6acf8 SHA512 c38d6a62608d97018fc92328f4d0d86d4bad79593ce68b07264d3cb84e853dd2dc755e6ffaed46c40b4afdc691ae4527027c545f30ad8203985db1dd17cc58f2
|
||||
MISC metadata.xml 337 BLAKE2B bd72b6097fead5eaf80082790d3712ae0893b118140b62f58639f0e5c56bebf57dbd0ccd0ea19af82b2dce88c88c494d88290f98df4818e4fad3f4386398d171 SHA512 aee4825d8b90a8fd84fb558b9af4b7eb889fcf81bae6c7b317a9d69f62b06dd0f0bc2aa91aa2c32f10ff91fdbf64b341d7e5adc3c65a5225c7e0e92d7a6b7816
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
# Calculate host statistics for prometheus
|
||||
# Written by Manuel Friedli
|
||||
# Changelog:
|
||||
# 2019-11-10: Inception
|
||||
|
||||
[Unit]
|
||||
Description=Calculate CPU/Memory stats for prometheus
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/bin/prometheus-cpu-mem-monitor.sh
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
#!/bin/bash
|
||||
# Extract per-process CPU and memory usage from "ps aux" and send the data to prometheus
|
||||
#
|
||||
|
||||
TARGET_URL="http://localhost:9091/metrics/job/top/instance/vps-02.friedli.info"
|
||||
|
||||
z=$(ps aux)
|
||||
|
||||
while read -r z
|
||||
do
|
||||
cpustats=$cpustats$(awk '{print "cpu_usage{process=\""$11"\", pid=\""$2"\"}", $3z}');
|
||||
memstats=$memstats$(awk '{print "memory_usage{process=\""$11"\", pid=\""$2"\"}", $4z}');
|
||||
done <<< "$z"
|
||||
|
||||
curl -X POST -H "Content-Type: text/plain" --data "$cpustats
|
||||
" ${TARGET_URL}
|
||||
|
||||
curl -X POST -H "Content-Type: text/plain" --data "$memstats
|
||||
" ${TARGET_URL}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
# Timer for calculating host statistics for prometheus
|
||||
# Written by Manuel Friedli
|
||||
# Changelog:
|
||||
# 2019-11-10: Inception
|
||||
|
||||
[Unit]
|
||||
Description=Timer for calculating CPU/Memory stats for prometheus
|
||||
|
||||
[Timer]
|
||||
OnBootSec=1s
|
||||
OnUnitInactiveSec=10s
|
||||
AccuracySec=1s
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit systemd
|
||||
|
||||
DESCRIPTION="CPU and memory monitoring for prometheus"
|
||||
HOMEPAGE="https://gittr.ch/linux/gentoo-overlay"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
DEPEND="sys-process/procps"
|
||||
|
||||
src_install() {
|
||||
dobin "${FILESDIR}/${PN}.sh"
|
||||
systemd_dounit "${FILESDIR}/${PN}.service"
|
||||
systemd_dounit "${FILESDIR}/${PN}.timer"
|
||||
}
|
||||
6
dev-games/simgear/Manifest
Normal file
6
dev-games/simgear/Manifest
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
AUX 0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch 1133 BLAKE2B c149bd4d1be4038bbbd18627755947542f72d9f80314555bd2749d0c7ba6a859bba8237bc1a295661ca5d1ba4cf698ecf72dce55cb9b3c343d95cb9cb8a08eec SHA512 11e5bc51ad5452c0f09d3953d67262e0a646478f1b4bc29e782b87802f9b48712bc033364e36a250b7272ad363ad911d2fe51cb3dc509171c50fe9b2f3ecf90d
|
||||
AUX 0002-fix-support-for-aarch64.patch 819 BLAKE2B 54ad2da897398ae39864b04b156ee784f9a9a325ebea702c590d5029671135035ac95b645e7a5d0f0d75d4a91c935039add3124755199899b49d40a4fb1a6d08 SHA512 f21c22adff9bda15142281c349adacda8b223399831d320a2c0b2d38af4741e486bc5a701e470a12ed981599e526a877e974ef105aea668b9410c448f29903af
|
||||
AUX simgear-2024.1.3-boost.patch 426 BLAKE2B 98d01e06980e4b9506d54f10edb3f71aa3e12b7dfcd1fcd61f2fb46d1b65cd4ad4a5694fde5705f5b1d40a82a3dc7eff341c6275d7ea657273fd31857657685e SHA512 d9ddf1da745132de3fb2c101ebb284028b272989998fed971aa03cd67ea5137bfe3641a1fc6eb80e23ccd5517c09246a7cae45489633356d51ac4f457e0e873d
|
||||
DIST simgear-2024.1.3.tar.bz2 1783857 BLAKE2B d4a6227ea74afdac8767280eacecc43cd80b8f28dbe54fec0d27a18936008ba71804438e86a81c4a01a66d9b66d9a4a050552281e0943638daa63f1faf0f68ee SHA512 23d97b9837fe67f35a0bdb6f8e6e466fdfc7774762d0c6006d6fec4f472bde1654571532bf9bc5cee8dd35c3a362727b347474ea605d4c87939edd8511e6fea7
|
||||
EBUILD simgear-2024.1.3.ebuild 1584 BLAKE2B 4f544bfdcf217349e061bbb5ca713f140d038378fbf3bf3ce45c8a0a538d83c73b0e4bc1ecac462c1fbc2f206ecb4bbf5a007d94adb01a927664493d0ef89edf SHA512 e5f4191225fb367d92cfb1d2767ce3eac1b76af804db915fdf5e13ce9a08143e63101791fac6d63de493db9b6abfdb231ef46cbfc37d9e7d11d49fef3224ba9a
|
||||
MISC metadata.xml 808 BLAKE2B 9db106e9b7de4d0db144a637e4870e709f629804d12115e0ae6b9b40960ecc455d12dd96fa1c801ddcd3e219ada65ae62299604253f87175965be9a4147167b4 SHA512 45c19fc8e049750ba87a77f20ccd0191daf5c9a467067c01475781ef2e31203b1ecd6ed90cba312e4ed316ad4f57ac91e437dd2d0143d69c7b6b11b91403bd23
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
From 9465f10110e02686b3f8a860520a7e8f3c6a7936 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Bellet <fabrice@bellet.info>
|
||||
Date: Sun, 22 Sep 2013 11:56:12 +0200
|
||||
Subject: [PATCH 0/1] check to be sure that %n is not being set as format type
|
||||
(CVE-2012-2090)
|
||||
|
||||
---
|
||||
simgear/scene/model/SGText.cxx | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/simgear/scene/model/SGText.cxx b/simgear/scene/model/SGText.cxx
|
||||
index 08e84439..bc673511 100644
|
||||
--- a/simgear/scene/model/SGText.cxx
|
||||
+++ b/simgear/scene/model/SGText.cxx
|
||||
@@ -73,6 +73,16 @@ void SGText::UpdateCallback::operator()(osg::Node * node, osg::NodeVisitor *nv )
|
||||
// FIXME:
|
||||
// hopefully the users never specifies bad formats here
|
||||
// this should better be something more robust
|
||||
+ // It is never safe for format.c_str to be %n.
|
||||
+ string unsafe ("%n");
|
||||
+ size_t found;
|
||||
+
|
||||
+ found=format.find(unsafe);
|
||||
+ if (found!=string::npos) {
|
||||
+ SG_LOG(SG_GENERAL, SG_ALERT, "format type contained %n, but this is unsafe, reverting to %s");
|
||||
+ format = "%s";
|
||||
+ }
|
||||
+
|
||||
char buf[256];
|
||||
if( numeric ) {
|
||||
double d = property->getDoubleValue() * scale + offset;
|
||||
--
|
||||
2.48.1
|
||||
|
||||
25
dev-games/simgear/files/0002-fix-support-for-aarch64.patch
Normal file
25
dev-games/simgear/files/0002-fix-support-for-aarch64.patch
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
From 560be7700e03b20e5f252fed371ac14a0e7a7c17 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Bellet <fabrice@bellet.info>
|
||||
Date: Fri, 19 Feb 2016 15:57:19 +0100
|
||||
Subject: [PATCH 1/1] fix support for aarch64
|
||||
|
||||
---
|
||||
simgear/nasal/naref.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/simgear/nasal/naref.h b/simgear/nasal/naref.h
|
||||
index 21f766f5..7e269a1f 100644
|
||||
--- a/simgear/nasal/naref.h
|
||||
+++ b/simgear/nasal/naref.h
|
||||
@@ -18,7 +18,7 @@
|
||||
# endif
|
||||
#elif defined(_M_IX86) || defined(__i386) || defined(__x86_64) || \
|
||||
defined(__ia64__) || defined(_M_IA64) || defined(__ARMEL__) || \
|
||||
- defined(_M_X64) || defined(_M_ARM) || \
|
||||
+ defined(_M_X64) || defined(_M_ARM) || defined(__aarch64__) || \
|
||||
defined(__e2k__)
|
||||
# define NASAL_LE
|
||||
#elif defined(__sparc) || defined(__ARMEB__) || \
|
||||
--
|
||||
2.48.1
|
||||
|
||||
13
dev-games/simgear/files/simgear-2024.1.3-boost.patch
Normal file
13
dev-games/simgear/files/simgear-2024.1.3-boost.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/simgear/nasal/cppbind/NasalHash.hxx b/simgear/nasal/cppbind/NasalHash.hxx
|
||||
index 54efc2c5194f9c6fa8c52a528aff56228c576d90..1734adf682e0614671675c5dad2f9dfd5d91838d 100644
|
||||
--- a/simgear/nasal/cppbind/NasalHash.hxx
|
||||
+++ b/simgear/nasal/cppbind/NasalHash.hxx
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef SG_NASAL_HASH_HXX_
|
||||
#define SG_NASAL_HASH_HXX_
|
||||
|
||||
+#include <boost/mpl/if.hpp>
|
||||
+
|
||||
#include "from_nasal.hxx"
|
||||
#include "to_nasal.hxx"
|
||||
|
||||
20
dev-games/simgear/metadata.xml
Normal file
20
dev-games/simgear/metadata.xml
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>manuel@fritteli.ch</email>
|
||||
<name>Manuel Friedli</name>
|
||||
</maintainer>
|
||||
<longdescription>
|
||||
SimGear is a set of open-source libraries designed to be used as building blocks for
|
||||
quickly assembling 3d simulations, games, and visualization applications.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="ffmpeg">Enable video recording via <pkg>media-video/ffmpeg</pkg></flag>
|
||||
<flag name="gdal">Enable alternative terrain engine based on pagedLOD via <pkg>sci-libs/gdal</pkg></flag>
|
||||
<flag name="subversion">Enable terrasync scenery downloader</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="gitlab">flightgear/simgear</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
66
dev-games/simgear/simgear-2024.1.3.ebuild
Normal file
66
dev-games/simgear/simgear-2024.1.3.ebuild
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake
|
||||
|
||||
DESCRIPTION="Development library for simulation games"
|
||||
HOMEPAGE="https://www.flightgear.org/"
|
||||
#SRC_URI="https://gitlab.com/flightgear/fgmeta/-/jobs/9264813015/artifacts/raw/sgbuild/${P}.tar.bz2"
|
||||
SRC_URI="https://gitlab.com/flightgear/simgear/-/archive/${PV}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="cpu_flags_x86_sse2 debug ffmpeg gdal subversion test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
# TODO AeonWave, CycloneDDS
|
||||
COMMON_DEPEND="
|
||||
app-arch/xz-utils
|
||||
dev-libs/expat
|
||||
dev-games/openscenegraph
|
||||
media-libs/openal
|
||||
net-libs/udns
|
||||
net-misc/curl
|
||||
virtual/zlib:=
|
||||
virtual/opengl
|
||||
ffmpeg? ( media-video/ffmpeg:0 )
|
||||
gdal? ( sci-libs/gdal:= )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/boost
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
subversion? ( dev-vcs/subversion )
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch"
|
||||
"${FILESDIR}/0002-fix-support-for-aarch64.patch"
|
||||
"${FILESDIR}/${P}-boost.patch"
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DENABLE_ASAN=OFF
|
||||
-DENABLE_CYCLONE=OFF
|
||||
-DENABLE_GDAL=$(usex gdal)
|
||||
-DENABLE_PKGUTIL=ON
|
||||
-DENABLE_RTI=OFF
|
||||
-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
|
||||
-DENABLE_SOUND=ON
|
||||
-DENABLE_TESTS=$(usex test)
|
||||
-DENABLE_TSAN=OFF
|
||||
-DENABLE_VIDEO_RECORD=$(usex ffmpeg)
|
||||
-DSIMGEAR_HEADLESS=OFF
|
||||
-DSIMGEAR_SHARED=ON
|
||||
-DSYSTEM_EXPAT=ON
|
||||
-DSYSTEM_UDNS=ON
|
||||
-DUSE_AEONWAVE=OFF
|
||||
-DUSE_OPENALSOFT=ON
|
||||
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO perhaps track it
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
DIST geoip2-4.8.0.tar.gz 174237 BLAKE2B a175065c127246d6594cc1c3e9148db6b0f1b440a1634b6da649da4f529a67fcd66f7d08e3e4a8137d13c9ca6b92f38c53a7744b45d362c4e6de4552df0dae39 SHA512 927a68a50e68d82885da982b4e8fff1c166f8a482b88f311e9466356da383554813fa633227b7dcc914b49327e9ef918534161d8208ccc480d4965318d639af5
|
||||
EBUILD geoip2-4.8.0.ebuild 504 BLAKE2B 99e4a34e889b5fe03bbe3ee20a24894e0aacbaeeef0b1efe9b3f78ac7b1df4965f3482662833ce5ed7fea66e7ae175811cd5f8516aa78c989203184fc68ccfeb SHA512 fc7977c02261d7caba85d3812d7225817e08998039e61022ac25c575e26ab51dde2c52f90803645b82bce374a7346e10d85dfd31635b74ac947b4237a68e9b0f
|
||||
EBUILD geoip2-4.8.0.ebuild 504 BLAKE2B 38eb3c55da5a6944bec8d12910dac18215b48bcbd50ea2b5225b8aa87459fd20c5367d01df6f921cb842be9453bf5d15b26d395fe1493f23331bda130a202b4e SHA512 8093c19d0f347b41ac67fd4adb5eed704e1dad1b88dc664299c54880d49f9a9122fe49c332d9936ad833392a3a5fdb37e12ae68ee751eb37d5e4f24cec04dd53
|
||||
MISC ChangeLog 767 BLAKE2B 634974f533f8c9424522861351dee15931e12e4d0a3b550bd59b0f67c9c25357d0b7702303be51bc347072a8080834d68662236ec1f070f12a2712b56abc0659 SHA512 838b1946d5e28c2ca4bcb994670855809bc7782f837fd4f4fbbf66850640a9b8d1426275d65286cc70ce2bc7c7ceee4350bcadaedc2b3bfcf1eb06e329007e28
|
||||
MISC metadata.xml 378 BLAKE2B 021f1d4f38fc77495964dcd72e96bfe42364a221e1be0048a7facb7373ab3122b5b4204712d9178c9fd229d0b4d3c7565d75b1f1d241789bd74ce34fd1ab924d SHA512 b3448e6d9699cf5aa36d17532ec0b19a41078927d1692bf15b8aa79436aff3e0fe0017670d3361fac6b802b60ee1985db7ab766095ad0f352139ce4d131abb48
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{8..13} )
|
||||
PYTHON_COMPAT=( python3_{8..14} )
|
||||
|
||||
inherit distutils-r1 pypi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
DIST maxminddb-2.6.2.tar.gz 181286 BLAKE2B 484ea210956bf23ab6f9995bfe3723204ff26296a18e23766afee2bcc9c53bff2f04301da9bebf80cf965aab88474e79a1b6ecb5b662f82f2ced5fedbf35ecf8 SHA512 72fe00e29a26e51fe5357dc70da35d5c8bd7085ad6bd4e70eb1b37414c7dbad4f54d207bf8c957ecb03ff7e7503756f57c0dcd753de2fe2cfb0717df617ff811
|
||||
EBUILD maxminddb-2.6.2.ebuild 478 BLAKE2B 228be35b064d84739fb6e313fdf66678552e72e9c8cd635edf88d4de3f38399f960c5e9b230d9ed7714d043a4e27f88055af9fac4e26956cf1e0447a287280f7 SHA512 45b7628d5023d2b0f2b4e1eda5410837a406d88e94993c03949a63fcc532f1c964b0fb7ed70dbd9505859b48eae89f7b75ac8689791f8cf008e9e64be6b69fb6
|
||||
EBUILD maxminddb-2.6.2.ebuild 490 BLAKE2B 876d0edecf9143a1bd610743b79a328f435776dcb590860a800cd848cf515b98298d443fda73ae703c31c50652e5596fd0570959882cff8f3ac6e62310f7ab00 SHA512 a0b438a36f7684c435724f931f5641bfb5885da43db935aa79044a28157d26851b99b1029009a16ff51e40780f44ae20da39d0a6cb681890e772c4b4bf26b480
|
||||
MISC ChangeLog 623 BLAKE2B 5dc58925a20d08e0ad1e83c5bdb555a812d86b54ed88cca489ffc283c22ddc77ee9e0c25fcf564e56677781af5ba9ada9dc243b36cc3ff29d2dff7f034090f87 SHA512 9449e563127e6b1db426df8a4f7eca8f534e136e8baa4c6be49cf9118c69b456006fa2a9024d993a0f2c3c4b9b7f8ac0c4dcaa71dfcbf42b709a03a0ba15fc5b
|
||||
MISC metadata.xml 392 BLAKE2B 80ee8b6d41e2c55629eeb9d57d6c280e70bf21ee0d7af48b4f295db55117b9f2409340df26226ff4d51e680c8b1afe4d2664558872a18b38f4786f6943a92b31 SHA512 0b7723429e3137409159f75f2c37f29982a4bb034f68395cde63a9c7a825626b986277b9bec551f24b895d7731735bfae726cd64abb1d4c8b043122ad6e0eff5
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ EAPI=8
|
|||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
DISTUTILS_EXT=1
|
||||
PYTHON_COMPAT=( python3_{8..13} python3_13t)
|
||||
PYTHON_COMPAT=( python3_{8..14} python3_13t python3_14t)
|
||||
|
||||
inherit distutils-r1 pypi
|
||||
|
||||
|
|
|
|||
5
dev-util/forgejo-runner/Manifest
Normal file
5
dev-util/forgejo-runner/Manifest
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
AUX forgejo-runner.service 404 BLAKE2B 5a135bd06c62b680e7b8ac3af100b315190626aacb9e05abb9953ec35c72df2b91e8b278fcfdda7d51b895ef1a78ec0be754e79d08d15f6558bde466bfd80f9e SHA512 2bf6014bee79a50628c9c1cc24ae7401165b611bb3e5c63125f91f3e2028fb9ecb54babd7d304146f1694bccaaefa4f1d54b237a7e6bd51437914992a18aa2fd
|
||||
DIST forgejo-runner-12.6.2-deps.tar.xz 54995188 BLAKE2B bbc273aaa5a7ec4f071f2309070957a4f4d53581baaa498065b03aba0e2b7eb7564c25627a8bb2dd0d803190bd8c4b25ac34f5d40bfb0ca0f66d7c999eac140c SHA512 a4fa6b42d79b3eb5230ce65a44fbf8057d11705b409a5fba4e19ea05e4cd12eadd17f0ad675bcfb23c0ed48f378ed2223b1c2f7b662e19c7c080f01bf86b96ba
|
||||
DIST forgejo-runner-12.6.2.tar.gz 3481686 BLAKE2B 821017323f1236de7ac83f5a62569fa4bb181033dc91e0faaeba3d3772b099110f6619a7d2540c444ed3b25f4cdfe70cc53baac89d79eb1016e922e4736ad90f SHA512 d1b4fb28ae3791522e107469475af0e285bc9ffda8b5a2988b0ba2c587a451c20c4de47a7925810f1dfa8bf3beb8faec58923c5ff21bdb1c4336d6cf4093cfae
|
||||
EBUILD forgejo-runner-12.6.2.ebuild 1851 BLAKE2B 181153d0d9f691df47f22fcbd299a8fd8d943000842c7b083aed5c3c51288e5bf4676b90cb340c1caa4ba87c8b3d3b8d9f24f12779dfbb65a4f0eb20e91f9d43 SHA512 eab660cb212de0be7aadd26e176751a93245c0e7eedef94dd9a7c90929a05c6f10cb7bf8ac8d22b12fc5fd1c9eb9f99f850bf4e75cb1cb70229113caba045fca
|
||||
MISC metadata.xml 352 BLAKE2B 544a34545f937b6096dd963bc77b6b7189ce3046f8c3ef68f6edc02f6a9e39f53ceafb005b9d50f0fda07c14321f399745db7ae6b9f6731c205a6158e260c2a0 SHA512 e3e013d4273ac753163ab1c8d61fc30e4dfe9422f20d0d33356bfab7eff34b29617230da0a4b16d8b1e3a47eb03cfd636f578de5262c6713aa9b6827f33b0829
|
||||
18
dev-util/forgejo-runner/files/forgejo-runner.service
Normal file
18
dev-util/forgejo-runner/files/forgejo-runner.service
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
[Unit]
|
||||
Description=Forgejo Runner
|
||||
Documentation=https://forgejo.org/docs/latest/admin/actions/
|
||||
After=docker.service
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/forgejo-runner daemon
|
||||
ExecReload=/bin/kill -s HUP $MAINPID
|
||||
|
||||
# This user and working directory must already exist
|
||||
User=forgejo-runner
|
||||
WorkingDirectory=/var/lib/forgejo-runner
|
||||
Restart=on-failure
|
||||
TimeoutSec=0
|
||||
RestartSec=10
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
85
dev-util/forgejo-runner/forgejo-runner-12.6.2.ebuild
Normal file
85
dev-util/forgejo-runner/forgejo-runner-12.6.2.ebuild
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
# Copyright 2024-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit go-module systemd
|
||||
|
||||
DESCRIPTION="A daemon that connects to a Forgejo instance and runs jobs for CI"
|
||||
HOMEPAGE="https://code.forgejo.org/forgejo/runner https://forgejo.org/docs/next/admin/actions/"
|
||||
|
||||
if [[ "${PV}" == *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://code.forgejo.org/forgejo/runner.git"
|
||||
else
|
||||
SRC_URI="
|
||||
https://code.forgejo.org/forgejo/runner/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://github.com/gentoo-golang-dist/${PN}/releases/download/v${PV}/${P}-deps.tar.xz
|
||||
"
|
||||
S="${WORKDIR}/runner"
|
||||
|
||||
KEYWORDS="~amd64 ~arm64"
|
||||
fi
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
IUSE="examples"
|
||||
RESTRICT="test"
|
||||
|
||||
DEPEND="
|
||||
acct-group/forgejo-runner
|
||||
acct-user/forgejo-runner
|
||||
>=dev-lang/go-1.24.0
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
app-containers/docker
|
||||
"
|
||||
|
||||
src_unpack() {
|
||||
if [[ "${PV}" == *9999* ]]; then
|
||||
git-r3_src_unpack
|
||||
go-module_live_vendor
|
||||
else
|
||||
go-module_src_unpack
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# export version information
|
||||
# https://github.com/gentoo/guru/pull/205
|
||||
# https://forums.gentoo.org/viewtopic-p-8831646.html
|
||||
local VERSION
|
||||
if [[ "${PV}" == *9999* ]]; then
|
||||
VERSION="$(
|
||||
git describe --tags --first-parent --abbrev=7 --long --dirty --always \
|
||||
| sed -e "s/^v//g"
|
||||
)"
|
||||
else
|
||||
VERSION="${PVR}"
|
||||
fi
|
||||
|
||||
local EXTRA_GOFLAGS_LD=(
|
||||
# "-w" # disable DWARF generation
|
||||
# "-s" # disable symbol table
|
||||
"-X=code.forgejo.org/forgejo/runner/v11/internal/pkg/ver.version=v${VERSION}"
|
||||
)
|
||||
|
||||
GOFLAGS+=" '-ldflags=${EXTRA_GOFLAGS_LD[*]}'"
|
||||
|
||||
ego build -tags 'netgo osusergo' -o forgejo-runner
|
||||
|
||||
# Makefile does this
|
||||
# emake forgejo-runner
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin forgejo-runner
|
||||
|
||||
systemd_dounit "${FILESDIR}/forgejo-runner.service"
|
||||
|
||||
dodoc "README.md"
|
||||
if use examples; then
|
||||
dodoc -r "examples"
|
||||
docompress -x "/usr/share/doc/${PF}/examples"
|
||||
fi
|
||||
}
|
||||
11
dev-util/forgejo-runner/metadata.xml
Normal file
11
dev-util/forgejo-runner/metadata.xml
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>negril.nx+gentoo@gmail.com</email>
|
||||
<name>Paul Zander</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">gentoo-golang-dist/forgejo-runner</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
3
games-simulation/flightgear-data/Manifest
Normal file
3
games-simulation/flightgear-data/Manifest
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
DIST FlightGear-2024.1.3-data.txz 1883164948 BLAKE2B 8749efac5b2b149844e78bf4acb8896e4d9513c938cfbffce1b50dee78460988ea57426b2c97d5142ea27ff25c0c1d41fc538e6f85169f353188b1b1064ed7f3 SHA512 f7e537d82dd1baa65ae96d69a357ccda5b98056d81c1d88e7588358aaddc84f1f5bb0d53b913d7a50038a823e3f4217d2689961c459f7cd92a00a0086cbe27c0
|
||||
EBUILD flightgear-data-2024.1.3.ebuild 442 BLAKE2B 181628ac63884adc4cb60a6cad0a53fbc4563f7a0ec83e0fc5a6f74a117677396f7c5afeda563320d2feb92ecd219bf0de10a724d888df8269da5aaec3e289e8 SHA512 8dff86dee6da9c9a1d408280e46c95be4c2aed9ec3eafe0f82ebd73f137d9ff20ca0b9590febfe9741ecc2c8ae54bc1eab777ab6da8435ce6a99242bdbf93707
|
||||
MISC metadata.xml 248 BLAKE2B cb50cad2c614a99daa2e236f9e0d0fab1ab20a898c0b0f0c28a1387820ab1f2b9dd4d396a3b38f732b493824f96a29ee5894e80e09dbd08dff62c1aaba3feaa0 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="FlightGear data files"
|
||||
HOMEPAGE="https://www.flightgear.org/"
|
||||
SRC_URI="https://download.flightgear.org/release-2024.1/FlightGear-${PV}-data.txz"
|
||||
|
||||
S=${WORKDIR}/fgdata_$(ver_cut 1)_$(ver_cut 2)
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
src_install() {
|
||||
insinto /usr/share/flightgear
|
||||
rm -fr .git
|
||||
doins -r *
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<upstream>
|
||||
<remote-id type="github">kumina/postfix_exporter</remote-id>
|
||||
</upstream>
|
||||
<maintainer type="person">
|
||||
<email>manuel@fritteli.ch</email>
|
||||
<name>Manuel Friedli</name>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
11
games-simulation/flightgear/Manifest
Normal file
11
games-simulation/flightgear/Manifest
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
AUX 0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch 1260 BLAKE2B 7131a66b00ab68200d6c32e0531ab7e4a5cf5272ab179a46d523c40681b276cb589083fc19ac41ec3d747fc557351a9c85b107e73c6d00cb2ab0643b2227a831 SHA512 3210bc1732f77452dfbab6d9fcc94a50438c63c49dac835970c06bc0ed6731131e8236f1d9bd2a358ccf1272be1fcffd84d0bba08d49f61d73231e247cc99887
|
||||
AUX 0003-make-fglauncher-a-static-library.patch 728 BLAKE2B a5fe82c7427cad26f5c0a468ea16e160ac0552a8ef5367e34b364316afb1ffa4cb37c6ec9190285454861522815533f4626116d117e56f5bf764e3b34506de17 SHA512 6dbcf270fc8e26f23524d0e00d1a5379cc734c096fc573252b46335dc9babe7c374d464680ca62606bff3b59a60ab33d3a72a754978b7ddc45def4a32486864b
|
||||
AUX 0005-make-fgqmlui-a-static-library.patch 736 BLAKE2B 45707585fac5e62218d6db628f85cb2214ed0a0c64a2f9f151a02534770eb92d01feea08b288ed47a771c0ad794bce3d998695b7b88357836d28a284675fdd17 SHA512 025f72635a2a2829e336dfd6aa077e410586dab0a5776dd1915884aea026ee5708613ece651d1361f7221ce9b300b63de6a5ec25f4cff5ff8e11445fbe02e011
|
||||
AUX 0006-fgviewer-fix-crash-on-exit.patch 880 BLAKE2B 5b4e1b8c0a94901e55bda053efb78a032daa8caba1ae65b1b4d73be9ed508ef68098827e7108a376a021f4fed256f062e35a6f8f6c36832af2a90a6a8b2a92dd SHA512 746a78604261f37b62d4140d2142defec8bae85099092684111f2ee946f4ca93df5faf88d9992afa4abcc3499712494473dbf03915d437475e2159568e97104d
|
||||
AUX ac3d.vim 45 BLAKE2B 04a6e4c70a8be0f7d996f1192289cc05012d4b4cc82a56a14b5d6d2dd7aae8f23f1cd853d29d071a0b9691cf5b8e8b262355b40752f43bccaa318065992d709b SHA512 b691585c6772222525b7f2d67ed41431663400930d9c7deed843a6abe50f67b517bd3180026a0cfe949df29036a49bcaf33ab759dd958ae64d550c271150a7da
|
||||
AUX flightgear-2024.1.1-cmake.patch 2058 BLAKE2B 8a06322ef30df8e48c6d161c52193d6fd0da41515a24ea6e0850005a7d08b96efbd7d147f5e9b30e1e5421cc25ed4e51fc07318b93e5b8e241ca0d59eb112ca6 SHA512 a1bf34961f2d2740514ed5df78aa8b085e3a83689b8459c016a9bd04e01308b7208366af24885452d95668ae44f4436d84260adb18e42154fde1ce5f9786c884
|
||||
AUX flightgear-2024.1.1-fix-fgpanel.patch 28887 BLAKE2B 34f975aee6923a7d5190565411e9884813c3cdf5a67766b4755bee189605803ae48b993ee5245c40b25136fb3e9c92a1c654d070682b92905ae18909448d5e72 SHA512 78bfd041ec0fb4a74509c4f95e44a580d1786388da2a0207678df4ef17ba53de194ddb0add3fac93db80bc879dde99282f7cfcde7bc2d647dad4f6d65ebaa9de
|
||||
AUX nasal.vim 47 BLAKE2B c3809ad7297d5811ff0b4a004295cd8e7a0984d30acc5790e5c05f5aa400c4c0723e480256e26627f67969a85e9ed91706fae9d9807e19e0566b32339a41031b SHA512 1edfa24fabbaae5037c8c521052d7013f3b29d2933d79a8381593121115229df6764219614d8d06b4058eb93cf84d9cc75773fd0864fd7a6e2aebd811e9d1afb
|
||||
DIST flightgear-2024.1.3.tar.bz2 9772071 BLAKE2B 46ca22f7fb9d7b7c827ee36fb168ac0e3c637abbbbf37179da9d6dbf1b88a58737a4346a295204b6b78eb2dc618bcc7756dca7aee83ecad77c9faf783885973b SHA512 85c92e413f48e95be75bc96b82414c658ecfad902d606ba1ff31281e7ac6833b6b5630b7c29f3b0a266ef2f266563092c740b6a56470801f0085941e07a2ffa6
|
||||
EBUILD flightgear-2024.1.3.ebuild 4686 BLAKE2B ee71438c0eb7b9dffc75705af66f2801db32f92502e5839d34b40d7981b8ac688c0c2e2c2f7f93e282dda6c2b3e8c7392c91cee4825b289aea84d600c1f1760f SHA512 1c255fd4e1d0cc7bdca4b0ddd0cbfd5007213c80917e7f24976349a5190529820349be1a7becc569b9103ab38c0320282d2d4c3f0b98b4471ec7509f14a56061
|
||||
MISC metadata.xml 756 BLAKE2B c69e5dc34025838d009d26df5bbbd7ac8fd7326273204533ac448a688843e469628132abd5fe64a73ab8d33916cd4f564a92e79f56d040b6234f8561bdde6a4e SHA512 f01b51cbd9f35ac3764c2b36f5b52d19abaccce260b2dc0ce9703ad205bd5c41598456f578021f535a5c9a53b60095a54b3bcb8bafa5951cbf49c73dad73ef34
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
From 609b73ec6941321b157afb236f86c943f959a845 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Bellet <fabrice@bellet.info>
|
||||
Date: Sun, 22 Sep 2013 12:19:18 +0200
|
||||
Subject: [PATCH] check to be sure that %n is not being set as format type
|
||||
(CVE-2012-2090)
|
||||
|
||||
---
|
||||
src/Environment/fgclouds.cxx | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
|
||||
index 043cbb007..a57c529d8 100644
|
||||
--- a/src/Environment/fgclouds.cxx
|
||||
+++ b/src/Environment/fgclouds.cxx
|
||||
@@ -218,6 +218,15 @@ void FGClouds::buildLayer(int iLayer, const string& name, double coverage) {
|
||||
double count = acloud->getDoubleValue("count", 1.0);
|
||||
tCloudVariety[CloudVarietyCount].count = count;
|
||||
int variety = 0;
|
||||
+ // It is never safe for cloud_name.c_str to be %n.
|
||||
+ string unsafe ("%n");
|
||||
+ size_t found;
|
||||
+
|
||||
+ found=cloud_name.find(unsafe);
|
||||
+ if (found!=string::npos) {
|
||||
+ SG_LOG(SG_GENERAL, SG_ALERT, "format type contained %n, but this is unsafe , ignore it");
|
||||
+ continue;
|
||||
+ }
|
||||
char variety_name[50];
|
||||
do {
|
||||
variety++;
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 00de7fd687bdc7ab7c679678f3a523d2038b7d8f Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Bellet <fabrice@bellet.info>
|
||||
Date: Tue, 17 Feb 2015 23:00:29 +0100
|
||||
Subject: [PATCH] make fglauncher a static library
|
||||
|
||||
---
|
||||
src/GUI/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
|
||||
index f4fc01a6e..0a0bd3398 100644
|
||||
--- a/src/GUI/CMakeLists.txt
|
||||
+++ b/src/GUI/CMakeLists.txt
|
||||
@@ -104,7 +104,7 @@ if (HAVE_QT)
|
||||
|
||||
|
||||
|
||||
- add_library(fglauncher QtLauncher.cxx
|
||||
+ add_library(fglauncher STATIC QtLauncher.cxx
|
||||
QtLauncher.hxx
|
||||
SettingsWrapper.hxx
|
||||
LauncherMainWindow.hxx
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
From 5cd88182e3b8f3e011be53a307cbf981dbb97836 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Bellet <fabrice@bellet.info>
|
||||
Date: Sun, 8 Apr 2018 18:03:30 +0200
|
||||
Subject: [PATCH] make fgqmlui a static library
|
||||
|
||||
---
|
||||
src/GUI/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt
|
||||
index 0a0bd3398..34a1e1f2d 100644
|
||||
--- a/src/GUI/CMakeLists.txt
|
||||
+++ b/src/GUI/CMakeLists.txt
|
||||
@@ -185,7 +185,7 @@ if (HAVE_QT)
|
||||
Qt${QT_VERSION_MAJOR}::Svg
|
||||
SimGearCore)
|
||||
|
||||
- add_library(fgqmlui
|
||||
+ add_library(fgqmlui STATIC
|
||||
PropertyItemModel.cxx
|
||||
PropertyItemModel.hxx
|
||||
FGQmlInstance.cxx
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
From 95101b6fedaa332c70caca15a8fc762355d499b3 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Bellet <fabrice@bellet.info>
|
||||
Date: Wed, 7 Jun 2017 09:19:06 +0200
|
||||
Subject: [PATCH] fgviewer: fix crash on exit
|
||||
|
||||
---
|
||||
utils/fgviewer/fgviewer.cxx | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/fgviewer/fgviewer.cxx b/utils/fgviewer/fgviewer.cxx
|
||||
index 1af450e96..c5628cef8 100644
|
||||
--- a/utils/fgviewer/fgviewer.cxx
|
||||
+++ b/utils/fgviewer/fgviewer.cxx
|
||||
@@ -271,5 +271,11 @@ main(int argc, char** argv)
|
||||
// Note that this does not affect the hla camera manipulator
|
||||
viewer.home();
|
||||
|
||||
- return viewer.run();
|
||||
+ int result = viewer.run();
|
||||
+
|
||||
+ // clear cache now, since it contains SimGear objects. Otherwise SG_LOG
|
||||
+ // calls during shutdown will cause crashes.
|
||||
+ osgDB::Registry::instance()->clearObjectCache();
|
||||
+
|
||||
+ return result;
|
||||
}
|
||||
--
|
||||
2.48.1
|
||||
|
||||
1
games-simulation/flightgear/files/ac3d.vim
Normal file
1
games-simulation/flightgear/files/ac3d.vim
Normal file
|
|
@ -0,0 +1 @@
|
|||
au BufRead,BufNewFile *.ac set filetype=ac3d
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
diff '--color=auto' -ruN flightgear-2024.1.1/CMakeLists.txt my/CMakeLists.txt
|
||||
--- flightgear-2024.1.1/CMakeLists.txt 2025-02-27 15:49:31.000000000 +0100
|
||||
+++ my/CMakeLists.txt 2025-05-22 04:59:08.937714480 +0200
|
||||
@@ -368,7 +368,7 @@
|
||||
set(minQtVersion 5.12.1)
|
||||
endif()
|
||||
|
||||
- find_package(Qt${QT_VERSION_MAJOR} ${minQtVersion} REQUIRED COMPONENTS Widgets Gui Network Qml Quick Svg)
|
||||
+ find_package(Qt${QT_VERSION_MAJOR} ${minQtVersion} REQUIRED COMPONENTS Widgets Gui Network Qml Quick)
|
||||
if (NOT Qt${QT_VERSION_MAJOR}Widgets_FOUND)
|
||||
message(FATAL_ERROR "Qt support enabled, Qt was found but some required packages are missing, stopping.")
|
||||
endif()
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/CMakeModules/Installation.cmake my/CMakeModules/Installation.cmake
|
||||
--- flightgear-2024.1.1/CMakeModules/Installation.cmake 2025-02-27 15:49:31.000000000 +0100
|
||||
+++ my/CMakeModules/Installation.cmake 2025-05-22 05:25:32.200462286 +0200
|
||||
@@ -149,7 +149,7 @@
|
||||
########################################################################################
|
||||
# AppDir creation for Linux AppImage
|
||||
|
||||
-if (LINUX)
|
||||
+if (LINUX AND APPIMAGE)
|
||||
|
||||
install(DIRECTORY ${OSG_PLUGINS_DIR}
|
||||
DESTINATION appdir/usr/lib
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/src/GUI/CMakeLists.txt my/src/GUI/CMakeLists.txt
|
||||
--- flightgear-2024.1.1/src/GUI/CMakeLists.txt 2025-02-27 15:49:31.000000000 +0100
|
||||
+++ my/src/GUI/CMakeLists.txt 2025-05-22 05:52:05.224936638 +0200
|
||||
@@ -182,7 +182,6 @@
|
||||
Qt${QT_VERSION_MAJOR}::Network
|
||||
Qt${QT_VERSION_MAJOR}::Qml
|
||||
Qt${QT_VERSION_MAJOR}::Quick
|
||||
- Qt${QT_VERSION_MAJOR}::Svg
|
||||
SimGearCore)
|
||||
|
||||
add_library(fgqmlui
|
||||
@@ -250,7 +249,6 @@
|
||||
Qt${QT_VERSION_MAJOR}::Network
|
||||
Qt${QT_VERSION_MAJOR}::Qml
|
||||
Qt${QT_VERSION_MAJOR}::Quick
|
||||
- Qt${QT_VERSION_MAJOR}::Svg
|
||||
SimGearCore)
|
||||
|
||||
target_include_directories(fgqmlui PRIVATE ${PROJECT_BINARY_DIR}/src/GUI ${OPENSCENEGRAPH_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
|
@ -0,0 +1,718 @@
|
|||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/ApplicationProperties.cxx my/utils/fgpanel/ApplicationProperties.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/ApplicationProperties.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/ApplicationProperties.cxx 2025-05-22 06:30:47.453461696 +0200
|
||||
@@ -71,5 +71,5 @@
|
||||
return path;
|
||||
}
|
||||
|
||||
-string ApplicationProperties::root = ".";
|
||||
+std::string ApplicationProperties::root = ".";
|
||||
SGPropertyNode_ptr ApplicationProperties::Properties = new SGPropertyNode;
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGCroppedTexture.cxx my/utils/fgpanel/FGCroppedTexture.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGCroppedTexture.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGCroppedTexture.cxx 2025-05-22 06:46:12.372528774 +0200
|
||||
@@ -23,11 +23,11 @@
|
||||
#include "FGCroppedTexture.hxx"
|
||||
|
||||
GLuint FGCroppedTexture::s_current_bound_texture = 0;
|
||||
-map <string, GLuint> FGCroppedTexture::s_cache;
|
||||
-map <string, FGTextureLoaderInterface*> FGCroppedTexture::s_TextureLoader;
|
||||
+std::map <std::string, GLuint> FGCroppedTexture::s_cache;
|
||||
+std::map <std::string, FGTextureLoaderInterface*> FGCroppedTexture::s_TextureLoader;
|
||||
FGDummyTextureLoader FGCroppedTexture::s_DummyTextureLoader;
|
||||
|
||||
-FGCroppedTexture::FGCroppedTexture (const string &path,
|
||||
+FGCroppedTexture::FGCroppedTexture (const std::string &path,
|
||||
const float minX, const float minY,
|
||||
const float maxX, const float maxY) :
|
||||
m_path (path),
|
||||
@@ -40,11 +40,11 @@
|
||||
}
|
||||
|
||||
void
|
||||
-FGCroppedTexture::setPath (const string &path) {
|
||||
+FGCroppedTexture::setPath (const std::string &path) {
|
||||
m_path = path;
|
||||
}
|
||||
|
||||
-const string &
|
||||
+const std::string &
|
||||
FGCroppedTexture::getPath () const {
|
||||
return m_path;
|
||||
}
|
||||
@@ -55,7 +55,7 @@
|
||||
}
|
||||
|
||||
void
|
||||
-FGCroppedTexture::registerTextureLoader (const string &extension,
|
||||
+FGCroppedTexture::registerTextureLoader (const std::string &extension,
|
||||
FGTextureLoaderInterface * const loader) {
|
||||
if (s_TextureLoader.count (extension) == 0) {
|
||||
s_TextureLoader[extension] = loader;
|
||||
@@ -100,7 +100,7 @@
|
||||
"Using texture " << m_path << " from cache (#" << m_texture << ")");
|
||||
} else {
|
||||
const SGPath path (ApplicationProperties::GetRootPath (m_path.c_str ()));
|
||||
- const string extension (path.extension ());
|
||||
+ const std::string extension (path.extension ());
|
||||
FGTextureLoaderInterface *loader (&s_DummyTextureLoader);
|
||||
if (s_TextureLoader.count (extension) == 0) {
|
||||
SG_LOG (SG_COCKPIT,
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGCroppedTexture.hxx my/utils/fgpanel/FGCroppedTexture.hxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGCroppedTexture.hxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGCroppedTexture.hxx 2025-05-22 06:55:00.337444768 +0200
|
||||
@@ -30,19 +30,19 @@
|
||||
*/
|
||||
class FGCroppedTexture : public SGReferenced {
|
||||
public:
|
||||
- FGCroppedTexture (const string &path,
|
||||
+ FGCroppedTexture (const std::string &path,
|
||||
const float minX = 0.0, const float minY = 0.0,
|
||||
const float maxX = 1.0, const float maxY = 1.0);
|
||||
|
||||
virtual ~FGCroppedTexture ();
|
||||
|
||||
- virtual void setPath (const string &path);
|
||||
+ virtual void setPath (const std::string &path);
|
||||
|
||||
- virtual const string &getPath () const;
|
||||
+ virtual const std::string &getPath () const;
|
||||
|
||||
virtual void setCrop (const float minX, const float minY, const float maxX, const float maxY);
|
||||
|
||||
- static void registerTextureLoader (const string &extension,
|
||||
+ static void registerTextureLoader (const std::string &extension,
|
||||
FGTextureLoaderInterface * const loader);
|
||||
|
||||
virtual float getMinX () const;
|
||||
@@ -54,13 +54,13 @@
|
||||
virtual void bind (const GLint Textured_Layer_Sampler_Loc);
|
||||
|
||||
private:
|
||||
- string m_path;
|
||||
+ std::string m_path;
|
||||
float m_minX, m_minY, m_maxX, m_maxY;
|
||||
|
||||
GLuint m_texture;
|
||||
static GLuint s_current_bound_texture;
|
||||
- static map <string, GLuint> s_cache;
|
||||
- static map <string, FGTextureLoaderInterface*> s_TextureLoader;
|
||||
+ static std::map <std::string, GLuint> s_cache;
|
||||
+ static std::map <std::string, FGTextureLoaderInterface*> s_TextureLoader;
|
||||
static FGDummyTextureLoader s_DummyTextureLoader;
|
||||
};
|
||||
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGDummyTextureLoader.cxx my/utils/fgpanel/FGDummyTextureLoader.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGDummyTextureLoader.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGDummyTextureLoader.cxx 2025-05-22 06:31:21.970651761 +0200
|
||||
@@ -19,7 +19,7 @@
|
||||
#include "FGDummyTextureLoader.hxx"
|
||||
|
||||
GLuint
|
||||
-FGDummyTextureLoader::loadTexture (const string& filename) {
|
||||
+FGDummyTextureLoader::loadTexture (const std::string& filename) {
|
||||
GLuint texture;
|
||||
glGenTextures (1, &texture);
|
||||
glBindTexture (GL_TEXTURE_2D, texture);
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGDummyTextureLoader.hxx my/utils/fgpanel/FGDummyTextureLoader.hxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGDummyTextureLoader.hxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGDummyTextureLoader.hxx 2025-05-22 06:32:30.237016268 +0200
|
||||
@@ -18,8 +18,6 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
-#include <string.h>
|
||||
-
|
||||
#include "FGTextureLoaderInterface.hxx"
|
||||
|
||||
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGFontCache.cxx my/utils/fgpanel/FGFontCache.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGFontCache.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGFontCache.cxx 2025-05-22 06:59:46.822658662 +0200
|
||||
@@ -57,7 +57,7 @@
|
||||
}
|
||||
|
||||
bool
|
||||
-FGFontCache::Set_Font (const string& Font_Name,
|
||||
+FGFontCache::Set_Font (const std::string& Font_Name,
|
||||
const float Size,
|
||||
GLuint &Glyph_Texture) {
|
||||
if (m_Face_Map.find (Font_Name) != m_Face_Map.end ()) {
|
||||
@@ -68,7 +68,7 @@
|
||||
SG_LOG (SG_COCKPIT, SG_ALERT, "Could not open font : " + Font_Name);
|
||||
return false;
|
||||
}
|
||||
- m_Face_Map.insert (pair <string, FT_Face *> (Font_Name, Face_Ptr));
|
||||
+ m_Face_Map.insert (std::pair <std::string, FT_Face *> (Font_Name, Face_Ptr));
|
||||
m_Current_Face_Ptr = Face_Ptr;
|
||||
}
|
||||
if (m_Current_Face_Ptr != NULL) {
|
||||
@@ -76,7 +76,7 @@
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
- const string Key_Str (Font_Name + "_" + Get_Size (Size));
|
||||
+ const std::string Key_Str (Font_Name + "_" + Get_Size (Size));
|
||||
if (m_Pos_Map.find (Key_Str) != m_Pos_Map.end ()) {
|
||||
m_Current_Pos = m_Pos_Map[Key_Str];
|
||||
} else {
|
||||
@@ -117,7 +117,7 @@
|
||||
GL_ALPHA,
|
||||
GL_UNSIGNED_BYTE,
|
||||
m_Texture);
|
||||
- m_Pos_Map.insert (pair <string, unsigned int> (Key_Str, m_Current_Pos));
|
||||
+ m_Pos_Map.insert (std::pair <std::string, unsigned int> (Key_Str, m_Current_Pos));
|
||||
}
|
||||
Glyph_Texture = m_Glyph_Texture;
|
||||
return true;
|
||||
@@ -175,12 +175,12 @@
|
||||
Y = double (Line) / double (Texture_Size);
|
||||
}
|
||||
|
||||
-string
|
||||
+std::string
|
||||
FGFontCache::Get_Size (const float Size) {
|
||||
const int Half_Size (int (round (2.0 * Size)));
|
||||
const int Int_Part (Half_Size / 2);
|
||||
const int Dec_Part ((Half_Size % 2) ? 5 : 0);
|
||||
- stringstream Result_SS;
|
||||
+ std::stringstream Result_SS;
|
||||
Result_SS << Int_Part << "." << Dec_Part;
|
||||
return Result_SS.str ();
|
||||
}
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGGroupLayer.hxx my/utils/fgpanel/FGGroupLayer.hxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGGroupLayer.hxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGGroupLayer.hxx 2025-05-22 06:58:50.708076810 +0200
|
||||
@@ -37,7 +37,7 @@
|
||||
// transfer pointer ownership
|
||||
virtual void addLayer (FGInstrumentLayer * const layer);
|
||||
protected:
|
||||
- vector <FGInstrumentLayer *> m_layers;
|
||||
+ std::vector <FGInstrumentLayer *> m_layers;
|
||||
};
|
||||
|
||||
#endif
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGPanel.cxx my/utils/fgpanel/FGPanel.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGPanel.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGPanel.cxx 2025-05-22 07:14:43.910871435 +0200
|
||||
@@ -127,7 +127,7 @@
|
||||
Textured_Layer_Program_Object = GL_utils::instance ().load_program (V_Textured_Layer_Shader_Str,
|
||||
F_Textured_Layer_Shader_Str);
|
||||
if (Textured_Layer_Program_Object == 0) {
|
||||
- terminate ();
|
||||
+ std::terminate ();
|
||||
}
|
||||
|
||||
// Get the attribute locations
|
||||
@@ -148,7 +148,7 @@
|
||||
|
||||
// Text Layer Shaders
|
||||
if (!FGTextLayer::Init ()) {
|
||||
- terminate ();
|
||||
+ std::terminate ();
|
||||
}
|
||||
|
||||
glClearColor (0.0f, 0.0f, 0.0f, 1.0f);
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGPanelProtocol.cxx my/utils/fgpanel/FGPanelProtocol.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGPanelProtocol.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGPanelProtocol.cxx 2025-05-22 07:14:15.894624768 +0200
|
||||
@@ -88,8 +88,8 @@
|
||||
io (NULL) {
|
||||
const SGPropertyNode_ptr outputNode (root->getNode ("protocol/generic/output"));
|
||||
if (outputNode) {
|
||||
- const vector<SGPropertyNode_ptr> chunks (outputNode->getChildren ("chunk"));
|
||||
- for (vector<SGPropertyNode_ptr>::size_type i = 0; i < chunks.size (); i++) {
|
||||
+ const std::vector<SGPropertyNode_ptr> chunks (outputNode->getChildren ("chunk"));
|
||||
+ for (size_t i = 0; i < chunks.size (); i++) {
|
||||
const SGPropertyNode_ptr chunk (chunks[i]);
|
||||
|
||||
const SGPropertyNode_ptr nodeNode (chunk->getNode ("node", false));
|
||||
@@ -98,7 +98,7 @@
|
||||
}
|
||||
const SGPropertyNode_ptr node (ApplicationProperties::Properties->getNode (nodeNode->getStringValue (), true));
|
||||
|
||||
- string type;
|
||||
+ std::string type;
|
||||
const SGPropertyNode_ptr typeNode (chunk->getNode ("type", false));
|
||||
if (typeNode != NULL) {
|
||||
type = typeNode->getStringValue ();
|
||||
@@ -144,8 +144,8 @@
|
||||
// process most recent line of data
|
||||
Page ^= 1;
|
||||
buf[Page][sizeof (buf[Page]) - 1] = 0;
|
||||
- const vector<string> tokens (simgear::strutils::split (buf[Page], ","));
|
||||
- for (vector<string>::size_type i = 0; i < tokens.size (); i++) {
|
||||
+ const std::vector<std::string> tokens (simgear::strutils::split (buf[Page], ","));
|
||||
+ for (size_t i = 0; i < tokens.size (); i++) {
|
||||
if (i < propertySetterVector.size ()) {
|
||||
propertySetterVector[i]->setValue (tokens[i].c_str ());
|
||||
}
|
||||
@@ -159,9 +159,9 @@
|
||||
if (listenNode == NULL) {
|
||||
return;
|
||||
}
|
||||
- const string hostname (listenNode->getNode ("host", true)->getStringValue ());
|
||||
- const string port (listenNode->getNode ("port", true)->getStringValue ());
|
||||
- const string style (listenNode->getNode ("style", true)->getStringValue ());
|
||||
+ const std::string hostname (listenNode->getNode ("host", true)->getStringValue ());
|
||||
+ const std::string port (listenNode->getNode ("port", true)->getStringValue ());
|
||||
+ const std::string style (listenNode->getNode ("style", true)->getStringValue ());
|
||||
|
||||
if (io != NULL) {
|
||||
delete io;
|
||||
@@ -169,7 +169,7 @@
|
||||
io = new SGSocket (hostname, port, style);
|
||||
|
||||
if (!io->open (SG_IO_IN)) {
|
||||
- cerr << "can't open socket " << style << ":" << hostname << ":" << port << endl;
|
||||
+ std::cerr << "can't open socket " << style << ":" << hostname << ":" << port << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGPNGTextureLoader.cxx my/utils/fgpanel/FGPNGTextureLoader.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGPNGTextureLoader.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGPNGTextureLoader.cxx 2025-05-22 07:10:38.485216103 +0200
|
||||
@@ -42,7 +42,7 @@
|
||||
using namespace std;
|
||||
|
||||
GLuint
|
||||
-FGPNGTextureLoader::loadTexture (const string &filename) {
|
||||
+FGPNGTextureLoader::loadTexture (const std::string &filename) {
|
||||
//header for testing if it is a png
|
||||
png_byte header[8];
|
||||
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGPNGTextureLoader.hxx my/utils/fgpanel/FGPNGTextureLoader.hxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGPNGTextureLoader.hxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGPNGTextureLoader.hxx 2025-05-22 07:10:11.651891427 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
class FGPNGTextureLoader : public FGTextureLoaderInterface {
|
||||
public:
|
||||
- virtual GLuint loadTexture (const string &filename);
|
||||
+ virtual GLuint loadTexture (const std::string &filename);
|
||||
|
||||
const static GLuint NOTEXTURE = 0;
|
||||
};
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGRGBTextureLoader.cxx my/utils/fgpanel/FGRGBTextureLoader.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGRGBTextureLoader.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGRGBTextureLoader.cxx 2025-05-22 07:13:33.966248033 +0200
|
||||
@@ -52,7 +52,7 @@
|
||||
unsigned long wasteBytes;
|
||||
char name[80];
|
||||
unsigned long colorMap;
|
||||
- istream *file;
|
||||
+ std::istream *file;
|
||||
unsigned char *tmp, *tmpR, *tmpG, *tmpB, *tmpA;
|
||||
unsigned long rleEnd;
|
||||
GLuint *rowStart;
|
||||
@@ -156,7 +156,7 @@
|
||||
}
|
||||
|
||||
static rawImageRec *
|
||||
-RawImageOpen (istream& fin) {
|
||||
+RawImageOpen (std::istream& fin) {
|
||||
union {
|
||||
int testWord;
|
||||
char testByte[4];
|
||||
@@ -242,7 +242,7 @@
|
||||
}
|
||||
int x (ybyz * sizeof (GLuint));
|
||||
raw->rleEnd = 512 + (2 * x);
|
||||
- fin.seekg (512, ios::beg);
|
||||
+ fin.seekg (512, std::ios::beg);
|
||||
fin.read ((char*) raw->rowStart, x);
|
||||
fin.read ((char*) raw->rowSize, x);
|
||||
if (raw->swapFlag) {
|
||||
@@ -260,7 +260,7 @@
|
||||
unsigned short *tempShort;
|
||||
|
||||
if ((raw->type & 0xFF00) == 0x0100) {
|
||||
- raw->file->seekg (long (raw->rowStart[y + z * raw->sizeY]), ios::beg);
|
||||
+ raw->file->seekg (long (raw->rowStart[y + z * raw->sizeY]), std::ios::beg);
|
||||
raw->file->read ((char*) raw->tmp, (unsigned int) (raw->rowSize[y + z * raw->sizeY]));
|
||||
|
||||
unsigned char *iPtr = raw->tmp;
|
||||
@@ -333,7 +333,7 @@
|
||||
}
|
||||
}
|
||||
} else {
|
||||
- raw->file->seekg (512 + (y * raw->sizeX * raw->bpc) + (z * raw->sizeX * raw->sizeY * raw->bpc), ios::beg);
|
||||
+ raw->file->seekg (512 + (y * raw->sizeX * raw->bpc) + (z * raw->sizeX * raw->sizeY * raw->bpc), std::ios::beg);
|
||||
raw->file->read ((char*) buf, raw->sizeX * raw->bpc);
|
||||
if (raw->swapFlag && raw->bpc != 1) {
|
||||
ConvertShort (reinterpret_cast<unsigned short*> (buf), raw->sizeX);
|
||||
@@ -427,7 +427,7 @@
|
||||
// supportsExtension("bw","bw image format");
|
||||
|
||||
GLuint
|
||||
-readRGBStream (istream &fin) {
|
||||
+readRGBStream (std::istream &fin) {
|
||||
rawImageRec * const raw (RawImageOpen (fin));
|
||||
|
||||
if (raw == NULL) {
|
||||
@@ -468,9 +468,9 @@
|
||||
}
|
||||
|
||||
GLuint
|
||||
-FGRGBTextureLoader::loadTexture (const string &filename) {
|
||||
+FGRGBTextureLoader::loadTexture (const std::string &filename) {
|
||||
GLuint texture = NOTEXTURE;
|
||||
- ifstream istream (filename.c_str (), ios::in | ios::binary);
|
||||
+ std::ifstream istream (filename.c_str (), std::ios::in | std::ios::binary);
|
||||
texture = readRGBStream (istream);
|
||||
istream.close ();
|
||||
return texture;
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGRGBTextureLoader.hxx my/utils/fgpanel/FGRGBTextureLoader.hxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGRGBTextureLoader.hxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGRGBTextureLoader.hxx 2025-05-22 07:05:22.209920047 +0200
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
class FGRGBTextureLoader : public FGTextureLoaderInterface {
|
||||
public:
|
||||
- virtual GLuint loadTexture (const string &filename);
|
||||
+ virtual GLuint loadTexture (const std::string &filename);
|
||||
|
||||
const static GLuint NOTEXTURE = 0;
|
||||
};
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/FGTextLayer.cxx my/utils/fgpanel/FGTextLayer.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/FGTextLayer.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/FGTextLayer.cxx 2025-06-01 02:32:56.203092040 +0200
|
||||
@@ -156,7 +156,7 @@
|
||||
int Left, Bottom, W, H;
|
||||
double X1, Y1, X2, Y2;
|
||||
|
||||
- for (string::iterator It = m_value.begin (); It != m_value.end (); ++It) {
|
||||
+ for (std::string::iterator It = m_value.begin (); It != m_value.end (); ++It) {
|
||||
if (The_Font_Cache.Get_Char (*It,
|
||||
X, Y,
|
||||
Left, Bottom,
|
||||
@@ -221,7 +221,7 @@
|
||||
}
|
||||
|
||||
void
|
||||
-FGTextLayer::setFontName (const string &name) {
|
||||
+FGTextLayer::setFontName (const std::string &name) {
|
||||
if (The_Font_Path.isNull ()) {
|
||||
char *Env_Path = ::getenv ("FG_FONTS");
|
||||
if (Env_Path != NULL) {
|
||||
@@ -247,8 +247,8 @@
|
||||
// Implementation of FGTextLayer::Chunk.
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
|
||||
-FGTextLayer::Chunk::Chunk (const string &text,
|
||||
- const string &fmt) :
|
||||
+FGTextLayer::Chunk::Chunk (const std::string &text,
|
||||
+ const std::string &fmt) :
|
||||
m_type (FGTextLayer::TEXT),
|
||||
m_text (text),
|
||||
m_fmt (fmt),
|
||||
@@ -262,7 +262,7 @@
|
||||
|
||||
FGTextLayer::Chunk::Chunk (const ChunkType type,
|
||||
const SGPropertyNode *node,
|
||||
- const string &fmt,
|
||||
+ const std::string &fmt,
|
||||
const float mult,
|
||||
const float offs,
|
||||
const bool truncation) :
|
||||
@@ -290,7 +290,7 @@
|
||||
sprintf (m_buf, m_fmt.c_str (), m_text.c_str ());
|
||||
break;
|
||||
case TEXT_VALUE:
|
||||
- sprintf (m_buf, m_fmt.c_str (), m_node->getStringValue ());
|
||||
+ sprintf (m_buf, m_fmt.c_str (), m_node->getStringValue ().c_str());
|
||||
break;
|
||||
case DOUBLE_VALUE:
|
||||
double d (m_offs + m_node->getFloatValue() * m_mult);
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/GL_utils.cxx my/utils/fgpanel/GL_utils.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/GL_utils.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/GL_utils.cxx 2025-05-22 07:18:54.467677071 +0200
|
||||
@@ -57,7 +57,7 @@
|
||||
GLuint shader (glCreateShader (type));
|
||||
|
||||
if (shader == 0) {
|
||||
- cerr << "Error creating shader" << endl;
|
||||
+ std::cerr << "Error creating shader" << std::endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
char* info_log ((char *) malloc (sizeof (char) * info_len));
|
||||
|
||||
glGetShaderInfoLog (shader, info_len, NULL, info_log);
|
||||
- cerr << "Error compiling shader:" << endl << info_log << endl;
|
||||
+ std::cerr << "Error compiling shader:" << std::endl << info_log << std::endl;
|
||||
|
||||
free (info_log);
|
||||
}
|
||||
@@ -106,13 +106,13 @@
|
||||
// Load the vertex/fragment shaders
|
||||
GLuint vertex_shader (load_shader (GL_VERTEX_SHADER, vert_shader_src));
|
||||
if (vertex_shader == 0) {
|
||||
- cerr << "Error loading vertex shader" << endl;
|
||||
+ std::cerr << "Error loading vertex shader" << std::endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
GLuint fragment_shader (load_shader (GL_FRAGMENT_SHADER, frag_shader_src));
|
||||
if (fragment_shader == 0) {
|
||||
- cerr << "Error loading fragment shader" << endl;
|
||||
+ std::cerr << "Error loading fragment shader" << std::endl;
|
||||
glDeleteShader (vertex_shader);
|
||||
return 0;
|
||||
}
|
||||
@@ -121,7 +121,7 @@
|
||||
GLuint program_object (glCreateProgram ());
|
||||
|
||||
if (program_object == 0) {
|
||||
- cerr << "Error creating program" << endl;
|
||||
+ std::cerr << "Error creating program" << std::endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
char* info_log ((char *) malloc (sizeof (char) * info_len));
|
||||
|
||||
glGetProgramInfoLog (program_object, info_len, NULL, info_log);
|
||||
- cerr << "Error linking program:" << endl << info_log << endl;
|
||||
+ std::cerr << "Error linking program:" << std::endl << info_log << std::endl;
|
||||
|
||||
free (info_log);
|
||||
}
|
||||
@@ -364,11 +364,11 @@
|
||||
GL_utils::Debug (const GL_utils::GLenum_Mode mode) const {
|
||||
if (mode < GL_UTILS_LAST) {
|
||||
for (int l = 0; l < 4; ++l) {
|
||||
- cout << " ";
|
||||
+ std::cout << " ";
|
||||
for (int c = 0; c < 4; ++c) {
|
||||
- cout << m_Matrix[mode].top ().m[c][l] << " ";
|
||||
+ std::cout << m_Matrix[mode].top ().m[c][l] << " ";
|
||||
}
|
||||
- cout << endl;
|
||||
+ std::cout << std::endl;
|
||||
}
|
||||
}
|
||||
}
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/main.cxx my/utils/fgpanel/main.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/main.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/main.cxx 2025-05-22 06:55:23.033614787 +0200
|
||||
@@ -25,6 +25,6 @@
|
||||
return 0;
|
||||
}
|
||||
catch (...) {
|
||||
- cerr << "Sorry, your program terminated." << endl;
|
||||
+ std::cerr << "Sorry, your program terminated." << std::endl;
|
||||
}
|
||||
}
|
||||
diff '--color=auto' -ruN flightgear-2024.1.1/utils/fgpanel/panel_io.cxx my/utils/fgpanel/panel_io.cxx
|
||||
--- flightgear-2024.1.1/utils/fgpanel/panel_io.cxx 2025-02-27 15:49:32.000000000 +0100
|
||||
+++ my/utils/fgpanel/panel_io.cxx 2025-05-22 07:43:05.623983755 +0200
|
||||
@@ -26,8 +26,6 @@
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
-#include <string.h> // for strcmp()
|
||||
-
|
||||
#include <simgear/compiler.h>
|
||||
#include <simgear/structure/exception.hxx>
|
||||
#include <simgear/debug/logstream.hxx>
|
||||
@@ -101,7 +99,7 @@
|
||||
*/
|
||||
static FGCroppedTexture_ptr
|
||||
readTexture (const SGPropertyNode *node) {
|
||||
- SG_LOG(SG_COCKPIT, SG_DEBUG, "Read texture " << node->getName ());
|
||||
+ SG_LOG(SG_COCKPIT, SG_DEBUG, "Read texture " << node->getNameString ());
|
||||
|
||||
return new FGCroppedTexture (node->getStringValue ("path"),
|
||||
node->getFloatValue ("x1"),
|
||||
@@ -158,9 +156,9 @@
|
||||
readTransformation (const SGPropertyNode *node, const float w_scale, const float h_scale) {
|
||||
FGPanelTransformation *t (new FGPanelTransformation);
|
||||
|
||||
- const string name (node->getName ());
|
||||
- string type (node->getStringValue ("type"));
|
||||
- const string propName (node->getStringValue ("property", ""));
|
||||
+ const std::string name (node->getNameString ());
|
||||
+ std::string type (node->getStringValue ("type"));
|
||||
+ const std::string propName (node->getStringValue ("property", ""));
|
||||
const SGPropertyNode *target (0);
|
||||
|
||||
if (type.empty ()) {
|
||||
@@ -191,14 +189,14 @@
|
||||
t->table = new SGInterpTable();
|
||||
for (int i = 0; i < trans_table->nChildren(); i++) {
|
||||
const SGPropertyNode * node = trans_table->getChild(i);
|
||||
- if (!strcmp(node->getName(), "entry")) {
|
||||
+ if (node->getNameString () == "entry") {
|
||||
double ind = node->getDoubleValue("ind", 0.0);
|
||||
double dep = node->getDoubleValue("dep", 0.0);
|
||||
SG_LOG(SG_COCKPIT, SG_INFO, "Adding interpolation entry "
|
||||
<< ind << "==>" << dep);
|
||||
t->table->addEntry(ind, dep);
|
||||
} else {
|
||||
- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
|
||||
+ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
|
||||
<< " in interpolation");
|
||||
}
|
||||
}
|
||||
@@ -262,9 +260,9 @@
|
||||
FGTextLayer::Chunk *
|
||||
readTextChunk (const SGPropertyNode *node) {
|
||||
FGTextLayer::Chunk *chunk;
|
||||
- const string name (node->getStringValue ("name"));
|
||||
- string type (node->getStringValue ("type"));
|
||||
- const string format (node->getStringValue ("format"));
|
||||
+ const std::string name (node->getStringValue ("name"));
|
||||
+ std::string type (node->getStringValue ("type"));
|
||||
+ const std::string format (node->getStringValue ("format"));
|
||||
|
||||
// Default to literal text.
|
||||
if (type.empty ()) {
|
||||
@@ -275,7 +273,7 @@
|
||||
|
||||
// A literal text string.
|
||||
if (type == "literal") {
|
||||
- const string text (node->getStringValue ("text"));
|
||||
+ const std::string text (node->getStringValue ("text"));
|
||||
chunk = new FGTextLayer::Chunk (text, format);
|
||||
} else if (type == "text-value") {
|
||||
// The value of a string property.
|
||||
@@ -284,7 +282,7 @@
|
||||
chunk = new FGTextLayer::Chunk (FGTextLayer::TEXT_VALUE, target, format);
|
||||
} else if (type == "number-value") {
|
||||
// The value of a float property.
|
||||
- const string propName (node->getStringValue ("property"));
|
||||
+ const std::string propName (node->getStringValue ("property"));
|
||||
const float scale (node->getFloatValue ("scale", 1.0));
|
||||
const float offset (node->getFloatValue ("offset", 0.0));
|
||||
const bool truncation (node->getBoolValue ("truncate", false));
|
||||
@@ -326,8 +324,8 @@
|
||||
static FGInstrumentLayer *
|
||||
readLayer (const SGPropertyNode *node, const float w_scale, const float h_scale) {
|
||||
FGInstrumentLayer *layer (NULL);
|
||||
- const string name (node->getStringValue ("name"));
|
||||
- string type (node->getStringValue ("type"));
|
||||
+ const std::string name (node->getStringValue ("name"));
|
||||
+ std::string type (node->getStringValue ("type"));
|
||||
int w (node->getIntValue ("w", -1));
|
||||
int h (node->getIntValue ("h", -1));
|
||||
const bool emissive (node->getBoolValue ("emissive", false));
|
||||
@@ -357,7 +355,7 @@
|
||||
layer = new FGGroupLayer ();
|
||||
for (int i = 0; i < node->nChildren(); i++) {
|
||||
const SGPropertyNode *child = node->getChild (i);
|
||||
- if (!strcmp (child->getName (), "layer")) {
|
||||
+ if (child->getNameString () == "layer") {
|
||||
((FGGroupLayer *) layer)->addLayer (readLayer (child, w_scale, h_scale));
|
||||
}
|
||||
}
|
||||
@@ -376,7 +374,7 @@
|
||||
tlayer->setPointSize (pointSize);
|
||||
|
||||
// Set the font.
|
||||
- const string fontName (node->getStringValue ("font", "7-Segment"));
|
||||
+ const std::string fontName (node->getStringValue ("font", "7-Segment"));
|
||||
tlayer->setFontName (fontName);
|
||||
|
||||
const SGPropertyNode *chunk_group (node->getNode ("chunks"));
|
||||
@@ -384,13 +382,13 @@
|
||||
const int nChunks (chunk_group->nChildren ());
|
||||
for (int i = 0; i < nChunks; i++) {
|
||||
const SGPropertyNode *node (chunk_group->getChild (i));
|
||||
- if (!strcmp(node->getName (), "chunk")) {
|
||||
+ if (node->getNameString () == "chunk") {
|
||||
FGTextLayer::Chunk * const chunk (readTextChunk (node));
|
||||
if (chunk != 0) {
|
||||
tlayer->addChunk (chunk);
|
||||
}
|
||||
} else {
|
||||
- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
|
||||
+ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
|
||||
<< " in chunks");
|
||||
}
|
||||
}
|
||||
@@ -401,7 +399,7 @@
|
||||
layer = new FGSwitchLayer ();
|
||||
for (int i = 0; i < node->nChildren (); i++) {
|
||||
const SGPropertyNode *child (node->getChild (i));
|
||||
- if (!strcmp (child->getName (), "layer")) {
|
||||
+ if (child->getNameString () == "layer") {
|
||||
((FGGroupLayer *) layer)->addLayer (readLayer (child, w_scale, h_scale));
|
||||
}
|
||||
}
|
||||
@@ -420,13 +418,13 @@
|
||||
const int nTransformations (trans_group->nChildren ());
|
||||
for (int i = 0; i < nTransformations; i++) {
|
||||
const SGPropertyNode *node (trans_group->getChild (i));
|
||||
- if (!strcmp(node->getName (), "transformation")) {
|
||||
+ if (node->getNameString () == "transformation") {
|
||||
FGPanelTransformation * const t (readTransformation (node, w_scale, h_scale));
|
||||
if (t != 0) {
|
||||
layer->addTransformation (t);
|
||||
}
|
||||
} else {
|
||||
- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
|
||||
+ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
|
||||
<< " in transformations");
|
||||
}
|
||||
}
|
||||
@@ -450,7 +448,7 @@
|
||||
*/
|
||||
static FGPanelInstrument *
|
||||
readInstrument (const SGPropertyNode *node) {
|
||||
- const string name (node->getStringValue ("name"));
|
||||
+ const std::string name (node->getStringValue ("name"));
|
||||
const int x (node->getIntValue ("x", -1));
|
||||
const int y (node->getIntValue ("y", -1));
|
||||
const int real_w (node->getIntValue ("w", -1));
|
||||
@@ -488,13 +486,13 @@
|
||||
const int nLayers (layer_group->nChildren ());
|
||||
for (int i = 0; i < nLayers; i++) {
|
||||
const SGPropertyNode *node (layer_group->getChild (i));
|
||||
- if (!strcmp (node->getName (), "layer")) {
|
||||
+ if (node->getNameString () == "layer") {
|
||||
FGInstrumentLayer * const layer (readLayer (node, w_scale, h_scale));
|
||||
if (layer != 0) {
|
||||
instrument->addLayer (layer);
|
||||
}
|
||||
} else {
|
||||
- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName ()
|
||||
+ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
|
||||
<< " in layers");
|
||||
}
|
||||
}
|
||||
@@ -521,7 +519,7 @@
|
||||
|
||||
// Assign the background texture, if any, or a bogus chequerboard.
|
||||
//
|
||||
- const string bgTexture (root->getStringValue ("background"));
|
||||
+ const std::string bgTexture (root->getStringValue ("background"));
|
||||
if (!bgTexture.empty ()) {
|
||||
panel->setBackground (new FGCroppedTexture (bgTexture));
|
||||
}
|
||||
@@ -534,7 +532,7 @@
|
||||
//
|
||||
for (int i = 0; i < 8; i++) {
|
||||
SGPropertyNode * const mbgNode (root->getChild ("multibackground", i));
|
||||
- string mbgTexture;
|
||||
+ std::string mbgTexture;
|
||||
if (mbgNode != NULL) {
|
||||
mbgTexture = mbgNode->getStringValue ();
|
||||
}
|
||||
@@ -557,13 +555,13 @@
|
||||
const int nInstruments (instrument_group->nChildren ());
|
||||
for (int i = 0; i < nInstruments; i++) {
|
||||
const SGPropertyNode *node = instrument_group->getChild (i);
|
||||
- if (!strcmp (node->getName (), "instrument")) {
|
||||
+ if (node->getNameString () == "instrument") {
|
||||
FGPanelInstrument * const instrument (readInstrument (node));
|
||||
if (instrument != 0) {
|
||||
panel->addInstrument (instrument);
|
||||
}
|
||||
} else {
|
||||
- SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getName()
|
||||
+ SG_LOG(SG_COCKPIT, SG_INFO, "Skipping " << node->getNameString ()
|
||||
<< " in instruments section");
|
||||
}
|
||||
}
|
||||
1
games-simulation/flightgear/files/nasal.vim
Normal file
1
games-simulation/flightgear/files/nasal.vim
Normal file
|
|
@ -0,0 +1 @@
|
|||
au BufRead,BufNewFile *.nas set filetype=nasal
|
||||
175
games-simulation/flightgear/flightgear-2024.1.3.ebuild
Normal file
175
games-simulation/flightgear/flightgear-2024.1.3.ebuild
Normal file
|
|
@ -0,0 +1,175 @@
|
|||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit cmake flag-o-matic
|
||||
|
||||
DESCRIPTION="Open Source Flight Simulator"
|
||||
HOMEPAGE="https://www.flightgear.org/"
|
||||
#SRC_URI="https://gitlab.com/flightgear/fgmeta/-/jobs/9264813015/artifacts/raw/fgbuild/${P}.tar.bz2"
|
||||
SRC_URI="https://gitlab.com/flightgear/flightgear/-/archive/${PV}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="cpu_flags_x86_sse2 dbus debug examples gdal qt6 +udev +utils"
|
||||
|
||||
# Needs --fg-root with path to flightgear-data passed to test runner passed,
|
||||
# not really worth patching
|
||||
RESTRICT="test"
|
||||
|
||||
# zlib is some strange auto-dep from simgear
|
||||
# TODO add osgXR
|
||||
COMMON_DEPEND="
|
||||
dev-db/sqlite:3
|
||||
>=dev-games/openscenegraph-3.6.0[jpeg,png]
|
||||
~dev-games/simgear-${PV}[gdal=]
|
||||
media-libs/openal
|
||||
>=media-libs/plib-1.8.5
|
||||
>=media-libs/speex-1.2.0:0
|
||||
media-libs/speexdsp:0
|
||||
media-sound/gsm
|
||||
virtual/zlib:=
|
||||
virtual/glu
|
||||
x11-libs/libX11
|
||||
dbus? ( >=sys-apps/dbus-1.6.18-r1 )
|
||||
gdal? ( >=sci-libs/gdal-2.0.0:= )
|
||||
qt6? (
|
||||
dev-qt/qtbase:6[gui,network,widgets]
|
||||
dev-qt/qtdeclarative:6
|
||||
)
|
||||
udev? ( virtual/udev )
|
||||
utils? (
|
||||
media-libs/freeglut
|
||||
media-libs/freetype:2
|
||||
media-libs/glew:0
|
||||
media-libs/libpng:0
|
||||
virtual/opengl
|
||||
qt6? ( dev-qt/qtwebsockets:6 )
|
||||
)
|
||||
"
|
||||
# libXi and libXmu are build-only-deps according to FindGLUT.cmake
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-libs/boost
|
||||
x11-base/xorg-proto
|
||||
utils? (
|
||||
x11-libs/libXi
|
||||
x11-libs/libXmu
|
||||
)
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
~games-simulation/${PN}-data-${PV}
|
||||
"
|
||||
BDEPEND="qt6? ( dev-qt/qttools:6 )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2024.1.1-cmake.patch"
|
||||
"${FILESDIR}/${PN}-2024.1.1-fix-fgpanel.patch"
|
||||
"${FILESDIR}/0001-check-to-be-sure-that-n-is-not-being-set-as-format-t.patch"
|
||||
"${FILESDIR}/0003-make-fglauncher-a-static-library.patch"
|
||||
"${FILESDIR}/0005-make-fgqmlui-a-static-library.patch"
|
||||
"${FILESDIR}/0006-fgviewer-fix-crash-on-exit.patch"
|
||||
)
|
||||
|
||||
DOCS=(AUTHORS ChangeLog NEWS README Thanks)
|
||||
|
||||
src_configure() {
|
||||
# -Werror=lto-type-mismatch, -Werror=odr
|
||||
# https://bugs.gentoo.org/859217
|
||||
# https://sourceforge.net/p/flightgear/codetickets/2908/
|
||||
filter-lto
|
||||
|
||||
local mycmakeargs=(
|
||||
-DBUILD_SHARED_LIBS=OFF
|
||||
-DCHECK_FOR_QT5=OFF
|
||||
-DCHECK_FOR_QT6=ON
|
||||
-DENABLE_AUTOTESTING=OFF
|
||||
-DENABLE_FGCOM=$(usex utils)
|
||||
-DENABLE_FGELEV=$(usex utils)
|
||||
-DENABLE_FGJS=$(usex utils)
|
||||
-DENABLE_FGVIEWER=$(usex utils)
|
||||
-DENABLE_GDAL=$(usex gdal)
|
||||
-DENABLE_GPSSMOOTH=$(usex utils)
|
||||
-DENABLE_HID_INPUT=$(usex udev)
|
||||
-DENABLE_IAX=$(usex utils)
|
||||
-DENABLE_JS_DEMO=$(usex utils)
|
||||
-DENABLE_JSBSIM=ON
|
||||
-DENABLE_LARCSIM=ON
|
||||
-DENABLE_METAR=$(usex utils)
|
||||
-DENABLE_PLIB_JOYSTICK=ON # NOTE look for defaults changes in CMake
|
||||
-DENABLE_QT=$(usex qt6)
|
||||
-DENABLE_RTI=OFF
|
||||
-DENABLE_SENTRY=OFF # sentry-native masked
|
||||
-DENABLE_HUD=ON
|
||||
-DENABLE_PUI=ON
|
||||
-DENABLE_SIMD=$(usex cpu_flags_x86_sse2)
|
||||
-DENABLE_STGMERGE=ON
|
||||
-DENABLE_SWIFT=OFF # swift pilot client not packaged yet
|
||||
-DENABLE_TRAFFIC=$(usex utils)
|
||||
-DENABLE_UIUC_MODEL=ON
|
||||
-DENABLE_VR=OFF
|
||||
-DENABLE_YASIM=ON
|
||||
-DEVENT_INPUT=$(usex udev)
|
||||
-DFG_BUILD_TYPE=Release
|
||||
-DFG_DATA_DIR=/usr/share/${PN}
|
||||
-DJSBSIM_TERRAIN=ON
|
||||
-DOSG_FSTREAM_EXPORT_FIXED=OFF # TODO also see simgear
|
||||
-DSP_FDMS=ON
|
||||
-DSYSTEM_CPPUNIT=OFF # NOTE we do not build tests anyway
|
||||
-DSYSTEM_FLITE=OFF
|
||||
-DSYSTEM_HTS_ENGINE=OFF
|
||||
-DSYSTEM_SPEEX=ON
|
||||
-DSYSTEM_GSM=ON
|
||||
-DSYSTEM_SQLITE=ON
|
||||
-DSYSTEM_OSGXR=ON
|
||||
-DUSE_AEONWAVE=OFF
|
||||
-DUSE_DBUS=$(usex dbus)
|
||||
-DWITH_FGPANEL=$(usex utils)
|
||||
)
|
||||
if use gdal && use utils; then
|
||||
mycmakeargs+=(-DENABLE_DEMCONVERT=ON)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_DEMCONVERT=OFF)
|
||||
fi
|
||||
if use qt6 && use utils; then
|
||||
mycmakeargs+=(-DENABLE_FGQCANVAS=ON)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_FGQCANVAS=OFF)
|
||||
fi
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake_src_install
|
||||
|
||||
# Install bash completion (TODO zsh)
|
||||
# Uncomment below when scripts stops writing files...
|
||||
# sed -e "s|/usr/local/share/FlightGear|${GAMES_DATADIR}/${PN}|" \
|
||||
# -i scripts/completion/fg-completion.bash || die 'unable to replace FG_ROOT'
|
||||
# newbashcomp scripts/completion/fg-completion.bash ${PN}
|
||||
|
||||
# Install examples and other misc files
|
||||
if use examples; then
|
||||
docompress -x /usr/share/doc/"${PF}"/{examples,tools}
|
||||
docinto examples
|
||||
dodoc -r scripts/java scripts/perl scripts/python
|
||||
docinto examples/c++
|
||||
dodoc -r scripts/example/*
|
||||
docinto tools
|
||||
dodoc -r scripts/atis scripts/tools/*
|
||||
fi
|
||||
|
||||
# Install nasal script syntax
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins scripts/syntax/{ac3d,nasal}.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect/
|
||||
doins "${FILESDIR}"/{ac3d,nasal}.vim
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use qt6; then
|
||||
einfo "To use launcher, run fgfs with '--launcher' parameter"
|
||||
fi
|
||||
}
|
||||
18
games-simulation/flightgear/metadata.xml
Normal file
18
games-simulation/flightgear/metadata.xml
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>manuel@fritteli.ch</email>
|
||||
<name>Manuel Friedli</name>
|
||||
</maintainer>
|
||||
<use>
|
||||
<flag name="dbus">Enable screensaver DBus interaction</flag>
|
||||
<flag name="gdal">Enable alternative terrain engine based on pagedLOD using <pkg>sci-libs/gdal</pkg></flag>
|
||||
<flag name="qt6">Build Qt6 launcher application</flag>
|
||||
<flag name="udev">Enable event-based Input devices through <pkg>virtual/udev</pkg></flag>
|
||||
<flag name="utils">Build various utilities (fgpanel, fgviewer among others)</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="gitlab">flightgear/flightgear</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
AUX nautilus-dropbox-2019-system-rst2man.patch 464 BLAKE2B c0f25a56ee504a6070efdae70670e1a925a1718cfb5e1345d3acfdb0face02d1278d10f2f7172e172056834f99f309d50bbf5899f37fa6023e743042f6ffd7b8 SHA512 98c9e85a491991fd2afee3a12c8be4ab708ee47a42d08d4a11daefc1e964cb3031ffb94a27ab7758b3f1c71f7343dd4b0a49d24cb8aa2848baf65f83879a6cfb
|
||||
DIST nautilus-dropbox-2024.04.17.tar.bz2 394725 BLAKE2B e617f02fcb6c11fd6937a99c0e2faaebd564d533e6ed44fc0492504fb41612fb297b3c98c84b8c3ecc314e33b27a820e8b655bc6ae92de43ffbb2f4e4d370f9f SHA512 43b7a0eaf3b7ebc35fa21a5d11dc1089b62fd0a414079a55fbb4ef7cb8211923123c46bec06c3b73eacd5897b7b8b2ae336de7b15750f0802eb28a23ec9e56bd
|
||||
EBUILD nautilus-dropbox-2024.04.17-r1.ebuild 1372 BLAKE2B 20ba5c5668a5d77a5110b1b962e04e20d9f2f02cddf00c0ca85d119ac0e31c2edb28614b9bbc7147b87b13dcb535d20609a48602f8290fe720430995a740dc03 SHA512 e680e1057412cc3040b5a50ee855e1d36ff75338bc0c0567bd89a69dc889b5dfca12a275b62567df9099c4a01039745c8cf61c6caa0c1f49b0fa9d363c5bf91d
|
||||
MISC metadata.xml 444 BLAKE2B 005df2e1ee3656e09b801e581b388f7f0b26ed555bf6f12185a1ddc109dd17fa67e8b9affcc62e702d4a6fb3728faba0736bf0c845b7f6078314eb64f5271911 SHA512 680a197a3b3172d09247b2e2d4ce1b53097f1451e08bc3651913bf80a71f0202f76fed11ea57cc98ee826130b18189a874f4580a901efc39151f4dede83f2b29
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
Index: nautilus-dropbox-0.7.0/configure.ac
|
||||
===================================================================
|
||||
--- nautilus-dropbox-0.7.0.orig/configure.ac
|
||||
+++ nautilus-dropbox-0.7.0/configure.ac
|
||||
@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
|
||||
|
||||
AC_PATH_PROG([PYTHON], [python])
|
||||
|
||||
-AC_PATH_PROG([RST2MAN], [rst2man], [python3 rst2man.py])
|
||||
+AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
|
||||
AC_SUBST(RST2MAN)
|
||||
|
||||
# define module checking macro
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<upstream>
|
||||
<remote-id type="github">dropbox/nautilus-dropbox</remote-id>
|
||||
</upstream>
|
||||
<longdescription lang="en">
|
||||
A extension of nautilus to display the sync state of an Dropbox folder and add a right click menu to mange files in the Dropbox folder.
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
|
||||
inherit autotools python-single-r1 xdg
|
||||
|
||||
DESCRIPTION="Dropbox Nautilus Extension"
|
||||
HOMEPAGE="https://github.com/dropbox/nautilus-dropbox"
|
||||
SRC_URI="https://linux.dropboxstatic.com/packages/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3 CC-BY-ND-3.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="debug"
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="
|
||||
${PYTHON_DEPS}
|
||||
$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )
|
||||
dev-libs/glib:2
|
||||
gui-libs/gtk:4
|
||||
>=gnome-base/nautilus-43
|
||||
net-misc/dropbox
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
$(python_gen_cond_dep 'dev-python/docutils[${PYTHON_USEDEP}]' )
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
# use system rst2man
|
||||
PATCHES=(
|
||||
# use system rst2man
|
||||
"${FILESDIR}/${PN}-2019-system-rst2man.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# use system dropbox
|
||||
sed \
|
||||
-e "s|~/[.]dropbox-dist|${EPREFIX}/opt/dropbox|" \
|
||||
-e "s|\(DROPBOXD_PATH = \).*|\1\"${EPREFIX}/opt/dropbox/dropboxd\"|" \
|
||||
-i dropbox.in || die
|
||||
AT_NOELIBTOOLIZE=yes eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable debug) \
|
||||
--disable-static
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
# removes files which conflicts with system dropbox
|
||||
rm -r "${ED}"/usr/share/applications || die
|
||||
rm -r "${ED}"/usr/bin || die
|
||||
|
||||
find "${ED}" -type f -name '*.la' -delete || die
|
||||
}
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
AUX fix-amp-entity-in-de-po.patch 1516 BLAKE2B 6fb6cfdbf8d3562217464b98414c3f78642bb4df0732a1ab4dea528558ddc6470bd7cccaac56179303745a104b0c0307551682b15b247cd16fd3de12e2828bfb SHA512 a744a220f19f03513af2ab4bf58c9453dba3384e5b9084d7f01df68ddfed6b3755c965728a96330ad90ab80286096fc4d7aacc940e5431fb441ea61fb69bd32e
|
||||
DIST video-trimmer-0.8.1.tar.bz2 144877 BLAKE2B bfa00dab985525d27bbc089f7d3fe8ab9f5961d1640fb36a67fb4adcf225da3be260fde99a6e285b1e46f8de1a26d2d429d985d6027c39cddfa4f3b2a89483e0 SHA512 b85576247e2d1ecca414f0ec6fecf56eb421db5e2559fd5799e39c07dba92cdadcabebd4230df8437185d42d62f0e4db5392410d8f0ebb35e23167b940559245
|
||||
EBUILD video-trimmer-0.8.1-r1.ebuild 649 BLAKE2B 32e04b2e0f74fdedaa48b11757cb3af3c1621878fe1a0cdf89c063d54150634bb1a0939fab0ccd1f499e2a3e12ed95bbc31347f33f9e368a3887af57e6d2d105 SHA512 e93d6888cb289968c997051f5fae941f29bcfa4da1b68c0c830c81380e84af8829408dc766e5f6f8b47ce3e0c69d89a2f3d0755ca759896a4e24ce0ced038bba
|
||||
DIST video-trimmer-25.03.tar.bz2 171020 BLAKE2B a961001386eede3b71d5e6a3c64f8cf4de476235b0ad9d3508550e3c87edf16e3f20c675fb5d0bb59a66fdd1d2f4e5d81ba49fed2f880af07c60d079ddb0a200 SHA512 9fa34a9b696feec234ae4c41499acca579f80cf8a5139fc40c013bcec99eaa36e93745c8ae7af7c8be14d56d852b80e32b4546db9399c0688c0c58a019adb384
|
||||
EBUILD video-trimmer-25.03.ebuild 609 BLAKE2B a7369cc07f82feb34973fe62e01fa07fc755b0e9141cee9652d87995f6f1b336296547d4489abad1319ee976de9c601bb4ba35cab9b67e95aa8db5d3023bd5e5 SHA512 a43c925cb0a65b0fbaca26e4e67fdc644d8ba6f311211d8041cf812f56126879c640f0774db736a87f53c0d013b25e6dfb7358ec86e229d484391d40d134e29a
|
||||
MISC ChangeLog 342 BLAKE2B 471f98417bea21fa98e8dc8193b1a311cacbeb4edbc28d9ed95f364dd28179eb170e7cda5d70abf6b5505a234b77e9438ab7d6a747e2e946a89e6f389d4c5e1f SHA512 f597c9c99ffc3bd7902061f0feaca640430f12aed5c4c67358844fa2c953a4015ead7a9e8ca5dab073ab37dcdf15460aa1cf146a00c9d1132ba202cd42233849
|
||||
MISC metadata.xml 340 BLAKE2B 03d97cb6bdc0a7464cd9cc4fe860e2c3cefee7a42d42b418e34ee316b5bfc1695573e58cdad3b248133d7ba3fc73e8f55269e02d1b32a88056f2b19cd324002f SHA512 d1efcbd6d0ce922be59b94ee48468f4e0626f0a15e893a8bef0cd986179c62aba773b44ff3de0b21e8dbb0a44964e580dd354baeb2e8100fa56e522c27ce1a85
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
diff --git a/po/de.po b/po/de.po
|
||||
index e007785..ec8da36 100644
|
||||
--- a/po/de.po
|
||||
+++ b/po/de.po
|
||||
@@ -134,7 +134,7 @@ msgstr "Fügt ein --output oder -o Argument um den Ausgabevideopfad zu spezifizi
|
||||
|
||||
#: data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in:127
|
||||
msgid "Added support for opening videos with DnD, although it doesn't work on Flatpak unless Video Trimmer is given filesystem access."
|
||||
-msgstr "Fügt das Öffnen von Videos via Drag & Drop hinzu. Dies funktioniert aber nicht mit Flatpak, solange Video Trimmer keinen Dateisystemzugriff hat."
|
||||
+msgstr "Fügt das Öffnen von Videos via Drag & Drop hinzu. Dies funktioniert aber nicht mit Flatpak, solange Video Trimmer keinen Dateisystemzugriff hat."
|
||||
|
||||
#: data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in:128
|
||||
msgid "Replaced the Done dialog with an in-app notification to better follow the GNOME HIG."
|
||||
@@ -404,7 +404,7 @@ msgid "Please enter the start and end timestamps manually.\n"
|
||||
"If you're running Video Trimmer under Flatpak, note that opening files by drag-and-drop may not work."
|
||||
msgstr "Bitte gib Start- und Ende-Zeitstempel manuell an.\n"
|
||||
"\n"
|
||||
-"Falls Video Trimmer via Flatpak läuft, dann kann es sein, dass Drag & Drop nicht funktioniert."
|
||||
+"Falls Video Trimmer via Flatpak läuft, dann kann es sein, dass Drag & Drop nicht funktioniert."
|
||||
|
||||
#: data/org.gnome.gitlab.YaLTeR.VideoTrimmer.metainfo.xml.in.in:45
|
||||
msgid "This release adds an accurate trimming with re-encoding option and refreshes the design a bit."
|
||||
|
|
@ -1,9 +1,9 @@
|
|||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Copyright 1999-2026 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit gnome2 meson # cargo
|
||||
inherit gnome2 meson
|
||||
|
||||
DESCRIPTION="Trim videos quickly"
|
||||
HOMEPAGE="https://apps.gnome.org/de/app/org.gnome.gitlab.YaLTeR.VideoTrimmer/"
|
||||
|
|
@ -22,8 +22,4 @@ RDEPEND="gui-libs/gtk
|
|||
|
||||
DEPEND="${RDEPEND}
|
||||
>=dev-util/blueprint-compiler-0.2.0
|
||||
virtual/rust"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/fix-amp-entity-in-de-po.patch"
|
||||
)
|
||||
|| ( dev-lang/rust dev-lang/rust-bin )"
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
DEFINED_PHASES=install preinst pretend
|
||||
DESCRIPTION=Group used for the apache_exporter prometheus plugin
|
||||
EAPI=8
|
||||
INHERIT=acct-group
|
||||
KEYWORDS=~amd64
|
||||
SLOT=0
|
||||
_eclasses_=user-info 9951b1a0e4f026d16c33a001fd2d5cdf acct-group c2bb1fc7bada6e119b3ce202ca42476f
|
||||
_md5_=6223075d6587ef091669de9ca0d2fa63
|
||||
8
metadata/md5-cache/acct-group/beszel-0
Normal file
8
metadata/md5-cache/acct-group/beszel-0
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
DEFINED_PHASES=install preinst pretend
|
||||
DESCRIPTION=Group used for the Beszel monitoring hub and agent
|
||||
EAPI=8
|
||||
INHERIT=acct-group
|
||||
KEYWORDS=~amd64
|
||||
SLOT=0
|
||||
_eclasses_=user-info d7c261c6f7c2392145e8789913f1bf7e acct-group 64c2dcae095a4889476d76ba39d2ce21
|
||||
_md5_=bf14925505f7b3b4191a5d10b2e2db41
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
DEFINED_PHASES=install preinst pretend
|
||||
DESCRIPTION=Group conduit
|
||||
EAPI=8
|
||||
INHERIT=acct-group
|
||||
KEYWORDS=~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
|
||||
SLOT=0
|
||||
_eclasses_=user-info 9951b1a0e4f026d16c33a001fd2d5cdf acct-group c2bb1fc7bada6e119b3ce202ca42476f
|
||||
_md5_=e7c167076d7ad86dbae6828dffc0aaa9
|
||||
|
|
@ -4,5 +4,5 @@ EAPI=8
|
|||
INHERIT=acct-group
|
||||
KEYWORDS=~amd64
|
||||
SLOT=0
|
||||
_eclasses_=user-info 9951b1a0e4f026d16c33a001fd2d5cdf acct-group c2bb1fc7bada6e119b3ce202ca42476f
|
||||
_eclasses_=user-info d7c261c6f7c2392145e8789913f1bf7e acct-group 64c2dcae095a4889476d76ba39d2ce21
|
||||
_md5_=c8e24b5f96a608bc3f11b1545f72054d
|
||||
|
|
|
|||
8
metadata/md5-cache/acct-group/forgejo-runner-0
Normal file
8
metadata/md5-cache/acct-group/forgejo-runner-0
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
DEFINED_PHASES=install preinst pretend
|
||||
DESCRIPTION=Group used for the forgejo-runner
|
||||
EAPI=8
|
||||
INHERIT=acct-group
|
||||
KEYWORDS=~amd64
|
||||
SLOT=0
|
||||
_eclasses_=user-info d7c261c6f7c2392145e8789913f1bf7e acct-group 64c2dcae095a4889476d76ba39d2ce21
|
||||
_md5_=b72701ce2ec0d7b792ba7779ed76def3
|
||||
|
|
@ -4,5 +4,5 @@ EAPI=8
|
|||
INHERIT=acct-group
|
||||
KEYWORDS=~amd64
|
||||
SLOT=0
|
||||
_eclasses_=user-info 9951b1a0e4f026d16c33a001fd2d5cdf acct-group c2bb1fc7bada6e119b3ce202ca42476f
|
||||
_eclasses_=user-info d7c261c6f7c2392145e8789913f1bf7e acct-group 64c2dcae095a4889476d76ba39d2ce21
|
||||
_md5_=baba85eb3b0097cc27871edfef8461ad
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
DEFINED_PHASES=install postinst preinst prerm pretend
|
||||
DESCRIPTION=User for the apache_exporter prometheus plugin
|
||||
EAPI=8
|
||||
INHERIT=acct-user
|
||||
KEYWORDS=~amd64
|
||||
RDEPEND=acct-group/apache_exporter
|
||||
SLOT=0
|
||||
_eclasses_=user-info 9951b1a0e4f026d16c33a001fd2d5cdf acct-user cf1210dd7bebfa79756df4fb6735d975
|
||||
_md5_=75d24045e06b0a8e4cfe6b6e58a1c9d9
|
||||
9
metadata/md5-cache/acct-user/beszel-agent-0
Normal file
9
metadata/md5-cache/acct-user/beszel-agent-0
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
DEFINED_PHASES=install postinst preinst prerm pretend
|
||||
DESCRIPTION=User for the Beszel monitoring agent
|
||||
EAPI=8
|
||||
INHERIT=acct-user
|
||||
KEYWORDS=~amd64
|
||||
RDEPEND=acct-group/beszel
|
||||
SLOT=0
|
||||
_eclasses_=user-info 563da40a1a20ea1e55bbf4d149fc190d acct-user ca29416d617e4fd224258d5cf916bf33
|
||||
_md5_=27a0fdf6eca98be975931282bb4d29d3
|
||||
10
metadata/md5-cache/acct-user/beszel-agent-0-r1
Normal file
10
metadata/md5-cache/acct-user/beszel-agent-0-r1
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
DEFINED_PHASES=install postinst preinst prerm pretend setup
|
||||
DESCRIPTION=User for the Beszel monitoring agent
|
||||
EAPI=8
|
||||
INHERIT=acct-user
|
||||
IUSE=docker
|
||||
KEYWORDS=~amd64
|
||||
RDEPEND=acct-group/beszel
|
||||
SLOT=0
|
||||
_eclasses_=user-info d7c261c6f7c2392145e8789913f1bf7e acct-user 8c5f04cd2cfafc30ffb9bae9cf5f5605
|
||||
_md5_=68743e0393992a8b8a9c919f1222571b
|
||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue