[X2Go-Commits] x2goserver.git - build-main (branch) updated: 3.0.99-2-84-gb64868c

[X2Go dev team]

The branch, build-main has been updated
       via  b64868c5c11843ee44b12fd6cc171946e63bca88 (commit)
      from  3223f23c40474d8a5062274c9b54beca6a336850 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 Makefile                       |    4 ++++
 debian/rules                   |    1 +
 debian/x2goserver.postinst     |    6 ++++++
 x2goserver-extensions/Makefile |    2 ++
 4 files changed, 13 insertions(+)

The diff of changes is:
diff --git a/Makefile b/Makefile
index 444112f..eee6d3d 100755
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,10 @@ clean:
 	cd x2goserver && make $@
 	cd x2goserver-extensions && make $@
 
+build-arch:
+	cd x2goserver && make $@
+	cd x2goserver-extensions && make $@
+
 build-indep:
 	cd x2goserver && make $@
 	cd x2goserver-extensions && make $@
diff --git a/debian/rules b/debian/rules
index c34429d..a5143a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,4 @@
 	dh $@
 
 override_dh_auto_install:
+	make -f Makefile build-arch
\ No newline at end of file
diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst
index 760e1fa..bed72b7 100755
--- a/debian/x2goserver.postinst
+++ b/debian/x2goserver.postinst
@@ -44,7 +44,13 @@ case "$1" in
         x2godbadmin --createdb
     fi
 
+    # the sqlite db has to be accessed as uid x2gouser
     dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/lib/x2go/x2gosqlitewrapper.pl || true
+
+    # we may be upgrading versions of x2goserver that used perlsuid, so make sure setuid is removed
+    # from /usr/bin/x2gosqlitewrapper
+    dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true
+
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/x2goserver-extensions/Makefile b/x2goserver-extensions/Makefile
index d95bc71..ae6b3c1 100755
--- a/x2goserver-extensions/Makefile
+++ b/x2goserver-extensions/Makefile
@@ -35,6 +35,8 @@ build: build-indep
 
 build-indep: build_man2html
 
+build-arch:
+
 build_man2html:
 	mkdir -p $(MAN2HTML_DEST)
 	for man_page in $(man_pages); do mkdir -p `dirname $(MAN2HTML_DEST)/$$man_page`; done


hooks/post-receive
-- 
x2goserver.git (X2Go Server)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).