Hey everybody,

for those who can not wait (like me) here is an update for keepassx.
I hope steven@ can use it for more tests or a better port.

Tested @amd64 with my old *.kdb file without problems.

Cheers, Rafael


Index: Makefile
===================================================================
RCS file: /cvs/ports/security/keepassx/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- Makefile    7 Dec 2015 18:26:01 -0000       1.8
+++ Makefile    10 Dec 2015 22:34:06 -0000
@@ -2,12 +2,11 @@
 
 COMMENT =      management tool for sensitive data
 
-V =            0.4.3
+V =            2.0
 DISTNAME =     keepassx-$V
-REVISION =     3
 CATEGORIES =   security
 
-HOMEPAGE =     http://www.keepassx.org/
+HOMEPAGE =     https://www.keepassx.org/
 
 MAINTAINER =   Steven Mestdagh <ste...@openbsd.org>
 
@@ -16,9 +15,15 @@ PERMIT_PACKAGE_CDROM =       Yes
 
 MASTER_SITES = https://www.keepassx.org/releases/$V/
 
-MODULES =      x11/qt4 devel/cmake
+MODULES =      x11/qt4 \
+               devel/cmake \
+               gcc4
+
+MODGCC4_ARCHS =        *
+MODGCC4_LANGS =        c c++
 
 WANTLIB += QtGui QtXml X11 Xtst c m pthread stdc++
+WANTLIB += gcrypt z
 
 RUN_DEPENDS =  devel/desktop-file-utils \
                misc/shared-mime-info
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/keepassx/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo    18 Jan 2015 03:15:02 -0000      1.2
+++ distinfo    10 Dec 2015 22:34:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (keepassx-0.4.3.tar.gz) = zZAaBhHOV+Ys9t9+7rG2kLUjIwK9rYYmmU61Stz6HoU=
-SIZE (keepassx-0.4.3.tar.gz) = 1368766
+SHA256 (keepassx-2.0.tar.gz) = DrQPrDpE2Cg9/B7ijMbeXGYLIquXVHLegsKwRnXIIuY=
+SIZE (keepassx-2.0.tar.gz) = 1524638
Index: patches/patch-src_lib_FileDialogs_cpp
===================================================================
RCS file: patches/patch-src_lib_FileDialogs_cpp
diff -N patches/patch-src_lib_FileDialogs_cpp
--- patches/patch-src_lib_FileDialogs_cpp       7 Dec 2015 18:26:01 -0000       
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-src_lib_FileDialogs_cpp,v 1.1 2015/12/07 18:26:01 jasper Exp $
-
-Security fix for CVE-2015-8378
-http://anonscm.debian.org/cgit/collab-maint/keepassx.git/commit/?id=b3c9028db8ec3b8752ff47717ffc792d755c1294
-
---- src/lib/FileDialogs.cpp.orig       Thu Oct  8 21:27:39 2009
-+++ src/lib/FileDialogs.cpp    Mon Dec  7 14:50:29 2015
-@@ -118,6 +118,11 @@ QString QtStandardFileDialogs::saveFileDialog(QWidget*
-               SelectedFilter=Filters[SelectedFilterIndex];
-       QString filepath = 
QFileDialog::getSaveFileName(parent,title,dir,toSingleStringFilter(Filters),&SelectedFilter,
-                                                       ShowOverwriteWarning ? 
(QFileDialog::Option)0 : QFileDialog::DontConfirmOverwrite);
-+
-+        // Fixes CVE-2015-8378
-+        if (filepath.isEmpty())
-+            return filepath;
-+
-       LastFilter=Filters.indexOf(SelectedFilter);
-               
-       //Check whether the file has an extension which fits to the selected 
filter
Index: pkg/PFRAG.shared
===================================================================
RCS file: pkg/PFRAG.shared
diff -N pkg/PFRAG.shared
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/PFRAG.shared    10 Dec 2015 22:34:06 -0000
@@ -0,0 +1,2 @@
+@comment $OpenBSD$
+lib/keepassx/libkeepassx-autotype-x11.so
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/keepassx/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- pkg/PLIST   28 Apr 2012 14:08:54 -0000      1.2
+++ pkg/PLIST   10 Dec 2015 22:34:06 -0000
@@ -1,103 +1,224 @@
 @comment $OpenBSD: PLIST,v 1.2 2012/04/28 14:08:54 ajacoutot Exp $
+%%SHARED%%
 @bin bin/keepassx
+lib/keepassx/
 share/applications/keepassx.desktop
+share/icons/
+share/icons/hicolor/
+share/icons/hicolor/128x128/
+share/icons/hicolor/128x128/apps/
+share/icons/hicolor/128x128/apps/keepassx.png
+share/icons/hicolor/128x128/mimetypes/
+share/icons/hicolor/128x128/mimetypes/application-x-keepassx.png
+share/icons/hicolor/16x16/
+share/icons/hicolor/16x16/actions/
+share/icons/hicolor/16x16/apps/
+share/icons/hicolor/16x16/apps/keepassx.png
+share/icons/hicolor/16x16/mimetypes/
+share/icons/hicolor/16x16/mimetypes/application-x-keepassx.png
+share/icons/hicolor/22x22/
+share/icons/hicolor/22x22/actions/
+share/icons/hicolor/22x22/mimetypes/
+share/icons/hicolor/22x22/mimetypes/application-x-keepassx.png
+share/icons/hicolor/22x22/status/
+share/icons/hicolor/24x24/
+share/icons/hicolor/24x24/apps/
+share/icons/hicolor/24x24/apps/keepassx.png
+share/icons/hicolor/256x256/
+share/icons/hicolor/256x256/apps/
+share/icons/hicolor/256x256/apps/keepassx.png
+share/icons/hicolor/32x32/
+share/icons/hicolor/32x32/apps/
+share/icons/hicolor/32x32/apps/keepassx.png
+share/icons/hicolor/32x32/mimetypes/
+share/icons/hicolor/32x32/mimetypes/application-x-keepassx.png
+share/icons/hicolor/48x48/
+share/icons/hicolor/48x48/apps/
+share/icons/hicolor/48x48/apps/keepassx.png
+share/icons/hicolor/64x64/
+share/icons/hicolor/64x64/apps/
+share/icons/hicolor/64x64/apps/keepassx.png
+share/icons/hicolor/64x64/mimetypes/
+share/icons/hicolor/64x64/mimetypes/application-x-keepassx.png
+share/icons/hicolor/scalable/
+share/icons/hicolor/scalable/apps/
+share/icons/hicolor/scalable/apps/keepassx.svgz
 share/keepassx/
-share/keepassx/i18n/
-share/keepassx/i18n/keepassx-de_DE.qm
-share/keepassx/i18n/keepassx-es_ES.qm
-share/keepassx/i18n/keepassx-fi_FI.qm
-share/keepassx/i18n/keepassx-fr_FR.qm
-share/keepassx/i18n/keepassx-gl_ES.qm
-share/keepassx/i18n/keepassx-hu_HU.qm
-share/keepassx/i18n/keepassx-it_IT.qm
-share/keepassx/i18n/keepassx-ja_JP.qm
-share/keepassx/i18n/keepassx-nb_NO.qm
-share/keepassx/i18n/keepassx-nl_NL.qm
-share/keepassx/i18n/keepassx-pl_PL.qm
-share/keepassx/i18n/keepassx-ru_RU.qm
-share/keepassx/i18n/keepassx-tr_TR.qm
-share/keepassx/i18n/keepassx-uk_UA.qm
-share/keepassx/i18n/keepassx-zh_CN.qm
-share/keepassx/i18n/qt_fi.qm
-share/keepassx/i18n/qt_hu.qm
-share/keepassx/i18n/qt_it.qm
-share/keepassx/i18n/qt_nl.qm
-share/keepassx/i18n/qt_tr.qm
 share/keepassx/icons/
-share/keepassx/icons/alarmclock.png
-share/keepassx/icons/appsettings.png
-share/keepassx/icons/autotype.png
-share/keepassx/icons/bookmark.png
-share/keepassx/icons/bookmark_add.png
-share/keepassx/icons/bookmark_del.png
-share/keepassx/icons/bookmark_edit.png
-share/keepassx/icons/bookmark_folder.png
-share/keepassx/icons/bookmark_this.png
-share/keepassx/icons/clientic.png
-share/keepassx/icons/clock.png
-share/keepassx/icons/cloneentry.png
-share/keepassx/icons/copypwd.png
-share/keepassx/icons/copyusername.png
-share/keepassx/icons/dbsearch.png
-share/keepassx/icons/dbsettings.png
-share/keepassx/icons/delete.png
-share/keepassx/icons/deleteentry.png
-share/keepassx/icons/deletegroup.png
-share/keepassx/icons/dice.png
-share/keepassx/icons/document.png
-share/keepassx/icons/down.png
-share/keepassx/icons/editentry.png
-share/keepassx/icons/editgroup.png
-share/keepassx/icons/exit.png
-share/keepassx/icons/expired.png
-share/keepassx/icons/fileclose.png
-share/keepassx/icons/filedelete.png
-share/keepassx/icons/filenew.png
-share/keepassx/icons/fileopen.png
-share/keepassx/icons/filesave.png
-share/keepassx/icons/filesaveas.png
-share/keepassx/icons/filesavedisabled.png
-share/keepassx/icons/generator.png
-share/keepassx/icons/go-home.png
-share/keepassx/icons/go-next.png
-share/keepassx/icons/go-previous.png
-share/keepassx/icons/groupsearch.png
-share/keepassx/icons/help.png
-share/keepassx/icons/help_about.png
-share/keepassx/icons/i18n.png
-share/keepassx/icons/keepassx.png
-share/keepassx/icons/keepassx_large.png
-share/keepassx/icons/keepassx_locked.png
-share/keepassx/icons/keepassx_small.png
-share/keepassx/icons/key.png
-share/keepassx/icons/lock.png
-share/keepassx/icons/manual.png
-share/keepassx/icons/newentry.png
-share/keepassx/icons/newgroup.png
-share/keepassx/icons/ok.png
-share/keepassx/icons/openurl.png
-share/keepassx/icons/pwd_hide.png
-share/keepassx/icons/pwd_show.png
-share/keepassx/icons/restore.png
-share/keepassx/icons/search.png
-share/keepassx/icons/swap.png
-share/keepassx/icons/templates.png
-share/keepassx/icons/text_block.png
-share/keepassx/icons/text_bold.png
-share/keepassx/icons/text_center.png
-share/keepassx/icons/text_italic.png
-share/keepassx/icons/text_left.png
-share/keepassx/icons/text_right.png
-share/keepassx/icons/text_under.png
-share/keepassx/icons/trashcan.png
-share/keepassx/icons/up.png
-share/keepassx/license.html
+share/keepassx/icons/application/
+share/keepassx/icons/application/128x128/
+share/keepassx/icons/application/128x128/apps/
+share/keepassx/icons/application/128x128/apps/keepassx.png
+share/keepassx/icons/application/128x128/mimetypes/
+share/keepassx/icons/application/128x128/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/16x16/
+share/keepassx/icons/application/16x16/actions/
+share/keepassx/icons/application/16x16/actions/application-exit.png
+share/keepassx/icons/application/16x16/actions/auto-type.png
+share/keepassx/icons/application/16x16/actions/configure.png
+share/keepassx/icons/application/16x16/actions/database-change-key.png
+share/keepassx/icons/application/16x16/actions/document-close.png
+share/keepassx/icons/application/16x16/actions/document-edit.png
+share/keepassx/icons/application/16x16/actions/document-encrypt.png
+share/keepassx/icons/application/16x16/actions/document-new.png
+share/keepassx/icons/application/16x16/actions/document-open.png
+share/keepassx/icons/application/16x16/actions/document-save-as.png
+share/keepassx/icons/application/16x16/actions/document-save.png
+share/keepassx/icons/application/16x16/actions/edit-clear-locationbar-ltr.png
+share/keepassx/icons/application/16x16/actions/edit-clear-locationbar-rtl.png
+share/keepassx/icons/application/16x16/actions/entry-clone.png
+share/keepassx/icons/application/16x16/actions/entry-delete.png
+share/keepassx/icons/application/16x16/actions/entry-edit.png
+share/keepassx/icons/application/16x16/actions/entry-new.png
+share/keepassx/icons/application/16x16/actions/group-delete.png
+share/keepassx/icons/application/16x16/actions/group-edit.png
+share/keepassx/icons/application/16x16/actions/group-new.png
+share/keepassx/icons/application/16x16/actions/help-about.png
+share/keepassx/icons/application/16x16/actions/password-copy.png
+share/keepassx/icons/application/16x16/actions/password-generate.png
+share/keepassx/icons/application/16x16/actions/password-show-off.png
+share/keepassx/icons/application/16x16/actions/password-show-on.png
+share/keepassx/icons/application/16x16/actions/system-search.png
+share/keepassx/icons/application/16x16/actions/username-copy.png
+share/keepassx/icons/application/16x16/apps/
+share/keepassx/icons/application/16x16/apps/keepassx.png
+share/keepassx/icons/application/16x16/mimetypes/
+share/keepassx/icons/application/16x16/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/22x22/
+share/keepassx/icons/application/22x22/actions/
+share/keepassx/icons/application/22x22/actions/dialog-close.png
+share/keepassx/icons/application/22x22/actions/dialog-ok.png
+share/keepassx/icons/application/22x22/actions/document-encrypt.png
+share/keepassx/icons/application/22x22/actions/document-open.png
+share/keepassx/icons/application/22x22/actions/document-save.png
+share/keepassx/icons/application/22x22/actions/entry-delete.png
+share/keepassx/icons/application/22x22/actions/entry-edit.png
+share/keepassx/icons/application/22x22/actions/entry-new.png
+share/keepassx/icons/application/22x22/actions/password-copy.png
+share/keepassx/icons/application/22x22/actions/system-search.png
+share/keepassx/icons/application/22x22/actions/username-copy.png
+share/keepassx/icons/application/22x22/mimetypes/
+share/keepassx/icons/application/22x22/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/22x22/status/
+share/keepassx/icons/application/22x22/status/dialog-error.png
+share/keepassx/icons/application/22x22/status/dialog-information.png
+share/keepassx/icons/application/22x22/status/dialog-warning.png
+share/keepassx/icons/application/24x24/
+share/keepassx/icons/application/24x24/apps/
+share/keepassx/icons/application/24x24/apps/keepassx.png
+share/keepassx/icons/application/256x256/
+share/keepassx/icons/application/256x256/apps/
+share/keepassx/icons/application/256x256/apps/keepassx.png
+share/keepassx/icons/application/32x32/
+share/keepassx/icons/application/32x32/apps/
+share/keepassx/icons/application/32x32/apps/keepassx.png
+share/keepassx/icons/application/32x32/mimetypes/
+share/keepassx/icons/application/32x32/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/48x48/
+share/keepassx/icons/application/48x48/apps/
+share/keepassx/icons/application/48x48/apps/keepassx.png
+share/keepassx/icons/application/64x64/
+share/keepassx/icons/application/64x64/apps/
+share/keepassx/icons/application/64x64/apps/keepassx.png
+share/keepassx/icons/application/64x64/mimetypes/
+share/keepassx/icons/application/64x64/mimetypes/application-x-keepassx.png
+share/keepassx/icons/application/scalable/
+share/keepassx/icons/application/scalable/apps/
+share/keepassx/icons/application/scalable/apps/keepassx.svgz
+share/keepassx/icons/database/
+share/keepassx/icons/database/C00_Password.png
+share/keepassx/icons/database/C01_Package_Network.png
+share/keepassx/icons/database/C02_MessageBox_Warning.png
+share/keepassx/icons/database/C03_Server.png
+share/keepassx/icons/database/C04_Klipper.png
+share/keepassx/icons/database/C05_Edu_Languages.png
+share/keepassx/icons/database/C06_KCMDF.png
+share/keepassx/icons/database/C07_Kate.png
+share/keepassx/icons/database/C08_Socket.png
+share/keepassx/icons/database/C09_Identity.png
+share/keepassx/icons/database/C10_Kontact.png
+share/keepassx/icons/database/C11_Camera.png
+share/keepassx/icons/database/C12_IRKickFlash.png
+share/keepassx/icons/database/C13_KGPG_Key3.png
+share/keepassx/icons/database/C14_Laptop_Power.png
+share/keepassx/icons/database/C15_Scanner.png
+share/keepassx/icons/database/C16_Mozilla_Firebird.png
+share/keepassx/icons/database/C17_CDROM_Unmount.png
+share/keepassx/icons/database/C18_Display.png
+share/keepassx/icons/database/C19_Mail_Generic.png
+share/keepassx/icons/database/C20_Misc.png
+share/keepassx/icons/database/C21_KOrganizer.png
+share/keepassx/icons/database/C22_ASCII.png
+share/keepassx/icons/database/C23_Icons.png
+share/keepassx/icons/database/C24_Connect_Established.png
+share/keepassx/icons/database/C25_Folder_Mail.png
+share/keepassx/icons/database/C26_FileSave.png
+share/keepassx/icons/database/C27_NFS_Unmount.png
+share/keepassx/icons/database/C28_QuickTime.png
+share/keepassx/icons/database/C29_KGPG_Term.png
+share/keepassx/icons/database/C30_Konsole.png
+share/keepassx/icons/database/C31_FilePrint.png
+share/keepassx/icons/database/C32_FSView.png
+share/keepassx/icons/database/C33_Run.png
+share/keepassx/icons/database/C34_Configure.png
+share/keepassx/icons/database/C35_KRFB.png
+share/keepassx/icons/database/C36_Ark.png
+share/keepassx/icons/database/C37_KPercentage.png
+share/keepassx/icons/database/C38_Samba_Unmount.png
+share/keepassx/icons/database/C39_History.png
+share/keepassx/icons/database/C40_Mail_Find.png
+share/keepassx/icons/database/C41_VectorGfx.png
+share/keepassx/icons/database/C42_KCMMemory.png
+share/keepassx/icons/database/C43_EditTrash.png
+share/keepassx/icons/database/C44_KNotes.png
+share/keepassx/icons/database/C45_Cancel.png
+share/keepassx/icons/database/C46_Help.png
+share/keepassx/icons/database/C47_KPackage.png
+share/keepassx/icons/database/C48_Folder.png
+share/keepassx/icons/database/C49_Folder_Blue_Open.png
+share/keepassx/icons/database/C50_Folder_Tar.png
+share/keepassx/icons/database/C51_Decrypted.png
+share/keepassx/icons/database/C52_Encrypted.png
+share/keepassx/icons/database/C53_Apply.png
+share/keepassx/icons/database/C54_Signature.png
+share/keepassx/icons/database/C55_Thumbnail.png
+share/keepassx/icons/database/C56_KAddressBook.png
+share/keepassx/icons/database/C57_View_Text.png
+share/keepassx/icons/database/C58_KGPG.png
+share/keepassx/icons/database/C59_Package_Development.png
+share/keepassx/icons/database/C60_KFM_Home.png
+share/keepassx/icons/database/C61_Services.png
+share/keepassx/icons/database/C62_Tux.png
+share/keepassx/icons/database/C63_Feather.png
+share/keepassx/icons/database/C64_Apple.png
+share/keepassx/icons/database/C65_W.png
+share/keepassx/icons/database/C66_Money.png
+share/keepassx/icons/database/C67_Certificate.png
+share/keepassx/icons/database/C68_BlackBerry.png
+share/keepassx/translations/
+share/keepassx/translations/keepassx_cs.qm
+share/keepassx/translations/keepassx_da.qm
+share/keepassx/translations/keepassx_de.qm
+share/keepassx/translations/keepassx_el.qm
+share/keepassx/translations/keepassx_en_plurals.qm
+share/keepassx/translations/keepassx_es.qm
+share/keepassx/translations/keepassx_fr.qm
+share/keepassx/translations/keepassx_id.qm
+share/keepassx/translations/keepassx_it.qm
+share/keepassx/translations/keepassx_ja.qm
+share/keepassx/translations/keepassx_ko.qm
+share/keepassx/translations/keepassx_lt.qm
+share/keepassx/translations/keepassx_nl_NL.qm
+share/keepassx/translations/keepassx_pl.qm
+share/keepassx/translations/keepassx_pt_BR.qm
+share/keepassx/translations/keepassx_pt_PT.qm
+share/keepassx/translations/keepassx_ru.qm
+share/keepassx/translations/keepassx_sl_SI.qm
+share/keepassx/translations/keepassx_sv.qm
+share/keepassx/translations/keepassx_uk.qm
+share/keepassx/translations/keepassx_zh_CN.qm
+share/keepassx/translations/keepassx_zh_TW.qm
 share/mime/packages/keepassx.xml
-share/mimelnk/
-share/mimelnk/application/
-share/mimelnk/application/x-keepass.desktop
-share/pixmaps/
-share/pixmaps/keepassx.xpm
 @exec %D/bin/update-mime-database %D/share/mime
 @unexec-delete %D/bin/update-mime-database %D/share/mime
 @exec %D/bin/update-desktop-database

Reply via email to