head 1.11; access; symbols pkgsrc-2026Q1:1.11.0.24 pkgsrc-2026Q1-base:1.11 pkgsrc-2025Q4:1.11.0.22 pkgsrc-2025Q4-base:1.11 pkgsrc-2025Q3:1.11.0.20 pkgsrc-2025Q3-base:1.11 pkgsrc-2025Q2:1.11.0.18 pkgsrc-2025Q2-base:1.11 pkgsrc-2025Q1:1.11.0.16 pkgsrc-2025Q1-base:1.11 pkgsrc-2024Q4:1.11.0.14 pkgsrc-2024Q4-base:1.11 pkgsrc-2024Q3:1.11.0.12 pkgsrc-2024Q3-base:1.11 pkgsrc-2024Q2:1.11.0.10 pkgsrc-2024Q2-base:1.11 pkgsrc-2024Q1:1.11.0.8 pkgsrc-2024Q1-base:1.11 pkgsrc-2023Q4:1.11.0.6 pkgsrc-2023Q4-base:1.11 pkgsrc-2023Q3:1.11.0.4 pkgsrc-2023Q3-base:1.11 pkgsrc-2023Q2:1.11.0.2 pkgsrc-2023Q2-base:1.11 pkgsrc-2023Q1:1.10.0.34 pkgsrc-2023Q1-base:1.10 pkgsrc-2022Q4:1.10.0.32 pkgsrc-2022Q4-base:1.10 pkgsrc-2022Q3:1.10.0.30 pkgsrc-2022Q3-base:1.10 pkgsrc-2022Q2:1.10.0.28 pkgsrc-2022Q2-base:1.10 pkgsrc-2022Q1:1.10.0.26 pkgsrc-2022Q1-base:1.10 pkgsrc-2021Q4:1.10.0.24 pkgsrc-2021Q4-base:1.10 pkgsrc-2021Q3:1.10.0.22 pkgsrc-2021Q3-base:1.10 pkgsrc-2021Q2:1.10.0.20 pkgsrc-2021Q2-base:1.10 pkgsrc-2021Q1:1.10.0.18 pkgsrc-2021Q1-base:1.10 pkgsrc-2020Q4:1.10.0.16 pkgsrc-2020Q4-base:1.10 pkgsrc-2020Q3:1.10.0.14 pkgsrc-2020Q3-base:1.10 pkgsrc-2020Q2:1.10.0.12 pkgsrc-2020Q2-base:1.10 pkgsrc-2020Q1:1.10.0.8 pkgsrc-2020Q1-base:1.10 pkgsrc-2019Q4:1.10.0.10 pkgsrc-2019Q4-base:1.10 pkgsrc-2019Q3:1.10.0.6 pkgsrc-2019Q3-base:1.10 pkgsrc-2019Q2:1.10.0.4 pkgsrc-2019Q2-base:1.10 pkgsrc-2019Q1:1.10.0.2 pkgsrc-2019Q1-base:1.10 pkgsrc-2018Q4:1.9.0.10 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.8 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.6 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.4 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.2 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.8.0.10 pkgsrc-2017Q3-base:1.8 pkgsrc-2017Q2:1.8.0.6 pkgsrc-2017Q2-base:1.8 pkgsrc-2017Q1:1.8.0.4 pkgsrc-2017Q1-base:1.8 pkgsrc-2016Q4:1.8.0.2 pkgsrc-2016Q4-base:1.8 pkgsrc-2016Q3:1.6.0.8 pkgsrc-2016Q3-base:1.6 pkgsrc-2016Q2:1.6.0.6 pkgsrc-2016Q2-base:1.6 pkgsrc-2016Q1:1.6.0.4 pkgsrc-2016Q1-base:1.6 pkgsrc-2015Q4:1.6.0.2 pkgsrc-2015Q4-base:1.6 pkgsrc-2015Q3:1.5.0.14 pkgsrc-2015Q3-base:1.5 pkgsrc-2015Q2:1.5.0.12 pkgsrc-2015Q2-base:1.5 pkgsrc-2015Q1:1.5.0.10 pkgsrc-2015Q1-base:1.5 pkgsrc-2014Q4:1.5.0.8 pkgsrc-2014Q4-base:1.5 pkgsrc-2014Q3:1.5.0.6 pkgsrc-2014Q3-base:1.5 pkgsrc-2014Q2:1.5.0.4 pkgsrc-2014Q2-base:1.5 pkgsrc-2014Q1:1.5.0.2 pkgsrc-2014Q1-base:1.5 pkgsrc-2013Q4:1.4.0.2 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.2.0.2 pkgsrc-2013Q3-base:1.2; locks; strict; comment @# @; 1.11 date 2023.06.06.10.55.13; author wiz; state Exp; branches; next 1.10; commitid RDYFPjGRI25inSrE; 1.10 date 2019.01.02.17.25.06; author tnn; state Exp; branches; next 1.9; commitid 9kk8PF70ZlLrte6B; 1.9 date 2017.10.04.11.53.10; author wiz; state Exp; branches; next 1.8; commitid NO0cNTrW5byugJ9A; 1.8 date 2016.12.07.20.00.20; author maya; state Exp; branches; next 1.7; commitid H45hQ2q6LumeD5xz; 1.7 date 2016.10.30.11.39.14; author adam; state Exp; branches; next 1.6; commitid 81vddNW0Lsrd4asz; 1.6 date 2015.11.25.10.46.24; author adam; state Exp; branches; next 1.5; commitid bdpMaai36xnMIsKy; 1.5 date 2014.02.12.14.35.11; author jperkin; state Exp; branches; next 1.4; commitid 5uMHtL2mSNysUOox; 1.4 date 2013.10.14.06.30.47; author adam; state Exp; branches; next 1.3; commitid xmAoCpaUndUB7e9x; 1.3 date 2013.10.06.16.45.04; author wiz; state Exp; branches; next 1.2; commitid sn37gRjD3L7FLf8x; 1.2 date 2013.09.17.14.01.01; author adam; state Exp; branches; next 1.1; commitid ZLGWQPtfFWpwtN5x; 1.1 date 2013.09.11.09.46.27; author joerg; state Exp; branches; next ; commitid 8f43pbnvFcErg05x; desc @@ 1.11 log @serf: update to 1.3.10. Apache Serf 1.3.10 [2023-xx-xx, from tags/1.3.10, rxxxxxxx] Support for OpenSSL 3 (r1901937, ...) Fix issue #171: Win32: Running tests fails with "no OPENSSL_Applink" error Fix issue #194: Win32: Linking error when building against OpenSSL 1.1+ Fix issue #198: OpenSSL BIO control method incorrectly handles unknown requests Fix issue #202: SSL tests are not passing with OpenSSL 3 Fix error handling when reading the outgoing request body (r1804534, ...) Fix handling of invalid chunk lengths in the dechunk bucket (r1804005, ...) Fix an endless loop in the deflate bucket with truncated input (r1805301) Fix BIO control handlers to support BIO_CTRL_EOF (r1902208) Fix a CRT mismatch issue caused by using certain OpenSSL functions (r1909252) Build changes to support VS2017, VS2019 and VS2022 (r1712131, ...) Build changes to support Python 3 (r1875933) @ text @$NetBSD: patch-SConstruct,v 1.10 2019/01/02 17:25:06 tnn Exp $ Hack: Use OPENSSL variable as final shared library path; fixes lib id on Darwin. Don't append -O2 compiler flag. Don't special case sunos5 in naming shlibs Fix build with scons-3.x. --- SConstruct.orig 2015-09-17 12:46:24.000000000 +0000 +++ SConstruct @@@@ -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), + RawListVariable('LDFLAGS', "Extra linker flags from pkgsrc", None), RawListVariable('LIBS', "Extra libraries passed to the linker, " "e.g. \"-l -l\" (space separated)", None), RawListVariable('LINKFLAGS', "Extra flags for the linker (space-separated)", @@@@ -152,7 +153,7 @@@@ if sys.platform == 'win32': True), ) -env = Environment(variables=opts, +env = Environment(variables=opts, ENV=os.environ, tools=('default', 'textfile',), CPPPATH=['.', ], ) @@@@ -215,8 +216,7 @@@@ incdir = '$PREFIX/include/serf-$MAJOR' # Unfortunately we can't set the .dylib compatibility_version option separately # from current_version, so don't use the PATCH level to avoid that build and # runtime patch levels have to be identical. -if sys.platform != 'sunos5': - env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) +env['SHLIBVERSION'] = '%d.%d.%d' % (MAJOR, MINOR, 0) LIBNAME = 'libserf-%d' % (MAJOR,) if sys.platform != 'win32': @@@@ -257,7 +257,6 @@@@ if sys.platform != 'win32': env.Append(CCFLAGS=['-g']) env.Append(CPPDEFINES=['DEBUG', '_DEBUG']) else: - env.Append(CCFLAGS=['-O2']) env.Append(CPPDEFINES=['NDEBUG']) ### works for Mac OS. probably needs to change @@@@ -391,6 +390,11 @@@@ if sys.platform == 'win32': for d in env['LIBPATH']: env.Append(RPATH=':'+d) +for l in env['LDFLAGS']: + if l.startswith('-l'): + env.Append(LINKFLAGS=l) + env.Append(GSSAPI_LIBS=l) + # Set up the construction of serf-*.pc pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), env.File('build/serf.pc.in'), @@@@ -429,7 +433,7 @@@@ if sys.platform == 'darwin': # make applications depend on the exact major.minor.patch version of serf. install_shared_path = install_shared[0].abspath - target_install_shared_path = os.path.join(libdir, '%s.dylib' % LIBNAME) + target_install_shared_path = os.path.join('$OPENSSL', '%s.dylib' % LIBNAME) env.AddPostAction(install_shared, ('install_name_tool -id %s %s' % (target_install_shared_path, install_shared_path))) @ 1.10 log @self: catch up with scons update; support building with python 3 @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.9 2017/10/04 11:53:10 wiz Exp $ a26 18 @@@@ -166,7 +167,7 @@@@ env.Append(BUILDERS = { match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' 'SERF_MINOR_VERSION ([0-9]+).*' 'SERF_PATCH_VERSION ([0-9]+)', - env.File('serf.h').get_contents(), + env.File('serf.h').get_contents().decode('utf-8'), re.DOTALL) MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] env.Append(MAJOR=str(MAJOR)) @@@@ -183,7 +184,7 @@@@ CALLOUT_OKAY = not (env.GetOption('clean unknown = opts.UnknownVariables() if unknown: - print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) + print ('Warning: Used unknown variables:', ', '.join(unknown.keys())) apr = str(env['APR']) apu = str(env['APU']) @ 1.9 log @serf: Fix build with scons-3.0. @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.8 2016/12/07 20:00:20 maya Exp $ d27 9 @ 1.8 log @serf: don't special case sunos5 in naming shlibs This will likely fix PR pkg/51697: www/serf fails to package on Solaris @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.7 2016/10/30 11:39:14 adam Exp $ d6 1 d27 9 @ 1.7 log @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 @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.6 2015/11/25 10:46:24 adam Exp $ d5 1 d26 11 a36 1 @@@@ -257,7 +258,6 @@@@ if sys.platform != 'win32': d44 1 a44 1 @@@@ -391,6 +391,11 @@@@ if sys.platform == 'win32': d56 1 a56 1 @@@@ -429,7 +434,7 @@@@ if sys.platform == 'darwin': @ 1.6 log @Do not add spaces in front of LINKFLAGS and GSSAPI_LIBS @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.5 2014/02/12 14:35:11 jperkin Exp $ d6 1 a6 1 --- SConstruct.orig 2013-10-04 15:11:04.000000000 +0000 d8 1 a8 1 @@@@ -106,6 +106,7 @@@@ opts.AddVariables( d16 1 a16 1 @@@@ -146,7 +147,7 @@@@ if sys.platform == 'win32': d25 2 a26 2 @@@@ -240,7 +241,6 @@@@ if sys.platform != 'win32': env.Append(CCFLAGS='-g') d29 2 a30 2 - env.Append(CCFLAGS='-O2') env.Append(CPPDEFINES='NDEBUG') d33 1 a33 1 @@@@ -372,6 +372,11 @@@@ if sys.platform == 'win32': d45 1 a45 1 @@@@ -410,7 +415,7 @@@@ if sys.platform == 'darwin': @ 1.5 log @Pass in additional libraries and use full path to krb5-config. Fixes build on SunOS when using builtin mit-krb5. @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.4 2013/10/14 06:30:47 adam Exp $ d39 2 a40 2 + env.Append(LINKFLAGS=" " + l) + env.Append(GSSAPI_LIBS=" " + l) @ 1.4 log @Fix shared library path on Darwin @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.3 2013/10/06 16:45:04 wiz Exp $ d8 9 a16 1 @@@@ -146,7 +146,7 @@@@ if sys.platform == 'win32': d25 1 a25 1 @@@@ -240,7 +240,6 @@@@ if sys.platform != 'win32': d33 13 a45 1 @@@@ -410,7 +409,7 @@@@ if sys.platform == 'darwin': @ 1.3 log @Update to 1.3.2. Upstream downgraded their shlib major version (at least on NetBSD). Since there are so few packages in pkgsrc depending on it, follow suit. Recursive revbump coming next. Serf 1.3.2 [2013-10-04, from /tags/1.3.2, r????] Fix issue 130: HTTP headers should be treated case-insensitively Fix issue 126: Compilation breaks with Codewarrior compiler Fix crash during cleanup of SSL buckets in apr_terminate() (r2145) Fix Windows build: Also export functions with capital letters in .def file Fix host header when url contains a username or password (r2170) Ensure less TCP package fragmentation on Windows (r2145) Handle authentication for responses to HEAD requests (r2178,-9) Improve serf_get: add option to add request headers, allow url with query, allow HEAD requests (r2143,r2175,-6) Improve RFC conformance: don't expect body for certain responses (r2011,-2) Do not invoke progress callback when no data was received (r2144) And more test suite fixes and build warning cleanups SCons-related fixes: Fix build when GSSAPI not in default include path (2155) Fix OpenBSD build: always map all LIBPATH entries into RPATH (r2156) Checksum generation in Windows shared libraries for release builds (2162) Mac OS X: Use MAJOR version only in dylib install name (r2161) Use both MAJOR and MINOR version for the shared library name (2163) Fix the .pc file when installing serf in a non-default LIBDIR (r2191) @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.2 2013/09/17 14:01:01 adam Exp $ d3 1 d25 9 @ 1.2 log @* Fix library id on Darwin. * Pass CC and CFLAGS. * Added LICENSE. * Removed USE_LIBTOOL and TEST_TARGET: these are not used with Scons build. @ text @d1 1 a1 1 $NetBSD: patch-SConstruct,v 1.1 2013/09/11 09:46:27 joerg Exp $ a2 1 Hack: Use OPENSSL variable as final shared library path; fixes lib id on Darwin. d5 1 a5 1 --- SConstruct.orig 2013-09-11 09:42:09.000000000 +0000 d16 1 a16 1 @@@@ -238,7 +238,6 @@@@ if sys.platform != 'win32': a23 9 @@@@ -401,7 +400,7 @@@@ if sys.platform == 'darwin': # to a path in the sandbox. The shared library install name (id) should be the # final targat path. install_shared_path = install_shared[0].abspath - target_install_shared_path = os.path.join(libdir, lib_shared[0].name) + target_install_shared_path = os.path.join('$OPENSSL', lib_shared[0].name) env.AddPostAction(install_shared, ('install_name_tool -id %s %s' % (target_install_shared_path, install_shared_path))) @ 1.1 log @Honor environment to get correct PATH. @ text @d1 4 a4 1 $NetBSD$ d17 17 @