From b49f59790d1aa16a5b76ab40f9e84c502e34030e Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Wed, 22 Jul 2020 11:47:52 +0200 Subject: system/gnomint: Apply patches from debian. Signed-off-by: Matteo Bernardini --- system/gnomint/doinst.sh | 9 +- system/gnomint/gnomint.SlackBuild | 9 +- system/gnomint/patches/01-ldd.patch | 14 - system/gnomint/patches/01_cflags.patch | 15 + system/gnomint/patches/02-cflags.patch | 28 - system/gnomint/patches/02_682432.patch | 16 + system/gnomint/patches/03_fix-autoreconf.patch | 16 + system/gnomint/patches/04_gsettings-port.patch | 383 + .../patches/05_export-private-key-crash.patch | 83 + system/gnomint/patches/06_desktop-file.patch | 22 + system/gnomint/patches/07_spelling-errors.patch | 39 + system/gnomint/patches/08_gtk3-port.patch | 7655 ++++++++++++++++++++ system/gnomint/patches/09_gcc-10.patch | 33 + system/gnomint/patches/gnutls3.patch | 31 - 14 files changed, 8271 insertions(+), 82 deletions(-) delete mode 100644 system/gnomint/patches/01-ldd.patch create mode 100644 system/gnomint/patches/01_cflags.patch delete mode 100644 system/gnomint/patches/02-cflags.patch create mode 100644 system/gnomint/patches/02_682432.patch create mode 100644 system/gnomint/patches/03_fix-autoreconf.patch create mode 100644 system/gnomint/patches/04_gsettings-port.patch create mode 100644 system/gnomint/patches/05_export-private-key-crash.patch create mode 100644 system/gnomint/patches/06_desktop-file.patch create mode 100644 system/gnomint/patches/07_spelling-errors.patch create mode 100644 system/gnomint/patches/08_gtk3-port.patch create mode 100644 system/gnomint/patches/09_gcc-10.patch delete mode 100644 system/gnomint/patches/gnutls3.patch diff --git a/system/gnomint/doinst.sh b/system/gnomint/doinst.sh index bae04666ba2c8..6d1bccdc33ddc 100644 --- a/system/gnomint/doinst.sh +++ b/system/gnomint/doinst.sh @@ -6,9 +6,8 @@ if [ -x /usr/bin/update-mime-database ]; then /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 fi -if [ -x usr/bin/gconftool-2 ]; then - ( cd $PKG/etc/gconf/schemas - GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ - usr/bin/gconftool-2 --makefile-install-rule \ - etc/gconf/schemas/gnomint.schemas >/dev/null 2>&1 ) +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi fi diff --git a/system/gnomint/gnomint.SlackBuild b/system/gnomint/gnomint.SlackBuild index 9f043f0c908f8..7a4f44ca82ef4 100644 --- a/system/gnomint/gnomint.SlackBuild +++ b/system/gnomint/gnomint.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gnomint -# Copyright 2012-2016 Matteo Bernardini , Pisa, Italy +# Copyright 2012-2020 Matteo Bernardini , Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=gnomint VERSION=${VERSION:-1.3.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,9 +71,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -cp Makefile.in m4/ +# Apply debian patches +for i in $CWD/patches/* ; do patch -p1 -i $i ; done -sed -i 's|CFLAGS="-Wall -Werror "|CFLAGS="${CFLAGS:--Wall -Werror}"|' configure.ac configure +autoreconf -fi CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/gnomint/patches/01-ldd.patch b/system/gnomint/patches/01-ldd.patch deleted file mode 100644 index 0f92419fb0b1c..0000000000000 --- a/system/gnomint/patches/01-ldd.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Daniel Baumann -Description: Explicitly linking against libgcrypt. - -diff -Naurp gnomint.orig/src/Makefile.in gnomint/src/Makefile.in ---- gnomint.orig/src/Makefile.in 2011-05-17 19:57:50.013883380 +0200 -+++ gnomint/src/Makefile.in 2011-05-17 19:57:37.209981808 +0200 -@@ -347,6 +347,7 @@ gnomint_cli_SOURCES = \ - - gnomint_cli_LDADD = \ - $(GNOMINTCLI_LIBS) \ -+ $(LIBGCRYPT_LIBS) \ - $(LIBGNUTLS_LIBS) \ - $(SQLITE_LIBS) \ - $(READLINE_LIBS) \ diff --git a/system/gnomint/patches/01_cflags.patch b/system/gnomint/patches/01_cflags.patch new file mode 100644 index 0000000000000..abf31b635751f --- /dev/null +++ b/system/gnomint/patches/01_cflags.patch @@ -0,0 +1,15 @@ +Author: Daniel Baumann +Description: + Don't hardcode CFLAGS and respect the environment (Closes: #634395). + +--- gnomint-1.3.0.orig/configure.ac ++++ gnomint-1.3.0/configure.ac +@@ -182,7 +182,7 @@ + + dnl + if test "x$GCC" = "xyes"; then +- CFLAGS="-Wall -Werror " ++ CFLAGS="${CFLAGS:--Wall}" + if test "x$use_debug" = "xYes"; then + CFLAGS="$CFLAGS -g -O0" + fi diff --git a/system/gnomint/patches/02-cflags.patch b/system/gnomint/patches/02-cflags.patch deleted file mode 100644 index 59e4f71943190..0000000000000 --- a/system/gnomint/patches/02-cflags.patch +++ /dev/null @@ -1,28 +0,0 @@ -Author: Daniel Baumann -Description: - Don't hardcode CFLAGS and respect the environemnt (Closes: #634395). - -diff -Naurp gnomint.orig/configure gnomint/configure ---- gnomint.orig/configure 2011-09-08 07:58:09.324752523 +0000 -+++ gnomint/configure 2011-09-08 07:59:20.113103539 +0000 -@@ -14338,7 +14338,7 @@ fi - - - if test "x$GCC" = "xyes"; then -- CFLAGS="-Wall -Werror" -+ CFLAGS="${CFLAGS:--Wall -Werror}" - if test "x$use_debug" = "xYes"; then - CFLAGS="$CFLAGS -g -O0" - fi -diff -Naurp gnomint.orig/configure.in gnomint/configure.in ---- gnomint.orig/configure.in 2011-09-08 07:58:09.328752536 +0000 -+++ gnomint/configure.in 2011-09-08 07:59:20.113103539 +0000 -@@ -181,7 +181,7 @@ dnl - - dnl - if test "x$GCC" = "xyes"; then -- CFLAGS="-Wall -Werror" -+ CFLAGS="${CFLAGS:--Wall -Werror}" - if test "x$use_debug" = "xYes"; then - CFLAGS="$CFLAGS -g -O0" - fi diff --git a/system/gnomint/patches/02_682432.patch b/system/gnomint/patches/02_682432.patch new file mode 100644 index 0000000000000..96905965a9941 --- /dev/null +++ b/system/gnomint/patches/02_682432.patch @@ -0,0 +1,16 @@ +Description: Fix double free in tls_creation_data_free. +Author: Sebastian Ramacher +Bug-Debian: http://bugs.debian.org/682432 +Last-Update: 2012-08-04 + +--- gnomint-1.3.0.orig/src/tls.c ++++ gnomint-1.3.0/src/tls.c +@@ -1665,8 +1665,6 @@ + g_free (cd->emailAddress); + if (cd->password) + g_free (cd->password); +- if (cd->crl_distribution_point) +- g_free (cd->crl_distribution_point); + if (cd->parent_ca_id_str) + g_free (cd->parent_ca_id_str); + if (cd->crl_distribution_point) diff --git a/system/gnomint/patches/03_fix-autoreconf.patch b/system/gnomint/patches/03_fix-autoreconf.patch new file mode 100644 index 0000000000000..ee3a24788995a --- /dev/null +++ b/system/gnomint/patches/03_fix-autoreconf.patch @@ -0,0 +1,16 @@ +Description: Fix autoreconf failure. +Author: Yavor Doganov +Forwarded: gnomint-devel@lists.sourceforge.net +Last-Update: 2018-09-01 +--- + +--- gnomint-1.3.0.orig/configure.ac ++++ gnomint-1.3.0/configure.ac +@@ -198,7 +198,6 @@ + AC_OUTPUT([ + Makefile + src/Makefile +-m4/Makefile + gui/Makefile + po/Makefile.in + mime/Makefile diff --git a/system/gnomint/patches/04_gsettings-port.patch b/system/gnomint/patches/04_gsettings-port.patch new file mode 100644 index 0000000000000..5594012cd5882 --- /dev/null +++ b/system/gnomint/patches/04_gsettings-port.patch @@ -0,0 +1,383 @@ +Description: Port to GSettings. +Bug-Debian: https://bugs.debian.org/885817 +Author: Yavor Doganov +Forwarded: gnomint-devel@lists.sourceforge.net +Last-Update: 2019-10-15 +--- + +--- gnomint-1.3.0.orig/configure.ac ++++ gnomint-1.3.0/configure.ac +@@ -61,7 +61,6 @@ + GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4 + SQLITE_REQUIRED=3.0 + GLIB_REQUIRED=2.6.0 +-GCONF_REQUIRED=2.0 + GTK_REQUIRED=2.12.0 + ISO_CODES_REQUIRED=0.35 + +@@ -84,7 +83,6 @@ + PKG_CHECK_MODULES(GNOMINT, + glib-2.0 >= $GLIB_REQUIRED \ + gthread-2.0 >= $GLIB_REQUIRED \ +- gconf-2.0 >= $GCONF_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gdk-pixbuf-2.0 \ + gnutls >= $GNUTLS_REQUIRED \ +@@ -111,8 +109,7 @@ + AC_SUBST(READLINE_LIBS) + + PKG_CHECK_MODULES(GNOMINTCLI, +- glib-2.0 >= $GLIB_REQUIRED \ +- gconf-2.0 >= $GCONF_REQUIRED \ ++ gio-2.0 >= $GLIB_REQUIRED \ + gnutls >= $GNUTLS_REQUIRED \ + ) + AC_SUBST(GNOMINTCLI_CFLAGS) +@@ -150,17 +147,7 @@ + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + AC_SUBST(GLIB_GENMARSHAL) + +-dnl The following conditional is set in AM_GCONF_SOURCE_2. +-dnl Because we may skip its execution, we have to set a default here. +-m4_pattern_allow([^AM_GCONF_SOURCE_2$]) +-AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false]) +-GCONFTOOL="" +-AC_CHECK_PROG(GCONFTOOL, gconftool-2, gconftool-2) +-if test x"$GCONFTOOL" = x; then +- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) +-fi +-AM_GCONF_SOURCE_2 +- ++GLIB_GSETTINGS + + dnl + dnl Check if src should be build with the debug mode +--- gnomint-1.3.0.orig/gconf/Makefile.am ++++ gnomint-1.3.0/gconf/Makefile.am +@@ -1,21 +1,5 @@ +-schemasdir = @GCONF_SCHEMA_FILE_DIR@ +-schemas_in_files = gnomint.schemas.in +-schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) ++gsettings_SCHEMAS = net.sf.gnomint.gschema.xml + +-@INTLTOOL_SCHEMAS_RULE@ ++@GSETTINGS_RULES@ + +-EXTRA_DIST = $(schemas_in_files) +- +-CLEANFILES = $(schemas_DATA) +- +-if GCONF_SCHEMAS_INSTALL +-# don't do this if we are building in eg. rpm +-install-data-local: $(schemas_DATA) +- if test -z "$(DESTDIR)" ; then \ +- for p in $(schemas_DATA) ; do \ +- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \ +- done \ +- fi +-else +-install-data-local: +-endif ++EXTRA_DIST = $(gsettings_SCHEMAS) +--- gnomint-1.3.0.orig/src/preferences-gui.h ++++ gnomint-1.3.0/src/preferences-gui.h +@@ -20,6 +20,8 @@ + #ifndef _PREFERENCES_H_ + #define _PREFERENCES_H_ + ++#include ++ + typedef void (* PreferencesGuiChangeCallback) (gboolean, gboolean); + + void preferences_gui_set_csr_visible_callback (PreferencesGuiChangeCallback callback); +@@ -43,10 +45,8 @@ + void preferences_deinit (void); + + +-#include +-void preferences_changed_callback(GConfClient* client, +- guint cnxn_id, +- GConfEntry *entry, ++void preferences_changed_callback(GSettings* settings, ++ gchar *key, + gpointer user_data); + + +--- gnomint-1.3.0.orig/src/preferences-gui.c ++++ gnomint-1.3.0/src/preferences-gui.c +@@ -18,7 +18,6 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + #include +-#include + + + #include "preferences-gui.h" +@@ -26,7 +25,7 @@ + #include + + +-static GConfClient * preferences_client; ++static GSettings * preferences; + + PreferencesGuiChangeCallback csr_visible_callback = NULL; + PreferencesGuiChangeCallback revoked_visible_callback = NULL; +@@ -42,18 +41,19 @@ + } + + +-void preferences_changed_callback(GConfClient* client, +- guint cnxn_id, +- GConfEntry *entry, ++void preferences_changed_callback(GSettings* settings, ++ gchar *key, + gpointer user_data) + { + +- gboolean value = gconf_value_get_bool (gconf_entry_get_value(entry)); +- if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/crq_visible") && csr_visible_callback) +- csr_visible_callback (value, TRUE); +- +- if (! strcmp (gconf_entry_get_key(entry), "/apps/gnomint/revoked_visible") && revoked_visible_callback) +- revoked_visible_callback (value, TRUE); ++ if (! strcmp (key, "crq-visible") && csr_visible_callback) ++ csr_visible_callback (g_settings_get_boolean (settings, key), ++ TRUE); ++ ++ if (! strcmp (key, "revoked-visible") && revoked_visible_callback) ++ revoked_visible_callback (g_settings_get_boolean ++ (settings, key), ++ TRUE); + + } + +@@ -61,72 +61,62 @@ + + void preferences_init (int argc, char ** argv) + { +- gconf_init(argc, argv, NULL); +- +- preferences_client = gconf_client_get_default(); +- +- gconf_client_add_dir(preferences_client, +- "/apps/gnomint", +- GCONF_CLIENT_PRELOAD_NONE, +- NULL); +- +- gconf_client_notify_add (preferences_client, "/apps/gnomint/revoked_visible", +- preferences_changed_callback, +- NULL, NULL, NULL); +- +- gconf_client_notify_add (preferences_client, "/apps/gnomint/crq_visible", +- preferences_changed_callback, +- NULL, NULL, NULL); +- ++ preferences = g_settings_new ("net.sf.gnomint"); + ++ g_signal_connect (preferences, "changed", ++ G_CALLBACK (preferences_changed_callback), NULL); + } + + + gchar * preferences_get_size () + { +- return gconf_client_get_string (preferences_client, "/apps/gnomint/size", NULL); ++ return g_settings_get_string (preferences, "size"); + } + + void preferences_set_size (const gchar *new_value) + { +- gconf_client_set_string (preferences_client, "/apps/gnomint/size", new_value, NULL); ++ g_settings_set_string (preferences, "size", new_value); ++ /* Make sure the backend manages to write the setting, ++ otherwise the program exits too quickly and a garbage value ++ gets written, leading to a crash on next startup. */ ++ g_settings_sync (); + } + + + gboolean preferences_get_revoked_visible () + { +- return gconf_client_get_bool (preferences_client, "/apps/gnomint/revoked_visible", NULL); ++ return g_settings_get_boolean (preferences, "revoked-visible"); + } + + void preferences_set_revoked_visible (gboolean new_value) + { +- gconf_client_set_bool (preferences_client, "/apps/gnomint/revoked_visible", new_value, NULL); ++ g_settings_set_boolean (preferences, "revoked-visible", new_value); + } + + gboolean preferences_get_crq_visible () + { +- return gconf_client_get_bool (preferences_client, "/apps/gnomint/crq_visible", NULL); ++ return g_settings_get_boolean (preferences, "crq-visible"); + } + + void preferences_set_crq_visible (gboolean new_value) + { +- gconf_client_set_bool (preferences_client, "/apps/gnomint/crq_visible", new_value, NULL); ++ g_settings_set_boolean (preferences, "crq-visible", new_value); + } + + gboolean preferences_get_gnome_keyring_export () + { +- return gconf_client_get_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", NULL); ++ return g_settings_get_boolean (preferences, "gnome-keyring-export"); + } + + void preferences_set_gnome_keyring_export (gboolean new_value) + { +- gconf_client_set_bool (preferences_client, "/apps/gnomint/gnome_keyring_export", new_value, NULL); ++ g_settings_set_boolean (preferences, "gnome-keyring-export", new_value); + } + + + void preferences_deinit () + { +- g_object_unref (preferences_client); +- preferences_client = NULL; ++ g_object_unref (preferences); ++ preferences = NULL; + } + +--- gnomint-1.3.0.orig/src/preferences.c ++++ gnomint-1.3.0/src/preferences.c +@@ -18,36 +18,35 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + #include +-#include ++#include + + #include + + #include "preferences.h" + + +-static GConfEngine * preferences_engine; ++static GSettings * preferences; + + void preferences_init (int argc, char **argv) + { +- gconf_init (argc, argv, NULL); +- preferences_engine = gconf_engine_get_default (); ++ preferences = g_settings_new ("net.sf.gnomint"); + } + + + gboolean preferences_get_gnome_keyring_export () + { +- return gconf_engine_get_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", NULL); ++ return g_settings_get_boolean (preferences, "gnome-keyring-export"); + } + + void preferences_set_gnome_keyring_export (gboolean new_value) + { +- gconf_engine_set_bool (preferences_engine, "/apps/gnomint/gnome_keyring_export", new_value, NULL); ++ g_settings_set_boolean (preferences, "gnome-keyring-export", new_value); + } + + + void preferences_deinit () + { +- gconf_engine_unref (preferences_engine); +- preferences_engine = NULL; ++ g_object_unref (preferences); ++ preferences = NULL; + } + +--- gnomint-1.3.0.orig/gconf/gnomint.schemas.in ++++ /dev/null +@@ -1,58 +0,0 @@ +- +- +- +- /schemas/apps/gnomint/size +- /apps/gnomint/size +- gnomint +- string +- (500,400) +- +- Window size The (width,length) size +- gnoMint should take when started. This cannot be smaller than +- (320,200). +- +- +- +- +- +- /schemas/apps/gnomint/revoked_visible +- /apps/gnomint/revoked_visible +- gnomint +- bool +- 0 +- +- Revoked certificates visibility +- Whether the revoked certificates should be visible. +- +- +- +- +- +- /schemas/apps/gnomint/crq_visible +- /apps/gnomint/crq_visible +- gnomint +- bool +- 1 +- +- Certificate requests visibility +- Whether the certificate requests should be visible. +- +- +- +- +- +- /schemas/apps/gnomint/gnome_keyring_export +- /apps/gnomint/gnome_keyring_export +- gnomint +- bool +- 1 +- +- Automatic exporting of certificates for gnome-keyring +- Whether the created or imported certificates are +- automatically exported to gnome-keyring certificate-store. +- +- +- +- +- +- +--- /dev/null ++++ gnomint-1.3.0/gconf/net.sf.gnomint.gschema.xml +@@ -0,0 +1,30 @@ ++ ++ ++ ++ '(500,400)' ++ Window size ++ The (width,length) size gnoMint should take when ++ started. This cannot be smaller than (320,200). ++ ++ ++ false ++ Revoked certificates visibility ++ Whether the revoked certificates should be ++ visible. ++ ++ ++ true ++ Certificate requests visibility ++ Whether the certificate requests should be ++ visible. ++ ++ ++ true ++ Automatic exporting of certificates for ++ gnome-keyring ++ Whether the created or imported certificates are ++ automatically exported to gnome-keyring ++ certificate-store. ++ ++ ++ diff --git a/system/gnomint/patches/05_export-private-key-crash.patch b/system/gnomint/patches/05_export-private-key-crash.patch new file mode 100644 index 0000000000000..e0a3fd2bcb6b5 --- /dev/null +++ b/system/gnomint/patches/05_export-private-key-crash.patch @@ -0,0 +1,83 @@ +Description: Fix crash when exporting the private key. + In ca_on_extractprivatekey1_activate, when calling + gtk_tree_model_get, GLib attempts to assign a guint64 value to a + variable declared gint (CA_MODEL_COLUMN_ID is defined as type + G_TYPE_UINT64 in the tree store). This corrupts the stack and also + invalidates the iter. + . + While investigating this, I noticed that the program happily leaks + GtkTreeIter's. Every time the user selects a certificate from the + tree view, the callback ca_treeview_selection_change invokes + __ca_selection_type which makes a copy of the iter with + gtk_tree_iter_copy. If the user chooses some action from the popup + menu, the toolbar or the main menu, __ca_selection_type is called + once again in the widget's callback function, copying another iter. + AFAICT these are never freed for the lifetime of the program. + . + This is not addressed by the patch as it would require some changes, + but it could be a source of trouble and something to watch out if + bugs like this pop up. According to the GTK+ API documentation, + gtk_tree_iter_copy is not supposed to be used by applications; + GtkTreeIter structs should be copied by value. +Bug-Debian: https://bugs.debian.org/855200 +Author: Yavor Doganov +Forwarded: gnomint-devel@lists.sourceforge.net +Last-Update: 2018-09-02 +--- + +--- gnomint-1.3.0.orig/src/ca.c ++++ gnomint-1.3.0/src/ca.c +@@ -922,7 +922,7 @@ + GObject *widget = NULL; + gchar * filename = NULL; + GtkDialog * dialog = NULL; +- gint id; ++ guint64 id; + gchar * strerror = NULL; + + widget = gtk_builder_get_object (main_window_gtkb, "main_window1"); +@@ -973,7 +973,7 @@ + GObject *widget = NULL; + gchar * filename = NULL; + GtkDialog * dialog = NULL; +- gint id; ++ guint64 id; + gchar * error_msg = NULL; + + widget = gtk_builder_get_object (main_window_gtkb, "main_window1"); +@@ -1022,7 +1022,7 @@ + GObject *widget = NULL; + gchar * filename = NULL; + GtkDialog * dialog = NULL; +- gint id; ++ guint64 id; + + gchar *error_msg = NULL; + +@@ -1181,7 +1181,7 @@ + GtkTreeIter *iter; + gint type; + gchar *filename = NULL; +- gint id; ++ guint64 id; + + type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter); + +@@ -1212,7 +1212,7 @@ + GtkTreeIter *iter; + gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter); + gint response = 0; +- gint id = 0; ++ guint64 id = 0; + + if (type == CA_FILE_ELEMENT_TYPE_CSR) + return; +@@ -1267,7 +1267,7 @@ + GtkTreeIter *iter; + gint type = __ca_selection_type (GTK_TREE_VIEW(gtk_builder_get_object (main_window_gtkb, "ca_treeview")), &iter); + gint response = 0; +- gint id = 0; ++ guint64 id = 0; + + if (type != CA_FILE_ELEMENT_TYPE_CSR) + return; diff --git a/system/gnomint/patches/06_desktop-file.patch b/system/gnomint/patches/06_desktop-file.patch new file mode 100644 index 0000000000000..a6b73b084aa37 --- /dev/null +++ b/system/gnomint/patches/06_desktop-file.patch @@ -0,0 +1,22 @@ +Description: Add code to Exec key, remove Encoding key, add Keywords key. +Author: Yavor Doganov +Forwarded: gnomint-devel@lists.sourceforge.net +Last-Update: 2018-09-01 +--- + +--- gnomint-1.3.0.orig/gui/gnomint.desktop.in ++++ gnomint-1.3.0/gui/gnomint.desktop.in +@@ -2,11 +2,11 @@ + _Name=gnoMint X.509 CA Manager + GenericName=gnoMint X.509 CA Manager + _Comment=Manage X.509 certificates and CAs, easily and graphically +-Exec=gnomint ++_Keywords=certificate;x.509;encryption; ++Exec=gnomint %f + Terminal=false + Type=Application + Icon=gnomint + Categories=GNOME;Application;System;Security + MimeType=application/x-gnomint; + StartupNotify=true +-Encoding=UTF-8 diff --git a/system/gnomint/patches/07_spelling-errors.patch b/system/gnomint/patches/07_spelling-errors.patch new file mode 100644 index 0000000000000..f0045bd61b78b --- /dev/null +++ b/system/gnomint/patches/07_spelling-errors.patch @@ -0,0 +1,39 @@ +Description: Fix some spelling errors. +Author: Yavor Doganov +Forwarded: gnomint-devel@lists.sourceforge.net +Last-Update: 2019-10-12 +--- + +--- gnomint-1.3.0.orig/src/ca.c ++++ gnomint-1.3.0/src/ca.c +@@ -978,7 +978,7 @@ + + widget = gtk_builder_get_object (main_window_gtkb, "main_window1"); + +- dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export uncrypted private key"), ++ dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +--- gnomint-1.3.0.orig/src/country_table.c ++++ gnomint-1.3.0/src/country_table.c +@@ -520,7 +520,7 @@ + country_table[i++].code = "VU"; + country_table[i].name = D_("Venezuela"); + country_table[i++].code = "VE"; +- country_table[i].name = D_("Viet Nam"); ++ country_table[i].name = D_("Vietnam"); + country_table[i++].code = "VN"; + country_table[i].name = D_("Virgin Islands, British"); + country_table[i++].code = "VG"; +--- gnomint-1.3.0.orig/src/import.c ++++ gnomint-1.3.0/src/import.c +@@ -82,7 +82,7 @@ + printf (_("The whole selected file, or some of its elements, seems to\n" + "be cyphered using a password or passphrase. For importing\n" + "the file into gnoMint database, you must provide an \n" +- "appropiate password.\n")); ++ "appropriate password.\n")); + + prompt = g_strdup_printf (_("Please introduce password for `%s'"), crypted_part_description); + password = dialog_ask_for_password (prompt); diff --git a/system/gnomint/patches/08_gtk3-port.patch b/system/gnomint/patches/08_gtk3-port.patch new file mode 100644 index 0000000000000..62638dd1dfd87 --- /dev/null +++ b/system/gnomint/patches/08_gtk3-port.patch @@ -0,0 +1,7655 @@ +Description: Port to GTK 3. +Author: Yavor Doganov +Forwarded: gnomint-devel@lists.sourceforge.net +Last-Update: 2019-10-15 +--- + +--- gnomint-1.3.0.orig/configure.ac ++++ gnomint-1.3.0/configure.ac +@@ -60,8 +60,8 @@ + GNUTLS_REQUIRED=2.0 + GNUTLS_ADVANCED_FEATURES_MINIMUM_VERSION=2.7.4 + SQLITE_REQUIRED=3.0 +-GLIB_REQUIRED=2.6.0 +-GTK_REQUIRED=2.12.0 ++GLIB_REQUIRED=2.41.1 ++GTK_REQUIRED=3.21.5 + ISO_CODES_REQUIRED=0.35 + + +@@ -83,7 +83,7 @@ + PKG_CHECK_MODULES(GNOMINT, + glib-2.0 >= $GLIB_REQUIRED \ + gthread-2.0 >= $GLIB_REQUIRED \ +- gtk+-2.0 >= $GTK_REQUIRED \ ++ gtk+-3.0 >= $GTK_REQUIRED \ + gdk-pixbuf-2.0 \ + gnutls >= $GNUTLS_REQUIRED \ + ) +--- gnomint-1.3.0.orig/src/ca.c ++++ gnomint-1.3.0/src/ca.c +@@ -821,15 +821,15 @@ + dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Save"), GTK_RESPONSE_ACCEPT, + NULL)); + else + dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export certificate signing request"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Save"), GTK_RESPONSE_ACCEPT, + NULL)); + + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); +@@ -930,8 +930,8 @@ + dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export crypted private key"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Save"), GTK_RESPONSE_ACCEPT, + NULL)); + + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); +@@ -981,8 +981,8 @@ + dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export unencrypted private key"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Save"), GTK_RESPONSE_ACCEPT, + NULL)); + + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); +@@ -1032,8 +1032,8 @@ + (_("Export whole certificate in PKCS#12 package"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Save"), GTK_RESPONSE_ACCEPT, + NULL)); + + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); +@@ -1422,8 +1422,8 @@ + widget = gtk_builder_get_object (cert_popup_menu_gtkb, "revoke_menuitem"); + gtk_widget_set_sensitive (GTK_WIDGET(widget), (! is_revoked)); + +- gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, +- event_button->button, event_button->time); ++ gtk_menu_popup_at_pointer (GTK_MENU(menu), ++ (GdkEvent *)event_button); + return FALSE; + case CA_FILE_ELEMENT_TYPE_CSR: + menu = gtk_builder_get_object (csr_popup_menu_gtkb, +@@ -1436,8 +1436,8 @@ + widget = gtk_builder_get_object (csr_popup_menu_gtkb, "extract_pkey_menuitem3"); + gtk_widget_set_sensitive (GTK_WIDGET(widget), pk_indb); + +- gtk_menu_popup (GTK_MENU(menu), NULL, NULL, NULL, NULL, +- event_button->button, event_button->time); ++ gtk_menu_popup_at_pointer (GTK_MENU(menu), ++ (GdkEvent *)event_button); + return FALSE; + default: + case -1: +@@ -1446,13 +1446,6 @@ + + } + +-void ca_treeview_popup_timeout_program (GdkEventButton *event) +-{ +- g_timeout_add (1, ca_treeview_popup_timeout_program_cb, event); +- +-} +- +- + G_MODULE_EXPORT gboolean ca_treeview_popup_handler (GtkTreeView *tree_view, + GdkEvent *event, gpointer user_data) + { +@@ -1464,7 +1457,7 @@ + + event_button = (GdkEventButton *) event; + if (event_button->button == 3) { +- ca_treeview_popup_timeout_program (event_button); ++ ca_treeview_popup_timeout_program_cb (event_button); + } + } + +@@ -1775,8 +1768,8 @@ + dialog2 = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Save Diffie-Hellman parameters"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Save"), GTK_RESPONSE_ACCEPT, + NULL)); + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog2), TRUE); + +@@ -1871,8 +1864,8 @@ + dialog = gtk_file_chooser_dialog_new (_("Select PEM file to import"), + GTK_WINDOW(main_window_widget), + GTK_FILE_CHOOSER_ACTION_OPEN, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Open"), GTK_RESPONSE_ACCEPT, + NULL); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) +@@ -1905,8 +1898,8 @@ + dialog = gtk_file_chooser_dialog_new (_("Select directory to import"), + GTK_WINDOW(main_window_widget), + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Open"), GTK_RESPONSE_ACCEPT, + NULL); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) +--- gnomint-1.3.0.orig/src/certificate_properties.c ++++ gnomint-1.3.0/src/certificate_properties.c +@@ -242,7 +242,7 @@ + for (i = g_list_length(cert->uses) - 1; i >= 0; i--) { + GtkLabel *label = NULL; + label = GTK_LABEL(gtk_label_new ((gchar *) g_list_nth_data (cert->uses, i))); +- gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.5); ++ gtk_label_set_xalign (label, 0.0); + gtk_box_pack_end (GTK_BOX(widget), GTK_WIDGET(label), 0, 0, 0); + } + gtk_widget_show_all (GTK_WIDGET(widget)); +--- gnomint-1.3.0.orig/src/creation_process_window.c ++++ gnomint-1.3.0/src/creation_process_window.c +@@ -66,7 +66,7 @@ + GtkWidget *dialog = NULL; + + g_thread_join (creation_process_window_thread); +- gtk_timeout_remove (timer); ++ g_source_remove (timer); + timer = 0; + + widget = gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window"); +@@ -116,7 +116,7 @@ + creation_process_window_ca_finish (); + } else if (status < 0) { + error_message = (gchar *) g_thread_join (creation_process_window_thread); +- gtk_timeout_remove (timer); ++ g_source_remove (timer); + timer = 0; + if (error_message) { + creation_process_window_error_dialog (error_message); +@@ -165,7 +165,7 @@ + GtkWidget *dialog, *widget; + + if (timer) { +- gtk_timeout_remove (timer); ++ g_source_remove (timer); + timer = 0; + } + +@@ -196,7 +196,7 @@ + GtkWidget *widget = NULL, *dialog = NULL; + + g_thread_join (creation_process_window_thread); +- gtk_timeout_remove (timer); ++ g_source_remove (timer); + timer = 0; + + widget = GTK_WIDGET(gtk_builder_get_object (creation_process_window_gtkb, "creation_process_window")); +@@ -242,7 +242,7 @@ + creation_process_window_csr_finish (); + } else if (status < 0) { + error_message = (gchar *) g_thread_join (creation_process_window_thread); +- gtk_timeout_remove (timer); ++ g_source_remove (timer); + timer = 0; + if (error_message) { + creation_process_window_error_dialog (error_message); +--- gnomint-1.3.0.orig/src/crl.c ++++ gnomint-1.3.0/src/crl.c +@@ -213,7 +213,7 @@ + G_MODULE_EXPORT void crl_cancel_clicked_cb (GtkButton *button, gpointer userdata) + { + GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog")); +- gtk_object_destroy(GTK_OBJECT(window)); ++ gtk_widget_destroy(window); + + } + +@@ -241,8 +241,8 @@ + dialog = GTK_DIALOG (gtk_file_chooser_dialog_new (_("Export Certificate Revocation List"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Save"), GTK_RESPONSE_ACCEPT, + NULL)); + + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); +@@ -274,7 +274,7 @@ + gtk_widget_destroy (GTK_WIDGET(dialog)); + + dialog = GTK_DIALOG(gtk_builder_get_object (crl_window_gtkb, "new_crl_dialog")); +- gtk_object_destroy(GTK_OBJECT(dialog)); ++ gtk_widget_destroy(GTK_WIDGET(dialog)); + + } + +--- gnomint-1.3.0.orig/src/main.c ++++ gnomint-1.3.0/src/main.c +@@ -291,8 +291,8 @@ + dialog = gtk_file_chooser_dialog_new (_("Create new CA database"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Open"), GTK_RESPONSE_ACCEPT, + NULL); + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); + +@@ -363,8 +363,8 @@ + dialog = gtk_file_chooser_dialog_new (_("Open CA database"), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_OPEN, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Open"), GTK_RESPONSE_ACCEPT, + NULL); + + if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) +@@ -451,8 +451,8 @@ + dialog = gtk_file_chooser_dialog_new (_("Save CA database as..."), + GTK_WINDOW(widget), + GTK_FILE_CHOOSER_ACTION_SAVE, +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, ++ _("_Cancel"), GTK_RESPONSE_CANCEL, ++ _("_Open"), GTK_RESPONSE_ACCEPT, + NULL); + gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); + +@@ -490,14 +490,19 @@ + { + + GtkWidget *widget; +- gchar *authors[2]; ++ GdkPixbuf *logo; ++ gchar **authors; ++ gchar *file; + + widget = GTK_WIDGET(gtk_builder_get_object (main_window_gtkb, "main_window")); + +- authors[0] = PACKAGE_AUTHORS; +- authors[1] = NULL; ++ authors = g_strsplit (PACKAGE_AUTHORS, "\n", -1); ++ file = g_build_filename (PACKAGE_DATA_DIR, "gnomint", ++ "gnomint.png", NULL); ++ logo = gdk_pixbuf_new_from_file (file, NULL); + + gtk_show_about_dialog (GTK_WINDOW(widget), ++ "logo", logo, + "version", PACKAGE_VERSION, + "copyright", PACKAGE_COPYRIGHT, + "comments", _("gnoMint is a program for creating and managing Certification Authorities, and their certificates"), +@@ -507,4 +512,7 @@ + "authors", authors, + "translator_credits", _("translator-credits"), + NULL); ++ g_object_unref (logo); ++ g_strfreev (authors); ++ g_free (file); + } +--- gnomint-1.3.0.orig/src/new_ca_window.c ++++ gnomint-1.3.0/src/new_ca_window.c +@@ -129,7 +129,7 @@ + + GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window")); + +- gtk_object_destroy(GTK_OBJECT(window)); ++ gtk_widget_destroy(GTK_WIDGET(window)); + + } + +@@ -299,7 +299,7 @@ + } + + window = GTK_WINDOW(gtk_builder_get_object (new_ca_window_gtkb, "new_ca_window")); +- gtk_object_destroy(GTK_OBJECT(window)); ++ gtk_widget_destroy(GTK_WIDGET(window)); + + creation_process_window_ca_display (ca_creation_data); + +--- gnomint-1.3.0.orig/src/new_cert.c ++++ gnomint-1.3.0/src/new_cert.c +@@ -456,7 +456,7 @@ + gpointer user_data) + { + GtkWidget * window = GTK_WIDGET(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window")); +- gtk_object_destroy(GTK_OBJECT(window)); ++ gtk_widget_destroy(window); + + } + +@@ -743,7 +743,7 @@ + } + + widget = G_OBJECT(gtk_builder_get_object (new_cert_window_gtkb, "new_cert_window")); +- gtk_object_destroy(GTK_OBJECT(widget)); ++ gtk_widget_destroy(GTK_WIDGET(widget)); + + dialog_refresh_list(); + +--- gnomint-1.3.0.orig/src/new_req_window.c ++++ gnomint-1.3.0/src/new_req_window.c +@@ -410,7 +410,7 @@ + + GtkWindow *window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window")); + +- gtk_object_destroy(GTK_OBJECT(window)); ++ gtk_widget_destroy(GTK_WIDGET(window)); + + } + +@@ -498,7 +498,7 @@ + } + + window = GTK_WINDOW(gtk_builder_get_object (new_req_window_gtkb, "new_req_window")); +- gtk_object_destroy(GTK_OBJECT(window)); ++ gtk_widget_destroy(GTK_WIDGET(window)); + + creation_process_window_csr_display (csr_creation_data); + +--- gnomint-1.3.0.orig/gui/certificate_popup_menu.ui ++++ gnomint-1.3.0/gui/certificate_popup_menu.ui +@@ -1,45 +1,50 @@ +- ++ ++ + +- +- ++ + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + gtk-properties + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Shows the certificate properties window + Shows the certificate properties window + True + True +- ++ + + + + + True ++ False + + + + + E_xport + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Exports the certificate so it can be imported by any other application + Exports the certificate so it can be imported by any other application + True + False +- ++ + + + + + Extrac_t private key + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Extracts the private key of the selected +@@ -52,25 +57,27 @@ + each time the certificate will be used + True + False +- ++ + + + + + True ++ False + + + + + Revo_ke + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Revokes the selected certificate + Revokes the selected certificate + True + False +- ++ + + + +--- gnomint-1.3.0.orig/gui/certificate_properties_dialog.ui ++++ gnomint-1.3.0/gui/certificate_properties_dialog.ui +@@ -1,547 +1,549 @@ +- ++ ++ + +- +- +- +- 24 +- 1 +- 8760 +- 24 +- 168 +- ++ + +- 60 + 1 + 600 ++ 60 + 1 + 12 + ++ ++ 1 ++ 8760 ++ 24 ++ 24 ++ 168 ++ + ++ False + Certificate properties - gnoMint + True + center + gnomint.png + dialog + +- ++ ++ ++ ++ + True ++ False ++ vertical + + + True + True + 5 + +- ++ + True ++ False + 5 ++ vertical + +- ++ + True ++ False + 5 ++ vertical + 5 + + +- 0 +- 0 ++ False + <b>This certificate has been verified for the following uses:</b> + True ++ 0 ++ 0 + + ++ False ++ True + 0 + + + + + False ++ True + 0 + + + +- ++ ++ False ++ + + False ++ True + 1 + + + +- ++ + True ++ False + 5 +- 17 +- 2 + 10 + + + True ++ False ++ MD5FINGERPRINT + 0 + 0 +- MD5FINGERPRINT + + + 1 +- 2 + 14 +- 15 + + + + + True ++ False ++ SHA1FINGERPRINT + 0 + 0 +- SHA1FINGERPRINT + + + 1 +- 2 + 13 +- 14 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 + 12 +- 13 + + + + + True ++ False ++ CertExpirationDate + 0 + 0 +- CertExpirationDate + + + 1 +- 2 + 11 +- 12 + + + + + True ++ False ++ CertActivationDate + 0 + 0 +- CertActivationDate + + + 1 +- 2 + 10 +- 11 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 + 9 +- 10 + + + + + True ++ False ++ CAOU + 0 + 0 +- CAOU + + + 1 +- 2 + 8 +- 9 + + + + + True ++ False ++ CAO + 0 + 0 +- CAO + + + 1 +- 2 + 7 +- 8 + + + + + True ++ False ++ CACN + 0 + 0 +- CACN + + + 1 +- 2 + 6 +- 7 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 + 5 +- 6 + + + + + True ++ False ++ CertSN + 0 + 0 +- CertSN + + + 1 +- 2 + 4 +- 5 + + + + + True ++ False ++ SubjectOU + 0 + 0 +- SubjectOU + + + 1 +- 2 + 3 +- 4 + + + + + True ++ False ++ SubjectO + 0 + 0 +- SubjectO + + + 1 +- 2 + 2 +- 3 + + + + + True ++ False ++ SubjectCN + 0 + 0 +- SubjectCN + + + 1 +- 2 + 1 +- 2 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 ++ 0 + + + + + True ++ False ++ MD5 fingerprint + 0 + 0 +- MD5 fingerprint + + ++ 0 + 14 +- 15 +- GTK_FILL + + + + + True ++ False ++ SHA1 fingerprint + 0 + 0 +- SHA1 fingerprint + + ++ 0 + 13 +- 14 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>Fingerprints</b> + True ++ 0 ++ 1 + + ++ 0 + 12 +- 13 +- GTK_FILL +- 7 + + + + + True ++ False ++ Expires on + 0 + 0 +- Expires on + + ++ 0 + 11 +- 12 +- GTK_FILL + + + + + True ++ False ++ Activated on + 0 + 0 +- Activated on + + ++ 0 + 10 +- 11 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>Validity</b> + True ++ 0 ++ 1 + + ++ 0 + 9 +- 10 +- GTK_FILL +- 7 + + + + + True ++ False ++ Organizational Unit (OU) + 0 + 0 +- Organizational Unit (OU) + + ++ 0 + 8 +- 9 +- GTK_FILL + + + + + True ++ False ++ Organization (O) + 0 + 0 +- Organization (O) + + ++ 0 + 7 +- 8 +- GTK_FILL + + + + + True ++ False ++ Common Name (CN) + 0 + 0 +- Common Name (CN) + + ++ 0 + 6 +- 7 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>Emmited by</b> + True ++ 0 ++ 1 + + ++ 0 + 5 +- 6 +- GTK_FILL +- 7 + + + + + True ++ False ++ Serial number + 0 + 0 +- Serial number + + ++ 0 + 4 +- 5 +- GTK_FILL + + + + + True ++ False ++ Organizational Unit (OU) + 0 + 0 +- Organizational Unit (OU) + + ++ 0 + 3 +- 4 +- GTK_FILL + + + + + True ++ False ++ Organization (O) + 0 + 0 +- Organization (O) + + ++ 0 + 2 +- 3 +- GTK_FILL + + + + + True ++ False ++ Common Name (CN) + 0 + 0 +- Common Name (CN) + + ++ 0 + 1 +- 2 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>Certificate subject</b> + True ++ 0 ++ 1 + + +- GTK_FILL +- 7 ++ 0 ++ 0 + + + + + True +- 0 +- 0 ++ False + SHA256FINGERPRINT + True + char + 60 ++ 60 ++ 0 ++ 0 + + + 1 +- 2 + 15 +- 16 + + + + + True ++ False ++ SHA256 fingerprint + 0 + 0 +- SHA256 fingerprint + + ++ 0 + 15 +- 16 +- GTK_FILL + + + + + True +- 0 +- 0 ++ False + SHA512FINGERPRINT + True + char + 60 ++ 60 ++ 0 ++ 0 + + + 1 +- 2 + 16 +- 17 + + + + + True ++ False ++ SHA512 fingerprint + 0 + 0 +- SHA512 fingerprint + + ++ 0 + 16 +- 17 +- GTK_FILL + + +- + + ++ False ++ True + 2 + + +@@ -550,59 +552,68 @@ + + + True ++ False ++ General + 0 + 0 +- General + + + False + + + +- ++ + True ++ False + 10 ++ vertical + 5 + + +- 0 +- 0 ++ False + <b>Certificate hierarchy</b> + True ++ 0 ++ 0 + + + False ++ True + 0 + + + + + True +- automatic +- automatic + in + + + True + False ++ ++ ++ + + + + +- False ++ True ++ True + 1 + + + + + True +- 0 +- 0 ++ False + <b>Certificate fields</b> + True ++ 0 ++ 0 + + + False ++ True + 2 + + +@@ -610,18 +621,21 @@ + + True + True +- automatic +- automatic + in + + + True + True + False ++ ++ ++ + + + + ++ True ++ True + 3 + + +@@ -633,9 +647,10 @@ + + + True ++ False ++ Details + 0 + 0 +- Details + + + 1 +@@ -643,22 +658,30 @@ + + + +- ++ + True ++ False ++ vertical + + + True +- 0 +- 0 +- 5 ++ False ++ 5 ++ 5 + <small><i> +-It is recommended that all the certificates generated by a CA share the same properties. +-If you want to generate certificates with different properties, you should create a hierarchy of CAs, each one with its own policy for certificate generation.</i> ++It is recommended that all the certificates generated by a CA ++share the same properties. ++If you want to generate certificates with different properties, you ++should create a hierarchy of CAs, each one with its own policy for ++certificate generation.</i> + </small> +-Please, define the maximum set of properties for the certificates that this CA will be able to generate: ++Please, define the maximum set of properties for the ++certificates that this CA will be able to generate: + + True + True ++ 0 ++ 0 + + + False +@@ -667,18 +690,23 @@ + + + +- ++ + True ++ False + 8 + + + True ++ False ++ Maximum number of months before ++expiration of the new generated certificates: ++ True + 0 + 0 +- Maximum number of months before expiration of the new generated certificates: +- True + + ++ True ++ True + 0 + + +@@ -686,13 +714,15 @@ + + True + True +- • ++ • + AdjustmentCertMonthsBeforeExpiration + 1 + True +- ++ + + ++ True ++ True + 1 + + +@@ -709,20 +739,26 @@ + True + 4 + +- ++ + True ++ False ++ vertical + +- ++ + True ++ False + 8 + + + True +- 0 ++ False + Hours between CRL updates: + True ++ 0 + + ++ False ++ True + 0 + + +@@ -730,32 +766,41 @@ + + True + True +- • ++ • + AdjustmentHoursBetweenCRLUpdates + 1 + True +- ++ + + ++ False ++ True + 1 + + + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 9 ++ vertical + + + True +- 0 ++ False + CRL distribution URL: ++ 0 + + ++ True ++ True + 0 + + +@@ -763,8 +808,8 @@ + + True + True +- • +- ++ • ++ + + + False +@@ -774,6 +819,8 @@ + + + ++ False ++ True + 1 + + +@@ -782,6 +829,7 @@ + + + True ++ False + <b>CRL Properties</b> + True + +@@ -799,11 +847,10 @@ + True + 4 + +- ++ + True ++ False + 10 +- 5 +- 2 + + + Country +@@ -812,8 +859,12 @@ + False + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -823,16 +874,17 @@ + False + True + True +- ++ + + ++ 0 + 1 +- 2 + + + +- ++ + True ++ False + + + must be the same +@@ -842,9 +894,11 @@ + False + True + country_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -859,18 +913,21 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 ++ 0 + + + +- ++ + True ++ False + + + must be the same +@@ -880,9 +937,11 @@ + False + True + state_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -897,15 +956,15 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 + 1 +- 2 + + + +@@ -916,11 +975,11 @@ + False + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -931,11 +990,11 @@ + False + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -946,16 +1005,17 @@ + False + True + True +- ++ + + ++ 0 + 4 +- 5 + + + +- ++ + True ++ False + + + must be the same +@@ -965,9 +1025,11 @@ + False + True + city_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -982,20 +1044,21 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 + 2 +- 3 + + + +- ++ + True ++ False + + + must be the same +@@ -1005,9 +1068,11 @@ + False + True + organization_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -1022,20 +1087,21 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 + 3 +- 4 + + + +- ++ + True ++ False + + + must be the same +@@ -1045,9 +1111,11 @@ + False + True + ou_differ_radiobutton +- ++ + + ++ False ++ True + 0 + + +@@ -1062,15 +1130,15 @@ + True + + ++ False ++ True + 1 + + + + + 1 +- 2 + 4 +- 5 + + + +@@ -1078,10 +1146,11 @@ + + + True +- 0 +- 0 ++ False + <b>Inherited fields from CA subject</b> + True ++ 0 ++ 0 + + + +@@ -1097,11 +1166,10 @@ + True + 4 + +- ++ + True ++ False + 10 +- 4 +- 2 + + + Certification Authority +@@ -1110,8 +1178,12 @@ + False + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -1121,11 +1193,11 @@ + False + True + True +- ++ + + + 1 +- 2 ++ 0 + + + +@@ -1137,13 +1209,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 1 +- 2 + + + +@@ -1155,13 +1225,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 2 +- 3 + + + +@@ -1173,11 +1241,11 @@ + True + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -1189,11 +1257,11 @@ + True + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -1204,22 +1272,21 @@ + False + True + True +- ++ + + ++ 0 + 1 +- 2 + + + + + True ++ False + + + 1 +- 2 + 3 +- 4 + + + +@@ -1227,10 +1294,11 @@ + + + True +- 0 +- 0 ++ False + <b>Uses of new generated certificates</b> + True ++ 0 ++ 0 + + + +@@ -1246,11 +1314,10 @@ + True + 4 + +- ++ + True ++ False + 10 +- 4 +- 2 + + + Email protection +@@ -1260,13 +1327,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 1 +- 2 + + + +@@ -1277,11 +1342,11 @@ + False + True + True +- ++ + + + 1 +- 2 ++ 0 + + + +@@ -1293,11 +1358,11 @@ + True + True + True +- ++ + + ++ 0 + 1 +- 2 + + + +@@ -1309,8 +1374,12 @@ + True + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -1320,11 +1389,11 @@ + False + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -1335,11 +1404,11 @@ + False + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -1350,26 +1419,23 @@ + False + True + True +- ++ + + + 1 +- 2 + 2 +- 3 + + + + + True ++ False + 0 + 0 + + + 1 +- 2 + 3 +- 4 + + + +@@ -1377,14 +1443,17 @@ + + + True +- 0 +- 0 ++ False + <b>Purposes of new generated certificates</b> + True ++ 0 ++ 0 + + + + ++ False ++ True + 5 + + +@@ -1396,9 +1465,10 @@ + + + True ++ False ++ CA Policy + 0 + 0 +- CA Policy + + + 2 +@@ -1407,12 +1477,15 @@ + + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 10 + end + +@@ -1422,7 +1495,7 @@ + True + True + True +- ++ + + + False +@@ -1433,6 +1506,7 @@ + + + False ++ True + end + 1 + +--- gnomint-1.3.0.orig/gui/change_password_dialog.ui ++++ gnomint-1.3.0/gui/change_password_dialog.ui +@@ -1,32 +1,81 @@ +- ++ ++ + +- +- ++ + ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Database password protection - gnoMint + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 ++ ++ ++ True ++ False ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + 20 +- 4 +- 2 +- 10 + 10 ++ 10 ++ True + +- ++ + True ++ False + True + + +@@ -37,7 +86,7 @@ + True + True + True +- ++ + + + False +@@ -64,39 +113,22 @@ + + + 1 +- 2 +- GTK_FILL +- +- +- +- +- +- True +- 0 +- 0 +- Protect CA database private +-keys with password: +- True +- +- +- GTK_FILL +- ++ 0 + + + + + True +- 0 ++ False + Enter new password again + for confirmation: + True + word-char ++ 0 + + ++ 0 + 3 +- 4 +- GTK_FILL +- + + + +@@ -105,14 +137,12 @@ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False +- • +- ++ • ++ + + + 1 +- 2 + 3 +- 4 + + + +@@ -121,46 +151,41 @@ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False +- • +- ++ • ++ + + + 1 +- 2 + 2 +- 3 + + + + + True +- 0 ++ False + Please, enter new + password: + True ++ 0 + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + + + True +- 0 +- 0 ++ False + Please, enter current + password: + True ++ 0 ++ 0 + + ++ 0 + 1 +- 2 +- GTK_FILL +- +- 15 + + + +@@ -169,61 +194,34 @@ + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + False +- • +- ++ • ++ + + + 1 +- 2 + 1 +- 2 + + +- +- +- 1 +- +- +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- end + +- +- gtk-cancel +- True +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok ++ + True +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True ++ False ++ Protect CA database private ++keys with password: ++ True ++ 0 ++ 0 + + +- False +- False +- 1 ++ 0 ++ 0 + + + + + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/creation_process_window.ui ++++ gnomint-1.3.0/gui/creation_process_window.ui +@@ -1,40 +1,50 @@ +- ++ ++ + +- +- ++ + + True ++ False + Creating new CA - gnoMint + True + center + gnomint.png + dialog + +- ++ ++ ++ ++ + True ++ False + + + True ++ False ++ + 0 + 0 +- + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 9 + vertical + True + + + True ++ False ++ Creating CA Root Certificate + 0 + 0 +- Creating CA Root Certificate + + + False +@@ -45,6 +55,7 @@ + + + True ++ False + 0 + 0 + +@@ -57,7 +68,7 @@ + + + True +- True ++ False + 0 + + +@@ -73,7 +84,7 @@ + True + True + True +- ++ + + + False +@@ -84,17 +95,21 @@ + + + False ++ True + 1 + + + + + True ++ False ++ + 0 + 0 +- + + ++ False ++ True + 2 + + +--- gnomint-1.3.0.orig/gui/csr_popup_menu.ui ++++ gnomint-1.3.0/gui/csr_popup_menu.ui +@@ -1,45 +1,50 @@ +- ++ ++ + +- +- ++ + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + gtk-properties + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Shows the CSR properties window + Shows the CSR properties window + True + True +- ++ + + + + + True ++ False + + + + + E_xport + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Exports the CSR so it can be imported by any other application + Exports the CSR so it can be imported by any other application + True + False +- ++ + + + + + Extrac_t private key + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Extracts the private key of the selected +@@ -52,32 +57,35 @@ + each time the CSR will be used + True + False +- ++ + + + + + True ++ False + + + + + _Sign + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False +- ++ + + + + + gtk-delete + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + True +- ++ + + + +--- gnomint-1.3.0.orig/gui/csr_properties_dialog.ui ++++ gnomint-1.3.0/gui/csr_properties_dialog.ui +@@ -1,8 +1,9 @@ +- ++ ++ + +- +- ++ + ++ False + CSR properties - gnoMint + True + center +@@ -10,170 +11,183 @@ + dialog + True + +- ++ ++ ++ ++ + True ++ False + vertical + + + True ++ False + 5 + False + False + +- ++ + True ++ False + 5 + vertical + +- ++ + True ++ False + 5 + vertical + 5 + + + True +- 0 +- 0 +- <b>This Certificate Signing Request has its corresponding private key saved in the internal database.</b> ++ False ++ <b>This Certificate Signing Request has its ++corresponding private key saved in the internal database.</b> + True + True ++ 0 ++ 0 + + ++ False ++ True + 0 + + + + + False ++ True + 0 + + + +- ++ + True ++ False + + + False ++ True + 1 + + + +- ++ + True ++ False + 5 +- 4 +- 2 + 10 + + + True ++ False ++ SubjectOU + 0 + 0 +- SubjectOU + + + 1 +- 2 + 3 +- 4 + + + + + True ++ False ++ SubjectO + 0 + 0 +- SubjectO + + + 1 +- 2 + 2 +- 3 + + + + + True ++ False ++ SubjectCN + 0 + 0 +- SubjectCN + + + 1 +- 2 + 1 +- 2 + + + + + True ++ False ++ + 0 + 0 +- + + + 1 +- 2 ++ 0 + + + + + True ++ False ++ Organizational Unit (OU) + 0 + 0 +- Organizational Unit (OU) + + ++ 0 + 3 +- 4 +- GTK_FILL + + + + + True ++ False ++ Organization (O) + 0 + 0 +- Organization (O) + + ++ 0 + 2 +- 3 +- GTK_FILL + + + + + True ++ False ++ Common Name (CN) + 0 + 0 +- Common Name (CN) + + ++ 0 + 1 +- 2 +- GTK_FILL + + + + + True +- 0 +- 1 ++ False + <b>CSR subject</b> + True ++ 0 ++ 1 + + +- GTK_FILL +- 7 ++ 0 ++ 0 + + + + + False ++ True + 2 + + +@@ -185,9 +199,10 @@ + + + True ++ False ++ General + 0 + 0 +- General + + + False +@@ -199,9 +214,10 @@ + + + True ++ False ++ Details + 0 + 0 +- Details + + + 1 +@@ -210,12 +226,15 @@ + + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 10 + end + +@@ -225,7 +244,7 @@ + True + True + True +- ++ + + + False +@@ -235,6 +254,8 @@ + + + ++ False ++ True + end + 1 + +--- gnomint-1.3.0.orig/gui/dh_parameters_dialog.ui ++++ gnomint-1.3.0/gui/dh_parameters_dialog.ui +@@ -1,68 +1,124 @@ +- ++ ++ + +- +- ++ + + 1024 + 10240 +- 1024 +- 1024 +- 0 + 1024 ++ 1024 ++ 1024 + + ++ False + 5 + New Diffie-Hellman parameters - gnoMint + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical + 2 ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + vertical + 12 + + + True +- 0 +- You are about to create and export a set of Diffie·Hellman parameters into a PKCS#3 structure file. ++ False ++ You are about to create and export a set of ++Diffie·Hellman parameters into a PKCS#3 structure file. + True + True ++ 0 + + ++ False ++ True + 0 + + + + + True +- 0 +- 8 +- <small><i>PKCS#3 files containing Diffie·Hellman parameters are used by some cryptographic ++ False ++ 8 ++ 8 ++ <small><i>PKCS#3 files containing Diffie·Hellman parameters are used by some cryptographic + applications for a secure interchange of their keys over insecure channels.</i></small> + True + True + 80 ++ 0 + + ++ False ++ True + 1 + + + + + True +- 0 ++ False + Please, enter the prime size, in bits: + True + True ++ 0 + + ++ False ++ True + 2 + + +@@ -70,58 +126,23 @@ + + True + True +- • ++ • + AdjustmentDHPrimeSizeSpinButton + + ++ False ++ True + 3 + + + + ++ False ++ True + 10 + 1 + + +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- +- False +- False +- 1 +- +- +- +- +- False +- end +- 0 +- +- + + + +--- gnomint-1.3.0.orig/gui/get_db_password_dialog.ui ++++ gnomint-1.3.0/gui/get_db_password_dialog.ui +@@ -1,28 +1,73 @@ +- ++ ++ + +- +- ++ + ++ False + Enter password - gnoMint + True + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 20 + vertical + + + True +- 0 +- 0 ++ False + This action requires using one or more private keys saved in the CA database. + + Please insert the database password. +@@ -30,6 +75,8 @@ + fill + True + 40 ++ 0 ++ 0 + + + False +@@ -38,28 +85,35 @@ + + + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + dialog-password +- 6 ++ 6 + + ++ False ++ True + 0 + + + + + True +- 1 ++ False + Password: + True ++ 1 + + ++ False ++ True + 1 + + +@@ -69,15 +123,19 @@ + True + True + False +- • ++ • + True + + ++ False ++ True + 2 + + + + ++ False ++ True + 1 + + +@@ -86,10 +144,9 @@ + Remember this password during this gnoMint session + True + True ++ False + False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- False +- 0 + True + + +@@ -100,46 +157,9 @@ + + + +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- +- False +- False +- 1 +- +- +- +- + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/get_password_dialog.ui ++++ gnomint-1.3.0/gui/get_password_dialog.ui +@@ -1,53 +1,100 @@ +- ++ ++ + +- +- ++ + ++ False + Enter password - gnoMint + True + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ False ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + 11 + vertical + + + True +- 0 +- 0 ++ False + Please, enter password + True + True ++ 0 ++ 0 + + ++ False ++ True + 0 + + + +- ++ + True ++ False + 30 +- 2 +- 2 + + + True + True + False +- • ++ • + + + 1 +- 2 + 1 +- 2 + + + +@@ -55,85 +102,55 @@ + True + True + False +- • ++ • + True +- ++ + + + 1 +- 2 ++ 0 + + + + + True +- 0 +- 0 ++ False + Password (confirm): + True ++ 0 ++ 0 + + ++ 0 + 1 +- 2 + + + + + True +- 0 +- 0 ++ False + Password: + True ++ 0 ++ 0 + ++ ++ 0 ++ 0 ++ + + + +- 1 +- +- +- +- +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- + False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- False +- True +- True +- True +- +- +- False +- False ++ True + 1 + + + + + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/get_pkey_dialog.ui ++++ gnomint-1.3.0/gui/get_pkey_dialog.ui +@@ -1,8 +1,9 @@ +- ++ ++ + +- +- ++ + ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 5 + Choose private key file. gnoMint +@@ -10,32 +11,84 @@ + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 2 ++ ++ ++ True ++ False ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 4 ++ end ++ 0 ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + vertical + 20 + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- 0 +- 0 + <big>Choose private key file</big> + +-For doing the selected operation, you must provide the file where resides the private key corresponding to the certificate: ++For doing the selected operation, you must provide the ++file where resides the private key corresponding to the ++certificate: + True + True + word-char + 40 ++ 0 ++ 0 + + + False +@@ -46,24 +99,28 @@ + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Certificate DN + + ++ False ++ True + 1 + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- 0 +- 0 + Please, choose the file: + True + True + word-char + 40 ++ 0 ++ 0 + + + False +@@ -74,8 +131,9 @@ + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- ++ + + + False +@@ -101,53 +159,12 @@ + + + ++ False ++ True + 10 + 1 + + +- +- +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- end +- +- +- gtk-cancel +- True +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK +- True +- +- +- False +- False +- 1 +- +- +- +- +- False +- 4 +- end +- 0 +- +- + + + +--- gnomint-1.3.0.orig/gui/import_file_or_directory_dialog.ui ++++ gnomint-1.3.0/gui/import_file_or_directory_dialog.ui +@@ -1,40 +1,91 @@ +- ++ ++ + +- +- ++ + ++ False + 5 + Import selection - gnoMint + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical + 2 ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + 8 + vertical + 8 + + + True ++ False ++ Please, choose the more suitable option for ++what you want to import: ++ True + 0 + 0 +- Please, choose the more suitable option for what you want to import: +- True + + ++ False ++ True + 0 + + + +- ++ + True ++ False + vertical + + +@@ -47,21 +98,31 @@ + True + + ++ False ++ True + 0 + + + + + True +- 0 +- 0 +- 24 +- 9 +- <i>Import a single file, encoded in DER or PEM format, containing certificates, private keys (encrypted or plain), signing requests (CSRs), revocation lists (CRLs) or PKCS#12 packages.</i> ++ False ++ 24 ++ 24 ++ 9 ++ 9 ++ <i>Import a single file, encoded in DER or PEM format, containing ++certificates, private keys (encrypted or plain), signing ++requests (CSRs), revocation lists (CRLs) or PKCS#12 ++packages.</i> + True + True ++ 0 ++ 0 + + ++ False ++ True + 1 + + +@@ -76,73 +137,45 @@ + importfile_radiobutton + + ++ False ++ True + 2 + + + + + True +- 0 +- 0 +- 24 +- 9 ++ False ++ 24 ++ 24 ++ 9 ++ 9 + <i>Import a directory containing the structure of + a whole CA made with OpenSSL .</i> + True + fill + True ++ 0 ++ 0 + + ++ False ++ True + 3 + + + + +- 1 +- +- +- +- +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- + False +- False ++ True + 1 + + + + + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/import_password_dialog.ui ++++ gnomint-1.3.0/gui/import_password_dialog.ui +@@ -1,35 +1,84 @@ +- ++ ++ + +- +- ++ + ++ False + Enter password - gnoMint + True + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 20 + vertical + + + True +- 0 +- 0 +- The whole selected file, or some of its elements, seems to be cyphered using a password or passphrase. ++ False ++ The whole selected file, or some of its elements, seems to ++be cyphered using a password or passphrase. + +-For importing the file into gnoMint database, you must provide an appropiate password. ++For importing the file into gnoMint database, you must ++provide an appropiate password. + True + fill + True + 40 ++ 0 ++ 0 + + + False +@@ -40,54 +89,69 @@ + + + True +- 0 +- 8 ++ False ++ 8 ++ 8 + <small><i>The part that is being imported has the description:</i></small> + True + True + right ++ 0 + + ++ False ++ True + 1 + + + + + True +- 0 +- 15 ++ False ++ 15 ++ 15 + <small><i>#Description#</i></small> + True + True + right ++ 0 + + ++ False ++ True + 2 + + + +- ++ + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + dialog-password +- 6 ++ 6 + + ++ False ++ True + 0 + + + + + True +- 1 ++ False + Password: + True ++ 1 + + ++ False ++ True + 1 + + +@@ -97,60 +161,27 @@ + True + True + False +- • ++ • + True + + ++ False ++ True + 2 + + + + +- 3 +- +- +- +- +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- + False +- False +- 1 ++ True ++ 3 + + + + + False +- end +- 0 ++ True ++ 1 + + + +--- gnomint-1.3.0.orig/gui/main_window.ui ++++ gnomint-1.3.0/gui/main_window.ui +@@ -1,51 +1,82 @@ +- ++ ++ + +- +- ++ ++ ++ True ++ False ++ addca.png ++ ++ ++ True ++ False ++ addcsr.png ++ ++ ++ True ++ False ++ extractpkey.png ++ ++ ++ True ++ False ++ sign.png ++ + + True ++ False + gnoMint + gnoMint_main + center + 400 + 300 + gnomint.png +- ++ ++ ++ ++ + +- ++ + True ++ False + vertical + + + True ++ False + + + True ++ False + _Certificates + True + + ++ False + + + _New certificate database + True ++ False + True + False +- ++ + + + + + _Open certificate database + True ++ False + True + False +- ++ + + + + + True ++ False + Open _recents + True + +@@ -54,41 +85,47 @@ + + _Save certificate database as... + True ++ False + True + False +- ++ + + + + + True ++ False + + + + + gtk-add + True ++ False + True + True + + + True ++ False + + + _Add self-signed CA + True ++ False + True + False +- ++ + + + + + Add _Certificate Request + True ++ False + True + False +- ++ + + + +@@ -100,12 +137,13 @@ + Extrac_t private key + True + False ++ False + True + Extract the saved private key to an external file or device + Extract the saved private key to an external file or device + True + False +- ++ + + + +@@ -113,9 +151,10 @@ + Revo_ke + True + False ++ False + True + False +- ++ + + + +@@ -123,9 +162,10 @@ + _Sign + True + False ++ False + True + False +- ++ + + + +@@ -133,91 +173,103 @@ + gtk-delete + True + False ++ False + True + True +- ++ + + + + + True ++ False + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + Generate the current Certificate Revocation List + Generate the current Certificate Revocation List + Generate _CRL + True +- ++ + + + + + True ++ False + + + + + True ++ False + Generate D_H parameters... + True +- ++ + + + + + True ++ False + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Change database pass_word + True +- ++ + + + + + True ++ False + + + + + _Import + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + True + False +- ++ + + + + + True + False ++ False + E_xport + True +- ++ + + + + + True ++ False + + + + + gtk-quit + True ++ False + True + True +- ++ + + + +@@ -227,31 +279,36 @@ + + + True ++ False + _Edit + True + + ++ False + + + gtk-properties + True ++ False + True + True +- ++ + + + + + True ++ False + + + + + gtk-preferences + True ++ False + True + True +- ++ + + + +@@ -261,31 +318,35 @@ + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _View + True + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Certificate _Signing Requests + True + True +- ++ + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + _Revoked Certificates + True + True +- ++ + + + +@@ -295,17 +356,20 @@ + + + True ++ False + _Help + True + + ++ False + + + gtk-about + True ++ False + True + True +- ++ + + + +@@ -322,14 +386,16 @@ + + + True ++ False + + + True ++ False + True + Create a new database + Create a new database + gtk-new +- ++ + + + False +@@ -339,11 +405,12 @@ + + + True ++ False + True + Open an existing database + Open an existing database + gtk-open +- ++ + + + False +@@ -353,6 +420,7 @@ + + + True ++ False + + + False +@@ -362,12 +430,13 @@ + + + True ++ False + True + Add an autosigned CA + Add an autosigned CA + Add autosigned CA certificate + addcaimg +- ++ + + + False +@@ -377,12 +446,13 @@ + + + True ++ False + True + Add a new Certificate Signing Request + Add a new Certificate Signing Request + Add CSR + addcsrimg +- ++ + + + False +@@ -392,6 +462,7 @@ + + + True ++ False + + + False +@@ -402,12 +473,13 @@ + + True + False ++ False + True + Extract the private key of the selected item into a external file + Extract the private key of the selected item into a external file + Extract Private Key + extractpkeyimg +- ++ + + + False +@@ -418,12 +490,13 @@ + + True + False ++ False + True + Revoke the selected certificate + Revoke the selected certificate + Revoke + gtk-cancel +- ++ + + + False +@@ -434,12 +507,13 @@ + + True + False ++ False + True + Sign the selected Certificate Signing Request + Sign the selected Certificate Signing Request + Sign + signimg +- ++ + + + False +@@ -450,11 +524,12 @@ + + True + False ++ False + True + Delete the selected Certificate Signing Request + Delete the selected Certificate Signing Request + gtk-delete +- ++ + + + False +@@ -472,41 +547,28 @@ + + True + True +- automatic +- automatic + in + + + True + True + True +- +- +- ++ ++ ++ ++ ++ ++ + + + + ++ True ++ True + 2 + + + + + +- +- True +- addca.png +- +- +- True +- addcsr.png +- +- +- True +- sign.png +- +- +- True +- extractpkey.png +- + +--- gnomint-1.3.0.orig/gui/new_ca_window.ui ++++ gnomint-1.3.0/gui/new_ca_window.ui +@@ -1,49 +1,58 @@ +- ++ ++ + +- +- ++ + +- 2048 + 1024 + 5120 ++ 2048 + 1024 + 1024 + + +- 240 + 1 + 600 ++ 240 + 1 + 12 + + + True ++ False + New CA - gnoMint + True + center + gnomint.png + dialog + ++ ++ ++ + + True ++ False + 8 + False + False + +- ++ + True ++ False ++ vertical + 6 + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>CA Subject Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -54,9 +63,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -72,186 +82,168 @@ + + + +- ++ + True ++ False + 6 +- 6 +- 2 + 6 + + + True ++ False ++ Organization: + 0 + 0 +- Organization: + + ++ 0 + 3 +- 4 +- GTK_FILL +- + + + + + True ++ False ++ Organization Unit: + 0 + 0 +- Organization Unit: + + ++ 0 + 4 +- 5 +- GTK_FILL +- + + + + + True +- 0 +- 0 ++ False + Country: + 0 ++ 0 ++ 0 + + +- GTK_FILL +- ++ 0 ++ 0 + + + + + True ++ False ++ State or Province name: + 0 + 0 +- State or Province name: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ City: + 0 + 0 +- City: + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + + + True + True +- • ++ • + + + 1 +- 2 + 1 +- 2 +- + + + + + True + True +- • ++ • + + + 1 +- 2 + 2 +- 3 +- + + + + + True + True +- • ++ • + + + 1 +- 2 + 3 +- 4 +- + + + + + True + True +- • ++ • + + + 1 +- 2 + 4 +- 5 +- + + + + + True +- 0 +- 0 ++ False + CA Root Certificate + Common Name (CN): ++ 0 ++ 0 + + ++ 0 + 5 +- 6 +- GTK_FILL +- + + + + + True + True +- • +- ++ • ++ + + + 1 +- 2 + 5 +- 6 +- + + + + + True ++ False + + + 1 +- 2 +- GTK_FILL +- ++ 0 + + + + ++ False ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -277,7 +269,7 @@ + True + True + True +- ++ + + + False +@@ -294,7 +286,7 @@ + True + True + True +- ++ + + + False +@@ -317,28 +309,33 @@ + + + True ++ False ++ CA properties + 0 + 0 +- CA properties + + + False + + + +- ++ + True ++ False ++ vertical + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>CA Root certificate properties</big> + + True ++ 0 ++ 0 + + + False +@@ -349,9 +346,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -362,16 +360,16 @@ + + + False ++ True + 0 + + + +- ++ + True ++ False + 6 +- 3 +- 2 +- True ++ True + + + True +@@ -384,24 +382,20 @@ + + + 1 +- 2 + 2 +- 3 +- + + + + + True ++ False ++ Months before root certificate expiration: + 0 + 0 +- Months before root certificate expiration: + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + +@@ -416,15 +410,13 @@ + + + 1 +- 2 + 1 +- 2 +- + + + +- ++ + True ++ False + True + + +@@ -435,7 +427,7 @@ + True + True + True +- ++ + + + False +@@ -462,45 +454,46 @@ + + + 1 +- 2 +- GTK_FILL +- ++ 0 + + + + + True ++ False ++ Private key bit length: + 0 + 0 +- Private key bit length: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ Private key type: + 0 + 0 +- Private key type: + + +- GTK_FILL +- ++ 0 ++ 0 + + + + ++ True ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -526,7 +519,7 @@ + True + True + True +- ++ + + + False +@@ -542,7 +535,7 @@ + True + True + True +- ++ + + + False +@@ -558,7 +551,7 @@ + True + True + True +- ++ + + + False +@@ -569,20 +562,23 @@ + + + False ++ True + 2 + + + + + 1 ++ False + + + + + True ++ False ++ Root certificate prop + 0 + 0 +- Root certificate prop + + + 1 +@@ -590,19 +586,23 @@ + + + +- ++ + True ++ False ++ vertical + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>CA properties</big> + + True ++ 0 ++ 0 + + + False +@@ -613,9 +613,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -626,17 +627,21 @@ + + + False ++ True + 0 + + + +- ++ + True ++ False ++ vertical + + + True +- 0 ++ False + CRL Distribution Point: ++ 0 + + + False +@@ -647,8 +652,7 @@ + + + True +- 0 +- 0 ++ False + <small>Please, in this field enter an URL where the CRL for this CA will be available. + You can leave it blank. In this case, no CRL Distribution Point will be set in the CA + Certificate, and you will be able to set it as a new CA property. +@@ -657,6 +661,8 @@ + True + True + 60 ++ 0 ++ 0 + + + False +@@ -668,7 +674,7 @@ + + True + True +- • ++ • + + + False +@@ -678,12 +684,15 @@ + + + ++ True ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -709,7 +718,7 @@ + True + True + True +- ++ + + + False +@@ -725,7 +734,7 @@ + True + True + True +- ++ + + + False +@@ -741,7 +750,7 @@ + True + True + True +- ++ + + + False +@@ -752,17 +761,20 @@ + + + False ++ True + 2 + + + + + 2 ++ False + + + + + True ++ False + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + Password protect + +--- gnomint-1.3.0.orig/gui/new_cert_window.ui ++++ gnomint-1.3.0/gui/new_cert_window.ui +@@ -1,41 +1,47 @@ +- ++ ++ + +- +- ++ + + 1 + 600 +- 1 +- 12 +- 0 + 1 ++ 1 ++ 12 + + + True ++ False + New Certificate - gnoMint + True + center + gnomint.png + dialog + ++ ++ ++ + + True ++ False + 8 + False + False + +- ++ + True ++ False + vertical + 6 + + + True +- 0 +- 0 ++ False + <big>New Certificate Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -46,197 +52,196 @@ + + + True +- 0 +- 0 +- You are about to sign a Certificate Signing Request, and this way, creating a new certificate. Please check the certificate properties. ++ False ++ You are about to sign a Certificate Signing Request, ++and this way, creating a new certificate. Please ++check the certificate properties. + fill + True ++ 0 ++ 0 + + ++ False ++ True + 1 + + + +- ++ + True ++ False + 16 +- 6 +- 2 +- 10 + 6 ++ 10 + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 5 +- 6 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 4 +- 5 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 3 +- 4 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 2 +- 3 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 + 1 +- 2 + + + + + True ++ False ++ label + 0 + 0 +- label + + + 1 +- 2 ++ 0 + + + + + True ++ False ++ Organization: + 0 + 0 +- Organization: + + ++ 0 + 3 +- 4 +- GTK_FILL +- + + + + + True ++ False ++ Organization Unit: + 0 + 0 +- Organization Unit: + + ++ 0 + 4 +- 5 +- GTK_FILL +- + + + + + True ++ False ++ Country: + 0 + 0 +- Country: + + +- GTK_FILL +- ++ 0 ++ 0 + + + + + True ++ False ++ State or Province name: + 0 + 0 +- State or Province name: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ City: + 0 + 0 +- City: + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + + + True +- 0 +- 0 ++ False + New certificate + Common Name (CN): ++ 0 ++ 0 + + ++ 0 + 5 +- 6 +- GTK_FILL +- + + + + ++ False ++ True + 2 + + + +- ++ + True ++ False + 12 + end + +@@ -262,7 +267,7 @@ + True + True + True +- ++ + + + False +@@ -278,7 +283,7 @@ + True + True + True +- ++ + + + False +@@ -301,27 +306,30 @@ + + + True ++ False ++ CA properties + 0 + 0 +- CA properties + + + False + + + +- ++ + True ++ False + vertical + 6 + + + True +- 0 +- 0 ++ False + <big>New Certificate Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -332,13 +340,18 @@ + + + True +- 0 +- 0 +- You are about to sign a Certificate Signing Request. Please, choose the Certification Authority you are going to use for signing it. ++ False ++ You are about to sign a Certificate Signing Request. ++Please, choose the Certification Authority you are ++going to use for signing it. + fill + True ++ 0 ++ 0 + + ++ False ++ True + 1 + + +@@ -346,25 +359,29 @@ + + True + True +- automatic +- automatic + in + + + True + True + False +- ++ ++ ++ ++ + + + + ++ True ++ True + 2 + + + +- ++ + True ++ False + 12 + end + +@@ -390,7 +407,7 @@ + True + True + True +- ++ + + + False +@@ -406,7 +423,7 @@ + True + True + True +- ++ + + + False +@@ -423,7 +440,7 @@ + True + True + True +- ++ + + + False +@@ -446,9 +463,10 @@ + + + True ++ False ++ Choose CA for signing the CSR + 0 + 0 +- Choose CA for signing the CSR + + + 2 +@@ -456,17 +474,19 @@ + + + +- ++ + True ++ False + vertical + + + True +- 0 +- 0 ++ False + <big>New Certificate Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -475,17 +495,21 @@ + + + +- ++ + True ++ False + 8 + + + True ++ False ++ Months before certificate expiration: + 0 + 0 +- Months before certificate expiration: + + ++ False ++ True + 0 + + +@@ -493,19 +517,21 @@ + + True + True +- • ++ • + AdjustmentMonthsBeforeExpirationSpinButton1 + 1 + True + + ++ False ++ True + 1 + + + + + False +- False ++ True + 1 + + +@@ -515,11 +541,10 @@ + True + 4 + +- ++ + True ++ False + 10 +- 4 +- 2 + + + Data encipherment +@@ -529,13 +554,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 2 +- 3 + + + +@@ -547,13 +570,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 1 +- 2 + + + +@@ -565,11 +586,11 @@ + True + True + True +- ++ + + + 1 +- 2 ++ 0 + + + +@@ -580,8 +601,12 @@ + False + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -592,11 +617,11 @@ + True + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -607,11 +632,11 @@ + False + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -622,22 +647,21 @@ + False + True + True +- ++ + + ++ 0 + 1 +- 2 + + + + + True ++ False + + + 1 +- 2 + 3 +- 4 + + + +@@ -645,16 +669,17 @@ + + + True +- 0 +- 0 ++ False + <b>Certificate uses</b> + True ++ 0 ++ 0 + + + + +- False +- False ++ True ++ True + 2 + + +@@ -664,22 +689,20 @@ + True + 4 + +- ++ + True ++ False + 10 +- 4 +- 2 + + + True ++ False + 0 + 0 + + + 1 +- 2 + 3 +- 4 + + + +@@ -690,13 +713,11 @@ + False + True + True +- ++ + + + 1 +- 2 + 2 +- 3 + + + +@@ -707,11 +728,11 @@ + False + True + True +- ++ + + ++ 0 + 3 +- 4 + + + +@@ -722,11 +743,11 @@ + False + True + True +- ++ + + ++ 0 + 2 +- 3 + + + +@@ -738,8 +759,12 @@ + True + True + True +- ++ + ++ ++ 0 ++ 0 ++ + + + +@@ -750,11 +775,11 @@ + True + True + True +- ++ + + ++ 0 + 1 +- 2 + + + +@@ -765,11 +790,11 @@ + False + True + True +- ++ + + + 1 +- 2 ++ 0 + + + +@@ -781,13 +806,11 @@ + True + True + True +- ++ + + + 1 +- 2 + 1 +- 2 + + + +@@ -795,30 +818,36 @@ + + + True +- 0 +- 0 ++ False + <b>Certificate purposes</b> + True ++ 0 ++ 0 + + + + ++ True ++ True + 3 + + + +- ++ + True ++ False + + + False ++ True + 10 + 4 + + + +- ++ + True ++ False + 12 + end + +@@ -844,7 +873,7 @@ + True + True + True +- ++ + + + False +@@ -860,7 +889,7 @@ + True + True + True +- ++ + + + False +@@ -876,7 +905,7 @@ + True + True + True +- ++ + + + False +@@ -887,6 +916,7 @@ + + + False ++ False + 5 + + +@@ -898,6 +928,7 @@ + + + True ++ False + Certificate properties + + +--- gnomint-1.3.0.orig/gui/new_crl_dialog.ui ++++ gnomint-1.3.0/gui/new_crl_dialog.ui +@@ -1,26 +1,75 @@ +- ++ ++ + +- +- ++ + ++ False + 5 + New CRL - gnoMint + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical + 11 ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ False ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + + + True +- 0 +- 0 ++ False + <big><b>New Certificate Revocation List</b></big> + True ++ 0 ++ 0 + + + False +@@ -31,9 +80,10 @@ + + + True +- 0 ++ False + Please, select the CA for which a Certificate + Revocation List is going to be created: ++ 0 + + + False +@@ -45,64 +95,25 @@ + + True + True +- automatic +- automatic + in + + + True + True + False +- ++ ++ ++ ++ + + + + ++ True ++ True + 3 + + +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- False +- True +- True +- True +- +- +- +- False +- False +- 1 +- +- +- +- +- False +- end +- 0 +- +- + + + +--- gnomint-1.3.0.orig/gui/new_req_window.ui ++++ gnomint-1.3.0/gui/new_req_window.ui +@@ -1,41 +1,50 @@ +- ++ ++ + +- +- ++ + +- 2048 + 1024 + 5120 ++ 2048 + 1024 + + + True ++ False + New certificate request - gnoMint + True + center + gnomint.png + dialog + ++ ++ ++ + + True ++ False + 8 + False + False + +- ++ + True ++ False ++ vertical + 7 + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>Certificate Request Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -46,9 +55,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -59,18 +69,26 @@ + + + False ++ True + 0 + + + + + True +- 0 +- <small>The subject of the new certificate request can inherit information from one of the existing Certification Authorities. This is a must if the policy of the CA you are going to use is defined to force some fields of a certificate subject to be the same as the ones in the CA cert subject.</small> ++ False ++ <small>The subject of the new certificate request can inherit information ++from one of the existing Certification Authorities. This is a must if the ++policy of the CA you are going to use is defined to force some fields ++of a certificate subject to be the same as the ones in the CA cert ++subject.</small> + True + True ++ 0 + + ++ False ++ True + 1 + + +@@ -84,6 +102,8 @@ + True + + ++ False ++ True + 2 + + +@@ -95,9 +115,11 @@ + False + True + dont_inherit_radiobutton +- ++ + + ++ False ++ True + 3 + + +@@ -105,8 +127,6 @@ + + True + True +- automatic +- automatic + in + + +@@ -114,16 +134,22 @@ + True + False + True ++ ++ ++ + + + + ++ True ++ True + 4 + + + +- ++ + True ++ False + 12 + end + +@@ -149,7 +175,7 @@ + True + True + True +- ++ + + + False +@@ -165,7 +191,7 @@ + True + True + True +- ++ + + + False +@@ -176,6 +202,7 @@ + + + False ++ True + 5 + + +@@ -184,29 +211,34 @@ + + + True ++ False ++ CA properties + 0 + 0 +- CA properties + + + False + + + +- ++ + True ++ False ++ vertical + 6 + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>Certificate Request Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -217,9 +249,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -235,185 +268,167 @@ + + + +- ++ + True ++ False + 6 +- 6 +- 2 + 6 + + + True ++ False + + + 1 +- 2 +- GTK_FILL +- ++ 0 + + + + + True + True +- • +- ++ • ++ + + + 1 +- 2 + 5 +- 6 +- + + + + + True +- 0 +- 0 ++ False + Certificate + Common Name (CN): ++ 0 ++ 0 + + ++ 0 + 5 +- 6 +- GTK_FILL +- + + + + + True + True +- • ++ • + + + 1 +- 2 + 4 +- 5 +- + + + + + True + True +- • ++ • + + + 1 +- 2 + 3 +- 4 +- + + + + + True + True +- • ++ • + + + 1 +- 2 + 2 +- 3 +- + + + + + True + True +- • ++ • + + + 1 +- 2 + 1 +- 2 +- + + + + + True ++ False ++ City: + 0 + 0 +- City: + + ++ 0 + 2 +- 3 +- GTK_FILL +- + + + + + True ++ False ++ State or Province name: + 0 + 0 +- State or Province name: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ Country: + 0 + 0 +- Country: + + +- GTK_FILL +- ++ 0 ++ 0 + + + + + True ++ False ++ Organization Unit: + 0 + 0 +- Organization Unit: + + ++ 0 + 4 +- 5 +- GTK_FILL +- + + + + + True ++ False ++ Organization: + 0 + 0 +- Organization: + + ++ 0 + 3 +- 4 +- GTK_FILL +- + + + + ++ False ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -439,7 +454,7 @@ + True + True + True +- ++ + + + False +@@ -455,7 +470,7 @@ + True + True + True +- ++ + + + False +@@ -472,7 +487,7 @@ + True + True + True +- ++ + + + False +@@ -495,9 +510,10 @@ + + + True ++ False ++ Root certificate prop + 0 + 0 +- Root certificate prop + + + 1 +@@ -505,19 +521,23 @@ + + + +- ++ + True ++ False ++ vertical + +- ++ + True ++ False + + + True +- 0 +- 0 ++ False + <big>Certificate Request Properties</big> + + True ++ 0 ++ 0 + + + False +@@ -528,9 +548,10 @@ + + + True ++ False ++ + 0 + 0 +- + + + False +@@ -541,23 +562,23 @@ + + + False ++ True + 0 + + + +- ++ + True ++ False + 6 +- 2 +- 2 +- True ++ True + + + True + True + False + 5 +- • ++ • + AdjustmentKeyLengthSpinButton1 + 1024 + True +@@ -566,15 +587,13 @@ + + + 1 +- 2 + 1 +- 2 +- + + + +- ++ + True ++ False + True + + +@@ -586,7 +605,7 @@ + True + True + dsa_radiobutton1 +- ++ + + + False +@@ -613,45 +632,46 @@ + + + 1 +- 2 +- GTK_FILL +- ++ 0 + + + + + True ++ False ++ Private key bit length: + 0 + 0 +- Private key bit length: + + ++ 0 + 1 +- 2 +- GTK_FILL +- + + + + + True ++ False ++ Private key type: + 0 + 0 +- Private key type: + + +- GTK_FILL +- ++ 0 ++ 0 + + + + ++ True ++ True + 1 + + + +- ++ + True ++ False + 12 + end + +@@ -677,7 +697,7 @@ + True + True + True +- ++ + + + False +@@ -693,7 +713,7 @@ + True + True + True +- ++ + + + False +@@ -709,7 +729,7 @@ + True + True + True +- ++ + + + False +@@ -720,6 +740,7 @@ + + + False ++ True + 2 + + +@@ -731,6 +752,7 @@ + + + True ++ False + page 3 + + +--- gnomint-1.3.0.orig/gui/preferences_dialog.ui ++++ gnomint-1.3.0/gui/preferences_dialog.ui +@@ -1,8 +1,9 @@ +- ++ ++ + +- +- ++ + ++ False + 5 + General Preferences - gnoMint + False +@@ -10,19 +11,51 @@ + center-on-parent + gnomint.png + dialog +- False ++ ++ ++ + +- ++ + True ++ False + vertical + 2 ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + + + True + True + +- ++ + True ++ False + vertical + + +@@ -33,9 +66,11 @@ + False + True + True +- ++ + + ++ False ++ True + 0 + + +@@ -44,6 +79,7 @@ + + + True ++ False + Export options + + +@@ -52,36 +88,12 @@ + + + ++ False ++ True + 6 + 1 + + +- +- +- True +- end +- +- +- gtk-ok +- True +- True +- True +- True +- +- +- +- False +- False +- 0 +- +- +- +- +- False +- end +- 0 +- +- + + + +--- gnomint-1.3.0.orig/src/ca.h ++++ gnomint-1.3.0/src/ca.h +@@ -47,7 +47,6 @@ + gboolean ca_rcrt_view_toggled (GtkCheckMenuItem *button, gpointer user_data); + void ca_generate_crl (GtkCheckMenuItem *button, gpointer user_data); + gboolean ca_treeview_popup_timeout_program_cb (gpointer data); +-void ca_treeview_popup_timeout_program (GdkEventButton *event); + gboolean ca_treeview_popup_handler (GtkTreeView *tree_view, + GdkEvent *event, gpointer user_data); + void ca_on_change_pwd_menuitem_activate (GtkMenuItem *menuitem, gpointer user_data); +--- gnomint-1.3.0.orig/gui/export_certificate_dialog.ui ++++ gnomint-1.3.0/gui/export_certificate_dialog.ui +@@ -1,8 +1,9 @@ +- ++ ++ + +- +- ++ + ++ False + Export certificate - gnoMint + True + center +@@ -10,32 +11,82 @@ + gnomint.png + dialog + True +- False ++ ++ ++ + +- ++ + True ++ False + vertical ++ ++ ++ True ++ False ++ end ++ ++ ++ gtk-cancel ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ gtk-ok ++ True ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ False ++ False ++ end ++ 0 ++ ++ + +- ++ + True ++ False + 8 + vertical + 8 + + + True ++ False ++ Please, choose which part of the ++saved certificate you want to export: ++ True + 0 + 0 +- Please, choose which part of the saved certificate you want to export: +- True + + ++ True ++ True + 0 + + + +- ++ + True ++ False + vertical + + +@@ -48,22 +99,29 @@ + True + + ++ True ++ True + 0 + + + + + True +- 0 +- 0 +- 24 +- 9 ++ False ++ 24 ++ 24 ++ 9 ++ 9 + <i>Export only the certificate to a public file, in PEM format.</i> + True + fill + True ++ 0 ++ 0 + + ++ True ++ True + 1 + + +@@ -79,22 +137,31 @@ + publicpart_radiobutton1 + + ++ True ++ True + 2 + + + + + True +- 0 +- 0 +- 24 +- 9 +- <i>Export the saved private key to a PKCS#8 password-protected file. This file should only be accessed by the subject of the certificate.</i> ++ False ++ 24 ++ 24 ++ 9 ++ 9 ++ <i>Export the saved private key to a PKCS#8 password- ++protected file. This file should only be accessed by the ++subject of the certificate.</i> + True + fill + True ++ 0 ++ 0 + + ++ True ++ True + 3 + + +@@ -109,22 +176,31 @@ + publicpart_radiobutton1 + + ++ True ++ True + 4 + + + + + True +- 0 +- 0 +- 24 +- 9 +- <i>Export the saved private key to a PEM file. This option should only be used for exporting certificates that will be used in unattended servers.</i> ++ False ++ 24 ++ 24 ++ 9 ++ 9 ++ <i>Export the saved private key to a PEM file. This option ++should only be used for exporting certificates that will be ++used in unattended servers.</i> + True + fill + True ++ 0 ++ 0 + + ++ True ++ True + 5 + + +@@ -139,72 +215,46 @@ + publicpart_radiobutton1 + + ++ True ++ True + 6 + + + + + True +- 0 +- 0 +- 24 +- 9 +- <i>Export both (private and public) parts to a password-protected PKCS#12 file. This kind of file can be imported by other common programs, such as web or mail clients.</i> ++ False ++ 24 ++ 24 ++ 9 ++ 9 ++ <i>Export both (private and public) parts to a password- ++protected PKCS#12 file. This kind of file can be imported ++by other common programs, such as web or mail clients.</i> + True + fill + True ++ 0 ++ 0 + + ++ True ++ True + 7 + + + + +- 1 +- +- +- +- +- 1 +- +- +- +- +- True +- end +- +- +- gtk-cancel +- True +- True +- True +- True +- +- +- False +- False +- 0 +- +- +- +- +- gtk-ok +- True +- True +- True +- True +- +- +- False +- False ++ True ++ True + 1 + + + + + False +- end +- 0 ++ True ++ 1 + + + diff --git a/system/gnomint/patches/09_gcc-10.patch b/system/gnomint/patches/09_gcc-10.patch new file mode 100644 index 0000000000000..0e9779335c0f3 --- /dev/null +++ b/system/gnomint/patches/09_gcc-10.patch @@ -0,0 +1,33 @@ +Description: Fix FTBFS with GCC 10. +Author: Yavor Doganov +Bug-Debian: https://bugs.debian.org/957287 +Forwarded: gnomint-devel@lists.sourceforge.net +Last-Update: 2020-06-23 +--- + +--- gnomint-1.3.0.orig/src/ca_file.h ++++ gnomint-1.3.0/src/ca_file.h +@@ -69,6 +69,7 @@ + + GList * ca_file_get_revoked_certs (guint64 ca_id, gchar **error); + ++typedef + enum {CA_FILE_CA_COLUMN_ID=0, + CA_FILE_CA_COLUMN_SERIAL=1, + CA_FILE_CA_COLUMN_SUBJECT=2, +@@ -78,6 +79,7 @@ + CA_FILE_CA_COLUMN_NUMBER=6} + CaFileCAColumns; + ++typedef + enum {CA_FILE_CERT_COLUMN_ID=0, + CA_FILE_CERT_COLUMN_IS_CA=1, + CA_FILE_CERT_COLUMN_SERIAL=2, +@@ -93,6 +95,7 @@ + CA_FILE_CERT_COLUMN_NUMBER=12} + CaFileCertColumns; + ++typedef + enum {CA_FILE_CSR_COLUMN_ID=0, + CA_FILE_CSR_COLUMN_SUBJECT=1, + CA_FILE_CSR_COLUMN_PRIVATE_KEY_IN_DB=2, diff --git a/system/gnomint/patches/gnutls3.patch b/system/gnomint/patches/gnutls3.patch deleted file mode 100644 index 8ee3371884e40..0000000000000 --- a/system/gnomint/patches/gnutls3.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -aur a/src/import.c b/src/import.c ---- a/src/import.c 2010-05-31 23:01:37.000000000 +0200 -+++ b/src/import.c 2012-06-27 17:50:06.993671796 +0200 -@@ -695,7 +695,7 @@ - - // After having all the parts unencrypted, we import all certificates first. - for (i=0; i