x2go-commits July 2011

x2go-commits@lists.x2go.org

1 participants
232 discussions

x2goserver.git - master (branch) updated: 3.0.99-2-104-gc4291bc
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via c4291bc6c352257d466d151a53a3b42cc3b799a9 (commit) from a78c357f75dbeec81f0c0b05ad275f85cba8edaa (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 ----------------------------------------------------------------- commit c4291bc6c352257d466d151a53a3b42cc3b799a9 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 23:00:55 2011 +0200 add some more cleanup for x2goserver versions that installed to /var/lib/x2go ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.preinst | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst index 1f9cff3..6528f8f 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver.preinst @@ -22,6 +22,7 @@ case "$1" in install|upgrade) # cleanup old x2goserver installations test -f /var/lib/x2go/x2go_sessions && rm /var/lib/x2go/x2go_sessions + test -d /var/lib/x2go && rm -Rf /var/lib/x2go getent group x2gousers >/dev/null && { echo; echo "*** WARNING: found obsolete group ,,x2gousers'', please remove manually!!!"; echo; } ;; abort-upgrade) 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-103-ga78c357
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via a78c357f75dbeec81f0c0b05ad275f85cba8edaa (commit) via 8bb7cc55cd18c205b8a289acc1b0267c0a7ddfd1 (commit) from 57f1929cd3d5eda7349fa78b1a3031701dbbee5a (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 ----------------------------------------------------------------- commit a78c357f75dbeec81f0c0b05ad275f85cba8edaa Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 22:55:15 2011 +0200 permissions fix commit 8bb7cc55cd18c205b8a289acc1b0267c0a7ddfd1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 22:54:58 2011 +0200 make old x2gousers group warning louder ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.postinst | 2 +- debian/x2goserver.preinst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 75ddc2b..c604621 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -56,7 +56,7 @@ case "$1" in dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true # the sqlite db has to be accessed as uid x2gouser - dpkg-statoverride --add --update root x2gouser 4755 /usr/bin/x2gosqlitewrapper || true + dpkg-statoverride --add --update root x2gouser 2755 /usr/bin/x2gosqlitewrapper || true ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst index b9ff043..1f9cff3 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver.preinst @@ -22,7 +22,7 @@ case "$1" in install|upgrade) # cleanup old x2goserver installations test -f /var/lib/x2go/x2go_sessions && rm /var/lib/x2go/x2go_sessions - getent group x2gousers >/dev/null && echo "WARNING: found obsolete group ,,x2gousers'', please remove manually!!!" + getent group x2gousers >/dev/null && { echo; echo "*** WARNING: found obsolete group ,,x2gousers'', please remove manually!!!"; echo; } ;; abort-upgrade) ;; 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-101-g57f1929
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via 57f1929cd3d5eda7349fa78b1a3031701dbbee5a (commit) from bc1865e288025ac94a68f040dac33f21702b7559 (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 ----------------------------------------------------------------- commit 57f1929cd3d5eda7349fa78b1a3031701dbbee5a Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 22:45:41 2011 +0200 path fix ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.postinst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 8b9d54e..75ddc2b 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -53,7 +53,7 @@ case "$1" in # we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser. dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl && chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl || true # we may be upgrading versions of x2goserver that had /usr/bin/x2gosqlitewrapper set to setuid x2gouser. - dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true + dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true # the sqlite db has to be accessed as uid x2gouser dpkg-statoverride --add --update root x2gouser 4755 /usr/bin/x2gosqlitewrapper || true 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-100-gbc1865e
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via bc1865e288025ac94a68f040dac33f21702b7559 (commit) from 4c2668b92010980a4e5dc5adf28ed2d3472eb104 (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 ----------------------------------------------------------------- commit bc1865e288025ac94a68f040dac33f21702b7559 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 22:36:19 2011 +0200 fix for dpkg-statoverride in x2goserver.postinst script ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.postinst | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 523639b..8b9d54e 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -50,11 +50,13 @@ case "$1" in chmod 0660 /var/db/x2go/x2go_sessions fi + # we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid x2gouser. + dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl && chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl || true + # we may be upgrading versions of x2goserver that had /usr/bin/x2gosqlitewrapper set to setuid x2gouser. + dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/bin/x2gosqlitewrapper && chmod 0755 /usr/bin/x2gosqlitewrapper || true + # the sqlite db has to be accessed as uid x2gouser dpkg-statoverride --add --update root x2gouser 4755 /usr/bin/x2gosqlitewrapper || true - - # we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid user. - dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl && chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl || true ;; abort-upgrade|abort-remove|abort-deconfigure) 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-99-g4c2668b
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via 4c2668b92010980a4e5dc5adf28ed2d3472eb104 (commit) from 2f170f19a8e7dba35224eaac410844cda5703a97 (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 ----------------------------------------------------------------- commit 4c2668b92010980a4e5dc5adf28ed2d3472eb104 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 22:19:07 2011 +0200 fixed x2goserver.preinst script... ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.postinst | 2 +- debian/x2goserver.preinst | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 4d24dcb..523639b 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -19,7 +19,7 @@ set -e case "$1" in - configure|upgrade) + configure) chmod 700 /etc/x2go/x2gosql/passwords || true touch /etc/x2go/x2gosql/passwords/pgadmin || true chmod 600 /etc/x2go/x2gosql/passwords/pgadmin || true diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst index 58988d9..b9ff043 100755 --- a/debian/x2goserver.preinst +++ b/debian/x2goserver.preinst @@ -19,16 +19,15 @@ set -e case "$1" in - configure) + install|upgrade) # cleanup old x2goserver installations test -f /var/lib/x2go/x2go_sessions && rm /var/lib/x2go/x2go_sessions - getent group x2gousers && echo "WARNING: found obsolete group ,,x2gousers'', please remove manually!!!" + getent group x2gousers >/dev/null && echo "WARNING: found obsolete group ,,x2gousers'', please remove manually!!!" ;; - abort-upgrade|abort-remove|abort-deconfigure) + abort-upgrade) ;; - *) - echo "postinst called with unknown argument \`$1'" >&2 + echo "preinst called with unknown argument \`$1'" >&2 exit 1 ;; esac 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-98-g2f170f1
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via 2f170f19a8e7dba35224eaac410844cda5703a97 (commit) from 1d41ff64f488d4aa40c78125914ca840fb020abe (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 ----------------------------------------------------------------- commit 2f170f19a8e7dba35224eaac410844cda5703a97 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 22:07:20 2011 +0200 run x2goserver.postinst configure also on upgrades ----------------------------------------------------------------------- Summary of changes: debian/x2goserver.postinst | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index e5bc217..4d24dcb 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -19,10 +19,10 @@ set -e case "$1" in - configure) - chmod 700 /etc/x2go/x2gosql/passwords - touch /etc/x2go/x2gosql/passwords/pgadmin - chmod 600 /etc/x2go/x2gosql/passwords/pgadmin + configure|upgrade) + chmod 700 /etc/x2go/x2gosql/passwords || true + touch /etc/x2go/x2gosql/passwords/pgadmin || true + chmod 600 /etc/x2go/x2gosql/passwords/pgadmin || true # setup x2gouser and group if ! getent group x2gouser >/dev/null; then 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-97-g1d41ff6
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via 1d41ff64f488d4aa40c78125914ca840fb020abe (commit) via 455ff70389358957807352d47eb78e7605a104e5 (commit) from 999a7a65467e1db2de8582570baa47b9e3bf9223 (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 ----------------------------------------------------------------- commit 1d41ff64f488d4aa40c78125914ca840fb020abe Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 21:58:16 2011 +0200 x2goserver.postrm fix commit 455ff70389358957807352d47eb78e7605a104e5 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 21:57:58 2011 +0200 Update of INSTALL, UNINSTALL file. ----------------------------------------------------------------------- Summary of changes: INSTALL | 26 +++++++++++++++----------- UNINSTALL | 4 ++-- debian/x2goserver.postrm | 2 +- 3 files changed, 18 insertions(+), 14 deletions(-) The diff of changes is: diff --git a/INSTALL b/INSTALL index a189806..9b2c2e9 100644 --- a/INSTALL +++ b/INSTALL @@ -15,20 +15,25 @@ in base folder of the extracted tarball. Set up x2gouser account and its group if they do not exist already: - $ addgroup --system x2gousers + $ addgroup --system x2gouser $ adduser --system --no-create-home \ --disabled-password --disabled-login \ - --shell /bin/false --group --home /var/lib/x2go x2gouser + --shell /bin/false --group x2gouser --home /var/db/x2go x2gouser -3.) SUID USER -------------- +3.) SUID GROUP +-------------- Configure ownership, permissions and setuid user bit of x2gosqlitewrapper: - $ chown x2gouser:x2gousers /usr/bin/x2gosqlitewrapper - $ chmod 6755 /usr/bin/x2gosqlitewrapper + $ chown root:x2gouser /usr/bin/x2gosqlitewrapper + $ chmod 4755 /usr/bin/x2gosqlitewrapper +4.) DATABASE SETUP (SQLite only) +-------------------------------- -4.) INIT SCRIPT + $ x2godbadmin --createdb + + +5.) INIT SCRIPT --------------- Create a simple init script that starts $PREFIX/sbin/x2gocleansessions on system start (runlevel 2-3-4-5). @@ -38,16 +43,15 @@ Alternatively, you can add a single line to /etc/rc.local: /usr/local/sbin/x2gocleansessions & -5.) OPTIONAL: PostgreSQL setup +6.) OPTIONAL: PostgreSQL setup ------------------------------ This last step is optional and is only needed for a setup of x2goserver with PostgreSQL as database backend... When using PostgreSQL the following steps are necessary: - $ chmod 700 /etc/x2go/x2gosql/passwords + $ chmod 0750 /etc/x2go/x2gosql/passwords $ touch /etc/x2go/x2gosql/passwords/pgadmin - $ chmod 600 /etc/x2go/x2gosql/passwords/pgadmin - $ x2godbadmin --createdb + $ chmod 0640 /etc/x2go/x2gosql/passwords/pgadmin diff --git a/UNINSTALL b/UNINSTALL index e75d6fc..e5bc0ea 100644 --- a/UNINSTALL +++ b/UNINSTALL @@ -3,7 +3,7 @@ TARBALL UNINSTALL OF x2goserver 1.) Remove SQLite database -------------------------- - $ rm -vf /var/lib/x2go/x2go_sessions + $ rm -vf /var/db/x2go/x2go_sessions 2.) Remove PostgreSQL passwords @@ -15,7 +15,7 @@ TARBALL UNINSTALL OF x2goserver ---------------------------------------------- $ deluser x2gouser - $ delgroup x2gousers + $ delgroup x2gouser 4.) Run Makefile's uninstall diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index 4522b04..ba45ecc 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -20,7 +20,7 @@ case "$1" in purge) dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper || true echo "Removing x2go session database" >&2 - rm -vf /var/lib/x2go/x2go_sessions + rm -vf /var/db/x2go/x2go_sessions rm -vf /etc/x2go/x2gosql/passwords/pgadmin getent passwd x2gouser >/dev/null && deluser x2gouser getent group x2gousers >/dev/null && delgroup x2gousers 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-95-g999a7a6
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via 999a7a65467e1db2de8582570baa47b9e3bf9223 (commit) via e7324f82784e188b09885f03378d6a672afcabf1 (commit) via fff8dfd7d3b73d0e597d08a193d855b6009eaca4 (commit) from 96655427f63bf17cf244f44859c568366950680c (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 ----------------------------------------------------------------- commit 999a7a65467e1db2de8582570baa47b9e3bf9223 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 21:49:26 2011 +0200 Make sure upgrades from old x2goserver versions work more cleanly. commit e7324f82784e188b09885f03378d6a672afcabf1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 21:47:02 2011 +0200 indentation fix commit fff8dfd7d3b73d0e597d08a193d855b6009eaca4 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 21:38:33 2011 +0200 Tab'ified postinst/postrm scripts. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2goserver.postinst | 90 ++++++++++++++++++++++---------------------- debian/x2goserver.postrm | 27 +++++++------ debian/x2goserver.preinst | 43 +++++++++++++++++++++ 4 files changed, 103 insertions(+), 58 deletions(-) create mode 100755 debian/x2goserver.preinst The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 5d44ea4..d2fa577 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Fix of Debian clean rules, fix of Makefile's clean rules. * Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint (instead of Conflicts). * Switch to setgid instead of setuid for SQLite wrapper. + * Tab'ified postinst/postrm scripts. [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index 5cbd874..e5bc217 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -19,51 +19,51 @@ set -e case "$1" in - configure) - chmod 700 /etc/x2go/x2gosql/passwords - touch /etc/x2go/x2gosql/passwords/pgadmin - chmod 600 /etc/x2go/x2gosql/passwords/pgadmin - - # setup x2gouser and group - if ! getent group x2gouser >/dev/null; then - echo "Creating x2gouser group." >&2 - addgroup --system x2gouser - else - echo "Group x2gouser already exists." >&2 - fi - if ! getent passwd x2gouser >/dev/null; then - echo "Creating x2gouser user." >&2 - adduser --system --no-create-home \ - --disabled-password --disabled-login \ - --shell /bin/false --group --home /var/db/x2go x2gouser - else - echo "User x2gouser already exists." >&2 - fi - - if [ ! -f /var/db/x2go/x2go_sessions ]; then - x2godbadmin --createdb - else - # make sure db permissions are set correctly - chown root:x2gouser /var/db/x2go -Rf - chmod 0750 /var/db/x2go - chmod 0660 /var/db/x2go/x2go_sessions - fi - - # the sqlite db has to be accessed as uid x2gouser - dpkg-statoverride --add --update root x2gouser 4755 /usr/bin/x2gosqlitewrapper || true - - # we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid user. - dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl && chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl || true - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; + configure) + chmod 700 /etc/x2go/x2gosql/passwords + touch /etc/x2go/x2gosql/passwords/pgadmin + chmod 600 /etc/x2go/x2gosql/passwords/pgadmin + + # setup x2gouser and group + if ! getent group x2gouser >/dev/null; then + echo "Creating x2gouser group." >&2 + addgroup --system x2gouser + else + echo "Group x2gouser already exists." >&2 + fi + if ! getent passwd x2gouser >/dev/null; then + echo "Creating x2gouser user." >&2 + adduser --system --no-create-home \ + --disabled-password --disabled-login \ + --shell /bin/false --group --home /var/db/x2go x2gouser + else + echo "User x2gouser already exists." >&2 + id -g --name "x2gouser" | grep "x2gousers" >/dev/null && usermod x2gouser -g x2gouser + fi + + if [ ! -f /var/db/x2go/x2go_sessions ]; then + x2godbadmin --createdb + else + # make sure db permissions are set correctly + chown root:x2gouser /var/db/x2go -Rf + chmod 0750 /var/db/x2go + chmod 0660 /var/db/x2go/x2go_sessions + fi + + # the sqlite db has to be accessed as uid x2gouser + dpkg-statoverride --add --update root x2gouser 4755 /usr/bin/x2gosqlitewrapper || true + + # we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid user. + dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl && chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl || true + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; esac # dh_installdeb will replace this with shell code automatically diff --git a/debian/x2goserver.postrm b/debian/x2goserver.postrm index 37f8c02..4522b04 100755 --- a/debian/x2goserver.postrm +++ b/debian/x2goserver.postrm @@ -17,19 +17,20 @@ set -e case "$1" in - purge) - dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper || true - echo "Removing x2go session database" >&2 - rm -vf /var/lib/x2go/x2go_sessions - rm -vf /etc/x2go/x2gosql/passwords/pgadmin - getent passwd x2gouser >/dev/null && deluser x2gouser - getent group x2gousers >/dev/null && delgroup x2gousers - ;; - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 0 + purge) + dpkg-statoverride --remove /usr/bin/x2gosqlitewrapper || true + echo "Removing x2go session database" >&2 + rm -vf /var/lib/x2go/x2go_sessions + rm -vf /etc/x2go/x2gosql/passwords/pgadmin + getent passwd x2gouser >/dev/null && deluser x2gouser + getent group x2gousers >/dev/null && delgroup x2gousers + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 0 + ;; esac # dh_installdeb will replace this with shell code automatically diff --git a/debian/x2goserver.preinst b/debian/x2goserver.preinst new file mode 100755 index 0000000..58988d9 --- /dev/null +++ b/debian/x2goserver.preinst @@ -0,0 +1,43 @@ +#!/bin/sh +# preinst script for x2goserver +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <postinst> `abort-remove' +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + + +case "$1" in + configure) + # cleanup old x2goserver installations + test -f /var/lib/x2go/x2go_sessions && rm /var/lib/x2go/x2go_sessions + getent group x2gousers && echo "WARNING: found obsolete group ,,x2gousers'', please remove manually!!!" + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-92-g9665542
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via 96655427f63bf17cf244f44859c568366950680c (commit) from 30ba707a2402086c71eaf3061519a85662848aa1 (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 ----------------------------------------------------------------- commit 96655427f63bf17cf244f44859c568366950680c Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 21:19:21 2011 +0200 Switch to setgid instead of setuid for SQLite wrapper. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 1 + debian/x2goserver.postinst | 24 ++++++++++++++---------- x2goserver/lib/x2gosqlitewrapper.pl | 12 ++++++------ x2goserver/sbin/x2godbadmin | 8 ++++---- 4 files changed, 25 insertions(+), 20 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 01aa4fd..5d44ea4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ x2goserver (3.0.99.5-0~x2go3) UNRELEASED; urgency=low * Use source format 3.0 (native). * Fix of Debian clean rules, fix of Makefile's clean rules. * Breaks/replaces packages: x2goserver-one, x2goserver-home, x2goprint (instead of Conflicts). + * Switch to setgid instead of setuid for SQLite wrapper. [Martin Oehler] * Removes old debug code fragment, fixes x2golistsessions parsing. diff --git a/debian/x2goserver.postinst b/debian/x2goserver.postinst index bed72b7..5cbd874 100755 --- a/debian/x2goserver.postinst +++ b/debian/x2goserver.postinst @@ -25,31 +25,35 @@ case "$1" in chmod 600 /etc/x2go/x2gosql/passwords/pgadmin # setup x2gouser and group - if ! getent group x2gousers >/dev/null; then - echo "Creating x2gouser user." >&2 - addgroup --system x2gousers + if ! getent group x2gouser >/dev/null; then + echo "Creating x2gouser group." >&2 + addgroup --system x2gouser else - echo "User x2gouser already exists." >&2 + echo "Group x2gouser already exists." >&2 fi if ! getent passwd x2gouser >/dev/null; then echo "Creating x2gouser user." >&2 adduser --system --no-create-home \ --disabled-password --disabled-login \ - --shell /bin/false --group --home /var/lib/x2go x2gouser + --shell /bin/false --group --home /var/db/x2go x2gouser else echo "User x2gouser already exists." >&2 fi - if [ ! -f /var/lib/x2go/x2go_sessions ]; then + if [ ! -f /var/db/x2go/x2go_sessions ]; then x2godbadmin --createdb + else + # make sure db permissions are set correctly + chown root:x2gouser /var/db/x2go -Rf + chmod 0750 /var/db/x2go + chmod 0660 /var/db/x2go/x2go_sessions fi # the sqlite db has to be accessed as uid x2gouser - dpkg-statoverride --add --update x2gouser x2gousers 6755 /usr/lib/x2go/x2gosqlitewrapper.pl || true + dpkg-statoverride --add --update root x2gouser 4755 /usr/bin/x2gosqlitewrapper || 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 + # we may be upgrading versions of x2goserver that had /usr/lib/x2go/x2gosqlitewrapper.pl set to setuid user. + dpkg-statoverride --remove /usr/lib/x2go/x2gosqlitewrapper.pl && chown root:root /usr/lib/x2go/x2gosqlitewrapper.pl && chmod 0755 /usr/lib/x2go/x2gosqlitewrapper.pl || true ;; diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index 9cbf663..70ee4e5 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -25,14 +25,14 @@ use strict; use DBI; use POSIX; -if ($< eq $>) -{ - die "Please install this program as SUID x2gouser!\n"; -} +# retrieve home dir of x2gouser +my $x2gouser='x2gouser'; +my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam($x2gouser); +my $dbfile="$homedir/x2go_sessions"; +# retrieve account data of real user my $realuser=$<; -my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($>); -my $dbfile="$homedir/x2go_sessions"; +my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwnam($realuser); my $dbh=DBI->connect("dbi:SQLite:dbname=$dbfile","","",{AutoCommit => 1}) or die $_; diff --git a/x2goserver/sbin/x2godbadmin b/x2goserver/sbin/x2godbadmin index 7dc98b6..00bb073 100755 --- a/x2goserver/sbin/x2godbadmin +++ b/x2goserver/sbin/x2godbadmin @@ -147,10 +147,10 @@ if($Config->param("backend") eq 'sqlite') $sth->finish(); $dbh->disconnect(); - chmod(0700,"$dir"); - chown($uid,$pgid,"$dir"); - chmod(0600,"$dbfile"); - chown($uid,$pgid,"$dbfile"); + chmod(0750, "$dir"); + chown('root',$pgid,"$dir"); + chmod(0660, "$dbfile"); + chown('root',$pgid,"$dbfile"); exit(0); } 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).

1 0

x2goserver.git - master (branch) updated: 3.0.99-2-91-g30ba707
by git-admin＠x2go.org 18 Jul '11

18 Jul '11

The branch, master has been updated via 30ba707a2402086c71eaf3061519a85662848aa1 (commit) from e1c116e2ad6958f86573da9bea2b0428608726e9 (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 ----------------------------------------------------------------- commit 30ba707a2402086c71eaf3061519a85662848aa1 Author: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Date: Mon Jul 18 18:02:13 2011 +0200 Revert "disabled perlsuid check..." This reverts commit 82c6545adef362a9d759b5ddf41473af052156c7. ----------------------------------------------------------------------- Summary of changes: x2goserver/lib/x2gosqlitewrapper.pl | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/x2goserver/lib/x2gosqlitewrapper.pl b/x2goserver/lib/x2gosqlitewrapper.pl index a566fc1..9cbf663 100755 --- a/x2goserver/lib/x2gosqlitewrapper.pl +++ b/x2goserver/lib/x2gosqlitewrapper.pl @@ -25,15 +25,10 @@ use strict; use DBI; use POSIX; -### -### We are not using perlsuid anymore as it is deprecated as of Perl 5.12. -### Instead we ship our own setuidwrapper... -### - -#if ($< eq $>) -#{ -# die "Please install this program as SUID x2gouser!\n"; -#} +if ($< eq $>) +{ + die "Please install this program as SUID x2gouser!\n"; +} my $realuser=$<; my ($uname, $pass, $uid, $pgid, $quota, $comment, $gcos, $homedir, $shell, $expire) = getpwuid($>); 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).

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits July 2011