CVS commit: pkgsrc/www/serf

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Oct 30 11:39:14 UTC 2016

Modified Files:
        pkgsrc/www/serf: Makefile distinfo
        pkgsrc/www/serf/patches: patch-SConstruct
Removed Files:
        pkgsrc/www/serf/patches: patch-buckets_ssl__buckets.c

Log Message:
Apache Serf 1.3.9:
  serf is now Apache Serf; apply header changes
  Fix issue 151: SCons build broken when only one library in ENVPATH
  Fix issue 153: avoid SSPI handle leak
  Fix issue 167: Explicitly use the ANSI version of SSPI
  Fix issue 170: Allow building with Microsoft Visual Studio 2015
  Fix build of 'check' target when using VPATH-style builds
    (builddir != srcdir).
  Resolve a bucket (aka "memory") leak when a request bucket is
    destroyed before it is morphed into an aggregate bucket
  Reset state variables when resetting connection
  Fix types of passed, but unused batons
  Fix some usages of the openssl BIO api
  Improve handling of bad data in the response state line.
  Resolve several compiler issues with less common compilers
  Support more overrides via SCons arguments
  Adapt to OpenSSL 1.1.x api


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/www/serf/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/serf/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/serf/patches/patch-SConstruct
cvs rdiff -u -r1.1 -r0 pkgsrc/www/serf/patches/patch-buckets_ssl__buckets.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/serf/Makefile
diff -u pkgsrc/www/serf/Makefile:1.35 pkgsrc/www/serf/Makefile:1.36
--- pkgsrc/www/serf/Makefile:1.35       Sat Mar  5 11:27:58 2016
+++ pkgsrc/www/serf/Makefile    Sun Oct 30 11:39:14 2016
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.35 2016/03/05 11:27:58 jperkin Exp $
+# $NetBSD: Makefile,v 1.36 2016/10/30 11:39:14 adam Exp $
 
-DISTNAME=      serf-1.3.8
-PKGREVISION=   1
+DISTNAME=      serf-1.3.9
 CATEGORIES=    www
-MASTER_SITES=  http://serf.googlecode.com/svn/src_releases/
+MASTER_SITES=  https://www.apache.org/dist/serf/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://code.google.com/p/serf/
+HOMEPAGE=      http://serf.apache.org/
 COMMENT=       High-performance asynchronous HTTP client library
 LICENSE=       apache-2.0
 

Index: pkgsrc/www/serf/distinfo
diff -u pkgsrc/www/serf/distinfo:1.20 pkgsrc/www/serf/distinfo:1.21
--- pkgsrc/www/serf/distinfo:1.20       Wed Nov 25 10:46:24 2015
+++ pkgsrc/www/serf/distinfo    Sun Oct 30 11:39:14 2016
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.20 2015/11/25 10:46:24 adam Exp $
+$NetBSD: distinfo,v 1.21 2016/10/30 11:39:14 adam Exp $
 
-SHA1 (serf-1.3.8.tar.bz2) = 1d45425ca324336ce2f4ae7d7b4cfbc5567c5446
-RMD160 (serf-1.3.8.tar.bz2) = ea2f8e70289fa09cffcbe20fdc8257a13671a609
-SHA512 (serf-1.3.8.tar.bz2) = 78787a0d1e3e72dd9afc2e0de65e9af3b4303fefdcb865bd5e087fae570a7fe4d1395ce021756db4685c6e63e31c495563afe57baf677bf9846657f5d63d4205
-Size (serf-1.3.8.tar.bz2) = 143337 bytes
-SHA1 (patch-SConstruct) = 9cb00daf919515062b178b8f04264e81ccfaf003
-SHA1 (patch-buckets_ssl__buckets.c) = f940e1703d3a8cf879d5a563cf57826f027ed8e1
+SHA1 (serf-1.3.9.tar.bz2) = 26015c63e3bbb108c1689bf2090e4c26351db674
+RMD160 (serf-1.3.9.tar.bz2) = 4bbc773841eb2bd83a7c12170937b403201dd83b
+SHA512 (serf-1.3.9.tar.bz2) = 9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d
+Size (serf-1.3.9.tar.bz2) = 145132 bytes
+SHA1 (patch-SConstruct) = 5f2d847f810486ba7dc1b0c3820169bc2aa129c7

Index: pkgsrc/www/serf/patches/patch-SConstruct
diff -u pkgsrc/www/serf/patches/patch-SConstruct:1.6 pkgsrc/www/serf/patches/patch-SConstruct:1.7
--- pkgsrc/www/serf/patches/patch-SConstruct:1.6        Wed Nov 25 10:46:24 2015
+++ pkgsrc/www/serf/patches/patch-SConstruct    Sun Oct 30 11:39:14 2016
@@ -1,11 +1,11 @@
-$NetBSD: patch-SConstruct,v 1.6 2015/11/25 10:46:24 adam Exp $
+$NetBSD: patch-SConstruct,v 1.7 2016/10/30 11:39:14 adam Exp $
 
 Hack: Use OPENSSL variable as final shared library path; fixes lib id on Darwin.
 Don't append -O2 compiler flag.
 
---- SConstruct.orig    2013-10-04 15:11:04.000000000 +0000
+--- SConstruct.orig    2015-09-17 12:46:24.000000000 +0000
 +++ SConstruct
-@@ -106,6 +106,7 @@ opts.AddVariables(
+@@ -111,6 +111,7 @@ opts.AddVariables(
    RawListVariable('CC', "Command name or path of the C compiler", None),
    RawListVariable('CFLAGS', "Extra flags for the C compiler (space-separated)",
                    None),
@@ -13,7 +13,7 @@ Don't append -O2 compiler flag.
    RawListVariable('LIBS', "Extra libraries passed to the linker, "
                    "e.g. \"-l<library1> -l<library2>\" (space separated)", None),
    RawListVariable('LINKFLAGS', "Extra flags for the linker (space-separated)",
-@@ -146,7 +147,7 @@ if sys.platform == 'win32':
+@@ -152,7 +153,7 @@ if sys.platform == 'win32':
                   True),
      )
  
@@ -22,15 +22,15 @@ Don't append -O2 compiler flag.
                    tools=('default', 'textfile',),
                    CPPPATH=['.', ],
                    )
-@@ -240,7 +241,6 @@ if sys.platform != 'win32':
-     env.Append(CCFLAGS='-g')
+@@ -257,7 +258,6 @@ if sys.platform != 'win32':
+     env.Append(CCFLAGS=['-g'])
      env.Append(CPPDEFINES=['DEBUG', '_DEBUG'])
    else:
--    env.Append(CCFLAGS='-O2')
-     env.Append(CPPDEFINES='NDEBUG')
+-    env.Append(CCFLAGS=['-O2'])
+     env.Append(CPPDEFINES=['NDEBUG'])
  
    ### works for Mac OS. probably needs to change
-@@ -372,6 +372,11 @@ if sys.platform == 'win32':
+@@ -391,6 +391,11 @@ if sys.platform == 'win32':
  for d in env['LIBPATH']:
    env.Append(RPATH=':'+d)
  
@@ -42,7 +42,7 @@ Don't append -O2 compiler flag.
  # Set up the construction of serf-*.pc
  pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
                           env.File('build/serf.pc.in'),
-@@ -410,7 +415,7 @@ if sys.platform == 'darwin':
+@@ -429,7 +434,7 @@ if sys.platform == 'darwin':
    # make applications depend on the exact major.minor.patch version of serf.
  
    install_shared_path = install_shared[0].abspath