[125157] trunk/dports/net/yafc
ryandesign at macports.org
ryandesign at macports.org
Sun Sep 7 20:21:00 PDT 2014
Revision: 125157
https://trac.macports.org/changeset/125157
Author: ryandesign at macports.org
Date: 2014-09-07 20:20:59 -0700 (Sun, 07 Sep 2014)
Log Message:
-----------
yafc: update to 1.3.4; fixes build problems with texinfo 5 (#43252) and readline 6.3 (#44887)
Modified Paths:
--------------
trunk/dports/net/yafc/Portfile
Added Paths:
-----------
trunk/dports/net/yafc/files/patch-lib-collsyms.h.diff
Removed Paths:
-------------
trunk/dports/net/yafc/files/patch-lib__gssapi.c-krb-heimdal.diff
trunk/dports/net/yafc/files/patch-lib__gssapi.c-krb-mit.diff
trunk/dports/net/yafc/files/patch-src__input.c.diff
trunk/dports/net/yafc/files/patch-src__syshdr.h.diff
Modified: trunk/dports/net/yafc/Portfile
===================================================================
--- trunk/dports/net/yafc/Portfile 2014-09-08 03:10:09 UTC (rev 125156)
+++ trunk/dports/net/yafc/Portfile 2014-09-08 03:20:59 UTC (rev 125157)
@@ -4,8 +4,7 @@
PortSystem 1.0
name yafc
-version 1.1.1
-revision 4
+version 1.3.4
categories net
platforms darwin
maintainers nomaintainer
@@ -23,45 +22,35 @@
Kerberos support (version 4 and 5, heimdal, kth-krb or \
MIT), SSH2 support (sftp).
-homepage http://yafc.sourceforge.net/
-master_sites sourceforge:project/yafc/yafc/yafc-${version}
-use_bzip2 yes
+homepage http://www.yafc-ftp.com/
+master_sites ${homepage}upload/
+use_xz yes
-checksums md5 832d074183a36ee15b47553ed5962fce \
- sha1 d88132e1b389d74533f9eaa94f1a6d02787c03c8 \
- rmd160 1a1af7f618e9fada90b23390e64ec0ee4c8ed370
+checksums rmd160 9fc9fb929ec36af1c43431cf7aad78684703573b \
+ sha256 e628b13d2c5a621242ca7710753678bbf36787d4211dc578f56da8e1117790eb
-# yafc -requires- kerberos for compiling on OS X; by default, choose
-# the MIT version but allow for Heimdal variant. openssl is required
-# for the deprecated function "des_read_pw_string".
-
-patchfiles patch-src__input.c.diff \
- patch-src__syshdr.h.diff \
- patch-lib__gssapi.c-krb-mit.diff
-
depends_lib port:readline \
port:kerberos5 \
port:openssl
-# for _ossl_old_des_read_pw_string
-configure.ldflags -lcrypto
+patchfiles patch-lib-collsyms.h.diff
-configure.args --mandir=${prefix}/share/man \
- --infodir=${prefix}/share/info \
+configure.args --with-openssl=${prefix} \
--with-readline=${prefix} \
- --without-krb4 \
--with-krb5=${prefix}
+configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
+
variant heimdal description {Use Heimdal for Kerberos 5 network authentication, not MIT variety} {
# remove MIT style parameters
depends_lib-delete port:kerberos5
configure.args-delete --with-krb5=${prefix}
- patchfiles-delete patch-lib__gssapi.c-krb-mit.diff
# add Heimdal style parameters
depends_lib-append port:heimdal
configure.args-append --with-krb5=${prefix}/libexec/heimdal
- patchfiles-append patch-lib__gssapi.c-krb-heimdal.diff
}
+livecheck.type regex
+livecheck.url ${homepage}download
livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
Added: trunk/dports/net/yafc/files/patch-lib-collsyms.h.diff
===================================================================
--- trunk/dports/net/yafc/files/patch-lib-collsyms.h.diff (rev 0)
+++ trunk/dports/net/yafc/files/patch-lib-collsyms.h.diff 2014-09-08 03:20:59 UTC (rev 125157)
@@ -0,0 +1,12 @@
+https://github.com/sebastinas/yafc/issues/40
+--- ./lib/collsyms.h.orig 2013-07-23 07:26:19.000000000 -0500
++++ ./lib/collsyms.h 2014-09-07 22:07:08.000000000 -0500
+@@ -20,7 +20,7 @@
+ Foundation, 59 Temple Place, Suite 330, Boston, MA 02111 USA. */
+
+ #ifndef _COLLSYMS_H_
+-# define _COLLSYSMS_H_
++# define _COLLSYMS_H_
+
+ /* The upper-case letters, lower-case letters, and digits are omitted from
+ this table. The digits are not included in the table in the POSIX.2
Deleted: trunk/dports/net/yafc/files/patch-lib__gssapi.c-krb-heimdal.diff
===================================================================
--- trunk/dports/net/yafc/files/patch-lib__gssapi.c-krb-heimdal.diff 2014-09-08 03:10:09 UTC (rev 125156)
+++ trunk/dports/net/yafc/files/patch-lib__gssapi.c-krb-heimdal.diff 2014-09-08 03:20:59 UTC (rev 125157)
@@ -1,10 +0,0 @@
---- lib/gssapi.c.orig 2005-04-16 15:16:31.000000000 -0400
-+++ lib/gssapi.c 2005-04-16 15:16:35.000000000 -0400
-@@ -72,7 +72,6 @@
- static gss_OID_desc gss_c_nt_hostbased_service_oid_desc =
- {10, (void *)"\x2a\x86\x48\x86\xf7\x12" "\x01\x02\x01\x04"};
-
--static gss_OID GSS_C_NT_HOSTBASED_SERVICE = &gss_c_nt_hostbased_service_oid_desc;
-
-
-
Deleted: trunk/dports/net/yafc/files/patch-lib__gssapi.c-krb-mit.diff
===================================================================
--- trunk/dports/net/yafc/files/patch-lib__gssapi.c-krb-mit.diff 2014-09-08 03:10:09 UTC (rev 125156)
+++ trunk/dports/net/yafc/files/patch-lib__gssapi.c-krb-mit.diff 2014-09-08 03:20:59 UTC (rev 125157)
@@ -1,42 +0,0 @@
---- lib/gssapi.c 2002-12-05 17:12:36.000000000 -0500
-+++ lib/gssapi.c 2007-11-15 21:59:58.000000000 -0500
-@@ -34,29 +34,8 @@
- #include "syshdr.h"
- #include "ftp.h"
- #include "base64.h"
--
--#if defined(HAVE_GSSAPI_H)
--# include <gssapi.h>
-- /* if we have gssapi.h (not gssapi/gssapi.h) we assume we link
-- * against Heimdal, which needs krb5_err.h to define *
-- * KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN
-- */
--# include <krb5_err.h>
--#elif defined(HAVE_GSSAPI_GSSAPI_H)
--# include <gssapi/gssapi.h>
-- /* if we have gssapi/gssapi.h it might be safe to assume we have the
-- * other two that are part of MIT's krb5 as well, but this will work
-- * even if they one day do away with one of those two header files.
-- */
--# if defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
--# include <gssapi/gssapi_krb5.h>
--# endif
--#else
--# error "Need gssapi.h from either Heimdal or MIT krb5"
--#endif
--
--
--
-+#include <gssapi/gssapi.h>
-+#include <gssapi/gssapi_krb5.h>
-
- /*
- * The implementation must reserve static storage for a
-@@ -72,7 +51,6 @@
- static gss_OID_desc gss_c_nt_hostbased_service_oid_desc =
- {10, (void *)"\x2a\x86\x48\x86\xf7\x12" "\x01\x02\x01\x04"};
-
--static gss_OID GSS_C_NT_HOSTBASED_SERVICE = &gss_c_nt_hostbased_service_oid_desc;
-
-
-
Deleted: trunk/dports/net/yafc/files/patch-src__input.c.diff
===================================================================
--- trunk/dports/net/yafc/files/patch-src__input.c.diff 2014-09-08 03:10:09 UTC (rev 125156)
+++ trunk/dports/net/yafc/files/patch-src__input.c.diff 2014-09-08 03:20:59 UTC (rev 125157)
@@ -1,17 +0,0 @@
---- src/input.c.orig 2010-07-16 20:36:45.000000000 -0600
-+++ src/input.c 2010-07-16 20:49:03.000000000 -0600
-@@ -76,11 +76,12 @@
-
- # include <fcntl.h>
- # include <sys/ioctl.h>
--# include <termio.h>
-+# include <term.h>
-+# include <openssl/ui_compat.h>
-
- char *getpass_hook(const char *prompt)
- {
--#ifdef KERBEROS
-+#ifdef HAVE_KERBEROS
- char tmp[80];
- des_read_pw_string(tmp, sizeof(tmp), (char *)prompt,
- 0);
Deleted: trunk/dports/net/yafc/files/patch-src__syshdr.h.diff
===================================================================
--- trunk/dports/net/yafc/files/patch-src__syshdr.h.diff 2014-09-08 03:10:09 UTC (rev 125156)
+++ trunk/dports/net/yafc/files/patch-src__syshdr.h.diff 2014-09-08 03:20:59 UTC (rev 125157)
@@ -1,11 +0,0 @@
---- src/syshdr.h 2002-12-05 23:14:15.000000000 +0100
-+++ src/syshdr.h 2005-09-27 23:23:12.000000000 +0200
-@@ -15,7 +15,7 @@
- #define _syshdr_h_included
-
- #ifdef HAVE_CONFIG_H
--# include <config.h>
-+# include "config.h"
- #endif
-
- #ifdef HAVE_SYS_TYPES_H
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140907/46510b84/attachment-0001.html>
More information about the macports-changes
mailing list