summaryrefslogtreecommitdiffstats
path: root/trinity-base
diff options
context:
space:
mode:
authorChris <xchrisx@uber.space>2020-01-26 21:56:05 +0100
committerTDE Gitea <gitea@mirror.git.trinitydesktop.org>2020-01-28 14:51:29 +0000
commitcc1f828e85180149b1d38867a8a49ea31c4b4a4a (patch)
treec17306b950a9a8ee734dc34803c04035312afb40 /trinity-base
parent6750f2e403ceb8381920682ad69b0a2d3b36df15 (diff)
downloadtde-packaging-gentoo-cc1f828e85180149b1d38867a8a49ea31c4b4a4a.tar.gz
tde-packaging-gentoo-cc1f828e85180149b1d38867a8a49ea31c4b4a4a.zip
Live ebuilds: Add preliminary LibreSSL support and fix certs.
Also: Add ca-certificates as dependency. Remove superfluous dependencies. Signed-off-by: Chris <xchrisx@uber.space>
Diffstat (limited to 'trinity-base')
-rw-r--r--trinity-base/krdc/krdc-9999.ebuild6
-rw-r--r--trinity-base/krfb/krfb-9999.ebuild6
-rw-r--r--trinity-base/tdelibs/tdelibs-9999.ebuild12
3 files changed, 14 insertions, 10 deletions
diff --git a/trinity-base/krdc/krdc-9999.ebuild b/trinity-base/krdc/krdc-9999.ebuild
index 33f847d2..e1a85466 100644
--- a/trinity-base/krdc/krdc-9999.ebuild
+++ b/trinity-base/krdc/krdc-9999.ebuild
@@ -8,10 +8,10 @@ TRINITY_MODULE_NAME="tdenetwork"
inherit trinity-meta-2
DESCRIPTION="Trinity remote desktop connection (RDP and VNC) client"
-IUSE="rdp slp"
+IUSE="rdp slp libressl"
-DEPEND="
- dev-libs/openssl:=
+DEPEND="!libressl? ( dev-libs/openssl:= )
+ libressl? ( dev-libs/libressl:= )
slp? ( net-libs/openslp )
x11-libs/libXext"
RDEPEND="${DEPEND}
diff --git a/trinity-base/krfb/krfb-9999.ebuild b/trinity-base/krfb/krfb-9999.ebuild
index 6baf431b..233a3365 100644
--- a/trinity-base/krfb/krfb-9999.ebuild
+++ b/trinity-base/krfb/krfb-9999.ebuild
@@ -9,10 +9,10 @@ inherit trinity-meta-2
DESCRIPTION="VNC-compatible server to share Trinity desktops"
-IUSE="slp"
+IUSE="slp libressl"
-DEPEND="
- dev-libs/openssl:=
+DEPEND="!libressl? ( dev-libs/openssl:= )
+ libressl? ( dev-libs/libressl:= )
slp? ( net-libs/openslp )
x11-libs/libXext"
RDEPEND="${DEPEND}"
diff --git a/trinity-base/tdelibs/tdelibs-9999.ebuild b/trinity-base/tdelibs/tdelibs-9999.ebuild
index b70a4f89..ec224dbd 100644
--- a/trinity-base/tdelibs/tdelibs-9999.ebuild
+++ b/trinity-base/tdelibs/tdelibs-9999.ebuild
@@ -19,7 +19,7 @@ SLOT="${TRINITY_VER}"
IUSE+=" alsa avahi cups consolekit cryptsetup fam jpeg2k lua
lzma networkmanager openexr pcsc-lite spell sudo tiff
- utempter upower xcomposite hwlib +xrandr "
+ utempter upower xcomposite hwlib libressl +xrandr "
MY_DEPEND="=dev-tqt/tqtinterface-${PV}
dev-libs/libxslt
@@ -27,13 +27,13 @@ MY_DEPEND="=dev-tqt/tqtinterface-${PV}
dev-libs/libpcre
net-dns/libidn
app-text/ghostscript-gpl
- dev-libs/openssl:=
+ !libressl? ( dev-libs/openssl:= )
+ libressl? ( dev-libs/libressl:= )
+ app-misc/ca-certificates
media-libs/fontconfig
media-libs/freetype
=media-libs/libart_lgpl-${PV}
- sys-apps/dbus
=dev-libs/dbus-1-tqt-${PV}
- x11-libs/libXcursor
x11-libs/libXrender
alsa? ( media-libs/alsa-lib )
avahi? ( net-dns/avahi )
@@ -98,6 +98,10 @@ src_configure() {
src_install() {
trinity-base-2_src_install
+
+ # Make TDE to use our system certificates
+ rm -f "${D}"${TDEDIR}/share/apps/kssl/ca-bundle.crt || die
+ dosym /etc/ssl/certs/ca-certificates.crt ${TDEDIR}/share/apps/kssl/ca-bundle.crt
dodir /etc/env.d
# TDE expects that the install path is listed first in TDEDIRS and the user