Bug 177561 - [update]: security/libkpass up to latest version
Summary: [update]: security/libkpass up to latest version
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-04-01 20:30 UTC by Veniamin
Modified: 2013-05-02 13:10 UTC (History)
0 users

See Also:


Attachments
file.diff (2.65 KB, patch)
2013-04-01 20:30 UTC, Veniamin
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Veniamin 2013-04-01 20:30:00 UTC
Update to version 5:

Version 5 - 20121107
** Packagers and users -- Changed ABI/SONAME/dependencies

Switched from OpenSSL to nettle due to licensing issues. Some functions changed
to void since they no longer can produce errors.
Changed libtool version to change SONAME due to interface changes.
Changed error message format, now using a function that goes through gettext
for localized text (translations welcome).
Change kpass_hash_pw and kpass_hash_pw_keyfile to not require a DB argument.

Version 4 - 20121013
Add support for keyfiles and pull in a bunch of autotools changes.
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-05-02 11:52:40 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-05-02 13:06:35 UTC
Author: pawel
Date: Thu May  2 12:06:21 2013
New Revision: 317096
URL: http://svnweb.freebsd.org/changeset/ports/317096

Log:
  - Update security/libkpass to version 5 [1]
  - Force libkpass to link with gettext, library uses symbols from
    libintl without linking to it - this creates problems for
    consumers (only for ckpass right now)
  - Update security/ckpass to version 0.2 [2]
  
  PR:		ports/177561 [1]
  PR:		ports/177562 [2]
  Submitted by:	Veniamin Gvozdikov <g.veniamin@googlemail.com> (maintainer)

Modified:
  head/security/ckpass/Makefile   (contents, props changed)
  head/security/ckpass/distinfo   (contents, props changed)
  head/security/ckpass/pkg-descr   (contents, props changed)
  head/security/libkpass/Makefile   (contents, props changed)
  head/security/libkpass/distinfo   (contents, props changed)
  head/security/libkpass/files/patch-src_kpass.c   (contents, props changed)
  head/security/libkpass/pkg-descr   (contents, props changed)

Modified: head/security/ckpass/Makefile
==============================================================================
--- head/security/ckpass/Makefile	Thu May  2 12:05:48 2013	(r317095)
+++ head/security/ckpass/Makefile	Thu May  2 12:06:21 2013	(r317096)
@@ -1,9 +1,8 @@
 # Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ckpass
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -12,11 +11,11 @@ COMMENT=	Ncurses based password database
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	kpass.0:${PORTSDIR}/security/libkpass
+LIB_DEPENDS=	kpass:${PORTSDIR}/security/libkpass
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/ckpass
 

Modified: head/security/ckpass/distinfo
==============================================================================
--- head/security/ckpass/distinfo	Thu May  2 12:05:48 2013	(r317095)
+++ head/security/ckpass/distinfo	Thu May  2 12:06:21 2013	(r317096)
@@ -1,2 +1,2 @@
-SHA256 (ckpass-0.1.tar.gz) = 2bf19b9214127d5772fc70777e2db147ed58c809fa003fe3cbd23c361336d12e
-SIZE (ckpass-0.1.tar.gz) = 89129
+SHA256 (ckpass-0.2.tar.gz) = 4027708b9518e7d320958f186f6b932001a3501c88773a88191fe5c976fe0686
+SIZE (ckpass-0.2.tar.gz) = 95921

Modified: head/security/ckpass/pkg-descr
==============================================================================
--- head/security/ckpass/pkg-descr	Thu May  2 12:05:48 2013	(r317095)
+++ head/security/ckpass/pkg-descr	Thu May  2 12:06:21 2013	(r317096)
@@ -1,4 +1,4 @@
 An ncurses based password database client that is compatible
 with KeePass 1.x format databases.
 
-WWW:	http://ckpass.sourceforge.net/
+WWW: http://ckpass.sourceforge.net/

Modified: head/security/libkpass/Makefile
==============================================================================
--- head/security/libkpass/Makefile	Thu May  2 12:05:48 2013	(r317095)
+++ head/security/libkpass/Makefile	Thu May  2 12:06:21 2013	(r317096)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	libkpass
-# Date created:		2011-09-12
-# Whom:			Gvozdikov Veniamin <g.veniamin@googlemail.com>
-#
+# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	libkpass
-PORTVERSION=	3
+PORTVERSION=	5
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
@@ -15,14 +11,19 @@ COMMENT=	Library for a reading/writing K
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	nettle:${PORTSDIR}/security/nettle
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USES=		gettext
 USE_LDCONFIG=	yes
-CFLAGS+=	-Dbswap_32=bswap32 -Dbswap_16=bswap16
+CFLAGS+=	-Dbswap_32=bswap32 -Dbswap_16=bswap16 \
+		-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 PLIST_FILES=	include/kpass.h \
 		lib/libkpass.so \
-		lib/libkpass.so.0 \
+		lib/libkpass.so.1 \
 		lib/libkpass.la \
 		lib/libkpass.a
 

Modified: head/security/libkpass/distinfo
==============================================================================
--- head/security/libkpass/distinfo	Thu May  2 12:05:48 2013	(r317095)
+++ head/security/libkpass/distinfo	Thu May  2 12:06:21 2013	(r317096)
@@ -1,2 +1,2 @@
-SHA256 (libkpass-3.tar.gz) = 390ebca29040ae1a015f4c067de16fe585693d2b4f95caca24529917bdb2dfec
-SIZE (libkpass-3.tar.gz) = 313707
+SHA256 (libkpass-5.tar.gz) = 72bea97b2a2f5a68bdf52b3a67fc38028fcd295b016169e05c631fec9596faca
+SIZE (libkpass-5.tar.gz) = 402843

Modified: head/security/libkpass/files/patch-src_kpass.c
==============================================================================
--- head/security/libkpass/files/patch-src_kpass.c	Thu May  2 12:05:48 2013	(r317095)
+++ head/security/libkpass/files/patch-src_kpass.c	Thu May  2 12:06:21 2013	(r317096)
@@ -1,11 +1,14 @@
---- src/kpass.c.orig	2011-09-12 11:39:12.476116248 +0400
-+++ src/kpass.c	2011-09-12 11:39:37.962483090 +0400
-@@ -19,7 +19,7 @@
- 
- #include <string.h>
- #include <openssl/evp.h>
--#include <byteswap.h>
+--- src/kpass.c.orig	2013-04-01 18:36:50.878364960 +0000
++++ src/kpass.c	2013-04-01 18:37:43.162887560 +0000
+@@ -23,7 +23,11 @@
+ #include <nettle/aes.h>
+ #include <nettle/sha.h>
+ #include <nettle/cbc.h>
++#ifdef __FreeBSD__
 +#include <sys/endian.h>
++#else
+ #include <byteswap.h>
++#endif
  #include <time.h>
  
- #include "kpass.h"
+ #include <libintl.h>

Modified: head/security/libkpass/pkg-descr
==============================================================================
--- head/security/libkpass/pkg-descr	Thu May  2 12:05:48 2013	(r317095)
+++ head/security/libkpass/pkg-descr	Thu May  2 12:06:21 2013	(r317096)
@@ -1,4 +1,4 @@
 Libkpass is a from-scratch C implementation of reading and writing
 KeePass 1.x format password databases.
 
-WWW:	http://libkpass.sourceforge.net/
+WWW: http://libkpass.sourceforge.net/
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2013-05-02 13:06:57 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!