Commit 62098c4a authored by Liguros - Gitlab CI/CD [develop]'s avatar Liguros - Gitlab CI/CD [develop]
Browse files

updates

merged:

  xor: a45cc06882de5d2c19ee7457d4c868447f64840c
  cinnamon: ed51a9b32dff1dbbf0fdba4317a009373d0dd114
  mate-desktop: f22fd0e11de7e239c3897d0a71bb66f7b3eba218
  fusion809: c50aa839559497bb0229bf2e8f1fad7c5207efdd
  steam: f1c5a7f8471c1b111bfc8a7d1a40cecc85c47f11
  go-overlay: 435b13dcc2cdc2dc5b5fee57005d8deb2caa114c
  stefantalpalaru: 3bce1f6a55722aa8a6d9c10064b271366328d219
  ports: 0ad381e3deaa5d1d63d6d5702b72880cb72b9a18
  gentoo-libressl: eea877be8b5f120e5ca67b3d0bf34acd908ae960
  gentoo-staging: 5ce69e4c84fbee2104d498124730b15a446eeffc
  calculatelinux: 24ea942da7dda700e6a9b91eacd4d4f57721756a
  thegreatmcpain: d372a69ed0c48058a16d5919d45e746f93408391
  pf4public: c40ca890befb9e965c68eefebcba0ac16c1d9563
  kit-fixups: 844c3034a92615c461d560209ee896b8ef2f97e8
parent 14ce2e8f
......@@ -2,3 +2,4 @@ DIST prelude-manager-3.0.0.tar.gz 1286459 BLAKE2B 0909b0d7501909de51cd580b6ce22a
DIST prelude-manager-4.0.0.tar.gz 1353116 BLAKE2B 20aaa28797a67fd310807735bb08f0c21c3bd95950598a86c45144ee2474785aef0c7d569732c817509ae8ae52ffce5f43f3c071931f2960578681f91a8c9504 SHA512 793ed37c71eb4884cbbb49b11c7388ee291a35252255458ceadb4ce10d1392e8bad423f95e31bff4550a9cf1d04139e43729352554fd847048b6c8d14f813a8a
DIST prelude-manager-4.1.1.tar.gz 1415847 BLAKE2B 7cea7209a680a38cf597a9678f3ac9a31b00187e4597e1aeed91bbe57a55981279e8399ee8c90a044e40873e595ca648736fa79090420d9bcd72b82588f7bb5e SHA512 4e9d09b56eb7ec55144caa06a04e458bf0462d8c0064a34aac5aa0fb96a30fbefe5a4956185b606ec58fc410e4cbcac8721e521b3396303b3bff88808042a966
DIST prelude-manager-5.1.0.tar.gz 1510054 BLAKE2B 88ef666a76c58af1a8164c033b7e9c1ea869a18a66cb489d8c7fdbf1fa331006e7844aea4386ea3185902afd108af5eb1b46ee17686032de460d8c5b336fd658 SHA512 1f0e993f9bf684ec65a741db3cdaf537dc47bc2f77652a37c194db422dd5da2aa33b78d3ee454c78b28b44c022eacc7246ee99187b0b8779c12f3a67320d89a3
DIST prelude-manager-5.2.0.tar.gz 1564874 BLAKE2B cd00aca6a533cdb47e311c4a8eed17d514f39de3b1c5a4b334b8e8c8c2d318b36d1fc843bf36be0383da2ae5f4e41a936fc70ad92d5b55ab56e9a34c36fc1dae SHA512 49f8fd10c7f3c5c816e6bc49ce8d47abfe56b4b0a1d8a564774f67ef5f0e3058c62ef9c88ca709b1fe2961ed832269fe811ddf57d4118879fa561970561507d6
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools systemd tmpfiles
DESCRIPTION="Bus communication for all Prelude modules"
HOMEPAGE="https://www.prelude-siem.org"
SRC_URI="https://www.prelude-siem.org/pkg/src/5.2.0/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="dbx geoip snmp tcpwrapper xml"
RDEPEND="net-libs/gnutls:=
>=dev-libs/libprelude-5.2.0
<dev-libs/libprelude-6
dbx? (
>=dev-libs/libpreludedb-5.2.0
<dev-libs/libpreludedb-6
)
geoip? ( dev-libs/libmaxminddb )
snmp? ( net-analyzer/net-snmp )
tcpwrapper? ( sys-apps/tcp-wrappers )
xml? ( dev-libs/libxml2 )"
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${PN}-3.1.0-run.patch"
)
src_prepare() {
default
eautoreconf
}
src_configure() {
local myconf=(
--localstatedir="${EPREFIX}/var"
$(use_with dbx libpreludedb-prefix)
$(use_enable geoip libmaxminddb)
$(use_enable snmp snmp)
$(use_with tcpwrapper libwrap)
$(usex xml '' '--without-xml-prefix')
)
econf "${myconf[@]}"
}
src_install() {
default
rm -rv "${ED}/run" || die "rm failed"
keepdir /var/spool/prelude-manager{,/failover,/scheduler}
keepdir /var/spool/prelude/prelude-manager{,/failover,/scheduler}
find "${D}" -name '*.la' -delete || die
systemd_dounit "${FILESDIR}/${PN}.service"
newtmpfiles "${FILESDIR}/${PN}.run" "${PN}.conf"
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
}
pkg_postinst() {
tmpfiles_process "${PN}.conf"
}
DIST selint-1.1.0.tar.gz 283926 BLAKE2B 0908f8830ce4b569c54e8c025dd92c39af59172fee0b8061f5b8cdaf61222979a78c3726a5647af9161ce7e4a7ddd5bee64772afecd2024368afa76294b3d317 SHA512 3af358e0f42a285a0360ce2b4db9014ef1e4f0b792623007f88cf510799080975d9e44817e8911bbd32b141704a7fd11e1b4d8f91e124d0fa91c38f71a978c91
......@@ -2,11 +2,11 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>tex@gentoo.org</email>
<name>Gentoo TeX Project</name>
<email>selinux@gentoo.org</email>
<name>SELinux Team</name>
</maintainer>
<upstream>
<remote-id type="github">plk/biblatex-apa</remote-id>
<remote-id type="github">TresysTechnology/selint</remote-id>
</upstream>
<origin>gentoo-staging</origin>
</pkgmetadata>
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit toolchain-funcs
DESCRIPTION="Policy Analysis Tools for SELinux"
HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
if [[ ${PV} == 9999 ]] ; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
else
SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/confuse
dev-libs/uthash"
DEPEND="${RDEPEND}
test? ( dev-libs/check )"
src_prepare() {
[[ ${PV} == 9999 ]] && eautoreconf
eapply_user
}
src_configure() {
econf $(use_with test check)
}
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
inherit toolchain-funcs
DESCRIPTION="Policy Analysis Tools for SELinux"
HOMEPAGE="https://github.com/TresysTechnology/selint/wiki"
if [[ ${PV} == 9999 ]] ; then
inherit autotools git-r3
EGIT_REPO_URI="https://github.com/TresysTechnology/selint.git"
else
SRC_URI="https://github.com/TresysTechnology/selint/releases/download/v${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="Apache-2.0"
SLOT="0"
IUSE="test"
RESTRICT="!test? ( test )"
RDEPEND="
dev-libs/confuse
dev-libs/uthash"
DEPEND="${RDEPEND}
test? ( dev-libs/check )"
src_prepare() {
[[ ${PV} == 9999 ]] && eautoreconf
eapply_user
}
src_configure() {
econf $(use_with test check)
}
DIST unarj-2.65.tgz 21568 BLAKE2B 9b4d15782ebbac841937fc30c049e300d4c4324cb0cd7a585a228454ee35e7177e73cb6523e6cd03a509f9ad20103790ce3eac77552956557290414d57af2bdd SHA512 1b152063017042a343f49e487e5284c3d4c548222baa52e2066cefe6d2add60213ffd2653f42e38582681a1fd89efb8f1d3a6ef6389fc33e5397760ad9e72386
Index: unarj-2.65/unarj.c
===================================================================
--- unarj-2.65.orig/unarj.c
+++ unarj-2.65/unarj.c
@@ -217,7 +217,7 @@ static uchar arj_flags;
static short method;
static uint file_mode;
static ulong time_stamp;
-static short entry_pos;
+static ushort entry_pos;
static ushort host_data;
static uchar *get_ptr;
static UCRC file_crc;
@@ -608,6 +608,7 @@ char *name;
error(M_BADHEADR, "");
crc = CRC_MASK;
+ memset(header, 0, sizeof(header));
fread_crc(header, (int) headersize, fd);
header_crc = fget_crc(fd);
if ((crc ^ CRC_MASK) != header_crc)
@@ -632,9 +633,13 @@ char *name;
if (origsize < 0 || compsize < 0)
error(M_HEADRCRC, "");
+ if(first_hdr_size > headersize-2) /* need two \0 for file and comment */
+ error(M_BADHEADR, "");
hdr_filename = (char *)&header[first_hdr_size];
strncopy(filename, hdr_filename, sizeof(filename));
+ if(entry_pos >= strlen(filename))
+ error(M_BADHEADR, "");
if (host_os != OS)
strparity((uchar *)filename);
if ((arj_flags & PATHSYM_FLAG) != 0)
@@ -733,11 +738,11 @@ extract()
no_output = 0;
if (command == 'E')
- strcpy(name, &filename[entry_pos]);
+ strncopy(name, &filename[entry_pos], sizeof(name));
else
{
strcpy(name, DEFAULT_DIR);
- strcat(name, filename);
+ strncopy(name+strlen(name), filename, sizeof(name)-strlen(name));
}
if (host_os != OS)
Bug: https://bugs.gentoo.org/520478
--- a/unarj.c
+++ b/unarj.c
@@ -699,7 +699,7 @@
}
if ((arj_flags & GARBLE_FLAG) != 0)
{
- printf(M_ENCRYPT);
+ puts(M_ENCRYPT);
printf(M_SKIPPED, filename);
skip();
return -1;
@@ -763,7 +763,7 @@
}
printf(M_EXTRACT, name);
if (host_os != OS && file_type == BINARY_TYPE)
- printf(M_DIFFHOST);
+ puts(M_DIFFHOST);
printf(" ");
crc = CRC_MASK;
@@ -779,10 +779,10 @@
set_ftime_mode(name, time_stamp, file_mode, (uint) host_os);
if ((crc ^ CRC_MASK) == file_crc)
- printf(M_CRCOK);
+ puts(M_CRCOK);
else
{
- printf(M_CRCERROR);
+ puts(M_CRCERROR);
error_count++;
}
return 1;
@@ -808,10 +808,10 @@
decode_f();
if ((crc ^ CRC_MASK) == file_crc)
- printf(M_CRCOK);
+ puts(M_CRCOK);
else
{
- printf(M_CRCERROR);
+ puts(M_CRCERROR);
error_count++;
}
return 1;
@@ -958,7 +958,7 @@
int i;
for (i = 0; M_USAGE[i] != NULL; i++)
- printf(M_USAGE[i]);
+ puts(M_USAGE[i]);
}
int
@@ -973,7 +973,7 @@
argc = ccommand(&argv);
#endif
- printf(M_VERSION);
+ puts(M_VERSION);
if (argc == 1)
{
--- a/environ.c
+++ b/environ.c
@@ -437,7 +437,6 @@
#endif
extern struct tm *localtime();
-extern time_t time();
extern char *strcpy();
extern voidp *malloc();
Index: unarj-2.65/sanitize.c
===================================================================
--- /dev/null
+++ unarj-2.65/sanitize.c
@@ -0,0 +1,81 @@
+/*
+ * Path sanitation code by Ludwig Nussel <ludwig.nussel@suse.de>. Public Domain.
+ */
+
+#include "unarj.h"
+
+#include <string.h>
+#include <limits.h>
+#include <stdio.h>
+
+#ifndef PATH_CHAR
+#define PATH_CHAR '/'
+#endif
+#ifndef MIN
+#define MIN(x,y) ((x)<(y)?(x):(y))
+#endif
+
+/* copy src into dest converting the path to a relative one inside the current
+ * directory. dest must hold at least len bytes */
+void copy_path_relative(char *dest, char *src, size_t len)
+{
+ char* o = dest;
+ char* p = src;
+
+ *o = '\0';
+
+ while(*p && *p == PATH_CHAR) ++p;
+ for(; len && *p;)
+ {
+ src = p;
+ p = strchr(src, PATH_CHAR);
+ if(!p) p = src+strlen(src);
+
+ /* . => skip */
+ if(p-src == 1 && *src == '.' )
+ {
+ if(*p) src = ++p;
+ }
+ /* .. => pop one */
+ else if(p-src == 2 && *src == '.' && src[1] == '.')
+ {
+ if(o != dest)
+ {
+ char* tmp;
+ *o = '\0';
+ tmp = strrchr(dest, PATH_CHAR);
+ if(!tmp)
+ {
+ len += o-dest;
+ o = dest;
+ if(*p) ++p;
+ }
+ else
+ {
+ len += o-tmp;
+ o = tmp;
+ if(*p) ++p;
+ }
+ }
+ else /* nothing to pop */
+ if(*p) ++p;
+ }
+ else
+ {
+ size_t copy;
+ if(o != dest)
+ {
+ --len;
+ *o++ = PATH_CHAR;
+ }
+ copy = MIN(p-src,len);
+ memcpy(o, src, copy);
+ len -= copy;
+ src += copy;
+ o += copy;
+ if(*p) ++p;
+ }
+ while(*p && *p == PATH_CHAR) ++p;
+ }
+ o[len?0:-1] = '\0';
+}
Index: unarj-2.65/unarj.c
===================================================================
--- unarj-2.65.orig/unarj.c
+++ unarj-2.65/unarj.c
@@ -235,6 +235,8 @@ static UCRC crctable[UCHAR_MAX + 1];
/* Functions */
+void copy_path_relative(char *dest, char *src, size_t len);
+
static void
make_crctable()
{
@@ -738,11 +740,11 @@ extract()
no_output = 0;
if (command == 'E')
- strncopy(name, &filename[entry_pos], sizeof(name));
+ copy_path_relative(name, &filename[entry_pos], sizeof(name));
else
{
strcpy(name, DEFAULT_DIR);
- strncopy(name+strlen(name), filename, sizeof(name)-strlen(name));
+ copy_path_relative(name+strlen(name), filename, sizeof(name)-strlen(name));
}
if (host_os != OS)
--- unarj-2.65.orig/Makefile Mon Nov 29 16:47:24 2004
+++ unarj-2.65/Makefile Mon Nov 29 22:46:56 2004
@@ -9,7 +9,9 @@
decode.o: decode.c unarj.h
-OBJS = unarj.o decode.o environ.o
+sanitize.o: sanitize.c unarj.h
+
+OBJS = unarj.o decode.o environ.o sanitize.o
unarj: $(OBJS)
$(CC) $(LDFLAGS) $(OBJS) -o unarj
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
<origin>gentoo-staging</origin>
</pkgmetadata>
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit toolchain-funcs
DESCRIPTION="Utility for opening arj archives"
HOMEPAGE="https://www.arjsoftware.com/"
SRC_URI="mirror://gentoo/${P}.tgz"
LICENSE="arj"
SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
PATCHES=(
"${FILESDIR}"/${P}-CAN-2004-0947.patch
"${FILESDIR}"/${P}-sanitation.patch
"${FILESDIR}"/${P}-gentoo-fbsd.patch
"${FILESDIR}"/${PN}-2.65-Wformat-security.patch
)
src_configure() {
tc-export CC
}
src_install() {
dobin unarj
dodoc unarj.txt technote.txt
}
DIST duplicity-0.8.12.1612.tar.gz 1883596 BLAKE2B 6d3075cdc6cd1f09e60cdbdc5d17867f3686a7e05ce16b908b797b6d2c343ae4c8104793b9f389920112917089086ac8f4c5baffa326c528c023bd40daab8643 SHA512 eac4d1aecd604ece123bd3b5cecd3b65e1213c243db1a3ce25bae58360d666dd1db07ba0a137e7682f99775ece20453c7dc44cd87940b56c0acd05d01149c951
DIST duplicity-0.8.13.tar.gz 1463564 BLAKE2B 31037b0a27e043937f80ee91939793e304c0f7b1c96ee4bc9fe7c06dde69f374a718028d9ae4a98cfd7f866af72e5ed0a8f679319a73428207a99961961e8d2d SHA512 71e07fa17dcf2002a0275bdf236c1b2c30143e276abfdee15e45a75f0adeefc9e784c76a578f90f6ed785f093f364b877551374204e70b930dd5d0920f7e1e75
DIST duplicity-0.8.15.tar.gz 1482647 BLAKE2B e1ddd4232611ad5fcf8faa5135c925aef68a21eb9dec50de7194562a0d4871e9c58132faf9340f71367025dcc84cbc6f1aae69bd37cae294d4200a8ca8b796b3 SHA512 2d048377c839ae56fc2828997c9aa7ba8c339e815e1e2ae738652037508ec276a2c72583687da34408fadd4839011e242b51bc73cca954227fc51db5683c258c
DIST duplicity-0.8.16.tar.gz 1470714 BLAKE2B c9b2df3a7f008d44595b76d5f1d86ef53996d3ad788415e3a0fa122a7246bb5ae92e73be5079b3cef9a9a93a0b106f3be6405882028d79dc49194276a7c8f4a7 SHA512 67e8fe7d5db7da82d82f24892d721e32cd63fcdb8bbc5e60508af06e4c9b637f593ce0b1902c31433c92ed97035880e44368e9a461ad197511171f67de937f73
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{5,6,7,8,9} )
inherit distutils-r1
DESCRIPTION="Secure backup system using gnupg to encrypt data"
HOMEPAGE="https://www.nongnu.org/duplicity/"
SRC_URI="https://code.launchpad.net/${PN}/$(ver_cut 1-2)-series/$(ver_cut 1-3)/+download/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="s3 test"
CDEPEND="
net-libs/librsync
app-crypt/gnupg
dev-python/fasteners[${PYTHON_USEDEP}]
"
DEPEND="${CDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
dev-python/setuptools_scm[${PYTHON_USEDEP}]
test? (
app-arch/par2cmdline
dev-python/mock[${PYTHON_USEDEP}]
dev-python/pexpect[${PYTHON_USEDEP}]
)
"
RDEPEND="${CDEPEND}
dev-python/paramiko[${PYTHON_USEDEP}]
dev-python/future[${PYTHON_USEDEP}]
s3? ( dev-python/boto[${PYTHON_USEDEP}] )
"
RESTRICT="test"
PATCHES=(
"${FILESDIR}/${P}-fix-docs-cmd.patch"
)
python_test() {
esetup.py test
}
pkg_postinst() {
elog "Duplicity has many optional dependencies to support various backends."
elog "Currently it's up to you to install them as necessary."
}
--- duplicity-0.8.16/setup.py 2020-10-12 13:44:15.382732960 -0400
+++ duplicity-0.8.16/setup.py 2020-10-12 13:46:03.553414858 -0400
@@ -93,18 +93,6 @@
u'bin/rdiffdir.1'
]
),
- (u'share/doc/duplicity-%s' % Version,
- [
- u'AUTHORS',
- u'CHANGELOG',
- u'Changelog.GNU',
- u'COPYING',
- u'README.md',
- u'README-LOG.md',
- u'README-REPO.md',
- u'README-TESTING.md',
- ],
- ),
]
if not os.environ.get(u'READTHEDOCS') == u'True':
@@ -340,7 +328,6 @@
],
test_suite=u"testing",
cmdclass={
- u"build_scripts": BuildScriptsCommand,
u"install": InstallCommand,
u"install_data": InstallDataCommand,
u"sdist": SdistCommand,
DIST kde_cdemu-0.7.3.tar.bz2 14140 BLAKE2B 8631e7cd71605a90f2e9d6ac3c1052466a4469bbbf84bcab883b998bab8a562489483580a0a5c31c3e591d47edaba5648fad58227097b6c15e461dc2a6573727 SHA512 40a87c669a091a5eb1dfa38ccf080c5671349bc88600d4ede914d4e94a2d85962fe4d6afa2eb05a2582feef9d9b3a9949b9d2916acfa43089af5c3515c020aad
DIST kde_cdemu-0.8.0.tar.bz2 25461 BLAKE2B 6fbcbdb1fed8e56d903844ef89039f4ec1090cbf7bb465c7a4a6aceb5f4710ec9b201532b54a6b5c463a34b042d9e6a4bf11fbcdeee8f5c53c0334084478ab29 SHA512 3d14d5ff2892622ed7668ea530d5023f81a9783b64d886c63711b3fb54389960479b9572cabafa54657a1d0206cf7506bfeecfef23495ff5105f9923b9b3dfd4
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
MY_PN="kde_cdemu"
KFMIN=5.60.0
QTMIN=5.12.3
inherit ecm
DESCRIPTION="Frontend to cdemu daemon based on KDE Frameworks"
HOMEPAGE="https://www.linux-apps.com/p/998461/"