On 6/19/19 9:38 AM, Espen Martinsen wrote:
Hi Folks!
I've been tasked to do a test of a PR to rdesktop for oi-userland.
This is for my report on
https://www.illumos.org/issues/10691#change-25406
I've managed to do a clone of oi-userland: git clone
https://github.com/OpenIndiana/oi-userland.git
And setup the environment: cd components ; gmake setup
Then I try building rdesktop as-is: cd desktop/rdesktop ; gmake publish
And this works fine, I get a fresh compiled version of 1.8.3post
Then, I'm told to apply the PR in
https://github.com/OpenIndiana/oi-userland/pull/5025.
When I try to ask "how", I get a hint on trying
https://patch-diff.githubusercontent.com/raw/OpenIndiana/oi-userland/pull/5025.patch
and rebuild
I download this .patch file and put it in
components/esktop/rdesktop/patches directory, and tries to rebuild.
And it stops with a prompt saying "File to patch: "
like this:
gmake publish
/usr/gnu/bin/patch -d
/export/home/esm/utv/OI/oi-userland/components/desktop/rdesktop/rdesktop-1f13bf5c5e86cbc99a6f0492fcdcd38cf0da2105
--strip=1 --backup --version-control=numbered < patches/5025.patch
can't find file to patch at input line 18
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 6f3d5fe948096d8e3751581b6b340d14a31d5b69 Mon Sep 17 00:00:00 2001
|From: Michal Nowak <mno...@startmail.com>
|Date: Mon, 20 May 2019 09:50:01 +0200
|Subject: [PATCH] 10691 Want rdesktop with GSS-API and TLS v1.3
|
|---
| components/desktop/rdesktop/Makefile | 38 +-
| .../rdesktop/patches/02-g11n-i18n-title.patch | 8 +-
| .../desktop/rdesktop/patches/03-gssapi.patch | 10 +-
| .../desktop/rdesktop/patches/04-CVEs.patch | 733 ------------------
| 4 files changed, 35 insertions(+), 754 deletions(-)
| delete mode 100644 components/desktop/rdesktop/patches/04-CVEs.patch
|
|diff --git a/components/desktop/rdesktop/Makefile
b/components/desktop/rdesktop/Makefile
|index a0fc80ac0d..e9c34dcdf0 100644
|--- a/components/desktop/rdesktop/Makefile
|+++ b/components/desktop/rdesktop/Makefile
--------------------------
File to patch:
I'll guess I'm doing something really stupid... can someone give me a
hint on how to deply this PR (patch) onm the rdekstop component. As you
sure understand, I'm not a developer......
I am sorry for the short-circuited suggestion, I thought patching things
in-place will be the most straightforward thing for you to do. Just for
the record, the patch was meant to be placed in the component's
directory and applied like this:
$ gpatch -p4 < ./5025.patch
But I understand you found a better way to do it. That's great. Looking
forward to your testing results! Make sure to state, what you tested and
what host version was used (Windows version etc.).
Thanks,
Michal
_______________________________________________
openindiana-discuss mailing list
openindiana-discuss@openindiana.org
https://openindiana.org/mailman/listinfo/openindiana-discuss
