diff options
| author | Veniamin Gvozdikov <vg@FreeBSD.org> | 2016-05-11 11:53:39 +0000 |
|---|---|---|
| committer | Veniamin Gvozdikov <vg@FreeBSD.org> | 2016-05-11 11:53:39 +0000 |
| commit | 84fc3494a8f8120193e051c6260f043f2fca2c63 (patch) | |
| tree | fa2c08609df3cbc05ce05b502b8c9921e9291a44 /net-mgmt | |
| parent | b63955e458193a2591e9aa09c4beefa827ef52a0 (diff) | |
Notes
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/sx/Makefile | 20 | ||||
| -rw-r--r-- | net-mgmt/sx/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/sx/files/patch-libsxclient_src_openssl.c | 11 | ||||
| -rw-r--r-- | net-mgmt/sx/pkg-plist | 12 |
4 files changed, 23 insertions, 24 deletions
diff --git a/net-mgmt/sx/Makefile b/net-mgmt/sx/Makefile index 2eaf0ef6b6f0..f0a1bcb5c147 100644 --- a/net-mgmt/sx/Makefile +++ b/net-mgmt/sx/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sx -PORTVERSION= 1.2 -PORTREVISION= 1 +PORTVERSION= 2.0 CATEGORIES= net-mgmt MASTER_SITES= http://cdn.skylable.com/source/ @@ -15,15 +14,19 @@ LICENSE= GPLv2 BROKEN_powerpc64= Does not build LIB_DEPENDS= libcurl.so:ftp/curl \ - libfcgi.so:www/fcgi + libfcgi.so:www/fcgi \ + libyajl.so:devel/yajl \ + libltdl.so:devel/libltdl \ + libsqlite3.so:databases/sqlite3 HAS_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip -USES= gmake libtool pkgconfig +USES= fuse gmake libtool pkgconfig CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" --prefix="${STAGE}${PREFIX}" \ - --sysconfdir="${ETCDIR}" --mandir="${MANPREFIX}/man" + --sysconfdir="${ETCDIR}" --mandir="${MANPREFIX}/man" \ + --with-system-libs OPTIONS_DEFINE= SXSERVER DOCS SXSERVER_DESC= Enable sxhttpd server @@ -41,4 +44,11 @@ CONFIGURE_ARGS+=--disable-sxhttpd --disable-server PLIST_SUB+= SXSERVER="@comment " .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1002000 +PLIST_FILES+= lib/sxclient/libsxf_aes256-20.so \ + lib/sxclient/libsxf_aes256.so \ + lib/sxclient/libsxf_aes256_dummy-00.so \ + lib/sxclient/libsxf_aes256_dummy.so +.endif + .include <bsd.port.mk> diff --git a/net-mgmt/sx/distinfo b/net-mgmt/sx/distinfo index 880489d06606..3c8410b3e6d4 100644 --- a/net-mgmt/sx/distinfo +++ b/net-mgmt/sx/distinfo @@ -1,2 +1,2 @@ -SHA256 (sx-1.2.tar.gz) = 98c37a84e1653364226aff47e63b715500636c0af3b20f4e74eefe3397ee2d63 -SIZE (sx-1.2.tar.gz) = 7218016 +SHA256 (sx-2.0.tar.gz) = 649ab7ccc1e2fc94aa79169a55bc99bc2b72da50dad82419d7f3c1ee4ef884aa +SIZE (sx-2.0.tar.gz) = 7641676 diff --git a/net-mgmt/sx/files/patch-libsxclient_src_openssl.c b/net-mgmt/sx/files/patch-libsxclient_src_openssl.c deleted file mode 100644 index f272bd88350e..000000000000 --- a/net-mgmt/sx/files/patch-libsxclient_src_openssl.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libsxclient/src/openssl.c.orig 2015-07-24 14:26:43 UTC -+++ libsxclient/src/openssl.c -@@ -98,6 +98,8 @@ int sxi_sslctxfun(sxc_client_t *sx, curl - return -1; - } - SSL_CTX *ctx = (SSL_CTX*)info->internals; -+ if (!ctx) -+ return -EAGAIN; - SSL_CTX_set_cert_verify_callback(ctx, ssl_verify_hostname, ev); - return 0; - } diff --git a/net-mgmt/sx/pkg-plist b/net-mgmt/sx/pkg-plist index b50b1c90cc0a..334185100aaf 100644 --- a/net-mgmt/sx/pkg-plist +++ b/net-mgmt/sx/pkg-plist @@ -1,6 +1,7 @@ bin/sxacl bin/sxcat bin/sxcp +bin/sxfs bin/sxinit bin/sxls bin/sxmv @@ -15,15 +16,13 @@ bin/sxvol %%SXSERVER%%%%ETCDIR%%/sxserver/sxhttpd.conf.default include/sx.h lib/libsxclient.so -lib/libsxclient.so.2 -lib/libsxclient.so.2.0.0 -lib/sxclient/libsxf_aes256-15.so -lib/sxclient/libsxf_aes256.so -lib/sxclient/libsxf_attribs-12.so +lib/libsxclient.so.3 +lib/libsxclient.so.3.0.0 +lib/sxclient/libsxf_attribs-13.so lib/sxclient/libsxf_attribs.so lib/sxclient/libsxf_undelete-12.so lib/sxclient/libsxf_undelete.so -lib/sxclient/libsxf_zcomp-11.so +lib/sxclient/libsxf_zcomp-12.so lib/sxclient/libsxf_zcomp.so %%SXSERVER%%sbin/sx.fcgi %%SXSERVER%%sbin/sxadm @@ -51,6 +50,7 @@ man/man1/sxacl-whoami.1.gz man/man1/sxacl.1.gz man/man1/sxcat.1.gz man/man1/sxcp.1.gz +man/man1/sxfs.1.gz man/man1/sxinit.1.gz man/man1/sxls.1.gz man/man1/sxmv.1.gz |