From mike.gabriel@das-netzwerkteam.de Thu Jun 26 08:10:58 2014 Received: (at 302) by bugs.x2go.org; 26 Jun 2014 06:10:59 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,WEIRD_PORT autolearn=ham version=3.3.2 Received: from freya.das-netzwerkteam.de (freya.das-netzwerkteam.de [88.198.48.199]) by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id B31E95DB1B for <302@bugs.x2go.org>; Thu, 26 Jun 2014 08:10:58 +0200 (CEST) Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98]) by freya.das-netzwerkteam.de (Postfix) with ESMTPS id 6E0262AD5; Thu, 26 Jun 2014 08:10:58 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 5EED93B9EC; Thu, 26 Jun 2014 08:10:58 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de Received: from grimnir.das-netzwerkteam.de ([127.0.0.1]) by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GYpji9m9i6OS; Thu, 26 Jun 2014 08:10:58 +0200 (CEST) Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTPS id 252DD3B9E8; Thu, 26 Jun 2014 08:10:58 +0200 (CEST) Received: from pD9E9F59B.dip0.t-ipconnect.de (pD9E9F59B.dip0.t-ipconnect.de [217.233.245.155]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP; Thu, 26 Jun 2014 06:10:58 +0000 Date: Thu, 26 Jun 2014 06:10:58 +0000 Message-ID: <20140626061058.Horde.0pr2cxjBJe2ofUG9-_Irjg1@mail.das-netzwerkteam.de> From: Mike Gabriel To: Oleksandr Shneyder , 302@bugs.x2go.org Subject: Patch review for #302 (was: Re: [X2Go-Dev] Bug#302: (no subject)) References: <53AAE0F8.6070707@phoca-gmbh.de> In-Reply-To: <53AAE0F8.6070707@phoca-gmbh.de> User-Agent: Internet Messaging Program (IMP) H5 (6.1.7) Accept-Language: en,de Organization: DAS-NETZWERKTEAM X-Originating-IP: 217.233.245.155 X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0 Iceweasel/30.0 Content-Type: multipart/signed; boundary="=_VGC3-vA4-siV9n5datbohg1"; protocol="application/pgp-signature"; micalg=pgp-sha1 MIME-Version: 1.0 This message is in MIME format and has been PGP signed. --=_VGC3-vA4-siV9n5datbohg1 Content-Type: text/plain; charset=iso-8859-15; format=flowed; DelSp=Yes Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Control: reassign -1 nxagent Control: found -1 3.5.0.24 Control: fixed -1 3.5.0.25 Control: tag -1 confirmed ### the bug is pending anyway, so I don't set the pending tag=20=20 explicitly=20above. Hi Alex On Mi 25 Jun 2014 16:47:20 CEST, Oleksandr Shneyder wrote: > """ > Control: tag -1 - pending > Control: reassign -1 nxagent > Control: tag -1 confirmed The bug tracker accepts these commands, but the leading quotes (""")=20=20 of=20the mail body have prohibited the control commands to be executed=20= =20 in=20the BTS system... > Hi all, > > I made some changes in nx and x2goserver sources: > > http://code.x2go.org/gitweb?p=3Dx2goserver.git;a=3Dcommit;h=3Dcee48577633= c72988dd8563ceae7bf04cfe7d518 These patches have been committed on the master branch of X2Go Server.=20= =20 On=20the master branch we have been developing the next major release of=20= =20 X2Go=20Server for a while. The release of 4.1.0.0 has been pending=20=20 because=20I want to get Telekinesis and mTeleplayer into that next major=20= =20 release=20(X2Go 4.1.0.0 ?). Maybe we need a new codename for that next=20= =20 release=20(Baikal+1). (1) So, if you want to get this code (or the essence of it) into the next=20=20 x2goserver=204.0.1.16 release (which is overdue already), you have to=20=20 backport=20your changes to the release/4.0.1.x branch in x2goserver.git $ git checkout release/4.0.1.x With small patches, I normally try "git cherry-pick=20=20 "=20but with such a large code changes,=20=20 esp.=20around the newly introduced X2Go::Server Perl package, this is=20=20 not=20possible. So the inclusion in x2goserver 4.0.1.16 would mean this: o backport the patch to release/4.0.1.x branch manually o you can try git cherry-pick, but the fixing of conflicts will=20=20 need=20quite some Git knowledge... o commit the fix to release/4.0.1.x branch, mention it in changelog=20= =20 stanza=20of 4.0.1.16 o on master branch move your changelog entry from 4.1.0.0 down to 4.0.1.= 16 (2) The commit breaks the RPM nightly builds [1]. Once everything under=20=20 (1)=20has been sorted out, I can take a look at that. (3) The commit causes some installation dependency trouble on=20=20 Debian/Ubuntu.=20I won't get to fixing issues before this afternoon, so=20= =20 maybe=20you can take a look at that already (remove dropped dependencies=20= =20 /=20Perl packages from "Depends:" (libfile-readbackwards-perl), add new=20= =20 dependencies=20/ Perl packages to "Depends: where appropriate...=20=20 (libswitch-perl=20is missing) ). (4) If the issue is really solved with this approach, please remove the=20=20 x2gonxcleanup=20code again from the sources, so that we don't have=20=20 unused=20code in the X2Go Server source tree. > http://code.x2go.org/gitweb?p=3Dnx-libs.git;a=3Dcommit;h=3Dc62b81304ca990= 6fe608f7387025162107d8d8ab (1) The patch's filename (211_nxcomp_set_default_options.patch) won't make=20= =20 it=20into the release tarball. The debian/roll-tarball.sh scripts=20=20 expects=20a ".full." in the patch filename for patches that are for=20=20 nx-libs=20(nxcomp, nxcompshad, nxcompext, nx-X11) and a ".full+lite."=20=20 for=20patches that should make it into the nx-libs tarball release _AND_=20= =20 into=20the nx-libs-lite tarball release (i.e. nxcomp+nxproxy). So for this patch, please rename the file to=20=20 211_nxcomp_set_default_options.full+lite.patch.=20Make sure to adapt the=20= =20 debian/patches/series=20file with this commit. (2) The patch number is 211, but the position in debian/patches/series is=20=20 at=20the very end. Please match patch number _and_ position in the=20=20 series=20file. At the end of the series file there are a few=20=20 Debian/Ubuntu=20specific patches (".debian.patch"). Only those patches=20= =20 get=20applied at the very end of the patching processes. The patch=20=20 number=20denotes, that the patch relates to an earlier patch of the same=20= =20 number. >=20http://code.x2go.org/gitweb?p=3Dnx-libs.git;a=3Dcommit;h=3D9f6eb6f796e8= 1b00ff5b37c9abc89bb159e4e372 (1) Please rename the patch filename to=20=20 210_nxagent_nxcomp_save_session_state.full.patch =20 = ^^^^ (2) Please fix the patch's position in the debian/patches/series file. > This should fix #302 I was able to restore all sessions on windows an > Linux after crashes of x2goclient, nxproxy and by network failure. Greets, Mike [1] https://jenkins.x2go.org:8443/view/Server/ --=20 DAS-NETZWERKTEAM mike=20gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x= fb --=_VGC3-vA4-siV9n5datbohg1 Content-Type: application/pgp-signature Content-Description: Digitale PGP-Signatur Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJTq7lyAAoJEJr0azAldxsxLhMQAJoZ4qG5w1f/kiddC28Id4UI ZSiOeWHs9qu61LYMi3eKyRTzYo9jvBoi1li6imD1Zx9osy4fcqu6J43SAr03/rzM c0izbPpjlW/j+KUj6C0CH2idKz89/Hjf3/SbWQ3cH/pLCKrHlgujs44XvGZNp8WO i90m/wOpvYPc3QOC5KixBDLfCHwVmHziCSbMf5hqBJZnoQSwSOl4JINgSpIzpmpC +AhG3qBCUEQBXeHDHWSVZe5euqvZtu++SZ/kUbwtIMcu1A9nImWHzOVmAGAX22j/ TFwXRmgeZm/xfX0lT2niylgr0Hz5/fkn2ze5O1KDLZ8DEiEJ0iflWVFyfpQVETmI FE3ri99taI3XoXTARWCfI+Ry8O3iT9vUMQmrFtjVykXN6czHU4s6zBcyJSI2hYQK fm365JRSToqE7rWxwfj+hGucuWOL4OMPyJcQVkMP9dQblvcrJWAnW1KBicg2QWgz EHWQ7I8oTL8OA6lvNf31A5cLDV7Kyux5If75ZSOh8abbj50tv/xrMICWY8l1qtKM BoMSxrv5M8r6ey5vOL5Du5BArDDul4p5fel/yj0T7Qzkl9cV9BDhjZMdqr1h3h0G 471xAVEKoHtsOQKU1F1v6evCRLjPVkxKGFfWrf9R6W93UPkuM8Vee1uI3Wg6qzkf xrVd+7nWA24e84qAYOi9 =XqpR -----END PGP SIGNATURE----- --=_VGC3-vA4-siV9n5datbohg1--