diff --git a/util/crypt/pinentry/actions.py b/util/crypt/pinentry/actions.py index 42f2e007a5..468a23606b 100644 --- a/util/crypt/pinentry/actions.py +++ b/util/crypt/pinentry/actions.py @@ -2,20 +2,20 @@ # -*- coding: utf-8 -*- # # Licensed under the GNU General Public License, version 3. -# See the file http://www.gnu.org/licenses/gpl.txt +# See the file https://www.gnu.org/licenses/gpl-3.0.txt from pisi.actionsapi import pisitools from pisi.actionsapi import autotools +j = ''.join([ + ' --enable-pinentry-tty', + ' --enable-pinentry-curses', + ' --enable-pinentry-gnome3', + ' --enable-pinentry-qt5 ' + ]) + def setup(): - #autotools.autoreconf("-vfi") - autotools.configure("--prefix=/usr \ - --enable-pinentry-curses \ - --disable-pinentry-gtk \ - --disable-pinentry-qt \ - --enable-pinentry-gtk2 \ - --disable-pinentry-qt4 \ - --enable-fallback-curses") + autotools.configure(j) def build(): autotools.make() @@ -26,7 +26,4 @@ def install(): # We're using pinentry-wrapper as additional file instead of upstream pinentry symlink. pisitools.remove("/usr/bin/pinentry") - pisitools.dosym("pinentry-gtk-2", "/usr/bin/pinentry-gtk") - #pisitools.dosym("pinentry-qt4", "/usr/bin/pinentry-qt") - - pisitools.dodoc("AUTHORS", "ChangeLog", "NEWS", "README", "THANKS") + pisitools.dodoc("AUTHORS", "NEWS", "THANKS") diff --git a/util/crypt/pinentry/files/pinentry-wrapper b/util/crypt/pinentry/files/pinentry-wrapper index 6135486075..95bcd338c8 100644 --- a/util/crypt/pinentry/files/pinentry-wrapper +++ b/util/crypt/pinentry/files/pinentry-wrapper @@ -46,19 +46,11 @@ fi # if KDE is detected and pinentry-qt exists, use pinentry-qt if [ -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 [ -x /usr/bin/pinentry-gtk-2 ] + export PINENTRY_BINARY="/usr/bin/pinentry-qt" +# otherwise test if pinentry-gnome3 is installed +elif [ -x /usr/bin/pinentry-gnome3 ] then - export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2" -# otherwise test if pinentry-qt3 is installed -elif [ -x /usr/bin/pinentry-qt3 ] -then - export PINENTRY_BINARY="/usr/bin/pinentry-qt" -# otherwise test if pinentry-qt exists although KDE is not detected -elif [ -x /usr/bin/pinentry-qt ] -then - export PINENTRY_BINARY="/usr/bin/pinentry-qt3" + export PINENTRY_BINARY="/usr/bin/pinentry-gnome3" # pinentry-curses is installed by default else #test if gui binary is required diff --git a/util/crypt/pinentry/pspec.xml b/util/crypt/pinentry/pspec.xml index 3b2e1b04a7..b2fa015cb6 100644 --- a/util/crypt/pinentry/pspec.xml +++ b/util/crypt/pinentry/pspec.xml @@ -1,9 +1,9 @@ - + pinentry - http://www.gnupg.org/aegypten/ + https://www.gnupg.org/ PisiLinux Community admins@pisilinux.org @@ -12,21 +12,21 @@ app:console Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol Pinentry is a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol as described by the aegypten project. - ftp://ftp.gnupg.org/gcrypt/pinentry/pinentry-1.1.0.tar.bz2 + https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-1.2.0.tar.bz2 - libsecret-devel - libgpg-error-devel - libassuan-devel - gtk2-devel + gcr-devel + qt5-base-devel + gtk3-devel + glib2-devel pango-devel libcap-devel ncurses-devel - glib2-devel - - fltk-devel + libsecret-devel + libassuan-devel + libgpg-error-devel - + @@ -38,55 +38,89 @@ /usr/share/doc - - fltk - libgcc - glib2 - libassuan - libsecret - libgpg-error - libcap - ncurses + pinentry-wrapper - - - pinentry-gtk - pinentry for GTK toolkit + pinentry-tty pinentry - ncurses + glib2 libcap libassuan libsecret libgpg-error - glib2 - gtk2 - pango - /usr/bin/pinentry-gtk* + /usr/bin/pinentry-tty + + + + + pinentry-curses + + pinentry + glib2 + libcap + ncurses + libassuan + libsecret + libgpg-error + + + /usr/bin/pinentry-curses + + + + + pinentry-gnome3 + + pinentry + gcr + gtk3 + glib2 + libcap + ncurses + libassuan + libsecret + libgpg-error + + + /usr/bin/pinentry-gnome3 + + + + + pinentry-qt + + pinentry + glib2 + libcap + libgcc + ncurses + qt5-base + libassuan + libsecret + libgpg-error + + + /usr/bin/pinentry-qt - + + 2022-08-07 + 1.2.0 + Version bump. + fury + uglyside@yandex.ru + + 2020-01-19 1.1.0 Rebuild diff --git a/util/crypt/pinentry/translations.xml b/util/crypt/pinentry/translations.xml index a43cba0002..3488d84475 100644 --- a/util/crypt/pinentry/translations.xml +++ b/util/crypt/pinentry/translations.xml @@ -15,4 +15,4 @@ pinentry-qt Qt4 ile yazılmış pinentry arayüzü - \ No newline at end of file +