From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Nov 20 01:20:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D54F21065679 for ; Fri, 20 Nov 2009 01:20:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id B24A78FC1A for ; Fri, 20 Nov 2009 01:20:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id nAK1K1jN087723 for ; Fri, 20 Nov 2009 01:20:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id nAK1K1RC087722; Fri, 20 Nov 2009 01:20:01 GMT (envelope-from gnats) Resent-Date: Fri, 20 Nov 2009 01:20:01 GMT Resent-Message-Id: <200911200120.nAK1K1RC087722@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sofian Brabez Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6B551065670 for ; Fri, 20 Nov 2009 01:17:07 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 8C5488FC0C for ; Fri, 20 Nov 2009 01:17:07 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id nAK1H7aI024246 for ; Fri, 20 Nov 2009 01:17:07 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id nAK1H7LV024245; Fri, 20 Nov 2009 01:17:07 GMT (envelope-from nobody) Message-Id: <200911200117.nAK1H7LV024245@www.freebsd.org> Date: Fri, 20 Nov 2009 01:17:07 GMT From: Sofian Brabez To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/140711: [patch] security/libssh2: add debug and zlib options X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Nov 2009 01:20:01 -0000 >Number: 140711 >Category: ports >Synopsis: [patch] security/libssh2: add debug and zlib options >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 20 01:20:01 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Sofian Brabez >Release: FreeBSD 7.2-STABLE i386 >Organization: >Environment: FreeBSD freebsd.ifr.lan 7.2-STABLE FreeBSD 7.2-STABLE #2: Thu Nov 19 01:59:45 CET 2009 root@freebsd.ifr.lan:/usr/obj/usr/src/sys/FREEBSD i386 >Description: - Add WITH_DEBUG knob - Add WITH_ZLIB knob - Clean non necessary lines >How-To-Repeat: >Fix: Patch attached with submission follows: diff -urN libssh2.orig/Makefile libssh2/Makefile --- libssh2.orig/Makefile 2009-11-20 02:05:34.000000000 +0100 +++ libssh2/Makefile 2009-11-20 02:01:12.000000000 +0100 @@ -7,6 +7,7 @@ PORTNAME= libssh2 PORTVERSION= 1.2.2 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= security devel MASTER_SITES= http://www.libssh2.org/download/ \ @@ -18,10 +19,19 @@ USE_OPENSSL= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -OPTIONS= GCRYPT "Use libgcrypt instead of OpenSSL" off + +OPTIONS= DEBUG "Enable pedantic and debug options" off \ + GCRYPT "Use libgcrypt instead of OpenSSL" off \ + ZLIB "Use Libz for compression" off .include +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.else +CONFIGURE_ARGS+= --disable-debug +.endif + .if defined(WITH_GCRYPT) LIB_DEPENDS+= gcrypt:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+= --with-libgcrypt -with-libgcrypt-prefix=${LOCALBASE} --without-openssl @@ -29,6 +39,12 @@ LDFLAGS+=-L${LOCALBASE}/lib .endif +.if defined(WITH_ZLIB) +CONFIGURE_ARGS+= --with-libz +.else +CONFIGURE_ARGS+= --without-libz +.endif + MAN3= libssh2_banner_set.3 \ libssh2_base64_decode.3 \ libssh2_channel_close.3 \ @@ -125,9 +141,6 @@ libssh2_version.3 post-patch: - @${REINPLACE_CMD} -e '/ssh2_sample\.o/d' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|SHLIB_SUFFIX_NAME@ |SHLIB_SUFFIX_NAME@.0 |g' \ - ${WRKSRC}/src/Makefile.in @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in >Release-Note: >Audit-Trail: >Unformatted: