[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Friday, October 16, 2020 @ 05:59:06 Author: andyrtr Revision: 398422 upgpkg: x2goserver 4.1.0.3-9: fix missing hostname command - FS#68276 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-10-16 05:49:24 UTC (rev 398421) +++ PKGBUILD2020-10-16 05:59:06 UTC (rev 398422) @@ -7,7 +7,7 @@ pkgname=x2goserver pkgver=4.1.0.3 -pkgrel=8 +pkgrel=9 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="https://www.x2go.org/"; @@ -37,7 +37,8 @@ 'sudo' 'which' # For /etc/X11/Xresources - 'xorg-xinit' + 'xorg-xinit' + 'inetutils' # FS#68276 'xorg-fonts-misc' 'xorg-xauth' 'xkeyboard-config'
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Sunday, June 21, 2020 @ 16:17:12 Author: felixonmars Revision: 389907 upgpkg: x2goserver 4.1.0.3-8: Perl 5.32 rebuild Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-06-21 16:16:35 UTC (rev 389906) +++ PKGBUILD2020-06-21 16:17:12 UTC (rev 389907) @@ -7,7 +7,7 @@ pkgname=x2goserver pkgver=4.1.0.3 -pkgrel=7 +pkgrel=8 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="https://www.x2go.org/";
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Wednesday, June 17, 2020 @ 05:33:24 Author: andyrtr Revision: 389389 upgpkg: x2goserver 4.1.0.3-7: fix dependency on nxagent - FS#67024 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-06-16 19:31:36 UTC (rev 389388) +++ PKGBUILD2020-06-17 05:33:24 UTC (rev 389389) @@ -7,7 +7,7 @@ pkgname=x2goserver pkgver=4.1.0.3 -pkgrel=6 +pkgrel=7 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="https://www.x2go.org/"; @@ -18,6 +18,7 @@ depends=( 'openssh' + 'nxagent' # FS#67024 # certain shell script hardcode bash 'bash' # for x2goruncommand - for now @@ -68,8 +69,6 @@ makedepends=('man2html' 'perl-extutils-makemaker' 'systemd' # only needed for file system paths 'sudo' - # for /usr/lib/nx/bin to be owned by some package - 'nxagent' ) optdepends=('perl-dbd-pg: Postgres support') #conflicts=('x2go-agent')
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Tuesday, June 9, 2020 @ 09:52:18 Author: andyrtr Revision: 388510 upgpkg: x2goserver 4.1.0.3-6: drop logcheck support that Arch doesn't offer; minor dependencies updates; fade out old provides/conflict/replaces Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD | 68 ++--- 1 file changed, 38 insertions(+), 30 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-06-09 02:33:56 UTC (rev 388509) +++ PKGBUILD2020-06-09 09:52:18 UTC (rev 388510) @@ -7,7 +7,7 @@ pkgname=x2goserver pkgver=4.1.0.3 -pkgrel=5 +pkgrel=6 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="https://www.x2go.org/"; @@ -16,37 +16,44 @@ # from 4.0.1.20 changelog there could be new deps on bash, xkeyboard-config, perl-cwd-guard -depends=(#'python' - - # For x2goruncommand - for now +depends=( + 'openssh' + # certain shell script hardcode bash + 'bash' + # for x2goruncommand - for now 'bc' - # For netstat in x2goresume-session - 'net-tools' - 'openssh' - 'perl-file-readbackwards' - # We need a database - 'perl-dbd-sqlite' + # for ss in x2gogetfreeport +'iproute' + # for x2goshowblocks + 'lsof' # For killall in x2gosuspend-session 'psmisc' - # For x2goshowblocks - 'lsof' # For x2godbadmin 'pwgen' # in community # For printing, file-sharing 'sshfs' - # For /etc/sudoers.d +# for /etc/sudoers.d 'sudo' - 'nxagent' + 'which' # For /etc/X11/Xresources 'xorg-xinit' 'xorg-fonts-misc' 'xorg-xauth' + 'xkeyboard-config' + 'xorg-xwininfo' # FS#38558 + 'xorg-setxkbmap' # FS#53345 + + # for useradd/groupadd 'shadow' - - # for post install actions + + # for filemanager bindings 'desktop-file-utils' 'shared-mime-info' - + 'xdg-utils' + + # We need a database + 'perl-dbd-sqlite' + 'perl-capture-tiny' 'perl-config-simple' 'perl-file-basedir' # FS#38551 @@ -53,23 +60,21 @@ 'perl-file-which' # FS#44125 'perl-switch' 'perl-try-tiny' # FS#58226 + #'perl-file-readbackwards' ? - 'xorg-xwininfo' # FS#38558 - 'xorg-setxkbmap' # FS#53345 - 'dbus' - - #x2goserver-extensions - #x2goserver-xsession - #x2goserver-fmbindings - #x2goserver-printing ) -makedepends=('man2html' 'perl-extutils-makemaker' 'systemd') -#optdepends=('cups-x2go: printing support') +#makedepends=('man2html' 'perl-extutils-makemaker' 'systemd') +makedepends=('man2html' 'perl-extutils-makemaker' 'systemd' + # only needed for file system paths + 'sudo' + # for /usr/lib/nx/bin to be owned by some package + 'nxagent' +) optdepends=('perl-dbd-pg: Postgres support') -conflicts=('x2go-agent') -replaces=('x2go-agent') -provides=('x2go-agent' 'x2goagent') +#conflicts=('x2go-agent') +#replaces=('x2go-agent') +#provides=('x2go-agent' 'x2goagent') options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' @@ -140,5 +145,8 @@ chmod 750 "${pkgdir}"/etc/sudoers.d chmod 0440 "${pkgdir}"/etc/sudoers.d/x2goserver + + # Arch offer logcheck package - http://logcheck.org/ + rm -r "${pkgdir}"/etc/logcheck }
[arch-commits] Commit in x2goserver/trunk (PKGBUILD reproducible-man-gzip.patch)
Date: Friday, May 29, 2020 @ 12:07:03 Author: andyrtr Revision: 387815 upgpkg: x2goserver 4.1.0.3-5: fix reproducable build Added: x2goserver/trunk/reproducible-man-gzip.patch Modified: x2goserver/trunk/PKGBUILD -+ PKGBUILD| 19 ++--- reproducible-man-gzip.patch | 81 ++ 2 files changed, 94 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-05-29 11:56:43 UTC (rev 387814) +++ PKGBUILD2020-05-29 12:07:03 UTC (rev 387815) @@ -7,7 +7,7 @@ pkgname=x2goserver pkgver=4.1.0.3 -pkgrel=4 +pkgrel=5 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="https://www.x2go.org/"; @@ -80,16 +80,17 @@ # no https due to invalid certificate source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} tmpfiles.d - sysusers.d) + sysusers.d + reproducible-man-gzip.patch) sha256sums=('6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0' 'SKIP' '548d48925171aeca198494236cfba7232921a25a1c4c81f5d004a734d83d1350' -'04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118') +'04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118' +'2d52a5ca28d5b65a9cc9bd8cdc74d030d7faddb6d727d2df520686934ea125fb') validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator -build() { +prepare() { cd ${pkgname}-${pkgver} - # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -103,7 +104,13 @@ done # Do not ship xsession - Debian specific sed -i -e '/xsession/s/^/#/' Makefile - + + # remove timestamp to solve reproducible build + patch -Np1 -i ../reproducible-man-gzip.patch +} + +build() { + cd ${pkgname}-${pkgver} make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor } Added: reproducible-man-gzip.patch === --- reproducible-man-gzip.patch (rev 0) +++ reproducible-man-gzip.patch 2020-05-29 12:07:03 UTC (rev 387815) @@ -0,0 +1,81 @@ +--- x2goserver-4.1.0.3/x2goserver-common/Makefile 2020-05-29 13:47:22.0 +0200 x2goserver-4.1.0.3/x2goserver-common/Makefile.new 2020-05-29 13:49:19.785916164 +0200 +@@ -70,7 +70,7 @@ + install_man: + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_FILE) man/man5/*.5 $(DESTDIR)$(MANDIR)/man5 +- gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5 ++ gzip -f -n $(DESTDIR)$(MANDIR)/man5/x2go*.5 + + install_version: + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) +--- x2goserver-4.1.0.3/x2goserver/Makefile 2020-05-29 13:47:22.0 +0200 x2goserver-4.1.0.3/x2goserver/Makefile.new 2020-05-29 13:50:51.578356020 +0200 +@@ -80,10 +80,10 @@ + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man5 + $(INSTALL_FILE) man/man5/*.5 $(DESTDIR)$(MANDIR)/man5 +- gzip -f $(DESTDIR)$(MANDIR)/man5/x2go*.5 ++ gzip -f -n $(DESTDIR)$(MANDIR)/man5/x2go*.5 + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 +- gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 ++ gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8 + + install_version: + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) +--- x2goserver-4.1.0.3/x2goserver-x2goagent/Makefile 2020-05-29 13:47:22.0 +0200 x2goserver-4.1.0.3/x2goserver-x2goagent/Makefile.new 2020-05-29 13:52:31.241005436 +0200 +@@ -75,7 +75,7 @@ + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man1 + $(INSTALL_FILE) man/man1/*.1 $(DESTDIR)$(MANDIR)/man1 +- gzip -f $(DESTDIR)$(MANDIR)/man1/x2go*.1 ++ gzip -f -n $(DESTDIR)$(MANDIR)/man1/x2go*.1 + + install_version: + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) +--- x2goserver-4.1.0.3/x2goserver-printing/Makefile2020-05-29 13:47:22.0 +0200 x2goserver-4.1.0.3/x2goserver-printing/Makefile.new2020-05-29 13:58:14.460132349 +0200 +@@ -62,7 +62,7 @@ + $(INSTALL_DIR) $(DESTDIR)$(MANDIR) + $(INSTALL_DIR) $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_FILE) man/man8/*.8 $(DESTDIR)$(MANDIR)/man8 +- gzip -f $(DESTDIR)$(MANDIR)/man8/x2go*.8 ++ gzip -f -n $(DESTDIR)$(MANDIR)/man8/x2go*.8 + + install_version: + $(INSTALL_DIR) $(DESTDIR)$(SHAREDIR) +--- x2goserver-4.1.0.3/x2goserver-extensions/Makefile 2020-05-29 13:47:22.0 +0200 x2goserver-4.1.0.3/x2goserver-extensions/Makefile.new 2020-05-29 13:59:21.731921736 +0200 +@@ -94,7 +94,7 @@ + $(INSTALL_DIR) $(DESTDIR)$(M
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Saturday, May 16, 2020 @ 13:30:56 Author: foutrelis Revision: 384626 upgpkg: x2goserver 4.1.0.3-4: reproducibility rebuild Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2020-05-16 13:30:11 UTC (rev 384625) +++ PKGBUILD2020-05-16 13:30:56 UTC (rev 384626) @@ -7,7 +7,7 @@ pkgname=x2goserver pkgver=4.1.0.3 -pkgrel=3 +pkgrel=4 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="https://www.x2go.org/";
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Wednesday, September 25, 2019 @ 17:36:26 Author: andyrtr Revision: 363397 fix quoting Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD | 25 - 1 file changed, 12 insertions(+), 13 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-09-25 17:34:14 UTC (rev 363396) +++ PKGBUILD2019-09-25 17:36:26 UTC (rev 363397) @@ -88,7 +88,7 @@ validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) @@ -108,31 +108,30 @@ } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install # systemd files install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # overwrite upstream systemd tmofile "x /tmp/.x2go-*" with ours -# install -Dm644 ../tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/x2goserver.conf - cat ../tmpfiles.d >> ${pkgdir}/usr/lib/tmpfiles.d/x2goserver.conf - install -Dm644 ../sysusers.d ${pkgdir}/usr/lib/sysusers.d/x2goserver.conf + cat ../tmpfiles.d >> "${pkgdir}"/usr/lib/tmpfiles.d/x2goserver.conf + install -Dm644 ../sysusers.d "${pkgdir}"/usr/lib/sysusers.d/x2goserver.conf # load fuse module at system start - install -dm755 $pkgdir/usr/lib/modules-load.d - echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf + install -dm755 "$pkgdir"/usr/lib/modules-load.d + echo "fuse" > "$pkgdir"/usr/lib/modules-load.d/x2goserver.conf install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/" # fix permission - see INSTALL file - chown root:111 ${pkgdir}/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper - chmod 2755 ${pkgdir}/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper + chown root:111 "${pkgdir}"/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper + chmod 2755 "${pkgdir}"/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper - chown root:112 ${pkgdir}/usr/bin/x2goprint - chmod 2755 ${pkgdir}/usr/bin/x2goprint + chown root:112 "${pkgdir}"/usr/bin/x2goprint + chmod 2755 "${pkgdir}"/usr/bin/x2goprint - chmod 750 ${pkgdir}/etc/sudoers.d - chmod 0440 ${pkgdir}/etc/sudoers.d/x2goserver + chmod 750 "${pkgdir}"/etc/sudoers.d + chmod 0440 "${pkgdir}"/etc/sudoers.d/x2goserver }
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Saturday, June 1, 2019 @ 18:26:04 Author: felixonmars Revision: 354732 Perl 5.30 rebuild Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-06-01 17:10:57 UTC (rev 354731) +++ PKGBUILD2019-06-01 18:26:04 UTC (rev 354732) @@ -7,7 +7,7 @@ pkgname=x2goserver pkgver=4.1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="https://www.x2go.org/";
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Saturday, May 25, 2019 @ 11:46:48 Author: felixonmars Revision: 354244 Perl 5.30 rebuild Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-05-25 11:42:52 UTC (rev 354243) +++ PKGBUILD2019-05-25 11:46:48 UTC (rev 354244) @@ -7,7 +7,7 @@ pkgname=x2goserver pkgver=4.1.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="https://www.x2go.org/";
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Thursday, November 29, 2018 @ 07:29:28 Author: andyrtr Revision: 340596 upgpkg: x2goserver 4.1.0.3-1 upstream update 4.1.0.3 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |9 + 1 file changed, 5 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-11-29 07:10:28 UTC (rev 340595) +++ PKGBUILD2018-11-29 07:29:28 UTC (rev 340596) @@ -6,8 +6,8 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.1.0.2 -pkgrel=2 +pkgver=4.1.0.3 +pkgrel=1 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="https://www.x2go.org/"; @@ -72,7 +72,8 @@ provides=('x2go-agent' 'x2goagent') options=('emptydirs') install=x2goserver.install -backup=('etc/x2go/x2goserver.conf' # 'etc/x2go/x2gosql/sql') +backup=('etc/x2go/x2goserver.conf' +'etc/x2go/desktopsharing/settings' # from old x2go-agent pkg now provided here etc/x2go/{keystrokes.cfg,x2goagent.keyboard,x2goagent.options} ) @@ -80,7 +81,7 @@ source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} tmpfiles.d sysusers.d) -sha256sums=('2b567416e7459ff39b047bdedd6648cc66652b7d6a7711a10546fa42f699af91' +sha256sums=('6776aaa354f5a44e349f0b3c176d4988c88a618c2edf46c98a37ae89c069dcd0' 'SKIP' '548d48925171aeca198494236cfba7232921a25a1c4c81f5d004a734d83d1350' '04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118')
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Sunday, August 12, 2018 @ 18:30:54 Author: andyrtr Revision: 331421 upgpkg: x2goserver 4.1.0.2-2 don't cleanup /tmp/.x2go-* following upstream tmpfiles.d setup Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-08-12 18:17:37 UTC (rev 331420) +++ PKGBUILD2018-08-12 18:30:54 UTC (rev 331421) @@ -8,12 +8,12 @@ pkgname=x2goserver pkgver=4.1.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') -url="http://www.x2go.org/"; +url="https://www.x2go.org/"; license=('GPL2') -# http://code.x2go.org/gitweb?p=x2goserver.git;a=blob;f=x2goserver.spec +# https://code.x2go.org/gitweb?p=x2goserver.git;a=blob;f=x2goserver.spec # from 4.0.1.20 changelog there could be new deps on bash, xkeyboard-config, perl-cwd-guard @@ -78,7 +78,7 @@ etc/x2go/{keystrokes.cfg,x2goagent.keyboard,x2goagent.options} ) # no https due to invalid certificate -source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} +source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} tmpfiles.d sysusers.d) sha256sums=('2b567416e7459ff39b047bdedd6648cc66652b7d6a7711a10546fa42f699af91' @@ -114,7 +114,8 @@ # systemd files install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # overwrite upstream systemd tmofile "x /tmp/.x2go-*" with ours - install -Dm644 ../tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/x2goserver.conf +# install -Dm644 ../tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/x2goserver.conf + cat ../tmpfiles.d >> ${pkgdir}/usr/lib/tmpfiles.d/x2goserver.conf install -Dm644 ../sysusers.d ${pkgdir}/usr/lib/sysusers.d/x2goserver.conf # load fuse module at system start
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Sunday, August 5, 2018 @ 19:41:12 Author: andyrtr Revision: 330629 upgpkg: x2goserver 4.1.0.2-1 upstream update 4.1.0.2 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD | 23 +-- 1 file changed, 5 insertions(+), 18 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-08-05 19:10:45 UTC (rev 330628) +++ PKGBUILD2018-08-05 19:41:12 UTC (rev 330629) @@ -7,8 +7,8 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.1.0.0 -pkgrel=3 +pkgver=4.1.0.2 +pkgrel=1 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="http://www.x2go.org/"; @@ -75,13 +75,13 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' # 'etc/x2go/x2gosql/sql') # from old x2go-agent pkg now provided here -etc/x2go/{keystrokes.cfg,rgb,x2goagent.keyboard,x2goagent.options} +etc/x2go/{keystrokes.cfg,x2goagent.keyboard,x2goagent.options} ) # no https due to invalid certificate source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} tmpfiles.d sysusers.d) -sha256sums=('17f61fb7901a53d4309d7a873e27272809f8cd1188cbeaffd6a0248e53d6d374' +sha256sums=('2b567416e7459ff39b047bdedd6648cc66652b7d6a7711a10546fa42f699af91' 'SKIP' '548d48925171aeca198494236cfba7232921a25a1c4c81f5d004a734d83d1350' '04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118') @@ -113,6 +113,7 @@ # systemd files install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" + # overwrite upstream systemd tmofile "x /tmp/.x2go-*" with ours install -Dm644 ../tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/x2goserver.conf install -Dm644 ../sysusers.d ${pkgdir}/usr/lib/sysusers.d/x2goserver.conf @@ -132,19 +133,5 @@ chmod 750 ${pkgdir}/etc/sudoers.d chmod 0440 ${pkgdir}/etc/sudoers.d/x2goserver - - # these files are part of x2go-agent (pkgbase "nx") -# rm ${pkgdir}/etc/x2go/keystrokes.cfg -# rm ${pkgdir}/etc/x2go/rgb -# rm ${pkgdir}/etc/x2go/x2goagent.keyboard -# rm ${pkgdir}/etc/x2go/x2goagent.options -# rm ${pkgdir}/usr/bin/x2goagent -# rm ${pkgdir}/usr/share/man/man1/x2goagent.1.gz -# rm ${pkgdir}/usr/share/pixmaps/x2go.xpm -# rm ${pkgdir}/usr/share/x2go/rgb - } - - -
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Wednesday, August 1, 2018 @ 12:06:58 Author: foutrelis Revision: 330212 Perl 5.28 rebuild Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-08-01 12:03:06 UTC (rev 330211) +++ PKGBUILD2018-08-01 12:06:58 UTC (rev 330212) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="http://www.x2go.org/";
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Saturday, April 14, 2018 @ 11:59:33 Author: andyrtr Revision: 321794 upgpkg: x2goserver 4.1.0.0-2 add perl-try-tiny dependency FS#58226 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-04-14 11:33:47 UTC (rev 321793) +++ PKGBUILD2018-04-14 11:59:33 UTC (rev 321794) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="http://www.x2go.org/"; @@ -53,6 +53,7 @@ 'perl-file-basedir' # FS#38551 'perl-file-which' # FS#44125 'perl-switch' + 'perl-try-tiny' # FS#58226 'xorg-xwininfo' # FS#38558 'xorg-setxkbmap' # FS#53345
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Monday, February 19, 2018 @ 19:38:52 Author: andyrtr Revision: 317285 upgpkg: x2goserver 4.1.0.0-1 upstream update 4.1.0.0 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD | 30 +++--- 1 file changed, 19 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-02-19 17:05:11 UTC (rev 317284) +++ PKGBUILD2018-02-19 19:38:52 UTC (rev 317285) @@ -37,7 +37,7 @@ 'sshfs' # For /etc/sudoers.d 'sudo' - 'x2go-agent' + 'nxagent' # For /etc/X11/Xresources 'xorg-xinit' 'xorg-fonts-misc' @@ -52,7 +52,8 @@ 'perl-config-simple' 'perl-file-basedir' # FS#38551 'perl-file-which' # FS#44125 - + 'perl-switch' + 'xorg-xwininfo' # FS#38558 'xorg-setxkbmap' # FS#53345 @@ -66,9 +67,15 @@ makedepends=('man2html' 'perl-extutils-makemaker' 'systemd') #optdepends=('cups-x2go: printing support') optdepends=('perl-dbd-pg: Postgres support') +conflicts=('x2go-agent') +replaces=('x2go-agent') +provides=('x2go-agent' 'x2goagent') options=('emptydirs') install=x2goserver.install -backup=('etc/x2go/x2goserver.conf') # 'etc/x2go/x2gosql/sql') +backup=('etc/x2go/x2goserver.conf' # 'etc/x2go/x2gosql/sql') +# from old x2go-agent pkg now provided here +etc/x2go/{keystrokes.cfg,rgb,x2goagent.keyboard,x2goagent.options} +) # no https due to invalid certificate source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} tmpfiles.d @@ -126,14 +133,15 @@ chmod 0440 ${pkgdir}/etc/sudoers.d/x2goserver # these files are part of x2go-agent (pkgbase "nx") - rm ${pkgdir}/etc/x2go/keystrokes.cfg - rm ${pkgdir}/etc/x2go/rgb - rm ${pkgdir}/etc/x2go/x2goagent.keyboard - rm ${pkgdir}/etc/x2go/x2goagent.options - rm ${pkgdir}/usr/bin/x2goagent - rm ${pkgdir}/usr/share/man/man1/x2goagent.1.gz - rm ${pkgdir}/usr/share/pixmaps/x2go.xpm - rm ${pkgdir}/usr/share/x2go/rgb +# rm ${pkgdir}/etc/x2go/keystrokes.cfg +# rm ${pkgdir}/etc/x2go/rgb +# rm ${pkgdir}/etc/x2go/x2goagent.keyboard +# rm ${pkgdir}/etc/x2go/x2goagent.options +# rm ${pkgdir}/usr/bin/x2goagent +# rm ${pkgdir}/usr/share/man/man1/x2goagent.1.gz +# rm ${pkgdir}/usr/share/pixmaps/x2go.xpm +# rm ${pkgdir}/usr/share/x2go/rgb + }
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Friday, February 16, 2018 @ 21:03:16 Author: andyrtr Revision: 317164 prepare new release - will require fixes in nx pkg Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD | 23 +-- 1 file changed, 17 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-02-16 20:42:46 UTC (rev 317163) +++ PKGBUILD2018-02-16 21:03:16 UTC (rev 317164) @@ -7,8 +7,8 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.22 -pkgrel=2 +pkgver=4.1.0.0 +pkgrel=1 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') url="http://www.x2go.org/"; @@ -65,14 +65,15 @@ ) makedepends=('man2html' 'perl-extutils-makemaker' 'systemd') #optdepends=('cups-x2go: printing support') +optdepends=('perl-dbd-pg: Postgres support') options=('emptydirs') install=x2goserver.install -backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') +backup=('etc/x2go/x2goserver.conf') # 'etc/x2go/x2gosql/sql') # no https due to invalid certificate source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} tmpfiles.d sysusers.d) -sha256sums=('bb7bd9abadfb6201f39068731a955df5183f4d447c42fc0720777f32acafbfbc' +sha256sums=('17f61fb7901a53d4309d7a873e27272809f8cd1188cbeaffd6a0248e53d6d374' 'SKIP' '548d48925171aeca198494236cfba7232921a25a1c4c81f5d004a734d83d1350' '04d429e8d8fe02c8078d75ba63ba57774274df877b2c6ec942621312b7bf9118') @@ -115,8 +116,8 @@ install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/" # fix permission - see INSTALL file - chown root:111 ${pkgdir}/usr/lib/x2go/x2gosqlitewrapper - chmod 2755 ${pkgdir}/usr/lib/x2go/x2gosqlitewrapper + chown root:111 ${pkgdir}/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper + chmod 2755 ${pkgdir}/usr/lib/x2go/libx2go-server-db-sqlite3-wrapper chown root:112 ${pkgdir}/usr/bin/x2goprint chmod 2755 ${pkgdir}/usr/bin/x2goprint @@ -123,6 +124,16 @@ chmod 750 ${pkgdir}/etc/sudoers.d chmod 0440 ${pkgdir}/etc/sudoers.d/x2goserver + + # these files are part of x2go-agent (pkgbase "nx") + rm ${pkgdir}/etc/x2go/keystrokes.cfg + rm ${pkgdir}/etc/x2go/rgb + rm ${pkgdir}/etc/x2go/x2goagent.keyboard + rm ${pkgdir}/etc/x2go/x2goagent.options + rm ${pkgdir}/usr/bin/x2goagent + rm ${pkgdir}/usr/share/man/man1/x2goagent.1.gz + rm ${pkgdir}/usr/share/pixmaps/x2go.xpm + rm ${pkgdir}/usr/share/x2go/rgb }
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Sunday, November 12, 2017 @ 08:13:53 Author: andyrtr Revision: 309580 upgpkg: x2goserver 4.0.1.22-1 upstream update 4.0.1.22 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-11-12 08:07:42 UTC (rev 309579) +++ PKGBUILD2017-11-12 08:13:53 UTC (rev 309580) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.21 +pkgver=4.0.1.22 pkgrel=1 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('x86_64') @@ -70,7 +70,7 @@ backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') # no https due to invalid certificate source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) -sha256sums=('a3ebba69a4b640541d811453457454f324ab6deeac7da13ec0c159e8f060b7af' +sha256sums=('bb7bd9abadfb6201f39068731a955df5183f4d447c42fc0720777f32acafbfbc' 'SKIP') validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Wednesday, November 8, 2017 @ 20:19:34 Author: andyrtr Revision: 309059 upgpkg: x2goserver 4.0.1.21-1 upstream update 4.0.1.21 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-11-08 19:43:37 UTC (rev 309058) +++ PKGBUILD2017-11-08 20:19:34 UTC (rev 309059) @@ -7,10 +7,10 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.20 -pkgrel=2 +pkgver=4.0.1.21 +pkgrel=1 pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" -arch=('i686' 'x86_64') +arch=('x86_64') url="http://www.x2go.org/"; license=('GPL2') # http://code.x2go.org/gitweb?p=x2goserver.git;a=blob;f=x2goserver.spec @@ -32,7 +32,7 @@ # For x2goshowblocks 'lsof' # For x2godbadmin -'pwgen' # in community + 'pwgen' # in community # For printing, file-sharing 'sshfs' # For /etc/sudoers.d @@ -55,7 +55,9 @@ 'xorg-xwininfo' # FS#38558 'xorg-setxkbmap' # FS#53345 - + + 'dbus' + #x2goserver-extensions #x2goserver-xsession #x2goserver-fmbindings @@ -68,7 +70,7 @@ backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') # no https due to invalid certificate source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) -sha256sums=('f8bf48e1c8995bd5a7cde6de1c006fdb77f2bae6c4b82e6b7b985a8f00a3dad9' +sha256sums=('a3ebba69a4b640541d811453457454f324ab6deeac7da13ec0c159e8f060b7af' 'SKIP') validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Monday, August 21, 2017 @ 14:02:54 Author: andyrtr Revision: 303213 improve pkgdesc; FS#55213 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-08-21 13:50:04 UTC (rev 303212) +++ PKGBUILD2017-08-21 14:02:54 UTC (rev 303213) @@ -9,7 +9,7 @@ pkgname=x2goserver pkgver=4.0.1.20 pkgrel=2 -pkgdesc="Open source terminal server" +pkgdesc="Open source graphical Remote Desktop and terminal server based on NX technology" arch=('i686' 'x86_64') url="http://www.x2go.org/"; license=('GPL2')
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Sunday, March 19, 2017 @ 09:31:46 Author: andyrtr Revision: 291081 upgpkg: x2goserver 4.0.1.20-2 add missing dep on xorg-setxkbmap; FS#53345 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-03-19 09:28:31 UTC (rev 291080) +++ PKGBUILD2017-03-19 09:31:46 UTC (rev 291081) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.1.20 -pkgrel=1 +pkgrel=2 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -54,6 +54,7 @@ 'perl-file-which' # FS#44125 'xorg-xwininfo' # FS#38558 + 'xorg-setxkbmap' # FS#53345 #x2goserver-extensions #x2goserver-xsession
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Tuesday, November 22, 2016 @ 21:13:07 Author: andyrtr Revision: 281953 upgpkg: x2goserver 4.0.1.20-1 upstream update 4.0.1.20 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-11-22 21:08:50 UTC (rev 281952) +++ PKGBUILD2016-11-22 21:13:07 UTC (rev 281953) @@ -7,13 +7,16 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.19 -pkgrel=5 +pkgver=4.0.1.20 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; license=('GPL2') # http://code.x2go.org/gitweb?p=x2goserver.git;a=blob;f=x2goserver.spec + +# from 4.0.1.20 changelog there could be new deps on bash, xkeyboard-config, perl-cwd-guard + depends=(#'python' # For x2goruncommand - for now @@ -62,8 +65,11 @@ options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') -source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('7f1093c4dbc0a273bcc73a2e4b2c8b69') +# no https due to invalid certificate +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}) +sha256sums=('f8bf48e1c8995bd5a7cde6de1c006fdb77f2bae6c4b82e6b7b985a8f00a3dad9' +'SKIP') +validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # X2go Git Administrator build() { cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Tuesday, May 10, 2016 @ 17:52:31 Author: andyrtr Revision: 267322 upgpkg: x2goserver 4.0.1.19-5 readd .install scriptlet that was dropped unwanted; FS#49281 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2016-05-10 15:52:24 UTC (rev 267321) +++ PKGBUILD2016-05-10 15:52:31 UTC (rev 267322) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.1.19 -pkgrel=4 +pkgrel=5 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -60,6 +60,7 @@ makedepends=('man2html' 'perl-extutils-makemaker' 'systemd') #optdepends=('cups-x2go: printing support') options=('emptydirs') +install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('7f1093c4dbc0a273bcc73a2e4b2c8b69')
[arch-commits] Commit in x2goserver/trunk (PKGBUILD x2goserver.install)
Date: Thursday, April 28, 2016 @ 19:38:21 Author: andyrtr Revision: 266560 upgpkg: x2goserver 4.0.1.19-4 Hooks rebuild (part 1) Modified: x2goserver/trunk/PKGBUILD x2goserver/trunk/x2goserver.install + PKGBUILD |3 +-- x2goserver.install | 10 -- 2 files changed, 1 insertion(+), 12 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-04-28 17:24:25 UTC (rev 266559) +++ PKGBUILD2016-04-28 17:38:21 UTC (rev 266560) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.1.19 -pkgrel=3 +pkgrel=4 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -60,7 +60,6 @@ makedepends=('man2html' 'perl-extutils-makemaker' 'systemd') #optdepends=('cups-x2go: printing support') options=('emptydirs') -install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) md5sums=('7f1093c4dbc0a273bcc73a2e4b2c8b69') Modified: x2goserver.install === --- x2goserver.install 2016-04-28 17:24:25 UTC (rev 266559) +++ x2goserver.install 2016-04-28 17:38:21 UTC (rev 266560) @@ -11,17 +11,7 @@ } -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install $1 -} - post_remove() { rm -rf /var/lib/x2go/* &> /dev/null || /bin/true rm -rf /var/spool/x2go/* &> /dev/null || /bin/true - post_install $1 }
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Sunday, March 6, 2016 @ 15:25:23 Author: andyrtr Revision: 26 upgpkg: x2goserver 4.0.1.19-3 add missing xorg-xauth dependency form upstream spec file recommendations Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-03-06 13:22:20 UTC (rev 261110) +++ PKGBUILD2016-03-06 14:25:23 UTC (rev 26) @@ -8,13 +8,13 @@ pkgname=x2goserver pkgver=4.0.1.19 -pkgrel=2 +pkgrel=3 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; license=('GPL2') -# see x2goserver.spec -depends=(#'python' 'xorg-xauth' +# http://code.x2go.org/gitweb?p=x2goserver.git;a=blob;f=x2goserver.spec +depends=(#'python' # For x2goruncommand - for now 'bc' @@ -38,6 +38,7 @@ # For /etc/X11/Xresources 'xorg-xinit' 'xorg-fonts-misc' + 'xorg-xauth' 'shadow' # for post install actions
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Wednesday, March 11, 2015 @ 19:17:18 Author: andyrtr Revision: 233360 upgpkg: x2goserver 4.0.1.19-2 add dep non perl-file-which FS#44125 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-03-11 17:22:57 UTC (rev 233359) +++ PKGBUILD2015-03-11 18:17:18 UTC (rev 233360) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.1.19 -pkgrel=1 +pkgrel=2 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -47,6 +47,7 @@ 'perl-capture-tiny' 'perl-config-simple' 'perl-file-basedir' # FS#38551 + 'perl-file-which' # FS#44125 'xorg-xwininfo' # FS#38558
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Wednesday, February 25, 2015 @ 12:36:57 Author: andyrtr Revision: 231971 upgpkg: x2goserver 4.0.1.19-1 upstream update 4.0.1.19 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-02-25 11:24:20 UTC (rev 231970) +++ PKGBUILD2015-02-25 11:36:57 UTC (rev 231971) @@ -7,8 +7,8 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.18 -pkgrel=3 +pkgver=4.0.1.19 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -61,7 +61,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('e7bd91b82d7a911d04386e09c4650004') +md5sums=('7f1093c4dbc0a273bcc73a2e4b2c8b69') build() { cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Saturday, February 14, 2015 @ 21:57:50 Author: andyrtr Revision: 231394 upgpkg: x2goserver 4.0.1.18-3 fix some permissions Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-02-14 18:28:14 UTC (rev 231393) +++ PKGBUILD2015-02-14 20:57:50 UTC (rev 231394) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.1.18 -pkgrel=2 +pkgrel=3 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -95,8 +95,8 @@ install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # X2go homedir + printing spool dir - install -dm 770 $pkgdir/var/lib/x2go - install -dm 770 --owner=112 --group=112 $pkgdir/var/spool/x2go + install -dm 0770 --owner=111 --group=111 $pkgdir/var/lib/x2go + install -dm 0770 --owner=112 --group=112 $pkgdir/var/spool/x2go # load fuse module at system start install -dm755 $pkgdir/usr/lib/modules-load.d @@ -105,15 +105,15 @@ install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/" - # fix permission - chmod 750 ${pkgdir}/etc/sudoers.d - - # fix more permissions - see INSTALL file + # fix permission - see INSTALL file chown root:111 ${pkgdir}/usr/lib/x2go/x2gosqlitewrapper chmod 2755 ${pkgdir}/usr/lib/x2go/x2gosqlitewrapper chown root:112 ${pkgdir}/usr/bin/x2goprint chmod 2755 ${pkgdir}/usr/bin/x2goprint + + chmod 750 ${pkgdir}/etc/sudoers.d + chmod 0440 ${pkgdir}/etc/sudoers.d/x2goserver }
[arch-commits] Commit in x2goserver/trunk (PKGBUILD x2goserver.install)
Date: Friday, February 13, 2015 @ 22:20:15 Author: andyrtr Revision: 231385 upgpkg: x2goserver 4.0.1.18-2 don't groupdel/userdel in .install - simplify install file Modified: x2goserver/trunk/PKGBUILD x2goserver/trunk/x2goserver.install + PKGBUILD | 19 ++-- x2goserver.install | 60 +++ 2 files changed, 26 insertions(+), 53 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-02-13 20:52:49 UTC (rev 231384) +++ PKGBUILD2015-02-13 21:20:15 UTC (rev 231385) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.1.18 -pkgrel=1 +pkgrel=2 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -84,6 +84,10 @@ } package() { + + # system user/group x2gouser - 111 + # system user/group x2goprint - 112 + cd "${srcdir}/${pkgname}-${pkgver}" make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install @@ -92,7 +96,7 @@ # X2go homedir + printing spool dir install -dm 770 $pkgdir/var/lib/x2go - install -dm 770 $pkgdir/var/spool/x2go + install -dm 770 --owner=112 --group=112 $pkgdir/var/spool/x2go # load fuse module at system start install -dm755 $pkgdir/usr/lib/modules-load.d @@ -103,4 +107,15 @@ # fix permission chmod 750 ${pkgdir}/etc/sudoers.d + + # fix more permissions - see INSTALL file + chown root:111 ${pkgdir}/usr/lib/x2go/x2gosqlitewrapper + chmod 2755 ${pkgdir}/usr/lib/x2go/x2gosqlitewrapper + + chown root:112 ${pkgdir}/usr/bin/x2goprint + chmod 2755 ${pkgdir}/usr/bin/x2goprint } + + + + Modified: x2goserver.install === --- x2goserver.install 2015-02-13 20:52:49 UTC (rev 231384) +++ x2goserver.install 2015-02-13 21:20:15 UTC (rev 231385) @@ -3,49 +3,15 @@ ==> Use the following command to setup sqlite database: ==> x2godbadmin --createdb EOM + + getent group x2gouser &> /dev/null || groupadd -g 111 x2gouser &> /dev/null + getent group x2goprint &> /dev/null || groupadd -g 112 x2goprint &> /dev/null + getent passwd x2gouser &> /dev/null || useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null + getent passwd x2goprint &> /dev/null || useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null + } - post_install() { - - # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values - - # x2gouser - if grep -q "^x2gouser:" /etc/group &> /dev/null ; then -groupmod -g 111 -n x2gouser x2gouser &> /dev/null - else -groupadd -g 111 x2gouser &> /dev/null - fi - - if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then -usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null - else -useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null - fi - - # x2goprint - if grep -q "^x2goprint:" /etc/group &> /dev/null ; then -groupmod -g 112 -n x2goprint x2goprint &> /dev/null - else -groupadd -g 112 x2goprint &> /dev/null - fi - - if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then -usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null - else -useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null - fi - - # fix permissions - see INSTALL file - chown -R x2goprint:x2goprint /var/spool/x2go - chmod 0770 /var/spool/x2go - - chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper - chmod 2755 /usr/lib/x2go/x2gosqlitewrapper - - chown root:x2goprint /usr/bin/x2goprint - chmod 2755 /usr/bin/x2goprint - update-desktop-database -q update-mime-database usr/share/mime &> /dev/null } @@ -54,16 +20,8 @@ post_install $1 } -pre_remove() { -userdel x2gouser &> /dev/null -userdel x2goprint &> /dev/null -groupdel x2gouser &> /dev/null || /bin/true -groupdel x2goprint &> /dev/null || /bin/true -rm -rf /var/lib/x2go/* &> /dev/null || /bin/true -rm -rf /var/spool/x2go/* &> /dev/null || /bin/true -} - post_remove() { -update-desktop-database -q -update-mime-database usr/share/mime &> /dev/null + rm -rf /var/lib/x2go/* &> /dev/null || /bin/true + rm -rf /var/spool/x2go/* &> /dev/null || /bin/true + post_install $1 }
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Wednesday, October 8, 2014 @ 21:03:29 Author: andyrtr Revision: 224113 upgpkg: x2goserver 4.0.1.18-1 upstream update 4.0.1.18 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-10-08 18:18:34 UTC (rev 224112) +++ PKGBUILD2014-10-08 19:03:29 UTC (rev 224113) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.17 +pkgver=4.0.1.18 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -61,7 +61,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('5b02aed3cb2bcdcfa94a22edce180dab') +md5sums=('e7bd91b82d7a911d04386e09c4650004') build() { cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Saturday, October 4, 2014 @ 15:29:22 Author: andyrtr Revision: 223864 upgpkg: x2goserver 4.0.1.17-1 upstream update 4.0.1.17 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-10-04 12:20:28 UTC (rev 223863) +++ PKGBUILD2014-10-04 13:29:22 UTC (rev 223864) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.16 +pkgver=4.0.1.17 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -61,7 +61,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('41453b94dbcd2c6b44501bf517cba2db') +md5sums=('5b02aed3cb2bcdcfa94a22edce180dab') build() { cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Friday, September 26, 2014 @ 21:31:37 Author: andyrtr Revision: 223363 upgpkg: x2goserver 4.0.1.16-1 upstream update 4.0.1.16 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-09-26 19:22:50 UTC (rev 223362) +++ PKGBUILD2014-09-26 19:31:37 UTC (rev 223363) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.15 +pkgver=4.0.1.16 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -61,7 +61,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('6b1d77f1955103cd59958fc67a0b77e2') +md5sums=('41453b94dbcd2c6b44501bf517cba2db') build() { cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Thursday, April 3, 2014 @ 15:12:15 Author: andyrtr Revision: 209762 upgpkg: x2goserver 4.0.1.15-1 upstream update 4.0.1.15 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-04-03 08:08:46 UTC (rev 209761) +++ PKGBUILD2014-04-03 13:12:15 UTC (rev 209762) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.14 +pkgver=4.0.1.15 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -61,7 +61,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('45f44c98b59937952874c7c4fd4c7840') +md5sums=('6b1d77f1955103cd59958fc67a0b77e2') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -100,7 +100,6 @@ install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/" -# install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN" # fix permission chmod 750 ${pkgdir}/etc/sudoers.d
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Wednesday, April 2, 2014 @ 18:34:17 Author: andyrtr Revision: 209745 upgpkg: x2goserver 4.0.1.14-1 upstream update 4.0.1.14 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-04-02 13:15:06 UTC (rev 209744) +++ PKGBUILD2014-04-02 16:34:17 UTC (rev 209745) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.13 +pkgver=4.0.1.14 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -61,7 +61,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('24181098a9c4d7a5ca2c1416b0cee22d') +md5sums=('45f44c98b59937952874c7c4fd4c7840') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -99,8 +99,8 @@ echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" - install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" - install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN" + install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/" +# install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN" # fix permission chmod 750 ${pkgdir}/etc/sudoers.d
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Monday, January 20, 2014 @ 16:33:02 Author: andyrtr Revision: 204465 upgpkg: x2goserver 4.0.1.13-1 upstream update 4.0.1.13 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-20 15:32:46 UTC (rev 204464) +++ PKGBUILD2014-01-20 15:33:02 UTC (rev 204465) @@ -7,8 +7,8 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.12 -pkgrel=5 +pkgver=4.0.1.13 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -61,7 +61,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('2f41accfb7b7d8b8113eb6f2f686e340') +md5sums=('24181098a9c4d7a5ca2c1416b0cee22d') build() { cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Friday, January 17, 2014 @ 20:43:35 Author: andyrtr Revision: 204355 upgpkg: x2goserver 4.0.1.12-5 add missing dep; FS#38558 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-17 17:42:07 UTC (rev 204354) +++ PKGBUILD2014-01-17 19:43:35 UTC (rev 204355) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.1.12 -pkgrel=3 +pkgrel=5 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -46,8 +46,10 @@ 'perl-capture-tiny' 'perl-config-simple' - 'perl-file-basedir' + 'perl-file-basedir' # FS#38551 + 'xorg-xwininfo' # FS#38558 + #x2goserver-extensions #x2goserver-xsession #x2goserver-fmbindings
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Friday, January 17, 2014 @ 12:29:04 Author: andyrtr Revision: 204346 upgpkg: x2goserver 4.0.1.12-3 readd missing dep; FS#38551 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-17 11:12:05 UTC (rev 204345) +++ PKGBUILD2014-01-17 11:29:04 UTC (rev 204346) @@ -8,14 +8,13 @@ pkgname=x2goserver pkgver=4.0.1.12 -pkgrel=2 +pkgrel=3 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; license=('GPL2') # see x2goserver.spec -depends=(# 'perl-file-basedir' - #'python' 'xorg-xauth' +depends=(#'python' 'xorg-xauth' # For x2goruncommand - for now 'bc' @@ -47,7 +46,8 @@ 'perl-capture-tiny' 'perl-config-simple' - + 'perl-file-basedir' + #x2goserver-extensions #x2goserver-xsession #x2goserver-fmbindings
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Wednesday, January 8, 2014 @ 20:37:53 Author: andyrtr Revision: 203361 upgpkg: x2goserver 4.0.1.12-2 readd perl-config-simple dep, FS#38416 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-08 18:29:54 UTC (rev 203360) +++ PKGBUILD2014-01-08 19:37:53 UTC (rev 203361) @@ -8,13 +8,13 @@ pkgname=x2goserver pkgver=4.0.1.12 -pkgrel=1 +pkgrel=2 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; license=('GPL2') # see x2goserver.spec -depends=(#'perl-config-simple' 'perl-file-basedir' +depends=(# 'perl-file-basedir' #'python' 'xorg-xauth' # For x2goruncommand - for now @@ -46,6 +46,7 @@ 'shared-mime-info' 'perl-capture-tiny' + 'perl-config-simple' #x2goserver-extensions #x2goserver-xsession
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Tuesday, January 7, 2014 @ 21:10:41 Author: andyrtr Revision: 203299 upgpkg: x2goserver 4.0.1.12-1 upstream update 4.0.1.12 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-07 18:06:19 UTC (rev 203298) +++ PKGBUILD2014-01-07 20:10:41 UTC (rev 203299) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.11 +pkgver=4.0.1.12 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -44,6 +44,8 @@ # for post install actions 'desktop-file-utils' 'shared-mime-info' + + 'perl-capture-tiny' #x2goserver-extensions #x2goserver-xsession @@ -56,7 +58,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('11f130f712d1d5910bb479b5eb599105') +md5sums=('2f41accfb7b7d8b8113eb6f2f686e340') build() { cd "${srcdir}/${pkgname}-${pkgver}"
[arch-commits] Commit in x2goserver/trunk (PKGBUILD x2goserver-mimetype.patch)
Date: Saturday, January 4, 2014 @ 22:17:32 Author: andyrtr Revision: 203174 prepare next build Added: x2goserver/trunk/x2goserver-mimetype.patch Modified: x2goserver/trunk/PKGBUILD ---+ PKGBUILD | 35 --- x2goserver-mimetype.patch | 14 ++ 2 files changed, 38 insertions(+), 11 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-04 17:28:52 UTC (rev 203173) +++ PKGBUILD2014-01-04 21:17:32 UTC (rev 203174) @@ -12,24 +12,25 @@ pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; -license=('GPL') +license=('GPL2') # see x2goserver.spec -depends=('perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' - 'python' 'xorg-xauth' 'desktop-file-utils' 'shared-mime-info' +depends=(#'perl-config-simple' 'perl-file-basedir' + #'python' 'xorg-xauth' + # For x2goruncommand - for now 'bc' # For netstat in x2goresume-session 'net-tools' 'openssh' - # perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) ? 'perl-file-readbackwards' # We need a database + 'perl-dbd-sqlite' # For killall in x2gosuspend-session 'psmisc' # For x2goshowblocks 'lsof' # For x2godbadmin -#'pwgen' +'pwgen' # in community # For printing, file-sharing 'sshfs' # For /etc/sudoers.d @@ -38,25 +39,35 @@ # For /etc/X11/Xresources 'xorg-xinit' 'xorg-fonts-misc' - #'shadow'-utils + 'shadow' + + # for post install actions + 'desktop-file-utils' + 'shared-mime-info' + #x2goserver-extensions #x2goserver-xsession #x2goserver-fmbindings #x2goserver-printing ) -makedepends=('man2html') +makedepends=('man2html' 'perl-extutils-makemaker' 'systemd') #optdepends=('cups-x2go: printing support') options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz -x2goserver.service) +x2goserver.service +x2goserver-mimetype.patch) md5sums=('d6cd2f7f11e96097d8d0454a89accc4e' - 'f76081c01e40b6206895d194dc949707') + 'f76081c01e40b6206895d194dc949707' + '2cfac1cd78080a3a1f20c29b2d10a338') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # fix x2gofm.desktop mimetype + patch -Np1 -i ${srcdir}/x2goserver-mimetype.patch + # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -68,8 +79,10 @@ for Makefile in $(find . -type f -name Makefile); do sed -i "s:-o root -g root ::g" $Makefile done - - make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" + # Do not ship xsession - Debian specific +# sed -i -e '/xsession/s/^/#/' Makefile + + make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor } package() { Added: x2goserver-mimetype.patch === --- x2goserver-mimetype.patch (rev 0) +++ x2goserver-mimetype.patch 2014-01-04 21:17:32 UTC (rev 203174) @@ -0,0 +1,14 @@ +diff -up x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop.mimetype +x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop +--- x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop.mimetype 2014-01-03 10:27:31.167601207 -0700 x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop 2014-01-03 10:28:15.184321072 -0700 +@@ -1,7 +1,7 @@ + [Desktop Entry] + Encoding=UTF-8 + Name=x2gofm +-MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go ++MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go; + Exec=x2gofm %f + Type=Application + Terminal=false +
[arch-commits] Commit in x2goserver/trunk (PKGBUILD x2goserver.install)
Date: Friday, January 3, 2014 @ 22:43:12 Author: andyrtr Revision: 203085 prepare next build Modified: x2goserver/trunk/PKGBUILD x2goserver/trunk/x2goserver.install + PKGBUILD | 36 +--- x2goserver.install |8 2 files changed, 41 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-01-03 21:06:06 UTC (rev 203084) +++ PKGBUILD2014-01-03 21:43:12 UTC (rev 203085) @@ -7,13 +7,43 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.8 +pkgver=4.0.1.10 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; license=('GPL') -depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth') +# see x2goserver.spec +depends=('perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' + 'python' 'xorg-xauth' 'desktop-file-utils' 'shared-mime-info' + # For x2goruncommand - for now + 'bc' + # For netstat in x2goresume-session + 'net-tools' + 'openssh' + # perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) ? + 'perl-file-readbackwards' + # We need a database + # For killall in x2gosuspend-session + 'psmisc' + # For x2goshowblocks + 'lsof' + # For x2godbadmin +#'pwgen' + # For printing, file-sharing + 'sshfs' + # For /etc/sudoers.d + 'sudo' + 'x2go-agent' + # For /etc/X11/Xresources + 'xorg-xinit' + 'xorg-fonts-misc' + #'shadow'-utils + #x2goserver-extensions + #x2goserver-xsession + #x2goserver-fmbindings + #x2goserver-printing +) makedepends=('man2html') #optdepends=('cups-x2go: printing support') options=('emptydirs') @@ -21,7 +51,7 @@ backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('754ee94f2b4b57fc08973027a174cf81' +md5sums=('d6cd2f7f11e96097d8d0454a89accc4e' 'f76081c01e40b6206895d194dc949707') build() { Modified: x2goserver.install === --- x2goserver.install 2014-01-03 21:06:06 UTC (rev 203084) +++ x2goserver.install 2014-01-03 21:43:12 UTC (rev 203085) @@ -45,6 +45,9 @@ chown root:x2goprint /usr/bin/x2goprint chmod 2755 /usr/bin/x2goprint + + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null } post_upgrade() { @@ -59,3 +62,8 @@ rm -rf /var/lib/x2go/* &> /dev/null || /bin/true rm -rf /var/spool/x2go/* &> /dev/null || /bin/true } + +post_remove() { +update-desktop-database -q +update-mime-database usr/share/mime &> /dev/null +}
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Saturday, November 23, 2013 @ 22:58:11 Author: andyrtr Revision: 200257 upgpkg: x2goserver 4.0.1.8-1 upstream update 4.0.1.8 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-11-23 21:48:38 UTC (rev 200256) +++ PKGBUILD2013-11-23 21:58:11 UTC (rev 200257) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.6 +pkgver=4.0.1.8 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('61f2248fb16bc035f92b9588ab19c35e' +md5sums=('754ee94f2b4b57fc08973027a174cf81' 'f76081c01e40b6206895d194dc949707') build() { @@ -60,4 +60,7 @@ install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN" + + # fix permission + chmod 750 ${pkgdir}/etc/sudoers.d }
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Monday, July 29, 2013 @ 15:46:52 Author: andyrtr Revision: 191715 upgpkg: x2goserver 4.0.1.6-1 upstream update 4.0.1.6 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-07-29 10:21:51 UTC (rev 191714) +++ PKGBUILD2013-07-29 13:46:52 UTC (rev 191715) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.5 +pkgver=4.0.1.6 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('2bcd0f96d38951f96c08a5d92c21aa41' +md5sums=('61f2248fb16bc035f92b9588ab19c35e' 'f76081c01e40b6206895d194dc949707') build() {
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Sunday, July 28, 2013 @ 11:09:17 Author: andyrtr Revision: 191626 upgpkg: x2goserver 4.0.1.5-1 upstream update 4.0.1.5 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-07-28 07:40:29 UTC (rev 191625) +++ PKGBUILD2013-07-28 09:09:17 UTC (rev 191626) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.3 +pkgver=4.0.1.5 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('494b2d0435f7a11bc68a5d1d2a8a5f33' +md5sums=('2bcd0f96d38951f96c08a5d92c21aa41' 'f76081c01e40b6206895d194dc949707') build() {
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Saturday, June 22, 2013 @ 21:39:04 Author: andyrtr Revision: 188845 upgpkg: x2goserver 4.0.1.3-1 upstream update 4.0.1.3 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-06-22 15:33:40 UTC (rev 188844) +++ PKGBUILD2013-06-22 19:39:04 UTC (rev 188845) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.1.1 +pkgver=4.0.1.3 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -21,7 +21,7 @@ backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('d970699f1df8d7096a7d3151c0ede447' +md5sums=('494b2d0435f7a11bc68a5d1d2a8a5f33' 'f76081c01e40b6206895d194dc949707') build() {
[arch-commits] Commit in x2goserver/trunk (PKGBUILD revert.patch)
Date: Saturday, June 15, 2013 @ 12:16:41 Author: andyrtr Revision: 188541 upgpkg: x2goserver 4.0.1.1-1 upstream update 4.0.1.1; fix FS#35210 Modified: x2goserver/trunk/PKGBUILD Deleted: x2goserver/trunk/revert.patch --+ PKGBUILD | 22 +++- revert.patch | 152 - 2 files changed, 8 insertions(+), 166 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-06-15 10:10:22 UTC (rev 188540) +++ PKGBUILD2013-06-15 10:16:41 UTC (rev 188541) @@ -7,8 +7,8 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.0.2 -pkgrel=2 +pkgver=4.0.1.1 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -20,19 +20,13 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz -x2goserver.service -revert.patch) -md5sums=('6b8cecfdd31a8877203f50d3666c265f' - 'f76081c01e40b6206895d194dc949707' - 'c487c31e7c0aa9a73323313007497764') +x2goserver.service) +md5sums=('d970699f1df8d7096a7d3151c0ede447' + 'f76081c01e40b6206895d194dc949707') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # revert an upstream commit that breaks sessions showing up - # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f - patch -Rp1 -i ${srcdir}/revert.patch - # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -45,7 +39,7 @@ sed -i "s:-o root -g root ::g" $Makefile done - make + make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" } package() { @@ -60,8 +54,8 @@ install -dm 770 $pkgdir/var/spool/x2go # load fuse module at system start - install -dm755 $pkgdir/lib/modules-load.d - echo "fuse" > $pkgdir/lib/modules-load.d/x2goserver.conf + install -dm755 $pkgdir/usr/lib/modules-load.d + echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" Deleted: revert.patch === --- revert.patch2013-06-15 10:10:22 UTC (rev 188540) +++ revert.patch2013-06-15 10:16:41 UTC (rev 188541) @@ -1,152 +0,0 @@ -From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001 -From: Mike Gabriel -Date: Sun, 19 May 2013 00:41:32 +0200 -Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c. - Hard-code path to x2gosqlitewrapper.pl during build via - defining a macro in the Makefile. Thanks to Richard - Weinberger for spotting this!!! - - Makefile |2 +- - debian/changelog |3 +++ - debian/rules |4 +-- - x2goserver/Makefile|4 +-- - x2goserver/x2gosqlitewrapper.c | 54 +++- - 5 files changed, 12 insertions(+), 55 deletions(-) - -diff --git a/Makefile b/Makefile -index 3be40f9..588084f 100755 a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ RM_FILE=rm -f - RM_DIR=rmdir -p --ignore-fail-on-non-empty - - DESTDIR= --PREFIX=/usr/local -+PREFIX ?= /usr/local - ETCDIR=/etc/x2go - LIBDIR=$(PREFIX)/lib/x2go - SHAREDIR=$(PREFIX)/share/x2go -diff --git a/debian/changelog b/debian/changelog -index 470a502..2cf2dde 100644 a/debian/changelog -+++ b/debian/changelog -@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low - * New upstream version (4.0.0.2): - - Use make_path from File::Path in x2godbadmin to create user directory if - not present. (Fixes: #200). -+- Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to -+ x2gosqlitewrapper.pl during build via defining a macro in the Makefile. -+ Thanks to Richard Weinberger for spotting this!!! - /debian/control: - + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: - #163). -diff --git a/debian/rules b/debian/rules -index b32e08d..5bb94b2 100755 a/debian/rules -+++ b/debian/rules -@@ -1,10 +1,10 @@ - #!/usr/bin/make -f - - %: -- dh $@ -+ PREFIX=/usr dh $@ - - override_dh_auto_install: -- make -f Makefile build-arch -+ PREFIX=/usr make -f Makefile build-arch - - override_dh_auto_clean: - rm -fv x2gosqlitewrapper -diff --git a/x2goserver/Makefile b/x2goserver/Makefile -index 4287478..e9d56e6 100755 a/x2goserver/Makefile -+++ b/x2goserver/Makefile -@@ -15,7 +15,7 @@ RM_FILE=rm -f - RM_DIR=rmdir -p --ignore-fail-on-non-empty - - DESTDIR= --PREFIX=/usr/local -+PREFIX ?= /usr/local - ETCDIR=/etc/x2go - BINDIR=$(PREFIX)/bin - SBINDIR=$(PREFIX)/sbin -@@ -41,7 +41,
[arch-commits] Commit in x2goserver/trunk (PKGBUILD revert.patch x2goserver.install)
Date: Monday, May 20, 2013 @ 20:08:51 Author: andyrtr Revision: 186035 upgpkg: x2goserver 4.0.0.2-2 fix session now showing up - FS#35380 Added: x2goserver/trunk/revert.patch Modified: x2goserver/trunk/PKGBUILD x2goserver/trunk/x2goserver.install + PKGBUILD | 18 -- revert.patch | 152 +++ x2goserver.install |2 3 files changed, 165 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-05-20 18:03:55 UTC (rev 186034) +++ PKGBUILD2013-05-20 18:08:51 UTC (rev 186035) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -19,13 +19,20 @@ options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') -source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz +x2goserver.service +revert.patch) md5sums=('6b8cecfdd31a8877203f50d3666c265f' - 'f76081c01e40b6206895d194dc949707') + 'f76081c01e40b6206895d194dc949707' + 'c487c31e7c0aa9a73323313007497764') build() { cd "${srcdir}/${pkgname}-${pkgver}" -#return 1 + + # revert an upstream commit that breaks sessions showing up + # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f + patch -Rp1 -i ${srcdir}/revert.patch + # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -49,9 +56,8 @@ install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # X2go homedir + printing spool dir - #install -dm 755 $pkgdir/var/lib/x2go install -dm 770 $pkgdir/var/lib/x2go - install -dm 755 $pkgdir/var/spool/x2go + install -dm 770 $pkgdir/var/spool/x2go # load fuse module at system start install -dm755 $pkgdir/lib/modules-load.d Added: revert.patch === --- revert.patch(rev 0) +++ revert.patch2013-05-20 18:08:51 UTC (rev 186035) @@ -0,0 +1,152 @@ +From 011d14ae076ba6fec96cd1e019c4f82444ab0f9f Mon Sep 17 00:00:00 2001 +From: Mike Gabriel +Date: Sun, 19 May 2013 00:41:32 +0200 +Subject: [PATCH] Security fix for setgid wrapper x2gosqlitewrapper.c. + Hard-code path to x2gosqlitewrapper.pl during build via + defining a macro in the Makefile. Thanks to Richard + Weinberger for spotting this!!! + +--- + Makefile |2 +- + debian/changelog |3 +++ + debian/rules |4 +-- + x2goserver/Makefile|4 +-- + x2goserver/x2gosqlitewrapper.c | 54 +++- + 5 files changed, 12 insertions(+), 55 deletions(-) + +diff --git a/Makefile b/Makefile +index 3be40f9..588084f 100755 +--- a/Makefile b/Makefile +@@ -4,7 +4,7 @@ RM_FILE=rm -f + RM_DIR=rmdir -p --ignore-fail-on-non-empty + + DESTDIR= +-PREFIX=/usr/local ++PREFIX ?= /usr/local + ETCDIR=/etc/x2go + LIBDIR=$(PREFIX)/lib/x2go + SHAREDIR=$(PREFIX)/share/x2go +diff --git a/debian/changelog b/debian/changelog +index 470a502..2cf2dde 100644 +--- a/debian/changelog b/debian/changelog +@@ -12,6 +12,9 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low + * New upstream version (4.0.0.2): + - Use make_path from File::Path in x2godbadmin to create user directory if + not present. (Fixes: #200). ++- Security fix for setgid wrapper x2gosqlitewrapper.c. Hard-code path to ++ x2gosqlitewrapper.pl during build via defining a macro in the Makefile. ++ Thanks to Richard Weinberger for spotting this!!! + /debian/control: + + Let x2goserver bin:package depend on xfonts-base and fontconfig. (Fixes: + #163). +diff --git a/debian/rules b/debian/rules +index b32e08d..5bb94b2 100755 +--- a/debian/rules b/debian/rules +@@ -1,10 +1,10 @@ + #!/usr/bin/make -f + + %: +- dh $@ ++ PREFIX=/usr dh $@ + + override_dh_auto_install: +- make -f Makefile build-arch ++ PREFIX=/usr make -f Makefile build-arch + + override_dh_auto_clean: + rm -fv x2gosqlitewrapper +diff --git a/x2goserver/Makefile b/x2goserver/Makefile +index 4287478..e9d56e6 100755 +--- a/x2goserver/Makefile b/x2goserver/Makefile +@@ -15,7 +15,7 @@ RM_FILE=rm -f + RM_DIR=rmdir -p --ignore-fail-on-non-empty + + DESTDIR= +-PREFIX=/usr/local ++PREFIX ?= /usr/local + ETCDIR=/etc/x2go + BINDIR=$(PREFIX)/bin + SBINDIR=$(PREFIX)/sbin +@@ -41,7 +41,7 @@ build: build-arch build-indep + build-arch: build_setgidwrappers + + build_setgidwrappers: +- $(CC) $(CFLAGS) $(LDFLA
[arch-commits] Commit in x2goserver/trunk (PKGBUILD x2goserver.service)
Date: Sunday, May 19, 2013 @ 17:18:13 Author: andyrtr Revision: 185845 upgpkg: x2goserver 4.0.0.2-1 upstream update 4.0.0.2; move to /usr/bin Modified: x2goserver/trunk/PKGBUILD x2goserver/trunk/x2goserver.service + PKGBUILD | 10 +- x2goserver.service |2 +- 2 files changed, 6 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-05-19 15:04:46 UTC (rev 185844) +++ PKGBUILD2013-05-19 15:18:13 UTC (rev 185845) @@ -7,7 +7,7 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.0.1 +pkgver=4.0.0.2 pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') @@ -20,12 +20,12 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('85dc2a2d52e82eead744a51007155ff9' - 'b09799f9203150dc1277a56058be48a8') +md5sums=('6b8cecfdd31a8877203f50d3666c265f' + 'f76081c01e40b6206895d194dc949707') build() { cd "${srcdir}/${pkgname}-${pkgver}" - +#return 1 # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -43,7 +43,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 PREFIX=/usr DESTDIR="$pkgdir" install + make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install # systemd service file - only runs x2gocleansessions install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" Modified: x2goserver.service === --- x2goserver.service 2013-05-19 15:04:46 UTC (rev 185844) +++ x2goserver.service 2013-05-19 15:18:13 UTC (rev 185845) @@ -3,7 +3,7 @@ After=syslog.target network.target [Service] -ExecStart=/usr/sbin/x2gocleansessions +ExecStart=/usr/bin/x2gocleansessions PIDFile=/run/x2goserver.pid [Install]
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Sunday, March 24, 2013 @ 10:33:50 Author: andyrtr Revision: 180592 upgpkg: x2goserver 4.0.0.1-1 upstream update 4.0.0.1 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-24 07:51:29 UTC (rev 180591) +++ PKGBUILD2013-03-24 09:33:50 UTC (rev 180592) @@ -7,8 +7,8 @@ # Contributor: Milan Knížek pkgname=x2goserver -pkgver=4.0.0.0 -pkgrel=5 +pkgver=4.0.0.1 +pkgrel=1 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -20,7 +20,7 @@ install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('1fc38566832c30897c6583e7ffa1fda3' +md5sums=('85dc2a2d52e82eead744a51007155ff9' 'b09799f9203150dc1277a56058be48a8') build() { @@ -43,7 +43,7 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr DESTDIR="$pkgdir" install + make -j1 PREFIX=/usr DESTDIR="$pkgdir" install # systemd service file - only runs x2gocleansessions install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Friday, March 1, 2013 @ 15:04:34 Author: andyrtr Revision: 179011 upgpkg: x2goserver 4.0.0.0-5 add missing dependency on perl-file-basedir; FS#34078 Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-01 10:28:10 UTC (rev 179010) +++ PKGBUILD2013-03-01 14:04:34 UTC (rev 179011) @@ -8,12 +8,12 @@ pkgname=x2goserver pkgver=4.0.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; license=('GPL') -depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'python' 'x2go-agent' 'xorg-xauth') +depends=('openssh' 'perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir' 'python' 'x2go-agent' 'xorg-xauth') makedepends=('man2html') #optdepends=('cups-x2go: printing support') options=('emptydirs')
[arch-commits] Commit in x2goserver/trunk (PKGBUILD x2goserver.install)
Date: Saturday, January 19, 2013 @ 12:55:46 Author: andyrtr Revision: 175693 upgpkg: x2goserver 4.0.0.0-4 fix module loading (FS#33462) and user login in install scriptlet Modified: x2goserver/trunk/PKGBUILD x2goserver/trunk/x2goserver.install + PKGBUILD |6 +++--- x2goserver.install |8 2 files changed, 7 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-01-19 17:54:24 UTC (rev 175692) +++ PKGBUILD2013-01-19 17:55:46 UTC (rev 175693) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -54,8 +54,8 @@ install -dm 755 $pkgdir/var/spool/x2go # load fuse module at system start - install -dm755 $pkgdir/usr/lib/modprobe.d - echo "fuse" > $pkgdir/usr/lib/modprobe.d/x2goserver.conf + install -dm755 $pkgdir/lib/modules-load.d + echo "fuse" > $pkgdir/lib/modules-load.d/x2goserver.conf install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" Modified: x2goserver.install === --- x2goserver.install 2013-01-19 17:54:24 UTC (rev 175692) +++ x2goserver.install 2013-01-19 17:55:46 UTC (rev 175693) @@ -18,9 +18,9 @@ fi if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then -usermod -s /sbin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null +usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null else -useradd -s /sbin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null +useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null fi # x2goprint @@ -31,9 +31,9 @@ fi if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then -usermod -s /sbin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null +usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null else -useradd -s /sbin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null +useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null fi # fix permissions - see INSTALL file
[arch-commits] Commit in x2goserver/trunk (PKGBUILD)
Date: Saturday, January 19, 2013 @ 09:55:57 Author: andyrtr Revision: 175684 upgpkg: x2goserver 4.0.0.0-3 add back symlinks to X11 session files and Xressources; fix permission on /var/lib/x2go Modified: x2goserver/trunk/PKGBUILD --+ PKGBUILD |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-01-19 14:26:54 UTC (rev 175683) +++ PKGBUILD2013-01-19 14:55:57 UTC (rev 175684) @@ -8,7 +8,7 @@ pkgname=x2goserver pkgver=4.0.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Open source terminal server" arch=('i686' 'x86_64') url="http://www.x2go.org/"; @@ -49,7 +49,8 @@ install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # X2go homedir + printing spool dir - install -dm 755 $pkgdir/var/lib/x2go + #install -dm 755 $pkgdir/var/lib/x2go + install -dm 770 $pkgdir/var/lib/x2go install -dm 755 $pkgdir/var/spool/x2go # load fuse module at system start @@ -59,8 +60,4 @@ install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}" install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN" install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN" - - # cleanup unneded files/directories - rmdir $pkgdir/etc/X11/Xsession.d - rm -f $pkgdir/etc/x2go/Xresources }