From owner-svn-src-all@FreeBSD.ORG Wed May 11 11:10:23 2011 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 876A6106566B; Wed, 11 May 2011 11:10:23 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-qw0-f54.google.com (mail-qw0-f54.google.com [209.85.216.54]) by mx1.freebsd.org (Postfix) with ESMTP id E2CBF8FC12; Wed, 11 May 2011 11:10:22 +0000 (UTC) Received: by qwc9 with SMTP id 9so246146qwc.13 for ; Wed, 11 May 2011 04:10:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=tBk/bvu5Ier4nkR2B4+qq3EsFCBqECNeGTeuilw2psU=; b=pWXZv3ZMn3mT+TQvpaDtUk5nn6XaAg6t1nmuAUUkGBavYnDox6T4wsHxh9etrCi+rx 5ioG0NehS7DQWRBff/rKHwF4ioZjSI8j98lK4j0EzmbYSRRpOagDosWrgN9pm5qGjdFS em+zxFaFPOIMFGsFrjxoh961tE4/KMUgrAC2o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=B9pS/vHyAZLWF6wFkNSM/OgTjiDH6c9hIQWABuDBuuxIItoxVVSWR4a97AWwUvzg/k dlhOVK4I8nY+lRWxBCUpMqcxoFfxPZYZAOO8ZAkSWz7pNQBohYFVYVbaEzfWFEvcIq4S qR3s2sIWe2cWxaIOdAfiJMx3flkulTMNQZqKI= MIME-Version: 1.0 Received: by 10.229.62.198 with SMTP id y6mr6984643qch.290.1305110792137; Wed, 11 May 2011 03:46:32 -0700 (PDT) Sender: pluknet@gmail.com Received: by 10.229.95.19 with HTTP; Wed, 11 May 2011 03:46:32 -0700 (PDT) In-Reply-To: <201105110946.p4B9kaTL083669@svn.freebsd.org> References: <201105110946.p4B9kaTL083669@svn.freebsd.org> Date: Wed, 11 May 2011 14:46:32 +0400 X-Google-Sender-Auth: p-r_hNxdZumw3UFiuDbXnUmUKJY Message-ID: From: Sergey Kandaurov To: Dag-Erling Smorgrav Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r221765 - stable/7/lib/libfetch 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: Wed, 11 May 2011 11:10:23 -0000 On 11 May 2011 13:46, Dag-Erling Smorgrav wrote: > Author: des > Date: Wed May 11 09:46:36 2011 > New Revision: 221765 > URL: http://svn.freebsd.org/changeset/base/221765 > > Log: > =A0Sync with head: proxy authentication, SSL hang, cached connection cras= h. > > Modified: > =A0stable/7/lib/libfetch/Makefile > =A0stable/7/lib/libfetch/common.c > =A0stable/7/lib/libfetch/ftp.c > =A0stable/7/lib/libfetch/http.c > Directory Properties: > =A0stable/7/lib/libfetch/ =A0 (props changed) > > Modified: stable/7/lib/libfetch/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- stable/7/lib/libfetch/Makefile =A0 =A0 =A0Wed May 11 09:42:40 2011 = =A0 =A0 =A0 =A0(r221764) > +++ stable/7/lib/libfetch/Makefile =A0 =A0 =A0Wed May 11 09:46:36 2011 = =A0 =A0 =A0 =A0(r221765) > @@ -28,7 +28,7 @@ CFLAGS+=3D =A0 =A0 =A0-DFTP_COMBINE_CWDS > =A0CSTD?=3D =A0 =A0 =A0 =A0 c99 > =A0WARNS?=3D =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A02 > > -SHLIB_MAJOR=3D =A0 =A05 > +SHLIB_MAJOR=3D =A0 =A06 > > =A0ftperr.h: ftp.errors ${.CURDIR}/Makefile > =A0 =A0 =A0 =A0@echo "static struct fetcherr ftp_errlist[] =3D {" > ${.TA= RGET} [...] Hi, DES. It seems that SHLIB_MAJOR was merged my mistake. --=20 wbr, pluknet