summaryrefslogtreecommitdiffstats
path: root/shell-term-fm
diff options
context:
space:
mode:
authorVlad Glagolev2019-01-14 00:17:01 +0000
committerVlad Glagolev2019-01-14 00:17:01 +0000
commit402c4bb0410cde03a45cbaf0b647226ded3a7d47 (patch)
treef1ca167abd423c630c65a2044337e0ab8759d12c /shell-term-fm
parent2ed208060b04ad98608160005bc72733de7fba52 (diff)
rdesktop: => 1.8.4 [security]
Diffstat (limited to 'shell-term-fm')
-rwxr-xr-xshell-term-fm/rdesktop/DETAILS12
-rw-r--r--shell-term-fm/rdesktop/HISTORY5
-rwxr-xr-xshell-term-fm/rdesktop/PRE_BUILD8
-rw-r--r--shell-term-fm/rdesktop/libressl.patch11
4 files changed, 28 insertions, 8 deletions
diff --git a/shell-term-fm/rdesktop/DETAILS b/shell-term-fm/rdesktop/DETAILS
index 8d49071177..db61376931 100755
--- a/shell-term-fm/rdesktop/DETAILS
+++ b/shell-term-fm/rdesktop/DETAILS
@@ -1,10 +1,10 @@
SPELL=rdesktop
- VERSION=1.8.3
- SECURITY_PATCH=2
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://sourceforge.net/projects/$SPELL/files/$SPELL/$VERSION/$SOURCE/download
- SOURCE_HASH=sha512:06b94ad3b09430b05e424ef31a3e6f2388190b4920e348603cb66a414244896e0dc8906b9f12920e9406cf153ffa7f6507b23bf6713c3a675c0540a8ef57902d
+ VERSION=1.8.4
+ SECURITY_PATCH=3
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+ SOURCE_URL[0]=https://github.com/rdesktop/${SPELL}/releases/download/v${VERSION}/${SOURCE}
+ SOURCE_HASH=sha512:9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://www.rdesktop.org
ENTERED=20010922
LICENSE[0]=GPL3
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index 9e472c61a0..fe59c9f374 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,8 @@
+2019-01-13 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 1.8.4; SECURITY_PATCH++; updated source URL
+ * PRE_BUILD: apply patch
+ * libressl.patch: added, to fix build with libressl
+
2014-11-12 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: updated spell to 1.8.3
diff --git a/shell-term-fm/rdesktop/PRE_BUILD b/shell-term-fm/rdesktop/PRE_BUILD
index 5aa3cfd6e2..7dd0a93c7a 100755
--- a/shell-term-fm/rdesktop/PRE_BUILD
+++ b/shell-term-fm/rdesktop/PRE_BUILD
@@ -1,4 +1,8 @@
default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
+cd "${SOURCE_DIRECTORY}" &&
-patch -p0 < "$SPELL_DIRECTORY/config.patch"
+patch -p0 < "${SPELL_DIRECTORY}/config.patch" &&
+
+if [[ $(get_spell_provider ${SPELL} SSL) == "libressl" ]]; then
+ patch -p0 < "${SPELL_DIRECTORY}/libressl.patch"
+fi
diff --git a/shell-term-fm/rdesktop/libressl.patch b/shell-term-fm/rdesktop/libressl.patch
new file mode 100644
index 0000000000..93411cea4b
--- /dev/null
+++ b/shell-term-fm/rdesktop/libressl.patch
@@ -0,0 +1,11 @@
+--- ssl.c.orig 2019-01-02 05:50:34.000000000 -0800
++++ ssl.c 2019-01-13 16:07:54.902828390 -0800
+@@ -225,7 +225,7 @@
+ BIGNUM *e = NULL;
+ BIGNUM *n = NULL;
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
+ e = rkey->e;
+ n = rkey->n;
+ #else