Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fwknop-gui for openSUSE:Factory checked in at 2022-12-05 18:01:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fwknop-gui (Old) and /work/SRC/openSUSE:Factory/.fwknop-gui.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fwknop-gui" Mon Dec 5 18:01:16 2022 rev:3 rq:1040090 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/fwknop-gui/fwknop-gui.changes 2021-04-01 14:19:00.248131277 +0200 +++ /work/SRC/openSUSE:Factory/.fwknop-gui.new.1835/fwknop-gui.changes 2022-12-05 18:01:20.184625774 +0100 @@ -1,0 +2,7 @@ +Sun Dec 4 20:37:59 UTC 2022 - Dirk Müller <[email protected]> + +- update to 1.3.1: + * Fix QR export feature, fixes a bug on some platforms where the QR + code was truncated. + +------------------------------------------------------------------- Old: ---- fwknop-gui-1.3.tar.gz New: ---- fwknop-gui-1.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fwknop-gui.spec ++++++ --- /var/tmp/diff_new_pack.dj4lLb/_old 2022-12-05 18:01:20.936629870 +0100 +++ /var/tmp/diff_new_pack.dj4lLb/_new 2022-12-05 18:01:20.940629891 +0100 @@ -1,7 +1,7 @@ # # spec file for package fwknop-gui # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # Copyright (c) 2019, Martin Hauke <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,14 +18,14 @@ Name: fwknop-gui -Version: 1.3 +Version: 1.3.1 Release: 0 Summary: FireWall KNock OPerator Graphical User Interface License: GPL-3.0-or-later Group: Productivity/Networking/Security URL: https://incomsystems.biz/fwknop-gui/ #Git-Clone: https://github.com/jp-bennett/fwknop-gui.git -Source: https://github.com/jp-bennett/fwknop-gui/archive/v%{version}-release.tar.gz#/%{name}-%{version}.tar.gz +Source: https://incomsystems.biz/fwknop-gui/downloads/fwknop-gui-%{version}.tar.gz Patch0: fwknop-gui-fix-manpage-path.patch BuildRequires: asciidoc BuildRequires: cmake @@ -57,7 +57,7 @@ readable by the command line client. %prep -%setup -q -n %{name}-%{version}-release +%setup -q -n %{name} %patch0 -p1 %build ++++++ fwknop-gui-1.3.tar.gz -> fwknop-gui-1.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/HEAD new/fwknop-gui/.git/HEAD --- old/fwknop-gui-1.3-release/.git/HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/HEAD 2016-09-05 03:42:11.000000000 +0200 @@ -0,0 +1 @@ +ref: refs/heads/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/config new/fwknop-gui/.git/config --- old/fwknop-gui-1.3-release/.git/config 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/config 2016-09-05 03:42:11.000000000 +0200 @@ -0,0 +1,11 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[remote "origin"] + url = https://github.com/jp-bennett/fwknop-gui + 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/fwknop-gui-1.3-release/.git/description new/fwknop-gui/.git/description --- old/fwknop-gui-1.3-release/.git/description 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/description 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/hooks/applypatch-msg.sample new/fwknop-gui/.git/hooks/applypatch-msg.sample --- old/fwknop-gui-1.3-release/.git/hooks/applypatch-msg.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/hooks/applypatch-msg.sample 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,15 @@ +#!/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/fwknop-gui-1.3-release/.git/hooks/commit-msg.sample new/fwknop-gui/.git/hooks/commit-msg.sample --- old/fwknop-gui-1.3-release/.git/hooks/commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/hooks/commit-msg.sample 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,24 @@ +#!/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/fwknop-gui-1.3-release/.git/hooks/post-update.sample new/fwknop-gui/.git/hooks/post-update.sample --- old/fwknop-gui-1.3-release/.git/hooks/post-update.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/hooks/post-update.sample 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,8 @@ +#!/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/fwknop-gui-1.3-release/.git/hooks/pre-applypatch.sample new/fwknop-gui/.git/hooks/pre-applypatch.sample --- old/fwknop-gui-1.3-release/.git/hooks/pre-applypatch.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/hooks/pre-applypatch.sample 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,14 @@ +#!/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/fwknop-gui-1.3-release/.git/hooks/pre-commit.sample new/fwknop-gui/.git/hooks/pre-commit.sample --- old/fwknop-gui-1.3-release/.git/hooks/pre-commit.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/hooks/pre-commit.sample 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,49 @@ +#!/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=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --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/fwknop-gui-1.3-release/.git/hooks/pre-push.sample new/fwknop-gui/.git/hooks/pre-push.sample --- old/fwknop-gui-1.3-release/.git/hooks/pre-push.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/hooks/pre-push.sample 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,53 @@ +#!/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 sha1> <remote ref> <remote sha1> +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -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/fwknop-gui-1.3-release/.git/hooks/pre-rebase.sample new/fwknop-gui/.git/hooks/pre-rebase.sample --- old/fwknop-gui-1.3-release/.git/hooks/pre-rebase.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/hooks/pre-rebase.sample 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,169 @@ +#!/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 + +exit 0 + +################################################################ + +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". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/hooks/prepare-commit-msg.sample new/fwknop-gui/.git/hooks/prepare-commit-msg.sample --- old/fwknop-gui-1.3-release/.git/hooks/prepare-commit-msg.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/hooks/prepare-commit-msg.sample 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,36 @@ +#!/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 comments out the +# "Conflicts:" part of a merge commit. +# +# 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. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/hooks/update.sample new/fwknop-gui/.git/hooks/update.sample --- old/fwknop-gui-1.3-release/.git/hooks/update.sample 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/hooks/update.sample 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,128 @@ +#!/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 --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --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="0000000000000000000000000000000000000000" +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/fwknop-gui-1.3-release/.git/index and new/fwknop-gui/.git/index differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/info/exclude new/fwknop-gui/.git/info/exclude --- old/fwknop-gui-1.3-release/.git/info/exclude 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/info/exclude 2016-09-05 03:42:09.000000000 +0200 @@ -0,0 +1,6 @@ +# 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/fwknop-gui-1.3-release/.git/logs/HEAD new/fwknop-gui/.git/logs/HEAD --- old/fwknop-gui-1.3-release/.git/logs/HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/logs/HEAD 2016-09-05 03:42:11.000000000 +0200 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 447df9bba27326c4d19c6d76af70a909e29a11b4 Jonathan Bennett <[email protected]> 1473039731 -0500 clone: from https://github.com/jp-bennett/fwknop-gui diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/logs/refs/heads/master new/fwknop-gui/.git/logs/refs/heads/master --- old/fwknop-gui-1.3-release/.git/logs/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/logs/refs/heads/master 2016-09-05 03:42:11.000000000 +0200 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 447df9bba27326c4d19c6d76af70a909e29a11b4 Jonathan Bennett <[email protected]> 1473039731 -0500 clone: from https://github.com/jp-bennett/fwknop-gui diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/logs/refs/remotes/origin/HEAD new/fwknop-gui/.git/logs/refs/remotes/origin/HEAD --- old/fwknop-gui-1.3-release/.git/logs/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/logs/refs/remotes/origin/HEAD 2016-09-05 03:42:11.000000000 +0200 @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 447df9bba27326c4d19c6d76af70a909e29a11b4 Jonathan Bennett <[email protected]> 1473039731 -0500 clone: from https://github.com/jp-bennett/fwknop-gui Binary files old/fwknop-gui-1.3-release/.git/objects/pack/pack-a685ea606a06e3a0674315a1eeede258828e1017.idx and new/fwknop-gui/.git/objects/pack/pack-a685ea606a06e3a0674315a1eeede258828e1017.idx differ Binary files old/fwknop-gui-1.3-release/.git/objects/pack/pack-a685ea606a06e3a0674315a1eeede258828e1017.pack and new/fwknop-gui/.git/objects/pack/pack-a685ea606a06e3a0674315a1eeede258828e1017.pack differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/packed-refs new/fwknop-gui/.git/packed-refs --- old/fwknop-gui-1.3-release/.git/packed-refs 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/packed-refs 2016-09-05 03:42:11.000000000 +0200 @@ -0,0 +1,4 @@ +# pack-refs with: peeled fully-peeled +447df9bba27326c4d19c6d76af70a909e29a11b4 refs/remotes/origin/master +8ddf7060466c4d30f991ec4fbad087483cafda06 refs/tags/v1.0-release +4ec34580d5b1656e00df1549399998bd7696b045 refs/tags/v1.3-release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/refs/heads/master new/fwknop-gui/.git/refs/heads/master --- old/fwknop-gui-1.3-release/.git/refs/heads/master 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/refs/heads/master 2016-09-05 03:42:11.000000000 +0200 @@ -0,0 +1 @@ +447df9bba27326c4d19c6d76af70a909e29a11b4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/.git/refs/remotes/origin/HEAD new/fwknop-gui/.git/refs/remotes/origin/HEAD --- old/fwknop-gui-1.3-release/.git/refs/remotes/origin/HEAD 1970-01-01 01:00:00.000000000 +0100 +++ new/fwknop-gui/.git/refs/remotes/origin/HEAD 2016-09-05 03:42:11.000000000 +0200 @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/Changes new/fwknop-gui/Changes --- old/fwknop-gui-1.3-release/Changes 2016-08-08 20:33:14.000000000 +0200 +++ new/fwknop-gui/Changes 2016-09-05 03:42:11.000000000 +0200 @@ -1,3 +1,7 @@ +New in V1.3.1 +Changes to the QR export feature, fixes a bug on some platforms where the QR + code was truncated. + New in V1.3 A countdown timer that keeps track of how long the port will remain open The ability to automatically resend knocks to keep a port open diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/fwknop_guiMain.cpp new/fwknop-gui/fwknop_guiMain.cpp --- old/fwknop-gui-1.3-release/fwknop_guiMain.cpp 2016-08-08 20:33:14.000000000 +0200 +++ new/fwknop-gui/fwknop_guiMain.cpp 2016-09-05 03:42:11.000000000 +0200 @@ -682,8 +682,7 @@ void fwknop_guiFrame::OnQR(wxCommandEvent &event) { if (ourConfig != NULL) { - qr_export *qr_export_dialog = new qr_export(_(""), ourConfig); - qr_export_dialog->Show(true); + qr_export *qr_export_dialog = new qr_export(ourConfig->NICK_NAME, ourConfig); } } @@ -745,7 +744,7 @@ //wxMessageBox(msg, _("Fwknop-gui")); wxAboutDialogInfo aboutInfo; aboutInfo.SetName(_("Fwknop-gui")); - aboutInfo.SetVersion(_("Version 1.3")); + aboutInfo.SetVersion(_("Version 1.3.1")); aboutInfo.SetDescription(_("Fwknop-gui is a cross platform graphical fwknop client.")); aboutInfo.SetWebSite(_("https://github.com/jp-bennett/fwknop-gui";)); aboutInfo.AddDeveloper(_("Jonathan Bennett")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fwknop-gui-1.3-release/qr_export.cpp new/fwknop-gui/qr_export.cpp --- old/fwknop-gui-1.3-release/qr_export.cpp 2016-08-08 20:33:14.000000000 +0200 +++ new/fwknop-gui/qr_export.cpp 2016-09-05 03:42:11.000000000 +0200 @@ -34,6 +34,8 @@ QRcode *ourQR = NULL; wxImage *ourQRImage; wxString QRBuf = wxT(""); + + wxBoxSizer* sizer = new wxBoxSizer(wxHORIZONTAL); if (selectedConfig->KEY_BASE64) QRBuf = (wxT("KEY_BASE64:")); else @@ -67,12 +69,12 @@ ourQRImage = new wxImage(ourQR->width, ourQR->width, rawImage); ourQRImage->Rescale(ourQR->width * 4, ourQR->width * 4); bmp = wxBitmap(*ourQRImage); - if (ourQR->width * 4 > 100) - this->SetSize(wxDefaultCoord, wxDefaultCoord, ourQR->width * 4 + 50, ourQR->width * 4 + 50); + sizer->SetMinSize(bmp.GetHeight(), bmp.GetHeight()); + SetSizer(sizer); + Layout(); + this->Fit(); Centre(); - ShowModal(); - Destroy(); QRcode_free(ourQR); } @@ -82,6 +84,7 @@ // depending on your system you may need to look at double-buffered dcs wxPaintDC dc(this); render(dc); + } void qr_export::paintNow() @@ -93,5 +96,6 @@ void qr_export::render(wxDC& dc) { - dc.DrawBitmap( bmp, 15, 15, false ); + dc.DrawBitmap( bmp, 0, 0, false ); + }
