opensourcemirror
/
opnsense-ports
mirror of https://github.com/opnsense/ports.git
1
0
Fork 0
Code Issues Releases Wiki Activity

*/*: sync with upstream 

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2019-01-20 16:16:05 +01:00
parent d99715e30b
commit b049bf41d8
36 changed files with 458 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comms/p5-Nexmo-SMS/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= Nexmo-SMS PORTNAME= Nexmo-SMS
PORTVERSION= 0.06 PORTVERSION= 0.06
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= comms perl5 CATEGORIES= comms perl5
MASTER_SITES= CPAN MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:RENEEB MASTER_SITE_SUBDIR= CPAN:RENEEB
@ -14,9 +14,7 @@ COMMENT= Send SMS via http://www.nexmo.com/ API
BUILD_DEPENDS= ${RUN_DEPENDS} BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-HTTP-Message>=5.836:www/p5-HTTP-Message \ RUN_DEPENDS= p5-HTTP-Message>=5.836:www/p5-HTTP-Message \
p5-JSON-PP>=2.26000:converters/p5-JSON-PP \
p5-libwww>=5.835:www/p5-libwww p5-libwww>=5.835:www/p5-libwww
TEST_DEPENDS= p5-Test-Pod>=1.22:devel/p5-Test-Pod \ TEST_DEPENDS= p5-Test-Pod>=1.22:devel/p5-Test-Pod \
p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage p5-Test-Pod-Coverage>=1.08:devel/p5-Test-Pod-Coverage

6
converters/p5-JSON-Any/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= JSON-Any PORTNAME= JSON-Any
PORTVERSION= 1.39 PORTVERSION= 1.39
PORTREVISION= 1
CATEGORIES= converters perl5 CATEGORIES= converters perl5
MASTER_SITES= CPAN MASTER_SITES= CPAN
PKGNAMEPREFIX= p5- PKGNAMEPREFIX= p5-
@ -31,18 +32,17 @@ JSON_DWIW_DESC= Use JSON::DWIW
JSON_PP_DESC= Use JSON::PP JSON_PP_DESC= Use JSON::PP
JSON_XS_DESC= Use JSON::XS JSON_XS_DESC= Use JSON::XS
NO_ARCH= yes
USES= perl5 USES= perl5
USE_PERL5= configure USE_PERL5= configure
NO_ARCH= yes
CPANEL_BUILD_DEPENDS= p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS CPANEL_BUILD_DEPENDS= p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS
CPANEL_RUN_DEPENDS= p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS CPANEL_RUN_DEPENDS= p5-Cpanel-JSON-XS>=0:converters/p5-Cpanel-JSON-XS
JSON_BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON JSON_BUILD_DEPENDS= p5-JSON>=0:converters/p5-JSON
JSON_RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON JSON_RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON
JSON_DWIW_BUILD_DEPENDS=p5-JSON-DWIW>=0:converters/p5-JSON-DWIW JSON_DWIW_BUILD_DEPENDS=p5-JSON-DWIW>=0:converters/p5-JSON-DWIW
JSON_DWIW_RUN_DEPENDS= p5-JSON-DWIW>=0:converters/p5-JSON-DWIW JSON_DWIW_RUN_DEPENDS= p5-JSON-DWIW>=0:converters/p5-JSON-DWIW
JSON_PP_BUILD_DEPENDS= p5-JSON-PP>=0:converters/p5-JSON-PP
JSON_PP_RUN_DEPENDS= p5-JSON-PP>=0:converters/p5-JSON-PP
JSON_XS_BUILD_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS JSON_XS_BUILD_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS
JSON_XS_RUN_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS JSON_XS_RUN_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS

2
databases/mysql80-client/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= mysql PORTNAME= mysql
PORTREVISION= 0 PORTREVISION= 1
PKGNAMESUFFIX= 80-client PKGNAMESUFFIX= 80-client
COMMENT= Multithreaded SQL database (client) COMMENT= Multithreaded SQL database (client)

11
databases/mysql80-client/files/patch-scripts_CMakeLists.txt
View File

@ -1,4 +1,4 @@
--- scripts/CMakeLists.txt.orig 2018-11-04 20:58:12 UTC --- scripts/CMakeLists.txt.orig 2018-10-07 08:44:22 UTC
+++ scripts/CMakeLists.txt +++ scripts/CMakeLists.txt
@@ -80,6 +80,7 @@ ELSE() @@ -80,6 +80,7 @@ ELSE()
MESSAGE(FATAL_ERROR "Cannot concatenate files") MESSAGE(FATAL_ERROR "Cannot concatenate files")
@ -32,6 +32,15 @@
# TCMalloc hacks # TCMalloc hacks
IF(MALLOC_LIB) IF(MALLOC_LIB)
@@ -364,7 +368,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
FOREACH(lib ${${target}_LIB_DEPENDS})
# Filter out "general", it is not a library, just CMake hint
- IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ")
+ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")
IF (lib MATCHES "^\\-l")
SET(${var} "${${var}} ${lib} ")
ELSEIF(lib MATCHES "^/")
@@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) @@ -372,6 +376,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
STRING(REGEX REPLACE "^lib" "" lib "${lib}") STRING(REGEX REPLACE "^lib" "" lib "${lib}")

3
devel/p5-Devel-Size-Report/Makefile
View File

@ -11,6 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Extension to generate a size report for all elements in a structure COMMENT= Extension to generate a size report for all elements in a structure
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
BUILD_DEPENDS= ${RUN_DEPENDS} BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-Array-RefElem>=1.00:misc/p5-Array-RefElem \ RUN_DEPENDS= p5-Array-RefElem>=1.00:misc/p5-Array-RefElem \
p5-Devel-Size>=0.69:devel/p5-Devel-Size p5-Devel-Size>=0.69:devel/p5-Devel-Size

26
devel/p5-FFI-Platypus/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= FFI-Platypus PORTNAME= FFI-Platypus
PORTVERSION= 0.59 PORTVERSION= 0.74
CATEGORIES= devel perl5 CATEGORIES= devel perl5
MASTER_SITES= CPAN MASTER_SITES= CPAN
PKGNAMEPREFIX= p5- PKGNAMEPREFIX= p5-
@ -14,20 +14,24 @@ LICENSE= ART10 GPLv1+
LICENSE_COMB= dual LICENSE_COMB= dual
LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= p5-Config-AutoConf>=0.309:devel/p5-Config-AutoConf \ BUILD_DEPENDS= ${RUN_DEPENDS}
${RUN_DEPENDS}
LIB_DEPENDS= libffi.so:devel/libffi LIB_DEPENDS= libffi.so:devel/libffi
RUN_DEPENDS= p5-FFI-CheckLib>=0.05:devel/p5-FFI-CheckLib \ RUN_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
p5-File-ShareDir>=0:devel/p5-File-ShareDir p5-FFI-CheckLib>=0.05:devel/p5-FFI-CheckLib
TEST_DEPENDS= p5-Capture-Tiny>=0:devel/p5-Capture-Tiny
USES= localbase perl5 USES= gmake perl5 pkgconfig
USE_PERL5= modbuild USE_PERL5= configure
MAKE_ARGS= extra_compiler_flags="-I${LOCALBASE}/include" \ .include <bsd.port.pre.mk>
extra_linker_flags="-L${LOCALBASE}/lib -lffi"
.if ${PERL_LEVEL} < 502600
BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=7.12:devel/p5-ExtUtils-MakeMaker \
p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils
RUN_DEPENDS+= p5-ExtUtils-MakeMaker>=7.12:devel/p5-ExtUtils-MakeMaker \
p5-Scalar-List-Utils>=1.45:lang/p5-Scalar-List-Utils
.endif
post-install: post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/FFI/Platypus/Platypus.so ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/FFI/Platypus/Platypus.so
.include <bsd.port.mk> .include <bsd.port.post.mk>

6
devel/p5-FFI-Platypus/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1546258190 TIMESTAMP = 1547994890
SHA256 (FFI-Platypus-0.59.tar.gz) = 6217382925c928214024065931f55e605a03a80816a204c450506e7ea732daad SHA256 (FFI-Platypus-0.74.tar.gz) = 0b9752d5d716ab98bd85eccc19fcae68a912c84a1f36f39f225eedf7501b2bb1
SIZE (FFI-Platypus-0.59.tar.gz) = 215635 SIZE (FFI-Platypus-0.74.tar.gz) = 239979

35
devel/p5-FFI-Platypus/files/patch-inc-My-ModuleBuild.pm
View File

@ -1,35 +0,0 @@
--- inc/My/ModuleBuild.pm.orig 2017-03-23 22:26:13 UTC
+++ inc/My/ModuleBuild.pm
@@ -3,7 +3,6 @@ package My::ModuleBuild;
use strict;
use warnings;
use 5.008001;
-use Alien::FFI;
use My::LibTest;
use My::AutoConf;
use My::Dev;
@@ -23,8 +22,6 @@ sub new
$args{c_source} = 'xs';
$args{include_dirs} = 'include';
- $args{extra_compiler_flags} = Alien::FFI->cflags;
- $args{extra_linker_flags} = Alien::FFI->libs;
$args{requires}->{'Math::Int64'} = '0.34' if $ENV{FFI_PLATYPUS_DEBUG_FAKE32} || $Config{uvsize} < 8;
if($^O eq 'MSWin32' && $Config{cc} =~ /cl(\.exe)?$/i)
@@ -94,15 +91,6 @@ sub new
$ccflags = "@ccflags";
}
- # on some configurations (eg. Solaris 64 bit, Strawberry Perl)
- # -L flags are included in the lddlflags configuration, but we
- # need to make sure OUR -L comes first
- my @libdirflags = grep /^-L/, shellwords(Alien::FFI->libs);
- if(@libdirflags)
- {
- $lddlflags = join ' ', @libdirflags, $lddlflags;
- }
-
if($^O eq 'MSWin32')
{
# needed by My/Probe.pm on any MSWin32 platform

31
devel/p5-FFI-Platypus/pkg-plist
View File

@ -1,6 +1,15 @@
%%SITE_ARCH%%/FFI/Build.pm
%%SITE_ARCH%%/FFI/Build/File/Base.pm
%%SITE_ARCH%%/FFI/Build/File/C.pm
%%SITE_ARCH%%/FFI/Build/File/CXX.pm
%%SITE_ARCH%%/FFI/Build/File/Library.pm
%%SITE_ARCH%%/FFI/Build/File/Object.pm
%%SITE_ARCH%%/FFI/Build/MM.pm
%%SITE_ARCH%%/FFI/Build/Platform.pm
%%SITE_ARCH%%/FFI/Platypus.pm %%SITE_ARCH%%/FFI/Platypus.pm
%%SITE_ARCH%%/FFI/Platypus/API.pm %%SITE_ARCH%%/FFI/Platypus/API.pm
%%SITE_ARCH%%/FFI/Platypus/Buffer.pm %%SITE_ARCH%%/FFI/Platypus/Buffer.pm
%%SITE_ARCH%%/FFI/Platypus/Closure.pm
%%SITE_ARCH%%/FFI/Platypus/DL.pm %%SITE_ARCH%%/FFI/Platypus/DL.pm
%%SITE_ARCH%%/FFI/Platypus/Declare.pm %%SITE_ARCH%%/FFI/Platypus/Declare.pm
%%SITE_ARCH%%/FFI/Platypus/Internal.pm %%SITE_ARCH%%/FFI/Platypus/Internal.pm
@ -16,12 +25,28 @@
%%SITE_ARCH%%/FFI/Platypus/Type/PointerSizeBuffer.pm %%SITE_ARCH%%/FFI/Platypus/Type/PointerSizeBuffer.pm
%%SITE_ARCH%%/FFI/Platypus/Type/StringArray.pm %%SITE_ARCH%%/FFI/Platypus/Type/StringArray.pm
%%SITE_ARCH%%/FFI/Platypus/Type/StringPointer.pm %%SITE_ARCH%%/FFI/Platypus/Type/StringPointer.pm
%%SITE_ARCH%%/FFI/Probe.pm
%%SITE_ARCH%%/FFI/Probe/Runner.pm
%%SITE_ARCH%%/FFI/Probe/Runner/Builder.pm
%%SITE_ARCH%%/FFI/Probe/Runner/Result.pm
%%SITE_ARCH%%/FFI/typemap
%%SITE_ARCH%%/auto/FFI/Platypus/Platypus.so %%SITE_ARCH%%/auto/FFI/Platypus/Platypus.so
%%SITE_ARCH%%/auto/share/dist/FFI-Platypus/README.txt
%%SITE_ARCH%%/auto/share/dist/FFI-Platypus/config.pl %%SITE_ARCH%%/auto/share/dist/FFI-Platypus/config.pl
%%SITE_ARCH%%/auto/share/dist/FFI-Platypus/probe/bin/dlrun
%%SITE_ARCH%%/auto/share/dist/FFI-Platypus/probe/probe.pl
%%SITE_ARCH%%/auto/share/dist/FFI-Platypus/probe/src/dlrun.c
%%PERL5_MAN3%%/FFI::Build.3.gz
%%PERL5_MAN3%%/FFI::Build::File::Base.3.gz
%%PERL5_MAN3%%/FFI::Build::File::C.3.gz
%%PERL5_MAN3%%/FFI::Build::File::CXX.3.gz
%%PERL5_MAN3%%/FFI::Build::File::Library.3.gz
%%PERL5_MAN3%%/FFI::Build::File::Object.3.gz
%%PERL5_MAN3%%/FFI::Build::MM.3.gz
%%PERL5_MAN3%%/FFI::Build::Platform.3.gz
%%PERL5_MAN3%%/FFI::Platypus.3.gz %%PERL5_MAN3%%/FFI::Platypus.3.gz
%%PERL5_MAN3%%/FFI::Platypus::API.3.gz %%PERL5_MAN3%%/FFI::Platypus::API.3.gz
%%PERL5_MAN3%%/FFI::Platypus::Buffer.3.gz %%PERL5_MAN3%%/FFI::Platypus::Buffer.3.gz
%%PERL5_MAN3%%/FFI::Platypus::Closure.3.gz
%%PERL5_MAN3%%/FFI::Platypus::DL.3.gz %%PERL5_MAN3%%/FFI::Platypus::DL.3.gz
%%PERL5_MAN3%%/FFI::Platypus::Declare.3.gz %%PERL5_MAN3%%/FFI::Platypus::Declare.3.gz
%%PERL5_MAN3%%/FFI::Platypus::Internal.3.gz %%PERL5_MAN3%%/FFI::Platypus::Internal.3.gz
@ -37,3 +62,7 @@
%%PERL5_MAN3%%/FFI::Platypus::Type::PointerSizeBuffer.3.gz %%PERL5_MAN3%%/FFI::Platypus::Type::PointerSizeBuffer.3.gz
%%PERL5_MAN3%%/FFI::Platypus::Type::StringArray.3.gz %%PERL5_MAN3%%/FFI::Platypus::Type::StringArray.3.gz
%%PERL5_MAN3%%/FFI::Platypus::Type::StringPointer.3.gz %%PERL5_MAN3%%/FFI::Platypus::Type::StringPointer.3.gz
%%PERL5_MAN3%%/FFI::Probe.3.gz
%%PERL5_MAN3%%/FFI::Probe::Runner.3.gz
%%PERL5_MAN3%%/FFI::Probe::Runner::Builder.3.gz
%%PERL5_MAN3%%/FFI::Probe::Runner::Result.3.gz

3
devel/p5-Proc-WaitStat/Makefile
View File

@ -11,6 +11,9 @@ PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org MAINTAINER= ports@FreeBSD.org
COMMENT= Interpret and act on wait() status values COMMENT= Interpret and act on wait() status values
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
BUILD_DEPENDS= ${RUN_DEPENDS} BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-IPC-Signal>=0:devel/p5-IPC-Signal RUN_DEPENDS= p5-IPC-Signal>=0:devel/p5-IPC-Signal

2
devel/php-composer/Makefile
View File

@ -4,7 +4,7 @@
PORTNAME= composer PORTNAME= composer
DISTVERSION= 1.8.0 DISTVERSION= 1.8.0
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= http://getcomposer.org/download/${DISTVERSION}/ MASTER_SITES= https://getcomposer.org/download/${DISTVERSION}/
PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
DISTNAME= composer DISTNAME= composer
EXTRACT_SUFX= .phar EXTRACT_SUFX= .phar

2
devel/php-composer/pkg-descr
View File

@ -2,4 +2,4 @@ Composer is a tool for dependency management in PHP. It allows you to declare
the dependent libraries your project needs and it will install them in your the dependent libraries your project needs and it will install them in your
project for you. project for you.
WWW: http://getcomposer.org/ WWW: https://getcomposer.org/

5
devel/rust-bindgen/Makefile
View File

@ -2,8 +2,7 @@
PORTNAME= rust-bindgen PORTNAME= rust-bindgen
DISTVERSIONPREFIX= v DISTVERSIONPREFIX= v
DISTVERSION= 0.46.0 DISTVERSION= 0.47.0
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MAINTAINER= gecko@FreeBSD.org MAINTAINER= gecko@FreeBSD.org
@ -29,7 +28,7 @@ CARGO_CRATES= aho-corasick-0.6.8 \
cc-1.0.25 \ cc-1.0.25 \
cexpr-0.3.3 \ cexpr-0.3.3 \
cfg-if-0.1.5 \ cfg-if-0.1.5 \
clang-sys-0.26.0 \ clang-sys-0.27.0 \
clap-2.32.0 \ clap-2.32.0 \
diff-0.1.11 \ diff-0.1.11 \
env_logger-0.6.0 \ env_logger-0.6.0 \

10
devel/rust-bindgen/distinfo
View File

@ -1,4 +1,4 @@
TIMESTAMP = 1546091549 TIMESTAMP = 1547917966
SHA256 (rust/crates/aho-corasick-0.6.8.tar.gz) = 68f56c7353e5a9547cbd76ed90f7bb5ffc3ba09d4ea9bd1d8c06c8b1142eeb5a SHA256 (rust/crates/aho-corasick-0.6.8.tar.gz) = 68f56c7353e5a9547cbd76ed90f7bb5ffc3ba09d4ea9bd1d8c06c8b1142eeb5a
SIZE (rust/crates/aho-corasick-0.6.8.tar.gz) = 26786 SIZE (rust/crates/aho-corasick-0.6.8.tar.gz) = 26786
SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b
@ -19,8 +19,8 @@ SHA256 (rust/crates/cexpr-0.3.3.tar.gz) = 8fc0086be9ca82f7fc89fc873435531cb898b8
SIZE (rust/crates/cexpr-0.3.3.tar.gz) = 16127 SIZE (rust/crates/cexpr-0.3.3.tar.gz) = 16127
SHA256 (rust/crates/cfg-if-0.1.5.tar.gz) = 0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3 SHA256 (rust/crates/cfg-if-0.1.5.tar.gz) = 0c4e7bb64a8ebb0d856483e1e682ea3422f883c5f5615a90d51a2c82fe87fdd3
SIZE (rust/crates/cfg-if-0.1.5.tar.gz) = 7363 SIZE (rust/crates/cfg-if-0.1.5.tar.gz) = 7363
SHA256 (rust/crates/clang-sys-0.26.0.tar.gz) = 778ca7c912184f2012124f2dfe40592c4a9edf608b9bf68a9927c8f52e8082bc SHA256 (rust/crates/clang-sys-0.27.0.tar.gz) = 4d1a299f75fb3364b4dab6c9402f57b57ad8c81be070a85410dbb4747eb73889
SIZE (rust/crates/clang-sys-0.26.0.tar.gz) = 32479 SIZE (rust/crates/clang-sys-0.27.0.tar.gz) = 34237
SHA256 (rust/crates/clap-2.32.0.tar.gz) = b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e SHA256 (rust/crates/clap-2.32.0.tar.gz) = b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e
SIZE (rust/crates/clap-2.32.0.tar.gz) = 196073 SIZE (rust/crates/clap-2.32.0.tar.gz) = 196073
SHA256 (rust/crates/diff-0.1.11.tar.gz) = 3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a SHA256 (rust/crates/diff-0.1.11.tar.gz) = 3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a
@ -103,5 +103,5 @@ SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c
SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998
SHA256 (rust/crates/wincolor-1.0.1.tar.gz) = 561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba SHA256 (rust/crates/wincolor-1.0.1.tar.gz) = 561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba
SIZE (rust/crates/wincolor-1.0.1.tar.gz) = 4737 SIZE (rust/crates/wincolor-1.0.1.tar.gz) = 4737
SHA256 (rust-lang-rust-bindgen-v0.46.0_GH0.tar.gz) = a83c2c5d5c8e4bcd8e818b23c6dfb0b48b76a640be7c3d91cac7ec3972935bd1 SHA256 (rust-lang-rust-bindgen-v0.47.0_GH0.tar.gz) = fcee02ed51e428b8dfb11adef6427e69941f6da40f049d08aecfec0ab0ef5c21
SIZE (rust-lang-rust-bindgen-v0.46.0_GH0.tar.gz) = 2182652 SIZE (rust-lang-rust-bindgen-v0.47.0_GH0.tar.gz) = 2184280

3
editors/kakoune/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= kakoune PORTNAME= kakoune
DISTVERSION= 2018.10.27 DISTVERSION= 2019.01.20
PORTREVISION= 1
CATEGORIES= editors CATEGORIES= editors
MASTER_SITES= https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/ MASTER_SITES= https://github.com/mawww/kakoune/releases/download/v${DISTVERSION}/

6
editors/kakoune/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1540606945 TIMESTAMP = 1548027695
SHA256 (kakoune-2018.10.27.tar.bz2) = 687a173c8f94fb66aad899e7a3095fe8f08e1fdcab955dbc6785335427cc8a1d SHA256 (kakoune-2019.01.20.tar.bz2) = 991103a227be00ca1b10ad575fd6c749fa4c99eb19763971c7b1e113e299b995
SIZE (kakoune-2018.10.27.tar.bz2) = 430321 SIZE (kakoune-2019.01.20.tar.bz2) = 435883

1
editors/kakoune/pkg-plist
View File

@ -59,6 +59,7 @@ man/man1/kak.1.gz
%%DATADIR%%/rc/base/mail.kak %%DATADIR%%/rc/base/mail.kak
%%DATADIR%%/rc/base/markdown.kak %%DATADIR%%/rc/base/markdown.kak
%%DATADIR%%/rc/base/mercurial.kak %%DATADIR%%/rc/base/mercurial.kak
%%DATADIR%%/rc/base/new-client.kak
%%DATADIR%%/rc/base/ocaml.kak %%DATADIR%%/rc/base/ocaml.kak
%%DATADIR%%/rc/base/perl.kak %%DATADIR%%/rc/base/perl.kak
%%DATADIR%%/rc/base/restructuredtext.kak %%DATADIR%%/rc/base/restructuredtext.kak

15
emulators/wine/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= wine PORTNAME= wine
DISTVERSION= 3.0.4 DISTVERSION= 3.0.4
PORTREVISION= 1 PORTREVISION= 2
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \ MASTER_SITES= SF/${PORTNAME}/Source \
@ -21,6 +21,8 @@ ONLY_FOR_ARCHS= amd64 i386
BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex
LIB_DEPENDS= libxml2.so:textproc/libxml2 LIB_DEPENDS= libxml2.so:textproc/libxml2
USES= bison desktop-file-utils gmake localbase shebangfix tar:xz
CONFLICTS_INSTALL= wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \ CONFLICTS_INSTALL= wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \
i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* i386-wine-staging-[0-9]* i386-wine-devel-[0-9]*
@ -41,7 +43,6 @@ CONFIGURE_ARGS+=--verbose \
--without-udev --without-udev
CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
WINELIBDIR?= ${PREFIX}/lib WINELIBDIR?= ${PREFIX}/lib
USES= bison compiler:c11 desktop-file-utils gmake localbase shebangfix tar:xz
.if !defined(USE_LDCONFIG32) .if !defined(USE_LDCONFIG32)
USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine
.endif .endif
@ -52,8 +53,8 @@ SUB_FILES= pkg-message
PORTDATA= l_intl.nls wine.inf PORTDATA= l_intl.nls wine.inf
OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO OPTIONS_DEFINE= CUPS DOCS DOSBOX GCC GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
OPTIONS_DEFAULT=GNUTLS X11 OPTIONS_DEFAULT=GCC GNUTLS X11
OPTIONS_SUB= yes OPTIONS_SUB= yes
DOSBOX_DESC= Use DOSBox to run MS-DOS programs DOSBOX_DESC= Use DOSBox to run MS-DOS programs
@ -107,6 +108,12 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
.include <bsd.port.pre.mk> .include <bsd.port.pre.mk>
.if empty(PORT_OPTIONS:MGCC)
USES+= compiler:c11
.else
USE_GCC= yes
.endif
.if ${ARCH} == amd64 .if ${ARCH} == amd64
# Wine is composed of three parts: # Wine is composed of three parts:
# - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386) # - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386)

2
net-p2p/transmission-cli/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= transmission PORTNAME= transmission
DISTVERSION= 2.94 DISTVERSION= 2.94
PORTREVISION?= 1 PORTREVISION?= 2
CATEGORIES+= net-p2p CATEGORIES+= net-p2p
SLAVEPORT?= cli SLAVEPORT?= cli
PKGNAMESUFFIX?= -cli PKGNAMESUFFIX?= -cli

152
net-p2p/transmission-cli/files/patch-Units Normal file
View File

@ -0,0 +1,152 @@
--- cli/cli.c.orig 2018-05-01 10:18:29.000000000 -0700
+++ cli/cli.c 2019-01-18 17:21:27.893302000 -0800
@@ -46,14 +46,14 @@
#define MEM_G_STR "GiB"
#define MEM_T_STR "TiB"
-#define DISK_K 1000
+#define DISK_K 1024
#define DISK_B_STR "B"
#define DISK_K_STR "kB"
#define DISK_M_STR "MB"
#define DISK_G_STR "GB"
#define DISK_T_STR "TB"
-#define SPEED_K 1000
+#define SPEED_K 1024
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "kB/s"
#define SPEED_M_STR "MB/s"
--- daemon/daemon.c.orig 2018-05-01 10:18:29.000000000 -0700
+++ daemon/daemon.c 2019-01-18 17:21:55.699919000 -0800
@@ -50,14 +50,14 @@
#define MEM_G_STR "GiB"
#define MEM_T_STR "TiB"
-#define DISK_K 1000
+#define DISK_K 1024
#define DISK_B_STR "B"
#define DISK_K_STR "kB"
#define DISK_M_STR "MB"
#define DISK_G_STR "GB"
#define DISK_T_STR "TB"
-#define SPEED_K 1000
+#define SPEED_K 1024
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "kB/s"
#define SPEED_M_STR "MB/s"
--- daemon/remote.c.orig 2018-05-01 10:18:29.000000000 -0700
+++ daemon/remote.c 2019-01-18 18:03:10.333078000 -0800
@@ -44,14 +44,14 @@
#define MEM_G_STR "GiB"
#define MEM_T_STR "TiB"
-#define DISK_K 1000
+#define DISK_K 1024
#define DISK_B_STR "B"
#define DISK_K_STR "kB"
#define DISK_M_STR "MB"
#define DISK_G_STR "GB"
#define DISK_T_STR "TB"
-#define SPEED_K 1000
+#define SPEED_K 1024
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "kB/s"
#define SPEED_M_STR "MB/s"
--- gtk/util.c.orig 2018-05-01 10:18:29.000000000 -0700
+++ gtk/util.c 2019-01-18 17:23:10.918334000 -0800
@@ -39,13 +39,13 @@
const char * mem_G_str = N_("GiB");
const char * mem_T_str = N_("TiB");
-const int disk_K = 1000;
+const int disk_K = 1024;
const char * disk_K_str = N_("kB");
const char * disk_M_str = N_("MB");
const char * disk_G_str = N_("GB");
const char * disk_T_str = N_("TB");
-const int speed_K = 1000;
+const int speed_K = 1024;
const char * speed_K_str = N_("kB/s");
const char * speed_M_str = N_("MB/s");
const char * speed_G_str = N_("GB/s");
--- libtransmission/libtransmission-test.c.orig 2018-05-01 10:18:29.000000000 -0700
+++ libtransmission/libtransmission-test.c 2019-01-18 17:23:43.535466000 -0800
@@ -200,14 +200,14 @@
#define MEM_G_STR "GiB"
#define MEM_T_STR "TiB"
-#define DISK_K 1000
+#define DISK_K 1024
#define DISK_B_STR "B"
#define DISK_K_STR "kB"
#define DISK_M_STR "MB"
#define DISK_G_STR "GB"
#define DISK_T_STR "TB"
-#define SPEED_K 1000
+#define SPEED_K 1024
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "kB/s"
#define SPEED_M_STR "MB/s"
--- qt/Formatter.cc.orig 2018-05-01 10:18:29.000000000 -0700
+++ qt/Formatter.cc 2019-01-18 17:25:58.166361000 -0800
@@ -29,7 +29,7 @@
void
Formatter::initUnits ()
{
- speed_K = 1000;
+ speed_K = 1024;
unitStrings[SPEED][B] = tr ( "B/s");
unitStrings[SPEED][KB] = tr ("kB/s");
unitStrings[SPEED][MB] = tr ("MB/s");
@@ -41,7 +41,7 @@
unitStrings[SPEED][GB].toUtf8().constData(),
unitStrings[SPEED][TB].toUtf8().constData());
- size_K = 1000;
+ size_K = 1024;
unitStrings[SIZE][B] = tr ( "B");
unitStrings[SIZE][KB] = tr ("kB");
unitStrings[SIZE][MB] = tr ("MB");
--- utils/units.h.orig 2018-05-01 10:18:29.000000000 -0700
+++ utils/units.h 2019-01-18 17:26:23.460607000 -0800
@@ -16,14 +16,14 @@
#define MEM_G_STR "GiB"
#define MEM_T_STR "TiB"
-#define DISK_K 1000
+#define DISK_K 1024
#define DISK_B_STR "B"
#define DISK_K_STR "kB"
#define DISK_M_STR "MB"
#define DISK_G_STR "GB"
#define DISK_T_STR "TB"
-#define SPEED_K 1000
+#define SPEED_K 1024
#define SPEED_B_STR "B/s"
#define SPEED_K_STR "kB/s"
#define SPEED_M_STR "MB/s"
--- web/javascript/formatter.js.orig 2018-05-01 10:18:29.000000000 -0700
+++ web/javascript/formatter.js 2019-01-18 17:26:43.307090000 -0800
@@ -7,14 +7,14 @@
Transmission.fmt = (function()
{
- var speed_K = 1000;
+ var speed_K = 1024;
var speed_B_str = 'B/s';
var speed_K_str = 'kB/s';
var speed_M_str = 'MB/s';
var speed_G_str = 'GB/s';
var speed_T_str = 'TB/s';
- var size_K = 1000;
+ var size_K = 1024;
var size_B_str = 'B';
var size_K_str = 'kB';
var size_M_str = 'MB';

2
net-p2p/transmission-daemon/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
PORTREVISION= 1 PORTREVISION= 2
PKGNAMESUFFIX= -daemon PKGNAMESUFFIX= -daemon
USES= ssl USES= ssl

3
net-p2p/transmission-gtk/Makefile
View File

@ -1,7 +1,6 @@
# $FreeBSD$ # $FreeBSD$
PORTREVISION= 2 PORTREVISION= 3
PKGNAMESUFFIX= -gtk PKGNAMESUFFIX= -gtk
LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \

2
net-p2p/transmission-qt/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
PORTREVISION= 5 PORTREVISION= 6
PKGNAMESUFFIX= -${FLAVOR} PKGNAMESUFFIX= -${FLAVOR}
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \

6
net/ndisc6/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= ndisc6 PORTNAME= ndisc6
PORTVERSION= 1.0.3 PORTVERSION= 1.0.4
PORTREVISION= 1
CATEGORIES= net ipv6 CATEGORIES= net ipv6
MASTER_SITES= http://www.remlab.net/files/ndisc6/ \ MASTER_SITES= http://www.remlab.net/files/ndisc6/ \
http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/ http://people.via.ecp.fr/~rem/www.remlab.net/files/ndisc6/
@ -13,8 +12,7 @@ COMMENT= IPv6 network diagnostic tools
LICENSE= GPLv2 LICENSE= GPLv2
USES= tar:bzip2 perl5 USES= compiler:c11 perl5 tar:bzip2
USE_GCC= any
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-suid-install --localstatedir="${PREFIX}/var" CONFIGURE_ARGS= --disable-suid-install --localstatedir="${PREFIX}/var"

6
net/ndisc6/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1542928199 TIMESTAMP = 1547299650
SHA256 (ndisc6-1.0.3.tar.bz2) = 0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821 SHA256 (ndisc6-1.0.4.tar.bz2) = abb1da4a98d94e5abe1dd7b1c975de540306b0581cbbd36aff035118b2f25c1f
SIZE (ndisc6-1.0.3.tar.bz2) = 260294 SIZE (ndisc6-1.0.4.tar.bz2) = 264071

10
net/ndisc6/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig 2014-12-14 10:09:45 UTC --- configure.orig 2019-01-06 14:36:38 UTC
+++ configure +++ configure
@@ -5713,7 +5713,7 @@ fi @@ -5900,7 +5900,7 @@ fi
if test "X$additional_includedir" = "X/usr/local/include"; then if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then if test -n "$GCC"; then
case $host_os in case $host_os in
@ -9,7 +9,7 @@
esac esac
fi fi
fi fi
@@ -5759,7 +5759,7 @@ fi @@ -5946,7 +5946,7 @@ fi
|| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
if test -n "$GCC"; then if test -n "$GCC"; then
case $host_os in case $host_os in
@ -18,7 +18,7 @@
esac esac
fi fi
fi fi
@@ -6597,7 +6597,7 @@ fi @@ -6784,7 +6784,7 @@ fi
if test "X$additional_includedir" = "X/usr/local/include"; then if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then if test -n "$GCC"; then
case $host_os in case $host_os in
@ -27,7 +27,7 @@
esac esac
fi fi
fi fi
@@ -6643,7 +6643,7 @@ fi @@ -6830,7 +6830,7 @@ fi
|| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
if test -n "$GCC"; then if test -n "$GCC"; then
case $host_os in case $host_os in

4
net/ndisc6/files/patch-rdnssd__merge-hook.in → net/ndisc6/files/patch-rdnss_merge-hook.in
View File

@ -1,5 +1,5 @@
--- rdnssd/merge-hook.in.orig 2014-12-14 10:13:57 UTC --- rdnss/merge-hook.in.orig 2014-12-14 10:13:57 UTC
+++ rdnssd/merge-hook.in +++ rdnss/merge-hook.in
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
set -e set -e

4
net/ndisc6/files/patch-rdnssd__rdnssd.c → net/ndisc6/files/patch-rdnss_rdnssd.c
View File

@ -1,5 +1,5 @@
--- rdnssd/rdnssd.c.orig 2014-12-14 10:39:28 UTC --- rdnss/rdnssd.c.orig 2014-12-14 10:39:28 UTC
+++ rdnssd/rdnssd.c +++ rdnss/rdnssd.c
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <locale.h> #include <locale.h>

6
net/ndisc6/files/patch-rdnssd__rdnssd.h → net/ndisc6/files/patch-rdnss_rdnssd.h
View File

@ -1,6 +1,6 @@
--- rdnssd/rdnssd.h.orig 2011-10-17 15:35:11 UTC --- rdnss/rdnssd.h.orig 2016-12-07 18:11:55 UTC
+++ rdnssd/rdnssd.h +++ rdnss/rdnssd.h
@@ -32,24 +32,6 @@ extern const rdnss_src_t rdnss_netlink, @@ -32,24 +32,6 @@ extern const rdnss_src_t rdnss_netlink, rdnss_icmp;
#define ND_OPT_RDNSS 25 #define ND_OPT_RDNSS 25
#define ND_OPT_DNSSL 31 #define ND_OPT_DNSSL 31

4
net/ndisc6/files/patch-src-ndisc.c
View File

@ -1,6 +1,6 @@
--- src/ndisc.c.orig 2014-12-14 10:39:28 UTC --- src/ndisc.c.orig 2016-12-07 16:43:04 UTC
+++ src/ndisc.c +++ src/ndisc.c
@@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len @@ -532,7 +532,7 @@ parseadv (const uint8_t *buf, size_t len, const struct
printf (_("Stateful other conf. : %3s\n"), printf (_("Stateful other conf. : %3s\n"),
gettext ((v & ND_RA_FLAG_OTHER) ? N_ ("Yes") : N_("No"))); gettext ((v & ND_RA_FLAG_OTHER) ? N_ ("Yes") : N_("No")));
printf (_("Mobile home agent : %3s\n"), printf (_("Mobile home agent : %3s\n"),

1
net/ndisc6/pkg-plist
View File

@ -26,5 +26,6 @@ sbin/tracert6
%%NLS%%share/locale/en/LC_MESSAGES/ndisc6.mo %%NLS%%share/locale/en/LC_MESSAGES/ndisc6.mo
%%NLS%%share/locale/en_GB/LC_MESSAGES/ndisc6.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/ndisc6.mo
%%NLS%%share/locale/fr/LC_MESSAGES/ndisc6.mo %%NLS%%share/locale/fr/LC_MESSAGES/ndisc6.mo
%%NLS%%share/locale/sv/LC_MESSAGES/ndisc6.mo
@owner nobody @owner nobody
@dir var/run/rdnssd @dir var/run/rdnssd

2
www/codeigniter/Makefile
View File

@ -5,7 +5,7 @@ PORTNAME= codeigniter
PORTVERSION= 3.1.6 PORTVERSION= 3.1.6
CATEGORIES= www CATEGORIES= www
MAINTAINER= ports@FreeBSD.org MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Framework for developing PHP web applications COMMENT= Framework for developing PHP web applications
LICENSE= MIT LICENSE= MIT

2
www/codeigniter/pkg-descr
View File

@ -2,4 +2,4 @@ CodeIgniter is a powerful PHP framework with a very small footprint,
built for developers who need a simple and elegant toolkit to create built for developers who need a simple and elegant toolkit to create
full-featured web applications. full-featured web applications.
WWW: http://www.codeigniter.com/ WWW: https://www.codeigniter.com/

2
www/mod_pagespeed/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= mod_pagespeed PORTNAME= mod_pagespeed
PORTVERSION= 1.12.34.2 PORTVERSION= 1.12.34.2
PORTREVISION= 17 PORTREVISION= 18
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= www devel CATEGORIES= www devel
MASTER_SITES= LOCAL/mmokhi:boringssl,chromium_base,chromium_build,googleurl,gflags_arch,gflags_src,libjpeg_turbo_src,yasm_patched,libwebp,modpb64 \ MASTER_SITES= LOCAL/mmokhi:boringssl,chromium_base,chromium_build,googleurl,gflags_arch,gflags_src,libjpeg_turbo_src,yasm_patched,libwebp,modpb64 \

44
www/mod_pagespeed/files/patch-third__party_grpc_src_src_core_lib_security_credentials_jwt_jwt__verifier.c Normal file
View File

@ -0,0 +1,44 @@
--- third_party/grpc/src/src/core/lib/security/credentials/jwt/jwt_verifier.c.orig 2018-12-27 21:47:56 UTC
+++ third_party/grpc/src/src/core/lib/security/credentials/jwt/jwt_verifier.c
@@ -467,6 +467,7 @@ static EVP_PKEY *pkey_from_jwk(const grp
const grpc_json *key_prop;
RSA *rsa = NULL;
EVP_PKEY *result = NULL;
+ BIGNUM *ee = NULL, *nn = NULL;
GPR_ASSERT(kty != NULL && json != NULL);
if (strcmp(kty, "RSA") != 0) {
@@ -480,14 +481,29 @@ static EVP_PKEY *pkey_from_jwk(const grp
}
for (key_prop = json->child; key_prop != NULL; key_prop = key_prop->next) {
if (strcmp(key_prop->key, "n") == 0) {
- rsa->n = bignum_from_base64(validate_string_field(key_prop, "n"));
- if (rsa->n == NULL) goto end;
+ BIGNUM *n = bignum_from_base64(validate_string_field(key_prop, "n"));
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ rsa->n = n;
+#else
+ RSA_set0_key(rsa, &n, NULL, NULL);
+#endif
+ if (n == NULL) goto end;
} else if (strcmp(key_prop->key, "e") == 0) {
- rsa->e = bignum_from_base64(validate_string_field(key_prop, "e"));
- if (rsa->e == NULL) goto end;
+ BIGNUM *e = bignum_from_base64(validate_string_field(key_prop, "e"));
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ rsa->e = e;
+#else
+ RSA_set0_key(rsa, NULL, &e, NULL);
+#endif
+ if (e == NULL) goto end;
}
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
if (rsa->e == NULL || rsa->n == NULL) {
+#else
+ RSA_get0_key(rsa, &nn, &ee, NULL);
+ if (ee == NULL || nn == NULL) {
+#endif
gpr_log(GPR_ERROR, "Missing RSA public key field.");
goto end;
}

142
www/mod_pagespeed/files/patch-third__party_serf_instaweb__ssl__buckets.c
View File

@ -1,6 +1,146 @@
--- third_party/serf/instaweb_ssl_buckets.c.orig 2017-06-08 22:22:39 UTC --- third_party/serf/instaweb_ssl_buckets.c.orig 2017-06-08 22:22:39 UTC
+++ third_party/serf/instaweb_ssl_buckets.c +++ third_party/serf/instaweb_ssl_buckets.c
@@ -1697,11 +1697,15 @@ int serf_ssl_cert_depth(const serf_ssl_c @@ -253,7 +253,11 @@ apps_ssl_info_callback(const SSL *s, int
/* Returns the amount read. */
static int bio_bucket_read(BIO *bio, char *in, int inlen)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
serf_ssl_context_t *ctx = bio->ptr;
+#else
+ serf_ssl_context_t *ctx = BIO_get_data(bio);
+#endif
const char *data;
apr_status_t status;
apr_size_t len;
@@ -297,7 +301,11 @@ static int bio_bucket_read(BIO *bio, cha
/* Returns the amount written. */
static int bio_bucket_write(BIO *bio, const char *in, int inl)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
serf_ssl_context_t *ctx = bio->ptr;
+#else
+ serf_ssl_context_t *ctx = BIO_get_data(bio);
+#endif
serf_bucket_t *tmp;
serf__log(SSL_VERBOSE, __FILE__, "bio_bucket_write called for %d bytes\n",
@@ -325,7 +333,11 @@ static int bio_bucket_write(BIO *bio, co
/* Returns the amount read. */
static int bio_file_read(BIO *bio, char *in, int inlen)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
apr_file_t *file = bio->ptr;
+#else
+ apr_file_t *file = BIO_get_data(bio);
+#endif
apr_status_t status;
apr_size_t len;
@@ -350,7 +362,11 @@ static int bio_file_read(BIO *bio, char
/* Returns the amount written. */
static int bio_file_write(BIO *bio, const char *in, int inl)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
apr_file_t *file = bio->ptr;
+#else
+ apr_file_t *file = BIO_get_data(bio);
+#endif
apr_size_t nbytes;
BIO_clear_retry_flags(bio);
@@ -368,10 +384,16 @@ static int bio_file_gets(BIO *bio, char
static int bio_bucket_create(BIO *bio)
{
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
bio->shutdown = 1;
bio->init = 1;
bio->num = -1;
bio->ptr = NULL;
+#else
+ BIO_set_shutdown(bio, 1);
+ BIO_set_init(bio, 1);
+ BIO_set_data(bio, NULL);
+#endif
return 1;
}
@@ -405,6 +427,7 @@ static long bio_bucket_ctrl(BIO *bio, in
return ret;
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
static BIO_METHOD bio_bucket_method = {
BIO_TYPE_MEM,
"Serf SSL encryption and decryption buckets",
@@ -434,6 +457,11 @@ static BIO_METHOD bio_file_method = {
NULL /* sslc does not have the callback_ctrl field */
#endif
};
+#else
+static BIO_METHOD *bio_bucket_method = NULL;
+static BIO_METHOD *bio_file_method = NULL;
+#endif
+
typedef enum san_copy_t {
EscapeNulAndCopy = 0,
@@ -1088,7 +1116,9 @@ static void init_ssl_libraries(void)
}
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
CRYPTO_malloc_init();
+#endif
ERR_load_crypto_strings();
SSL_load_error_strings();
SSL_library_init();
@@ -1172,8 +1202,22 @@ static int ssl_need_client_cert(SSL *ssl
continue;
}
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
bio = BIO_new(&bio_file_method);
bio->ptr = cert_file;
+#else
+ if (bio_file_method == NULL) {
+ bio_file_method = BIO_meth_new(BIO_TYPE_FILE, "Wrapper around APR file structures");
+ BIO_meth_set_write(bio_file_method, bio_file_write);
+ BIO_meth_set_read(bio_file_method, bio_file_read);
+ BIO_meth_set_gets(bio_file_method, bio_file_gets);
+ BIO_meth_set_ctrl(bio_file_method, bio_bucket_ctrl);
+ BIO_meth_set_create(bio_file_method, bio_bucket_create);
+ BIO_meth_set_destroy(bio_file_method, bio_bucket_destroy);
+ }
+ bio = BIO_new(bio_file_method);
+ BIO_set_data(bio, cert_file);
+#endif
ctx->cert_path = cert_path;
p12 = d2i_PKCS12_bio(bio, NULL);
@@ -1351,8 +1395,21 @@ static serf_ssl_context_t *ssl_init_cont
disable_compression(ssl_ctx);
ssl_ctx->ssl = SSL_new(ssl_ctx->ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
ssl_ctx->bio = BIO_new(&bio_bucket_method);
ssl_ctx->bio->ptr = ssl_ctx;
+#else
+ if (bio_bucket_method == NULL) {
+ bio_bucket_method = BIO_meth_new(BIO_TYPE_MEM, "Serf SSL encryption and decryption buckets");
+ BIO_meth_set_write(bio_bucket_method, bio_bucket_write);
+ BIO_meth_set_read(bio_bucket_method, bio_bucket_read);
+ BIO_meth_set_ctrl(bio_bucket_method, bio_bucket_ctrl);
+ BIO_meth_set_create(bio_bucket_method, bio_bucket_create);
+ BIO_meth_set_destroy(bio_bucket_method, bio_bucket_destroy);
+ }
+ ssl_ctx->bio = BIO_new(bio_bucket_method);
+ BIO_set_data(ssl_ctx->bio, ssl_ctx);
+#endif
SSL_set_bio(ssl_ctx->ssl, ssl_ctx->bio, ssl_ctx->bio);
@@ -1697,11 +1754,15 @@ int serf_ssl_cert_depth(const serf_ssl_c
int serf_ssl_check_host(const serf_ssl_certificate_t *cert, int serf_ssl_check_host(const serf_ssl_certificate_t *cert,
const char* hostname) const char* hostname)
{ {