Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 9

fpm2.changes Changed

@@ -1,4 +1,37 @@
 -------------------------------------------------------------------
+Sat Sep  5 10:42:34 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
+
+- Update to version 0.90
+  * adapted for GTK3
+  * new icon (thanks Wendell Fernandes)
+  * added dependency on nettle library
+  * added ciphers with authenticated encryption with associated
+    data mode
+  * added configurable PBKDF2 iterations, new default set at
+    250000
+  * added new option for replace entries when import plaintext
+    XML
+  * added configurable time for clear after paste
+  * added Hebrew translation by Genghis Khan
+  * added Polish translation by Robert
+  * use AES-256 GCM as default cipher
+  * use new file format
+  * updated Basque translation by Ales Zabala Alava (Shagi)
+  * fixed incorrectly saving columns order in ini file
+  * fixed cursor in treeview after entry is renamed or category
+    changed
+  * fixed minimizing when tray icon is disabled
+  * fixed stale lock when user run launcher and then quit FPM2
+  * removed ability to read, import and convert old FPM data file
+  * removed built-in AES-256 and PBKDF2 function
+  * better clipboard handling
+  * better file locking
+  * Autotools update and cleanup
+  * code and UI cleanup
+- Switch to GTK3 build
+- Spec cleanup
+
+-------------------------------------------------------------------
 Tue May 29 05:24:26 UTC 2012 - pascal.bleser@opensuse.org
 
 - removed the licenses hack, see

fpm2.spec Changed

@@ -1,8 +1,10 @@
-# vim: set sw=4 ts=4 et:
-
-# Copyright (c) 2008-2010 Toni "oc2pus" Graffy
-# Copyright (c) 2011 Detlef Reichelt <detlef@links2linux.org>
+#
+# spec file for package fpm2
+#
+# Copyright (c) 2020 Packman Team <packman@links2linux.de>
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
+# Copyright (c) 2011 Detlef Reichelt <detlef@links2linux.org>
+# Copyright (c) 2008-2010 Toni "oc2pus" Graffy
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -13,26 +15,28 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.links2linux.org
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
+#
+
 
-Summary:        Password manager with GTK2 GUI
 Name:           fpm2
-Version:        0.79
-Release:        0.pm.1
-License:        GPL-2.0+
+Version:        0.90
+Release:        0
+Summary:        Password manager with GTK3 GUI
+License:        GPL-2.0-or-later
 Group:          Productivity/Security
-Source:         http://als.regnet.cz/%{name}/download/%{name}-%{version}.tar.bz2
-URL:            http://als.regnet.cz/fpm2/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:  intltool
+URL:            https://als.regnet.cz/fpm2/
+Source:         https://als.regnet.cz/%{name}/download/%{name}-%{version}.tar.xz
 BuildRequires:  gettext
-BuildRequires:  gtk2-devel
-BuildRequires:  libxml2-devel
+BuildRequires:  intltool
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(nettle)
 
 %description
 Figaro's Password Manager 2 is a program that allows you to securely
-store the passwords using GTK2 interface.
+store the passwords using GTK3 interface.
 
 Features include:
 * Passwords are encrypted with the blowfish algorithm.
@@ -51,43 +55,29 @@
   You can even have it avoid ambiguous characters such as a capital
   O or the number zero.
 
-
 %lang_package
 
 %prep
-%setup -q
+%autosetup
 
 %build
-export CPPFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure
-%__make %{?_smp_flags}
+%make_build
 
 %install
-%makeinstall
-
-# icon
-%__install -dm 755 %{buildroot}%{_datadir}/pixmaps
-%__install -m 644 data/pixmaps/logo.png \
-    %{buildroot}%{_datadir}/pixmaps/%{name}.png
-
+%make_install
 %suse_update_desktop_file -i %{name} Utility Security
-
 %find_lang %{name}
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %files
-%defattr(-, root, root)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO
-%doc %{_mandir}/man1/%{name}.1*
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README TODO
+%{_mandir}/man1/%{name}.1%{?ext_man}
 %{_bindir}/%{name}
-%{_datadir}/pixmaps/*.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
 %dir %{_datadir}/pixmaps/%{name}
-%{_datadir}/pixmaps/%{name}/*.png
-%{_datadir}/applications/*.desktop
+%{_datadir}/pixmaps/%{name}/logo.png
+%{_datadir}/applications/%{name}.desktop
 
 %files lang -f %{name}.lang

fpm2-0.79.tar.bz2/fpm2.glade Deleted

@@ -1,5270 +0,0 @@
-<?xml version="1.0" standalone="no"?> 
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="app_safe">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Figaro's Password Manager 2</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER</property>
-  <property name="modal">False</property>
-  <property name="default_width">500</property>
-  <property name="default_height">350</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon">logo.png</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="on_app_safe_destroy" last_modification_time="Sat, 19 Apr 2008 22:36:31 GMT"/>
-  <signal name="delete_event" handler="on_app_safe_delete_event" last_modification_time="Sat, 19 Apr 2008 22:36:42 GMT"/>
-  <signal name="window_state_event" handler="on_app_safe_window_state_event" last_modification_time="Thu, 05 Jun 2008 11:48:55 GMT"/>
-  <signal name="focus_in_event" handler="on_app_safe_focus_in_event" last_modification_time="Thu, 12 Jun 2008 06:10:21 GMT"/>
-  <signal name="focus_out_event" handler="on_app_safe_focus_out_event" last_modification_time="Thu, 12 Jun 2008 06:10:32 GMT"/>
-
-  <child>
-    <widget class="GtkVBox" id="vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkMenuBar" id="menubar1">
-	  <property name="visible">True</property>
-	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
-	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="file1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_File</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="file1_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="new_file">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-new</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_new_file_activate" last_modification_time="Thu, 12 Feb 2009 07:00:33 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="open1">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-open</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_open1_activate" last_modification_time="Sat, 19 Apr 2008 23:08:21 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="save1">
-		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
-		      <property name="label">gtk-save</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_save1_activate" last_modification_time="Sat, 19 Apr 2008 23:08:21 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="save_as1">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-save-as</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_save_as1_activate" last_modification_time="Sat, 19 Apr 2008 23:08:21 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="oddělovač5">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="import_passwords1">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Import Passwords</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_import_passwords1_activate" last_modification_time="Sat, 19 Apr 2008 23:08:21 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image1011">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-convert</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="export1">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Export Passwords</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_export1_activate" last_modification_time="Sat, 19 Apr 2008 23:08:21 GMT"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image1012">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-harddisk</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="hide_to_tray">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Minimize to tray</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_hide_to_tray_activate" last_modification_time="Thu, 05 Jun 2008 06:26:15 GMT"/>
-		      <accelerator key="w" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image1013">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-leave-fullscreen</property>
-			  <property name="icon_size">1</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="exit1">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-quit</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_exit1_activate" last_modification_time="Sat, 19 Apr 2008 23:08:21 GMT"/>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkMenuItem" id="edit1">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Edit</property>
-	      <property name="use_underline">True</property>
-
-	      <child>
-		<widget class="GtkMenu" id="edit1_menu">
-
-		  <child>
-		    <widget class="GtkImageMenuItem" id="copy_pass">
-		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
-		      <property name="label" translatable="yes">Copy _Password</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_copy_pass_activate" last_modification_time="Sat, 19 Apr 2008 23:08:21 GMT"/>
-		      <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image1014">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-copy</property>
-			  <property name="icon_size">1</property>

fpm2-0.79.tar.bz2/fpm2.gladep Deleted

fpm2-0.79.tar.bz2/src/bithelp.h Deleted

@@ -1,58 +0,0 @@
-/* FIGARO'S PASSWORD MANAGER (FPM)
- * Copyright (C) 2000 John Conneely except portions taken from GnuPG
- * 
- * FPM is open source / free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * FPM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- * bithelp.h  -  Some bit manipulation helpers
- *	Copyright (C) 1999 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-#ifndef G10_BITHELP_H
-#define G10_BITHELP_H
-
-
-/****************
- * Rotate a 32 bit integer by n bytes
- */
-#if defined(__GNUC__) && defined(__i386__)
-static inline u32
-rol( u32 x, int n)
-{
-	__asm__("roll %%cl,%0"
-		:"=r" (x)
-		:"0" (x),"c" (n));
-	return x;
-}
-#else
-  #define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) )
-#endif
-
-
-#endif /*G10_BITHELP_H*/

fpm2-0.79.tar.bz2/src/blowfish.c Deleted

@@ -1,610 +0,0 @@
-/* FIGARO'S PASSWORD MANAGER (FPM)
- * Copyright (C) 2000 John Conneely except for portions taken from GnuPG.
- * 
- * FPM is open source / free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * FPM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- * 
- * This file was taken from GnuPG.  I've only modified it where necessary
- * to make it compile with the rest of FPM.  Changes made:
- * - Removed GPG specific include files
- *
- * blowfish.c  -  Blowfish encryption
- *	Copyright (C) 1998 Free Software Foundation, Inc.
- *
- * For a description of the algorithm, see:
- *   Bruce Schneier: Applied Cryptography. John Wiley & Sons, 1996.
- *   ISBN 0-471-11709-9. Pages 336 ff.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-/* Test values:
- * key	  "abcdefghijklmnopqrstuvwxyz";
- * plain  "BLOWFISH"
- * cipher 32 4E D0 FE F4 13 A2 03
- *
- */
-
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include "gpg_trans.h"
-
-#define CIPHER_ALGO_BLOWFISH	 4  /* blowfish 128 bit key */
-
-#define FNCCAST_SETKEY(f)  (int(*)(void*, const byte*, unsigned))(f)
-#define FNCCAST_CRYPT(f)   (void(*)(void*, byte*, const byte*))(f)
-
-#define BLOWFISH_BLOCKSIZE 8
-#define BLOWFISH_ROUNDS 16
-
-typedef struct {
-    u32 s0256;
-    u32 s1256;
-    u32 s2256;
-    u32 s3256;
-    u32 pBLOWFISH_ROUNDS+2;
-} BLOWFISH_context;
-
-static int  bf_setkey( BLOWFISH_context *c, const byte *key, unsigned keylen );
-static void encrypt_block( BLOWFISH_context *bc, byte *outbuf, const byte *inbuf );
-static void decrypt_block( BLOWFISH_context *bc, byte *outbuf, const byte *inbuf );
-
-
-/* precomputed S boxes */
-static const u32 ks0256 = {
-    0xD1310BA6,0x98DFB5AC,0x2FFD72DB,0xD01ADFB7,0xB8E1AFED,0x6A267E96,
-    0xBA7C9045,0xF12C7F99,0x24A19947,0xB3916CF7,0x0801F2E2,0x858EFC16,
-    0x636920D8,0x71574E69,0xA458FEA3,0xF4933D7E,0x0D95748F,0x728EB658,
-    0x718BCD58,0x82154AEE,0x7B54A41D,0xC25A59B5,0x9C30D539,0x2AF26013,
-    0xC5D1B023,0x286085F0,0xCA417918,0xB8DB38EF,0x8E79DCB0,0x603A180E,
-    0x6C9E0E8B,0xB01E8A3E,0xD71577C1,0xBD314B27,0x78AF2FDA,0x55605C60,
-    0xE65525F3,0xAA55AB94,0x57489862,0x63E81440,0x55CA396A,0x2AAB10B6,
-    0xB4CC5C34,0x1141E8CE,0xA15486AF,0x7C72E993,0xB3EE1411,0x636FBC2A,
-    0x2BA9C55D,0x741831F6,0xCE5C3E16,0x9B87931E,0xAFD6BA33,0x6C24CF5C,
-    0x7A325381,0x28958677,0x3B8F4898,0x6B4BB9AF,0xC4BFE81B,0x66282193,
-    0x61D809CC,0xFB21A991,0x487CAC60,0x5DEC8032,0xEF845D5D,0xE98575B1,
-    0xDC262302,0xEB651B88,0x23893E81,0xD396ACC5,0x0F6D6FF3,0x83F44239,
-    0x2E0B4482,0xA4842004,0x69C8F04A,0x9E1F9B5E,0x21C66842,0xF6E96C9A,
-    0x670C9C61,0xABD388F0,0x6A51A0D2,0xD8542F68,0x960FA728,0xAB5133A3,
-    0x6EEF0B6C,0x137A3BE4,0xBA3BF050,0x7EFB2A98,0xA1F1651D,0x39AF0176,
-    0x66CA593E,0x82430E88,0x8CEE8619,0x456F9FB4,0x7D84A5C3,0x3B8B5EBE,
-    0xE06F75D8,0x85C12073,0x401A449F,0x56C16AA6,0x4ED3AA62,0x363F7706,
-    0x1BFEDF72,0x429B023D,0x37D0D724,0xD00A1248,0xDB0FEAD3,0x49F1C09B,
-    0x075372C9,0x80991B7B,0x25D479D8,0xF6E8DEF7,0xE3FE501A,0xB6794C3B,
-    0x976CE0BD,0x04C006BA,0xC1A94FB6,0x409F60C4,0x5E5C9EC2,0x196A2463,
-    0x68FB6FAF,0x3E6C53B5,0x1339B2EB,0x3B52EC6F,0x6DFC511F,0x9B30952C,
-    0xCC814544,0xAF5EBD09,0xBEE3D004,0xDE334AFD,0x660F2807,0x192E4BB3,
-    0xC0CBA857,0x45C8740F,0xD20B5F39,0xB9D3FBDB,0x5579C0BD,0x1A60320A,
-    0xD6A100C6,0x402C7279,0x679F25FE,0xFB1FA3CC,0x8EA5E9F8,0xDB3222F8,
-    0x3C7516DF,0xFD616B15,0x2F501EC8,0xAD0552AB,0x323DB5FA,0xFD238760,
-    0x53317B48,0x3E00DF82,0x9E5C57BB,0xCA6F8CA0,0x1A87562E,0xDF1769DB,
-    0xD542A8F6,0x287EFFC3,0xAC6732C6,0x8C4F5573,0x695B27B0,0xBBCA58C8,
-    0xE1FFA35D,0xB8F011A0,0x10FA3D98,0xFD2183B8,0x4AFCB56C,0x2DD1D35B,
-    0x9A53E479,0xB6F84565,0xD28E49BC,0x4BFB9790,0xE1DDF2DA,0xA4CB7E33,
-    0x62FB1341,0xCEE4C6E8,0xEF20CADA,0x36774C01,0xD07E9EFE,0x2BF11FB4,
-    0x95DBDA4D,0xAE909198,0xEAAD8E71,0x6B93D5A0,0xD08ED1D0,0xAFC725E0,
-    0x8E3C5B2F,0x8E7594B7,0x8FF6E2FB,0xF2122B64,0x8888B812,0x900DF01C,
-    0x4FAD5EA0,0x688FC31C,0xD1CFF191,0xB3A8C1AD,0x2F2F2218,0xBE0E1777,
-    0xEA752DFE,0x8B021FA1,0xE5A0CC0F,0xB56F74E8,0x18ACF3D6,0xCE89E299,
-    0xB4A84FE0,0xFD13E0B7,0x7CC43B81,0xD2ADA8D9,0x165FA266,0x80957705,
-    0x93CC7314,0x211A1477,0xE6AD2065,0x77B5FA86,0xC75442F5,0xFB9D35CF,
-    0xEBCDAF0C,0x7B3E89A0,0xD6411BD3,0xAE1E7E49,0x00250E2D,0x2071B35E,
-    0x226800BB,0x57B8E0AF,0x2464369B,0xF009B91E,0x5563911D,0x59DFA6AA,
-    0x78C14389,0xD95A537F,0x207D5BA2,0x02E5B9C5,0x83260376,0x6295CFA9,
-    0x11C81968,0x4E734A41,0xB3472DCA,0x7B14A94A,0x1B510052,0x9A532915,
-    0xD60F573F,0xBC9BC6E4,0x2B60A476,0x81E67400,0x08BA6FB5,0x571BE91F,
-    0xF296EC6B,0x2A0DD915,0xB6636521,0xE7B9F9B6,0xFF34052E,0xC5855664,
-    0x53B02D5D,0xA99F8FA1,0x08BA4799,0x6E85076A };
-
-static const u32 ks1256 = {
-    0x4B7A70E9,0xB5B32944,0xDB75092E,0xC4192623,0xAD6EA6B0,0x49A7DF7D,
-    0x9CEE60B8,0x8FEDB266,0xECAA8C71,0x699A17FF,0x5664526C,0xC2B19EE1,
-    0x193602A5,0x75094C29,0xA0591340,0xE4183A3E,0x3F54989A,0x5B429D65,
-    0x6B8FE4D6,0x99F73FD6,0xA1D29C07,0xEFE830F5,0x4D2D38E6,0xF0255DC1,
-    0x4CDD2086,0x8470EB26,0x6382E9C6,0x021ECC5E,0x09686B3F,0x3EBAEFC9,
-    0x3C971814,0x6B6A70A1,0x687F3584,0x52A0E286,0xB79C5305,0xAA500737,
-    0x3E07841C,0x7FDEAE5C,0x8E7D44EC,0x5716F2B8,0xB03ADA37,0xF0500C0D,
-    0xF01C1F04,0x0200B3FF,0xAE0CF51A,0x3CB574B2,0x25837A58,0xDC0921BD,
-    0xD19113F9,0x7CA92FF6,0x94324773,0x22F54701,0x3AE5E581,0x37C2DADC,
-    0xC8B57634,0x9AF3DDA7,0xA9446146,0x0FD0030E,0xECC8C73E,0xA4751E41,
-    0xE238CD99,0x3BEA0E2F,0x3280BBA1,0x183EB331,0x4E548B38,0x4F6DB908,
-    0x6F420D03,0xF60A04BF,0x2CB81290,0x24977C79,0x5679B072,0xBCAF89AF,
-    0xDE9A771F,0xD9930810,0xB38BAE12,0xDCCF3F2E,0x5512721F,0x2E6B7124,
-    0x501ADDE6,0x9F84CD87,0x7A584718,0x7408DA17,0xBC9F9ABC,0xE94B7D8C,
-    0xEC7AEC3A,0xDB851DFA,0x63094366,0xC464C3D2,0xEF1C1847,0x3215D908,
-    0xDD433B37,0x24C2BA16,0x12A14D43,0x2A65C451,0x50940002,0x133AE4DD,
-    0x71DFF89E,0x10314E55,0x81AC77D6,0x5F11199B,0x043556F1,0xD7A3C76B,
-    0x3C11183B,0x5924A509,0xF28FE6ED,0x97F1FBFA,0x9EBABF2C,0x1E153C6E,
-    0x86E34570,0xEAE96FB1,0x860E5E0A,0x5A3E2AB3,0x771FE71C,0x4E3D06FA,
-    0x2965DCB9,0x99E71D0F,0x803E89D6,0x5266C825,0x2E4CC978,0x9C10B36A,
-    0xC6150EBA,0x94E2EA78,0xA5FC3C53,0x1E0A2DF4,0xF2F74EA7,0x361D2B3D,
-    0x1939260F,0x19C27960,0x5223A708,0xF71312B6,0xEBADFE6E,0xEAC31F66,
-    0xE3BC4595,0xA67BC883,0xB17F37D1,0x018CFF28,0xC332DDEF,0xBE6C5AA5,
-    0x65582185,0x68AB9802,0xEECEA50F,0xDB2F953B,0x2AEF7DAD,0x5B6E2F84,
-    0x1521B628,0x29076170,0xECDD4775,0x619F1510,0x13CCA830,0xEB61BD96,
-    0x0334FE1E,0xAA0363CF,0xB5735C90,0x4C70A239,0xD59E9E0B,0xCBAADE14,
-    0xEECC86BC,0x60622CA7,0x9CAB5CAB,0xB2F3846E,0x648B1EAF,0x19BDF0CA,
-    0xA02369B9,0x655ABB50,0x40685A32,0x3C2AB4B3,0x319EE9D5,0xC021B8F7,
-    0x9B540B19,0x875FA099,0x95F7997E,0x623D7DA8,0xF837889A,0x97E32D77,
-    0x11ED935F,0x16681281,0x0E358829,0xC7E61FD6,0x96DEDFA1,0x7858BA99,
-    0x57F584A5,0x1B227263,0x9B83C3FF,0x1AC24696,0xCDB30AEB,0x532E3054,
-    0x8FD948E4,0x6DBC3128,0x58EBF2EF,0x34C6FFEA,0xFE28ED61,0xEE7C3C73,
-    0x5D4A14D9,0xE864B7E3,0x42105D14,0x203E13E0,0x45EEE2B6,0xA3AAABEA,
-    0xDB6C4F15,0xFACB4FD0,0xC742F442,0xEF6ABBB5,0x654F3B1D,0x41CD2105,
-    0xD81E799E,0x86854DC7,0xE44B476A,0x3D816250,0xCF62A1F2,0x5B8D2646,
-    0xFC8883A0,0xC1C7B6A3,0x7F1524C3,0x69CB7492,0x47848A0B,0x5692B285,
-    0x095BBF00,0xAD19489D,0x1462B174,0x23820E00,0x58428D2A,0x0C55F5EA,
-    0x1DADF43E,0x233F7061,0x3372F092,0x8D937E41,0xD65FECF1,0x6C223BDB,
-    0x7CDE3759,0xCBEE7460,0x4085F2A7,0xCE77326E,0xA6078084,0x19F8509E,
-    0xE8EFD855,0x61D99735,0xA969A7AA,0xC50C06C2,0x5A04ABFC,0x800BCADC,
-    0x9E447A2E,0xC3453484,0xFDD56705,0x0E1E9EC9,0xDB73DBD3,0x105588CD,
-    0x675FDA79,0xE3674340,0xC5C43465,0x713E38D8,0x3D28F89E,0xF16DFF20,
-    0x153E21E7,0x8FB03D4A,0xE6E39F2B,0xDB83ADF7 };
-
-static const u32 ks2256 = {
-    0xE93D5A68,0x948140F7,0xF64C261C,0x94692934,0x411520F7,0x7602D4F7,
-    0xBCF46B2E,0xD4A20068,0xD4082471,0x3320F46A,0x43B7D4B7,0x500061AF,
-    0x1E39F62E,0x97244546,0x14214F74,0xBF8B8840,0x4D95FC1D,0x96B591AF,
-    0x70F4DDD3,0x66A02F45,0xBFBC09EC,0x03BD9785,0x7FAC6DD0,0x31CB8504,
-    0x96EB27B3,0x55FD3941,0xDA2547E6,0xABCA0A9A,0x28507825,0x530429F4,
-    0x0A2C86DA,0xE9B66DFB,0x68DC1462,0xD7486900,0x680EC0A4,0x27A18DEE,
-    0x4F3FFEA2,0xE887AD8C,0xB58CE006,0x7AF4D6B6,0xAACE1E7C,0xD3375FEC,
-    0xCE78A399,0x406B2A42,0x20FE9E35,0xD9F385B9,0xEE39D7AB,0x3B124E8B,
-    0x1DC9FAF7,0x4B6D1856,0x26A36631,0xEAE397B2,0x3A6EFA74,0xDD5B4332,
-    0x6841E7F7,0xCA7820FB,0xFB0AF54E,0xD8FEB397,0x454056AC,0xBA489527,
-    0x55533A3A,0x20838D87,0xFE6BA9B7,0xD096954B,0x55A867BC,0xA1159A58,
-    0xCCA92963,0x99E1DB33,0xA62A4A56,0x3F3125F9,0x5EF47E1C,0x9029317C,
-    0xFDF8E802,0x04272F70,0x80BB155C,0x05282CE3,0x95C11548,0xE4C66D22,
-    0x48C1133F,0xC70F86DC,0x07F9C9EE,0x41041F0F,0x404779A4,0x5D886E17,
-    0x325F51EB,0xD59BC0D1,0xF2BCC18F,0x41113564,0x257B7834,0x602A9C60,
-    0xDFF8E8A3,0x1F636C1B,0x0E12B4C2,0x02E1329E,0xAF664FD1,0xCAD18115,
-    0x6B2395E0,0x333E92E1,0x3B240B62,0xEEBEB922,0x85B2A20E,0xE6BA0D99,
-    0xDE720C8C,0x2DA2F728,0xD0127845,0x95B794FD,0x647D0862,0xE7CCF5F0,
-    0x5449A36F,0x877D48FA,0xC39DFD27,0xF33E8D1E,0x0A476341,0x992EFF74,
-    0x3A6F6EAB,0xF4F8FD37,0xA812DC60,0xA1EBDDF8,0x991BE14C,0xDB6E6B0D,
-    0xC67B5510,0x6D672C37,0x2765D43B,0xDCD0E804,0xF1290DC7,0xCC00FFA3,
-    0xB5390F92,0x690FED0B,0x667B9FFB,0xCEDB7D9C,0xA091CF0B,0xD9155EA3,
-    0xBB132F88,0x515BAD24,0x7B9479BF,0x763BD6EB,0x37392EB3,0xCC115979,
-    0x8026E297,0xF42E312D,0x6842ADA7,0xC66A2B3B,0x12754CCC,0x782EF11C,
-    0x6A124237,0xB79251E7,0x06A1BBE6,0x4BFB6350,0x1A6B1018,0x11CAEDFA,
-    0x3D25BDD8,0xE2E1C3C9,0x44421659,0x0A121386,0xD90CEC6E,0xD5ABEA2A,
-    0x64AF674E,0xDA86A85F,0xBEBFE988,0x64E4C3FE,0x9DBC8057,0xF0F7C086,

fpm2-0.79.tar.bz2/src/gpg_trans.h Deleted

@@ -1,56 +0,0 @@
-/* FIGARO'S PASSWORD MANAGER 2 (FPM2)
- * Copyright (C) 2000 John Conneely
- * Copyright (C) 2009 Aleš Koval
- *
- * FPM is open source / free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * FPM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- * gpg_trans.h
- * I use blowfish.c, rijndael.c and sha256.c from GNU PG. This header file
- * is a hack to get it to compile.
- */
-
-#include <gtk/gtk.h>
-
-/* From types.h: */
-typedef guint32 u32; /* GPG used complex method to ensure 32 bit unsigned int.
-		      * Since this is a gnome app, we can take use guint32!
-		      */
-typedef guchar byte;
-
-/* From errors.h: */
-#define G10ERR_SELFTEST_FAILED 50
-#define G10ERR_WEAK_KEY       43
-#define G10ERR_WRONG_KEYLEN   44
-
-/* Using this instead of memset() to prevent possible optimalization. Taken from gnupg util.h */
-#define wipememory2(_ptr,_set,_len) do { volatile char *_vptr=(volatile char *)(_ptr); size_t _vlen=(_len); while(_vlen) { *_vptr=(_set); _vptr++; _vlen--; } } while(0)
-#define wipememory(_ptr,_len) wipememory2(_ptr,0,_len)
-
-const char *
-blowfish_get_info( int algo, size_t *keylen,
-                   size_t *blocksize, size_t *contextsize,
-                   int  (**setkeyf)( void *c, const byte *key, unsigned keylen ),
-                   void (**encryptf)( void *c, byte *outbuf, const byte *inbuf ),
-                   void (**decryptf)( void *c, byte *outbuf, const byte *inbuf )
-                 );
-
-const char *
-rijndael_get_info( int algo, size_t *keylen,
-		   size_t *blocksize, size_t *contextsize,
-		   int (**setkeyf)( void *c, const byte *key, unsigned keylen),
-		   void (**encryptf)(void *c, byte *outbuf, const byte *inbuf),
-		   void (**decryptf)(void *c, byte *outbuf, const byte *inbuf)
-		   );
-

fpm2-0.79.tar.bz2/src/rijndael.c Deleted

@@ -1,2202 +0,0 @@
-/* Rijndael (AES) for GnuPG
- *	Copyright (C) 2000, 2001 Free Software Foundation, Inc.
- *
- * This file is part of GnuPG.
- *
- * GnuPG is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GnuPG is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA.
- *******************************************************************
- * The code here is based on the optimized implementation taken from
- * http://www.esat.kuleuven.ac.be/~rijmen/rijndael/ on Oct 2, 2000,
- * which carries this notice:
- *------------------------------------------
- * rijndael-alg-fst.c   v2.3   April '2000
- *
- * Optimised ANSI C code
- *
- * authors: v1.0: Antoon Bosselaers
- *          v2.0: Vincent Rijmen
- *          v2.3: Paulo Barreto
- *
- * This code is placed in the public domain.
- *------------------------------------------
- */
-&#xc;
-#include <config.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h> /* for memcmp() */
-
-#include "gpg_trans.h"
-
-#define MAXKC			(256/32)
-#define MAXROUNDS		14
-
-static const char *selftest(void);
-
-typedef struct {
-    int   ROUNDS;                   /* key-length-dependent number of rounds */
-    int decryption_prepared;
-    byte  keySchedMAXROUNDS+144;	/* key schedule		*/
-    byte  keySched2MAXROUNDS+144;	/* key schedule		*/
-} RIJNDAEL_context;
-&#xc;
-
-static const byte S256 = {
-    99, 124, 119, 123, 242, 107, 111, 197,
-    48,   1, 103,  43, 254, 215, 171, 118, 
-    202, 130, 201, 125, 250,  89,  71, 240,
-    173, 212, 162, 175, 156, 164, 114, 192, 
-    183, 253, 147,  38,  54,  63, 247, 204,
-    52, 165, 229, 241, 113, 216,  49,  21, 
-    4, 199,  35, 195,  24, 150,   5, 154,
-    7,  18, 128, 226, 235,  39, 178, 117, 
-    9, 131,  44,  26,  27, 110,  90, 160, 
-    82,  59, 214, 179,  41, 227,  47, 132, 
-    83, 209,   0, 237,  32, 252, 177,  91,
-    106, 203, 190,  57,  74,  76,  88, 207, 
-    208, 239, 170, 251,  67,  77,  51, 133,
-    69, 249,   2, 127,  80,  60, 159, 168, 
-    81, 163,  64, 143, 146, 157,  56, 245,
-    188, 182, 218,  33,  16, 255, 243, 210, 
-    205,  12,  19, 236,  95, 151,  68,  23,
-    196, 167, 126,  61, 100,  93,  25, 115, 
-    96, 129,  79, 220,  34,  42, 144, 136,
-    70, 238, 184,  20, 222,  94,  11, 219, 
-    224,  50,  58,  10,  73,   6,  36,  92,
-    194, 211, 172,  98, 145, 149, 228, 121, 
-    231, 200,  55, 109, 141, 213,  78, 169, 
-    108,  86, 244, 234, 101, 122, 174,   8, 
-    186, 120,  37,  46,  28, 166, 180, 198, 
-    232, 221, 116,  31,  75, 189, 139, 138, 
-    112,  62, 181, 102,  72,   3, 246,  14,
-    97,  53,  87, 185, 134, 193,  29, 158, 
-    225, 248, 152,  17, 105, 217, 142, 148,
-    155,  30, 135, 233, 206,  85,  40, 223, 
-    140, 161, 137,  13, 191, 230,  66, 104, 
-    65, 153,  45,  15, 176,  84, 187,  22
-};
-
-
-static const byte T12564 = {
-    { 0xc6,0x63,0x63,0xa5 }, { 0xf8,0x7c,0x7c,0x84 },
-    { 0xee,0x77,0x77,0x99 }, { 0xf6,0x7b,0x7b,0x8d }, 
-    { 0xff,0xf2,0xf2,0x0d }, { 0xd6,0x6b,0x6b,0xbd },
-    { 0xde,0x6f,0x6f,0xb1 }, { 0x91,0xc5,0xc5,0x54 }, 
-    { 0x60,0x30,0x30,0x50 }, { 0x02,0x01,0x01,0x03 },
-    { 0xce,0x67,0x67,0xa9 }, { 0x56,0x2b,0x2b,0x7d }, 
-    { 0xe7,0xfe,0xfe,0x19 }, { 0xb5,0xd7,0xd7,0x62 },
-    { 0x4d,0xab,0xab,0xe6 }, { 0xec,0x76,0x76,0x9a }, 
-    { 0x8f,0xca,0xca,0x45 }, { 0x1f,0x82,0x82,0x9d },
-    { 0x89,0xc9,0xc9,0x40 }, { 0xfa,0x7d,0x7d,0x87 }, 
-    { 0xef,0xfa,0xfa,0x15 }, { 0xb2,0x59,0x59,0xeb }, 
-    { 0x8e,0x47,0x47,0xc9 }, { 0xfb,0xf0,0xf0,0x0b }, 
-    { 0x41,0xad,0xad,0xec }, { 0xb3,0xd4,0xd4,0x67 },
-    { 0x5f,0xa2,0xa2,0xfd }, { 0x45,0xaf,0xaf,0xea }, 
-    { 0x23,0x9c,0x9c,0xbf }, { 0x53,0xa4,0xa4,0xf7 },
-    { 0xe4,0x72,0x72,0x96 }, { 0x9b,0xc0,0xc0,0x5b }, 
-    { 0x75,0xb7,0xb7,0xc2 }, { 0xe1,0xfd,0xfd,0x1c },
-    { 0x3d,0x93,0x93,0xae }, { 0x4c,0x26,0x26,0x6a }, 
-    { 0x6c,0x36,0x36,0x5a }, { 0x7e,0x3f,0x3f,0x41 },
-    { 0xf5,0xf7,0xf7,0x02 }, { 0x83,0xcc,0xcc,0x4f }, 
-    { 0x68,0x34,0x34,0x5c }, { 0x51,0xa5,0xa5,0xf4 }, 
-    { 0xd1,0xe5,0xe5,0x34 }, { 0xf9,0xf1,0xf1,0x08 }, 
-    { 0xe2,0x71,0x71,0x93 }, { 0xab,0xd8,0xd8,0x73 },
-    { 0x62,0x31,0x31,0x53 }, { 0x2a,0x15,0x15,0x3f }, 
-    { 0x08,0x04,0x04,0x0c }, { 0x95,0xc7,0xc7,0x52 },
-    { 0x46,0x23,0x23,0x65 }, { 0x9d,0xc3,0xc3,0x5e }, 
-    { 0x30,0x18,0x18,0x28 }, { 0x37,0x96,0x96,0xa1 },
-    { 0x0a,0x05,0x05,0x0f }, { 0x2f,0x9a,0x9a,0xb5 }, 
-    { 0x0e,0x07,0x07,0x09 }, { 0x24,0x12,0x12,0x36 },
-    { 0x1b,0x80,0x80,0x9b }, { 0xdf,0xe2,0xe2,0x3d }, 
-    { 0xcd,0xeb,0xeb,0x26 }, { 0x4e,0x27,0x27,0x69 },
-    { 0x7f,0xb2,0xb2,0xcd }, { 0xea,0x75,0x75,0x9f }, 
-    { 0x12,0x09,0x09,0x1b }, { 0x1d,0x83,0x83,0x9e },
-    { 0x58,0x2c,0x2c,0x74 }, { 0x34,0x1a,0x1a,0x2e }, 
-    { 0x36,0x1b,0x1b,0x2d }, { 0xdc,0x6e,0x6e,0xb2 }, 
-    { 0xb4,0x5a,0x5a,0xee }, { 0x5b,0xa0,0xa0,0xfb }, 
-    { 0xa4,0x52,0x52,0xf6 }, { 0x76,0x3b,0x3b,0x4d },
-    { 0xb7,0xd6,0xd6,0x61 }, { 0x7d,0xb3,0xb3,0xce }, 
-    { 0x52,0x29,0x29,0x7b }, { 0xdd,0xe3,0xe3,0x3e }, 
-    { 0x5e,0x2f,0x2f,0x71 }, { 0x13,0x84,0x84,0x97 }, 
-    { 0xa6,0x53,0x53,0xf5 }, { 0xb9,0xd1,0xd1,0x68 }, 
-    { 0x00,0x00,0x00,0x00 }, { 0xc1,0xed,0xed,0x2c }, 
-    { 0x40,0x20,0x20,0x60 }, { 0xe3,0xfc,0xfc,0x1f },
-    { 0x79,0xb1,0xb1,0xc8 }, { 0xb6,0x5b,0x5b,0xed }, 
-    { 0xd4,0x6a,0x6a,0xbe }, { 0x8d,0xcb,0xcb,0x46 },
-    { 0x67,0xbe,0xbe,0xd9 }, { 0x72,0x39,0x39,0x4b }, 
-    { 0x94,0x4a,0x4a,0xde }, { 0x98,0x4c,0x4c,0xd4 },
-    { 0xb0,0x58,0x58,0xe8 }, { 0x85,0xcf,0xcf,0x4a }, 
-    { 0xbb,0xd0,0xd0,0x6b }, { 0xc5,0xef,0xef,0x2a },
-    { 0x4f,0xaa,0xaa,0xe5 }, { 0xed,0xfb,0xfb,0x16 }, 
-    { 0x86,0x43,0x43,0xc5 }, { 0x9a,0x4d,0x4d,0xd7 },
-    { 0x66,0x33,0x33,0x55 }, { 0x11,0x85,0x85,0x94 }, 
-    { 0x8a,0x45,0x45,0xcf }, { 0xe9,0xf9,0xf9,0x10 },
-    { 0x04,0x02,0x02,0x06 }, { 0xfe,0x7f,0x7f,0x81 }, 
-    { 0xa0,0x50,0x50,0xf0 }, { 0x78,0x3c,0x3c,0x44 },
-    { 0x25,0x9f,0x9f,0xba }, { 0x4b,0xa8,0xa8,0xe3 }, 
-    { 0xa2,0x51,0x51,0xf3 }, { 0x5d,0xa3,0xa3,0xfe },
-    { 0x80,0x40,0x40,0xc0 }, { 0x05,0x8f,0x8f,0x8a }, 
-    { 0x3f,0x92,0x92,0xad }, { 0x21,0x9d,0x9d,0xbc },
-    { 0x70,0x38,0x38,0x48 }, { 0xf1,0xf5,0xf5,0x04 }, 
-    { 0x63,0xbc,0xbc,0xdf }, { 0x77,0xb6,0xb6,0xc1 },
-    { 0xaf,0xda,0xda,0x75 }, { 0x42,0x21,0x21,0x63 }, 
-    { 0x20,0x10,0x10,0x30 }, { 0xe5,0xff,0xff,0x1a },
-    { 0xfd,0xf3,0xf3,0x0e }, { 0xbf,0xd2,0xd2,0x6d }, 
-    { 0x81,0xcd,0xcd,0x4c }, { 0x18,0x0c,0x0c,0x14 },
-    { 0x26,0x13,0x13,0x35 }, { 0xc3,0xec,0xec,0x2f }, 
-    { 0xbe,0x5f,0x5f,0xe1 }, { 0x35,0x97,0x97,0xa2 },
-    { 0x88,0x44,0x44,0xcc }, { 0x2e,0x17,0x17,0x39 }, 
-    { 0x93,0xc4,0xc4,0x57 }, { 0x55,0xa7,0xa7,0xf2 },
-    { 0xfc,0x7e,0x7e,0x82 }, { 0x7a,0x3d,0x3d,0x47 }, 
-    { 0xc8,0x64,0x64,0xac }, { 0xba,0x5d,0x5d,0xe7 },
-    { 0x32,0x19,0x19,0x2b }, { 0xe6,0x73,0x73,0x95 }, 
-    { 0xc0,0x60,0x60,0xa0 }, { 0x19,0x81,0x81,0x98 },
-    { 0x9e,0x4f,0x4f,0xd1 }, { 0xa3,0xdc,0xdc,0x7f }, 
-    { 0x44,0x22,0x22,0x66 }, { 0x54,0x2a,0x2a,0x7e },
-    { 0x3b,0x90,0x90,0xab }, { 0x0b,0x88,0x88,0x83 }, 
-    { 0x8c,0x46,0x46,0xca }, { 0xc7,0xee,0xee,0x29 },
-    { 0x6b,0xb8,0xb8,0xd3 }, { 0x28,0x14,0x14,0x3c }, 
-    { 0xa7,0xde,0xde,0x79 }, { 0xbc,0x5e,0x5e,0xe2 },
-    { 0x16,0x0b,0x0b,0x1d }, { 0xad,0xdb,0xdb,0x76 }, 
-    { 0xdb,0xe0,0xe0,0x3b }, { 0x64,0x32,0x32,0x56 },
-    { 0x74,0x3a,0x3a,0x4e }, { 0x14,0x0a,0x0a,0x1e }, 
-    { 0x92,0x49,0x49,0xdb }, { 0x0c,0x06,0x06,0x0a },
-    { 0x48,0x24,0x24,0x6c }, { 0xb8,0x5c,0x5c,0xe4 }, 
-    { 0x9f,0xc2,0xc2,0x5d }, { 0xbd,0xd3,0xd3,0x6e },
-    { 0x43,0xac,0xac,0xef }, { 0xc4,0x62,0x62,0xa6 }, 
-    { 0x39,0x91,0x91,0xa8 }, { 0x31,0x95,0x95,0xa4 },
-    { 0xd3,0xe4,0xe4,0x37 }, { 0xf2,0x79,0x79,0x8b }, 
-    { 0xd5,0xe7,0xe7,0x32 }, { 0x8b,0xc8,0xc8,0x43 },
-    { 0x6e,0x37,0x37,0x59 }, { 0xda,0x6d,0x6d,0xb7 }, 
-    { 0x01,0x8d,0x8d,0x8c }, { 0xb1,0xd5,0xd5,0x64 },
-    { 0x9c,0x4e,0x4e,0xd2 }, { 0x49,0xa9,0xa9,0xe0 }, 
-    { 0xd8,0x6c,0x6c,0xb4 }, { 0xac,0x56,0x56,0xfa },
-    { 0xf3,0xf4,0xf4,0x07 }, { 0xcf,0xea,0xea,0x25 }, 
-    { 0xca,0x65,0x65,0xaf }, { 0xf4,0x7a,0x7a,0x8e },
-    { 0x47,0xae,0xae,0xe9 }, { 0x10,0x08,0x08,0x18 }, 
-    { 0x6f,0xba,0xba,0xd5 }, { 0xf0,0x78,0x78,0x88 },
-    { 0x4a,0x25,0x25,0x6f }, { 0x5c,0x2e,0x2e,0x72 }, 
-    { 0x38,0x1c,0x1c,0x24 }, { 0x57,0xa6,0xa6,0xf1 },
-    { 0x73,0xb4,0xb4,0xc7 }, { 0x97,0xc6,0xc6,0x51 }, 
-    { 0xcb,0xe8,0xe8,0x23 }, { 0xa1,0xdd,0xdd,0x7c },
-    { 0xe8,0x74,0x74,0x9c }, { 0x3e,0x1f,0x1f,0x21 }, 
-    { 0x96,0x4b,0x4b,0xdd }, { 0x61,0xbd,0xbd,0xdc }, 
-    { 0x0d,0x8b,0x8b,0x86 }, { 0x0f,0x8a,0x8a,0x85 }, 
-    { 0xe0,0x70,0x70,0x90 }, { 0x7c,0x3e,0x3e,0x42 },
-    { 0x71,0xb5,0xb5,0xc4 }, { 0xcc,0x66,0x66,0xaa },

fpm2-0.79.tar.bz2/src/sha256.c Deleted

@@ -1,217 +0,0 @@
-/* FIGARO'S PASSWORD MANAGER 2 (FPM2)
- * Copyright (C) 2009-2010 Aleš Koval
- *
- * FPM is open source / free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * FPM is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- */
-
-/* pkcs5_pbkdf2 function is taken from bioctl package
- *
- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*  Test vectors from FIPS-180-2:
- *
- *  "abc"
- * 224:
- *  23097D22 3405D822 8642A477 BDA255B3 2AADBCE4 BDA0B3F7 E36C9DA7
- * 256:
- *  BA7816BF 8F01CFEA 414140DE 5DAE2223 B00361A3 96177A9C B410FF61 F20015AD
- *
- *  "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
- * 224:
- *  75388B16 512776CC 5DBA5DA1 FD890150 B0C6455C B4F58B19 52522525
- * 256:
- *  248D6A61 D20638B8 E5C02693 0C3E6039 A33CE459 64FF2167 F6ECEDD4 19DB06C1
- *
- *  "a" x 1000000
- * 224:
- *  20794655 980C91D8 BBB4C1EA 97618A4B F03F4258 1948B2EE 4EE7AD67
- * 256:
- *  CDC76E5C 9914FB92 81A1C7E2 84D73E67 F1809A48 A497200E 046D39CC C7112CD0
- */
-
-#include "fpm.h"
-#include "fpm_crypt.h"
-
-typedef struct {
-  GChecksum *outer, *inner;
-} fpm_hmacsha256;
-
-static void fpm_hmacsha256_init(fpm_hmacsha256 *c, guchar *key, gint keylen) {
-  guchar realkey64, outerkey64, innerkey64;
-  GChecksum *keyc;
-  gsize size = SHA256_DIGEST_LENGTH;
-  gint i;
-
-  memset(realkey, 0, sizeof(realkey));
-  if(keylen > 64) {
-    keyc = g_checksum_new(G_CHECKSUM_SHA256);
-    g_checksum_update(keyc, key, keylen);
-    g_checksum_get_digest(keyc, realkey, &size);
-    g_checksum_free(keyc);
-    keylen = 32;
-  } else {
-    memcpy(realkey, key, keylen);
-  }
-
-  /* abusing the cache here, if we do sha256 in between that'll erase it */
-  for(i = 0; i<64 ; i++) {
-    int r = realkeyi;
-    innerkeyi = r ^ 0x36;
-    outerkeyi = r ^ 0x5c;
-  }
-    c->outer = g_checksum_new(G_CHECKSUM_SHA256);
-    c->inner = g_checksum_new(G_CHECKSUM_SHA256);
-    g_checksum_update(c->outer, outerkey, 64);
-    g_checksum_update(c->inner, innerkey, 64);
-}
-
-static void fpm_hmacsha256_write(fpm_hmacsha256 *c, guchar *message, gint messagelen) {
-    g_checksum_update(c->inner, message, messagelen);
-}
-
-static void fpm_hmacsha256_final(fpm_hmacsha256 *c, guchar *digest) {
-  gsize size = SHA256_DIGEST_LENGTH;
-  g_checksum_get_digest(c->inner, digest, &size);
-  g_checksum_free(c->inner);
-  g_checksum_update(c->outer, digest, SHA256_DIGEST_LENGTH);
-  g_checksum_get_digest(c->outer, digest, &size);
-  g_checksum_free(c->outer);
-}
-
-void fpm_hmac_sha256(guchar *key, gint key_len, guchar *data, gint data_len, guchar *mac) {
-  fpm_hmacsha256 hmac;
-  guchar digestSHA256_DIGEST_LENGTH;
-
-  fpm_hmacsha256_init(&hmac, key, key_len);
-  fpm_hmacsha256_write(&hmac, data, data_len);
-  fpm_hmacsha256_final(&hmac, digest);
-
-  memcpy(mac, digest, SHA256_DIGEST_LENGTH);
-  wipememory(digest, sizeof(digest));
-}
-
-/*
- *   Password-Based Key Derivation Function 2 (PKCS #5 v2.0).
- *   Code based on IEEE Std 802.11-2007, Annex H.4.2.
-*/
-
-gint fpm_pkcs5_pbkdf2(guchar *pass, gsize pass_len, const gchar *salt, gsize salt_len,
-    guint8 *key, gsize key_len, guint rounds)
-{
-	guint8 *asalt, obufSHA256_DIGEST_LENGTH;
-	guint8 d1SHA256_DIGEST_LENGTH, d2SHA256_DIGEST_LENGTH;
-	guint i, j;
-	guint count;
-	gsize r;
-
-	if (rounds < 1 || key_len == 0)
-		return -1;
-	if (salt_len == 0 || salt_len > 256 - 1)
-		return -1;
-	if ((asalt = g_malloc(salt_len + 4)) == NULL)
-		return -1;
-
-	memcpy(asalt, salt, salt_len);
-
-	for (count = 1; key_len > 0; count++) {
-		asaltsalt_len + 0 = (count >> 24) & 0xff;
-		asaltsalt_len + 1 = (count >> 16) & 0xff;
-		asaltsalt_len + 2 = (count >> 8) & 0xff;
-		asaltsalt_len + 3 = count & 0xff;
-		fpm_hmac_sha256(pass, pass_len, asalt, salt_len + 4, d1);
-		memcpy(obuf, d1, sizeof(obuf));
-		for (i = 1; i < rounds; i++) {
-			fpm_hmac_sha256(pass, pass_len, d1, sizeof(d1), d2);
-			memcpy(d1, d2, sizeof(d1));
-			for (j = 0; j < sizeof(obuf); j++)
-				obufj ^= d1j;
-		}
-
-		r = MIN(key_len, SHA256_DIGEST_LENGTH);
-		memcpy(key, obuf, r);
-		key += r;
-		key_len -= r;
-	};
-	wipememory(asalt, salt_len + 4);
-	g_free(asalt);
-	wipememory(d1, sizeof(d1));
-	wipememory(d2, sizeof(d2));
-	wipememory(obuf, sizeof(obuf));
-
-	return 0;
-}
-
-/* Calculate sha256 hash of file, return 0 for success */
-gint fpm_sha256_file(gchar *filename, guchar *digest) {
-    FILE *fp;
-    GChecksum *checksum;
-    gsize size = SHA256_DIGEST_LENGTH;
-    guchar buf1024;
-    gulong br;
-    gint ret_val = -1;
-
-    checksum = g_checksum_new(G_CHECKSUM_SHA256);
-
-    if((fp = fopen(filename, "r")) != NULL) {
-	while ((br = fread (buf, sizeof (guchar), 1024, fp)) > 0) {
-	    g_checksum_update(checksum, buf, br);
-        }
-	if(!ferror(fp)) {
-	    g_checksum_get_digest(checksum, digest, &size);
-	    g_checksum_free(checksum);
-	    ret_val = 0;
-	}
-        fclose(fp);
-    }
-
-    return(ret_val);
-}
-
-/* Calculate sha256 hash from all fpm_data entries except passwords */
-void fpm_sha256_fpm_data(gchar *digest) {
-  GChecksum *checksum;
-  gsize size = SHA256_DIGEST_LENGTH;

fpm2-0.79.tar.bz2/AUTHORS -> fpm2-0.90.tar.xz/AUTHORS Changed

fpm2-0.79.tar.bz2/ChangeLog -> fpm2-0.90.tar.xz/ChangeLog Changed

@@ -1,3 +1,27 @@
+0.90
+    - adapted for GTK3
+    - new icon (thanks Wendell Fernandes)
+    - added dependency on nettle library
+    - added ciphers with authenticated encryption with associated data mode
+    - added configurable PBKDF2 iterations, new default set at 250000
+    - added new option for replace entries when import plaintext XML
+    - added configurable time for clear after paste
+    - added Hebrew translation by Genghis Khan
+    - added Polish translation by Robert
+    - use AES-256 GCM as default cipher
+    - use new file format
+    - updated Basque translation by Ales Zabala Alava (Shagi)
+    - fixed incorrectly saving columns order in ini file
+    - fixed cursor in treeview after entry is renamed or category changed
+    - fixed minimizing when tray icon is disabled
+    - fixed stale lock when user run launcher and then quit FPM2
+    - removed ability to read, import and convert old FPM data file
+    - removed built-in AES-256 and PBKDF2 function
+    - better clipboard handling
+    - better file locking
+    - Autotools update and cleanup
+    - code and UI cleanup
+
 0.79
     - use xdg-open instead of gnome-moz-remote (Christoph Thompson)
     - fixed grammatical error in entropy collection dialog (Stefano Rivera)

fpm2-0.79.tar.bz2/INSTALL -> fpm2-0.90.tar.xz/INSTALL Changed

@@ -1,82 +1,107 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
+Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+   Briefly, the shell command './configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the 'README' file for
+instructions specific to this package.  Some packages provide this
+'INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
-   The `configure' shell script attempts to guess correct values for
+   The 'configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
+those values to create a 'Makefile' in each directory of the package.
+It may also create one or more '.h' files containing system-dependent
+definitions.  Finally, it creates a shell script 'config.status' that
 you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
+file 'config.log' containing compiler output (useful mainly for
+debugging 'configure').
 
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
+   It can also use an optional file (typically called 'config.cache' and
+enabled with '--cache-file=config.cache' or simply '-C') that saves the
+results of its tests to speed up reconfiguring.  Caching is disabled by
+default to prevent problems with accidental use of stale cache files.
 
    If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
+to figure out how 'configure' could check whether to do them, and mail
+diffs or instructions to the address given in the 'README' so they can
 be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
+some point 'config.cache' contains results you don't want to keep, you
 may remove or edit it.
 
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+   The file 'configure.ac' (or 'configure.in') is used to create
+'configure' by a program called 'autoconf'.  You need 'configure.ac' if
+you want to change it or regenerate 'configure' using a newer version of
+'autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
-  1. `cd' to the directory containing the package's source code and type
-     `./configure' to configure the package for your system.
+  1. 'cd' to the directory containing the package's source code and type
+     './configure' to configure the package for your system.
 
-     Running `configure' might take a while.  While running, it prints
+     Running 'configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
 
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
-     the package.
-
-  4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
-     source code directory by typing `make clean'.  To also remove the
-     files that `configure' created (so you can compile the package for
-     a different kind of computer), type `make distclean'.  There is
-     also a `make maintainer-clean' target, but that is intended mainly
+  2. Type 'make' to compile the package.
+
+  3. Optionally, type 'make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type 'make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the 'make install' phase executed with root
+     privileges.
+
+  5. Optionally, type 'make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior 'make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing 'make clean'.  To also remove the
+     files that 'configure' created (so you can compile the package for
+     a different kind of computer), type 'make distclean'.  There is
+     also a 'make maintainer-clean' target, but that is intended mainly
      for the package's developers.  If you use it, you may have to get
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
+  7. Often, you can also type 'make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide 'make
+     distcheck', which can by used by developers to test that all other
+     targets like 'make install' and 'make uninstall' work correctly.
+     This target is generally not run by end users.
+
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the 'configure' script does not know about.  Run './configure --help'
+for details on some of the pertinent environment variables.
 
-   You can give `configure' initial values for configuration parameters
-by setting variables in the command line or in the environment.  Here
-is an example:
+   You can give 'configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here is
+an example:
 
      ./configure CC=c99 CFLAGS=-g LIBS=-lposix
 
@@ -85,150 +110,259 @@
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
-own directory.  To do this, you can use GNU `make'.  `cd' to the
+own directory.  To do this, you can use GNU 'make'.  'cd' to the
 directory where you want the object files and executables to go and run
-the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+the 'configure' script.  'configure' automatically checks for the source
+code in the directory that 'configure' is in and in '..'.  This is known
+as a "VPATH" build.
 
-   With a non-GNU `make', it is safer to compile the package for one
+   With a non-GNU 'make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
-installed the package for one architecture, use `make distclean' before
+installed the package for one architecture, use 'make distclean' before
 reconfiguring for another architecture.
 
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple '-arch' options to the
+compiler but only a single '-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the 'lipo' tool if you have problems.
+
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving

fpm2-0.79.tar.bz2/Makefile.am -> fpm2-0.90.tar.xz/Makefile.am Changed

fpm2-0.79.tar.bz2/Makefile.in -> fpm2-0.90.tar.xz/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,61 @@
 
 @SET_MAKE@
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -32,29 +86,45 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -76,25 +146,59 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
 MANS = $(dist_man_MANS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir distdir-am dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
+	$(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+	README TODO compile depcomp install-sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$^/*$/.*$$,\1,'; \
@@ -121,12 +225,16 @@
   done; \

fpm2-0.79.tar.bz2/README -> fpm2-0.90.tar.xz/README Changed

fpm2-0.79.tar.bz2/aclocal.m4 -> fpm2-0.90.tar.xz/aclocal.m4 Changed

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,14 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef(AC_CONFIG_MACRO_DIRS, m4_defun(_AM_CONFIG_MACRO_DIRS, )m4_defun(AC_CONFIG_MACRO_DIRS, _AM_CONFIG_MACRO_DIRS($@)))
 m4_ifndef(AC_AUTOCONF_VERSION,
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
-m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.66,,
-m4_warning(this file was generated for autoconf 2.66.
+m4_if(m4_defn(AC_AUTOCONF_VERSION), 2.69,,
+m4_warning(this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.))
+To do so, use the procedure documented by the package, typically 'autoreconf'.))
 
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -46,7 +47,10 @@
 #
 # Modified to require ngettext
 # Matthias Clasen <mclasen@redhat.com> 08/06/2004
-#
+
+# Increment this whenever this file is changed.
+#serial 1
+
 # We need this here as well, since someone might use autoconf-2.5x
 # to configure GLib then an older version to configure a package
 # using AM_GLIB_GNU_GETTEXT
@@ -118,6 +122,51 @@
 AC_SUBST($1)dnl
 )
 
+dnl Checks for special options needed on Mac OS X.
+dnl Defines INTL_MACOSX_LIBS.
+dnl
+dnl Copied from intlmacosx.m4 in gettext, GPL.
+dnl Copyright (C) 2004-2013 Free Software Foundation, Inc.
+glib_DEFUN(glib_gt_INTL_MACOSX,
+
+  dnl Check for API introduced in Mac OS X 10.2.
+  AC_CACHE_CHECK(for CFPreferencesCopyAppValue,
+    gt_cv_func_CFPreferencesCopyAppValue,
+    gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       AC_LANG_PROGRAM(
+          #include <CoreFoundation/CFPreferences.h>,
+          CFPreferencesCopyAppValue(NULL, NULL)),
+       gt_cv_func_CFPreferencesCopyAppValue=yes,
+       gt_cv_func_CFPreferencesCopyAppValue=no)
+     LIBS="$gt_save_LIBS")
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE(HAVE_CFPREFERENCESCOPYAPPVALUE, 1,
+      Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.)
+  fi
+  dnl Check for API introduced in Mac OS X 10.3.
+  AC_CACHE_CHECK(for CFLocaleCopyCurrent, gt_cv_func_CFLocaleCopyCurrent,
+    gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
+     AC_LINK_IFELSE(
+       AC_LANG_PROGRAM(
+          #include <CoreFoundation/CFLocale.h>,
+          CFLocaleCopyCurrent();),
+       gt_cv_func_CFLocaleCopyCurrent=yes,
+       gt_cv_func_CFLocaleCopyCurrent=no)
+     LIBS="$gt_save_LIBS")
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE(HAVE_CFLOCALECOPYCURRENT, 1,
+      Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.)
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST(INTL_MACOSX_LIBS)
+)
+
 # GLIB_WITH_NLS
 #-----------------
 glib_DEFUN(GLIB_WITH_NLS,
@@ -131,6 +180,8 @@
     XGETTEXT=:
     INTLLIBS=
 
+    glib_gt_INTL_MACOSX
+
     AC_CHECK_HEADER(libintl.h,
      gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
@@ -214,7 +265,7 @@
       fi
   
       if test "$gt_cv_func_dgettext_libintl" = "yes"; then
-        INTLLIBS="-lintl $libintl_extra_libs"
+        INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS"
       fi
   
       if test "$gt_cv_have_gettext" = "yes"; then
@@ -260,6 +311,10 @@
 	      CATOBJEXT=.mo
                DATADIRNAME=lib)
 	    ;;
+	    *-*-openbsd*)
+	    CATOBJEXT=.mo
+            DATADIRNAME=share
+	    ;;
 	    *)
 	    CATOBJEXT=.mo
             DATADIRNAME=lib
@@ -330,9 +385,8 @@
 # on various variables needed by the Makefile.in.in installed by 
 # glib-gettextize.
 dnl
-glib_DEFUN(GLIB_GNU_GETTEXT,
+AU_DEFUN(GLIB_GNU_GETTEXT,
   AC_REQUIRE(AC_PROG_CC)dnl
-   AC_REQUIRE(AC_HEADER_STDC)dnl
    
    GLIB_LC_MESSAGES
    GLIB_WITH_NLS
@@ -401,7 +455,8 @@
    rm -f po/POTFILES
    sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/$.*$ \\\\/\1/" \
 	< $srcdir/po/POTFILES.in > po/POTFILES
-  )
+  ,
+  $0: This macro is deprecated. You should use upstream gettext instead.)
 
 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
 # -------------------------------
@@ -454,7 +509,7 @@
 
 
 dnl IT_PROG_INTLTOOL(MINIMUM-VERSION, no-xml)
-# serial 40 IT_PROG_INTLTOOL
+# serial 42 IT_PROG_INTLTOOL
 AC_DEFUN(IT_PROG_INTLTOOL, 
 AC_PREREQ(2.50)dnl
 AC_REQUIRE(AM_NLS)dnl
@@ -467,13 +522,11 @@
     ;;
 esac
 
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 if test -n "$1"; then
     AC_MSG_CHECKING(for intltool >= $1)
-
-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
-    INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-    
     AC_MSG_RESULT($INTLTOOL_APPLIED_VERSION found)
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
 	AC_MSG_ERROR(Your intltool is too old.  You need intltool $1 or later.)
@@ -486,25 +539,48 @@
     AC_MSG_ERROR(The intltool scripts were not found. Please install intltool.)
 fi
 
-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@' 
-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' 
-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+  AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST(AM_DEFAULT_VERBOSITY)
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo "  ITMRG " $@;'

fpm2-0.90.tar.xz/compile Added

@@ -0,0 +1,348 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /!/*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.oObBjJ)
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)

fpm2-0.79.tar.bz2/config.h.in -> fpm2-0.90.tar.xz/config.h.in Changed

@@ -1,11 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define if building universal (internal helper macro) */
-#undef AC_APPLE_UNIVERSAL_BUILD
-
-/* Big endian host */
-#undef BIG_ENDIAN_HOST
-
 /* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS
 
@@ -24,6 +18,14 @@
 /* Define to 1 if you have the `bind_textdomain_codeset' function. */
 #undef HAVE_BIND_TEXTDOMAIN_CODESET
 
+/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
+   CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYCURRENT
+
+/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
+   the CoreFoundation framework. */
+#undef HAVE_CFPREFERENCESCOPYAPPVALUE
+
 /* Define to 1 if you have the `dcgettext' function. */
 #undef HAVE_DCGETTEXT
 
@@ -66,9 +68,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Little endian host */
-#undef LITTLE_ENDIAN_HOST
-
 /* Name of package */
 #undef PACKAGE
 
@@ -95,15 +94,3 @@
 
 /* Version number of package */
 #undef VERSION
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-#  undef WORDS_BIGENDIAN
-# endif
-#endif

fpm2-0.79.tar.bz2/configure -> fpm2-0.90.tar.xz/configure Changed

@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for fpm2 0.79.
+# Generated by GNU Autoconf 2.69 for fpm2 0.90.
 #
 # Report bugs to <als@regnet.cz>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +89,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *\\/* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -135,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -168,7 +192,8 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -213,14 +238,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -323,6 +359,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -444,6 +488,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $0, causing all sort of problems
   # (the dirname of $0 is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -478,16 +526,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -499,28 +547,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???sx*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
@@ -552,8 +580,8 @@
 # Identity of this package.
 PACKAGE_NAME='fpm2'
 PACKAGE_TARNAME='fpm2'
-PACKAGE_VERSION='0.79'
-PACKAGE_STRING='fpm2 0.79'
+PACKAGE_VERSION='0.90'
+PACKAGE_STRING='fpm2 0.90'
 PACKAGE_BUGREPORT='als@regnet.cz'
 PACKAGE_URL='http://als.regnet.cz/fpm2/'
 
@@ -606,11 +634,15 @@
 INTLLIBS
 INSTOBJEXT
 GMOFILES
+DATADIRNAME
 CATOBJEXT
 CATALOGS
 MSGFMT_OPTS
+INTL_MACOSX_LIBS
+EGREP
+GREP

fpm2-0.79.tar.bz2/configure.ac -> fpm2-0.90.tar.xz/configure.ac Changed

@@ -1,25 +1,29 @@
-dnl Process this file with autoconf to produce a configure script.
+dnl Process this file with autoreconf to produce a configure script.
 
-AC_INIT(fpm2, 0.79, als@regnet.cz, fpm2, http://als.regnet.cz/fpm2/)
-AM_INIT_AUTOMAKE(no-dist-gzip dist-bzip2)
-AM_CONFIG_HEADER(config.h)
-AM_MAINTAINER_MODE
+AC_INIT(fpm2,0.90,als@regnet.cz,fpm2,http://als.regnet.cz/fpm2/)
+AM_INIT_AUTOMAKE(no-dist-gzip dist-xz)
+AC_CONFIG_HEADERS(config.h)
 
-AC_ISC_POSIX
 AC_PROG_CC
-AM_PROG_CC_STDC
-AC_HEADER_STDC
-
-AC_C_BIGENDIAN(
-    AC_DEFINE(BIG_ENDIAN_HOST, 1, Big endian host), 
-    AC_DEFINE(LITTLE_ENDIAN_HOST, 1, Little endian host)
-)
 
 AC_CHECK_LIB(m, pow)
-pkg_modules="x11 glib-2.0 >= 2.16 gtk+-2.0 libxml-2.0"
-PKG_CHECK_MODULES(PACKAGE, $pkg_modules)
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
+
+PKG_CHECK_MODULES(x11, x11)
+PKG_CHECK_MODULES(libxml2, libxml-2.0)
+PKG_CHECK_MODULES(nettle, nettle)
+
+fpm2_CFLAGS="${x11_CFLAGS} ${libxml2_CFLAGS} ${nettle_CFLAGS} "
+fpm2_LIBS="${x11_LIBS} ${libxml2_LIBS} ${nettle_LIBS} "
+
+PKG_CHECK_MODULES(gtk3, gtk+-3.0)
+fpm2_CFLAGS+="${gtk3_CFLAGS} "
+fpm2_LIBS+="${gtk3_LIBS} "
+
+# Get rid of deprecated GTK3 mess
+fpm2_CFLAGS+="-Wno-deprecated-declarations"
+
+AC_SUBST(fpm2_CFLAGS)
+AC_SUBST(fpm2_LIBS)
 
 IT_PROG_INTLTOOL(0.35.0)
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
@@ -32,8 +36,7 @@
 
 # Debug mode
 AC_ARG_ENABLE(debug,
-	    AC_HELP_STRING(--enable-debug,
-	    Compile binaries in debug mode))
+	    AS_HELP_STRING(--enable-debug,Compile binaries in debug mode))
 
 if test "$enable_debug" = "yes"; then
   echo "enabling debug compile mode"
@@ -43,11 +46,13 @@
   AC_DEFINE(G_DISABLE_CHECKS, 1, Disable Glib check functions)
 fi
 
-AC_OUTPUT(
-Makefile
-src/Makefile
-po/Makefile.in
-data/Makefile
-data/pixmaps/Makefile
-data/fpm2.desktop.in
+AC_CONFIG_FILES(
+    Makefile
+    src/Makefile
+    po/Makefile.in
+    data/Makefile
+    data/pixmaps/Makefile
+    data/icons/Makefile
+    data/fpm2.desktop.in
 )
+AC_OUTPUT

fpm2-0.79.tar.bz2/data/Makefile.am -> fpm2-0.90.tar.xz/data/Makefile.am Changed

fpm2-0.79.tar.bz2/data/Makefile.in -> fpm2-0.90.tar.xz/data/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,25 +87,42 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/fpm2.desktop.in.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = fpm2.desktop.in
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -73,16 +144,43 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(desktopdir)"
 DATA = $(desktop_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	distdir distdir-am
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/fpm2.desktop.in.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -112,6 +210,7 @@
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -147,11 +246,15 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -161,8 +264,6 @@

fpm2-0.90.tar.xz/data/icons Added

fpm2-0.90.tar.xz/data/icons/128x128 Added

fpm2-0.90.tar.xz/data/icons/128x128/apps Added

fpm2-0.90.tar.xz/data/icons/128x128/apps/fpm2.png Added

fpm2-0.90.tar.xz/data/icons/48x48 Added

fpm2-0.90.tar.xz/data/icons/48x48/apps Added

fpm2-0.90.tar.xz/data/icons/48x48/apps/fpm2.png Added

fpm2-0.90.tar.xz/data/icons/Makefile.am Added

fpm2-0.90.tar.xz/data/icons/Makefile.in Added

@@ -0,0 +1,521 @@
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = data/icons
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(nobase_dist_icons_DATA) \
+	$(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/.^$$\\*|/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/^/*$$,\1,' | \
+  $(AWK) 'BEGIN { files"." = "" } { files$$2 = files$$2 " " $$1; \
+    if (++n$$2 == $(am__install_max)) \
+      { print $$2, files$$2; n$$2 = 0; files$$2 = "" } } \
+    END { for (dir in files) print dir, filesdir }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+DATA = $(nobase_dist_icons_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@

fpm2-0.79.tar.bz2/data/pixmaps/Makefile.in -> fpm2-0.90.tar.xz/data/pixmaps/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -33,17 +87,34 @@
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = data/pixmaps
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -65,12 +136,21 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pixmapsdir)"
 DATA = $(pixmaps_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -106,11 +186,15 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -120,8 +204,6 @@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_CFLAGS = @PACKAGE_CFLAGS@
-PACKAGE_LIBS = @PACKAGE_LIBS@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -159,17 +241,27 @@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+fpm2_CFLAGS = @fpm2_CFLAGS@
+fpm2_LIBS = @fpm2_LIBS@
+gtk3_CFLAGS = @gtk3_CFLAGS@
+gtk3_LIBS = @gtk3_LIBS@
 host_alias = @host_alias@
 htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libxml2_CFLAGS = @libxml2_CFLAGS@
+libxml2_LIBS = @libxml2_LIBS@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
+nettle_CFLAGS = @nettle_CFLAGS@
+nettle_LIBS = @nettle_LIBS@
 oldincludedir = @oldincludedir@
 pdfdir = @pdfdir@
 pixmapdir = @pixmapdir@
@@ -184,13 +276,15 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+x11_CFLAGS = @x11_CFLAGS@
+x11_LIBS = @x11_LIBS@
 pixmapsdir = $(pixmapdir)
 pixmaps_DATA = logo.png
 EXTRA_DIST = $(pixmaps_DATA)
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)

fpm2-0.79.tar.bz2/depcomp -> fpm2-0.90.tar.xz/depcomp Changed

@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +16,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -28,9 +27,9 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp --help --version PROGRAM ARGS
@@ -40,11 +39,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +56,66 @@
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/^/*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.^.*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.$lower*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.$lower*:$tab *,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -69,6 +128,9 @@
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -80,18 +142,32 @@
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
 fi
 
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
-   depmode=msvisualcpp
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -114,8 +190,7 @@
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -123,13 +198,17 @@
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -137,31 +216,31 @@
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"

fpm2-0.79.tar.bz2/fpm2.1 -> fpm2-0.90.tar.xz/fpm2.1 Changed

fpm2-0.79.tar.bz2/fpm2.spec -> fpm2-0.90.tar.xz/fpm2.spec Changed

@@ -1,18 +1,16 @@
-Summary: Password manager with GTK2 GUI
+Summary: Password manager with GTK3 GUI
 Name: fpm2
-Version: 0.79
+Version: 0.90
 Release: 1%{?dist}
 License: GPLv2+
-Group: Applications/Productivity
-Source: http://als.regnet.cz/%{name}/download/%{name}-%{version}.tar.bz2
+Source: http://als.regnet.cz/%{name}/download/%{name}-%{version}.tar.xz
 URL: http://als.regnet.cz/fpm2/
-BuildRequires: gtk2-devel, libxml2-devel, desktop-file-utils, gettext
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRequires: gtk3-devel, libxml2-devel, desktop-file-utils, gettext, intltool, gcc
 
 %description
 Figaro's Password Manager 2 is a program that allows you to securely store the
-passwords using GTK2 interface. Features include:
-- Passwords are encrypted with the AES-256 algorithm.
+passwords using GTK3 interface. Features include:
+- Passwords are encrypted with the AES-256-GCM algorithm.
 - Copy passwords or usernames to the clipboard/primary selection.
 - If the password is for a web site, FPM2 can keep track of the URLs of your
   login screens and can automatically launch your browser. In this capacity,
@@ -42,23 +40,82 @@
 %find_lang %{name}
 
 desktop-file-install \
-  --vendor fedora \
   --delete-original \
   --dir %{buildroot}%{_datadir}/applications \
   %{buildroot}%{_datadir}/applications/%{name}.desktop
 
-%clean
-rm -rf %{buildroot}
-
 %files -f %{name}.lang
-%defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
 %{_bindir}/fpm2
 %{_datadir}/pixmaps/fpm2
 %{_mandir}/man1/fpm2.1.gz
 %{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/apps/fpm2.png
 
 %changelog
+* Thu Feb 13 2020 Aleš Koval <als@regnet.cz> - 0.90-1
+- Update to 0.90
+
+* Thu Oct 17 2019 Aleš Koval <als@regnet.cz> - 0.79-21
+- Build for EPEL-8
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.79-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.79-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.79-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Mar 07 2018 Aleš Koval <als@regnet.cz> - 0.79-17
+- Add gcc to BuildRequires:
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.79-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.79-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.79-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.79-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.79-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.79-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.79-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.79-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.79-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Mar 15 2013 Jon Ciesla <limburgher@gmail.com> - 0.79-7
+- Drop desktop vendor tag.
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.79-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.79-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.79-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 0.79-3
+- Rebuild for new libpng
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.79-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Mon Jan 17 2011 Aleš Koval <als@regnet.cz> - 0.79-1
 - Update to 0.79
 - Fixed crash due to incorrectly call xmlCleanupParser() (#669102)

fpm2-0.79.tar.bz2/install-sh -> fpm2-0.90.tar.xz/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2018-03-11.20; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,25 +35,21 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 
+tab='	'
 nl='
 '
-IFS=" ""	$nl"
+IFS=" $tab$nl"
 
-# set DOITPROG to echo to test this script
+# Set DOITPROG to "echo" to test this script.
 
-# Don't use :- since 4.3BSD and earlier shells don't like it.
 doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
+doit_exec=${doit:-exec}
 
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
@@ -68,17 +64,6 @@
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
 
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
 posix_mkdir=
 
 # Desired mode of installed file.
@@ -97,7 +82,7 @@
 dst_arg=
 
 copy_on_change=false
-no_target_directory=
+is_target_a_directory=possibly
 
 usage="\
 Usage: $0 OPTION... -T SRCFILE DSTFILE
@@ -137,42 +122,57 @@
     -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-	shift;;
+        shift;;
 
     --help) echo "$usage"; exit $?;;
 
     -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *''*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
+        case $mode in
+          *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *''*)
+            echo "$0: invalid mode: $mode" >&2
+            exit 1;;
+        esac
+        shift;;
 
     -o) chowncmd="$chownprog $2"
-	shift;;
+        shift;;
 
     -s) stripcmd=$stripprog;;
 
-    -t) dst_arg=$2
-	shift;;
+    -t)
+        is_target_a_directory=always
+        dst_arg=$2
+        # Protect names problematic for 'test' and other utilities.
+        case $dst_arg in
+          -* | =!) dst_arg=./$dst_arg;;
+        esac
+        shift;;
 
-    -T) no_target_directory=true;;
+    -T) is_target_a_directory=never;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    --)	shift
-	break;;
+    --) shift
+        break;;
 
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
+    -*) echo "$0: invalid option: $1" >&2
+        exit 1;;
 
     *)  break;;
   esac
   shift
 done
 
+# We allow the use of options -d and -T together, by making -d
+# take the precedence; this is for compatibility with GNU install.
+
+if test -n "$dir_arg"; then
+  if test -n "$dst_arg"; then
+    echo "$0: target directory not allowed when installing a directory." >&2
+    exit 1
+  fi
+fi
+
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
   # When -d is used, all remaining arguments are directories to create.
   # When -t is used, the destination is already specified.
@@ -186,6 +186,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | =!) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +198,26 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  if test $# -gt 1 || test "$is_target_a_directory" = always; then
+    if test ! -d "$dst_arg"; then
+      echo "$0: $dst_arg: Is not a directory." >&2
+      exit 1
+    fi
+  fi
+fi
+
+if test -z "$dir_arg"; then
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -211,16 +228,16 @@
 
     *0-7)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw='% 200'
+        u_plus_rw='% 200'
       fi
       cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
     *)
       if test -z "$stripcmd"; then
-	u_plus_rw=
+        u_plus_rw=
       else
-	u_plus_rw=,u+rw
+        u_plus_rw=,u+rw
       fi

fpm2-0.79.tar.bz2/missing -> fpm2-0.90.tar.xz/missing Changed

@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,7 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -26,69 +25,40 @@
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output =$^ *$.*/\1/p'
-sed_minuso='s/.* -o $^ *$.*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 OPTION... PROGRAM ARGUMENT...
 
-Handle \`PROGRAM ARGUMENT...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM ARGUMENT...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.ch', if possible, from existing .ch
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.ch', if possible, from existing .ch
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -100,277 +70,146 @@
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^ *ACM_CONFIG_HEADER($^)*$).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^^:*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files

fpm2-0.79.tar.bz2/po/LINGUAS -> fpm2-0.90.tar.xz/po/LINGUAS Changed

fpm2-0.79.tar.bz2/po/bg.po -> fpm2-0.90.tar.xz/po/bg.po Changed

@@ -9,301 +9,290 @@
 msgstr ""
 "Project-Id-Version: fpm2 0.72\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-09 08:33+0100\n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
 "PO-Revision-Date: 2008-07-07 17:17+0200\n"
 "Last-Translator: Yovko Yovkov <yyovkov@yyovkov.net>\n"
 "Language-Team: Bulgarian\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095
-#: src/fpm.c:1378
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr ""
 
-#: src/interface.c:147
+#: ../src/interface.c:162
 msgid "_File"
 msgstr "_Файл"
 
-#: src/interface.c:175
+#: ../src/interface.c:191
 #, fuzzy
 msgid "_Import Passwords"
 msgstr "_Внасяне на пароли"
 
-#: src/interface.c:183
+#: ../src/interface.c:199
 #, fuzzy
 msgid "_Export Passwords"
 msgstr "_Изнасяне на пароли"
 
-#: src/interface.c:196
+#: ../src/interface.c:212
 msgid "_Minimize to tray"
 msgstr "_Минимизиране"
 
-#: src/interface.c:211
+#: ../src/interface.c:227
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: src/interface.c:218 src/interface.c:2684
+#: ../src/interface.c:234 ../src/interface.c:2675
 msgid "Copy _Password"
 msgstr "Копиране на _парола"
 
-#: src/interface.c:229 src/interface.c:2692
+#: ../src/interface.c:246 ../src/interface.c:2683
 msgid "Copy _Username"
 msgstr "Копиране на п_отребител"
 
-#: src/interface.c:240 src/interface.c:2700
+#: ../src/interface.c:258 ../src/interface.c:2691
 msgid "Copy _Both"
 msgstr "Копиране на двете"
 
-#: src/interface.c:256 src/interface.c:2713
+#: ../src/interface.c:275 ../src/interface.c:2704
 msgid "_Add Item"
 msgstr "Eintrag _hinzufügen"
 
-#: src/interface.c:267 src/interface.c:2721
+#: ../src/interface.c:286 ../src/interface.c:2712
 msgid "_Edit Item"
 msgstr "_Добавяне на обект"
 
-#: src/interface.c:278 src/interface.c:2729
+#: ../src/interface.c:298 ../src/interface.c:2720
 #, fuzzy
 msgid "_Clone Item"
 msgstr "_Клониране на обект"
 
-#: src/interface.c:289 src/interface.c:2737
+#: ../src/interface.c:310 ../src/interface.c:2728
 msgid "_Delete Item"
 msgstr "_Изтриване на обект"
 
-#: src/interface.c:309
+#: ../src/interface.c:331
 #, fuzzy
 msgid "_View"
 msgstr "_Файл"
 
-#: src/interface.c:316
+#: ../src/interface.c:338
 #, fuzzy
 msgid "_Title"
 msgstr "Заглавие"
 
-#: src/interface.c:320
+#: ../src/interface.c:342
 #, fuzzy
 msgid "U_RL"
 msgstr "URL"
 
-#: src/interface.c:324
+#: ../src/interface.c:346
 #, fuzzy
 msgid "_User"
 msgstr "Потр."
 
-#: src/interface.c:328
+#: ../src/interface.c:350
 #, fuzzy
 msgid "_Password"
 msgstr "Парола:"
 
-#: src/interface.c:332
+#: ../src/interface.c:354
 #, fuzzy
 msgid "_Category"
 msgstr "Категория"
 
-#: src/interface.c:336
+#: ../src/interface.c:358
 #, fuzzy
 msgid "_Notes"
 msgstr "Бележки:"
 
-#: src/interface.c:340
+#: ../src/interface.c:362
 #, fuzzy
 msgid "_Launcher"
 msgstr "Програма:"
 
-#: src/interface.c:349
+#: ../src/interface.c:371
 #, fuzzy
 msgid "Tool_bar"
 msgstr "_Лента с инструменти"
 
-#: src/interface.c:354
+#: ../src/interface.c:376
 msgid "_Settings"
 msgstr "_Настройки"
 
-#: src/interface.c:361
+#: ../src/interface.c:383
 #, fuzzy
 msgid "_Launcher Preferences"
 msgstr "Страртиран Настройки"
 
-#: src/interface.c:369
+#: ../src/interface.c:391
 #, fuzzy
 msgid "Change _Password"
 msgstr "_Промяна на парола"
 
-#: src/interface.c:386
+#: ../src/interface.c:408
 msgid "_Help"
 msgstr "_Помощ"
 
-#: src/interface.c:393
+#: ../src/interface.c:415
 msgid "Current Password File"
 msgstr "_Текущ файл с пароли"
 
-#: src/interface.c:419
-#, fuzzy
-msgid "Save password list"
-msgstr "Запиши списък с промени"
-
-#: src/interface.c:427
+#: ../src/interface.c:450
 msgid "New"
 msgstr "Нов"
 
-#: src/interface.c:441 src/interface.c:890
+#: ../src/interface.c:465
 msgid "Jump"
 msgstr "Пуск"
 
-#: src/interface.c:447 src/fpm.c:92
+#: ../src/interface.c:472 ../src/fpm.c:64
 msgid "User"
 msgstr "Потр."
 
-#: src/interface.c:453
+#: ../src/interface.c:479
 msgid "Pass"
 msgstr "Пар."
 
-#: src/interface.c:466 src/fpm.c:94
+#: ../src/interface.c:493 ../src/fpm.c:66
 msgid "Category"
 msgstr "Категория"
 
-#: src/interface.c:501
+#: ../src/interface.c:530
 msgid "Find:"
 msgstr "Намери:"

fpm2-0.79.tar.bz2/po/cs.po -> fpm2-0.90.tar.xz/po/cs.po Changed

@@ -7,283 +7,273 @@
 msgstr ""
 "Project-Id-Version: fpm2 0.72\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-09 08:33+0100\n"
-"PO-Revision-Date: 2010-02-09 08:34+0100\n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
+"PO-Revision-Date: 2017-09-13 14:24+0200\n"
 "Last-Translator: Aleš Koval <als@regnet.cz>\n"
-"Language-Team:  <>\n"
+"Language-Team: <>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Virtaal 0.3.0\n"
+"X-Generator: Poedit 2.0.3\n"
 
-#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095
-#: src/fpm.c:1378
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr ""
 
-#: src/interface.c:147
+#: ../src/interface.c:162
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/interface.c:175
+#: ../src/interface.c:191
 msgid "_Import Passwords"
 msgstr "_Importovat hesla"
 
-#: src/interface.c:183
+#: ../src/interface.c:199
 msgid "_Export Passwords"
 msgstr "_Exportovat hesla"
 
-#: src/interface.c:196
+#: ../src/interface.c:212
 msgid "_Minimize to tray"
 msgstr "_Minimalizovat do lišty"
 
-#: src/interface.c:211
+#: ../src/interface.c:227
 msgid "_Edit"
 msgstr "_Upravit"
 
-#: src/interface.c:218 src/interface.c:2684
+#: ../src/interface.c:234 ../src/interface.c:2675
 msgid "Copy _Password"
 msgstr "Zkopírovat hes_lo"
 
-#: src/interface.c:229 src/interface.c:2692
+#: ../src/interface.c:246 ../src/interface.c:2683
 msgid "Copy _Username"
 msgstr "Zkopírovat _jméno"
 
-#: src/interface.c:240 src/interface.c:2700
+#: ../src/interface.c:258 ../src/interface.c:2691
 msgid "Copy _Both"
 msgstr "Zkopírovat _obojí"
 
-#: src/interface.c:256 src/interface.c:2713
+#: ../src/interface.c:275 ../src/interface.c:2704
 msgid "_Add Item"
 msgstr "_Přidat položku"
 
-#: src/interface.c:267 src/interface.c:2721
+#: ../src/interface.c:286 ../src/interface.c:2712
 msgid "_Edit Item"
 msgstr "_Upravit položku"
 
-#: src/interface.c:278 src/interface.c:2729
+#: ../src/interface.c:298 ../src/interface.c:2720
 msgid "_Clone Item"
 msgstr "_Zdvojit položku"
 
-#: src/interface.c:289 src/interface.c:2737
+#: ../src/interface.c:310 ../src/interface.c:2728
 msgid "_Delete Item"
 msgstr "_Smazat položku"
 
-#: src/interface.c:309
+#: ../src/interface.c:331
 msgid "_View"
 msgstr "_Zobrazit"
 
-#: src/interface.c:316
+#: ../src/interface.c:338
 msgid "_Title"
 msgstr "Název"
 
-#: src/interface.c:320
+#: ../src/interface.c:342
 msgid "U_RL"
 msgstr ""
 
-#: src/interface.c:324
+#: ../src/interface.c:346
 msgid "_User"
 msgstr "Uživatel"
 
-#: src/interface.c:328
+#: ../src/interface.c:350
 msgid "_Password"
 msgstr "_Heslo"
 
-#: src/interface.c:332
+#: ../src/interface.c:354
 msgid "_Category"
 msgstr "Kategorie"
 
-#: src/interface.c:336
+#: ../src/interface.c:358
 msgid "_Notes"
 msgstr "Poznámka"
 
-#: src/interface.c:340
+#: ../src/interface.c:362
 msgid "_Launcher"
 msgstr "Spouštěč"
 
-#: src/interface.c:349
+#: ../src/interface.c:371
 msgid "Tool_bar"
 msgstr "_Panel nástrojů"
 
-#: src/interface.c:354
+#: ../src/interface.c:376
 msgid "_Settings"
 msgstr "Nastav_ení"
 
-#: src/interface.c:361
+#: ../src/interface.c:383
 msgid "_Launcher Preferences"
 msgstr "Nastavení _spouštěčů"
 
-#: src/interface.c:369
+#: ../src/interface.c:391
 msgid "Change _Password"
 msgstr "Změna _hesla"
 
-#: src/interface.c:386
+#: ../src/interface.c:408
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: src/interface.c:393
+#: ../src/interface.c:415
 msgid "Current Password File"
 msgstr "Soubor s hesly"
 
-#: src/interface.c:419
-msgid "Save password list"
-msgstr "Uložit soubor s hesly"
-
-#: src/interface.c:427
+#: ../src/interface.c:450
 msgid "New"
 msgstr "Přidat"
 
-#: src/interface.c:441 src/interface.c:890
+#: ../src/interface.c:465
 msgid "Jump"
 msgstr "Spustit"
 
-#: src/interface.c:447 src/fpm.c:92
+#: ../src/interface.c:472 ../src/fpm.c:64
 msgid "User"
 msgstr "Uživatel"
 
-#: src/interface.c:453
+#: ../src/interface.c:479
 msgid "Pass"
 msgstr "Heslo"
 
-#: src/interface.c:466 src/fpm.c:94
+#: ../src/interface.c:493 ../src/fpm.c:66
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/interface.c:501
+#: ../src/interface.c:530
 msgid "Find:"
 msgstr "Hledat:"
 
-#: src/interface.c:519 src/interface.c:2222
+#: ../src/interface.c:548 ../src/interface.c:2246
 msgid "_Match case"
 msgstr "_Rozlišovat velikost"
 
-#: src/interface.c:813
+#: ../src/interface.c:845
 msgid "View / Edit Password Item"
 msgstr "Zobrazit / Upravit položku"

fpm2-0.79.tar.bz2/po/de.po -> fpm2-0.90.tar.xz/po/de.po Changed

@@ -9,281 +9,272 @@
 msgstr ""
 "Project-Id-Version: fpm2 0.77\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-09 08:33+0100\n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
 "PO-Revision-Date: 2010-02-11 10:50+0100\n"
 "Last-Translator: Mike Constabel <mike@constabel.net>\n"
 "Language-Team: German\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095
-#: src/fpm.c:1378
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr ""
 
-#: src/interface.c:147
+#: ../src/interface.c:162
 msgid "_File"
 msgstr "_Datei"
 
-#: src/interface.c:175
+#: ../src/interface.c:191
 msgid "_Import Passwords"
 msgstr "Passwörter _importieren"
 
-#: src/interface.c:183
+#: ../src/interface.c:199
 msgid "_Export Passwords"
 msgstr "Passwörter _exportieren"
 
-#: src/interface.c:196
+#: ../src/interface.c:212
 msgid "_Minimize to tray"
 msgstr "_Minimieren"
 
-#: src/interface.c:211
+#: ../src/interface.c:227
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: src/interface.c:218 src/interface.c:2684
+#: ../src/interface.c:234 ../src/interface.c:2675
 msgid "Copy _Password"
 msgstr "_Passwort kopieren"
 
-#: src/interface.c:229 src/interface.c:2692
+#: ../src/interface.c:246 ../src/interface.c:2683
 msgid "Copy _Username"
 msgstr "Ben_utzername kopieren"
 
-#: src/interface.c:240 src/interface.c:2700
+#: ../src/interface.c:258 ../src/interface.c:2691
 msgid "Copy _Both"
 msgstr "_Beides kopieren"
 
-#: src/interface.c:256 src/interface.c:2713
+#: ../src/interface.c:275 ../src/interface.c:2704
 msgid "_Add Item"
 msgstr "Eintrag _hinzufügen"
 
-#: src/interface.c:267 src/interface.c:2721
+#: ../src/interface.c:286 ../src/interface.c:2712
 msgid "_Edit Item"
 msgstr "Eintrag _bearbeiten"
 
-#: src/interface.c:278 src/interface.c:2729
+#: ../src/interface.c:298 ../src/interface.c:2720
 msgid "_Clone Item"
 msgstr "Eintrag _kopieren"
 
-#: src/interface.c:289 src/interface.c:2737
+#: ../src/interface.c:310 ../src/interface.c:2728
 msgid "_Delete Item"
 msgstr "Eintrag _löschen"
 
-#: src/interface.c:309
+#: ../src/interface.c:331
 msgid "_View"
 msgstr "_Ansicht"
 
-#: src/interface.c:316
+#: ../src/interface.c:338
 msgid "_Title"
 msgstr "_Titel"
 
-#: src/interface.c:320
+#: ../src/interface.c:342
 msgid "U_RL"
 msgstr "U_RL"
 
-#: src/interface.c:324
+#: ../src/interface.c:346
 msgid "_User"
 msgstr "Ben_utzer"
 
-#: src/interface.c:328
+#: ../src/interface.c:350
 msgid "_Password"
 msgstr "_Passwort"
 
-#: src/interface.c:332
+#: ../src/interface.c:354
 msgid "_Category"
 msgstr "_Kategorie"
 
-#: src/interface.c:336
+#: ../src/interface.c:358
 msgid "_Notes"
 msgstr "_Notizen"
 
-#: src/interface.c:340
+#: ../src/interface.c:362
 msgid "_Launcher"
 msgstr "_Starter"
 
-#: src/interface.c:349
+#: ../src/interface.c:371
 msgid "Tool_bar"
 msgstr "Symbol_leiste"
 
-#: src/interface.c:354
+#: ../src/interface.c:376
 msgid "_Settings"
 msgstr "_Einstellungen"
 
-#: src/interface.c:361
+#: ../src/interface.c:383
 msgid "_Launcher Preferences"
 msgstr "Programm_starter Einstellungen"
 
-#: src/interface.c:369
+#: ../src/interface.c:391
 msgid "Change _Password"
 msgstr "_Passwort ändern"
 
-#: src/interface.c:386
+#: ../src/interface.c:408
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: src/interface.c:393
+#: ../src/interface.c:415
 msgid "Current Password File"
 msgstr "_Aktuelle Passwortdatei"
 
-#: src/interface.c:419
-msgid "Save password list"
-msgstr "Passwortdatei speichern"
-
-#: src/interface.c:427
+#: ../src/interface.c:450
 msgid "New"
 msgstr "Neu"
 
-#: src/interface.c:441 src/interface.c:890
+#: ../src/interface.c:465
 msgid "Jump"
 msgstr "Springe"
 
-#: src/interface.c:447 src/fpm.c:92
+#: ../src/interface.c:472 ../src/fpm.c:64
 msgid "User"
 msgstr "Benutzer"
 
-#: src/interface.c:453
+#: ../src/interface.c:479
 msgid "Pass"
 msgstr "Passwort"
 
-#: src/interface.c:466 src/fpm.c:94
+#: ../src/interface.c:493 ../src/fpm.c:66
 msgid "Category"
 msgstr "Kategorie"
 
-#: src/interface.c:501
+#: ../src/interface.c:530
 msgid "Find:"
 msgstr "Suche:"
 
-#: src/interface.c:519 src/interface.c:2222
+#: ../src/interface.c:548 ../src/interface.c:2246
 msgid "_Match case"
 msgstr "Unterscheide _Groß-/Kleinschreibung"
 
-#: src/interface.c:813
+#: ../src/interface.c:845
 msgid "View / Edit Password Item"
 msgstr "Passworteintrag ansehen / bearbeiten"
 
-#: src/interface.c:842
+#: ../src/interface.c:873
 msgid "Title:"
 msgstr "Titel:"

fpm2-0.79.tar.bz2/po/es.po -> fpm2-0.90.tar.xz/po/es.po Changed

@@ -8,283 +8,273 @@
 msgstr ""
 "Project-Id-Version: fpm2 0.77\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-09 08:33+0100\n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
 "PO-Revision-Date: 2010-02-14 19:13+0100\n"
 "Last-Translator: Antonio Rguez. Capita <antoniorodc@gmail.com>\n"
 "Language-Team: es <>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.3.1\n"
 
-#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095
-#: src/fpm.c:1378
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr "Figaro's Password Manager 2"
 
-#: src/interface.c:147
+#: ../src/interface.c:162
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/interface.c:175
+#: ../src/interface.c:191
 msgid "_Import Passwords"
 msgstr "_Importar contraseñas"
 
-#: src/interface.c:183
+#: ../src/interface.c:199
 msgid "_Export Passwords"
 msgstr "_Exportar contraseñas"
 
-#: src/interface.c:196
+#: ../src/interface.c:212
 msgid "_Minimize to tray"
 msgstr "_Minimizar al área de notificación"
 
-#: src/interface.c:211
+#: ../src/interface.c:227
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/interface.c:218 src/interface.c:2684
+#: ../src/interface.c:234 ../src/interface.c:2675
 msgid "Copy _Password"
 msgstr "Copiar _contraseña"
 
-#: src/interface.c:229 src/interface.c:2692
+#: ../src/interface.c:246 ../src/interface.c:2683
 msgid "Copy _Username"
 msgstr "Copiar _usuario"
 
-#: src/interface.c:240 src/interface.c:2700
+#: ../src/interface.c:258 ../src/interface.c:2691
 msgid "Copy _Both"
 msgstr "Copiar a_mbos"
 
-#: src/interface.c:256 src/interface.c:2713
+#: ../src/interface.c:275 ../src/interface.c:2704
 msgid "_Add Item"
 msgstr "_Añadir elemento"
 
-#: src/interface.c:267 src/interface.c:2721
+#: ../src/interface.c:286 ../src/interface.c:2712
 msgid "_Edit Item"
 msgstr "_Editar elemento"
 
-#: src/interface.c:278 src/interface.c:2729
+#: ../src/interface.c:298 ../src/interface.c:2720
 msgid "_Clone Item"
 msgstr "C_lonar elemento"
 
-#: src/interface.c:289 src/interface.c:2737
+#: ../src/interface.c:310 ../src/interface.c:2728
 msgid "_Delete Item"
 msgstr "Bo_rrar elemento"
 
-#: src/interface.c:309
+#: ../src/interface.c:331
 msgid "_View"
 msgstr "_Ver"
 
-#: src/interface.c:316
+#: ../src/interface.c:338
 msgid "_Title"
 msgstr "_Título"
 
-#: src/interface.c:320
+#: ../src/interface.c:342
 msgid "U_RL"
 msgstr "U_RL"
 
-#: src/interface.c:324
+#: ../src/interface.c:346
 msgid "_User"
 msgstr "_Usuario"
 
-#: src/interface.c:328
+#: ../src/interface.c:350
 msgid "_Password"
 msgstr "_Contraseña"
 
-#: src/interface.c:332
+#: ../src/interface.c:354
 msgid "_Category"
 msgstr "_Categoría"
 
-#: src/interface.c:336
+#: ../src/interface.c:358
 msgid "_Notes"
 msgstr "_Notas"
 
-#: src/interface.c:340
+#: ../src/interface.c:362
 msgid "_Launcher"
 msgstr "_Lanzador"
 
-#: src/interface.c:349
+#: ../src/interface.c:371
 msgid "Tool_bar"
 msgstr "_Barra de herramientas"
 
-#: src/interface.c:354
+#: ../src/interface.c:376
 msgid "_Settings"
 msgstr "_Opciones"
 
-#: src/interface.c:361
+#: ../src/interface.c:383
 msgid "_Launcher Preferences"
 msgstr "Preferencias _lanzador"
 
-#: src/interface.c:369
+#: ../src/interface.c:391
 msgid "Change _Password"
 msgstr "_Cambiar contraseña"
 
-#: src/interface.c:386
+#: ../src/interface.c:408
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: src/interface.c:393
+#: ../src/interface.c:415
 msgid "Current Password File"
 msgstr "Archivo actual de claves"
 
-#: src/interface.c:419
-msgid "Save password list"
-msgstr "Guardar lista de contraseñas"
-
-#: src/interface.c:427
+#: ../src/interface.c:450
 msgid "New"
 msgstr "Nuevo"
 
-#: src/interface.c:441 src/interface.c:890
+#: ../src/interface.c:465
 msgid "Jump"
 msgstr "Ir a"
 
-#: src/interface.c:447 src/fpm.c:92
+#: ../src/interface.c:472 ../src/fpm.c:64
 msgid "User"
 msgstr "Usuario"
 
-#: src/interface.c:453
+#: ../src/interface.c:479
 msgid "Pass"
 msgstr "Contraseña"
 
-#: src/interface.c:466 src/fpm.c:94
+#: ../src/interface.c:493 ../src/fpm.c:66
 msgid "Category"
 msgstr "Categoría"
 
-#: src/interface.c:501
+#: ../src/interface.c:530
 msgid "Find:"
 msgstr "Buscar:"
 
-#: src/interface.c:519 src/interface.c:2222
+#: ../src/interface.c:548 ../src/interface.c:2246
 msgid "_Match case"
 msgstr "Coincidir con _mayúsculas y minúsculas"
 
-#: src/interface.c:813
+#: ../src/interface.c:845
 msgid "View / Edit Password Item"
 msgstr "Ver / Editar Contraseña"
 
-#: src/interface.c:842
+#: ../src/interface.c:873

fpm2-0.79.tar.bz2/po/eu.po -> fpm2-0.90.tar.xz/po/eu.po Changed

@@ -8,291 +8,272 @@
 msgstr ""
 "Project-Id-Version: fpm2 0.72\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-09 08:33+0100\n"
-"PO-Revision-Date: 2009-07-29 13:43+0100\n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
+"PO-Revision-Date: 2011-01-17 21:32+0100\n"
 "Last-Translator: Ales Zabala Alava (Shagi) <shagi@gisa-elkartea.org>\n"
 "Language-Team: \n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095
-#: src/fpm.c:1378
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr "Figaroren Pasahitz Kudeatzailea 2"
 
-#: src/interface.c:147
+#: ../src/interface.c:162
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: src/interface.c:175
+#: ../src/interface.c:191
 msgid "_Import Passwords"
 msgstr "Pasahitzak _Inportatu"
 
-#: src/interface.c:183
+#: ../src/interface.c:199
 msgid "_Export Passwords"
 msgstr "Pasahitzak _Esportatu"
 
-#: src/interface.c:196
+#: ../src/interface.c:212
 msgid "_Minimize to tray"
 msgstr "Erretilura ikonotu (_M)"
 
-#: src/interface.c:211
+#: ../src/interface.c:227
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: src/interface.c:218 src/interface.c:2684
+#: ../src/interface.c:234 ../src/interface.c:2675
 msgid "Copy _Password"
 msgstr "_Pasahitza kopiatu"
 
-#: src/interface.c:229 src/interface.c:2692
+#: ../src/interface.c:246 ../src/interface.c:2683
 msgid "Copy _Username"
 msgstr "Erabiltzailea Kopiat_u"
 
-#: src/interface.c:240 src/interface.c:2700
+#: ../src/interface.c:258 ../src/interface.c:2691
 msgid "Copy _Both"
 msgstr "_Biak kopiatu"
 
-#: src/interface.c:256 src/interface.c:2713
+#: ../src/interface.c:275 ../src/interface.c:2704
 msgid "_Add Item"
 msgstr "Elementu_a Gehitu"
 
-#: src/interface.c:267 src/interface.c:2721
+#: ../src/interface.c:286 ../src/interface.c:2712
 msgid "_Edit Item"
 msgstr "Elementua _Editatu"
 
-#: src/interface.c:278 src/interface.c:2729
+#: ../src/interface.c:298 ../src/interface.c:2720
 msgid "_Clone Item"
 msgstr "Elementua Klonatu (_C)"
 
-#: src/interface.c:289 src/interface.c:2737
+#: ../src/interface.c:310 ../src/interface.c:2728
 msgid "_Delete Item"
 msgstr "Elementua Ezabatu (_D)"
 
-#: src/interface.c:309
-#, fuzzy
+#: ../src/interface.c:331
 msgid "_View"
-msgstr "_Fitxategia"
+msgstr "Ikusi (_V)"
 
-#: src/interface.c:316
-#, fuzzy
+#: ../src/interface.c:338
 msgid "_Title"
-msgstr "Izenburua"
+msgstr "Izenburua (_T)"
 
-#: src/interface.c:320
-#, fuzzy
+#: ../src/interface.c:342
 msgid "U_RL"
-msgstr "URL"
+msgstr "U_RL"
 
-#: src/interface.c:324
-#, fuzzy
+#: ../src/interface.c:346
 msgid "_User"
-msgstr "Erabiltzailea"
+msgstr "Erabiltzailea (_U)"
 
-#: src/interface.c:328
-#, fuzzy
+#: ../src/interface.c:350
 msgid "_Password"
-msgstr "_Pasahitza:"
+msgstr "_Pasahitza"
 
-#: src/interface.c:332
-#, fuzzy
+#: ../src/interface.c:354
 msgid "_Category"
-msgstr "Kategoria"
+msgstr "Kategoria (_C)"
 
-#: src/interface.c:336
-#, fuzzy
+#: ../src/interface.c:358
 msgid "_Notes"
-msgstr "Oharrak:"
+msgstr "Oharrak (_N)"
 
-#: src/interface.c:340
-#, fuzzy
+#: ../src/interface.c:362
 msgid "_Launcher"
-msgstr "Abiarazlea:"
+msgstr "Abiaraz_lea"
 
-#: src/interface.c:349
-#, fuzzy
+#: ../src/interface.c:371
 msgid "Tool_bar"
-msgstr "_Tresna barra"
+msgstr "Tresna_barra"
 
-#: src/interface.c:354
+#: ../src/interface.c:376
 msgid "_Settings"
 msgstr "Hobe_spenak"
 
-#: src/interface.c:361
+#: ../src/interface.c:383
 msgid "_Launcher Preferences"
 msgstr "Abiaraz_learen Hobespenak"
 
-#: src/interface.c:369
+#: ../src/interface.c:391
 msgid "Change _Password"
 msgstr "_Pasahitza aldatu"
 
-#: src/interface.c:386
+#: ../src/interface.c:408
 msgid "_Help"
 msgstr "Laguntza (_H)"
 
-#: src/interface.c:393
+#: ../src/interface.c:415
 msgid "Current Password File"
 msgstr "Uneko Pasahitz Fitxategia"
 
-#: src/interface.c:419
-msgid "Save password list"
-msgstr "Pasahitz zerrenda gorde"
-
-#: src/interface.c:427
+#: ../src/interface.c:450
 msgid "New"
 msgstr "Berria"
 
-#: src/interface.c:441 src/interface.c:890
+#: ../src/interface.c:465
 msgid "Jump"
 msgstr "Salto"
 
-#: src/interface.c:447 src/fpm.c:92
+#: ../src/interface.c:472 ../src/fpm.c:64
 msgid "User"
 msgstr "Erabiltzailea"
 
-#: src/interface.c:453
+#: ../src/interface.c:479
 msgid "Pass"
 msgstr "Pasahitza"
 
-#: src/interface.c:466 src/fpm.c:94
+#: ../src/interface.c:493 ../src/fpm.c:66
 msgid "Category"
 msgstr "Kategoria"

fpm2-0.79.tar.bz2/po/fr.po -> fpm2-0.90.tar.xz/po/fr.po Changed

@@ -7,280 +7,271 @@
 msgstr ""
 "Project-Id-Version: fpm2 0.77\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-09 08:33+0100\n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
 "PO-Revision-Date: 2010-02-11 09:21+0100\n"
 "Last-Translator: Christoph J. Thompson <cjsthompson@gmail.com>\n"
 "Language-Team: French\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095
-#: src/fpm.c:1378
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr "Gestionnaire de Mots de Passe de Figaro 2"
 
-#: src/interface.c:147
+#: ../src/interface.c:162
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/interface.c:175
+#: ../src/interface.c:191
 msgid "_Import Passwords"
 msgstr "_Importer des Mots de Passe"
 
-#: src/interface.c:183
+#: ../src/interface.c:199
 msgid "_Export Passwords"
 msgstr "_Exporter les Mots de Passe"
 
-#: src/interface.c:196
+#: ../src/interface.c:212
 msgid "_Minimize to tray"
 msgstr "_Mettre en notification"
 
-#: src/interface.c:211
+#: ../src/interface.c:227
 msgid "_Edit"
 msgstr "_Editer"
 
-#: src/interface.c:218 src/interface.c:2684
+#: ../src/interface.c:234 ../src/interface.c:2675
 msgid "Copy _Password"
 msgstr "Copier le Mot de _Passe"
 
-#: src/interface.c:229 src/interface.c:2692
+#: ../src/interface.c:246 ../src/interface.c:2683
 msgid "Copy _Username"
 msgstr "Copier le Nom d'_Utilisateur"
 
-#: src/interface.c:240 src/interface.c:2700
+#: ../src/interface.c:258 ../src/interface.c:2691
 msgid "Copy _Both"
 msgstr "Copier les _Deux"
 
-#: src/interface.c:256 src/interface.c:2713
+#: ../src/interface.c:275 ../src/interface.c:2704
 msgid "_Add Item"
 msgstr "_Ajouter un Signet"
 
-#: src/interface.c:267 src/interface.c:2721
+#: ../src/interface.c:286 ../src/interface.c:2712
 msgid "_Edit Item"
 msgstr "_Editer un Signet"
 
-#: src/interface.c:278 src/interface.c:2729
+#: ../src/interface.c:298 ../src/interface.c:2720
 msgid "_Clone Item"
 msgstr "_Clôner un Signet"
 
-#: src/interface.c:289 src/interface.c:2737
+#: ../src/interface.c:310 ../src/interface.c:2728
 msgid "_Delete Item"
 msgstr "E_ffacer un Signet"
 
-#: src/interface.c:309
+#: ../src/interface.c:331
 msgid "_View"
 msgstr "_Voir"
 
-#: src/interface.c:316
+#: ../src/interface.c:338
 msgid "_Title"
 msgstr "_Titre"
 
-#: src/interface.c:320
+#: ../src/interface.c:342
 msgid "U_RL"
 msgstr "U_RL"
 
-#: src/interface.c:324
+#: ../src/interface.c:346
 msgid "_User"
 msgstr "_Utilisateur"
 
-#: src/interface.c:328
+#: ../src/interface.c:350
 msgid "_Password"
 msgstr "Mot de _Passe"
 
-#: src/interface.c:332
+#: ../src/interface.c:354
 msgid "_Category"
 msgstr "Rubr_ique"
 
-#: src/interface.c:336
+#: ../src/interface.c:358
 msgid "_Notes"
 msgstr "Comme_ntaires"
 
-#: src/interface.c:340
+#: ../src/interface.c:362
 msgid "_Launcher"
 msgstr "_Raccourci"
 
-#: src/interface.c:349
+#: ../src/interface.c:371
 msgid "Tool_bar"
 msgstr "_Barre d'Outils"
 
-#: src/interface.c:354
+#: ../src/interface.c:376
 msgid "_Settings"
 msgstr "_Paramètres"
 
-#: src/interface.c:361
+#: ../src/interface.c:383
 msgid "_Launcher Preferences"
 msgstr "Éditeur de _Raccourci"
 
-#: src/interface.c:369
+#: ../src/interface.c:391
 msgid "Change _Password"
 msgstr "Changer de Mot de _Passe"
 
-#: src/interface.c:386
+#: ../src/interface.c:408
 msgid "_Help"
 msgstr "_Aide"
 
-#: src/interface.c:393
+#: ../src/interface.c:415
 msgid "Current Password File"
 msgstr "Fichier de Mot de Passe actuel"
 
-#: src/interface.c:419
-msgid "Save password list"
-msgstr "Enregistrer la collection de mots de passe"
-
-#: src/interface.c:427
+#: ../src/interface.c:450
 msgid "New"
 msgstr "Nouveau"
 
-#: src/interface.c:441 src/interface.c:890
+#: ../src/interface.c:465
 msgid "Jump"
 msgstr "Sauter"
 
-#: src/interface.c:447 src/fpm.c:92
+#: ../src/interface.c:472 ../src/fpm.c:64
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/interface.c:453
+#: ../src/interface.c:479
 msgid "Pass"
 msgstr "Mot de Passe"
 
-#: src/interface.c:466 src/fpm.c:94
+#: ../src/interface.c:493 ../src/fpm.c:66
 msgid "Category"
 msgstr "Rubrique"
 
-#: src/interface.c:501
+#: ../src/interface.c:530
 msgid "Find:"
 msgstr "Trouver:"
 
-#: src/interface.c:519 src/interface.c:2222
+#: ../src/interface.c:548 ../src/interface.c:2246
 msgid "_Match case"
 msgstr "_Respecter la casse"
 
-#: src/interface.c:813
+#: ../src/interface.c:845
 msgid "View / Edit Password Item"
 msgstr "Voir / Éditer un Signet"
 
-#: src/interface.c:842
+#: ../src/interface.c:873
 msgid "Title:"
 msgstr "Titre:"

fpm2-0.90.tar.xz/po/he.po Added

@@ -0,0 +1,1021 @@
+# Hebrew translation for fpm2.
+# Copyright (c) 2000-2003 John Conneely & other contributors
+# Copyright (c) 2008-2011 Aleš Koval
+# This file is distributed under the same license as the fpm2 package.
+# Isratine Citizen <genghiskhan@gmx.ca>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fpm2 0.79\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
+"PO-Revision-Date: 2012-12-22 15:52+0200\n"
+"Last-Translator: Isratine Citizen <genghiskhan@gmx.ca>\n"
+"Language-Team: Rahut <genghiskhan@gmx.ca>\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
+
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
+msgid "Figaro's Password Manager 2"
+msgstr ""
+
+#: ../src/interface.c:162
+msgid "_File"
+msgstr "_קובץ"
+
+#: ../src/interface.c:191
+msgid "_Import Passwords"
+msgstr "יי_בוא סיסמאות"
+
+#: ../src/interface.c:199
+msgid "_Export Passwords"
+msgstr "ייצו_א סיסמאות"
+
+#: ../src/interface.c:212
+msgid "_Minimize to tray"
+msgstr "_מזער למגש"
+
+#: ../src/interface.c:227
+msgid "_Edit"
+msgstr "ע_ריכה"
+
+# מילת מפתח
+#: ../src/interface.c:234 ../src/interface.c:2675
+msgid "Copy _Password"
+msgstr "העתק _סיסמה"
+
+# העתקת _שם
+#: ../src/interface.c:246 ../src/interface.c:2683
+msgid "Copy _Username"
+msgstr "העתק שם מ_שתמש"
+
+#: ../src/interface.c:258 ../src/interface.c:2691
+msgid "Copy _Both"
+msgstr "העתק ה_כל"
+
+#: ../src/interface.c:275 ../src/interface.c:2704
+msgid "_Add Item"
+msgstr "_הוסף פריט"
+
+#: ../src/interface.c:286 ../src/interface.c:2712
+msgid "_Edit Item"
+msgstr "_ערוך פריט"
+
+#: ../src/interface.c:298 ../src/interface.c:2720
+msgid "_Clone Item"
+msgstr "שכ_פל פריט"
+
+#: ../src/interface.c:310 ../src/interface.c:2728
+msgid "_Delete Item"
+msgstr "_מחק פריט"
+
+#: ../src/interface.c:331
+msgid "_View"
+msgstr "_תצוגה"
+
+#: ../src/interface.c:338
+msgid "_Title"
+msgstr "_כותרת"
+
+#: ../src/interface.c:342
+msgid "U_RL"
+msgstr "_URL"
+
+#: ../src/interface.c:346
+msgid "_User"
+msgstr "_משתמש"
+
+#: ../src/interface.c:350
+msgid "_Password"
+msgstr "_סיסמה"
+
+#: ../src/interface.c:354
+msgid "_Category"
+msgstr "_קטגוריה"
+
+#: ../src/interface.c:358
+msgid "_Notes"
+msgstr "ה_ערות"
+
+# חלופות:
+# השקה משיק
+# הזנקה מזניק
+# המתרגמים הגרמניים תרגמו אל Starter
+# סטרטר
+# מתנע
+# מזנק
+#: ../src/interface.c:362
+msgid "_Launcher"
+msgstr "מש_גר"
+
+#: ../src/interface.c:371
+msgid "Tool_bar"
+msgstr "סרגל _כלים"
+
+#: ../src/interface.c:376
+msgid "_Settings"
+msgstr "_הגדרות"
+
+#: ../src/interface.c:383
+msgid "_Launcher Preferences"
+msgstr "העדפות מש_גר"
+
+#: ../src/interface.c:391
+msgid "Change _Password"
+msgstr "שנה _סיסמה"
+
+#: ../src/interface.c:408
+msgid "_Help"
+msgstr "_עזרה"
+
+#: ../src/interface.c:415
+msgid "Current Password File"
+msgstr "קובץ סיסמה נוכחי"
+
+#: ../src/interface.c:450
+msgid "New"
+msgstr "חדש"
+
+#: ../src/interface.c:465
+msgid "Jump"
+msgstr "הזנק"
+
+#: ../src/interface.c:472 ../src/fpm.c:64
+msgid "User"
+msgstr "משתמש"
+
+#: ../src/interface.c:479
+msgid "Pass"
+msgstr "סיסמה"
+
+#: ../src/interface.c:493 ../src/fpm.c:66
+msgid "Category"
+msgstr "קטגוריה"
+
+# מציאה:
+#: ../src/interface.c:530
+msgid "Find:"
+msgstr "חיפוש:"
+
+#: ../src/interface.c:548 ../src/interface.c:2246
+msgid "_Match case"
+msgstr "ה_תאם אותיות גדולות\\קטנות"
+
+#: ../src/interface.c:845
+msgid "View / Edit Password Item"
+msgstr "הצגת \\ עריכת פריט סיסמה"
+
+#: ../src/interface.c:873
+msgid "Title:"
+msgstr "כותרת:"
+
+#: ../src/interface.c:878
+msgid "URL / Arg:"
+msgstr "‏ארגומנט \\ URL:"
+
+#: ../src/interface.c:883
+msgid "User Name:"
+msgstr "שם משתמש:"
+
+# מילת מעבר/מפתח
+#: ../src/interface.c:888
+msgid "Password:"
+msgstr "סיסמה:"
+
+#: ../src/interface.c:902
+msgid "Show Password"
+msgstr "הצג סיסמה"
+
+#: ../src/interface.c:921 ../src/callbacks.c:559 ../src/callbacks.c:625
+msgid "Category:"
+msgstr "קטגוריה:"
+
+#: ../src/interface.c:926
+msgid "Include this password in the default list."

fpm2-0.79.tar.bz2/po/hu.po -> fpm2-0.90.tar.xz/po/hu.po Changed

@@ -7,289 +7,280 @@
 msgstr ""
 "Project-Id-Version: fpm2 0.71\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-09 08:33+0100\n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
 "PO-Revision-Date: 2009-03-01 10:57+0100\n"
 "Last-Translator: Peter Polonkai <polesz@nedudu.hu>\n"
 "Language-Team: Nedudu Team <polesz@nedudu.hu>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095
-#: src/fpm.c:1378
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr "Figaro Jelszó Kezelő 2"
 
-#: src/interface.c:147
+#: ../src/interface.c:162
 msgid "_File"
 msgstr "_Fájl"
 
-#: src/interface.c:175
+#: ../src/interface.c:191
 msgid "_Import Passwords"
 msgstr "Jelszavak importálása"
 
-#: src/interface.c:183
+#: ../src/interface.c:199
 msgid "_Export Passwords"
 msgstr "Jelszavak exportálása"
 
-#: src/interface.c:196
+#: ../src/interface.c:212
 msgid "_Minimize to tray"
 msgstr "_Kicsinyítés a tálcára"
 
-#: src/interface.c:211
+#: ../src/interface.c:227
 msgid "_Edit"
 msgstr "Sz_erkesztés"
 
-#: src/interface.c:218 src/interface.c:2684
+#: ../src/interface.c:234 ../src/interface.c:2675
 msgid "Copy _Password"
 msgstr "_Jelszó másolása"
 
-#: src/interface.c:229 src/interface.c:2692
+#: ../src/interface.c:246 ../src/interface.c:2683
 msgid "Copy _Username"
 msgstr "_Felhasználónév másolása"
 
-#: src/interface.c:240 src/interface.c:2700
+#: ../src/interface.c:258 ../src/interface.c:2691
 msgid "Copy _Both"
 msgstr "_Mind másolása"
 
-#: src/interface.c:256 src/interface.c:2713
+#: ../src/interface.c:275 ../src/interface.c:2704
 msgid "_Add Item"
 msgstr "Elem hozzá_adása"
 
-#: src/interface.c:267 src/interface.c:2721
+#: ../src/interface.c:286 ../src/interface.c:2712
 msgid "_Edit Item"
 msgstr "_Elem szerkesztése"
 
-#: src/interface.c:278 src/interface.c:2729
+#: ../src/interface.c:298 ../src/interface.c:2720
 msgid "_Clone Item"
 msgstr "Elem _klónozása"
 
-#: src/interface.c:289 src/interface.c:2737
+#: ../src/interface.c:310 ../src/interface.c:2728
 msgid "_Delete Item"
 msgstr "Elem _törlése"
 
-#: src/interface.c:309
+#: ../src/interface.c:331
 #, fuzzy
 msgid "_View"
 msgstr "_Fájl"
 
-#: src/interface.c:316
+#: ../src/interface.c:338
 #, fuzzy
 msgid "_Title"
 msgstr "Fejléc"
 
-#: src/interface.c:320
+#: ../src/interface.c:342
 #, fuzzy
 msgid "U_RL"
 msgstr "URL"
 
-#: src/interface.c:324
+#: ../src/interface.c:346
 #, fuzzy
 msgid "_User"
 msgstr "Felhasználó"
 
-#: src/interface.c:328
+#: ../src/interface.c:350
 #, fuzzy
 msgid "_Password"
 msgstr "_Jelszó:"
 
-#: src/interface.c:332
+#: ../src/interface.c:354
 #, fuzzy
 msgid "_Category"
 msgstr "Kategória"
 
-#: src/interface.c:336
+#: ../src/interface.c:358
 #, fuzzy
 msgid "_Notes"
 msgstr "Megjegyzés:"
 
-#: src/interface.c:340
+#: ../src/interface.c:362
 #, fuzzy
 msgid "_Launcher"
 msgstr "Futtató:"
 
-#: src/interface.c:349
+#: ../src/interface.c:371
 #, fuzzy
 msgid "Tool_bar"
 msgstr "Eszköz_tár"
 
-#: src/interface.c:354
+#: ../src/interface.c:376
 msgid "_Settings"
 msgstr "_Beállítások"
 
-#: src/interface.c:361
+#: ../src/interface.c:383
 msgid "_Launcher Preferences"
 msgstr "Futtatók beállításai"
 
-#: src/interface.c:369
+#: ../src/interface.c:391
 msgid "Change _Password"
 msgstr "Jelszó cseréje"
 
-#: src/interface.c:386
+#: ../src/interface.c:408
 msgid "_Help"
 msgstr "_Súgó"
 
-#: src/interface.c:393
+#: ../src/interface.c:415
 msgid "Current Password File"
 msgstr "Jelenlegi Jelszó fájl"
 
-#: src/interface.c:419
-msgid "Save password list"
-msgstr "Jelszó fájl mentése"
-
-#: src/interface.c:427
+#: ../src/interface.c:450
 msgid "New"
 msgstr "Új"
 
-#: src/interface.c:441 src/interface.c:890
+#: ../src/interface.c:465
 msgid "Jump"
 msgstr "Ugrás"
 
-#: src/interface.c:447 src/fpm.c:92
+#: ../src/interface.c:472 ../src/fpm.c:64
 msgid "User"
 msgstr "Felhasználó"
 
-#: src/interface.c:453
+#: ../src/interface.c:479
 msgid "Pass"
 msgstr "Jelszó"
 
-#: src/interface.c:466 src/fpm.c:94
+#: ../src/interface.c:493 ../src/fpm.c:66
 msgid "Category"
 msgstr "Kategória"
 
-#: src/interface.c:501
+#: ../src/interface.c:530
 msgid "Find:"
 msgstr "Keresés:"
 
-#: src/interface.c:519 src/interface.c:2222
+#: ../src/interface.c:548 ../src/interface.c:2246
 msgid "_Match case"
 msgstr "_Kis/nagybetű érzékeny"
 
-#: src/interface.c:813

fpm2-0.79.tar.bz2/po/it.po -> fpm2-0.90.tar.xz/po/it.po Changed

@@ -7,14 +7,14 @@
 msgstr ""
 "Project-Id-Version: fpm2 0.77\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-09 08:33+0100\n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
 "PO-Revision-Date: 2010-02-11 20:28+0100\n"
 "Last-Translator: Nicola Jelmorini <jelmorini@linux.com>\n"
 "Language-Team: Nicola Jelmorini <jelmorini@linux.com>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.3.1\n"
 "X-Poedit-Language: Italian\n"
@@ -22,358 +22,346 @@
 "X-Poedit-Bookmarks: 116,125,-1,-1,-1,-1,-1,-1,-1,-1\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/interface.c:129
-#: src/interface.c:1063
-#: src/interface.c:1095
-#: src/fpm.c:1378
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr "Figaro's Password Manager 2"
 
-#: src/interface.c:147
+#: ../src/interface.c:162
 msgid "_File"
 msgstr "_File"
 
-#: src/interface.c:175
+#: ../src/interface.c:191
 msgid "_Import Passwords"
 msgstr "_Importa le password"
 
-#: src/interface.c:183
+#: ../src/interface.c:199
 msgid "_Export Passwords"
 msgstr "_Esporta le password"
 
-#: src/interface.c:196
+#: ../src/interface.c:212
 msgid "_Minimize to tray"
 msgstr "_Minimizza nell'area di notifica"
 
-#: src/interface.c:211
+#: ../src/interface.c:227
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: src/interface.c:218
-#: src/interface.c:2684
+#: ../src/interface.c:234 ../src/interface.c:2675
 msgid "Copy _Password"
 msgstr "Copia _password"
 
-#: src/interface.c:229
-#: src/interface.c:2692
+#: ../src/interface.c:246 ../src/interface.c:2683
 msgid "Copy _Username"
 msgstr "Copia nome _utente"
 
-#: src/interface.c:240
-#: src/interface.c:2700
+#: ../src/interface.c:258 ../src/interface.c:2691
 msgid "Copy _Both"
 msgstr "Copia _entrambi"
 
-#: src/interface.c:256
-#: src/interface.c:2713
+#: ../src/interface.c:275 ../src/interface.c:2704
 msgid "_Add Item"
 msgstr "_Aggiungi elemento"
 
-#: src/interface.c:267
-#: src/interface.c:2721
+#: ../src/interface.c:286 ../src/interface.c:2712
 msgid "_Edit Item"
 msgstr "_Modifica elemento"
 
-#: src/interface.c:278
-#: src/interface.c:2729
+#: ../src/interface.c:298 ../src/interface.c:2720
 msgid "_Clone Item"
 msgstr "_Clona elemento"
 
-#: src/interface.c:289
-#: src/interface.c:2737
+#: ../src/interface.c:310 ../src/interface.c:2728
 msgid "_Delete Item"
 msgstr "Ca_ncella elemento"
 
-#: src/interface.c:309
+#: ../src/interface.c:331
 msgid "_View"
 msgstr "_Visualizza"
 
-#: src/interface.c:316
+#: ../src/interface.c:338
 msgid "_Title"
 msgstr "_Titolo"
 
-#: src/interface.c:320
+#: ../src/interface.c:342
 msgid "U_RL"
 msgstr "U_RL"
 
-#: src/interface.c:324
+#: ../src/interface.c:346
 msgid "_User"
 msgstr "_Utente"
 
-#: src/interface.c:328
+#: ../src/interface.c:350
 msgid "_Password"
 msgstr "_Password"
 
-#: src/interface.c:332
+#: ../src/interface.c:354
 msgid "_Category"
 msgstr "_Categoria"
 
-#: src/interface.c:336
+#: ../src/interface.c:358
 msgid "_Notes"
 msgstr "_Note"
 
-#: src/interface.c:340
+#: ../src/interface.c:362
 msgid "_Launcher"
 msgstr "_Lanciatore"
 
-#: src/interface.c:349
+#: ../src/interface.c:371
 msgid "Tool_bar"
 msgstr "_Barra degli strumenti"
 
-#: src/interface.c:354
+#: ../src/interface.c:376
 msgid "_Settings"
 msgstr "_Impostazioni"
 
-#: src/interface.c:361
+#: ../src/interface.c:383
 msgid "_Launcher Preferences"
 msgstr "Preferenze del _lanciatore"
 
-#: src/interface.c:369
+#: ../src/interface.c:391
 msgid "Change _Password"
 msgstr "_Cambiare la password"
 
-#: src/interface.c:386
+#: ../src/interface.c:408
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: src/interface.c:393
+#: ../src/interface.c:415
 msgid "Current Password File"
 msgstr "File delle password corrente"
 
-#: src/interface.c:419
-msgid "Save password list"
-msgstr "Salvare la lista delle password"
-
-#: src/interface.c:427
+#: ../src/interface.c:450
 msgid "New"
 msgstr "Nuovo"
 
-#: src/interface.c:441
-#: src/interface.c:890
+#: ../src/interface.c:465
 msgid "Jump"
 msgstr "Vai a"
 
-#: src/interface.c:447
-#: src/fpm.c:92
+#: ../src/interface.c:472 ../src/fpm.c:64
 msgid "User"
 msgstr "Utente"
 
-#: src/interface.c:453
+#: ../src/interface.c:479
 msgid "Pass"
 msgstr "Password"
 
-#: src/interface.c:466
-#: src/fpm.c:94
+#: ../src/interface.c:493 ../src/fpm.c:66
 msgid "Category"
 msgstr "Categoria"
 
-#: src/interface.c:501

fpm2-0.90.tar.xz/po/pl.po Added

@@ -0,0 +1,1004 @@
+# Polish translation of fpm2
+# Copyright (C) 2009
+# This file is distributed under the same license as the fpm2 package.
+# Robert Wojewódzki <robwoj44@poczta.onet.pl>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: fpm2 0.77\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
+"PO-Revision-Date: 2011-03-08 16:50+0100\n"
+"Last-Translator: Robert Wojewódzki <robwoj44@poczta.onet.pl>\n"
+"Language-Team: Polish\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
+msgid "Figaro's Password Manager 2"
+msgstr "Figaro's Password Manager 2"
+
+#: ../src/interface.c:162
+msgid "_File"
+msgstr "_Plik"
+
+#: ../src/interface.c:191
+msgid "_Import Passwords"
+msgstr "_Import haseł"
+
+#: ../src/interface.c:199
+msgid "_Export Passwords"
+msgstr "_Eksport haseł"
+
+#: ../src/interface.c:212
+msgid "_Minimize to tray"
+msgstr "_Zminimalizuj do tacki"
+
+#: ../src/interface.c:227
+msgid "_Edit"
+msgstr "_Edycja"
+
+#: ../src/interface.c:234 ../src/interface.c:2675
+msgid "Copy _Password"
+msgstr "Skopiuj _hasło"
+
+#: ../src/interface.c:246 ../src/interface.c:2683
+msgid "Copy _Username"
+msgstr "Skopiuj _nazwę użytkownika"
+
+#: ../src/interface.c:258 ../src/interface.c:2691
+msgid "Copy _Both"
+msgstr "Skopiuj _oba"
+
+#: ../src/interface.c:275 ../src/interface.c:2704
+msgid "_Add Item"
+msgstr "_Dodaj pozycję"
+
+#: ../src/interface.c:286 ../src/interface.c:2712
+msgid "_Edit Item"
+msgstr "_Edytuj pozycję"
+
+#: ../src/interface.c:298 ../src/interface.c:2720
+msgid "_Clone Item"
+msgstr "_Sklonuj pozycję"
+
+#: ../src/interface.c:310 ../src/interface.c:2728
+msgid "_Delete Item"
+msgstr "_Usuń pozycję"
+
+#: ../src/interface.c:331
+msgid "_View"
+msgstr "_Widok"
+
+#: ../src/interface.c:338
+msgid "_Title"
+msgstr "_Tytuł"
+
+#: ../src/interface.c:342
+msgid "U_RL"
+msgstr "U_RL"
+
+#: ../src/interface.c:346
+msgid "_User"
+msgstr "_Użytkownik"
+
+#: ../src/interface.c:350
+msgid "_Password"
+msgstr "_Hasło"
+
+#: ../src/interface.c:354
+msgid "_Category"
+msgstr "_Kategoria"
+
+#: ../src/interface.c:358
+msgid "_Notes"
+msgstr "U_wagi"
+
+#: ../src/interface.c:362
+msgid "_Launcher"
+msgstr "_Starter"
+
+#: ../src/interface.c:371
+msgid "Tool_bar"
+msgstr "_Pasek narzędziowy"
+
+#: ../src/interface.c:376
+msgid "_Settings"
+msgstr "_Ustawienia"
+
+#: ../src/interface.c:383
+msgid "_Launcher Preferences"
+msgstr "_Starter Preferencji"
+
+#: ../src/interface.c:391
+msgid "Change _Password"
+msgstr "Zmień _hasło"
+
+#: ../src/interface.c:408
+msgid "_Help"
+msgstr "_Pomoc"
+
+#: ../src/interface.c:415
+msgid "Current Password File"
+msgstr "Obecny plik hasła"
+
+#: ../src/interface.c:450
+msgid "New"
+msgstr "Nowy"
+
+#: ../src/interface.c:465
+msgid "Jump"
+msgstr "Skocz"
+
+#: ../src/interface.c:472 ../src/fpm.c:64
+msgid "User"
+msgstr "Użytkownik"
+
+#: ../src/interface.c:479
+msgid "Pass"
+msgstr "Hasło"
+
+#: ../src/interface.c:493 ../src/fpm.c:66
+msgid "Category"
+msgstr "Kategoria"
+
+#: ../src/interface.c:530
+msgid "Find:"
+msgstr "Znajdź:"
+
+#: ../src/interface.c:548 ../src/interface.c:2246
+msgid "_Match case"
+msgstr "_Wielkość liter"
+
+#: ../src/interface.c:845
+msgid "View / Edit Password Item"
+msgstr "Widok / Edycja pozycji hasła"
+
+#: ../src/interface.c:873
+msgid "Title:"
+msgstr "Tytuł:"
+
+#: ../src/interface.c:878
+msgid "URL / Arg:"
+msgstr "URL / Arg:"
+
+#: ../src/interface.c:883
+msgid "User Name:"
+msgstr "Nazwa użytkownika:"
+
+#: ../src/interface.c:888
+msgid "Password:"
+msgstr "Hasło:"
+
+#: ../src/interface.c:902
+msgid "Show Password"
+msgstr "Pokaż hasło"
+
+#: ../src/interface.c:921 ../src/callbacks.c:559 ../src/callbacks.c:625
+msgid "Category:"
+msgstr "Kategoria:"
+
+#: ../src/interface.c:926
+msgid "Include this password in the default list."
+msgstr "Uwzględnij to hasło w liście domyślnych."
+
+#: ../src/interface.c:943
+msgid "Notes:"
+msgstr "Uwagi:"
+
+#: ../src/interface.c:948
+msgid "Launcher:"
+msgstr "Starter:"
+
+#: ../src/interface.c:967
+msgid "Generate..."
+msgstr "Generuj..."
+

fpm2-0.79.tar.bz2/po/ru.po -> fpm2-0.90.tar.xz/po/ru.po Changed

@@ -7,369 +7,357 @@
 msgstr ""
 "Project-Id-Version: fpm2 0.72\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-09 08:33+0100\n"
+"POT-Creation-Date: 2017-09-13 14:20+0200\n"
 "PO-Revision-Date: 2010-02-13 20:34+0300\n"
 "Last-Translator: Boorkov Sergey <leo_bs@mail.ru>\n"
 "Language-Team: <>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Virtaal 0.3.0\n"
 
-#: src/interface.c:129
-#: src/interface.c:1063
-#: src/interface.c:1095
-#: src/fpm.c:1378
+#: ../src/interface.c:144 ../src/interface.c:1060 ../src/interface.c:1091
+#: ../src/fpm.c:1429 ../data/fpm2.desktop.in.in.h:1
 msgid "Figaro's Password Manager 2"
 msgstr "Figaro's Password Manager 2"
 
-#: src/interface.c:147
+#: ../src/interface.c:162
 msgid "_File"
 msgstr "_Файл"
 
-#: src/interface.c:175
+#: ../src/interface.c:191
 msgid "_Import Passwords"
 msgstr "_Импорт Паролей"
 
-#: src/interface.c:183
+#: ../src/interface.c:199
 msgid "_Export Passwords"
 msgstr "_Экспорт Паролей"
 
-#: src/interface.c:196
+#: ../src/interface.c:212
 msgid "_Minimize to tray"
 msgstr "С_вернуть в трей"
 
-#: src/interface.c:211
+#: ../src/interface.c:227
 msgid "_Edit"
 msgstr "_Правка"
 
-#: src/interface.c:218
-#: src/interface.c:2684
+#: ../src/interface.c:234 ../src/interface.c:2675
 msgid "Copy _Password"
 msgstr "Копировать _Пароль"
 
-#: src/interface.c:229
-#: src/interface.c:2692
+#: ../src/interface.c:246 ../src/interface.c:2683
 msgid "Copy _Username"
 msgstr "Копировать _Логин"
 
-#: src/interface.c:240
-#: src/interface.c:2700
+#: ../src/interface.c:258 ../src/interface.c:2691
 msgid "Copy _Both"
 msgstr "Копировать _Оба"
 
-#: src/interface.c:256
-#: src/interface.c:2713
+#: ../src/interface.c:275 ../src/interface.c:2704
 msgid "_Add Item"
 msgstr "_Новая Запись"
 
-#: src/interface.c:267
-#: src/interface.c:2721
+#: ../src/interface.c:286 ../src/interface.c:2712
 msgid "_Edit Item"
 msgstr "_Редактировать Запись"
 
-#: src/interface.c:278
-#: src/interface.c:2729
+#: ../src/interface.c:298 ../src/interface.c:2720
 msgid "_Clone Item"
 msgstr "_Копировать Запись"
 
-#: src/interface.c:289
-#: src/interface.c:2737
+#: ../src/interface.c:310 ../src/interface.c:2728
 msgid "_Delete Item"
 msgstr "_Удалить Запись"
 
-#: src/interface.c:309
+#: ../src/interface.c:331
 msgid "_View"
 msgstr "_Вид"
 
-#: src/interface.c:316
+#: ../src/interface.c:338
 msgid "_Title"
 msgstr "_Название"
 
-#: src/interface.c:320
+#: ../src/interface.c:342
 msgid "U_RL"
 msgstr "U_RL"
 
-#: src/interface.c:324
+#: ../src/interface.c:346
 msgid "_User"
 msgstr "_Логин"
 
-#: src/interface.c:328
+#: ../src/interface.c:350
 msgid "_Password"
 msgstr "_Пароль"
 
-#: src/interface.c:332
+#: ../src/interface.c:354
 msgid "_Category"
 msgstr "_Категория"
 
-#: src/interface.c:336
+#: ../src/interface.c:358
 msgid "_Notes"
 msgstr "_Примечание"
 
-#: src/interface.c:340
+#: ../src/interface.c:362
 msgid "_Launcher"
 msgstr "_Загрузчик"
 
-#: src/interface.c:349
+#: ../src/interface.c:371
 msgid "Tool_bar"
 msgstr "Панель _Инструментов"
 
-#: src/interface.c:354
+#: ../src/interface.c:376
 msgid "_Settings"
 msgstr "_Настройки"
 
-#: src/interface.c:361
+#: ../src/interface.c:383
 msgid "_Launcher Preferences"
 msgstr "Параметры _Загрузчика"
 
-#: src/interface.c:369
+#: ../src/interface.c:391
 msgid "Change _Password"
 msgstr "Из_менить Пароль"
 
-#: src/interface.c:386
+#: ../src/interface.c:408
 msgid "_Help"
 msgstr "Справк_а"
 
-#: src/interface.c:393
+#: ../src/interface.c:415
 msgid "Current Password File"
 msgstr "_Текущий Файл Паролей"
 
-#: src/interface.c:419
-msgid "Save password list"
-msgstr "Сохранить список паролей"
-
-#: src/interface.c:427
+#: ../src/interface.c:450
 msgid "New"
 msgstr "Создать"
 
-#: src/interface.c:441
-#: src/interface.c:890
+#: ../src/interface.c:465
 msgid "Jump"
 msgstr "Вход"
 
-#: src/interface.c:447
-#: src/fpm.c:92
+#: ../src/interface.c:472 ../src/fpm.c:64
 msgid "User"
 msgstr "Логин"
 
-#: src/interface.c:453
+#: ../src/interface.c:479
 msgid "Pass"
 msgstr "Пароль"
 
-#: src/interface.c:466
-#: src/fpm.c:94
+#: ../src/interface.c:493 ../src/fpm.c:66
 msgid "Category"
 msgstr "Категория"
 
-#: src/interface.c:501
+#: ../src/interface.c:530
 msgid "Find:"
 msgstr "Поиск:"

fpm2-0.79.tar.bz2/src/Makefile.am -> fpm2-0.90.tar.xz/src/Makefile.am Changed

fpm2-0.79.tar.bz2/src/Makefile.in -> fpm2-0.90.tar.xz/src/Makefile.in Changed

@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +15,61 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\\ \	*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs$$bs $$bs	*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -dEDm) skip_next=yes;; \
+      -JT) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -34,41 +88,98 @@
 POST_UNINSTALL = :
 bin_PROGRAMS = fpm2$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am_fpm2_OBJECTS = main.$(OBJEXT) fpm.$(OBJEXT) support.$(OBJEXT) \
-	interface.$(OBJEXT) fpm_file.$(OBJEXT) callbacks.$(OBJEXT) \
-	blowfish.$(OBJEXT) fpm_crypt.$(OBJEXT) fpm_gpw.$(OBJEXT) \
-	fpm_clist.$(OBJEXT) fpm_launcher.$(OBJEXT) rijndael.$(OBJEXT) \
-	sha256.$(OBJEXT)
+am_fpm2_OBJECTS = fpm2-main.$(OBJEXT) fpm2-fpm.$(OBJEXT) \
+	fpm2-support.$(OBJEXT) fpm2-interface.$(OBJEXT) \
+	fpm2-fpm_file.$(OBJEXT) fpm2-callbacks.$(OBJEXT) \
+	fpm2-fpm_crypt.$(OBJEXT) fpm2-fpm_gpw.$(OBJEXT) \
+	fpm2-fpm_clist.$(OBJEXT) fpm2-fpm_launcher.$(OBJEXT) \
+	fpm2-fpm_nettle.$(OBJEXT)
 fpm2_OBJECTS = $(am_fpm2_OBJECTS)
 am__DEPENDENCIES_1 =
 fpm2_DEPENDENCIES = $(am__DEPENDENCIES_1)
+fpm2_LINK = $(CCLD) $(fpm2_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/fpm2-callbacks.Po \
+	./$(DEPDIR)/fpm2-fpm.Po ./$(DEPDIR)/fpm2-fpm_clist.Po \
+	./$(DEPDIR)/fpm2-fpm_crypt.Po ./$(DEPDIR)/fpm2-fpm_file.Po \
+	./$(DEPDIR)/fpm2-fpm_gpw.Po ./$(DEPDIR)/fpm2-fpm_launcher.Po \
+	./$(DEPDIR)/fpm2-fpm_nettle.Po ./$(DEPDIR)/fpm2-interface.Po \
+	./$(DEPDIR)/fpm2-main.Po ./$(DEPDIR)/fpm2-support.Po
 am__mv = mv -f
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(fpm2_SOURCES)
 DIST_SOURCES = $(fpm2_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items$$0 = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALL_LINGUAS = @ALL_LINGUAS@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -104,11 +215,15 @@
 INTLTOOL_MERGE = @INTLTOOL_MERGE@
 INTLTOOL_PERL = @INTLTOOL_PERL@
 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
+INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
@@ -118,8 +233,6 @@
 OBJEXT = @OBJEXT@

fpm2-0.79.tar.bz2/src/callbacks.c -> fpm2-0.90.tar.xz/src/callbacks.c Changed

@@ -1,6 +1,6 @@
 /* FIGARO'S PASSWORD MANAGER 2 (FPM2)
  * Copyright (C) 2000 John Conneely
- * Copyright (C) 2008-2010 Aleš Koval
+ * Copyright (C) 2008-2018 Aleš Koval
  *
  * FPM is open source / free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
 }
 
 void
-on_app_safe_destroy                    (GtkObject       *object,
+on_app_safe_destroy                    (GtkWidget       *object,
                                         gpointer         user_data)
 {
     gtk_main_quit();
@@ -59,12 +59,16 @@
 on_button_ok_clicked                   (GtkButton       *button,
                                         gpointer         user_data)
 {
-  if (!fpm_save_passitem(gui->edit_window, glb_edit_data)) {
+  if (!fpm_save_passitem (glb_edit_data)) {
 	state->new_entry = FALSE;
-	gtk_widget_destroy(gui->edit_window);
-/*	gtk_tree_view_set_cursor(gui->main_clist, gtk_tree_path_new_from_string(g_strdup_printf("%i", glb_cur_row)), NULL, FALSE);
-	gtk_widget_set_sensitive(gui->main_window, TRUE);
-	gtk_widget_grab_focus(GTK_WIDGET(gui->main_clist));*/
+	gtk_widget_destroy (gui->edit_window);
+
+	/* Move cursor on added item */
+	gtk_tree_view_set_cursor (gui->main_clist, gtk_tree_path_new_from_string(g_strdup_printf("%i", glb_cur_row)), NULL, FALSE);
+	gtk_widget_set_sensitive (gui->main_window, TRUE);
+	gtk_widget_grab_focus (GTK_WIDGET (gui->main_clist));
+
+	fpm_sensitive_menu (TRUE);
    }
 }
 
@@ -74,10 +78,6 @@
                                         gpointer         user_data)
 {
   gtk_widget_destroy(gui->edit_window);
-/*  gtk_tree_view_set_cursor(gui->main_clist, gtk_tree_path_new_from_string(g_strdup_printf("%i", glb_cur_row)), NULL, FALSE);
-  gtk_widget_set_sensitive(gui->main_window, TRUE);
-  gtk_widget_grab_focus(GTK_WIDGET(gui->main_clist));
-*/
 }
 
 
@@ -134,8 +134,6 @@
     glb_click_row = glb_cur_row;
   }
  }
-
-
   return FALSE;
 }
 
@@ -173,25 +171,24 @@
 	  FPM_DATA_POINTER, &glb_edit_data,
 	  -1);
 
-    row = gtk_tree_model_get_string_from_iter(model, &selectedIter);
-    glb_cur_row = atoi(row);
+	row = gtk_tree_model_get_string_from_iter(model, &selectedIter);
+	glb_cur_row = atoi(row);
 	g_free(row);
 
-    if (glb_click_btn) {
+	if (glb_click_btn) {
 
-		if (gui->context_menu == NULL)
-			gui->context_menu = GTK_MENU(create_context_menu());
+	    if (gui->context_menu == NULL)
+		gui->context_menu = GTK_MENU(create_context_menu());
 
-        gtk_menu_popup (gui->context_menu, NULL, NULL, NULL, NULL,
+    	    gtk_menu_popup (gui->context_menu, NULL, NULL, NULL, NULL,
 			0, gtk_get_current_event_time ());
 
-	glb_click_btn = FALSE;
+	    glb_click_btn = FALSE;
     }
   }
   fpm_sensitive_menu(TRUE);
 }
 
-
 void
 on_save1_activate                      (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
@@ -237,34 +234,21 @@
 	|| strcmp(glb_edit_data->category, fpm_get_combo_entry(gui->edit_window, "combo_box_category"))
 	|| strcmp(glb_edit_data->launcher, fpm_get_combo_entry(gui->edit_window, "combo_box_launcher"))
 	|| strcmp(glb_edit_data->notes, entry_notes)
-	|| glb_edit_data->default_list != GTK_TOGGLE_BUTTON(lookup_widget(gui->edit_window, "checkbutton_default"))->active
+	|| glb_edit_data->default_list != gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(gui->edit_window, "checkbutton_default")))
      ) {
 	if (fpm_question(GTK_WINDOW(gui->edit_window), _("Are you sure you want discard changes?"))
 	    == GTK_RESPONSE_YES) {
 		gtk_widget_destroy(gui->edit_window);
-/*		gtk_widget_set_sensitive(gui->main_window, TRUE); */
 	}
 	g_free(entry_notes);
 	return TRUE;
   }
   gtk_widget_destroy (gui->edit_window);
-/*  gtk_widget_set_sensitive (gui->main_window, TRUE);
-  gtk_widget_grab_focus (GTK_WIDGET(lookup_widget(gui->main_window, "clist_main")));
-*/
+
   g_free(entry_notes);
   return FALSE;
 }
 
-  /* Make main window active again */
-
-/* void
-on_dialog_edit_passitem_destroy        (GtkObject       *object,
-                                        gpointer         user_data)
-{
-  gtk_widget_set_sensitive(gui->main_window, TRUE);
-}
-*/
-
 void
 on_dialog_edit_passitem_show           (GtkWidget       *widget,
                                         gpointer         user_data)
@@ -287,7 +271,7 @@
     GtkEntry* entry_password;
 
     entry_password = GTK_ENTRY(lookup_widget (gui->edit_window, "entry_password"));
-    gtk_entry_set_visibility(entry_password, togglebutton->active);
+    gtk_entry_set_visibility(entry_password, gtk_toggle_button_get_active(togglebutton));
 }
 
 void
@@ -358,6 +342,7 @@
 {
 
   glb_win_misc = create_dialog_password_gen();
+  gtk_window_set_transient_for (GTK_WINDOW(glb_win_misc), GTK_WINDOW(gui->edit_window));
   fpm_gpw_start_screen(glb_win_misc);
   fpm_gpw_set_from_dialog(glb_win_misc);
   gtk_widget_show(glb_win_misc);
@@ -427,7 +412,7 @@
                                         GdkEvent        *event,
                                         gpointer         user_data)
 {
-  if(old_context == NULL)
+  if (state->new_file == TRUE)
   {
     /* We must be running for the first time.  Cancel quits. */
     gtk_main_quit();
@@ -466,13 +451,19 @@
 on_item_password_activate              (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-    GtkComboBox *combo_box;
     glb_win_misc = create_dialog_cpw();
-    gtk_window_set_transient_for(GTK_WINDOW(glb_win_misc), GTK_WINDOW(gui->main_window));
 
-    combo_box = GTK_COMBO_BOX(lookup_widget(glb_win_misc, "key_file_combo"));
-    gtk_combo_box_append_text (combo_box, C_("key_file","<NONE>"));
-    gtk_combo_box_set_active(combo_box, 0);
+	GtkWidget *ciphers_combo = lookup_widget(glb_win_misc, "ciphers_combo");
+	GList *ciphers = fpm_get_ciphers();
+	while (ciphers) {
+	    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(ciphers_combo), ciphers->data);
+	    ciphers = g_list_next(ciphers);
+	}
+        gtk_combo_box_set_active (GTK_COMBO_BOX (ciphers_combo), (cipher_algo == 0) ? fpm_get_cipher_algo(FPM_DEFAULT_CIPHER) - 1 : (cipher_algo - 1));
+
+    gtk_spin_button_set_value (GTK_SPIN_BUTTON (lookup_widget (glb_win_misc, "number_kdf_iterations")), crypto->kdf_iterations);
+
+    gtk_window_set_transient_for(GTK_WINDOW(glb_win_misc), GTK_WINDOW(gui->main_window));
 
     gtk_widget_show(glb_win_misc);
 }
@@ -497,7 +488,6 @@
 
 	glb_edit_data = NULL;
 	fpm_sensitive_menu(FALSE);
-//	state->dirty = TRUE;
 	fpm_dirty(TRUE);
 	if (ini->save_on_delete)
 	    passfile_save(glb_filename);
@@ -510,7 +500,7 @@
 }
 
 void
-on_dialog_prefs_destroy                (GtkObject       *object,
+on_dialog_prefs_destroy                (GtkWidget       *object,
                                         gpointer         user_data)
 {
   gtk_widget_set_sensitive(gui->main_window, TRUE);
@@ -547,8 +537,8 @@
 	0,0,15,0
 	);

fpm2-0.79.tar.bz2/src/callbacks.h -> fpm2-0.90.tar.xz/src/callbacks.h Changed

@@ -1,6 +1,6 @@
 /* FIGARO'S PASSWORD MANAGER 2 (FPM2)
  * Copyright (C) 2000 John Conneely
- * Copyright (C) 2008-2010 Aleš Koval
+ * Copyright (C) 2008-2017 Aleš Koval
  *
  * FPM is open source / free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
                                         gpointer         user_data);
 
 void
-on_app_safe_destroy                    (GtkObject       *object,
+on_app_safe_destroy                    (GtkWidget       *object,
                                         gpointer         user_data);
 
 void
@@ -46,18 +46,12 @@
 on_button_new_clicked                  (GtkButton       *button,
                                         gpointer         user_data);
 
-/* void
-on_clist_main_select_row               (GtkCList        *clist,
-                                        gint             row,
-                                        gint             column,
-                                        GdkEvent        *event,
-                                        gpointer         user_data);
-*/
-
-
 void
 on_clist_main_select_row               (GtkTreeView *treeview,
 					gpointer data);
+void
+on_clist_main_select_row2               (GtkTreeSelection *selection,
+					gpointer data);
 
 void
 on_button_edit_clicked                 (GtkButton       *button,
@@ -96,7 +90,7 @@
                                         gpointer         user_data);
 
 void
-on_dialog_edit_passitem_destroy        (GtkObject       *object,
+on_dialog_edit_passitem_destroy        (GtkWidget       *object,
                                         gpointer         user_data);
 
 void
@@ -191,7 +185,7 @@
                                         gpointer         user_data);
 
 void
-on_dialog_prefs_destroy                (GtkObject       *object,
+on_dialog_prefs_destroy                (GtkWidget       *object,
                                         gpointer         user_data);
 
 void
@@ -202,19 +196,10 @@
 on_import_passwords1_activate          (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 
-/*void
-on_button_import_ok_clicked            (GtkButton       *button,
-                                        gpointer         user_data);
-
-void
-on_button_import_cancel_clicked        (GtkButton       *button,
-                                        gpointer         user_data);
-*/
 void
 on_current_password_file1_activate     (GtkMenuItem     *menuitem,
                                         gpointer         user_data);
 
-
 void
 on_aboutdialog1_close                  (GtkDialog       *dialog,
                                         gpointer         user_data);
@@ -292,7 +277,7 @@
 
 
 void
-on_app_safe_destroy                    (GtkObject       *object,
+on_app_safe_destroy                    (GtkWidget       *object,
                                         gpointer         user_data);
 
 gboolean
@@ -502,13 +487,9 @@
                                         gpointer         user_data);
 
 void
-on_dialog_edit_passitem_destroy        (GtkObject       *object,
+on_dialog_edit_passitem_destroy        (GtkWidget       *object,
                                         gpointer         user_data);
 
-/*void
-on_optionmenu_launcher_changed         (GtkComboBox     *combobox,
-                                        gpointer         user_data);
-*/
 void
 on_copy_target_combo_changed        (GtkComboBox     *combobox,
                                         gpointer         user_data);
@@ -534,7 +515,7 @@
                                         gpointer         user_data);
 
 void
-dialog_launcher_destroy                (GtkObject       *object,
+dialog_launcher_destroy                (GtkWidget       *object,
                                         gpointer         user_data);
 
 void
@@ -578,3 +559,11 @@
 void
 on_startup_search_toggled              (GtkToggleButton *togglebutton,
                                         gpointer         user_data);
+
+void
+on_button_etime_clicked			(GtkButton       *button,
+                                	gpointer         user_data);
+
+void
+on_clear_target_toggled                (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);

fpm2-0.79.tar.bz2/src/fpm.c -> fpm2-0.90.tar.xz/src/fpm.c Changed

@@ -1,6 +1,6 @@
 /* FIGARO'S PASSWORD MANAGER 2 (FPM2)
  * Copyright (C) 2000 John Conneely
- * Copyright (C) 2008-2010 Aleš Koval
+ * Copyright (C) 2008-2020 Aleš Koval
  *
  * FPM is open source / free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,10 +36,8 @@
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 
-
 /* GLOBAL VARIABLES */
 GtkWidget* glb_win_misc;  /* Misc window, used for dialogs         */
-
 GtkWidget* glb_win_import; /* The import window                    */
 fpm_data* glb_edit_data;  /* The password item being edited now    */
 gint glb_num_row;         /* The total number of rows in the CList */
@@ -47,42 +45,22 @@
 gchar* glb_filename;      /* The location of the pasword file.     */
 GTimer* glb_timer_click;  /* Timer used to check for double clicks */
 gint glb_click_count;	  /* Click count used for double clicks    */
-gchar* new_salt;	  /* Salt to use on next save.             */
-gchar* old_salt;	  /* Salt to used on last save.            */
 gboolean glb_click_btn;	  /* Right button clicked -> context menu  */
 gint glb_click_row;       /* Store row for first click on dblclick */
+fpm_ini *ini;		  /* Store FPM settings */
+fpm_gui *gui;		  /* Store important GUI widget */
+fpm_state *state;	  /* Store running flags and other info */
 
 static int lock_fd = -1;
 
-void* old_context;
-void* new_context;
-
-char* vstring;
-char* file_version;
-
-GList *glb_pass_list;	 /* A GList of fpm_data containing all items */
-GList *glb_cat_string_list;	 /* A GList of strings, used to populate combos */
+GList *glb_pass_list;		/* A GList of fpm_data containing all items */
+GList *glb_cat_string_list;	/* A GList of strings, used to populate combos */
 GList *glb_launcher_list;
 GList *glb_launcher_string_list;
 
-/* Set default cipher algorithm*/
-fpm_cipher_algo cipher_algo = AES256;
-
-/* Current versions of FPM encrypt all fields.  Fields other than the
- * password are decrypted when the program reads the password file,
- * and the password is decrypted as it is needed (to try to prevent it
- * from showing up in coredumps, etc.)  The global variable  glb_need_decrypt
- * is set by the passfile loading routines to specify that the passfile
- * was created with a version of FPM that requires this decryption.  
- * This allows backward compatibility with previous versions of FPM which
- * only encrypted passwords.
- */
-gboolean glb_need_decrypt;
-
 GList *columns_order = NULL;
 
-gchar *columns_title  =
-{
+gchar *columns_title  = {
    "",
    N_("Title") ,
    N_("URL") ,
@@ -93,35 +71,248 @@
    N_("Launcher")
 };
 
-void
-lock_fpm_file(gchar* glb_filename)
+void fpm_init (char* opt_file_name, int tray_on_startup) {
+    static gboolean first_run = TRUE;
+
+    if (first_run == TRUE) {
+	umask(S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+
+	gui = g_malloc0 (sizeof (fpm_gui));
+	state = g_malloc0 (sizeof (fpm_state));
+	crypto = g_malloc (sizeof (fpm_crypto_context));
+
+	fpm_ini_load();
+
+	gui->main_window = create_app_safe();
+
+	fpm_toolbar_style();
+	gtk_widget_hide(GTK_WIDGET(lookup_widget (gui->main_window ,"hide_to_tray")));
+
+	gui->main_clist = GTK_TREE_VIEW(lookup_widget (gui->main_window, "clist_main"));
+
+	fpm_clist_init();
+
+        GtkWidget *view = gtk_menu_item_get_submenu(GTK_MENU_ITEM(lookup_widget (gui->main_window ,"view1")));
+        GList *children = gtk_container_get_children(GTK_CONTAINER(view));
+	for (gint i = 1; i < FPM_NUM_COLS; i++) {
+	    g_object_set_data(G_OBJECT(children->data), "index", GINT_TO_POINTER(i));
+
+	    if (g_list_find(columns_order, GINT_TO_POINTER(i)) != NULL) {
+		g_signal_handlers_block_by_func(G_OBJECT(children->data), G_CALLBACK(on_view_menu_activate), NULL);
+		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(children->data), TRUE);
+		g_signal_handlers_unblock_by_func(G_OBJECT(children->data), G_CALLBACK(on_view_menu_activate), NULL);
+	    }
+
+	    children = g_list_next(children);
+	}
+
+	state->new_entry = FALSE;
+	state->startup_tray = tray_on_startup;
+
+	glb_timer_click = g_timer_new();
+	g_timer_start(glb_timer_click);
+	glb_click_count = -1;
+
+	fpm_gpw_set_options(8, TRUE, TRUE, TRUE, FALSE, TRUE);
+
+	first_run = FALSE;
+
+    } else {
+	gtk_widget_hide(gui->main_window);
+    }
+
+    if (opt_file_name) {
+	glb_filename = opt_file_name;
+    } else {
+	glb_filename = g_build_filename (g_get_home_dir(), FPM_DIR, "fpm", NULL);
+    }
+
+    /* Create data dir if not exists */
+    if(!g_file_test(g_build_filename (g_get_home_dir(), FPM_DIR, NULL), G_FILE_TEST_IS_DIR))
+	g_mkdir(g_build_filename (g_get_home_dir(), FPM_DIR, NULL), S_IRUSR | S_IWUSR | S_IXUSR);
+
+    /* Check if password file exists */
+    if(g_file_test (glb_filename, G_FILE_TEST_EXISTS)) {
+	state->new_file = FALSE;
+
+	lock_fpm_file (glb_filename);
+
+        gui->pass_window = create_dialog_password();
+	gtk_window_set_transient_for (GTK_WINDOW(gui->pass_window), GTK_WINDOW(gui->main_window));
+
+        if(tray_on_startup) {
+    	    ini->enable_tray_icon = TRUE;
+	    ini->tr_always_visible = TRUE;
+	    state->minimized = TRUE;
+	    fpm_tray_icon();
+	    fpm_lock();
+	} else {
+	    gtk_widget_show(gui->pass_window);
+	}
+
+    } else {
+	/* No passwords file so ask for master password for new passwords file */
+	state->new_file = TRUE;
+
+	glb_win_misc = create_dialog_cpw();
+
+	GtkWidget *ciphers_combo = lookup_widget(glb_win_misc, "ciphers_combo");
+	GList *ciphers = fpm_get_ciphers();
+	while (ciphers) {
+	    gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT(ciphers_combo), ciphers->data);
+	    ciphers = g_list_next(ciphers);
+	}
+        gtk_combo_box_set_active (GTK_COMBO_BOX (ciphers_combo), fpm_get_cipher_algo(FPM_DEFAULT_CIPHER) - 1);
+
+	gtk_window_set_transient_for (GTK_WINDOW(glb_win_misc), GTK_WINDOW(gui->main_window));
+        gtk_widget_show(glb_win_misc);
+    }
+}
+
+void fpm_check_password () {
+    GtkEntry *entry;
+    GtkLabel *label;
+    GtkComboBoxText *combo_box;
+    gchar *password;
+    fpm_load_file_result res;
+
+    entry = GTK_ENTRY(lookup_widget(gui->pass_window, "entry_password"));
+    password = gtk_editable_get_chars (GTK_EDITABLE(entry), 0, -1);
+
+    gtk_entry_set_text(entry, "");
+
+    /* User provide keyfile? */
+    combo_box = GTK_COMBO_BOX_TEXT (lookup_widget (gui->pass_window, "key_file_combo"));
+    if (gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box))) {
+	guchar kf_hashSHA256_DIGEST_LENGTH + 1 = {0};
+
+	if (fpm_sha256_file (gtk_combo_box_text_get_active_text (combo_box), kf_hash)) {
+	    fpm_message (GTK_WINDOW (gui->pass_window), _("Cannot read key file!"), GTK_MESSAGE_ERROR);
+	    return;
+	}
+	password = g_strdup_printf ("%s%s", password, kf_hash);
+        wipememory (kf_hash, sizeof (kf_hash));
+    }
+
+    fpm_launcher_remove_all ();
+
+    res = fpm_file_load (glb_filename, password);

fpm2-0.79.tar.bz2/src/fpm.h -> fpm2-0.90.tar.xz/src/fpm.h Changed

@@ -1,6 +1,6 @@
 /* FIGARO'S PASSWORD MANAGER 2 (FPM2)
  * Copyright (C) 2000 John Conneely
- * Copyright (C) 2008-2010 Aleš Koval
+ * Copyright (C) 2008-2020 Aleš Koval
  *
  * FPM is open source / free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,14 +52,16 @@
 #define FPM_MAX_DOUBLE_CLICK_TIME 0.8 /* In seconds */
 
 #define FPM_PASSWORD_LEN 256
+#define FPM_IV_SIZE	16
+#define FPM_TAG_SIZE	16
 
 #define SELECTION_PRIMARY	0
 #define SELECTION_CLIPBOARD	1
 
-#define DISPLAY_VERSION 	"0.75"
-#define FULL_VERSION 		"00.75.00"
-#define MIN_VERSION		"00.75.00"
-#define MIN_VERSION_BLOWFISH	"00.58.00"
+#define DISPLAY_VERSION 	"0.90"
+#define FULL_VERSION 		"00.90.00"
+#define MIN_VERSION		"00.90.00"
+#define MIN_VERSION_AES256	"00.75.00"
 #define ENCRYPT_VERSION		"00.23.00"
 
 #define FPM_ALL_CAT_MSG		_("<ALL CATEGORIES>")
@@ -72,6 +74,8 @@
 #define wipememory2(_ptr,_set,_len) do { volatile char *_vptr=(volatile char *)(_ptr); size_t _vlen=(_len); while(_vlen) { *_vptr=(_set); _vptr++; _vlen--; } } while(0)
 #define wipememory(_ptr,_len) wipememory2(_ptr,0,_len)
 
+typedef guint8 byte;
+
 /* STRUCTURES */
 typedef struct fpm_data_struct
 {
@@ -80,12 +84,13 @@
   gchar *user;
   gchar *notes;
   gchar *launcher;
-  gchar passwordFPM_PASSWORD_LEN*2+1;
+  gchar passwordFPM_PASSWORD_LEN * 2 + 1;
+  guint8 *iv;
+  guint8 *tag;
   gchar *category;
   gint default_list;
 } fpm_data;
 
-
 typedef struct fpm_launcher_struct
 {
   gchar *title;
@@ -131,6 +136,7 @@
     gchar *startup_category;
     gint copy_target;
     gboolean clear_target;
+    gint clear_target_seconds;
     gboolean after_unhide_set_startup_category;
     gboolean dont_remember_position;
     gint dblclick_action;
@@ -144,7 +150,10 @@
     gboolean minimized;
     gboolean locked;
     gboolean new_entry;
+    gboolean new_file;
     gboolean startup_tray;		/* FPM2 started in tray */
+    gboolean legacy_cipher;		/* FPM2 run in legacy mode */
+    guint clipboard_timeout;		/* Event source ID for clear clipboard after timeout */
 } fpm_state;
 
 typedef struct fpm_gui_struct
@@ -159,22 +168,6 @@
 	GtkStatusIcon *tray_icon;
 } fpm_gui;
 
-typedef enum
-{
-	BLOWFISH,
-	AES256
-} fpm_cipher_algo;
-
-typedef struct fpm_cipher_struct
-{
-	gchar *name;
-	gint hash_len;
-	gint salt_len;
-	size_t keylen;
-	size_t blocksize;
-	size_t contextsize;
-} fpm_cipher;
-
 typedef struct fpm_clipboard_struct {
 	GdkAtom selection;
 	gchar *user;
@@ -182,17 +175,15 @@
 	gboolean is_password;
 	gboolean multi_select;
 	gboolean no_clear;
+	guint8 *iv;
+	guint8 *tag;
 } fpm_clipboard;
 
-fpm_ini *ini;					/* Store FPM settings */
-fpm_gui *gui;					/* Store important GUI widget */
-fpm_state *state;				/* Store running flags and other info */
-fpm_cipher *cipher;				/* Store cipher infos */
-
-//extern GtkTreeView* glb_clist_main; /* Password CList on main window         */
+extern fpm_ini *ini;		/* Store FPM settings */
+extern fpm_gui *gui;		/* Store important GUI widget */
+extern fpm_state *state;	/* Store running flags and other info */
 
 extern GtkWidget* glb_win_misc;  /* Misc window, used for dialogs         */
-
 extern GtkWidget* glb_win_import; /* The import window                    */
 extern fpm_data* glb_edit_data;  /* The password item being edited now    */
 extern gint glb_num_row;	 /* The total number of rows in the CList */
@@ -203,25 +194,12 @@
 extern gboolean glb_click_btn;   /* Right button clicked -> context menu  */
 extern gint glb_click_row;       /* Store row for first click on dblclick */
 
-extern gchar* new_salt;          /* Salt to use on next save.             */
-extern gchar* old_salt;          /* Salt to used on last save.            */
-
-extern void* old_context;
-extern void* new_context;
-
-extern char* vstring;
-extern char* file_version;
-
-extern fpm_cipher_algo cipher_algo;         /* Current cipher algorithm */
-
 extern GList *glb_pass_list;     /* A GList of fpm_data containing all items */
 
 extern GList *glb_cat_string_list;     /* A GList of strings, used to populate combos */
 extern GList *glb_launcher_list; /* A list of ways we can launch a password */
 extern GList *glb_launcher_string_list;     /* A GList of strings, used to populate combos */
 
-extern gboolean glb_need_decrypt;
-
 extern fpm_launcher* current_launcher;
 
 void
@@ -230,8 +208,7 @@
 void
 fpm_edit_passitem(GtkWidget** win_edit_ptr, fpm_data* data);
 
-int
-fpm_save_passitem(GtkWidget* win_edit, fpm_data* data);
+int fpm_save_passitem(fpm_data *data);
 
 char*
 fpm_get_entry(GtkWidget* win, gchar* entry_name);
@@ -272,8 +249,7 @@
 void
 fpm_create_category_list(gint edit_flag);
 
-gchar*
-fpm_create_cmd_line(gchar* cmd, gchar* arg, gchar* user, gchar* pass);
+gchar *fpm_create_cmd_line(gchar* cmd, gchar* arg, gchar* user, gchar* pass, guint8 *iv);
 
 void fpm_init_launchers(void);
 
@@ -287,8 +263,6 @@
 
 void lock_fpm_file(gchar* glb_filename);
 
-void unlock_fpm_file1(void);
-
 void fpm_message(GtkWindow* win, gchar* message, GtkMessageType message_type);
 
 gint fpm_question(GtkWindow* win, gchar* message);
@@ -328,6 +302,10 @@
 void on_clist_main_columns_changed          (GtkTreeView     *treeview,
                                     	     gpointer         user_data);
 
+void
+on_clist_main_select_row               (GtkTreeView *treeview,
+					gpointer data);
+
 void fpm_view_modify_column(gint type, gboolean active);
 
 void fpm_clist_set_data(fpm_data *data, GtkTreeModel *list_store, GtkTreeIter iter);
@@ -338,7 +316,7 @@
 
 void fpm_populate_combo_box(GtkComboBox *combo_box, gchar *active_item);
 
-void fpm_copy_target_combo(GtkComboBox *combo_box, gint selection);
+void fpm_copy_target_combo(GtkComboBoxText *combo_box, gint selection);
 
 void fpm_unlock();
 
@@ -361,3 +339,5 @@
 void fpm_dirty(gboolean active);
 
 void fpm_sensitive_menu(gboolean active);
+
+gboolean fpm_clipboard_clear_timeout (fpm_clipboard *clipboard);

fpm2-0.79.tar.bz2/src/fpm_clist.c -> fpm2-0.90.tar.xz/src/fpm_clist.c Changed

@@ -1,6 +1,6 @@
 /* FIGARO'S PASSWORD MANAGER 2 (FPM2)
  * Copyright (C) 2000 John Conneely
- * Copyright (C) 2008-2010 Aleš Koval
+ * Copyright (C) 2008-2017 Aleš Koval
  *
  * FPM is open source / free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,8 +35,6 @@
 {
   GList *list;
   fpm_data *data;
-//  GCompareFunc cmp_func;
-
 
   /* Clear cat list */
   list = g_list_first(glb_cat_string_list);
@@ -49,9 +47,6 @@
   g_list_free(glb_cat_string_list);
   glb_cat_string_list = NULL;
 
-//  cmp_func = (GCompareFunc) g_strcasecmp;
-//  cmp_func = (GCompareFunc) g_utf8_collate;
-
   /* Step through pass list adding to cat list */
   list = g_list_first(glb_pass_list);
   while(list!=NULL)
@@ -68,8 +63,6 @@
     list=g_list_next(list);
   }
 
-
-
   if(edit_flag)
   {
     /* Add first item entry to beginning of list */
@@ -102,8 +95,7 @@
   index=0;
   while(list!=NULL)
   {
-//    gtk_combo_box_append_text(combo_box, g_strdup(list->data));
-    gtk_combo_box_append_text(combo_box, list->data);
+    gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box), list->data);
 
     if(!strcmp(active_item, list->data))
 	index=i;
@@ -126,11 +118,11 @@
   GtkListStore *main_list_store;
   GtkCellRenderer *cellRenderer;
   GtkTreeViewColumn *treeViewColumn = NULL;
-//  GtkTreeModel *list_store;
   GType typesFPM_NUM_COLS;
   gint i = 1, j;
 
   g_signal_handlers_block_by_func (gui->main_clist, G_CALLBACK (on_clist_main_columns_changed), NULL);
+  g_signal_handlers_block_by_func (gui->main_clist, G_CALLBACK (on_clist_main_select_row), NULL);
 
   GList *columns;
   columns = gtk_tree_view_get_columns(gui->main_clist);
@@ -148,7 +140,8 @@
 	j = GPOINTER_TO_INT(columns->data);
 
 	typesi = G_TYPE_STRING;
-	treeViewColumn = gtk_tree_view_column_new_with_attributes (gettext(columns_titlej), cellRenderer, "text", i, NULL);
+	treeViewColumn = gtk_tree_view_column_new_with_attributes (gettext(columns_titlej), cellRenderer, "markup", i, NULL); // text to markup!
+
 	g_object_set_data(G_OBJECT(treeViewColumn), "index", GINT_TO_POINTER(j));
 	gtk_tree_view_append_column (GTK_TREE_VIEW(gui->main_clist), treeViewColumn);
 	gtk_tree_view_column_set_resizable (treeViewColumn, TRUE);
@@ -171,7 +164,7 @@
     gtk_tree_view_set_model (gui->main_clist, GTK_TREE_MODEL (main_list_store));
 
     g_signal_handlers_unblock_by_func (gui->main_clist, G_CALLBACK (on_clist_main_columns_changed), NULL);
-
+    g_signal_handlers_unblock_by_func (gui->main_clist, G_CALLBACK (on_clist_main_select_row), NULL);
 }
 
 
@@ -179,23 +172,25 @@
 fpm_clist_create_view(gchar *category)
 /* Create visible CList from abstract GList */
 {
-//  gint row,i,j;
   fpm_data *data;
   GList *list;
 
   GtkTreeIter iter;
   GtkTreeModel *list_store;
-//  GCompareFunc cmp_list;
 
   glb_num_row = 0;
 
   /* Sort the list */
-  //glb_cmp = (GCompareFunc) fpm_cmp_title;
   glb_pass_list = g_list_sort(glb_pass_list, (GCompareFunc) fpm_cmp_title);
 
   list_store = gtk_tree_view_get_model (gui->main_clist);
 
-  gtk_list_store_clear(GTK_LIST_STORE(list_store));
+  /* GTK3 list_store_clear sends iterative cursor_changed signal so block it */
+  g_signal_handlers_block_by_func (gui->main_clist, G_CALLBACK (on_clist_main_select_row), NULL);
+
+  gtk_list_store_clear (GTK_LIST_STORE (list_store));
+
+  g_signal_handlers_unblock_by_func (gui->main_clist, G_CALLBACK (on_clist_main_select_row), NULL);
 
   /* Iterate over the list */
   list = g_list_first(glb_pass_list);
@@ -217,7 +212,6 @@
     fpm_clist_set_data (data, list_store, iter);
 
     glb_num_row++;
-//      row = glb_num_row - 1;
 
     }
 
@@ -233,7 +227,6 @@
   gchar cleartextFPM_PASSWORD_LEN+1 = {0};
   gint i, j, ix;
 
-
   i = 1;
   columns = g_list_first(columns_order);
   while (columns != NULL) {
@@ -252,7 +245,10 @@
 		break;
 	    case FPM_PASSWORD:
 		ix = strlen(data->password) / 2;
-		fpm_decrypt_field(old_context, cleartext, data->password, ix);
+		if (!state->legacy_cipher) {
+		    fpm_set_iv(crypto->old, data->iv);
+		}
+		fpm_decrypt_field(crypto->old, cleartext, data->password, ix);
 		g_value_set_string(&value, cleartext);
 		wipememory(cleartext, FPM_PASSWORD_LEN);
 		break;
@@ -280,4 +276,3 @@
 
   g_list_free(columns);
 }
-

fpm2-0.79.tar.bz2/src/fpm_crypt.c -> fpm2-0.90.tar.xz/src/fpm_crypt.c Changed

@@ -1,6 +1,6 @@
 /* FIGARO'S PASSWORD MANAGER 2 (FPM2)
  * Copyright (C) 2000 John Conneely
- * Copyright (C) 2009 Aleš Koval
+ * Copyright (C) 2009-2020 Aleš Koval
  *
  * FPM is open source / free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,123 +15,170 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- * This file contains the crypto interface for FPS.
+ * This file contains the crypto interface for FPM.
  *
  * fpm_crypt.c - Crypto interface for FPM
  */
 
 #include <gtk/gtk.h>
 #include <stdlib.h>
+
 #include "fpm_crypt.h"
+#include "fpm_nettle.h"
 #include "fpm.h"
 
-static fpm_cipher ciphers = {
-    { "BLOWFISH", 16, 4 },
-    { "AES-256", 32, 16 }
+#include <nettle/pbkdf2.h>
+#include <nettle/aes.h>
+#include <nettle/yarrow.h>
+#include <nettle/gcm.h>
+#include <nettle/eax.h>
+#include <nettle/chacha-poly1305.h>
+
+fpm_crypto_context *crypto;
+fpm_cipher_algo cipher_algo;
+
+void (*fpm_setkey) (fpm_cipher *cipher, const byte *key);
+void (*fpm_encrypt_block) (fpm_cipher *cipher, byte *outbuf, const byte *inbuf);
+void (*fpm_decrypt_block) (fpm_cipher *cipher, byte *outbuf, const byte *inbuf);
+void (*fpm_decrypt_data) (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void (*fpm_encrypt_data) (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+
+void (*fpm_set_iv) (fpm_cipher *cipher, byte *iv);
+void (*fpm_get_tag) (fpm_cipher *cipher, gsize len, byte *tag);
+void (*fpm_add_data) (fpm_cipher *cipher, gsize len, byte *data);
+
+static const fpm_cipher_info ciphers = {
+    { "AES-256", AES_BLOCK_SIZE, AES256_KEY_SIZE, 0, sizeof(struct aes256_ctx), 0 },
+    { "AES-256-GCM", GCM_BLOCK_SIZE, AES256_KEY_SIZE, GCM_DIGEST_SIZE, sizeof(struct gcm_aes256_ctx), FPM_IV_SIZE },
+    { "AES-128-EAX", EAX_BLOCK_SIZE, AES128_KEY_SIZE, EAX_DIGEST_SIZE, sizeof(struct eax_aes128_ctx), FPM_IV_SIZE },
+    { "ChaCha-Poly1305", CHACHA_POLY1305_BLOCK_SIZE, CHACHA_POLY1305_KEY_SIZE, CHACHA_POLY1305_DIGEST_SIZE, sizeof(struct chacha_poly1305_ctx), FPM_IV_SIZE },
+    { "Camellia256-GCM", GCM_BLOCK_SIZE, CAMELLIA256_KEY_SIZE, GCM_DIGEST_SIZE, sizeof(struct gcm_camellia256_ctx), FPM_IV_SIZE }
 };
 
-void (*fpm_encrypt_block) (void *c, byte *outbuf, const byte *inbuf);
-void (*fpm_decrypt_block) (void *c, byte *outbuf, const byte *inbuf);
-
-static size_t keylen, blocksize, contextsize;
-
 static void fpm_hex_to_bin(byte* out, const gchar* in, gint len);
 static void fpm_bin_to_hex(gchar* out, const byte* in, gint len);
 
+fpm_cipher_algo fpm_get_cipher_algo (gchar *cipher_name) {
+    for (gsize i = 0; i < sizeof (ciphers) / sizeof (ciphers0); i++)
+	if (strcmp (cipher_name, ciphersi.name) == 0)
+	    return (i);
+    return CIPHER_UNKNOWN;
+}
+
+GList *fpm_get_ciphers() {
+    GList *ciphers_list = NULL;
+
+    for (gsize i = 1; i < sizeof (ciphers) / sizeof (ciphers0); i++)
+	ciphers_list = g_list_append (ciphers_list, ciphersi.name);
+
+    return ciphers_list;
+}
+
 void fpm_cipher_init(char *cipher_name) {
 
-    if(strcmp(cipher_name, "BLOWFISH") == 0) {
-	cipher_algo = BLOWFISH;
-    }
-    else if(strcmp(cipher_name, "AES-256") == 0) {
-	cipher_algo = AES256;
-    }
+    cipher_algo = fpm_get_cipher_algo (cipher_name);
 
     switch(cipher_algo)  {
-	case BLOWFISH:
-		if (strcmp("BLOWFISH", blowfish_get_info(4, &keylen, &blocksize,
-					     &contextsize, &fpm_setkey,
-					     &fpm_encrypt_block,
-					     &fpm_decrypt_block)))
-		{ g_assert_not_reached(); }
-		break;
+
 	case AES256:
-		if (strcmp("AES256", rijndael_get_info(9, &keylen, &blocksize,
-					     &contextsize, &fpm_setkey,
-					     &fpm_encrypt_block,
-					     &fpm_decrypt_block)))
-		{ g_assert_not_reached(); }
+		fpm_setkey = aes256_set_key;
+		fpm_decrypt_data = aes256_decrypt_data;
+		fpm_encrypt_data = aes256_encrypt_data;
+		break;
+
+	case AES256_GCM:
+		fpm_setkey = aes256_gcm_set_key;
+		fpm_decrypt_data = aes256_gcm_decrypt_data;
+		fpm_encrypt_data = aes256_gcm_encrypt_data;
+		fpm_set_iv = aes256_gcm_set_iv;
+		fpm_get_tag = aes256_gcm_get_tag;
+		fpm_add_data = aes256_gcm_add_data;
+		break;
+
+	case AES128_EAX:
+		fpm_setkey = aes128_eax_set_key;
+		fpm_decrypt_data = aes128_eax_decrypt_data;
+		fpm_encrypt_data = aes128_eax_encrypt_data;
+		fpm_set_iv = aes128_eax_set_iv;
+		fpm_get_tag = aes128_eax_get_tag;
+		fpm_add_data = aes128_eax_add_data;
+		break;
+
+	case ChaCha_Poly1305:
+		fpm_setkey = chacha_poly1305_set_key_wrap;
+		fpm_decrypt_data = chacha_poly1305_decrypt_data;
+		fpm_encrypt_data = chacha_poly1305_encrypt_data;
+		fpm_set_iv = chacha_poly1305_set_iv;
+		fpm_get_tag = chacha_poly1305_get_tag;
+		fpm_add_data = chacha_poly1305_add_data;
+		break;
+
+	case Camellia256_GCM:
+		fpm_setkey = camellia256_gcm_set_key;
+		fpm_decrypt_data = camellia256_gcm_decrypt_data;
+		fpm_encrypt_data = camellia256_gcm_encrypt_data;
+		fpm_set_iv = camellia256_gcm_set_iv;
+		fpm_get_tag = camellia256_gcm_get_tag;
+		fpm_add_data = camellia256_gcm_add_data;
 		break;
+
 	default:
 		printf("Unknown cipher algorithm!\n");
 		exit(-1);
     }
-    cipher->name = cipherscipher_algo.name;
-    cipher->hash_len = cipherscipher_algo.hash_len;
-    cipher->salt_len = cipherscipher_algo.salt_len;
-    cipher->keylen = keylen;
-    cipher->blocksize = blocksize;
-    cipher->contextsize = contextsize;
-}
 
-void fpm_crypt_init(gchar* password) {
-  gchar *prehash1 = "", *prehash2 = "";
-  byte *hash_1, *hash_2;
+    crypto->cipher_info = &cipherscipher_algo;
 
-  old_context = g_malloc(cipher->contextsize);
-  new_context = g_malloc(cipher->contextsize);
+    crypto->old = g_malloc (sizeof (fpm_cipher));
+    crypto->new = g_malloc (sizeof (fpm_cipher));
 
-  hash_1 = g_malloc(cipher->hash_len);
-  hash_2 = g_malloc(cipher->hash_len);
+    crypto->old->context = g_malloc (crypto->cipher_info->contextsize);
+    crypto->new->context = g_malloc (crypto->cipher_info->contextsize);
 
-  if(cipher_algo == AES256) {
-    fpm_pkcs5_pbkdf2((guchar *)password, strlen(password), old_salt, cipher->salt_len, hash_1, cipher->hash_len, PBKDF2_ITERATIONS);
-    fpm_pkcs5_pbkdf2((guchar *)password, strlen(password), new_salt, cipher->salt_len, hash_2, cipher->hash_len, PBKDF2_ITERATIONS);
-  } else {
-    prehash1 = g_strdup_printf("%s%s", old_salt, password);
-    prehash2 = g_strdup_printf("%s%s", new_salt, password);
+    crypto->iv = g_malloc (crypto->cipher_info->ivsize);
 
-    md5(prehash1, hash_1);
-    md5(prehash2, hash_2);
-  }
+    FILE* rnd;
+    byte *buf = g_malloc (YARROW256_SEED_FILE_SIZE);
+    rnd = fopen ("/dev/random", "r");
+    gint ret __attribute__((unused)) = fread(buf, 1, YARROW256_SEED_FILE_SIZE, rnd);
+    fclose (rnd);
+
+    crypto->rnd = g_malloc (sizeof (struct yarrow256_ctx));
+    yarrow256_init (crypto->rnd, 0, NULL);
+    yarrow256_seed (crypto->rnd, YARROW256_SEED_FILE_SIZE, buf);
+    g_free (buf);
+}
 
-  fpm_setkey(old_context, hash_1, cipher->hash_len);
-  fpm_setkey(new_context, hash_2, cipher->hash_len);
+void fpm_crypt_init (gchar *password) {
+    byte *hash_1, *hash_2;

fpm2-0.79.tar.bz2/src/fpm_crypt.h -> fpm2-0.90.tar.xz/src/fpm_crypt.h Changed

@@ -1,6 +1,7 @@
-/* FIGARO'S PASSWORD MANAGER (FPM)
+/* FIGARO'S PASSWORD MANAGER 2 (FPM2)
  * Copyright (C) 2000 John Conneely
- * 
+ * Copyright (C) 2009-2020 Aleš Koval
+ *
  * FPM is open source / free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -18,51 +19,100 @@
  * fpm_crypt.h
  */
 
+#include <gtk/gtk.h>
+
+typedef guint8 byte;
+
+#define FPM_DEFAULT_CIPHER "AES-256-GCM"
+//#define FPM_DEFAULT_CIPHER "Camellia256-GCM"
+//#define FPM_DEFAULT_CIPHER "AES-128-EAX"
+//#define FPM_DEFAULT_CIPHER "ChaCha-Poly1305"
 
-#include "gpg_trans.h"
+#define PBKDF2_ITERATIONS_DEFAULT 250000
+#define PBKDF2_ITERATIONS_DEFAULT_OLD 8192
 
-#define PBKDF2_ITERATIONS 8192
 #define SHA256_DIGEST_LENGTH 32
 
-void fpm_crypt_init(gchar *password);
+#define FPM_HASH_SIZE	32
+#define FPM_SALT_SIZE	16
 
-int (*fpm_setkey) (void *c, const byte *key, unsigned keylen );
+typedef enum {
+    CIPHER_UNKNOWN = -1,
+    AES256,
+    AES256_GCM,
+    AES128_EAX,
+    ChaCha_Poly1305,
+    Camellia256_GCM
+} fpm_cipher_algo;
 
-gchar* get_new_salt(gint len);
+typedef enum {
+    PBKDF2
+} fpm_kdf_type;
 
-void
-fpm_decrypt_field(      void* context,
-                        gchar* plaintext,
-                        gchar* cipher_field,
-                        gint len);
-void
-fpm_encrypt_field(      void* context,
-                        gchar* cipher_field,
-                        gchar* plaintext,
-                        gint len);
+typedef struct {
+    gchar *name;
+    gsize blocksize;
+    gsize keylen;
+    gsize digestsize;
+    gsize contextsize;
+    gsize ivsize;
+} fpm_cipher_info;
 
-gchar*
-fpm_encrypt_field_var(  void* context,
-                        gchar* plaintext);
+typedef struct {
+    gpointer context;
+    guint8 *salt;
+    gboolean decryption_prepared;
+} fpm_cipher;
 
-gchar*
-fpm_decrypt_field_var(  void* context,
-                        gchar* cipher_field);
+typedef struct {
+    const fpm_cipher_info *cipher_info;
+    fpm_cipher *old;
+    fpm_cipher *new;
+    gpointer rnd;
+    guint8 *iv;
+    fpm_kdf_type kdf;
+    guint32 kdf_iterations;
+} fpm_crypto_context;
 
+extern fpm_crypto_context *crypto;
+extern fpm_cipher_algo cipher_algo;		/* Current cipher algorithm */
 
-void fpm_decrypt_all(void);
+GList *fpm_get_ciphers ();
+fpm_cipher_algo fpm_get_cipher_algo (gchar *cipher_name);
 
-void fpm_cipher_init(char *cipher);
+void fpm_crypt_init (gchar *password);
 
-void fpm_crypt_set_password(gchar *password);
+extern void (*fpm_setkey) (fpm_cipher *cipher, const byte *key);
+extern void (*fpm_encrypt_block) (fpm_cipher *cipher, byte *outbuf, const byte *inbuf);
+extern void (*fpm_decrypt_block) (fpm_cipher *cipher, byte *outbuf, const byte *inbuf);
+extern void (*fpm_decrypt_data) (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+extern void (*fpm_encrypt_data) (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
 
-void fpm_decrypt_launchers();
+extern void (*fpm_set_iv) (fpm_cipher *cipher, byte *iv);
+extern void (*fpm_get_tag) (fpm_cipher *cipher, gsize len, byte *tag);
+extern void (*fpm_add_data) (fpm_cipher *cipher, gsize len, byte *data);
+
+gchar *get_new_salt (gint len);
 
-void md5(gchar *prehash, guint8 *hash);
+void fpm_decrypt_field (fpm_cipher *cipher, gchar *plaintext, gchar *cipher_field, gsize len);
+void fpm_encrypt_field (fpm_cipher *cipher, gchar *cipher_field, gchar *plaintext, gsize len);
 
-void fpm_sha256_fpm_data(gchar *digest);
+gchar *fpm_encrypt_field_var (fpm_cipher *cipher, gchar *plaintext);
+gchar *fpm_decrypt_field_var (fpm_cipher *cipher, gchar *cipher_field);
+
+void fpm_decrypt_all (void);
+
+void fpm_cipher_init (char *cipher);
+
+void fpm_crypt_set_password (gchar *password);
+
+void fpm_decrypt_launchers();
 
-gint fpm_sha256_file(gchar *filename, guchar *digest);
+byte *fpm_get_new_iv();
+byte *fpm_get_new_salt (gsize len);
 
-gint fpm_pkcs5_pbkdf2(guchar *pass, gsize pass_len, const gchar *salt, gsize salt_len, guint8 *key, gsize key_len, guint rounds);
+gchar *fpm_encrypt_data_base64 (fpm_cipher *cipher, byte *plaintext, gsize len);
+gchar *fpm_decrypt_data_base64 (fpm_cipher *cipher, gchar *ciphertext);
 
+void fpm_sha256_fpm_data (gchar *digest);
+gint fpm_sha256_file (gchar *filename, guchar *digest);

fpm2-0.79.tar.bz2/src/fpm_file.c -> fpm2-0.90.tar.xz/src/fpm_file.c Changed

@@ -1,6 +1,6 @@
 /* FIGARO'S PASSWORD MANAGER 2 (FPM2)
  * Copyright (C) 2000 John Conneely
- * Copyright (C) 2009,2010 Aleš Koval
+ * Copyright (C) 2009-2020 Aleš Koval
  *
  * FPM is open source / free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,10 +29,67 @@
 #include "fpm_crypt.h"
 #include "support.h"
 
-static void new_leaf_encrypt_password(xmlDocPtr doc, xmlNodePtr item, const xmlChar *name, char *text);
+#define VAULT_DECRYPT_OK 0
+#define VAULT_DECRYPT_FAIL -1
 
-static void
-passfile_update_key()
+static void new_leaf_encrypt_password (xmlDocPtr doc, xmlNodePtr item, fpm_data *data);
+
+static void encrypt_vault (xmlNodePtr node, xmlDocPtr doc, gchar *adata) {
+
+    gchar *data;
+    byte *tag;
+
+    xmlBufferPtr nodeBuffer = xmlBufferCreate();
+    gsize len = xmlNodeDump (nodeBuffer, doc, node, 0, 1);
+
+    fpm_set_iv (crypto->new, crypto->iv);
+    fpm_add_data (crypto->new, strlen (adata), (byte *)adata);
+    data = fpm_encrypt_data_base64 (crypto->new, nodeBuffer->content, len);
+    tag = g_malloc (crypto->cipher_info->digestsize);
+    fpm_get_tag (crypto->new, crypto->cipher_info->digestsize, tag);
+
+    xmlBufferFree (nodeBuffer);
+
+    xmlNodePtr vault = xmlNewChild (doc->xmlRootNode, NULL, (xmlChar *)"Vault", (xmlChar *)data);
+
+    gchar *ctag = g_base64_encode (tag, crypto->cipher_info->digestsize);
+    xmlSetProp (vault, (xmlChar *)"tag", (xmlChar *)ctag);
+
+    g_free (tag);
+    g_free (data);
+
+    xmlReplaceNode (node, vault);
+}
+
+static int decrypt_vault (xmlNodePtr node, gchar *adata, byte *tag_old) {
+
+    xmlNodePtr vault;
+    gchar *decrypted;
+    byte *tag_new;
+
+    tag_new = malloc (crypto->cipher_info->digestsize);
+
+    fpm_add_data (crypto->old, strlen (adata), (byte *)adata);
+    decrypted = fpm_decrypt_data_base64 (crypto->old, (char *)node->xmlChildrenNode->content);
+    fpm_get_tag (crypto->old, crypto->cipher_info->digestsize, tag_new);
+
+    /* Check if MAC is correct */
+    if (memcmp (tag_old, tag_new, crypto->cipher_info->digestsize)) {
+	g_free (tag_new);
+	g_free (decrypted);
+	return (VAULT_DECRYPT_FAIL);
+    }
+
+    xmlParseInNodeContext (node, decrypted, strlen (decrypted), 0, &vault);
+    xmlReplaceNode (node, vault);
+
+    g_free (tag_new);
+    g_free (decrypted);
+
+    return (VAULT_DECRYPT_OK);
+}
+
+static void passfile_update_key()
 /* This routine goes through the entire password list and will decrypt the
  * passwords with an old key and encrypt it again with a new key.  This is
  * needed in two situations: First, if the user changes a password.  Secondly,
@@ -40,702 +97,829 @@
  * called whenever we save a file.
  */
 {
-  fpm_data* data;
-  gchar plaintextFPM_PASSWORD_LEN+1 = {0};
-  GList *list;
-  guint ix;
-
-  if (old_context!=new_context)
-  {
-    list=g_list_first(glb_pass_list);
-    while(list!=NULL)
-    {
-      data = list->data;
-      ix = strlen(data->password) / 2;
-      fpm_decrypt_field(old_context, plaintext,
-	 data->password, ix);
-      fpm_encrypt_field(new_context, data->password,
-	 plaintext, FPM_PASSWORD_LEN);
-      list = g_list_next(list);
-    }
-
-    wipememory(plaintext, FPM_PASSWORD_LEN);
-    memcpy(old_context, new_context , cipher->contextsize);
-    old_salt = new_salt;
-  }
-}
+    fpm_data *data;
+    gchar plaintextFPM_PASSWORD_LEN + 1 = {0};
+    GList *list;
+    guint ix;
 
-static void
-move_backup(gchar* file_name)
-{
-  gchar file1512;
-  gchar file2512;
-  gint i;
+    if (crypto->old->context != crypto->new->context) {
+        list = g_list_first (glb_pass_list);
+        while (list != NULL) {
+            data = list->data;
+            ix = strlen (data->password) / 2;
 
+	    if (!state->legacy_cipher) {
+		fpm_set_iv (crypto->old, data->iv);
+	    }
 
-  for(i=ini->number_backup_files;i>0;i--)
-  {
-    g_snprintf(file2, 512, "%s.%02d", file_name, i);
-    if (i>1)
-      g_snprintf(file1, 512, "%s.%02d", file_name, i-1);
-    else
-      g_snprintf(file1, 512, "%s", file_name);
+            fpm_decrypt_field (crypto->old, plaintext, data->password, ix);
+
+	    if (!state->legacy_cipher) {
+		g_free (data->iv);
+    		data->iv = fpm_get_new_iv ();
+		fpm_set_iv (crypto->new, data->iv);
+	    }
+
+            fpm_encrypt_field (crypto->new, data->password, plaintext, FPM_PASSWORD_LEN);
 
-    rename(file1, file2);
+	    if (!state->legacy_cipher) {
+		g_free (data->tag);
+		data->tag = g_malloc (crypto->cipher_info->digestsize);
+		fpm_get_tag (crypto->new, crypto->cipher_info->digestsize, data->tag);
+	    }
 
-  }
+            list = g_list_next (list);
+        }
+
+        wipememory (plaintext, FPM_PASSWORD_LEN);
+        memcpy (crypto->old->context, crypto->new->context , crypto->cipher_info->contextsize);
+        memcpy (crypto->old->salt, crypto->new->salt, FPM_SALT_SIZE);
+
+        crypto->old->decryption_prepared = FALSE;
+    }
 }
 
-static void
-passfile_upd_attr(xmlNodePtr node, char *cond, char** data_ptr)
-{
-  if (!strcmp((char *)node->name, cond))
-  {
-    g_free(*data_ptr);
-    if(node->xmlChildrenNode != NULL)
-      *data_ptr=g_strdup((char *)node->xmlChildrenNode->content);
-    else
-      *data_ptr=g_strdup("");
-  }
+static void move_backup (gchar *file_name) {
+    gchar file1512;
+    gchar file2512;
+    gint i;
+
+    for (i = ini->number_backup_files; i > 0; i--) {
+        g_snprintf (file2, 512, "%s.%02d", file_name, i);
+        if (i > 1)
+            g_snprintf (file1, 512, "%s.%02d", file_name, i - 1);
+        else
+            g_snprintf (file1, 512, "%s", file_name);
+
+        rename (file1, file2);
+    }
 }
 
-static void new_leaf(xmlDocPtr doc, xmlNodePtr item, const xmlChar *name, xmlChar *text)
-{
-  xmlChar *tmp;
+static void passfile_upd_attr (xmlNodePtr node, char *cond, char **data_ptr) {
+    if (!strcmp ((char *)node->name, cond)) {
+        g_free (*data_ptr);
+        if (node->xmlChildrenNode != NULL)
+            *data_ptr = g_strdup ((char *)node->xmlChildrenNode->content);
+        else

fpm2-0.79.tar.bz2/src/fpm_file.h -> fpm2-0.90.tar.xz/src/fpm_file.h Changed

@@ -1,6 +1,6 @@
 /* FIGARO'S PASSWORD MANAGER 2 (FPM2)
  * Copyright (C) 2000 John Conneely
- * Copyright (C) 2009 Aleš Koval
+ * Copyright (C) 2009-2017 Aleš Koval
  *
  * FPM is open source / free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,9 +19,19 @@
  * fpm_file.h formerly passfile.h
  */
 
-void passfile_save(gchar* file_name);
-gint passfile_load(gchar* file_name);
-void fpm_file_save(gchar* file_name, gboolean convert);
-void fpm_file_convert(gchar* file_name, gchar *password);
-gint fpm_file_import(gchar *file_name, gint import_launchers, gchar *import_category, gchar **message);
-void fpm_file_export(gchar *file_name, gint export_launchers, gchar *export_category);
+typedef enum {
+    FILE_OK,
+    FILE_NOT_FPM,
+    FILE_INVALID,
+    FILE_OLD,
+    FILE_FUTURE,
+    FILE_DECRYPT_FAIL,
+    FILE_UNKNOWN_CIPHER
+} fpm_load_file_result;
+
+void passfile_save (gchar *file_name);
+gint fpm_file_load (gchar *file_name, gchar *password);
+void fpm_file_save (gchar *file_name, gboolean convert);
+void fpm_file_convert (gchar *file_name, gchar *password, gchar *cipher);
+gint fpm_file_import (gchar *file_name, gint import_launchers, gchar *import_category, gint import_entries, gchar **message);
+void fpm_file_export (gchar *file_name, gint export_launchers, gchar *export_category);

fpm2-0.79.tar.bz2/src/fpm_gpw.c -> fpm2-0.90.tar.xz/src/fpm_gpw.c Changed

fpm2-0.79.tar.bz2/src/fpm_launcher.c -> fpm2-0.90.tar.xz/src/fpm_launcher.c Changed

fpm2-0.90.tar.xz/src/fpm_nettle.c Added

@@ -0,0 +1,154 @@
+/* FIGARO'S PASSWORD MANAGER 2 (FPM2)
+ * Copyright (C) 2016-2020 Aleš Koval
+ *
+ * FPM2 is open source / free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FPM2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * fpm_nettle.c --- Interface between FPM2 and nettle
+ *
+ */
+
+#include "fpm_crypt.h"
+
+#include <nettle/aes.h>
+#include <nettle/yarrow.h>
+#include <nettle/gcm.h>
+#include <nettle/eax.h>
+#include <nettle/chacha-poly1305.h>
+
+/* AES-256 function for compatibility */
+void aes256_set_key (fpm_cipher *cipher, const byte *key) {
+    aes256_set_encrypt_key (cipher->context, key);
+    cipher->decryption_prepared = FALSE;
+}
+
+void aes256_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    if (!cipher->decryption_prepared) {
+        aes256_invert_key (cipher->context, cipher->context);
+        cipher->decryption_prepared = TRUE;
+    }
+    aes256_decrypt (cipher->context, len, outbuf, inbuf);
+}
+
+void aes256_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    if (cipher->decryption_prepared) {
+        /* Rotate all subkey for encrypt */
+        aes256_invert_key (cipher->context, cipher->context);
+        aes256_invert_key (cipher->context, cipher->context);
+        aes256_invert_key (cipher->context, cipher->context);
+        cipher->decryption_prepared = FALSE;
+    }
+
+    aes256_encrypt (cipher->context, len, outbuf, inbuf);
+}
+
+/* AES-256-GCM */
+void aes256_gcm_set_key (fpm_cipher *cipher, const byte *key) {
+    gcm_aes256_set_key (cipher->context, key);
+}
+
+void aes256_gcm_set_iv (fpm_cipher *cipher, byte *iv) {
+    gcm_aes256_set_iv (cipher->context, crypto->cipher_info->ivsize, iv);
+}
+
+void aes256_gcm_get_tag (fpm_cipher *cipher, gsize len, byte *tag) {
+    gcm_aes256_digest (cipher->context, len, tag);
+}
+
+void aes256_gcm_add_data (fpm_cipher *cipher, gsize len, byte *data) {
+    gcm_aes256_update (cipher->context, len, data);
+}
+
+void aes256_gcm_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    gcm_aes256_decrypt (cipher->context, len, outbuf, inbuf);
+}
+
+void aes256_gcm_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    gcm_aes256_encrypt (cipher->context, len, outbuf, inbuf);
+}
+
+/* AES-128-EAX */
+void aes128_eax_set_key (fpm_cipher *cipher, const byte *key) {
+    eax_aes128_set_key (cipher->context, key);
+}
+
+void aes128_eax_set_iv (fpm_cipher *cipher, byte *iv) {
+    eax_aes128_set_nonce (cipher->context, crypto->cipher_info->ivsize, iv);
+}
+
+void aes128_eax_get_tag (fpm_cipher *cipher, gsize len, byte *tag) {
+    eax_aes128_digest (cipher->context, len, tag);
+}
+
+void aes128_eax_add_data (fpm_cipher *cipher, gsize len, byte *data) {
+    eax_aes128_update (cipher->context, len, data);
+}
+
+void aes128_eax_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    eax_aes128_decrypt (cipher->context, len, outbuf, inbuf);
+}
+
+void aes128_eax_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    eax_aes128_encrypt (cipher->context, len, outbuf, inbuf);
+}
+
+/* ChaCha-Poly1305 */
+void chacha_poly1305_set_key_wrap (fpm_cipher *cipher, const byte *key) {
+    chacha_poly1305_set_key (cipher->context, key);
+}
+
+void chacha_poly1305_set_iv (fpm_cipher *cipher, byte *iv) {
+    chacha_poly1305_set_nonce (cipher->context, iv);
+}
+
+void chacha_poly1305_get_tag (fpm_cipher *cipher, gsize len, byte *tag) {
+    chacha_poly1305_digest (cipher->context, len, tag);
+}
+
+void chacha_poly1305_add_data (fpm_cipher *cipher, gsize len, byte *data) {
+    chacha_poly1305_update (cipher->context, len, data);
+}
+
+void chacha_poly1305_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    chacha_poly1305_decrypt (cipher->context, len, outbuf, inbuf);
+}
+
+void chacha_poly1305_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    chacha_poly1305_encrypt (cipher->context, len, outbuf, inbuf);
+}
+
+/* Camellia256-GCM */
+void camellia256_gcm_set_key (fpm_cipher *cipher, const byte *key) {
+    gcm_camellia256_set_key (cipher->context, key);
+}
+
+void camellia256_gcm_set_iv (fpm_cipher *cipher, byte *iv) {
+    gcm_camellia256_set_iv (cipher->context, crypto->cipher_info->ivsize, iv);
+}
+
+void camellia256_gcm_get_tag (fpm_cipher *cipher, gsize len, byte *tag) {
+    gcm_camellia256_digest (cipher->context, len, tag);
+}
+
+void camellia256_gcm_add_data (fpm_cipher *cipher, gsize len, byte *data) {
+    gcm_camellia256_update (cipher->context, len, data);
+}
+
+void camellia256_gcm_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    gcm_camellia256_decrypt (cipher->context, len, outbuf, inbuf);
+}
+
+void camellia256_gcm_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len) {
+    gcm_camellia256_encrypt (cipher->context, len, outbuf, inbuf);
+}

fpm2-0.90.tar.xz/src/fpm_nettle.h Added

@@ -0,0 +1,52 @@
+/* FIGARO'S PASSWORD MANAGER 2 (FPM2)
+ * Copyright (C) 2016 Aleš Koval
+ *
+ * FPM2 is open source / free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FPM2 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * fpm_nettle.h --- Interface between FPM2 and nettle
+ *
+ */
+
+void aes256_set_key (fpm_cipher *cipher, const byte *key);
+void aes256_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void aes256_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+
+void aes256_gcm_set_key (fpm_cipher *cipher, const byte *key);
+void aes256_gcm_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void aes256_gcm_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void aes256_gcm_set_iv (fpm_cipher *cipher, byte *iv);
+void aes256_gcm_get_tag (fpm_cipher *cipher, gsize len, byte *tag);
+void aes256_gcm_add_data (fpm_cipher *cipher, gsize len, byte *data);
+
+void aes128_eax_set_key (fpm_cipher *cipher, const byte *key);
+void aes128_eax_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void aes128_eax_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void aes128_eax_set_iv (fpm_cipher *cipher, byte *iv);
+void aes128_eax_get_tag (fpm_cipher *cipher, gsize len, byte *tag);
+void aes128_eax_add_data (fpm_cipher *cipher, gsize len, byte *data);
+
+void chacha_poly1305_set_key_wrap (fpm_cipher *cipher, const byte *key);
+void chacha_poly1305_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void chacha_poly1305_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void chacha_poly1305_set_iv (fpm_cipher *cipher, byte *iv);
+void chacha_poly1305_get_tag (fpm_cipher *cipher, gsize len, byte *tag);
+void chacha_poly1305_add_data (fpm_cipher *cipher, gsize len, byte *data);
+
+void camellia256_gcm_set_key (fpm_cipher *cipher, const byte *key);
+void camellia256_gcm_decrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void camellia256_gcm_encrypt_data (fpm_cipher *cipher, byte *outbuf, const byte *inbuf, gsize len);
+void camellia256_gcm_set_iv (fpm_cipher *cipher, byte *iv);
+void camellia256_gcm_get_tag (fpm_cipher *cipher, gsize len, byte *tag);
+void camellia256_gcm_add_data (fpm_cipher *cipher, gsize len, byte *data);

fpm2-0.79.tar.bz2/src/interface.c -> fpm2-0.90.tar.xz/src/interface.c Changed

@@ -1,5 +1,22 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
+/* FIGARO'S PASSWORD MANAGER 2 (FPM2)
+ * Copyright (C) 2000 John Conneely
+ * Copyright (C) 2008-2020 Aleš Koval
+ *
+ * FPM is open source / free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FPM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * interface.c - GTK Interface - originally generated by Glade
  */
 
 #ifdef HAVE_CONFIG_H
@@ -18,10 +35,11 @@
 #include "callbacks.h"
 #include "interface.h"
 #include "support.h"
+#include "fpm_crypt.h"
 
 #define GLADE_HOOKUP_OBJECT(component,widget,name) \
   g_object_set_data_full (G_OBJECT (component), name, \
-    gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)
+    g_object_ref (widget), (GDestroyNotify) g_object_unref)
 
 #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \
   g_object_set_data (G_OBJECT (component), name, widget)
@@ -30,7 +48,6 @@
 create_app_safe (void)
 {
   GtkWidget *app_safe;
-  GdkPixbuf *app_safe_icon_pixbuf;
   GtkWidget *vbox1;
   GtkWidget *menubar1;
   GtkWidget *file1;
@@ -111,17 +128,10 @@
   GtkWidget *clist_main;
   GtkWidget *findbar;
   GtkWidget *find_close;
-  GtkWidget *toolitem2;
-  GtkWidget *find_label;
-  GtkWidget *toolitem3;
   GtkWidget *find_entry;
-  GtkWidget *toolitem4;
   GtkWidget *find_match_case;
   GtkWidget *statusbar;
   GtkAccelGroup *accel_group;
-  GtkTooltips *tooltips;
-
-  tooltips = gtk_tooltips_new ();
 
   accel_group = gtk_accel_group_new ();
 
@@ -129,14 +139,10 @@
   gtk_window_set_title (GTK_WINDOW (app_safe), _("Figaro's Password Manager 2"));
   gtk_window_set_position (GTK_WINDOW (app_safe), GTK_WIN_POS_CENTER);
   gtk_window_set_default_size (GTK_WINDOW (app_safe), 500, 350);
-  app_safe_icon_pixbuf = create_pixbuf ("logo.png");
-  if (app_safe_icon_pixbuf)
-    {
-      gtk_window_set_icon (GTK_WINDOW (app_safe), app_safe_icon_pixbuf);
-      gdk_pixbuf_unref (app_safe_icon_pixbuf);
-    }
 
-  vbox1 = gtk_vbox_new (FALSE, 0);
+  gtk_window_set_default_icon_name ("fpm2");
+
+  vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_show (vbox1);
   gtk_container_add (GTK_CONTAINER (app_safe), vbox1);
 
@@ -177,7 +183,7 @@
   gtk_widget_show (import_passwords1);
   gtk_container_add (GTK_CONTAINER (file1_menu), import_passwords1);
 
-  image1011 = gtk_image_new_from_stock ("gtk-convert", GTK_ICON_SIZE_MENU);
+  image1011 = gtk_image_new_from_icon_name ("gtk-convert", GTK_ICON_SIZE_MENU);
   gtk_widget_show (image1011);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_passwords1), image1011);
 
@@ -185,7 +191,7 @@
   gtk_widget_show (export1);
   gtk_container_add (GTK_CONTAINER (file1_menu), export1);
 
-  image1012 = gtk_image_new_from_stock ("gtk-harddisk", GTK_ICON_SIZE_MENU);
+  image1012 = gtk_image_new_from_icon_name ("gtk-harddisk", GTK_ICON_SIZE_MENU);
   gtk_widget_show (image1012);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (export1), image1012);
 
@@ -198,10 +204,10 @@
   gtk_widget_show (hide_to_tray);
   gtk_container_add (GTK_CONTAINER (file1_menu), hide_to_tray);
   gtk_widget_add_accelerator (hide_to_tray, "activate", accel_group,
-                              GDK_w, (GdkModifierType) GDK_CONTROL_MASK,
+                              GDK_KEY_w, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image1013 = gtk_image_new_from_stock ("gtk-leave-fullscreen", GTK_ICON_SIZE_MENU);
+  image1013 = gtk_image_new_from_icon_name ("gtk-leave-fullscreen", GTK_ICON_SIZE_MENU);
   gtk_widget_show (image1013);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (hide_to_tray), image1013);
 
@@ -221,10 +227,10 @@
   gtk_container_add (GTK_CONTAINER (edit1_menu), copy_pass);
   gtk_widget_set_sensitive (copy_pass, FALSE);
   gtk_widget_add_accelerator (copy_pass, "activate", accel_group,
-                              GDK_p, (GdkModifierType) GDK_CONTROL_MASK,
+                              GDK_KEY_p, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image1014 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
+  image1014 = gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_MENU);
   gtk_widget_show (image1014);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_pass), image1014);
 
@@ -233,10 +239,10 @@
   gtk_container_add (GTK_CONTAINER (edit1_menu), copy_user);
   gtk_widget_set_sensitive (copy_user, FALSE);
   gtk_widget_add_accelerator (copy_user, "activate", accel_group,
-                              GDK_u, (GdkModifierType) GDK_CONTROL_MASK,
+                              GDK_KEY_u, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image1015 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
+  image1015 = gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_MENU);
   gtk_widget_show (image1015);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_user), image1015);
 
@@ -245,10 +251,10 @@
   gtk_container_add (GTK_CONTAINER (edit1_menu), copy_both1);
   gtk_widget_set_sensitive (copy_both1, FALSE);
   gtk_widget_add_accelerator (copy_both1, "activate", accel_group,
-                              GDK_b, (GdkModifierType) GDK_CONTROL_MASK,
+                              GDK_KEY_b, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image1016 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
+  image1016 = gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_MENU);
   gtk_widget_show (image1016);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_both1), image1016);
 
@@ -261,10 +267,10 @@
   gtk_widget_show (add_item1);
   gtk_container_add (GTK_CONTAINER (edit1_menu), add_item1);
   gtk_widget_add_accelerator (add_item1, "activate", accel_group,
-                              GDK_a, (GdkModifierType) GDK_CONTROL_MASK,
+                              GDK_KEY_a, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image1017 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU);
+  image1017 = gtk_image_new_from_icon_name ("gtk-new", GTK_ICON_SIZE_MENU);
   gtk_widget_show (image1017);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_item1), image1017);
 
@@ -273,10 +279,10 @@
   gtk_container_add (GTK_CONTAINER (edit1_menu), edit_item1);
   gtk_widget_set_sensitive (edit_item1, FALSE);
   gtk_widget_add_accelerator (edit_item1, "activate", accel_group,
-                              GDK_e, (GdkModifierType) GDK_CONTROL_MASK,
+                              GDK_KEY_e, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image1018 = gtk_image_new_from_stock ("gtk-edit", GTK_ICON_SIZE_MENU);
+  image1018 = gtk_image_new_from_icon_name ("gtk-edit", GTK_ICON_SIZE_MENU);
   gtk_widget_show (image1018);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (edit_item1), image1018);
 
@@ -285,10 +291,10 @@
   gtk_container_add (GTK_CONTAINER (edit1_menu), clone_item1);
   gtk_widget_set_sensitive (clone_item1, FALSE);
   gtk_widget_add_accelerator (clone_item1, "activate", accel_group,
-                              GDK_c, (GdkModifierType) GDK_CONTROL_MASK,
+                              GDK_KEY_c, (GdkModifierType) GDK_CONTROL_MASK,
                               GTK_ACCEL_VISIBLE);
 
-  image1019 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU);
+  image1019 = gtk_image_new_from_icon_name ("gtk-copy", GTK_ICON_SIZE_MENU);
   gtk_widget_show (image1019);
   gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clone_item1), image1019);
 
@@ -297,10 +303,10 @@
   gtk_container_add (GTK_CONTAINER (edit1_menu), item_delete);
   gtk_widget_set_sensitive (item_delete, FALSE);
   gtk_widget_add_accelerator (item_delete, "activate", accel_group,
-                              GDK_Delete, (GdkModifierType) 0,
+                              GDK_KEY_Delete, (GdkModifierType) 0,
                               GTK_ACCEL_VISIBLE);
 
-  image1020 = gtk_image_new_from_stock ("gtk-delete", GTK_ICON_SIZE_MENU);

fpm2-0.79.tar.bz2/src/interface.h -> fpm2-0.90.tar.xz/src/interface.h Changed

fpm2-0.79.tar.bz2/src/main.c -> fpm2-0.90.tar.xz/src/main.c Changed

fpm2-0.79.tar.bz2/src/support.c -> fpm2-0.90.tar.xz/src/support.c Changed

@@ -1,5 +1,22 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
+/* FIGARO'S PASSWORD MANAGER 2 (FPM2)
+ * Copyright (C) 2000 John Conneely
+ * Copyright (C) 2008-2017 Aleš Koval
+ *
+ * FPM is open source / free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FPM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * support.c - GTK Interface support utility - originally generated by Glade
  */
 
 #ifdef HAVE_CONFIG_H
@@ -27,7 +44,8 @@
       if (GTK_IS_MENU (widget))
         parent = gtk_menu_get_attach_widget (GTK_MENU (widget));
       else
-        parent = widget->parent;
+        parent = gtk_widget_get_parent (widget);
+//        parent = widget->parent;
       if (!parent)
         parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey");
       if (parent == NULL)
@@ -73,10 +91,7 @@
 }
 
 /* This is an internally used function to create pixmaps. */
-GtkWidget*
-create_pixmap                          (GtkWidget       *widget,
-                                        const gchar     *filename)
-{
+GtkWidget *create_pixmap (const gchar *filename) {
   gchar *pathname = NULL;
   GtkWidget *pixmap;

fpm2-0.79.tar.bz2/src/support.h -> fpm2-0.90.tar.xz/src/support.h Changed

@@ -1,5 +1,22 @@
-/*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
+/* FIGARO'S PASSWORD MANAGER 2 (FPM2)
+ * Copyright (C) 2000 John Conneely
+ * Copyright (C) 2008-2017 Aleš Koval
+ *
+ * FPM is open source / free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * FPM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ *
+ * support.h - GTK Interface support utility - originally generated by Glade
  */
 
 #ifdef HAVE_CONFIG_H
@@ -34,8 +51,7 @@
  */
 
 /* This is used to create the pixmaps used in the interface. */
-GtkWidget*  create_pixmap              (GtkWidget       *widget,
-                                        const gchar     *filename);
+GtkWidget*  create_pixmap              (const gchar     *filename);
 
 /* This is used to create the pixbufs used in the interface. */
 GdkPixbuf*  create_pixbuf              (const gchar     *filename);