<!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>[119200] trunk/dports/net/tftp-hpa</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/119200">119200</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-04-20 00:05:05 -0700 (Sun, 20 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>tftp-hpa: update to 5.2, closes #43256, #31740, maintainer timeout</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnettftphpaPortfile">trunk/dports/net/tftp-hpa/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/net/tftp-hpa/files/</li>
<li><a href="#trunkdportsnettftphpafilespatchtftpdrecvfromcdiff">trunk/dports/net/tftp-hpa/files/patch-tftpd-recvfrom.c.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnettftphpaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/tftp-hpa/Portfile (119199 => 119200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/tftp-hpa/Portfile 2014-04-20 04:03:10 UTC (rev 119199)
+++ trunk/dports/net/tftp-hpa/Portfile 2014-04-20 07:05:05 UTC (rev 119200)
</span><span class="lines">@@ -2,61 +2,65 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx">
</span><del>-name tftp-hpa
-version 0.48
-revision 2
-categories net
-maintainers markd
-description Enhanced port of the BSD TFTP server
-platforms darwin
-long_description tftp-hpa is an enhanced version of the BSD TFTP client \
- and server, possessing a number of bugfixes and enhancements \
- over the original. It has been made portable and will work on \
- pretty much any modern Unix variant.
</del><ins>+name tftp-hpa
+version 5.2
+categories net
+maintainers markd
+description Enhanced port of the BSD TFTP server
+platforms darwin
+long_description tftp-hpa is an enhanced version of the BSD TFTP client \
+ and server, possessing a number of bugfixes and enhancements \
+ over the original. It has been made portable and will work on \
+ pretty much any modern Unix variant.
+license BSD
+homepage http://www.kernel.org/pub/software/network/tftp/
+master_sites ${homepage}/tftp-hpa/
+use_bzip2 yes
</ins><span class="cx">
</span><del>-homepage http://www.kernel.org/pub/software/network/tftp/
-master_sites ${homepage}
-use_bzip2 yes
-checksums md5 f2e0a1ca0c49ae46ecad26a54df3e887
</del><ins>+checksums rmd160 dc3935af75f2919c55cac6c04b61488af425918c \
+ sha256 0a9f88d4c1c02687b4853b02ab5dd8779d4de4ffdb9b2e5c9332841304d1a269
</ins><span class="cx">
</span><del>-set tftp-root ${prefix}/var/${name}/
</del><ins>+patchfiles patch-tftpd-recvfrom.c.diff
</ins><span class="cx">
</span><ins>+depends_lib port:readline port:ncurses
+
+set tftp-root ${prefix}/var/${name}/
+
</ins><span class="cx"> variant enable_upload description {If invoked with the server variant, tftp uploads \
</span><del>- are enabled; without the server variant, this variant has no effect} {}
</del><ins>+ are enabled; without the server variant, this variant has no effect} {}
</ins><span class="cx">
</span><del>-startupitem.name tftpd
</del><ins>+startupitem.name tftpd
</ins><span class="cx">
</span><span class="cx"> variant server description {Install launchd scripts to run tftpd at system boot} {
</span><del>- startupitem.create yes
- if { ! [variant_isset enable_upload] } {
- startupitem.executable ${prefix}/sbin/tftpd -L -s ${tftp-root}
- } else {
- startupitem.executable ${prefix}/sbin/tftpd -L -c -s ${tftp-root}
- }
</del><ins>+ startupitem.create yes
+ if { ! [variant_isset enable_upload] } {
+ startupitem.executable ${prefix}/sbin/tftpd -L -s ${tftp-root}
+ } else {
+ startupitem.executable ${prefix}/sbin/tftpd -L -c -s ${tftp-root}
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-configure.args --mandir=\\\${prefix}/share/man
</del><ins>+configure.args --mandir=\\\${prefix}/share/man
</ins><span class="cx">
</span><del>-destroot.destdir prefix=${destroot}${prefix}
</del><ins>+destroot.destdir prefix=${destroot}${prefix}
</ins><span class="cx">
</span><del>-post-destroot {
- file rename ${destroot}${prefix}/sbin/in.tftpd \
- ${destroot}${prefix}/sbin/tftpd
</del><ins>+post-destroot {
+ file rename ${destroot}${prefix}/sbin/in.tftpd \
+ ${destroot}${prefix}/sbin/tftpd
</ins><span class="cx">
</span><del>- file delete ${destroot}${prefix}/share/man/man8/tftpd.8
- file rename ${destroot}${prefix}/share/man/man8/in.tftpd.8 \
- ${destroot}${prefix}/share/man/man8/tftpd.8
</del><ins>+ file delete ${destroot}${prefix}/share/man/man8/tftpd.8
+ file rename ${destroot}${prefix}/share/man/man8/in.tftpd.8 \
+ ${destroot}${prefix}/share/man/man8/tftpd.8
</ins><span class="cx">
</span><del>- reinplace "s|in.tftpd|tftpd|g" \
- ${destroot}${prefix}/share/man/man8/tftpd.8
</del><ins>+ reinplace "s|in.tftpd|tftpd|g" \
+ ${destroot}${prefix}/share/man/man8/tftpd.8
</ins><span class="cx">
</span><del>- xinstall -m 777 -d ${tftp-root}
- destroot.keepdirs ${tftp-root}
</del><ins>+ xinstall -m 777 -d ${tftp-root}
+ destroot.keepdirs ${tftp-root}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # tftp-ha setup instructions
</span><del>-post-install {
- ui_msg "\n
</del><ins>+notes "
</ins><span class="cx">
</span><span class="cx"> ***** Setup Instructions *****
</span><span class="cx">
</span><span class="lines">@@ -64,14 +68,14 @@
</span><span class="cx"> on all local addresses.
</span><span class="cx">
</span><span class="cx"> To run tftpd manually for download only access, use this command:
</span><del>- sudo tftpd -L -s <tftp-root-dir>
</del><ins>+ sudo tftpd -L -s <tftp-root-dir>
</ins><span class="cx">
</span><span class="cx"> To run tftpd manually and support tftp uploads, add \"-c\" to the command:
</span><del>- sudo tftpd -L -c -s <tftp-root-dir>
</del><ins>+ sudo tftpd -L -c -s <tftp-root-dir>
</ins><span class="cx">
</span><span class="cx"> You may run tftpd at system boot using the startupitem if you installed tftp-hpa
</span><span class="cx"> using the server variant. To load the startupitem using launchctl:
</span><del>- sudo launchctl load -w /Library/LaunchDaemons/org.macports.tftpd.plist
</del><ins>+ sudo launchctl load -w /Library/LaunchDaemons/org.macports.tftpd.plist
</ins><span class="cx">
</span><span class="cx"> NOTE: When loading tftp-hpa using launchctl, make sure to place the files you want to serve
</span><span class="cx"> in ${tftp-root}, because that is the location set in the StartupItem.
</span><span class="lines">@@ -82,6 +86,5 @@
</span><span class="cx"> file and replace the one installed by MacPorts in /Library/LaunchDaemons. You
</span><span class="cx"> may use /System/Library/LaunchDaemons/tftp.plist as a template.
</span><span class="cx">
</span><del>-\n"
-}
</del><ins>+"
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkdportsnettftphpafilespatchtftpdrecvfromcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/tftp-hpa/files/patch-tftpd-recvfrom.c.diff (0 => 119200)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/tftp-hpa/files/patch-tftpd-recvfrom.c.diff (rev 0)
+++ trunk/dports/net/tftp-hpa/files/patch-tftpd-recvfrom.c.diff 2014-04-20 07:05:05 UTC (rev 119200)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+--- tftpd/recvfrom.c.orig 2011-12-11 17:13:52.000000000 -0500
++++ tftpd/recvfrom.c 2014-04-06 11:47:12.000000000 -0400
+@@ -17,6 +17,12 @@
+ *
+ */
+
++#if defined(__APPLE__)
++#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1070
++#define __APPLE_USE_RFC_3542 1
++#endif
++#endif
++
+ #include "config.h" /* Must be included first! */
+ #include "common/tftpsubs.h"
+ #include "recvfrom.h"
+@@ -220,16 +226,18 @@
+ sizeof(struct in6_addr));
+ #endif
+
+-#ifdef HAVE_STRUCT_IN6_PKTINFO
+ if (cmptr->cmsg_level == IPPROTO_IPV6 &&
++#ifdef HAVE_STRUCT_IN6_PKTINFO
+ (cmptr->cmsg_type == IPV6_RECVPKTINFO ||
+- cmptr->cmsg_type == IPV6_PKTINFO)) {
++#else
++ (
++#endif
++ cmptr->cmsg_type == IPV6_PKTINFO)) {
+ memcpy(&pktinfo6, CMSG_DATA(cmptr),
+ sizeof(struct in6_pktinfo));
+ memcpy(&myaddr->s6.sin6_addr, &pktinfo6.ipi6_addr,
+ sizeof(struct in6_addr));
+ }
+-#endif
+ }
+ #endif
+ }
</ins></span></pre>
</div>
</div>
</body>
</html>