Compare commits

..

No commits in common. "cb3f7b6d5ce566efda799ed944ef2b8120b2cdbb" and "b017aab0b97bd2a35a2515fef25ed4b5cc61c958" have entirely different histories.

19 changed files with 838 additions and 320 deletions

View File

@ -1,10 +1,10 @@
# Copyright 1999-2021 Gentoo Authors # Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI="8" EAPI="7"
DISTUTILS_USE_PEP517=setuptools
PYTHON_COMPAT=( python3_9 ) PYTHON_COMPAT=( python3_9 )
DISTUTILS_USE_SETUPTOOLS="rdepend"
inherit distutils-r1 inherit distutils-r1

View File

@ -0,0 +1 @@
DIST aiosqlite-0.17.0.tar.gz 25941 BLAKE2B 869d165bc8c791cb94159f6508f5113d915f5531117d0d79ac1f297de16cbb78574a7eaafc1bceccc9e4397f88f490b90d49becb4b7cc2c0d51e14f0afd7561b SHA512 50f9965ef7dafe91a2f41dc41489395e437080aa4b7853800d806d21f4f8042d92ff6cfd2aeadefa7ca5e4debd14f39d93ca28c89f3116b3b61b2e8829533e6e

View File

@ -0,0 +1,29 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
PYTHON_COMPAT=( python3_9 )
DISTUTILS_USE_SETUPTOOLS="no"
inherit distutils-r1
DESCRIPTION="asyncio bridge to the standard sqlite3 module"
HOMEPAGE="https://github.com/jreese/aiosqlite"
SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
# lacks dev-python/aiounittest
RESTRICT="test"
DOCS=( CHANGELOG.md README.rst )
PATCHES=(
# https://github.com/omnilib/aiosqlite/commit/a157e0b7d126daeeda4e5b7dcf2b6cb9cf9ac274
"${FILESDIR}/${P}-typing.patch"
)
distutils_enable_sphinx docs

View File

@ -0,0 +1,38 @@
From a157e0b7d126daeeda4e5b7dcf2b6cb9cf9ac274 Mon Sep 17 00:00:00 2001
From: John Reese <john@noswap.com>
Date: Sun, 16 May 2021 14:18:18 -0700
Subject: [PATCH] Drop dependency on typing_extensions, fix #114
---
aiosqlite/context.py | 4 +---
pyproject.toml | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/aiosqlite/context.py b/aiosqlite/context.py
index 2a2fa4e..316845f 100644
--- a/aiosqlite/context.py
+++ b/aiosqlite/context.py
@@ -3,9 +3,7 @@
from functools import wraps
-from typing import Any, Callable, Coroutine, Generator, TypeVar
-
-from typing_extensions import AsyncContextManager
+from typing import Any, AsyncContextManager, Callable, Coroutine, Generator, TypeVar
from .cursor import Cursor
diff --git a/pyproject.toml b/pyproject.toml
index 4d44707..16a4013 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,7 +8,7 @@ author = "John Reese"
author-email = "john@noswap.com"
description-file = "README.rst"
home-page = "https://aiosqlite.omnilib.dev"
-requires = ["typing_extensions>=3.7.2"]
+requires = []
requires-python = ">=3.6"
classifiers = [
"Development Status :: 5 - Production/Stable",

View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>candrews@gentoo.org</email>
<name>Craig Andrews</name>
</maintainer>
<use>
<flag name="cloud">Enable Netdata Cloud support</flag>
<flag name="compression">Enable compression via zlib</flag>
<flag name="dbengine">Enable the Netdata database engine</flag>
<flag name="ipmi">Install <pkg>sys-apps/ipmitool</pkg> required for monitoring IPMI sensors.</flag>
<flag name="jsonc">Enable optimization of JSON using <pkg>dev-libs/json-c</pkg></flag>
<flag name="kinesis">Enable support for Amazon Kenesis as a backend</flag>
<flag name="lto">Build with Link Time Optimization (LTO)</flag>
<flag name="mongodb">Enable support for the mongodb backend</flag>
<flag name="nfacct">Enable the nfacct plugin</flag>
<flag name="nodejs">Enable use of nodejs (which some plugins use)</flag>
<flag name="prometheus">Enable support for the Prometheus remote write backend</flag>
<flag name="tor">Enable monitoring of tor</flag>
<flag name="xen">Enable monitoring of xen</flag>
</use>
<upstream>
<remote-id type="github">netdata/netdata</remote-id>
</upstream>
</pkgmetadata>

View File

@ -1,164 +0,0 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python{3_8,3_9,3_10} )
inherit autotools fcaps linux-info python-single-r1 systemd toolchain-funcs
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
inherit git-r3
else
SRC_URI="https://github.com/netdata/${PN}/releases/download/${PV}/${PN}-${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${PV}"
KEYWORDS="~amd64 ~ppc64 ~x86"
fi
DESCRIPTION="Linux real time system monitoring, done right!"
HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
LICENSE="GPL-3+ MIT BSD"
SLOT="0"
IUSE="caps cloud +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis +lto mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
REQUIRED_USE="
mysql? ( python )
python? ( ${PYTHON_REQUIRED_USE} )
tor? ( python )"
# most unconditional dependencies are for plugins.d/charts.d.plugin:
RDEPEND="
acct-group/netdata
acct-user/netdata
app-misc/jq
>=app-shells/bash-4:0
|| (
net-analyzer/openbsd-netcat
net-analyzer/netcat
)
net-libs/libwebsockets
net-misc/curl
net-misc/wget
sys-apps/util-linux
virtual/awk
caps? ( sys-libs/libcap )
cups? ( net-print/cups )
dbengine? (
app-arch/lz4
dev-libs/judy
dev-libs/openssl:=
)
dev-libs/libuv
cloud? ( dev-libs/protobuf:= )
compression? ( sys-libs/zlib )
ipmi? ( sys-libs/freeipmi )
jsonc? ( dev-libs/json-c:= )
kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
mongodb? ( dev-libs/mongo-c-driver )
nfacct? (
net-firewall/nfacct
net-libs/libmnl
)
nodejs? ( net-libs/nodejs )
prometheus? (
dev-libs/protobuf:=
app-arch/snappy
)
python? (
${PYTHON_DEPS}
$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
mysql? ( $(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_USEDEP}]') )
postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]') )
tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_USEDEP}]') )
)
xen? (
app-emulation/xen-tools
dev-libs/yajl
)"
DEPEND="${RDEPEND}
virtual/pkgconfig"
FILECAPS=(
'cap_dac_read_search,cap_sys_ptrace=ep' 'usr/libexec/netdata/plugins.d/apps.plugin' -- 'cap_setuid=ep' 'usr/libexec/netdata/plugins.d/slabinfo.plugin' -- 'cap_setuid=ep' 'usr/libexec/netdata/plugins.d/cgroup-network' -- 'cap_net_raw' 'usr/libexec/netdata/plugins.d/fping.plugin' -- 'cap_perfmon=ep' 'usr/libexec/netdata/plugins.d/perf.plugin'
)
pkg_setup() {
use python && python-single-r1_pkg_setup
linux-info_pkg_setup
}
src_prepare() {
default
eautoreconf
}
src_configure() {
if use ppc64; then
# bundled dlib does not support vsx on big-endian
# https://github.com/davisking/dlib/issues/397
[[ $(tc-endian) == big ]] && append-flags -mno-vsx
fi
econf \
--localstatedir="${EPREFIX}"/var \
--with-user=netdata \
--without-bundled-protobuf \
$(use_enable cloud) \
$(use_enable jsonc) \
$(use_enable cups plugin-cups) \
$(use_enable dbengine) \
$(use_enable nfacct plugin-nfacct) \
$(use_enable ipmi plugin-freeipmi) \
$(use_enable kinesis backend-kinesis) \
$(use_enable lto lto) \
$(use_enable mongodb backend-mongodb) \
$(use_enable prometheus backend-prometheus-remote-write) \
$(use_enable xen plugin-xenstat) \
$(use_enable cpu_flags_x86_sse2 x86-sse) \
$(use_with compression zlib)
}
src_compile() {
emake clean
default
}
src_install() {
default
rm -rf "${D}/var/cache" || die
keepdir /var/log/netdata
fowners -Rc netdata:netdata /var/log/netdata
keepdir /var/lib/netdata
keepdir /var/lib/netdata/registry
fowners -Rc netdata:netdata /var/lib/netdata
fowners -Rc root:netdata /usr/share/${PN}
fowners -Rc root:netdata /usr/libexec/netdata/plugins.d
fperms 4750 /usr/libexec/netdata/plugins.d/{cgroup-network,ioping.plugin,perf.plugin,slabinfo.plugin}
newinitd system/netdata-openrc ${PN}
systemd_dounit system/netdata.service
insinto /etc/netdata
doins system/netdata.conf
}
pkg_postinst() {
fcaps_pkg_postinst
if use nfacct ; then
fcaps 'cap_net_admin' 'usr/libexec/netdata/plugins.d/nfacct.plugin'
fi
if use xen ; then
fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
fi
if use ipmi ; then
fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/freeipmi.plugin'
fi
}

View File

@ -1 +1 @@
DIST nfs-ganesha-4.0.3.tar.gz 1884881 BLAKE2B 8e4d2f7615b63b3e0458bd21c5c42bc9804b5428abf4c0c09e569925d10c4f9112dd8e910ef75c540ae00eae9711c9a3d8468bcb3e8d5a5c5fdd999091e1dd23 SHA512 4c1a5781e5b412003ef7a8fb3fce3bfa380200b61f58c9b9b973b369eff3f5dc367e2417cb69e33353b36baddab70b0cb08687aa9b80d8abd28d462b3b25c32b DIST nfs-ganesha-4.0_beta63.tar.gz 1887627 BLAKE2B 12a615ed14039c9d00be7c63a5e7ea86edad50f3c6169000d5f322a04a47b9150fd35faba3534c90dd599287ef5e6274d7216e6320ee22044aabb45f9e459df4 SHA512 f9dc1886002e944bc3b1495d310cfe4e695577f38f4930acb593ebfb01fb56b65513604d7f10e97a180b3ec1d4d947e7069405d9760e27e352bc7c43500708d8

View File

@ -1,41 +1,37 @@
# Copyright 1999-2022 Gentoo Foundation # Copyright 1999-2021 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
EAPI=8 EAPI=7
PYTHON_COMPAT=( python3_10 ) #PYTHON_COMPAT=( python3_9 )
inherit cmake flag-o-matic python-single-r1 #inherit cmake flag-o-matic python-single-r1
#inherit cmake flag-o-matic inherit cmake flag-o-matic
DESCRIPTION="A NFSv3,v4,v4.1 fileserver that runs in user mode on most UNIX/Linux systems" DESCRIPTION="A NFSv3,v4,v4.1 fileserver that runs in user mode on most UNIX/Linux systems"
HOMEPAGE="https://github.com/nfs-ganesha/nfs-ganesha" HOMEPAGE="https://github.com/nfs-ganesha/nfs-ganesha"
if [[ ${PV} == *beta* ]] ; then if [[ ${PV} == *beta* ]] ; then
MY_PV="$(ver_cut 1)-dev.$(ver_cut 4)" MY_PV="$(ver_cut 1)-dev.$(ver_cut 4)"
SRC_URI="https://github.com/nfs-ganesha/${PN}/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz" SRC_URI="https://github.com/nfs-ganesha/${PN}/archive/V${MY_PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${MY_PV}/src"
else else
SRC_URI="https://github.com/nfs-ganesha/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz" SRC_URI="https://github.com/nfs-ganesha/${PN}/archive/V${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${P}/src"
fi fi
LICENSE="LGPL-3" LICENSE="LGPL-3"
SLOT="0" SLOT="0"
KEYWORDS="~amd64" KEYWORDS="~amd64"
IUSE="btrfs caps dbus debug gssapi gui +nfs3 nfsidmap tools vsock" IUSE="btrfs dbus debug gssapi gui +nfs3 nfsidmap tools vsock"
FS_SUPPORT=" ceph glusterfs gpfs lustre mem null proxy-v3 proxy-v4 rgw vfs xfs" FS_SUPPORT=" ceph glusterfs gpfs lustre mem null panfs proxy-v3 proxy-v4 rgw vfs xfs"
IUSE+=" ${FS_SUPPORT// / ganesha_fs_}" IUSE+=" ${FS_SUPPORT// / ganesha_fs_}"
REQUIRED_USE="gui? ( tools ) REQUIRED_USE="gui? ( tools )
btrfs? ( ganesha_fs_vfs )" btrfs? ( ganesha_fs_vfs )"
RDEPEND=" RDEPEND="
dev-libs/jemalloc:= dev-libs/jemalloc
dev-libs/userspace-rcu:= dev-libs/userspace-rcu:=
>=net-libs/ntirpc-4.0[gssapi] net-libs/libnfsidmap
sys-apps/acl >=net-libs/ntirpc-3.4:=[gssapi]
sys-apps/util-linux
caps? ( sys-libs/libcap )
btrfs? ( sys-fs/btrfs-progs ) btrfs? ( sys-fs/btrfs-progs )
gssapi? ( virtual/krb5 ) gssapi? ( virtual/krb5 )
dbus? ( sys-apps/dbus ) dbus? ( sys-apps/dbus )
@ -43,7 +39,6 @@ RDEPEND="
ganesha_fs_glusterfs? ( sys-cluster/glusterfs ) ganesha_fs_glusterfs? ( sys-cluster/glusterfs )
ganesha_fs_lustre? ( sys-cluster/lustre ) ganesha_fs_lustre? ( sys-cluster/lustre )
ganesha_fs_xfs? ( sys-fs/xfsprogs ) ganesha_fs_xfs? ( sys-fs/xfsprogs )
nfsidmap? ( net-libs/libnfsidmap )
" "
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
sys-devel/bison sys-devel/bison
@ -51,6 +46,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig virtual/pkgconfig
" "
#S="${WORKDIR}/${P}/src"
S="${WORKDIR}/${PN}-${MY_PV}/src"
pkg_setup() { pkg_setup() {
if use tools || use gui; then if use tools || use gui; then
python-single-r1_pkg_setup python-single-r1_pkg_setup
@ -77,7 +76,6 @@ src_configure() {
-DALLOCATOR=jemalloc -DALLOCATOR=jemalloc
-DUSE_SYSTEM_NTIRPC=ON -DUSE_SYSTEM_NTIRPC=ON
-DTIRPC_EPOLL=ON -DTIRPC_EPOLL=ON
-USE_ACL_MAPPING=ON
-DUSE_BTRFSUTIL=$(usex btrfs) -DUSE_BTRFSUTIL=$(usex btrfs)
-DUSE_GSS=$(usex gssapi) -DUSE_GSS=$(usex gssapi)
-DUSE_DBUS=$(usex dbus) -DUSE_DBUS=$(usex dbus)
@ -104,6 +102,7 @@ src_configure() {
-DUSE_FSAL_LUSTRE=$(usex ganesha_fs_lustre) -DUSE_FSAL_LUSTRE=$(usex ganesha_fs_lustre)
-DUSE_FSAL_MEM=$(usex ganesha_fs_mem) -DUSE_FSAL_MEM=$(usex ganesha_fs_mem)
-DUSE_FSAL_NULL=$(usex ganesha_fs_null) -DUSE_FSAL_NULL=$(usex ganesha_fs_null)
-DUSE_FSAL_PANFS=$(usex ganesha_fs_panfs)
-DUSE_FSAL_PROXY_V3=$(usex ganesha_fs_proxy-v3) -DUSE_FSAL_PROXY_V3=$(usex ganesha_fs_proxy-v3)
-DUSE_FSAL_PROXY_V4=$(usex ganesha_fs_proxy-v4) -DUSE_FSAL_PROXY_V4=$(usex ganesha_fs_proxy-v4)
-DUSE_FSAL_RGW=$(usex ganesha_fs_rgw) -DUSE_FSAL_RGW=$(usex ganesha_fs_rgw)

View File

@ -0,0 +1,299 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
CRATES="
ahash-0.7.2
ansi_term-0.11.0
atty-0.2.14
autocfg-1.0.1
base64-0.13.0
bitflags-1.2.1
byteorder-1.4.3
cbindgen-0.9.1
cc-1.0.67
cfg-if-1.0.0
clap-2.33.3
concread-0.2.9
crossbeam-0.8.0
crossbeam-channel-0.5.1
crossbeam-deque-0.8.0
crossbeam-epoch-0.9.3
crossbeam-queue-0.3.1
crossbeam-utils-0.8.3
fernet-0.1.4
foreign-types-0.3.2
foreign-types-shared-0.1.1
getrandom-0.2.2
hermit-abi-0.1.18
instant-0.1.9
itoa-0.4.7
jobserver-0.1.21
lazy_static-1.4.0
libc-0.2.93
lock_api-0.4.3
log-0.4.14
memoffset-0.6.3
once_cell-1.7.2
openssl-0.10.33
openssl-sys-0.9.61
parking_lot-0.11.1
parking_lot_core-0.8.3
paste-0.1.18
paste-impl-0.1.18
pkg-config-0.3.19
ppv-lite86-0.2.10
proc-macro-hack-0.5.19
proc-macro2-1.0.26
quote-1.0.9
rand-0.8.3
rand_chacha-0.3.0
rand_core-0.6.2
rand_hc-0.3.0
redox_syscall-0.2.6
remove_dir_all-0.5.3
ryu-1.0.5
scopeguard-1.1.0
serde-1.0.125
serde_derive-1.0.125
serde_json-1.0.64
smallvec-1.6.1
strsim-0.8.0
syn-1.0.69
synstructure-0.12.4
tempfile-3.2.0
textwrap-0.11.0
toml-0.5.8
unicode-width-0.1.8
unicode-xid-0.2.1
uuid-0.8.2
vcpkg-0.2.11
vec_map-0.8.2
version_check-0.9.3
wasi-0.10.2+wasi-snapshot-preview1
winapi-0.3.9
winapi-i686-pc-windows-gnu-0.4.0
winapi-x86_64-pc-windows-gnu-0.4.0
zeroize-1.2.0
zeroize_derive-1.0.1
"
PYTHON_COMPAT=( python3_{8,9,10} )
DISTUTILS_SINGLE_IMPL=1
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit multilib flag-o-matic autotools distutils-r1 systemd tmpfiles db-use cargo
DESCRIPTION="389 Directory Server (core libraries and daemons)"
HOMEPAGE="https://directory.fedoraproject.org/"
SRC_URI="https://github.com/389ds/${PN}/archive/refs/tags/${P}.tar.gz
$(cargo_crate_uris ${CRATES})"
LICENSE="GPL-3+ Apache-2.0 BSD MIT MPL-2.0"
SLOT="$(ver_cut 1-2)/0"
KEYWORDS="~amd64"
IUSE_PLUGINS="+accountpolicy +bitwise +dna +pam-passthru"
IUSE="${IUSE_PLUGINS} +autobind auto-dn-suffix debug doc +ldapi selinux systemd"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# lib389 tests (which is most of the suite) can't find their own modules.
RESTRICT="test"
# always list newer first
# Do not add any AGPL-3 BDB here!
# See bug 525110, comment 15.
BERKDB_SLOTS=( 5.3 4.8 )
DEPEND="
>=app-crypt/mit-krb5-1.7-r100[openldap]
>=dev-libs/cyrus-sasl-2.1.19[kerberos]
>=dev-libs/icu-60.2:=
dev-libs/nspr
>=dev-libs/nss-3.22[utils]
dev-libs/libevent:=
dev-libs/libpcre:3
dev-libs/openssl:0=
>=net-analyzer/net-snmp-5.1.2:=
net-nds/openldap[sasl]
|| (
$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}" ; done)
)
sys-libs/cracklib
sys-fs/e2fsprogs
sys-libs/zlib
pam-passthru? ( sys-libs/pam )
selinux? (
$(python_gen_cond_dep '
sys-libs/libselinux[python,${PYTHON_USEDEP}]
')
)
systemd? ( >=sys-apps/systemd-244 )
virtual/libcrypt:=
"
BDEPEND=">=sys-devel/autoconf-2.69-r5
virtual/pkgconfig
${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/argparse-manpage[${PYTHON_USEDEP}]
')
doc? ( app-doc/doxygen )
test? ( dev-util/cmocka )
"
# perl dependencies are for logconv.pl
RDEPEND="${DEPEND}
!dev-libs/svrcore
!net-nds/389-ds-base:0
acct-user/dirsrv
acct-group/dirsrv
${PYTHON_DEPS}
$(python_gen_cond_dep '
dev-python/pyasn1[${PYTHON_USEDEP}]
dev-python/pyasn1-modules[${PYTHON_USEDEP}]
dev-python/argcomplete[${PYTHON_USEDEP}]
dev-python/python-dateutil[${PYTHON_USEDEP}]
dev-python/python-ldap[sasl,${PYTHON_USEDEP}]
dev-python/distro[${PYTHON_USEDEP}]
')
virtual/perl-Archive-Tar
virtual/perl-DB_File
virtual/perl-IO
virtual/perl-Getopt-Long
virtual/perl-IO-Compress
virtual/perl-MIME-Base64
virtual/perl-Scalar-List-Utils
virtual/perl-Time-Local
virtual/logger
selinux? ( sec-policy/selinux-dirsrv )
"
S="${WORKDIR}/${PN}-${P}"
PATCHES=(
"${FILESDIR}/${PN}-db-gentoo.patch"
)
distutils_enable_tests pytest
src_prepare() {
# this is for upstream GitHub issue 4292
if use !systemd; then
sed -i \
-e 's|WITH_SYSTEMD = 1|WITH_SYSTEMD = 0|' \
Makefile.am || die
fi
# GH issue 4092
sed -i \
-e 's|@localstatedir@/run|/run|' \
ldap/admin/src/defaults.inf.in || die
default
eautoreconf
}
src_configure() {
local myeconfargs=(
$(use_enable accountpolicy acctpolicy)
$(use_enable bitwise)
$(use_enable dna)
$(use_enable pam-passthru)
$(use_enable autobind)
$(use_enable auto-dn-suffix)
$(use_enable debug)
$(use_enable ldapi)
$(use_with selinux)
$(use_with systemd)
$(use_with systemd systemdgroupname "dirsrv.target")
$(use_with systemd tmpfiles-d "/usr/lib/tmpfiles.d")
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
$(use_with !systemd initddir "/etc/init.d")
$(use_enable test cmocka)
--enable-rust
--enable-rust-offline
--with-pythonexec="${PYTHON}"
--with-fhs
--with-openldap
--with-db-inc="$(db_includedir)"
--disable-cockpit
)
econf "${myeconfargs[@]}"
rm "${S}"/.cargo/config || die
}
src_compile() {
export CARGO_HOME="${ECARGO_HOME}"
default
if use doc; then
doxygen "${S}"/docs/slapi.doxy || die
fi
cd "${S}"/src/lib389 || die
distutils-r1_src_compile
# argparse-manpage dynamic man pages have hardcoded man v1 in header
sed -i \
"1s/\"1\"/\"8\"/" \
"${S}"/src/lib389/man/{openldap_to_ds,ds{conf,ctl,idm,create}}.8 || die
}
src_test () {
emake check
cd "${S}"/src/lib389 || die
distutils-r1_src_test
}
src_install() {
# -j1 is a temporary workaround for bug #605432
emake -j1 DESTDIR="${D}" install
# Install gentoo style init script
# Get these merged upstream
newinitd "${FILESDIR}"/389-ds.initd-r1 389-ds
newinitd "${FILESDIR}"/389-ds-snmp.initd 389-ds-snmp
dotmpfiles "${FILESDIR}"/389-ds-base.conf
# cope with libraries being in /usr/lib/dirsrv
dodir /etc/env.d
echo "LDPATH=/usr/$(get_libdir)/dirsrv" > "${ED}"/etc/env.d/08dirsrv || die
if use doc; then
cd "${S}" || die
docinto html/
dodoc -r html/.
fi
cd "${S}"/src/lib389 || die
distutils-r1_src_install
python_fix_shebang "${ED}"
find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
}
pkg_postinst() {
tmpfiles_process 389-ds-base.conf
echo
elog "If you are planning to use 389-ds-snmp (ldap-agent),"
elog "make sure to properly configure: /etc/dirsrv/config/ldap-agent.conf"
elog "adding proper 'server' entries, and adding the lines below to"
elog " => /etc/snmp/snmpd.conf"
elog
elog "master agentx"
elog "agentXSocket /var/agentx/master"
elog
elog "To start 389 Directory Server (LDAP service) at boot:"
elog
elog " rc-update add 389-ds default"
elog
echo
}

View File

@ -1 +1,2 @@
DIST sssd-2.6.3.tar.gz 6062332 BLAKE2B bb2a81ce45200ea933244404743438ea552be3cfb7807b57bdbfdaa33caebee437dbb846efbc779c2db4ede2a049637e6e709117c9797104cdace185520591f2 SHA512 5a8cacac5ead44d31167852b418167a740b31fc9adf2a0fe88e57c3a8ed9e9cfda1ceb57084c5e86f43deb0e96e78dc88f23dae962df3b0a5ae60255cdeff8fc DIST sssd-2.5.2-CVE-2021-3621.patch.bz2 3155 BLAKE2B c50e331f0f1acbb9ef8e6d54a63219da44df5e565608c24635d85a110fcc024f7d5293c4412bca64831a9a3a14e2c1188be1a802c76575ad6d7a83243d3d89c2 SHA512 650af7c67b3a807935c0875ee877d366facdf818492fb4244757448ad351454a279968ea5414e6b3cd116e873abe4f1aef2ccdaf790a4df0cf7f2a0078a41860
DIST sssd-2.5.2.tar.gz 7579208 BLAKE2B ec5d9aeaf5b5e05b56c01f9137f6f24db05544dbd48458d742285b60e7beb6d48af865f3415e11ce89e187f4643bbecf15bbb321859ec80cfe458eb781cea6c9 SHA512 a9bac7b2cc23022dce3bcda314c9c26a0a0914c448f6d5a51c5ba18670f04c1fd1a94cb20173235b6285df1dcc9251cb6b3f3e71a220037b4eb66668e6f33c48

View File

@ -3,81 +3,30 @@
EAPI=7 EAPI=7
PYTHON_COMPAT=( python3_{8..10} ) PYTHON_COMPAT=( python3_{7..10} )
PLOCALES="ca cs de es eu fi fr ja ko nl pt pt_BR ru sv tg uk zh_CN"
PLOCALES_BIN="${PLOCALES} bg hu id it nb pl zh_TW"
PLOCALE_BACKUP="de"
inherit autotools linux-info multilib-minimal optfeature plocale python-single-r1 pam systemd toolchain-funcs inherit autotools linux-info multilib-minimal python-single-r1 pam systemd toolchain-funcs
DESCRIPTION="System Security Services Daemon provides access to identity and authentication" DESCRIPTION="System Security Services Daemon provides access to identity and authentication"
HOMEPAGE="https://github.com/SSSD/sssd" HOMEPAGE="https://github.com/SSSD/sssd"
SRC_URI="https://github.com/SSSD/sssd/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" SRC_URI="https://github.com/SSSD/sssd/releases/download/${PV}/${P}.tar.gz"
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-CVE-2021-3621.patch.bz2"
LICENSE="GPL-3" LICENSE="GPL-3"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux subid sudo systemd systemtap test valgrind" IUSE="acl doc +locator +netlink nfsv4 nls +man pac python samba selinux sudo systemd systemtap test valgrind"
REQUIRED_USE="
pac? ( samba )
python? ( ${PYTHON_REQUIRED_USE} )
test? ( sudo )
valgrind? ( test )"
RESTRICT="!test? ( test )" RESTRICT="!test? ( test )"
DEPEND=" REQUIRED_USE="${PYTHON_REQUIRED_USE}
>=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}] pac? ( samba )
app-crypt/p11-kit test? ( sudo )
>=dev-libs/ding-libs-0.2 valgrind? ( test )"
>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
dev-libs/libpcre2:= BDEPEND=">=sys-devel/autoconf-2.69-r5
dev-libs/libunistring:=
>=dev-libs/popt-1.16
>=dev-libs/openssl-1.0.2:=
>=net-dns/bind-tools-9.9[gssapi]
>=net-dns/c-ares-1.7.4:=
>=net-nds/openldap-2.4.30[sasl]
>=sys-apps/dbus-1.6
>=sys-apps/keyutils-1.5:=
>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
>=sys-libs/talloc-2.0.7
>=sys-libs/tdb-1.2.9
>=sys-libs/tevent-0.9.16
>=sys-libs/ldb-1.1.17-r1:=
virtual/libintl
acl? ( net-fs/cifs-utils[acl] )
locator? ( >=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}] )
netlink? ( dev-libs/libnl:3 )
nfsv4? (
|| (
>=net-fs/nfs-utils-2.3.1-r2
net-libs/libnfsidmap
)
)
nls? ( >=sys-devel/gettext-0.18 )
python? (
${PYTHON_DEPS}
systemd? (
$(python_gen_cond_dep '
dev-python/python-systemd[${PYTHON_USEDEP}]
')
)
)
samba? ( >=net-fs/samba-4.10.2[winbind] )
selinux? (
>=sys-libs/libselinux-2.1.9
>=sys-libs/libsemanage-2.1
)
subid? ( >=sys-apps/shadow-4.9 )
systemtap? ( dev-util/systemtap )"
RDEPEND="${DEPEND}
>=sys-libs/glibc-2.17[nscd]
selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
BDEPEND="
virtual/pkgconfig virtual/pkgconfig
${PYTHON_DEPS} ${PYTHON_DEPS}
doc? ( app-doc/doxygen ) doc? ( app-doc/doxygen )
nls? ( sys-devel/gettext )
test? ( test? (
dev-libs/check dev-libs/check
dev-libs/softhsm:2 dev-libs/softhsm:2
@ -95,6 +44,51 @@ BDEPEND="
nls? ( app-text/po4a ) nls? ( app-text/po4a )
)" )"
DEPEND=">=app-crypt/mit-krb5-1.19.1[${MULTILIB_USEDEP}]
app-crypt/p11-kit
>=dev-libs/ding-libs-0.2
dev-libs/glib:2
>=dev-libs/cyrus-sasl-2.1.25-r3[kerberos]
>=dev-libs/libpcre-8.30:=
>=dev-libs/popt-1.16
>=dev-libs/openssl-1.0.2:0=
>=net-dns/bind-tools-9.9[gssapi]
>=net-dns/c-ares-1.7.4
>=net-nds/openldap-2.4.30[sasl]
>=sys-apps/dbus-1.6
>=sys-apps/keyutils-1.5:=
>=sys-libs/pam-0-r1[${MULTILIB_USEDEP}]
>=sys-libs/talloc-2.0.7
>=sys-libs/tdb-1.2.9
>=sys-libs/tevent-0.9.16
>=sys-libs/ldb-1.1.17-r1:=
virtual/libintl
locator? (
>=net-dns/c-ares-1.10.0-r1[${MULTILIB_USEDEP}]
)
acl? ( net-fs/cifs-utils[acl] )
netlink? ( dev-libs/libnl:3 )
nfsv4? ( || ( >=net-fs/nfs-utils-2.3.1-r2 net-libs/libnfsidmap ) )
nls? ( >=sys-devel/gettext-0.18 )
pac? (
net-fs/samba
)
python? ( ${PYTHON_DEPS} )
samba? ( >=net-fs/samba-4.10.2[winbind] )
selinux? (
>=sys-libs/libselinux-2.1.9
>=sys-libs/libsemanage-2.1
)
systemd? (
dev-libs/jansson:0=
net-libs/http-parser:0=
net-misc/curl:0=
)
systemtap? ( dev-util/systemtap )"
RDEPEND="${DEPEND}
>=sys-libs/glibc-2.17[nscd]
selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )"
CONFIG_CHECK="~KEYS" CONFIG_CHECK="~KEYS"
MULTILIB_WRAPPED_HEADERS=( MULTILIB_WRAPPED_HEADERS=(
@ -108,6 +102,10 @@ MULTILIB_WRAPPED_HEADERS=(
/usr/include/sss_certmap.h /usr/include/sss_certmap.h
) )
PATCHES=(
"${WORKDIR}"/${P}-CVE-2021-3621.patch
)
pkg_setup() { pkg_setup() {
linux-info_pkg_setup linux-info_pkg_setup
python-single-r1_pkg_setup python-single-r1_pkg_setup
@ -116,42 +114,15 @@ pkg_setup() {
src_prepare() { src_prepare() {
default default
plocale_get_locales > src/man/po/LINGUAS || die
sed -i \
-e "/_langs]/ s/ .*//" \
src/man/po/po4a.cfg \
|| die
enable_locale() {
local locale=${1}
sed -i \
-e "/_langs]/ s/$/ ${locale}/" \
src/man/po/po4a.cfg \
|| die
}
plocale_for_each_locale enable_locale
# remove locales that will not build
# sed -i \
# -e "/_langs]/ s/ br//" \
# -e "/_langs]/ s/ lv//" \
# src/man/po/po4a.cfg \
# || die
PLOCALES="${PLOCALES_BIN}"
plocale_get_locales > po/LINGUAS || die
sed -i \ sed -i \
-e 's:/var/run:/run:' \ -e 's:/var/run:/run:' \
src/examples/logrotate \ "${S}"/src/examples/logrotate \
|| die || die
# disable flaky test, see https://github.com/SSSD/sssd/issues/5631 # disable flaky test, see https://github.com/SSSD/sssd/issues/5631
sed -i \ sed -i \
-e '/^\s*pam-srv-tests[ \\]*$/d' \ -e '/^\s*pam-srv-tests[ \\]*$/d' \
Makefile.am \ "${S}"/Makefile.am \
|| die || die
eautoreconf eautoreconf
@ -160,7 +131,7 @@ src_prepare() {
} }
src_configure() { src_configure() {
local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1 || die) local native_dbus_cflags=$($(tc-getPKG_CONFIG) --cflags dbus-1)
multilib-minimal_src_configure multilib-minimal_src_configure
} }
@ -183,16 +154,19 @@ multilib_src_configure() {
--with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets --with-secrets-db-path="${EPREFIX}"/var/lib/sss/secrets
--with-log-path="${EPREFIX}"/var/log/sssd --with-log-path="${EPREFIX}"/var/log/sssd
--with-os=gentoo --with-os=gentoo
--with-nscd="${EPREFIX}"/usr/sbin/nscd
--with-unicode-lib="glib2"
--disable-rpath --disable-rpath
--disable-static --disable-static
--sbindir="${EPREFIX}"/usr/sbin --sbindir=/usr/sbin
--libexecdir="${EPREFIX}"/usr/libexec --enable-local-provider
$(multilib_native_use_with systemd kcm)
$(multilib_native_use_with systemd secrets)
$(use_with samba) $(use_with samba)
--with-smb-idmap-interface-version=6 --with-smb-idmap-interface-version=6
$(multilib_native_use_enable acl cifs-idmap-plugin) $(multilib_native_use_enable acl cifs-idmap-plugin)
$(multilib_native_use_with selinux) $(multilib_native_use_with selinux)
$(multilib_native_use_with selinux semanage) $(multilib_native_use_with selinux semanage)
--with-kcm
$(use_enable locator krb5-locator-plugin) $(use_enable locator krb5-locator-plugin)
$(use_enable pac pac-responder) $(use_enable pac pac-responder)
$(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin) $(multilib_native_use_with nfsv4 nfsv4-idmapd-plugin)
@ -202,18 +176,21 @@ multilib_src_configure() {
$(multilib_native_use_with sudo) $(multilib_native_use_with sudo)
$(multilib_native_with autofs) $(multilib_native_with autofs)
$(multilib_native_with ssh) $(multilib_native_with ssh)
$(use_with subid)
$(use_enable systemtap) $(use_enable systemtap)
$(use_enable valgrind) $(use_enable valgrind)
--without-python2-bindings --without-python2-bindings
$(multilib_native_use_with python python3-bindings) $(multilib_native_use_with python python3-bindings)
# Annoyingly configure requires that you pick systemd XOR sysv
--with-initscript=$(usex systemd systemd sysv)
) )
use systemd && myconf+=( # Annoyingly configure requires that you pick systemd XOR sysv
--with-systemdunitdir=$(systemd_get_systemunitdir) if use systemd; then
) myconf+=(
--with-initscript="systemd"
--with-systemdunitdir=$(systemd_get_systemunitdir)
)
else
myconf+=(--with-initscript="sysv")
fi
if ! multilib_is_native_abi; then if ! multilib_is_native_abi; then
# work-around all the libraries that are used for CLI and server # work-around all the libraries that are used for CLI and server
@ -221,8 +198,8 @@ multilib_src_configure() {
{POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' ' {POPT,TALLOC,TDB,TEVENT,LDB}_{CFLAGS,LIBS}=' '
# ldb headers are fine since native needs it # ldb headers are fine since native needs it
# ldb lib fails... but it does not seem to bother # ldb lib fails... but it does not seem to bother
{DHASH,UNISTRING,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' ' {DHASH,INI_CONFIG_V{0,1,1_1,1_3}}_{CFLAGS,LIBS}=' '
{PCRE,CARES,SYSTEMD_LOGIN,SASL,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' ' {PCRE,CARES,SYSTEMD_LOGIN,SASL,GLIB2,DBUS,CRYPTO,P11_KIT}_{CFLAGS,LIBS}=' '
{NDR_NBT,SAMBA_UTIL,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' ' {NDR_NBT,SAMBA_UTIL,SMBCLIENT,NDR_KRB5PAC}_{CFLAGS,LIBS}=' '
# use native include path for dbus (needed for build) # use native include path for dbus (needed for build)
@ -230,6 +207,7 @@ multilib_src_configure() {
# non-pkgconfig checks # non-pkgconfig checks
ac_cv_lib_ldap_ldap_search=yes ac_cv_lib_ldap_ldap_search=yes
--without-secrets
--without-kcm --without-kcm
) )
fi fi
@ -241,6 +219,9 @@ multilib_src_compile() {
if multilib_is_native_abi; then if multilib_is_native_abi; then
default default
use doc && emake docs use doc && emake docs
if use man || use nls; then
emake update-po
fi
else else
emake libnss_sss.la pam_sss.la pam_sss_gss.la emake libnss_sss.la pam_sss.la pam_sss_gss.la
use locator && emake sssd_krb5_locator_plugin.la use locator && emake sssd_krb5_locator_plugin.la
@ -257,10 +238,10 @@ multilib_src_test() {
multilib_src_install() { multilib_src_install() {
if multilib_is_native_abi; then if multilib_is_native_abi; then
emake -j1 DESTDIR="${D}" install emake -j1 DESTDIR="${D}" "${_at_args[@]}" install
if use python; then if use python; then
python_fix_shebang "${ED}"
python_optimize python_optimize
python_fix_shebang "${ED}"
fi fi
else else
# easier than playing with automake... # easier than playing with automake...
@ -284,14 +265,15 @@ multilib_src_install() {
multilib_src_install_all() { multilib_src_install_all() {
einstalldocs einstalldocs
find "${ED}" -type f -name '*.la' -delete || die
insinto /etc/sssd insinto /etc/sssd
insopts -m600 insopts -m600
doins src/examples/sssd-example.conf doins "${S}"/src/examples/sssd-example.conf
insinto /etc/logrotate.d insinto /etc/logrotate.d
insopts -m644 insopts -m644
newins src/examples/logrotate sssd newins "${S}"/src/examples/logrotate sssd
newconfd "${FILESDIR}"/sssd.conf sssd newconfd "${FILESDIR}"/sssd.conf sssd
@ -312,12 +294,10 @@ multilib_src_install_all() {
fi fi
rm -r "${ED}"/run || die rm -r "${ED}"/run || die
find "${ED}" -type f -name '*.la' -delete || die
} }
pkg_postinst() { pkg_postinst() {
elog "You must set up sssd.conf (default installed into /etc/sssd)" elog "You must set up sssd.conf (default installed into /etc/sssd)"
elog "and (optionally) configuration in /etc/pam.d in order to use SSSD" elog "and (optionally) configuration in /etc/pam.d in order to use SSSD"
elog "features. Please see howto in https://sssd.io/docs/design_pages/smartcard_authentication_require.html" elog "features. Please see howto in https://sssd.io/docs/design_pages/smartcard_authentication_require.html"
optfeature "Kerberos keytab renew (see krb5_renew_interval)" app-crypt/adcli
} }

1
www-apps/gitea/Manifest Normal file
View File

@ -0,0 +1 @@
DIST gitea-1.12.1.tar.gz 135104234 BLAKE2B 36510e25e8c2cc1c718702a7cd0be74bbf5448beb33a90732599a4830b0899b37dfc9a58e3a8ffdb5037e93f185ba3b09a0ac7b8acd629c46b1982d6aeab1ec1 SHA512 6ba8a703272e611aac4c214cd818490a9615a9ab9b64ec22ec2c6331e865226324896f600218fb3b39cea7b6649456db7ff18e1857ece6964ab5d3c6d99c3aec

View File

@ -0,0 +1,13 @@
diff --git a/vendor/modules.txt b/vendor/modules.txt
index efbc866..1c34104 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
# mvdan.cc/xurls/v2 v2.1.0
## explicit
mvdan.cc/xurls/v2
+# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
+## explicit
# strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
## explicit
strk.kbt.io/projects/go/libravatar

View File

@ -0,0 +1,139 @@
#Patch to make gitea logging less verbose.
diff --git a/modules/log/flags.go b/modules/log/flags.go
index 992fc62dd..5578a1b6b 100644
--- a/modules/log/flags.go
+++ b/modules/log/flags.go
@@ -31,7 +31,7 @@ const (
Lmedfile = Lshortfile | Llongfile
// LstdFlags is the initial value for the standard logger
- LstdFlags = Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial
+ LstdFlags = Ldate | Ltime | Llevelinitial
)
var flagFromString = map[string]int{
#Just patching the tests to keep working with the patch above (avoid using LstdFlags)
diff --git a/modules/log/conn_test.go b/modules/log/conn_test.go
index cc3d758fa..295bee37f 100644
--- a/modules/log/conn_test.go
+++ b/modules/log/conn_test.go
@@ -40,7 +40,7 @@ func TestConnLogger(t *testing.T) {
prefix := "TestPrefix "
level := INFO
- flags := LstdFlags | LUTC | Lfuncname
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
logger := NewConn()
connLogger := logger.(*ConnLogger)
@@ -112,7 +112,7 @@ func TestConnLoggerCloseBeforeSend(t *testing.T) {
prefix := "TestPrefix "
level := INFO
- flags := LstdFlags | LUTC | Lfuncname
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
logger := NewConn()
@@ -126,7 +126,7 @@ func TestConnLoggerFailConnect(t *testing.T) {
prefix := "TestPrefix "
level := INFO
- flags := LstdFlags | LUTC | Lfuncname
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
logger := NewConn()
@@ -169,7 +169,7 @@ func TestConnLoggerClose(t *testing.T) {
prefix := "TestPrefix "
level := INFO
- flags := LstdFlags | LUTC | Lfuncname
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
logger := NewConn()
connLogger := logger.(*ConnLogger)
diff --git a/modules/log/console_test.go b/modules/log/console_test.go
index a028b5b87..e4fec760a 100644
--- a/modules/log/console_test.go
+++ b/modules/log/console_test.go
@@ -33,7 +33,7 @@ func TestConsoleLoggerMinimalConfig(t *testing.T) {
},
}
prefix := ""
- flags := LstdFlags
+ flags := LstdFlags
cw := NewConsoleLogger()
realCW := cw.(*ConsoleLogger)
@@ -64,7 +64,7 @@ func TestConsoleLogger(t *testing.T) {
}
prefix := "TestPrefix "
level := INFO
- flags := LstdFlags | LUTC | Lfuncname
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
cw := NewConsoleLogger()
realCW := cw.(*ConsoleLogger)
diff --git a/modules/log/file_test.go b/modules/log/file_test.go
index 38279315a..dc8d291ed 100644
--- a/modules/log/file_test.go
+++ b/modules/log/file_test.go
@@ -24,7 +24,7 @@ func TestFileLoggerFails(t *testing.T) {
prefix := "TestPrefix "
level := INFO
- flags := LstdFlags | LUTC | Lfuncname
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
//filename := filepath.Join(tmpDir, "test.log")
fileLogger := NewFileLogger()
@@ -52,7 +52,7 @@ func TestFileLogger(t *testing.T) {
prefix := "TestPrefix "
level := INFO
- flags := LstdFlags | LUTC | Lfuncname
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
filename := filepath.Join(tmpDir, "test.log")
fileLogger := NewFileLogger()
@@ -155,7 +155,7 @@ func TestCompressFileLogger(t *testing.T) {
prefix := "TestPrefix "
level := INFO
- flags := LstdFlags | LUTC | Lfuncname
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
filename := filepath.Join(tmpDir, "test.log")
fileLogger := NewFileLogger()
diff --git a/modules/log/smtp_test.go b/modules/log/smtp_test.go
index 216d55521..15075dd41 100644
--- a/modules/log/smtp_test.go
+++ b/modules/log/smtp_test.go
@@ -17,7 +17,7 @@ import (
func TestSMTPLogger(t *testing.T) {
prefix := "TestPrefix "
level := INFO
- flags := LstdFlags | LUTC | Lfuncname
+ flags := Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
username := "testuser"
password := "testpassword"
host := "testhost"
diff --git a/modules/log/writer_test.go b/modules/log/writer_test.go
index 886dd58fb..df2f6e698 100644
--- a/modules/log/writer_test.go
+++ b/modules/log/writer_test.go
@@ -41,7 +41,7 @@ func TestBaseLogger(t *testing.T) {
b := WriterLogger{
out: c,
Level: INFO,
- Flags: LstdFlags | LUTC,
+ Flags: Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC,
Prefix: prefix,
}
location, _ := time.LoadLocation("EST")

View File

@ -0,0 +1,14 @@
# Gitea configuration
GITEA_CONF="/etc/gitea/app.ini"
# Gitea user
GITEA_USER="git"
# Gitea group
GITEA_GROUP="git"
# Gitea working directory
GITEA_WORK_DIR="/var/lib/gitea"
# Gitea custom directory
GITEA_CUSTOM="${GITEA_WORK_DIR}/custom"

View File

@ -0,0 +1,22 @@
#!/sbin/openrc-run
# Copyright 2016-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
description="Gitea, a self-hosted Git service"
: ${GITEA_CONF:=/etc/gitea/app.ini}
: ${GITEA_USER:=git}
: ${GITEA_GROUP:=git}
: ${GITEA_WORK_DIR:=/var/lib/gitea}
: ${GITEA_CUSTOM:=${GITEA_WORK_DIR}/custom}
command="/usr/bin/gitea web"
command_args="--config ${GITEA_CONF}"
command_background="true"
command_user="${GITEA_USER}:${GITEA_GROUP}"
error_log="/var/log/${RC_SVCNAME}/${RC_SVCNAME}.err"
pidfile="/run/${RC_SVCNAME}.pid"
required_files="${GITEA_CONF}"
start_stop_daemon_args="-d ${GITEA_WORK_DIR}"
start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_WORK_DIR=${GITEA_WORK_DIR}"
start_stop_daemon_args="${start_stop_daemon_args} -e GITEA_CUSTOM=${GITEA_CUSTOM}"

View File

@ -0,0 +1,34 @@
[Unit]
Description=Gitea service
Documentation=https://docs.gitea.io/
AssertPathIsDirectory=/var/lib/gitea
AssertPathIsReadWrite=/var/lib/gitea
After=network.target
Requires=network.target
After=mysqld.service
After=postgresql-9.3.service
After=postgresql-9.4.service
After=postgresql-9.5.service
After=postgresql-9.6.service
After=postgresql-10.service
After=postgresql-11.service
After=postgresql-12.service
After=memcached.service
After=redis.service
[Service]
User=git
Group=git
Environment="GITEA_WORK_DIR=/var/lib/gitea" "GITEA_CUSTOM=/var/lib/gitea/custom"
WorkingDirectory=/var/lib/gitea
ExecStart=/usr/bin/gitea web --config /etc/gitea/app.ini
Restart=always
PrivateTmp=true
Nice=5
[Install]
WantedBy=multi-user.target

View File

@ -0,0 +1,126 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit fcaps go-module tmpfiles systemd
MY_PV="${PV/_rc/-rc}"
DESCRIPTION="A painless self-hosted Git service"
HOMEPAGE="https://gitea.io"
if [[ ${PV} != 9999* ]] ; then
SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64"
S="${WORKDIR}"
else
EGIT_REPO_URI="https://github.com/go-gitea/gitea"
inherit git-r3
S="${WORKDIR}/${P}"
fi
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
SLOT="0"
IUSE="+acct build-client pam sqlite"
BDEPEND="build-client? ( >=net-libs/nodejs-10[npm] )"
COMMON_DEPEND="
acct? (
acct-group/git
acct-user/git[gitea] )
pam? ( sys-libs/pam )"
DEPEND="${COMMON_DEPEND}"
RDEPEND="${COMMON_DEPEND}
dev-vcs/git"
DOCS=(
custom/conf/app.ini.sample CONTRIBUTING.md README.md
)
FILECAPS=(
cap_net_bind_service+ep usr/bin/gitea
)
PATCHES=(
"${FILESDIR}/1.12-fix-vendoring.patch"
)
src_prepare() {
default
local sedcmds=(
-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
-e "s#^MODE = console#MODE = file#"
-e "s#^LEVEL = Trace#LEVEL = Info#"
-e "s#^LOG_SQL = true#LOG_SQL = false#"
-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
-e "s#^APP_ID =#;APP_ID =#"
-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
)
sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
if use sqlite ; then
sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
fi
einfo "Remove tests which are known to fail with network-sandbox enabled."
rm ./modules/migrations/github_test.go || die
einfo "Remove tests which depend on gitea git-repo."
rm ./modules/git/blob_test.go || die
rm ./modules/git/repo_test.go || die
# Remove already build assets (like frontend part)
use build-client && emake clean-all
}
src_compile() {
local gitea_tags=(
bindata
$(usev pam)
$(usex sqlite 'sqlite sqlite_unlock_notify' '')
)
local gitea_settings=(
"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
)
local makeenv=(
TAGS="${gitea_tags[@]}"
LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
)
[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
if use build-client; then
# -j1 as Makefile doesn't handle dependancy correctly, and is not
# useful as golang compiler don't use this info.
env "${makeenv[@]}" emake -j1 build
else
env "${makeenv[@]}" emake backend
fi
}
src_install() {
dobin gitea
einstalldocs
newconfd "${FILESDIR}/gitea.confd-r1" gitea
newinitd "${FILESDIR}/gitea.initd-r3" gitea
newtmpfiles - gitea.conf <<-EOF
d /run/gitea 0755 git git
EOF
systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
insinto /etc/gitea
newins custom/conf/app.ini.sample app.ini
if use acct ; then
fowners root:git /etc/gitea/{,app.ini}
fperms g+w,o-rwx /etc/gitea/{,app.ini}
diropts -m0750 -o git -g git
keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
keepdir /var/log/gitea
fi
}

View File

@ -0,0 +1,12 @@
<?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">go-gitea/gitea</remote-id>
</upstream>
<use>
<flag name="acct">User and group management via acct-*/git packages</flag>
<flag name="build-client">Build the client code, instead of using a precompiled one</flag>
</use>
</pkgmetadata>