From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 23 16:40:06 2008 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 171BA106567D for ; Sun, 23 Nov 2008 16:40:06 +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 EE3ED8FC14 for ; Sun, 23 Nov 2008 16:40:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id mANGe5f5044659 for ; Sun, 23 Nov 2008 16:40:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id mANGe50g044658; Sun, 23 Nov 2008 16:40:05 GMT (envelope-from gnats) Resent-Date: Sun, 23 Nov 2008 16:40:05 GMT Resent-Message-Id: <200811231640.mANGe50g044658@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, Jui-Nan Lin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5628D106564A for ; Sun, 23 Nov 2008 16:33:38 +0000 (UTC) (envelope-from jnlin@tamama.org) Received: from Florence.tamama.org (Florence.tamama.org [59.120.212.55]) by mx1.freebsd.org (Postfix) with ESMTP id 960AD8FC16 for ; Sun, 23 Nov 2008 16:33:37 +0000 (UTC) (envelope-from jnlin@tamama.org) Received: by Florence.tamama.org (Postfix, from userid 1000) id 95D4CA111C; Mon, 24 Nov 2008 00:17:49 +0800 (CST) Message-Id: <20081123161749.95D4CA111C@Florence.tamama.org> Date: Mon, 24 Nov 2008 00:17:49 +0800 (CST) From: Jui-Nan Lin To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: mnag@FreeBSD.org Subject: ports/129092: [PATCH] security/openssh-portable: Fix ldap timeout problem in 64-bit platform 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: Sun, 23 Nov 2008 16:40:06 -0000 >Number: 129092 >Category: ports >Synopsis: [PATCH] security/openssh-portable: Fix ldap timeout problem in 64-bit platform >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: Sun Nov 23 16:40:05 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Jui-Nan Lin >Release: FreeBSD 7.0-RELEASE-p1 amd64 >Organization: >Environment: System: FreeBSD Florence.tamama.org 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #5: Mon May 5 00:36:32 CST >Description: Import http://code.google.com/p/openssh-lpk/source/browse/trunk/patch/contrib/contrib-openssh-5.1_p1-lpk-64bit.patch to FreeBSD ports system. It solved a problem in 64-bit platform that the bind timeout and search timeout values were not being parsed correctly: http://bugs.gentoo.org/210110 Added file(s): - files/openssh-lpk-5.0p1-64bit.patch Port maintainer (mnag@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- openssh-portable-5.0.p1_1,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/security/openssh-portable/Makefile /home/users/jnlin/ports/openssh-portable/Makefile --- /usr/ports/security/openssh-portable/Makefile 2008-11-11 21:03:40.000000000 +0800 +++ /home/users/jnlin/ports/openssh-portable/Makefile 2008-11-24 00:12:13.730346940 +0800 @@ -26,6 +26,7 @@ NO_CHECKSUM= yes DISTNAME+= ${PORTNAME}-SNAP-${PORTREVISION} .else +PORTREVISION= 1 DISTNAME+= ${PORTNAME}-${DISTVERSION} .endif @@ -148,6 +149,9 @@ # See http://dev.inversepath.com/trac/openssh-lpk .if defined(WITH_LPK) EXTRA_PATCHES= ${FILESDIR}/openssh-lpk-5.0p1-0.3.9.patch +.if ${ARCH} == "amd64" +EXTRA_PATCHES+= ${FILESDIR}/openssh-lpk-5.0p1-64bit.patch +.endif USE_OPENLDAP= yes CPPFLAGS+= "-I${LOCALBASE}/include -DWITH_LDAP_PUBKEY" CONFIGURE_ARGS+= --with-libs='-lldap' --with-ldflags='-L${LOCALBASE}/lib' \ diff -ruN --exclude=CVS /usr/ports/security/openssh-portable/files/openssh-lpk-5.0p1-64bit.patch /home/users/jnlin/ports/openssh-portable/files/openssh-lpk-5.0p1-64bit.patch --- /usr/ports/security/openssh-portable/files/openssh-lpk-5.0p1-64bit.patch 1970-01-01 08:00:00.000000000 +0800 +++ /home/users/jnlin/ports/openssh-portable/files/openssh-lpk-5.0p1-64bit.patch 2008-11-24 00:07:15.074737542 +0800 @@ -0,0 +1,44 @@ +diff -Nuar --exclude '*.rej' servconf.c.orig servconf.c +--- servconf.c.orig 2008-08-23 15:02:47.000000000 -0700 ++++ servconf.c 2008-08-23 15:04:21.000000000 -0700 +@@ -701,6 +701,7 @@ + int cmdline = 0, *intptr, value, n; + SyslogFacility *log_facility_ptr; + LogLevel *log_level_ptr; ++ unsigned long lvalue, *longptr; + ServerOpCodes opcode; + u_short port; + u_int i, flags = 0; +@@ -715,6 +716,7 @@ + if (!arg || !*arg || *arg == '#') + return 0; + intptr = NULL; ++ longptr = NULL; + charptr = NULL; + opcode = parse_token(arg, filename, linenum, &flags); + +@@ -1449,11 +1451,20 @@ + *intptr = value; + break; + case sBindTimeout: +- intptr = (int *) &options->lpk.b_timeout.tv_sec; +- goto parse_int; ++ longptr = (unsigned long *) &options->lpk.b_timeout.tv_sec; ++parse_ulong: ++ arg = strdelim(&cp); ++ if (!arg || *arg == '\0') ++ fatal("%s line %d: missing integer value.", ++ filename, linenum); ++ lvalue = atol(arg); ++ if (*activep && *longptr == -1) ++ *longptr = lvalue; ++ break; ++ + case sSearchTimeout: +- intptr = (int *) &options->lpk.s_timeout.tv_sec; +- goto parse_int; ++ longptr = (unsigned long *) &options->lpk.s_timeout.tv_sec; ++ goto parse_ulong; + break; + case sLdapConf: + arg = cp; --- openssh-portable-5.0.p1_1,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: