updpkg: 3.1.1.3-1

Removed the install and patch. Also added a system-sysusers file for
creating the x2godesktopsharing group. Security improvements, use
https for downloading of the source and add the upstream PGP keys fo
validation.

5 files changed, 37 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2b763407b209..75c24b1ac082 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,29 @@
 # Generated by mksrcinfo v8
-# Thu Sep  1 06:34:50 UTC 2016
+# Wed Mar 22 04:09:00 UTC 2017
 pkgbase = x2godesktopsharing
-	pkgdesc = x2godesktopsharing is an X2Go add-on tool that allows a user to grant other X2go users access to the current session (shadow session support).
-	pkgver = 3.1.1.2
-	pkgrel = 3
+	pkgdesc = X2Go add-on tool that allows a user to grant other X2go users access to the current session (shadow session support).
+	pkgver = 3.1.1.3
+	pkgrel = 1
 	url = http://www.x2go.org/
-	install = x2godesktopsharing.install
-	arch = i686
 	arch = x86_64
 	groups = x2go
 	groups = alts
 	license = GPL
 	depends = x2goserver>=4.0.1
 	depends = qt4>=4.5
-	options = !strip
-	source = sharetray.cpp.patch
-	source = http://code.x2go.org/releases/source/x2godesktopsharing/x2godesktopsharing-3.1.1.2.tar.gz
-	md5sums = 2efa3a30be77489dbc22188584a93690
-	md5sums = bd48394f5a4eaa55559622f21a5e0a79
+	options = emptydirs
+	source = https://code.x2go.org/releases/source/x2godesktopsharing/x2godesktopsharing-3.1.1.3.tar.gz
+	source = https://code.x2go.org/releases/source/x2godesktopsharing/x2godesktopsharing-3.1.1.3.tar.gz.asc
+	source = x2godesktopsharing-sysusers.conf
+	md5sums = e5d4c4393ed5dde7e0790d7cded56cc2
+	md5sums = SKIP
+	md5sums = d10b90b9a038bed5e91ba821d8ac874c
+	sha1sums = 1d94ffb31756c36b7071c53b214b0941244482b6
+	sha1sums = SKIP
+	sha1sums = d3fa5d6ba6aa0a9d6925b97bf0ae51581cdabd8d
+	sha512sums = e6a8ee81cbc2211951d0676fad5fd4102069dd66a013e74a955e28c0a1e5429ef1a334a9b028ec278633c61f59e66c29e329f4a2a4354263fce359035c12ed6f
+	sha512sums = SKIP
+	sha512sums = 67aae752373174504d5b2de52f2b4bb195cc111033525a9e166bcd0da79ef9be0295850666050f1847a9f2895bb20656b3f1ca82b4c0565d2c35769be6542e4f
 
 pkgname = x2godesktopsharing
 
diff --git a/PKGBUILD b/PKGBUILD
index da58882a9e2a..c4a859207107 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,32 @@
 # Maintainer: Milan Knížek <knizek@volny.cz>
 
 pkgname=x2godesktopsharing
-pkgver=3.1.1.2
-pkgrel=3
-pkgdesc="x2godesktopsharing is an X2Go add-on tool that allows a user to grant other X2go users access to the current session (shadow session support)."
-arch=('i686' 'x86_64')
+pkgver=3.1.1.3
+pkgrel=1
+pkgdesc="X2Go add-on tool that allows a user to grant other X2go users access to the current session (shadow session support)."
+arch=('x86_64')
 url="http://www.x2go.org/"
 license=('GPL')
 depends=('x2goserver>=4.0.1' 'qt4>=4.5')
 options=(emptydirs)
-install=$pkgname.install
 groups=('x2go' 'alts')
-options=(!strip)
-source=('sharetray.cpp.patch'
-        "http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2efa3a30be77489dbc22188584a93690'
-         'bd48394f5a4eaa55559622f21a5e0a79')
+source=("https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        "https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz.asc"
+        'x2godesktopsharing-sysusers.conf')
+md5sums=('e5d4c4393ed5dde7e0790d7cded56cc2'
+         'SKIP'
+         'd10b90b9a038bed5e91ba821d8ac874c')
+sha1sums=('1d94ffb31756c36b7071c53b214b0941244482b6'
+          'SKIP'
+          'd3fa5d6ba6aa0a9d6925b97bf0ae51581cdabd8d')
+sha512sums=('e6a8ee81cbc2211951d0676fad5fd4102069dd66a013e74a955e28c0a1e5429ef1a334a9b028ec278633c61f59e66c29e329f4a2a4354263fce359035c12ed6f'
+            'SKIP'
+            '67aae752373174504d5b2de52f2b4bb195cc111033525a9e166bcd0da79ef9be0295850666050f1847a9f2895bb20656b3f1ca82b4c0565d2c35769be6542e4f')
+validpgpkeys=('1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-#  echo "CONFIG = qt x11 dll debug" >> x2godesktopsharing.pro
-  patch -Np1 -i "${srcdir}/sharetray.cpp.patch"
   qmake-qt4 x2godesktopsharing.pro
-#  cp ../Makefiledbg Makefile
   make
 }
 
@@ -68,4 +72,6 @@ package() {
   echo ${pkgver} > "${pkgdir}/usr/share/x2go/versions/VERSION.$pkgname"
 
   install -D -m 755 "share/x2gofeature.d/x2godesktopsharing.features" "${pkgdir}/usr/share/x2go/x2gofeature.d/x2godesktopsharing.features"
+
+  install -D -m 644 "$srcdir/x2godesktopsharing-sysusers.conf" "$pkgdir/usr/lib/sysusers.d/x2godesktopsharing.conf"
 }
diff --git a/sharetray.cpp.patch b/sharetray.cpp.patch
deleted file mode 100644
index b85f2bdf4b13..000000000000
--- a/sharetray.cpp.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur x2godesktopsharing-3.1.1.2.orig/sharetray.cpp x2godesktopsharing-3.1.1.2/sharetray.cpp
---- x2godesktopsharing-3.1.1.2.orig/sharetray.cpp	2015-03-06 15:11:16.000000000 +1100
-+++ x2godesktopsharing-3.1.1.2/sharetray.cpp	2016-09-01 16:32:39.112356875 +1000
-@@ -93,8 +93,8 @@
- 			{
- 				QString line = in.readLine();
- 				file.close();
--				if ( abs ( line.toUInt() -
--					QDateTime::currentDateTime().toTime_t() ) <5 )
-+				if ( abs ( int(line.toUInt() -
-+					QDateTime::currentDateTime().toTime_t()) ) <5 )
- 					{
- 
- 					QString message=QString (
-@@ -174,6 +174,7 @@
- 	          SLOT ( slotStopSharing() ) );
- 
- 	actStop->setEnabled ( false );
-+	slotStartSharing();
- 
- 	// unix signals (TERM, INT) are piped into a unix socket and will raise Qt events
- 	if (::socketpair(AF_UNIX, SOCK_STREAM, 0, sigkeybintFd))
diff --git a/x2godesktopsharing-sysusers.conf b/x2godesktopsharing-sysusers.conf
new file mode 100644
index 000000000000..7a88eaacca1e
--- /dev/null
+++ b/x2godesktopsharing-sysusers.conf
@@ -0,0 +1 @@
+g x2godesktopsharing - -
diff --git a/x2godesktopsharing.install b/x2godesktopsharing.install
deleted file mode 100644
index f285d7c6a435..000000000000
--- a/x2godesktopsharing.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install()
-{
-  # setup x2godesktopsharing group
-  if ! getent group x2godesktopsharing >/dev/null; then
-    groupadd -K GID_MIN=800 -K GID_MAX=999 x2godesktopsharing
-    echo "  ==> Group x2godesktopsharing created."
-    echo "      Adding users to x2godesktopsharing ('gpasswd -a \$USER x2godesktopsharing')"
-    echo "      will allow them to access their current local desktop remotely (shadowing)."
-  fi
-}
-
-post_upgrade()
-{
-  post_install
-  warning
-}
-
-warning()
-{
-  # Check if the originally used "x2godesktopshare" still exists and propose migration.
-  # The sys user should take care about (delete) the obsolete group manually.
-  if getent group x2godesktopshare >/dev/null; then
-    echo "      The obsolete group x2godesktopshare exists. Pls migrate users to the group"
-    echo "      x2godesktopsharing instead and remove this obsolete one."
-  fi
-}