diff -Nru kwalletcli-3.02/BSDmakefile kwalletcli-3.03/BSDmakefile --- kwalletcli-3.02/BSDmakefile 2016-08-30 19:34:16.000000000 +0000 +++ kwalletcli-3.03/BSDmakefile 2020-11-19 21:37:36.000000000 +0000 @@ -1,6 +1,6 @@ -# $MirOS: contrib/hosted/tg/code/kwalletcli/BSDmakefile,v 1.19 2016/08/30 19:33:50 tg Exp $ +# $MirOS: contrib/hosted/tg/code/kwalletcli/BSDmakefile,v 1.20 2020/11/19 21:37:09 tg Exp $ #- -# Copyright © 2009, 2010, 2011, 2012, 2016 +# Copyright © 2009, 2010, 2011, 2012, 2016, 2020 # mirabilos # # Provided that these terms and disclaimer and all copyright notices @@ -27,6 +27,8 @@ MAN= ${PROG}.1 ${SCRIPTS:=.1} BINDIR?= ${BSD_PREFIX}/bin +PKG_CONFIG?= pkg-config + KDE_VER?= 3 .if ${KDE_VER} == 3 KDE_INCS?= -I/usr/include/qt3 -I/usr/include/kde @@ -38,10 +40,11 @@ LDADD+= -lkdeui -lkdecore -lQtCore .elif ${KDE_VER} == 5 . ifndef KDE_INCS -QT5_INCS!= pkg-config --cflags Qt5Gui +QT5_INCS!= ${PKG_CONFIG} --cflags Qt5Gui . endif KDE_INCS?= ${QT5_INCS} -I/usr/include/KF5/KI18n \ - -I/usr/include/KF5/KCoreAddons -I/usr/include/KF5/KWallet + -I/usr/include/KF5/KCoreAddons \ + -I/usr/include/KF5/KWallet SRCS+= kwif5.cc LDADD+= -lKF5CoreAddons -lKF5Wallet -lKF5I18n -lQt5Core -lQt5Widgets .else diff -Nru kwalletcli-3.02/debian/changelog kwalletcli-3.03/debian/changelog --- kwalletcli-3.02/debian/changelog 2020-03-22 15:45:09.000000000 +0000 +++ kwalletcli-3.03/debian/changelog 2021-01-25 14:12:33.000000000 +0000 @@ -1,8 +1,10 @@ -kwalletcli (3.02-1build1) focal; urgency=medium +kwalletcli (3.03-1) unstable; urgency=low - * No-change rebuild for libgcc-s1 package name change. + * New upstream release + * Modernise packaging (Closes: #922167) + * Drop ancient release compatibility - -- Matthias Klose Sun, 22 Mar 2020 16:45:09 +0100 + -- Thorsten Glaser Mon, 25 Jan 2021 15:12:33 +0100 kwalletcli (3.02-1) unstable; urgency=medium diff -Nru kwalletcli-3.02/debian/compat kwalletcli-3.03/debian/compat --- kwalletcli-3.02/debian/compat 2019-01-05 10:37:02.000000000 +0000 +++ kwalletcli-3.03/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -12 diff -Nru kwalletcli-3.02/debian/control kwalletcli-3.03/debian/control --- kwalletcli-3.02/debian/control 2019-01-05 10:38:13.000000000 +0000 +++ kwalletcli-3.03/debian/control 2021-01-25 14:02:15.000000000 +0000 @@ -3,13 +3,8 @@ Priority: optional Homepage: http://www.mirbsd.org/kwalletcli.htm Maintainer: Thorsten Glaser -# For KDE 3: change KDE_VER to 3 in debian/rules and use: -#Build-Depends: debhelper (>= 5), kdelibs4-dev, libqt3-headers -# For KDE 4: change KDE_VER to 4 in debian/rules and use: -#Build-Depends: debhelper (>= 5), kdelibs5-dev, libqt4-dev -# For KDE 5: change KDE_VER to 5 in debian/rules and use debhelper 9 and: -Build-Depends: debhelper (>= 12~), libkf5coreaddons-dev, libkf5i18n-dev, libkf5wallet-dev, pkg-config -Standards-Version: 4.3.0 +Build-Depends: debhelper-compat (= 13), libkf5coreaddons-dev, libkf5i18n-dev, libkf5wallet-dev, pkg-config +Standards-Version: 4.5.1 Rules-Requires-Root: no VCS-git: https://evolvis.org/anonscm/git/alioth/kwalletcli.git -b master VCS-Browser: https://evolvis.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=alioth/kwalletcli.git;a=shortlog;h=refs/heads/master @@ -17,14 +12,12 @@ Package: kwalletcli Architecture: any Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends}, mksh (>= 38~) +Depends: ${misc:Depends}, ${shlibs:Depends}, mksh Provides: ssh-askpass -# pinentry-gtk exists in dapper and etch… it’s there to keep -# things backport friendly Recommends: gnupg-agent, kwalletmanager, - pinentry-curses | pinentry-fltk | pinentry-gnome3 | pinentry-gtk | pinentry-gtk2 | pinentry-qt | pinentry-qt4 | pinentry-tty | pinentry-x2go | pinentry | pinentry-x11, + pinentry-curses | pinentry-fltk | pinentry-gnome3 | pinentry-gtk2 | pinentry-qt | pinentry-tty | pinentry-x2go | pinentry, openssh-client -Enhances: gajim (>= 0.13~) +Enhances: gajim Description: command line interface to the KDE Wallet kwalletcli implements a command line interface tool to get and set password entries in the default KDE Wallet. Also included are a shell diff -Nru kwalletcli-3.02/debian/copyright kwalletcli-3.03/debian/copyright --- kwalletcli-3.02/debian/copyright 2019-01-05 10:48:02.000000000 +0000 +++ kwalletcli-3.03/debian/copyright 2021-01-25 14:12:33.000000000 +0000 @@ -2,19 +2,19 @@ Wed Jul 8 15:29:22 UTC 2009. It was downloaded from: -https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-3.02.tar.gz +https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-3.03.tar.gz Note: on Debian systems, the complete text of the GNU LGPL can be found at: /usr/share/common-licenses/LGPL-3 The kwalletcli packaging for Debian is also covered by The MirOS Licence and -Copyright © 2009, 2010, 2011, 2012, 2014, 2015, 2016, 2018 +Copyright © 2009, 2010, 2011, 2012, 2014, 2015, 2016, 2018, 2020, 2021 mirabilos Licence: -kwalletcli – Command-Line Interface for the KDE Wallet +kwalletcli — Command-Line Interface for the KDE Wallet ────────────────────────────────────────────────────── kwalletcli is “OSI Certified Open Source Software” and distributed @@ -23,7 +23,7 @@ kwalletcli is covered by The MirOS Licence: -Copyright © 2009, 2010, 2011, 2014, 2016, 2018 +Copyright © 2009, 2010, 2011, 2014, 2016, 2018, 2020 mirabilos KDE 4 bindings Copyright © 2009 Thomas Fischer @@ -92,12 +92,13 @@ The following persons, in no particular order, have also contributed to kwalletcli, in one way or the other: -• tarent solutions GmbH +• ⮡ tarent solutions GmbH • Daniel Schaal • Felix Geyer • pinotree (via IRC) • Timo Weingärtner • Tomas Pospisek +• Helmut Grohne ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ -$MirOS: contrib/hosted/tg/code/kwalletcli/LICENCE,v 1.8 2018/02/09 16:59:54 tg Exp $ +$MirOS: contrib/hosted/tg/code/kwalletcli/LICENCE,v 1.9 2021/01/25 13:41:58 tg Exp $ diff -Nru kwalletcli-3.02/debian/copyright.hdr kwalletcli-3.03/debian/copyright.hdr --- kwalletcli-3.02/debian/copyright.hdr 2019-01-05 10:38:21.000000000 +0000 +++ kwalletcli-3.03/debian/copyright.hdr 2021-01-25 14:03:54.000000000 +0000 @@ -2,14 +2,14 @@ Wed Jul 8 15:29:22 UTC 2009. It was downloaded from: -https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-3.02.tar.gz +https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/kwalletcli-3.03.tar.gz Note: on Debian systems, the complete text of the GNU LGPL can be found at: /usr/share/common-licenses/LGPL-3 The kwalletcli packaging for Debian is also covered by The MirOS Licence and -Copyright © 2009, 2010, 2011, 2012, 2014, 2015, 2016, 2018 +Copyright © 2009, 2010, 2011, 2012, 2014, 2015, 2016, 2018, 2020, 2021 mirabilos Licence: diff -Nru kwalletcli-3.02/debian/docs kwalletcli-3.03/debian/docs --- kwalletcli-3.02/debian/docs 2019-01-05 10:36:26.000000000 +0000 +++ kwalletcli-3.03/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -kwalletcli.svg -kwalletcli128.png -kwalletcli32.png -kwalletcli64.png diff -Nru kwalletcli-3.02/debian/lintian-bp kwalletcli-3.03/debian/lintian-bp --- kwalletcli-3.02/debian/lintian-bp 2019-01-05 10:36:26.000000000 +0000 +++ kwalletcli-3.03/debian/lintian-bp 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -# there is none -kwalletcli: no-upstream-changelog - -# this is built as PIC with Qt5 -kwalletcli: hardening-no-pie usr/bin/kwalletcli diff -Nru kwalletcli-3.02/debian/lintian-overrides kwalletcli-3.03/debian/lintian-overrides --- kwalletcli-3.02/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ kwalletcli-3.03/debian/lintian-overrides 2021-01-25 14:11:09.000000000 +0000 @@ -0,0 +1,8 @@ +# this is built as PIC with Qt5 +kwalletcli: hardening-no-pie usr/bin/kwalletcli + +# false positive (#966316) +kwalletcli: acute-accent-in-manual-page usr/share/man/man1/kwalletaskpass.1.gz:23 +kwalletcli: acute-accent-in-manual-page usr/share/man/man1/kwalletcli.1.gz:23 +kwalletcli: acute-accent-in-manual-page usr/share/man/man1/kwalletcli_getpin.1.gz:23 +kwalletcli: acute-accent-in-manual-page usr/share/man/man1/pinentry-kwallet.1.gz:23 diff -Nru kwalletcli-3.02/debian/postinst kwalletcli-3.03/debian/postinst --- kwalletcli-3.02/debian/postinst 2019-01-05 10:36:26.000000000 +0000 +++ kwalletcli-3.03/debian/postinst 2021-01-25 14:02:15.000000000 +0000 @@ -9,35 +9,38 @@ # are no circular dependencies, configured. # # * old-postinst "abort-upgrade" $new_version -# * conflictors-postinst "abort-remove" "in-favour" $package +# * old-postinst "abort-remove" +# * conflictors-postinst "abort-remove" "in-favour" $new_package # $new_version -# * postinst "abort-remove" # * deconfigureds-postinst "abort-deconfigure" "in-favour" -# $failed_install_package $fip_version ["removing" -# $conflicting_package $cp_version] +# $failed_install_package $fip_version # new-package +# ["removing" $conflicting_package $cp_version] # old-package # The package is unpacked; all dependencies are at least Half-Installed, # previously been configured, and not removed. In some error situations, # dependencies may not be even fully unpacked. # # * postinst "triggered" "${triggers[*]}" # For trigger-only calls, i.e. if "configure" is not called. +# +# * new-postinst "reconfigure" [$most_recently_configured_version](?) +# Treat this as just like "configure" for a future extension by debconf. case $1 in -configure) +(configure|reconfigure) update-alternatives --install /usr/bin/ssh-askpass ssh-askpass \ /usr/bin/kwalletaskpass 30 \ --slave /usr/share/man/man1/ssh-askpass.1.gz ssh-askpass.1.gz \ /usr/share/man/man1/kwalletaskpass.1.gz ;; -abort-upgrade|abort-remove|abort-deconfigure) +(abort-upgrade|abort-remove|abort-deconfigure) ;; -triggered) +(triggered) ;; -*) - echo >&2 "postinst called with unknown subcommand '$1'" +(*) + echo >&2 "E: postinst called with unknown subcommand '$1'" exit 1 ;; esac diff -Nru kwalletcli-3.02/debian/prerm kwalletcli-3.03/debian/prerm --- kwalletcli-3.02/debian/prerm 2019-01-05 10:36:26.000000000 +0000 +++ kwalletcli-3.03/debian/prerm 2021-01-25 14:02:15.000000000 +0000 @@ -6,27 +6,28 @@ # # * prerm "remove" # * old-prerm "upgrade" $new_version -# * conflictors-prerm "remove" "in-favour" $package $new_version +# * conflictors-prerm "remove" "in-favour" $new_package $new_version # * deconfigureds-prerm "deconfigure" "in-favour" -# $package_being_installed $pbi_version ["removing" -# $conflicting_package $cp_version] +# $package_being_installed $pbi_version # new-package +# ["removing" $conflicting_package $cp_version] # old-package # The package and dependencies are at least Half-Installed; dependencies # have previously been configured and not removed. # # * new-prerm "failed-upgrade" $old_version +# * new-prerm "failed-upgrade" $old_version $new_version # 1.18.5, stretch # Called when 'old-prerm "upgrade"' fails; new package not unpacked, all # other constraints the same as above. case $1 in -remove|deconfigure) +(remove|deconfigure) update-alternatives --remove ssh-askpass /usr/bin/kwalletaskpass ;; -upgrade|failed-upgrade) +(upgrade|failed-upgrade) ;; -*) - echo >&2 "prerm called with unknown subcommand '$1'" +(*) + echo >&2 "E: prerm called with unknown subcommand '$1'" exit 1 ;; esac diff -Nru kwalletcli-3.02/debian/rules kwalletcli-3.03/debian/rules --- kwalletcli-3.02/debian/rules 2019-01-05 10:39:09.000000000 +0000 +++ kwalletcli-3.03/debian/rules 2021-01-25 14:02:15.000000000 +0000 @@ -1,90 +1,69 @@ #!/usr/bin/make -f -ifeq (,$(findstring terse,${DEB_BUILD_OPTIONS})) +ifeq (,$(filter terse,${DEB_BUILD_OPTIONS})) export DH_VERBOSE=1 export V=1 export VERBOSE=1 endif -LC_ALL:=C +LC_ALL:=C.UTF-8 export LC_ALL -KDE_VER=5 - shellescape='$(subst ','\'',$(1))' shellexport=$(1)=$(call shellescape,${$(1)}) -CC?= gcc -CXX?= g++ -EXTRA_CFLAGS= -Wall -EXTRA_CXXFLAGS= -Wall -EXTRA_LDFLAGS= -Wl,--as-needed - -ifneq (,$(wildcard /usr/share/dpkg/buildflags.mk)) -# dpkg-dev (>= 1.16.1~) -DEB_CFLAGS_MAINT_APPEND=${EXTRA_CFLAGS} -DEB_CXXFLAGS_MAINT_APPEND=${EXTRA_CXXFLAGS} -DEB_LDFLAGS_MAINT_APPEND=${EXTRA_LDFLAGS} -ifeq (5,${KDE_VER}) -# recent Qt5 builds require the application to be built as PIC -DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie -DEB_CPPFLAGS_MAINT_APPEND+=-DPIC -DEB_CFLAGS_MAINT_APPEND+=-fPIC -DEB_CXXFLAGS_MAINT_APPEND+=-fPIC -DEB_LDFLAGS_MAINT_APPEND+=-fPIC -else -DEB_BUILD_MAINT_OPTIONS=hardening=+all -endif -include /usr/share/dpkg/buildflags.mk -else -# old-fashioned way to determine build flags -CFLAGS= -O$(if $(findstring noopt,${DEB_BUILD_OPTIONS}),0,2) -g -CXXFLAGS= -O$(if $(findstring noopt,${DEB_BUILD_OPTIONS}),0,2) -g -CFLAGS+= ${EXTRA_CFLAGS} -CXXFLAGS+= ${EXTRA_CXXFLAGS} -LDFLAGS+= ${EXTRA_LDFLAGS} +include /usr/share/dpkg/buildtools.mk + +# OUR_CFLAGS are also used as CXXFLAGS +OUR_CPPFLAGS:= +OUR_CFLAGS:= +OUR_LDFLAGS:= + +ifneq (,$(filter debug,${DEB_BUILD_OPTIONS})) +OUR_CFLAGS+= -Og -g3 endif -MAKE_INVOCATION= ${MAKE} -f GNUmakefile KDE_VER=${KDE_VER} INSTALL_STRIP= +OUR_CFLAGS+= -Wall -Wextra -Wformat -build build-arch: .build_done -build-indep: +# recent Qt5 builds require the application to be built as PIC +OUR_CPPFLAGS+= -DPIC +OUR_CFLAGS+= -fPIC +OUR_LDFLAGS+= -fPIC + +dpkgbuildflagsmkescape=$(subst \,\\\,$(1)) +export DEB_BUILD_MAINT_OPTIONS:=hardening=+all,-pie +export DEB_CPPFLAGS_MAINT_APPEND:=$(call dpkgbuildflagsmkescape,${OUR_CPPFLAGS}) +export DEB_CFLAGS_MAINT_APPEND:=$(call dpkgbuildflagsmkescape,${OUR_CFLAGS}) +export DEB_CXXFLAGS_MAINT_APPEND:=$(call dpkgbuildflagsmkescape,${OUR_CFLAGS}) +export DEB_LDFLAGS_MAINT_APPEND:=$(call dpkgbuildflagsmkescape,${OUR_LDFLAGS}) +include /usr/share/dpkg/buildflags.mk -.build_done: - dh_testdir - $(foreach i,CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS,$(call shellexport,$i)); \ - export CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS; \ - exec ${MAKE_INVOCATION} - @:>$@ +%: + dh $@ -Snone -clean: +DOMAKE= env \ + $(foreach i,CC CXX CPPFLAGS CFLAGS CXXFLAGS LDFLAGS PKG_CONFIG,$(call shellexport,$i)) \ + ${MAKE} -f GNUmakefile KDE_VER=5 INSTALL_STRIP= + +override_dh_auto_clean: dh_testdir - ${MAKE_INVOCATION} clean - -rm -f .build_done debian/copyright + ${DOMAKE} clean cat debian/copyright.hdr LICENCE >debian/copyright - dh_clean - -binary-indep: build-indep -binary-arch: build-arch +override_dh_auto_build: dh_testdir - dh_testroot - if test -x "$$(which dh_prep)"; then dh_prep; else dh_clean -k; fi - dh_installdirs - ${MAKE_INVOCATION} DESTDIR="$$(pwd)/debian/kwalletcli" install - dh_installchangelogs - dh_installdocs - mkdir -p debian/kwalletcli/usr/share/lintian/overrides - cp -a debian/lintian-bp \ - debian/kwalletcli/usr/share/lintian/overrides/kwalletcli - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb + @rm -f kwalletcli + ${DOMAKE} + test -x kwalletcli -binary: binary-indep binary-arch -.PHONY: binary binary-arch binary-indep build build-arch build-indep clean +override_dh_auto_install: + dh_testdir + ${DOMAKE} install DESTDIR="$$(pwd)/debian/kwalletcli" + install -D -m 644 kwalletcli32.png \ + debian/kwalletcli/usr/share/icons/hicolor/32x32/apps/kwalletcli.png + install -D -m 644 kwalletcli64.png \ + debian/kwalletcli/usr/share/icons/hicolor/64x64/apps/kwalletcli.png + install -D -m 644 kwalletcli128.png \ + debian/kwalletcli/usr/share/icons/hicolor/128x128/apps/kwalletcli.png + install -D -m 644 kwalletcli.svg \ + debian/kwalletcli/usr/share/icons/hicolor/scalable/apps/kwalletcli.svg diff -Nru kwalletcli-3.02/debian/source/lintian-overrides kwalletcli-3.03/debian/source/lintian-overrides --- kwalletcli-3.02/debian/source/lintian-overrides 2019-01-05 10:36:26.000000000 +0000 +++ kwalletcli-3.03/debian/source/lintian-overrides 2021-01-25 14:11:43.000000000 +0000 @@ -1,11 +1,11 @@ +# cannot use https due to OpenSSL maintainer disabling TLSv1.0 +kwalletcli source: debian-watch-uses-insecure-uri http://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/ + +# eh… +kwalletcli source: cute-field + # there is none, only a gzsig(1) signature kwalletcli source: debian-watch-does-not-check-gpg-signature -# no, thanks. +# we use human-readable copyright instead kwalletcli source: no-dep5-copyright - -# none exist -kwalletcli source: testsuite-autopkgtest-missing - -# cannot use https due to OpenSSL maintainer disabling TLSv1.0 -kwalletcli source: debian-watch-uses-insecure-uri http://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/ diff -Nru kwalletcli-3.02/debian/watch kwalletcli-3.03/debian/watch --- kwalletcli-3.02/debian/watch 2019-01-05 10:36:26.000000000 +0000 +++ kwalletcli-3.03/debian/watch 2021-01-25 14:02:15.000000000 +0000 @@ -1,2 +1,2 @@ -version=3 +version=4 http://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/ kwalletcli-(.*)\.tar\.gz diff -Nru kwalletcli-3.02/GNUmakefile kwalletcli-3.03/GNUmakefile --- kwalletcli-3.02/GNUmakefile 2016-08-30 19:34:16.000000000 +0000 +++ kwalletcli-3.03/GNUmakefile 2020-11-19 21:37:37.000000000 +0000 @@ -1,6 +1,6 @@ -# $MirOS: contrib/hosted/tg/code/kwalletcli/GNUmakefile,v 1.15 2016/08/30 19:33:50 tg Exp $ +# $MirOS: contrib/hosted/tg/code/kwalletcli/GNUmakefile,v 1.16 2020/11/19 21:37:10 tg Exp $ #- -# Copyright © 2009, 2011, 2016 +# Copyright © 2009, 2011, 2016, 2020 # mirabilos # # Provided that these terms and disclaimer and all copyright notices @@ -33,6 +33,8 @@ SRCS= charconv.c main.c OBJS= charconv.o main.o +PKG_CONFIG?= pkg-config + KDE_VER:= 3 ifeq (${KDE_VER},3) KDE_INCS?= -I/usr/include/qt3 -I/usr/include/kde @@ -47,8 +49,10 @@ LDADD+= -lkdeui -lkdecore -lQtCore else ifeq (${KDE_VER},5) -KDE_INCS?= $(shell pkg-config --cflags Qt5Gui) -I/usr/include/KF5/KI18n \ - -I/usr/include/KF5/KCoreAddons -I/usr/include/KF5/KWallet +KDE_INCS?= $(shell ${PKG_CONFIG} --cflags Qt5Gui) \ + -I/usr/include/KF5/KI18n \ + -I/usr/include/KF5/KCoreAddons \ + -I/usr/include/KF5/KWallet SRCS+= kwif5.cc OBJS+= kwif5.o LDADD+= -lKF5CoreAddons -lKF5Wallet -lKF5I18n -lQt5Core -lQt5Widgets diff -Nru kwalletcli-3.02/kwalletaskpass.1 kwalletcli-3.03/kwalletaskpass.1 --- kwalletcli-3.02/kwalletaskpass.1 2018-12-25 19:38:39.000000000 +0000 +++ kwalletcli-3.03/kwalletaskpass.1 2020-11-19 21:31:21.000000000 +0000 @@ -1,6 +1,6 @@ -.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletaskpass.1,v 1.12 2018/12/25 19:38:12 tg Exp $ +.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletaskpass.1,v 1.14 2020/11/19 21:30:54 tg Exp $ .\"- -.\" Copyright © 2009, 2010, 2011, 2016, 2018 +.\" Copyright © 2009, 2010, 2011, 2016, 2018, 2020 .\" mirabilos .\" .\" Provided that these terms and disclaimer and all copyright notices @@ -25,7 +25,8 @@ .\" thus use - for hyphens and \- for minus signs and option dashes .\" * ~ is size-reduced and placed atop in groff, so use \*(TI .\" * ^ is size-reduced and placed atop in groff, so use \*(ha -.\" * \(en does not work in nroff, so use \*(en +.\" * \(en does not work in nroff, so use \*(en for a solo en dash +.\" * and \*(EM for a correctly spaced em dash .\" * <>| are problematic, so redefine and use \*(Lt\*(Gt\*(Ba .\" Also make sure to use \& *before* a punctuation char that is to not .\" be interpreted as punctuation, and especially with two-letter words @@ -59,6 +60,12 @@ . ds ha ^ . ds en \(em .\} +.ie n \{\ +. ds EM \ \(em\ \& +.\} +.el \{\ +. ds EM \f(TR\^\(em\^\fP +.\} .\" .\" Implement .Dd with the Mdocdate RCS keyword .\" @@ -74,7 +81,7 @@ .\" with -mandoc, it might implement .Mx itself, but we want to .\" use our own definition. And .Dd must come *first*, always. .\" -.Dd $Mdocdate: December 25 2018 $ +.Dd $Mdocdate: November 19 2020 $ .\" .\" Check which macro package we use, and do other -mdoc setup. .\" diff -Nru kwalletcli-3.02/kwalletcli.1 kwalletcli-3.03/kwalletcli.1 --- kwalletcli-3.02/kwalletcli.1 2018-12-25 19:38:40.000000000 +0000 +++ kwalletcli-3.03/kwalletcli.1 2020-11-19 21:31:21.000000000 +0000 @@ -1,6 +1,6 @@ -.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli.1,v 1.19 2018/12/25 19:38:13 tg Exp $ +.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli.1,v 1.21 2020/11/19 21:30:54 tg Exp $ .\"- -.\" Copyright © 2009, 2010, 2011, 2016, 2018 +.\" Copyright © 2009, 2010, 2011, 2016, 2018, 2020 .\" mirabilos .\" .\" Provided that these terms and disclaimer and all copyright notices @@ -25,7 +25,8 @@ .\" thus use - for hyphens and \- for minus signs and option dashes .\" * ~ is size-reduced and placed atop in groff, so use \*(TI .\" * ^ is size-reduced and placed atop in groff, so use \*(ha -.\" * \(en does not work in nroff, so use \*(en +.\" * \(en does not work in nroff, so use \*(en for a solo en dash +.\" * and \*(EM for a correctly spaced em dash .\" * <>| are problematic, so redefine and use \*(Lt\*(Gt\*(Ba .\" Also make sure to use \& *before* a punctuation char that is to not .\" be interpreted as punctuation, and especially with two-letter words @@ -59,6 +60,12 @@ . ds ha ^ . ds en \(em .\} +.ie n \{\ +. ds EM \ \(em\ \& +.\} +.el \{\ +. ds EM \f(TR\^\(em\^\fP +.\} .\" .\" Implement .Dd with the Mdocdate RCS keyword .\" @@ -74,7 +81,7 @@ .\" with -mandoc, it might implement .Mx itself, but we want to .\" use our own definition. And .Dd must come *first*, always. .\" -.Dd $Mdocdate: December 25 2018 $ +.Dd $Mdocdate: November 19 2020 $ .\" .\" Check which macro package we use, and do other -mdoc setup. .\" diff -Nru kwalletcli-3.02/kwalletcli_getpin.1 kwalletcli-3.03/kwalletcli_getpin.1 --- kwalletcli-3.02/kwalletcli_getpin.1 2018-12-25 19:38:40.000000000 +0000 +++ kwalletcli-3.03/kwalletcli_getpin.1 2020-11-19 21:31:21.000000000 +0000 @@ -1,6 +1,6 @@ -.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli_getpin.1,v 1.20 2018/12/25 19:38:13 tg Exp $ +.\" $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli_getpin.1,v 1.22 2020/11/19 21:30:54 tg Exp $ .\"- -.\" Copyright © 2009, 2011, 2016, 2018 +.\" Copyright © 2009, 2011, 2016, 2018, 2020 .\" mirabilos .\" .\" Provided that these terms and disclaimer and all copyright notices @@ -25,7 +25,8 @@ .\" thus use - for hyphens and \- for minus signs and option dashes .\" * ~ is size-reduced and placed atop in groff, so use \*(TI .\" * ^ is size-reduced and placed atop in groff, so use \*(ha -.\" * \(en does not work in nroff, so use \*(en +.\" * \(en does not work in nroff, so use \*(en for a solo en dash +.\" * and \*(EM for a correctly spaced em dash .\" * <>| are problematic, so redefine and use \*(Lt\*(Gt\*(Ba .\" Also make sure to use \& *before* a punctuation char that is to not .\" be interpreted as punctuation, and especially with two-letter words @@ -59,6 +60,12 @@ . ds ha ^ . ds en \(em .\} +.ie n \{\ +. ds EM \ \(em\ \& +.\} +.el \{\ +. ds EM \f(TR\^\(em\^\fP +.\} .\" .\" Implement .Dd with the Mdocdate RCS keyword .\" @@ -74,7 +81,7 @@ .\" with -mandoc, it might implement .Mx itself, but we want to .\" use our own definition. And .Dd must come *first*, always. .\" -.Dd $Mdocdate: December 25 2018 $ +.Dd $Mdocdate: November 19 2020 $ .\" .\" Check which macro package we use, and do other -mdoc setup. .\" diff -Nru kwalletcli-3.02/kwalletcli.svg kwalletcli-3.03/kwalletcli.svg --- kwalletcli-3.02/kwalletcli.svg 2016-08-30 17:38:23.000000000 +0000 +++ kwalletcli-3.03/kwalletcli.svg 2021-01-25 13:42:25.000000000 +0000 @@ -19,17 +19,17 @@ inkscape:export-xdpi="22.319284" inkscape:export-ydpi="22.319284"> - Logo for kwalletcli – Command-Line Interface for the KDE Wallet + Logo for kwalletcli — Command-Line Interface for the KDE Wallet Based on an experimental draft of a new MirOS logo (CC-BY-IDC), Utilising Gentium Book Basic (Bold Italic), and The Oxygen Icon Theme by ＜kde-artists@kde.org＞ - $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli.svg,v 1.4 2016/08/30 17:37:57 tg Exp $ + $MirOS: contrib/hosted/tg/code/kwalletcli/kwalletcli.svg,v 1.5 2021/01/25 13:41:58 tg Exp $ Copyright © 2008, 2009 Lukas U. ＜smultron@midnightbsd.org＞ Copyright © 2008 mirabilos ＜m@mirbsd.org＞ - This artwork is copyrighted material – refer to the 「LICENCE」 + This artwork is copyrighted material — refer to the 「LICENCE」 file in the kwalletcli source or binary distribution for terms. screen()->winId()); if (!wallet) { diff -Nru kwalletcli-3.02/LICENCE kwalletcli-3.03/LICENCE --- kwalletcli-3.02/LICENCE 2018-02-09 17:00:21.000000000 +0000 +++ kwalletcli-3.03/LICENCE 2021-01-25 13:42:25.000000000 +0000 @@ -1,4 +1,4 @@ -kwalletcli – Command-Line Interface for the KDE Wallet +kwalletcli — Command-Line Interface for the KDE Wallet ────────────────────────────────────────────────────── kwalletcli is “OSI Certified Open Source Software” and distributed @@ -7,7 +7,7 @@ kwalletcli is covered by The MirOS Licence: -Copyright © 2009, 2010, 2011, 2014, 2016, 2018 +Copyright © 2009, 2010, 2011, 2014, 2016, 2018, 2020 mirabilos KDE 4 bindings Copyright © 2009 Thomas Fischer @@ -76,12 +76,13 @@ The following persons, in no particular order, have also contributed to kwalletcli, in one way or the other: -• tarent solutions GmbH +• ⮡ tarent solutions GmbH • Daniel Schaal • Felix Geyer • pinotree (via IRC) • Timo Weingärtner • Tomas Pospisek +• Helmut Grohne ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ ̲ -$MirOS: contrib/hosted/tg/code/kwalletcli/LICENCE,v 1.8 2018/02/09 16:59:54 tg Exp $ +$MirOS: contrib/hosted/tg/code/kwalletcli/LICENCE,v 1.9 2021/01/25 13:41:58 tg Exp $ diff -Nru kwalletcli-3.02/main.c kwalletcli-3.03/main.c --- kwalletcli-3.02/main.c 2016-08-30 17:38:24.000000000 +0000 +++ kwalletcli-3.03/main.c 2020-11-19 23:11:14.000000000 +0000 @@ -27,7 +27,7 @@ #include "kwalletcli.h" const char __rcsid_main_c[] = - "$MirOS: contrib/hosted/tg/code/kwalletcli/main.c,v 1.11 2016/08/30 17:37:58 tg Exp $"; + "$MirOS: contrib/hosted/tg/code/kwalletcli/main.c,v 1.12 2020/11/19 23:10:47 tg Exp $"; #define WOCTET_MASK (0x7FFFFF80) #define WOCTET_VALUE (0x0000EF80) @@ -189,6 +189,7 @@ case KWE_ABORT: if (!quiet) fprintf(stderr, "internal error\n"); + /* FALLTHROUGH */ default: fflush(NULL); abort(); diff -Nru kwalletcli-3.02/pinentry-kwallet.1 kwalletcli-3.03/pinentry-kwallet.1 --- kwalletcli-3.02/pinentry-kwallet.1 2018-12-25 19:38:40.000000000 +0000 +++ kwalletcli-3.03/pinentry-kwallet.1 2020-11-19 21:31:21.000000000 +0000 @@ -1,6 +1,6 @@ -.\" $MirOS: contrib/hosted/tg/code/kwalletcli/pinentry-kwallet.1,v 1.12 2018/12/25 19:38:13 tg Exp $ +.\" $MirOS: contrib/hosted/tg/code/kwalletcli/pinentry-kwallet.1,v 1.14 2020/11/19 21:30:54 tg Exp $ .\"- -.\" Copyright © 2009, 2010, 2011, 2016, 2018 +.\" Copyright © 2009, 2010, 2011, 2016, 2018, 2020 .\" mirabilos .\" .\" Provided that these terms and disclaimer and all copyright notices @@ -25,7 +25,8 @@ .\" thus use - for hyphens and \- for minus signs and option dashes .\" * ~ is size-reduced and placed atop in groff, so use \*(TI .\" * ^ is size-reduced and placed atop in groff, so use \*(ha -.\" * \(en does not work in nroff, so use \*(en +.\" * \(en does not work in nroff, so use \*(en for a solo en dash +.\" * and \*(EM for a correctly spaced em dash .\" * <>| are problematic, so redefine and use \*(Lt\*(Gt\*(Ba .\" Also make sure to use \& *before* a punctuation char that is to not .\" be interpreted as punctuation, and especially with two-letter words @@ -59,6 +60,12 @@ . ds ha ^ . ds en \(em .\} +.ie n \{\ +. ds EM \ \(em\ \& +.\} +.el \{\ +. ds EM \f(TR\^\(em\^\fP +.\} .\" .\" Implement .Dd with the Mdocdate RCS keyword .\" @@ -74,7 +81,7 @@ .\" with -mandoc, it might implement .Mx itself, but we want to .\" use our own definition. And .Dd must come *first*, always. .\" -.Dd $Mdocdate: December 25 2018 $ +.Dd $Mdocdate: November 19 2020 $ .\" .\" Check which macro package we use, and do other -mdoc setup. .\"