From owner-svn-ports-all@freebsd.org Mon Sep 12 02:01:39 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B678BD78E5; Mon, 12 Sep 2016 02:01:39 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 145BFC27; Mon, 12 Sep 2016 02:01:39 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8C21cVq085335; Mon, 12 Sep 2016 02:01:38 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8C21cF5085333; Mon, 12 Sep 2016 02:01:38 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609120201.u8C21cF5085333@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 12 Sep 2016 02:01:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421894 - in head/games/tinymux: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2016 02:01:39 -0000 Author: marino Date: Mon Sep 12 02:01:38 2016 New Revision: 421894 URL: https://svnweb.freebsd.org/changeset/ports/421894 Log: games/tinymux: Fix SSL flags and handle no SHA0 cases (LibreSSL) Added: head/games/tinymux/files/patch-player.cpp (contents, props changed) Modified: head/games/tinymux/Makefile Modified: head/games/tinymux/Makefile ============================================================================== --- head/games/tinymux/Makefile Mon Sep 12 02:01:05 2016 (r421893) +++ head/games/tinymux/Makefile Mon Sep 12 02:01:38 2016 (r421894) @@ -20,9 +20,6 @@ USES= gmake GNU_CONFIGURE= yes USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lcrypto - PATCHLEVEL= 12 PORTDOCS= * @@ -49,7 +46,9 @@ MEMORY_BASED_CONFIGURE_ENABLE= memorybas REALITY_LVLS_CONFIGURE_ENABLE= realitylvls SELFCHECK_CONFIGURE_ENABLE= selfcheck SSL_CONFIGURE_ENABLE= ssl -SSL_USE= OPENSSL=yes +SSL_USES= ssl +SSL_CPPFLAGS= -I${OPENSSLINC} +SSL_LDFLAGS= -L${OPENSSLLIB} -lcrypto WOD_REALMS_CONFIGURE_ENABLE= wodrealms SUB_FILES= ${PORTNAME} pkg-deinstall pkg-message Added: head/games/tinymux/files/patch-player.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/tinymux/files/patch-player.cpp Mon Sep 12 02:01:38 2016 (r421894) @@ -0,0 +1,20 @@ +--- player.cpp.orig 2012-07-12 05:25:51 UTC ++++ player.cpp +@@ -422,7 +422,7 @@ void ChangePassword(dbref player, const + s_Pass(player, pEncodedPassword); + } + +-#ifdef UNIX_DIGEST ++#if defined(UNIX_DIGEST) && !defined(OPENSSL_NO_SHA0) + const UTF8 *p6h_xx_crypt(const UTF8 *szPassword) + { + // Calculate SHA-0 Hash. +@@ -598,7 +598,7 @@ const UTF8 *mux_crypt(const UTF8 *szPass + case CRYPT_CLEARTEXT: + return szPassword; + +-#ifdef UNIX_DIGEST ++#if defined(UNIX_DIGEST) && !defined(OPENSSL_NO_SHA0) + case CRYPT_P6H_XX: + return p6h_xx_crypt(szPassword); + #endif