pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pinentry-fltk: remove, imported to security/pinentry-fltk
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <tk%giga.or.at@localhost>
Pushed By: wiz
Date: Wed Feb 13 18:44:11 2019 +0100
Changeset: 276464533101924dca31801c247862b5d1c25db7
Removed Files:
pinentry-fltk/COMMIT_MSG
pinentry-fltk/DESCR
pinentry-fltk/Makefile
pinentry-fltk/PLIST
pinentry-fltk/TODO
pinentry-fltk/patches/patch-fltk_main.cxx
Log Message:
pinentry-fltk: remove, imported to security/pinentry-fltk
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=276464533101924dca31801c247862b5d1c25db7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
pinentry-fltk/COMMIT_MSG | 298 ------------------------------
pinentry-fltk/DESCR | 4 -
pinentry-fltk/Makefile | 22 ---
pinentry-fltk/PLIST | 2 -
pinentry-fltk/TODO | 9 -
pinentry-fltk/patches/patch-fltk_main.cxx | 87 ---------
6 files changed, 422 deletions(-)
diffs:
diff --git a/pinentry-fltk/COMMIT_MSG b/pinentry-fltk/COMMIT_MSG
deleted file mode 100644
index 84911909fb..0000000000
--- a/pinentry-fltk/COMMIT_MSG
+++ /dev/null
@@ -1,298 +0,0 @@
-Shipped with patches that were merged upstream after 1.1.0 Release
-- Keyboard shortcuts are not recognized (https://dev.gnupg.org/T4336)
-- Format string handling (https://dev.gnupg.org/T4337)
-
-
-Changelog for version 1.1.0
-===========================
-
-2017-12-03 Werner Koch <wk%gnupg.org@localhost>
-
- Release 1.1.0.
- + commit 02df3d26b986c8f2850eeba47efcb3aca9d5dbcb
-
-
-2017-11-22 Damien Goutte-Gattat <dgouttegattat%incenp.org@localhost>
- "deloptes" <deloptes%gmail.com@localhost>
-
- tqt: Add a TQt-based pinentry.
- + commit 985e5cad6f60de8e60d8ae410cffcd7e2d84f3a2
- * NEWS: Update.
- * Makefile.am: Add new tqt subdirectory.
- * configure.ac: Add --enable-pinentry-tqt option.
- * tqt/Makefile.am: New file.
- * tqt/main.cpp: New file.
- * tqt/pinentrydialog.cpp: New file.
- * tqt/pinentrydialog.h: New file.
- * tqt/secqinternal.cpp: New file.
- * tqt/secqinternal_p.h: New file.
- * tqt/secqlineedit.cpp: New file.
- * tqt/secqlineedit.h: New file.
- * tqt/secqstring.cpp: New file.
- * tqt/secqstring.h: New file.
-
-2017-11-21 Werner Koch <wk%gnupg.org@localhost>
-
- w32: Allow building for Windows again.
- + commit 8ea3a6c3f8e72ebece2af9b1b05ea1da4865a786
- * pinentry/pinentry.c [W32]: Do not include utsname.h
- (WITH_UTF8_CONVERSION): New macro.
- (lc_ctype_unknown_warning): Move that var to the top and define only
- if needed.
- (pinentry_utf8_to_local, pinentry_local_to_utf8): Simplyfy by using
- the new macro.
- (get_cmdline) [W32]: Do not build.
- (get_pid_name_for_uid) [W32]: Do not build.
- (pinentry_get_title) [W32]: Do not use the new utsname code.
- (option_handler) <debug-wait>: Ignore for any Windows version.
-
-2017-11-20 Werner Koch <wk%gnupg.org@localhost>
-
- Add SPDX-License-Identifier to most files.
- + commit 622f876784239c9524a598e6486181bcd0ee64b2
-
-
- Add copyright info for AUTHORS.
- + commit 738ab548f13cc032f01ca5da1f8dc3ea221b209d
-
-
-2017-11-16 Damien Goutte-Gattat <dgouttegattat%incenp.org@localhost>
-
- fltk: Fix compilation and distcheck errors.
- + commit 89ae5378d1cc54be0825bcfa3ea567b1caa4a247
- * fltk/Makefile.am (AM_CXXFLAGS): Add -std=c++11 flag.
- (pinentry_fltk_SOURCES): Add header files.
- (EXTRA_DIST): Add icon files.
- * .gitignore: Ignore autoconf-generated files in fltk/.
-
-2017-10-19 Daniel Kahn Gillmor <dkg%fifthhorseman.net@localhost>
-
- core: Expect (and verify) a uid on "owner" option.
- + commit 6aafa61b199ab9091d6c9e190129f2ead2a647c7
- * pinentry/pinentry.h (struct pinentry): Add field 'owner_uid'.
- * pinentry/pinentry.c (pinentry_reset): Handle this new field.
- (get_pid_name_for_uid): New. Atomic check for the base process name
- contingent on process ownership.
- (pinentry_get_title): Only scan for full commandline if the process
- actually belongs to the claimed uid.
- (option_handler): Option "owner" now expects "pid/uid hostname".
-
-2017-10-12 Daniel Kahn Gillmor <dkg%fifthhorseman.net@localhost>
-
- core: Only scan for the command line if probably on the same host.
- + commit 1f5b351531205214e9513a0aed170660dc822ceb
- * pinentry/pinentry.c (pinentry_get_title): Check the current hostname
- and make sure it matches. If it does not, do not bother looking for
- the command line.
-
- core: Clean up command line extraction.
- + commit 242b658289488696d371c639c1da631712bd774c
- * pinentry/pinentry.c (get_cmdline): Avoid trailing space, and return
- NULL when no bytes were read from /proc.
-
- tty: correct comments.
- + commit d7c54372512fbbd77709a3ea913b902061e5d45d
- * tty/Makefile.am, tty/pinentry-tty.c: comments were copy/pasted from
- pinentry-curses; correcting them.
-
-2017-08-23 Damien Goutte-Gattat <dgouttegattat%incenp.org@localhost>
-
- gtk: Really always set the window as transient.
- + commit 2b1fb2f30a94a967dacec298e3c7d8a80b4c3194
- * gtk+-2/pinentry-gtk-2.c (make_transient): Set the window as
- transient even if we do not grab the keyboard.
-
-2017-08-23 Marcus Brinkmann <marcus.brinkmann%ruhr-uni-bochum.de@localhost>
-
- core: Supress compiler warnings.
- + commit 858bde1fbbc5e14f2d6410da05869188bdc36ee3
- * pinentry/password-cache.c (password_cache_save, password_cache_lookup,
- password_cache_clear) [!HAVE_LIBSECRET]: Suppress unused parameter
- warnings.
-
-2017-08-04 Damien Goutte-Gattat <dgouttegattat%incenp.org@localhost>
-
- gtk: Disable tooltips in keyboard-grabbing mode.
- + commit 1590b664d88be8386a4664c2994b685187d1eb25
- * gtk+-2:/pinentry-gtk-2.c (show_hide_button): Do not show the
- tooltip if we attempt to grab the keyboard.
- (create_window): Likewise.
-
-2017-07-12 Daiki Ueno <ueno%gnu.org@localhost>
-
- doc: Make Emacs frontend description more accurate.
- + commit ebfa54e6044420ae12a090cdef9df7e7b0d961d2
- * doc/pinentry.texi (Front ends): Remove false assertions on
- insecurity of Emacs, and mention allow-emacs-pinentry option of
- gpg-agent.
-
-2017-07-12 Marcus Brinkmann <marcus.brinkmann%ruhr-uni-bochum.de@localhost>
-
- core: Disable "save passphrase" checkbox without secret service.
- + commit e57bcb7a2acff3a61a342d24e6a55407bf736631
- * pinentry/password-cache.c (password_cache_lookup): New argument
- FATAL_ERROR. Set it on fatal error.
- * pinentry/password-cache.h (password_cache_lookup): New argument
- FATAL_ERROR in declaration.
- * pinentry/pinentry.c (cmd_getpin): On fatal error, disallow
- external password store.
- * NEWS: Update.
-
-2017-07-11 Alon Bar-Lev <alon.barlev%gmail.com@localhost>
-
- Use pkg-config consistently.
- + commit 6053cb4f3873897acf5d899bc6f02046d0748a0f
- * configure.ac: Invoke PKG_PROG_PKG_CONFIG. Consistently use
- PKG_CHECK_MODULES for GTK+2.0, Gnome 3 and libsecret.
- * gnome3/Makefile.am (AM_CPPFLAGS, LDADD): Adjust Gnome 3 flags.
- * gtk+-2/Makefile.am (AM_CPPFLAGS, LDADD): Adjust Gtk+2.0 flags.
-
-2017-07-11 Marcus Brinkmann <marcus.brinkmann%ruhr-uni-bochum.de@localhost>
-
- curses: Add option to beep or flash terminal on dialog.
- + commit 1dba96fafa123f3631c0a50bb01835306c23b903
- * pinentry/pinentry-curses.c (dialog_run): Beep or flash terminal.
- * pinentry/pinentry.c (pinentry_reset): Reset ttyalert option.
- (pinentry_parse_opts): Parse option ttyalert.
- (option_handler): Handle option ttyalert.
- * pinentry/pinentry.h (struct pinentry): New option ttyalert.
-
-2017-07-05 Damien Goutte-Gattat <dgouttegattat%incenp.org@localhost>
-
- gtk: Always set the window as transient.
- + commit f69dadc6ccea7672869436291ab5c1f58d545466
- * gtk+-2/pinentry-gtk-2.c (create_window): Setup the make_transient
- callback whether we ask for a passphrase or not.
-
-2017-05-03 Andre Heinecke <aheinecke%intevation.de@localhost>
-
- qt: Improve width of pinentryconfirm.
- + commit 4101806bf73caf25c8ce4e455b154901da1fe788
- * qt/pinentryconfirm.cpp (PinentryConfirm::showEvent): Add spacer
- item for text width.
-
- qt: Fix build with Qt4.
- + commit 8bf41fe086438de9fa223ccf4162ed9d98e54646
- * qt/main.cpp (main): Don't use Q_NULLPTR.
-
-2017-03-08 Justus Winter <justus%gnupg.org@localhost>
-
- fltk: Remove commented-out code.
- + commit 5c3f796798d655b5583257f9dfc81ae9c1427fb3
- * fltk/main.cxx: Remove commented-out code.
-
- fltk: Fix warning.
- + commit 2b2bbc9f67115baf518514281d3911b727b1caf9
- * fltk/main.cxx (fltk_cmd_handler): Use a 'std::unique_ptr' instead of
- a deprecated 'std::auto_ptr'.
-
-2017-03-08 Anatoly madRat L. Berenblit <madrat-%users.noreply.github.com@localhost>
-
- fltk: Add a FLTK-based pinentry.
- + commit 6c45eed62214b44fcc11e642b19df7b6ca0da0bd
- * NEWS: Update.
- * Makefile.am: Add new subdirectory.
- * configure.ac: Add configuration for FLTK.
- * fltk/Makefile.am: New file.
- * fltk/encrypt.xpm: Likewise.
- * fltk/icon.xpm: Likewise.
- * fltk/main.cxx: Likewise.
- * fltk/passwindow.cxx: Likewise.
- * fltk/passwindow.h: Likewise.
- * fltk/pinwindow.cxx: Likewise.
- * fltk/pinwindow.h: Likewise.
- * fltk/qualitypasswindow.cxx: Likewise.
- * fltk/qualitypasswindow.h: Likewise.
-
-2017-02-13 Andre Heinecke <aheinecke%intevation.de@localhost>
-
- qt: Fix pinentry-curses fallback for qt5.
- + commit cd7b35e8ff106993b9ce98ea99a5210d637f3452
- * qt/main.cpp (main): Initialize QApplication later.
-
-2017-02-03 Werner Koch <wk%gnupg.org@localhost>
-
- core: Show the command line in the titlebar.
- + commit e467a000f87e87582f5838964b6f1e0a960d4445
- * pinentry/pinentry.c (get_cmdline): New.
- (pinentry_get_title): Add the cmdline to the title.
-
- Use a shared function to construct the title.
- + commit 36d32fbdedb07b285d01871b3ee66400c81681d3
- * pinentry/pinentry.c (pinentry_get_title): New.
- * qt/main.cpp (qt_cmd_handler): Use that function for the title.
- * tty/pinentry-tty.c (confirm, password): Ditto.
- * gnome3/pinentry-gnome3.c (create_prompt): Ditto.
- * gtk+-2/pinentry-gtk-2.c (create_window): Ditto.
- * pinentry/pinentry-emacs.c (set_labels): Ditto.
-
- gtk: Unless SETTITLE is used show the pid in the titlebar.
- + commit c0d60e130b9bbd21801c8e71e80ab7c36f4ad6bd
- * gtk+-2/pinentry-gtk-2.c (create_window): Display the pid as title.
-
- core: New Assuan option "owner".
- + commit 61cde37b3e6a41bd24476d3c285288c12da0ed60
- * pinentry/pinentry.h (struct pinentry): Add fields 'owner_pid' and
- 'owner_host'.
- * pinentry/pinentry.c (pinentry_reset): Take care of these fields.
- (option_handler): New option "owner".
-
- curses: Do not return OK on error.
- + commit ce745a292192b01203ba5f557205a6f000bff953
- * pinentry/pinentry.c (cmd_confirm): Take care not to return OK if the
- RESULT is negative.
- * pinentry/pinentry-curses.c (dialog_create): Amend error reporting by
- setting specific_err_loc.
- (dialog_run): Use new var confirm_mode for clearness. In confirm mode
- return Cancel instead of error. This is how the gtk Pinentry does it.
-
- core: New command getinfo/ttyinfo.
- + commit cd45d74d07512f8ec8d2b3306a1804457dd12964
- * pinentry/pinentry.c (remember_display): New var.
- (pinentry_have_display): Peek at --display.
- (pinentry_parse_opts): Set pinentry.display.
- (cmd_getinfo): Add sub-command "ttyinfo".
-
-2017-02-03 Werner Koch <wk%gnupg.org@localhost>
- Vincent Lefevre <vincent%vinc17.net@localhost>
-
- gtk2: Fix a problem with fvwm.
- + commit b0e0bdeac5d40ca645afc9017778b39a26303523
- * gtk+-2/pinentry-gtk-2.c (grab_pointer): Take care of
- GDK_GRAB_ALREADY_GRABBED.
-
-2017-01-16 Justus Winter <justus%g10code.com@localhost>
-
- gnome3: Use the program name as default title.
- + commit 8e3aa3204e74e8d7a7538e0d0f04e555f140131b
- * gnome3/pinentry-gnome3.c (create_prompt): If no title is requested,
- use the program name as the default title. This mimics what the GTK+2
- variant does (although the GTK+2 pinentry seems to use
- basename(argv[0])).
-
-2017-01-13 NIIBE Yutaka <gniibe%fsij.org@localhost>
-
- gnome3: Fix CONFIRM condition.
- + commit c725fdd260b0c2291660ff954e6b2250006ec08f
- * gnome3/pinentry-gnome3.c (gnome3_cmd_handler): No buffer for PIN means
- it's not passphrase input but confirmation dialog.
-
-2016-12-19 Raphael Kubo da Costa <rakuco%FreeBSD.org@localhost>
-
- Qt: Make sure extended grep is used with '|'.
- + commit 1acb06aac3dd08f573d7c2e3be75226346e61ed2
- * m4/qt.m4: Use grep -E when using the alternation character.
-
-2016-12-01 Werner Koch <wk%gnupg.org@localhost>
-
- Fix linkage problem in tty and emacs pinentries.
- + commit c5c7bee68730c9f66a27f9bb0d023480623a2bfb
- * 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.
diff --git a/pinentry-fltk/DESCR b/pinentry-fltk/DESCR
deleted file mode 100644
index 51c5dfc9d8..0000000000
--- a/pinentry-fltk/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-This is a collection of simple PIN or passphrase entry dialogs which
-utilize the Assuan protocol as described by the aegypten project.
-It provides programs for several graphical toolkits, such as FLTK,
-GTK+ and QT, as well as for the console, using curses.
diff --git a/pinentry-fltk/Makefile b/pinentry-fltk/Makefile
deleted file mode 100644
index cb46a34c64..0000000000
--- a/pinentry-fltk/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD$
-
-PKGNAME= ${DISTNAME:S/pinentry-/pinentry-fltk-/}
-COMMENT= Applications for entering PINs or Passphrases, FLTK enabled
-
-.include "../../security/pinentry/Makefile.common"
-
-USE_LANGUAGES+= c c++
-USE_TOOLS+= pkg-config
-
-CONFIGURE_ARGS+= --disable-pinentry-gtk2
-CONFIGURE_ARGS+= --disable-pinentry-qt
-CONFIGURE_ARGS+= --disable-pinentry-curses
-CONFIGURE_ARGS+= --disable-pinentry-emacs
-#CONFIGURE_ARGS+= --disable-fallback-curses
-CONFIGURE_ARGS+= --disable-pinentry-gnome3
-CONFIGURE_ARGS+= --disable-libsecret
-
-INSTALL_DIRS= fltk
-
-.include "../../x11/fltk13/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/pinentry-fltk/PLIST b/pinentry-fltk/PLIST
deleted file mode 100644
index 37d56431c3..0000000000
--- a/pinentry-fltk/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD$
-bin/pinentry-fltk
diff --git a/pinentry-fltk/TODO b/pinentry-fltk/TODO
deleted file mode 100644
index c135da4282..0000000000
--- a/pinentry-fltk/TODO
+++ /dev/null
@@ -1,9 +0,0 @@
-[X] Fix format string handling for fl_message() and fl_choice()
- => Patch added (taken from Debian pinentry package)
-[X] Keyboard shortcut handling (via '_') doesn't work
- => Patch added
-[X] Sent patches to upstream
- https://dev.gnupg.org/T4336
- https://dev.gnupg.org/T4337
- Both patches now merged upstream (can be removed for next release)
-
diff --git a/pinentry-fltk/patches/patch-fltk_main.cxx b/pinentry-fltk/patches/patch-fltk_main.cxx
deleted file mode 100644
index d6af2ef915..0000000000
--- a/pinentry-fltk/patches/patch-fltk_main.cxx
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD$
-
-Handle '_' in labels as keyboard shortcuts (used by GPG2).
-Fix format string handling (Patch from Debian).
-
---- fltk/main.cxx.orig 2017-12-03 16:13:05.000000000 +0000
-+++ fltk/main.cxx
-@@ -78,6 +78,44 @@ static std::string escape_accel_utf8(con
- return result;
- }
-
-+// For button labels
-+// Accelerator '_' (used e.g. by GPG2) is converted to '&' (for FLTK)
-+// '&' is escaped as in escape_accel_utf8()
-+static std::string convert_accel_utf8(const char *s)
-+{
-+ static bool last_was_underscore = false;
-+ std::string result;
-+ if (NULL != s)
-+ {
-+ result.reserve(strlen(s));
-+ for (const char *p = s; *p; ++p)
-+ {
-+ // & => &&
-+ if ('&' == *p)
-+ result.push_back(*p);
-+ // _ => & (handle '__' as escaped underscore)
-+ if ('_' == *p)
-+ {
-+ if (last_was_underscore)
-+ {
-+ result.push_back(*p);
-+ last_was_underscore = false;
-+ }
-+ else
-+ last_was_underscore = true;
-+ }
-+ else
-+ {
-+ if (last_was_underscore)
-+ result.push_back('&');
-+ result.push_back(*p);
-+ last_was_underscore = false;
-+ }
-+ }
-+ }
-+ return result;
-+}
-+
- class cancel_exception
- {
-
-@@ -111,8 +149,8 @@ static int fltk_cmd_handler(pinentry_t p
- // TODO: Add parent window to pinentry-fltk window
- //if (pe->parent_wid){}
- std::string title = !is_empty(pe->title)?pe->title:PGMNAME;
-- std::string ok = escape_accel_utf8(pe->ok?pe->ok:(pe->default_ok?pe->default_ok:OK_STRING));
-- std::string cancel = escape_accel_utf8(pe->cancel?pe->cancel:(pe->default_cancel?pe->default_cancel:CANCEL_STRING));
-+ std::string ok = convert_accel_utf8(pe->ok?pe->ok:(pe->default_ok?pe->default_ok:OK_STRING));
-+ std::string cancel = convert_accel_utf8(pe->cancel?pe->cancel:(pe->default_cancel?pe->default_cancel:CANCEL_STRING));
-
- if (!!pe->pin) // password (or confirmation)
- {
-@@ -241,12 +279,12 @@ static int fltk_cmd_handler(pinentry_t p
- if (pe->one_button)
- {
- fl_ok = ok.c_str();
-- fl_message(message);
-+ fl_message("%s", message);
- result = 1; // OK
- }
- else if (pe->notok)
- {
-- switch (fl_choice(message, ok.c_str(), cancel.c_str(), pe->notok))
-+ switch (fl_choice("%s", ok.c_str(), cancel.c_str(), pe->notok, message))
- {
- case 0: result = 1; break;
- case 2: result = 0; break;
-@@ -256,7 +294,7 @@ static int fltk_cmd_handler(pinentry_t p
- }
- else
- {
-- switch (fl_choice(message, ok.c_str(), cancel.c_str(), NULL))
-+ switch (fl_choice("%s", ok.c_str(), cancel.c_str(), NULL, message))
- {
- case 0: result = 1; break;
- default:
Home |
Main Index |
Thread Index |
Old Index