cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop kerberos support.

Browse Source
This commit is contained in:
ajacoutot 2014-04-21 14:09:56 +00:00
parent 074a5a5df7
commit f329168b5f
3 changed files with 3 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/yafc/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.28 2013/06/20 08:26:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.29 2014/04/21 14:09:56 ajacoutot Exp $
COMMENT= powerful console ftp client with many features
DISTNAME= yafc-1.1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yafc/}
REVISION= 3
REVISION= 4
HOMEPAGE= http://yafc.sourceforge.net/
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
@ -13,8 +13,7 @@ MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += asn1 c com_err crypto gssapi heimbase
WANTLIB += krb5 ncurses readline roken wind
WANTLIB += c ncurses readline
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/support

30
net/yafc/patches/patch-configure
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-configure,v 1.1 2013/06/17 19:30:53 ajacoutot Exp $
--- configure.orig Thu May 20 12:17:14 2004
+++ configure Mon Jun 17 10:51:57 2013
@@ -27108,7 +27108,7 @@ echo $ECHO_N "checking for Kerberos 5 in $p... $ECHO_C
saved_LIBS=$LIBS
saved_LDFLAGS=$LDFLAGS
- for xlibs in "-lk5crypto -lcom_err" "-lcrypto -lcom_err" "-lasn1 -ldes -lroken" "-lasn1 -ldes -lroken -lresolv" "-lasn1 -lcrypto -lcom_err -lroken" "-lasn1 -lcrypto -lcom_err -lroken -lcrypt -lresolv" "-lasn1 -ldes -lroken -ldb" "-lasn1 -ldes -lroken -ldb -lresolv" "-lasn1 -lcrypto -lcom_err -lroken -ldb" ; do
+ for xlibs in "-lk5crypto -lcom_err" "-lcrypto -lcom_err" "-lasn1 -ldes -lroken" "-lasn1 -ldes -lroken -lresolv" "-lasn1 -lcrypto -lcom_err -lroken" "-lasn1 -lcrypto -lcom_err -lroken -lcrypt -lresolv" "-lasn1 -ldes -lroken -ldb" "-lasn1 -ldes -lroken -ldb -lresolv" "-lasn1 -lcrypto -lcom_err -lroken -ldb" "`krb5-config --libs`" ; do
LIBS="-lkrb5 $xlibs $saved_LIBS"
if test -n "$p"; then
LDFLAGS="-L$p $saved_LDFLAGS"
@@ -27199,7 +27199,7 @@ echo $ECHO_N "checking for Kerberos 5 in $p... $ECHO_C
saved_LIBS=$LIBS
saved_LDFLAGS=$LDFLAGS
- for xlibs in "-lk5crypto -lcom_err" "-lcrypto -lcom_err" "-lasn1 -ldes -lroken" "-lasn1 -ldes -lroken -lresolv" "-lasn1 -lcrypto -lcom_err -lroken" "-lasn1 -lcrypto -lcom_err -lroken -lcrypt -lresolv" "-lasn1 -ldes -lroken -ldb" "-lasn1 -ldes -lroken -ldb -lresolv" "-lasn1 -lcrypto -lcom_err -lroken -ldb" ; do
+ for xlibs in "-lk5crypto -lcom_err" "-lcrypto -lcom_err" "-lasn1 -ldes -lroken" "-lasn1 -ldes -lroken -lresolv" "-lasn1 -lcrypto -lcom_err -lroken" "-lasn1 -lcrypto -lcom_err -lroken -lcrypt -lresolv" "-lasn1 -ldes -lroken -ldb" "-lasn1 -ldes -lroken -ldb -lresolv" "-lasn1 -lcrypto -lcom_err -lroken -ldb" "`krb5-config --libs`" ; do
LIBS="-lkrb5 $xlibs $saved_LIBS"
if test -n "$p"; then
LDFLAGS="-L$p $saved_LDFLAGS"
@@ -27487,7 +27487,7 @@ echo $ECHO_N "checking for GSSAPI library... $ECHO_C"
saved_LIBS=$LIBS
saved_LDFLAGS=$LDFLAGS
- for lib in "-lgssapi" "-lgssapi_krb5" ; do
+ for lib in "-lgssapi" "-lgssapi_krb5" "`krb5-config --libs gssapi`"; do
LDFLAGS="$yafc_found_krb5_lib_flags $saved_LDFLAGS"
LIBS="$lib $yafc_found_krb5_lib_libs $saved_LIBS"

11
net/yafc/patches/patch-lib_gssapi_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-lib_gssapi_c,v 1.1 2013/06/17 19:30:53 ajacoutot Exp $
--- lib/gssapi.c.orig Mon Jun 17 10:48:59 2013
+++ lib/gssapi.c Mon Jun 17 10:49:06 2013
@@ -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;