From nobody@FreeBSD.org  Mon Apr  1 19:31:41 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id A94DFD11
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  1 Apr 2013 19:31:41 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 8246BB9E
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  1 Apr 2013 19:31:41 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r31JVfNq025189
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 1 Apr 2013 19:31:41 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r31JVfK6025182;
	Mon, 1 Apr 2013 19:31:41 GMT
	(envelope-from nobody)
Message-Id: <201304011931.r31JVfK6025182@red.freebsd.org>
Date: Mon, 1 Apr 2013 19:31:41 GMT
From: Veniamin Gvozdikov <g.veniamin@googlemail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [update]: security/ckpass up to latest version
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         177562
>Category:       ports
>Synopsis:       [update]: security/ckpass up to latest version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 01 19:40:02 UTC 2013
>Closed-Date:    Thu May 02 12:07:05 UTC 2013
>Last-Modified:  Thu May  2 12:10:00 UTC 2013
>Originator:     Veniamin Gvozdikov
>Release:        FreeBSD 9.1-RELEASE
>Organization:
>Environment:
FreeBSD ololo 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec  4 09:23:10 UTC 2012     root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Up to latest version 0.2 which depended by ports/177561 libkpass 5.
>How-To-Repeat:

>Fix:
diff -ruN ckpass.orig/Makefile ckpass/Makefile
--- ckpass.orig/Makefile	2013-04-01 23:28:39.859364113 +0400
+++ ckpass/Makefile	2013-04-01 23:12:31.450365350 +0400
@@ -3,7 +3,7 @@
 #
 
 PORTNAME=	ckpass
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	security
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -12,11 +12,11 @@
 
 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"
+CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lintl"
 
 PLIST_FILES=	bin/ckpass
 
diff -ruN ckpass.orig/distinfo ckpass/distinfo
--- ckpass.orig/distinfo	2013-04-01 23:28:39.859364113 +0400
+++ ckpass/distinfo	2013-04-01 22:29:24.290872073 +0400
@@ -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
diff -ruN ckpass.orig/pkg-descr ckpass/pkg-descr
--- ckpass.orig/pkg-descr	2013-04-01 23:28:39.859364113 +0400
+++ ckpass/pkg-descr	2013-04-01 23:01:03.512363845 +0400
@@ -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/

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Thu May 2 10:53:35 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177562 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Thu May 2 12:07:04 UTC 2013 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=177562 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/177562: commit references a PR
Date: Thu,  2 May 2013 12:06:36 +0000 (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"
 
>Unformatted:
