svn commit: r221765 - stable/7/lib/libfetch

[Sergey Kandaurov]

On 11 May 2011 13:46, Dag-Erling Smorgrav <des at freebsd.org> wrote:
> Author: des
> Date: Wed May 11 09:46:36 2011
> New Revision: 221765
> URL: http://svn.freebsd.org/changeset/base/221765
>
> Log:
>  Sync with head: proxy authentication, SSL hang, cached connection crash.
>
> Modified:
>  stable/7/lib/libfetch/Makefile
>  stable/7/lib/libfetch/common.c
>  stable/7/lib/libfetch/ftp.c
>  stable/7/lib/libfetch/http.c
> Directory Properties:
>  stable/7/lib/libfetch/   (props changed)
>
> Modified: stable/7/lib/libfetch/Makefile
> ==============================================================================
> --- stable/7/lib/libfetch/Makefile      Wed May 11 09:42:40 2011        (r221764)
> +++ stable/7/lib/libfetch/Makefile      Wed May 11 09:46:36 2011        (r221765)
> @@ -28,7 +28,7 @@ CFLAGS+=      -DFTP_COMBINE_CWDS
>  CSTD?=         c99
>  WARNS?=                2
>
> -SHLIB_MAJOR=    5
> +SHLIB_MAJOR=    6
>
>  ftperr.h: ftp.errors ${.CURDIR}/Makefile
>        @echo "static struct fetcherr ftp_errlist[] = {" > ${.TARGET}
[...]

Hi, DES.

It seems that SHLIB_MAJOR was merged my mistake.

-- 
wbr,
pluknet