From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-crypt/pinentry/Manifest | 12 -- .../pinentry/files/pinentry-0.8.2-ncurses.patch | 25 --- ...isable-tooltips-in-keyboard-grabbing-mode.patch | 47 ----- .../pinentry/files/pinentry-1.0.0-build.patch | 218 --------------------- ...nentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch | 47 ----- ...1.0.0-make-icon-work-under-Plasma-Wayland.patch | 52 ----- app-crypt/pinentry/metadata.xml | 12 -- app-crypt/pinentry/pinentry-1.0.0-r2.ebuild | 102 ---------- app-crypt/pinentry/pinentry-1.0.0-r3.ebuild | 103 ---------- app-crypt/pinentry/pinentry-1.1.0-r1.ebuild | 100 ---------- app-crypt/pinentry/pinentry-1.1.0-r2.ebuild | 102 ---------- 11 files changed, 820 deletions(-) delete mode 100644 app-crypt/pinentry/Manifest delete mode 100644 app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch delete mode 100644 app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch delete mode 100644 app-crypt/pinentry/files/pinentry-1.0.0-build.patch delete mode 100644 app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch delete mode 100644 app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch delete mode 100644 app-crypt/pinentry/metadata.xml delete mode 100644 app-crypt/pinentry/pinentry-1.0.0-r2.ebuild delete mode 100644 app-crypt/pinentry/pinentry-1.0.0-r3.ebuild delete mode 100644 app-crypt/pinentry/pinentry-1.1.0-r1.ebuild delete mode 100644 app-crypt/pinentry/pinentry-1.1.0-r2.ebuild (limited to 'app-crypt/pinentry') diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest deleted file mode 100644 index 8b99dd4504bc..000000000000 --- a/app-crypt/pinentry/Manifest +++ /dev/null @@ -1,12 +0,0 @@ -AUX pinentry-0.8.2-ncurses.patch 824 BLAKE2B 922bb9a7079d4a3bc307a441f3f884f764f78819a16b57cde3dcb000ae7a23b592b390f53c528358818087c2c313716289b829c307f07dbee3c9580bd174cd0d SHA512 415ad55fd7a4ab66e87e5db76b1314b00f5a86552804f1f431a533ba1e7ec3f2c7136096106688b572639ceb637fdf0c3e25d96aa2e07fd1f6f295d39e1d4901 -AUX pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch 1571 BLAKE2B 08d4b7b3db26112b2165511eaebb3664f692ea99d0999096c17b11164a222c072ff79aaa9d8d2bf7d6be94644fc2697bcbf114019d18a255bd573ce4375c01b9 SHA512 e5fce39467221865d5a40b54053745c4d7c63bfd07ae763f9e76779dd7e77252acf7627f5768e729e09c49762479692bc2f3e6474878765d80a1132193c87361 -AUX pinentry-1.0.0-build.patch 6634 BLAKE2B f5bd7f10e62ea603add875e14a69f30fbc6a2f8df463fa5c70531dd3f425a9219e36198380fcdd0906b670692bba49fb157807fae1c05a7be6f420b27e7426c0 SHA512 cd71552db3c4ab3bd7dd34d5009ad332e5a430ae1e909085cac6a04e63801086cac18916af65a37c110c2b667054c356f38dcc8af43468a23b1b562bf6dbafec -AUX pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch 1900 BLAKE2B b9e7aa8f87615d4780af3361dd85907bf249891c108d51c001b44a5b55c697573c314e20fa2d8ec3df95c71b3aabfd2099e4efce4a0fdc3265fc483e785c3c23 SHA512 0b35900e4641c72c6b28b19bd252ffcabe14669e037c710a1057157fac0b65c709711a5667b66fd07afb433fc1c67509ec84eaddb822213d3ddc4ff7b549967e -AUX pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch 1606 BLAKE2B bebea23f44a0512dad873f693a8343a47684c983ca37faba908bee62a7f87d1eaf2a097672df45fcfabb28911b55bc3b02177f910137f50d9c97a6939a1f7047 SHA512 15e6b86015bbf9f199bfa9e68f2a1b9f3fc14105313e1dbfb303d76b1949092ec2671b8d2a90fa8b05e0196da81e9f20875656dc11fdd96b48a14d79e4becdf7 -DIST pinentry-1.0.0.tar.bz2 436930 BLAKE2B 949be8de8504a42cd5bd6ffebe331a825db7ff3c2ccc5fc554155b7621fddf9df957aa92063eb1a06c6964826a296bf60a4cc46cf2886552e37703a62042f35a SHA512 f109236707c51871b5020ef807a551366461fafcfbe09bf8cda19d4b163a42cf622562b905ceb41429f1d648b3f3d27807538709da6a135b67f9888709eccd62 -DIST pinentry-1.1.0.tar.bz2 467702 BLAKE2B cf43555848ab0dc60756fca123aba7599ebb1bfe0458b973ed9d84479f8de9ee69ef309b518b40aa340434d64d37793cf97c94f78f99820bc5c71ecd2aac7a49 SHA512 5012672925bcb5f683358c259e55e4b87c67cf063ad52c759308933733025c33f7ce08e5b8019ffc101cbf7ef30499040ef2fd34a7611698e65e1593f80948cd -EBUILD pinentry-1.0.0-r2.ebuild 2885 BLAKE2B 2338a3aaff93a76c8a2e6d621cfd011447f81eb21a5d957468504f4d4c2e77a7acf71c6c80ed8babb9f20879e603a87ffd3e3b88ef706cd06f70a9ec204cb38e SHA512 252e068bd96c9a9c406ba358a69e7f6b9ef6875072236a3cf13995a27524903f2bae1860c65ced27d2ffd532e8797a3ed8cbb180a76e80f2442d56f02010929a -EBUILD pinentry-1.0.0-r3.ebuild 2958 BLAKE2B 350c3f20934857f72ce46dad5d8a047f5b04c10dbf4f398e346a5b1339a81fa1263296859a240fe717970840ed81b2f271a902d3e26b5d93f108bbdf3117cc20 SHA512 10c088dd6cd0efab43430856615cd795986c127765fbb47c0d324085aac9474da85bd317a8ec23aecc05fafba19f14392ccbf59b1820590223be0eb57855a2a6 -EBUILD pinentry-1.1.0-r1.ebuild 2809 BLAKE2B b67fe9e2549179f6a035e7b47a2a5041e97e2924c381a66f889d656176c1ee464ab023297801f7f0442390565f5697f2e5fb67a54d7a4c3cfb8f5a4aeae23288 SHA512 e27748277d88402c8c46251ab95f7852fc6ff0499b00823cc1a980ebc222568acf6c31d6ebe92a29b414aba0a6f1796679b43ec279e36bd423183a1a25431411 -EBUILD pinentry-1.1.0-r2.ebuild 2876 BLAKE2B 00a80e0c23694d45c5ac529e086934f1ce28be2c46594171d6de17a2eeb7904df1ab031f4ba4c76d00e61944d229feabf204643ceb5a806b98c56566e262096c SHA512 9eccbd9d41ebf030ad823fa66f25509b6f68b29c5ea85a772453dd81a86c35d0734fbdb4b1d24970a7d0e3851dedd9357bf0c804d3f3987f7f34eab86674f923 -MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0 diff --git a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch b/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch deleted file mode 100644 index 3bb92c63d00c..000000000000 --- a/app-crypt/pinentry/files/pinentry-0.8.2-ncurses.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bafe8608fc525ef103b3d1f3048ca28958bef596 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sun, 5 May 2013 02:23:08 +0300 -Subject: [PATCH] ncurses: link with optional tinfo - ---- - m4/curses.m4 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/m4/curses.m4 b/m4/curses.m4 -index 3a01881..ffb6bd1 100644 ---- a/m4/curses.m4 -+++ b/m4/curses.m4 -@@ -36,6 +36,8 @@ AC_DEFUN([IU_LIB_NCURSES], [ - have_ncursesw=no - fi - if test "$LIBNCURSES"; then -+ AC_CHECK_LIB(tinfow, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfow", -+ AC_CHECK_LIB(tinfo, curs_set, LIBNCURSES="${LIBNCURSES} -ltinfo")) - # Use ncurses header files instead of the ordinary ones, if possible; - # is there a better way of doing this, that avoids looking in specific - # directories? --- -1.8.1.5 - diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch b/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch deleted file mode 100644 index 7724d1beae8c..000000000000 --- a/app-crypt/pinentry/files/pinentry-1.0.0-Disable-tooltips-in-keyboard-grabbing-mode.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1590b664d88be8386a4664c2994b685187d1eb25 Mon Sep 17 00:00:00 2001 -From: Damien Goutte-Gattat -Date: Thu, 3 Aug 2017 22:56:49 +0200 -Subject: [PATCH 1/6] gtk: Disable tooltips in keyboard-grabbing mode. - -* gtk+-2:/pinentry-gtk-2.c (show_hide_button): Do not show the -tooltip if we attempt to grab the keyboard. -(create_window): Likewise. --- - -For unclear reasons, those tooltips may interfere with grabbing -under some tiling window managers. - -GnuPG-bug-id: 3297 -Signed-off-by: Damien Goutte-Gattat ---- - gtk+-2/pinentry-gtk-2.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c -index d467ec5..f17a702 100644 ---- a/gtk+-2/pinentry-gtk-2.c -+++ b/gtk+-2/pinentry-gtk-2.c -@@ -516,7 +516,10 @@ show_hide_button_toggled (GtkWidget *widget, gpointer data) - } - - gtk_label_set_markup (GTK_LABEL(label), text); -- gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip); -+ if (!pinentry->grab) -+ { -+ gtk_widget_set_tooltip_text (GTK_WIDGET(button), tooltip); -+ } - g_free (tooltip); - } - -@@ -736,7 +739,7 @@ create_window (pinentry_t ctx) - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (qualitybar), - QUALITYBAR_EMPTY_TEXT); - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (qualitybar), 0.0); -- if (pinentry->quality_bar_tt) -+ if (pinentry->quality_bar_tt && !pinentry->grab) - { - #if !GTK_CHECK_VERSION (2, 12, 0) - gtk_tooltips_set_tip (GTK_TOOLTIPS (tooltips), qualitybar, --- -2.13.6 - diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-build.patch b/app-crypt/pinentry/files/pinentry-1.0.0-build.patch deleted file mode 100644 index e367b8566450..000000000000 --- a/app-crypt/pinentry/files/pinentry-1.0.0-build.patch +++ /dev/null @@ -1,218 +0,0 @@ -From c5c7bee68730c9f66a27f9bb0d023480623a2bfb Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Thu, 1 Dec 2016 09:10:08 +0100 -Subject: [PATCH] Fix linkage problem in tty and emacs pinentries. - -* emacs/pinentry-emacs.c (curses_cmd_handler): Remove var. -* tty/pinentry-tty.c (curses_cmd_handler): Remove var. -* pinentry/pinentry.c (flavor_flag): New local var. -(pinentry_set_flavor_flag): New function. -(cmd_getinfo): Use FLAVOR_FLAG for the "flavor" sub-command. -* gnome3/pinentry-gnome3.c (main): Call pinentry_set_flavor_flag. -* gtk+-2/pinentry-gtk-2.c (main): Ditto. -* pinentry/pinentry-emacs.c (initial_emacs_cmd_handler): Ditto. -* qt/main.cpp (main): Ditto. --- - -Fixes-commit: e4e3a9cc88704dcffac660d0b92fd1ed8abecc11 -Fixes-commit: d126036671e7dd631babc118cb4113f723f15748 -Signed-off-by: Werner Koch ---- - emacs/pinentry-emacs.c | 4 ---- - gnome3/pinentry-gnome3.c | 3 +++ - gtk+-2/pinentry-gtk-2.c | 10 ++++++++-- - pinentry/pinentry-emacs.c | 5 ++++- - pinentry/pinentry.c | 34 ++++++++++++++++++---------------- - pinentry/pinentry.h | 4 ++++ - qt/main.cpp | 1 + - tty/pinentry-tty.c | 3 --- - 8 files changed, 38 insertions(+), 26 deletions(-) - -diff --git a/emacs/pinentry-emacs.c b/emacs/pinentry-emacs.c -index b6b3eb8..3c39a96 100644 ---- a/emacs/pinentry-emacs.c -+++ b/emacs/pinentry-emacs.c -@@ -29,10 +29,6 @@ - - pinentry_cmd_handler_t pinentry_cmd_handler = emacs_cmd_handler; - --/* needed to link cleanly; should never be used except for comparison -- * in pinentry/pinentry.c's cmd_getinfo(): */ --pinentry_cmd_handler_t curses_cmd_handler = NULL; -- - - - int -diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c -index a040f9b..d5a49d6 100644 ---- a/gnome3/pinentry-gnome3.c -+++ b/gnome3/pinentry-gnome3.c -@@ -517,18 +517,21 @@ main (int argc, char *argv[]) - fprintf (stderr, "No $DBUS_SESSION_BUS_ADDRESS found," - " falling back to curses\n"); - pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); - } - else if (!pe_gcr_system_prompt_available ()) - { - fprintf (stderr, "No Gcr System Prompter available," - " falling back to curses\n"); - pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); - } - else if (pe_gnome_screen_locked ()) - { - fprintf (stderr, "GNOME screensaver is locked," - " falling back to curses\n"); - pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); - } - #endif - -diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c -index 6037533..473c4aa 100644 ---- a/gtk+-2/pinentry-gtk-2.c -+++ b/gtk+-2/pinentry-gtk-2.c -@@ -938,10 +938,16 @@ main (int argc, char *argv[]) - if (pinentry_have_display (argc, argv)) - { - if (! gtk_init_check (&argc, &argv)) -- pinentry_cmd_handler = curses_cmd_handler; -+ { -+ pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); -+ } - } - else -- pinentry_cmd_handler = curses_cmd_handler; -+ { -+ pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); -+ } - #else - gtk_init (&argc, &argv); - #endif -diff --git a/pinentry/pinentry-emacs.c b/pinentry/pinentry-emacs.c -index df12f1b..50ba406 100644 ---- a/pinentry/pinentry-emacs.c -+++ b/pinentry/pinentry-emacs.c -@@ -644,7 +644,10 @@ initial_emacs_cmd_handler (pinentry_t pe) - if (emacs_socket < 0) - pinentry_cmd_handler = fallback_cmd_handler; - else -- pinentry_cmd_handler = emacs_cmd_handler; -+ { -+ pinentry_cmd_handler = emacs_cmd_handler; -+ pinentry_set_flavor_flag ("emacs"); -+ } - - return (* pinentry_cmd_handler) (pe); - } -diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c -index 322a651..a198fb3 100644 ---- a/pinentry/pinentry.c -+++ b/pinentry/pinentry.c -@@ -67,6 +67,10 @@ static char this_pgmname[50]; - - struct pinentry pinentry; - -+ -+static const char *flavor_flag; -+ -+ - static void - pinentry_reset (int use_defaults) - { -@@ -793,6 +797,16 @@ pinentry_parse_opts (int argc, char *argv[]) - } - } - -+ -+/* Set the optional flag used with getinfo. */ -+void -+pinentry_set_flavor_flag (const char *string) -+{ -+ flavor_flag = string; -+} -+ -+ -+ - - static gpg_error_t - option_handler (assuan_context_t ctx, const char *key, const char *value) -@@ -1444,27 +1458,15 @@ cmd_getinfo (assuan_context_t ctx, char *line) - } - else if (!strcmp (line, "flavor")) - { -- const char *flags; -- - if (!strncmp (this_pgmname, "pinentry-", 9) && this_pgmname[9]) - s = this_pgmname + 9; - else - s = this_pgmname; - -- if (0) -- ; --#ifdef INSIDE_EMACS -- else if (pinentry_cmd_handler == emacs_cmd_handler) -- flags = ":emacs"; --#endif --#ifdef FALLBACK_CURSES -- else if (pinentry_cmd_handler == curses_cmd_handler) -- flags = ":curses"; --#endif -- else -- flags = ""; -- -- snprintf (buffer, sizeof buffer, "%s%s", s, flags); -+ snprintf (buffer, sizeof buffer, "%s%s%s", -+ s, -+ flavor_flag? ":":"", -+ flavor_flag? flavor_flag : ""); - buffer[sizeof buffer -1] = 0; - rc = assuan_send_data (ctx, buffer, strlen (buffer)); - } -diff --git a/pinentry/pinentry.h b/pinentry/pinentry.h -index 01fb373..45d35ad 100644 ---- a/pinentry/pinentry.h -+++ b/pinentry/pinentry.h -@@ -275,6 +275,10 @@ int pinentry_have_display (int argc, char **argv); - or version output is requested. */ - void pinentry_parse_opts (int argc, char *argv[]); - -+/* Set the optional flag used with getinfo. */ -+void pinentry_set_flavor_flag (const char *string); -+ -+ - - /* The caller must define this variable to process assuan commands. */ - extern pinentry_cmd_handler_t pinentry_cmd_handler; -diff --git a/qt/main.cpp b/qt/main.cpp -index 8284960..225c06b 100644 ---- a/qt/main.cpp -+++ b/qt/main.cpp -@@ -308,6 +308,7 @@ main(int argc, char *argv[]) - #ifdef FALLBACK_CURSES - if (!pinentry_have_display(argc, argv)) { - pinentry_cmd_handler = curses_cmd_handler; -+ pinentry_set_flavor_flag ("curses"); - } else - #endif - { -diff --git a/tty/pinentry-tty.c b/tty/pinentry-tty.c -index 3d6cd5a..a509d79 100644 ---- a/tty/pinentry-tty.c -+++ b/tty/pinentry-tty.c -@@ -556,9 +556,6 @@ tty_cmd_handler(pinentry_t pinentry) - - pinentry_cmd_handler_t pinentry_cmd_handler = tty_cmd_handler; - --/* needed to link cleanly; should never be used except for comparison -- * in pinentry/pinentry.c's cmd_getinfo(): */ --pinentry_cmd_handler_t curses_cmd_handler = NULL; - - - int --- -2.8.0.rc3 - diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch b/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch deleted file mode 100644 index f7476de1ff67..000000000000 --- a/app-crypt/pinentry/files/pinentry-1.0.0-gtk2-Fix-a-problem-with-fvwm.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b0e0bdeac5d40ca645afc9017778b39a26303523 Mon Sep 17 00:00:00 2001 -From: Werner Koch -Date: Wed, 11 Jan 2017 18:40:17 +0100 -Subject: [PATCH 01/25] gtk2: Fix a problem with fvwm - -* gtk+-2/pinentry-gtk-2.c (grab_pointer): Take care of -GDK_GRAB_ALREADY_GRABBED. --- - -Debian-bug-id: 850708 -Co-authored-by: Vincent Lefevre -Signed-off-by: Werner Koch ---- - gtk+-2/pinentry-gtk-2.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c -index 473c4aa..e37601f 100644 ---- a/gtk+-2/pinentry-gtk-2.c -+++ b/gtk+-2/pinentry-gtk-2.c -@@ -203,7 +203,12 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data) - (void)data; - - /* Change the cursor for the duration of the grab to indicate that -- something is going on. */ -+ * something is going on. The fvwm window manager grabs the pointer -+ * for a short time and thus we may end up with the already grabbed -+ * error code. Actually this error code should be used to detect a -+ * malicious grabbing application but with fvwm this renders -+ * Pinentry only unusable. Thus we try again several times also for -+ * that error code. See Debian bug 850708 for details. */ - /* XXX: It would be nice to have a key cursor, unfortunately there - is none readily available. */ - cursor = gdk_cursor_new_for_display (gtk_widget_get_display (win), -@@ -215,7 +220,8 @@ grab_pointer (GtkWidget *win, GdkEvent *event, gpointer data) - NULL /* confine to */, - cursor, - gdk_event_get_time (event)); -- while (tries++ < max_tries && err == GDK_GRAB_NOT_VIEWABLE); -+ while (tries++ < max_tries && (err == GDK_GRAB_NOT_VIEWABLE -+ || err == GDK_GRAB_ALREADY_GRABBED)); - - if (err) - { --- -2.13.6 - diff --git a/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch b/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch deleted file mode 100644 index 646df1963760..000000000000 --- a/app-crypt/pinentry/files/pinentry-1.0.0-make-icon-work-under-Plasma-Wayland.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7218becac7132c2508d4e8f42c693d69c406795a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= -Date: Wed, 7 Mar 2018 15:14:22 +0100 -Subject: [PATCH] Make pinentry-qt icon work under Plasma Wayland. - ---- - qt/Makefile.am | 2 ++ - qt/main.cpp | 2 ++ - qt/org.gnupg.pinentry-qt.desktop | 5 +++++ - 3 files changed, 9 insertions(+) - create mode 100644 qt/org.gnupg.pinentry-qt.desktop - -diff --git a/qt/Makefile.am b/qt/Makefile.am -index 698005e..bbf39d1 100644 ---- a/qt/Makefile.am -+++ b/qt/Makefile.am -@@ -24,6 +24,8 @@ bin_PROGRAMS = pinentry-qt - - EXTRA_DIST = document-encrypt.png pinentry.qrc - -+desktopdir = $(datadir)/applications -+dist_desktop_DATA = org.gnupg.pinentry-qt.desktop - - if FALLBACK_CURSES - ncurses_include = $(NCURSES_INCLUDE) -diff --git a/qt/main.cpp b/qt/main.cpp -index fe88d26..b767cb4 100644 ---- a/qt/main.cpp -+++ b/qt/main.cpp -@@ -372,6 +372,8 @@ main(int argc, char *argv[]) - i = argc; - app = new QApplication(i, new_argv); - app->setWindowIcon(QIcon(QLatin1String(":/document-encrypt.png"))); -+ app->setOrganizationDomain(QStringLiteral("gnupg.org")); -+ app->setDesktopFileName(QStringLiteral("org.gnupg.pinentry-qt")); - } - - pinentry_parse_opts(argc, argv); -diff --git a/qt/org.gnupg.pinentry-qt.desktop b/qt/org.gnupg.pinentry-qt.desktop -new file mode 100644 -index 0000000..0ac89aa ---- /dev/null -+++ b/qt/org.gnupg.pinentry-qt.desktop -@@ -0,0 +1,5 @@ -+[Desktop Entry] -+Type=Application -+Name=Pinentry dialog -+Icon=document-encrypt -+NoDisplay=true --- -2.16.1 - diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml deleted file mode 100644 index 46f4637bdd41..000000000000 --- a/app-crypt/pinentry/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - k_f@gentoo.org - Kristian Fiskerstrand - - - crypto@gentoo.org - Crypto - - diff --git a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild deleted file mode 100644 index 84e0c01de1e3..000000000000 --- a/app-crypt/pinentry/pinentry-1.0.0-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/index.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps emacs gnome-keyring gtk ncurses qt5 static" - -CDEPEND=" - app-eselect/eselect-pinentry - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - gnome-keyring? ( app-crypt/libsecret ) - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) -" -DEPEND="${CDEPEND} - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - gnome-keyring? ( app-crypt/gcr ) -" - -REQUIRED_USE=" - gtk? ( !static ) - qt5? ( !static ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch" - "${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_with caps libcap) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt5 pinentry-qt) \ - MOC="$(qt5_get_bindir)"/moc -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 -} - -pkg_postinst() { - if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - fi - - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} diff --git a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild deleted file mode 100644 index 86f29751d3f8..000000000000 --- a/app-crypt/pinentry/pinentry-1.0.0-r3.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/index.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps emacs gnome-keyring gtk ncurses qt5 static" - -CDEPEND=" - app-eselect/eselect-pinentry - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - gnome-keyring? ( app-crypt/libsecret ) - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) -" -DEPEND="${CDEPEND} - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - gnome-keyring? ( app-crypt/gcr ) -" - -REQUIRED_USE=" - gtk? ( !static ) - qt5? ( !static ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" - "${FILESDIR}/${P}-build.patch" - "${FILESDIR}/${P}-Disable-tooltips-in-keyboard-grabbing-mode.patch" - "${FILESDIR}/${P}-gtk2-Fix-a-problem-with-fvwm.patch" - "${FILESDIR}/${P}-make-icon-work-under-Plasma-Wayland.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_with caps libcap) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt5 pinentry-qt) \ - MOC="$(qt5_get_bindir)"/moc -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 -} - -pkg_postinst() { - if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - fi - - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} diff --git a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild deleted file mode 100644 index cf2bbd6858a8..000000000000 --- a/app-crypt/pinentry/pinentry-1.1.0-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/index.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps emacs gnome-keyring gtk ncurses qt5 static" - -CDEPEND=" - app-eselect/eselect-pinentry - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - gnome-keyring? ( app-crypt/libsecret ) - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) -" -DEPEND="${CDEPEND} - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - gnome-keyring? ( app-crypt/gcr ) -" - -REQUIRED_USE=" - gtk? ( !static ) - qt5? ( !static ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch" - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_with caps libcap) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt5 pinentry-qt) \ - MOC="$(qt5_get_bindir)"/moc -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 -} - -pkg_postinst() { - if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - fi - - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} diff --git a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild b/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild deleted file mode 100644 index 5b9da6b3a473..000000000000 --- a/app-crypt/pinentry/pinentry-1.1.0-r2.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools flag-o-matic qmake-utils toolchain-funcs - -DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol" -HOMEPAGE="https://gnupg.org/aegypten2/index.html" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps emacs gnome-keyring fltk gtk ncurses qt5 static" - -CDEPEND=" - app-eselect/eselect-pinentry - >=dev-libs/libassuan-2.1 - >=dev-libs/libgcrypt-1.6.3 - >=dev-libs/libgpg-error-1.17 - caps? ( sys-libs/libcap ) - fltk? ( x11-libs/fltk ) - gnome-keyring? ( app-crypt/libsecret ) - gtk? ( x11-libs/gtk+:2 ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - static? ( >=sys-libs/ncurses-5.7-r5:0=[static-libs,-gpm] ) -" -DEPEND="${CDEPEND} - sys-devel/gettext - virtual/pkgconfig -" -RDEPEND="${CDEPEND} - gnome-keyring? ( app-crypt/gcr ) -" - -REQUIRED_USE=" - gtk? ( !static ) - qt5? ( !static ) -" - -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-make-icon-work-under-Plasma-Wayland.patch" - "${FILESDIR}/${PN}-0.8.2-ncurses.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - use static && append-ldflags -static - [[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11 - - export QTLIB="$(qt5_get_libdir)" - - econf \ - --enable-pinentry-tty \ - $(use_with caps libcap) \ - $(use_enable emacs pinentry-emacs) \ - $(use_enable fltk pinentry-fltk) \ - $(use_enable gnome-keyring libsecret) \ - $(use_enable gnome-keyring pinentry-gnome3) \ - $(use_enable gtk pinentry-gtk2) \ - $(use_enable ncurses pinentry-curses) \ - $(use_enable ncurses fallback-curses) \ - $(use_enable qt5 pinentry-qt) \ - MOC="$(qt5_get_bindir)"/moc -} - -src_install() { - default - rm -f "${ED}"/usr/bin/pinentry || die - - use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt4 -} - -pkg_postinst() { - if ! has_version 'app-crypt/pinentry' || has_version '=2.6.9 support memory locking for unprivileged processes." - elog "The soft resource limit for memory locking specifies the limit an" - elog "unprivileged process may lock into memory. You can also use POSIX" - elog "capabilities to allow pinentry to lock memory. To do so activate the caps" - elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of" - elog "your users." - fi - - eselect pinentry update ifunset -} - -pkg_postrm() { - eselect pinentry update ifunset -} -- cgit v1.2.3