Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xpra-html5 for openSUSE:Factory checked in at 2022-04-27 21:41:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xpra-html5 (Old) and /work/SRC/openSUSE:Factory/.xpra-html5.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xpra-html5" Wed Apr 27 21:41:04 2022 rev:2 rq:973252 version:4.5.2+git20220421.ecc3a08 Changes: -------- --- /work/SRC/openSUSE:Factory/xpra-html5/xpra-html5.changes 2022-04-11 23:49:43.434741649 +0200 +++ /work/SRC/openSUSE:Factory/.xpra-html5.new.1538/xpra-html5.changes 2022-04-27 21:41:09.825001869 +0200 @@ -1,0 +2,18 @@ +Wed Apr 27 18:05:45 UTC 2022 - [email protected] + +- Update to version 4.5.2+git20220421.ecc3a08: + * Added keycloak authentication +- Switching UglifyJS source from npmjs source url to github source url. + +------------------------------------------------------------------- +Tue Apr 19 18:55:04 UTC 2022 - Scott Bradnick <[email protected]> + +- Updating uglifyjs to '3.15.4'. + +------------------------------------------------------------------- +Tue Apr 19 18:51:58 UTC 2022 - [email protected] + +- Update to version 4.5.2+git20220413.dc3077b: + * tell the server to use 'scroll' encoding less + +------------------------------------------------------------------- Old: ---- uglify-js-3.15.3.tgz xpra-html5-4.5.2+git20220322.82199bc.tar.gz New: ---- uglify-js-3.15.4.tar.gz xpra-html5-4.5.2+git20220421.ecc3a08.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xpra-html5.spec ++++++ --- /var/tmp/diff_new_pack.DasrcY/_old 2022-04-27 21:41:10.601002783 +0200 +++ /var/tmp/diff_new_pack.DasrcY/_new 2022-04-27 21:41:10.609002793 +0200 @@ -16,19 +16,23 @@ # -%define uglifyjs_version 3.15.3 +%define uglifyjs_version 3.15.4 %define minifier uglifyjs %define python python3 Name: xpra-html5 Release: 0 -Version: 4.5.2+git20220322.82199bc +Version: 4.5.2+git20220421.ecc3a08 Summary: HTML5 client for Xpra License: GPL-2.0+ AND BSD-3-Clause AND LGPL-3.0+ AND MIT URL: https://xpra.org/ Source0: xpra-html5-%{version}.tar.gz -### To update, run 'npm pack uglify-js' -Source1: uglify-js-%{uglifyjs_version}.tgz +### To update UglifyJS using npm release: +### npm pack uglify-js +### To update UglifyJS using github release: +### osc service runall download_files +#Source1: https://registry.npmjs.org/uglify-js/-/uglify-js-%%{uglifyjs_ver}.tgz#/uglify-js-%%{uglifyjs_version}.tgz +Source1: https://github.com/mishoo/UglifyJS/archive/refs/tags/v%{uglifyjs_version}.tar.gz#/uglify-js-%{uglifyjs_version}.tar.gz ##### BuildRequires: fdupes BuildRequires: git-core @@ -65,9 +69,14 @@ echo -e "\nPWD: '$(pwd)'\n" echo -e "%{name} :: %{version}" find . -iname uglifyjs -exec ls -ld {} \; -export PATH=$PATH:$(pwd)/package/bin -chmod -v 755 %{_builddir}/%{name}-%{version}/package/bin/uglifyjs -ls -l %{_builddir}/%{name}-%{version}/package/bin +### Using npm download +#export PATH=$PATH:$(pwd)/package/bin +#chmod -v 755 %%{_builddir}/%%{name}-%%{version}/package/bin/uglifyjs +#ls -l %%{_builddir}/%%{name}-%%{version}/package/bin +##### +export PATH=$PATH:$(pwd)/UglifyJS-%{uglifyjs_version}/bin +chmod -v 755 %{_builddir}/%{name}-%{version}/UglifyJS-%{uglifyjs_version}/bin/uglifyjs +ls -l %{_builddir}/%{name}-%{version}/UglifyJS-%{uglifyjs_version}/bin find . -iname uglifyjs -exec ls -ld {} \; echo -e "\nUGLIFYJS -check2 :: $(which uglifyjs)\n" ##### ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.DasrcY/_old 2022-04-27 21:41:10.657002849 +0200 +++ /var/tmp/diff_new_pack.DasrcY/_new 2022-04-27 21:41:10.661002854 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/Xpra-org/xpra-html5</param> - <param name="changesrevision">82199bc802571876f0b0ed20bc7e8dcce5257d02</param></service></servicedata> + <param name="changesrevision">ecc3a0819807d5174d28b6bc76e498d9af3b92fa</param></service></servicedata> (No newline at EOF) ++++++ xpra-html5-4.5.2+git20220322.82199bc.tar.gz -> xpra-html5-4.5.2+git20220421.ecc3a08.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/FETCH_HEAD new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/FETCH_HEAD --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/FETCH_HEAD 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/FETCH_HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -82199bc802571876f0b0ed20bc7e8dcce5257d02 branch 'master' of https://github.com/Xpra-org/xpra-html5 -379cfdc11c4651e98a3febc1a4b4192d85944b53 not-for-merge branch 'v4.2.x' of https://github.com/Xpra-org/xpra-html5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/HEAD new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/HEAD --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/HEAD 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/ORIG_HEAD new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/ORIG_HEAD --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/ORIG_HEAD 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/ORIG_HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -82199bc802571876f0b0ed20bc7e8dcce5257d02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/config new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/config --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/config 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/config 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = https://github.com/Xpra-org/xpra-html5 - fetch = +refs/heads/*:refs/remotes/origin/* -[branch "master"] - remote = origin - merge = refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/description new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/description --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/description 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/description 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/applypatch-msg.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/applypatch-msg.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/applypatch-msg.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message taken by -# applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. The hook is -# allowed to edit the commit message file. -# -# To enable this hook, rename this file to "applypatch-msg". - -. git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/commit-msg.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/commit-msg.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/commit-msg.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to check the commit log message. -# Called by "git commit" with one argument, the name of the file -# that has the commit message. The hook should exit with non-zero -# status after issuing an appropriate message if it wants to stop the -# commit. The hook is allowed to edit the commit message file. -# -# To enable this hook, rename this file to "commit-msg". - -# Uncomment the below to add a Signed-off-by line to the message. -# Doing this in a hook is a bad idea in general, but the prepare-commit-msg -# hook is more suited to it. -# -# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" - -# This example catches duplicate Signed-off-by lines. - -test "" = "$(grep '^Signed-off-by: ' "$1" | - sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { - echo >&2 Duplicate Signed-off-by lines. - exit 1 -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/fsmonitor-watchman.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/fsmonitor-watchman.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/fsmonitor-watchman.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/fsmonitor-watchman.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,173 +0,0 @@ -#!/usr/bin/perl - -use strict; -use warnings; -use IPC::Open2; - -# An example hook script to integrate Watchman -# (https://facebook.github.io/watchman/) with git to speed up detecting -# new and modified files. -# -# The hook is passed a version (currently 2) and last update token -# formatted as a string and outputs to stdout a new update token and -# all files that have been modified since the update token. Paths must -# be relative to the root of the working tree and separated by a single NUL. -# -# To enable this hook, rename this file to "query-watchman" and set -# 'git config core.fsmonitor .git/hooks/query-watchman' -# -my ($version, $last_update_token) = @ARGV; - -# Uncomment for debugging -# print STDERR "$0 $version $last_update_token\n"; - -# Check the hook interface version -if ($version ne 2) { - die "Unsupported query-fsmonitor hook version '$version'.\n" . - "Falling back to scanning...\n"; -} - -my $git_work_tree = get_working_dir(); - -my $retry = 1; - -my $json_pkg; -eval { - require JSON::XS; - $json_pkg = "JSON::XS"; - 1; -} or do { - require JSON::PP; - $json_pkg = "JSON::PP"; -}; - -launch_watchman(); - -sub launch_watchman { - my $o = watchman_query(); - if (is_work_tree_watched($o)) { - output_result($o->{clock}, @{$o->{files}}); - } -} - -sub output_result { - my ($clockid, @files) = @_; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # binmode $fh, ":utf8"; - # print $fh "$clockid\n@files\n"; - # close $fh; - - binmode STDOUT, ":utf8"; - print $clockid; - print "\0"; - local $, = "\0"; - print @files; -} - -sub watchman_clock { - my $response = qx/watchman clock "$git_work_tree"/; - die "Failed to get clock id on '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - - return $json_pkg->new->utf8->decode($response); -} - -sub watchman_query { - my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') - or die "open2() failed: $!\n" . - "Falling back to scanning...\n"; - - # In the query expression below we're asking for names of files that - # changed since $last_update_token but not from the .git folder. - # - # To accomplish this, we're using the "since" generator to use the - # recency index to select candidate nodes and "fields" to limit the - # output to file names only. Then we're using the "expression" term to - # further constrain the results. - if (substr($last_update_token, 0, 1) eq "c") { - $last_update_token = "\"$last_update_token\""; - } - my $query = <<" END"; - ["query", "$git_work_tree", { - "since": $last_update_token, - "fields": ["name"], - "expression": ["not", ["dirname", ".git"]] - }] - END - - # Uncomment for debugging the watchman query - # open (my $fh, ">", ".git/watchman-query.json"); - # print $fh $query; - # close $fh; - - print CHLD_IN $query; - close CHLD_IN; - my $response = do {local $/; <CHLD_OUT>}; - - # Uncomment for debugging the watch response - # open ($fh, ">", ".git/watchman-response.json"); - # print $fh $response; - # close $fh; - - die "Watchman: command returned no output.\n" . - "Falling back to scanning...\n" if $response eq ""; - die "Watchman: command returned invalid output: $response\n" . - "Falling back to scanning...\n" unless $response =~ /^\{/; - - return $json_pkg->new->utf8->decode($response); -} - -sub is_work_tree_watched { - my ($output) = @_; - my $error = $output->{error}; - if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { - $retry--; - my $response = qx/watchman watch "$git_work_tree"/; - die "Failed to make watchman watch '$git_work_tree'.\n" . - "Falling back to scanning...\n" if $? != 0; - $output = $json_pkg->new->utf8->decode($response); - $error = $output->{error}; - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - # Uncomment for debugging watchman output - # open (my $fh, ">", ".git/watchman-output.out"); - # close $fh; - - # Watchman will always return all files on the first query so - # return the fast "everything is dirty" flag to git and do the - # Watchman query just to get it over with now so we won't pay - # the cost in git to look up each individual file. - my $o = watchman_clock(); - $error = $output->{error}; - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - output_result($o->{clock}, ("/")); - $last_update_token = $o->{clock}; - - eval { launch_watchman() }; - return 0; - } - - die "Watchman: $error.\n" . - "Falling back to scanning...\n" if $error; - - return 1; -} - -sub get_working_dir { - my $working_dir; - if ($^O =~ 'msys' || $^O =~ 'cygwin') { - $working_dir = Win32::GetCwd(); - $working_dir =~ tr/\\/\//; - } else { - require Cwd; - $working_dir = Cwd::cwd(); - } - - return $working_dir; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/post-update.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/post-update.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/post-update.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare a packed repository for use over -# dumb transports. -# -# To enable this hook, rename this file to "post-update". - -exec git update-server-info diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-applypatch.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-applypatch.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-applypatch.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed -# by applypatch from an e-mail message. -# -# The hook should exit with non-zero status after issuing an -# appropriate message if it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-applypatch". - -. git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-commit.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-commit.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-commit.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,49 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git commit" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, rename this file to "pre-commit". - -if git rev-parse --verify HEAD >/dev/null 2>&1 -then - against=HEAD -else - # Initial commit: diff against an empty tree object - against=$(git hash-object -t tree /dev/null) -fi - -# If you want to allow non-ASCII filenames set this variable to true. -allownonascii=$(git config --type=bool hooks.allownonascii) - -# Redirect output to stderr. -exec 1>&2 - -# Cross platform projects tend to avoid non-ASCII filenames; prevent -# them from being added to the repository. We exploit the fact that the -# printable range starts at the space character and ends with tilde. -if [ "$allownonascii" != "true" ] && - # Note that the use of brackets around a tr range is ok here, (it's - # even required, for portability to Solaris 10's /usr/bin/tr), since - # the square bracket bytes happen to fall in the designated range. - test $(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 -then - cat <<\EOF -Error: Attempt to add a non-ASCII file name. - -This can cause problems if you want to work with people on other platforms. - -To be portable it is advisable to rename the file. - -If you know what you are doing you can disable this check using: - - git config hooks.allownonascii true -EOF - exit 1 -fi - -# If there are whitespace errors, print the offending file names and fail. -exec git diff-index --check --cached $against -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-merge-commit.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-merge-commit.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-merge-commit.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-merge-commit.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by "git merge" with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message to -# stderr if it wants to stop the merge commit. -# -# To enable this hook, rename this file to "pre-merge-commit". - -. git-sh-setup -test -x "$GIT_DIR/hooks/pre-commit" && - exec "$GIT_DIR/hooks/pre-commit" -: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-push.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-push.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-push.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-push.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,53 +0,0 @@ -#!/bin/sh - -# An example hook script to verify what is about to be pushed. Called by "git -# push" after it has checked the remote status, but before anything has been -# pushed. If this script exits with a non-zero status nothing will be pushed. -# -# This hook is called with the following parameters: -# -# $1 -- Name of the remote to which the push is being done -# $2 -- URL to which the push is being done -# -# If pushing without using a named remote those arguments will be equal. -# -# Information about the commits which are being pushed is supplied as lines to -# the standard input in the form: -# -# <local ref> <local oid> <remote ref> <remote oid> -# -# This sample shows how to prevent push of commits where the log message starts -# with "WIP" (work in progress). - -remote="$1" -url="$2" - -zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0') - -while read local_ref local_oid remote_ref remote_oid -do - if test "$local_oid" = "$zero" - then - # Handle delete - : - else - if test "$remote_oid" = "$zero" - then - # New branch, examine all commits - range="$local_oid" - else - # Update to existing branch, examine new commits - range="$remote_oid..$local_oid" - fi - - # Check for WIP commit - commit=$(git rev-list -n 1 --grep '^WIP' "$range") - if test -n "$commit" - then - echo >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-rebase.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-rebase.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-rebase.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,169 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2006, 2008 Junio C Hamano -# -# The "pre-rebase" hook is run just before "git rebase" starts doing -# its job, and can prevent the command from running by exiting with -# non-zero status. -# -# The hook is called with the following parameters: -# -# $1 -- the upstream the series was forked from. -# $2 -- the branch being rebased (or empty when rebasing the current branch). -# -# This sample shows how to prevent topic branches that are already -# merged to 'next' branch from getting rebased, because allowing it -# would result in rebasing already published history. - -publish=next -basebranch="$1" -if test "$#" = 2 -then - topic="refs/heads/$2" -else - topic=`git symbolic-ref HEAD` || - exit 0 ;# we do not interrupt rebasing detached HEAD -fi - -case "$topic" in -refs/heads/??/*) - ;; -*) - exit 0 ;# we do not interrupt others. - ;; -esac - -# Now we are dealing with a topic branch being rebased -# on top of master. Is it OK to rebase it? - -# Does the topic really exist? -git show-ref -q "$topic" || { - echo >&2 "No such branch $topic" - exit 1 -} - -# Is topic fully merged to master? -not_in_master=`git rev-list --pretty=oneline ^master "$topic"` -if test -z "$not_in_master" -then - echo >&2 "$topic is fully merged to master; better remove it." - exit 1 ;# we could allow it, but there is no point. -fi - -# Is topic ever merged to next? If so you should not be rebasing it. -only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` -only_next_2=`git rev-list ^master ${publish} | sort` -if test "$only_next_1" = "$only_next_2" -then - not_in_topic=`git rev-list "^$topic" master` - if test -z "$not_in_topic" - then - echo >&2 "$topic is already up to date with master" - exit 1 ;# we could allow it, but there is no point. - else - exit 0 - fi -else - not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` - /usr/bin/perl -e ' - my $topic = $ARGV[0]; - my $msg = "* $topic has commits already merged to public branch:\n"; - my (%not_in_next) = map { - /^([0-9a-f]+) /; - ($1 => 1); - } split(/\n/, $ARGV[1]); - for my $elem (map { - /^([0-9a-f]+) (.*)$/; - [$1 => $2]; - } split(/\n/, $ARGV[2])) { - if (!exists $not_in_next{$elem->[0]}) { - if ($msg) { - print STDERR $msg; - undef $msg; - } - print STDERR " $elem->[1]\n"; - } - } - ' "$topic" "$not_in_next" "$not_in_master" - exit 1 -fi - -<<\DOC_END - -This sample hook safeguards topic branches that have been -published from being rewound. - -The workflow assumed here is: - - * Once a topic branch forks from "master", "master" is never - merged into it again (either directly or indirectly). - - * Once a topic branch is fully cooked and merged into "master", - it is deleted. If you need to build on top of it to correct - earlier mistakes, a new topic branch is created by forking at - the tip of the "master". This is not strictly necessary, but - it makes it easier to keep your history simple. - - * Whenever you need to test or publish your changes to topic - branches, merge them into "next" branch. - -The script, being an example, hardcodes the publish branch name -to be "next", but it is trivial to make it configurable via -$GIT_DIR/config mechanism. - -With this workflow, you would want to know: - -(1) ... if a topic branch has ever been merged to "next". Young - topic branches can have stupid mistakes you would rather - clean up before publishing, and things that have not been - merged into other branches can be easily rebased without - affecting other people. But once it is published, you would - not want to rewind it. - -(2) ... if a topic branch has been fully merged to "master". - Then you can delete it. More importantly, you should not - build on top of it -- other people may already want to - change things related to the topic as patches against your - "master", so if you need further changes, it is better to - fork the topic (perhaps with the same name) afresh from the - tip of "master". - -Let's look at this example: - - o---o---o---o---o---o---o---o---o---o "next" - / / / / - / a---a---b A / / - / / / / - / / c---c---c---c B / - / / / \ / - / / / b---b C \ / - / / / / \ / - ---o---o---o---o---o---o---o---o---o---o---o "master" - - -A, B and C are topic branches. - - * A has one fix since it was merged up to "next". - - * B has finished. It has been fully merged up to "master" and "next", - and is ready to be deleted. - - * C has not merged to "next" at all. - -We would want to allow C to be rebased, refuse A, and encourage -B to be deleted. - -To compute (1): - - git rev-list ^master ^topic next - git rev-list ^master next - - if these match, topic has not merged in next at all. - -To compute (2): - - git rev-list master..topic - - if this is empty, it is fully merged to "master". - -DOC_END diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-receive.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-receive.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/pre-receive.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/pre-receive.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# -# An example hook script to make use of push options. -# The example simply echoes all push options that start with 'echoback=' -# and rejects all pushes when the "reject" push option is used. -# -# To enable this hook, rename this file to "pre-receive". - -if test -n "$GIT_PUSH_OPTION_COUNT" -then - i=0 - while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" - do - eval "value=\$GIT_PUSH_OPTION_$i" - case "$value" in - echoback=*) - echo "echo from the pre-receive-hook: ${value#*=}" >&2 - ;; - reject) - exit 1 - esac - i=$((i + 1)) - done -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/prepare-commit-msg.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/prepare-commit-msg.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/prepare-commit-msg.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -#!/bin/sh -# -# An example hook script to prepare the commit log message. -# Called by "git commit" with the name of the file that has the -# commit message, followed by the description of the commit -# message's source. The hook's purpose is to edit the commit -# message file. If the hook fails with a non-zero status, -# the commit is aborted. -# -# To enable this hook, rename this file to "prepare-commit-msg". - -# This hook includes three examples. The first one removes the -# "# Please enter the commit message..." help message. -# -# The second includes the output of "git diff --name-status -r" -# into the message, just before the "git status" output. It is -# commented because it doesn't cope with --amend or with squashed -# commits. -# -# The third example adds a Signed-off-by line to the message, that can -# still be edited. This is rarely a good idea. - -COMMIT_MSG_FILE=$1 -COMMIT_SOURCE=$2 -SHA1=$3 - -/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" - -# case "$COMMIT_SOURCE,$SHA1" in -# ,|template,) -# /usr/bin/perl -i.bak -pe ' -# print "\n" . `git diff --cached --name-status -r` -# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; -# *) ;; -# esac - -# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') -# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" -# if test -z "$COMMIT_SOURCE" -# then -# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" -# fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/push-to-checkout.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/push-to-checkout.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/push-to-checkout.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/push-to-checkout.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,78 +0,0 @@ -#!/bin/sh - -# An example hook script to update a checked-out tree on a git push. -# -# This hook is invoked by git-receive-pack(1) when it reacts to git -# push and updates reference(s) in its repository, and when the push -# tries to update the branch that is currently checked out and the -# receive.denyCurrentBranch configuration variable is set to -# updateInstead. -# -# By default, such a push is refused if the working tree and the index -# of the remote repository has any difference from the currently -# checked out commit; when both the working tree and the index match -# the current commit, they are updated to match the newly pushed tip -# of the branch. This hook is to be used to override the default -# behaviour; however the code below reimplements the default behaviour -# as a starting point for convenient modification. -# -# The hook receives the commit with which the tip of the current -# branch is going to be updated: -commit=$1 - -# It can exit with a non-zero status to refuse the push (when it does -# so, it must not modify the index or the working tree). -die () { - echo >&2 "$*" - exit 1 -} - -# Or it can make any necessary changes to the working tree and to the -# index to bring them to the desired state when the tip of the current -# branch is updated to the new commit, and exit with a zero status. -# -# For example, the hook can simply run git read-tree -u -m HEAD "$1" -# in order to emulate git fetch that is run in the reverse direction -# with git push, as the two-tree form of git read-tree -u -m is -# essentially the same as git switch or git checkout that switches -# branches while keeping the local changes in the working tree that do -# not interfere with the difference between the branches. - -# The below is a more-or-less exact translation to shell of the C code -# for the default behaviour for git's push-to-checkout hook defined in -# the push_to_deploy() function in builtin/receive-pack.c. -# -# Note that the hook will be executed from the repository directory, -# not from the working tree, so if you want to perform operations on -# the working tree, you will have to adapt your code accordingly, e.g. -# by adding "cd .." or using relative paths. - -if ! git update-index -q --ignore-submodules --refresh -then - die "Up-to-date check failed" -fi - -if ! git diff-files --quiet --ignore-submodules -- -then - die "Working directory has unstaged changes" -fi - -# This is a rough translation of: -# -# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX -if git cat-file -e HEAD 2>/dev/null -then - head=HEAD -else - head=$(git hash-object -t tree --stdin </dev/null) -fi - -if ! git diff-index --quiet --cached --ignore-submodules $head -- -then - die "Working directory has staged changes" -fi - -if ! git read-tree -u -m "$commit" -then - die "Could not update working tree to new HEAD" -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/update.sample new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/update.sample --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/hooks/update.sample 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100 @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block unannotated tags from entering. -# Called by "git receive-pack" with arguments: refname sha1-old sha1-new -# -# To enable this hook, rename this file to "update". -# -# Config -# ------ -# hooks.allowunannotated -# This boolean sets whether unannotated tags will be allowed into the -# repository. By default they won't be. -# hooks.allowdeletetag -# This boolean sets whether deleting tags will be allowed in the -# repository. By default they won't be. -# hooks.allowmodifytag -# This boolean sets whether a tag may be modified after creation. By default -# it won't be. -# hooks.allowdeletebranch -# This boolean sets whether deleting branches will be allowed in the -# repository. By default they won't be. -# hooks.denycreatebranch -# This boolean sets whether remotely creating branches will be denied -# in the repository. By default this is allowed. -# - -# --- Command line -refname="$1" -oldrev="$2" -newrev="$3" - -# --- Safety check -if [ -z "$GIT_DIR" ]; then - echo "Don't run this script from the command line." >&2 - echo " (if you want, you could supply GIT_DIR then run" >&2 - echo " $0 <ref> <oldrev> <newrev>)" >&2 - exit 1 -fi - -if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "usage: $0 <ref> <oldrev> <newrev>" >&2 - exit 1 -fi - -# --- Config -allowunannotated=$(git config --type=bool hooks.allowunannotated) -allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) -denycreatebranch=$(git config --type=bool hooks.denycreatebranch) -allowdeletetag=$(git config --type=bool hooks.allowdeletetag) -allowmodifytag=$(git config --type=bool hooks.allowmodifytag) - -# check for no description -projectdesc=$(sed -e '1q' "$GIT_DIR/description") -case "$projectdesc" in -"Unnamed repository"* | "") - echo "*** Project description file hasn't been set" >&2 - exit 1 - ;; -esac - -# --- Check types -# if $newrev is 0000...0000, it's a commit to delete a ref. -zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0') -if [ "$newrev" = "$zero" ]; then - newrev_type=delete -else - newrev_type=$(git cat-file -t $newrev) -fi - -case "$refname","$newrev_type" in - refs/tags/*,commit) - # un-annotated tag - short_refname=${refname##refs/tags/} - if [ "$allowunannotated" != "true" ]; then - echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 - echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 - exit 1 - fi - ;; - refs/tags/*,delete) - # delete tag - if [ "$allowdeletetag" != "true" ]; then - echo "*** Deleting a tag is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/tags/*,tag) - # annotated tag - if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 - then - echo "*** Tag '$refname' already exists." >&2 - echo "*** Modifying a tag is not allowed in this repository." >&2 - exit 1 - fi - ;; - refs/heads/*,commit) - # branch - if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then - echo "*** Creating a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/heads/*,delete) - # delete branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - refs/remotes/*,commit) - # tracking branch - ;; - refs/remotes/*,delete) - # delete tracking branch - if [ "$allowdeletebranch" != "true" ]; then - echo "*** Deleting a tracking branch is not allowed in this repository" >&2 - exit 1 - fi - ;; - *) - # Anything else (is there anything else?) - echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 - exit 1 - ;; -esac - -# --- Finished -exit 0 Binary files old/xpra-html5-4.5.2+git20220322.82199bc/.git/index and new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/info/exclude new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/info/exclude --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/info/exclude 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100 @@ -1,6 +0,0 @@ -# git ls-files --others --exclude-from=.git/info/exclude -# Lines that start with '#' are comments. -# For a project mostly in C, the following would be a good set of -# exclude patterns (uncomment them if you want to use them): -# *.[oa] -# *~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/logs/HEAD new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/logs/HEAD --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/logs/HEAD 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -0000000000000000000000000000000000000000 82199bc802571876f0b0ed20bc7e8dcce5257d02 Scott Bradnick <[email protected]> 1648571607 -0400 clone: from https://github.com/Xpra-org/xpra-html5 -82199bc802571876f0b0ed20bc7e8dcce5257d02 82199bc802571876f0b0ed20bc7e8dcce5257d02 Scott Bradnick <[email protected]> 1648571607 -0400 reset: moving to master -82199bc802571876f0b0ed20bc7e8dcce5257d02 82199bc802571876f0b0ed20bc7e8dcce5257d02 Scott Bradnick <[email protected]> 1649087542 -0400 reset: moving to master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/logs/refs/heads/master new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/logs/refs/heads/master --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/logs/refs/heads/master 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 82199bc802571876f0b0ed20bc7e8dcce5257d02 Scott Bradnick <[email protected]> 1648571607 -0400 clone: from https://github.com/Xpra-org/xpra-html5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/logs/refs/remotes/origin/HEAD new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/logs/refs/remotes/origin/HEAD --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/logs/refs/remotes/origin/HEAD 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -0000000000000000000000000000000000000000 82199bc802571876f0b0ed20bc7e8dcce5257d02 Scott Bradnick <[email protected]> 1648571607 -0400 clone: from https://github.com/Xpra-org/xpra-html5 Binary files old/xpra-html5-4.5.2+git20220322.82199bc/.git/objects/pack/pack-bb54450e61fd5287d64695af609f3f0b88ebf28c.idx and new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/objects/pack/pack-bb54450e61fd5287d64695af609f3f0b88ebf28c.idx differ Binary files old/xpra-html5-4.5.2+git20220322.82199bc/.git/objects/pack/pack-bb54450e61fd5287d64695af609f3f0b88ebf28c.pack and new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/objects/pack/pack-bb54450e61fd5287d64695af609f3f0b88ebf28c.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/packed-refs new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/packed-refs --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/packed-refs 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100 @@ -1,21 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -82199bc802571876f0b0ed20bc7e8dcce5257d02 refs/remotes/origin/master -379cfdc11c4651e98a3febc1a4b4192d85944b53 refs/remotes/origin/v4.2.x -48fb9b87ae90f04918ac4701a12e025a8385b7d7 refs/tags/v4.1 -^62a7faa1cf0c96de769b4c6f4e2639b85194e046 -d4fb6648d08d6980a24c05bf3a74a1bd22b5f5ed refs/tags/v4.1.1 -^9f6c4772a0e51233621eda0ddae044522f17f09b -5284c3e798dc4ca33030cbbe6967f4289a458155 refs/tags/v4.1.2 -^cfab323eecb65ad971ad621dfac0ca85c0856d56 -9858eb5b39152ef315575193f0f69402a29a712c refs/tags/v4.2 -^f4e6d50f0405350e1c5f92705ce729ff415937c8 -3ad4aa2178a6b8137433af423daa1b848ec5ab2f refs/tags/v4.3 -^8a6057438b67b05b80a6a3e2344c81030779416b -a1d4f23f2b79d4a4aedc169a5b8b110f5c902964 refs/tags/v4.4 -^90f302648a21829fd0699dbdb6a478fa30aac665 -c83b0e50ca737918e3874a4af1882b9e9f9fe9ac refs/tags/v4.5 -^6cf98b41286a31a7ffb36a939945318beb31e3d3 -658b3f4d8377d94e8f5a1b436360c0cf02656d87 refs/tags/v4.5.1 -^72c49d25dc0cd18d291ea72ede532f4114439ccf -a164bdc20dea34da6410000fdaf7003a75310feb refs/tags/v4.5.2 -^132d3c516ec78a793d7966fd2ae4ce8aa4551772 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/refs/heads/master new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/refs/heads/master --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/refs/heads/master 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -82199bc802571876f0b0ed20bc7e8dcce5257d02 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/.git/refs/remotes/origin/HEAD new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/refs/remotes/origin/HEAD --- old/xpra-html5-4.5.2+git20220322.82199bc/.git/refs/remotes/origin/HEAD 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -ref: refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/html5/index.html new/xpra-html5-4.5.2+git20220421.ecc3a08/html5/index.html --- old/xpra-html5-4.5.2+git20220322.82199bc/html5/index.html 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/html5/index.html 2022-04-21 11:18:32.000000000 +0200 @@ -529,6 +529,21 @@ password_input.focus(); password_input.addEventListener("keydown", password_special_keys); } + + function keycloak_prompt_fn(url, callback) { + const params = new URLSearchParams(window.location.search); + const code = params.get("code"); + const error = params.get("error"); + if (error) { + const error_description = params.get("error_description"); + callback(JSON.stringify({ error, error_description })); + } else if (!code) { + window.location.href = url; + } else { + history.replaceState({}, "", window.location.pathname); + callback(JSON.stringify({ code })); + } + } let touchaction_scroll = true; function toggle_touchaction() { @@ -1379,6 +1394,7 @@ } }); client.password_prompt_fn = password_prompt_fn; + client.keycloak_prompt_fn = keycloak_prompt_fn; $('#fullscreen').on('click', function (e) { toggle_fullscreen(); }); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xpra-html5-4.5.2+git20220322.82199bc/html5/js/Client.js new/xpra-html5-4.5.2+git20220421.ecc3a08/html5/js/Client.js --- old/xpra-html5-4.5.2+git20220322.82199bc/html5/js/Client.js 2022-03-22 12:28:13.000000000 +0100 +++ new/xpra-html5-4.5.2+git20220421.ecc3a08/html5/js/Client.js 2022-04-21 11:18:32.000000000 +0200 @@ -107,6 +107,7 @@ this.RGB_FORMATS = ["RGBX", "RGBA", "RGB"]; this.disconnect_reason = null; this.password_prompt_fn = null; + this.keycloak_prompt_fn = null; // audio this.audio = null; this.audio_enabled = false; @@ -1202,7 +1203,7 @@ XpraClient.prototype._make_hello_base = function() { this.capabilities = {}; - const digests = ["hmac", "hmac+md5", "xor"]; + const digests = ["hmac", "hmac+md5", "xor", "keycloak"]; if (typeof forge!=='undefined') { try { this.debug("network", "forge.md.algorithms=", forge.md.algorithms); @@ -1331,7 +1332,11 @@ this.key_layout = this._get_keyboard_layout(); if (this.supported_encodings.indexOf("scroll")>0) { //support older servers which use a capability for enabling 'scroll' encoding: - this._update_capabilities({"encoding.scrolling" : true}); + this._update_capabilities({ + "encoding.scrolling" : true, + "encoding.scrolling.min-percent" : 50, + "encoding.scrolling.preference" : 20, + }); } this._update_capabilities({ "auto_refresh_delay" : 500, @@ -1355,7 +1360,6 @@ "encodings.cursor" : ["png"], "encoding.flush" : true, "encoding.transparency" : true, - //"encoding.scrolling.min-percent" : 30, "encoding.decoder-speed" : {"video" : 0}, "encodings.packet" : true, //"encoding.min-speed" : 80, @@ -2475,14 +2479,19 @@ ctx.close(); return; } - ctx.do_process_challenge(digest, server_salt, salt_digest, password); + const challenge_digest = digest.startsWith("keycloak") ? "xor" : digest; + ctx.do_process_challenge(challenge_digest, server_salt, salt_digest, password); } if (ctx.passwords.length>0) { const password = ctx.passwords.shift(); do_process_challenge(password); return; } - if (ctx.password_prompt_fn) { + if (digest.startsWith("keycloak") && ctx.keycloak_prompt_fn) { + ctx.cancel_hello_timer(); + ctx.keycloak_prompt_fn(server_salt, do_process_challenge); + return; + } else if (ctx.password_prompt_fn) { const address = ""+client.host+":"+client.port; ctx.cancel_hello_timer(); ctx.password_prompt_fn("The server at "+address+" requires a "+prompt, do_process_challenge); ++++++ xpra-html5.obsinfo ++++++ --- /var/tmp/diff_new_pack.DasrcY/_old 2022-04-27 21:41:10.929003169 +0200 +++ /var/tmp/diff_new_pack.DasrcY/_new 2022-04-27 21:41:10.933003174 +0200 @@ -1,5 +1,5 @@ name: xpra-html5 -version: 4.5.2+git20220322.82199bc -mtime: 1647948493 -commit: 82199bc802571876f0b0ed20bc7e8dcce5257d02 +version: 4.5.2+git20220421.ecc3a08 +mtime: 1650532712 +commit: ecc3a0819807d5174d28b6bc76e498d9af3b92fa
