summaryrefslogtreecommitdiff
path: root/net-misc/x2goserver
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-08-04 08:53:53 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-08-04 08:53:53 +0100
commite3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree9cb29a544215119b5c5538e37211b994ce1c87ae /net-misc/x2goserver
parent480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)
gentoo resync : 04.08.2018
Diffstat (limited to 'net-misc/x2goserver')
-rw-r--r--net-misc/x2goserver/Manifest7
-rw-r--r--net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch27
-rw-r--r--net-misc/x2goserver/x2goserver-4.1.0.1.ebuild (renamed from net-misc/x2goserver/x2goserver-4.1.0.0.ebuild)29
-rw-r--r--net-misc/x2goserver/x2goserver-4.1.0.2.ebuild (renamed from net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild)37
4 files changed, 47 insertions, 53 deletions
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index b984fdc16e6f..e8e1268261ab 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -1,12 +1,13 @@
AUX x2gocleansessions.service 198 BLAKE2B 2660b62182aecd274786220abe4616f3862934b84308369e6791bb14ac1a919e5ed08b02c70f9ca135613a7b10abf9ed67f0ae2d5166e6b5fc83f81192a43587 SHA512 45f29bdaa70a91ccdd129158511f78f85b01aeb1ef874b087e3eb96000fbfc104b1c427a5ad5dab65e66624151988bb2fd75c63d4f5033b76bd19849b0986bd5
AUX x2goserver-4.1.0.0-Xresources.patch 1139 BLAKE2B f48f329836a86958866836949a44ccd6c37dc56b3da85366d8ab9a5ec003bc50a10f262211c9de3f2512aa497746d4ad43d1043fe6a36caf3905981f3d551e3c SHA512 42dba64bb8a0c278ca81f4e41236c17ea01c8294914f0051d4781c701b4356ccc05ee6835b0688b79205e0cd7a4c9ebbe418aac685a982db00fa293d48a61300
-AUX x2goserver-4.1.0.0-provided_by_nx.patch 1199 BLAKE2B a2295b9b36792fdae0a754299f5654e628755c9e9d961fe11d1e9323634b5f29fd6304df13b5ffb9014744625576857d92ab15b103062599b400af74c35f1a95 SHA512 e056b9d378b0b9df5bf1c90c194b2325c4259ead7caa40013dc88c4c7cc3c344ba05edc73cb28f2fec600326862c21b166c9a267b579c2171413fde1a651acd7
AUX x2goserver-4.1.0.0-skip_man2html.patch 2936 BLAKE2B 6b18439c5dc994c5a8ec073e2767047dcd94ebb61b0418ba5d55d55d2860530ab818b87192bdc85124be6a9d52d5c19872063555b7bdcd721429ccfa8593cabb SHA512 7b56c725c42f0813ecb88ed7f34feb0cecd1eaedd157c19068f3e6607bd8510fbba177079744f9e93fc83a4bcc65e7df40f8b1bb6acf4124fda847bc4fb86986
AUX x2goserver.init 442 BLAKE2B 11e29bed398d23cae9fccc29d2ccce6ef59422a3d258139f91dd100562bb3029202a0bb0174fcb71dd776b075a708558eeaf8b1d9914c671bd8e59799772be44 SHA512 4e5add80aedbfb732552158b8c2b97b711e333f45740b8e3dd37089e7a512bd145d64812ec651cd7b022065129cced5730e1b28ab3758fcd81bea5b84b46d93c
DIST x2goserver-4.0.1.22.tar.gz 101286 BLAKE2B 238da88d333b6bcb31b37b7d5e44d223ad975388fdee0cfb1ba21c58d5ab9a42961c7fcd55e474affd29197bc92fcbddf8c679eab8052387996b983a9e0244ba SHA512 ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67
DIST x2goserver-4.1.0.0.tar.gz 132386 BLAKE2B b24b29f2eebaec04061690b51cf00f65de256ce2f68b57909909fe88a08466a1f802ead00ad9cf62a5327c2b7bc6690feb7c26b8b5b711757e88a553586fbe1a SHA512 3f48dced332729d726bffa991a7a203035fc6580dd2e094561f52b327e7c2e48b807daf68219132fbec29b5abcb865021361a35654792e58da1f2e4715ea95d0
-EBUILD x2goserver-4.0.1.22-r1.ebuild 2727 BLAKE2B 6d532772e5e650a0a73c87f5ab6fb6ea2f79001205b2031f2b53eb9b8c7711c06058a893882d28f5485e0fea7a3d75268f5b124c780034d346ddeaa52fb856bd SHA512 22984e395f9f36257de45f739f8d689457bec3cfa7a843175791a3cd781b384104f3636f0f78a815cc66b31128be2b36befe589a64e6cfb2bca4154b2a3d0876
+DIST x2goserver-4.1.0.1.tar.gz 137553 BLAKE2B a7ece36332a8aa583491103e23e37fefb3ec13d8e73cb43382d7e3cfcd3b1bd32706356a45091f34335a07cc5b1bc549a5d275e1ee207b740a0c61248da74be1 SHA512 cd201cef75585d1c918d481710ca03608cadff9c5adba073e48750b5c9dcefe70f1d7ae0d77aa619e2bb3fffa644f8da261bc486e0dced4094d179888ddc9964
+DIST x2goserver-4.1.0.2.tar.gz 138053 BLAKE2B 5281f05d8531ace6e9228faf5c73590b17e4f743ab6a01779bcf0252c2c34d4525919ae71deef190bf835713be2f43d25fa41fd5c82e99280f0dc77927af7006 SHA512 32f9f38889b79a836bba12bf8df61d0a1530959b1e0da52935a330472a3933288edc611a4843ae145261e954a61e5b61a00a7cb0563b276bcad0587e00c09672
EBUILD x2goserver-4.0.1.22.ebuild 2745 BLAKE2B 46368f9d193c2961f8a7643e36caf60c4e3e7917a5b0279e31e50e3132851c132c7d4398404de69cc2d7b786b993e250f39aec5d3b81de779f89be0c74b6b063 SHA512 085e01dc8fe8fb4b7e7d609db05852deaaec28a828f0ea7d27d17e02b6972240078b790a13b77d1df0dba826407ec4369b739cfd2a01068429fae9978025a85b
EBUILD x2goserver-4.1.0.0-r1.ebuild 2716 BLAKE2B 9fcf8025a9173d0ee4d9b7d2c10a6dbee4b407719a94ff499dcb36de79ac0c854347f837a5fd5a524bd91cd920951623c51e651c773c4115abc8ada55713dd94 SHA512 f25ec7e1f78fda719e99b28bc90372bf6ff4748d610f8145a1cf31b244bddee2c62879e9349a79ee79b632012259683a47e95c7a24e173594a180d988cfc271b
-EBUILD x2goserver-4.1.0.0.ebuild 2532 BLAKE2B fbc9adb02d481fc288df75dfbc17c075971dbe9541c567ec1c33b878e7fbc46cb15fd6fa4c686319c289843d947ad5776692d9a6985c7aebdf52e548cf1d9a9b SHA512 580c25fd2d273a7f56fc6518bd391e517095cca6b127741b62ac2a0086cac63f971e4aaada892e0e326709ab780d469c85d6f488ad51a523106b3518889d40b4
+EBUILD x2goserver-4.1.0.1.ebuild 2716 BLAKE2B 9fcf8025a9173d0ee4d9b7d2c10a6dbee4b407719a94ff499dcb36de79ac0c854347f837a5fd5a524bd91cd920951623c51e651c773c4115abc8ada55713dd94 SHA512 f25ec7e1f78fda719e99b28bc90372bf6ff4748d610f8145a1cf31b244bddee2c62879e9349a79ee79b632012259683a47e95c7a24e173594a180d988cfc271b
+EBUILD x2goserver-4.1.0.2.ebuild 2716 BLAKE2B 9fcf8025a9173d0ee4d9b7d2c10a6dbee4b407719a94ff499dcb36de79ac0c854347f837a5fd5a524bd91cd920951623c51e651c773c4115abc8ada55713dd94 SHA512 f25ec7e1f78fda719e99b28bc90372bf6ff4748d610f8145a1cf31b244bddee2c62879e9349a79ee79b632012259683a47e95c7a24e173594a180d988cfc271b
MISC metadata.xml 398 BLAKE2B 4e3f8a55917796a30045a54805c7d7d8d4457ec14aa2354987868e02805192f208f1dd624414e1b04633ccd4d2fccd0d05b91deabc3073aefdb019578acdc42d SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f
diff --git a/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch b/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch
deleted file mode 100644
index e189b918dbd3..000000000000
--- a/net-misc/x2goserver/files/x2goserver-4.1.0.0-provided_by_nx.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile
---- x2goserver-4.1.0.0.orig/x2goserver-x2goagent/Makefile 2018-02-15 23:08:27.000000000 +0100
-+++ x2goserver-4.1.0.0/x2goserver-x2goagent/Makefile 2018-02-23 14:42:03.106562501 +0100
-@@ -49,7 +49,7 @@
- clean_man2html:
- rm -rf `dirname $(MAN2HTML_DEST)`
-
--install: install_scripts install_config install_data install_man install_version
-+install: install_scripts install_config install_data install_man
-
- install_scripts:
- $(INSTALL_DIR) $(DESTDIR)$(BINDIR)
-@@ -57,14 +57,11 @@
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/x2gofeature.d
- $(INSTALL_PROGRAM) share/x2go/x2gofeature.d/*.features $(DESTDIR)$(SHAREDIR)/x2gofeature.d/
-- $(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/bin/
-- $(INSTALL_SYMLINK) nxagent $(DESTDIR)$(NXLIBDIR)/bin/x2goagent
-
- install_data:
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/
- $(INSTALL_FILE) etc/rgb $(DESTDIR)$(SHAREDIR)/
- $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR)/../pixmaps/
-- $(INSTALL_FILE) share/pixmaps/x2go.xpm $(DESTDIR)$(SHAREDIR)/../pixmaps/
- $(INSTALL_SYMLINK) $(ETCDIR)/rgb $(DESTDIR)$(SHAREDIR)/
-
- install_config:
diff --git a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.1.ebuild
index c281ef09ff5a..36e6bdd7c3dd 100644
--- a/net-misc/x2goserver/x2goserver-4.1.0.0.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="dev-perl/Capture-Tiny
dev-perl/Try-Tiny
media-fonts/font-cursor-misc
media-fonts/font-misc-misc[nls]
- >=net-misc/nx-3.5.0.25
+ >=net-misc/nx-3.5.99.14
net-misc/openssh
>=sys-apps/iproute2-4.3.0
x11-apps/xauth
@@ -37,7 +37,6 @@ RDEPEND="dev-perl/Capture-Tiny
PATCHES=(
"${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
- "${FILESDIR}"/${PN}-4.1.0.0-provided_by_nx.patch
"${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
)
@@ -50,19 +49,25 @@ pkg_setup() {
}
src_prepare() {
+ default
# Multilib clean
- sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die
sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
-
- default
}
src_compile() {
- emake CC="$(tc-getCC)" PREFIX=/usr
+ emake \
+ CC="$(tc-getCC)" \
+ LIBDIR="/usr/$(get_libdir)/x2go" \
+ PREFIX=/usr
}
src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
+ emake \
+ DESTDIR="${D}" \
+ LIBDIR="/usr/$(get_libdir)/x2go" \
+ NXLIBDIR="/usr/$(get_libdir)/nx" \
+ PREFIX=/usr \
+ install
fowners root:x2goprint /usr/bin/x2goprint
fperms 2755 /usr/bin/x2goprint
@@ -76,8 +81,14 @@ src_install() {
pkg_postinst() {
if use sqlite ; then
- elog "To use sqlite and create the initial database, run:"
- elog " # x2godbadmin --createdb"
+ if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
+ elog "To use sqlite and update your existing database, run:"
+ elog " # x2godbadmin --updatedb"
+ else
+ elog "To use sqlite and create the initial database, run:"
+ elog " # x2godbadmin --createdb"
+ fi
+
fi
if use postgres ; then
elog "To use a PostgreSQL database, more information is availabe here:"
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
index 3aeb90b0e70f..36e6bdd7c3dd 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.22-r1.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.1.0.2.ebuild
@@ -21,10 +21,11 @@ RDEPEND="dev-perl/Capture-Tiny
dev-perl/File-BaseDir
dev-perl/File-ReadBackwards
dev-perl/File-Which
+ dev-perl/Switch
dev-perl/Try-Tiny
media-fonts/font-cursor-misc
media-fonts/font-misc-misc[nls]
- >=net-misc/nx-3.5.0.25
+ >=net-misc/nx-3.5.99.14
net-misc/openssh
>=sys-apps/iproute2-4.3.0
x11-apps/xauth
@@ -35,6 +36,8 @@ RDEPEND="dev-perl/Capture-Tiny
sqlite? ( dev-perl/DBD-SQLite )"
PATCHES=(
+ "${FILESDIR}"/${PN}-4.1.0.0-Xresources.patch
+ "${FILESDIR}"/${PN}-4.1.0.0-skip_man2html.patch
)
pkg_setup() {
@@ -46,25 +49,25 @@ pkg_setup() {
}
src_prepare() {
- # Do not install Xresources symlink (#521126)
- sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die
+ default
# Multilib clean
- sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die
sed -e "s#/lib/#/$(get_libdir)/#" -i x2goserver/bin/x2gopath || die
- # Skip man2html build
- sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die
- # Use nxagent directly
- sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die
-
- default
}
src_compile() {
- emake CC="$(tc-getCC)" PREFIX=/usr
+ emake \
+ CC="$(tc-getCC)" \
+ LIBDIR="/usr/$(get_libdir)/x2go" \
+ PREFIX=/usr
}
src_install() {
- emake DESTDIR="${D}" PREFIX=/usr install
+ emake \
+ DESTDIR="${D}" \
+ LIBDIR="/usr/$(get_libdir)/x2go" \
+ NXLIBDIR="/usr/$(get_libdir)/nx" \
+ PREFIX=/usr \
+ install
fowners root:x2goprint /usr/bin/x2goprint
fperms 2755 /usr/bin/x2goprint
@@ -78,8 +81,14 @@ src_install() {
pkg_postinst() {
if use sqlite ; then
- elog "To use sqlite and create the initial database, run:"
- elog " # x2godbadmin --createdb"
+ if [[ -f "${EROOT}"/var/lib/x2go/x2go_sessions ]] ; then
+ elog "To use sqlite and update your existing database, run:"
+ elog " # x2godbadmin --updatedb"
+ else
+ elog "To use sqlite and create the initial database, run:"
+ elog " # x2godbadmin --createdb"
+ fi
+
fi
if use postgres ; then
elog "To use a PostgreSQL database, more information is availabe here:"
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-13 01:56:33 +0000