1 |
commit: f08b25af5ac679a57a52ca5a0213deb0800db8c5 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Mar 7 13:48:00 2016 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Mar 7 13:54:33 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08b25af |
7 |
|
8 |
net-misc/x2goserver: remove hardcoded blowfish Cipher spec |
9 |
|
10 |
Gentoo-Bug: 576356 |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
.../x2goserver-4.0.1.19-remove_sshfs_cipher.patch | 21 +++++ |
15 |
net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild | 93 ++++++++++++++++++++++ |
16 |
2 files changed, 114 insertions(+) |
17 |
|
18 |
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch |
19 |
new file mode 100644 |
20 |
index 0000000..b293363 |
21 |
--- /dev/null |
22 |
+++ b/net-misc/x2goserver/files/x2goserver-4.0.1.19-remove_sshfs_cipher.patch |
23 |
@@ -0,0 +1,21 @@ |
24 |
+X-Git-Url: http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff_plain;f=x2goserver%2Fbin%2Fx2gomountdirs;h=f39d19975c6806ea115921aa0e1949e3dfa44c7d;hp=f0b497edd252481792ebc6e5e73d79158bc4a14c;hb=86a0e421c3da850045459af855a33f646828dd68;hpb=7ae2669b596d3b84f0ba09552d5a8c0e653ce86d |
25 |
+ |
26 |
+diff --git a/x2goserver/bin/x2gomountdirs b/x2goserver/bin/x2gomountdirs |
27 |
+index f0b497e..f39d199 100755 |
28 |
+--- a/x2goserver/bin/x2gomountdirs |
29 |
++++ b/x2goserver/bin/x2gomountdirs |
30 |
+@@ -304,12 +304,12 @@ for (my $i=0;$i<@dirs;$i++) |
31 |
+ { |
32 |
+ syslog('debug', "SSH host key has arrived: $key.ident"); |
33 |
+ } |
34 |
+- $msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; |
35 |
++ $msg = "timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port"; |
36 |
+ syslog('debug', "executing: $msg"); |
37 |
+ print "inserted, $msg\n"; |
38 |
+ |
39 |
+ # FIXME: this system call should be converted to a multi-argument system call while pertaining the redirect of stderr to the mounts.log file |
40 |
+- if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,Cipher=blowfish,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0) |
41 |
++ if (system("timeout 30 sshfs $code_conv -o idmap=user,uid=`id -u`,gid=`id -g`,$umaskstr,ServerAliveInterval=300,IdentityFile=$key,UserKnownHostsFile=$key.ident \"$user\"\@$host:\"@dirs[$i]\" \"$mntpath\" -p $port 1>>$sessiondir/sshfs-mounts.log 2>&1")==0) |
42 |
+ { |
43 |
+ print "mount @dirs[$i] ok\n"; |
44 |
+ syslog('notice', "successfully mounted $user\@$host:$port@dirs[$i] to $mntpath"); |
45 |
|
46 |
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild |
47 |
new file mode 100644 |
48 |
index 0000000..a977760 |
49 |
--- /dev/null |
50 |
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19-r3.ebuild |
51 |
@@ -0,0 +1,93 @@ |
52 |
+# Copyright 1999-2016 Gentoo Foundation |
53 |
+# Distributed under the terms of the GNU General Public License v2 |
54 |
+# $Id$ |
55 |
+ |
56 |
+EAPI=6 |
57 |
+inherit multilib systemd toolchain-funcs user |
58 |
+ |
59 |
+DESCRIPTION="The X2Go server" |
60 |
+HOMEPAGE="http://www.x2go.org" |
61 |
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" |
62 |
+ |
63 |
+LICENSE="GPL-2" |
64 |
+SLOT="0" |
65 |
+KEYWORDS="~amd64 ~x86" |
66 |
+IUSE="+fuse postgres +sqlite" |
67 |
+ |
68 |
+REQUIRED_USE="|| ( postgres sqlite )" |
69 |
+ |
70 |
+DEPEND="" |
71 |
+RDEPEND="dev-perl/Capture-Tiny |
72 |
+ dev-perl/Config-Simple |
73 |
+ dev-perl/File-BaseDir |
74 |
+ dev-perl/File-ReadBackwards |
75 |
+ dev-perl/File-Which |
76 |
+ media-fonts/font-cursor-misc |
77 |
+ media-fonts/font-misc-misc[nls] |
78 |
+ >=net-misc/nx-3.5.0.25 |
79 |
+ net-misc/openssh |
80 |
+ >=sys-apps/iproute2-4.3.0 |
81 |
+ x11-apps/xauth |
82 |
+ x11-apps/xhost |
83 |
+ x11-apps/xwininfo |
84 |
+ fuse? ( sys-fs/sshfs-fuse ) |
85 |
+ postgres? ( dev-perl/DBD-Pg ) |
86 |
+ sqlite? ( dev-perl/DBD-SQLite )" |
87 |
+ |
88 |
+PATCHES=( |
89 |
+ "${FILESDIR}"/${P}-use_bash_in_Xsession.patch |
90 |
+ "${FILESDIR}"/${P}-remove_sshfs_cipher.patch |
91 |
+ ) |
92 |
+ |
93 |
+pkg_setup() { |
94 |
+ # Force the group creation, #479650 |
95 |
+ enewgroup x2gouser |
96 |
+ enewgroup x2goprint |
97 |
+ enewuser x2gouser -1 -1 /var/lib/x2go x2gouser |
98 |
+ enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint |
99 |
+} |
100 |
+ |
101 |
+src_prepare() { |
102 |
+ # Do not install Xresources symlink (#521126) |
103 |
+ sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed" |
104 |
+ # Multilib clean |
105 |
+ sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed" |
106 |
+ # Skip man2html build |
107 |
+ sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed" |
108 |
+ # Use nxagent directly |
109 |
+ sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed" |
110 |
+ |
111 |
+ default |
112 |
+} |
113 |
+ |
114 |
+src_compile() { |
115 |
+ emake CC="$(tc-getCC)" PREFIX=/usr |
116 |
+} |
117 |
+ |
118 |
+src_install() { |
119 |
+ emake DESTDIR="${D}" PREFIX=/usr install |
120 |
+ |
121 |
+ fowners root:x2goprint /usr/bin/x2goprint |
122 |
+ fperms 2755 /usr/bin/x2goprint |
123 |
+ fperms 0750 /etc/sudoers.d |
124 |
+ fperms 0440 /etc/sudoers.d/x2goserver |
125 |
+ dosym /usr/share/applications /etc/x2go/applications |
126 |
+ |
127 |
+ newinitd "${FILESDIR}"/${PN}.init x2gocleansessions |
128 |
+ systemd_dounit "${FILESDIR}"/x2gocleansessions.service |
129 |
+} |
130 |
+ |
131 |
+pkg_postinst() { |
132 |
+ if use sqlite ; then |
133 |
+ elog "To use sqlite and create the initial database, run:" |
134 |
+ elog " # x2godbadmin --createdb" |
135 |
+ fi |
136 |
+ if use postgres ; then |
137 |
+ elog "To use a PostgreSQL databse, more information is availabe here:" |
138 |
+ elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql" |
139 |
+ fi |
140 |
+ |
141 |
+ elog "For password authentication, you need to enable PasswordAuthentication" |
142 |
+ elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)" |
143 |
+ elog "An init script was installed for x2gocleansessions" |
144 |
+} |