<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138163] trunk/dports/security/pass</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138163">138163</a></dd>
<dt>Author</dt> <dd>ionic@macports.org</dd>
<dt>Date</dt> <dd>2015-06-30 13:39:36 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>pass: update to 1.6.5. Patches provided by maintainer. Change gnupg2 dependency to a bin-style dependency. Fixes: #47050, #47051.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssecuritypassPortfile">trunk/dports/security/pass/Portfile</a></li>
<li><a href="#trunkdportssecuritypassfilespatchgetoptpathdiff">trunk/dports/security/pass/files/patch-getopt-path.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssecuritypassfilespatchuse_apple_mktempdiff">trunk/dports/security/pass/files/patch-use_apple_mktemp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssecuritypassPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/pass/Portfile (138162 => 138163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/pass/Portfile 2015-06-30 19:28:15 UTC (rev 138162)
+++ trunk/dports/security/pass/Portfile 2015-06-30 20:39:36 UTC (rev 138163)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><span class="cx"> name pass
</span><del>-version 1.6.3
</del><ins>+version 1.6.5
</ins><span class="cx"> maintainers macports.swinbank.org:john openmaintainer
</span><span class="cx"> categories security
</span><span class="cx"> description ${name} is the standard unix password manager
</span><span class="lines">@@ -15,21 +15,20 @@
</span><span class="cx"> license GPL-2+
</span><span class="cx">
</span><span class="cx"> depends_run port:git \
</span><del>- port:gnupg2 \
</del><span class="cx"> port:pwgen \
</span><span class="cx"> port:getopt \
</span><del>- port:tree
</del><ins>+ port:tree \
+ bin:gpg2:gnupg2
</ins><span class="cx">
</span><span class="cx"> master_sites http://git.zx2c4.com/password-store/snapshot/
</span><span class="cx"> distname password-store-${version}
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 1a1311b67942a0a490af5c20376483a4a5240101 \
- sha256 d419d40aa165c1f893e994dd706733374a9db8cf5314124702a061e70e0340f7
</del><ins>+checksums rmd160 76e50eaef02163dc23c155ade34b88e965ac6f30 \
+ sha256 337a39767e6a8e69b2bcc549f27ff3915efacea57e5334c6068fcb72331d7315
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-Makefile.diff \
</span><del>- patch-getopt-path.diff \
- patch-use_apple_mktemp.diff
</del><ins>+ patch-getopt-path.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/src/platform/darwin.sh
</span></span></pre></div>
<a id="trunkdportssecuritypassfilespatchgetoptpathdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/security/pass/files/patch-getopt-path.diff (138162 => 138163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/pass/files/patch-getopt-path.diff 2015-06-30 19:28:15 UTC (rev 138162)
+++ trunk/dports/security/pass/files/patch-getopt-path.diff 2015-06-30 20:39:36 UTC (rev 138163)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>---- src/platform/darwin.sh.orig 2014-04-12 20:06:30.000000000 +0200
-+++ src/platform/darwin.sh 2014-04-13 22:19:05.000000000 +0200
</del><ins>+--- src/platform/darwin.sh.orig 2015-03-05 19:07:50.000000000 -0500
++++ src/platform/darwin.sh 2015-03-05 19:08:37.000000000 -0500
</ins><span class="cx"> @@ -31,5 +31,5 @@
</span><del>- mount -t hfs -o noatime -o nobrowse "$ramdisk_dev" "$tmp_dir" || exit 1
</del><ins>+ mount -t hfs -o noatime -o nobrowse "$DARWIN_RAMDISK_DEV" "$SECURE_TMPDIR" || die "Error: could not mount filesystem on ramdisk."
</ins><span class="cx"> }
</span><span class="cx">
</span><del>--GETOPT="$(brew --prefix gnu-getopt 2>/dev/null || echo /usr/local)/bin/getopt"
</del><ins>+-GETOPT="$(brew --prefix gnu-getopt 2>/dev/null || { which port &>/dev/null && echo /opt/local; } || echo /usr/local)/bin/getopt"
</ins><span class="cx"> +GETOPT=@@PREFIX@@/bin/getopt
</span><span class="cx"> SHRED="srm -f -z"
</span></span></pre></div>
<a id="trunkdportssecuritypassfilespatchuse_apple_mktempdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/security/pass/files/patch-use_apple_mktemp.diff (138162 => 138163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/security/pass/files/patch-use_apple_mktemp.diff 2015-06-30 19:28:15 UTC (rev 138162)
+++ trunk/dports/security/pass/files/patch-use_apple_mktemp.diff 2015-06-30 20:39:36 UTC (rev 138163)
</span><span class="lines">@@ -1,47 +0,0 @@
</span><del>-diff -r -u src.orig/password-store.sh src/password-store.sh
---- src.orig/password-store.sh 2014-07-06 18:51:05.000000000 +0200
-+++ src/password-store.sh 2014-07-06 18:51:45.000000000 +0200
-@@ -168,7 +168,7 @@
- [[ $1 == "nowarn" ]] && warn=0
- local template="$PROGRAM.XXXXXXXXXXXXX"
- if [[ -d /dev/shm && -w /dev/shm && -x /dev/shm ]]; then
-- SECURE_TMPDIR="$(mktemp -d "/dev/shm/$template")"
-+ SECURE_TMPDIR="$(${MKTEMP} -d "/dev/shm/$template")"
- remove_tmpfile() {
- rm -rf "$SECURE_TMPDIR"
- }
-@@ -182,7 +182,7 @@
- Are you sure you would like to continue?
- _EOF
- )"
-- SECURE_TMPDIR="$(mktemp -d "${TMPDIR:-/tmp}/$template")"
-+ SECURE_TMPDIR="$(${MKTEMP} -d "${TMPDIR:-/tmp}/$template")"
- shred_tmpfile() {
- find "$SECURE_TMPDIR" -type f -exec $SHRED {} +
- rm -rf "$SECURE_TMPDIR"
-@@ -421,7 +421,7 @@
- local passfile="$PREFIX/$path.gpg"
-
- tmpdir #Defines $SECURE_TMPDIR
-- local tmp_file="$(mktemp -u "$SECURE_TMPDIR/XXXXX")-${path//\//-}.txt"
-+ local tmp_file="$(${MKTEMP} -u "$SECURE_TMPDIR/XXXXX")-${path//\//-}.txt"
-
-
- local action="Add"
-diff -r -u src.orig/platform/darwin.sh src/platform/darwin.sh
---- src.orig/platform/darwin.sh 2014-07-06 18:53:23.000000000 +0200
-+++ src/platform/darwin.sh 2014-07-06 18:53:02.000000000 +0200
-@@ -24,7 +24,7 @@
- rm -rf "$SECURE_TMPDIR"
- }
- trap unmount_tmpdir INT TERM EXIT
-- SECURE_TMPDIR="$(mktemp -d "${TMPDIR:-/tmp}/$PROGRAM.XXXXXXXXXXXXX")"
-+ SECURE_TMPDIR="$(${MKTEMP} -d "${TMPDIR:-/tmp}/$PROGRAM.XXXXXXXXXXXXX")"
- DARWIN_RAMDISK_DEV="$(hdid -drivekey system-image=yes -nomount 'ram://32768' | cut -d ' ' -f 1)" # 32768 sectors = 16 mb
- [[ -z $DARWIN_RAMDISK_DEV ]] && die "Error: could not create ramdisk."
- newfs_hfs -M 700 "$DARWIN_RAMDISK_DEV" &>/dev/null || die "Error: could not create filesystem on ramdisk."
-@@ -33,3 +33,4 @@
-
- GETOPT=@@PREFIX@@/bin/getopt
- SHRED="srm -f -z"
-+MKTEMP="/usr/bin/mktemp"
</del></span></pre>
</div>
</div>
</body>
</html>