Hello community, here is the log from the commit of package pinentry for openSUSE:Factory checked in at 2014-10-01 11:22:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pinentry (Old) and /work/SRC/openSUSE:Factory/.pinentry.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pinentry" Changes: -------- --- /work/SRC/openSUSE:Factory/pinentry/pinentry.changes 2013-12-30 10:27:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pinentry.new/pinentry.changes 2014-10-01 11:22:13.000000000 +0200 @@ -1,0 +2,14 @@ +Sun Sep 21 22:21:38 UTC 2014 - andreas.stieger@gmx.de + +- pinentry 0.8.4: + * New pinentry-tty version for dumb terminals. + * Qt4: New option to enable pasting the passphrase from clipboard + * Qt4: Improved accessiblity + * Qt4: Raise confirm message windows into foreground + * Improved the build system. +- remove pinentry-0.8.1-allow_paste_qt4.patch, functionality + implemented +- sync pinentry wrapper with Fedora +- update pinentry wrapper to use pinentry-tty on dumb terminals + +------------------------------------------------------------------- Old: ---- pinentry-0.8.1-allow_paste_qt4.patch pinentry-0.8.3.tar.bz2 pinentry-0.8.3.tar.bz2.sig New: ---- pinentry-0.8.4.tar.bz2 pinentry-0.8.4.tar.bz2.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pinentry.spec ++++++ --- /var/tmp/diff_new_pack.E3PkQV/_old 2014-10-01 11:22:15.000000000 +0200 +++ /var/tmp/diff_new_pack.E3PkQV/_new 2014-10-01 11:22:15.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pinentry # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: pinentry -Version: 0.8.3 +Version: 0.8.4 Release: 0 Summary: Collection of Simple PIN or Passphrase Entry Dialogs License: GPL-2.0+ @@ -30,8 +30,6 @@ Patch0: moreSecureMemoryForPinentry-qt.diff Patch1: pinentry-0.7.2-gtk+-2.4.diff Patch2: pinentry-0.7.2-bnc179996_disable_inputmethod_for_passords.patch -# PATCH-FIX-UPSTREAM allow paste for pinentry-qt4 (bnc#690514) -Patch4: pinentry-0.8.1-allow_paste_qt4.patch # PATCH-FIX-UPSTREAM allow paste for pinentry-gtk-2 (bnc#690514) Patch5: pinentry-0.8.1-allow_paste_gtk2.patch # PATCH-FIX-SUSE fix qt4 password entry not to allow IM (bnc#725471) @@ -46,7 +44,7 @@ BuildRequires: libqt4-devel BuildRequires: ncurses-devel BuildRequires: update-desktop-files -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-2.0) >= 2.4.0 %if %suse_version >= 1230 BuildRequires: gpg-offline %endif @@ -59,9 +57,7 @@ This is a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol as described by the Aegypten project. -%package -n pinentry-qt4 -Version: %{version} -Release: 0 +%package qt4 Summary: Collection of Simple PIN or Passphrase Entry Dialogs Group: Productivity/Other Requires: pinentry @@ -71,13 +67,11 @@ Provides: pinentry:/usr/bin/pinentry-qt4 Obsoletes: pinentry-qt <= 0.8.3 -%description -n pinentry-qt4 +%description qt4 This is a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol as described by the Aegypten project. -%package -n pinentry-gtk2 -Version: %{version} -Release: 0 +%package gtk2 Summary: Collection of Simple PIN or Passphrase Entry Dialogs Group: Productivity/Other Requires: pinentry @@ -85,7 +79,7 @@ Provides: pinentry-gui Provides: pinentry:/usr/bin/pinentry-gtk-2 -%description -n pinentry-gtk2 +%description gtk2 This is a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol as described by the Aegypten project. @@ -95,7 +89,6 @@ %patch0 -p 1 %patch1 -p 1 %patch2 -p 1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch8 -p1 @@ -106,12 +99,14 @@ # Regenerate moc's moc qt4/pinentrydialog.h > qt4/pinentrydialog.moc moc qt4/qsecurelineedit.h > qt4/qsecurelineedit.moc +moc qt4/pinentryconfirm.h > qt4/pinentryconfirm.moc export CFLAGS="%{optflags} $(%{ncursesw_config} --cflags)" export CXXFLAGS="%{optflags} $(%{ncursesw_config} --cflags)" %configure \ --enable-pinentry-curses \ --enable-pinentry-qt4 \ --enable-pinentry-gtk2 \ + --enable-pinentry-tty \ --with-qt-dir=%{_libdir}/qt3/ \ --with-qt-includes=%{_libdir}/qt3/include/ \ --with-qt-libraries=%{_libdir}/qt3/%{_lib}/ \ @@ -136,12 +131,13 @@ %doc AUTHORS COPYING ChangeLog NEWS README %doc %{_infodir}/pinentry* %attr(755,root,root) %{_bindir}/pinentry +%attr(755,root,root) %{_bindir}/pinentry-tty %attr(755,root,root) %{_bindir}/pinentry-curses -%files -n pinentry-qt4 +%files qt4 %attr(755,root,root) %{_bindir}/pinentry-qt4 -%files -n pinentry-gtk2 +%files gtk2 %attr(755,root,root) %{_bindir}/pinentry-gtk-2 %changelog ++++++ pinentry ++++++ --- /var/tmp/diff_new_pack.E3PkQV/_old 2014-10-01 11:22:15.000000000 +0200 +++ /var/tmp/diff_new_pack.E3PkQV/_new 2014-10-01 11:22:15.000000000 +0200 @@ -1,6 +1,8 @@ #!/bin/sh # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 Fedora Project +# Copyright (c) 2014 Red Hat # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -8,61 +10,76 @@ # # Anna Bernathova <anicka@novell.com> 2006 # Pavel Nemec <pnemec@novell.com> 2006 +# Rex Dieter <rdieter@fedoraproject.org> 2009 # Pavol Rusnak <prusnak@novell.com> 2009 +# Boris Ranto <branto@redhat.com> 2014 +# Andreas Stieger <andreas.stieger@gmx.de> 2014 # # use proper binary (pinentry-qt4, pinentry-qt, pinentry-gtk-2 or pinentry-curses) kde_running= -if [ -n "$KDE_FULL_SESSION" ]; then +arg= +display= +# look for a --display option +for opt in "$@"; do + if [ "$opt" = "--display" ]; then + arg=1 + elif [ -n "$arg" ]; then + display="$opt" + else + arg= + fi +done + +# export DISPLAY if pinentry is meant to be run on a different display +# check the KDE_FULL_SESSION variable otherwise +if [ -n "$display" -a "$DISPLAY" != "$display" ]; then + export DISPLAY="$display" +elif [ -n "$KDE_FULL_SESSION" ]; then kde_running=1 kde_ver="$KDE_SESSION_VERSION" -elif [ -n "$DISPLAY" ]; then +fi + +# Check for presence of xprop binary +type xprop >/dev/null 2>/dev/null +XPROP=$? + +if [ -n "$DISPLAY" -a $XPROP -eq 0 ]; then xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null if test $? -eq 0; then kde_running=1 kde_ver="`xprop -root | sed -n 's/KDE_SESSION_VERSION(CARDINAL) = //p'`" 2>/dev/null fi -else - arg= - display= - for opt in "$@"; do - if [ "$opt" = "--display" ]; then - arg=1 - elif [ -n "$arg" ]; then - display="$opt" - else - arg= - fi - done - if [ -n "$display" ]; then - DISPLAY="$display" xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null - if test $? -eq 0; then - kde_running=1 - kde_ver="`DISPLAY="$display" xprop -root | sed -n 's/KDE_SESSION_VERSION(CARDINAL) = //p'`" 2>/dev/null - fi - fi fi +# if a user supplied a pinentry binary, use it +if [ -n "$PINENTRY_BINARY" ]; +then + export PINENTRY_BINARY="$PINENTRY_BINARY" # if KDE is detected and pinentry-qt4 exists, use pinentry-qt4 -if [ -n "$kde_running" -a "$kde_ver"x = 4x -a -f /usr/bin/pinentry-qt4 ] +elif [ -n "$kde_running" -a "$kde_ver"x = 4x -a -x /usr/bin/pinentry-qt4 ] then export PINENTRY_BINARY="/usr/bin/pinentry-qt4" # if KDE is detected and pinentry-qt exists, use pinentry-qt -elif [ -n "$kde_running" -a -f /usr/bin/pinentry-qt ] +elif [ -n "$kde_running" -a -x /usr/bin/pinentry-qt ] then export PINENTRY_BINARY="/usr/bin/pinentry-qt" # otherwise test if pinentry-gtk-2 is installed -elif [ -n "$DISPLAY" -a -f /usr/bin/pinentry-gtk-2 ] +elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-gtk-2 ] then export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2" # otherwise test if pinentry-qt4 exists although KDE is not detected -elif [ -n "$DISPLAY" -a -f /usr/bin/pinentry-qt4 ] +elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt4 ] then export PINENTRY_BINARY="/usr/bin/pinentry-qt4" # otherwise test if pinentry-qt exists although KDE is not detected -elif [ -n "$DISPLAY" -a -f /usr/bin/pinentry-qt ] +elif [ -n "$DISPLAY" -a -x /usr/bin/pinentry-qt ] then export PINENTRY_BINARY="/usr/bin/pinentry-qt" +# use pinentry-tty for modem / serial +elif [ "$TERM" = "dumb" ] +then + export PINENTRY_BINARY="/usr/bin/pinentry-tty" # pinentry-curses is installed by default else export PINENTRY_BINARY="/usr/bin/pinentry-curses" ++++++ pinentry-0.8.3.tar.bz2 -> pinentry-0.8.4.tar.bz2 ++++++ ++++ 21719 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org