commit
e76f77ba69
|
@ -0,0 +1,27 @@
|
|||
commit 183d7619c29482a5d4ae8019692899f87f198171
|
||||
commit b05e301d1b264a5d8f07cb96e5edc243d99bff79
|
||||
|
||||
diff -up libcryptui-3.12.2/configure.ac.gpg2 libcryptui-3.12.2/configure.ac
|
||||
--- libcryptui-3.12.2/configure.ac.gpg2 2018-01-29 13:04:53.324022912 -0600
|
||||
+++ libcryptui-3.12.2/configure.ac 2018-01-29 13:05:14.293824226 -0600
|
||||
@@ -95,7 +95,7 @@ AC_ARG_ENABLE(gpg-check,
|
||||
DO_CHECK=$enableval, DO_CHECK=yes)
|
||||
|
||||
if test "$DO_CHECK" = "yes"; then
|
||||
- accepted_versions="1.2 1.4 2.0"
|
||||
+ accepted_versions="1.2 1.4 2.0 2.1 2.2"
|
||||
AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
|
||||
AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
|
||||
ok="no"
|
||||
diff -up libcryptui-3.12.2/configure.gpg2 libcryptui-3.12.2/configure
|
||||
--- libcryptui-3.12.2/configure.gpg2 2018-01-29 13:04:57.487983459 -0600
|
||||
+++ libcryptui-3.12.2/configure 2018-01-29 13:05:27.721696999 -0600
|
||||
@@ -17379,7 +17379,7 @@ fi
|
||||
|
||||
|
||||
if test "$DO_CHECK" = "yes"; then
|
||||
- accepted_versions="1.2 1.4 2.0"
|
||||
+ accepted_versions="1.2 1.4 2.0 2.1 2.2"
|
||||
for ac_prog in gpg gpg2
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
|
@ -0,0 +1,154 @@
|
|||
From 728aceb6defd4e6e4f07fa49ca76f5e745230fee Mon Sep 17 00:00:00 2001
|
||||
From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
|
||||
Date: Fri, 16 Sep 2016 11:46:55 +0200
|
||||
Subject: [PATCH] daemon: port to gcr-3
|
||||
|
||||
This removes the dependency on libgnome-keyring and adds a dependency
|
||||
on libgcr instead.
|
||||
|
||||
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
|
||||
Signed-off-by: Stef Walter <stefw@redhat.com>
|
||||
* Updated commit message
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=771522
|
||||
---
|
||||
configure.ac | 14 +++++++-------
|
||||
daemon/seahorse-secure-buffer.c | 7 ++++---
|
||||
daemon/seahorse-secure-memory.c | 21 +++++++++++----------
|
||||
3 files changed, 22 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index b621b236..4486e7b2 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -252,18 +252,18 @@ if test "$enable_fatal_messages" = "yes" && test "$enable_debug" = "yes"; then
|
||||
fi
|
||||
|
||||
dnl ****************************************************************************
|
||||
-dnl GNOME-KEYRING
|
||||
+dnl GCR
|
||||
dnl ****************************************************************************
|
||||
|
||||
-PKG_CHECK_MODULES([GNOME_KEYRING], gnome-keyring-1 >= 2.25.5,
|
||||
- [enable_gnome_keyring=yes],[enable_gnome_keyring=no])
|
||||
+PKG_CHECK_MODULES([GCR], gcr-3,
|
||||
+ [enable_gcr=yes],[enable_gcr=no])
|
||||
|
||||
-if test "$enable_gnome_keyring" = "no"; then
|
||||
- AC_MSG_ERROR([gnome-keyring library or headers not found.])
|
||||
+if test "$enable_gcr" = "no"; then
|
||||
+ AC_MSG_ERROR([gcr library or headers not found.])
|
||||
fi
|
||||
|
||||
-SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
|
||||
-SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
|
||||
+SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GCR_CFLAGS"
|
||||
+SEAHORSE_LIBS="$SEAHORSE_LIBS $GCR_LIBS"
|
||||
|
||||
dnl ****************************************************************************
|
||||
dnl LIBCRYPTUI
|
||||
diff --git a/daemon/seahorse-secure-buffer.c b/daemon/seahorse-secure-buffer.c
|
||||
index 0db87961..63f87cd3 100644
|
||||
--- a/daemon/seahorse-secure-buffer.c
|
||||
+++ b/daemon/seahorse-secure-buffer.c
|
||||
@@ -20,7 +20,8 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "seahorse-secure-buffer.h"
|
||||
-#include <gnome-keyring-memory.h>
|
||||
+#define GCR_API_SUBJECT_TO_CHANGE 1
|
||||
+#include <gcr/gcr.h>
|
||||
|
||||
#include <string.h>
|
||||
|
||||
@@ -92,7 +93,7 @@ seahorse_secure_buffer_real_insert_text (GtkEntryBuffer *buffer, guint position,
|
||||
}
|
||||
}
|
||||
|
||||
- pv->text = gnome_keyring_memory_realloc (pv->text, pv->text_size);
|
||||
+ pv->text = gcr_secure_memory_realloc (pv->text, pv->text_size);
|
||||
}
|
||||
|
||||
/* Actual text insertion */
|
||||
@@ -158,7 +159,7 @@ seahorse_secure_buffer_finalize (GObject *obj)
|
||||
SeahorseSecureBufferPrivate *pv = self->priv;
|
||||
|
||||
if (pv->text) {
|
||||
- gnome_keyring_memory_free (pv->text);
|
||||
+ gcr_secure_memory_free (pv->text);
|
||||
pv->text = NULL;
|
||||
pv->text_bytes = pv->text_size = 0;
|
||||
pv->text_chars = 0;
|
||||
diff --git a/daemon/seahorse-secure-memory.c b/daemon/seahorse-secure-memory.c
|
||||
index 3d94a674..f201d1df 100644
|
||||
--- a/daemon/seahorse-secure-memory.c
|
||||
+++ b/daemon/seahorse-secure-memory.c
|
||||
@@ -23,7 +23,8 @@
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
-#include <gnome-keyring-memory.h>
|
||||
+#define GCR_API_SUBJECT_TO_CHANGE 1
|
||||
+#include <gcr/gcr.h>
|
||||
|
||||
#include "seahorse-secure-memory.h"
|
||||
|
||||
@@ -47,7 +48,7 @@ switch_malloc (gsize size)
|
||||
if (size == 0)
|
||||
return NULL;
|
||||
if (seahorse_use_secure_mem)
|
||||
- p = gnome_keyring_memory_try_alloc (size);
|
||||
+ p = gcr_secure_memory_try_alloc (size);
|
||||
else
|
||||
p = malloc (size);
|
||||
return p;
|
||||
@@ -71,7 +72,7 @@ switch_calloc (gsize num, gsize size)
|
||||
if (size == 0 || num == 0)
|
||||
return NULL;
|
||||
if (seahorse_use_secure_mem)
|
||||
- p = gnome_keyring_memory_try_alloc (size * num);
|
||||
+ p = gcr_secure_memory_try_alloc (size * num);
|
||||
else
|
||||
p = calloc (num, size);
|
||||
return p;
|
||||
@@ -99,11 +100,11 @@ switch_realloc (gpointer mem, gsize size)
|
||||
|
||||
if (!mem) {
|
||||
if (seahorse_use_secure_mem)
|
||||
- p = gnome_keyring_memory_alloc (size);
|
||||
+ p = gcr_secure_memory_alloc (size);
|
||||
else
|
||||
p = malloc (size);
|
||||
- } else if (gnome_keyring_memory_is_secure (mem))
|
||||
- p = gnome_keyring_memory_try_realloc (mem, size);
|
||||
+ } else if (gcr_secure_memory_is_secure (mem))
|
||||
+ p = gcr_secure_memory_try_realloc (mem, size);
|
||||
else
|
||||
p = realloc (mem, size);
|
||||
return p;
|
||||
@@ -120,8 +121,8 @@ static void
|
||||
switch_free (gpointer mem)
|
||||
{
|
||||
if (mem) {
|
||||
- if (gnome_keyring_memory_is_secure (mem))
|
||||
- gnome_keyring_memory_free (mem);
|
||||
+ if (gcr_secure_memory_is_secure (mem))
|
||||
+ gcr_secure_memory_free (mem);
|
||||
else
|
||||
free (mem);
|
||||
}
|
||||
@@ -138,9 +139,9 @@ seahorse_try_gk_secure_memory ()
|
||||
{
|
||||
gpointer p;
|
||||
|
||||
- p = gnome_keyring_memory_try_alloc (10);
|
||||
+ p = gcr_secure_memory_try_alloc (10);
|
||||
if (p != NULL) {
|
||||
- gnome_keyring_memory_free (p);
|
||||
+ gcr_secure_memory_free (p);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
diff -uprN libcryptui-3.12.2.orig/configure.ac libcryptui-3.12.2/configure.ac
|
||||
--- libcryptui-3.12.2.orig/configure.ac 2021-07-27 19:35:29.668962000 +0200
|
||||
+++ libcryptui-3.12.2/configure.ac 2021-07-27 19:36:21.194924363 +0200
|
||||
@@ -96,7 +96,7 @@ AC_ARG_ENABLE(gpg-check,
|
||||
|
||||
if test "$DO_CHECK" = "yes"; then
|
||||
accepted_versions="1.2 1.4 2.0 2.1 2.2"
|
||||
- AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
|
||||
+ AC_PATH_PROGS(GNUPG, [gpg1 gpg2], no)
|
||||
AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
|
||||
ok="no"
|
||||
if test "$GNUPG" != "no"; then
|
|
@ -0,0 +1,217 @@
|
|||
Name: libcryptui
|
||||
Version: 3.12.2
|
||||
Release: 23%{?dist}
|
||||
Summary: Interface components for OpenPGP
|
||||
|
||||
License: LGPLv2+
|
||||
URL: http://projects.gnome.org/seahorse/
|
||||
Source0: http://download.gnome.org/sources/libcryptui/3.12/%{name}-%{version}.tar.xz
|
||||
Patch0: libcryptui-3.12.2-gpg22.patch
|
||||
Patch1: libcryptui-3.12.2-use-gcr.patch
|
||||
Patch2: libcryptui-gpg_version_fix.patch
|
||||
|
||||
BuildRequires: autoconf automake
|
||||
BuildRequires: gnupg1
|
||||
BuildRequires: gobject-introspection-devel
|
||||
BuildRequires: gpgme-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig(dbus-glib-1)
|
||||
BuildRequires: pkgconfig(gcr-3)
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
BuildRequires: pkgconfig(sm)
|
||||
BuildRequires: make
|
||||
|
||||
%description
|
||||
libcryptui is a library used for prompting for PGP keys.
|
||||
|
||||
%package devel
|
||||
Summary: Header files required to develop with libcryptui
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The libcryptui-devel package contains the header files and developer
|
||||
documentation for the libcryptui library.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
autoreconf --force --install
|
||||
|
||||
%build
|
||||
%configure
|
||||
%make_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%find_lang cryptui --with-gnome --all-name
|
||||
|
||||
find ${RPM_BUILD_ROOT} -type f -name "*.a" -delete
|
||||
find ${RPM_BUILD_ROOT} -type f -name "*.la" -delete
|
||||
|
||||
%files -f cryptui.lang
|
||||
%license COPYING-LIBCRYPTUI
|
||||
%doc AUTHORS NEWS README
|
||||
%{_bindir}/*
|
||||
%{_mandir}/man1/*.1*
|
||||
%{_datadir}/cryptui
|
||||
%{_libdir}/libcryptui.so.*
|
||||
%{_datadir}/dbus-1/services/*
|
||||
%{_datadir}/pixmaps/cryptui
|
||||
%dir %{_libdir}/girepository-1.0
|
||||
%{_libdir}/girepository-1.0/*
|
||||
%{_datadir}/GConf/gsettings/org.gnome.seahorse.recipients.convert
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.recipients.gschema.xml
|
||||
|
||||
%files devel
|
||||
%{_libdir}/libcryptui.so
|
||||
%{_libdir}/pkgconfig/*
|
||||
%{_includedir}/libcryptui
|
||||
%dir %{_datadir}/gtk-doc
|
||||
%dir %{_datadir}/gtk-doc/html
|
||||
%{_datadir}/gtk-doc/html/libcryptui
|
||||
%dir %{_datadir}/gir-1.0
|
||||
%{_datadir}/gir-1.0/*
|
||||
|
||||
%changelog
|
||||
* Tue Jul 27 2021 Wolfgang Ulbrich <fedora@raveit.de> - 3.12.2-23
|
||||
- fix building with gnupg1
|
||||
|
||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Jun 14 2019 David King <amigadave@amigadave.com> - 3.12.2-17
|
||||
- Use pkgconfig for BuildRequires
|
||||
- Improve man page glob
|
||||
- Use gcr instead of libgnome-keyring
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-16
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Dec 11 2018 Pete Walter <pwalter@fedoraproject.org> - 3.12.2-15
|
||||
- Modernize the spec file
|
||||
- Fix gir and gtk-doc directory ownership
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Jan 06 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.12.2-12
|
||||
- Remove obsolete scriptlets
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Sat Dec 10 2016 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 3.12.2-8
|
||||
- Rebuild for gpgme 1.18
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.12.2-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Sun Jul 19 2015 Peter Robinson <pbrobinson@fedoraproject.org> 3.12.2-6
|
||||
- Add gnupg dep to fix FTBFS
|
||||
- Use %%licence
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.2-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 3.12.2-3
|
||||
- Rebuilt for gobject-introspection 1.41.4
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Thu May 15 2014 Kalev Lember <kalevlember@gmail.com> - 3.12.2-1
|
||||
- Update to 3.12.2
|
||||
|
||||
* Tue Oct 29 2013 Richard Hughes <rhughes@redhat.com> - 3.10.1-1
|
||||
- Update to 3.10.1
|
||||
|
||||
* Wed Sep 25 2013 Kalev Lember <kalevlember@gmail.com> - 3.10.0-1
|
||||
- Update to 3.10.0
|
||||
|
||||
* Wed Aug 28 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.90-1
|
||||
- Update to 3.9.90
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue Mar 26 2013 Kalev Lember <kalevlember@gmail.com> - 3.8.0-1
|
||||
- Update to 3.8.0
|
||||
|
||||
* Wed Feb 06 2013 Kalev Lember <kalevlember@gmail.com> - 3.7.5-1
|
||||
- Update to 3.7.5
|
||||
|
||||
* Tue Sep 25 2012 Matthias Clasen <mclasen@redhat.com> -3.6.0-1
|
||||
- Update to 3.6.0
|
||||
|
||||
* Wed Sep 19 2012 Tomas Bzatek <tbzatek@redhat.com> - 3.5.92-1
|
||||
- Update to 3.5.92
|
||||
|
||||
* Tue Jul 17 2012 Richard Hughes <hughsient@gmail.com> - 3.5.4-1
|
||||
- Update to 3.5.4
|
||||
|
||||
* Tue Apr 24 2012 Kalev Lember <kalevlember@gmail.com> - 3.4.1-2
|
||||
- Silence rpm scriptlet output
|
||||
|
||||
* Mon Apr 16 2012 Richard Hughes <hughsient@gmail.com> - 3.4.1-1
|
||||
- Update to 3.4.1
|
||||
|
||||
* Tue Mar 27 2012 Kalev Lember <kalevlember@gmail.com> - 3.4.0-1
|
||||
- Update to 3.4.0
|
||||
|
||||
* Fri Mar 9 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.91-1
|
||||
- Update to 3.3.91
|
||||
|
||||
* Tue Feb 7 2012 Matthias Clasen <mclasen@redhat.com> - 3.3.5-1
|
||||
- Update to 3.3.5
|
||||
|
||||
* Thu Jan 26 2012 Tomas Bzatek <tbzatek@redhat.com> - 3.2.2-3
|
||||
- Fix BuildRequires
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Thu Nov 24 2011 Matthias Clasen <mclasen@redhat.com> - 3.2.2-1
|
||||
- Update to 3.2.2
|
||||
|
||||
* Fri Nov 18 2011 Matthew Barnes <mbarnes@redhat.com> - 3.2.0-2
|
||||
- Remove gtk-doc req in devel subpackage (RH bug #754500).
|
||||
|
||||
* Wed Sep 28 2011 Matthias Clasen <mclasen@redhat.com> - 3.2.0-1
|
||||
- Update to 3.2.0
|
||||
|
||||
* Tue Sep 6 2011 Matthias Clasen <mclasen@redhat.com> - 3.1.91-1
|
||||
- Update to 3.1.91
|
||||
|
||||
* Wed Jul 27 2011 Matthew Barnes <mbarnes@redhat.com> - 3.1.4-3
|
||||
- Add upstream patch to avoid file conflicts with seahorse.
|
||||
|
||||
* Tue Jul 26 2011 Matthew Barnes <mbarnes@redhat.com> - 3.1.4-2
|
||||
- Package review changes.
|
||||
|
||||
* Mon Jul 25 2011 Matthew Barnes <mbarnes@redhat.com> - 3.1.4-1
|
||||
- Initial packaging.
|
Loading…
Reference in New Issue