svn commit: r421894 - in head/games/tinymux: . files
John Marino
marino at FreeBSD.org
Mon Sep 12 02:01:39 UTC 2016
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
More information about the svn-ports-head
mailing list