This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch feature/x2goserver-xsettings in repository x2goserver. discards 34ff953 xsettings: remove temporary file in x2goserver_xsettings_merge. discards 503f822 xsettings: fix speling errors in POSIX BRE character classes. discards 95d2c58 xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_. discards 85df6b5 xsettings: rename faulty "base" to "data". discards 23c719c xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install. discards 9b2e1c8 xsettings: add missing post-resume.d targets to Makefile. discards 0c36f1c extensions: add data/common.sh, providing commonly used variables. discards 6721346 xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks. discards bc4da32 extensions: add "data" directory to man page. discards 71f0235 extensions: add data directory in hooks directory used for shared data/programs/scripts. discards a82312e x2goserver: add generic typo and whitespace fixes comment to debian/changelog. discards 45da265 x2goserver: add x2gopath etc addition to debian/changelog. discards 1ef1966 xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD. discards 57ddf48 xsettings: add debian/x2goserver-xsettings.manpages. discards 9a0a61e xsettings: add debian/x2goserver-xsettings.install. discards 76d03e2 xsettings: add debian/x2goserver-xsettings.dirs. discards 9e3ff0a xsettings: add debian/changelog entries to reflect x2goserver-xsettings addition. discards 2d89175 xsettings: add x2goserver-xsettings package to debian/control. discards 78c89ce xsettings: spell XSETTINGS in uppercase in RPM spec file. discards 29bbf68 xsettings: change RPM spec file to include the new x2goserver-xsettings package. discards e63f30a xsettings: documentation update, describe the newly implemented features. discards 629ad37 xsettings: rename xsettings.conf previously missed. discards 50c83a0 xsettings: create XSETTINGSD_OVERRIDES_CONF if missing. discards cd7d78b xsettings: add comment explaining the merge shell function and its requirements. discards e2ac69d xsettings: remove .conf suffix from xsettingsd config files. discards c629157 xsettings: use merge shell function to merge the determined base config with the overrides config. discards 3b64611 xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR. discards 9860fe0 xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. discards f9b2743 xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF. discards d356d1c xsettings: use out file directly, no need for a second temp file. discards 8e5ba30 xsettings: filter out overriden keys. Add the rest to the second temporary file. discards 05b7270 xsettings: add loop through base file extracting key-value pairs. discards e4798c5 xsettings: go through overrides file and extract key-value pairs, write them into temp files for future reference. discards dcde05b xsettings: add session dir parameter to merge shell function and create two temporary files in that session directory. discards b5359fe xsettings: add extract_value shell function to be used on a sanitized xsettingsd config file line. discards 0db30a0 xsettings: add extract_key shell function to be used on a sanitized xsettingsd config file line. discards 5c03855 xsettings: add sanitize_line shell function to remove white space and comments from an xsettingsd config file line. discards 345f9f1 xsettings: add incomplete merge function to startup script. discards 58cbdaf xsettings: also delete pre-processed man pages in clean_man2html target. discards 90b10cd xsettings: pregen man files by piping man pages ending in .in through sed to replace placeholders. discards b7e4f22 xsettings: fix default config file. discards 1cb7165 xsettings: add manual page. discards 5f70a94 xsettings: add X2GO_XSETTINGS feature. discards 7e04967 xsettings: add default xsettingsd configuration file enabling MenuImages and ButtonImages. discards cbf9e1c xsettings: add pre-terminate hook. discards 29fefd7 xsettings: add post-start hook. discards 933529e xsettings: add VERSION file. discards 1146f9f x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time. discards 0072d8a xsettings: add README.md. discards 10b847e xsettings: add new stub. adds 3c1cd29 debian/changelog: sync with release/4.0.1.x branch. adds 21ce952 x2goserver.spec: add sudo and logcheck as BuildRequires and Requires. Don't own directories that are owned by sudo and logcheck. adds fe9f1ad x2goserver.spec: typo fix in comment: Recommands -> Recommends. adds 097c241 x2goserver.spec: fix installation on OpenSUSE 12.3 and higher: has replaced pwdutils with shadow. Also affects SLE{S,D} 12. adds d716e91 x2goserver.spec: add workaround documentation for sudoers on *SUSE 11. adds dd70d3e x2goserver.spec: add shadow/shadow-utils/pwdutils Requires to x2goserver-printing sub package. adds 6eebfb8 x2goserver.spec: move shadow/shadow-utils/pwdutils Requires to x2goserver-common sub package (where they are actually needed.) adds a875eb9 x2goserver-extensions: add runcommand.d hooks to x2goserver-extensions Makefile. Fix changelog. adds 4d93df5 Make X2Go Server aware of Rick Astley (RICKROLL) adds 81b8d3d Revert "Make X2Go Server aware of Rick Astley (RICKROLL)" adds 9ec47ce TRINITY: Add support for Q4OS adds 4eb608e {debian/control,x2goserver.spec}: add new dependency on bash. adds dd39de9 x2goserver/bin/x2gosessionlimit: don't iterate over the whole groups file. adds 4ad590e x2goserver/sbin/x2godbadmin: remove trailing whitespace. adds 126b18d x2goserver/sbin/x2godbadmin: revoke all PRIVILEGES before trying to delete a user on postgres. adds 2108538 x2goserver/sbin/x2gocleansessions: re-fetch the current sessions' status before handling it. adds 1767104 x2goserver/sbin/x2gocleansessions: rename %remembered_sessions_since to %remembered_sessions_status_since. adds f13c44b x2goserver/sbin/x2gocleansessions: rename %remembered_sessions_status_since to %remembered_sessions_status_since_time. adds a35aa9c x2goserver/sbin/x2gocleansessions: give suspended-but-running sessions a grace period of one iteration. adds a1ab739 x2goserver/sbin/x2gocleansessions: fix ugly missing whitespace. adds 8393882 x2goserver/sbin/x2gocleansessions: move up session status sync a bit, don't update session state when session has been removed from the database. adds 939a345 x2goserver/sbin/x2gocleansessions: unify log messages. Move dangling line around. adds 30de2ca x2goserver/sbin/x2gocleansessions: whitespace only. adds 45a92c7 x2goserver/sbin/x2gocleansessions: also delete entries in the other, overlooked hashes. adds b44bc57 x2goserver/sbin/x2gocleansessions: move socket and lock file cleanup into time-based block for finished/failed sessions. adds 77ce2d2 x2goserver/sbin/x2gocleansessions: add @remembered_finished_sessions array. adds d894b1a x2goserver/sbin/x2gocleansessions: don't add failed/finished sessions to remembered list if that list already includes them. adds 87b97fb x2goserver/sbin/x2gocleansessions: don't use gmtime (time ()) but merely time (). adds 4bd8d24 x2goserver/sbin/x2gocleansessions: add debugging output to show the state change when updating the cached state result. adds 81fb801 x2goserver/sbin/x2gocleansessions: add timestamp to debug output. adds 91c41f1 x2goserver/sbin/x2gocleansessions: only output status refreshing debug message if the old and new states actually differ. adds 47de61e x2goserver/sbin/x2gocleansessions: also (correctly) log to syslog if started with --debug parameter. adds 4a6bf69 debian/control: add new dependency on xkb-data to x2goserver. adds d62cb63 x2goserver.spec: add new dependency on xkeyboard-config to x2goserver. Fixes: #903. adds 2a10512 debian/x2goserver.preinst: Use proper comment header explaining about preinst script argument calls (not postinst). adds bfe3ba7 x2goserver/bin/x2gostartagent: changes to Robert Nowotny's SSH_PORT patch. Fixes: #922. adds c37ea34 libx2go-server-db-perl/lib/libx2go-server-db-sqlite3-wrapper.pl: don't use deprecated defined (@array) construct which never really did what one would expect (defined () can only be used on scalar values.) new 439a223 xsettings: add new stub. new b303054 xsettings: add README.md. new 21c697c x2goserver: add 'etc' target to x2gopath, use value specified in Makefile at build time. new 3f00614 xsettings: add VERSION file. new 885c2b9 xsettings: add post-start hook. new 08531bf xsettings: add pre-terminate hook. new 0df7946 xsettings: add default xsettingsd configuration file enabling MenuImages and ButtonImages. new d277e4f xsettings: add X2GO_XSETTINGS feature. new 3db8134 xsettings: add manual page. new 423b43d xsettings: fix default config file. new d446d25 xsettings: pregen man files by piping man pages ending in .in through sed to replace placeholders. new c2aa395 xsettings: also delete pre-processed man pages in clean_man2html target. new 60c86fc xsettings: add incomplete merge function to startup script. new acd5210 xsettings: add sanitize_line shell function to remove white space and comments from an xsettingsd config file line. new d9a28b6 xsettings: add extract_key shell function to be used on a sanitized xsettingsd config file line. new 2ee1acd xsettings: add extract_value shell function to be used on a sanitized xsettingsd config file line. new 84c73e8 xsettings: add session dir parameter to merge shell function and create two temporary files in that session directory. new 639a45c xsettings: go through overrides file and extract key-value pairs, write them into temp files for future reference. new ecbaadf xsettings: add loop through base file extracting key-value pairs. new 6498f61 xsettings: filter out overriden keys. Add the rest to the second temporary file. new 2fb4986 xsettings: use out file directly, no need for a second temp file. new 134d82a xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF. new 9244684 xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. new e44bfdc xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR. new e5f3662 xsettings: use merge shell function to merge the determined base config with the overrides config. new 3a6f39b xsettings: remove .conf suffix from xsettingsd config files. new 856bb66 xsettings: add comment explaining the merge shell function and its requirements. new d3d4ab0 xsettings: create XSETTINGSD_OVERRIDES_CONF if missing. new 542d063 xsettings: rename xsettings.conf previously missed. new 8e38700 xsettings: documentation update, describe the newly implemented features. new 2c54082 xsettings: change RPM spec file to include the new x2goserver-xsettings package. new adad8d7 xsettings: spell XSETTINGS in uppercase in RPM spec file. new 72e3340 xsettings: add x2goserver-xsettings package to debian/control. new 7107de6 xsettings: add debian/changelog entries to reflect x2goserver-xsettings addition. new 48269e8 xsettings: add debian/x2goserver-xsettings.dirs. new fec2361 xsettings: add debian/x2goserver-xsettings.install. new 0def351 xsettings: add debian/x2goserver-xsettings.manpages. new e75484a xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD. new b0516e8 x2goserver: add x2gopath etc addition to debian/changelog. new d2db0ea x2goserver: add generic typo and whitespace fixes comment to debian/changelog. new 16ff808 extensions: add data directory in hooks directory used for shared data/programs/scripts. new 8cfbf8e extensions: add "data" directory to man page. new d777c25 xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks. new 2f07be5 extensions: add data/common.sh, providing commonly used variables. new a59510a xsettings: add missing post-resume.d targets to Makefile. new b9b1e43 xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install. new 36cf705 xsettings: rename faulty "base" to "data". new 2ee5126 xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_. new 567cc6b xsettings: fix speling errors in POSIX BRE character classes. new d837d54 xsettings: remove temporary file in x2goserver_xsettings_merge. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (34ff953) \ N -- N -- N refs/heads/feature/x2goserver-xsettings (d837d54) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 50 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 130 ++++++++++++++++++- debian/control | 2 + debian/x2goserver.preinst | 14 +- .../lib/libx2go-server-db-sqlite3-wrapper.pl | 2 +- x2goserver-extensions/Makefile | 12 ++ x2goserver.spec | 79 ++++++++++-- x2goserver/bin/x2goruncommand | 8 +- x2goserver/bin/x2gosessionlimit | 21 +-- x2goserver/bin/x2gostartagent | 71 +++++++++- x2goserver/doc/README.sudoers | 22 ++++ x2goserver/sbin/x2gocleansessions | 136 +++++++++++++------- x2goserver/sbin/x2godbadmin | 70 ++++++---- 12 files changed, 454 insertions(+), 113 deletions(-) create mode 100644 x2goserver/doc/README.sudoers -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git