Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (2167e9462720e695567955ccd90e90c8387e6cb0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (2167e9462720e695567955ccd90e90c8387e6cb0)
  • Date: Sun, 2 Jun 2019 01:32:52 +0000

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

shell-term-fm/rdesktop/DETAILS | 6 +++---
shell-term-fm/rdesktop/HISTORY | 5 +++++
shell-term-fm/rdesktop/PRE_BUILD | 4 +++-
shell-term-fm/rdesktop/config.patch | 27 ++++++++++++++++++---------
4 files changed, 29 insertions(+), 13 deletions(-)

New commits:
commit 2167e9462720e695567955ccd90e90c8387e6cb0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

rdesktop: => 1.8.6 [security]

(cherry picked from commit f36e4059b55e86b26e83ff1006a2c09e870c3ad4)

diff --git a/shell-term-fm/rdesktop/DETAILS b/shell-term-fm/rdesktop/DETAILS
index db61376..2abc1ac 100755
--- a/shell-term-fm/rdesktop/DETAILS
+++ b/shell-term-fm/rdesktop/DETAILS
@@ -1,9 +1,9 @@
SPELL=rdesktop
- VERSION=1.8.4
- SECURITY_PATCH=3
+ VERSION=1.8.6
+ SECURITY_PATCH=4
SOURCE=${SPELL}-${VERSION}.tar.gz

SOURCE_URL[0]=https://github.com/rdesktop/${SPELL}/releases/download/v${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
+
SOURCE_HASH=sha512:a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://www.rdesktop.org
ENTERED=20010922
diff --git a/shell-term-fm/rdesktop/HISTORY b/shell-term-fm/rdesktop/HISTORY
index fe59c9f..e7628ec 100644
--- a/shell-term-fm/rdesktop/HISTORY
+++ b/shell-term-fm/rdesktop/HISTORY
@@ -1,3 +1,8 @@
+2019-06-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.8.6; SECURITY_PATCH++
+ * PRE_BUILD: re-run autoconf
+ * config.patch: updated
+
2019-01-13 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.8.4; SECURITY_PATCH++; updated source
URL
* PRE_BUILD: apply patch
diff --git a/shell-term-fm/rdesktop/PRE_BUILD
b/shell-term-fm/rdesktop/PRE_BUILD
index 7dd0a93..deab8bc 100755
--- a/shell-term-fm/rdesktop/PRE_BUILD
+++ b/shell-term-fm/rdesktop/PRE_BUILD
@@ -5,4 +5,6 @@ patch -p0 < "${SPELL_DIRECTORY}/config.patch" &&

if [[ $(get_spell_provider ${SPELL} SSL) == "libressl" ]]; then
patch -p0 < "${SPELL_DIRECTORY}/libressl.patch"
-fi
+fi &&
+
+autoreconf -fi
diff --git a/shell-term-fm/rdesktop/config.patch
b/shell-term-fm/rdesktop/config.patch
index a1c5aa1..0b8bd4e 100644
--- a/shell-term-fm/rdesktop/config.patch
+++ b/shell-term-fm/rdesktop/config.patch
@@ -1,11 +1,20 @@
---- configure.orig 2012-01-09 17:11:57.000000000 +0400
-+++ configure 2012-01-23 02:08:14.837525307 +0400
-@@ -5555,7 +5555,7 @@
-
-
- # Check whether --with-libvncserver was given.
--if test "${with_libvncserver+set}" = set; then :
-+if test "x$with_libvncserver" != "xno"; then :
- withval=$with_libvncserver;
+--- configure.ac.orig 2019-05-16 03:42:56.000000000 -0700
++++ configure.ac 2019-06-01 18:23:07.029227730 -0700
+@@ -251,7 +251,7 @@
+ )
+ AC_ARG_WITH(libvncserver,
+ [ --with-libvncserver make rdp2vnc],
+- [
++ [AS_IF([test "x$withval" != xno],
VNCINC=`$vncserverconfig --cflags`
+ AC_SUBST(VNCINC)
+ LDVNC=`$vncserverconfig --libs`
+@@ -260,7 +260,7 @@
+ AC_SUBST(VNCLINK)
+ RDP2VNCTARGET="rdp2vnc"
+ AC_SUBST(RDP2VNCTARGET)
+- ]
++ )]
+ )

+ #



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (2167e9462720e695567955ccd90e90c8387e6cb0), Vlad Glagolev, 06/01/2019

Archive powered by MHonArc 2.6.24.

Top of Page