parent
801d02707d
commit
9a76def356
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST httpd-2.4.53.tar.bz2 7431942 BLAKE2B 44acd51a2c18ae66878d64922947f2f24f0ddf8a5fa70718f788572032e18dafd06888fed3cf559e63e2a9e69d9b0a8dcc79e11fc9d8f216b5b073f769494727 SHA512 07ef59594251a30a864cc9cc9a58ab788c2d006cef85b728f29533243927c63cb063e0867f2a306f37324c3adb9cf7dcb2402f3516b05c2c6f32469d475dd756
|
||||
DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
|
||||
|
@ -0,0 +1,104 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Useful Apache tools - htdigest, htpasswd, ab, htdbm"
|
||||
HOMEPAGE="https://httpd.apache.org/"
|
||||
SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc64-solaris ~x64-solaris"
|
||||
IUSE="ssl"
|
||||
RESTRICT="test"
|
||||
|
||||
RDEPEND=">=dev-libs/apr-1.5.0:1=
|
||||
dev-libs/apr-util:1=
|
||||
dev-libs/expat
|
||||
dev-libs/libpcre
|
||||
virtual/libcrypt:=
|
||||
kernel_linux? ( sys-apps/util-linux )
|
||||
ssl? ( dev-libs/openssl:0= )"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/libtool"
|
||||
BDEPEND="
|
||||
sys-apps/which
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S="${WORKDIR}/httpd-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.4.7-Makefile.patch" #459446
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# This package really should upgrade to using pcre's .pc file.
|
||||
cat <<-\EOF >"${T}"/pcre-config
|
||||
#!/bin/bash
|
||||
flags=()
|
||||
for flag; do
|
||||
if [[ ${flag} == "--version" ]]; then
|
||||
flags+=( --modversion )
|
||||
else
|
||||
flags+=( "${flag}" )
|
||||
fi
|
||||
done
|
||||
exec ${PKG_CONFIG} libpcre "${flags[@]}"
|
||||
EOF
|
||||
chmod a+x "${T}"/pcre-config || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# Brain dead check.
|
||||
tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
|
||||
|
||||
tc-export PKG_CONFIG
|
||||
|
||||
local myeconfargs=(
|
||||
--libexecdir="${EPREFIX}"/usr/$(get_libdir)/apache2/modules
|
||||
--sbindir="${EPREFIX}"/usr/sbin
|
||||
--with-z="${EPREFIX}"/usr
|
||||
--with-apr="${ESYSROOT}"/usr
|
||||
--with-apr-util="${ESYSROOT}"/usr
|
||||
--with-pcre="${T}"/pcre-config
|
||||
$(use_enable ssl)
|
||||
$(usex ssl '--with-ssl="${EPREFIX}"/usr' '')
|
||||
)
|
||||
# econf overwrites the stuff from config.layout.
|
||||
ac_cv_path_PKGCONFIG="${PKG_CONFIG}" \
|
||||
econf "${myeconfargs[@]}"
|
||||
sed -i \
|
||||
-e '/^LTFLAGS/s:--silent::' \
|
||||
build/rules.mk build/config_vars.mk || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C support
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -C support DESTDIR="${D}" install
|
||||
dodoc CHANGES
|
||||
doman docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \
|
||||
docs/man/{htcacheclean,rotatelogs}.8
|
||||
|
||||
# Providing compatiblity symlinks for #177697 (which we'll stop to install
|
||||
# at some point).
|
||||
pushd "${ED}"/usr/sbin >/dev/null || die
|
||||
local i
|
||||
for i in *; do
|
||||
dosym ${i} /usr/sbin/${i}2
|
||||
done
|
||||
popd >/dev/null || die
|
||||
|
||||
# Provide a symlink for ab-ssl
|
||||
if use ssl ; then
|
||||
dosym ab /usr/bin/ab-ssl
|
||||
dosym ab /usr/bin/ab2-ssl
|
||||
fi
|
||||
}
|
@ -1,5 +1,4 @@
|
||||
DIST aws-cli-1.24.10.gh.tar.gz 2219050 BLAKE2B 9655429a65c81b5c6436f0bafb293243d8f6d2160573902bbd3f2b10ab69ef24796ac0c1bd112000afc3d15cc4d8560fc95f774c38739cf8e2d3303a4512e3ec SHA512 592564ff501ff52572655973c518366928a20371333ccf4f7234d414070343a38287a8870a5652bbbe6a8c35c8cd8731439f1520c0988100ade22d842f11ad2d
|
||||
DIST aws-cli-1.24.5.gh.tar.gz 2215786 BLAKE2B db9077cfe3cf561109dea9ce1395f9d5bbe25b9dd28675e20d56c1fee3ad17e4befdce61cb81f217bb32d85b326ca4069f97482b9670f9653a850fd90fd135f7 SHA512 1cb4fcf37ccc6e7c3dfb211a9bc6687172f4052c6dae307e1a8451947078794973a3fd8382824ca2be650ee5b898b1f8d9bc27e2b403a2c51fea17b319bd366d
|
||||
DIST aws-cli-1.25.0.gh.tar.gz 2219640 BLAKE2B 009863c9df07d01e5ddd849565124657bcead4dfac8a921247a1bcd4196593c93441f91fa1e2b4ee1908e5fd59b6559da98fa887083f70f110804a0e252f2c25 SHA512 305e16ea51ad0f689232b06dcf1964e0479b3c529631364688afc41e6441fc28ae934cd9959de493ea5734dacb81e01af27305609d6d3919656f8a55bebd4eac
|
||||
DIST aws-cli-1.25.1.gh.tar.gz 2220206 BLAKE2B 574f0d3185911fdb72e15acb2922d15687bccb8551d7128618a7eba39ba5ed689591a1d3a51d75832834fc2511495cb84014bc733bbe49c997f8e92c2bd8dfde SHA512 f78cca5901fcf503ba4bfc3a403548878806f774677d5de1b86b7fcac97e020b3de7370ffb312db839130093319b1c0bf9e4aa9f5fb8f14da118957e2a71dd5e
|
||||
DIST aws-cli-1.25.2.gh.tar.gz 2220304 BLAKE2B 370137db21688db07a1367a1b82b906d5e7f16939fb9a10f8f8e60d986b68cd7cf3fcaca89baa097b351ce1552a9b35c143a5328972577cc08b2369a0ff35407 SHA512 4278be5b73865854a736ae447b729670310d557d019fe483376d8bb6317cc557f1567d8cbd77c4fc658d5593bdf8ddb2765696b144694c7df3d3447156ac14b0
|
||||
DIST aws-cli-1.25.3.gh.tar.gz 2221419 BLAKE2B ecc3e16985426b9b6cf6a6fc5cd3cf58d0641f57927ee533bfd5c63f1a02e7accf325f44f5f6e3289c7f0ce984be8f23428bf3d99dacc5a317b49fe2cfc2bb19 SHA512 a80088c8864d48c922734ab0d4f367d14b86470735dbb818640d0aaa2c957a30b1abcfbce441e33bccae388ce9df7869d0d7e82a519055c8aa192e2c74147f5e
|
||||
DIST aws-cli-1.25.4.gh.tar.gz 2222045 BLAKE2B 3d8496b997e80b9504c8810a256d6886a7dee239ed0eba74d42d23955d1596d5b7690a20ac31b8f57e004ff27889e8e204b335996d2f629e9ed11b3bfd033641 SHA512 e053529c9e5429e5782e6c3afe26c212599825c78691d8c58a4c5dcd373385c1111afb2f75e09b5c1831d30ce6c890db0e4888fa4d9d874a5fc68994a8c3c5fd
|
||||
|
@ -1,71 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
|
||||
inherit bash-completion-r1 distutils-r1 multiprocessing
|
||||
|
||||
MY_P=aws-cli-${PV}
|
||||
DESCRIPTION="Universal Command Line Environment for AWS"
|
||||
HOMEPAGE="
|
||||
https://github.com/aws/aws-cli/
|
||||
https://pypi.org/project/awscli/
|
||||
"
|
||||
SRC_URI="
|
||||
https://github.com/aws/aws-cli/archive/${PV}.tar.gz
|
||||
-> ${MY_P}.gh.tar.gz
|
||||
"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm64 x86"
|
||||
|
||||
# botocore is x.(y+2).z
|
||||
BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
|
||||
RDEPEND="
|
||||
>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
|
||||
dev-python/colorama[${PYTHON_USEDEP}]
|
||||
dev-python/docutils[${PYTHON_USEDEP}]
|
||||
dev-python/rsa[${PYTHON_USEDEP}]
|
||||
>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
"
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-python/pytest-forked[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-xdist[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_prepare() {
|
||||
# do not rely on bundled deps in botocore (sic!)
|
||||
find -name '*.py' -exec sed -i \
|
||||
-e 's:from botocore[.]vendored import:import:' \
|
||||
-e 's:from botocore[.]vendored[.]:from :' \
|
||||
{} + || die
|
||||
# strip overzealous upper bounds on requirements
|
||||
sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
python_test() {
|
||||
# integration tests require AWS credentials and Internet access
|
||||
epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
newbashcomp bin/aws_bash_completer aws
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins bin/aws_zsh_completer.sh _aws
|
||||
|
||||
distutils-r1_python_install_all
|
||||
|
||||
rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
|
||||
}
|
@ -1,5 +1,6 @@
|
||||
DIST consul-1.12.0-deps.tar.xz 252403904 BLAKE2B 742eaeaf4c24276de9b66d8d6b8f3b51d836d41b8466e7be23a00e3787132f8a0ffad7bf6e8c288797d8de52885ec4c72f43206022d6d4d2a1b89febd878531d SHA512 11087675a0d353c94576609986a7ddf777e8454e90161e35f80f1592ea3af48477684ec63d1ed870db71066a58c21977b7e9d58a5408c65fee213d64f152671a
|
||||
DIST consul-1.12.0.tar.gz 23969785 BLAKE2B 57a13905917bac77793be26fb5ac7e668233400e1f9c8eceace3463018cd8fee06b6f5a3753c8eeb250c276f8c95afd63b3b6ae1a7d847dc5adaa11880e52f53 SHA512 c83a5b9e68f46e5f458fb607f60d80fa7bc2dd46000c60bd9838fb03ea925ec5f0c0a4336f9052f70f805b41b4dd8fc872f5f6e883de5da29a87f5273507f31e
|
||||
DIST consul-1.12.1.tar.gz 24196810 BLAKE2B b82929de9228adaaf1bbf3a4269dd09e17b51f769d0bf040b86949dd8648e1f0b813e5cc5d5e9704b964ef5185074f58ac7347e049be6bc493cc96e4b977e22b SHA512 33925b20a81c7ab9873e5dfc24c26d14c86494c03de0a4030304bf4ac0169b59843337ef05f0564fa69de9dba08e350774e7ae62c6914769d8f0d4cb625e4910
|
||||
DIST consul-1.12.2.tar.gz 24195804 BLAKE2B 550b5bc4977c9181a097f699ad5da88a81571327707b448bc659d7c8f2d92a8c82f6c1b0f13448fee25c89d08cc3771dd4fb78a4cf58d640442df38e86639cfa SHA512 91da8b1fecbd5db4c0deae1cec4b5265a26c11739633be74f6e2dd2027ab9ba5da10ba33b1b844531a59b63e4117ec57af87d55512d1098033e99f88e2e3aabc
|
||||
DIST consul-1.9.17-deps.tar.xz 214799320 BLAKE2B c9fe5511156d50d4155ed6050186af894b7efc29e2f311ff542f79d298769b2dc55ee1bba12ca5ba5b81eddb6959a1d7a5e55aeb533827d5e924d3a72853a418 SHA512 be9f417e721372b8eaffe8b908f1ca1d1299c897f032cfb8b7ea8b62f7c2689011c5079a450fb5eed2e4e5454f0ad6a5e3859c91bd67166193334d100968f093
|
||||
DIST consul-1.9.17.tar.gz 29480703 BLAKE2B c233eab63ea515f886234395100e47910c1acdefa0b29af5bbc96d6c078dae41e0cd4150e1f6f17daac972b3e66d3abe43b594a0c37bff790e43f0f3c0a20da2 SHA512 c859fbede7294884befd0c70469febed5a4269b21cb351f8619d13e3b29f9b8bdd8d18e9611ef34908fc54bd38f2fd0bbc6e96d4e08ab23da952c3db537fb92c
|
||||
|
@ -0,0 +1,51 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit go-module systemd
|
||||
|
||||
DESCRIPTION="A tool for service discovery, monitoring and configuration"
|
||||
HOMEPAGE="https://www.consul.io"
|
||||
GIT_COMMIT="19041f202c952a25c5d612a3664e1bdac3c91129"
|
||||
|
||||
SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~zmedico/dist/consul-1.12.0-deps.tar.xz"
|
||||
|
||||
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
|
||||
RESTRICT+=" test"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
BDEPEND="dev-go/gox"
|
||||
COMMON_DEPEND="
|
||||
acct-group/consul
|
||||
acct-user/consul"
|
||||
DEPEND="${COMMON_DEPEND}"
|
||||
RDEPEND="${COMMON_DEPEND}"
|
||||
|
||||
src_compile() {
|
||||
# The dev target sets causes build.sh to set appropriate XC_OS
|
||||
# and XC_ARCH, and skips generation of an unused zip file,
|
||||
# avoiding a dependency on app-arch/zip.
|
||||
GIT_DESCRIBE="v${PV}" \
|
||||
GIT_DIRTY="" \
|
||||
GIT_COMMIT="${GIT_COMMIT}" \
|
||||
emake dev-build
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/consul
|
||||
|
||||
keepdir /etc/consul.d
|
||||
insinto /etc/consul.d
|
||||
doins "${FILESDIR}/"*.json.example
|
||||
|
||||
keepdir /var/log/consul
|
||||
fowners consul:consul /var/log/consul
|
||||
|
||||
newinitd "${FILESDIR}/consul.initd" "${PN}"
|
||||
newconfd "${FILESDIR}/consul.confd" "${PN}"
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/${PN}.logrotated" "${PN}"
|
||||
systemd_dounit "${FILESDIR}/consul.service"
|
||||
}
|
@ -1,2 +1,3 @@
|
||||
DIST doctl-1.57.0.tar.gz 5195498 BLAKE2B 17273e9f8f63464aa2ba6c6d48dfabd78b0bdeb7156dc315d1970fb0052710c7a4b37f1d5e2a7a60211f2ab166c0926de438959d853639a8c329ec39b3ee0577 SHA512 0c868c5732a48367a93bf2b884689dbd917ba6690c82516495862546bc31d58d44aab192bd3b3543f951e9fa9b7289e99fbdf828c017af68496b84f1585a5f6b
|
||||
DIST doctl-1.68.0.tar.gz 5514572 BLAKE2B e44be00e1b7451e84d3d6dc5a19dc04fcb5dab2c8a5c1923c0c0f99058a1938f9567d63681989e869341957586cdf549842cd45ca82503007039ae989664e8ff SHA512 d81799c227c071793af74f78e54d8348782caf158b28e0a12b92adf17b6c78c787a82abbdf3aa340a960f26c929b00f38015725e6e629aad7615096270d19c10
|
||||
DIST doctl-1.76.2.tar.gz 5648377 BLAKE2B 1ec89adb5ad187ccc6b66d077dda57ca4065bc1a5981a0f2549913532f6bcc6d1f48c3cc56c100c1b6c55f698ffcf3f2c639888ccaab30948384ce800181b332 SHA512 d7efc587843cd87f3ac17b974858ea688377ca6f0cd3d4b7430c47a1e8b825cc05f4d9107d7062f5e52fe3c267ec6bbd19a8b1d773a15f1d7ab653087ce13bba
|
||||
|
@ -0,0 +1,42 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit edo bash-completion-r1 go-module
|
||||
|
||||
DESCRIPTION="A command line tool for DigitalOcean services"
|
||||
HOMEPAGE="https://github.com/digitalocean/doctl"
|
||||
SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
src_compile() {
|
||||
LDFLAGS="-X github.com/digitalocean/doctl.Major=$(ver_cut 1)
|
||||
-X github.com/digitalocean/doctl.Minor=$(ver_cut 2)
|
||||
-X github.com/digitalocean/doctl.Patch=$(ver_cut 3-)
|
||||
-X github.com/digitalocean/doctl.Label=release"
|
||||
GOFLAGS="-v -x -mod=vendor" ego build -ldflags "${LDFLAGS}" ./cmd/...
|
||||
|
||||
local completion
|
||||
for completion in bash zsh fish ; do
|
||||
edo ./doctl completion ${completion} > doctl.${completion} || die "completion for ${completion} failed"
|
||||
done
|
||||
}
|
||||
|
||||
src_test() {
|
||||
GOFLAGS="-v -x -mod=vendor" ego test -work ./do/... ./pkg/... .
|
||||
}
|
||||
|
||||
src_install() {
|
||||
einstalldocs
|
||||
dobin doctl
|
||||
|
||||
newbashcomp doctl.bash doctl
|
||||
insinto /usr/share/zsh/site-functions
|
||||
newins doctl.zsh _doctl
|
||||
insinto /usr/share/fish/completion
|
||||
newins doctl.fish doctl
|
||||
}
|
@ -0,0 +1,147 @@
|
||||
https://bugs.gentoo.org/847382#c3
|
||||
https://github.com/logrotate/logrotate/commit/31cf1099ab8514dfcae5a980bc77352edd5292f8
|
||||
https://github.com/logrotate/logrotate/commit/7b1fa328bf70eb8434166f151bd075cd1440d0dc
|
||||
|
||||
From 31cf1099ab8514dfcae5a980bc77352edd5292f8 Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Fri, 27 May 2022 09:56:07 +0200
|
||||
Subject: [PATCH] lockState: do not print `error:` when exit code is unaffected
|
||||
|
||||
Closes: https://github.com/logrotate/logrotate/pull/448
|
||||
--- a/logrotate.c
|
||||
+++ b/logrotate.c
|
||||
@@ -3050,8 +3050,8 @@ static int lockState(const char *stateFilename, int skip_state_lock)
|
||||
}
|
||||
|
||||
if (sb.st_mode & S_IROTH) {
|
||||
- message(MESS_ERROR, "state file %s is world-readable and thus can"
|
||||
- " be locked from other unprivileged users."
|
||||
+ message(MESS_NORMAL, "warning: state file %s is world-readable"
|
||||
+ " and thus can be locked from other unprivileged users."
|
||||
" Skipping lock acquisition...\n",
|
||||
stateFilename);
|
||||
close(lockFd);
|
||||
|
||||
From 7b1fa328bf70eb8434166f151bd075cd1440d0dc Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Dudka <kdudka@redhat.com>
|
||||
Date: Fri, 27 May 2022 16:02:57 +0200
|
||||
Subject: [PATCH] log: unify handling of log levels
|
||||
|
||||
Use MESS_WARN instead of MESS_NORMAL and make it always use
|
||||
the `warning:` prefix. MESS_WARN is now mapped to LOG_WARNING
|
||||
for syslog.
|
||||
|
||||
Also drop MESS_VERBOSE, which was not set anywhere.
|
||||
|
||||
Closes: https://github.com/logrotate/logrotate/pull/239
|
||||
Closes: https://github.com/logrotate/logrotate/pull/449
|
||||
--- a/config.c
|
||||
+++ b/config.c
|
||||
@@ -643,7 +643,7 @@ static void set_criterium(enum criterium *pDst, enum criterium src, int *pSet)
|
||||
{
|
||||
if (*pSet && (*pDst != src)) {
|
||||
/* we are overriding a previously set criterium */
|
||||
- message(MESS_VERBOSE, "warning: '%s' overrides previously specified '%s'\n",
|
||||
+ message(MESS_DEBUG, "note: '%s' overrides previously specified '%s'\n",
|
||||
crit_to_string(src), crit_to_string(*pDst));
|
||||
}
|
||||
*pDst = src;
|
||||
@@ -1021,7 +1021,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
||||
|
||||
if (getuid() == ROOT_UID) {
|
||||
if ((sb_config.st_mode & 07533) != 0400) {
|
||||
- message(MESS_NORMAL,
|
||||
+ message(MESS_WARN,
|
||||
"Potentially dangerous mode on %s: 0%o\n",
|
||||
configFile, (unsigned) (sb_config.st_mode & 07777));
|
||||
}
|
||||
@@ -1386,7 +1386,7 @@ static int readConfigFile(const char *configFile, struct logInfo *defConfig)
|
||||
RAISE_ERROR();
|
||||
}
|
||||
} else if (!strcmp(key, "errors")) {
|
||||
- message(MESS_NORMAL,
|
||||
+ message(MESS_WARN,
|
||||
"%s: %d: the errors directive is deprecated and no longer used.\n",
|
||||
configFile, lineNum);
|
||||
} else if (!strcmp(key, "mail")) {
|
||||
--- a/log.c
|
||||
+++ b/log.c
|
||||
@@ -40,9 +40,12 @@ static void log_once(FILE *where, int level, const char *format, va_list args)
|
||||
{
|
||||
switch (level) {
|
||||
case MESS_DEBUG:
|
||||
- case MESS_NORMAL:
|
||||
- case MESS_VERBOSE:
|
||||
break;
|
||||
+
|
||||
+ case MESS_WARN:
|
||||
+ fprintf(where, "warning: ");
|
||||
+ break;
|
||||
+
|
||||
default:
|
||||
fprintf(where, "error: ");
|
||||
break;
|
||||
@@ -78,10 +81,11 @@ void message(int level, const char *format, ...)
|
||||
priority |= LOG_DEBUG;
|
||||
break;
|
||||
case MESS_DEBUG:
|
||||
- case MESS_VERBOSE:
|
||||
- case MESS_NORMAL:
|
||||
priority |= LOG_INFO;
|
||||
break;
|
||||
+ case MESS_WARN:
|
||||
+ priority |= LOG_WARNING;
|
||||
+ break;
|
||||
case MESS_ERROR:
|
||||
priority |= LOG_ERR;
|
||||
break;
|
||||
--- a/log.h
|
||||
+++ b/log.h
|
||||
@@ -5,8 +5,7 @@
|
||||
|
||||
#define MESS_REALDEBUG 1
|
||||
#define MESS_DEBUG 2
|
||||
-#define MESS_VERBOSE 3
|
||||
-#define MESS_NORMAL 4
|
||||
+#define MESS_WARN 4
|
||||
#define MESS_ERROR 5
|
||||
#define MESS_FATAL 6
|
||||
|
||||
--- a/logrotate.c
|
||||
+++ b/logrotate.c
|
||||
@@ -3050,7 +3050,7 @@ static int lockState(const char *stateFilename, int skip_state_lock)
|
||||
}
|
||||
|
||||
if (sb.st_mode & S_IROTH) {
|
||||
- message(MESS_NORMAL, "warning: state file %s is world-readable"
|
||||
+ message(MESS_WARN, "state file %s is world-readable"
|
||||
" and thus can be locked from other unprivileged users."
|
||||
" Skipping lock acquisition...\n",
|
||||
stateFilename);
|
||||
@@ -3106,7 +3106,7 @@ int main(int argc, const char **argv)
|
||||
POPT_AUTOHELP { NULL, 0, 0, NULL, 0, NULL, NULL }
|
||||
};
|
||||
|
||||
- logSetLevel(MESS_NORMAL);
|
||||
+ logSetLevel(MESS_WARN);
|
||||
setlocale (LC_ALL, "");
|
||||
|
||||
optCon = poptGetContext("logrotate", argc, argv, options, 0);
|
||||
@@ -3117,7 +3117,7 @@ int main(int argc, const char **argv)
|
||||
switch (arg) {
|
||||
case 'd':
|
||||
debug = 1;
|
||||
- message(MESS_NORMAL, "WARNING: logrotate in debug mode does nothing"
|
||||
+ message(MESS_WARN, "logrotate in debug mode does nothing"
|
||||
" except printing debug messages! Consider using verbose"
|
||||
" mode (-v) instead if this is not what you want.\n\n");
|
||||
/* fallthrough */
|
||||
--- a/test/test-0080.sh
|
||||
+++ b/test/test-0080.sh
|
||||
@@ -10,4 +10,4 @@ cleanup 80
|
||||
preptest test.log 80 1 0
|
||||
|
||||
$RLR -d test-config.80 2>&1 | \
|
||||
- grep -q "warning: 'daily' overrides previously specified 'size'"
|
||||
+ grep -q "note: 'daily' overrides previously specified 'size'"
|
||||
|
@ -0,0 +1,96 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/kamildudka.asc
|
||||
inherit systemd tmpfiles verify-sig
|
||||
|
||||
DESCRIPTION="Rotates, compresses, and mails system logs"
|
||||
HOMEPAGE="https://github.com/logrotate/logrotate"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
|
||||
SRC_URI+=" verify-sig? ( https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz.asc )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
|
||||
IUSE="acl +cron selinux"
|
||||
|
||||
DEPEND=">=dev-libs/popt-1.5
|
||||
selinux? ( sys-libs/libselinux )
|
||||
acl? ( virtual/acl )"
|
||||
RDEPEND="${DEPEND}
|
||||
selinux? ( sec-policy/selinux-logrotate )
|
||||
cron? ( virtual/cron )"
|
||||
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-kamildudka )"
|
||||
|
||||
STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status"
|
||||
OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.15.0-ignore-hidden.patch
|
||||
"${FILESDIR}"/${P}-log-changes.patch
|
||||
)
|
||||
|
||||
move_old_state_file() {
|
||||
elog "logrotate state file is now located at ${STATEFILE}"
|
||||
elog "See bug #357275"
|
||||
if [[ -e "${OLDSTATEFILE}" ]] ; then
|
||||
elog "Moving your current state file to new location: ${STATEFILE}"
|
||||
mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
|
||||
fi
|
||||
}
|
||||
|
||||
install_cron_file() {
|
||||
exeinto /etc/cron.daily
|
||||
newexe "${S}"/examples/logrotate.cron "${PN}"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_with acl) \
|
||||
$(use_with selinux) \
|
||||
--with-state-file-path="${STATEFILE}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin logrotate
|
||||
doman logrotate.8
|
||||
dodoc ChangeLog.md
|
||||
|
||||
insinto /etc
|
||||
doins "${FILESDIR}"/logrotate.conf
|
||||
|
||||
use cron && install_cron_file
|
||||
|
||||
systemd_dounit examples/logrotate.{service,timer}
|
||||
newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
|
||||
|
||||
keepdir /etc/logrotate.d
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "The ${PN} binary is now installed under /usr/bin. Please"
|
||||
elog "update your links"
|
||||
elog
|
||||
|
||||
move_old_state_file
|
||||
|
||||
tmpfiles_process ${PN}.conf
|
||||
|
||||
if [[ -z ${REPLACING_VERSIONS} ]] ; then
|
||||
elog "If you wish to have logrotate e-mail you updates, please"
|
||||
elog "emerge virtual/mailx and configure logrotate in"
|
||||
elog "/etc/logrotate.conf appropriately"
|
||||
elog
|
||||
elog "Additionally, /etc/logrotate.conf may need to be modified"
|
||||
elog "for your particular needs. See man logrotate for details."
|
||||
fi
|
||||
}
|
@ -1,43 +1,59 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<use>
|
||||
<flag name="clickhouse">Build the ClickHouse output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
|
||||
<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
|
||||
<flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag>
|
||||
<flag name="imhttp">Build the http input module (requires <pkg>www-servers/civetweb</pkg>)</flag>
|
||||
<flag name="impcap">Build the pcap input module (requires <pkg>net-libs/libpcap</pkg>)</flag>
|
||||
<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
|
||||
<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
|
||||
<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
|
||||
<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/mongo-c-driver</pkg>)</flag>
|
||||
<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag>
|
||||
<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
|
||||
<flag name="omhttp">Build the http output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
|
||||
<flag name="openssl">Build the OpenSSL network stream driver (requires <pkg>dev-libs/openssl</pkg>)</flag>
|
||||
<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag>
|
||||
<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
|
||||
<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
|
||||
<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
|
||||
<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
|
||||
<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag>
|
||||
<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
|
||||
<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
|
||||
<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
|
||||
<flag name="uuid">Include UUIDs in messages (requires <pkg>sys-apps/util-linux</pkg>)</flag>
|
||||
<flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag>
|
||||
<flag name="xxhash">Enable xxHash support in fmhash module (requires <pkg>dev-libs/xxhash</pkg>)</flag>
|
||||
<flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<bugs-to>https://github.com/rsyslog/rsyslog/issues</bugs-to>
|
||||
<remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
|
||||
</upstream>
|
||||
<maintainer type="person">
|
||||
<email>xgqt@gentoo.org</email>
|
||||
<name>Maciej Barć</name>
|
||||
</maintainer>
|
||||
<longdescription>
|
||||
Rsyslog is a rocket-fast system for log processing. It offers
|
||||
high-performance, great security features and a modular design. While it
|
||||
started as a regular syslogd, rsyslog has evolved into a kind of swiss army
|
||||
knife of logging, being able to accept inputs from a wide variety of
|
||||
sources, transform them, and output to the results to diverse destinations.
|
||||
Rsyslog can deliver over one million messages per second to local
|
||||
destinations when limited processing is applied (based on v7, December
|
||||
2013). Even with remote destinations and more elaborate processing the
|
||||
performance is usually considered "stunning".
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="clickhouse">Build the ClickHouse output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="curl">Enable http_request() function in RainerScript (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="dbi">Build the general database output module (requires <pkg>dev-db/libdbi</pkg>)</flag>
|
||||
<flag name="elasticsearch">Build the Elasticsearch output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
|
||||
<flag name="gnutls">Build the GnuTLS network stream driver (requires <pkg>net-libs/gnutls</pkg>)</flag>
|
||||
<flag name="imhttp">Build the http input module (requires <pkg>www-servers/civetweb</pkg>)</flag>
|
||||
<flag name="impcap">Build the pcap input module (requires <pkg>net-libs/libpcap</pkg>)</flag>
|
||||
<flag name="kafka">Build the Apache Kafka input/output module (requires <pkg>dev-libs/librdkafka</pkg>)</flag>
|
||||
<flag name="kerberos">Build the GSSAPI input and output module (requires <pkg>virtual/krb5</pkg>)</flag>
|
||||
<flag name="kubernetes">Build the kubernetes modify plugin (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="mdblookup">Build the MaxMind DB lookup message modify plugin using <pkg>dev-libs/libmaxminddb</pkg></flag>
|
||||
<flag name="mongodb">Build the MongoDB output module (requires <pkg>dev-libs/mongo-c-driver</pkg>)</flag>
|
||||
<flag name="mysql">Build the MySQL database output module (requires <pkg>virtual/mysql</pkg>)</flag>
|
||||
<flag name="normalize">Build the normalize modify module (requires <pkg>dev-libs/libee</pkg> and <pkg>dev-libs/liblognorm</pkg>)</flag>
|
||||
<flag name="omhttp">Build the http output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="omhttpfs">Build the httpfs output module (requires <pkg>net-misc/curl</pkg>)</flag>
|
||||
<flag name="omudpspoof">Build the udpspoof output module (requires <pkg>net-libs/libnet</pkg>)</flag>
|
||||
<flag name="openssl">Build the OpenSSL network stream driver (requires <pkg>dev-libs/openssl</pkg>)</flag>
|
||||
<flag name="postgres">Build the PostgreSQL database output module (requires <pkg>dev-db/postgresql</pkg>)</flag>
|
||||
<flag name="rabbitmq">Build the RabbitMQ output module (requires <pkg>net-libs/rabbitmq-c</pkg>)</flag>
|
||||
<flag name="redis">Build the Redis output module using (requires <pkg>dev-libs/hiredis</pkg>)</flag>
|
||||
<flag name="relp">Build the Reliable Event Logging Protocol (RELP) output module (requires <pkg>dev-libs/librelp</pkg>)</flag>
|
||||
<flag name="rfc3195">Build the rfc3195 input module (requires <pkg>dev-libs/liblogging</pkg>)</flag>
|
||||
<flag name="rfc5424hmac">Build the rfc5424hmac modify module (requires <pkg>dev-libs/openssl</pkg>)</flag>
|
||||
<flag name="snmp">Build the snmp modify and output module (requires <pkg>net-analyzer/net-snmp</pkg>)</flag>
|
||||
<flag name="ssl">Add support for encrypted client/server communication (requires <pkg>net-libs/gnutls</pkg>)</flag>
|
||||
<flag name="systemd">Build the journal input and output module (requires <pkg>sys-apps/systemd</pkg>)</flag>
|
||||
<flag name="uuid">Include UUIDs in messages (requires <pkg>sys-apps/util-linux</pkg>)</flag>
|
||||
<flag name="usertools">Installs the user tools (rsgtutil, rscryutil...) corresponding to the set USE flags</flag>
|
||||
<flag name="xxhash">Enable xxHash support in fmhash module (requires <pkg>dev-libs/xxhash</pkg>)</flag>
|
||||
<flag name="zeromq">Build the ZeroMQ input and output modules (requires <pkg>net-libs/czmq</pkg>)</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<bugs-to>https://github.com/rsyslog/rsyslog/issues/</bugs-to>
|
||||
<remote-id type="cpe">cpe:/a:rsyslog:rsyslog</remote-id>
|
||||
<remote-id type="github">rsyslog/rsyslog</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
@ -1,4 +1,6 @@
|
||||
DIST sudo-1.9.10.tar.gz 4516568 BLAKE2B 94d97379e31b41917616a829cbece3d3fce7dd6ab9d04791b928981c14249c306508298655c19dc59a054ccf7deed4e69e65367cbfe9f6d8b5aba8895cfa6064 SHA512 65cf92b67b64413cb807da8b9602fc90b75e5b30dd1402d682ca36f276a3d6209a8a59c14e463898abc9856bc56263e5ba4bb6d44774f56a2885a9eea4a35375
|
||||
DIST sudo-1.9.10.tar.gz.sig 566 BLAKE2B 808919c826faa4f63efc283461f9f2089fd745aaf7462bcc41c505e7f978e7d56307202f96548d95844c99236fec10cada8438b935a1e1b6ea3601ee857d6900 SHA512 4ea0b736783b8e7be47645f770d7684d99c31f901177d3527f1ff78f5126d41592a94d36c67762bf5cb941eed80b9f585637aaa81d7f4920576d31a83f447323
|
||||
DIST sudo-1.9.11.tar.gz 4822882 BLAKE2B 5b6b0345d923935c022705b2f65d2b27f4b9fa332dd4cb386584cf3388571c23a52a689565822306cf6f801d49c23117f6df2c30f1875ead2c8d3d42d5d86f0d SHA512 ed6f04f8f6dedeb837720524ca7e6137ca62977f739cf78e10f9502855be8af07b76a4ece422d4d7dcc0d34949606f9805bd5ebd623bfa25bfa89e19c45cacbd
|
||||
DIST sudo-1.9.11.tar.gz.sig 566 BLAKE2B 495058445cfbad7bf1db4f8a4fb2efe8d0549fdb2a0d35938ea986576fd39e4cf47a28e55819e937b9f4a3dddf556cb9eeb4ff03feddd60fd89c7c37e9254d28 SHA512 35d608c031816dfec5251e2dd1ed3ea2bc979db77f65803b7fa879429241188c79769fb32b58909f3dd39838cb27bf8266a5f518590bbaf5b16113bfc93025c3
|
||||
DIST sudo-1.9.8p2.tar.gz 4302256 BLAKE2B ba40df539b3466bebe0d876ef4f1809867125e83983609eae0447f933fbd499b2eda88d2f6c475779654e68af9580a2998eca3c3f7953129ff73c923e1c88ad9 SHA512 899b252e8c219226f658dff3dd34c97b07d42004998b45175b4c0c4de42a6bf9f909598e99b4056fa1171e63378e203854b0f8608b0f5c1b00e9d3677818f6d3
|
||||
DIST sudo-1.9.8p2.tar.gz.sig 566 BLAKE2B 1e1cf69ea391602a214aef253a19fff2e26a908ffd9f5e54f2eeb20245f9518fde7d8417e7160b33d1067916fc7cd3df0b59e626d54d24dc8c6453a0efa95200 SHA512 18a7170a4654ff22b23181f589ae2115acd2d635d94977586aa15093bb5144f947584588ae03fc2dd941fb934fac4d9fa689b3fd5a4ef0295156e5b9772b8126
|
||||
|
@ -0,0 +1,23 @@
|
||||
https://github.com/sudo-project/sudo/commit/d549adf04bfde7936306203e2e8886ffd93d00ea
|
||||
https://bugs.gentoo.org/850454
|
||||
|
||||
From: Pierre Bourdon <delroth@gmail.com>
|
||||
Date: Tue, 7 Jun 2022 17:14:39 +0200
|
||||
Subject: [PATCH] exec_ptrace: fix missing sudo_pt_regs on aarch64
|
||||
|
||||
AArch64 already had an existing "user_pt_regs" struct and didn't need a
|
||||
struct alias before the renaming to "sudo_pt_regs". Make the code build
|
||||
again by adding the now missing alias.
|
||||
|
||||
Fixes: 2eb8ff17
|
||||
--- a/src/exec_ptrace.h
|
||||
+++ b/src/exec_ptrace.h
|
||||
@@ -76,6 +76,7 @@
|
||||
# define reg_arg4(x) (x).r10
|
||||
#elif defined(__aarch64__)
|
||||
# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_AARCH64
|
||||
+# define sudo_pt_regs struct user_pt_regs
|
||||
# define reg_syscall(x) (x).regs[8] /* w8 */
|
||||
# define reg_retval(x) (x).regs[0] /* x0 */
|
||||
# define reg_sp(x) (x).sp /* sp */
|
||||
|
@ -0,0 +1,274 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit pam libtool tmpfiles toolchain-funcs
|
||||
|
||||
MY_P="${P/_/}"
|
||||
MY_P="${MY_P/beta/b}"
|
||||
|
||||
DESCRIPTION="Allows users or groups to run commands as other users"
|
||||
HOMEPAGE="https://www.sudo.ws/"
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
inherit mercurial
|
||||
EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
|
||||
else
|
||||
inherit verify-sig
|
||||
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/sudo.ws.asc
|
||||
BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
|
||||
|
||||
uri_prefix=
|
||||
case ${P} in
|
||||
*_beta*|*_rc*) uri_prefix=beta/ ;;
|
||||
esac
|
||||
|
||||
SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
|
||||
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz
|
||||
verify-sig? (
|
||||
https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig
|
||||
ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig
|
||||
)"
|
||||
if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Basic license is ISC-style as-is, some files are released under
|
||||
# 3-clause BSD license
|
||||
LICENSE="ISC BSD"
|
||||
SLOT="0"
|
||||
IUSE="gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
|
||||
|
||||
DEPEND="
|
||||
sys-libs/zlib:=
|
||||
virtual/libcrypt:=
|
||||
gcrypt? ( dev-libs/libgcrypt:= )
|
||||
ldap? (
|
||||
>=net-nds/openldap-2.1.30-r1:=
|
||||
sasl? (
|
||||
dev-libs/cyrus-sasl
|
||||
net-nds/openldap:=[sasl]
|
||||
)
|
||||
)
|
||||
pam? ( sys-libs/pam )
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
skey? ( >=sys-auth/skey-1.1.5-r1 )
|
||||
ssl? ( dev-libs/openssl:0= )
|
||||
sssd? ( sys-auth/sssd[sudo] )
|
||||
"
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
>=app-misc/editor-wrapper-3
|
||||
virtual/editor
|
||||
ldap? ( dev-lang/perl )
|
||||
pam? ( sys-auth/pambase )
|
||||
selinux? ( sec-policy/selinux-sudo )
|
||||
sendmail? ( virtual/mta )
|
||||
"
|
||||
BDEPEND+="
|
||||
sys-devel/bison
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
REQUIRED_USE="
|
||||
?? ( pam skey )
|
||||
?? ( gcrypt ssl )
|
||||
"
|
||||
|
||||
MAKEOPTS+=" SAMPLES="
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-fix-arm64-build.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
elibtoolize
|
||||
}
|
||||
|
||||
set_secure_path() {
|
||||
# first extract the default ROOTPATH from build env
|
||||
SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
|
||||
echo "${ROOTPATH}")
|
||||
case "${SECURE_PATH}" in
|
||||
*/usr/sbin*) ;;
|
||||
*) SECURE_PATH=$(unset PATH;
|
||||
. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
|
||||
;;
|
||||
esac
|
||||
if [[ -z ${SECURE_PATH} ]] ; then
|
||||
ewarn " Failed to detect SECURE_PATH, please report this"
|
||||
fi
|
||||
|
||||
# then remove duplicate path entries
|
||||
cleanpath() {
|
||||
local newpath thisp IFS=:
|
||||
for thisp in $1 ; do
|
||||
if [[ :${newpath}: != *:${thisp}:* ]] ; then
|
||||
newpath+=:${thisp}
|
||||
else
|
||||
einfo " Duplicate entry ${thisp} removed..."
|
||||
fi
|
||||
done
|
||||
SECURE_PATH=${newpath#:}
|
||||
}
|
||||
cleanpath /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
|
||||
|
||||
# finally, strip gcc paths #136027
|
||||
rmpath() {
|
||||
local e newpath thisp IFS=:
|
||||
for thisp in ${SECURE_PATH} ; do
|
||||
for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
|
||||
newpath+=:${thisp}
|
||||
done
|
||||
SECURE_PATH=${newpath#:}
|
||||
}
|
||||
rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local SECURE_PATH
|
||||
set_secure_path
|
||||
tc-export PKG_CONFIG #767712
|
||||
|
||||
# audit: somebody got to explain me how I can test this before I
|
||||
# enable it.. - Diego
|
||||
# plugindir: autoconf code is crappy and does not delay evaluation
|
||||
# until `make` time, so we have to use a full path here rather than
|
||||
# basing off other values.
|
||||
myeconfargs=(
|
||||
# We set all of the relevant options by ourselves (patched
|
||||
# into the toolchain) and setting these in the build system
|
||||
# actually causes a downgrade when using e.g. -D_FORTIFY_SOURCE=3
|
||||
# (it'll downgrade to =2). So, this has no functional effect on
|
||||
# the hardening for users. It's safe.
|
||||
--disable-hardening
|
||||
|
||||
# requires some python eclass
|
||||
--disable-python
|
||||
--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
|
||||
--enable-zlib=system
|
||||
--with-editor="${EPREFIX}"/usr/libexec/editor
|
||||
--with-env-editor
|
||||
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
|
||||
--with-rundir="${EPREFIX}"/run/sudo
|
||||
--with-vardir="${EPREFIX}"/var/db/sudo
|
||||
--without-linux-audit
|
||||
--without-opie
|
||||
$(use_enable gcrypt)
|
||||
$(use_enable nls)
|
||||
$(use_enable sasl)
|
||||
$(use_enable ssl openssl)
|
||||
$(use_with ldap)
|
||||
$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
|
||||
$(use_with offensive insults)
|
||||
$(use_with offensive all-insults)
|
||||
$(use_with pam)
|
||||
$(use_with pam pam-login)
|
||||
$(use_with secure-path secure-path "${SECURE_PATH}")
|
||||
$(use_with selinux)
|
||||
$(use_with sendmail)
|
||||
$(use_with skey)
|
||||
$(use_with sssd)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use ldap ; then
|
||||
dodoc README.LDAP.md
|
||||
|
||||
cat <<-EOF > "${T}"/ldap.conf.sudo
|
||||
# See ldap.conf(5) and README.LDAP.md for details
|
||||
# This file should only be readable by root
|
||||
|
||||
# supported directives: host, port, ssl, ldap_version
|
||||
# uri, binddn, bindpw, sudoers_base, sudoers_debug
|
||||
# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
|
||||
EOF
|
||||
|
||||
if use sasl ; then
|
||||
cat <<-EOF >> "${T}"/ldap.conf.sudo
|
||||
|
||||
# SASL directives: use_sasl, sasl_mech, sasl_auth_id
|
||||
# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
|
||||
EOF
|
||||
fi
|
||||
|
||||
insinto /etc
|
||||
doins "${T}"/ldap.conf.sudo
|
||||
fperms 0440 /etc/ldap.conf.sudo
|
||||
|
||||
insinto /etc/openldap/schema
|
||||
newins docs/schema.OpenLDAP sudo.schema
|
||||
fi
|
||||
|
||||
if use pam; then
|
||||
pamd_mimic system-auth sudo auth account session
|
||||
pamd_mimic system-auth sudo-i auth account session
|
||||
fi
|
||||
|
||||
keepdir /var/db/sudo/lectured
|
||||
fperms 0700 /var/db/sudo/lectured
|
||||
fperms 0711 /var/db/sudo #652958
|
||||
|
||||
# Don't install into /run as that is a tmpfs most of the time
|
||||
# (bug #504854)
|
||||
rm -rf "${ED}"/run || die
|
||||
|
||||
find "${ED}" -type f -name "*.la" -delete || die #697812
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process sudo.conf
|
||||
|
||||
#652958
|
||||
local sudo_db="${EROOT}/var/db/sudo"
|
||||
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
|
||||
chmod 711 "${sudo_db}" || die
|
||||
fi
|
||||
|
||||
if use ldap ; then
|
||||
ewarn
|
||||
ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
|
||||
ewarn
|
||||
if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
|
||||
ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
|
||||
ewarn "configured in /etc/nsswitch.conf."
|
||||
ewarn
|
||||
ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
|
||||
ewarn " sudoers: ldap files"
|
||||
ewarn
|
||||
fi
|
||||
fi
|
||||
if use prefix ; then
|
||||
ewarn
|
||||
ewarn "To use sudo, you need to change file ownership and permissions"
|
||||
ewarn "with root privileges, as follows:"
|
||||
ewarn
|
||||
ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
|
||||
ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
|
||||
ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
|
||||
ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
|
||||
ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
|
||||
ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
|
||||
ewarn
|
||||
fi
|
||||
|
||||
elog "To use the -A (askpass) option, you need to install a compatible"
|
||||
elog "password program from the following list. Starred packages will"
|
||||
elog "automatically register for the use with sudo (but will not force"
|
||||
elog "the -A option):"
|
||||
elog ""
|
||||
elog " [*] net-misc/ssh-askpass-fullscreen"
|
||||
elog " net-misc/x11-ssh-askpass"
|
||||
elog ""
|
||||
elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
|
||||
elog "variable to the program you want to use."
|
||||
}
|
Binary file not shown.
Binary file not shown.
@ -1,50 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools
|
||||
|
||||
EGIT_COMMIT="fcf71a89265c78fc26243574dda3a872574a5c02"
|
||||
DESCRIPTION="Recompress ZIP, PNG and MNG, considerably improving compression"
|
||||
HOMEPAGE="https://www.advancemame.it/comp-readme.html"
|
||||
SRC_URI="https://github.com/amadvance/advancecomp/archive/${EGIT_COMMIT}.tar.gz
|
||||
-> ${PN}-${EGIT_COMMIT}.tar.gz"
|
||||
S=${WORKDIR}/${PN}-${EGIT_COMMIT}
|
||||
|
||||
LICENSE="GPL-2+ Apache-2.0 LGPL-2.1+ MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND="app-arch/bzip2:=
|
||||
sys-libs/zlib:="
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
# Tests seem to rely on exact output:
|
||||
# https://sourceforge.net/p/advancemame/bugs/270/
|
||||
RESTRICT="test"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gcc-11.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--enable-bzip2
|
||||
# (--disable-* arguments are mishandled)
|
||||
# --disable-debug
|
||||
# --disable-valgrind
|
||||
)
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dodoc HISTORY
|
||||
}
|
@ -1,184 +0,0 @@
|
||||
From 7b08f7a2af3f66ab95437e4490499cebb20e5e41 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Wed, 28 Apr 2021 22:11:42 +0200
|
||||
Subject: [PATCH] Remove dynamic exception specification to fix C++17
|
||||
compatibility
|
||||
|
||||
The dynamic exception specifications have been deprecated in C++11
|
||||
and eventually removed in C++17 [1]. GCC-11 uses gnu++17 by default,
|
||||
causing advancecomp to fail to compile:
|
||||
|
||||
In file included from rezip.cc:24:
|
||||
file.h:70:43: error: ISO C++17 does not allow dynamic exception specifications
|
||||
70 | bool file_exists(const std::string& file) throw (error);
|
||||
| ^~~~~
|
||||
file.h:71:75: error: ISO C++17 does not allow dynamic exception specifications
|
||||
71 | e(const std::string& path, const char* data, unsigned size) throw (error);
|
||||
| ^~~~~
|
||||
...
|
||||
|
||||
Since there is really no gain from having these specifications anymore,
|
||||
just remove them to fix the build.
|
||||
|
||||
[1] https://en.cppreference.com/w/cpp/language/except_spec
|
||||
---
|
||||
file.cc | 26 +++++++++++++-------------
|
||||
file.h | 24 ++++++++++++------------
|
||||
2 files changed, 25 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/file.cc b/file.cc
|
||||
index 1e90348..d676d25 100644
|
||||
--- a/file.cc
|
||||
+++ b/file.cc
|
||||
@@ -98,7 +98,7 @@ void infopath::readonly_set(bool Areadonly)
|
||||
/**
|
||||
* Check if a file exists.
|
||||
*/
|
||||
-bool file_exists(const string& path) throw (error)
|
||||
+bool file_exists(const string& path)
|
||||
{
|
||||
struct stat s;
|
||||
if (stat(path.c_str(), &s) != 0) {
|
||||
@@ -114,7 +114,7 @@ bool file_exists(const string& path) throw (error)
|
||||
/**
|
||||
* Write a whole file.
|
||||
*/
|
||||
-void file_write(const string& path, const char* data, unsigned size) throw (error)
|
||||
+void file_write(const string& path, const char* data, unsigned size)
|
||||
{
|
||||
FILE* f = fopen(path.c_str(), "wb");
|
||||
if (!f)
|
||||
@@ -134,7 +134,7 @@ void file_write(const string& path, const char* data, unsigned size) throw (erro
|
||||
/**
|
||||
* Read a whole file.
|
||||
*/
|
||||
-void file_read(const string& path, char* data, unsigned size) throw (error)
|
||||
+void file_read(const string& path, char* data, unsigned size)
|
||||
{
|
||||
file_read(path, data, 0, size);
|
||||
}
|
||||
@@ -142,7 +142,7 @@ void file_read(const string& path, char* data, unsigned size) throw (error)
|
||||
/**
|
||||
* Read a whole file.
|
||||
*/
|
||||
-void file_read(const string& path, char* data, unsigned offset, unsigned size) throw (error)
|
||||
+void file_read(const string& path, char* data, unsigned offset, unsigned size)
|
||||
{
|
||||
FILE* f = fopen(path.c_str(), "rb");
|
||||
if (!f)
|
||||
@@ -166,7 +166,7 @@ void file_read(const string& path, char* data, unsigned offset, unsigned size) t
|
||||
/**
|
||||
* Get the time of a file.
|
||||
*/
|
||||
-time_t file_time(const string& path) throw (error)
|
||||
+time_t file_time(const string& path)
|
||||
{
|
||||
struct stat s;
|
||||
if (stat(path.c_str(), &s)!=0)
|
||||
@@ -178,7 +178,7 @@ time_t file_time(const string& path) throw (error)
|
||||
/**
|
||||
* Set the time of a file.
|
||||
*/
|
||||
-void file_utime(const string& path, time_t tod) throw (error)
|
||||
+void file_utime(const string& path, time_t tod)
|
||||
{
|
||||
struct utimbuf u;
|
||||
|
||||
@@ -192,7 +192,7 @@ void file_utime(const string& path, time_t tod) throw (error)
|
||||
/**
|
||||
* Get the size of a file.
|
||||
*/
|
||||
-unsigned file_size(const string& path) throw (error)
|
||||
+unsigned file_size(const string& path)
|
||||
{
|
||||
struct stat s;
|
||||
if (stat(path.c_str(), &s)!=0)
|
||||
@@ -204,7 +204,7 @@ unsigned file_size(const string& path) throw (error)
|
||||
/**
|
||||
* Get the crc of a file.
|
||||
*/
|
||||
-crc_t file_crc(const string& path) throw (error)
|
||||
+crc_t file_crc(const string& path)
|
||||
{
|
||||
unsigned size = file_size(path);
|
||||
|
||||
@@ -227,7 +227,7 @@ crc_t file_crc(const string& path) throw (error)
|
||||
/**
|
||||
* Copy a file.
|
||||
*/
|
||||
-void file_copy(const string& path1, const string& path2) throw (error)
|
||||
+void file_copy(const string& path1, const string& path2)
|
||||
{
|
||||
unsigned size;
|
||||
|
||||
@@ -249,7 +249,7 @@ void file_copy(const string& path1, const string& path2) throw (error)
|
||||
/**
|
||||
* Move a file.
|
||||
*/
|
||||
-void file_move(const string& path1, const string& path2) throw (error)
|
||||
+void file_move(const string& path1, const string& path2)
|
||||
{
|
||||
if (rename(path1.c_str(), path2.c_str())!=0
|
||||
&& errno==EXDEV) {
|
||||
@@ -271,7 +271,7 @@ void file_move(const string& path1, const string& path2) throw (error)
|
||||
/**
|
||||
* Remove a file.
|
||||
*/
|
||||
-void file_remove(const string& path1) throw (error)
|
||||
+void file_remove(const string& path1)
|
||||
{
|
||||
if (remove(path1.c_str())!=0) {
|
||||
throw error() << "Failed remove of " << path1;
|
||||
@@ -281,7 +281,7 @@ void file_remove(const string& path1) throw (error)
|
||||
/**
|
||||
* Rename a file.
|
||||
*/
|
||||
-void file_rename(const string& path1, const string& path2) throw (error)
|
||||
+void file_rename(const string& path1, const string& path2)
|
||||
{
|
||||
if (rename(path1.c_str(), path2.c_str())!=0) {
|
||||
throw error() << "Failed rename of " << path1 << " to " << path2;
|
||||
@@ -409,7 +409,7 @@ string file_adjust(const string& path) throw ()
|
||||
/**
|
||||
* Make a drectory tree.
|
||||
*/
|
||||
-void file_mktree(const std::string& path) throw (error)
|
||||
+void file_mktree(const std::string& path)
|
||||
{
|
||||
string dir = file_dir(path);
|
||||
string name = file_name(path);
|
||||
diff --git a/file.h b/file.h
|
||||
index 1b0cf85..49429b5 100644
|
||||
--- a/file.h
|
||||
+++ b/file.h
|
||||
@@ -67,18 +67,18 @@ typedef unsigned crc_t;
|
||||
crc_t crc_compute(const char* data, unsigned len);
|
||||
crc_t crc_compute(crc_t pred, const char* data, unsigned len);
|
||||
|
||||
-bool file_exists(const std::string& file) throw (error);
|
||||
-void file_write(const std::string& path, const char* data, unsigned size) throw (error);
|
||||
-void file_read(const std::string& path, char* data, unsigned size) throw (error);
|
||||
-void file_read(const std::string& path, char* data, unsigned offset, unsigned size) throw (error);
|
||||
-time_t file_time(const std::string& path) throw (error);
|
||||
-void file_utime(const std::string& path, time_t tod) throw (error);
|
||||
-unsigned file_size(const std::string& path) throw (error);
|
||||
-crc_t file_crc(const std::string& path) throw (error);
|
||||
-void file_copy(const std::string& path1, const std::string& path2) throw (error);
|
||||
-void file_move(const std::string& path1, const std::string& path2) throw (error);
|
||||
-void file_remove(const std::string& path1) throw (error);
|
||||
-void file_mktree(const std::string& path1) throw (error);
|
||||
+bool file_exists(const std::string& file);
|
||||
+void file_write(const std::string& path, const char* data, unsigned size);
|
||||
+void file_read(const std::string& path, char* data, unsigned size);
|
||||
+void file_read(const std::string& path, char* data, unsigned offset, unsigned size);
|
||||
+time_t file_time(const std::string& path);
|
||||
+void file_utime(const std::string& path, time_t tod);
|
||||
+unsigned file_size(const std::string& path);
|
||||
+crc_t file_crc(const std::string& path);
|
||||
+void file_copy(const std::string& path1, const std::string& path2);
|
||||
+void file_move(const std::string& path1, const std::string& path2);
|
||||
+void file_remove(const std::string& path1);
|
||||
+void file_mktree(const std::string& path1);
|
||||
|
||||
std::string file_temp(const std::string& path) throw ();
|
||||
std::string file_randomize(const std::string& path, int n) throw ();
|
@ -1,6 +1,3 @@
|
||||
DIST rarlinux-6.0.2_p20210611.tar.gz 610546 BLAKE2B 927a7f60af431e84e9ff19dc1abf52c4697068264d3c67a17ada324bfb00975824e26937a19dea023cda772066991de719ec68fb1fb380f6656130af67202131 SHA512 6b6ef629dd0e681702fb0835cf6fe9962dc2ce774291f800893308a93a0a498099775e7d897d69375f68107b0ce0862bb2a6a169b8fbda534091678e9be3f09c
|
||||
DIST rarlinux-x32-6.10_p20220124.tar.gz 616277 BLAKE2B 051a8c5689dd0924bc841fab05acd01cfaa7752a5ce54de71b727acedc6606d62605f3487af99d59af081acfbc1ded95ee427904caa6fee39734243248e73c13 SHA512 3593756eba8fd8e512ff1f0378e2768a264671dd25c139f00dc632b53d379ee6da4d63d6d94394f39ad4fde0310211d11d8c2d3167da5d576f16b299da969118
|
||||
DIST rarlinux-x64-6.0.2_p20210611.tar.gz 599150 BLAKE2B ff60f32ee5215403e622bc5c341b8212c3deee0020155043e4c7c3d5feff113da351412a91fd42f46e3293dc5975fd2beca558e3e45744cdc5356ace82af6c93 SHA512 909eb3b05c56327ccec101652d1d68ca5eb97ba3a7223954724fbccf4960b07ffa0ff5fe5405c53a248342a3ae171325e7bbf7fadeaf63c1c45bf00853e0a940
|
||||
DIST rarlinux-x64-6.10_p20220124.tar.gz 604344 BLAKE2B ab5a5b0c1e8aed44e6b55820e0d843adf526c0d48ab5128fff5e907fcc4969cd6645cef2a91abbe49b770de3104d9a8d09da34e0f9955fa9825da204ca1098c9 SHA512 56ea0f3eaf84ff41af6543056e71d9768285ceef00132fe9ea0c7ecb02e0681023b0f7940b02fe3918bf28de229d000e0209f66dd4af2e93c6d81c3bcbedc87b
|
||||
DIST winrar-x64-6.0.2_p20210611.exe 3348968 BLAKE2B 482e5c34cae9c452b539f6e9e89efc7db8e463cc58b4db43cd25caa7e3fc6ab7945a7a17e9605b9d6d505c31a9a343a29812531dc5ba319765bf80fcc775426e SHA512 4c2bd804465e6bd948de248a7a0893f4b38728665b8e67c65bfc14766475072960250057ad1afc457a0df1f128da96d69483b000a5da18826776ea0a4377230a
|
||||
DIST winrar-x64-6.10_p20220124.exe 3470848 BLAKE2B d54dc216dfcc251d9c3a06ebf49b0717954cab856231b9777597dc0d1b61b64bc5c5fbebe9546be42c44ba23a2d9dd8eaf3f5d5484678eda5d1ec3a8ebb159c1 SHA512 9968fe6b3c5df9f11690263246366da9544a5a05f535f61d9cbb6765fb81f2614a75b8b1b8c367d7b83c83a87b53b1b94f3ffaa95c38dbf368a880c16f136e63
|
||||
DIST rarlinux-x32-612.tar.gz 616982 BLAKE2B 3ceaf625a77d6bb5543de8c2d118e6a5d679ffcdf295b4476725794277ba01c6b74179daefa2bbe1da7b3c0d29a2d368c1325b099d87955c355cc61461f893ff SHA512 8f67a365145d6fe7c9db1458a67f29a6b878f1969842f0cb43f639af1f8c304b0f4174f83b070f7d821316fdd9dcd2e1788bca2d6af5ef60fdb951924ebc71a4
|
||||
DIST rarlinux-x64-612.tar.gz 604520 BLAKE2B ad85a2a5d1b66677707491279166fa42c6f9b2b1e96f9dc8001da5e9199e50762a106991ecb27c0c4eaa72904490eebc43f21236a952da40acf866b1ce40ecd2 SHA512 bccb64b077fa044a920f02a826bafd4a07c446f2ff2ce88b7c8f27d49c6ac48108711880ad43aac89c034f582979cad8b332d675ea483eca9f76bcd892949423
|
||||
DIST winrar-x64-611.exe 3479544 BLAKE2B 84f2bf342a92b142731615d13280e36686dbd4f44d8a1c550fa6a03f2267e6ec0f8e963107b3baa5640072b399e58fe8865754b382def2183a391ca204a07333 SHA512 46c001b48be1503e1aa9f7b9540adfa210caa672ee766b3634697e23faa0b8ac140cc392adf13f1b5244ca61572c5dac2085b4a00a492774649602e4fdb6a46d
|
||||
|
@ -1,109 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="7"
|
||||
|
||||
DESCRIPTION="RAR compressor/uncompressor"
|
||||
HOMEPAGE="https://rarlab.com/"
|
||||
URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
|
||||
URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
|
||||
URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
|
||||
SRC_URI="x86? ( ${URI_x86} )
|
||||
amd64? ( ${URI_amd64} )
|
||||
all_sfx? (
|
||||
${URI_x86}
|
||||
${URI_amd64}
|
||||
${URI_w64}
|
||||
)"
|
||||
|
||||
LICENSE="RAR BSD BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
IUSE="all_sfx"
|
||||
RESTRICT="mirror bindist"
|
||||
|
||||
DEPEND="all_sfx? ( app-arch/unrar )"
|
||||
RDEPEND="sys-libs/glibc"
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
|
||||
QA_FLAGS_IGNORED="opt/rar/default.sfx
|
||||
opt/rar/default-elf32.sfx
|
||||
opt/rar/default-elf64.sfx
|
||||
opt/rar/default-win32.sfx
|
||||
opt/rar/default-win64.sfx
|
||||
opt/rar/WinCon.SFX
|
||||
opt/rar/WinCon64.SFX
|
||||
opt/rar/Zip.SFX
|
||||
opt/rar/Zip64.SFX
|
||||
opt/rar/unrar
|
||||
opt/rar/rar"
|
||||
QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
|
||||
|
||||
src_unpack() {
|
||||
local _file
|
||||
|
||||
for _file in ${A}; do
|
||||
if [[ "${_file}" == rarli* ]]; then
|
||||
if [[ "${_file}" =~ x64 ]]; then
|
||||
if ! use amd64; then
|
||||
continue
|
||||
fi
|
||||
|
||||
unpack "${_file}"
|
||||
elif [[ ! "${_file}" =~ x64 ]]; then
|
||||
if ! use x86; then
|
||||
continue
|
||||
fi
|
||||
|
||||
unpack "${_file}"
|
||||
else
|
||||
die "Unknown SRC file '${_file}'!"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
rm -f "${S}"/license.txt
|
||||
|
||||
if use all_sfx ; then
|
||||
mkdir sfx
|
||||
cd sfx
|
||||
for _file in ${A}; do
|
||||
if [[ "${_file}" == rarli* ]]; then
|
||||
unpack "${_file}"
|
||||
if [[ "${_file}" =~ x64 ]]; then
|
||||
mv rar/default.sfx default-elf64.sfx || die
|
||||
else
|
||||
mv rar/default.sfx default-elf32.sfx || die
|
||||
fi
|
||||
elif [[ "${_file}" == winrar* ]]; then
|
||||
ln -s "${DISTDIR}"/${_file} w64.rar || die
|
||||
unpack ./w64.rar
|
||||
mv Default.SFX default-win32.sfx || die
|
||||
mv Default64.SFX default-win64.sfx || die
|
||||
else
|
||||
die "Unknown SFX file '${_file}'!"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
exeinto /opt/rar
|
||||
doexe rar unrar
|
||||
|
||||
dodir /opt/bin
|
||||
dosym ../rar/rar /opt/bin/rar
|
||||
dosym ../rar/unrar /opt/bin/unrar
|
||||
|
||||
insinto /opt/rar
|
||||
if use all_sfx ; then
|
||||
doins "${WORKDIR}"/sfx/*.{sfx,SFX}
|
||||
else
|
||||
doins default.sfx
|
||||
fi
|
||||
doins rarfiles.lst
|
||||
dodoc *.txt
|
||||
}
|
Binary file not shown.
@ -1,4 +1,3 @@
|
||||
DIST borgbackup-1.1.15.tar.gz 3777355 BLAKE2B 388f3cd33280c9d1a27b9cd43509d317aa1c95d08418a43c176146243d83cf07b3033707ab5423eeb097e92bb31cf016f65fc3738ebff1bb8c704a54c6e8dd12 SHA512 db2f06a96897c07a71e9c4531d4f219ef5451009c08ae933348b1a02b7d6c95b4e814a25b4cf465c0021ff670fdd46076c486c2a466d056dd931cb7eee8b1ef3
|
||||
DIST borgbackup-1.1.16.tar.gz 3777030 BLAKE2B bf5ad487fd0cdcce341b14ad950bc447d89d025b1b3434c5d270539d1fc4aec92b52a750ab1079911e53478411f91c92be4f053c09289b1e38285caa03453f17 SHA512 9cdfe794329821c784461382633fd29f7f9b3cc6ef9e7fa2463ed178efd64ea367e56d49128d88b86bd516d36971282207ec173735ecb4eabc4ec7b4604ed773
|
||||
DIST borgbackup-1.1.17.tar.gz 3781411 BLAKE2B 3ceb51f3c2e4ee4e38495ca0bdef2d5c1b30225afe9a3c9987a82f4a1facd4aa203fb21512e655fbbab400bcbd412ff4aefa80242aa21a579e086d38bf3e1078 SHA512 6170680efcca35341031a8fcfd9434d2dca530bb6f7fcabbf452e6af6a8df5a825b4991d342f3c97bd7378d56b9ee86e6118f9281a31ba51235f49818852f4bb
|
||||
DIST borgbackup-1.2.0.tar.gz 4020793 BLAKE2B 9e6cb8d85ca196cbdd6baba694bc7987d63f85d2ba0e25f3ac1e59400882fff71e29b04ca218ee78f23daeb52d13547062b0c80bd0d3f5b460b28b4f274d11ec SHA512 c06a797439078118fc57418be2a9af64e84248659ba25cfc04dff7c67f9f52a033a11cd1e830410be390ae59dcacd2474f97d8b5886db7d4910486d0ad9b7c51
|
||||
DIST borgbackup-1.2.1.tar.gz 4017050 BLAKE2B 2841f3c02b6af76aba61064513ebd9039367be868a5f0dad2e10cbf3243236a5d29609bee63b79056f2a553052d3dc415178dbabd5c1e5af9c43111286942869 SHA512 47e95960c9ce7715897834f400ee1a3dcbbbd9aa1e4b69dc93618ade24caf6c046b844c9f3edd10e090795d06bed0136fbd42d6e679f0639f221b83d82545d43
|
||||
|
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{7,8,9} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="https://github.com/${PN}/borg.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Deduplicating backup program with compression and authenticated encryption"
|
||||
HOMEPAGE="https://borgbackup.readthedocs.io/"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
|
||||
# Unfortunately we have a file conflict with app-office/borg, bug #580402
|
||||
RDEPEND="
|
||||
!!app-office/borg
|
||||
app-arch/lz4
|
||||
virtual/acl
|
||||
dev-python/llfuse[${PYTHON_USEDEP}]
|
||||
dev-libs/openssl:0=
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
dev-python/setuptools_scm[${PYTHON_USEDEP}]
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
${RDEPEND}
|
||||
"
|
||||
|
||||
src_install() {
|
||||
distutils-r1_src_install
|
||||
doman docs/man/*
|
||||
}
|
Binary file not shown.
@ -1 +1 @@
|
||||
DIST cri-o-1.24.0.tar.gz 15987447 BLAKE2B 0571c2719d3773fc1085e3fcecef959b210a601365686fd80262fe8ec5b9f2414641ed56f3fa6c6e21ff4cca1a3fecaa3ed5cd4de08799b2eb9b67fc0545d0f1 SHA512 0e0d7668098d90f1800c3763143c17721004f92355fc681cc7314d86d6d719788929c66ca06bab2ae3d3bbf77a5e95254458b7c79662e7aef5fc9548a4495504
|
||||
DIST cri-o-1.24.1.tar.gz 15943809 BLAKE2B 13840967b7555e680652cdfe71e358fee5afcfbdbc28771960a5e28c88d6242909a595212559b7967c05cfc7cf9921d6d227b810a26bdc66cb75ffed917bcb23 SHA512 899efb61c70be3a0e950dc239245e1a4dca66e2130d8b355a7ad73c1e91088a2d42c6a4cc05f879cc6a1252d40294e9a8845fd2b110148a05a9d63f61077c498
|
||||
|
@ -1,2 +1,4 @@
|
||||
DIST k3d-5.4.0-deps.tar.xz 85753240 BLAKE2B c86a3172e0944593b7d66ff3bf20c2c2398d725117e18b93cab0c291bd6ae9551d01ea4da7b7f2a96aec36f3143cb029474066f457b8e6308ea8ae4ee3fd90a0 SHA512 d7b8bc46e1a72f68bece84224ff8255e12f17020137523d8d3fc748e6fd152a8d7f4a3da53a624d8ce482341ac18161b64e885db3b3a5e14c018a16551367da3
|
||||
DIST k3d-5.4.0.tar.gz 7395322 BLAKE2B cc7a85b18db36861a8291ee20895a5d626c24f5ae106d48342b3d328070456fe816714dcf84b09606382de93af39acd74ce9fcbed72ac4dd4448ef2c099eddd2 SHA512 1af6a5264f0e1d53428c7f66d440c7d4541988d5fca64e4ea7e1c8177a918e30e7f27ff76a7d20291303fd410c32791634548b1b46dc30ff2810f57ad0253120
|
||||
DIST k3d-5.4.2-deps.tar.xz 76441740 BLAKE2B 3d5388fa057a0d5feb889b6fcec2234e2c22c751077276fd535d4a555f6b463166f4b422385e5732f752f00b42335a6bf1e27fdfaf7b3d54e244a228f70050f2 SHA512 04daa6470762e30cf0bb2409ba4db5c8bc06b75e1560e1099c28f8dc30c4239618b56763bf8c79177aebfefae6ffe92c99a33feeaa6d4ffce7f9e0e9f2ff62d7
|
||||
DIST k3d-5.4.2.tar.gz 7397277 BLAKE2B c16d67272ceac008eddcbdd7c8816a179804c4e2a3ae9bf762ee13e0a84e525ea69502575e64a9190deef5d4a69679806a9337709b21c82cbff141dbebd7bfc3 SHA512 b38144e93a5d3e781a839144e2960e7a8455e5b2e8cca96e1b14631be626f7b9e37630d9b5902f7bd896e7422de13dbed5df206dfa2d481bcae997987353c813
|
||||
|
@ -0,0 +1,38 @@
|
||||
# Copyright 2021-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit go-module
|
||||
|
||||
DESCRIPTION="k3d creates k3s clusters in docker"
|
||||
HOMEPAGE="https://github.com/rancher/k3d"
|
||||
|
||||
K3D_K3S_TAG=v1.23.6-k3s1
|
||||
SRC_URI="https://github.com/rancher/k3d/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
|
||||
LICENSE="MIT Apache-2.0 BSD BSD-2 MPL-2.0 ISC"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="doc"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
rm Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
CGO_ENABLED=0 \
|
||||
go build \
|
||||
-ldflags "-w -s -X github.com/rancher/k3d/v5/version.Version=v${PV} -X github.com/rancher/k3d/v5/version.K3sVersion=${K3D_K3S_TAG}" \
|
||||
-o bin/k3d
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dobin bin/${PN}
|
||||
DOCS=(*.md)
|
||||
if use doc; then
|
||||
DOCS+=(docs)
|
||||
fi
|
||||
default_src_install
|
||||
}
|
@ -1,2 +1 @@
|
||||
DIST podman-4.0.3.tar.gz 11392523 BLAKE2B 2d69fa8f52b061a931cf3dbe767edcb9eb5baf4f45fa77bcd9dd6e5541c126830c059a2bb97906f4fe9a4fd3257f77c801add06e1da910542ebafeaa2d032768 SHA512 a7c6f9a0f33641520c4143e6a3568129021783557f8ea7c846e4bc3f7da9bf70cb30b19cc7c6527809df2c46e6ded1d162a929dc4f44a5daafcf9d211b43b44a
|
||||
DIST podman-4.1.0.tar.gz 10904727 BLAKE2B 6d01a65b13494dc948c0667147eca6f250a81056f1bcf6eda6285566b8aa7aa526794ea96a571aecad642a8b1d3d1877cd31683ccf46662f8681a2afac083b5a SHA512 4d5f240423f21b1224ce44853a2265359dacee0d921f0ea53a7fca34f9076ebfaa49f4327a59ac51f5bf5b9dafb47dda3a9bb8e609237cc69f833b42b95bcd0a
|
||||
|
@ -1,164 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EGIT_COMMIT="62534053086fdeba7b93117e7c4dc6e797835a3e"
|
||||
|
||||
inherit bash-completion-r1 flag-o-matic go-module tmpfiles
|
||||
|
||||
DESCRIPTION="Library and podman tool for running OCI-based containers in Pods"
|
||||
HOMEPAGE="https://github.com/containers/podman/"
|
||||
MY_PN=podman
|
||||
MY_P=${MY_PN}-${PV}
|
||||
SRC_URI="https://github.com/containers/podman/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
|
||||
LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
|
||||
IUSE="apparmor btrfs cgroup-hybrid +fuse +init +rootless selinux"
|
||||
RESTRICT+=" test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-crypt/gpgme:=
|
||||
>=app-containers/conmon-2.0.0
|
||||
cgroup-hybrid? ( >=app-containers/runc-1.0.0_rc6 )
|
||||
!cgroup-hybrid? ( app-containers/crun )
|
||||
dev-libs/libassuan:=
|
||||
dev-libs/libgpg-error:=
|
||||
>=net-misc/cni-plugins-0.8.6
|
||||
sys-fs/lvm2
|
||||
sys-libs/libseccomp:=
|
||||
|
||||
apparmor? ( sys-libs/libapparmor )
|
||||
btrfs? ( sys-fs/btrfs-progs )
|
||||
init? ( app-containers/catatonit )
|
||||
rootless? ( app-containers/slirp4netns )
|
||||
selinux? ( sys-libs/libselinux:= )
|
||||
"
|
||||
DEPEND="
|
||||
${COMMON_DEPEND}
|
||||
dev-go/go-md2man"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
fuse? ( sys-fs/fuse-overlayfs )
|
||||
selinux? ( sec-policy/selinux-podman )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Disable installation of python modules here, since those are
|
||||
# installed by separate ebuilds.
|
||||
local makefile_sed_args=(
|
||||
-e '/^GIT_.*/d'
|
||||
-e 's/$(GO) build/$(GO) build -v -work -x/'
|
||||
-e 's/^\(install:.*\) install\.python$/\1/'
|
||||
-e 's|^pkg/varlink/iopodman.go: .gopathok pkg/varlink/io.podman.varlink$|pkg/varlink/iopodman.go: pkg/varlink/io.podman.varlink|'
|
||||
)
|
||||
|
||||
has_version -b '>=dev-lang/go-1.13.9' || makefile_sed_args+=(-e 's:GO111MODULE=off:GO111MODULE=on:')
|
||||
|
||||
sed "${makefile_sed_args[@]}" -i Makefile || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local git_commit=${EGIT_COMMIT}
|
||||
|
||||
# Filter unsupported linker flags
|
||||
filter-flags '-Wl,*'
|
||||
|
||||
[[ -f hack/apparmor_tag.sh ]] || die
|
||||
if use apparmor; then
|
||||
echo -e "#!/bin/sh\necho apparmor" > hack/apparmor_tag.sh || die
|
||||
else
|
||||
echo -e "#!/bin/sh\ntrue" > hack/apparmor_tag.sh || die
|
||||
fi
|
||||
|
||||
[[ -f hack/btrfs_installed_tag.sh ]] || die
|
||||
if use btrfs; then
|
||||
echo -e "#!/bin/sh\ntrue" > hack/btrfs_installed_tag.sh || die
|
||||
else
|
||||
echo -e "#!/bin/sh\necho exclude_graphdriver_btrfs" > \
|
||||
hack/btrfs_installed_tag.sh || die
|
||||
fi
|
||||
|
||||
[[ -f hack/selinux_tag.sh ]] || die
|
||||
if use selinux; then
|
||||
echo -e "#!/bin/sh\necho selinux" > hack/selinux_tag.sh || die
|
||||
else
|
||||
echo -e "#!/bin/sh\ntrue" > hack/selinux_tag.sh || die
|
||||
fi
|
||||
|
||||
# Avoid this error when generating pkg/varlink/iopodman.go:
|
||||
# cannot find package "github.com/varlink/go/varlink/idl"
|
||||
mkdir -p _output || die
|
||||
ln -snf ../vendor _output/src || die
|
||||
GO111MODULE=off GOPATH=${PWD}/_output go generate ./pkg/varlink/... || die
|
||||
rm _output/src || die
|
||||
|
||||
export -n GOCACHE GOPATH XDG_CACHE_HOME
|
||||
GOBIN="${S}/bin" \
|
||||
emake all \
|
||||
GIT_BRANCH=master \
|
||||
GIT_BRANCH_CLEAN=master \
|
||||
COMMIT_NO="${git_commit}" \
|
||||
GIT_COMMIT="${git_commit}"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
|
||||
|
||||
insinto /etc/containers
|
||||
newins test/registries.conf registries.conf.example
|
||||
newins test/policy.json policy.json.example
|
||||
|
||||
insinto /usr/share/containers
|
||||
doins vendor/github.com/containers/common/pkg/seccomp/seccomp.json
|
||||
|
||||
newconfd "${FILESDIR}"/podman.confd podman
|
||||
newinitd "${FILESDIR}"/podman.initd podman
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}/podman.logrotated" podman
|
||||
|
||||
dobashcomp completions/bash/*
|
||||
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins completions/zsh/*
|
||||
|
||||
insinto /usr/share/fish/vendor_completions.d
|
||||
doins completions/fish/*
|
||||
|
||||
keepdir /var/lib/containers
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
PODMAN_ROOTLESS_UPGRADE=false
|
||||
if use rootless; then
|
||||
has_version 'app-containers/podman[rootless]' || PODMAN_ROOTLESS_UPGRADE=true
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
tmpfiles_process podman.conf
|
||||
|
||||
local want_newline=false
|
||||
if [[ ! ( -e ${EROOT%/*}/etc/containers/policy.json && -e ${EROOT%/*}/etc/containers/registries.conf ) ]]; then
|
||||
elog "You need to create the following config files:"
|
||||
elog "/etc/containers/registries.conf"
|
||||
elog "/etc/containers/policy.json"
|
||||
elog "To copy over default examples, use:"
|
||||
elog "cp /etc/containers/registries.conf{.example,}"
|
||||
elog "cp /etc/containers/policy.json{.example,}"
|
||||
want_newline=true
|
||||
fi
|
||||
if [[ ${PODMAN_ROOTLESS_UPGRADE} == true ]] ; then
|
||||
${want_newline} && elog ""
|
||||
elog "For rootless operation, you need to configure subuid/subgid"
|
||||
elog "for user running podman. In case subuid/subgid has only been"
|
||||
elog "configured for root, run:"
|
||||
elog "usermod --add-subuids 1065536-1131071 <user>"
|
||||
elog "usermod --add-subgids 1065536-1131071 <user>"
|
||||
want_newline=true
|
||||
fi
|
||||
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,3 +1,2 @@
|
||||
DIST ghostwriter-1.8.1.tar.gz 1220000 BLAKE2B 3fa3d95ed819bc8f7b76b396e6634658a8bda23e9100cbb298d301fc382db451430a4a31fbd092326af198825c83d2c998172c90a7e318aeb57ef7799751995a SHA512 9f60f81a594cf161edfeac8c75830e186ab4ec2c22859b2bad40768e1ecf64e6842b52a69024a1f014d24a2f1cbb38e15a7799101d7fd54ef7709e245f6ac521
|
||||
DIST ghostwriter-2.0.2.tar.gz 7802654 BLAKE2B a52a96ba6aecb8c6b8ff565bd9b3b7622d15ae68af5e393da4f1e1c8dae70a8053228e302e87e2530c907be825df5e7eebc7de14bb23e0e46f4b4308b9ae6e63 SHA512 1e51b86b8afae41c47e5e7ec96752d356dd9dca8a44d1aab6a541e1ce188cb40add52f96a52da7a689df47a2e7a9a1dc7211f480c3456f4a11c81f80e2779a7e
|
||||
DIST ghostwriter-2.1.2.tar.gz 7722873 BLAKE2B 62144986e5524fdb8eb774e80349b1814adefb69c79affb8f7dd3239c0850215864e16cc80998258b09b18f0f03ace817fbd35534205145de49ce18fd54fc38f SHA512 7ae715bd2f1313953629bcebd2aa2f36b7185e1cd3d5e90c69f7f30345a81974506f3035b1449b3ef9b6027cab029c43644b0167b5dfbf8353623ae7b6441407
|
||||
DIST ghostwriter-2.1.3.tar.gz 7725244 BLAKE2B 06e868bdc599cfb1fd9b7ab18b571ba4c401a401efa1189cacf8faec076041d579e1894b93bf1a7bf0bf9b823d40fb498b535dc0be4e0d5c4b24a578db7bf5df SHA512 ce7192caa0100d7264856193bd1fb765b8f4307146f7b3828875f4316a9bcc7d61b94768a01beacfab23631ba24b385aab1be5b72d309153ceba92c84081be30
|
||||
|
@ -1,63 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit qmake-utils xdg-utils
|
||||
|
||||
DESCRIPTION="Cross-platform, aesthetic, distraction-free markdown editor"
|
||||
HOMEPAGE="https://wereturtle.github.io/ghostwriter/"
|
||||
SRC_URI="https://github.com/wereturtle/ghostwriter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug"
|
||||
|
||||
BDEPEND="dev-qt/linguist-tools:5"
|
||||
|
||||
RDEPEND="
|
||||
app-text/hunspell:=
|
||||
dev-qt/qtconcurrent:5
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtsvg:5
|
||||
dev-qt/qtwebchannel:5
|
||||
dev-qt/qtwebengine:5[widgets]
|
||||
dev-qt/qtwidgets:5
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( CREDITS.md README.md )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-appdata-path.patch"
|
||||
"${FILESDIR}/${P}-qt-5.15.patch" # git master
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
sed -i -e "/^VERSION =/s/\$.*/${PV}/" ghostwriter.pro || die "failed to override version"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
eqmake5 \
|
||||
CONFIG+=$(usex debug debug release) \
|
||||
PREFIX="${EPREFIX}"/usr
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_ROOT="${D}" install
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
@ -0,0 +1,385 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Please bump with app-editors/vim-core and app-editors/gvim
|
||||
|
||||
VIM_VERSION="8.2"
|
||||
LUA_COMPAT=( lua5-1 luajit )
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
USE_RUBY="ruby26 ruby27"
|
||||
|
||||
inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single
|
||||
|
||||
if [[ ${PV} == 9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/vim/vim.git"
|
||||
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
|
||||
else
|
||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
|
||||
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
|
||||
fi
|
||||
S="${WORKDIR}"/vim-${PV}
|
||||
|
||||
DESCRIPTION="GUI version of the Vim text editor"
|
||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
||||
|
||||
LICENSE="vim"
|
||||
SLOT="0"
|
||||
IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
|
||||
REQUIRED_USE="
|
||||
lua? ( ${LUA_REQUIRED_USE} )
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
~app-editors/vim-core-${PV}
|
||||
>=app-eselect/eselect-vi-1.1
|
||||
>=sys-libs/ncurses-5.2-r2:0=
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libXext
|
||||
x11-libs/libXt
|
||||
acl? ( kernel_linux? ( sys-apps/acl ) )
|
||||
!aqua? (
|
||||
gtk? (
|
||||
x11-libs/gtk+:3
|
||||
x11-libs/libXft
|
||||
)
|
||||
!gtk? (
|
||||
gtk2? (
|
||||
>=x11-libs/gtk+-2.6:2
|
||||
x11-libs/libXft
|
||||
)
|
||||
!gtk2? (
|
||||
motif? ( >=x11-libs/motif-2.3:0 )
|
||||
!motif? (
|
||||
neXt? ( x11-libs/neXtaw )
|
||||
!neXt? ( x11-libs/libXaw )
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
crypt? ( dev-libs/libsodium:= )
|
||||
cscope? ( dev-util/cscope )
|
||||
lua? (
|
||||
${LUA_DEPS}
|
||||
$(lua_gen_impl_dep 'deprecated' lua5-1)
|
||||
)
|
||||
nls? ( virtual/libintl )
|
||||
perl? ( dev-lang/perl:= )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
racket? ( dev-scheme/racket )
|
||||
ruby? ( ${RUBY_DEPS} )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
session? ( x11-libs/libSM )
|
||||
sound? ( media-libs/libcanberra )
|
||||
tcl? ( dev-lang/tcl:0= )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
# configure runs the Lua interpreter
|
||||
BDEPEND="
|
||||
sys-devel/autoconf
|
||||
virtual/pkgconfig
|
||||
lua? ( ${LUA_DEPS} )
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
# various failures (bugs #630042 and #682320)
|
||||
RESTRICT="test"
|
||||
|
||||
pkg_setup() {
|
||||
# people with broken alphabets run into trouble. bug 82186.
|
||||
unset LANG LC_ALL
|
||||
export LC_COLLATE="C"
|
||||
|
||||
# Gnome sandbox silliness. bug #114475.
|
||||
mkdir -p "${T}"/home || die
|
||||
export HOME="${T}"/home
|
||||
|
||||
use lua && lua-single_pkg_setup
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999* ]]; then
|
||||
rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || di
|
||||
|
||||
# Gentoo patches to fix runtime issues, cross-compile errors, etc
|
||||
eapply "${WORKDIR}"/patches/
|
||||
fi
|
||||
|
||||
# Fixup a script to use awk instead of nawk
|
||||
sed -i -e \
|
||||
'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
||||
"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
|
||||
|
||||
# Read vimrc and gvimrc from /etc/vim
|
||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
|
||||
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
|
||||
# Hopefully this pattern won't break for a while at least.
|
||||
# This fixes bug 29398 (27 Sep 2003 agriffis)
|
||||
sed -i -e \
|
||||
's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
|
||||
"${S}"/runtime/doc/syntax.txt \
|
||||
"${S}"/runtime/doc/tagsrch.txt \
|
||||
"${S}"/runtime/doc/usr_29.txt \
|
||||
"${S}"/runtime/menu.vim \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
|
||||
# this is NeXT, but it's actually just a file in dev-libs/9libs
|
||||
# This fixes bug 43885 (20 Mar 2004 agriffis)
|
||||
sed -i -e \
|
||||
's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
|
||||
# correctly. To avoid some really entertaining error messages about stuff
|
||||
# which isn't even in the source file being invalid, we'll do some trickery
|
||||
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
|
||||
find "${S}" -name '*.c' | while read c; do
|
||||
echo >> "$c" || die "echo failed"
|
||||
done
|
||||
|
||||
# Try to avoid sandbox problems. Bug #114475.
|
||||
if [[ -d "${S}"/src/po ]]; then
|
||||
sed -i -e \
|
||||
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
|
||||
"${S}"/src/po/Makefile || die
|
||||
fi
|
||||
|
||||
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
|
||||
|
||||
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
|
||||
sed -i -e \
|
||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
# Fix bug 37354: Disallow -funroll-all-loops on amd64
|
||||
# Bug 57859 suggests that we want to do this for all archs
|
||||
filter-flags -funroll-all-loops
|
||||
|
||||
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
|
||||
# everyone since previous flag filtering bugs have turned out to affect
|
||||
# multiple archs...
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# Fix bug 18245: Prevent "make" from the following chain:
|
||||
# (1) Notice configure.ac is newer than auto/configure
|
||||
# (2) Rebuild auto/configure
|
||||
# (3) Notice auto/configure is newer than auto/config.mk
|
||||
# (4) Run ./configure (with wrong args) to remake auto/config.mk
|
||||
sed -i -e \
|
||||
's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||
rm -v src/auto/configure || die "rm failed"
|
||||
emake -j1 -C src autoconf
|
||||
|
||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
||||
# things are for ppc64, see bug 86433.
|
||||
local file
|
||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
||||
if [[ -e ${file} ]]; then
|
||||
addwrite $file
|
||||
fi
|
||||
done
|
||||
|
||||
use debug && append-flags "-DDEBUG"
|
||||
|
||||
myconf=(
|
||||
--with-features=huge
|
||||
--disable-gpm
|
||||
--with-gnome=no
|
||||
$(use_enable sound canberra)
|
||||
$(use_enable acl)
|
||||
$(use_enable crypt libsodium)
|
||||
$(use_enable cscope)
|
||||
$(use_enable netbeans)
|
||||
$(use_enable nls)
|
||||
$(use_enable perl perlinterp)
|
||||
$(use_enable python python3interp)
|
||||
$(use_with python python3-command "${PYTHON}")
|
||||
$(use_enable racket mzschemeinterp)
|
||||
$(use_enable ruby rubyinterp)
|
||||
$(use_enable selinux)
|
||||
$(use_enable session xsmp)
|
||||
$(use_enable tcl tclinterp)
|
||||
)
|
||||
|
||||
# --with-features=huge forces on cscope even if we --disable it. We need
|
||||
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
|
||||
if ! use cscope; then
|
||||
sed -i -e \
|
||||
'/# define FEAT_CSCOPE/d' src/feature.h || die "couldn't disable cscope"
|
||||
fi
|
||||
|
||||
if use lua; then
|
||||
myconf+=(
|
||||
--enable-luainterp
|
||||
$(use_with lua_single_target_luajit luajit)
|
||||
--with-lua-prefix="${EPREFIX}/usr"
|
||||
)
|
||||
fi
|
||||
|
||||
# gvim's GUI preference order is as follows:
|
||||
# aqua CARBON (not tested)
|
||||
# -aqua gtk GTK3
|
||||
# -aqua -gtk gtk2 GTK2
|
||||
# -aqua -gtk -gtk motif MOTIF
|
||||
# -aqua -gtk -gtk -motif neXt NEXTAW
|
||||
# -aqua -gtk -gtk -motif -neXt ATHENA
|
||||
echo ; echo
|
||||
if use aqua; then
|
||||
einfo "Building gvim with the Carbon GUI"
|
||||
myconf+=(
|
||||
--enable-darwin
|
||||
--enable-gui=carbon
|
||||
)
|
||||
elif use gtk; then
|
||||
myconf+=( --enable-gtk3-check )
|
||||
einfo "Building gvim with the gtk+-3 GUI"
|
||||
myconf+=( --enable-gui=gtk3 )
|
||||
elif use gtk2; then
|
||||
myconf+=( --enable-gtk2-check )
|
||||
einfo "Building gvim with the gtk+-2 GUI"
|
||||
myconf+=( --enable-gui=gtk2 )
|
||||
elif use motif; then
|
||||
einfo "Building gvim with the MOTIF GUI"
|
||||
myconf+=( --enable-gui=motif )
|
||||
elif use neXt; then
|
||||
einfo "Building gvim with the neXtaw GUI"
|
||||
myconf+=( --enable-gui=nextaw )
|
||||
else
|
||||
einfo "Building gvim with the Athena GUI"
|
||||
myconf+=( --enable-gui=athena )
|
||||
fi
|
||||
echo ; echo
|
||||
|
||||
# let package manager strip binaries
|
||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
||||
|
||||
# keep prefix env contained within the EPREFIX
|
||||
use prefix && myconf+=( --without-local-dir )
|
||||
|
||||
if [[ ${CHOST} == *-interix* ]]; then
|
||||
# avoid finding of this function, to avoid having to patch either
|
||||
# configure or the source, which would be much more hackish.
|
||||
# after all vim does it right, only interix is badly broken (again)
|
||||
export ac_cv_func_sigaction=no
|
||||
fi
|
||||
|
||||
econf \
|
||||
--with-modified-by=Gentoo-${PVR} \
|
||||
--with-vim-name=gvim \
|
||||
--with-x \
|
||||
"${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# The following allows emake to be used
|
||||
emake -j1 -C src auto/osdef.h objects
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
einfo
|
||||
einfo "Starting vim tests. Several error messages will be shown"
|
||||
einfo "while the tests run. This is normal behaviour and does not"
|
||||
einfo "indicate a fault."
|
||||
einfo
|
||||
ewarn "If the tests fail, your terminal may be left in a strange"
|
||||
ewarn "state. Usually, running 'reset' will fix this."
|
||||
einfo
|
||||
|
||||
# Don't let vim talk to X
|
||||
unset DISPLAY
|
||||
|
||||
# Make gvim not try to connect to X. See :help gui-x11-start in vim for how
|
||||
# this evil trickery works.
|
||||
ln -s "${S}"/src/gvim "${S}"/src/testvim || die
|
||||
|
||||
# Make sure our VIMPROG is used.
|
||||
sed -i -e 's:\.\./vim:../testvim:' src/testdir/test49.vim || die
|
||||
|
||||
# Don't do additional GUI tests.
|
||||
emake -j1 VIMPROG=../testvim -C src/testdir nongui
|
||||
}
|
||||
|
||||
# Call eselect vi update with --if-unset
|
||||
# to respect user's choice (bug 187449)
|
||||
eselect_vi_update() {
|
||||
einfo "Calling eselect vi update..."
|
||||
eselect vi update --if-unset
|
||||
eend $?
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
||||
|
||||
dobin src/gvim
|
||||
dosym gvim /usr/bin/gvimdiff
|
||||
dosym gvim /usr/bin/evim
|
||||
dosym gvim /usr/bin/eview
|
||||
dosym gvim /usr/bin/gview
|
||||
dosym gvim /usr/bin/rgvim
|
||||
dosym gvim /usr/bin/rgview
|
||||
|
||||
emake -C src DESTDIR="${D}" DATADIR="${EPREFIX}"/usr/share install-icons
|
||||
|
||||
dodir /usr/share/man/man1
|
||||
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gvim.1 || die "echo failed"
|
||||
echo ".so vim.1" > "${ED}"/usr/share/man/man1/gview.1 || die "echo failed"
|
||||
echo ".so vimdiff.1" > "${ED}"/usr/share/man/man1/gvimdiff.1 || \
|
||||
die "echo failed"
|
||||
|
||||
insinto /etc/vim
|
||||
newins "${FILESDIR}"/gvimrc-r1 gvimrc
|
||||
eprefixify "${ED}"/etc/vim/gvimrc
|
||||
|
||||
# bash completion script, bug #79018.
|
||||
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
|
||||
|
||||
# don't install vim desktop file
|
||||
rm -v "${ED}"/usr/share/applications/vim.desktop || die "failed to remove vim.desktop"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update fdo mime stuff, bug #78394
|
||||
xdg_desktop_database_update
|
||||
|
||||
# update icon cache
|
||||
xdg_icon_cache_update
|
||||
|
||||
# call eselect vi update
|
||||
eselect_vi_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update fdo mime stuff, bug #78394
|
||||
xdg_desktop_database_update
|
||||
|
||||
# update icon cache
|
||||
xdg_icon_cache_update
|
||||
|
||||
# call eselect vi update
|
||||
eselect_vi_update
|
||||
}
|
@ -1,2 +1 @@
|
||||
DIST mousepad-0.5.8.tar.bz2 927756 BLAKE2B b0518cfbc72a4816765846dc55cedb13377047d39966ceb66d93943b6eed7191eb06c2d482f41e7356271a26f3e99a5a26d1f63b3e4ef490c777448f85dd7083 SHA512 6446927b564fe18c3127835e592d0248efa690c7b8fc2a7da92f237eb16184bd502c446a5b50aed8acd1d8233c22ee7e91c0b9ee512232f7d7a69c72f1dea9e9
|
||||
DIST mousepad-0.5.9.tar.bz2 953685 BLAKE2B f8db50048964c789600ce6d310f6b6a893d7d4406d55f0666b7e78bf3e54446d3ec56eb70a059da6fac367d7c3f3fc5861fb29dadf28aa9b0d5e2f62056f3dfb SHA512 915fa1c89d66f793c4dba7826b4934e286e940dbdd9c933bddeeaf76be79d2140cd0feb1dea2946989879ec354d57af36fd61517309ebd4915f18be4b9cf621f
|
||||
|
@ -1,42 +0,0 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit gnome2-utils xdg-utils
|
||||
|
||||
DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
|
||||
HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
|
||||
SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
|
||||
|
||||
RDEPEND=">=dev-libs/glib-2.52
|
||||
>=x11-libs/gtk+-3.22:3
|
||||
>=x11-libs/gtksourceview-4.0.0:4"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
dev-lang/perl
|
||||
dev-util/intltool
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
--enable-gtksourceview4
|
||||
)
|
||||
econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
gnome2_schemas_update
|
||||
xdg_desktop_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_schemas_update
|
||||
xdg_desktop_database_update
|
||||
xdg_icon_cache_update
|
||||
}
|
@ -0,0 +1,233 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Please bump with app-editors/vim and app-editors/gvim
|
||||
|
||||
VIM_VERSION="8.2"
|
||||
inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils
|
||||
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/vim/vim.git"
|
||||
EGIT_CHECKOUT_DIR=${WORKDIR}/vim-${PV}
|
||||
else
|
||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
|
||||
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
S="${WORKDIR}"/vim-${PV}
|
||||
|
||||
DESCRIPTION="vim and gvim shared files"
|
||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
||||
|
||||
LICENSE="vim"
|
||||
SLOT="0"
|
||||
IUSE="nls acl minimal"
|
||||
|
||||
BDEPEND="sys-devel/autoconf"
|
||||
# Avoid icon file collision, bug #673880
|
||||
RDEPEND="!!<app-editors/gvim-8.1.0648
|
||||
!<app-editors/vim-8.2.4328-r1"
|
||||
PDEPEND="!minimal? ( app-vim/gentoo-syntax )"
|
||||
|
||||
pkg_setup() {
|
||||
# people with broken alphabets run into trouble. bug #82186.
|
||||
unset LANG LC_ALL
|
||||
export LC_COLLATE="C"
|
||||
|
||||
# Gnome sandbox silliness. bug #114475.
|
||||
mkdir -p "${T}"/home || die "mkdir -p failed"
|
||||
export HOME="${T}"/home
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
|
||||
|
||||
# Gentoo patches to fix runtime issues, cross-compile errors, etc
|
||||
eapply "${WORKDIR}"/patches
|
||||
fi
|
||||
|
||||
# Fixup a script to use awk instead of nawk
|
||||
sed -i \
|
||||
-e '1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
||||
"${S}"/runtime/tools/mve.awk || die "sed failed"
|
||||
|
||||
# See bug #77841. We remove this file after the tarball extraction.
|
||||
rm -v "${S}"/runtime/tools/vimspell.sh || die "rm failed"
|
||||
|
||||
# Read vimrc and gvimrc from /etc/vim
|
||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' >> "${S}"/src/feature.h
|
||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' >> "${S}"/src/feature.h
|
||||
|
||||
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
|
||||
# Hopefully this pattern won't break for a while at least.
|
||||
# This fixes bug #29398 (27 Sep 2003 agriffis)
|
||||
sed -i 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
|
||||
"${S}"/runtime/doc/syntax.txt \
|
||||
"${S}"/runtime/doc/tagsrch.txt \
|
||||
"${S}"/runtime/doc/usr_29.txt \
|
||||
"${S}"/runtime/menu.vim \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
|
||||
# this is NeXT, but it's actually just a file in dev-libs/9libs
|
||||
# This fixes bug #43885 (20 Mar 2004 agriffis)
|
||||
sed -i 's/ libc\.h / /' "${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
|
||||
# correctly. To avoid some really entertaining error messages about stuff
|
||||
# which isn't even in the source file being invalid, we'll do some trickery
|
||||
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
|
||||
find "${S}" -name '*.c' | while read c; do
|
||||
echo >> "$c" || die "echo failed"
|
||||
done
|
||||
|
||||
# Try to avoid sandbox problems. Bug #114475.
|
||||
if [[ -d "${S}"/src/po ]]; then
|
||||
sed -i -e \
|
||||
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
|
||||
"${S}"/src/po/Makefile || die "sed failed"
|
||||
fi
|
||||
|
||||
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
|
||||
|
||||
# Bug #378107 - Build properly with >=perl-core/ExtUtils-ParseXS-3.20.0
|
||||
sed -i -e \
|
||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
# Fix bug #37354: Disallow -funroll-all-loops on amd64
|
||||
# Bug 57859 suggests that we want to do this for all archs
|
||||
filter-flags -funroll-all-loops
|
||||
|
||||
# Fix bug #76331: -O3 causes problems, use -O2 instead. We'll do this for
|
||||
# everyone since previous flag filtering bugs have turned out to affect
|
||||
# multiple archs...
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# Fix bug #18245: Prevent "make" from the following chain:
|
||||
# (1) Notice configure.ac is newer than auto/configure
|
||||
# (2) Rebuild auto/configure
|
||||
# (3) Notice auto/configure is newer than auto/config.mk
|
||||
# (4) Run ./configure (with wrong args) to remake auto/config.mk
|
||||
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||
|
||||
# Remove src/auto/configure file.
|
||||
rm -v src/auto/configure || die "rm configure failed"
|
||||
|
||||
emake -j1 -C src autoconf
|
||||
|
||||
# This should fix a sandbox violation (see bug 24447). The hvc
|
||||
# things are for ppc64, see bug 86433.
|
||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
||||
if [[ -e "${file}" ]]; then
|
||||
addwrite ${file}
|
||||
fi
|
||||
done
|
||||
|
||||
# Let Portage do the stripping. Some people like that.
|
||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
||||
|
||||
# Keep Gentoo Prefix env contained within the EPREFIX
|
||||
use prefix && myconf+=" --without-local-dir"
|
||||
|
||||
econf \
|
||||
--with-modified-by=Gentoo-${PVR} \
|
||||
--enable-gui=no \
|
||||
--without-x \
|
||||
--disable-darwin \
|
||||
--disable-perlinterp \
|
||||
--disable-pythoninterp \
|
||||
--disable-rubyinterp \
|
||||
--disable-gpm \
|
||||
--disable-selinux \
|
||||
$(use_enable nls) \
|
||||
$(use_enable acl) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -j1 -C src auto/osdef.h objects
|
||||
emake tools
|
||||
}
|
||||
|
||||
src_test() { :; }
|
||||
|
||||
src_install() {
|
||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
||||
|
||||
dodir /usr/{bin,share/{man/man1,vim}}
|
||||
emake -C src \
|
||||
installruntime \
|
||||
installmanlinks \
|
||||
installmacros \
|
||||
installtutor \
|
||||
installtutorbin \
|
||||
installtools \
|
||||
install-languages \
|
||||
DESTDIR="${D}" \
|
||||
BINDIR="${EPREFIX}"/usr/bin \
|
||||
MANDIR="${EPREFIX}"/usr/share/man \
|
||||
DATADIR="${EPREFIX}"/usr/share
|
||||
|
||||
keepdir ${vimfiles}/keymap
|
||||
|
||||
# default vimrc is installed by vim-core since it applies to
|
||||
# both vim and gvim
|
||||
insinto /etc/vim/
|
||||
newins "${FILESDIR}"/vimrc-r5 vimrc
|
||||
eprefixify "${ED}"/etc/vim/vimrc
|
||||
|
||||
if use minimal; then
|
||||
# To save space, install only a subset of the files.
|
||||
# Helps minimalize the livecd, bug 65144.
|
||||
eshopts_push -s extglob
|
||||
|
||||
rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed"
|
||||
rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed"
|
||||
rm -v "${ED}"/usr/bin/vimtutor || die "rm failed"
|
||||
|
||||
local keep_colors="default"
|
||||
ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )
|
||||
|
||||
local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig"
|
||||
# tinkering with the next line might make bad things happen ...
|
||||
keep_syntax="${keep_syntax}|syntax|nosyntax|synload"
|
||||
ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim )
|
||||
|
||||
# Delete skip_defaults_vim config not supported by vim[minimal]
|
||||
sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed"
|
||||
|
||||
eshopts_pop
|
||||
fi
|
||||
|
||||
newbashcomp "${FILESDIR}"/xxd-completion xxd
|
||||
|
||||
# install gvim icon since both vim/gvim desktop files reference it
|
||||
doicon -s scalable "${FILESDIR}"/gvim.svg
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update icon cache
|
||||
xdg_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# update icon cache
|
||||
xdg_icon_cache_update
|
||||
}
|
@ -0,0 +1,360 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Please bump with app-editors/vim-core and app-editors/gvim
|
||||
|
||||
VIM_VERSION="8.2"
|
||||
LUA_COMPAT=( lua5-1 luajit )
|
||||
PYTHON_COMPAT=( python3_{8..10} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
USE_RUBY="ruby26 ruby27"
|
||||
|
||||
inherit vim-doc flag-o-matic bash-completion-r1 lua-single python-single-r1 ruby-single desktop xdg-utils
|
||||
|
||||
if [[ ${PV} == 9999* ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://github.com/vim/vim.git"
|
||||
else
|
||||
SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
|
||||
https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
fi
|
||||
|
||||
DESCRIPTION="Vim, an improved vi-style text editor"
|
||||
HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
|
||||
|
||||
LICENSE="vim"
|
||||
SLOT="0"
|
||||
IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager"
|
||||
REQUIRED_USE="
|
||||
lua? ( ${LUA_REQUIRED_USE} )
|
||||
python? ( ${PYTHON_REQUIRED_USE} )
|
||||
vim-pager? ( !minimal )
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
>=app-eselect/eselect-vi-1.1
|
||||
>=sys-libs/ncurses-5.2-r2:0=
|
||||
nls? ( virtual/libintl )
|
||||
acl? ( kernel_linux? ( sys-apps/acl ) )
|
||||
crypt? ( dev-libs/libsodium:= )
|
||||
cscope? ( dev-util/cscope )
|
||||
gpm? ( >=sys-libs/gpm-1.19.3 )
|
||||
lua? ( ${LUA_DEPS}
|
||||
$(lua_gen_impl_dep 'deprecated' lua5-1)
|
||||
)
|
||||
~app-editors/vim-core-${PV}
|
||||
!<app-editors/vim-core-8.2.4328-r1
|
||||
vim-pager? ( app-editors/vim-core[-minimal] )
|
||||
perl? ( dev-lang/perl:= )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
racket? ( dev-scheme/racket )
|
||||
ruby? ( ${RUBY_DEPS} )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
sound? ( media-libs/libcanberra )
|
||||
tcl? ( dev-lang/tcl:0= )
|
||||
X? ( x11-libs/libXt )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
# configure runs the Lua interpreter
|
||||
BDEPEND="
|
||||
sys-devel/autoconf
|
||||
lua? ( ${LUA_DEPS} )
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
pkg_setup() {
|
||||
# people with broken alphabets run into trouble. bug #82186.
|
||||
unset LANG LC_ALL
|
||||
export LC_COLLATE="C"
|
||||
|
||||
# Gnome sandbox silliness. bug #114475.
|
||||
mkdir -p "${T}"/home || die "mkdir failed"
|
||||
export HOME="${T}"/home
|
||||
|
||||
use lua && lua-single_pkg_setup
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} != 9999* ]] ; then
|
||||
rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || die
|
||||
|
||||
# Gentoo patches to fix runtime issues, cross-compile errors, etc
|
||||
eapply "${WORKDIR}"/patches/
|
||||
fi
|
||||
|
||||
# Fixup a script to use awk instead of nawk
|
||||
sed -i -e \
|
||||
'1s|.*|#!'"${EPREFIX}"'/usr/bin/awk -f|' \
|
||||
"${S}"/runtime/tools/mve.awk || die "mve.awk sed failed"
|
||||
|
||||
# Read vimrc and gvimrc from /etc/vim
|
||||
echo '#define SYS_VIMRC_FILE "'${EPREFIX}'/etc/vim/vimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
echo '#define SYS_GVIMRC_FILE "'${EPREFIX}'/etc/vim/gvimrc"' \
|
||||
>> "${S}"/src/feature.h || die "echo failed"
|
||||
|
||||
# Use exuberant ctags which installs as /usr/bin/exuberant-ctags.
|
||||
# Hopefully this pattern won't break for a while at least.
|
||||
# This fixes bug #29398 (27 Sep 2003 agriffis)
|
||||
sed -i -e \
|
||||
's/\<ctags\("\| [-*.]\)/exuberant-&/g' \
|
||||
"${S}"/runtime/doc/syntax.txt \
|
||||
"${S}"/runtime/doc/tagsrch.txt \
|
||||
"${S}"/runtime/doc/usr_29.txt \
|
||||
"${S}"/runtime/menu.vim \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# Don't be fooled by /usr/include/libc.h. When found, vim thinks
|
||||
# this is NeXT, but it's actually just a file in dev-libs/9libs
|
||||
# This fixes bug #43885 (20 Mar 2004 agriffis)
|
||||
sed -i -e \
|
||||
's/ libc\.h / /' \
|
||||
"${S}"/src/configure.ac || die 'sed failed'
|
||||
|
||||
# gcc on sparc32 has this, uhm, interesting problem with detecting EOF
|
||||
# correctly. To avoid some really entertaining error messages about stuff
|
||||
# which isn't even in the source file being invalid, we'll do some trickery
|
||||
# to make the error never occur. bug 66162 (02 October 2004 ciaranm)
|
||||
find "${S}" -name '*.c' | while read c; do
|
||||
echo >> "$c" || die "echo failed"
|
||||
done
|
||||
|
||||
# conditionally make the manpager.sh script
|
||||
if use vim-pager; then
|
||||
cat > "${S}"/runtime/macros/manpager.sh <<-_EOF_ || die "cat EOF failed"
|
||||
#!/bin/sh
|
||||
sed -e 's/\x1B\[[[:digit:]]\+m//g' | col -b | \\
|
||||
vim \\
|
||||
-c 'let no_plugin_maps = 1' \\
|
||||
-c 'set nolist nomod ft=man ts=8' \\
|
||||
-c 'let g:showmarks_enable=0' \\
|
||||
-c 'runtime! macros/less.vim' -
|
||||
_EOF_
|
||||
fi
|
||||
|
||||
# Try to avoid sandbox problems. Bug #114475.
|
||||
if [[ -d "${S}"/src/po ]]; then
|
||||
sed -i -e \
|
||||
'/-S check.vim/s,..VIM.,ln -s $(VIM) testvim \; ./testvim -X,' \
|
||||
"${S}"/src/po/Makefile || die "sed failed"
|
||||
fi
|
||||
|
||||
cp -v "${S}"/src/config.mk.dist "${S}"/src/auto/config.mk || die "cp failed"
|
||||
|
||||
sed -i -e \
|
||||
"s:\\\$(PERLLIB)/ExtUtils/xsubpp:${EPREFIX}/usr/bin/xsubpp:" \
|
||||
"${S}"/src/Makefile || die 'sed for ExtUtils-ParseXS failed'
|
||||
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
# Fix bug #37354: Disallow -funroll-all-loops on amd64
|
||||
# Bug #57859 suggests that we want to do this for all archs
|
||||
filter-flags -funroll-all-loops
|
||||
|
||||
# Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for
|
||||
# everyone since previous flag filtering bugs have turned out to affect
|
||||
# multiple archs...
|
||||
replace-flags -O3 -O2
|
||||
|
||||
# Fix bug 18245: Prevent "make" from the following chain:
|
||||
# (1) Notice configure.ac is newer than auto/configure
|
||||
# (2) Rebuild auto/configure
|
||||
# (3) Notice auto/configure is newer than auto/config.mk
|
||||
# (4) Run ./configure (with wrong args) to remake auto/config.mk
|
||||
sed -i 's# auto/config\.mk:#:#' src/Makefile || die "Makefile sed failed"
|
||||
rm src/auto/configure || die "rm failed"
|
||||
emake -j1 -C src autoconf
|
||||
|
||||
# This should fix a sandbox violation (see bug #24447). The hvc
|
||||
# things are for ppc64, see bug #86433.
|
||||
for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do
|
||||
if [[ -e "${file}" ]]; then
|
||||
addwrite ${file}
|
||||
fi
|
||||
done
|
||||
|
||||
if use minimal; then
|
||||
myconf=(
|
||||
--with-features=tiny
|
||||
--disable-nls
|
||||
--disable-canberra
|
||||
--disable-acl
|
||||
--enable-gui=no
|
||||
--without-x
|
||||
--disable-darwin
|
||||
--disable-luainterp
|
||||
--disable-perlinterp
|
||||
--disable-pythoninterp
|
||||
--disable-mzschemeinterp
|
||||
--disable-rubyinterp
|
||||
--disable-selinux
|
||||
--disable-tclinterp
|
||||
--disable-gpm
|
||||
)
|
||||
else
|
||||
use debug && append-flags "-DDEBUG"
|
||||
|
||||
myconf=(
|
||||
--with-features=huge
|
||||
$(use_enable sound canberra)
|
||||
$(use_enable acl)
|
||||
$(use_enable crypt libsodium)
|
||||
$(use_enable cscope)
|
||||
$(use_enable gpm)
|
||||
$(use_enable nls)
|
||||
$(use_enable perl perlinterp)
|
||||
$(use_enable python python3interp)
|
||||
$(use_with python python3-command "${PYTHON}")
|
||||
$(use_enable racket mzschemeinterp)
|
||||
$(use_enable ruby rubyinterp)
|
||||
$(use_enable selinux)
|
||||
$(use_enable tcl tclinterp)
|
||||
$(use_enable terminal)
|
||||
)
|
||||
|
||||
# --with-features=huge forces on cscope even if we --disable it. We need
|
||||
# to sed this out to avoid screwiness. (1 Sep 2004 ciaranm)
|
||||
if ! use cscope; then
|
||||
sed -i -e \
|
||||
'/# define FEAT_CSCOPE/d' src/feature.h || die "sed failed"
|
||||
fi
|
||||
|
||||
if use lua; then
|
||||
myconf+=(
|
||||
--enable-luainterp
|
||||
$(use_with lua_single_target_luajit luajit)
|
||||
--with-lua-prefix="${EPREFIX}/usr"
|
||||
)
|
||||
fi
|
||||
|
||||
# don't test USE=X here ... see bug #19115
|
||||
# but need to provide a way to link against X ... see bug #20093
|
||||
myconf+=(
|
||||
--enable-gui=no
|
||||
--disable-darwin
|
||||
$(use_with X x)
|
||||
)
|
||||
fi
|
||||
|
||||
# let package manager strip binaries
|
||||
export ac_cv_prog_STRIP="$(type -P true ) faking strip"
|
||||
|
||||
# keep prefix env contained within the EPREFIX
|
||||
use prefix && myconf+=( --without-local-dir )
|
||||
|
||||
econf \
|
||||
--with-modified-by=Gentoo-${PVR} \
|
||||
"${myconf[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# The following allows emake to be used
|
||||
emake -j1 -C src auto/osdef.h objects
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
einfo
|
||||
einfo "Starting vim tests. Several error messages will be shown"
|
||||
einfo "while the tests run. This is normal behaviour and does not"
|
||||
einfo "indicate a fault."
|
||||
einfo
|
||||
ewarn "If the tests fail, your terminal may be left in a strange"
|
||||
ewarn "state. Usually, running 'reset' will fix this."
|
||||
einfo
|
||||
|
||||
# Don't let vim talk to X
|
||||
unset DISPLAY
|
||||
|
||||
# Arch and opensuse seem to do this and at this point, I'm willing
|
||||
# to try anything to avoid random test hangs!
|
||||
export TERM=xterm
|
||||
|
||||
# See https://github.com/vim/vim/blob/f08b0eb8691ff09f98bc4beef986ece1c521655f/src/testdir/runtest.vim#L5
|
||||
# for more information on test variables we can use.
|
||||
# Note that certain variables need vim-compatible regex (not PCRE), see e.g.
|
||||
# http://www.softpanorama.org/Editors/Vimorama/vim_regular_expressions.shtml.
|
||||
#
|
||||
# Skipped tests:
|
||||
# - Test_expand_star_star
|
||||
# Hangs because of a recursive symlink in /usr/include/nodejs (bug #616680)
|
||||
# - Test_exrc
|
||||
# Looks in wrong location? (bug #742710)
|
||||
# - Test_job_tty_in_out
|
||||
# Fragile and depends on TERM(?)
|
||||
# - Test_spelldump_bang
|
||||
# Hangs.
|
||||
# - Test_fuzzy_completion_env
|
||||
# Too sensitive to leaked environment variables.
|
||||
# - Test_term_mouse_multiple_clicks_to_select_mode
|
||||
# Hangs.
|
||||
export TEST_SKIP_PAT='\(Test_expand_star_star\|Test_exrc\|Test_job_tty_in_out\|Test_spelldump_bang\|Test_fuzzy_completion_env\|Test_term_mouse_multiple_clicks_to_select_mode\)'
|
||||
|
||||
emake -j1 -C src/testdir nongui
|
||||
}
|
||||
|
||||
# Call eselect vi update with --if-unset
|
||||
# to respect user's choice (bug #187449)
|
||||
eselect_vi_update() {
|
||||
ebegin "Calling eselect vi update"
|
||||
eselect vi update --if-unset
|
||||
eend $?
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local vimfiles=/usr/share/vim/vim${VIM_VERSION/.}
|
||||
|
||||
# Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are
|
||||
# managed by eselect-vi
|
||||
dobin src/vim
|
||||
if ! use minimal ; then
|
||||
dosym vim /usr/bin/vimdiff
|
||||
fi
|
||||
dosym vim /usr/bin/rvim
|
||||
dosym vim /usr/bin/rview
|
||||
if use vim-pager ; then
|
||||
dosym ${vimfiles}/macros/less.sh /usr/bin/vimpager
|
||||
dosym ${vimfiles}/macros/manpager.sh /usr/bin/vimmanpager
|
||||
insinto ${vimfiles}/macros
|
||||
doins runtime/macros/manpager.sh
|
||||
fperms a+x ${vimfiles}/macros/manpager.sh
|
||||
fi
|
||||
|
||||
domenu runtime/vim.desktop
|
||||
|
||||
newbashcomp "${FILESDIR}"/${PN}-completion ${PN}
|
||||
|
||||
# keep in sync with 'complete ... -F' list
|
||||
bashcomp_alias vim ex vi view rvim rview vimdiff
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# Call eselect vi update
|
||||
eselect_vi_update
|
||||
|
||||
# update desktop file mime cache
|
||||
xdg_desktop_database_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Update documentation tags (from vim-doc.eclass)
|
||||
update_vim_helptags
|
||||
|
||||
# Call eselect vi update
|
||||
eselect_vi_update
|
||||
|
||||
# update desktop file mime cache
|
||||
xdg_desktop_database_update
|
||||
}
|
Binary file not shown.
@ -0,0 +1 @@
|
||||
DIST git-modes-1.4.0.tar.gz 18218 BLAKE2B 7e08ce42d683d4a8224df6255304e3beb7db2a5d97f6c758bf229e020dd3c0e5ed5f75acf9a7fdf8a5d313b904cc59d0de1419244067a5975d5174f45aca0071 SHA512 2511575a4d5d578fca5bde50e103d0fe777eed9bc3c520d5172aff7c65baa47a0a0f633e0950b7efb3eaa891debd3e34df3612d713412d547bb58733c9f00cbc
|
@ -0,0 +1,2 @@
|
||||
(add-to-list 'load-path "@SITELISP@")
|
||||
(load "git-modes-autoloads" nil t)
|
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
NEED_EMACS=24.3
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Emacs major modes for editing Git configuration files"
|
||||
HOMEPAGE="https://github.com/magit/git-modes/"
|
||||
SRC_URI="https://github.com/magit/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3+"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SLOT="0"
|
||||
|
||||
DOCS=( README.md )
|
||||
SITEFILE="50${PN}-gentoo.el"
|
||||
|
||||
src_compile() {
|
||||
elisp-compile *.el
|
||||
elisp-make-autoload-file
|
||||
}
|
@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>gnu-emacs@gentoo.org</email>
|
||||
<name>Gentoo GNU Emacs project</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<bugs-to>https://github.com/magit/git-modes/issues/</bugs-to>
|
||||
<remote-id type="github">magit/git-modes</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
@ -1,2 +1,3 @@
|
||||
DIST lean-mode-20211220.tar.gz 46406 BLAKE2B ff7663ae41befed9ce30aeeb0462e6877b827367823e97330b18c741db76162f49b0ce0dca58585892d173e91e290d155320f97416ff4306958dd38f1e452e83 SHA512 23f1d24a4ffdcbff0266cf6e3fd6ddefcd6f380ecab6e21a73cfcbb2a281200f3c22482a19b97988af316a3e206ab3069abf4eb3d45a9ccff7e0f18018b1dab5
|
||||
DIST lean-mode-20220124.tar.gz 46725 BLAKE2B 3f1f31cd6005570439d609f3cf9565f5adbd124772264ccc301bf8f9dda23d0b023e0afc703cfc572c3faee3498315852873effa3963203d6567ed029a1e14ed SHA512 292193a83847e034625d60825eec669b3d26591fab9e93448fc8e685935db5bfbb3417ae4e8d32facead40d02031b67f15dbaa52f7214b70343e7e677aa3cd6a
|
||||
DIST lean-mode-20220501.tar.gz 46795 BLAKE2B 1d1024f8eb29f787c26368945086d61d06375ee675379833856b72fd47b6fb35e2b24a4dc6d2bb1cc333fe8fc4ed760e13a1e6978e539a994d1907ce774761b6 SHA512 131d71f863e59a0cdfd5eeab015e9e9869e4edd87b1cb45d5864aa13858aac5d8b05843a82a38db9a6e27fe6d54633bdb473509ab9ce179dc216a3fd8f89ad30
|
||||
|
@ -0,0 +1,33 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
H=362bc6fa3efb1874c525ed6b4b6f24f76af22596
|
||||
NEED_EMACS=24.3
|
||||
|
||||
inherit elisp
|
||||
|
||||
DESCRIPTION="Emacs mode for the Lean 3 theorem prover"
|
||||
HOMEPAGE="https://github.com/leanprover/lean-mode/"
|
||||
SRC_URI="https://github.com/leanprover/${PN}/archive/${H}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}"/${PN}-${H}
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
|
||||
BDEPEND="
|
||||
>=app-emacs/dash-2.18.1
|
||||
>=app-emacs/f-0.19.0
|
||||
>=app-emacs/flycheck-32
|
||||
>=app-emacs/s-1.10.0
|
||||
"
|
||||
RDEPEND="
|
||||
${BDEPEND}
|
||||
sci-mathematics/lean:0/3
|
||||
"
|
||||
|
||||
DOCS=( README.md )
|
||||
ELISP_REMOVE="company-lean.el helm-lean.el"
|
||||
SITEFILE="50${PN}-gentoo.el"
|
Binary file not shown.
@ -0,0 +1,98 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DESCRIPTION="Grub2 built as a PV grub per the Xen PV Boot Protocol"
|
||||
HOMEPAGE="https://wiki.xenproject.org/wiki/PvGrub2"
|
||||
|
||||
LICENSE="BSD-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="pvh"
|
||||
|
||||
DEPEND="
|
||||
sys-boot/grub:2=[grub_platforms_xen]
|
||||
pvh? ( >=sys-boot/grub-2.04:2=[grub_platforms_xen-pvh] )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
RESTRICT="binchecks strip test"
|
||||
|
||||
src_configure() {
|
||||
:
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
|
||||
normal (memdisk)/grub.cfg
|
||||
EOF
|
||||
|
||||
cat > "${S}/grub.cfg" <<- EOF || die
|
||||
if search -s -f /boot/xen/pvboot-x86_64.elf ; then
|
||||
echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
|
||||
multiboot "/boot/xen/pvboot-x86_64.elf"
|
||||
boot
|
||||
fi
|
||||
|
||||
if search -s -f /xen/pvboot-x86_64.elf ; then
|
||||
echo "Chainloading (${root})/xen/pvboot-x86_64.elf"
|
||||
multiboot "/xen/pvboot-x86_64.elf"
|
||||
boot
|
||||
fi
|
||||
|
||||
if search -s -f /boot/grub/grub.cfg ; then
|
||||
echo "Reading (${root})/boot/grub/grub.cfg"
|
||||
configfile /boot/grub/grub.cfg
|
||||
fi
|
||||
|
||||
if search -s -f /grub/grub.cfg ; then
|
||||
echo "Reading (${root})/grub/grub.cfg"
|
||||
configfile /grub/grub.cfg
|
||||
fi
|
||||
EOF
|
||||
|
||||
tar cf memdisk.tar grub.cfg || die "failed to tar"
|
||||
|
||||
local grub_mkimage=grub-mkimage
|
||||
if type grub2-mkimage &> /dev/null; then
|
||||
grub_mkimage=grub2-mkimage
|
||||
fi
|
||||
|
||||
local args=(
|
||||
"${grub_mkimage}"
|
||||
-O x86_64-xen
|
||||
-c grub-bootstrap.cfg
|
||||
-m memdisk.tar
|
||||
-p "${EPREFIX}"/usr/lib/grub/x86_64-xen/*.mod
|
||||
-o grub-x86_64-xen.bin
|
||||
)
|
||||
|
||||
echo "${args[@]}"
|
||||
"${args[@]}" || die "failed to grub-mkimage"
|
||||
|
||||
if use pvh; then
|
||||
local args=(
|
||||
"${grub_mkimage}"
|
||||
-O i386-xen_pvh
|
||||
-c grub-bootstrap.cfg
|
||||
-m memdisk.tar
|
||||
-p "${EPREFIX}"/usr/lib/grub/i386-xen_pvh/*.mod
|
||||
-o grub-i386-xen_pvh.bin
|
||||
)
|
||||
|
||||
echo "${args[@]}"
|
||||
"${args[@]}" || die "failed to grub-mkimage"
|
||||
fi
|
||||
|
||||
}
|
||||
|
||||
src_install() {
|
||||
exeinto /usr/libexec/xen/bin
|
||||
doexe grub-x86_64-xen.bin
|
||||
if use pvh; then
|
||||
doexe grub-i386-xen_pvh.bin
|
||||
fi
|
||||
}
|
@ -1,33 +0,0 @@
|
||||
From 1805ab024b10e8185175de7ce9c9b9db87fd0897 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Zeimetz <bernd@bzed.de>
|
||||
Date: Sun, 10 Jan 2016 22:18:04 +0100
|
||||
Subject: [PATCH] Fix mount.vmhgfs symlinks if DESTDIR is used
|
||||
|
||||
Without this change symlinks in the form of
|
||||
sbin/mount.vmhgfs -> /build/open-vm-tools-10.0.5-3227872/debian/open-vm-tools/usr/sbin/mount.vmhgfs
|
||||
are being produced, if DESTDIR was uset while running make install.
|
||||
---
|
||||
open-vm-tools/hgfsmounter/Makefile.am | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/open-vm-tools/hgfsmounter/Makefile.am b/open-vm-tools/hgfsmounter/Makefile.am
|
||||
index e48417e..fe70892 100644
|
||||
--- a/open-vm-tools/hgfsmounter/Makefile.am
|
||||
+++ b/open-vm-tools/hgfsmounter/Makefile.am
|
||||
@@ -33,14 +33,14 @@ install-exec-hook:
|
||||
mv $(DESTDIR)$(sbindir)/mount.vmhgfs \
|
||||
$(DESTDIR)$(sbindir)/mount_vmhgfs
|
||||
-$(MKDIR_P) $(DESTDIR)/sbin
|
||||
- -$(LN_S) $(DESTDIR)$(sbindir)/mount_vmhgfs \
|
||||
+ -$(LN_S) $(sbindir)/mount_vmhgfs \
|
||||
$(DESTDIR)/sbin/mount_vmhgfs &> /dev/null
|
||||
uninstall-hook:
|
||||
rm -f $(DESTDIR)$(sbindir)/mount_vmhgfs
|
||||
else
|
||||
install-exec-hook:
|
||||
-$(MKDIR_P) $(DESTDIR)/sbin
|
||||
- -$(LN_S) $(DESTDIR)$(sbindir)/mount.vmhgfs \
|
||||
+ -$(LN_S) $(sbindir)/mount.vmhgfs \
|
||||
$(DESTDIR)/sbin/mount.vmhgfs &> /dev/null
|
||||
uninstall-hook:
|
||||
rm -f $(DESTDIR)/sbin/mount.vmhgfs
|
@ -1,148 +0,0 @@
|
||||
From 82931a1bcb39d5132910c7fb2ddc086c51d06662 Mon Sep 17 00:00:00 2001
|
||||
From: John Wolfe <jwolfe@vmware.com>
|
||||
Date: Mon, 19 Apr 2021 11:08:10 -0700
|
||||
Subject: [PATCH] Fix issues using GCC 11 with gtk >= 3.20 and glib >=2.66.3
|
||||
|
||||
With glib2.0 releases >= 2.66.3, glib header files inside an
|
||||
extern "C" block will encounter compilation errors. This has
|
||||
impacted several OSS packages. Consumers of newer versions of glib2.0
|
||||
must not include glib headers in an extern "C" block.
|
||||
|
||||
GTK 3.20 has deprecated gdk_display_get_device_manager(); using the
|
||||
newer gdk_display_get_default_seat() when the GTK version is >= 3.20.
|
||||
|
||||
The return value from read() must be used to avoid an unused result
|
||||
warning from the compiler. This can be avoided by using dummy retyping
|
||||
in the case where the return value is not used or in this case, using
|
||||
the returned value in a debug log message.
|
||||
|
||||
Pull Request: https://github.com/vmware/open-vm-tools/pull/505
|
||||
Addresses: https://github.com/vmware/open-vm-tools/issues/500
|
||||
Addresses: https://github.com/vmware/open-vm-tools/issues/509
|
||||
---
|
||||
open-vm-tools/AUTHORS | 3 +++
|
||||
open-vm-tools/lib/include/tracer.hh | 4 +---
|
||||
.../services/plugins/dndcp/copyPasteUIX11.cpp | 3 ++-
|
||||
.../plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp | 6 +++---
|
||||
open-vm-tools/services/plugins/dndcp/dndUIX11.cpp | 11 +++++++++--
|
||||
open-vm-tools/services/plugins/dndcp/dndcp.cpp | 7 ++++++-
|
||||
6 files changed, 24 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/open-vm-tools/lib/include/tracer.hh b/open-vm-tools/lib/include/tracer.hh
|
||||
index 697caedbc..e9ae892cb 100644
|
||||
--- a/open-vm-tools/lib/include/tracer.hh
|
||||
+++ b/open-vm-tools/lib/include/tracer.hh
|
||||
@@ -1,5 +1,5 @@
|
||||
/*********************************************************
|
||||
- * Copyright (C) 2013-2017 VMware, Inc. All rights reserved.
|
||||
+ * Copyright (C) 2013-2017,2021 VMware, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published
|
||||
@@ -28,9 +28,7 @@
|
||||
|
||||
#include "vm_basic_defs.h"
|
||||
|
||||
-extern "C" {
|
||||
#include "glib.h"
|
||||
-}
|
||||
|
||||
|
||||
#ifdef VMX86_DEVEL
|
||||
diff --git a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
|
||||
index 68212ab8b..080dc3d76 100644
|
||||
--- a/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
|
||||
+++ b/open-vm-tools/services/plugins/dndcp/copyPasteUIX11.cpp
|
||||
@@ -1,5 +1,5 @@
|
||||
/*********************************************************
|
||||
- * Copyright (C) 2009-2020 VMware, Inc. All rights reserved.
|
||||
+ * Copyright (C) 2009-2021 VMware, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published
|
||||
@@ -1666,6 +1666,7 @@ CopyPasteUIX11::FileBlockMonitorThread(void *arg) // IN
|
||||
char buf[sizeof(VMBLOCK_FUSE_READ_RESPONSE)];
|
||||
ssize_t size;
|
||||
size = read(fd, buf, sizeof(VMBLOCK_FUSE_READ_RESPONSE));
|
||||
+ g_debug("%s: Number of bytes read : %" FMTSZ "u\n", __FUNCTION__, size);
|
||||
/*
|
||||
* The current thread will block in read function until
|
||||
* any other application accesses the file params->fileBlockName
|
||||
diff --git a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
|
||||
index 9b70984fc..424481baa 100644
|
||||
--- a/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
|
||||
+++ b/open-vm-tools/services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
|
||||
@@ -1,5 +1,5 @@
|
||||
/*********************************************************
|
||||
- * Copyright (C) 2010-2017 VMware, Inc. All rights reserved.
|
||||
+ * Copyright (C) 2010-2017,2021 VMware, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published
|
||||
@@ -31,13 +31,13 @@
|
||||
|
||||
#include "dnd.h"
|
||||
|
||||
-extern "C" {
|
||||
#ifdef VMX86_TOOLS
|
||||
#include "vmware/tools/guestrpc.h"
|
||||
#else
|
||||
+extern "C" {
|
||||
#include "guest_rpc.h"
|
||||
-#endif
|
||||
}
|
||||
+#endif
|
||||
|
||||
#define GUEST_RPC_CMD_STR_DND "dnd.transport"
|
||||
#define GUEST_RPC_CMD_STR_CP "copypaste.transport"
|
||||
diff --git a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
|
||||
index 50c2bf5e1..03cf3e0d7 100644
|
||||
--- a/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
|
||||
+++ b/open-vm-tools/services/plugins/dndcp/dndUIX11.cpp
|
||||
@@ -1,5 +1,5 @@
|
||||
/*********************************************************
|
||||
- * Copyright (C) 2009-2019 VMware, Inc. All rights reserved.
|
||||
+ * Copyright (C) 2009-2021 VMware, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published
|
||||
@@ -467,8 +467,15 @@ DnDUIX11::OnSrcDragBegin(const CPClipboard *clip, // IN
|
||||
#ifndef GTK3
|
||||
event.device = gdk_device_get_core_pointer();
|
||||
#else
|
||||
- GdkDeviceManager* manager = gdk_display_get_device_manager(gdk_window_get_display(event.window));
|
||||
+# if GTK_MINOR_VERSION >= 20
|
||||
+ GdkSeat *seat =
|
||||
+ gdk_display_get_default_seat(gdk_window_get_display(event.window));
|
||||
+ event.device = gdk_seat_get_pointer(seat);
|
||||
+# else
|
||||
+ GdkDeviceManager *manager =
|
||||
+ gdk_display_get_device_manager(gdk_window_get_display(event.window));
|
||||
event.device = gdk_device_manager_get_client_pointer(manager);
|
||||
+# endif
|
||||
#endif
|
||||
event.x_root = mOrigin.get_x();
|
||||
event.y_root = mOrigin.get_y();
|
||||
diff --git a/open-vm-tools/services/plugins/dndcp/dndcp.cpp b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
|
||||
index d1013f4a7..bae4c94c7 100644
|
||||
--- a/open-vm-tools/services/plugins/dndcp/dndcp.cpp
|
||||
+++ b/open-vm-tools/services/plugins/dndcp/dndcp.cpp
|
||||
@@ -1,5 +1,5 @@
|
||||
/*********************************************************
|
||||
- * Copyright (C) 2010-2019 VMware, Inc. All rights reserved.
|
||||
+ * Copyright (C) 2010-2021 VMware, Inc. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU Lesser General Public License as published
|
||||
@@ -31,6 +31,11 @@
|
||||
|
||||
#define G_LOG_DOMAIN "dndcp"
|
||||
|
||||
+/**
|
||||
+ * Include glib.h before encountering any extern "C".
|
||||
+ */
|
||||
+#include <glib.h>
|
||||
+
|
||||
extern "C" {
|
||||
#include "vmware/guestrpc/tclodefs.h"
|
||||
#include "vmware/tools/plugin.h"
|
Binary file not shown.
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
DIST ibus-typing-booster-2.15.22.tar.gz 10779889 BLAKE2B c35306fd3556178257047573f58658ea44d1ceee341964bee5719f5e4509f385e6b1ca520324c66bc417a74d89e5b3eebc7a7413ce2e60398bc83f992eb8a07e SHA512 ae7683434111c7c267c1eb05e88609e0895308443a0510e9eba67000681bb3dfddcf5a652f33bd4b63c7aed10fe2109eafcaae19a4052ae008e92ab9314ae907
|
||||
DIST ibus-typing-booster-2.15.25.tar.gz 10785373 BLAKE2B 555105c9da7a813491e3ab8cbea0a8b52239c7ffb39dc7a6ea47e461d81515ba3cdf1adfe8d8cebd74bb2b00775eac3b19956aa9e4c4b696e6083418e2b73e91 SHA512 927f118eac1a641f658b82ef72ec8cd728727910f6c2bd77a14d9195a8203fd40b771e68a04d7ea7c5f5c1f2cd4ff37b7e041282e63f301348b60af462e041ea
|
||||
DIST ibus-typing-booster-2.16.0.tar.gz 10811558 BLAKE2B d171972f3c6242234ce73112e4ea8fde9e713e102a7fb2111017e7489811c1128146582e2a9a60f49dfca8b5282949415fb33e79b7c1be16521dba2dd03536fa SHA512 a90ea11a72d770765ef55ff6fc288bf6ddfa5e5ae1c7393f195ed3466a207022872f5e27f9629101b8b31e26c84dc8512e4cd261b2c503fd98daa8438e47dfb9
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue