Attachment #178568 for bug #215817

View | Details | Raw Unified | Return to bug 215817
Collapse All | Expand All




PORTVERSION=	2.10.1.${PATCHLEVEL}
PORTREVISION=	1
CATEGORIES=	games net
MASTER_SITES=	ftp://ftp.tinymux.org/tinymux-2.10/${PATCHLEVEL}/
DISTNAME=	mux-${PORTVERSION}.unix

MAINTAINER=	ports@FreeBSD.org

LICENSE=	ART10
LICENSE_FILE=	${WRKSRC}/copyright.h

BROKEN=		Unfetchable (google code has gone away)

WRKSRC=		${WRKDIR}/mux2.10/src

USES=		gmake
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes

PATCHLEVEL=	13

PORTDOCS=	*


Lines 1-2 Link Here

(-)tinymux/distinfo (-2 / +3 lines)
1	SHA256 (mux-2.10.1.12.unix.tar.gz) = fe7d7b25723a7fc618a3ff6c15d274a107839d5e9797911d142cbc9d25ce51e8	1	TIMESTAMP = 1483685355
2	SIZE (mux-2.10.1.12.unix.tar.gz) = 1303734	2	SHA256 (mux-2.10.1.13.unix.tar.gz) = 33bd24048b5590f47a7dd4b6f027f169dfe60bd7eeaadc65e2d8fedf9ad96bff
		3	SIZE (mux-2.10.1.13.unix.tar.gz) = 1305491




--- 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

Return to bug 215817

Lines 5-11 Link Here

(-)tinymux/Makefile (-4 / +2 lines)
5	PORTVERSION= 2.10.1.${PATCHLEVEL}	5	PORTVERSION= 2.10.1.${PATCHLEVEL}
6	PORTREVISION= 1	6	PORTREVISION= 1
7	CATEGORIES= games net	7	CATEGORIES= games net
8	MASTER_SITES= GOOGLE_CODE	8	MASTER_SITES= ftp://ftp.tinymux.org/tinymux-2.10/${PATCHLEVEL}/
9	DISTNAME= mux-${PORTVERSION}.unix	9	DISTNAME= mux-${PORTVERSION}.unix
10		10
11	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
Lines 14-28 Link Here
14	LICENSE= ART10	14	LICENSE= ART10
15	LICENSE_FILE= ${WRKSRC}/copyright.h	15	LICENSE_FILE= ${WRKSRC}/copyright.h
16		16
17	BROKEN= Unfetchable (google code has gone away)
18
19	WRKSRC= ${WRKDIR}/mux2.10/src	17	WRKSRC= ${WRKDIR}/mux2.10/src
20		18
21	USES= gmake	19	USES= gmake
22	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
23	USE_LDCONFIG= yes	21	USE_LDCONFIG= yes
24		22
25	PATCHLEVEL= 12	23	PATCHLEVEL= 13
26		24
27	PORTDOCS= *	25	PORTDOCS= *
28		26

Lines 1-20 Link Here

(-)tinymux/files/patch-player.cpp (-20 lines)
1	--- player.cpp.orig 2012-07-12 05:25:51 UTC
2	+++ player.cpp
3	@@ -422,7 +422,7 @@ void ChangePassword(dbref player, const
4	s_Pass(player, pEncodedPassword);
5	}
6
7	-#ifdef UNIX_DIGEST
8	+#if defined(UNIX_DIGEST) && !defined(OPENSSL_NO_SHA0)
9	const UTF8 p6h_xx_crypt(const UTF8 szPassword)
10	{
11	// Calculate SHA-0 Hash.
12	@@ -598,7 +598,7 @@ const UTF8 mux_crypt(const UTF8 szPass
13	case CRYPT_CLEARTEXT:
14	return szPassword;
15
16	-#ifdef UNIX_DIGEST
17	+#if defined(UNIX_DIGEST) && !defined(OPENSSL_NO_SHA0)
18	case CRYPT_P6H_XX:
19	return p6h_xx_crypt(szPassword);
20	#endif