Date: Tue, 13 May 2008 20:47:09 -0400 (EDT) From: Greg Larkin <glarkin@sourcehosting.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: glarkin@sourcehosting.net, skv@FreeBSD.org Subject: ports/123649: [PATCH] security/keepassx: update to 0.3.1 Message-ID: <200805140047.m4E0l98t010303@daemon.entropy.prv> Resent-Message-ID: <200805140110.m4E1A33u063933@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 123649
>Category: ports
>Synopsis: [PATCH] security/keepassx: update to 0.3.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed May 14 01:10:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Greg Larkin
>Release: FreeBSD 6.3-RELEASE-p1 i386
>Organization:
SourceHosting.net, LLC
>Environment:
System: FreeBSD daemon.entropy.prv 6.3-RELEASE-p1 FreeBSD 6.3-RELEASE-p1 #1: Wed Mar 26 16:21:11 EDT 2008
>Description:
- Update to 0.3.1
- Added a patch to fix compiler errors on FreeBSD
Added file(s):
- files/patch-src-src.pro
Removed file(s):
- files/patch-src-mainwindow.cpp
Port maintainer (skv@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- KeePassX-0.3.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/keepassx.orig/Makefile /usr/ports/security/keepassx/Makefile
--- /usr/ports/security/keepassx.orig/Makefile 2008-04-19 13:53:25.000000000 -0400
+++ /usr/ports/security/keepassx/Makefile 2008-05-09 16:52:26.000000000 -0400
@@ -6,8 +6,7 @@
#
PORTNAME= KeePassX
-PORTVERSION= 0.2.2
-PORTREVISION= 3
+PORTVERSION= 0.3.1
CATEGORIES= security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME:L}
@@ -15,7 +14,7 @@
MAINTAINER= skv@FreeBSD.org
COMMENT= Cross Platform Password Manager
-WRKSRC= ${WRKDIR}/${PORTNAME:L}-${PORTVERSION}
+DATADIR= ${PREFIX}/share/${PORTNAME:L}
USE_QT_VER= 4
QT_COMPONENTS= qmake_build moc_build uic_build qt3support_build corelib gui xml
diff -ruN --exclude=CVS /usr/ports/security/keepassx.orig/distinfo /usr/ports/security/keepassx/distinfo
--- /usr/ports/security/keepassx.orig/distinfo 2007-02-06 06:49:15.000000000 -0500
+++ /usr/ports/security/keepassx/distinfo 2008-05-09 11:21:39.000000000 -0400
@@ -1,3 +1,3 @@
-MD5 (KeePassX-0.2.2.tar.gz) = 5ee945ab12c2667ef5c4013a0636c26f
-SHA256 (KeePassX-0.2.2.tar.gz) = ee588bd744195e394e7b618b8e0aeb25cbf37ca5b619b1c7e2176fd412b29cbd
-SIZE (KeePassX-0.2.2.tar.gz) = 302656
+MD5 (KeePassX-0.3.1.tar.gz) = 1d6ebb010e44cf2d0a635b4796498694
+SHA256 (KeePassX-0.3.1.tar.gz) = 1f37b67f64d1b8d13b9c9c51fdfe15fe1cb33d122773b12688bb5213510876d2
+SIZE (KeePassX-0.3.1.tar.gz) = 501954
diff -ruN --exclude=CVS /usr/ports/security/keepassx.orig/files/patch-src-mainwindow.cpp /usr/ports/security/keepassx/files/patch-src-mainwindow.cpp
--- /usr/ports/security/keepassx.orig/files/patch-src-mainwindow.cpp 2007-06-18 16:10:06.000000000 -0400
+++ /usr/ports/security/keepassx/files/patch-src-mainwindow.cpp 1969-12-31 19:00:00.000000000 -0500
@@ -1,32 +0,0 @@
---- src/mainwindow.cpp.orig Wed Jun 7 12:54:20 2006
-+++ src/mainwindow.cpp Mon Jun 4 08:56:25 2007
-@@ -879,6 +879,9 @@
-
- void KeepassMainWindow::OnEditUsernameToClipboard(){
- Clipboard->setText(currentEntry()->UserName, QClipboard::Clipboard);
-+if(Clipboard->supportsSelection()){
-+ Clipboard->setText(currentEntry()->UserName, QClipboard::Selection);
-+}
- ClipboardTimer.setSingleShot(true);
- ClipboardTimer.start(config.ClipboardTimeOut*1000);
- }
-@@ -886,6 +889,9 @@
- void KeepassMainWindow::OnEditPasswordToClipboard(){
- currentEntry()->Password.unlock();
- Clipboard->setText(currentEntry()->Password.string(),QClipboard::Clipboard);
-+if(Clipboard->supportsSelection()){
-+ Clipboard->setText(currentEntry()->Password.string(),QClipboard::Selection);
-+}
- ClipboardTimer.setSingleShot(true);
- ClipboardTimer.start(config.ClipboardTimeOut*1000);
- currentEntry()->Password.lock();
-@@ -894,6 +900,9 @@
-
- void KeepassMainWindow::OnClipboardTimeOut(){
- Clipboard->clear(QClipboard::Clipboard);
-+if(Clipboard->supportsSelection()){
-+ Clipboard->clear(QClipboard::Selection);
-+}
- }
-
- void KeepassMainWindow::OnEditSaveAttachment(){
diff -ruN --exclude=CVS /usr/ports/security/keepassx.orig/files/patch-src-src.pro /usr/ports/security/keepassx/files/patch-src-src.pro
--- /usr/ports/security/keepassx.orig/files/patch-src-src.pro 1969-12-31 19:00:00.000000000 -0500
+++ /usr/ports/security/keepassx/files/patch-src-src.pro 2008-05-09 13:36:37.000000000 -0400
@@ -0,0 +1,21 @@
+--- src/src.pro.orig 2008-05-09 13:23:13.000000000 -0400
++++ src/src.pro 2008-05-09 13:34:37.000000000 -0400
+@@ -18,6 +18,7 @@
+ }
+
+ win32 : QMAKE_WIN32 = 1
++freebsd-* : QMAKE_FREEBSD = 1
+
+ #-------------------------------------------------------------------------------
+ # Platform Specific: Unix (except MacOS X)
+@@ -49,6 +50,10 @@
+ HEADERS += Application_X11.h
+ }
+ SOURCES += main_unix.cpp
++ isEqual(QMAKE_FREEBSD,1){
++ CONFIG -= precompile_header
++ QMAKE_CXXFLAGS += -include keepassx.h
++ }
+ }
+
+
diff -ruN --exclude=CVS /usr/ports/security/keepassx.orig/pkg-plist /usr/ports/security/keepassx/pkg-plist
--- /usr/ports/security/keepassx.orig/pkg-plist 2007-02-06 06:49:15.000000000 -0500
+++ /usr/ports/security/keepassx/pkg-plist 2008-05-09 16:29:18.000000000 -0400
@@ -1,43 +1,79 @@
-bin/keepass
-share/keepass/license.html
-share/keepass/i18n/keepass-de_DE.qm
-share/keepass/i18n/keepass-fr_FR.qm
-share/keepass/icons/clientic.png
-share/keepass/icons/i18n.png
-share/keepass/icons/keepassx.png
-share/keepass/icons/key.png
-share/keepass/icons/ok.png
-share/keepass/icons/search.png
-share/keepass/icons/settings.png
-share/keepass/icons/nuvola/32x32/actions/configure.png
-share/keepass/icons/nuvola/32x32/actions/edit.png
-share/keepass/icons/nuvola/32x32/actions/edit_add.png
-share/keepass/icons/nuvola/32x32/actions/editcopy.png
-share/keepass/icons/nuvola/32x32/actions/editdelete.png
-share/keepass/icons/nuvola/32x32/actions/exit.png
-share/keepass/icons/nuvola/32x32/actions/fileclose.png
-share/keepass/icons/nuvola/32x32/actions/fileexport.png
-share/keepass/icons/nuvola/32x32/actions/filenew.png
-share/keepass/icons/nuvola/32x32/actions/fileopen.png
-share/keepass/icons/nuvola/32x32/actions/filesave.png
-share/keepass/icons/nuvola/32x32/actions/filesaveas.png
-share/keepass/icons/nuvola/32x32/actions/find.png
-share/keepass/icons/nuvola/32x32/actions/help.png
-share/keepass/icons/nuvola/32x32/actions/identity.png
-share/keepass/icons/nuvola/32x32/actions/klipper_dock.png
-share/keepass/icons/nuvola/32x32/actions/reload.png
-share/keepass/icons/nuvola/32x32/actions/run.png
-share/keepass/icons/nuvola/32x32/apps/ktouch.png
-share/keepass/icons/nuvola/32x32/filesystems/desktop.png
-share/keepass/icons/nuvola/32x32/filesystems/folder.png
-share/keepass/icons/nuvola/32x32/filesystems/folder_home.png
-share/keepass/icons/nuvola/32x32/filesystems/network_local.png
-share/keepass/icons/nuvola/32x32/filesystems/trashcan_full.png
-@dirrm share/keepass/icons/nuvola/32x32/filesystems
-@dirrm share/keepass/icons/nuvola/32x32/apps
-@dirrm share/keepass/icons/nuvola/32x32/actions
-@dirrm share/keepass/icons/nuvola/32x32
-@dirrm share/keepass/icons/nuvola
-@dirrm share/keepass/icons
-@dirrm share/keepass/i18n
-@dirrm share/keepass
+bin/keepassx
+share/applications/keepassx.desktop
+%%DATADIR%%/doc/css/style.css
+%%DATADIR%%/doc/images/headerbackground.png
+%%DATADIR%%/doc/images/logo.png
+%%DATADIR%%/doc/index.html
+%%DATADIR%%/doc/keepassx.adp
+%%DATADIR%%/icons/alarmclock.png
+%%DATADIR%%/icons/appsettings.png
+%%DATADIR%%/icons/autotype.png
+%%DATADIR%%/icons/bookmark.png
+%%DATADIR%%/icons/bookmark_add.png
+%%DATADIR%%/icons/bookmark_del.png
+%%DATADIR%%/icons/bookmark_edit.png
+%%DATADIR%%/icons/bookmark_folder.png
+%%DATADIR%%/icons/bookmark_this.png
+%%DATADIR%%/icons/clientic.png
+%%DATADIR%%/icons/clock.png
+%%DATADIR%%/icons/cloneentry.png
+%%DATADIR%%/icons/copypwd.png
+%%DATADIR%%/icons/copyusername.png
+%%DATADIR%%/icons/dbsearch.png
+%%DATADIR%%/icons/dbsettings.png
+%%DATADIR%%/icons/delete.png
+%%DATADIR%%/icons/deleteentry.png
+%%DATADIR%%/icons/deletegroup.png
+%%DATADIR%%/icons/dice.png
+%%DATADIR%%/icons/document.png
+%%DATADIR%%/icons/down.png
+%%DATADIR%%/icons/editentry.png
+%%DATADIR%%/icons/editgroup.png
+%%DATADIR%%/icons/exit.png
+%%DATADIR%%/icons/expired.png
+%%DATADIR%%/icons/fileclose.png
+%%DATADIR%%/icons/filedelete.png
+%%DATADIR%%/icons/filenew.png
+%%DATADIR%%/icons/fileopen.png
+%%DATADIR%%/icons/filesave.png
+%%DATADIR%%/icons/filesaveas.png
+%%DATADIR%%/icons/filesavedisabled.png
+%%DATADIR%%/icons/generator.png
+%%DATADIR%%/icons/groupsearch.png
+%%DATADIR%%/icons/help.png
+%%DATADIR%%/icons/i18n.png
+%%DATADIR%%/icons/keepassx.png
+%%DATADIR%%/icons/keepassx_large.png
+%%DATADIR%%/icons/keepassx_locked.png
+%%DATADIR%%/icons/key.png
+%%DATADIR%%/icons/lock.png
+%%DATADIR%%/icons/manual.png
+%%DATADIR%%/icons/newentry.png
+%%DATADIR%%/icons/newgroup.png
+%%DATADIR%%/icons/ok.png
+%%DATADIR%%/icons/openurl.png
+%%DATADIR%%/icons/pwd_hide.png
+%%DATADIR%%/icons/pwd_show.png
+%%DATADIR%%/icons/restore.png
+%%DATADIR%%/icons/search.png
+%%DATADIR%%/icons/swap.png
+%%DATADIR%%/icons/templates.png
+%%DATADIR%%/icons/text_block.png
+%%DATADIR%%/icons/text_bold.png
+%%DATADIR%%/icons/text_center.png
+%%DATADIR%%/icons/text_italic.png
+%%DATADIR%%/icons/text_left.png
+%%DATADIR%%/icons/text_right.png
+%%DATADIR%%/icons/text_under.png
+%%DATADIR%%/icons/trashcan.png
+%%DATADIR%%/icons/up.png
+%%DATADIR%%/license.html
+share/pixmaps/keepassx.xpm
+@dirrmtry share/pixmaps
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%/i18n
+@dirrm %%DATADIR%%/doc/images
+@dirrm %%DATADIR%%/doc/css
+@dirrm %%DATADIR%%/doc
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
--- KeePassX-0.3.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805140047.m4E0l98t010303>