From owner-svn-src-all@FreeBSD.ORG Sun Jan 29 14:55:21 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CC7A106566B; Sun, 29 Jan 2012 14:55:21 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1129B8FC16; Sun, 29 Jan 2012 14:55:21 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0TEtK46040399; Sun, 29 Jan 2012 14:55:20 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0TEtKXJ040393; Sun, 29 Jan 2012 14:55:20 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201201291455.q0TEtKXJ040393@svn.freebsd.org> From: Marius Strobl Date: Sun, 29 Jan 2012 14:55:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230743 - in stable/9/usr.bin: . csup X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Jan 2012 14:55:21 -0000 Author: marius Date: Sun Jan 29 14:55:20 2012 New Revision: 230743 URL: http://svn.freebsd.org/changeset/base/230743 Log: MFC: r228857 On FreeBSD just use the MD5 implementation of libmd rather than that of libcrypto so we don't need to relinquish csup when world is built without OpenSSL. Modified: stable/9/usr.bin/Makefile stable/9/usr.bin/csup/Makefile stable/9/usr.bin/csup/auth.c stable/9/usr.bin/csup/misc.c stable/9/usr.bin/csup/misc.h Directory Properties: stable/9/usr.bin/ (props changed) stable/9/usr.bin/ar/ (props changed) stable/9/usr.bin/calendar/ (props changed) stable/9/usr.bin/clang/ (props changed) stable/9/usr.bin/compress/ (props changed) stable/9/usr.bin/cpio/ (props changed) stable/9/usr.bin/csup/ (props changed) stable/9/usr.bin/du/ (props changed) stable/9/usr.bin/fetch/ (props changed) stable/9/usr.bin/gprof/ (props changed) stable/9/usr.bin/grep/ (props changed) stable/9/usr.bin/hexdump/ (props changed) stable/9/usr.bin/indent/ (props changed) stable/9/usr.bin/mail/ (props changed) stable/9/usr.bin/make/ (props changed) stable/9/usr.bin/mkesdb/ (props changed) stable/9/usr.bin/mt/ (props changed) stable/9/usr.bin/ncplist/ (props changed) stable/9/usr.bin/netstat/ (props changed) stable/9/usr.bin/procstat/ (props changed) stable/9/usr.bin/rctl/ (props changed) stable/9/usr.bin/rwho/ (props changed) stable/9/usr.bin/script/ (props changed) stable/9/usr.bin/sed/ (props changed) stable/9/usr.bin/tar/ (props changed) stable/9/usr.bin/truss/ (props changed) stable/9/usr.bin/usbhidaction/ (props changed) stable/9/usr.bin/usbhidctl/ (props changed) stable/9/usr.bin/vacation/ (props changed) stable/9/usr.bin/vmstat/ (props changed) stable/9/usr.bin/xlint/ (props changed) Modified: stable/9/usr.bin/Makefile ============================================================================== --- stable/9/usr.bin/Makefile Sun Jan 29 14:52:42 2012 (r230742) +++ stable/9/usr.bin/Makefile Sun Jan 29 14:55:20 2012 (r230743) @@ -250,10 +250,11 @@ SUBDIR+= bc SUBDIR+= chkey SUBDIR+= dc SUBDIR+= newkey +.endif + .if ${MK_LIBTHR} != "no" SUBDIR+= csup .endif -.endif .if ${MK_LOCATE} != "no" SUBDIR+= locate Modified: stable/9/usr.bin/csup/Makefile ============================================================================== --- stable/9/usr.bin/csup/Makefile Sun Jan 29 14:52:42 2012 (r230742) +++ stable/9/usr.bin/csup/Makefile Sun Jan 29 14:55:20 2012 (r230743) @@ -33,8 +33,8 @@ CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -DHAVE_FFLAGS -DNDEBUG WARNS?= 1 -DPADD= ${LIBCRYPTO} ${LIBZ} ${LIBPTHREAD} -LDADD= -lcrypto -lz -lpthread +DPADD= ${LIBMD} ${LIBZ} ${LIBPTHREAD} +LDADD= -lmd -lz -lpthread SCRIPTS= cpasswd.sh MAN= csup.1 cpasswd.1 Modified: stable/9/usr.bin/csup/auth.c ============================================================================== --- stable/9/usr.bin/csup/auth.c Sun Jan 29 14:52:42 2012 (r230742) +++ stable/9/usr.bin/csup/auth.c Sun Jan 29 14:55:20 2012 (r230743) @@ -35,7 +35,6 @@ #include #include -#include #include #include #include Modified: stable/9/usr.bin/csup/misc.c ============================================================================== --- stable/9/usr.bin/csup/misc.c Sun Jan 29 14:52:42 2012 (r230742) +++ stable/9/usr.bin/csup/misc.c Sun Jan 29 14:55:20 2012 (r230743) @@ -28,7 +28,6 @@ #include #include -#include #include #include Modified: stable/9/usr.bin/csup/misc.h ============================================================================== --- stable/9/usr.bin/csup/misc.h Sun Jan 29 14:52:42 2012 (r230742) +++ stable/9/usr.bin/csup/misc.h Sun Jan 29 14:55:20 2012 (r230743) @@ -28,10 +28,18 @@ #ifndef _MISC_H_ #define _MISC_H_ -#include - #include +#ifdef __FreeBSD__ +#include +#define MD5_DIGEST_LENGTH 16 +#define MD5_Init MD5Init +#define MD5_Final MD5Final +#define MD5_Update MD5Update +#else +#include +#endif + /* If we're not compiling in a C99 environment, define the C99 types. */ #if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901