1 |
commit: ef3dcdab5cfa84b28ac856a34aa202d0f03fd457 |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 29 13:03:20 2016 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 29 13:03:53 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3dcdab |
7 |
|
8 |
net-misc/x2goserver: use explicitly bash in Xsession, bug #575022 |
9 |
|
10 |
Upstream backport after report by polynomial-c |
11 |
|
12 |
Package-Manager: portage-2.2.27 |
13 |
|
14 |
.../x2goserver-4.0.1.19-use_bash_in_Xsession.patch | 26 +++++++ |
15 |
net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild | 89 ++++++++++++++++++++++ |
16 |
2 files changed, 115 insertions(+) |
17 |
|
18 |
diff --git a/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch b/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch |
19 |
new file mode 100644 |
20 |
index 0000000..0eab0d3 |
21 |
--- /dev/null |
22 |
+++ b/net-misc/x2goserver/files/x2goserver-4.0.1.19-use_bash_in_Xsession.patch |
23 |
@@ -0,0 +1,26 @@ |
24 |
+X-Git-Url: http://code.x2go.org/gitweb?p=x2goserver.git;a=blobdiff_plain;f=x2goserver-xsession%2Fetc%2FXsession;h=7ad477ffc439ef0f7f0ccbbee40f55504a8f2dd6;hp=ab32a1062cdbec6b3ccbea29682d240f06046394;hb=7ae2669b596d3b84f0ba09552d5a8c0e653ce86d;hpb=1cc93d59f6bb2559b1c42daba26cf3b9b50f3e69 |
25 |
+ |
26 |
+diff --git a/x2goserver-xsession/etc/Xsession b/x2goserver-xsession/etc/Xsession |
27 |
+index ab32a10..7ad477f 100755 |
28 |
+--- a/x2goserver-xsession/etc/Xsession |
29 |
++++ b/x2goserver-xsession/etc/Xsession |
30 |
+@@ -208,16 +208,16 @@ elif [ -f /etc/redhat-release ] || [ -f /etc/gentoo-release ] || [ -f /etc/SUSE- |
31 |
+ |
32 |
+ # XCLIENTS_D=/etc/x2go/Xclients.d |
33 |
+ #if [ -d "$XCLIENTS_D" -a -x "$XCLIENTS_D/Xclients.${XSESSION_EXEC}.sh" ]; then |
34 |
+- # exec -l $SHELL -c "$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh" |
35 |
++ # exec /bin/bash -c "exec -l \"$SHELL\" -c \"$CK_XINIT_SESSION $SSH_AGENT $XCLIENTS_D/Xclients.$1.sh\"" |
36 |
+ #fi |
37 |
+ |
38 |
+ # switchdesk support is also totally deprecated in RHEL, but we leave it here |
39 |
+ # as a reminder, as well, in case we need it in the future for special setups... |
40 |
+ #if [ -x "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}" ]; then |
41 |
+- # exec -l "$SHELL" -c "$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}"; |
42 |
++ # exec /bin/bash -c "exec -l \"$SHELL\" -c \"$SWITCHDESKPATH/Xclients.${XSESSION_EXEC}\"" |
43 |
+ #fi |
44 |
+ |
45 |
+- exec $CK_XINIT_SESSION $SSH_AGENT /bin/sh -c "exec -l $SHELL -c \"$STARTUP\"" |
46 |
++ exec $CK_XINIT_SESSION $SSH_AGENT /bin/bash -c "exec -l \"$SHELL\" -c \"$STARTUP\"" |
47 |
+ fi |
48 |
+ |
49 |
+ exit 0 |
50 |
|
51 |
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild |
52 |
new file mode 100644 |
53 |
index 0000000..83207b6 |
54 |
--- /dev/null |
55 |
+++ b/net-misc/x2goserver/x2goserver-4.0.1.19-r2.ebuild |
56 |
@@ -0,0 +1,89 @@ |
57 |
+# Copyright 1999-2016 Gentoo Foundation |
58 |
+# Distributed under the terms of the GNU General Public License v2 |
59 |
+# $Id$ |
60 |
+ |
61 |
+EAPI=6 |
62 |
+inherit multilib systemd toolchain-funcs user |
63 |
+ |
64 |
+DESCRIPTION="The X2Go server" |
65 |
+HOMEPAGE="http://www.x2go.org" |
66 |
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz" |
67 |
+ |
68 |
+LICENSE="GPL-2" |
69 |
+SLOT="0" |
70 |
+KEYWORDS="~amd64 ~x86" |
71 |
+IUSE="+fuse postgres +sqlite" |
72 |
+ |
73 |
+REQUIRED_USE="|| ( postgres sqlite )" |
74 |
+ |
75 |
+DEPEND="" |
76 |
+RDEPEND="dev-perl/Capture-Tiny |
77 |
+ dev-perl/Config-Simple |
78 |
+ dev-perl/File-BaseDir |
79 |
+ dev-perl/File-ReadBackwards |
80 |
+ dev-perl/File-Which |
81 |
+ media-fonts/font-cursor-misc |
82 |
+ media-fonts/font-misc-misc[nls] |
83 |
+ >=net-misc/nx-3.5.0.25 |
84 |
+ net-misc/openssh |
85 |
+ >=sys-apps/iproute2-4.3.0 |
86 |
+ x11-apps/xauth |
87 |
+ x11-apps/xhost |
88 |
+ x11-apps/xwininfo |
89 |
+ fuse? ( sys-fs/sshfs-fuse ) |
90 |
+ postgres? ( dev-perl/DBD-Pg ) |
91 |
+ sqlite? ( dev-perl/DBD-SQLite )" |
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 |
+ eapply "${FILESDIR}"/${P}-use_bash_in_Xsession.patch |
112 |
+ eapply_user |
113 |
+} |
114 |
+ |
115 |
+src_compile() { |
116 |
+ emake CC="$(tc-getCC)" PREFIX=/usr |
117 |
+} |
118 |
+ |
119 |
+src_install() { |
120 |
+ emake DESTDIR="${D}" PREFIX=/usr install |
121 |
+ |
122 |
+ fowners root:x2goprint /usr/bin/x2goprint |
123 |
+ fperms 2755 /usr/bin/x2goprint |
124 |
+ fperms 0750 /etc/sudoers.d |
125 |
+ fperms 0440 /etc/sudoers.d/x2goserver |
126 |
+ dosym /usr/share/applications /etc/x2go/applications |
127 |
+ |
128 |
+ newinitd "${FILESDIR}"/${PN}.init x2gocleansessions |
129 |
+ systemd_dounit "${FILESDIR}"/x2gocleansessions.service |
130 |
+} |
131 |
+ |
132 |
+pkg_postinst() { |
133 |
+ if use sqlite ; then |
134 |
+ elog "To use sqlite and create the initial database, run:" |
135 |
+ elog " # x2godbadmin --createdb" |
136 |
+ fi |
137 |
+ if use postgres ; then |
138 |
+ elog "To use a PostgreSQL databse, more information is availabe here:" |
139 |
+ elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql" |
140 |
+ fi |
141 |
+ |
142 |
+ elog "For password authentication, you need to enable PasswordAuthentication" |
143 |
+ elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)" |
144 |
+ elog "An init script was installed for x2gocleansessions" |
145 |
+} |