From b174f0bb0b1e32805dc0e01d5e637a195e1664d6 Mon Sep 17 00:00:00 2001
From: anders <anders@FreeBSD.org>
Date: Sun, 11 Feb 2007 23:12:02 +0000
Subject: Update to 0.3.5.

PR:		109014
Submitted by:	"Marcelo Araujo" <araujo@bsdmail.org> (partly)
---
 security/pwman/Makefile                       |  5 ++--
 security/pwman/distinfo                       |  6 ++--
 security/pwman/files/patch-src-convert_pwdb.c | 40 +++++++++++++++++++++++++++
 security/pwman/files/patch-src-pwlist.c       | 40 ---------------------------
 4 files changed, 45 insertions(+), 46 deletions(-)
 create mode 100644 security/pwman/files/patch-src-convert_pwdb.c
 delete mode 100644 security/pwman/files/patch-src-pwlist.c

(limited to 'security')

diff --git a/security/pwman/Makefile b/security/pwman/Makefile
index a17a34367dbb..2dbf715df21d 100644
--- a/security/pwman/Makefile
+++ b/security/pwman/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	pwman
-PORTVERSION=	0.3.2
-PORTREVISION=	4
+PORTVERSION=	0.3.5
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,7 +24,7 @@ MAN1=	pwman.1
 DOCS=	AUTHORS COPYING ChangeLog README TODO
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/gpg|${LOCALBASE}/bin/gpg|g' ${WRKSRC}/src/misc.c
+	@${REINPLACE_CMD} -e 's|/usr/bin/gpg|${LOCALBASE}/bin/gpg|g' ${WRKSRC}/src/options.c
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/security/pwman/distinfo b/security/pwman/distinfo
index e31c95da5c81..cbe19a20f617 100644
--- a/security/pwman/distinfo
+++ b/security/pwman/distinfo
@@ -1,3 +1,3 @@
-MD5 (pwman-0.3.2.tar.gz) = 1e063e24a55134da9ed8ddc3965188a7
-SHA256 (pwman-0.3.2.tar.gz) = ac461450c987724e495ddce563264ce7935e3b3d41ccc5adf424756577b418d7
-SIZE (pwman-0.3.2.tar.gz) = 60717
+MD5 (pwman-0.3.5.tar.gz) = 82739d4104617573fd419df20e4f78bc
+SHA256 (pwman-0.3.5.tar.gz) = 90bb7946ec1794e434d038ee9c7e544480cc719c3659836f8ac71a884abfba1e
+SIZE (pwman-0.3.5.tar.gz) = 95678
diff --git a/security/pwman/files/patch-src-convert_pwdb.c b/security/pwman/files/patch-src-convert_pwdb.c
new file mode 100644
index 000000000000..abff8b049211
--- /dev/null
+++ b/security/pwman/files/patch-src-convert_pwdb.c
@@ -0,0 +1,40 @@
+--- src/convert_pwdb.c.orig	Tue Feb 14 12:43:20 2006
++++ src/convert_pwdb.c	Mon Feb 12 06:53:53 2007
+@@ -186,13 +186,32 @@
+ write_password_node(xmlNodePtr root, Pw *pw)
+ {
+ 	xmlNodePtr node;
++	xmlChar *escaped;
++
++	// Take the inbound strings. Treat as an xmlChar, and escape
++	// Need to free the result of escape every time
+ 
+ 	node = xmlNewChild(root, NULL, (xmlChar*)"PwItem", NULL);
+-	xmlNewChild(node, NULL, (xmlChar*)"name", (xmlChar*)pw->name);
+-	xmlNewChild(node, NULL, (xmlChar*)"host", (xmlChar*)pw->host);
+-	xmlNewChild(node, NULL, (xmlChar*)"user", (xmlChar*)pw->user);
+-	xmlNewChild(node, NULL, (xmlChar*)"passwd", (xmlChar*)pw->passwd);
+-	xmlNewChild(node, NULL, (xmlChar*)"launch", (xmlChar*)pw->launch);
++
++	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->name);
++	xmlNewChild(node, NULL, (xmlChar*)"name", escaped);
++	xmlFree(escaped);
++
++	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->host);
++	xmlNewChild(node, NULL, (xmlChar*)"host", escaped);
++	xmlFree(escaped);
++
++	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->user);
++	xmlNewChild(node, NULL, (xmlChar*)"user", escaped);
++	xmlFree(escaped);
++
++	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->passwd);
++	xmlNewChild(node, NULL, (xmlChar*)"passwd", escaped);
++	xmlFree(escaped);
++	
++	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->launch);
++	xmlNewChild(node, NULL, (xmlChar*)"launch", escaped);
++	xmlFree(escaped);
+ }
+ 
+ int
diff --git a/security/pwman/files/patch-src-pwlist.c b/security/pwman/files/patch-src-pwlist.c
deleted file mode 100644
index 9ef8a0d6ebea..000000000000
--- a/security/pwman/files/patch-src-pwlist.c
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/pwlist.c.old	2005-03-09 16:07:07.000000000 +0000
-+++ src/pwlist.c	2005-03-09 16:06:37.000000000 +0000
-@@ -272,13 +272,32 @@
- write_password_node(xmlNodePtr root, Pw* pw)
- {
- 	xmlNodePtr node;
-+	xmlChar *escaped;
-+
-+	// Take the inbound strings. Treat as an xmlChar, and escape
-+	// Need to free the result of escape every time
- 
- 	node = xmlNewChild(root, NULL, (xmlChar*)"PwItem", NULL);
--	xmlNewChild(node, NULL, (xmlChar*)"name", (xmlChar*)pw->name);
--	xmlNewChild(node, NULL, (xmlChar*)"host", (xmlChar*)pw->host);
--	xmlNewChild(node, NULL, (xmlChar*)"user", (xmlChar*)pw->user);
--	xmlNewChild(node, NULL, (xmlChar*)"passwd", (xmlChar*)pw->passwd);
--	xmlNewChild(node, NULL, (xmlChar*)"launch", (xmlChar*)pw->launch);
-+
-+	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->name);
-+	xmlNewChild(node, NULL, (xmlChar*)"name", escaped);
-+	xmlFree(escaped);
-+
-+	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->host);
-+	xmlNewChild(node, NULL, (xmlChar*)"host", escaped);
-+	xmlFree(escaped);
-+
-+	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->user);
-+	xmlNewChild(node, NULL, (xmlChar*)"user", escaped);
-+	xmlFree(escaped);
-+
-+	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->passwd);
-+	xmlNewChild(node, NULL, (xmlChar*)"passwd", escaped);
-+	xmlFree(escaped);
-+	
-+	escaped = xmlEncodeSpecialChars(root, (xmlChar*)pw->launch);
-+	xmlNewChild(node, NULL, (xmlChar*)"launch", escaped);
-+	xmlFree(escaped);
- }
- 
- int
-- 
cgit