Index: head/net-mgmt/sx/Makefile =================================================================== --- head/net-mgmt/sx/Makefile (revision 414983) +++ head/net-mgmt/sx/Makefile (revision 414984) @@ -1,44 +1,54 @@ # Created by: Veniamin Gvozdikov # $FreeBSD$ PORTNAME= sx -PORTVERSION= 1.2 -PORTREVISION= 1 +PORTVERSION= 2.0 CATEGORIES= net-mgmt MASTER_SITES= http://cdn.skylable.com/source/ MAINTAINER= vg@FreeBSD.org COMMENT= Skylable Sx is a reliable, fully distributed cluster solution 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 OPTIONS_DEFAULT=SXSERVER .include .if ${PORT_OPTIONS:MSXSERVER} CONFIGURE_ARGS+=--localstatedir="${STAGE}${PREFIX}/sxserver" PLIST_SUB+= SXSERVER="" USE_RC_SUBR= sxserver SUB_FILES= pkg-message .else 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 Index: head/net-mgmt/sx/distinfo =================================================================== --- head/net-mgmt/sx/distinfo (revision 414983) +++ head/net-mgmt/sx/distinfo (revision 414984) @@ -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 Index: head/net-mgmt/sx/files/patch-libsxclient_src_openssl.c =================================================================== --- head/net-mgmt/sx/files/patch-libsxclient_src_openssl.c (revision 414983) +++ head/net-mgmt/sx/files/patch-libsxclient_src_openssl.c (nonexistent) @@ -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; - } Property changes on: head/net-mgmt/sx/files/patch-libsxclient_src_openssl.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-mgmt/sx/pkg-plist =================================================================== --- head/net-mgmt/sx/pkg-plist (revision 414983) +++ head/net-mgmt/sx/pkg-plist (revision 414984) @@ -1,81 +1,81 @@ bin/sxacl bin/sxcat bin/sxcp +bin/sxfs bin/sxinit bin/sxls bin/sxmv bin/sxreport-client bin/sxrev bin/sxrm %%SXSERVER%%bin/sxsim bin/sxvol %%SXSERVER%%%%ETCDIR%%/sxserver/errors/414.json %%SXSERVER%%%%ETCDIR%%/sxserver/errors/50x.json %%SXSERVER%%%%ETCDIR%%/sxserver/fastcgi_params %%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 %%SXSERVER%%sbin/sxdump %%SXSERVER%%sbin/sxhttpd %%SXSERVER%%sbin/sxreport-server %%SXSERVER%%sbin/sxserver %%SXSERVER%%sbin/sxsetup %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/QUICKSTART %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/UPGRADE %%SXSERVER%%%%PORTDOCS%%%%DOCSDIR%%/logrotate.d/sxserver %%PORTDOCS%%%%DOCSDIR%%/manual.pdf man/man1/sxacl-useradd.1.gz man/man1/sxacl-userclone.1.gz man/man1/sxacl-userdel.1.gz man/man1/sxacl-usergetkey.1.gz man/man1/sxacl-userlist.1.gz man/man1/sxacl-usermod.1.gz man/man1/sxacl-usernewkey.1.gz man/man1/sxacl-volperm.1.gz man/man1/sxacl-volshow.1.gz 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 man/man1/sxreport-client.1.gz man/man1/sxrev-copy.1.gz man/man1/sxrev-delete.1.gz man/man1/sxrev-list.1.gz man/man1/sxrev.1.gz man/man1/sxrm.1.gz %%SXSERVER%%man/man1/sxsim.1.gz man/man1/sxvol-create.1.gz man/man1/sxvol-filter.1.gz man/man1/sxvol-modify.1.gz man/man1/sxvol-remove.1.gz man/man1/sxvol.1.gz %%SXSERVER%%man/man5/sxfcgi.conf.5.gz %%SXSERVER%%man/man5/sxsetup.conf.5.gz %%SXSERVER%%man/man8/sx.fcgi.8.gz %%SXSERVER%%man/man8/sxadm-cluster.8.gz %%SXSERVER%%man/man8/sxadm-node.8.gz %%SXSERVER%%man/man8/sxadm.8.gz %%SXSERVER%%man/man8/sxdump.8.gz %%SXSERVER%%man/man8/sxreport-server.8.gz %%SXSERVER%%man/man8/sxserver.8.gz %%SXSERVER%%man/man8/sxsetup.8.gz %%SXSERVER%%@dir sxserver/lib/sxserver %%SXSERVER%%@dir sxserver/log/sxserver %%SXSERVER%%@dir sxserver/run/sxserver