From d0b9c8793d489b84e509aaea636f7fee28d1fd2c Mon Sep 17 00:00:00 2001 From: Kubilay Kocak Date: Mon, 19 Oct 2015 13:04:58 +0000 Subject: Revert r399652 & r399658 Revert two commits that we're supposed to be MFH'd to the 2015Q4 branch, but instead because pointyhat, ended up in 2014Q4. Identified by: kwm Approved by: portmgr (bapt) --- net/turnserver/Makefile | 2 -- .../files/patch-src_apps_common_apputils.c | 21 --------------------- .../files/patch-src_apps_uclient_mainuclient.c | 14 -------------- sysutils/zfs-replicate/pkg-descr | 2 +- 4 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 net/turnserver/files/patch-src_apps_common_apputils.c delete mode 100644 net/turnserver/files/patch-src_apps_uclient_mainuclient.c diff --git a/net/turnserver/Makefile b/net/turnserver/Makefile index 2473a287893b..37be19d7bf10 100644 --- a/net/turnserver/Makefile +++ b/net/turnserver/Makefile @@ -2,7 +2,6 @@ PORTNAME= turnserver PORTVERSION= 3.2.4.4 -PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://turnserver.open-sys.org/downloads/v${PORTVERSION}/:prog \ http://turnserver.open-sys.org/downloads/extradocs/:xdocs \ @@ -16,7 +15,6 @@ MAINTAINER= mom040267@gmail.com COMMENT= STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156 LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libevent.so:${PORTSDIR}/devel/libevent2 diff --git a/net/turnserver/files/patch-src_apps_common_apputils.c b/net/turnserver/files/patch-src_apps_common_apputils.c deleted file mode 100644 index da72f8da02a5..000000000000 --- a/net/turnserver/files/patch-src_apps_common_apputils.c +++ /dev/null @@ -1,21 +0,0 @@ ---- src/apps/common/apputils.c.orig 2015-09-30 07:05:14 UTC -+++ src/apps/common/apputils.c -@@ -1037,13 +1037,15 @@ static const char* turn_get_method(const - if(!method) - return mdefault; - else { -- -+#ifndef OPENSSL_NO_SSL3 - if(method == SSLv3_server_method()) { - return "SSLv3"; - } else if(method == SSLv3_client_method()) { - return "SSLv3"; -- } else if(method == SSLv23_server_method()) { -- return "SSLv23"; -+ } else -+#endif -+ if(method == SSLv23_server_method()) { -+ return "SSLv23"; - } else if(method == SSLv23_client_method()) { - return "SSLv23"; - } else if(method == TLSv1_server_method()) { diff --git a/net/turnserver/files/patch-src_apps_uclient_mainuclient.c b/net/turnserver/files/patch-src_apps_uclient_mainuclient.c deleted file mode 100644 index 09b04d2e4c23..000000000000 --- a/net/turnserver/files/patch-src_apps_uclient_mainuclient.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/apps/uclient/mainuclient.c.orig 2015-09-30 07:05:14 UTC -+++ src/apps/uclient/mainuclient.c -@@ -483,9 +483,11 @@ int main(int argc, char **argv) - root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv23_client_method()); - SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); - root_tls_ctx_num++; -+#ifndef OPENSSL_NO_SSL3 - root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(SSLv3_client_method()); - SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); - root_tls_ctx_num++; -+#endif - root_tls_ctx[root_tls_ctx_num] = SSL_CTX_new(TLSv1_client_method()); - SSL_CTX_set_cipher_list(root_tls_ctx[root_tls_ctx_num], csuite); - root_tls_ctx_num++; diff --git a/sysutils/zfs-replicate/pkg-descr b/sysutils/zfs-replicate/pkg-descr index 5de5ee83eaf9..8b9bd8177750 100644 --- a/sysutils/zfs-replicate/pkg-descr +++ b/sysutils/zfs-replicate/pkg-descr @@ -1,4 +1,4 @@ zfs-replicate makes migrating a few filesystems and many snapshots to a new zpool more easier. -WWW: https://blogs.oracle.com/constantin/entry/useful_zfs_snapshot_replicator_script +WWW: http://blogs.sun.com/constantin/entry/useful_zfs_snapshot_replicator_script -- cgit v1.2.3