import pinentry-1.1.1-8.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
commit
8f4e149ca8
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
SOURCES/pinentry-1.1.1.tar.bz2
|
||||||
1
.pinentry.metadata
Normal file
1
.pinentry.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
b8b88cab4fd844e3616d55aeba8f084f2b98fb0f SOURCES/pinentry-1.1.1.tar.bz2
|
||||||
194
SOURCES/pinentry-1.1.1-coverity.patch
Normal file
194
SOURCES/pinentry-1.1.1-coverity.patch
Normal file
@ -0,0 +1,194 @@
|
|||||||
|
commit a87d9e8f89f946a733c756c72bf5ec41e0a738b8
|
||||||
|
Author: Jakub Jelen <jjelen@redhat.com>
|
||||||
|
Date: Wed Apr 14 15:51:27 2021 +0900
|
||||||
|
|
||||||
|
core,emacs,tty,curses: Fix memory leaks, invalid accese, and mistake.
|
||||||
|
|
||||||
|
* pinentry/pinentry-curses.c (dialog_create): Free NEW.
|
||||||
|
[HAVE_NCURSESW] (dialog_run): Free OLD_CTYPE on error.
|
||||||
|
* pinentry/pinentry.c (pinentry_inq_genpin): Free VALUE on error.
|
||||||
|
* tty/pinentry-tty.c (tty_cmd_handler): Don't access closed FDs.
|
||||||
|
* pinentry/pinentry-emacs.c (set_labels): Fix for ->default_cancel.
|
||||||
|
|
||||||
|
--
|
||||||
|
|
||||||
|
GnuPG-bug-id: 5384
|
||||||
|
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
||||||
|
|
||||||
|
diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c
|
||||||
|
index a3fe2e2..1c3008a 100644
|
||||||
|
--- a/pinentry/pinentry-curses.c
|
||||||
|
+++ b/pinentry/pinentry-curses.c
|
||||||
|
@@ -315,6 +315,7 @@ dialog_create (pinentry_t pinentry, dialog_t dialog)
|
||||||
|
} \
|
||||||
|
dialog->which = pinentry_utf8_to_local (pinentry->lc_ctype, \
|
||||||
|
new ? new : default); \
|
||||||
|
+ free (new); \
|
||||||
|
if (!dialog->which) \
|
||||||
|
{ \
|
||||||
|
err = 1; \
|
||||||
|
@@ -873,6 +874,9 @@ dialog_run (pinentry_t pinentry, const char *tty_name, const char *tty_type)
|
||||||
|
{
|
||||||
|
pinentry->specific_err = gpg_error_from_syserror ();
|
||||||
|
pinentry->specific_err_loc = "open_tty_for_read";
|
||||||
|
+#ifdef HAVE_NCURSESW
|
||||||
|
+ free (old_ctype);
|
||||||
|
+#endif
|
||||||
|
return confirm_mode? 0 : -1;
|
||||||
|
}
|
||||||
|
ttyfo = fopen (tty_name, "w");
|
||||||
|
@@ -883,6 +887,9 @@ dialog_run (pinentry_t pinentry, const char *tty_name, const char *tty_type)
|
||||||
|
errno = err;
|
||||||
|
pinentry->specific_err = gpg_error_from_syserror ();
|
||||||
|
pinentry->specific_err_loc = "open_tty_for_write";
|
||||||
|
+#ifdef HAVE_NCURSESW
|
||||||
|
+ free (old_ctype);
|
||||||
|
+#endif
|
||||||
|
return confirm_mode? 0 : -1;
|
||||||
|
}
|
||||||
|
screen = newterm (tty_type, ttyfo, ttyfi);
|
||||||
|
@@ -897,6 +904,9 @@ dialog_run (pinentry_t pinentry, const char *tty_name, const char *tty_type)
|
||||||
|
errno = ENOTTY;
|
||||||
|
pinentry->specific_err = gpg_error_from_syserror ();
|
||||||
|
pinentry->specific_err_loc = "isatty";
|
||||||
|
+#ifdef HAVE_NCURSESW
|
||||||
|
+ free (old_ctype);
|
||||||
|
+#endif
|
||||||
|
return confirm_mode? 0 : -1;
|
||||||
|
}
|
||||||
|
init_screen = 1;
|
||||||
|
diff --git a/pinentry/pinentry-emacs.c b/pinentry/pinentry-emacs.c
|
||||||
|
index 16ae1c2..9685b67 100644
|
||||||
|
--- a/pinentry/pinentry-emacs.c
|
||||||
|
+++ b/pinentry/pinentry-emacs.c
|
||||||
|
@@ -498,7 +498,7 @@ set_labels (pinentry_t pe)
|
||||||
|
set_label (pe, "SETOK", pe->default_ok);
|
||||||
|
if (pe->cancel)
|
||||||
|
set_label (pe, "SETCANCEL", pe->cancel);
|
||||||
|
- else if (pe->default_ok)
|
||||||
|
+ else if (pe->default_cancel)
|
||||||
|
set_label (pe, "SETCANCEL", pe->default_cancel);
|
||||||
|
if (pe->notok)
|
||||||
|
set_label (pe, "SETNOTOK", pe->notok);
|
||||||
|
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
|
||||||
|
index ef81f12..26ec77a 100644
|
||||||
|
--- a/pinentry/pinentry.c
|
||||||
|
+++ b/pinentry/pinentry.c
|
||||||
|
@@ -656,6 +656,7 @@ pinentry_inq_genpin (pinentry_t pin)
|
||||||
|
if (rc)
|
||||||
|
{
|
||||||
|
fprintf (stderr, "ASSUAN READ LINE failed: rc=%d\n", rc);
|
||||||
|
+ free (value);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c
|
||||||
|
index 403dd60..4a2b67f 100644
|
||||||
|
--- a/tty/pinentry-tty.c
|
||||||
|
+++ b/tty/pinentry-tty.c
|
||||||
|
@@ -559,7 +559,7 @@ tty_cmd_handler (pinentry_t pinentry)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (terminal_save (fileno (ttyfi)) < 0)
|
||||||
|
+ if (!rc && terminal_save (fileno (ttyfi)) < 0)
|
||||||
|
rc = -1;
|
||||||
|
|
||||||
|
if (! rc)
|
||||||
|
|
||||||
|
From 7f7fd8bcfd74919091cc318b27b8617a9ef2ac82 Mon Sep 17 00:00:00 2001
|
||||||
|
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||||
|
Date: Fri, 16 Apr 2021 12:54:43 +0900
|
||||||
|
Subject: [PATCH] tty: Fix error return paths and its resource leaks.
|
||||||
|
|
||||||
|
* tty/pinentry-tty.c (tty_cmd_handler): Only call do_touch_file
|
||||||
|
on successful interaction. Fix closing file.
|
||||||
|
|
||||||
|
--
|
||||||
|
|
||||||
|
GnuPG-bug-id: 5384
|
||||||
|
Co-authored-by: Jakub Jelen <jjelen@redhat.com>
|
||||||
|
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||||
|
---
|
||||||
|
tty/pinentry-tty.c | 34 +++++++++++++++++-----------------
|
||||||
|
1 file changed, 17 insertions(+), 17 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c
|
||||||
|
index 4a2b67f..c4d85c6 100644
|
||||||
|
--- a/tty/pinentry-tty.c
|
||||||
|
+++ b/tty/pinentry-tty.c
|
||||||
|
@@ -525,6 +525,7 @@ tty_cmd_handler (pinentry_t pinentry)
|
||||||
|
int rc = 0;
|
||||||
|
FILE *ttyfi = stdin;
|
||||||
|
FILE *ttyfo = stdout;
|
||||||
|
+ int saved_errno = 0;
|
||||||
|
|
||||||
|
#ifndef HAVE_DOSISH_SYSTEM
|
||||||
|
timed_out = 0;
|
||||||
|
@@ -545,30 +546,27 @@ tty_cmd_handler (pinentry_t pinentry)
|
||||||
|
{
|
||||||
|
ttyfi = fopen (pinentry->ttyname, "r");
|
||||||
|
if (!ttyfi)
|
||||||
|
- rc = -1;
|
||||||
|
- else
|
||||||
|
+ return -1;
|
||||||
|
+
|
||||||
|
+ ttyfo = fopen (pinentry->ttyname, "w");
|
||||||
|
+ if (!ttyfo)
|
||||||
|
{
|
||||||
|
- ttyfo = fopen (pinentry->ttyname, "w");
|
||||||
|
- if (!ttyfo)
|
||||||
|
- {
|
||||||
|
- int err = errno;
|
||||||
|
- fclose (ttyfi);
|
||||||
|
- errno = err;
|
||||||
|
- rc = -1;
|
||||||
|
- }
|
||||||
|
+ saved_errno = errno;
|
||||||
|
+ fclose (ttyfi);
|
||||||
|
+ errno = saved_errno;
|
||||||
|
+ return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (!rc && terminal_save (fileno (ttyfi)) < 0)
|
||||||
|
+ if (terminal_save (fileno (ttyfi)) < 0)
|
||||||
|
rc = -1;
|
||||||
|
-
|
||||||
|
- if (! rc)
|
||||||
|
+ else
|
||||||
|
{
|
||||||
|
if (terminal_setup (fileno (ttyfi), !!pinentry->pin) == -1)
|
||||||
|
{
|
||||||
|
- int err = errno;
|
||||||
|
+ saved_errno = errno;
|
||||||
|
fprintf (stderr, "terminal_setup failure, exiting\n");
|
||||||
|
- errno = err;
|
||||||
|
+ rc = -1;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
@@ -578,17 +576,19 @@ tty_cmd_handler (pinentry_t pinentry)
|
||||||
|
rc = confirm (pinentry, ttyfi, ttyfo);
|
||||||
|
|
||||||
|
terminal_restore (fileno (ttyfi));
|
||||||
|
+ do_touch_file (pinentry);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- do_touch_file (pinentry);
|
||||||
|
-
|
||||||
|
if (pinentry->ttyname)
|
||||||
|
{
|
||||||
|
fclose (ttyfi);
|
||||||
|
fclose (ttyfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (saved_errno)
|
||||||
|
+ errno = saved_errno;
|
||||||
|
+
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.30.2
|
||||||
41
SOURCES/pinentry-1.1.1-rpath.patch
Normal file
41
SOURCES/pinentry-1.1.1-rpath.patch
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
commit 6e8ad3150566d16a20cb3b54267191bcb0c14208
|
||||||
|
Author: Damien Goutte-Gattat <dgouttegattat@incenp.org>
|
||||||
|
Date: Tue Feb 23 22:05:37 2021 +0000
|
||||||
|
|
||||||
|
qt: Honor the --disable-rpath option.
|
||||||
|
|
||||||
|
* m4/qt.m4: Do not set rpath if --disable-rpath has been specified
|
||||||
|
at configure time.
|
||||||
|
--
|
||||||
|
|
||||||
|
GnuPG-bug-id: 5307
|
||||||
|
Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
|
||||||
|
|
||||||
|
diff --git a/m4/qt.m4 b/m4/qt.m4
|
||||||
|
index f8ef3f6..5f9de3f 100644
|
||||||
|
--- a/m4/qt.m4
|
||||||
|
+++ b/m4/qt.m4
|
||||||
|
@@ -59,7 +59,9 @@ AC_DEFUN([FIND_QT],
|
||||||
|
|
||||||
|
qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core`
|
||||||
|
if test -n "$qtlibdir"; then
|
||||||
|
+ if test "$enable_rpath" != "no"; then
|
||||||
|
PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\""
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_CHECK_TOOL(MOC, moc)
|
||||||
|
|
||||||
|
diff -up pinentry-1.1.1/configure.rpath pinentry-1.1.1/configure
|
||||||
|
--- pinentry-1.1.1/configure.rpath 2021-04-16 09:08:48.306479991 +0200
|
||||||
|
+++ pinentry-1.1.1/configure 2021-04-16 09:09:29.365068549 +0200
|
||||||
|
@@ -10765,7 +10776,9 @@ fi
|
||||||
|
|
||||||
|
qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core`
|
||||||
|
if test -n "$qtlibdir"; then
|
||||||
|
+ if test "$enable_rpath" != "no"; then
|
||||||
|
PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\""
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -n "$ac_tool_prefix"; then
|
||||||
BIN
SOURCES/pinentry-1.1.1.tar.bz2.sig
Normal file
BIN
SOURCES/pinentry-1.1.1.tar.bz2.sig
Normal file
Binary file not shown.
80
SOURCES/pinentry-wrapper
Executable file
80
SOURCES/pinentry-wrapper
Executable file
@ -0,0 +1,80 @@
|
|||||||
|
#!/usr/bin/sh
|
||||||
|
|
||||||
|
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
# Copyright (c) 2009 Fedora Project
|
||||||
|
# Copyright (c) 2014-2015 Red Hat
|
||||||
|
# This file and all modifications and additions to the pristine
|
||||||
|
# package are under the same license as the package itself.
|
||||||
|
#
|
||||||
|
# Please submit bugfixes or comments via http://bugzilla.redhat.com/
|
||||||
|
#
|
||||||
|
# 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
|
||||||
|
#
|
||||||
|
# use proper binary (pinentry-qt, pinentry-gnome, pinentry-gtk-2 or pinentry-curses)
|
||||||
|
|
||||||
|
kde_running=
|
||||||
|
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" ] && [ "$DISPLAY" != "$display" ]; then
|
||||||
|
export DISPLAY="$display"
|
||||||
|
elif [ -n "$KDE_FULL_SESSION" ]; then
|
||||||
|
kde_running=1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check for presence of xprop binary
|
||||||
|
type xprop >/dev/null 2>/dev/null
|
||||||
|
XPROP=$?
|
||||||
|
|
||||||
|
if [ -n "$DISPLAY" ] && [ $XPROP -eq 0 ]; then
|
||||||
|
xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
|
||||||
|
if test $? -eq 0; then
|
||||||
|
kde_running=1
|
||||||
|
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-qt exists, use pinentry-qt
|
||||||
|
elif [ -n "$kde_running" ] && [ -x /usr/bin/pinentry-qt ]
|
||||||
|
then
|
||||||
|
export PINENTRY_BINARY="/usr/bin/pinentry-qt"
|
||||||
|
# otherwise test if pinentry-gnome3 is installed
|
||||||
|
elif [ -n "$DISPLAY" ] && [ -x /usr/bin/pinentry-gnome3 ]
|
||||||
|
then
|
||||||
|
export PINENTRY_BINARY="/usr/bin/pinentry-gnome3"
|
||||||
|
# otherwise test if pinentry-gtk-2 is installed
|
||||||
|
elif [ -n "$DISPLAY" ] && [ -x /usr/bin/pinentry-gtk-2 ]
|
||||||
|
then
|
||||||
|
export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2"
|
||||||
|
# otherwise test if pinentry-qt exists although KDE is not detected
|
||||||
|
elif [ -n "$DISPLAY" ] && [ -x /usr/bin/pinentry-qt ]
|
||||||
|
then
|
||||||
|
export PINENTRY_BINARY="/usr/bin/pinentry-qt"
|
||||||
|
# use pinentry-tty if installed
|
||||||
|
elif [ -x /usr/bin/pinentry-tty ]
|
||||||
|
then
|
||||||
|
export PINENTRY_BINARY="/usr/bin/pinentry-tty"
|
||||||
|
# pinentry-curses is installed by default
|
||||||
|
else
|
||||||
|
export PINENTRY_BINARY="/usr/bin/pinentry-curses"
|
||||||
|
fi
|
||||||
|
exec $PINENTRY_BINARY "$@"
|
||||||
432
SPECS/pinentry.spec
Normal file
432
SPECS/pinentry.spec
Normal file
@ -0,0 +1,432 @@
|
|||||||
|
|
||||||
|
Name: pinentry
|
||||||
|
Version: 1.1.1
|
||||||
|
Release: 8%{?dist}
|
||||||
|
Summary: Collection of simple PIN or passphrase entry dialogs
|
||||||
|
|
||||||
|
License: GPLv2+
|
||||||
|
URL: https://www.gnupg.org/
|
||||||
|
Source0: https://gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2
|
||||||
|
Source1: https://gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
|
||||||
|
|
||||||
|
Patch1: pinentry-1.1.1-coverity.patch
|
||||||
|
Patch2: pinentry-1.1.1-rpath.patch
|
||||||
|
|
||||||
|
# borrowed from opensuse
|
||||||
|
Source10: pinentry-wrapper
|
||||||
|
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: gcr-devel
|
||||||
|
BuildRequires: gtk2-devel
|
||||||
|
BuildRequires: libcap-devel
|
||||||
|
BuildRequires: ncurses-devel
|
||||||
|
BuildRequires: libgpg-error-devel
|
||||||
|
BuildRequires: libassuan-devel
|
||||||
|
BuildRequires: libsecret-devel
|
||||||
|
BuildRequires: pkgconfig(Qt5Core) pkgconfig(Qt5Gui) pkgconfig(Qt5Widgets)
|
||||||
|
|
||||||
|
Requires(pre): %{_sbindir}/update-alternatives
|
||||||
|
|
||||||
|
Provides: %{name}-curses = %{version}-%{release}
|
||||||
|
|
||||||
|
%description
|
||||||
|
Pinentry is a collection of simple PIN or passphrase entry dialogs which
|
||||||
|
utilize the Assuan protocol as described by the aegypten project; see
|
||||||
|
http://www.gnupg.org/aegypten/ for details.
|
||||||
|
This package contains the curses (text) based version of the PIN entry dialog.
|
||||||
|
|
||||||
|
%package gnome3
|
||||||
|
Summary: Passphrase/PIN entry dialog for GNOME 3
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Provides: %{name}-gui = %{version}-%{release}
|
||||||
|
%description gnome3
|
||||||
|
Pinentry is a collection of simple PIN or passphrase entry dialogs which
|
||||||
|
utilize the Assuan protocol as described by the aegypten project; see
|
||||||
|
http://www.gnupg.org/aegypten/ for details.
|
||||||
|
This package contains the GNOME 3 version of the PIN entry dialog.
|
||||||
|
|
||||||
|
%package gtk
|
||||||
|
Summary: Passphrase/PIN entry dialog based on GTK+
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Provides: %{name}-gui = %{version}-%{release}
|
||||||
|
Provides: pinentry-gtk2 = %{version}-%{release}
|
||||||
|
%description gtk
|
||||||
|
Pinentry is a collection of simple PIN or passphrase entry dialogs which
|
||||||
|
utilize the Assuan protocol as described by the aegypten project; see
|
||||||
|
http://www.gnupg.org/aegypten/ for details.
|
||||||
|
This package contains the GTK GUI based version of the PIN entry dialog.
|
||||||
|
|
||||||
|
%package qt
|
||||||
|
Summary: Passphrase/PIN entry dialog based on Qt5
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Provides: %{name}-gui = %{version}-%{release}
|
||||||
|
Obsoletes: pinentry-qt4 < 0.8.0-2
|
||||||
|
Provides: pinentry-qt5 = %{version}-%{release}
|
||||||
|
%description qt
|
||||||
|
Pinentry is a collection of simple PIN or passphrase entry dialogs which
|
||||||
|
utilize the Assuan protocol as described by the aegypten project; see
|
||||||
|
http://www.gnupg.org/aegypten/ for details.
|
||||||
|
This package contains the Qt4 GUI based version of the PIN entry dialog.
|
||||||
|
|
||||||
|
%package emacs
|
||||||
|
Summary: Passphrase/PIN entry dialog based on emacs
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
%description emacs
|
||||||
|
Pinentry is a collection of simple PIN or passphrase entry dialogs which
|
||||||
|
utilize the Assuan protocol as described by the aegypten project; see
|
||||||
|
http://www.gnupg.org/aegypten/ for details.
|
||||||
|
This package contains the emacs based version of the PIN entry dialog.
|
||||||
|
|
||||||
|
%package tty
|
||||||
|
Summary: Passphrase/PIN entry dialog in tty
|
||||||
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
%description tty
|
||||||
|
Pinentry is a collection of simple PIN or passphrase entry dialogs which
|
||||||
|
utilize the Assuan protocol as described by the aegypten project; see
|
||||||
|
http://www.gnupg.org/aegypten/ for details.
|
||||||
|
This package contains the tty version of the PIN entry dialog.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
%patch1 -p1 -b .coverity
|
||||||
|
%patch2 -p1 -b .rpath
|
||||||
|
|
||||||
|
|
||||||
|
%build
|
||||||
|
%configure \
|
||||||
|
--disable-rpath \
|
||||||
|
--disable-dependency-tracking \
|
||||||
|
--without-libcap \
|
||||||
|
--disable-pinentry-fltk \
|
||||||
|
--enable-pinentry-gnome3 \
|
||||||
|
--enable-pinentry-gtk2 \
|
||||||
|
--enable-pinentry-qt5 \
|
||||||
|
--enable-pinentry-emacs \
|
||||||
|
--enable-pinentry-tty \
|
||||||
|
--enable-libsecret
|
||||||
|
|
||||||
|
%make_build
|
||||||
|
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install
|
||||||
|
|
||||||
|
# Symlink for Backward compatibility
|
||||||
|
ln -s pinentry-gtk-2 $RPM_BUILD_ROOT%{_bindir}/pinentry-gtk
|
||||||
|
ln -s pinentry-qt $RPM_BUILD_ROOT%{_bindir}/pinentry-qt4
|
||||||
|
|
||||||
|
install -p -m755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/pinentry
|
||||||
|
|
||||||
|
# unpackaged files
|
||||||
|
rm -fv $RPM_BUILD_ROOT%{_infodir}/dir
|
||||||
|
|
||||||
|
%files
|
||||||
|
%license COPYING
|
||||||
|
%doc AUTHORS ChangeLog NEWS README THANKS TODO
|
||||||
|
%{_bindir}/pinentry-curses
|
||||||
|
%{_bindir}/pinentry
|
||||||
|
%{_infodir}/pinentry.info*
|
||||||
|
|
||||||
|
%files gnome3
|
||||||
|
%{_bindir}/pinentry-gnome3
|
||||||
|
|
||||||
|
%files gtk
|
||||||
|
%{_bindir}/pinentry-gtk-2
|
||||||
|
# symlink for backward compatibility
|
||||||
|
%{_bindir}/pinentry-gtk
|
||||||
|
|
||||||
|
%files qt
|
||||||
|
%{_bindir}/pinentry-qt
|
||||||
|
# symlink for backward compatibility
|
||||||
|
%{_bindir}/pinentry-qt4
|
||||||
|
|
||||||
|
%files emacs
|
||||||
|
%{_bindir}/pinentry-emacs
|
||||||
|
|
||||||
|
%files tty
|
||||||
|
%{_bindir}/pinentry-tty
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-8
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-7
|
||||||
|
- Honor the disabled rpath
|
||||||
|
- Sync final version of coverity patches from upstream (#1938729)
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1.1-6
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Thu Apr 15 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-5
|
||||||
|
- Address few more minor issues reported by coverity
|
||||||
|
|
||||||
|
* Wed Apr 14 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-4
|
||||||
|
- Fix issues reported by coverity
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-2
|
||||||
|
- Move pinentry-tty to separate subpackage (#1782442)
|
||||||
|
- Update the wrapper selecting the appropriate version (#1918969)
|
||||||
|
|
||||||
|
* Fri Jan 22 2021 Jakub Jelen <jjelen@redhat.com> - 1.1.1-1
|
||||||
|
- New upstream release (#1919127)
|
||||||
|
|
||||||
|
* Wed Jan 06 2021 Boris Ranto <branto@redhat.com> - 1.1.0-9
|
||||||
|
- enable pinentry-tty
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-8
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Mar 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.1.0-3
|
||||||
|
- BR: gcc, use %%make_build %%make_install
|
||||||
|
- explicitly disable fltk support (FTBFS)
|
||||||
|
|
||||||
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Dec 31 2017 Rex Dieter <rdieter@fedoraproject.org> - 1.1.0-1
|
||||||
|
- 1.1.0 (#1397378)
|
||||||
|
- drop some old code/hacks/workarounds
|
||||||
|
- -qt: use Qt5
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.7-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Dec 07 2015 Boris Ranto <branto@redhat.com> - 0.9.7-1
|
||||||
|
- Rebase to latest upstream version
|
||||||
|
|
||||||
|
* Tue Oct 27 2015 Stef Walter <stefw@redhat.com> - 0.9.6-4
|
||||||
|
- Enable libsecret, which enables password caching in pinentry-gnome3
|
||||||
|
- Resolves rhbz#1275567
|
||||||
|
|
||||||
|
* Thu Oct 15 2015 Kalev Lember <klember@redhat.com> - 0.9.6-3
|
||||||
|
- Add pinentry-gnome3 support to pinentry wrapper
|
||||||
|
|
||||||
|
* Mon Sep 21 2015 Kalev Lember <klember@redhat.com> - 0.9.6-2
|
||||||
|
- Build pinentry-gnome3
|
||||||
|
|
||||||
|
* Fri Sep 11 2015 Boris Ranto <branto@redhat.com> - 0.9.6-1
|
||||||
|
- Rebase to latest upstream version
|
||||||
|
- Modify backwards compatible symlink for qt(4)
|
||||||
|
- Enable pinentry-emacs since it was enabled by default in 0.9.5
|
||||||
|
|
||||||
|
* Thu Jul 02 2015 Boris Ranto <branto@redhat.com> - 0.9.5-1
|
||||||
|
- Rebase to latest upstream version
|
||||||
|
- Removing qt4 pinentry patch -- got merged upstream
|
||||||
|
- New package pinentry-emacs that hosts pinentry-emacs
|
||||||
|
- New dependencies on libassuan and libgpg-error (de-bundling)
|
||||||
|
|
||||||
|
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu May 14 2015 Boris Ranto <branto@redhat.com> - 0.9.2-1
|
||||||
|
- Rebase to latest upstream version
|
||||||
|
|
||||||
|
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 0.9.1-2
|
||||||
|
- Rebuilt for GCC 5 C++11 ABI change
|
||||||
|
|
||||||
|
* Wed Mar 25 2015 Boris Ranto <branto@redhat.com> - 0.9.1-1
|
||||||
|
- Rebase to latest upstream version
|
||||||
|
- There are no longer any moc files so there is no need to patch them
|
||||||
|
|
||||||
|
* Fri Mar 13 2015 Rex Dieter <rdieter@fedoraproject.org> - 0.9.0-3
|
||||||
|
- fix FTBFS on f23/gcc5
|
||||||
|
- drop deprecated configure flags
|
||||||
|
|
||||||
|
* Sat Feb 21 2015 Till Maas <opensource@till.name> - 0.9.0-2
|
||||||
|
- Rebuilt for Fedora 23 Change
|
||||||
|
https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
|
||||||
|
|
||||||
|
* Wed Nov 12 2014 Boris Ranto <branto@redhat.com> - 0.9.0-1
|
||||||
|
- Rebase to latest upstream version
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.3-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Aug 12 2014 Boris Ranto <branto@redhat.com> - 0.8.3-6
|
||||||
|
- fix bogus dates
|
||||||
|
- upgrade pinentry-wrapper to handle corner cases better
|
||||||
|
|
||||||
|
* Wed Jul 30 2014 Tom Callaway <spot@fedoraproject.org> - 0.8.3-5
|
||||||
|
- fix license handling
|
||||||
|
|
||||||
|
* Sat Jul 19 2014 Rex Dieter <rdieter@fedoraproject.org> 0.8.3-4
|
||||||
|
- /usr/bin/pinentry should not check if stderr is opened (#787775)
|
||||||
|
|
||||||
|
* Sat Jul 19 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.8.3-3
|
||||||
|
- .spec cleanup (drop support for old releases)
|
||||||
|
- -gtk: Provides: pinentry-gtk2
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 30 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.3-1
|
||||||
|
- Update to latest upstream version (0.8.3)
|
||||||
|
|
||||||
|
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Nov 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.1-9
|
||||||
|
- Fix macros expansions so that conditionals work
|
||||||
|
|
||||||
|
* Mon Nov 12 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.1-8
|
||||||
|
- Fix up licenses for qt and qt4 subpackages (#875875)
|
||||||
|
|
||||||
|
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Nov 14 2011 Adam Jackson <ajax@redhat.com> 0.8.1-5
|
||||||
|
- Rebuild for new libpng
|
||||||
|
|
||||||
|
* Tue Jul 26 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.1-4
|
||||||
|
- Improve wrapper to fallback to curses even with DISPLAY set (#622077)
|
||||||
|
|
||||||
|
* Fri Feb 18 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.1-3
|
||||||
|
- Fix pinentry-curses running as root by disabling capabilities (#677670)
|
||||||
|
|
||||||
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Feb 1 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.1-1
|
||||||
|
- Updated to latest upstream version (0.8.1)
|
||||||
|
|
||||||
|
* Fri May 7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.0-3
|
||||||
|
- Fix X11 even race with gtk (#589998)
|
||||||
|
- Fix qt4 problems with creating window in the background (#589532)
|
||||||
|
|
||||||
|
* Thu Apr 29 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.8.0-2
|
||||||
|
- -qt: build as qt4 version, and drop qt3 support (f13+ only)
|
||||||
|
|
||||||
|
* Tue Apr 27 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.8.0-1
|
||||||
|
- pinentry-0.8.0
|
||||||
|
- pinentry-gtk keyboard grab fail results in SIGABRT (#585422)
|
||||||
|
|
||||||
|
* Sun Apr 18 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.7.6-5
|
||||||
|
- pinentry-gtk -g segfaults on focus change (#520236)
|
||||||
|
|
||||||
|
* Sun Sep 13 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.7.6-4
|
||||||
|
- Errors installing with --excludedocs (#515925)
|
||||||
|
|
||||||
|
* Sun Sep 13 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.7.6-3
|
||||||
|
- drop alternatives, use app-wrapper instead (borrowed from opensuse)
|
||||||
|
- -qt4 experimental subpkg, -qt includes qt3 version again (#523488)
|
||||||
|
|
||||||
|
* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.6-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jun 22 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.7.6-1
|
||||||
|
- pinentry-0.7.6
|
||||||
|
- -qt switched qt4 version, where applicable (f9+, rhel6+)
|
||||||
|
- fixup scriptlets
|
||||||
|
|
||||||
|
* Sat Apr 25 2009 Rex Dieter <rdieter@fedoraproject.org> - 0.7.5-1
|
||||||
|
- pinentry-0.7.5
|
||||||
|
|
||||||
|
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.4-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Mar 25 2008 Rex Dieter <rdieter@fedoraproject.org> - 0.7.4-5
|
||||||
|
- pinentry failed massrebuild attempt for GCC 4.3 (#434400)
|
||||||
|
|
||||||
|
* Tue Mar 25 2008 Rex Dieter <rdieter@fedoraproject.org> - 0.7.4-4
|
||||||
|
- s/qt-devel/qt3-devel/ (f9+)
|
||||||
|
|
||||||
|
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.7.4-3
|
||||||
|
- Autorebuild for GCC 4.3
|
||||||
|
|
||||||
|
* Sun Feb 17 2008 Adam Tkac <atkac redhat com> - 0.7.4-2
|
||||||
|
- rebuild against new libcap
|
||||||
|
|
||||||
|
* Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.7.4-1
|
||||||
|
- pinentry-0.7.4
|
||||||
|
- BR: libcap-devel
|
||||||
|
|
||||||
|
* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.7.3-2
|
||||||
|
- respin (BuildID)
|
||||||
|
|
||||||
|
* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.7.3-1
|
||||||
|
- pinentry-0.7.3
|
||||||
|
- License: GPLv2+
|
||||||
|
|
||||||
|
* Thu May 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 0.7.2-15
|
||||||
|
- respin (for ppc64)
|
||||||
|
|
||||||
|
* Mon Dec 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.2-14
|
||||||
|
- -14 respin (to help retire ATrpms pinentry pkg)
|
||||||
|
|
||||||
|
* Mon Aug 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.2-3
|
||||||
|
- fc6 respin
|
||||||
|
|
||||||
|
* Wed Aug 09 2006 Rex Dieter <rexdieter[AT]users.sf.net> - 0.7.2-2
|
||||||
|
- fc6 respin
|
||||||
|
|
||||||
|
* Wed Mar 01 2006 Rex Dieter <rexdieter[AT]users.sf.net>
|
||||||
|
- fc5: gcc/glibc respin
|
||||||
|
|
||||||
|
* Tue Oct 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-1
|
||||||
|
- 0.7.2, docs patch applied upstream.
|
||||||
|
- Switch to GTK2 in -gtk.
|
||||||
|
- Fine tune dependencies.
|
||||||
|
- Build with dependency tracking disabled.
|
||||||
|
- Clean up obsolete pre-FC2 support.
|
||||||
|
|
||||||
|
* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.7.1-4
|
||||||
|
- rebuilt
|
||||||
|
|
||||||
|
* Wed Jun 30 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.fdr.3
|
||||||
|
- BuildRequires qt-devel >= 3.2.
|
||||||
|
|
||||||
|
* Sat May 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.fdr.2
|
||||||
|
- Spec cleanups.
|
||||||
|
|
||||||
|
* Sat Apr 24 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.1-0.fdr.1
|
||||||
|
- Update to 0.7.1.
|
||||||
|
|
||||||
|
* Fri Dec 26 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.7.0-0.fdr.1
|
||||||
|
- Update to 0.7.0.
|
||||||
|
- Split GTK+ and QT dialogs into subpackages.
|
||||||
|
|
||||||
|
* Thu Jul 10 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.9-0.fdr.1
|
||||||
|
- Update to 0.6.9.
|
||||||
|
- Smoother experience with --excludedocs.
|
||||||
|
- Don't change alternative priorities on upgrade.
|
||||||
|
|
||||||
|
* Sat Mar 22 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.8-0.fdr.1
|
||||||
|
- Update to current Fedora guidelines.
|
||||||
|
|
||||||
|
* Wed Feb 12 2003 Warren Togami <warren@togami.com> 0.6.8-1.fedora.3
|
||||||
|
- info/dir temporary workaround
|
||||||
|
|
||||||
|
* Sat Feb 8 2003 Ville Skyttä <ville.skytta at iki.fi> - 0.6.8-1.fedora.1
|
||||||
|
- First Fedora release.
|
||||||
Loading…
Reference in New Issue
Block a user