[PATCH] Bump keepassxc to 2.3.1 and enable browser integration

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] Bump keepassxc to 2.3.1 and enable browser integration

William Orr-2
Hey,

I've bumped keepassxc to 2.3.1, and also enabled their new native
messaging browser integration. The old http-based browser integration
was completely removed in 2.3.0.

I've put this behind a flavor since this is an optional feature, and
adds an additional dependency.

Also, please CC me since I'm not on this list.

Thanks!

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/keepassxc/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 5 Mar 2018 09:33:46 -0000 1.11
+++ Makefile 14 Mar 2018 03:41:31 -0000
@@ -2,7 +2,7 @@

 COMMENT = management tool for password and sensitive data

-V = 2.3.0
+V = 2.3.1
 DISTNAME = keepassxc-${V}

 CATEGORIES = security
@@ -39,7 +39,7 @@ CONFIGURE_ARGS= -DCMAKE_INSTALL_MANDIR="

 TEST_IS_INTERACTIVE = X11

-FLAVORS = yubikey
+FLAVORS = browser yubikey
 FLAVOR ?=

 .if ${FLAVOR:Myubikey}
@@ -49,8 +49,15 @@ CONFIGURE_ARGS += -DWITH_XC_YUBIKEY=ON
 WANTLIB += yubikey ykpers-1
 .endif

+.if ${FLAVOR:Mbrowser}
+LIB_DEPENDS += security/libsodium
+CONFIGURE_ARGS += -DWITH_XC_BROWSER=ON
+WANTLIB += sodium
+.endif
+
 post-patch:
  cd ${WRKSRC}/src/; sed -i -e 's/Q_OS_LINUX/Q_OS_UNIX/g' \
+ browser/HostInstaller.cpp \
  core/ScreenLockListenerPrivate.cpp \
  gui/MainWindow.cpp \
  main.cpp
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/keepassxc/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 5 Mar 2018 09:33:46 -0000 1.7
+++ distinfo 14 Mar 2018 03:41:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (keepassxc-2.3.0-src.tar.xz) =
7FhY2uqgU4amFLeZ1drwHGNCBYRGR+L50lqvZV0q2+w=
-SIZE (keepassxc-2.3.0-src.tar.xz) = 3803400
+SHA256 (keepassxc-2.3.1-src.tar.xz) =
zn2CUdTVs19gL/UhdkkQlk2m2KZzlzmYVaboxf9dub0=
+SIZE (keepassxc-2.3.1-src.tar.xz) = 4085284
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/keepassxc/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 5 Mar 2018 09:33:46 -0000 1.7
+++ pkg/PLIST 14 Mar 2018 03:41:31 -0000
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.7 2018/03/05 09:33:46 rsadowski Exp $
 @bin bin/keepassxc
 @bin bin/keepassxc-cli
+@bin bin/keepassxc-proxy
 lib/keepassxc/
 lib/keepassxc/libkeepassx-autotype-xcb.so
 @man man/man1/keepassxc-cli.1

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] Bump keepassxc to 2.3.1 and enable browser integration

Giovanni Bechis-7
On 03/14/18 04:46, William Orr wrote:
> Hey,
>
> I've bumped keepassxc to 2.3.1, and also enabled their new native
> messaging browser integration. The old http-based browser integration
> was completely removed in 2.3.0.
>
the old http-based integration is deprecated but still works, the new browser integration works only on Chromium for me, on Firefox it does not seems to connect.

> I've put this behind a flavor since this is an optional feature, and
> adds an additional dependency.
>
I added both browser integration to the new browser flavor.
 Cheers
  Giovanni

Index: Makefile
===================================================================
RCS file: /var/cvs/ports/security/keepassxc/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile 5 Mar 2018 09:33:46 -0000 1.11
+++ Makefile 14 Mar 2018 07:47:52 -0000
@@ -2,7 +2,7 @@
 
 COMMENT = management tool for password and sensitive data
 
-V = 2.3.0
+V = 2.3.1
 DISTNAME = keepassxc-${V}
 
 CATEGORIES = security
@@ -39,7 +39,7 @@ CONFIGURE_ARGS= -DCMAKE_INSTALL_MANDIR="
 
 TEST_IS_INTERACTIVE = X11
 
-FLAVORS = yubikey
+FLAVORS = browser yubikey
 FLAVOR ?=
 
 .if ${FLAVOR:Myubikey}
@@ -49,8 +49,18 @@ CONFIGURE_ARGS += -DWITH_XC_YUBIKEY=ON
 WANTLIB += yubikey ykpers-1
 .endif
 
+.if ${FLAVOR:Mbrowser}
+LIB_DEPENDS += net/curl \
+ security/libsodium
+CONFIGURE_ARGS += -DWITH_XC_BROWSER=ON \
+ -DWITH_XC_HTTP=ON \
+ -DWITH_XC_NETWORKING=ON
+WANTLIB += curl sodium z
+.endif
+
 post-patch:
  cd ${WRKSRC}/src/; sed -i -e 's/Q_OS_LINUX/Q_OS_UNIX/g' \
+ browser/HostInstaller.cpp \
  core/ScreenLockListenerPrivate.cpp \
  gui/MainWindow.cpp \
  main.cpp
Index: distinfo
===================================================================
RCS file: /var/cvs/ports/security/keepassxc/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 5 Mar 2018 09:33:46 -0000 1.7
+++ distinfo 14 Mar 2018 07:09:28 -0000
@@ -1,2 +1,2 @@
-SHA256 (keepassxc-2.3.0-src.tar.xz) = 7FhY2uqgU4amFLeZ1drwHGNCBYRGR+L50lqvZV0q2+w=
-SIZE (keepassxc-2.3.0-src.tar.xz) = 3803400
+SHA256 (keepassxc-2.3.1-src.tar.xz) = zn2CUdTVs19gL/UhdkkQlk2m2KZzlzmYVaboxf9dub0=
+SIZE (keepassxc-2.3.1-src.tar.xz) = 4085284
Index: pkg/PLIST
===================================================================
RCS file: /var/cvs/ports/security/keepassxc/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 5 Mar 2018 09:33:46 -0000 1.7
+++ pkg/PLIST 14 Mar 2018 07:08:51 -0000
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.7 2018/03/05 09:33:46 rsadowski Exp $
 @bin bin/keepassxc
 @bin bin/keepassxc-cli
+@bin bin/keepassxc-proxy
 lib/keepassxc/
 lib/keepassxc/libkeepassx-autotype-xcb.so
 @man man/man1/keepassxc-cli.1