Merge remote-tracking branch 'upstream/master' into master

This commit is contained in:
Andreas Westman Dorcsak 2020-10-13 07:09:13 +02:00
commit bf186432d1
13 changed files with 580 additions and 11 deletions

View File

@ -0,0 +1 @@
DIST heirloom-mailx_12.5.orig.tar.gz 324085 BLAKE2B 8f3b7177d9db8bb399f9e3e8d51258d93ea6ea9556f514c9107b0733f2f999ec9c685107c8a11717526051c242d5f20d4b6fc1a572175539874904cb31fcc452 SHA512 eb4aea0c668354f6fe28137f72bf49d291ce58671a7b70c7775777532e17e59ac52156e68f02937256f0a2f90c132b7c0948553b55daad92a664bd8bbb64774f

View File

@ -0,0 +1,232 @@
Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
Date: 2014-12-27
Initial Package Version: 12.5
Upstream Status: Unknown
Origin: Changes to remove SSL2 found at debian, remainder from redhat.
Description: Removes support for SSL2 (openssl no longer supports it)
and fixes CVE-2004-2771 [sic] and CVE-2014-7844.
diff -Naur heirloom-mailx-12.5/extern.h heirloom-mailx-12.5-patched/extern.h
--- heirloom-mailx-12.5/extern.h 2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/extern.h 2014-12-27 01:26:59.654169487 +0000
@@ -396,7 +396,7 @@
int is_fileaddr(char *name);
struct name *usermap(struct name *names);
struct name *cat(struct name *n1, struct name *n2);
-char **unpack(struct name *np);
+char **unpack(struct name *smopts, struct name *np);
struct name *elide(struct name *names);
int count(struct name *np);
struct name *delete_alternates(struct name *np);
diff -Naur heirloom-mailx-12.5/fio.c heirloom-mailx-12.5-patched/fio.c
--- heirloom-mailx-12.5/fio.c 2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/fio.c 2014-12-27 01:27:15.634561413 +0000
@@ -43,12 +43,15 @@
#endif /* not lint */
#include "rcv.h"
+
+#ifndef HAVE_WORDEXP
+#error wordexp support is required
+#endif
+
#include <sys/stat.h>
#include <sys/file.h>
#include <sys/wait.h>
-#ifdef HAVE_WORDEXP
#include <wordexp.h>
-#endif /* HAVE_WORDEXP */
#include <unistd.h>
#if defined (USE_NSS)
@@ -481,7 +484,6 @@
static char *
globname(char *name)
{
-#ifdef HAVE_WORDEXP
wordexp_t we;
char *cp;
sigset_t nset;
@@ -495,7 +497,7 @@
sigemptyset(&nset);
sigaddset(&nset, SIGCHLD);
sigprocmask(SIG_BLOCK, &nset, NULL);
- i = wordexp(name, &we, 0);
+ i = wordexp(name, &we, WRDE_NOCMD);
sigprocmask(SIG_UNBLOCK, &nset, NULL);
switch (i) {
case 0:
@@ -527,65 +529,6 @@
}
wordfree(&we);
return cp;
-#else /* !HAVE_WORDEXP */
- char xname[PATHSIZE];
- char cmdbuf[PATHSIZE]; /* also used for file names */
- int pid, l;
- char *cp, *shell;
- int pivec[2];
- extern int wait_status;
- struct stat sbuf;
-
- if (pipe(pivec) < 0) {
- perror("pipe");
- return name;
- }
- snprintf(cmdbuf, sizeof cmdbuf, "echo %s", name);
- if ((shell = value("SHELL")) == NULL)
- shell = SHELL;
- pid = start_command(shell, 0, -1, pivec[1], "-c", cmdbuf, NULL);
- if (pid < 0) {
- close(pivec[0]);
- close(pivec[1]);
- return NULL;
- }
- close(pivec[1]);
-again:
- l = read(pivec[0], xname, sizeof xname);
- if (l < 0) {
- if (errno == EINTR)
- goto again;
- perror("read");
- close(pivec[0]);
- return NULL;
- }
- close(pivec[0]);
- if (wait_child(pid) < 0 && WTERMSIG(wait_status) != SIGPIPE) {
- fprintf(stderr, catgets(catd, CATSET, 81,
- "\"%s\": Expansion failed.\n"), name);
- return NULL;
- }
- if (l == 0) {
- fprintf(stderr, catgets(catd, CATSET, 82,
- "\"%s\": No match.\n"), name);
- return NULL;
- }
- if (l == sizeof xname) {
- fprintf(stderr, catgets(catd, CATSET, 83,
- "\"%s\": Expansion buffer overflow.\n"), name);
- return NULL;
- }
- xname[l] = 0;
- for (cp = &xname[l-1]; *cp == '\n' && cp > xname; cp--)
- ;
- cp[1] = '\0';
- if (strchr(xname, ' ') && stat(xname, &sbuf) < 0) {
- fprintf(stderr, catgets(catd, CATSET, 84,
- "\"%s\": Ambiguous.\n"), name);
- return NULL;
- }
- return savestr(xname);
-#endif /* !HAVE_WORDEXP */
}
/*
diff -Naur heirloom-mailx-12.5/mailx.1 heirloom-mailx-12.5-patched/mailx.1
--- heirloom-mailx-12.5/mailx.1 2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/mailx.1 2014-12-27 01:26:53.838026857 +0000
@@ -656,6 +656,14 @@
will have the system wide alias expanded
as all mail goes through sendmail.
.SS "Recipient address specifications"
+If the
+.I expandaddr
+option is not set (the default), recipient addresses must be names of
+local mailboxes or Internet mail addresses.
+.PP
+If the
+.I expandaddr
+option is set, the following rules apply:
When an address is used to name a recipient
(in any of To, Cc, or Bcc),
names of local mail folders
@@ -2391,6 +2399,12 @@
If this option is set,
\fImailx\fR starts even with an empty mailbox.
.TP
+.B expandaddr
+Causes
+.I mailx
+to expand message recipient addresses, as explained in the section,
+Recipient address specifications.
+.TP
.B flipr
Exchanges the
.I Respond
@@ -3575,7 +3589,7 @@
.TP
.B ssl-method
Selects a SSL/TLS protocol version;
-valid values are `ssl2', `ssl3', and `tls1'.
+valid values are `ssl3', and `tls1'.
If unset, the method is selected automatically,
if possible.
.TP
diff -Naur heirloom-mailx-12.5/names.c heirloom-mailx-12.5-patched/names.c
--- heirloom-mailx-12.5/names.c 2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/names.c 2014-12-27 01:26:59.654169487 +0000
@@ -268,6 +268,9 @@
FILE *fout, *fin;
int ispipe;
+ if (value("expandaddr") == NULL)
+ return names;
+
top = names;
np = names;
time(&now);
@@ -546,7 +549,7 @@
* Return an error if the name list won't fit.
*/
char **
-unpack(struct name *np)
+unpack(struct name *smopts, struct name *np)
{
char **ap, **top;
struct name *n;
@@ -561,7 +564,7 @@
* the terminating 0 pointer. Additional spots may be needed
* to pass along -f to the host mailer.
*/
- extra = 2;
+ extra = 3 + count(smopts);
extra++;
metoo = value("metoo") != NULL;
if (metoo)
@@ -578,6 +581,10 @@
*ap++ = "-m";
if (verbose)
*ap++ = "-v";
+ for (; smopts != NULL; smopts = smopts->n_flink)
+ if ((smopts->n_type & GDEL) == 0)
+ *ap++ = smopts->n_name;
+ *ap++ = "--";
for (; n != NULL; n = n->n_flink)
if ((n->n_type & GDEL) == 0)
*ap++ = n->n_name;
diff -Naur heirloom-mailx-12.5/openssl.c heirloom-mailx-12.5-patched/openssl.c
--- heirloom-mailx-12.5/openssl.c 2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/openssl.c 2014-12-27 01:26:34.385549867 +0000
@@ -216,9 +216,7 @@
cp = ssl_method_string(uhp);
if (cp != NULL) {
- if (equal(cp, "ssl2"))
- method = SSLv2_client_method();
- else if (equal(cp, "ssl3"))
+ if (equal(cp, "ssl3"))
method = SSLv3_client_method();
else if (equal(cp, "tls1"))
method = TLSv1_client_method();
diff -Naur heirloom-mailx-12.5/sendout.c heirloom-mailx-12.5-patched/sendout.c
--- heirloom-mailx-12.5/sendout.c 2011-04-26 22:23:22.000000000 +0100
+++ heirloom-mailx-12.5-patched/sendout.c 2014-12-27 01:26:59.654169487 +0000
@@ -835,7 +835,7 @@
#endif /* HAVE_SOCKETS */
if ((smtp = value("smtp")) == NULL) {
- args = unpack(cat(mailargs, to));
+ args = unpack(mailargs, to);
if (debug || value("debug")) {
printf(catgets(catd, CATSET, 181,
"Sendmail arguments:"));

View File

@ -0,0 +1,39 @@
# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
LICENSE="BSD"
DESCRIPTION="The mailx utility from CentOS"
HOMEPAGE="https://www.debian.org/"
SRC_URI="https://yorune.pl/gentoo/${CATEGORY}/${PN}/${PN}_${PVR}.orig.tar.gz http://ftp.debian.org/debian/pool/main/h/${PN}/${PN}_${PVR}.orig.tar.gz"
KEYWORDS="~amd64"
DEPEND="net-libs/liblockfile
dev-libs/libbsd
virtual/mta
mail-client/mailx-support"
RDEPEND="${DEPEND}
!virtual/mailx
!mail-client/nail
!net-mail/mailutils
!mail-client/mailx"
SLOT="0"
src_prepare() {
eapply -p1 "${FILESDIR}/${PN}-${PVR}-fixes-1.patch"
eapply_user
}
src_compile(){
sed 's@<openssl@<openssl-1.0/openssl@' -i openssl.c fio.c makeconfig
emake LDFLAGS+="-L /usr/lib/openssl-1.0/" SENDMAIL=/usr/sbin/sendmail
}
src_install(){
emake PREFIX="${D}/usr" SYSCONFDIR="${D}/etc" UCBINSTALL="/usr/bin/install" install
install -v -m755 -d "${D}/usr/share/doc/heirloom-mailx-12.5"
install -v -m644 README "${D}/usr/share/doc/heirloom-mailx-12.5"
}

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>y0rune@aol.com</email>
<name>Marcin Woźniak</name>
</maintainer>
</pkgmetadata>

View File

@ -1 +1 @@
DIST meganz-sdk-3.7.1.tar.gz 3293250 BLAKE2B c18578dd134060680070601aae4f4778f14228931cfb06e4a1b2e98622a58866354c56fc529ea8f34a6980581d464ff76c82806c456cd4b9193b083b3ad367a5 SHA512 f6ce9e286e69c1560d1f7a7b13b28e8e2ba77802e777a29bef132a09f32f5fc379e5c7f64845424081d682723c53760593442e0a71d01a497b83723c875b2d9a
DIST meganz-sdk-3.7.3.tar.gz 3322179 BLAKE2B c8f5f9bea8b1e030f24ae79f0fddf8027d9f770b30762caa1f013d1ca19b40a8bf7451ad6b056743c55d71c48014298f005cbc0f3b24edd932da3ba3edba62e0 SHA512 d85f04cc1cd4c1320f0e01a6d2bd52522f502f91f06ba275c8dbf0f3fb751ac195054376cf97fe7eb93934c37f68614164232486f5d3c296dc830896ca60dea9

View File

@ -1 +0,0 @@
meganz-sdk-9999.ebuild

View File

@ -0,0 +1,107 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic qmake-utils autotools db-use
if [[ -z ${PV%%*9999} ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN%-*}/${PN#*-}.git"
else
SRC_URI="https://github.com/meganz/sdk/archive/v${PV}d.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/sdk-${PV}d"
RESTRICT="primaryuri"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="MEGA C++ SDK"
HOMEPAGE="https://github.com/meganz/sdk"
LICENSE="BSD-2"
SLOT="0/30701"
IUSE="examples ffmpeg freeimage fuse hardened inotify libuv mediainfo qt raw +sqlite test"
REQUIRED_USE="
examples? ( sqlite )
fuse? ( examples )
"
# tests require a working mega.nz account and login details provided via $MEGA_EMAIL and $MEGA_PWD
RESTRICT+=" test"
RDEPEND="
dev-libs/crypto++
sys-libs/zlib
dev-libs/libpcre:3[cxx]
dev-libs/openssl:0
net-dns/c-ares
net-misc/curl
sqlite? ( dev-db/sqlite:3 )
!sqlite? ( sys-libs/db:*[cxx] )
examples? (
sys-libs/readline:0
fuse? ( sys-fs/fuse:0 )
)
freeimage? ( media-libs/freeimage )
libuv? ( dev-libs/libuv )
dev-libs/libsodium
mediainfo? ( media-libs/libmediainfo )
ffmpeg? ( virtual/ffmpeg )
raw? ( media-libs/libraw )
"
DEPEND="
${RDEPEND}
test? ( dev-cpp/gtest )
"
pkg_setup() {
use sqlite || append-cppflags "-I$(db_includedir)"
}
src_prepare() {
default
use qt && sed \
-e '/SOURCES += src\// s:+:-:' \
-e '/!exists.*config.h/ s:!::' \
-e 's:CONFIG(USE_MEGAAPI) {:&\nLIBS += -lmega:' \
-e '/^unix:!macx {/,/^}/d' \
-i bindings/qt/sdk.pri
use test && sed \
-e 's:\$(GTEST_DIR)/lib/lib\([^ ]\+\)\.la:-l\1:g' \
-e 's: tests/tool_purge_account::' \
-i tests/include.am
eautoreconf
}
src_configure() {
local myeconfargs=(
--enable-chat
$(use_enable inotify)
$(use_enable hardened gcc-hardening)
$(use_with libuv)
$(use_with !sqlite db)
$(use_with sqlite)
$(use_enable examples)
$(use_enable test tests)
$(use_with freeimage)
$(use_with fuse)
$(use_with mediainfo libmediainfo)
$(use_with ffmpeg)
$(use_with raw libraw)
)
use test && myeconfargs+=(
--with-gtest="${EPREFIX}/usr"
)
econf "${myeconfargs[@]}"
}
src_test() {
export MEGA_EMAIL MEGA_PWD MEGA_EMAIL_AUX="${MEGA_EMAIL}" MEGA_PWD_AUX="${MEGA_PWD}"
default
}
src_install() {
default
doheader -r include/mega
use qt || return
insinto /usr/share/${PN}/bindings/qt
doins bindings/qt/*.{h,cpp,pri}
}

View File

@ -8,22 +8,15 @@ if [[ -z ${PV%%*9999} ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/${PN%-*}/${PN#*-}.git"
else
inherit vcs-snapshot
MY_PV="b2948c7"
[[ -n ${PV%%*_p*} ]] && MY_PV="v${PV}"
SRC_URI="
mirror://githubcl/${PN%-*}/${PN#*-}/tar.gz/${MY_PV}
-> ${P}.tar.gz
"
SRC_URI="https://github.com/meganz/sdk/archive/v${PV}d.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/sdk-${PV}d"
RESTRICT="primaryuri"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="MEGA C++ SDK"
HOMEPAGE="https://github.com/meganz/sdk"
LICENSE="BSD-2"
# awk '/define/ {print $3}' include/mega/version.h|awk 'BEGIN{RS="";FS="\n"}{printf $1*10000+$2*100+$3}'
SLOT="0/30701"
IUSE="examples ffmpeg freeimage fuse hardened inotify libuv mediainfo qt raw +sqlite test"
REQUIRED_USE="

View File

@ -1 +1,2 @@
DIST torbrowser-launcher-0.3.2.tar.gz 227363 BLAKE2B b3e35f546ef84aec02a3b75068b08a6d60f9f41f6194d1bf25862c48780f77d72e4443e594add04c5a0d44cf01bcfc8c04d6d7d67c767c2cc75cc8b4a9c42f9c SHA512 26c5517723c730591ea5c4b81e30728e9db7323afcafc99d17a178d4300bad3df8731ffb063cc53fe189a3b5e2872395c913b9eea6595acac7f31ff4a1c5f105
DIST torbrowser-launcher-0.3.3.tar.gz 187239 BLAKE2B 8792e5474efe32124b401287bfbe01caef40381a35bb09062903da09c51f246b6092da2a3ffb84531c8f2be1bb45079263b8e46c98c5efa370abc6200289ac99 SHA512 129bcc3006d1cda92ab521c5106cacccf934b964b737f28bd89de6872f061b9e039678ca34b8ed30f348a0a47c3d87661b103f48e19a7edfae72a69512220fe6

View File

@ -0,0 +1,59 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1 xdg
DESCRIPTION="A program to download, updated, and run the Tor Browser Bundle"
HOMEPAGE="https://github.com/micahflee/torbrowser-launcher"
if [[ "${PV}" == *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/micahflee/${PN}.git"
KEYWORDS=""
else
SRC_URI="https://github.com/micahflee/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
fi
RESTRICT="mirror"
LICENSE="MIT"
SLOT="0"
IUSE="apparmor"
RDEPEND="
app-crypt/gpgme[python,${PYTHON_USEDEP}]
dev-python/PyQt5[${PYTHON_USEDEP},widgets]
dev-python/PySocks[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
apparmor? ( sys-libs/libapparmor )
"
PATCHES=(
"${FILESDIR}/${PN}-distro.patch"
)
python_install_all() {
distutils-r1_python_install_all
# delete apparmor profiles
if ! use apparmor; then
rm -r "${D}/etc/apparmor.d" || die "Failed to remove apparmor profiles"
rmdir "${D}/etc" || die "Failed to remove empty directory"
fi
}
pkg_postinst() {
xdg_desktop_database_update
xdg_icon_cache_update
elog "For updating over system TOR install net-vpn/tor and dev-python/txsocksx"
}
pkg_postrm() {
xdg_desktop_database_update
xdg_icon_cache_update
}

View File

@ -0,0 +1 @@
DIST ungoogled-chromium-bin-85.0.4183.102.tar.xz 85331136 BLAKE2B 7700270f53c215bb1302a67edb272169f32aa7e2c48093a73857974504cd158b87bc6d39016ac604867399bbf5418cbda9d50ebcfc58c053c6ae09711c299f87 SHA512 d64980b6e54b57d48eec42fbe4dbe19bc855157bfb95a3cfd1de3644ec05b20d8ffc5358f355eacc1e81f7cde5b1bfe2f0161c96e5f8c485f920d65f5e32e50f

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<upstream>
<remote-id type="github">Eloston/ungoogled-chromium</remote-id>
</upstream>
</pkgmetadata>

View File

@ -0,0 +1,122 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
UNGCH_PN="${PN/-bin/}"
UNGCH_PV="${PV}-1.1"
CHROMIUM_LANGS="
am ar bg bn ca cs da de el en-GB en-US es es-419 et fa fi fil fr gu he hi
hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv
sw ta te th tr uk vi zh-CN zh-TW
"
inherit chromium-2 desktop eutils xdg
DESCRIPTION="Google Chromium, sans integration with Google (binary package)"
HOMEPAGE="https://ungoogled-software.github.io/"
SRC_URI="https://github.com/Eloston/ungoogled-chromium-binaries/releases/download/${UNGCH_PV}/ungoogled-chromium_${UNGCH_PV}_linux.tar.xz -> ${P}.tar.xz
"
RESTRICT="mirror"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64"
IUSE="gnome-keyring"
RDEPEND="
${DEPEND}
>=media-libs/libpng-1.6.34
>=net-print/cups-2.0.0
app-accessibility/at-spi2-atk
app-accessibility/at-spi2-core
app-arch/bzip2
dev-libs/atk
dev-libs/expat
dev-libs/fribidi
dev-libs/glib
dev-libs/gmp
dev-libs/gobject-introspection
dev-libs/libbsd
dev-libs/libffi
dev-libs/libpcre
dev-libs/libpthread-stubs
dev-libs/libtasn1
dev-libs/libunistring
dev-libs/nettle
dev-libs/nspr
dev-libs/nss
media-gfx/graphite2
media-libs/alsa-lib
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz
media-libs/libepoxy
net-dns/libidn2
net-libs/gnutls
sys-libs/glibc
sys-libs/zlib
x11-libs/cairo
x11-libs/gdk-pixbuf
x11-libs/gtk+:3
x11-libs/libXScrnSaver
x11-libs/libXau
x11-libs/libXcomposite
x11-libs/libXcursor
x11-libs/libXdamage
x11-libs/libXdmcp
x11-libs/libXext
x11-libs/libXfixes
x11-libs/libXi
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXrender
x11-libs/libXtst
x11-libs/libXxf86vm
x11-libs/libxcb
x11-libs/libxshmfence
x11-libs/pango
x11-libs/pixman
"
QA_PREBUILT="*"
S="${WORKDIR}/${UNGCH_PN}_${UNGCH_PV}_linux"
src_prepare() {
pushd "${S}/locales" || die
chromium_remove_language_paks
popd || die
default
}
src_install() {
declare UNGCH_HOME="/opt/${PN}"
dodir "${UNGCH_HOME%/*}"
insinto "${UNGCH_HOME}"
doins -r *
exeinto "${UNGCH_HOME}"
doexe chrome
dosym "${UNGCH_HOME}/chrome" "${UNGCH_HOME}/${UNGCH_PN}"
dosym "${UNGCH_HOME}/${UNGCH_PN}" "/usr/bin/${PN}"
make_desktop_entry "${PN}" "${UNGCH_PN^} (binary)" "chromium" "Network;WebBrowser;"
}
pkg_postinst() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
elog "Some versions have cleaning cookies on browser exit enabled by default."
elog "This can be toggled in the browser settings."
}
pkg_postrm() {
xdg_desktop_database_update
xdg_mimeinfo_database_update
}