From 8d0f40e6cb1684e02934a13f7eaa999c814156ab Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 8 Dec 2018 09:01:33 +0100 Subject: [PATCH] */*: sync with upstream Taken from: HardenedBSD --- archivers/pecl-phk/Makefile | 2 +- audio/icecast-kh/Makefile | 53 +- audio/icecast-kh/distinfo | 5 +- audio/icecast-kh/files/patch-src_auth__cmd.c | 14 + audio/icecast-kh/pkg-plist | 4 +- audio/libcoverart/Makefile | 6 +- audio/qsynth/Makefile | 5 +- audio/qsynth/distinfo | 6 +- audio/synthpod-lv2/Makefile | 24 +- audio/synthpod-lv2/pkg-plist | 1 - audio/taglookup/Makefile | 2 +- biology/Makefile | 2 + biology/checkm/Makefile | 27 + biology/checkm/distinfo | 3 + biology/checkm/pkg-descr | 12 + biology/groopm/Makefile | 24 + biology/groopm/distinfo | 3 + biology/groopm/pkg-descr | 7 + cad/gmsh/Makefile | 12 +- cad/gmsh/distinfo | 6 +- cad/gmsh/pkg-plist | 1 + cad/libredwg/Makefile | 3 +- cad/libredwg/distinfo | 6 +- comms/cqrlog/Makefile | 1 + comms/cqrlog/pkg-plist | 24 + comms/liquid-dsp/files/patch-configure.ac | 11 + .../patch-src_dotprod_src_dotprod__crcf.av.c | 39 + .../patch-src_dotprod_src_dotprod__rrrf.av.c | 39 + converters/cl-babel-sbcl/Makefile | 2 +- converters/p5-JSON-PP/Makefile | 7 +- converters/pecl-fribidi/Makefile | 2 +- databases/mysqldumper/Makefile | 2 +- databases/pear-DB/Makefile | 4 +- databases/pear-DB/distinfo | 5 +- databases/pear-MDB2_Driver_mysql/Makefile | 2 +- .../Makefile | 2 +- .../Makefile | 2 +- .../Makefile | 2 +- .../Makefile | 2 +- databases/pecl-chdb/Makefile | 2 +- databases/pecl-dbase/Makefile | 2 +- databases/pecl-drizzle/Makefile | 2 +- databases/pecl-leveldb/Makefile | 2 +- databases/pecl-memcache/Makefile | 2 +- databases/pecl-memcached2/Makefile | 2 +- databases/pecl-mongo/Makefile | 2 +- databases/pecl-pdo_user/Makefile | 2 +- databases/pecl-rrd1/Makefile | 2 +- databases/pecl-tokyo_tyrant/Makefile | 2 +- databases/php-mdcached/Makefile | 2 +- databases/php5-tarantool/Makefile | 2 +- databases/puppetdb-cli/Makefile | 2 +- databases/py-alembic/Makefile | 2 +- databases/py-alembic/distinfo | 6 +- databases/py-pymysql/Makefile | 2 +- databases/py-pymysql/distinfo | 6 +- databases/py-pymysql/pkg-descr | 2 +- databases/sqlbuddy/Makefile | 2 +- deskutils/phpcollab/Makefile | 2 +- deskutils/simplegroupware/Makefile | 2 +- deskutils/surrealtodo/Makefile | 2 +- devel/Makefile | 4 + devel/arachne-pnr/files/patch-src_util.cc | 10 + devel/bingrep/Makefile | 2 +- devel/cl-alexandria-sbcl/Makefile | 2 +- devel/cl-infix-sbcl/Makefile | 2 +- devel/cl-port-sbcl/Makefile | 2 +- devel/cl-split-sequence-sbcl/Makefile | 2 +- devel/cl-trivial-features-sbcl/Makefile | 2 +- devel/cl-trivial-gray-streams-sbcl/Makefile | 2 +- devel/efivar/Makefile | 2 +- devel/efivar/distinfo | 5 +- devel/efivar/pkg-descr | 2 +- devel/git-lfs/Makefile | 2 +- devel/git-lfs/distinfo | 6 +- devel/gitlab-runner/Makefile | 8 +- devel/gitlab-runner/distinfo | 6 +- devel/grumpy/Makefile | 4 +- devel/grumpy/distinfo | 6 +- devel/grumpy/pkg-plist | 897 +++-- devel/hs-ShellCheck/Makefile | 2 +- devel/hs-ShellCheck/distinfo | 6 +- devel/ipython/Makefile | 8 +- devel/ipython/distinfo | 6 +- devel/jenkins-lts/Makefile | 2 +- devel/jenkins-lts/distinfo | 6 +- devel/kodi-platform/Makefile | 4 +- devel/kodi-platform/distinfo | 6 +- devel/libdap/Makefile | 2 +- devel/libdap/distinfo | 6 +- devel/libdap/pkg-plist | 2 +- devel/libdbusmenu/Makefile | 11 +- devel/ncurses/Makefile | 2 +- devel/ncurses/distinfo | 6 +- devel/ncurses/files/patch-configure | 14 - devel/p5-Test-WWW-Mechanize/Makefile | 5 +- devel/p5-Test-WWW-Mechanize/distinfo | 6 +- devel/pecl-APCu4/Makefile | 2 +- devel/pecl-expect/Makefile | 2 +- devel/pecl-gearman/Makefile | 2 +- devel/pecl-htscanner/Makefile | 2 +- devel/pecl-inotify/Makefile | 2 +- devel/pecl-intl/Makefile | 2 +- devel/pecl-jsmin2/Makefile | 2 +- devel/pecl-jsonc/Makefile | 2 +- devel/pecl-jsonnet/Makefile | 2 +- devel/pecl-judy/Makefile | 2 +- devel/pecl-libevent/Makefile | 2 +- devel/pecl-memoize/Makefile | 2 +- devel/pecl-msgpack0/Makefile | 2 +- devel/pecl-ncurses/Makefile | 2 +- devel/pecl-newt/Makefile | 2 +- devel/pecl-params/Makefile | 2 +- devel/pecl-propro/Makefile | 2 +- devel/pecl-pthreads2/Makefile | 2 +- devel/pecl-qb/Makefile | 2 +- devel/pecl-raphf/Makefile | 2 +- devel/pecl-runkit/Makefile | 2 +- devel/pecl-scream/Makefile | 2 +- devel/pecl-spl_types/Makefile | 2 +- devel/pecl-statgrab/Makefile | 2 +- devel/pecl-strict/Makefile | 2 +- devel/pecl-svn/Makefile | 2 +- devel/pecl-test_helpers/Makefile | 2 +- devel/pecl-uopz/Makefile | 2 +- devel/pecl-uploadprogress/Makefile | 2 +- devel/pecl-uri_template/Makefile | 2 +- devel/pecl-vld/Makefile | 2 +- devel/pecl-weakref/Makefile | 2 +- devel/pecl-xhprof/Makefile | 2 +- devel/php-jq/Makefile | 2 +- devel/php-memoize/Makefile | 2 +- devel/php-scalar_objects/Makefile | 2 +- devel/php-uprofiler/Makefile | 2 +- devel/php5-blitz-devel/Makefile | 2 +- devel/php5-blitz/Makefile | 2 +- devel/php5-dav/Makefile | 2 +- devel/php5-ice/Makefile | 2 +- devel/php5-pinba/Makefile | 2 +- devel/php5-thrift/Makefile | 2 +- devel/pijul/Makefile | 2 +- devel/pmdk/Makefile | 36 + devel/pmdk/distinfo | 3 + devel/pmdk/files/patch-src_Makefile.inc | 11 + devel/pmdk/files/patch-src_common.inc | 34 + .../patch-src_common_os__auto__flush__linux.c | 11 + devel/pmdk/files/patch-src_common_os__posix.c | 14 + devel/pmdk/files/patch-src_common_queue.h | 13 + devel/pmdk/pkg-descr | 6 + devel/pmdk/pkg-message | 2 + devel/pmdk/pkg-plist | 347 ++ devel/protobuf/Makefile | 2 +- devel/py-ipykernel5/Makefile | 27 + devel/py-ipykernel5/distinfo | 3 + devel/py-ipykernel5/pkg-descr | 3 + devel/py-jenkins-job-builder/Makefile | 2 +- devel/py-jenkins-job-builder/distinfo | 6 +- devel/py-jupyter_console/Makefile | 12 +- devel/py-jupyter_console/distinfo | 6 +- devel/py-py_interface/Makefile | 4 +- devel/py-py_interface/distinfo | 6 +- devel/py-qtconsole/Makefile | 12 +- devel/py-qtconsole/distinfo | 6 +- devel/py-vulture/Makefile | 24 + devel/py-vulture/distinfo | 3 + devel/py-vulture/pkg-descr | 17 + devel/py-widgetsnbextension/Makefile | 2 +- devel/py-widgetsnbextension/distinfo | 6 +- devel/racer/Makefile | 28 +- devel/racer/distinfo | 54 +- devel/racer/files/patch-rustc-ap-syntax-237 | 348 -- devel/racerd/Makefile | 2 +- devel/ruby-build/Makefile | 2 +- devel/ruby-build/distinfo | 6 +- devel/rubygem-aws-sdk-core/Makefile | 2 +- devel/rubygem-aws-sdk-core/distinfo | 6 +- devel/rubygem-aws-sdk-resources/Makefile | 2 +- devel/rubygem-aws-sdk-resources/distinfo | 6 +- devel/rubygem-aws-sdk/Makefile | 2 +- devel/rubygem-aws-sdk/distinfo | 6 +- devel/rubygem-mixlib-archive/Makefile | 7 +- devel/rubygem-mixlib-archive/distinfo | 6 +- devel/rubygem-ransack/Makefile | 7 +- devel/rubygem-ransack/distinfo | 6 +- devel/rubygem-rubocop/Makefile | 2 +- devel/rubygem-rubocop/distinfo | 6 +- devel/rust-bindgen/Makefile | 1 + devel/rust-cbindgen/Makefile | 1 + devel/sccache/Makefile | 2 +- devel/staf/Makefile | 8 +- .../files/patch-stafproc_STAFFSService.cpp | 39 + devel/ticcutils/Makefile | 35 + devel/ticcutils/distinfo | 3 + devel/ticcutils/files/patch-configure.ac | 19 + devel/ticcutils/files/patch-src_Makefile.am | 10 + devel/ticcutils/pkg-descr | 5 + devel/ticcutils/pkg-plist | 33 + devel/tigcc/Makefile | 15 +- devel/tokei/Makefile | 2 +- dns/amass/Makefile | 3 +- dns/amass/distinfo | 6 +- dns/doh-proxy/Makefile | 2 +- editors/kak-lsp/Makefile | 1 + editors/xi-core/Makefile | 2 +- emulators/citra/Makefile | 4 +- emulators/citra/distinfo | 6 +- emulators/gxemul/Makefile | 2 +- emulators/gxemul/distinfo | 6 +- emulators/ppsspp/Makefile | 4 +- emulators/ppsspp/distinfo | 10 +- emulators/wine-devel/Makefile | 1 + finance/php-tclink/Makefile | 2 +- games/7kaa/Makefile | 1 - games/blobwars/Makefile | 6 +- games/blobwars/pkg-descr | 2 +- games/easyrpg-player/Makefile | 36 +- games/easyrpg-player/distinfo | 6 +- .../easyrpg-player/files/patch-CMakeLists.txt | 14 + games/genact/Makefile | 2 +- games/liblcf/Makefile | 11 +- games/liblcf/distinfo | 6 +- games/liblcf/pkg-plist | 11 +- games/lwjgl/Makefile | 15 +- games/mkgichessclub/Makefile | 2 +- games/onscripter/Makefile | 2 +- games/onscripter/distinfo | 6 +- graphics/gauche-gl/Makefile | 2 +- .../gauche-gl/files/patch-src_Makefile.in | 11 + .../gexiv2/files/patch-gexiv2_meson.build | 15 +- graphics/gmic/Makefile | 10 +- graphics/gmic/distinfo | 6 +- graphics/gmic/files/patch-CMakeLists.txt | 6 +- graphics/gmic/files/patch-src_gmic.cpp | 6 +- .../patch-src_bench_graphene-bench-utils.c | 20 + graphics/mapserver/Makefile | 1 - graphics/netpbm/Makefile | 4 +- graphics/netpbm/distinfo | 6 +- graphics/pecl-gmagick/Makefile | 2 +- graphics/pecl-imlib2/Makefile | 2 +- graphics/php-gdal/Makefile | 2 +- graphics/php-libpuzzle/Makefile | 2 +- graphics/php-magickwand/Makefile | 2 +- graphics/php5-ffmpeg/Makefile | 2 +- graphics/py-termtosvg/Makefile | 2 +- graphics/py-termtosvg/distinfo | 6 +- japanese/php5-mecab/Makefile | 2 +- lang/gcc7-devel/Makefile | 2 +- lang/gcc7-devel/distinfo | 6 +- lang/gcc9-devel/Makefile | 2 +- lang/gcc9-devel/distinfo | 6 +- lang/ghc/Makefile | 2 - lang/ghc/bsd.ghc.mk | 76 +- lang/ghc/distinfo | 14 +- lang/ghc/files/build.boot.mk.in | 9 - lang/ghc/files/build.mk.in | 1 + lang/ghc843/Makefile | 2 - lang/ghc843/distinfo | 14 +- lang/ghc843/files/build.boot.mk.in | 9 - lang/ghc843/files/build.mk.in | 1 + lang/pecl-perl/Makefile | 2 +- lang/php56-extensions/Makefile | 2 +- lang/php56/Makefile.ext | 2 +- lang/php71-extensions/Makefile | 2 +- lang/php72-extensions/Makefile | 2 +- lang/php72/Makefile | 2 +- lang/php72/Makefile.ext | 2 +- lang/php72/distinfo | 6 +- lang/php73-extensions/Makefile | 2 +- lang/php73/Makefile | 4 +- lang/php73/Makefile.ext | 2 +- lang/php73/distinfo | 6 +- lang/rust/Makefile | 8 +- lang/rust/distinfo | 30 +- ...rc_vendor_openssl-sys_.cargo-checksum.json | 7 +- ...patch-src_vendor_openssl-sys_build_cfgs.rs | 22 - ...patch-src_vendor_openssl-sys_build_main.rs | 62 +- .../patch-src_vendor_openssl-sys_src_aes.rs | 31 - .../patch-src_vendor_openssl-sys_src_asn1.rs | 64 - .../patch-src_vendor_openssl-sys_src_bio.rs | 153 - .../patch-src_vendor_openssl-sys_src_bn.rs | 163 - .../patch-src_vendor_openssl-sys_src_cms.rs | 82 - .../patch-src_vendor_openssl-sys_src_conf.rs | 10 - ...patch-src_vendor_openssl-sys_src_crypto.rs | 125 - .../patch-src_vendor_openssl-sys_src_dh.rs | 27 - .../patch-src_vendor_openssl-sys_src_dsa.rs | 69 - .../patch-src_vendor_openssl-sys_src_dtls1.rs | 6 - .../patch-src_vendor_openssl-sys_src_ec.rs | 206 -- .../patch-src_vendor_openssl-sys_src_err.rs | 53 - .../patch-src_vendor_openssl-sys_src_evp.rs | 313 -- .../patch-src_vendor_openssl-sys_src_hmac.rs | 33 - .../patch-src_vendor_openssl-sys_src_lib.rs | 3021 ----------------- ...src_vendor_openssl-sys_src_libressl_mod.rs | 639 ---- ...rc_vendor_openssl-sys_src_libressl_v250.rs | 224 -- ...rc_vendor_openssl-sys_src_libressl_v251.rs | 92 - ...rc_vendor_openssl-sys_src_libressl_v273.rs | 125 - ...patch-src_vendor_openssl-sys_src_macros.rs | 72 - ...tch-src_vendor_openssl-sys_src_obj__mac.rs | 917 ----- ...patch-src_vendor_openssl-sys_src_object.rs | 21 - .../patch-src_vendor_openssl-sys_src_ocsp.rs | 121 - ...-src_vendor_openssl-sys_src_openssl_mod.rs | 86 - ...src_vendor_openssl-sys_src_openssl_v10x.rs | 1008 ------ ...src_vendor_openssl-sys_src_openssl_v110.rs | 398 --- ...src_vendor_openssl-sys_src_openssl_v111.rs | 140 - ...ch-src_vendor_openssl-sys_src_ossl__typ.rs | 992 ------ .../patch-src_vendor_openssl-sys_src_pem.rs | 140 - ...patch-src_vendor_openssl-sys_src_pkcs12.rs | 59 - .../patch-src_vendor_openssl-sys_src_rand.rs | 9 - .../patch-src_vendor_openssl-sys_src_rsa.rs | 181 - ...ch-src_vendor_openssl-sys_src_safestack.rs | 4 - .../patch-src_vendor_openssl-sys_src_sha.rs | 73 - .../patch-src_vendor_openssl-sys_src_srtp.rs | 21 - .../patch-src_vendor_openssl-sys_src_ssl.rs | 1232 ------- .../patch-src_vendor_openssl-sys_src_ssl3.rs | 8 - .../patch-src_vendor_openssl-sys_src_stack.rs | 48 - .../patch-src_vendor_openssl-sys_src_tls1.rs | 114 - .../patch-src_vendor_openssl-sys_src_x509.rs | 351 -- ...ch-src_vendor_openssl-sys_src_x509__vfy.rs | 156 - ...patch-src_vendor_openssl-sys_src_x509v3.rs | 95 - .../files/patch-src_vendor_openssl_build.rs | 12 - ...ch-src_vendor_openssl_src_ssl_callbacks.rs | 39 - lang/sbcl/Makefile | 2 +- lang/sbcl/distinfo | 10 +- mail/dracmail/Makefile | 2 +- mail/pecl-mailparse2/Makefile | 2 +- mail/pecl-pop3/Makefile | 2 +- mail/php71-imap/Makefile | 1 - mail/php71-imap/files/patch-php__imap.c | 40 - mail/php71-imap/files/patch-php__imap.h | 10 - mail/php72-imap/Makefile | 1 - mail/php72-imap/files/patch-php__imap.c | 40 - mail/php72-imap/files/patch-php__imap.h | 10 - mail/php73-imap/files/patch-php__imap.c | 40 - mail/php73-imap/files/patch-php__imap.h | 10 - mail/thunderbird-i18n/Makefile | 2 +- mail/thunderbird-i18n/distinfo | 234 +- mail/thunderbird/Makefile | 3 +- mail/thunderbird/distinfo | 6 +- math/Makefile | 5 + math/R-cran-RcppEigen/Makefile | 2 +- math/R-cran-RcppEigen/distinfo | 6 +- math/barvinok/Makefile | 25 + math/barvinok/distinfo | 3 + .../files/patch-interface_all__barvinok.h | 6 + math/barvinok/pkg-descr | 6 + math/barvinok/pkg-plist | 22 + math/cadabra2/Makefile | 7 +- math/cadabra2/distinfo | 6 +- .../files/patch-client__server_CMakeLists.txt | 57 +- .../files/patch-client__server_Server.cc | 11 - math/cadabra2/files/patch-cmake_version.cmake | 18 +- math/cadabra2/files/patch-core_CMakeLists.txt | 47 +- .../files/patch-frontend_gtkmm_CMakeLists.txt | 42 +- math/cadabra2/files/patch-pybind11-libc++7 | 26 - math/cadabra2/pkg-plist | 15 +- math/latte-integrale/Makefile | 39 + math/latte-integrale/distinfo | 3 + .../files/patch-EXAMPLES_Makefile.am | 9 + math/latte-integrale/files/patch-Makefile.am | 14 + .../files/patch-code_maple_Makefile.am | 8 + math/latte-integrale/files/patch-configure.ac | 11 + .../files/patch-doc_Makefile.am | 8 + math/latte-integrale/pkg-descr | 12 + math/latte-integrale/pkg-plist | 25 + math/pecl-big_int/Makefile | 2 +- math/pecl-bitset2/Makefile | 2 +- math/pecl-stats/Makefile | 2 +- math/pecl-trader/Makefile | 2 +- math/polylib/Makefile | 22 + math/polylib/distinfo | 3 + math/polylib/pkg-descr | 20 + math/polylib/pkg-plist | 43 + math/py-deap/Makefile | 21 + math/py-deap/distinfo | 3 + math/py-deap/pkg-descr | 23 + math/timbl/Makefile | 25 +- math/timbl/distinfo | 5 +- math/timbl/pkg-plist | 22 +- math/topcom/Makefile | 1 - math/visualpolylib/Makefile | 29 + math/visualpolylib/distinfo | 3 + math/visualpolylib/files/patch-configure | 16 + math/visualpolylib/pkg-descr | 5 + math/vtk8/Makefile | 5 - multimedia/aom/Makefile | 4 +- multimedia/aom/distinfo | 6 +- multimedia/dtv-scan-tables/Makefile | 2 +- multimedia/dtv-scan-tables/distinfo | 6 +- multimedia/libva-intel-media-driver/Makefile | 6 +- .../libva-intel-media-driver/pkg-message | 7 + multimedia/tvheadend/Makefile | 2 +- .../files/patch-src_webui_static_app_epg.js | 44 + .../tvheadend/files/patch-src_webui_webui.c | 80 + net-im/fractal/Makefile | 2 +- net-im/ktp-accounts-kcm/Makefile | 6 +- net-im/ktp-accounts-kcm/pkg-descr | 2 +- net-im/pecl-stomp/Makefile | 2 +- net-im/py-xmpppy/Makefile | 2 + net-mgmt/cacti88/Makefile | 2 +- net-mgmt/hawk/Makefile | 2 +- net-mgmt/ipplan/Makefile | 2 +- net-mgmt/nedi/Makefile | 2 +- net-mgmt/pandorafms_console/Makefile | 2 +- net-mgmt/phpip/Makefile | 2 +- net-mgmt/zabbix22-frontend/Makefile | 2 +- net-mgmt/zabbix3-frontend/Makefile | 2 +- net-mgmt/zabbix32-frontend/Makefile | 2 +- net-mgmt/zabbix34-frontend/Makefile | 2 +- net-mgmt/zabbix4-frontend/Makefile | 2 +- net-p2p/qtum/Makefile | 3 +- net-p2p/qtum/distinfo | 6 +- net/Makefile | 1 + net/intel-ixl-kmod/Makefile | 3 +- net/intel-ixl-kmod/distinfo | 6 +- net/pecl-apn/Makefile | 2 +- net/pecl-ip2location/Makefile | 2 +- net/pecl-mosquitto/Makefile | 2 +- net/pecl-oauth/Makefile | 2 +- net/pecl-yaz/Makefile | 2 +- net/pecl-yp/Makefile | 2 +- net/py-netif/Makefile | 5 +- net/py-netif/distinfo | 6 +- net/rabbiteer/Makefile | 2 +- net/routinator/Makefile | 154 + net/routinator/distinfo | 253 ++ net/routinator/pkg-descr | 8 + net/wireshark/Makefile | 4 +- net/wireshark/distinfo | 6 +- net/wireshark/pkg-plist | 8 +- ports-mgmt/tinderbox/Makefile | 2 +- print/lyx/Makefile | 7 +- print/lyx/distinfo | 6 +- .../patch-gentoo_git-lyx-2.3.0-qt-5.11.patch | 19 - print/pecl-haru/Makefile | 2 +- print/pecl-ps/Makefile | 2 +- science/Makefile | 1 + science/atompaw/Makefile | 8 +- science/atompaw/distinfo | 6 +- science/bagel/Makefile | 4 +- science/bagel/distinfo | 6 +- science/cdo/Makefile | 2 - science/coordgenlibs/Makefile | 2 +- science/coordgenlibs/distinfo | 6 +- science/coordgenlibs/pkg-plist | 6 +- science/latte/Makefile | 2 + science/nwchem/Makefile | 3 + science/nwchem/distinfo | 4 +- science/py-chempy/Makefile | 2 +- science/py-chempy/distinfo | 6 +- science/py-pygeodesy/Makefile | 19 + science/py-pygeodesy/distinfo | 3 + science/py-pygeodesy/pkg-descr | 6 + security/cargo-audit/Makefile | 2 +- security/cl-md5-sbcl/Makefile | 2 +- security/kr/Makefile | 2 +- security/p5-OpenCA-OpenSSL/Makefile | 4 +- security/pecl-crack/Makefile | 2 +- security/pecl-mcrypt/Makefile | 2 +- security/pecl-ssh2-0/Makefile | 2 +- security/php-suhosin/Makefile | 2 +- security/phpdeadlock/Makefile | 2 +- security/py-acme/distinfo | 6 +- security/py-acme/version.mk | 2 +- security/py-certbot-apache/distinfo | 6 +- security/py-certbot-dns-cloudflare/distinfo | 6 +- security/py-certbot-dns-cloudxns/distinfo | 6 +- security/py-certbot-dns-digitalocean/distinfo | 6 +- security/py-certbot-dns-dnsimple/distinfo | 6 +- security/py-certbot-dns-dnsmadeeasy/distinfo | 6 +- security/py-certbot-dns-gehirn/distinfo | 6 +- security/py-certbot-dns-google/distinfo | 6 +- security/py-certbot-dns-linode/distinfo | 6 +- security/py-certbot-dns-luadns/distinfo | 6 +- security/py-certbot-dns-nsone/distinfo | 6 +- security/py-certbot-dns-ovh/distinfo | 6 +- security/py-certbot-dns-rfc2136/distinfo | 6 +- security/py-certbot-dns-route53/distinfo | 6 +- security/py-certbot-dns-sakuracloud/distinfo | 6 +- security/py-certbot-nginx/distinfo | 6 +- security/py-certbot/Makefile | 1 + security/py-certbot/distinfo | 6 +- security/py-gnutls/Makefile | 4 +- security/py-gnutls/distinfo | 6 +- security/py-trezor/Makefile | 7 +- security/py-trezor/distinfo | 6 +- ...h-vendor_trezor-common_tools_coin__info.py | 11 + sysutils/cfengine-masterfiles310/Makefile | 4 +- sysutils/exa/Makefile | 2 +- sysutils/fd/Makefile | 2 +- sysutils/flowgger/Makefile | 2 +- sysutils/iocage-devel/Makefile | 4 +- sysutils/iocage-devel/distinfo | 6 +- sysutils/mkdesktop/Makefile | 23 +- sysutils/mkdesktop/distinfo | 6 +- sysutils/mkdesktop/pkg-descr | 14 +- sysutils/p5-Sys-Hostname-Long/Makefile | 3 + sysutils/pecl-mogilefs/Makefile | 2 +- sysutils/potnet/Makefile | 1 + textproc/Makefile | 3 + textproc/bat/Makefile | 1 + textproc/cl-meta-sbcl/Makefile | 2 +- textproc/cl-ppcre-sbcl/Makefile | 2 +- textproc/libfolia/Makefile | 29 + textproc/libfolia/distinfo | 3 + textproc/libfolia/pkg-descr | 9 + textproc/libfolia/pkg-plist | 14 + textproc/libmrss-php/Makefile | 2 +- textproc/p5-Text-Trac/Makefile | 2 +- textproc/p5-Text-Trac/distinfo | 6 +- .../Makefile | 2 +- .../Makefile | 2 +- textproc/pecl-ctemplate/Makefile | 2 +- textproc/pecl-doublemetaphone/Makefile | 2 +- textproc/pecl-stem/Makefile | 2 +- textproc/pecl-syck/Makefile | 2 +- textproc/pecl-wbxml/Makefile | 2 +- textproc/pecl-xdiff/Makefile | 2 +- textproc/pecl-xslcache/Makefile | 2 +- textproc/pecl-yaml1/Makefile | 2 +- textproc/ripgrep/Makefile | 2 +- textproc/rubygem-autoprefixer-rails/Makefile | 2 +- textproc/rubygem-autoprefixer-rails/distinfo | 6 +- textproc/ucto/Makefile | 33 + textproc/ucto/distinfo | 3 + textproc/ucto/files/patch-config_Makefile.am | 12 + textproc/ucto/pkg-descr | 10 + textproc/ucto/pkg-plist | 12 + textproc/uctodata/Makefile | 23 + textproc/uctodata/distinfo | 3 + textproc/uctodata/pkg-descr | 4 + textproc/uctodata/pkg-plist | 33 + textproc/xsv-rs/Makefile | 2 +- www/asterisk-stat/Makefile | 2 +- www/atutor/Makefile | 2 +- www/cl-lml-sbcl/Makefile | 2 +- www/claroline/Makefile | 2 +- www/cliqz/Makefile | 1 + www/cmsmadesimple/Makefile | 2 +- www/coppermine/Makefile | 2 +- www/dotproject/Makefile | 2 +- www/entrans/Makefile | 2 +- www/firefox-esr-i18n/Makefile | 4 +- www/firefox-esr-i18n/distinfo | 394 +-- www/firefox-esr/Makefile | 6 +- www/firefox-esr/distinfo | 6 +- www/firefox-esr/files/patch-bug1500484 | 12 - www/firefox-esr/files/patch-bug1500850 | 26 + www/firefox-esr/files/patch-bug1509757 | 20 - www/firefox-i18n/Makefile | 3 +- www/firefox-i18n/distinfo | 386 +-- www/firefox/Makefile | 3 +- www/firefox/distinfo | 6 +- www/flashplayer/Makefile | 3 +- www/fluxbb/Makefile | 2 +- www/gallery3/Makefile | 2 +- www/geckodriver/Makefile | 2 +- www/gitlab-ce/Makefile | 4 +- www/gitlab-ce/distinfo | 6 +- www/gitlab-ce/pkg-plist | 1 + www/kplaylist/Makefile | 2 +- www/limesurvey/Makefile | 2 +- www/linux-flashplayer/Makefile | 2 +- www/linux-flashplayer/distinfo | 6 +- www/magento/Makefile | 2 +- www/mahara/Makefile | 2 +- www/miniflux/Makefile | 21 +- www/miniflux/distinfo | 6 +- www/miniflux/files/miniflux.env.sample | 2 +- www/miniflux/pkg-descr | 2 +- www/miniflux/pkg-plist | 1 + www/minio/Makefile | 4 +- www/minio/distinfo | 6 +- www/mysar/Makefile | 2 +- www/netoffice/Makefile | 2 +- www/oscommerce/Makefile | 2 +- www/p5-Catalyst-Plugin-Session/Makefile | 3 +- www/p5-Catalyst-Plugin-Session/distinfo | 5 +- www/pecl-amfext/Makefile | 2 +- www/pecl-http1/Makefile | 2 +- www/pecl-http2/Makefile | 2 +- www/pecl-sphinx/Makefile | 2 +- www/pecl-swish/Makefile | 2 +- www/pecl-twig/Makefile | 2 +- www/pecl-yaf2/Makefile | 2 +- www/pecl-yar1/Makefile | 2 +- www/php-templates/Makefile | 2 +- www/phpgroupware/Makefile | 1 - www/phprecipebook/Makefile | 2 +- www/py-httplib2/Makefile | 2 +- www/py-httplib2/distinfo | 6 +- www/py-python-digitalocean/Makefile | 8 +- www/py-python-dotenv/Makefile | 7 +- www/py-python-dotenv/distinfo | 6 +- www/redaxo/Makefile | 2 +- www/revive-adserver/Makefile | 2 +- www/rnews/Makefile | 2 +- www/sams2/Makefile | 2 +- www/seamonkey/Makefile | 2 +- www/sit/Makefile | 2 +- www/sitebar/Makefile | 2 +- www/testlink/Makefile | 2 +- www/typo3-9/Makefile | 2 +- www/usermanager/Makefile | 2 +- .../files/patch-Source_WTF_wtf_Platform.h | 20 +- www/websocat/Makefile | 1 + www/xcache/Makefile | 2 +- www/you-get/Makefile | 8 +- www/you-get/distinfo | 6 +- x11-toolkits/bwidget/Makefile | 5 +- x11-toolkits/bwidget/distinfo | 6 +- x11-toolkits/gtksourceview3/Makefile | 4 +- x11-toolkits/pango/Makefile | 2 +- x11-wm/stumpwm/Makefile | 2 +- x11/admiral/Makefile | 2 +- x11/alacritty/Makefile | 1 + x11/cl-clx-sbcl/Makefile | 2 +- x11/gnome-session/Makefile | 3 +- 616 files changed, 4422 insertions(+), 14236 deletions(-) create mode 100644 audio/icecast-kh/files/patch-src_auth__cmd.c create mode 100644 biology/checkm/Makefile create mode 100644 biology/checkm/distinfo create mode 100644 biology/checkm/pkg-descr create mode 100644 biology/groopm/Makefile create mode 100644 biology/groopm/distinfo create mode 100644 biology/groopm/pkg-descr create mode 100644 comms/liquid-dsp/files/patch-configure.ac create mode 100644 comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c create mode 100644 comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c create mode 100644 devel/arachne-pnr/files/patch-src_util.cc delete mode 100644 devel/ncurses/files/patch-configure create mode 100644 devel/pmdk/Makefile create mode 100644 devel/pmdk/distinfo create mode 100644 devel/pmdk/files/patch-src_Makefile.inc create mode 100644 devel/pmdk/files/patch-src_common.inc create mode 100644 devel/pmdk/files/patch-src_common_os__auto__flush__linux.c create mode 100644 devel/pmdk/files/patch-src_common_os__posix.c create mode 100644 devel/pmdk/files/patch-src_common_queue.h create mode 100644 devel/pmdk/pkg-descr create mode 100644 devel/pmdk/pkg-message create mode 100644 devel/pmdk/pkg-plist create mode 100644 devel/py-ipykernel5/Makefile create mode 100644 devel/py-ipykernel5/distinfo create mode 100644 devel/py-ipykernel5/pkg-descr create mode 100644 devel/py-vulture/Makefile create mode 100644 devel/py-vulture/distinfo create mode 100644 devel/py-vulture/pkg-descr delete mode 100644 devel/racer/files/patch-rustc-ap-syntax-237 create mode 100644 devel/staf/files/patch-stafproc_STAFFSService.cpp create mode 100644 devel/ticcutils/Makefile create mode 100644 devel/ticcutils/distinfo create mode 100644 devel/ticcutils/files/patch-configure.ac create mode 100644 devel/ticcutils/files/patch-src_Makefile.am create mode 100644 devel/ticcutils/pkg-descr create mode 100644 devel/ticcutils/pkg-plist create mode 100644 games/easyrpg-player/files/patch-CMakeLists.txt create mode 100644 graphics/gauche-gl/files/patch-src_Makefile.in create mode 100644 graphics/graphene/files/patch-src_bench_graphene-bench-utils.c delete mode 100644 lang/ghc/files/build.boot.mk.in delete mode 100644 lang/ghc843/files/build.boot.mk.in delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_build_cfgs.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_aes.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_asn1.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_bio.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_bn.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_cms.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_conf.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_crypto.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_dh.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_dsa.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_dtls1.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_ec.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_err.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_evp.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_hmac.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v250.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v251.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v273.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_macros.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_obj__mac.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_object.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_ocsp.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_mod.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v10x.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v110.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v111.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_ossl__typ.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_pem.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_pkcs12.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_rand.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_rsa.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_safestack.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_sha.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_srtp.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_ssl.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_ssl3.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_stack.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_tls1.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_x509.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_x509__vfy.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl-sys_src_x509v3.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl_build.rs delete mode 100644 lang/rust/files/patch-src_vendor_openssl_src_ssl_callbacks.rs delete mode 100644 mail/php71-imap/files/patch-php__imap.c delete mode 100644 mail/php71-imap/files/patch-php__imap.h delete mode 100644 mail/php72-imap/files/patch-php__imap.c delete mode 100644 mail/php72-imap/files/patch-php__imap.h delete mode 100644 mail/php73-imap/files/patch-php__imap.c delete mode 100644 mail/php73-imap/files/patch-php__imap.h create mode 100644 math/barvinok/Makefile create mode 100644 math/barvinok/distinfo create mode 100644 math/barvinok/files/patch-interface_all__barvinok.h create mode 100644 math/barvinok/pkg-descr create mode 100644 math/barvinok/pkg-plist delete mode 100644 math/cadabra2/files/patch-client__server_Server.cc delete mode 100644 math/cadabra2/files/patch-pybind11-libc++7 create mode 100644 math/latte-integrale/Makefile create mode 100644 math/latte-integrale/distinfo create mode 100644 math/latte-integrale/files/patch-EXAMPLES_Makefile.am create mode 100644 math/latte-integrale/files/patch-Makefile.am create mode 100644 math/latte-integrale/files/patch-code_maple_Makefile.am create mode 100644 math/latte-integrale/files/patch-configure.ac create mode 100644 math/latte-integrale/files/patch-doc_Makefile.am create mode 100644 math/latte-integrale/pkg-descr create mode 100644 math/latte-integrale/pkg-plist create mode 100644 math/polylib/Makefile create mode 100644 math/polylib/distinfo create mode 100644 math/polylib/pkg-descr create mode 100644 math/polylib/pkg-plist create mode 100644 math/py-deap/Makefile create mode 100644 math/py-deap/distinfo create mode 100644 math/py-deap/pkg-descr create mode 100644 math/visualpolylib/Makefile create mode 100644 math/visualpolylib/distinfo create mode 100644 math/visualpolylib/files/patch-configure create mode 100644 math/visualpolylib/pkg-descr create mode 100644 multimedia/libva-intel-media-driver/pkg-message create mode 100644 multimedia/tvheadend/files/patch-src_webui_static_app_epg.js create mode 100644 multimedia/tvheadend/files/patch-src_webui_webui.c create mode 100644 net/routinator/Makefile create mode 100644 net/routinator/distinfo create mode 100644 net/routinator/pkg-descr delete mode 100644 print/lyx/files/patch-gentoo_git-lyx-2.3.0-qt-5.11.patch create mode 100644 science/py-pygeodesy/Makefile create mode 100644 science/py-pygeodesy/distinfo create mode 100644 science/py-pygeodesy/pkg-descr create mode 100644 security/py-trezor/files/patch-vendor_trezor-common_tools_coin__info.py create mode 100644 textproc/libfolia/Makefile create mode 100644 textproc/libfolia/distinfo create mode 100644 textproc/libfolia/pkg-descr create mode 100644 textproc/libfolia/pkg-plist create mode 100644 textproc/ucto/Makefile create mode 100644 textproc/ucto/distinfo create mode 100644 textproc/ucto/files/patch-config_Makefile.am create mode 100644 textproc/ucto/pkg-descr create mode 100644 textproc/ucto/pkg-plist create mode 100644 textproc/uctodata/Makefile create mode 100644 textproc/uctodata/distinfo create mode 100644 textproc/uctodata/pkg-descr create mode 100644 textproc/uctodata/pkg-plist delete mode 100644 www/firefox-esr/files/patch-bug1500484 create mode 100644 www/firefox-esr/files/patch-bug1500850 delete mode 100644 www/firefox-esr/files/patch-bug1509757 diff --git a/archivers/pecl-phk/Makefile b/archivers/pecl-phk/Makefile index 222c443ce08..66fedf7ef8a 100644 --- a/archivers/pecl-phk/Makefile +++ b/archivers/pecl-phk/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP301 USES= php:pecl USE_PHP= hash:build -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-phk diff --git a/audio/icecast-kh/Makefile b/audio/icecast-kh/Makefile index b8288e6b989..14309228a33 100644 --- a/audio/icecast-kh/Makefile +++ b/audio/icecast-kh/Makefile @@ -3,65 +3,50 @@ PORTNAME= icecast DISTVERSIONPREFIX= icecast- -DISTVERSION= ${ICVERSION}-kh${KH} -PORTREVISION= 3 +DISTVERSION= 2.4.0-kh10 CATEGORIES= audio net ipv6 PKGNAMESUFFIX= -kh -MAINTAINER= anes@anes.su +MAINTAINER= ports@FreeBSD.org COMMENT= Streaming mp3/ogg-vorbis audio server, KH branch LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libogg.so:audio/libogg \ libtheora.so:multimedia/libtheora \ - libvorbis.so:audio/libvorbis \ - libxml2.so:textproc/libxml2 \ - libxslt.so:textproc/libxslt + libvorbis.so:audio/libvorbis +USES= gmake gnome localbase pkgconfig ssl USE_GITHUB= yes GH_ACCOUNT= karlheyes GH_PROJECT= icecast-kh +USE_GNOME= libxml2 libxslt +USE_RC_SUBR= icecast + +CONFLICTS_INSTALL= icecast icecast2 -USES= gmake pkgconfig ssl GNU_CONFIGURE= yes -USE_RC_SUBR= ${PORTNAME} -SUB_FILES= pkg-message CONFIGURE_ENV= OGG_PREFIX=${LOCALBASE} -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +# /usr/bin/ld: error: undefined symbol: ERR_get_error +LIBS+= -L${OPENSSLLIB} -lcrypto -ICVERSION= 2.3.3 -KH= 10 +SUB_FILES= pkg-message OPTIONS_DEFINE= CURL DOCS KATE SPEEX OPTIONS_DEFAULT= CURL KATE SPEEX + CURL_DESC= Support Directory server interaction (YP) via curl KATE_DESC= Support Kate/Skeleton codec within Ogg streams SPEEX_DESC= Support Speex codec within Ogg streams -CONFLICTS_INSTALL= icecast-[0-9]* icecast2-[0-9]* +CURL_CONFIGURE_WITH= curl=${LOCALBASE} +CURL_LIB_DEPENDS= libcurl.so:ftp/curl -.include +KATE_CONFIGURE_WITH= kate +KATE_LIB_DEPENDS= libkate.so:multimedia/libkate -.if ${PORT_OPTIONS:MCURL} -BUILD_DEPENDS+= curl>=7.10:ftp/curl -CONFIGURE_ARGS+= --with-curl=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-curl -.endif - -.if ${PORT_OPTIONS:MKATE} -LIB_DEPENDS+= libkate.so:multimedia/libkate -.else -CONFIGURE_ARGS+= --without-kate -.endif - -.if ${PORT_OPTIONS:MSPEEX} -BUILD_DEPENDS+= speex>=1:audio/speex -CONFIGURE_ARGS+= --with-speex=${LOCALBASE} -.else -CONFIGURE_ARGS+= --without-speex -.endif +SPEEX_CONFIGURE_WITH= speex=${LOCALBASE} +SPEEX_LIB_DEPENDS= libspeex.so:audio/speex .include diff --git a/audio/icecast-kh/distinfo b/audio/icecast-kh/distinfo index c5517346677..e15eebfbf18 100644 --- a/audio/icecast-kh/distinfo +++ b/audio/icecast-kh/distinfo @@ -1,2 +1,3 @@ -SHA256 (karlheyes-icecast-kh-icecast-2.3.3-kh10_GH0.tar.gz) = c5d6e2fefe27ccc819e460bb27c67c876d66ed7ae89b094674d9e4e9857d74e4 -SIZE (karlheyes-icecast-kh-icecast-2.3.3-kh10_GH0.tar.gz) = 922537 +TIMESTAMP = 1535557669 +SHA256 (karlheyes-icecast-kh-icecast-2.4.0-kh10_GH0.tar.gz) = 783684db7b199b0e4096fcbd9f1b4c50bb79542e1a33dbaf6d817b2ba4150d33 +SIZE (karlheyes-icecast-kh-icecast-2.4.0-kh10_GH0.tar.gz) = 1004087 diff --git a/audio/icecast-kh/files/patch-src_auth__cmd.c b/audio/icecast-kh/files/patch-src_auth__cmd.c new file mode 100644 index 00000000000..86e7356e3e0 --- /dev/null +++ b/audio/icecast-kh/files/patch-src_auth__cmd.c @@ -0,0 +1,14 @@ +https://github.com/karlheyes/icecast-kh/pull/231 + +--- src/auth_cmd.c.orig 2018-08-29 15:48:26 UTC ++++ src/auth_cmd.c +@@ -35,9 +35,7 @@ + #ifdef HAVE_POLL + #include + #endif +-#ifdef HAVE_SIGNAL_H + #include +-#endif + + #include "auth.h" + #include "util.h" diff --git a/audio/icecast-kh/pkg-plist b/audio/icecast-kh/pkg-plist index 996b45a0bd8..7c50f094930 100644 --- a/audio/icecast-kh/pkg-plist +++ b/audio/icecast-kh/pkg-plist @@ -1,7 +1,7 @@ bin/icecast -etc/icecast.xml.sample +@sample etc/icecast.xml.sample %%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING +@comment %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO diff --git a/audio/libcoverart/Makefile b/audio/libcoverart/Makefile index 49674a23194..415995e4bbb 100644 --- a/audio/libcoverart/Makefile +++ b/audio/libcoverart/Makefile @@ -14,9 +14,13 @@ LICENSE= LGPL20 LIB_DEPENDS= libjansson.so:devel/jansson \ libneon.so:www/neon -USES= cmake pathfix +USES= compiler:c11 cmake pathfix +USE_CSTD= c99 +USE_CXXSTD= c++98 USE_LDCONFIG= yes +CXXFLAGS+= -Wno-implicit-fallthrough + post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/cmake/modules/*.cmake diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile index 09e24e7588c..b4a163786e7 100644 --- a/audio/qsynth/Makefile +++ b/audio/qsynth/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qsynth -PORTVERSION= 0.5.3 +PORTVERSION= 0.5.4 CATEGORIES= audio MASTER_SITES= SF @@ -17,7 +17,6 @@ LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth USES= compiler:c++11-lang gmake pkgconfig qt:5 USE_CXXSTD= c++11 USE_QT= core gui widgets x11extras buildtools_build linguisttools_build qmake_build -USE_GL= gl GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_path_ac_cv_qmake=${QMAKE} \ @@ -28,6 +27,8 @@ CONFIGURE_ENV= ac_cv_path_ac_cv_qmake=${QMAKE} \ CONFIGURE_ARGS= --localedir=${DATADIR} \ --with-fluidsynth=${LOCALBASE} +LDFLAGS+= -Wl,--as-needed # cf. PR 224488 + OPTIONS_DEFINE= GRADIENT SYSTEM_TRAY XUNIQUE OPTIONS_DEFAULT= GRADIENT SYSTEM_TRAY XUNIQUE diff --git a/audio/qsynth/distinfo b/audio/qsynth/distinfo index 427f7712819..fa63d400ec6 100644 --- a/audio/qsynth/distinfo +++ b/audio/qsynth/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539243134 -SHA256 (qsynth-0.5.3.tar.gz) = 2ce9791f8a927425d29bacc44fdfff575638b24512e0f0b6f2eca85deb67f0c9 -SIZE (qsynth-0.5.3.tar.gz) = 269252 +TIMESTAMP = 1544100637 +SHA256 (qsynth-0.5.4.tar.gz) = 2d6befb4023f8a64f35d802991d0d413e11d0307e87485428c969b94bb2bf84e +SIZE (qsynth-0.5.4.tar.gz) = 268106 diff --git a/audio/synthpod-lv2/Makefile b/audio/synthpod-lv2/Makefile index 4966ce5aa78..e8970e374cb 100644 --- a/audio/synthpod-lv2/Makefile +++ b/audio/synthpod-lv2/Makefile @@ -3,7 +3,7 @@ PORTNAME= synthpod PORTVERSION= g20170810 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= audio PKGNAMESUFFIX= -lv2 @@ -19,18 +19,18 @@ LIB_DEPENDS= liblilv-0.so:audio/lilv \ libsord-0.so:devel/sord \ libsratom-0.so:audio/sratom -USES= cmake compiler:c++11-lib pkgconfig localbase +USES= cmake:outsource compiler:c++11-lib pkgconfig localbase USE_GITHUB= yes GH_ACCOUNT= OpenMusicKontrollers GH_TAGNAME= 07cae54 USE_CXXSTD= c++11 -CMAKE_ARGS= -DBUILD_ALSA="OFF" +CMAKE_OFF= BUILD_ALSA BUILD_SANDBOX_QT4 OPTIONS_DEFINE= JACK DUMMY DOT OPTIONS_DEFAULT=JACK X11 SHOW KX OPTIONS_GROUP= UI -OPTIONS_GROUP_UI= X11 GTK2 GTK3 QT4 QT5 SHOW KX +OPTIONS_GROUP_UI= X11 GTK2 GTK3 QT5 SHOW KX OPTIONS_SUB= yes DUMMY_DESC= Build DUMMY standalone host @@ -40,7 +40,6 @@ JACK_DESC= Build JACK standalone host X11_DESC= Build X11 sandbox GTK2_DESC= Build GTK-2 sandbox GTK3_DESC= Build GTK-3 sandbox -QT4_DESC= Build Qt-4 sandbox QT5_DESC= Build Qt-5 sandbox SHOW_DESC= Build show-iface sandbox @@ -50,35 +49,32 @@ DUMMY_LIB_DEPENDS= libuv.so:devel/libuv GTK2_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_GTK2="ON" GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 +GTK2_USES= gl gnome GTK2_USE= XORG=x11,xcb,xext GL=gl,glu GNOME=glib20,gtk20,gdkpixbuf2,atk,cairo,pango gettext-runtime GTK3_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_GTK3="ON" +GTK3_USES= gl gnome GTK3_USE= XORG=x11,xcb,xext GL=glu GNOME=glib20,gtk30,gdkpixbuf2,atk,cairo,pango gettext-runtime JACK_LIB_DEPENDS= libjack.so:audio/jack \ libuv.so:devel/libuv JACK_CMAKE_OFF= -DBUILD_JACK="OFF" KX_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_KX="ON" +KX_USES= gl KX_USE= XORG=x11,xcb,xext GL=glu -QT4_USES= qt:4 -QT4_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_QT4="ON" -QT4_USE= XORG=x11,xcb,xext GL=glu QT=corelib,gui QT5_USES= qt:5 QT5_BROKEN= Build fails: https://github.com/OpenMusicKontrollers/synthpod/issues/10 QT5_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_QT5="ON" QT5_USE= XORG=x11,xcb,xext GL=glu QT=core,gui +SHOW_USES= gl SHOW_USE= XORG=x11,xcb,xext GL=glu SHOW_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_SHOW="ON" X11_CMAKE_ON= -DBUILD_UI="ON" -DBUILD_SANDBOX_X11="ON" X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm +X11_USES= gl X11_USE= XORG=x11,xcb,xext GL=gl,glu .include -.if ${PORT_OPTIONS:MQT4} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 -.endif - -.if ${PORT_OPTIONS:MX11} || ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4} || ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MSHOW} || ${PORT_OPTIONS:MKX} +.if ${PORT_OPTIONS:MX11} || ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MSHOW} || ${PORT_OPTIONS:MKX} PLIST_SUB+= UI="" .else PLIST_SUB+= UI="@comment " diff --git a/audio/synthpod-lv2/pkg-plist b/audio/synthpod-lv2/pkg-plist index e4f7a51624a..2c0454b0706 100644 --- a/audio/synthpod-lv2/pkg-plist +++ b/audio/synthpod-lv2/pkg-plist @@ -4,7 +4,6 @@ %%X11%%bin/synthpod_sandbox_x11 %%GTK2%%bin/synthpod_sandbox_gtk2 %%GTK3%%bin/synthpod_sandbox_gtk3 -%%QT4%%bin/synthpod_sandbox_qt4 %%QT5%%bin/synthpod_sandbox_qt5 %%SHOW%%bin/synthpod_sandbox_show %%KX%%bin/synthpod_sandbox_kx diff --git a/audio/taglookup/Makefile b/audio/taglookup/Makefile index 7fe4c037ac6..d942e9c3a71 100644 --- a/audio/taglookup/Makefile +++ b/audio/taglookup/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcddb.so:audio/libcddb \ libtag.so:audio/taglib -USES= pkgconfig tar:tgz +USES= compiler:c++11-lang pkgconfig tar:tgz PLIST_FILES= bin/taglookup \ man/man1/taglookup.1.gz diff --git a/biology/Makefile b/biology/Makefile index 1b0668abcb4..eed6f8e5b96 100644 --- a/biology/Makefile +++ b/biology/Makefile @@ -16,6 +16,7 @@ SUBDIR += canu SUBDIR += cd-hit SUBDIR += cdbfasta + SUBDIR += checkm SUBDIR += chemeq SUBDIR += clustal-omega SUBDIR += clustalw @@ -42,6 +43,7 @@ SUBDIR += gmap SUBDIR += gperiodic SUBDIR += grappa + SUBDIR += groopm SUBDIR += hmmer SUBDIR += htslib SUBDIR += hyphy diff --git a/biology/checkm/Makefile b/biology/checkm/Makefile new file mode 100644 index 00000000000..bec15cc5835 --- /dev/null +++ b/biology/checkm/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTNAME= CheckM +DISTVERSIONPREFIX= v +DISTVERSION= 1.0.12 +CATEGORIES= biology python + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Quality assessment tool for the microbial genomes + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}DendroPy>=4.0.0:science/py-DendroPy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.3.1:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pysam>=0.8.3:biology/py-pysam@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.9.0:science/py-scipy@${PY_FLAVOR} + +USES= python +USE_GITHUB= yes +GH_ACCOUNT= Ecogenomics +USE_PYTHON= distutils noflavors autoplist + +NO_ARCH= yes + +.include diff --git a/biology/checkm/distinfo b/biology/checkm/distinfo new file mode 100644 index 00000000000..e39206d0ecc --- /dev/null +++ b/biology/checkm/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544141583 +SHA256 (Ecogenomics-CheckM-v1.0.12_GH0.tar.gz) = 4aca26d0ae903ed7567cfc6ec53dc1d2ea909d58a0c4c6e2318a1885abbcfd91 +SIZE (Ecogenomics-CheckM-v1.0.12_GH0.tar.gz) = 211396 diff --git a/biology/checkm/pkg-descr b/biology/checkm/pkg-descr new file mode 100644 index 00000000000..a3239bad2ee --- /dev/null +++ b/biology/checkm/pkg-descr @@ -0,0 +1,12 @@ +CheckM provides a set of tools for assessing the quality of genomes recovered +from isolates, single cells, or metagenomes. It provides robust estimates of +genome completeness and contamination by using collocated sets of genes that +are ubiquitous and single-copy within a phylogenetic lineage. Assessment of +genome quality can also be examined using plots depicting key genomic +characteristics (e.g., GC, coding density) which highlight sequences outside +the expected distributions of a typical genome. CheckM also provides tools for +identifying genome bins that are likely candidates for merging based on marker +set compatibility, similarity in genomic characteristics, and proximity within +a reference genome tree. + +WWW: https://ecogenomics.github.io/CheckM/ diff --git a/biology/groopm/Makefile b/biology/groopm/Makefile new file mode 100644 index 00000000000..c336172c89d --- /dev/null +++ b/biology/groopm/Makefile @@ -0,0 +1,24 @@ +# $FreeBSD$ + +PORTNAME= GroopM +DISTVERSION= 0.3.4 +CATEGORIES= biology python +MASTER_SITES= CHEESESHOP + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Metagenomic binning suite + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}matplotlib>=1.1.0:math/py-matplotlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}scipy>=0.10.1:science/py-scipy@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tables>=2.3:devel/py-tables@${PY_FLAVOR} + +USES= python +USE_PYTHON= distutils noflavors autoplist + +NO_ARCH= yes + +.include diff --git a/biology/groopm/distinfo b/biology/groopm/distinfo new file mode 100644 index 00000000000..d34f6fd58b8 --- /dev/null +++ b/biology/groopm/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544140602 +SHA256 (GroopM-0.3.4.tar.gz) = 48bdaeb9010e7d81785697a55edc394ef36c2646b310d625a24bec740f1b6080 +SIZE (GroopM-0.3.4.tar.gz) = 127707 diff --git a/biology/groopm/pkg-descr b/biology/groopm/pkg-descr new file mode 100644 index 00000000000..969de4b5f1c --- /dev/null +++ b/biology/groopm/pkg-descr @@ -0,0 +1,7 @@ +GroopM is a metagenomic binning toolset. It leverages spatio-temoral +dynamics (differential coverage) to accurately (and almost automatically) +extract population genomes from multi-sample metagenomic datasets. + +GroopM is largely parameter-free. Use: groopm -h for more info. + +WWW: http://ecogenomics.github.io/GroopM/ diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index 83efc0ce05c..6a482ea66b3 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= gmsh -DISTVERSION= 4.0.2 -PORTREVISION= 1 +DISTVERSION= 4.0.6 CATEGORIES= cad MASTER_SITES= http://gmsh.info/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -15,9 +14,6 @@ COMMENT= Automatic 3D finite element mesh generator LICENSE= AGPLv3+ APACHE20 GPLv3+ GPLv2+ LGPL21 LICENSE_COMB= multi -BROKEN_FreeBSD_12_i386= fails to build on FreeBSD 12 i386 due to a clang bug: https://llvm.org/bugs/show_bug.cgi?id=21903 -BROKEN_FreeBSD_13_i386= fails to build on FreeBSD 13 i386 due to a clang bug: https://llvm.org/bugs/show_bug.cgi?id=21903 - LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ libfontconfig.so:x11-fonts/fontconfig \ libgmp.so:math/gmp \ @@ -33,12 +29,11 @@ USE_XORG= x11 xcursor xext xinerama xfixes xft xrender CFLAGS+= -fPIC CXXFLAGS+= -fPIC -MAKE_JOBS_UNSAFE= yes - CMAKE_ARGS= -DCMAKE_SKIP_RPATH:BOOL=YES OPTIONS_DEFINE= CGNS DOCS MED OCC SHARED STATIC OPTIONS_DEFAULT= CGNS MED OCC +OPTIONS_SUB= yes CGNS_DESC= Enable CGNS mesh import MED_DESC= Enable MED mesh and post file formats @@ -46,7 +41,6 @@ OCC_DESC= Enable OpenCASCADE geometrical models SHARED_DESC= Build shared library and install header files STATIC_DESC= Build static library -OPTIONS_SUB= yes PLIST_SUB= VER=${PORTVERSION} VE=${PORTVERSION:R} # TODO @@ -65,7 +59,7 @@ OCC_LIB_DEPENDS= libopenblas.so:math/openblas libTKernel.so:cad/opencascade OCC_USES= gnome OCC_USE= gnome=cairo SHARED_CMAKE_BOOL= ENABLE_BUILD_SHARED -SHARED_VARS= USE_LDCONFIG=yes +SHARED_USE= LDCONFIG=yes STATIC_CMAKE_BOOL= ENABLE_BUILD_LIB post-patch: diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo index ca8a5fe0057..702f7aeb1f4 100644 --- a/cad/gmsh/distinfo +++ b/cad/gmsh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538528267 -SHA256 (gmsh/gmsh-4.0.2-source.tgz) = f3c993408153961bd0bbd762458231abe50aeaabe7ab2466462975f2971e5c0d -SIZE (gmsh/gmsh-4.0.2-source.tgz) = 12764404 +TIMESTAMP = 1543925930 +SHA256 (gmsh/gmsh-4.0.6-source.tgz) = dce0aa4154908f9be8c48ec9bb31d4425c7c28b26897d882a2bce8f72c692a04 +SIZE (gmsh/gmsh-4.0.6-source.tgz) = 12791243 diff --git a/cad/gmsh/pkg-plist b/cad/gmsh/pkg-plist index d7eb2ee3ccb..b5d103e9f10 100644 --- a/cad/gmsh/pkg-plist +++ b/cad/gmsh/pkg-plist @@ -17,6 +17,7 @@ %%PORTDOCS%%%%DOCSDIR%%/demos/api/gui.cpp %%PORTDOCS%%%%DOCSDIR%%/demos/api/gui.jl %%PORTDOCS%%%%DOCSDIR%%/demos/api/gui.py +%%PORTDOCS%%%%DOCSDIR%%/demos/api/mesh_from_discrete_curve.py %%PORTDOCS%%%%DOCSDIR%%/demos/api/normals.py %%PORTDOCS%%%%DOCSDIR%%/demos/api/onelab_data.c %%PORTDOCS%%%%DOCSDIR%%/demos/api/onelab_data.cpp diff --git a/cad/libredwg/Makefile b/cad/libredwg/Makefile index 0f9ce504a48..c774269cf18 100644 --- a/cad/libredwg/Makefile +++ b/cad/libredwg/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libredwg -PORTVERSION= 0.6.2 -PORTREVISION= 1 +PORTVERSION= 0.7 CATEGORIES= cad devel MASTER_SITES= GNU diff --git a/cad/libredwg/distinfo b/cad/libredwg/distinfo index 82e02a016fb..ae2c01a6ecb 100644 --- a/cad/libredwg/distinfo +++ b/cad/libredwg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541585461 -SHA256 (libredwg-0.6.2.tar.xz) = b17a5bc2a4f7cc13aa2c26c890cba9954ca768643884c8740c1a6b045c07591f -SIZE (libredwg-0.6.2.tar.xz) = 3818848 +TIMESTAMP = 1544052766 +SHA256 (libredwg-0.7.tar.xz) = cbef6b9d48877ca26a54115b9ef9a7fd02d0279a94e79d2247f80277820b888d +SIZE (libredwg-0.7.tar.xz) = 3830064 diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile index 36f674d4f74..8bed5b2a803 100644 --- a/comms/cqrlog/Makefile +++ b/comms/cqrlog/Makefile @@ -19,6 +19,7 @@ USES= fpc lazarus:flavors shebangfix ssl:run dos2unix mysql USE_GITHUB= yes GH_ACCOUNT= ok2cqr +LLD_UNSAFE= yes SHEBANG_FILES= tools/cqrlog-apparmor-fix \ voice_keyer/voice_keyer.sh USE_FPC= cairo fcl-base chm fcl-db fcl-image fcl-json fcl-net fcl-web \ diff --git a/comms/cqrlog/pkg-plist b/comms/cqrlog/pkg-plist index 7e4ab84ce40..23287671c5b 100644 --- a/comms/cqrlog/pkg-plist +++ b/comms/cqrlog/pkg-plist @@ -15,10 +15,13 @@ share/applications/cqrlog.desktop %%DATADIR%%/ctyfiles/eqsl.txt %%DATADIR%%/ctyfiles/iota.tbl %%DATADIR%%/ctyfiles/lotw1.txt +%%DATADIR%%/ctyfiles/prop_mode.tab %%DATADIR%%/ctyfiles/qslmgr.csv +%%DATADIR%%/ctyfiles/sat_name.tab %%DATADIR%%/ctyfiles/us_states.tab %%DATADIR%%/help/contest.html %%DATADIR%%/help/cwd.html +%%DATADIR%%/help/cwh.html %%DATADIR%%/help/fldxml.html %%DATADIR%%/help/h1.html %%DATADIR%%/help/h20.html @@ -30,6 +33,8 @@ share/applications/cqrlog.desktop %%DATADIR%%/help/h26.html %%DATADIR%%/help/h27.html %%DATADIR%%/help/h28.html +%%DATADIR%%/help/h29.html +%%DATADIR%%/help/h30.html %%DATADIR%%/help/h3.html %%DATADIR%%/help/h4.html %%DATADIR%%/help/h5.html @@ -59,6 +64,9 @@ share/applications/cqrlog.desktop %%DATADIR%%/help/img/h109.png %%DATADIR%%/help/img/h11.png %%DATADIR%%/help/img/h110.png +%%DATADIR%%/help/img/h117.png +%%DATADIR%%/help/img/h118.png +%%DATADIR%%/help/img/h165.png %%DATADIR%%/help/img/h111.png %%DATADIR%%/help/img/h1112.png %%DATADIR%%/help/img/h1114.png @@ -190,8 +198,18 @@ share/applications/cqrlog.desktop %%DATADIR%%/help/img/wsjt2.png %%DATADIR%%/help/img/wsjt20.png %%DATADIR%%/help/img/wsjt21.png +%%DATADIR%%/help/img/wsjt22.png +%%DATADIR%%/help/img/wsjt23.png %%DATADIR%%/help/img/wsjt27.png %%DATADIR%%/help/img/wsjt28.png +%%DATADIR%%/help/img/wsjt29.png +%%DATADIR%%/help/img/wsjt30.png +%%DATADIR%%/help/img/wsjt31.png +%%DATADIR%%/help/img/wsjt32.png +%%DATADIR%%/help/img/wsjt33.png +%%DATADIR%%/help/img/wsjt34.png +%%DATADIR%%/help/img/wsjt35.png +%%DATADIR%%/help/img/wsjt36.png %%DATADIR%%/help/img/wsjt4.png %%DATADIR%%/help/index.html %%DATADIR%%/help/remi.html @@ -249,6 +267,7 @@ share/applications/cqrlog.desktop %%DATADIR%%/members/599dxa.txt %%DATADIR%%/members/9acwg.txt %%DATADIR%%/members/a1-club.txt +%%DATADIR%%/members/a1a-ea.txt %%DATADIR%%/members/a1-op.txt %%DATADIR%%/members/afm.txt %%DATADIR%%/members/agb.txt @@ -274,6 +293,7 @@ share/applications/cqrlog.desktop %%DATADIR%%/members/cwops.txt %%DATADIR%%/members/cwsp.txt %%DATADIR%%/members/dig.txt +%%DATADIR%%/members/dmc.txt %%DATADIR%%/members/dtc.txt %%DATADIR%%/members/ehsc.txt %%DATADIR%%/members/epc.txt @@ -298,6 +318,7 @@ share/applications/cqrlog.desktop %%DATADIR%%/members/hhc.txt %%DATADIR%%/members/hsc.txt %%DATADIR%%/members/htc.txt +%%DATADIR%%/members/kdr.txt %%DATADIR%%/members/inorc.txt %%DATADIR%%/members/jaig.txt %%DATADIR%%/members/lcc.txt @@ -324,7 +345,9 @@ share/applications/cqrlog.desktop %%DATADIR%%/members/qcwa.txt %%DATADIR%%/members/qthloc.txt %%DATADIR%%/members/rafars.txt +%%DATADIR%%/members/rcc.txt %%DATADIR%%/members/rcwc.txt +%%DATADIR%%/members/rdrc.txt %%DATADIR%%/members/ria.txt %%DATADIR%%/members/rnars.txt %%DATADIR%%/members/rrdxa.txt @@ -338,6 +361,7 @@ share/applications/cqrlog.desktop %%DATADIR%%/members/spar.txt %%DATADIR%%/members/spcwc.txt %%DATADIR%%/members/spdxc.txt +%%DATADIR%%/members/tbdxc.txt %%DATADIR%%/members/ten-ten.txt %%DATADIR%%/members/tenten.txt %%DATADIR%%/members/tfc.txt diff --git a/comms/liquid-dsp/files/patch-configure.ac b/comms/liquid-dsp/files/patch-configure.ac new file mode 100644 index 00000000000..d5571d2b85a --- /dev/null +++ b/comms/liquid-dsp/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2018-12-04 23:39:19 UTC ++++ configure.ac +@@ -195,7 +195,7 @@ else + src/dotprod/src/dotprod_rrrf.av.o \ + src/dotprod/src/dotprod_crcf.av.o \ + src/dotprod/src/sumsq.o" +- ARCH_OPTION="-fno-common -faltivec";; ++ ARCH_OPTION="-fno-common -maltivec";; + armv1*|armv2*|armv3*|armv4*|armv5*|armv6*) + # assume neon instructions are NOT available + MLIBS_DOTPROD="src/dotprod/src/dotprod_cccf.o \ diff --git a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c new file mode 100644 index 00000000000..d5f45ddf1f6 --- /dev/null +++ b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__crcf.av.c @@ -0,0 +1,39 @@ +--- src/dotprod/src/dotprod_crcf.av.c.orig 2018-12-04 23:40:11 UTC ++++ src/dotprod/src/dotprod_crcf.av.c +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #include "liquid.internal.h" + +@@ -168,8 +169,8 @@ void dotprod_crcf_execute(dotprod_crcf _q, + union { vector float v; float w[4];} s; + unsigned int nblocks; + +- ar = (vector float*)( (int)_x & ~15); +- al = ((int)_x & 15)/sizeof(float); ++ ar = (vector float*)( (uintptr_t)_x & ~15); ++ al = ((uintptr_t)_x & 15)/sizeof(float); + + d = (vector float*)_q->h[al]; + +@@ -179,7 +180,7 @@ void dotprod_crcf_execute(dotprod_crcf _q, + // split into four vectors each with four 32-bit + // partial sums. Effectively each loop iteration + // operates on 16 input samples at a time. +- s0 = s1 = s2 = s3 = (vector float)(0); ++ s0 = s1 = s2 = s3 = (vector float){0,0,0,0}; + while (nblocks >= 4) { + s0 = vec_madd(ar[nblocks-1],d[nblocks-1],s0); + s1 = vec_madd(ar[nblocks-2],d[nblocks-2],s1); +@@ -200,7 +201,7 @@ void dotprod_crcf_execute(dotprod_crcf _q, + // move the result into the union s (effetively, + // this loads the four 32-bit values in s0 into + // the array w). +- s.v = vec_add(s0,(vector float)(0)); ++ s.v = vec_add(s0,(vector float){0,0,0,0}); + + // sum the resulting array + //*_r = s.w[0] + s.w[1] + s.w[2] + s.w[3]; diff --git a/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c new file mode 100644 index 00000000000..c293e02b70d --- /dev/null +++ b/comms/liquid-dsp/files/patch-src_dotprod_src_dotprod__rrrf.av.c @@ -0,0 +1,39 @@ +--- src/dotprod/src/dotprod_rrrf.av.c.orig 2018-12-04 23:41:32 UTC ++++ src/dotprod/src/dotprod_rrrf.av.c +@@ -26,6 +26,7 @@ + + #include + #include ++#include + + #include "liquid.internal.h" + +@@ -163,8 +164,8 @@ void dotprod_rrrf_execute(dotprod_rrrf _q, + union { vector float v; float w[4];} s; + unsigned int nblocks; + +- ar = (vector float*)( (int)_x & ~15); +- al = ((int)_x & 15)/sizeof(float); ++ ar = (vector float*)( (uintptr_t)_x & ~15); ++ al = ((uintptr_t)_x & 15)/sizeof(float); + + d = (vector float*)_q->h[al]; + +@@ -173,7 +174,7 @@ void dotprod_rrrf_execute(dotprod_rrrf _q, + // split into four vectors each with four 32-bit + // partial sums. Effectively each loop iteration + // operates on 16 input samples at a time. +- s0 = s1 = s2 = s3 = (vector float)(0); ++ s0 = s1 = s2 = s3 = (vector float){0,0,0,0}; + while (nblocks >= 4) { + s0 = vec_madd(ar[nblocks-1],d[nblocks-1],s0); + s1 = vec_madd(ar[nblocks-2],d[nblocks-2],s1); +@@ -194,7 +195,7 @@ void dotprod_rrrf_execute(dotprod_rrrf _q, + // move the result into the union s (effetively, + // this loads the four 32-bit values in s0 into + // the array w). +- s.v = vec_add(s0,(vector float)(0)); ++ s.v = vec_add(s0,(vector float){0,0,0,0}); + + // sum the resulting array + *_r = s.w[0] + s.w[1] + s.w[2] + s.w[3]; diff --git a/converters/cl-babel-sbcl/Makefile b/converters/cl-babel-sbcl/Makefile index f7b795965cc..03b41e0d28e 100644 --- a/converters/cl-babel-sbcl/Makefile +++ b/converters/cl-babel-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= babel PORTVERSION= 2010.01.16 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= converters lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/converters/p5-JSON-PP/Makefile b/converters/p5-JSON-PP/Makefile index 67277f08fcf..1231a836c37 100644 --- a/converters/p5-JSON-PP/Makefile +++ b/converters/p5-JSON-PP/Makefile @@ -14,9 +14,12 @@ COMMENT= JSON::XS compatible pure-Perl module LICENSE= ART10 GPLv1+ LICENSE_COMB= dual -NO_ARCH= yes -USE_PERL5= configure +PORTSCOUT= limit:^[0-9\.]*$$ + USES= perl5 +USE_PERL5= configure + +NO_ARCH= yes pre-patch: @${MV} ${WRKSRC}/bin/json_pp ${WRKSRC}/bin/p5json_pp diff --git a/converters/pecl-fribidi/Makefile b/converters/pecl-fribidi/Makefile index 2553f55d005..5e1c08e8d6c 100644 --- a/converters/pecl-fribidi/Makefile +++ b/converters/pecl-fribidi/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LIB_DEPENDS= libfribidi.so:converters/fribidi USES= php:pecl pkgconfig -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --with-fribidi=${LOCALBASE} diff --git a/databases/mysqldumper/Makefile b/databases/mysqldumper/Makefile index 77b416d328b..9663cce5fbf 100644 --- a/databases/mysqldumper/Makefile +++ b/databases/mysqldumper/Makefile @@ -23,7 +23,7 @@ OPTIONS_DEFAULT=APACHE PORTSCOUT= limit:^[0-9\.]*$$ -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 NO_ARCH= yes NO_BUILD= yes USE_PHP= ftp mysql session zlib diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile index d28cf1418bc..55656784ac2 100644 --- a/databases/pear-DB/Makefile +++ b/databases/pear-DB/Makefile @@ -2,13 +2,15 @@ # $FreeBSD$ PORTNAME= DB -PORTVERSION= 1.9.2 +PORTVERSION= 1.9.3 PORTEPOCH= 1 CATEGORIES= databases www pear MAINTAINER= joneum@FreeBSD.org COMMENT= PEAR Database Abstraction Layer +LICENSE= PHP301 + USES= pear .include diff --git a/databases/pear-DB/distinfo b/databases/pear-DB/distinfo index 7eeb9264ae5..5fa5cb4e99c 100644 --- a/databases/pear-DB/distinfo +++ b/databases/pear-DB/distinfo @@ -1,2 +1,3 @@ -SHA256 (PEAR/DB-1.9.2.tgz) = 09a32b3eb7242accd61a8d8270596ab7486d2d63d2612ad51def696f7f2bd1b1 -SIZE (PEAR/DB-1.9.2.tgz) = 133795 +TIMESTAMP = 1544174040 +SHA256 (PEAR/DB-1.9.3.tgz) = a18dfb49e757c885618277fa5ce1863dd95d90c06f33a98da30f8c7454aeb6cc +SIZE (PEAR/DB-1.9.3.tgz) = 132290 diff --git a/databases/pear-MDB2_Driver_mysql/Makefile b/databases/pear-MDB2_Driver_mysql/Makefile index 3546997fac6..41eeb24548e 100644 --- a/databases/pear-MDB2_Driver_mysql/Makefile +++ b/databases/pear-MDB2_Driver_mysql/Makefile @@ -19,6 +19,6 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} NO_ARCH= yes USES= pear USE_PHP= mysql -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile b/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile index 30cde26cb32..6f7e17d21b9 100644 --- a/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_DBQuery/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@$ USES= pear USE_PHP= mysql -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 NO_ARCH= yes .include diff --git a/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile b/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile index ffc8dcf4149..9ab469f1f85 100644 --- a/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_DBTable/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@$ USES= pear USE_PHP= mysql -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 NO_ARCH= yes .include diff --git a/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile b/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile index 8476f50deea..2fcbc9417e2 100644 --- a/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_DataObject/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@$ USES= pear USE_PHP= mysql -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 NO_ARCH= yes .include diff --git a/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile b/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile index 6ba65a61cc6..a1673808b20 100644 --- a/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile +++ b/databases/pear-Structures_DataGrid_DataSource_MDB2/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid.php:devel/pear-Structures_DataGrid@$ USES= pear USE_PHP= mysql -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 NO_ARCH= yes .include diff --git a/databases/pecl-chdb/Makefile b/databases/pecl-chdb/Makefile index 3280650a57e..70bbe09ba42 100644 --- a/databases/pecl-chdb/Makefile +++ b/databases/pecl-chdb/Makefile @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libcmph.so:devel/cmph RUN_DEPENDS= ${LOCALBASE}/lib/libcmph.so:devel/cmph USES= php:ext -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CFLAGS+= -L${LOCALBASE}/lib diff --git a/databases/pecl-dbase/Makefile b/databases/pecl-dbase/Makefile index 8048e25ae0a..efe9db8e823 100644 --- a/databases/pecl-dbase/Makefile +++ b/databases/pecl-dbase/Makefile @@ -14,6 +14,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/databases/pecl-drizzle/Makefile b/databases/pecl-drizzle/Makefile index 136dd398d69..6b4199e5c1e 100644 --- a/databases/pecl-drizzle/Makefile +++ b/databases/pecl-drizzle/Makefile @@ -17,7 +17,7 @@ LICENSE= PHP301 LIB_DEPENDS= libdrizzle.so:databases/libdrizzle USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/databases/pecl-leveldb/Makefile b/databases/pecl-leveldb/Makefile index 9ee196c5fae..8594b7cad16 100644 --- a/databases/pecl-leveldb/Makefile +++ b/databases/pecl-leveldb/Makefile @@ -17,6 +17,6 @@ LICENSE= PHP301 LIB_DEPENDS= libleveldb.so:databases/leveldb USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/databases/pecl-memcache/Makefile b/databases/pecl-memcache/Makefile index c6ee4a0b1b5..d7209a489e0 100644 --- a/databases/pecl-memcache/Makefile +++ b/databases/pecl-memcache/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= EXAMPLES CONFIGURE_ARGS= --with-zlib-dir=/usr -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 USE_CSTD= gnu89 USE_PHP= session:build zlib:build USES= dos2unix php:pecl diff --git a/databases/pecl-memcached2/Makefile b/databases/pecl-memcached2/Makefile index 674c58905b6..b2aeb39a3b5 100644 --- a/databases/pecl-memcached2/Makefile +++ b/databases/pecl-memcached2/Makefile @@ -24,7 +24,7 @@ IGBINARY_DESC= Binary serializer support PORTSCOUT= limit:^2\. CONFIGURE_ARGS= --with-libmemcached-dir=${LOCALBASE} -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 USE_PHP= json:build session:build USES= php:pecl pkgconfig diff --git a/databases/pecl-mongo/Makefile b/databases/pecl-mongo/Makefile index 631d5a5ec27..8da48b21300 100644 --- a/databases/pecl-mongo/Makefile +++ b/databases/pecl-mongo/Makefile @@ -19,6 +19,6 @@ USES= php:pecl USE_PHP= spl:build CONFIGURE_ARGS= --enable-mongo SUB_FILES= pkg-message -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/databases/pecl-pdo_user/Makefile b/databases/pecl-pdo_user/Makefile index a063853d17e..e4aeca2ca47 100644 --- a/databases/pecl-pdo_user/Makefile +++ b/databases/pecl-pdo_user/Makefile @@ -17,6 +17,6 @@ WRKSRC= ${WRKDIR}/PDO_USER-${PORTVERSION} USES= php:pecl USE_PHP= pdo:build -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/databases/pecl-rrd1/Makefile b/databases/pecl-rrd1/Makefile index 716b7a747e6..a2f382169c3 100644 --- a/databases/pecl-rrd1/Makefile +++ b/databases/pecl-rrd1/Makefile @@ -12,7 +12,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 LIB_DEPENDS= librrd.so:databases/rrdtool USES= php:pecl localbase pkgconfig diff --git a/databases/pecl-tokyo_tyrant/Makefile b/databases/pecl-tokyo_tyrant/Makefile index 69ff3ec3689..30bb6c834b8 100644 --- a/databases/pecl-tokyo_tyrant/Makefile +++ b/databases/pecl-tokyo_tyrant/Makefile @@ -19,6 +19,6 @@ LIB_DEPENDS= libtokyotyrant.so:databases/tokyotyrant USES= php:pecl pkgconfig USE_PHP= session:build -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/databases/php-mdcached/Makefile b/databases/php-mdcached/Makefile index 416254b21fa..d0b105c9ef7 100644 --- a/databases/php-mdcached/Makefile +++ b/databases/php-mdcached/Makefile @@ -20,7 +20,7 @@ LICENSE= BSD2CLAUSE LIB_DEPENDS= libmdcached.so:databases/mdcached USES= php:ext -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-mdcached WRKSRC_SUBDIR= ${PORTNAME}/client_php/${PORTNAME} diff --git a/databases/php5-tarantool/Makefile b/databases/php5-tarantool/Makefile index 9ece12d8acc..54bc6228a38 100644 --- a/databases/php5-tarantool/Makefile +++ b/databases/php5-tarantool/Makefile @@ -21,7 +21,7 @@ PORTSCOUT= ignore:1 USES= php:ext CONFIGURE_ARGS= --with-tarantool -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 USE_GITHUB= yes GH_PROJECT= ${PORTNAME}-php diff --git a/databases/puppetdb-cli/Makefile b/databases/puppetdb-cli/Makefile index 4b9bedb9e0a..9be56f592c1 100644 --- a/databases/puppetdb-cli/Makefile +++ b/databases/puppetdb-cli/Makefile @@ -2,7 +2,7 @@ PORTNAME= puppetdb-cli PORTVERSION= 1.2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MAINTAINER= puppet@FreeBSD.org diff --git a/databases/py-alembic/Makefile b/databases/py-alembic/Makefile index 6071e9256fe..256e90beff8 100644 --- a/databases/py-alembic/Makefile +++ b/databases/py-alembic/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= alembic -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.5 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-alembic/distinfo b/databases/py-alembic/distinfo index 6a5e2949644..f2554fff75f 100644 --- a/databases/py-alembic/distinfo +++ b/databases/py-alembic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540851139 -SHA256 (alembic-1.0.1.tar.gz) = 0fe570f23dc48fb1bbda6f6a396f1c0c28d7045c0ad14018c104a511e6c1fe8a -SIZE (alembic-1.0.1.tar.gz) = 1019676 +TIMESTAMP = 1544176029 +SHA256 (alembic-1.0.5.tar.gz) = e9ffdece0eece55f4108b14b6b0f29ffc730d58e28446a434fe41a1cc5c5f266 +SIZE (alembic-1.0.5.tar.gz) = 1020663 diff --git a/databases/py-pymysql/Makefile b/databases/py-pymysql/Makefile index 33ff73323a3..84c4120ab35 100644 --- a/databases/py-pymysql/Makefile +++ b/databases/py-pymysql/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pymysql -PORTVERSION= 0.8.1 +PORTVERSION= 0.9.2 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/databases/py-pymysql/distinfo b/databases/py-pymysql/distinfo index a019d2715d2..61103e3d89a 100644 --- a/databases/py-pymysql/distinfo +++ b/databases/py-pymysql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526542602 -SHA256 (PyMySQL-0.8.1.tar.gz) = 34e19bfff13e8b2ffc38a68f9ad064609d48f3d46320e8ab8184af527e662629 -SIZE (PyMySQL-0.8.1.tar.gz) = 74297 +TIMESTAMP = 1544176273 +SHA256 (PyMySQL-0.9.2.tar.gz) = 9ec760cbb251c158c19d6c88c17ca00a8632bac713890e465b2be01fdc30713f +SIZE (PyMySQL-0.9.2.tar.gz) = 74532 diff --git a/databases/py-pymysql/pkg-descr b/databases/py-pymysql/pkg-descr index 6cc002cb462..c56ad8a070c 100644 --- a/databases/py-pymysql/pkg-descr +++ b/databases/py-pymysql/pkg-descr @@ -1,4 +1,4 @@ This pure Python MySQL client provides a DB-API to a MySQL database by talking directly to the server via the binary client/server protocol. -WWW: https://github.com/petehunt/PyMySQL +WWW: https://github.com/PyMySQL/PyMySQL diff --git a/databases/sqlbuddy/Makefile b/databases/sqlbuddy/Makefile index dab0cb36f51..880409b6f6e 100644 --- a/databases/sqlbuddy/Makefile +++ b/databases/sqlbuddy/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USE_GITHUB= yes GH_ACCOUNT= deliciousbrains diff --git a/deskutils/phpcollab/Makefile b/deskutils/phpcollab/Makefile index ed03eb61a07..20ba110e2c1 100644 --- a/deskutils/phpcollab/Makefile +++ b/deskutils/phpcollab/Makefile @@ -13,7 +13,7 @@ COMMENT= PHPcollab is project management and collaboration over the internet DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= zip NO_BUILD= yes diff --git a/deskutils/simplegroupware/Makefile b/deskutils/simplegroupware/Makefile index ecc9a1e76f8..afa372863b4 100644 --- a/deskutils/simplegroupware/Makefile +++ b/deskutils/simplegroupware/Makefile @@ -13,7 +13,7 @@ COMMENT= Simple Groupware is an open source enterprise application DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 NO_BUILD= yes USES= apache:run,2.2+ diff --git a/deskutils/surrealtodo/Makefile b/deskutils/surrealtodo/Makefile index 74c510e860e..f8bed0ad260 100644 --- a/deskutils/surrealtodo/Makefile +++ b/deskutils/surrealtodo/Makefile @@ -14,7 +14,7 @@ COMMENT= Surreal ToDo is an AJAX enabled web 2.0 list manager DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= zip USE_PHP= mysql NO_BUILD= yes diff --git a/devel/Makefile b/devel/Makefile index 098837c8b65..ff4138aa021 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -4201,6 +4201,7 @@ SUBDIR += plasma5-plasma-sdk SUBDIR += pmccabe SUBDIR += pmd + SUBDIR += pmdk SUBDIR += poco SUBDIR += poco-ssl SUBDIR += popt @@ -4662,6 +4663,7 @@ SUBDIR += py-ipaddr SUBDIR += py-ipdb SUBDIR += py-ipykernel + SUBDIR += py-ipykernel5 SUBDIR += py-ipyparallel SUBDIR += py-ipython_genutils SUBDIR += py-ipywidgets @@ -5226,6 +5228,7 @@ SUBDIR += py-virtualenvwrapper SUBDIR += py-visitor SUBDIR += py-voluptuous + SUBDIR += py-vulture SUBDIR += py-warlock SUBDIR += py-watchdog SUBDIR += py-wcwidth @@ -6303,6 +6306,7 @@ SUBDIR += thrift-c_glib SUBDIR += thrift-cpp SUBDIR += thunar-vcs-plugin + SUBDIR += ticcutils SUBDIR += tig SUBDIR += tigcc SUBDIR += tijmp diff --git a/devel/arachne-pnr/files/patch-src_util.cc b/devel/arachne-pnr/files/patch-src_util.cc new file mode 100644 index 00000000000..c49dfc048ff --- /dev/null +++ b/devel/arachne-pnr/files/patch-src_util.cc @@ -0,0 +1,10 @@ +--- src/util.cc.orig 2018-11-26 16:01:24 UTC ++++ src/util.cc +@@ -30,6 +30,7 @@ + # include + # include + #elif defined(__FreeBSD__) ++# include + # include + # include // TODO 180528: remove this + #else diff --git a/devel/bingrep/Makefile b/devel/bingrep/Makefile index bb147e565cd..4df5905f371 100644 --- a/devel/bingrep/Makefile +++ b/devel/bingrep/Makefile @@ -2,7 +2,7 @@ PORTNAME= bingrep PORTVERSION= g20171111 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MAINTAINER= ports@FreeBSD.org diff --git a/devel/cl-alexandria-sbcl/Makefile b/devel/cl-alexandria-sbcl/Makefile index 42ae8d6c4b6..65c4734fc78 100644 --- a/devel/cl-alexandria-sbcl/Makefile +++ b/devel/cl-alexandria-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= alexandria PORTVERSION= 2010.01.16 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-infix-sbcl/Makefile b/devel/cl-infix-sbcl/Makefile index 360ce39d72e..84a5c9b16cf 100644 --- a/devel/cl-infix-sbcl/Makefile +++ b/devel/cl-infix-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= infix PORTVERSION= 19960628 -PORTREVISION= 32 +PORTREVISION= 33 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-port-sbcl/Makefile b/devel/cl-port-sbcl/Makefile index 44e5a0c2f58..b2b8824d016 100644 --- a/devel/cl-port-sbcl/Makefile +++ b/devel/cl-port-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= port PORTVERSION= 2002.10.02.1 -PORTREVISION= 30 +PORTREVISION= 31 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-split-sequence-sbcl/Makefile b/devel/cl-split-sequence-sbcl/Makefile index 933fcb643f7..d49d61e3f45 100644 --- a/devel/cl-split-sequence-sbcl/Makefile +++ b/devel/cl-split-sequence-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= split-sequence PORTVERSION= 20011114.1 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-features-sbcl/Makefile b/devel/cl-trivial-features-sbcl/Makefile index abe69df43d6..5c5f24354a5 100644 --- a/devel/cl-trivial-features-sbcl/Makefile +++ b/devel/cl-trivial-features-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= trivial-features PORTVERSION= 2010.01.16 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/cl-trivial-gray-streams-sbcl/Makefile b/devel/cl-trivial-gray-streams-sbcl/Makefile index 266bc2902c1..2af9cebdb10 100644 --- a/devel/cl-trivial-gray-streams-sbcl/Makefile +++ b/devel/cl-trivial-gray-streams-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= trivial-gray-streams PORTVERSION= 2008.11.02 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= devel lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/devel/efivar/Makefile b/devel/efivar/Makefile index d7f1a401e49..9838ef0f171 100644 --- a/devel/efivar/Makefile +++ b/devel/efivar/Makefile @@ -20,7 +20,7 @@ LIB_DEPENDS= libpopt.so:devel/popt USES= gmake localbase pkgconfig USE_GCC= yes USE_GITHUB= yes -GH_ACCOUNT= rhinstaller +GH_ACCOUNT= rhboot USE_LDCONFIG= yes .include diff --git a/devel/efivar/distinfo b/devel/efivar/distinfo index de70d3a093a..4d6a04753ac 100644 --- a/devel/efivar/distinfo +++ b/devel/efivar/distinfo @@ -1,2 +1,3 @@ -SHA256 (rhinstaller-efivar-0.15_GH0.tar.gz) = 8e5a45ebbd116a96a43176e96b211c73f3ec8452da3bd0ce75a5716f86d4343f -SIZE (rhinstaller-efivar-0.15_GH0.tar.gz) = 30064 +TIMESTAMP = 1544125008 +SHA256 (rhboot-efivar-0.15_GH0.tar.gz) = 8e5a45ebbd116a96a43176e96b211c73f3ec8452da3bd0ce75a5716f86d4343f +SIZE (rhboot-efivar-0.15_GH0.tar.gz) = 30064 diff --git a/devel/efivar/pkg-descr b/devel/efivar/pkg-descr index 0f95fb186ae..0dd6c1135b1 100644 --- a/devel/efivar/pkg-descr +++ b/devel/efivar/pkg-descr @@ -1,3 +1,3 @@ Tools and library to manipulate EFI variables. -WWW: https://github.com/vathpela/efivar +WWW: https://github.com/rhboot/efivar diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile index 98708ae7c2b..67dbc534064 100644 --- a/devel/git-lfs/Makefile +++ b/devel/git-lfs/Makefile @@ -2,7 +2,7 @@ PORTNAME= git-lfs DISTVERSIONPREFIX= v -DISTVERSION= 2.6.0 +DISTVERSION= 2.6.1 CATEGORIES= devel MAINTAINER= egypcio@FreeBSD.org diff --git a/devel/git-lfs/distinfo b/devel/git-lfs/distinfo index 96587daa5de..e06faa77ca5 100644 --- a/devel/git-lfs/distinfo +++ b/devel/git-lfs/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1541665734 -SHA256 (git-lfs-git-lfs-v2.6.0_GH0.tar.gz) = e75b361d828d7b6e9ba537137d5243fa1e000a20686cddec2775b533a6b08f01 -SIZE (git-lfs-git-lfs-v2.6.0_GH0.tar.gz) = 1605203 +TIMESTAMP = 1544094697 +SHA256 (git-lfs-git-lfs-v2.6.1_GH0.tar.gz) = e17cd9d4e66d1116be32f7ddc7e660c7f8fabbf510bc01b01ec15a22dd934ead +SIZE (git-lfs-git-lfs-v2.6.1_GH0.tar.gz) = 1630301 SHA256 (davecgh-go-spew-d8f796a_GH0.tar.gz) = d009b3cf2f72f26e6b79371cd1220bfd0cccdc94fa0f538f6c1ac1df2275bd79 SIZE (davecgh-go-spew-d8f796a_GH0.tar.gz) = 42167 SHA256 (pmezard-go-difflib-792786c_GH0.tar.gz) = 7c2a6d7ea0700411ba7d13865230c03bd6734d3ff6c213357bda121f5bb707fb diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile index ecea19014db..58885d3560c 100644 --- a/devel/gitlab-runner/Makefile +++ b/devel/gitlab-runner/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitlab-runner -PORTVERSION= 11.5.0 +PORTVERSION= 11.5.1 CATEGORIES= devel MASTER_SITES= \ https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \ @@ -26,10 +26,10 @@ RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \ USE_GITLAB= yes GL_ACCOUNT= gitlab-org -GL_COMMIT= 3afdaba6bf04910d6db2733af0e7e6f1a4f37738 -GITREV= 3afdaba6 +GL_COMMIT= 7f00c780e2a2411ce04d0d55979490918255ea76 +GITREV= 7f00c780 GITBRANCH= 11-5-stable -BUILT= 2018-11-22T09:19:56+0000 +BUILT= 2018-12-06T13:25:32+0000 GO_LDFLAGS= -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=${PORTVERSION} \ -X gitlab.com/gitlab-org/gitlab-runner/common.REVISION=${GITREV} \ diff --git a/devel/gitlab-runner/distinfo b/devel/gitlab-runner/distinfo index b650462cd49..d2997f602aa 100644 --- a/devel/gitlab-runner/distinfo +++ b/devel/gitlab-runner/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1543340517 +TIMESTAMP = 1544211111 SHA256 (gitlab-runner/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e SIZE (gitlab-runner/prebuilt-x86_64.tar.xz) = 9594352 SHA256 (gitlab-runner/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32 SIZE (gitlab-runner/prebuilt-arm.tar.xz) = 9020896 -SHA256 (gitlab-runner/gitlab-org-gitlab-runner-3afdaba6bf04910d6db2733af0e7e6f1a4f37738_GL0.tar.gz) = fae128dd5ccc40bfea798854a7398151cb79e65f04605518ecd277274fcd585d -SIZE (gitlab-runner/gitlab-org-gitlab-runner-3afdaba6bf04910d6db2733af0e7e6f1a4f37738_GL0.tar.gz) = 25759968 +SHA256 (gitlab-runner/gitlab-org-gitlab-runner-7f00c780e2a2411ce04d0d55979490918255ea76_GL0.tar.gz) = fe4153518c023ec20245fccf143a7c9bc9cfc2b9e98becc906375e765c9abee0 +SIZE (gitlab-runner/gitlab-org-gitlab-runner-7f00c780e2a2411ce04d0d55979490918255ea76_GL0.tar.gz) = 25762101 diff --git a/devel/grumpy/Makefile b/devel/grumpy/Makefile index 798e07de84f..bba06d564d9 100644 --- a/devel/grumpy/Makefile +++ b/devel/grumpy/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= grumpy -PORTVERSION= 0.0.0.2017020301 +PORTVERSION= 0.0.0.2017112101 CATEGORIES= devel MAINTAINER= swills@FreeBSD.org @@ -12,7 +12,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes GH_ACCOUNT= google -GH_TAGNAME= 348f038 +GH_TAGNAME= 3ec8795 USES= gmake python:2.7 shebangfix SHEBANG_FILES= tools/benchcmp tools/coverparse tools/diffrange tools/grumpc diff --git a/devel/grumpy/distinfo b/devel/grumpy/distinfo index 021b6871edb..eb719ddaeb9 100644 --- a/devel/grumpy/distinfo +++ b/devel/grumpy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486146690 -SHA256 (google-grumpy-0.0.0.2017020301-348f038_GH0.tar.gz) = 9a3bea034b74327740be570962a2400ab827a7105da844eef5594c6320057fdd -SIZE (google-grumpy-0.0.0.2017020301-348f038_GH0.tar.gz) = 541133 +TIMESTAMP = 1544229003 +SHA256 (google-grumpy-0.0.0.2017112101-3ec8795_GH0.tar.gz) = 0d9742e9ef1190eee0005331f48212883a82cfe730721d03fe97c6b87890baba +SIZE (google-grumpy-0.0.0.2017112101-3ec8795_GH0.tar.gz) = 736001 diff --git a/devel/grumpy/pkg-plist b/devel/grumpy/pkg-plist index 2e4485b1e47..5f82cf9564c 100644 --- a/devel/grumpy/pkg-plist +++ b/devel/grumpy/pkg-plist @@ -2,113 +2,584 @@ bin/benchcmp bin/coverparse bin/diffrange bin/grumpc +go/pkg/freebsd_%%ARCH%%/__python__/Queue.a +go/pkg/freebsd_%%ARCH%%/__python__/StringIO.a +go/pkg/freebsd_%%ARCH%%/__python__/UserDict.a +go/pkg/freebsd_%%ARCH%%/__python__/UserList.a +go/pkg/freebsd_%%ARCH%%/__python__/UserString.a +go/pkg/freebsd_%%ARCH%%/__python__/__builtin__.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/grumpy.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/io/ioutil.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/math.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/math/rand.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/os.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/path/filepath.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/reflect.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/runtime.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/sync.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/syscall.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/time.a +go/pkg/freebsd_%%ARCH%%/__python__/__go__/unicode.a +go/pkg/freebsd_%%ARCH%%/__python__/_abcoll.a +go/pkg/freebsd_%%ARCH%%/__python__/_collections.a +go/pkg/freebsd_%%ARCH%%/__python__/_csv.a +go/pkg/freebsd_%%ARCH%%/__python__/_functools.a +go/pkg/freebsd_%%ARCH%%/__python__/_md5.a +go/pkg/freebsd_%%ARCH%%/__python__/_random.a +go/pkg/freebsd_%%ARCH%%/__python__/_sha.a +go/pkg/freebsd_%%ARCH%%/__python__/_sha256.a +go/pkg/freebsd_%%ARCH%%/__python__/_sha512.a +go/pkg/freebsd_%%ARCH%%/__python__/_sre.a +go/pkg/freebsd_%%ARCH%%/__python__/_struct.a +go/pkg/freebsd_%%ARCH%%/__python__/_syscall.a +go/pkg/freebsd_%%ARCH%%/__python__/_weakrefset.a +go/pkg/freebsd_%%ARCH%%/__python__/abc.a +go/pkg/freebsd_%%ARCH%%/__python__/argparse.a +go/pkg/freebsd_%%ARCH%%/__python__/base64.a +go/pkg/freebsd_%%ARCH%%/__python__/binascii.a +go/pkg/freebsd_%%ARCH%%/__python__/bisect.a +go/pkg/freebsd_%%ARCH%%/__python__/cStringIO.a +go/pkg/freebsd_%%ARCH%%/__python__/collections.a +go/pkg/freebsd_%%ARCH%%/__python__/colorsys.a +go/pkg/freebsd_%%ARCH%%/__python__/contextlib.a +go/pkg/freebsd_%%ARCH%%/__python__/copy.a +go/pkg/freebsd_%%ARCH%%/__python__/copy_reg.a +go/pkg/freebsd_%%ARCH%%/__python__/csv.a +go/pkg/freebsd_%%ARCH%%/__python__/datetime.a +go/pkg/freebsd_%%ARCH%%/__python__/difflib.a +go/pkg/freebsd_%%ARCH%%/__python__/dircache.a +go/pkg/freebsd_%%ARCH%%/__python__/dummy_thread.a +go/pkg/freebsd_%%ARCH%%/__python__/errno.a +go/pkg/freebsd_%%ARCH%%/__python__/exceptions.a +go/pkg/freebsd_%%ARCH%%/__python__/fnmatch.a +go/pkg/freebsd_%%ARCH%%/__python__/fpformat.a +go/pkg/freebsd_%%ARCH%%/__python__/functools.a +go/pkg/freebsd_%%ARCH%%/__python__/genericpath.a +go/pkg/freebsd_%%ARCH%%/__python__/getopt.a +go/pkg/freebsd_%%ARCH%%/__python__/glob.a +go/pkg/freebsd_%%ARCH%%/__python__/heapq.a +go/pkg/freebsd_%%ARCH%%/__python__/itertools.a +go/pkg/freebsd_%%ARCH%%/__python__/itertools_test.a +go/pkg/freebsd_%%ARCH%%/__python__/json.a +go/pkg/freebsd_%%ARCH%%/__python__/json/decoder.a +go/pkg/freebsd_%%ARCH%%/__python__/json/encoder.a +go/pkg/freebsd_%%ARCH%%/__python__/json_scanner.a +go/pkg/freebsd_%%ARCH%%/__python__/keyword.a +go/pkg/freebsd_%%ARCH%%/__python__/linecache.a +go/pkg/freebsd_%%ARCH%%/__python__/math.a +go/pkg/freebsd_%%ARCH%%/__python__/math_test.a +go/pkg/freebsd_%%ARCH%%/__python__/md5.a +go/pkg/freebsd_%%ARCH%%/__python__/mimetools.a +go/pkg/freebsd_%%ARCH%%/__python__/mutex.a +go/pkg/freebsd_%%ARCH%%/__python__/operator.a +go/pkg/freebsd_%%ARCH%%/__python__/optparse.a +go/pkg/freebsd_%%ARCH%%/__python__/os.a +go/pkg/freebsd_%%ARCH%%/__python__/os/path.a +go/pkg/freebsd_%%ARCH%%/__python__/os/path_test.a +go/pkg/freebsd_%%ARCH%%/__python__/os_test.a +go/pkg/freebsd_%%ARCH%%/__python__/pprint.a +go/pkg/freebsd_%%ARCH%%/__python__/quopri.a +go/pkg/freebsd_%%ARCH%%/__python__/random.a +go/pkg/freebsd_%%ARCH%%/__python__/random_test.a +go/pkg/freebsd_%%ARCH%%/__python__/re.a +go/pkg/freebsd_%%ARCH%%/__python__/re_tests.a +go/pkg/freebsd_%%ARCH%%/__python__/repr.a +go/pkg/freebsd_%%ARCH%%/__python__/rfc822.a +go/pkg/freebsd_%%ARCH%%/__python__/sched.a +go/pkg/freebsd_%%ARCH%%/__python__/select_.a +go/pkg/freebsd_%%ARCH%%/__python__/sha.a +go/pkg/freebsd_%%ARCH%%/__python__/sre_compile.a +go/pkg/freebsd_%%ARCH%%/__python__/sre_constants.a +go/pkg/freebsd_%%ARCH%%/__python__/sre_parse.a +go/pkg/freebsd_%%ARCH%%/__python__/stat.a +go/pkg/freebsd_%%ARCH%%/__python__/string.a +go/pkg/freebsd_%%ARCH%%/__python__/sys.a +go/pkg/freebsd_%%ARCH%%/__python__/sys_test.a +go/pkg/freebsd_%%ARCH%%/__python__/tempfile.a +go/pkg/freebsd_%%ARCH%%/__python__/tempfile_test.a +go/pkg/freebsd_%%ARCH%%/__python__/test.a +go/pkg/freebsd_%%ARCH%%/__python__/test/list_tests.a +go/pkg/freebsd_%%ARCH%%/__python__/test/lock_tests.a +go/pkg/freebsd_%%ARCH%%/__python__/test/mapping_tests.a +go/pkg/freebsd_%%ARCH%%/__python__/test/seq_tests.a +go/pkg/freebsd_%%ARCH%%/__python__/test/string_tests.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_argparse.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_bisect.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_colorsys.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_datetime.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_dict.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_dircache.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_dummy_thread.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_fpformat.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_genericpath.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_list.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_md5.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_mimetools.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_mutex.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_operator.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_queue.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_quopri.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_rfc822.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_sched.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_select.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_slice.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_stat.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_string.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_support.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_threading.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_tuple.a +go/pkg/freebsd_%%ARCH%%/__python__/test/test_uu.a +go/pkg/freebsd_%%ARCH%%/__python__/textwrap.a +go/pkg/freebsd_%%ARCH%%/__python__/thread.a +go/pkg/freebsd_%%ARCH%%/__python__/threading.a +go/pkg/freebsd_%%ARCH%%/__python__/time.a +go/pkg/freebsd_%%ARCH%%/__python__/time_test.a +go/pkg/freebsd_%%ARCH%%/__python__/traceback.a +go/pkg/freebsd_%%ARCH%%/__python__/types.a +go/pkg/freebsd_%%ARCH%%/__python__/types_test.a +go/pkg/freebsd_%%ARCH%%/__python__/unittest.a +go/pkg/freebsd_%%ARCH%%/__python__/unittest_case.a +go/pkg/freebsd_%%ARCH%%/__python__/unittest_loader.a +go/pkg/freebsd_%%ARCH%%/__python__/unittest_result.a +go/pkg/freebsd_%%ARCH%%/__python__/unittest_runner.a +go/pkg/freebsd_%%ARCH%%/__python__/unittest_signals.a +go/pkg/freebsd_%%ARCH%%/__python__/unittest_suite.a +go/pkg/freebsd_%%ARCH%%/__python__/unittest_util.a +go/pkg/freebsd_%%ARCH%%/__python__/urlparse.a +go/pkg/freebsd_%%ARCH%%/__python__/uu.a +go/pkg/freebsd_%%ARCH%%/__python__/warnings.a +go/pkg/freebsd_%%ARCH%%/__python__/weakref.a +go/pkg/freebsd_%%ARCH%%/__python__/weetest.a +go/pkg/freebsd_%%ARCH%%/__python__/weetest_test.a go/pkg/freebsd_%%ARCH%%/grumpy.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/StringIO.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/UserDict.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/UserList.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/UserString.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/__builtin__.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_abcoll.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_collections.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_csv.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_functools.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_md5.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_random.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_sha.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_sha256.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_sha512.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_sre.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_struct.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/_weakrefset.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/abc.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/argparse.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/base64.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/binascii.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/collections.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/contextlib.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/copy.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/copy_reg.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/csv.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/difflib.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/errno.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/exceptions.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/fnmatch.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/functools.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/getopt.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/glob.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/heapq.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/itertools.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/itertools_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/json.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/json/decoder.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/json/encoder.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/json_scanner.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/keyword.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/linecache.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/math.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/math_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/md5.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/operator.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/optparse.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/os.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/os/path.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/os/path_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/os_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/pprint.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/random.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/random_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/re.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/re_tests.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/repr.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/sha.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/sre_compile.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/sre_constants.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/sre_parse.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/stat.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/string.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/sys.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/sys_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/tempfile.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/tempfile_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/list_tests.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/mapping_tests.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/seq_tests.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/string_tests.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/test_argparse.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/test_dict.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/test_list.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/test_md5.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/test_slice.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/test_string.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/test_support.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/test/test_tuple.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/textwrap.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/thread.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/threading.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/threading_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/time.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/time_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/traceback.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/types.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/types_test.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/unittest.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/unittest_case.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/unittest_loader.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/unittest_result.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/unittest_runner.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/unittest_signals.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/unittest_suite.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/unittest_util.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/urlparse.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/warnings.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/weakref.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/weetest.a -go/pkg/freebsd_%%ARCH%%/grumpy/lib/weetest_test.a +go/src/__python__/Queue.py +go/src/__python__/Queue/module.d +go/src/__python__/Queue/module.go +go/src/__python__/StringIO.py +go/src/__python__/StringIO/module.d +go/src/__python__/StringIO/module.go +go/src/__python__/UserDict.py +go/src/__python__/UserDict/module.d +go/src/__python__/UserDict/module.go +go/src/__python__/UserList.py +go/src/__python__/UserList/module.d +go/src/__python__/UserList/module.go +go/src/__python__/UserString.py +go/src/__python__/UserString/module.d +go/src/__python__/UserString/module.go +go/src/__python__/__builtin__.py +go/src/__python__/__builtin__/module.d +go/src/__python__/__builtin__/module.go +go/src/__python__/__go__/grumpy/module.go +go/src/__python__/__go__/io/ioutil/module.go +go/src/__python__/__go__/math/module.go +go/src/__python__/__go__/math/rand/module.go +go/src/__python__/__go__/os/module.go +go/src/__python__/__go__/path/filepath/module.go +go/src/__python__/__go__/reflect/module.go +go/src/__python__/__go__/runtime/module.go +go/src/__python__/__go__/sync/module.go +go/src/__python__/__go__/syscall/module.go +go/src/__python__/__go__/time/module.go +go/src/__python__/__go__/unicode/module.go +go/src/__python__/_abcoll.py +go/src/__python__/_abcoll/module.d +go/src/__python__/_abcoll/module.go +go/src/__python__/_collections.py +go/src/__python__/_collections/module.d +go/src/__python__/_collections/module.go +go/src/__python__/_csv.py +go/src/__python__/_csv/module.d +go/src/__python__/_csv/module.go +go/src/__python__/_functools.py +go/src/__python__/_functools/module.d +go/src/__python__/_functools/module.go +go/src/__python__/_md5.py +go/src/__python__/_md5/module.d +go/src/__python__/_md5/module.go +go/src/__python__/_random.py +go/src/__python__/_random/module.d +go/src/__python__/_random/module.go +go/src/__python__/_sha.py +go/src/__python__/_sha/module.d +go/src/__python__/_sha/module.go +go/src/__python__/_sha256.py +go/src/__python__/_sha256/module.d +go/src/__python__/_sha256/module.go +go/src/__python__/_sha512.py +go/src/__python__/_sha512/module.d +go/src/__python__/_sha512/module.go +go/src/__python__/_sre.py +go/src/__python__/_sre/module.d +go/src/__python__/_sre/module.go +go/src/__python__/_struct.py +go/src/__python__/_struct/module.d +go/src/__python__/_struct/module.go +go/src/__python__/_syscall.py +go/src/__python__/_syscall/module.d +go/src/__python__/_syscall/module.go +go/src/__python__/_weakrefset.py +go/src/__python__/_weakrefset/module.d +go/src/__python__/_weakrefset/module.go +go/src/__python__/abc.py +go/src/__python__/abc/module.d +go/src/__python__/abc/module.go +go/src/__python__/argparse.py +go/src/__python__/argparse/module.d +go/src/__python__/argparse/module.go +go/src/__python__/base64.py +go/src/__python__/base64/module.d +go/src/__python__/base64/module.go +go/src/__python__/binascii.py +go/src/__python__/binascii/module.d +go/src/__python__/binascii/module.go +go/src/__python__/bisect.py +go/src/__python__/bisect/module.d +go/src/__python__/bisect/module.go +go/src/__python__/cStringIO.py +go/src/__python__/cStringIO/module.d +go/src/__python__/cStringIO/module.go +go/src/__python__/collections.py +go/src/__python__/collections/module.d +go/src/__python__/collections/module.go +go/src/__python__/colorsys.py +go/src/__python__/colorsys/module.d +go/src/__python__/colorsys/module.go +go/src/__python__/contextlib.py +go/src/__python__/contextlib/module.d +go/src/__python__/contextlib/module.go +go/src/__python__/copy.py +go/src/__python__/copy/module.d +go/src/__python__/copy/module.go +go/src/__python__/copy_reg.py +go/src/__python__/copy_reg/module.d +go/src/__python__/copy_reg/module.go +go/src/__python__/csv.py +go/src/__python__/csv/module.d +go/src/__python__/csv/module.go +go/src/__python__/datetime.py +go/src/__python__/datetime/module.d +go/src/__python__/datetime/module.go +go/src/__python__/difflib.py +go/src/__python__/difflib/module.d +go/src/__python__/difflib/module.go +go/src/__python__/dircache.py +go/src/__python__/dircache/module.d +go/src/__python__/dircache/module.go +go/src/__python__/dummy_thread.py +go/src/__python__/dummy_thread/module.d +go/src/__python__/dummy_thread/module.go +go/src/__python__/errno.py +go/src/__python__/errno/module.d +go/src/__python__/errno/module.go +go/src/__python__/exceptions.py +go/src/__python__/exceptions/module.d +go/src/__python__/exceptions/module.go +go/src/__python__/fnmatch.py +go/src/__python__/fnmatch/module.d +go/src/__python__/fnmatch/module.go +go/src/__python__/fpformat.py +go/src/__python__/fpformat/module.d +go/src/__python__/fpformat/module.go +go/src/__python__/functools.py +go/src/__python__/functools/module.d +go/src/__python__/functools/module.go +go/src/__python__/genericpath.py +go/src/__python__/genericpath/module.d +go/src/__python__/genericpath/module.go +go/src/__python__/getopt.py +go/src/__python__/getopt/module.d +go/src/__python__/getopt/module.go +go/src/__python__/glob.py +go/src/__python__/glob/module.d +go/src/__python__/glob/module.go +go/src/__python__/heapq.py +go/src/__python__/heapq/module.d +go/src/__python__/heapq/module.go +go/src/__python__/itertools.py +go/src/__python__/itertools/module.d +go/src/__python__/itertools/module.go +go/src/__python__/itertools_test.py +go/src/__python__/itertools_test/module.d +go/src/__python__/itertools_test/module.go +go/src/__python__/json/__init__.py +go/src/__python__/json/decoder.py +go/src/__python__/json/decoder/module.d +go/src/__python__/json/decoder/module.go +go/src/__python__/json/encoder.py +go/src/__python__/json/encoder/module.d +go/src/__python__/json/encoder/module.go +go/src/__python__/json/module.d +go/src/__python__/json/module.go +go/src/__python__/json_scanner.py +go/src/__python__/json_scanner/module.d +go/src/__python__/json_scanner/module.go +go/src/__python__/keyword.py +go/src/__python__/keyword/module.d +go/src/__python__/keyword/module.go +go/src/__python__/linecache.py +go/src/__python__/linecache/module.d +go/src/__python__/linecache/module.go +go/src/__python__/math.py +go/src/__python__/math/module.d +go/src/__python__/math/module.go +go/src/__python__/math_test.py +go/src/__python__/math_test/module.d +go/src/__python__/math_test/module.go +go/src/__python__/md5.py +go/src/__python__/md5/module.d +go/src/__python__/md5/module.go +go/src/__python__/mimetools.py +go/src/__python__/mimetools/module.d +go/src/__python__/mimetools/module.go +go/src/__python__/mutex.py +go/src/__python__/mutex/module.d +go/src/__python__/mutex/module.go +go/src/__python__/operator.py +go/src/__python__/operator/module.d +go/src/__python__/operator/module.go +go/src/__python__/optparse.py +go/src/__python__/optparse/module.d +go/src/__python__/optparse/module.go +go/src/__python__/os/__init__.py +go/src/__python__/os/module.d +go/src/__python__/os/module.go +go/src/__python__/os/path.py +go/src/__python__/os/path/module.d +go/src/__python__/os/path/module.go +go/src/__python__/os/path_test.py +go/src/__python__/os/path_test/module.d +go/src/__python__/os/path_test/module.go +go/src/__python__/os_test.py +go/src/__python__/os_test/module.d +go/src/__python__/os_test/module.go +go/src/__python__/pprint.py +go/src/__python__/pprint/module.d +go/src/__python__/pprint/module.go +go/src/__python__/quopri.py +go/src/__python__/quopri/module.d +go/src/__python__/quopri/module.go +go/src/__python__/random.py +go/src/__python__/random/module.d +go/src/__python__/random/module.go +go/src/__python__/random_test.py +go/src/__python__/random_test/module.d +go/src/__python__/random_test/module.go +go/src/__python__/re.py +go/src/__python__/re/module.d +go/src/__python__/re/module.go +go/src/__python__/re_tests.py +go/src/__python__/re_tests/module.d +go/src/__python__/re_tests/module.go +go/src/__python__/repr.py +go/src/__python__/repr/module.d +go/src/__python__/repr/module.go +go/src/__python__/rfc822.py +go/src/__python__/rfc822/module.d +go/src/__python__/rfc822/module.go +go/src/__python__/sched.py +go/src/__python__/sched/module.d +go/src/__python__/sched/module.go +go/src/__python__/select_.py +go/src/__python__/select_/module.d +go/src/__python__/select_/module.go +go/src/__python__/sha.py +go/src/__python__/sha/module.d +go/src/__python__/sha/module.go +go/src/__python__/sre_compile.py +go/src/__python__/sre_compile/module.d +go/src/__python__/sre_compile/module.go +go/src/__python__/sre_constants.py +go/src/__python__/sre_constants/module.d +go/src/__python__/sre_constants/module.go +go/src/__python__/sre_parse.py +go/src/__python__/sre_parse/module.d +go/src/__python__/sre_parse/module.go +go/src/__python__/stat.py +go/src/__python__/stat/module.d +go/src/__python__/stat/module.go +go/src/__python__/string.py +go/src/__python__/string/module.d +go/src/__python__/string/module.go +go/src/__python__/sys.py +go/src/__python__/sys/module.d +go/src/__python__/sys/module.go +go/src/__python__/sys_test.py +go/src/__python__/sys_test/module.d +go/src/__python__/sys_test/module.go +go/src/__python__/tempfile.py +go/src/__python__/tempfile/module.d +go/src/__python__/tempfile/module.go +go/src/__python__/tempfile_test.py +go/src/__python__/tempfile_test/module.d +go/src/__python__/tempfile_test/module.go +go/src/__python__/test/__init__.py +go/src/__python__/test/list_tests.py +go/src/__python__/test/list_tests/module.d +go/src/__python__/test/list_tests/module.go +go/src/__python__/test/lock_tests.py +go/src/__python__/test/lock_tests/module.d +go/src/__python__/test/lock_tests/module.go +go/src/__python__/test/mapping_tests.py +go/src/__python__/test/mapping_tests/module.d +go/src/__python__/test/mapping_tests/module.go +go/src/__python__/test/module.d +go/src/__python__/test/module.go +go/src/__python__/test/seq_tests.py +go/src/__python__/test/seq_tests/module.d +go/src/__python__/test/seq_tests/module.go +go/src/__python__/test/string_tests.py +go/src/__python__/test/string_tests/module.d +go/src/__python__/test/string_tests/module.go +go/src/__python__/test/test_argparse.py +go/src/__python__/test/test_argparse/module.d +go/src/__python__/test/test_argparse/module.go +go/src/__python__/test/test_bisect.py +go/src/__python__/test/test_bisect/module.d +go/src/__python__/test/test_bisect/module.go +go/src/__python__/test/test_colorsys.py +go/src/__python__/test/test_colorsys/module.d +go/src/__python__/test/test_colorsys/module.go +go/src/__python__/test/test_datetime.py +go/src/__python__/test/test_datetime/module.d +go/src/__python__/test/test_datetime/module.go +go/src/__python__/test/test_dict.py +go/src/__python__/test/test_dict/module.d +go/src/__python__/test/test_dict/module.go +go/src/__python__/test/test_dircache.py +go/src/__python__/test/test_dircache/module.d +go/src/__python__/test/test_dircache/module.go +go/src/__python__/test/test_dummy_thread.py +go/src/__python__/test/test_dummy_thread/module.d +go/src/__python__/test/test_dummy_thread/module.go +go/src/__python__/test/test_fpformat.py +go/src/__python__/test/test_fpformat/module.d +go/src/__python__/test/test_fpformat/module.go +go/src/__python__/test/test_genericpath.py +go/src/__python__/test/test_genericpath/module.d +go/src/__python__/test/test_genericpath/module.go +go/src/__python__/test/test_list.py +go/src/__python__/test/test_list/module.d +go/src/__python__/test/test_list/module.go +go/src/__python__/test/test_md5.py +go/src/__python__/test/test_md5/module.d +go/src/__python__/test/test_md5/module.go +go/src/__python__/test/test_mimetools.py +go/src/__python__/test/test_mimetools/module.d +go/src/__python__/test/test_mimetools/module.go +go/src/__python__/test/test_mutex.py +go/src/__python__/test/test_mutex/module.d +go/src/__python__/test/test_mutex/module.go +go/src/__python__/test/test_operator.py +go/src/__python__/test/test_operator/module.d +go/src/__python__/test/test_operator/module.go +go/src/__python__/test/test_queue.py +go/src/__python__/test/test_queue/module.d +go/src/__python__/test/test_queue/module.go +go/src/__python__/test/test_quopri.py +go/src/__python__/test/test_quopri/module.d +go/src/__python__/test/test_quopri/module.go +go/src/__python__/test/test_rfc822.py +go/src/__python__/test/test_rfc822/module.d +go/src/__python__/test/test_rfc822/module.go +go/src/__python__/test/test_sched.py +go/src/__python__/test/test_sched/module.d +go/src/__python__/test/test_sched/module.go +go/src/__python__/test/test_select.py +go/src/__python__/test/test_select/module.d +go/src/__python__/test/test_select/module.go +go/src/__python__/test/test_slice.py +go/src/__python__/test/test_slice/module.d +go/src/__python__/test/test_slice/module.go +go/src/__python__/test/test_stat.py +go/src/__python__/test/test_stat/module.d +go/src/__python__/test/test_stat/module.go +go/src/__python__/test/test_string.py +go/src/__python__/test/test_string/module.d +go/src/__python__/test/test_string/module.go +go/src/__python__/test/test_support.py +go/src/__python__/test/test_support/module.d +go/src/__python__/test/test_support/module.go +go/src/__python__/test/test_threading.py +go/src/__python__/test/test_threading/module.d +go/src/__python__/test/test_threading/module.go +go/src/__python__/test/test_tuple.py +go/src/__python__/test/test_tuple/module.d +go/src/__python__/test/test_tuple/module.go +go/src/__python__/test/test_uu.py +go/src/__python__/test/test_uu/module.d +go/src/__python__/test/test_uu/module.go +go/src/__python__/textwrap.py +go/src/__python__/textwrap/module.d +go/src/__python__/textwrap/module.go +go/src/__python__/thread.py +go/src/__python__/thread/module.d +go/src/__python__/thread/module.go +go/src/__python__/threading.py +go/src/__python__/threading/module.d +go/src/__python__/threading/module.go +go/src/__python__/time.py +go/src/__python__/time/module.d +go/src/__python__/time/module.go +go/src/__python__/time_test.py +go/src/__python__/time_test/module.d +go/src/__python__/time_test/module.go +go/src/__python__/traceback.py +go/src/__python__/traceback/module.d +go/src/__python__/traceback/module.go +go/src/__python__/types.py +go/src/__python__/types/module.d +go/src/__python__/types/module.go +go/src/__python__/types_test.py +go/src/__python__/types_test/module.d +go/src/__python__/types_test/module.go +go/src/__python__/unittest/__init__.py +go/src/__python__/unittest/module.d +go/src/__python__/unittest/module.go +go/src/__python__/unittest_case.py +go/src/__python__/unittest_case/module.d +go/src/__python__/unittest_case/module.go +go/src/__python__/unittest_loader.py +go/src/__python__/unittest_loader/module.d +go/src/__python__/unittest_loader/module.go +go/src/__python__/unittest_result.py +go/src/__python__/unittest_result/module.d +go/src/__python__/unittest_result/module.go +go/src/__python__/unittest_runner.py +go/src/__python__/unittest_runner/module.d +go/src/__python__/unittest_runner/module.go +go/src/__python__/unittest_signals.py +go/src/__python__/unittest_signals/module.d +go/src/__python__/unittest_signals/module.go +go/src/__python__/unittest_suite.py +go/src/__python__/unittest_suite/module.d +go/src/__python__/unittest_suite/module.go +go/src/__python__/unittest_util.py +go/src/__python__/unittest_util/module.d +go/src/__python__/unittest_util/module.go +go/src/__python__/urlparse.py +go/src/__python__/urlparse/module.d +go/src/__python__/urlparse/module.go +go/src/__python__/uu.py +go/src/__python__/uu/module.d +go/src/__python__/uu/module.go +go/src/__python__/warnings.py +go/src/__python__/warnings/module.d +go/src/__python__/warnings/module.go +go/src/__python__/weakref.py +go/src/__python__/weakref/module.d +go/src/__python__/weakref/module.go +go/src/__python__/weetest.py +go/src/__python__/weetest/module.d +go/src/__python__/weetest/module.go +go/src/__python__/weetest_test.py +go/src/__python__/weetest_test/module.d +go/src/__python__/weetest_test/module.go go/src/grumpy/baseexception.go go/src/grumpy/basestring.go go/src/grumpy/bool.go go/src/grumpy/builtin_types.go +go/src/grumpy/bytearray.go go/src/grumpy/code.go go/src/grumpy/complex.go go/src/grumpy/core.go @@ -122,210 +593,6 @@ go/src/grumpy/frame.go go/src/grumpy/function.go go/src/grumpy/generator.go go/src/grumpy/int.go -go/src/grumpy/lib/StringIO/module.d -go/src/grumpy/lib/StringIO/module.go -go/src/grumpy/lib/UserDict/module.d -go/src/grumpy/lib/UserDict/module.go -go/src/grumpy/lib/UserList/module.d -go/src/grumpy/lib/UserList/module.go -go/src/grumpy/lib/UserString/module.d -go/src/grumpy/lib/UserString/module.go -go/src/grumpy/lib/__builtin__/module.d -go/src/grumpy/lib/__builtin__/module.go -go/src/grumpy/lib/_abcoll/module.d -go/src/grumpy/lib/_abcoll/module.go -go/src/grumpy/lib/_collections/module.d -go/src/grumpy/lib/_collections/module.go -go/src/grumpy/lib/_csv/module.d -go/src/grumpy/lib/_csv/module.go -go/src/grumpy/lib/_functools/module.d -go/src/grumpy/lib/_functools/module.go -go/src/grumpy/lib/_md5/module.d -go/src/grumpy/lib/_md5/module.go -go/src/grumpy/lib/_random/module.d -go/src/grumpy/lib/_random/module.go -go/src/grumpy/lib/_sha/module.d -go/src/grumpy/lib/_sha/module.go -go/src/grumpy/lib/_sha256/module.d -go/src/grumpy/lib/_sha256/module.go -go/src/grumpy/lib/_sha512/module.d -go/src/grumpy/lib/_sha512/module.go -go/src/grumpy/lib/_sre/module.d -go/src/grumpy/lib/_sre/module.go -go/src/grumpy/lib/_struct/module.d -go/src/grumpy/lib/_struct/module.go -go/src/grumpy/lib/_weakrefset/module.d -go/src/grumpy/lib/_weakrefset/module.go -go/src/grumpy/lib/abc/module.d -go/src/grumpy/lib/abc/module.go -go/src/grumpy/lib/argparse/module.d -go/src/grumpy/lib/argparse/module.go -go/src/grumpy/lib/base64/module.d -go/src/grumpy/lib/base64/module.go -go/src/grumpy/lib/binascii/module.d -go/src/grumpy/lib/binascii/module.go -go/src/grumpy/lib/collections/module.d -go/src/grumpy/lib/collections/module.go -go/src/grumpy/lib/contextlib/module.d -go/src/grumpy/lib/contextlib/module.go -go/src/grumpy/lib/copy/module.d -go/src/grumpy/lib/copy/module.go -go/src/grumpy/lib/copy_reg/module.d -go/src/grumpy/lib/copy_reg/module.go -go/src/grumpy/lib/csv/module.d -go/src/grumpy/lib/csv/module.go -go/src/grumpy/lib/difflib/module.d -go/src/grumpy/lib/difflib/module.go -go/src/grumpy/lib/errno/module.d -go/src/grumpy/lib/errno/module.go -go/src/grumpy/lib/exceptions/module.d -go/src/grumpy/lib/exceptions/module.go -go/src/grumpy/lib/fnmatch/module.d -go/src/grumpy/lib/fnmatch/module.go -go/src/grumpy/lib/functools/module.d -go/src/grumpy/lib/functools/module.go -go/src/grumpy/lib/getopt/module.d -go/src/grumpy/lib/getopt/module.go -go/src/grumpy/lib/glob/module.d -go/src/grumpy/lib/glob/module.go -go/src/grumpy/lib/heapq/module.d -go/src/grumpy/lib/heapq/module.go -go/src/grumpy/lib/itertools/module.d -go/src/grumpy/lib/itertools/module.go -go/src/grumpy/lib/itertools_test/module.d -go/src/grumpy/lib/itertools_test/module.go -go/src/grumpy/lib/json/decoder/module.d -go/src/grumpy/lib/json/decoder/module.go -go/src/grumpy/lib/json/encoder/module.d -go/src/grumpy/lib/json/encoder/module.go -go/src/grumpy/lib/json/module.d -go/src/grumpy/lib/json/module.go -go/src/grumpy/lib/json_scanner/module.d -go/src/grumpy/lib/json_scanner/module.go -go/src/grumpy/lib/keyword/module.d -go/src/grumpy/lib/keyword/module.go -go/src/grumpy/lib/linecache/module.d -go/src/grumpy/lib/linecache/module.go -go/src/grumpy/lib/math/module.d -go/src/grumpy/lib/math/module.go -go/src/grumpy/lib/math_test/module.d -go/src/grumpy/lib/math_test/module.go -go/src/grumpy/lib/md5/module.d -go/src/grumpy/lib/md5/module.go -go/src/grumpy/lib/operator/module.d -go/src/grumpy/lib/operator/module.go -go/src/grumpy/lib/optparse/module.d -go/src/grumpy/lib/optparse/module.go -go/src/grumpy/lib/os/module.d -go/src/grumpy/lib/os/module.go -go/src/grumpy/lib/os/path/module.d -go/src/grumpy/lib/os/path/module.go -go/src/grumpy/lib/os/path_test/module.d -go/src/grumpy/lib/os/path_test/module.go -go/src/grumpy/lib/os_test/module.d -go/src/grumpy/lib/os_test/module.go -go/src/grumpy/lib/pprint/module.d -go/src/grumpy/lib/pprint/module.go -go/src/grumpy/lib/random/module.d -go/src/grumpy/lib/random/module.go -go/src/grumpy/lib/random_test/module.d -go/src/grumpy/lib/random_test/module.go -go/src/grumpy/lib/re/module.d -go/src/grumpy/lib/re/module.go -go/src/grumpy/lib/re_tests/module.d -go/src/grumpy/lib/re_tests/module.go -go/src/grumpy/lib/repr/module.d -go/src/grumpy/lib/repr/module.go -go/src/grumpy/lib/sha/module.d -go/src/grumpy/lib/sha/module.go -go/src/grumpy/lib/sre_compile/module.d -go/src/grumpy/lib/sre_compile/module.go -go/src/grumpy/lib/sre_constants/module.d -go/src/grumpy/lib/sre_constants/module.go -go/src/grumpy/lib/sre_parse/module.d -go/src/grumpy/lib/sre_parse/module.go -go/src/grumpy/lib/stat/module.d -go/src/grumpy/lib/stat/module.go -go/src/grumpy/lib/string/module.d -go/src/grumpy/lib/string/module.go -go/src/grumpy/lib/sys/module.d -go/src/grumpy/lib/sys/module.go -go/src/grumpy/lib/sys_test/module.d -go/src/grumpy/lib/sys_test/module.go -go/src/grumpy/lib/tempfile/module.d -go/src/grumpy/lib/tempfile/module.go -go/src/grumpy/lib/tempfile_test/module.d -go/src/grumpy/lib/tempfile_test/module.go -go/src/grumpy/lib/test/list_tests/module.d -go/src/grumpy/lib/test/list_tests/module.go -go/src/grumpy/lib/test/mapping_tests/module.d -go/src/grumpy/lib/test/mapping_tests/module.go -go/src/grumpy/lib/test/module.d -go/src/grumpy/lib/test/module.go -go/src/grumpy/lib/test/seq_tests/module.d -go/src/grumpy/lib/test/seq_tests/module.go -go/src/grumpy/lib/test/string_tests/module.d -go/src/grumpy/lib/test/string_tests/module.go -go/src/grumpy/lib/test/test_argparse/module.d -go/src/grumpy/lib/test/test_argparse/module.go -go/src/grumpy/lib/test/test_dict/module.d -go/src/grumpy/lib/test/test_dict/module.go -go/src/grumpy/lib/test/test_list/module.d -go/src/grumpy/lib/test/test_list/module.go -go/src/grumpy/lib/test/test_md5/module.d -go/src/grumpy/lib/test/test_md5/module.go -go/src/grumpy/lib/test/test_slice/module.d -go/src/grumpy/lib/test/test_slice/module.go -go/src/grumpy/lib/test/test_string/module.d -go/src/grumpy/lib/test/test_string/module.go -go/src/grumpy/lib/test/test_support/module.d -go/src/grumpy/lib/test/test_support/module.go -go/src/grumpy/lib/test/test_tuple/module.d -go/src/grumpy/lib/test/test_tuple/module.go -go/src/grumpy/lib/textwrap/module.d -go/src/grumpy/lib/textwrap/module.go -go/src/grumpy/lib/thread/module.d -go/src/grumpy/lib/thread/module.go -go/src/grumpy/lib/threading/module.d -go/src/grumpy/lib/threading/module.go -go/src/grumpy/lib/threading_test/module.d -go/src/grumpy/lib/threading_test/module.go -go/src/grumpy/lib/time/module.d -go/src/grumpy/lib/time/module.go -go/src/grumpy/lib/time_test/module.d -go/src/grumpy/lib/time_test/module.go -go/src/grumpy/lib/traceback/module.d -go/src/grumpy/lib/traceback/module.go -go/src/grumpy/lib/types/module.d -go/src/grumpy/lib/types/module.go -go/src/grumpy/lib/types_test/module.d -go/src/grumpy/lib/types_test/module.go -go/src/grumpy/lib/unittest/module.d -go/src/grumpy/lib/unittest/module.go -go/src/grumpy/lib/unittest_case/module.d -go/src/grumpy/lib/unittest_case/module.go -go/src/grumpy/lib/unittest_loader/module.d -go/src/grumpy/lib/unittest_loader/module.go -go/src/grumpy/lib/unittest_result/module.d -go/src/grumpy/lib/unittest_result/module.go -go/src/grumpy/lib/unittest_runner/module.d -go/src/grumpy/lib/unittest_runner/module.go -go/src/grumpy/lib/unittest_signals/module.d -go/src/grumpy/lib/unittest_signals/module.go -go/src/grumpy/lib/unittest_suite/module.d -go/src/grumpy/lib/unittest_suite/module.go -go/src/grumpy/lib/unittest_util/module.d -go/src/grumpy/lib/unittest_util/module.go -go/src/grumpy/lib/urlparse/module.d -go/src/grumpy/lib/urlparse/module.go -go/src/grumpy/lib/warnings/module.d -go/src/grumpy/lib/warnings/module.go -go/src/grumpy/lib/weakref/module.d -go/src/grumpy/lib/weakref/module.go -go/src/grumpy/lib/weetest/module.d -go/src/grumpy/lib/weetest/module.go -go/src/grumpy/lib/weetest_test/module.d -go/src/grumpy/lib/weetest_test/module.go go/src/grumpy/list.go go/src/grumpy/long.go go/src/grumpy/method.go @@ -359,6 +626,10 @@ go/src/grumpy/weakref.go %%PYTHON_SITELIBDIR%%/grumpy/compiler/expr.pyc %%PYTHON_SITELIBDIR%%/grumpy/compiler/expr_visitor.py %%PYTHON_SITELIBDIR%%/grumpy/compiler/expr_visitor.pyc +%%PYTHON_SITELIBDIR%%/grumpy/compiler/imputil.py +%%PYTHON_SITELIBDIR%%/grumpy/compiler/imputil.pyc +%%PYTHON_SITELIBDIR%%/grumpy/compiler/imputil_test.d +%%PYTHON_SITELIBDIR%%/grumpy/compiler/imputil_test.py %%PYTHON_SITELIBDIR%%/grumpy/compiler/shard_test.d %%PYTHON_SITELIBDIR%%/grumpy/compiler/shard_test.py %%PYTHON_SITELIBDIR%%/grumpy/compiler/stmt.py @@ -367,3 +638,17 @@ go/src/grumpy/weakref.go %%PYTHON_SITELIBDIR%%/grumpy/compiler/util.pyc %%PYTHON_SITELIBDIR%%/grumpy/compiler/util_test.d %%PYTHON_SITELIBDIR%%/grumpy/compiler/util_test.py +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/__init__.py +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/__init__.pyc +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/algorithm.py +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/algorithm.pyc +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/ast.py +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/ast.pyc +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/diagnostic.py +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/diagnostic.pyc +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/lexer.py +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/lexer.pyc +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/parser.py +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/parser.pyc +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/source.py +%%PYTHON_SITELIBDIR%%/grumpy/pythonparser/source.pyc diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile index addd0ba1632..9c56db75b05 100644 --- a/devel/hs-ShellCheck/Makefile +++ b/devel/hs-ShellCheck/Makefile @@ -2,7 +2,7 @@ PORTNAME= ShellCheck DISTVERSIONPREFIX= v -DISTVERSION= 0.5.0 +DISTVERSION= 0.6.0 CATEGORIES= devel haskell MAINTAINER= pizzamig@FreeBSD.org diff --git a/devel/hs-ShellCheck/distinfo b/devel/hs-ShellCheck/distinfo index 8cb94ccc7f8..679acf0a88f 100644 --- a/devel/hs-ShellCheck/distinfo +++ b/devel/hs-ShellCheck/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540501687 -SHA256 (cabal/koalaman-shellcheck-v0.5.0_GH0.tar.gz) = 348a3f7892c1f28a44f188c00ac82f1b3bf899d9f81d14ddb0e306db26c937bb -SIZE (cabal/koalaman-shellcheck-v0.5.0_GH0.tar.gz) = 173657 +TIMESTAMP = 1544015760 +SHA256 (cabal/koalaman-shellcheck-v0.6.0_GH0.tar.gz) = 78f90aa8e618dc468bc1c36b6929216dc7a0c2679cd157e50919f7d8cc1899bc +SIZE (cabal/koalaman-shellcheck-v0.6.0_GH0.tar.gz) = 181749 diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile index 2f38c2cfefa..0a1ed9a800d 100644 --- a/devel/ipython/Makefile +++ b/devel/ipython/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ipython -PORTVERSION= 6.5.0 -PORTREVISION= 1 +PORTVERSION= 7.2.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,14 +17,15 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pexpect>=0:misc/py-pexpect@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>=2:databases/py-sqlite3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}decorator>=0:devel/py-decorator@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pickleshare>=0:databases/py-pickleshare@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit2>=2.0.0:devel/py-prompt_toolkit2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}simplegeneric>0.8:devel/py-simplegeneric@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}traitlets>=4.2:devel/py-traitlets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jedi>=0.10:devel/py-jedi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}backcall>=0.1.0:devel/py-backcall@${PY_FLAVOR} -USES= python:3.3+ +USES= python:3.5+ + USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes diff --git a/devel/ipython/distinfo b/devel/ipython/distinfo index 6e10e7deda4..d558e3be400 100644 --- a/devel/ipython/distinfo +++ b/devel/ipython/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532951494 -SHA256 (ipython-6.5.0.tar.gz) = b0f2ef9eada4a68ef63ee10b6dde4f35c840035c50fd24265f8052c98947d5a4 -SIZE (ipython-6.5.0.tar.gz) = 5084444 +TIMESTAMP = 1543979685 +SHA256 (ipython-7.2.0.tar.gz) = 6a9496209b76463f1dec126ab928919aaf1f55b38beb9219af3fe202f6bbdd12 +SIZE (ipython-7.2.0.tar.gz) = 5112895 diff --git a/devel/jenkins-lts/Makefile b/devel/jenkins-lts/Makefile index 3aadd6a97d5..bc313556a6f 100644 --- a/devel/jenkins-lts/Makefile +++ b/devel/jenkins-lts/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins -PORTVERSION= 2.138.4 +PORTVERSION= 2.150.1 CATEGORIES= devel java MASTER_SITES= http://mirrors.jenkins-ci.org/war-stable/${PORTVERSION}/ PKGNAMESUFFIX= -lts diff --git a/devel/jenkins-lts/distinfo b/devel/jenkins-lts/distinfo index 42f50d07a0d..341203ebc35 100644 --- a/devel/jenkins-lts/distinfo +++ b/devel/jenkins-lts/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544002681 -SHA256 (jenkins/2.138.4/jenkins.war) = 053d2941d558092c934a0f95798ff2177170eecfffab27a46e30744cf12bc3da -SIZE (jenkins/2.138.4/jenkins.war) = 75751509 +TIMESTAMP = 1544203556 +SHA256 (jenkins/2.150.1/jenkins.war) = 7a38586d5a3a1a83498809a83715728bb2f01b58a7dd3a88366f076efdaf6669 +SIZE (jenkins/2.150.1/jenkins.war) = 75938045 diff --git a/devel/kodi-platform/Makefile b/devel/kodi-platform/Makefile index 78aa7ab8e53..3b0f9184e78 100644 --- a/devel/kodi-platform/Makefile +++ b/devel/kodi-platform/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= kodi-platform -PORTVERSION= 20170306 +PORTVERSION= 20180302 CATEGORIES= devel MAINTAINER= decke@FreeBSD.org @@ -17,7 +17,7 @@ USES= cmake USE_GITHUB= yes GH_ACCOUNT= xbmc -GH_TAGNAME= 36fb493 +GH_TAGNAME= e8574b8 USE_LDCONFIG= yes diff --git a/devel/kodi-platform/distinfo b/devel/kodi-platform/distinfo index d54cc25c41a..533857b9b37 100644 --- a/devel/kodi-platform/distinfo +++ b/devel/kodi-platform/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1518120462 -SHA256 (xbmc-kodi-platform-20170306-36fb493_GH0.tar.gz) = 0b8de462a83296a23f5674c78af69cb957170cc0fb91604ccfa8fd0decf3fdb8 -SIZE (xbmc-kodi-platform-20170306-36fb493_GH0.tar.gz) = 8599 +TIMESTAMP = 1544087552 +SHA256 (xbmc-kodi-platform-20180302-e8574b8_GH0.tar.gz) = ee262bb5f8227d630014b887388ee2f5e9474f64fae7408fd299bc22b8099ba5 +SIZE (xbmc-kodi-platform-20180302-e8574b8_GH0.tar.gz) = 8603 diff --git a/devel/libdap/Makefile b/devel/libdap/Makefile index 7088481f089..8abf629443c 100644 --- a/devel/libdap/Makefile +++ b/devel/libdap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libdap -PORTVERSION= 3.20.1 +PORTVERSION= 3.20.2 CATEGORIES= devel MASTER_SITES= https://www.opendap.org/pub/source/ \ LOCAL/sunpoet diff --git a/devel/libdap/distinfo b/devel/libdap/distinfo index e8210e77a9d..ee6183cbb36 100644 --- a/devel/libdap/distinfo +++ b/devel/libdap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542819947 -SHA256 (libdap-3.20.1.tar.gz) = 1e34d08145052436f2d468b8d6764c143eba1bc2e74481e7e568f0f96ae5cc7a -SIZE (libdap-3.20.1.tar.gz) = 2667599 +TIMESTAMP = 1544193710 +SHA256 (libdap-3.20.2.tar.gz) = 60eafd74f6e415b31de05078002ec82807c12be4f4fa7e8c7f982322e12be34e +SIZE (libdap-3.20.2.tar.gz) = 2668375 diff --git a/devel/libdap/pkg-plist b/devel/libdap/pkg-plist index 42466ae15b4..48a4e12c18e 100644 --- a/devel/libdap/pkg-plist +++ b/devel/libdap/pkg-plist @@ -141,7 +141,7 @@ include/libdap/xdr-datatypes.h lib/libdap.a lib/libdap.so lib/libdap.so.25 -lib/libdap.so.25.1.1 +lib/libdap.so.25.2.0 lib/libdapclient.a lib/libdapclient.so lib/libdapclient.so.6 diff --git a/devel/libdbusmenu/Makefile b/devel/libdbusmenu/Makefile index d20ed332be1..d0a0cbc3cd7 100644 --- a/devel/libdbusmenu/Makefile +++ b/devel/libdbusmenu/Makefile @@ -22,7 +22,8 @@ BUILD_DEPENDS= vapigen:lang/vala \ LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib GNU_CONFIGURE= yes -USES= gmake libtool pathfix pkgconfig python:run shebangfix +USES= compiler gmake gnome libtool pathfix pkgconfig python:run \ + shebangfix USE_GNOME= gnomedocutils:build glib20 intltool intlhack libxslt \ introspection:build gtk30 USE_XORG= x11 @@ -43,4 +44,10 @@ CONFIGURE_ARGS= --disable-static \ --enable-vala \ --with-gtk=3 -.include +.include + +.if ${CHOSEN_COMPILER_TYPE} == gcc +CFLAGS+= -Wno-unused-value +.endif + +.include diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index fc18f74a2d8..2a599f63126 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_sparc64= cannot build: coredump: illegal instruction -SNAPSHOT= 20180728 +SNAPSHOT= 20181201 GNU_CONFIGURE= yes CONFIGURE_SCRIPT=../configure CONFIGURE_ARGS= --datadir=${PREFIX}/share/misc --disable-overwrite \ diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo index 2aeac3f53e3..c724f9afa98 100644 --- a/devel/ncurses/distinfo +++ b/devel/ncurses/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532860991 -SHA256 (ncurses/ncurses-6.1-20180728.tgz) = d24f97b785f5227653f984348abd3978584e8a52bc1915173277f07574027de2 -SIZE (ncurses/ncurses-6.1-20180728.tgz) = 3400752 +TIMESTAMP = 1544209477 +SHA256 (ncurses/ncurses-6.1-20181201.tgz) = 702ff9added8b776f29a461acb053f348ae6391fa19c0570c78fa99ce4c3ca8a +SIZE (ncurses/ncurses-6.1-20181201.tgz) = 3421800 diff --git a/devel/ncurses/files/patch-configure b/devel/ncurses/files/patch-configure deleted file mode 100644 index 023e9c7ecc8..00000000000 --- a/devel/ncurses/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.orig 2017-08-12 12:15:04 UTC -+++ configure -@@ -8053,7 +8053,10 @@ case $host_os in - cf_xopen_source="-D_DARWIN_C_SOURCE" - cf_XOPEN_SOURCE= - ;; --(freebsd*|dragonfly*) -+(freebsd*) -+ cf_XOPEN_SOURCE= -+ ;; -+(dragonfly*) - # 5.x headers associate - # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L - # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L diff --git a/devel/p5-Test-WWW-Mechanize/Makefile b/devel/p5-Test-WWW-Mechanize/Makefile index 12252258931..30bf2ef1595 100644 --- a/devel/p5-Test-WWW-Mechanize/Makefile +++ b/devel/p5-Test-WWW-Mechanize/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Test-WWW-Mechanize -PORTVERSION= 1.50 +PORTVERSION= 1.52 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -23,8 +23,9 @@ RUN_DEPENDS= p5-Carp-Assert-More>=0:devel/p5-Carp-Assert-More \ PORTSCOUT= limit:^[0-9\.]*$$ -NO_ARCH= yes USES= perl5 USE_PERL5= configure +NO_ARCH= yes + .include diff --git a/devel/p5-Test-WWW-Mechanize/distinfo b/devel/p5-Test-WWW-Mechanize/distinfo index ccc4190a682..88a5faa3f1d 100644 --- a/devel/p5-Test-WWW-Mechanize/distinfo +++ b/devel/p5-Test-WWW-Mechanize/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523978964 -SHA256 (Test-WWW-Mechanize-1.50.tar.gz) = 0f4a3922a572d8b6a49c4388dec6b768d13ca3d1fb73b54d59abafb60fa2f724 -SIZE (Test-WWW-Mechanize-1.50.tar.gz) = 30921 +TIMESTAMP = 1544114726 +SHA256 (Test-WWW-Mechanize-1.52.tar.gz) = 842a550ceb9629aec4014760e5e84645fb5d9c7b75237d644c8363d817e55ecb +SIZE (Test-WWW-Mechanize-1.52.tar.gz) = 33254 diff --git a/devel/pecl-APCu4/Makefile b/devel/pecl-APCu4/Makefile index 7aaf3ad7325..a37016acd52 100644 --- a/devel/pecl-APCu4/Makefile +++ b/devel/pecl-APCu4/Makefile @@ -19,7 +19,7 @@ CONFLICTS_INSTALL= pecl-APC PORTSCOUT= limit:^4\. -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 USES= localbase php:pecl PHP_MODNAME= ${PORTNAME:tl} diff --git a/devel/pecl-expect/Makefile b/devel/pecl-expect/Makefile index e55ff2b0f96..3aac46c622c 100644 --- a/devel/pecl-expect/Makefile +++ b/devel/pecl-expect/Makefile @@ -17,7 +17,7 @@ LICENSE= PHP301 LIB_DEPENDS= libexpect.so:lang/expect USES= php:pecl tcl:86 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CFLAGS+= -I${TCL_INCLUDEDIR} CONFIGURE_ARGS+=--with-expect=${LOCALBASE} diff --git a/devel/pecl-gearman/Makefile b/devel/pecl-gearman/Makefile index cf73b7f6d18..9bcca5337c6 100644 --- a/devel/pecl-gearman/Makefile +++ b/devel/pecl-gearman/Makefile @@ -18,6 +18,6 @@ LIB_DEPENDS= libgearman.so:devel/gearmand USES= php:pecl CONFIGURE_ARGS= --with-gearman -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-htscanner/Makefile b/devel/pecl-htscanner/Makefile index 8b39df55136..75aee563011 100644 --- a/devel/pecl-htscanner/Makefile +++ b/devel/pecl-htscanner/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP30 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-htscanner diff --git a/devel/pecl-inotify/Makefile b/devel/pecl-inotify/Makefile index 7f8dea9f8f6..3f9cff9fe34 100644 --- a/devel/pecl-inotify/Makefile +++ b/devel/pecl-inotify/Makefile @@ -17,6 +17,6 @@ LICENSE= PHP301 LIB_DEPENDS= libinotify.so:devel/libinotify USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-intl/Makefile b/devel/pecl-intl/Makefile index 0aba0d64fc9..c5378dd6de4 100644 --- a/devel/pecl-intl/Makefile +++ b/devel/pecl-intl/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP301 LIB_DEPENDS= libicui18n.so:devel/icu -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 USES= compiler:c++11-lib php:pecl USE_CXXSTD= gnu++11 diff --git a/devel/pecl-jsmin2/Makefile b/devel/pecl-jsmin2/Makefile index 16c538b43ea..b48a9047a74 100644 --- a/devel/pecl-jsmin2/Makefile +++ b/devel/pecl-jsmin2/Makefile @@ -14,6 +14,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 USES= php:pecl -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 .include diff --git a/devel/pecl-jsonc/Makefile b/devel/pecl-jsonc/Makefile index bc93c29126a..e0e538f5ec0 100644 --- a/devel/pecl-jsonc/Makefile +++ b/devel/pecl-jsonc/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP301 USES= php:pecl pkgconfig CONFIGURE_ARGS= --with-jsonc MAKE_ARGS= EXTRA_CFLAGS=-DCOMPILE_DL_JSON=1 -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 CONFLICTS_INSTALL= php54-json-5* php55-json-5* php5-json-5* .include diff --git a/devel/pecl-jsonnet/Makefile b/devel/pecl-jsonnet/Makefile index 34218885335..310c5f77792 100644 --- a/devel/pecl-jsonnet/Makefile +++ b/devel/pecl-jsonnet/Makefile @@ -20,6 +20,6 @@ LIB_DEPENDS= libjsonnet.so:devel/jsonnet USES= php:pecl USE_PHP= json:build CONFIGURE_ARGS= --with-jsonnet=${LOCALBASE} -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-judy/Makefile b/devel/pecl-judy/Makefile index 6a0a5f023fa..535181375c6 100644 --- a/devel/pecl-judy/Makefile +++ b/devel/pecl-judy/Makefile @@ -20,6 +20,6 @@ BUILD_DEPENDS= Judy>=0:devel/judy CONFIGURE_ARGS= --with-judy=${LOCALBASE} USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-libevent/Makefile b/devel/pecl-libevent/Makefile index f96de92a3b7..510fade692b 100644 --- a/devel/pecl-libevent/Makefile +++ b/devel/pecl-libevent/Makefile @@ -18,6 +18,6 @@ LIB_DEPENDS= libevent.so:devel/libevent USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-memoize/Makefile b/devel/pecl-memoize/Makefile index 38769a3db66..a197a4eb421 100644 --- a/devel/pecl-memoize/Makefile +++ b/devel/pecl-memoize/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP301 USES= php:pecl CONFIGURE_ARGS= --enable-memoize -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 OPTIONS_DEFINE= MEMCACHED MEMORY OPTIONS_DEFAULT=MEMORY diff --git a/devel/pecl-msgpack0/Makefile b/devel/pecl-msgpack0/Makefile index eb343d8c242..6d834b1d316 100644 --- a/devel/pecl-msgpack0/Makefile +++ b/devel/pecl-msgpack0/Makefile @@ -14,6 +14,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= BSD3CLAUSE USES= php:pecl -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 .include diff --git a/devel/pecl-ncurses/Makefile b/devel/pecl-ncurses/Makefile index 11f7221e565..45c47118e46 100644 --- a/devel/pecl-ncurses/Makefile +++ b/devel/pecl-ncurses/Makefile @@ -15,6 +15,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 USES= php:pecl,cli ncurses -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 .include diff --git a/devel/pecl-newt/Makefile b/devel/pecl-newt/Makefile index cda1781699c..2ccb99e5d33 100644 --- a/devel/pecl-newt/Makefile +++ b/devel/pecl-newt/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP301 LIB_DEPENDS= libnewt.so:devel/newt USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 post-patch: @${REINPLACE_CMD} -e '/SEARCH_PATH/ s,=",="${LOCALBASE} ${PREFIX} ,' \ diff --git a/devel/pecl-params/Makefile b/devel/pecl-params/Makefile index 0e47908a358..5ac8d82026d 100644 --- a/devel/pecl-params/Makefile +++ b/devel/pecl-params/Makefile @@ -13,7 +13,7 @@ DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-params diff --git a/devel/pecl-propro/Makefile b/devel/pecl-propro/Makefile index 739c716a91a..ddbf37f3df0 100644 --- a/devel/pecl-propro/Makefile +++ b/devel/pecl-propro/Makefile @@ -18,6 +18,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PORTSCOUT= limit:^1.* USES= gmake php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-pthreads2/Makefile b/devel/pecl-pthreads2/Makefile index f4d2de76c73..a378c3d22db 100644 --- a/devel/pecl-pthreads2/Makefile +++ b/devel/pecl-pthreads2/Makefile @@ -19,7 +19,7 @@ PORTSCOUT= limit:^2\. CFLAGS+= -I${LOCALBASE}/include USES= php:pecl -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 .include diff --git a/devel/pecl-qb/Makefile b/devel/pecl-qb/Makefile index 207768334f6..5a373958129 100644 --- a/devel/pecl-qb/Makefile +++ b/devel/pecl-qb/Makefile @@ -17,6 +17,6 @@ LICENSE= PHP301 BROKEN_powerpc64= fails to build: Killing runaway build after 7200 seconds with no output USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-raphf/Makefile b/devel/pecl-raphf/Makefile index 91f61bde82d..33393ead7af 100644 --- a/devel/pecl-raphf/Makefile +++ b/devel/pecl-raphf/Makefile @@ -18,6 +18,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PORTSCOUT= limit:^1.* USES= gmake php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-runkit/Makefile b/devel/pecl-runkit/Makefile index 45c3feadc9c..d4adab82a3b 100644 --- a/devel/pecl-runkit/Makefile +++ b/devel/pecl-runkit/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP30 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-runkit=classkit diff --git a/devel/pecl-scream/Makefile b/devel/pecl-scream/Makefile index 153384fced1..de5c15f9b11 100644 --- a/devel/pecl-scream/Makefile +++ b/devel/pecl-scream/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 test: build @(cd ${WRKSRC} && ${MAKE} test) diff --git a/devel/pecl-spl_types/Makefile b/devel/pecl-spl_types/Makefile index 3c1f9c7ab95..96707c362e8 100644 --- a/devel/pecl-spl_types/Makefile +++ b/devel/pecl-spl_types/Makefile @@ -21,7 +21,7 @@ RE2C_RUN_DEPENDS= re2c:devel/re2c USE_PHP= spl USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-spl-types CFLAGS+= -I${LOCALBASE}/include diff --git a/devel/pecl-statgrab/Makefile b/devel/pecl-statgrab/Makefile index 2dfa0e51591..81d134251d4 100644 --- a/devel/pecl-statgrab/Makefile +++ b/devel/pecl-statgrab/Makefile @@ -16,7 +16,7 @@ EXPIRATION_DATE= 2018-12-30 LIB_DEPENDS= libstatgrab0.so:devel/libstatgrab0 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --with-statgrab=${LOCALBASE} diff --git a/devel/pecl-strict/Makefile b/devel/pecl-strict/Makefile index c36adf07343..19f44486a69 100644 --- a/devel/pecl-strict/Makefile +++ b/devel/pecl-strict/Makefile @@ -15,6 +15,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-svn/Makefile b/devel/pecl-svn/Makefile index ca480b36012..02cbad98f89 100644 --- a/devel/pecl-svn/Makefile +++ b/devel/pecl-svn/Makefile @@ -17,7 +17,7 @@ LICENSE= PHP301 LIB_DEPENDS= libsvn_client-1.so:devel/subversion USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USE_CSTD= c99 .include diff --git a/devel/pecl-test_helpers/Makefile b/devel/pecl-test_helpers/Makefile index b970ed3df11..362240bc03f 100644 --- a/devel/pecl-test_helpers/Makefile +++ b/devel/pecl-test_helpers/Makefile @@ -19,7 +19,7 @@ LICENSE= BSD3CLAUSE CONFIGURE_ARGS= --enable-test-helpers USES= php:zend tar:tgz SUB_FILES= pkg-message -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 # This needs to be loaded *after* devel/pecl-xdebug PHP_MOD_PRIO= 30 diff --git a/devel/pecl-uopz/Makefile b/devel/pecl-uopz/Makefile index 5674b3920d5..ea601aea99d 100644 --- a/devel/pecl-uopz/Makefile +++ b/devel/pecl-uopz/Makefile @@ -15,6 +15,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-uploadprogress/Makefile b/devel/pecl-uploadprogress/Makefile index 435404768d9..2eb289d6721 100644 --- a/devel/pecl-uploadprogress/Makefile +++ b/devel/pecl-uploadprogress/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-uploadprogress diff --git a/devel/pecl-uri_template/Makefile b/devel/pecl-uri_template/Makefile index 33f0aefa36f..8c3f69c83c9 100644 --- a/devel/pecl-uri_template/Makefile +++ b/devel/pecl-uri_template/Makefile @@ -15,6 +15,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/pecl-vld/Makefile b/devel/pecl-vld/Makefile index 1174d80f677..db124cc804a 100644 --- a/devel/pecl-vld/Makefile +++ b/devel/pecl-vld/Makefile @@ -11,7 +11,7 @@ COMMENT= Dump the internal representation of PHP scripts LICENSE= BSD2CLAUSE USES= php:pecl -IGNORE_WITH_PHP= 70 73 +IGNORE_WITH_PHP= 73 CONFIGURE_ARGS= --enable-vld diff --git a/devel/pecl-weakref/Makefile b/devel/pecl-weakref/Makefile index a18f9136440..ccc9fa6c46b 100644 --- a/devel/pecl-weakref/Makefile +++ b/devel/pecl-weakref/Makefile @@ -19,7 +19,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PORTSCOUT= limit:^0\.2\.[0-9]* USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CFLAGS+= -I${LOCALBASE}/include diff --git a/devel/pecl-xhprof/Makefile b/devel/pecl-xhprof/Makefile index d26e719b840..ecb0ece2dfe 100644 --- a/devel/pecl-xhprof/Makefile +++ b/devel/pecl-xhprof/Makefile @@ -18,6 +18,6 @@ WRKSRC_SUBDIR= extension USES= php:pecl ONLY_FOR_ARCHS= i386 amd64 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/php-jq/Makefile b/devel/php-jq/Makefile index b699783c328..60a2f2ff096 100644 --- a/devel/php-jq/Makefile +++ b/devel/php-jq/Makefile @@ -22,7 +22,7 @@ USE_GITHUB= yes GH_ACCOUNT= kjdev GH_PROJECT= php-ext-jq -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= php:ext JQ_CMD= ${LOCALBASE}/bin/jq diff --git a/devel/php-memoize/Makefile b/devel/php-memoize/Makefile index 5d1e82f5425..a4e3c12494f 100644 --- a/devel/php-memoize/Makefile +++ b/devel/php-memoize/Makefile @@ -19,7 +19,7 @@ GH_ACCOUNT= arraypad GH_PROJECT= php-${PORTNAME} USES= php:ext -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-memoize OPTIONS_DEFINE= MEMCACHED MEMORY diff --git a/devel/php-scalar_objects/Makefile b/devel/php-scalar_objects/Makefile index 05ccf492782..e3620f20b4d 100644 --- a/devel/php-scalar_objects/Makefile +++ b/devel/php-scalar_objects/Makefile @@ -20,6 +20,6 @@ GH_ACCOUNT= nikic GH_TAGNAME= baf4985 USES= php:ext -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/php-uprofiler/Makefile b/devel/php-uprofiler/Makefile index 3330505d51d..b240e57a343 100644 --- a/devel/php-uprofiler/Makefile +++ b/devel/php-uprofiler/Makefile @@ -29,6 +29,6 @@ GH_TAGNAME= 483c1e5 WRKSRC_SUBDIR= extension USES= php:ext -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/php5-blitz-devel/Makefile b/devel/php5-blitz-devel/Makefile index cf4ec84494a..737c3093124 100644 --- a/devel/php5-blitz-devel/Makefile +++ b/devel/php5-blitz-devel/Makefile @@ -19,6 +19,6 @@ CONFLICTS= php5-blitz-0.6* USES= php:ext PHP_MODNAME= blitz -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/php5-blitz/Makefile b/devel/php5-blitz/Makefile index 56ed6ac01e3..f08a65ee11d 100644 --- a/devel/php5-blitz/Makefile +++ b/devel/php5-blitz/Makefile @@ -17,6 +17,6 @@ EXPIRATION_DATE= 2018-12-30 CONFLICTS= php5-blitz-devel-[0-9]* USES= php:ext -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/devel/php5-dav/Makefile b/devel/php5-dav/Makefile index fdd434e3588..79f48aaf7d0 100644 --- a/devel/php5-dav/Makefile +++ b/devel/php5-dav/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libneon.so:www/neon USES= php:ext -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/devel/php5-ice/Makefile b/devel/php5-ice/Makefile index fc7718b86b3..c40d11e305f 100644 --- a/devel/php5-ice/Makefile +++ b/devel/php5-ice/Makefile @@ -27,7 +27,7 @@ PLIST= ${.CURDIR}/pkg-plist MAKE_ARGS+= PHP_EXT_DIR=${PHP_EXT_DIR} ICE_HOME=${LOCALBASE} \ PHP_HOME=${LOCALBASE} OPTIMIZE=yes USES+= php:build,flavors -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 BUILD_WRKSRC= ${WRKSRC}/php INSTALL_WRKSRC= ${WRKSRC}/php diff --git a/devel/php5-pinba/Makefile b/devel/php5-pinba/Makefile index 7287dc7a923..86b3de7e3d8 100644 --- a/devel/php5-pinba/Makefile +++ b/devel/php5-pinba/Makefile @@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX} MAINTAINER= komarov@valerka.net COMMENT= PHP-extension part of statistics server for PHP -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 diff --git a/devel/php5-thrift/Makefile b/devel/php5-thrift/Makefile index 7fe57e26622..0c28826732d 100644 --- a/devel/php5-thrift/Makefile +++ b/devel/php5-thrift/Makefile @@ -16,7 +16,7 @@ EXPIRATION_DATE= 2018-12-30 USES= php:ext PHP_MODNAME= thrift_protocol -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 DISTINFO_FILE= ${.CURDIR}/../thrift/distinfo WRKSRC_SUBDIR= lib/php/src/ext/thrift_protocol diff --git a/devel/pijul/Makefile b/devel/pijul/Makefile index b0b2a9dddee..57d0dcb6a5f 100644 --- a/devel/pijul/Makefile +++ b/devel/pijul/Makefile @@ -3,7 +3,7 @@ PORTNAME= pijul PORTVERSION= 0.10.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= https://pijul.org/releases/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} diff --git a/devel/pmdk/Makefile b/devel/pmdk/Makefile new file mode 100644 index 00000000000..9858ceac624 --- /dev/null +++ b/devel/pmdk/Makefile @@ -0,0 +1,36 @@ +# $FreeBSD$ + +PORTNAME= pmdk +DISTVERSION= 1.5 +CATEGORIES= devel + +MAINTAINER= d.scott.phillips@intel.com +COMMENT= Libraries and tools to manage and access persistent memory devices + +# PMDK code is BSD3CLAUSE, jemalloc is BSD2CLAUSE, +# Valgrind headers are BSD4CLAUSE. +LICENSE= BSD3CLAUSE BSD2CLAUSE BSD4CLAUSE +LICENSE_COMB= multi + +ONLY_FOR_ARCHS= aarch64 amd64 + +BUILD_DEPENDS= bash:shells/bash +LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid + +USES= autoreconf:build gmake pkgconfig +USE_GITHUB= yes +USE_LDCONFIG= yes + +GH_ACCOUNT= pmem + +MAKE_ARGS= EXTRA_CFLAGS=-Wno-error=unused-value + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/pmreorder + ${RM} ${STAGEDIR}${PREFIX}/man/man1/pmreorder.1.gz + ${RM} -r ${STAGEDIR}${PREFIX}/lib/pmdk_debug + ${RM} -r ${STAGEDIR}${PREFIX}/share/pmreorder + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pmempool + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.1.0.0 + +.include diff --git a/devel/pmdk/distinfo b/devel/pmdk/distinfo new file mode 100644 index 00000000000..b6be2079905 --- /dev/null +++ b/devel/pmdk/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1542399381 +SHA256 (pmem-pmdk-1.5_GH0.tar.gz) = 6b069d7207febeb62440e89245e8b18fcdf40b6170d2ec2ef33c252ed16db2d4 +SIZE (pmem-pmdk-1.5_GH0.tar.gz) = 2439245 diff --git a/devel/pmdk/files/patch-src_Makefile.inc b/devel/pmdk/files/patch-src_Makefile.inc new file mode 100644 index 00000000000..879b9b1b3dd --- /dev/null +++ b/devel/pmdk/files/patch-src_Makefile.inc @@ -0,0 +1,11 @@ +--- src/Makefile.inc.orig 2018-10-26 15:43:47 UTC ++++ src/Makefile.inc +@@ -294,7 +294,7 @@ install: all + ifneq ($(LIBRARY_NAME),) + $(INSTALL) -d $(LIBS_DESTDIR) + $(INSTALL) -p -m 0755 $(TARGET_LIBS) $(LIBS_DESTDIR) +- $(CP) -d $(TARGET_LINKS) $(LIBS_DESTDIR) ++ $(CP) -a $(TARGET_LINKS) $(LIBS_DESTDIR) + endif + + uninstall: diff --git a/devel/pmdk/files/patch-src_common.inc b/devel/pmdk/files/patch-src_common.inc new file mode 100644 index 00000000000..2d152eb3398 --- /dev/null +++ b/devel/pmdk/files/patch-src_common.inc @@ -0,0 +1,34 @@ +--- src/common.inc.orig 2018-10-26 15:43:47 UTC ++++ src/common.inc +@@ -85,9 +85,7 @@ endif + osdep = $(1)_$(shell echo $(OS_KERNEL_NAME) | tr "[:upper:]" "[:lower:]")$(2) + + get_arch = $(shell $(CC) -dumpmachine | awk -F'[/-]' '{print $$1}') +-ifeq ($(ARCH),) +-export ARCH := $(call get_arch) +-endif ++override export ARCH := $(call get_arch) + + ifeq ($(PKG_CONFIG_CHECKED),) + ifeq ($(shell command -v $(PKG_CONFIG) && echo y || echo n), n) +@@ -186,9 +184,9 @@ else + export WSTRINGOP_TRUNCATION_AVAILABLE + endif + +-install_recursive = $(shell cd $(1) && find . -type f -exec install -m $(2) -D {} $(3)/{} \;) ++install_recursive = $(shell cd $(1) && find . -type d -exec install -d $(3)/{} \; && find . -type f -exec install -m $(2) {} $(3)/{} \;) + +-install_recursive_filter = $(shell cd $(1) && find . -type f -name "$(2)" -exec install -m $(3) -D {} $(4)/{} \;) ++install_recursive_filter = $(shell cd $(1) && find . -type d -exec install -d $(4)/{} \; && find . -type f -name "$(2)" -exec install -m $(3) {} $(4)/{} \;) + + define create-deps + @cp $(objdir)/$*.d $(objdir)/.deps/$*.P; \ +@@ -209,7 +207,7 @@ export prefix = /usr/local + export exec_prefix := $(prefix) + export sysconfdir := $(prefix)/etc + export datarootdir := $(prefix)/share +-export mandir := $(datarootdir)/man ++export mandir := $(MANPREFIX)/man + export docdir := $(datarootdir)/doc + export man1dir := $(mandir)/man1 + export man3dir := $(mandir)/man3 diff --git a/devel/pmdk/files/patch-src_common_os__auto__flush__linux.c b/devel/pmdk/files/patch-src_common_os__auto__flush__linux.c new file mode 100644 index 00000000000..2c1b43c1729 --- /dev/null +++ b/devel/pmdk/files/patch-src_common_os__auto__flush__linux.c @@ -0,0 +1,11 @@ +--- src/common/os_auto_flush_linux.c.orig 2018-11-16 20:26:19 UTC ++++ src/common/os_auto_flush_linux.c +@@ -75,7 +75,7 @@ check_cpu_cache(const char *domain_path) + cpu_cache = -1; + goto end; + } else if (len == 0) { +- errno = ENODATA; ++ errno = EINVAL; + ERR("read(%d, %p, %d) empty string", + domain_fd, domain_value, + DOMAIN_VALUE_LEN); diff --git a/devel/pmdk/files/patch-src_common_os__posix.c b/devel/pmdk/files/patch-src_common_os__posix.c new file mode 100644 index 00000000000..20b3b368748 --- /dev/null +++ b/devel/pmdk/files/patch-src_common_os__posix.c @@ -0,0 +1,14 @@ +--- src/common/os_posix.c.orig 2018-10-26 15:43:47 UTC ++++ src/common/os_posix.c +@@ -200,9 +200,8 @@ os_posix_fallocate(int fd, os_off_t offset, off_t len) + if (fstatfs(fd, &fsbuf) == -1 || fstat(fd, &fbuf) == -1) + return errno; + +- size_t reqd_blocks = +- (((size_t)len + (fsbuf.f_bsize - 1)) / fsbuf.f_bsize) +- - (size_t)fbuf.st_blocks; ++ size_t reqd_blocks = (((size_t)len + (fsbuf.f_bsize - 1)) / fsbuf.f_bsize); ++ reqd_blocks -= fbuf.st_blocks > reqd_blocks ? reqd_blocks : fbuf.st_blocks; + if (reqd_blocks > (size_t)fsbuf.f_bavail) + return ENOSPC; + } diff --git a/devel/pmdk/files/patch-src_common_queue.h b/devel/pmdk/files/patch-src_common_queue.h new file mode 100644 index 00000000000..272a1b9a09e --- /dev/null +++ b/devel/pmdk/files/patch-src_common_queue.h @@ -0,0 +1,13 @@ +--- src/common/queue.h.orig 2018-10-24 02:57:34 UTC ++++ src/common/queue.h +@@ -32,8 +32,8 @@ + * @(#)queue.h 8.5 (Berkeley) 8/20/94 + */ + +-#ifndef _SYS_QUEUE_H_ +-#define _SYS_QUEUE_H_ ++#ifndef _COPIED_GLIBC_SYS_QUEUE_H_ ++#define _COPIED_GLIBC_SYS_QUEUE_H_ + + /* + * This file defines five types of data structures: singly-linked lists, diff --git a/devel/pmdk/pkg-descr b/devel/pmdk/pkg-descr new file mode 100644 index 00000000000..71b908c271f --- /dev/null +++ b/devel/pmdk/pkg-descr @@ -0,0 +1,6 @@ +The Persistent Memory Development Kit (PMDK) is a collection of +libraries and tools for System Administrators and Application +Developers to simplify managing and accessing persistent memory +devices. + +WWW: http://pmem.io diff --git a/devel/pmdk/pkg-message b/devel/pmdk/pkg-message new file mode 100644 index 00000000000..3926b82bbe9 --- /dev/null +++ b/devel/pmdk/pkg-message @@ -0,0 +1,2 @@ +pmdk requires procfs(5). Add this line to your fstab(5): +proc /proc procfs rw 0 0 diff --git a/devel/pmdk/pkg-plist b/devel/pmdk/pkg-plist new file mode 100644 index 00000000000..c0e3961ad23 --- /dev/null +++ b/devel/pmdk/pkg-plist @@ -0,0 +1,347 @@ +bin/pmempool +etc/bash_completion.d/pmempool +include/libpmem.h +include/libpmemblk.h +include/libpmemlog.h +include/libpmemobj.h +include/libpmemobj/action.h +include/libpmemobj/action_base.h +include/libpmemobj/atomic.h +include/libpmemobj/atomic_base.h +include/libpmemobj/base.h +include/libpmemobj/ctl.h +include/libpmemobj/iterator.h +include/libpmemobj/iterator_base.h +include/libpmemobj/lists_atomic.h +include/libpmemobj/lists_atomic_base.h +include/libpmemobj/pool.h +include/libpmemobj/pool_base.h +include/libpmemobj/thread.h +include/libpmemobj/tx.h +include/libpmemobj/tx_base.h +include/libpmemobj/types.h +include/libpmempool.h +include/libvmem.h +include/libvmmalloc.h +lib/libpmem.a +lib/libpmem.so +lib/libpmem.so.1 +lib/libpmem.so.1.0.0 +lib/libpmemblk.a +lib/libpmemblk.so +lib/libpmemblk.so.1 +lib/libpmemblk.so.1.0.0 +lib/libpmemlog.a +lib/libpmemlog.so +lib/libpmemlog.so.1 +lib/libpmemlog.so.1.0.0 +lib/libpmemobj.a +lib/libpmemobj.so +lib/libpmemobj.so.1 +lib/libpmemobj.so.1.0.0 +lib/libpmempool.a +lib/libpmempool.so +lib/libpmempool.so.1 +lib/libpmempool.so.1.0.0 +lib/libvmem.a +lib/libvmem.so +lib/libvmem.so.1 +lib/libvmem.so.1.0.0 +lib/libvmmalloc.a +lib/libvmmalloc.so +lib/libvmmalloc.so.1 +lib/libvmmalloc.so.1.0.0 +libdata/pkgconfig/libpmem.pc +libdata/pkgconfig/libpmemblk.pc +libdata/pkgconfig/libpmemlog.pc +libdata/pkgconfig/libpmemobj.pc +libdata/pkgconfig/libpmempool.pc +libdata/pkgconfig/libvmem.pc +libdata/pkgconfig/libvmmalloc.pc +man/man1/pmempool-check.1.gz +man/man1/pmempool-convert.1.gz +man/man1/pmempool-create.1.gz +man/man1/pmempool-dump.1.gz +man/man1/pmempool-feature.1.gz +man/man1/pmempool-info.1.gz +man/man1/pmempool-rm.1.gz +man/man1/pmempool-sync.1.gz +man/man1/pmempool-transform.1.gz +man/man1/pmempool.1.gz +man/man3/d_ro.3.gz +man/man3/d_rw.3.gz +man/man3/direct_ro.3.gz +man/man3/direct_rw.3.gz +man/man3/oid_equals.3.gz +man/man3/oid_instanceof.3.gz +man/man3/oid_is_null.3.gz +man/man3/pmem_check_version.3.gz +man/man3/pmem_deep_drain.3.gz +man/man3/pmem_deep_flush.3.gz +man/man3/pmem_deep_persist.3.gz +man/man3/pmem_drain.3.gz +man/man3/pmem_errormsg.3.gz +man/man3/pmem_flush.3.gz +man/man3/pmem_has_auto_flush.3.gz +man/man3/pmem_has_hw_drain.3.gz +man/man3/pmem_is_pmem.3.gz +man/man3/pmem_map_file.3.gz +man/man3/pmem_memcpy.3.gz +man/man3/pmem_memcpy_nodrain.3.gz +man/man3/pmem_memcpy_persist.3.gz +man/man3/pmem_memmove.3.gz +man/man3/pmem_memmove_nodrain.3.gz +man/man3/pmem_memmove_persist.3.gz +man/man3/pmem_memset.3.gz +man/man3/pmem_memset_nodrain.3.gz +man/man3/pmem_memset_persist.3.gz +man/man3/pmem_msync.3.gz +man/man3/pmem_persist.3.gz +man/man3/pmem_unmap.3.gz +man/man3/pmemblk_bsize.3.gz +man/man3/pmemblk_check.3.gz +man/man3/pmemblk_check_version.3.gz +man/man3/pmemblk_close.3.gz +man/man3/pmemblk_create.3.gz +man/man3/pmemblk_ctl_exec.3.gz +man/man3/pmemblk_ctl_get.3.gz +man/man3/pmemblk_ctl_set.3.gz +man/man3/pmemblk_errormsg.3.gz +man/man3/pmemblk_nblock.3.gz +man/man3/pmemblk_open.3.gz +man/man3/pmemblk_read.3.gz +man/man3/pmemblk_set_error.3.gz +man/man3/pmemblk_set_funcs.3.gz +man/man3/pmemblk_set_zero.3.gz +man/man3/pmemblk_write.3.gz +man/man3/pmemlog_append.3.gz +man/man3/pmemlog_appendv.3.gz +man/man3/pmemlog_check.3.gz +man/man3/pmemlog_check_version.3.gz +man/man3/pmemlog_close.3.gz +man/man3/pmemlog_create.3.gz +man/man3/pmemlog_ctl_exec.3.gz +man/man3/pmemlog_ctl_get.3.gz +man/man3/pmemlog_ctl_set.3.gz +man/man3/pmemlog_errormsg.3.gz +man/man3/pmemlog_nbyte.3.gz +man/man3/pmemlog_open.3.gz +man/man3/pmemlog_rewind.3.gz +man/man3/pmemlog_set_funcs.3.gz +man/man3/pmemlog_tell.3.gz +man/man3/pmemlog_walk.3.gz +man/man3/pmemobj_action.3.gz +man/man3/pmemobj_alloc.3.gz +man/man3/pmemobj_alloc_usable_size.3.gz +man/man3/pmemobj_cancel.3.gz +man/man3/pmemobj_check.3.gz +man/man3/pmemobj_check_version.3.gz +man/man3/pmemobj_close.3.gz +man/man3/pmemobj_cond_broadcast.3.gz +man/man3/pmemobj_cond_signal.3.gz +man/man3/pmemobj_cond_timedwait.3.gz +man/man3/pmemobj_cond_wait.3.gz +man/man3/pmemobj_cond_zero.3.gz +man/man3/pmemobj_create.3.gz +man/man3/pmemobj_ctl_exec.3.gz +man/man3/pmemobj_ctl_get.3.gz +man/man3/pmemobj_ctl_set.3.gz +man/man3/pmemobj_defer_free.3.gz +man/man3/pmemobj_direct.3.gz +man/man3/pmemobj_drain.3.gz +man/man3/pmemobj_errormsg.3.gz +man/man3/pmemobj_first.3.gz +man/man3/pmemobj_flush.3.gz +man/man3/pmemobj_free.3.gz +man/man3/pmemobj_list_insert.3.gz +man/man3/pmemobj_list_insert_new.3.gz +man/man3/pmemobj_list_move.3.gz +man/man3/pmemobj_list_remove.3.gz +man/man3/pmemobj_memcpy.3.gz +man/man3/pmemobj_memcpy_persist.3.gz +man/man3/pmemobj_memmove.3.gz +man/man3/pmemobj_memset.3.gz +man/man3/pmemobj_memset_persist.3.gz +man/man3/pmemobj_mutex_lock.3.gz +man/man3/pmemobj_mutex_timedlock.3.gz +man/man3/pmemobj_mutex_trylock.3.gz +man/man3/pmemobj_mutex_unlock.3.gz +man/man3/pmemobj_mutex_zero.3.gz +man/man3/pmemobj_next.3.gz +man/man3/pmemobj_oid.3.gz +man/man3/pmemobj_open.3.gz +man/man3/pmemobj_persist.3.gz +man/man3/pmemobj_pool_by_oid.3.gz +man/man3/pmemobj_pool_by_ptr.3.gz +man/man3/pmemobj_publish.3.gz +man/man3/pmemobj_realloc.3.gz +man/man3/pmemobj_reserve.3.gz +man/man3/pmemobj_root.3.gz +man/man3/pmemobj_root_construct.3.gz +man/man3/pmemobj_root_size.3.gz +man/man3/pmemobj_rwlock_rdlock.3.gz +man/man3/pmemobj_rwlock_timedrdlock.3.gz +man/man3/pmemobj_rwlock_timedwrlock.3.gz +man/man3/pmemobj_rwlock_tryrdlock.3.gz +man/man3/pmemobj_rwlock_trywrlock.3.gz +man/man3/pmemobj_rwlock_unlock.3.gz +man/man3/pmemobj_rwlock_wrlock.3.gz +man/man3/pmemobj_rwlock_zero.3.gz +man/man3/pmemobj_set_funcs.3.gz +man/man3/pmemobj_set_value.3.gz +man/man3/pmemobj_strdup.3.gz +man/man3/pmemobj_tx_abort.3.gz +man/man3/pmemobj_tx_add_range.3.gz +man/man3/pmemobj_tx_add_range_direct.3.gz +man/man3/pmemobj_tx_alloc.3.gz +man/man3/pmemobj_tx_begin.3.gz +man/man3/pmemobj_tx_commit.3.gz +man/man3/pmemobj_tx_end.3.gz +man/man3/pmemobj_tx_errno.3.gz +man/man3/pmemobj_tx_free.3.gz +man/man3/pmemobj_tx_lock.3.gz +man/man3/pmemobj_tx_process.3.gz +man/man3/pmemobj_tx_publish.3.gz +man/man3/pmemobj_tx_realloc.3.gz +man/man3/pmemobj_tx_stage.3.gz +man/man3/pmemobj_tx_strdup.3.gz +man/man3/pmemobj_tx_wcsdup.3.gz +man/man3/pmemobj_tx_xadd_range.3.gz +man/man3/pmemobj_tx_xadd_range_direct.3.gz +man/man3/pmemobj_tx_xalloc.3.gz +man/man3/pmemobj_tx_zalloc.3.gz +man/man3/pmemobj_tx_zrealloc.3.gz +man/man3/pmemobj_type_num.3.gz +man/man3/pmemobj_volatile.3.gz +man/man3/pmemobj_wcsdup.3.gz +man/man3/pmemobj_xalloc.3.gz +man/man3/pmemobj_xflush.3.gz +man/man3/pmemobj_xpersist.3.gz +man/man3/pmemobj_xreserve.3.gz +man/man3/pmemobj_zalloc.3.gz +man/man3/pmemobj_zrealloc.3.gz +man/man3/pmempool_check.3.gz +man/man3/pmempool_check_end.3.gz +man/man3/pmempool_check_init.3.gz +man/man3/pmempool_check_version.3.gz +man/man3/pmempool_errormsg.3.gz +man/man3/pmempool_feature_disable.3.gz +man/man3/pmempool_feature_enable.3.gz +man/man3/pmempool_feature_query.3.gz +man/man3/pmempool_rm.3.gz +man/man3/pmempool_sync.3.gz +man/man3/pmempool_transform.3.gz +man/man3/pobj_alloc.3.gz +man/man3/pobj_first.3.gz +man/man3/pobj_first_type_num.3.gz +man/man3/pobj_foreach.3.gz +man/man3/pobj_foreach_safe.3.gz +man/man3/pobj_foreach_safe_type.3.gz +man/man3/pobj_foreach_type.3.gz +man/man3/pobj_free.3.gz +man/man3/pobj_layout_begin.3.gz +man/man3/pobj_layout_end.3.gz +man/man3/pobj_layout_name.3.gz +man/man3/pobj_layout_root.3.gz +man/man3/pobj_layout_toid.3.gz +man/man3/pobj_layout_types_num.3.gz +man/man3/pobj_list_empty.3.gz +man/man3/pobj_list_entry.3.gz +man/man3/pobj_list_first.3.gz +man/man3/pobj_list_foreach.3.gz +man/man3/pobj_list_foreach_reverse.3.gz +man/man3/pobj_list_head.3.gz +man/man3/pobj_list_insert_after.3.gz +man/man3/pobj_list_insert_before.3.gz +man/man3/pobj_list_insert_head.3.gz +man/man3/pobj_list_insert_new_after.3.gz +man/man3/pobj_list_insert_new_before.3.gz +man/man3/pobj_list_insert_new_head.3.gz +man/man3/pobj_list_insert_new_tail.3.gz +man/man3/pobj_list_insert_tail.3.gz +man/man3/pobj_list_last.3.gz +man/man3/pobj_list_move_element_after.3.gz +man/man3/pobj_list_move_element_before.3.gz +man/man3/pobj_list_move_element_head.3.gz +man/man3/pobj_list_move_element_tail.3.gz +man/man3/pobj_list_next.3.gz +man/man3/pobj_list_prev.3.gz +man/man3/pobj_list_remove.3.gz +man/man3/pobj_list_remove_free.3.gz +man/man3/pobj_new.3.gz +man/man3/pobj_next.3.gz +man/man3/pobj_next_type_num.3.gz +man/man3/pobj_realloc.3.gz +man/man3/pobj_reserve_alloc.3.gz +man/man3/pobj_reserve_new.3.gz +man/man3/pobj_root.3.gz +man/man3/pobj_xreserve_alloc.3.gz +man/man3/pobj_xreserve_new.3.gz +man/man3/pobj_zalloc.3.gz +man/man3/pobj_znew.3.gz +man/man3/pobj_zrealloc.3.gz +man/man3/toid.3.gz +man/man3/toid_assign.3.gz +man/man3/toid_declare.3.gz +man/man3/toid_declare_root.3.gz +man/man3/toid_equals.3.gz +man/man3/toid_is_null.3.gz +man/man3/toid_offsetof.3.gz +man/man3/toid_type_num.3.gz +man/man3/toid_type_num_of.3.gz +man/man3/toid_typeof.3.gz +man/man3/toid_valid.3.gz +man/man3/tx_add.3.gz +man/man3/tx_add_direct.3.gz +man/man3/tx_add_field.3.gz +man/man3/tx_add_field_direct.3.gz +man/man3/tx_alloc.3.gz +man/man3/tx_begin.3.gz +man/man3/tx_begin_cb.3.gz +man/man3/tx_begin_param.3.gz +man/man3/tx_end.3.gz +man/man3/tx_finally.3.gz +man/man3/tx_free.3.gz +man/man3/tx_memcpy.3.gz +man/man3/tx_memset.3.gz +man/man3/tx_new.3.gz +man/man3/tx_onabort.3.gz +man/man3/tx_oncommit.3.gz +man/man3/tx_realloc.3.gz +man/man3/tx_set.3.gz +man/man3/tx_set_direct.3.gz +man/man3/tx_strdup.3.gz +man/man3/tx_wcsdup.3.gz +man/man3/tx_xadd.3.gz +man/man3/tx_xadd_direct.3.gz +man/man3/tx_xadd_field.3.gz +man/man3/tx_xadd_field_direct.3.gz +man/man3/tx_xalloc.3.gz +man/man3/tx_zalloc.3.gz +man/man3/tx_znew.3.gz +man/man3/tx_zrealloc.3.gz +man/man3/vmem_aligned_alloc.3.gz +man/man3/vmem_calloc.3.gz +man/man3/vmem_check.3.gz +man/man3/vmem_check_version.3.gz +man/man3/vmem_create.3.gz +man/man3/vmem_create_in_region.3.gz +man/man3/vmem_delete.3.gz +man/man3/vmem_errormsg.3.gz +man/man3/vmem_free.3.gz +man/man3/vmem_malloc.3.gz +man/man3/vmem_malloc_usable_size.3.gz +man/man3/vmem_realloc.3.gz +man/man3/vmem_set_funcs.3.gz +man/man3/vmem_stats_print.3.gz +man/man3/vmem_strdup.3.gz +man/man3/vmem_wcsdup.3.gz +man/man5/pmem_ctl.5.gz +man/man5/poolset.5.gz +man/man7/libpmem.7.gz +man/man7/libpmemblk.7.gz +man/man7/libpmemlog.7.gz +man/man7/libpmemobj.7.gz +man/man7/libpmempool.7.gz +man/man7/libvmem.7.gz +man/man7/libvmmalloc.7.gz diff --git a/devel/protobuf/Makefile b/devel/protobuf/Makefile index c6b16b922ee..bf11ea5968b 100644 --- a/devel/protobuf/Makefile +++ b/devel/protobuf/Makefile @@ -20,7 +20,7 @@ TEST_DEPENDS= googlemock>=0:devel/googlemock \ USES= autoreconf compiler:c++11-lang gmake libtool localbase pathfix pkgconfig -CFLAGS+= -DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src +CFLAGS+= -D_THREAD_SAFE -DGOOGLE_PROTOBUF_NO_RTTI -I${WRKSRC}/src CONFIGURE_ENV= CC_FOR_BUILD="${CC}" \ CFLAGS_FOR_BUILD="${CFLAGS}" \ CPPFLAGS_FOR_BUILD="${CPPFLAGS}" \ diff --git a/devel/py-ipykernel5/Makefile b/devel/py-ipykernel5/Makefile new file mode 100644 index 00000000000..415c9417e47 --- /dev/null +++ b/devel/py-ipykernel5/Makefile @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTNAME= ipykernel +PORTVERSION= 5.1.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 5 + +MAINTAINER= python@FreeBSD.org +COMMENT= IPython Kernel for Jupyter + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/COPYING.md + +BUILD_DEPENDS= ${RUN_DEPENDS} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipython>=7.0.0:devel/ipython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tornado>=4.0:www/py-tornado@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}traitlets>=4.1.0:devel/py-traitlets@${PY_FLAVOR} + +USES= python:3.4+ + +USE_PYTHON= autoplist concurrent distutils +NO_ARCH= yes + +.include diff --git a/devel/py-ipykernel5/distinfo b/devel/py-ipykernel5/distinfo new file mode 100644 index 00000000000..386366e0edb --- /dev/null +++ b/devel/py-ipykernel5/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1543978655 +SHA256 (ipykernel-5.1.0.tar.gz) = 0fc0bf97920d454102168ec2008620066878848fcfca06c22b669696212e292f +SIZE (ipykernel-5.1.0.tar.gz) = 101198 diff --git a/devel/py-ipykernel5/pkg-descr b/devel/py-ipykernel5/pkg-descr new file mode 100644 index 00000000000..84199ddb8f2 --- /dev/null +++ b/devel/py-ipykernel5/pkg-descr @@ -0,0 +1,3 @@ +IPython Kernel for Jupyter. + +WWW: https://ipython.org/ diff --git a/devel/py-jenkins-job-builder/Makefile b/devel/py-jenkins-job-builder/Makefile index 6f9481d4fdc..632acefea0e 100644 --- a/devel/py-jenkins-job-builder/Makefile +++ b/devel/py-jenkins-job-builder/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= jenkins-job-builder -PORTVERSION= 2.9.0 +PORTVERSION= 2.9.1 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-jenkins-job-builder/distinfo b/devel/py-jenkins-job-builder/distinfo index b7c08d4a07d..0808d47769a 100644 --- a/devel/py-jenkins-job-builder/distinfo +++ b/devel/py-jenkins-job-builder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543820048 -SHA256 (jenkins-job-builder-2.9.0.tar.gz) = 989508bc1e0b0d07531328432b3b89186d035fc8f3631aea2918ec1fd0b41e40 -SIZE (jenkins-job-builder-2.9.0.tar.gz) = 583525 +TIMESTAMP = 1544175032 +SHA256 (jenkins-job-builder-2.9.1.tar.gz) = fba5f3efe8bd06d559f06a5d3bd68da5a7395541fcd370053a8174d08519e3d0 +SIZE (jenkins-job-builder-2.9.1.tar.gz) = 587181 diff --git a/devel/py-jupyter_console/Makefile b/devel/py-jupyter_console/Makefile index af6ac3ce164..7ba24303dc2 100644 --- a/devel/py-jupyter_console/Makefile +++ b/devel/py-jupyter_console/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= jupyter_console -PORTVERSION= 5.2.0 -PORTREVISION= 1 +PORTVERSION= 6.0.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,12 +13,13 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter_client>=0:devel/py-jupyter_client@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ipython5>=0:devel/ipython5@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}prompt_toolkit>=1.0.4:devel/py-prompt_toolkit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipython>=7.0.0:devel/ipython@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipykernel5>=5.0.0:devel/py-ipykernel5@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}prompt_toolkit2>=2.0.0:devel/py-prompt_toolkit2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=1.6:textproc/py-pygments@${PY_FLAVOR} -USES= python +USES= python:3.5+ + USE_PYTHON= distutils autoplist USE_LOCALE= en_US.UTF-8 NO_ARCH= yes diff --git a/devel/py-jupyter_console/distinfo b/devel/py-jupyter_console/distinfo index 940d705a3ab..7da75bbb5cf 100644 --- a/devel/py-jupyter_console/distinfo +++ b/devel/py-jupyter_console/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521136405 -SHA256 (jupyter_console-5.2.0.tar.gz) = 545dedd3aaaa355148093c5609f0229aeb121b4852995c2accfa64fe3e0e55cd -SIZE (jupyter_console-5.2.0.tar.gz) = 27063 +TIMESTAMP = 1543970482 +SHA256 (jupyter_console-6.0.0.tar.gz) = 308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5 +SIZE (jupyter_console-6.0.0.tar.gz) = 27780 diff --git a/devel/py-py_interface/Makefile b/devel/py-py_interface/Makefile index 062e3494792..447dc511ae0 100644 --- a/devel/py-py_interface/Makefile +++ b/devel/py-py_interface/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= py_interface -PORTVERSION= 2.2 +PORTVERSION= 2.3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,6 +15,8 @@ LICENSE= LGPL20 USES= python USE_PYTHON= autoplist concurrent distutils +NO_ARCH= yes + OPTIONS_DEFINE= DOCS PORTDOCS= README diff --git a/devel/py-py_interface/distinfo b/devel/py-py_interface/distinfo index ef1e9fc54c1..0e544d7c921 100644 --- a/devel/py-py_interface/distinfo +++ b/devel/py-py_interface/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499766252 -SHA256 (py_interface-2.2.tar.gz) = a43d7d124f2e192987830baad067ea62d34c517ea0dc8b386ad2e2c4d5e52661 -SIZE (py_interface-2.2.tar.gz) = 88112 +TIMESTAMP = 1544114845 +SHA256 (py_interface-2.3.tar.gz) = 55ddb9881c18a2da9722f22546e374532082936eb5a8391063f17cc54c16c90b +SIZE (py_interface-2.3.tar.gz) = 88491 diff --git a/devel/py-qtconsole/Makefile b/devel/py-qtconsole/Makefile index 69371994700..4bea2d233d1 100644 --- a/devel/py-qtconsole/Makefile +++ b/devel/py-qtconsole/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qtconsole -PORTVERSION= 4.3.1 +PORTVERSION= 4.4.3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,17 +12,15 @@ COMMENT= Qt-based console for Jupyter with support for rich media output LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING.md -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 - RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}traitlets>=0:devel/py-traitlets@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyter_core>=0:devel/py-jupyter_core@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyter_client>=4.1:devel/py-jupyter_client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pygments>=0:textproc/py-pygments@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ipykernel>=4.1:devel/py-ipykernel@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ipykernel5>=5.1:devel/py-ipykernel5@${PY_FLAVOR} -USES= pyqt:4 python -USE_PYQT= core gui svg +USES= pyqt:5 python:3.4+ + +USE_PYQT= core gui printsupport sip svg widgets USE_PYTHON= distutils autoplist .include diff --git a/devel/py-qtconsole/distinfo b/devel/py-qtconsole/distinfo index a00c1893006..bacae76ca8b 100644 --- a/devel/py-qtconsole/distinfo +++ b/devel/py-qtconsole/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521045716 -SHA256 (qtconsole-4.3.1.tar.gz) = eff8c2faeda567a0bef5781f419a64e9977988db101652b312b9d74ec0a5109c -SIZE (qtconsole-4.3.1.tar.gz) = 416931 +TIMESTAMP = 1543980367 +SHA256 (qtconsole-4.4.3.tar.gz) = bc1ba15f50c29ed50f1268ad823bb6543be263c18dd093b80495e9df63b003ac +SIZE (qtconsole-4.4.3.tar.gz) = 419927 diff --git a/devel/py-vulture/Makefile b/devel/py-vulture/Makefile new file mode 100644 index 00000000000..fea83a6129d --- /dev/null +++ b/devel/py-vulture/Makefile @@ -0,0 +1,24 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= vulture +PORTVERSION= 1.0 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Find dead code in Python programs + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes + +.include diff --git a/devel/py-vulture/distinfo b/devel/py-vulture/distinfo new file mode 100644 index 00000000000..96d31d90cda --- /dev/null +++ b/devel/py-vulture/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544124100 +SHA256 (vulture-1.0.tar.gz) = 4b5a8980c338e9c068d43e7164555a1e4c9c7d84961ce2bc6f3ed975f6e5bc9d +SIZE (vulture-1.0.tar.gz) = 31690 diff --git a/devel/py-vulture/pkg-descr b/devel/py-vulture/pkg-descr new file mode 100644 index 00000000000..4f41c796cf3 --- /dev/null +++ b/devel/py-vulture/pkg-descr @@ -0,0 +1,17 @@ +Vulture finds unused code in Python programs. This is useful for cleaning up and +finding errors in large code bases. If you run Vulture on both your library and +test suite you can find untested code. + +Due to Python's dynamic nature, static code analyzers like Vulture are likely to +miss some dead code. Also, code that is only called implicitly may be reported +as unused. Nonetheless, Vulture can be a very helpful tool for higher code +quality. + +Features: +- fast: uses static code analysis +- tested: tests itself and has complete test coverage +- complements pyflakes and has the same output syntax +- sorts unused classes and functions by size with --sort-by-size +- supports Python 2.7 and Python >= 3.4 + +WWW: https://github.com/jendrikseipp/vulture diff --git a/devel/py-widgetsnbextension/Makefile b/devel/py-widgetsnbextension/Makefile index 721f4ddcbd3..3df3f6f57cf 100644 --- a/devel/py-widgetsnbextension/Makefile +++ b/devel/py-widgetsnbextension/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= widgetsnbextension -PORTVERSION= 3.2.1 +PORTVERSION= 3.4.2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-widgetsnbextension/distinfo b/devel/py-widgetsnbextension/distinfo index 9b5c5052553..9829a1d5ef8 100644 --- a/devel/py-widgetsnbextension/distinfo +++ b/devel/py-widgetsnbextension/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1531268028 -SHA256 (widgetsnbextension-3.2.1.tar.gz) = 5417789ee6064ff515fd10be24870660af3561c02d3d48b26f6f44285d0f70cc -SIZE (widgetsnbextension-3.2.1.tar.gz) = 1102216 +TIMESTAMP = 1544208236 +SHA256 (widgetsnbextension-3.4.2.tar.gz) = fa618be8435447a017fd1bf2c7ae922d0428056cfc7449f7a8641edf76b48265 +SIZE (widgetsnbextension-3.4.2.tar.gz) = 1103610 diff --git a/devel/racer/Makefile b/devel/racer/Makefile index 6598f990160..2c86eef2b1e 100644 --- a/devel/racer/Makefile +++ b/devel/racer/Makefile @@ -4,6 +4,7 @@ PORTNAME= racer DISTVERSIONPREFIX= v DISTVERSION= 2.1.14 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= beyert@cs.ucr.edu @@ -55,20 +56,24 @@ CARGO_CRATES= aho-corasick-0.6.9 \ lazy_static-1.2.0 \ lazycell-1.2.0 \ libc-0.2.44 \ + lock_api-0.1.5 \ log-0.4.6 \ memchr-2.1.1 \ memoffset-0.2.1 \ nodrop-0.1.13 \ num_cpus-1.8.0 \ - owning_ref-0.3.3 \ - parking_lot-0.5.5 \ + owning_ref-0.4.0 \ + parking_lot-0.6.4 \ parking_lot_core-0.2.14 \ + parking_lot_core-0.3.1 \ proc-macro2-0.4.24 \ quick-error-1.2.2 \ quote-0.6.10 \ rand-0.4.3 \ + rand-0.5.5 \ rand-0.6.1 \ rand_chacha-0.1.0 \ + rand_core-0.2.2 \ rand_core-0.3.0 \ rand_hc-0.1.0 \ rand_isaac-0.1.1 \ @@ -80,14 +85,15 @@ CARGO_CRATES= aho-corasick-0.6.9 \ regex-syntax-0.6.3 \ remove_dir_all-0.5.1 \ rls-span-0.4.0 \ - rustc-ap-arena-237.0.0 \ - rustc-ap-rustc_cratesio_shim-237.0.0 \ - rustc-ap-rustc_data_structures-237.0.0 \ - rustc-ap-rustc_errors-237.0.0 \ - rustc-ap-rustc_target-237.0.0 \ - rustc-ap-serialize-237.0.0 \ - rustc-ap-syntax-237.0.0 \ - rustc-ap-syntax_pos-237.0.0 \ + rustc-ap-arena-297.0.0 \ + rustc-ap-graphviz-297.0.0 \ + rustc-ap-rustc_cratesio_shim-297.0.0 \ + rustc-ap-rustc_data_structures-297.0.0 \ + rustc-ap-rustc_errors-297.0.0 \ + rustc-ap-rustc_target-297.0.0 \ + rustc-ap-serialize-297.0.0 \ + rustc-ap-syntax-297.0.0 \ + rustc-ap-syntax_pos-297.0.0 \ rustc-hash-1.0.1 \ rustc-rayon-0.1.1 \ rustc-rayon-core-0.1.1 \ @@ -105,7 +111,6 @@ CARGO_CRATES= aho-corasick-0.6.9 \ strsim-0.7.0 \ syn-0.15.22 \ tempfile-3.0.5 \ - termcolor-0.3.6 \ termcolor-1.0.4 \ termion-1.5.1 \ textwrap-0.10.0 \ @@ -122,7 +127,6 @@ CARGO_CRATES= aho-corasick-0.6.9 \ winapi-i686-pc-windows-gnu-0.4.0 \ winapi-util-0.1.1 \ winapi-x86_64-pc-windows-gnu-0.4.0 \ - wincolor-0.1.6 \ wincolor-1.0.1 .include diff --git a/devel/racer/distinfo b/devel/racer/distinfo index fcbb1f9fb04..8d6dee2ed4d 100644 --- a/devel/racer/distinfo +++ b/devel/racer/distinfo @@ -45,6 +45,8 @@ SHA256 (rust/crates/lazycell-1.2.0.tar.gz) = ddba4c30a78328befecec92fc94970e53b3 SIZE (rust/crates/lazycell-1.2.0.tar.gz) = 11259 SHA256 (rust/crates/libc-0.2.44.tar.gz) = 10923947f84a519a45c8fefb7dd1b3e8c08747993381adee176d7a82b4195311 SIZE (rust/crates/libc-0.2.44.tar.gz) = 347920 +SHA256 (rust/crates/lock_api-0.1.5.tar.gz) = 62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c +SIZE (rust/crates/lock_api-0.1.5.tar.gz) = 16967 SHA256 (rust/crates/log-0.4.6.tar.gz) = c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6 SIZE (rust/crates/log-0.4.6.tar.gz) = 22303 SHA256 (rust/crates/memchr-2.1.1.tar.gz) = 0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16 @@ -55,12 +57,14 @@ SHA256 (rust/crates/nodrop-0.1.13.tar.gz) = 2f9667ddcc6cc8a43afc9b7917599d7216aa SIZE (rust/crates/nodrop-0.1.13.tar.gz) = 7508 SHA256 (rust/crates/num_cpus-1.8.0.tar.gz) = c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30 SIZE (rust/crates/num_cpus-1.8.0.tar.gz) = 10539 -SHA256 (rust/crates/owning_ref-0.3.3.tar.gz) = cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37 -SIZE (rust/crates/owning_ref-0.3.3.tar.gz) = 11710 -SHA256 (rust/crates/parking_lot-0.5.5.tar.gz) = d4d05f1349491390b1730afba60bb20d55761bef489a954546b58b4b34e1e2ac -SIZE (rust/crates/parking_lot-0.5.5.tar.gz) = 36889 +SHA256 (rust/crates/owning_ref-0.4.0.tar.gz) = 49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13 +SIZE (rust/crates/owning_ref-0.4.0.tar.gz) = 12233 +SHA256 (rust/crates/parking_lot-0.6.4.tar.gz) = f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5 +SIZE (rust/crates/parking_lot-0.6.4.tar.gz) = 31890 SHA256 (rust/crates/parking_lot_core-0.2.14.tar.gz) = 4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa SIZE (rust/crates/parking_lot_core-0.2.14.tar.gz) = 22140 +SHA256 (rust/crates/parking_lot_core-0.3.1.tar.gz) = ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c +SIZE (rust/crates/parking_lot_core-0.3.1.tar.gz) = 26635 SHA256 (rust/crates/proc-macro2-0.4.24.tar.gz) = 77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09 SIZE (rust/crates/proc-macro2-0.4.24.tar.gz) = 30970 SHA256 (rust/crates/quick-error-1.2.2.tar.gz) = 9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0 @@ -69,10 +73,14 @@ SHA256 (rust/crates/quote-0.6.10.tar.gz) = 53fa22a1994bd0f9372d7a816207d8a2677ad SIZE (rust/crates/quote-0.6.10.tar.gz) = 15795 SHA256 (rust/crates/rand-0.4.3.tar.gz) = 8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd SIZE (rust/crates/rand-0.4.3.tar.gz) = 76094 +SHA256 (rust/crates/rand-0.5.5.tar.gz) = e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c +SIZE (rust/crates/rand-0.5.5.tar.gz) = 137359 SHA256 (rust/crates/rand-0.6.1.tar.gz) = ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a SIZE (rust/crates/rand-0.6.1.tar.gz) = 126613 SHA256 (rust/crates/rand_chacha-0.1.0.tar.gz) = 771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a SIZE (rust/crates/rand_chacha-0.1.0.tar.gz) = 11637 +SHA256 (rust/crates/rand_core-0.2.2.tar.gz) = 1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372 +SIZE (rust/crates/rand_core-0.2.2.tar.gz) = 15450 SHA256 (rust/crates/rand_core-0.3.0.tar.gz) = 0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db SIZE (rust/crates/rand_core-0.3.0.tar.gz) = 20581 SHA256 (rust/crates/rand_hc-0.1.0.tar.gz) = 7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4 @@ -95,22 +103,24 @@ SHA256 (rust/crates/remove_dir_all-0.5.1.tar.gz) = 3488ba1b9a2084d38645c4c08276a SIZE (rust/crates/remove_dir_all-0.5.1.tar.gz) = 8726 SHA256 (rust/crates/rls-span-0.4.0.tar.gz) = 5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a SIZE (rust/crates/rls-span-0.4.0.tar.gz) = 3191 -SHA256 (rust/crates/rustc-ap-arena-237.0.0.tar.gz) = 2d24c8b3c1437fad023cb9472381216a1d41d82dbb2d2e6c7858bd6f50317719 -SIZE (rust/crates/rustc-ap-arena-237.0.0.tar.gz) = 5622 -SHA256 (rust/crates/rustc-ap-rustc_cratesio_shim-237.0.0.tar.gz) = 9c5b02c76cd1ee4e9c97c8228701796d6b7431e8f100dea2d8af1d6c2c2bad56 -SIZE (rust/crates/rustc-ap-rustc_cratesio_shim-237.0.0.tar.gz) = 1218 -SHA256 (rust/crates/rustc-ap-rustc_data_structures-237.0.0.tar.gz) = 4076388154497fb9a007e3badd78e415402a5594111cd6bc7ce1420dd1b1818b -SIZE (rust/crates/rustc-ap-rustc_data_structures-237.0.0.tar.gz) = 78061 -SHA256 (rust/crates/rustc-ap-rustc_errors-237.0.0.tar.gz) = c6c11e4789cbc276ceaa87d326c234b1a2d1e0fe6017b88a8a25903200060acb -SIZE (rust/crates/rustc-ap-rustc_errors-237.0.0.tar.gz) = 28998 -SHA256 (rust/crates/rustc-ap-rustc_target-237.0.0.tar.gz) = 25f711bb152b9d7cdd69410cfe6d99aeb1409c959e0fdf3c8ca4d220e568aa52 -SIZE (rust/crates/rustc-ap-rustc_target-237.0.0.tar.gz) = 56229 -SHA256 (rust/crates/rustc-ap-serialize-237.0.0.tar.gz) = 57638db658d4942d3f30a12566836f9a67a636ed8002c8cae1c9231214e39929 -SIZE (rust/crates/rustc-ap-serialize-237.0.0.tar.gz) = 35119 -SHA256 (rust/crates/rustc-ap-syntax-237.0.0.tar.gz) = d6dbcf07abf7a9957dce8d34353d55dfb4cd882153181f24349f4690facb58f0 -SIZE (rust/crates/rustc-ap-syntax-237.0.0.tar.gz) = 319171 -SHA256 (rust/crates/rustc-ap-syntax_pos-237.0.0.tar.gz) = 0915cb5e166cabe588a129dec2d47357077e96fb1f9b57318fbe217eac4ce508 -SIZE (rust/crates/rustc-ap-syntax_pos-237.0.0.tar.gz) = 28022 +SHA256 (rust/crates/rustc-ap-arena-297.0.0.tar.gz) = b69fd4a0e8a3ecd99b497965d05f6f04dd2e4601a6146a841dbe4c8e77c2b30c +SIZE (rust/crates/rustc-ap-arena-297.0.0.tar.gz) = 5651 +SHA256 (rust/crates/rustc-ap-graphviz-297.0.0.tar.gz) = f8136418dbc491bab74aa0565eaa2086754a7a81a5e74a1d84d6168d18e889e7 +SIZE (rust/crates/rustc-ap-graphviz-297.0.0.tar.gz) = 10192 +SHA256 (rust/crates/rustc-ap-rustc_cratesio_shim-297.0.0.tar.gz) = a972feda82332d1d05b1ba5a097e915cd9c9c8f1af2bd7b08af09fb88c753d5f +SIZE (rust/crates/rustc-ap-rustc_cratesio_shim-297.0.0.tar.gz) = 1230 +SHA256 (rust/crates/rustc-ap-rustc_data_structures-297.0.0.tar.gz) = 582584c6c48b0ece4b8aef3f9bb59d94d17c5665612bc87a71f509e45a3113b5 +SIZE (rust/crates/rustc-ap-rustc_data_structures-297.0.0.tar.gz) = 77574 +SHA256 (rust/crates/rustc-ap-rustc_errors-297.0.0.tar.gz) = cd852096944d0ac6af1aefa9639a2ae6dede217606ce97f88ff0dcc8c86d6ff6 +SIZE (rust/crates/rustc-ap-rustc_errors-297.0.0.tar.gz) = 29674 +SHA256 (rust/crates/rustc-ap-rustc_target-297.0.0.tar.gz) = 98301a272ecfeec29d2d4e97b07238707c2b89d86fc3a4a5f31a00728f14e288 +SIZE (rust/crates/rustc-ap-rustc_target-297.0.0.tar.gz) = 57064 +SHA256 (rust/crates/rustc-ap-serialize-297.0.0.tar.gz) = c8f13510e617e2e322e3297038fd6a7346f2297124af9e10e33a627c5d544e9d +SIZE (rust/crates/rustc-ap-serialize-297.0.0.tar.gz) = 35223 +SHA256 (rust/crates/rustc-ap-syntax-297.0.0.tar.gz) = 0792f5a9ccfc5ec13bb5b0472fa49e145481029c39f6bf5b1a36decc99c3328f +SIZE (rust/crates/rustc-ap-syntax-297.0.0.tar.gz) = 323639 +SHA256 (rust/crates/rustc-ap-syntax_pos-297.0.0.tar.gz) = 0df9f97f41650d23b14f92f7267f8c61089655efb4533d82bf8991f99245198d +SIZE (rust/crates/rustc-ap-syntax_pos-297.0.0.tar.gz) = 28074 SHA256 (rust/crates/rustc-hash-1.0.1.tar.gz) = 7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8 SIZE (rust/crates/rustc-hash-1.0.1.tar.gz) = 8976 SHA256 (rust/crates/rustc-rayon-0.1.1.tar.gz) = 8c6d5a683c6ba4ed37959097e88d71c9e8e26659a3cb5be8b389078e7ad45306 @@ -145,8 +155,6 @@ SHA256 (rust/crates/syn-0.15.22.tar.gz) = ae8b29eb5210bc5cf63ed6149cbf9adfc82ac0 SIZE (rust/crates/syn-0.15.22.tar.gz) = 146349 SHA256 (rust/crates/tempfile-3.0.5.tar.gz) = 7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2 SIZE (rust/crates/tempfile-3.0.5.tar.gz) = 23272 -SHA256 (rust/crates/termcolor-0.3.6.tar.gz) = adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83 -SIZE (rust/crates/termcolor-0.3.6.tar.gz) = 13548 SHA256 (rust/crates/termcolor-1.0.4.tar.gz) = 4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f SIZE (rust/crates/termcolor-1.0.4.tar.gz) = 14416 SHA256 (rust/crates/termion-1.5.1.tar.gz) = 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 @@ -179,8 +187,6 @@ SHA256 (rust/crates/winapi-util-0.1.1.tar.gz) = afc5508759c5bf4285e61feb862b6083 SIZE (rust/crates/winapi-util-0.1.1.tar.gz) = 7635 SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f SIZE (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 -SHA256 (rust/crates/wincolor-0.1.6.tar.gz) = eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767 -SIZE (rust/crates/wincolor-0.1.6.tar.gz) = 4799 SHA256 (rust/crates/wincolor-1.0.1.tar.gz) = 561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba SIZE (rust/crates/wincolor-1.0.1.tar.gz) = 4737 SHA256 (racer-rust-racer-v2.1.14_GH0.tar.gz) = fae8722639f9f5310d49a365ad74380761640f7cf01d50948d9cbfaa4aa02064 diff --git a/devel/racer/files/patch-rustc-ap-syntax-237 b/devel/racer/files/patch-rustc-ap-syntax-237 deleted file mode 100644 index a525bcccb0f..00000000000 --- a/devel/racer/files/patch-rustc-ap-syntax-237 +++ /dev/null @@ -1,348 +0,0 @@ -error[E0106]: missing lifetime specifier - --> cargo-crates/rustc-ap-rustc_data_structures-297.0.0/vec_linked_list.rs:56:20 - | -56 | impl Links for &Ls - | ^ expected lifetime parameter - ---- Cargo.lock.orig 2018-11-27 05:23:40 UTC -+++ Cargo.lock -@@ -179,15 +179,6 @@ version = "0.2.44" - source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] --name = "lock_api" --version = "0.1.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] - name = "log" - version = "0.4.6" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -225,7 +216,7 @@ dependencies = [ - - [[package]] - name = "owning_ref" --version = "0.4.0" -+version = "0.3.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -233,11 +224,11 @@ dependencies = [ - - [[package]] - name = "parking_lot" --version = "0.6.4" -+version = "0.5.5" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -- "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -252,18 +243,6 @@ dependencies = [ - ] - - [[package]] --name = "parking_lot_core" --version = "0.3.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "smallvec 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] - name = "proc-macro2" - version = "0.4.24" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -299,7 +278,7 @@ dependencies = [ - "racer-cargo-metadata 0.1.1", - "racer-testutils 0.1.0", - "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-syntax 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-syntax 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] -@@ -338,18 +317,6 @@ dependencies = [ - - [[package]] - name = "rand" --version = "0.5.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -- "libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)", -- "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "rand" - version = "0.6.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -@@ -377,14 +344,6 @@ dependencies = [ - - [[package]] - name = "rand_core" --version = "0.2.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --dependencies = [ -- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", --] -- --[[package]] --name = "rand_core" - version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - -@@ -469,40 +428,33 @@ source = "registry+https://github.com/rust-lang/crates - - [[package]] - name = "rustc-ap-arena" --version = "297.0.0" -+version = "237.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] --name = "rustc-ap-graphviz" --version = "297.0.0" --source = "registry+https://github.com/rust-lang/crates.io-index" -- --[[package]] - name = "rustc-ap-rustc_cratesio_shim" --version = "297.0.0" -+version = "237.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "rustc-ap-rustc_data_structures" --version = "297.0.0" -+version = "237.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-graphviz 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-rustc_cratesio_shim 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-rustc_cratesio_shim 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-rayon-core 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -512,34 +464,31 @@ dependencies = [ - - [[package]] - name = "rustc-ap-rustc_errors" --version = "297.0.0" -+version = "237.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-rustc_cratesio_shim 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-syntax_pos 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-syntax_pos 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "rustc-ap-rustc_target" --version = "297.0.0" -+version = "237.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-rustc_cratesio_shim 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-rustc_cratesio_shim 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "rustc-ap-serialize" --version = "297.0.0" -+version = "237.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "smallvec 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -547,29 +496,29 @@ dependencies = [ - - [[package]] - name = "rustc-ap-syntax" --version = "297.0.0" -+version = "237.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-rustc_errors 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-rustc_target 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-syntax_pos 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-rustc_errors 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-rustc_target 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-syntax_pos 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - ] - - [[package]] - name = "rustc-ap-syntax_pos" --version = "297.0.0" -+version = "237.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-arena 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-arena 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - ] -@@ -710,6 +659,14 @@ dependencies = [ - - [[package]] - name = "termcolor" -+version = "0.3.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "termcolor" - version = "1.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -@@ -814,6 +771,14 @@ source = "registry+https://github.com/rust-lang/crates - - [[package]] - name = "wincolor" -+version = "0.1.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "wincolor" - version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ -@@ -845,24 +810,20 @@ dependencies = [ - "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" - "checksum lazycell 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0" - "checksum libc 0.2.44 (registry+https://github.com/rust-lang/crates.io-index)" = "10923947f84a519a45c8fefb7dd1b3e8c08747993381adee176d7a82b4195311" --"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" - "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" - "checksum memchr 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16" - "checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3" - "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" - "checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30" --"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" --"checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5" -+"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" -+"checksum parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4d05f1349491390b1730afba60bb20d55761bef489a954546b58b4b34e1e2ac" - "checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa" --"checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c" - "checksum proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)" = "77619697826f31a02ae974457af0b29b723e5619e113e9397b8b82c6bd253f09" - "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" - "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c" - "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd" --"checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c" - "checksum rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a" - "checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a" --"checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372" - "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db" - "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" - "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -@@ -874,15 +835,14 @@ dependencies = [ - "checksum regex-syntax 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fbc557aac2b708fe84121caf261346cc2eed71978024337e42eb46b8a252ac6e" - "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" - "checksum rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a" --"checksum rustc-ap-arena 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b69fd4a0e8a3ecd99b497965d05f6f04dd2e4601a6146a841dbe4c8e77c2b30c" --"checksum rustc-ap-graphviz 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8136418dbc491bab74aa0565eaa2086754a7a81a5e74a1d84d6168d18e889e7" --"checksum rustc-ap-rustc_cratesio_shim 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a972feda82332d1d05b1ba5a097e915cd9c9c8f1af2bd7b08af09fb88c753d5f" --"checksum rustc-ap-rustc_data_structures 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "582584c6c48b0ece4b8aef3f9bb59d94d17c5665612bc87a71f509e45a3113b5" --"checksum rustc-ap-rustc_errors 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cd852096944d0ac6af1aefa9639a2ae6dede217606ce97f88ff0dcc8c86d6ff6" --"checksum rustc-ap-rustc_target 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98301a272ecfeec29d2d4e97b07238707c2b89d86fc3a4a5f31a00728f14e288" --"checksum rustc-ap-serialize 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f13510e617e2e322e3297038fd6a7346f2297124af9e10e33a627c5d544e9d" --"checksum rustc-ap-syntax 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0792f5a9ccfc5ec13bb5b0472fa49e145481029c39f6bf5b1a36decc99c3328f" --"checksum rustc-ap-syntax_pos 297.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0df9f97f41650d23b14f92f7267f8c61089655efb4533d82bf8991f99245198d" -+"checksum rustc-ap-arena 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d24c8b3c1437fad023cb9472381216a1d41d82dbb2d2e6c7858bd6f50317719" -+"checksum rustc-ap-rustc_cratesio_shim 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9c5b02c76cd1ee4e9c97c8228701796d6b7431e8f100dea2d8af1d6c2c2bad56" -+"checksum rustc-ap-rustc_data_structures 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4076388154497fb9a007e3badd78e415402a5594111cd6bc7ce1420dd1b1818b" -+"checksum rustc-ap-rustc_errors 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c6c11e4789cbc276ceaa87d326c234b1a2d1e0fe6017b88a8a25903200060acb" -+"checksum rustc-ap-rustc_target 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "25f711bb152b9d7cdd69410cfe6d99aeb1409c959e0fdf3c8ca4d220e568aa52" -+"checksum rustc-ap-serialize 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "57638db658d4942d3f30a12566836f9a67a636ed8002c8cae1c9231214e39929" -+"checksum rustc-ap-syntax 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d6dbcf07abf7a9957dce8d34353d55dfb4cd882153181f24349f4690facb58f0" -+"checksum rustc-ap-syntax_pos 237.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0915cb5e166cabe588a129dec2d47357077e96fb1f9b57318fbe217eac4ce508" - "checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" - "checksum rustc-rayon 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c6d5a683c6ba4ed37959097e88d71c9e8e26659a3cb5be8b389078e7ad45306" - "checksum rustc-rayon-core 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40f06724db71e18d68b3b946fdf890ca8c921d9edccc1404fdfdb537b0d12649" -@@ -900,6 +860,7 @@ dependencies = [ - "checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550" - "checksum syn 0.15.22 (registry+https://github.com/rust-lang/crates.io-index)" = "ae8b29eb5210bc5cf63ed6149cbf9adfc82ac0be023d8735c176ee74a2db4da7" - "checksum tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "7e91405c14320e5c79b3d148e1c86f40749a36e490642202a31689cb1a3452b2" -+"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83" - "checksum termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" - "checksum termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096" - "checksum textwrap 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6" -@@ -916,4 +877,5 @@ dependencies = [ - "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - "checksum winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab" - "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767" - "checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" ---- Cargo.toml.orig 2018-11-27 05:23:40 UTC -+++ Cargo.toml -@@ -24,7 +24,7 @@ debug = false # because of #1005 - [dependencies] - bitflags = "1.0" - log = "0.4" --rustc-ap-syntax = "297.0.0" -+rustc-ap-syntax = "237.0.0" - env_logger = "0.6" - clap = "2.32" - lazy_static = "1.2" diff --git a/devel/racerd/Makefile b/devel/racerd/Makefile index d5cfb0fe2d8..96d64f1a0e4 100644 --- a/devel/racerd/Makefile +++ b/devel/racerd/Makefile @@ -5,7 +5,7 @@ PORTNAME= racerd DISTVERSIONPREFIX= v DISTVERSION= 0.1.1-56 DISTVERSIONSUFFIX= -g29cd4c6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MAINTAINER= ultima@FreeBSD.org diff --git a/devel/ruby-build/Makefile b/devel/ruby-build/Makefile index 7326c344648..f3976838543 100644 --- a/devel/ruby-build/Makefile +++ b/devel/ruby-build/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ruby-build -PORTVERSION= 20181106 +PORTVERSION= 20181207 DISTVERSIONPREFIX= v CATEGORIES= devel ruby diff --git a/devel/ruby-build/distinfo b/devel/ruby-build/distinfo index e9e75384142..e74a495a292 100644 --- a/devel/ruby-build/distinfo +++ b/devel/ruby-build/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541720135 -SHA256 (rbenv-ruby-build-v20181106_GH0.tar.gz) = 0924924ae2683a81c2e67bb5768fe70f54066d1b8d7dd7154661aec6476ffd91 -SIZE (rbenv-ruby-build-v20181106_GH0.tar.gz) = 59706 +TIMESTAMP = 1544177677 +SHA256 (rbenv-ruby-build-v20181207_GH0.tar.gz) = 74b4ffac4e8d6e68685afad035c64573280e93dfb2ab81fd7b613085e8a69c23 +SIZE (rbenv-ruby-build-v20181207_GH0.tar.gz) = 60187 diff --git a/devel/rubygem-aws-sdk-core/Makefile b/devel/rubygem-aws-sdk-core/Makefile index 62602fda33d..a475ff0333b 100644 --- a/devel/rubygem-aws-sdk-core/Makefile +++ b/devel/rubygem-aws-sdk-core/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-core -DISTVERSION= 2.11.184 +DISTVERSION= 2.11.186 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-core/distinfo b/devel/rubygem-aws-sdk-core/distinfo index a01af8f9adc..6b13626df22 100644 --- a/devel/rubygem-aws-sdk-core/distinfo +++ b/devel/rubygem-aws-sdk-core/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544007624 -SHA256 (rubygem/aws-sdk-core-2.11.184.gem) = f466c786e48bcba6ed2dd25b240399f05cd9287626f2cbdec3a834d4f1089e6d -SIZE (rubygem/aws-sdk-core-2.11.184.gem) = 1486336 +TIMESTAMP = 1544193760 +SHA256 (rubygem/aws-sdk-core-2.11.186.gem) = cff85b33fabdeae21e5ec0d59b37bfd10ea270d97784e0909bb589e9d6060317 +SIZE (rubygem/aws-sdk-core-2.11.186.gem) = 1487360 diff --git a/devel/rubygem-aws-sdk-resources/Makefile b/devel/rubygem-aws-sdk-resources/Makefile index 1db7df6266e..33cec545ede 100644 --- a/devel/rubygem-aws-sdk-resources/Makefile +++ b/devel/rubygem-aws-sdk-resources/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk-resources -DISTVERSION= 2.11.184 +DISTVERSION= 2.11.186 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk-resources/distinfo b/devel/rubygem-aws-sdk-resources/distinfo index 6bee9108a14..4ade527f26d 100644 --- a/devel/rubygem-aws-sdk-resources/distinfo +++ b/devel/rubygem-aws-sdk-resources/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544007644 -SHA256 (rubygem/aws-sdk-resources-2.11.184.gem) = 849a633a8937b59c838247215616429f60caf670e43cd2565b37670bf4d96a54 -SIZE (rubygem/aws-sdk-resources-2.11.184.gem) = 48640 +TIMESTAMP = 1544193783 +SHA256 (rubygem/aws-sdk-resources-2.11.186.gem) = 7ca3a488fcbc8f1bb83630213d53736ba157664283e1fee3d88fc026c507731f +SIZE (rubygem/aws-sdk-resources-2.11.186.gem) = 48640 diff --git a/devel/rubygem-aws-sdk/Makefile b/devel/rubygem-aws-sdk/Makefile index 8118e6617a3..62d82624a1e 100644 --- a/devel/rubygem-aws-sdk/Makefile +++ b/devel/rubygem-aws-sdk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= aws-sdk -DISTVERSION= 2.11.184 +DISTVERSION= 2.11.186 CATEGORIES= devel rubygems MASTER_SITES= RG diff --git a/devel/rubygem-aws-sdk/distinfo b/devel/rubygem-aws-sdk/distinfo index aaefa5f3c6f..eb646c5813f 100644 --- a/devel/rubygem-aws-sdk/distinfo +++ b/devel/rubygem-aws-sdk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544007664 -SHA256 (rubygem/aws-sdk-2.11.184.gem) = abbb904b4ead096db5075f07e6711adaea5aa2c4637209b8666e2ce390e221b6 -SIZE (rubygem/aws-sdk-2.11.184.gem) = 4608 +TIMESTAMP = 1544193804 +SHA256 (rubygem/aws-sdk-2.11.186.gem) = 485cf7570e11efe4df7e3d0affaadd38730ac2cc83790d54eaefb1da57424eaf +SIZE (rubygem/aws-sdk-2.11.186.gem) = 4608 diff --git a/devel/rubygem-mixlib-archive/Makefile b/devel/rubygem-mixlib-archive/Makefile index 3cfdd97ffaf..12259df899f 100644 --- a/devel/rubygem-mixlib-archive/Makefile +++ b/devel/rubygem-mixlib-archive/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mixlib-archive -PORTVERSION= 0.4.16 +PORTVERSION= 0.4.18 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -14,8 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= rubygem-mixlib-log>=0:devel/rubygem-mixlib-log -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/devel/rubygem-mixlib-archive/distinfo b/devel/rubygem-mixlib-archive/distinfo index ed6d1b684c8..169bb2c7c1a 100644 --- a/devel/rubygem-mixlib-archive/distinfo +++ b/devel/rubygem-mixlib-archive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536864096 -SHA256 (rubygem/mixlib-archive-0.4.16.gem) = d72c449a447b4f3006e8104fd18b168bb7d03fd96e2eba8aaf8e445dbe5ee316 -SIZE (rubygem/mixlib-archive-0.4.16.gem) = 1692672 +TIMESTAMP = 1544193826 +SHA256 (rubygem/mixlib-archive-0.4.18.gem) = d3b2307389cdd8e52a64de10f41fea9ee3afb765a721c135ae400d5881eb9d49 +SIZE (rubygem/mixlib-archive-0.4.18.gem) = 11776 diff --git a/devel/rubygem-ransack/Makefile b/devel/rubygem-ransack/Makefile index 08ba2447770..3b2e4265b83 100644 --- a/devel/rubygem-ransack/Makefile +++ b/devel/rubygem-ransack/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ransack -PORTVERSION= 2.1.0 +PORTVERSION= 2.1.1 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -17,8 +17,9 @@ RUN_DEPENDS= rubygem-actionpack5>=5.0:www/rubygem-actionpack5 \ rubygem-activesupport5>=5.0:devel/rubygem-activesupport5 \ rubygem-i18n>=0:devel/rubygem-i18n -NO_ARCH= yes -USE_RUBY= yes USES= gem +USE_RUBY= yes + +NO_ARCH= yes .include diff --git a/devel/rubygem-ransack/distinfo b/devel/rubygem-ransack/distinfo index e0a04f2d878..79e9a0614fb 100644 --- a/devel/rubygem-ransack/distinfo +++ b/devel/rubygem-ransack/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540753434 -SHA256 (rubygem/ransack-2.1.0.gem) = 19b81aab0d5a04c165a07b06aaca16b86895c851e021e978b47fb344da101273 -SIZE (rubygem/ransack-2.1.0.gem) = 192512 +TIMESTAMP = 1544114674 +SHA256 (rubygem/ransack-2.1.1.gem) = 1adc8fd8d79a6109a0d754df758116429bf3ab2b4de40e7f1dc2a1db41a9d768 +SIZE (rubygem/ransack-2.1.1.gem) = 194048 diff --git a/devel/rubygem-rubocop/Makefile b/devel/rubygem-rubocop/Makefile index e6e91110c6a..4b1c7a2b1de 100644 --- a/devel/rubygem-rubocop/Makefile +++ b/devel/rubygem-rubocop/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rubocop -PORTVERSION= 0.60.0 +PORTVERSION= 0.61.1 CATEGORIES= devel ruby MASTER_SITES= RG diff --git a/devel/rubygem-rubocop/distinfo b/devel/rubygem-rubocop/distinfo index 2cbc39724d6..e30849f1e59 100644 --- a/devel/rubygem-rubocop/distinfo +++ b/devel/rubygem-rubocop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540657918 -SHA256 (rubygem/rubocop-0.60.0.gem) = 31d8b34585456ce0f0e79d6411c3b7e705ac571996876d9815e1d6f1130173c7 -SIZE (rubygem/rubocop-0.60.0.gem) = 410112 +TIMESTAMP = 1544193881 +SHA256 (rubygem/rubocop-0.61.1.gem) = 8650301567ee5a4867dbb9ba9ca9987d7dc8a9166ee3136c41c03906cc935ada +SIZE (rubygem/rubocop-0.61.1.gem) = 414208 diff --git a/devel/rust-bindgen/Makefile b/devel/rust-bindgen/Makefile index 27cc28c1a1c..31b616fb4f8 100644 --- a/devel/rust-bindgen/Makefile +++ b/devel/rust-bindgen/Makefile @@ -3,6 +3,7 @@ PORTNAME= rust-bindgen DISTVERSIONPREFIX= v DISTVERSION= 0.44.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= gecko@FreeBSD.org diff --git a/devel/rust-cbindgen/Makefile b/devel/rust-cbindgen/Makefile index a238aec7c25..34f91c1a5a3 100644 --- a/devel/rust-cbindgen/Makefile +++ b/devel/rust-cbindgen/Makefile @@ -3,6 +3,7 @@ PORTNAME= cbindgen DISTVERSIONPREFIX= v DISTVERSION= 0.6.7 +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= rust- diff --git a/devel/sccache/Makefile b/devel/sccache/Makefile index cdbd0ce9fe9..84c95454b2a 100644 --- a/devel/sccache/Makefile +++ b/devel/sccache/Makefile @@ -2,7 +2,7 @@ PORTNAME= sccache DISTVERSION= 2.8.0.alpha0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= pizzamig@FreeBSD.org diff --git a/devel/staf/Makefile b/devel/staf/Makefile index cd9b417d3e6..b518396aeab 100644 --- a/devel/staf/Makefile +++ b/devel/staf/Makefile @@ -3,6 +3,7 @@ PORTNAME= staf PORTVERSION= 3.4.26 +PORTREVISION= 1 CATEGORIES= devel net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/V${PORTVERSION} DISTNAME= STAF${PORTVERSION:S/.//g}-src @@ -13,9 +14,6 @@ COMMENT= Software Testing Automation Framework LICENSE= EPL LICENSE_FILE= ${WRKSRC}/LICENSE.htm -BROKEN_SSL= openssl111 -BROKEN_SSL_REASON_openssl111= variable has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st') - WRKSRC= ${WRKDIR}/src WRKSRC_SUBDIR= ${PORTNAME} INSTALL_WRKSRC= ${WRKDIR}/rel/freebsd/staf/${STAF_BUILD_TYPE} @@ -151,8 +149,8 @@ do-install: .for bin in ${STAF_BIN_FILES} ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/bin/${bin} ${STAGEDIR}${PREFIX}/bin/ .endfor - ${LN} -s ${PREFIX}/bin/STAF ${STAGEDIR}${PREFIX}/bin/staf - ${LN} -s ${PREFIX}/bin/FmtLog ${STAGEDIR}${PREFIX}/bin/fmtlog + ${LN} -s STAF ${STAGEDIR}${PREFIX}/bin/staf + ${LN} -s FmtLog ${STAGEDIR}${PREFIX}/bin/fmtlog .for lib in ${STAF_LIB_FILES} ${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/${lib} ${STAGEDIR}${PREFIX}/lib/ .endfor diff --git a/devel/staf/files/patch-stafproc_STAFFSService.cpp b/devel/staf/files/patch-stafproc_STAFFSService.cpp new file mode 100644 index 00000000000..2486be0a6a4 --- /dev/null +++ b/devel/staf/files/patch-stafproc_STAFFSService.cpp @@ -0,0 +1,39 @@ +--- stafproc/STAFFSService.cpp.orig 2016-12-31 04:11:18 UTC ++++ stafproc/STAFFSService.cpp +@@ -4451,12 +4451,11 @@ STAFServiceResult STAFFSService::handleG + + unsigned int fileLength = lowerSize; + +- EVP_MD_CTX mdctx; ++ EVP_MD_CTX* mdctx = EVP_MD_CTX_create(); + unsigned char md_value[EVP_MAX_MD_SIZE]; + unsigned int md_len; + +- EVP_MD_CTX_init(&mdctx); +- EVP_DigestInit_ex(&mdctx, md, NULL); ++ EVP_DigestInit_ex(mdctx, md, NULL); + + // Read the entire file using a buffer size of 4096 bytes and + // update the digest with the buffer +@@ -4475,7 +4474,7 @@ STAFServiceResult STAFFSService::handleG + + if (rc != kSTAFOk) break; + +- EVP_DigestUpdate(&mdctx, fileBuffer, writeLength); ++ EVP_DigestUpdate(mdctx, fileBuffer, writeLength); + fileLength -= writeLength; + bytesCopied += writeLength; + } +@@ -4485,10 +4484,10 @@ STAFServiceResult STAFFSService::handleG + if (rc == kSTAFOk) + { + // Get the checksum value +- EVP_DigestFinal_ex(&mdctx, md_value, &md_len); ++ EVP_DigestFinal_ex(mdctx, md_value, &md_len); + } + +- EVP_MD_CTX_cleanup(&mdctx); ++ EVP_MD_CTX_destroy(mdctx); + + if (rc == kSTAFOk) + { diff --git a/devel/ticcutils/Makefile b/devel/ticcutils/Makefile new file mode 100644 index 00000000000..a312abc2510 --- /dev/null +++ b/devel/ticcutils/Makefile @@ -0,0 +1,35 @@ +# $FreeBSD$ + +PORTNAME= ticcutils +DISTVERSIONPREFIX= v +DISTVERSION= 0.20 +PORTREVISION= 1 +CATEGORIES= devel textproc + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Generic utility library shared by the Tilburg University software + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive +LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ + libicui18n.so:devel/icu \ + libtar.so:devel/libtar + +USES= autoreconf compiler:c++11-lib gmake gnome libtool localbase:ldflags pkgconfig +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static +USE_GITHUB= yes +GH_ACCOUNT= LanguageMachines +USE_GNOME= libxml2 +USE_LDCONFIG= yes + +INSTALL_TARGET= install-strip +TEST_TARGET= check + +# Workaround for https://github.com/LanguageMachines/ticcutils/issues/18 (also see the patch files/patch-configure.ac) +CXXFLAGS+= -DHAVE_BOOST_REGEX +LDFLAGS+= -lboost_regex + +.include diff --git a/devel/ticcutils/distinfo b/devel/ticcutils/distinfo new file mode 100644 index 00000000000..499cd45e8fa --- /dev/null +++ b/devel/ticcutils/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544205730 +SHA256 (LanguageMachines-ticcutils-v0.20_GH0.tar.gz) = 7e98fe9bb9b13e547eb6145feba0e9a54bafe8d5b139a4a91988ab2ac3a5082d +SIZE (LanguageMachines-ticcutils-v0.20_GH0.tar.gz) = 97099 diff --git a/devel/ticcutils/files/patch-configure.ac b/devel/ticcutils/files/patch-configure.ac new file mode 100644 index 00000000000..bd593c5d58e --- /dev/null +++ b/devel/ticcutils/files/patch-configure.ac @@ -0,0 +1,19 @@ +--- configure.ac.orig 2018-12-07 22:25:32 UTC ++++ configure.ac +@@ -75,11 +75,11 @@ fi + # for now we demand boost, because on some systems gcc4.8 is installed still + # and that fails on regex. + +-AX_BOOST_BASE( [1.50], +- [AX_BOOST_REGEX +- LIBS="$LIBS $BOOST_REGEX_LIB" +- AC_DEFINE(HAVE_BOOST_REGEX, 1 , [Define to 1 if you have boost regular expresions] )], +- [AC_MSG_ERROR([No Regular expression support available. Please install libboost-regex-dev])]) ++#AX_BOOST_BASE( [1.50], # Boost detection is broken: https://github.com/LanguageMachines/ticcutils/issues/18 ++# [AX_BOOST_REGEX ++# LIBS="$LIBS $BOOST_REGEX_LIB" ++# AC_DEFINE(HAVE_BOOST_REGEX, 1 , [Define to 1 if you have boost regular expresions] )], ++# [AC_MSG_ERROR([No Regular expression support available. Please install libboost-regex-dev])]) + + PKG_PROG_PKG_CONFIG + diff --git a/devel/ticcutils/files/patch-src_Makefile.am b/devel/ticcutils/files/patch-src_Makefile.am new file mode 100644 index 00000000000..1166bae0b6c --- /dev/null +++ b/devel/ticcutils/files/patch-src_Makefile.am @@ -0,0 +1,10 @@ +--- src/Makefile.am.orig 2018-12-07 23:02:14 UTC ++++ src/Makefile.am +@@ -1,5 +1,6 @@ + AM_CPPFLAGS = -I@top_srcdir@/include +-AM_CXXFLAGS = -g -std=c++11 -O3 -W -Wall -pedantic ++AM_CXXFLAGS = -std=c++11 -W -Wall -pedantic ++AM_LDFLAGS = $(LDFLAGS) + + LDADD = libticcutils.la + diff --git a/devel/ticcutils/pkg-descr b/devel/ticcutils/pkg-descr new file mode 100644 index 00000000000..61855edc877 --- /dev/null +++ b/devel/ticcutils/pkg-descr @@ -0,0 +1,5 @@ +This module contains useful functions for general use in the TiCC, +Tilburg centre for Cognition and Communication, Tilburg University, +software stack and beyond. + +WWW: https://github.com/LanguageMachines/ticcutils diff --git a/devel/ticcutils/pkg-plist b/devel/ticcutils/pkg-plist new file mode 100644 index 00000000000..e6e8066d1eb --- /dev/null +++ b/devel/ticcutils/pkg-plist @@ -0,0 +1,33 @@ +include/ticcutils/CommandLine.h +include/ticcutils/Configuration.h +include/ticcutils/FdStream.h +include/ticcutils/FileUtils.h +include/ticcutils/LogBuffer.h +include/ticcutils/LogStream.h +include/ticcutils/PrettyPrint.h +include/ticcutils/ServerBase.h +include/ticcutils/SocketBasics.h +include/ticcutils/StringOps.h +include/ticcutils/Tar.h +include/ticcutils/Timer.h +include/ticcutils/TreeHash.h +include/ticcutils/Trie.h +include/ticcutils/Unicode.h +include/ticcutils/UnitTest.h +include/ticcutils/Version.h +include/ticcutils/XMLtools.h +include/ticcutils/bz2stream.h +include/ticcutils/gzstream.h +include/ticcutils/zipper.h +lib/libticcutils.so +lib/libticcutils.so.5 +lib/libticcutils.so.5.0.0 +libdata/pkgconfig/ticcutils.pc +man/man1/ticc_commandline.1.gz +man/man1/ticc_configuration.1.gz +man/man1/ticc_fdstream.1.gz +man/man1/ticc_logstream.1.gz +man/man1/ticc_prettyprint.1.gz +man/man1/ticc_string.1.gz +man/man1/ticc_unit_test.1.gz +man/man1/ticcutils.1.gz diff --git a/devel/tigcc/Makefile b/devel/tigcc/Makefile index 6e5bd1486d9..135d378e73d 100644 --- a/devel/tigcc/Makefile +++ b/devel/tigcc/Makefile @@ -15,13 +15,8 @@ DISTFILES= gcc-core-4.1-20060728.tar.bz2:gcc \ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= C compiler for the TI89, 92, and 92+ calculators -BROKEN_mips= fails to compile: main_opt.inc: nested functions are disabled, use -fnested-functions to re-enable -BROKEN_mips64= fails to compile: main_opt.inc: nested functions are disabled, use -fnested-functions to re-enable -BROKEN_powerpc64= fails to compile: main_opt.inc: nested functions are disabled, use -fnested-functions to re-enable -BROKEN_sparc64= fails to compile: main_opt.inc: nested functions are disabled, use -fnested-functions to re-enable - -USE_CSTD= gnu89 USES= bison compiler:nestedfct gmake tar:bzip2 +USE_CSTD= gnu89 NO_WRKSUBDIR= yes SUB_FILES= pkg-message @@ -143,4 +138,10 @@ do-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} @${CP} ${WRKSRC}/tigcc/tigcclib/examples/* ${STAGEDIR}${EXAMPLESDIR}/ -.include +.include + +.if exists(/usr/lib/libstdc++.so) +CFLAGS+= -fnested-functions +.endif + +.include diff --git a/devel/tokei/Makefile b/devel/tokei/Makefile index b0a5cfbad34..aee4aa904a7 100644 --- a/devel/tokei/Makefile +++ b/devel/tokei/Makefile @@ -3,7 +3,7 @@ PORTNAME= tokei DISTVERSIONPREFIX= v DISTVERSION= 8.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= tobik@FreeBSD.org diff --git a/dns/amass/Makefile b/dns/amass/Makefile index 0d4b63f1a7b..901c98cbf91 100644 --- a/dns/amass/Makefile +++ b/dns/amass/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= amass -DISTVERSION= 2.8.3-4 -DISTVERSIONSUFFIX= -g935e6d5 +DISTVERSION= 2.8.4 CATEGORIES= dns MAINTAINER= yuri@FreeBSD.org diff --git a/dns/amass/distinfo b/dns/amass/distinfo index fcb8e65ddbb..522915e7947 100644 --- a/dns/amass/distinfo +++ b/dns/amass/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1542650548 -SHA256 (OWASP-Amass-2.8.3-4-g935e6d5_GH0.tar.gz) = f440c576f12a5a9f87c70b947705917e8da8ef9892f06bc9c18a64e98b4527a5 -SIZE (OWASP-Amass-2.8.3-4-g935e6d5_GH0.tar.gz) = 7940354 +TIMESTAMP = 1544083814 +SHA256 (OWASP-Amass-2.8.4_GH0.tar.gz) = b591048eb149a0167923923b9b6904847f6f5afba8a0c0af1f52e3c5289d225f +SIZE (OWASP-Amass-2.8.4_GH0.tar.gz) = 7940941 SHA256 (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 00ab6f915e958c9e0509836cd67082a802513459c12c4aa6e7a28ef37743ce52 SIZE (andybalholm-cascadia-v1.0.0_GH0.tar.gz) = 13232 SHA256 (asaskevich-EventBus-d46933a_GH0.tar.gz) = f1c2764fb95aa403c1de1445098c1a417985866983be8066316a9ae97a5bb5b7 diff --git a/dns/doh-proxy/Makefile b/dns/doh-proxy/Makefile index f46d92e7854..0143e3bac77 100644 --- a/dns/doh-proxy/Makefile +++ b/dns/doh-proxy/Makefile @@ -3,7 +3,7 @@ PORTNAME= doh-proxy DISTVERSION= 0.1.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= dns MAINTAINER= mat@FreeBSD.org diff --git a/editors/kak-lsp/Makefile b/editors/kak-lsp/Makefile index 5c43cb0a1d3..d2c717ff1e6 100644 --- a/editors/kak-lsp/Makefile +++ b/editors/kak-lsp/Makefile @@ -3,6 +3,7 @@ PORTNAME= kak-lsp DISTVERSIONPREFIX= v DISTVERSION= 5.10.0 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= tobik@FreeBSD.org diff --git a/editors/xi-core/Makefile b/editors/xi-core/Makefile index f45e8d9b9d6..6eb11b8ee86 100644 --- a/editors/xi-core/Makefile +++ b/editors/xi-core/Makefile @@ -3,7 +3,7 @@ PORTNAME= xi-core PORTVERSION= g20170612 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors MAINTAINER= ports@FreeBSD.org diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile index 09ddec249ae..f8c13d89fbb 100644 --- a/emulators/citra/Makefile +++ b/emulators/citra/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20181205 +PORTVERSION= s20181206 PORTREVISION?= 0 CATEGORIES= emulators @@ -21,7 +21,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= ab0dba6a8 +GH_TAGNAME= edbdbf0ba GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \ diff --git a/emulators/citra/distinfo b/emulators/citra/distinfo index c3ae36ead27..10c55c4f5e7 100644 --- a/emulators/citra/distinfo +++ b/emulators/citra/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1544019649 -SHA256 (citra-emu-citra-s20181205-ab0dba6a8_GH0.tar.gz) = 856f65d1a7c0243e5520a8ab562df8957e954001e6ec465447981bb1b2aa6956 -SIZE (citra-emu-citra-s20181205-ab0dba6a8_GH0.tar.gz) = 4662321 +TIMESTAMP = 1544141848 +SHA256 (citra-emu-citra-s20181206-edbdbf0ba_GH0.tar.gz) = 5ccca9abf3c6017edccdb155174ac7d08aedbc88e5c28fa02a3736b82bcf6502 +SIZE (citra-emu-citra-s20181206-edbdbf0ba_GH0.tar.gz) = 4664007 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile index 8e89bc6890c..6ccc90c9f0f 100644 --- a/emulators/gxemul/Makefile +++ b/emulators/gxemul/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gxemul -PORTVERSION= 0.6.0.2 +PORTVERSION= 0.6.1 CATEGORIES= emulators MASTER_SITES= http://gavare.se/gxemul/src/ diff --git a/emulators/gxemul/distinfo b/emulators/gxemul/distinfo index 45bab4f04cb..2a7e191230b 100644 --- a/emulators/gxemul/distinfo +++ b/emulators/gxemul/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542524977 -SHA256 (gxemul-0.6.0.2.tar.gz) = 0a0ceb4b5de6463487b28729d40e8e0a6e76ea955306e97aa5a5c74afaeb6636 -SIZE (gxemul-0.6.0.2.tar.gz) = 5498962 +TIMESTAMP = 1544180766 +SHA256 (gxemul-0.6.1.tar.gz) = 1bce1cc31615cde7562cf306b5d7062d2a97cae148fe9c9b2153f95ccb1463ed +SIZE (gxemul-0.6.1.tar.gz) = 5617712 diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile index c7ad76e1449..b36abc95cb4 100644 --- a/emulators/ppsspp/Makefile +++ b/emulators/ppsspp/Makefile @@ -2,7 +2,7 @@ PORTNAME= ppsspp DISTVERSIONPREFIX= v -DISTVERSION?= 1.7.4 +DISTVERSION?= 1.7.5 PORTREVISION?= 0 CATEGORIES= emulators # XXX Get from Debian once #697821 lands @@ -23,7 +23,7 @@ RUN_DEPENDS= xdg-open:devel/xdg-utils USE_GITHUB= yes GH_ACCOUNT= hrydgard GH_TUPLE?= hrydgard:glslang:29619b23:glslang/ext/glslang \ - hrydgard:${PORTNAME}-lang:a6c1c24:lang/assets/lang \ + hrydgard:${PORTNAME}-lang:7ea29e4:lang/assets/lang \ KhronosGroup:SPIRV-Cross:be7425e:SPIRV/ext/SPIRV-Cross \ Kingcom:armips:v0.10.0-22-g9efe336:armips/ext/armips \ Kingcom:tinyformat:Release-2.0.1-7-gb7f5a22:tinyformat/ext/armips/ext/tinyformat \ diff --git a/emulators/ppsspp/distinfo b/emulators/ppsspp/distinfo index bbcab3b05f3..ae84872fbbd 100644 --- a/emulators/ppsspp/distinfo +++ b/emulators/ppsspp/distinfo @@ -1,12 +1,12 @@ -TIMESTAMP = 1542986274 +TIMESTAMP = 1543931019 SHA256 (ppsspp.1) = 64a7cca4c3a5fc6ad5b63399edef9056b0c85ea68fed00fb7e97f4b2724e503b SIZE (ppsspp.1) = 1598 -SHA256 (hrydgard-ppsspp-v1.7.4_GH0.tar.gz) = a68f07cdcbad98bdca786b217edcf72ee16733c76b1b458036015f9a59591ca2 -SIZE (hrydgard-ppsspp-v1.7.4_GH0.tar.gz) = 19487086 +SHA256 (hrydgard-ppsspp-v1.7.5_GH0.tar.gz) = 85506e2db4e12e584fa3fc7aefe9ece039614ef2989ede8ff5489bfc04476842 +SIZE (hrydgard-ppsspp-v1.7.5_GH0.tar.gz) = 19487276 SHA256 (hrydgard-glslang-29619b23_GH0.tar.gz) = d1779812444d1514701ae41e9f07ecf368a29a8ce43452ef17601494cd27e672 SIZE (hrydgard-glslang-29619b23_GH0.tar.gz) = 2351816 -SHA256 (hrydgard-ppsspp-lang-a6c1c24_GH0.tar.gz) = 0d07a9eebff885366b1c447b784141382df29c15aa59bfbf908bcd80d8c51243 -SIZE (hrydgard-ppsspp-lang-a6c1c24_GH0.tar.gz) = 534276 +SHA256 (hrydgard-ppsspp-lang-7ea29e4_GH0.tar.gz) = a3af6e899de75fb3f8a354d1b0e20abd7119225fc68c83da56a59a2d4e19a27e +SIZE (hrydgard-ppsspp-lang-7ea29e4_GH0.tar.gz) = 534957 SHA256 (KhronosGroup-SPIRV-Cross-be7425e_GH0.tar.gz) = a5a06eee313583289f697689a3b79579b6f3dc40c766520e905047dfa94aade1 SIZE (KhronosGroup-SPIRV-Cross-be7425e_GH0.tar.gz) = 537750 SHA256 (Kingcom-armips-v0.10.0-22-g9efe336_GH0.tar.gz) = 5cd6210447b4a03f22901304f8a19b77526908671bb6522621154267948ad865 diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index bcd4747da12..13ef2991a98 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -39,6 +39,7 @@ CONFIGURE_ARGS+=--verbose \ --with-oss \ --without-pulse \ --without-sane \ + --without-sdl \ --without-tiff \ --without-udev CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" diff --git a/finance/php-tclink/Makefile b/finance/php-tclink/Makefile index 329ea3fd19d..a3023f05db4 100644 --- a/finance/php-tclink/Makefile +++ b/finance/php-tclink/Makefile @@ -17,7 +17,7 @@ EXPIRATION_DATE= 2018-12-30 USES= php:ext ssl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 post-patch: # avoid name conflicts with libressl diff --git a/games/7kaa/Makefile b/games/7kaa/Makefile index e097fac7911..323f5bccda1 100644 --- a/games/7kaa/Makefile +++ b/games/7kaa/Makefile @@ -26,7 +26,6 @@ LLD_UNSAFE= yes CONFIGURE_ARGS= --disable-nls # no translations ATM USE_SDL= sdl2 CXXFLAGS+= -Wno-error=narrowing -CXXFLAGS_clang= -Wno-c++11-narrowing PLIST_FILES= bin/${PORTNAME} \ share/pixmaps/${PORTNAME}.ico diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile index 09c9f32eee9..e5aaaea12aa 100644 --- a/games/blobwars/Makefile +++ b/games/blobwars/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE_GPLv2+ = ${WRKSRC}/doc/license USES= gmake pkgconfig USE_SDL= image2 mixer2 net2 sdl2 ttf2 -WITH_ZLIB= yes INSTALLS_ICONS= yes @@ -30,7 +29,6 @@ post-patch: @${REINPLACE_CMD} \ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/Makefile - ${CHMOD} 664 ${WRKSRC}/icons/* post-patch-DOCS-off: @${REINPLACE_CMD} \ @@ -43,8 +41,8 @@ post-patch-NLS-off: ${WRKSRC}/Makefile post-install: - ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + @${LN} -sf ../icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} .include diff --git a/games/blobwars/pkg-descr b/games/blobwars/pkg-descr index 4fb839cabc4..7112e5a5513 100644 --- a/games/blobwars/pkg-descr +++ b/games/blobwars/pkg-descr @@ -6,4 +6,4 @@ forward as it sounds, since the MIAs will often be not directly reachable and will require some extra thought. Bob also has to contend with environmental hazards, alien invaders and assimilated Blobs. -WWW: http://www.parallelrealities.co.uk/p/blob-wars-metal-blob-solid.html +WWW: https://www.parallelrealities.co.uk/p/blob-wars-metal-blob-solid.html diff --git a/games/easyrpg-player/Makefile b/games/easyrpg-player/Makefile index 43d4de0b237..73f98fb6f79 100644 --- a/games/easyrpg-player/Makefile +++ b/games/easyrpg-player/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= easyrpg-player -PORTVERSION= 0.5.3 -PORTREVISION= 4 +PORTVERSION= 0.5.4 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -12,16 +11,22 @@ COMMENT= RPG Maker 2000/2003 and EasyRPG games interpreter LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libfreetype.so:print/freetype2 \ +LIB_DEPENDS= liblcf.so:games/liblcf \ libpng.so:graphics/png \ - liblcf.so:games/liblcf \ + libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ - libmpg123.so:audio/mpg123 \ - libvorbis.so:audio/libvorbis \ - libsndfile.so:audio/libsndfile \ - libxmp.so:audio/libxmp \ libspeexdsp.so:audio/speexdsp \ - libopusfile.so:audio/opusfile + libmpg123.so:audio/mpg123 \ + libsndfile.so:audio/libsndfile \ + libvorbis.so:audio/libvorbis \ + libogg.so:audio/libogg \ + libopusfile.so:audio/opusfile \ + libopus.so:audio/opus \ + libWildMidi.so:audio/wildmidi \ + libxmp.so:audio/libxmp +# these come from liblcf +LIB_DEPENDS+= libicui18n.so:devel/icu \ + libexpat.so:textproc/expat2 BUILD_DEPENDS= asciidoc:textproc/asciidoc \ ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs @@ -29,16 +34,21 @@ USE_GITHUB= yes GH_ACCOUNT= EasyRPG GH_PROJECT= Player -USES= autoreconf compiler:c++11-lib gmake libtool localbase pkgconfig -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-bash-completion-dir=${PREFIX}/share/bash-completion/completions +USES= cmake compiler:c++11-lib pkgconfig +CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=man \ + -DPLAYER_AUDIO_BACKEND=SDL2_mixer USE_XORG= pixman USE_SDL= sdl2 mixer2 -PORTDOCS= AUTHORS README +PORTDOCS= AUTHORS.md README.md OPTIONS_DEFINE= DOCS +post-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions + ${INSTALL_DATA} ${WRKSRC}/resources/unix/bash-completion/easyrpg-player \ + ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} diff --git a/games/easyrpg-player/distinfo b/games/easyrpg-player/distinfo index babf69e9787..10847bfb524 100644 --- a/games/easyrpg-player/distinfo +++ b/games/easyrpg-player/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508950823 -SHA256 (EasyRPG-Player-0.5.3_GH0.tar.gz) = f820f4fadd7fb944f9f3ea80594349b7c5f78c2011ab0adf179aeeef9d0a1449 -SIZE (EasyRPG-Player-0.5.3_GH0.tar.gz) = 4151265 +TIMESTAMP = 1541171708 +SHA256 (EasyRPG-Player-0.5.4_GH0.tar.gz) = a504d873114706f01ff77145669938d41a977bbc3656c4a5aa431e7e6a1d21e4 +SIZE (EasyRPG-Player-0.5.4_GH0.tar.gz) = 5393488 diff --git a/games/easyrpg-player/files/patch-CMakeLists.txt b/games/easyrpg-player/files/patch-CMakeLists.txt new file mode 100644 index 00000000000..a84e253f283 --- /dev/null +++ b/games/easyrpg-player/files/patch-CMakeLists.txt @@ -0,0 +1,14 @@ +--- CMakeLists.txt.orig 2018-10-27 09:58:54 UTC ++++ CMakeLists.txt +@@ -419,9 +419,9 @@ if(NOT A2X_EXECUTABLE STREQUAL "A2X_EXEC + DEPENDS resources/${MAN_NAME}.adoc + COMMENT "(Re-)building manpage ${MAN_NAME}" + VERBATIM) +- if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") ++ if(UNIX) + add_custom_target(man ALL DEPENDS resources/${MAN_NAME}) +- install(FILES resources/${MAN_NAME} DESTINATION share/man/man6) ++ install(FILES resources/${MAN_NAME} DESTINATION ${CMAKE_INSTALL_MANDIR}/man6) + else() + add_custom_target(man DEPENDS resources/${MAN_NAME}) + endif() diff --git a/games/genact/Makefile b/games/genact/Makefile index e0bf9b91ec6..b36835e8455 100644 --- a/games/genact/Makefile +++ b/games/genact/Makefile @@ -2,7 +2,7 @@ PORTNAME= genact DISTVERSION= 0.6.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MAINTAINER= 0mp@FreeBSD.org diff --git a/games/liblcf/Makefile b/games/liblcf/Makefile index df08404054b..b8e3d6cc1db 100644 --- a/games/liblcf/Makefile +++ b/games/liblcf/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= liblcf -PORTVERSION= 0.5.3 -PORTREVISION= 5 +PORTVERSION= 0.5.4 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -18,12 +17,12 @@ LIB_DEPENDS= libicui18n.so:devel/icu \ USE_GITHUB= yes GH_ACCOUNT= EasyRPG -USES= autoreconf compiler:c++11-lib libtool pathfix pkgconfig -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip +USES= cmake compiler:c++11-lib pkgconfig USE_LDCONFIG= yes +CMAKE_ARGS= -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_INSTALL_INCLUDEDIR=include -PORTDOCS= AUTHORS README +PORTDOCS= AUTHORS.md README.md OPTIONS_DEFINE= DOCS diff --git a/games/liblcf/distinfo b/games/liblcf/distinfo index b152a58bc0b..5043cdbeb8c 100644 --- a/games/liblcf/distinfo +++ b/games/liblcf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1508950830 -SHA256 (EasyRPG-liblcf-0.5.3_GH0.tar.gz) = 4d2784ab927e2f61595b8efeb61664bcc64b3f746d12c893e302645dda3acddc -SIZE (EasyRPG-liblcf-0.5.3_GH0.tar.gz) = 178434 +TIMESTAMP = 1541171693 +SHA256 (EasyRPG-liblcf-0.5.4_GH0.tar.gz) = fb31eebfa0e9a06cae9bfdc77c295f5deeaf44ab4d688da4a78777c77df125e6 +SIZE (EasyRPG-liblcf-0.5.4_GH0.tar.gz) = 185441 diff --git a/games/liblcf/pkg-plist b/games/liblcf/pkg-plist index 7f1e98fb9af..e989b67447f 100644 --- a/games/liblcf/pkg-plist +++ b/games/liblcf/pkg-plist @@ -1,19 +1,23 @@ include/liblcf/command_codes.h include/liblcf/data.h +include/liblcf/enum_tags.h include/liblcf/ini.h include/liblcf/inireader.h include/liblcf/lcf_options.h include/liblcf/ldb_chunks.h include/liblcf/ldb_reader.h +include/liblcf/ldb_terrain_flags.h +include/liblcf/ldb_trooppagecondition_flags.h include/liblcf/lmt_chunks.h include/liblcf/lmt_reader.h include/liblcf/lmu_chunks.h +include/liblcf/lmu_eventpagecondition_flags.h include/liblcf/lmu_reader.h include/liblcf/lsd_chunks.h include/liblcf/lsd_reader.h +include/liblcf/lsd_savepicture_flags.h include/liblcf/reader_lcf.h include/liblcf/reader_struct.h -include/liblcf/reader_types.h include/liblcf/reader_util.h include/liblcf/reader_xml.h include/liblcf/rpg_actor.h @@ -81,8 +85,9 @@ include/liblcf/rpg_trooppagecondition.h include/liblcf/rpg_variable.h include/liblcf/writer_lcf.h include/liblcf/writer_xml.h -lib/liblcf.a +lib/cmake/liblcf/FindEXPAT.cmake +lib/cmake/liblcf/FindICU.cmake +lib/cmake/liblcf/liblcf-config.cmake lib/liblcf.so lib/liblcf.so.0 -lib/liblcf.so.0.0.0 libdata/pkgconfig/liblcf.pc diff --git a/games/lwjgl/Makefile b/games/lwjgl/Makefile index f01b5d8a206..92445940f0d 100644 --- a/games/lwjgl/Makefile +++ b/games/lwjgl/Makefile @@ -13,11 +13,12 @@ COMMENT= Lightweight Java Game Library LICENSE= BSD3CLAUSE +ONLY_FOR_ARCHS= amd64 i386 powerpc64 + BUILD_DEPENDS= ${JAVALIBDIR}/jutils/jutils.jar:games/jutils \ ${JAVALIBDIR}/jinput/jinput.jar:games/jinput RUN_DEPENDS:= ${BUILD_DEPENDS} -ONLY_FOR_ARCHS= i386 amd64 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} EXTRACT_AFTER_ARGS= -d ${WRKSRC} @@ -46,14 +47,22 @@ PLIST_DIRS= %%JAVAJARDIR%%/${PORTNAME} \ PLIST_FILES+= lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}.so .endif -.if ${ARCH} == amd64 +.if ${ARCH} == amd64 || ${ARCH} == powerpc64 PLIST_FILES+= lib/${PORTNAME}${PORTVERSION}/lib${PORTNAME}64.so .endif +.if ${ARCH} == powerpc64 +MAKE_ARGS+= -Dbuild.64bit.only=1 +.endif + post-patch: @${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|g' \ -e '/executable/s/cc/${CC}/g' \ ${WRKSRC}/platform_build/bsd_ant/build.xml +.if ${ARCH} == powerpc64 + @${REINPLACE_CMD} -e 's|amd64|ppc64|g' \ + ${WRKSRC}/platform_build/bsd_ant/build.xml +.endif do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME} @@ -66,7 +75,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}.so \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION} .endif -.if ${ARCH} == amd64 +.if ${ARCH} == amd64 || ${ARCH} == powerpc64 ${INSTALL_DATA} ${WRKSRC}/libs/freebsd/lib${PORTNAME}64.so \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}${PORTVERSION} .endif diff --git a/games/mkgichessclub/Makefile b/games/mkgichessclub/Makefile index 7d487d9d516..5f781cd3bd2 100644 --- a/games/mkgichessclub/Makefile +++ b/games/mkgichessclub/Makefile @@ -14,7 +14,7 @@ COMMENT= Chess playing server with a pure web interface DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 OPTIONS_DEFINE= GNUCHESS PHALANX DOCS GNUCHESS_DESC= Install gnuchess robot diff --git a/games/onscripter/Makefile b/games/onscripter/Makefile index e62a6ecf431..1ee6ddba2f5 100644 --- a/games/onscripter/Makefile +++ b/games/onscripter/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= onscripter -PORTVERSION= 20180409 +PORTVERSION= 20181202 CATEGORIES= games MASTER_SITES= http://onscripter.osdn.jp/ diff --git a/games/onscripter/distinfo b/games/onscripter/distinfo index 92039f95d04..e3132291654 100644 --- a/games/onscripter/distinfo +++ b/games/onscripter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523240521 -SHA256 (onscripter-20180409.tar.gz) = 8ee9eb388a3fd5b1877ea5fc93803265f6f0ef566c461c4d9742ab7da86d2e6f -SIZE (onscripter-20180409.tar.gz) = 245838 +TIMESTAMP = 1543758218 +SHA256 (onscripter-20181202.tar.gz) = 5cd46761f75121d2ae806aabf167e10e6de78e749ffc17588f8214a2893d4ef4 +SIZE (onscripter-20181202.tar.gz) = 248476 diff --git a/graphics/gauche-gl/Makefile b/graphics/gauche-gl/Makefile index bb06be9b73c..e423096a0a1 100644 --- a/graphics/gauche-gl/Makefile +++ b/graphics/gauche-gl/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= gosh:lang/gauche RUN_DEPENDS= gosh:lang/gauche -USES= localbase makeinfo tar:tgz +USES= gl localbase makeinfo tar:tgz USE_CSTD= gnu99 USE_XORG= ice sm x11 xext xmu xi USE_GL= gl glu glut diff --git a/graphics/gauche-gl/files/patch-src_Makefile.in b/graphics/gauche-gl/files/patch-src_Makefile.in new file mode 100644 index 00000000000..92af171e4a7 --- /dev/null +++ b/graphics/gauche-gl/files/patch-src_Makefile.in @@ -0,0 +1,11 @@ +--- src/Makefile.in.orig 2018-10-31 17:01:43 UTC ++++ src/Makefile.in +@@ -17,7 +17,7 @@ DESTDIR = + # These are set by configure + # NB: cc and various flags must match the ones used to compile Gauche, + # so the make invocator shouldn't casually override them. +-CFLAGS = @DEFS@ @X_CFLAGS@ @GLUT_INCDIR@ @GLEW_INCDIR@ ++CFLAGS += @DEFS@ @X_CFLAGS@ @GLUT_INCDIR@ @GLEW_INCDIR@ + LDFLAGS = @LDFLAGS@ + OBJEXT = @OBJEXT@ + SOEXT = @SOEXT@ diff --git a/graphics/gexiv2/files/patch-gexiv2_meson.build b/graphics/gexiv2/files/patch-gexiv2_meson.build index c967491f8a3..af4e439075d 100644 --- a/graphics/gexiv2/files/patch-gexiv2_meson.build +++ b/graphics/gexiv2/files/patch-gexiv2_meson.build @@ -1,11 +1,16 @@ ---- gexiv2/meson.build.orig 2018-11-23 19:55:20 UTC -+++ gexiv2/meson.build -@@ -35,7 +35,7 @@ install_headers(gexiv2_headers, subdir : +--- gexiv2/meson.build.orig 2018-12-01 18:58:21.005598000 +0100 ++++ gexiv2/meson.build 2018-12-01 19:01:56.566055000 +0100 +@@ -35,10 +35,10 @@ # Static map file mapfile = 'gexiv2.map' -if host_machine.system() == 'darwin' +- vflag = '' +if host_machine.system() == 'darwin' or host_machine.system() == 'freebsd' - vflag = '' ++ vflag = [] else - vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) +- vflag = '-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile) ++ vflag = ['-Wl,--version-script,@0@/@1@'.format(meson.current_source_dir(), mapfile)] + endif + + gexiv2 = library('gexiv2', diff --git a/graphics/gmic/Makefile b/graphics/gmic/Makefile index 2ce5d662dab..9834459b798 100644 --- a/graphics/gmic/Makefile +++ b/graphics/gmic/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gmic -DISTVERSION= 2.4.1 +DISTVERSION= 2.4.2 CATEGORIES= graphics MASTER_SITES= https://gmic.eu/files/source/ DISTNAME= ${PORTNAME}_${DISTVERSION} @@ -21,7 +21,6 @@ LIB_DEPENDS= libfftw3.so:math/fftw3 \ libGraphicsMagick++.so:graphics/GraphicsMagick \ libIlmImf.so:graphics/openexr \ libImath.so:graphics/ilmbase \ - libomp.so:devel/openmp \ libopencv_core.so:graphics/opencv-core \ libopencv_video.so:graphics/opencv \ libpng.so:graphics/png \ @@ -37,10 +36,13 @@ CMAKE_ON= ENABLE_DYNAMIC_LINKING WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -OPTIONS_DEFINE= PLUGINS X11 -OPTIONS_DEFAULT= X11 +OPTIONS_DEFINE= OPENMP PLUGINS X11 +OPTIONS_DEFAULT= OPENMP X11 OPTIONS_SUB= yes +OPENMP_CMAKE_BOOL= ENABLE_OPENMP +OPENMP_LIB_DEPENDS= libomp.so:devel/openmp + PLUGINS_CMAKE_BOOL= BUILD_PLUGIN PLUGINS_USE= GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango PLUGINS_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ diff --git a/graphics/gmic/distinfo b/graphics/gmic/distinfo index 3819ebaa32c..c556d3e2667 100644 --- a/graphics/gmic/distinfo +++ b/graphics/gmic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542255893 -SHA256 (gmic_2.4.1.tar.gz) = 446b465d2ff7314add634115f6bffecd136ad96759eb92f76c03f231f44188d6 -SIZE (gmic_2.4.1.tar.gz) = 3809170 +TIMESTAMP = 1544084124 +SHA256 (gmic_2.4.2.tar.gz) = 0fae452232501ed7e50bbe2eaa96900a5b6daa7fb1d4366d207311bdc27d0762 +SIZE (gmic_2.4.2.tar.gz) = 3813264 diff --git a/graphics/gmic/files/patch-CMakeLists.txt b/graphics/gmic/files/patch-CMakeLists.txt index be3ae53825a..00dfd94ede3 100644 --- a/graphics/gmic/files/patch-CMakeLists.txt +++ b/graphics/gmic/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2018-10-04 13:30:14 UTC +--- CMakeLists.txt.orig 2018-12-06 08:43:18 UTC +++ CMakeLists.txt @@ -108,7 +108,7 @@ set(COMPILE_FLAGS "-Dgmic_build -Dcimg_u if(APPLE) @@ -14,9 +14,9 @@ # CImg.h header if(NOT EXISTS ${CMAKE_SOURCE_DIR}/src/CImg.h) - file(DOWNLOAD https://framagit.org/dtschump/CImg/raw/master/CImg.h ${CMAKE_SOURCE_DIR}/src/CImg.h) -- file(TOUCH ${CMAKE_SOURCE_DIR}/src/CImg.h) +- execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_SOURCE_DIR}/src/CImg.h) + #file(DOWNLOAD https://framagit.org/dtschump/CImg/raw/master/CImg.h ${CMAKE_SOURCE_DIR}/src/CImg.h) -+ #file(TOUCH ${CMAKE_SOURCE_DIR}/src/CImg.h) ++ #execute_process(COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_SOURCE_DIR}/src/CImg.h) + execute_process(COMMAND ln -s ${CMAKE_INSTALL_PREFIX}/include/CImg.h ${CMAKE_SOURCE_DIR}/src/CImg.h) endif() diff --git a/graphics/gmic/files/patch-src_gmic.cpp b/graphics/gmic/files/patch-src_gmic.cpp index 78be03951ab..60944dfc708 100644 --- a/graphics/gmic/files/patch-src_gmic.cpp +++ b/graphics/gmic/files/patch-src_gmic.cpp @@ -1,6 +1,6 @@ ---- src/gmic.cpp.orig 2018-05-30 23:49:53 UTC +--- src/gmic.cpp.orig 2018-12-03 08:57:03 UTC +++ src/gmic.cpp -@@ -2224,7 +2224,7 @@ double gmic::mp_ext(char *const str, voi +@@ -2029,7 +2029,7 @@ double gmic::mp_ext(char *const str, voi // Manage correspondence between abort pointers and thread ids. CImgList gmic::list_p_is_abort = CImgList(); bool *gmic::abort_ptr(bool *const p_is_abort) { @@ -9,7 +9,7 @@ void* tid = (void*)(cimg_ulong)getpid(); #elif cimg_OS==1 void* tid = (void*)(cimg_ulong)syscall(SYS_gettid); -@@ -2557,7 +2557,7 @@ gmic::~gmic() { +@@ -2362,7 +2362,7 @@ gmic::~gmic() { #endif // #if cimg_display!=0 cimg::mutex(21); diff --git a/graphics/graphene/files/patch-src_bench_graphene-bench-utils.c b/graphics/graphene/files/patch-src_bench_graphene-bench-utils.c new file mode 100644 index 00000000000..76cd151178e --- /dev/null +++ b/graphics/graphene/files/patch-src_bench_graphene-bench-utils.c @@ -0,0 +1,20 @@ +--- src/bench/graphene-bench-utils.c.orig 2018-12-04 11:34:21 UTC ++++ src/bench/graphene-bench-utils.c +@@ -271,7 +271,7 @@ graphene_bench_print_results (const char *impl, + { + const char *d_unit, *round_unit, *iter_unit; + double d = format_time (elapsed, &d_unit); +- double round = format_time (avg, &round_unit); ++ double my_round = format_time (avg, &round_unit); + double iter = format_time (avg / bench_unit_rounds, &iter_unit); + + switch (bench_output) +@@ -283,7 +283,7 @@ graphene_bench_print_results (const char *impl, + " Per iteration: %.6f %s\n", + path, (gint64) (num_rounds * bench_unit_rounds), impl, + d, d_unit, num_rounds, +- round, round_unit, bench_unit_rounds, ++ my_round, round_unit, bench_unit_rounds, + iter, iter_unit); + break; + diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile index ae1a40cdcf3..dd3777cb969 100644 --- a/graphics/mapserver/Makefile +++ b/graphics/mapserver/Makefile @@ -129,7 +129,6 @@ CMAKE_ARGS+= -DWITH_POSTGIS=0 .if ${PORT_OPTIONS:MPHP} USES+= php:build -IGNORE_WITH_PHP= 70 CMAKE_ARGS+= -DWITH_PHP=1 PLIST_SUB+= PHP="" .else diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 1e6f65aeca0..f04e750fbb7 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -2,9 +2,10 @@ # $FreeBSD$ PORTNAME= netpbm -DISTVERSION= 10.84.02 +DISTVERSION= 10.84.04 CATEGORIES= graphics MASTER_SITES= https://github.com/t6/netpbm/releases/download/v${DISTVERSION}/ \ + https://gitlab.com/tobiask/netpbm/uploads/b29b61bbb4a7bf38cb3d77785bcc2657/ \ LOCAL/tobik MAINTAINER= tobik@FreeBSD.org @@ -71,6 +72,7 @@ STATIC_LIB_DEPENDS_OFF= libtiff.so:graphics/tiff \ STATIC_USES= jpeg:build STATIC_USES_OFF= jpeg SVGTOPAM_DESC= Build svgtopam +SVGTOPAM_USES= gnome SVGTOPAM_USE= GNOME=libxml2 SVGTOPAM_VARS_OFF= DISABLED_TESTS+=svgtopam X11_USE= XORG=x11,xcb,xau,xdmcp diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index c673bd14d69..dcc22dc74c0 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539980273 -SHA256 (netpbm-10.84.02.tar.gz) = ba896fa201ad28aa5fb3782dfa28d8df8fcfa5b98f3cc7c788c0ceda085a1812 -SIZE (netpbm-10.84.02.tar.gz) = 3291445 +TIMESTAMP = 1544200117 +SHA256 (netpbm-10.84.04.tar.gz) = f225ae16cf74a6eb3d8537fb15aa9aca47200d936a6615060f378dbb51ac5aab +SIZE (netpbm-10.84.04.tar.gz) = 3292715 diff --git a/graphics/pecl-gmagick/Makefile b/graphics/pecl-gmagick/Makefile index 7c24f8ee06a..e514df5c48b 100644 --- a/graphics/pecl-gmagick/Makefile +++ b/graphics/pecl-gmagick/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --with-gmagick=${LOCALBASE} diff --git a/graphics/pecl-imlib2/Makefile b/graphics/pecl-imlib2/Makefile index a2c5cd35d3c..769f64e987e 100644 --- a/graphics/pecl-imlib2/Makefile +++ b/graphics/pecl-imlib2/Makefile @@ -17,7 +17,7 @@ LICENSE= PHP202 LIB_DEPENDS= libImlib2.so:graphics/imlib2 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 # libImlib2 may or may not depend on X, however, # imlib2 extension doesn't need X related functions in libImlib2 diff --git a/graphics/php-gdal/Makefile b/graphics/php-gdal/Makefile index 801393e6dc9..53e078fd99d 100644 --- a/graphics/php-gdal/Makefile +++ b/graphics/php-gdal/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= libgdal.so:graphics/gdal ALL_TARGET= php_gdal.so php_gdalconst.so php_ogr.so php_osr.so CFLAGS+= -fPIC -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 MAKEFILE= GNUmakefile PHP_MOD_NAME= php_${PORTNAME} USES= php:build gmake localbase tar:xz diff --git a/graphics/php-libpuzzle/Makefile b/graphics/php-libpuzzle/Makefile index 12f99c77d86..467e2b3be15 100644 --- a/graphics/php-libpuzzle/Makefile +++ b/graphics/php-libpuzzle/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= libpuzzle.so:graphics/libpuzzle \ libgd.so:graphics/gd USES= php:ext tar:bzip2 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/php/${PORTNAME} diff --git a/graphics/php-magickwand/Makefile b/graphics/php-magickwand/Makefile index 882c09011e7..5f055585dc8 100644 --- a/graphics/php-magickwand/Makefile +++ b/graphics/php-magickwand/Makefile @@ -18,7 +18,7 @@ EXPIRATION_DATE= 2018-12-30 LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick6 USES= php:ext pkgconfig -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --with-magickwand=${LOCALBASE} diff --git a/graphics/php5-ffmpeg/Makefile b/graphics/php5-ffmpeg/Makefile index 0bde16ed57c..ad19f30ad81 100644 --- a/graphics/php5-ffmpeg/Makefile +++ b/graphics/php5-ffmpeg/Makefile @@ -21,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libgd.so:graphics/gd \ libavutil.so:multimedia/ffmpeg -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 USES= localbase php:ext tar:xz .include diff --git a/graphics/py-termtosvg/Makefile b/graphics/py-termtosvg/Makefile index e30cebe4edc..b3a995a6f65 100644 --- a/graphics/py-termtosvg/Makefile +++ b/graphics/py-termtosvg/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= termtosvg -PORTVERSION= 0.5.0 +PORTVERSION= 0.6.0 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-termtosvg/distinfo b/graphics/py-termtosvg/distinfo index de919df3718..ca68ecc21b9 100644 --- a/graphics/py-termtosvg/distinfo +++ b/graphics/py-termtosvg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1536109566 -SHA256 (termtosvg-0.5.0.tar.gz) = a2702d23902abb93e8e58cca65361b345702d481d9cf41a45e97a886ff6d6de7 -SIZE (termtosvg-0.5.0.tar.gz) = 49472 +TIMESTAMP = 1544176452 +SHA256 (termtosvg-0.6.0.tar.gz) = bf1c2f37261e31eb87b73270ff9c5567c9802fa710dbc352716d5686da83845f +SIZE (termtosvg-0.6.0.tar.gz) = 54010 diff --git a/japanese/php5-mecab/Makefile b/japanese/php5-mecab/Makefile index 269b8e4ef0b..6a2a0145703 100644 --- a/japanese/php5-mecab/Makefile +++ b/japanese/php5-mecab/Makefile @@ -17,7 +17,7 @@ EXPIRATION_DATE= 2018-12-30 LIB_DEPENDS= libmecab.so:japanese/mecab USES= php:ext -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --with-mecab=${LOCALBASE}/bin/mecab-config .include diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile index 1021f5a4137..d851cbee7a5 100644 --- a/lang/gcc7-devel/Makefile +++ b/lang/gcc7-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 7.3.1.s20181129 +PORTVERSION= 7.4.1.s20181206 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc7-devel/distinfo b/lang/gcc7-devel/distinfo index 42b310cbfaa..8433326f469 100644 --- a/lang/gcc7-devel/distinfo +++ b/lang/gcc7-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543685209 -SHA256 (gcc-7-20181129.tar.xz) = 94614bb365d5759e79415c0bf88dcb5f2155bc7c66b1ea8c203b893161ea44c6 -SIZE (gcc-7-20181129.tar.xz) = 59319304 +TIMESTAMP = 1544138200 +SHA256 (gcc-7-20181206.tar.xz) = ca49cb7994c72f126df52d7a470172078746e7d87bd749350775da5aad1d690e +SIZE (gcc-7-20181206.tar.xz) = 59314412 diff --git a/lang/gcc9-devel/Makefile b/lang/gcc9-devel/Makefile index 4c53d5f90de..10b9f33c8f9 100644 --- a/lang/gcc9-devel/Makefile +++ b/lang/gcc9-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 9.0.0.s20181125 +PORTVERSION= 9.0.0.s20181202 CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel diff --git a/lang/gcc9-devel/distinfo b/lang/gcc9-devel/distinfo index d4698adc76d..d8b0f7beb0f 100644 --- a/lang/gcc9-devel/distinfo +++ b/lang/gcc9-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543276778 -SHA256 (gcc-9-20181125.tar.xz) = 87afbab2198c846d553e58aeab4f4813791e67c2f1e39723cd000b7c8a102f0e -SIZE (gcc-9-20181125.tar.xz) = 67206644 +TIMESTAMP = 1543791048 +SHA256 (gcc-9-20181202.tar.xz) = 02846fd3d047180f4df84d043b367ad5fbdb9891a744000955797eaf5b2ca202 +SIZE (gcc-9-20181202.tar.xz) = 67269888 diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index fa935cfa362..86038014f2d 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -18,8 +18,6 @@ COMMENT= Compiler for the functional language Haskell LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 - GHC_VERSION= 8.4.4 HSCOLOUR_VERSION= 1.24.4 LLVM_VERSION= 50 diff --git a/lang/ghc/bsd.ghc.mk b/lang/ghc/bsd.ghc.mk index 175d05ac04a..721f5d3a7a2 100644 --- a/lang/ghc/bsd.ghc.mk +++ b/lang/ghc/bsd.ghc.mk @@ -5,11 +5,11 @@ # Maintained by: haskell@FreeBSD.org # +ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 + DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION} EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION} -LIB_DEPENDS+= libgmp.so:math/gmp - USE_HARDENING= pie:off LLVM_AR_UNSAFE= yes @@ -24,13 +24,12 @@ NO_CCACHE= ccache: error: Failed to create directory /nonexistent/.ccache/tmp: P # This is better fixed in files/build.mk.in GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gmp-includes=${LOCALBASE}/include \ - --with-gmp-libraries=${LOCALBASE}/lib \ - --with-iconv-includes=${LOCALBASE}/include \ +CONFIGURE_ARGS= --with-iconv-includes=${LOCALBASE}/include \ --with-iconv-libraries=${LOCALBASE}/lib +# Turn off for a while, see PR 228727 +CONFIGURE_ARGS+= --enable-dtrace=0 -SUB_FILES= build.mk \ - build.boot.mk +SUB_FILES= build.mk SUB_LIST= GHC_VERSION=${GHC_VERSION} \ NCURSESINC="${NCURSESBASE}/include" NCURSESLIB="${NCURSESLIB}" \ CFLAGS="${CFLAGS}" @@ -38,47 +37,57 @@ SUB_LIST= GHC_VERSION=${GHC_VERSION} \ OPTIONS_GROUP= BOOTSTRAP BOOTSTRAP_DESC= Bootsrap using installed ghc OPTIONS_GROUP_BOOTSTRAP=BOOT -OPTIONS_DEFINE= DYNAMIC PROFILE DOCS +OPTIONS_DEFINE= DYNAMIC GMP PROFILE DOCS OPTIONS_SUB= yes -OPTIONS_DEFAULT= PROFILE DYNAMIC -# ghci segfaults on arm when dynamic linking is used -OPTIONS_EXCLUDE_armv6= DYNAMIC -OPTIONS_EXCLUDE_armv7= DYNAMIC -OPTIONS_EXCLUDE_aarch64= DYNAMIC +OPTIONS_DEFAULT= DYNAMIC PROFILE GMP BOOT_DESC= Use installed GHC for bootstrapping -PROFILE_DESC= Add support for performance profiling -DYNAMIC_DESC= Add support for dynamic linking DOCS_DESC= Install HTML documentation +DYNAMIC_DESC= Add support for dynamic linking +GMP_DESC= Use GNU Multi-precision Library for big integers support +PROFILE_DESC= Add support for performance profiling -DYNAMIC_CONFIGURE_ARGS= --with-system-libffi \ - --with-ffi-includes=${LOCALBASE}/include \ - --with-ffi-libraries=${LOCALBASE}/lib +DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx + +DYNAMIC_CONFIGURE_WITH= system-libffi \ + ffi-includes=${LOCALBASE}/include \ + ffi-libraries=${LOCALBASE}/lib # The version number is needed as lang/gcc installs a different version DYNAMIC_LIB_DEPENDS= libffi.so.6:devel/libffi +GMP_CONFIGURE_WITH= gmp-includes=${LOCALBASE}/include \ + gmp-libraries=${LOCALBASE}/lib +GMP_LIB_DEPENDS= libgmp.so:math/gmp + # Append substitutions for build.mk BOOT_SUB_LIST= HSC2HS=${LOCALBASE}/bin/hsc2hs BOOT_SUB_LIST_OFF= HSC2HS=${BOOT_HSC2HS} -DOCS_BUILD_DEPENDS+= sphinx-build:textproc/py-sphinx +DOCS_SUB_LIST= WITH_DOCS="YES" +DOCS_SUB_LIST_OFF= WITH_DOCS="NO" DYNAMIC_SUB_LIST= WITH_DYNAMIC="YES" DYNAMIC_SUB_LIST_OFF= WITH_DYNAMIC="NO" +GMP_SUB_LIST= INTEGER_LIBRARY="integer-gmp" +GMP_SUB_LIST_OFF= INTEGER_LIBRARY="integer-simple" + PROFILE_SUB_LIST= WITH_PROFILE="YES" PROFILE_SUB_LIST_OFF= WITH_PROFILE="NO" -DOCS_SUB_LIST= WITH_DOCS="YES" -DOCS_SUB_LIST_OFF= WITH_DOCS="NO" - LOCALBASE?= /usr/local +GHC_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/} + .include .if empty(PORT_OPTIONS:MBOOT) +. if ${ARCH} == armv6 || ${ARCH} == armv7 BOOT_GHC_VERSION= 8.4.2 +. else +BOOT_GHC_VERSION= 8.4.3 +. endif DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot .endif # MBOOT @@ -101,16 +110,6 @@ IGNORE= qemu-user-static isn't able to build lang/ghc, but it builds fine on a r . endif .endif -# Turn off for a while, see PR 228727 -CONFIGURE_ARGS+= --enable-dtrace=0 -.if ${OSVERSION} < 1200000 -USE_GCC= yes -.else -. if !exists(/usr/bin/ld.bfd) -USE_BINUTILS= yes -. endif -LD= ld.bfd -.endif CONFIGURE_ENV+= CC=${CC} LD=${LD} DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} @@ -278,7 +277,12 @@ post-install: .PHONY: create-bootstrap create-bootstrap: cd ${WRKSRC} \ - && gmake binary-dist TAR_COMP=xz \ - && mv ${WRKSRC}/ghc-${GHC_VERSION}-${ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz - && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz - && stat -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz + && ${ECHO} "BIN_DIST_NAME=ghc-${GHC_VERSION}-boot" >> mk/build.mk \ + && ${ECHO} "BIN_DIST_TAR=ghc-${GHC_VERSION}-boot.tar" >> mk/build.mk \ + && gmake binary-dist TAR_COMP=xz \ + && ${MV} ${WRKSRC}/ghc-${GHC_VERSION}-boot-${GHC_ARCH}-portbld-freebsd.tar.xz /tmp/ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz + + cd /tmp \ + && sha256 ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz \ + && ${ECHO} -n "SIZE (ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz) = " \ + && ${STAT} -f %z ghc-${GHC_VERSION}-boot-${ARCH}-freebsd.tar.xz diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index bc01214c22e..4ee3ee5c367 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1541010521 +TIMESTAMP = 1541010522 SHA256 (ghc-8.4.4-src.tar.xz) = 11117735a58e507c481c09f3f39ae5a314e9fbf49fc3109528f99ea7959004b2 SIZE (ghc-8.4.4-src.tar.xz) = 11319500 -SHA256 (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 8fe44700c0b765b38a2072c8ea9ddb1da18b4a738397c9ceddcce80708900e4f -SIZE (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 72751016 -SHA256 (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 673230735fc459a3c05cf845ef7beeeb6eab9576bc03471b9fb50bd3fe29d911 -SIZE (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 69976728 +SHA256 (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 0e0324a539d471a813ed4d18c537fb19be22a4e250bd5434a3a911b9d5343724 +SIZE (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 67718400 +SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b1c0166e028b3f6d50ad295525e6b84490da82663ec66165e57e87972 +SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d SIZE (hscolour-1.24.4.tar.gz) = 28729 -SHA256 (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 18412f10bb172dbaff7f31505845fbd43fdde14046463fdacc42e26683be311d -SIZE (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 100240140 +SHA256 (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 84611f37d31a43a3216274ee7dcee4b89f2c5ef6ab713222f266b5658c736e05 +SIZE (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 99933576 SHA256 (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 61d3a4486dbb904b05a735e98f23a49c2b464d6b19212dd655ff578f36d02f0d SIZE (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 107368936 SHA256 (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = eedb9416870bfe82315155751871e31e815b718b381ccf4f7e45a99a6ad7c94d diff --git a/lang/ghc/files/build.boot.mk.in b/lang/ghc/files/build.boot.mk.in deleted file mode 100644 index c38f6c9806f..00000000000 --- a/lang/ghc/files/build.boot.mk.in +++ /dev/null @@ -1,9 +0,0 @@ -GhcLibWays = v -XMLDocWays = -HADDOCK_DOCS = NO -HSCOLOUR_SRCS = NO -INTEGER_LIBRARY = integer-simple -DYNAMIC_GHC_PROGRAMS = NO -BUILD_PROF_LIBS = NO -BIN_DIST_NAME = ghc-%%GHC_VERSION%%-boot -BIN_DIST_TAR = ghc-%%GHC_VERSION%%-boot.tar diff --git a/lang/ghc/files/build.mk.in b/lang/ghc/files/build.mk.in index 366ab8678fc..88b9aee33cc 100644 --- a/lang/ghc/files/build.mk.in +++ b/lang/ghc/files/build.mk.in @@ -6,6 +6,7 @@ DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%% BUILD_PROF_LIBS = %%WITH_PROFILE%% HADDOCK_DOCS = %%WITH_DOCS%% HSCOLOUR_SRCS = %%WITH_DOCS%% +INTEGER_LIBRARY = %%INTEGER_LIBRARY%% # disable xelatex: PR 231438 BUILD_SPHINX_PDF = NO BSD_PATH_TO_HSC2HS = %%HSC2HS%% diff --git a/lang/ghc843/Makefile b/lang/ghc843/Makefile index 9fb38ec347b..4996d334a85 100644 --- a/lang/ghc843/Makefile +++ b/lang/ghc843/Makefile @@ -20,8 +20,6 @@ COMMENT= Compiler for the functional language Haskell LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 - GHC_VERSION= 8.4.3 HSCOLOUR_VERSION= 1.24.4 LLVM_VERSION= 50 diff --git a/lang/ghc843/distinfo b/lang/ghc843/distinfo index 0353ce933f8..3bb1977e0bd 100644 --- a/lang/ghc843/distinfo +++ b/lang/ghc843/distinfo @@ -1,14 +1,14 @@ -TIMESTAMP = 1530033471 +TIMESTAMP = 1530033472 SHA256 (ghc-8.4.3-src.tar.xz) = ae47afda985830de8811243255aa3744dfb9207cb980af74393298b2b62160d6 SIZE (ghc-8.4.3-src.tar.xz) = 11315068 -SHA256 (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 8fe44700c0b765b38a2072c8ea9ddb1da18b4a738397c9ceddcce80708900e4f -SIZE (ghc-8.4.2-boot-amd64-freebsd.tar.xz) = 72751016 -SHA256 (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 673230735fc459a3c05cf845ef7beeeb6eab9576bc03471b9fb50bd3fe29d911 -SIZE (ghc-8.4.2-boot-i386-freebsd.tar.xz) = 69976728 +SHA256 (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 0e0324a539d471a813ed4d18c537fb19be22a4e250bd5434a3a911b9d5343724 +SIZE (ghc-8.4.3-boot-amd64-freebsd.tar.xz) = 67718400 +SHA256 (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 65fcd48b1c0166e028b3f6d50ad295525e6b84490da82663ec66165e57e87972 +SIZE (ghc-8.4.3-boot-i386-freebsd.tar.xz) = 66143592 SHA256 (hscolour-1.24.4.tar.gz) = 243332b082294117f37b2c2c68079fa61af68b36223b3fc07594f245e0e5321d SIZE (hscolour-1.24.4.tar.gz) = 28729 -SHA256 (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 18412f10bb172dbaff7f31505845fbd43fdde14046463fdacc42e26683be311d -SIZE (ghc-8.4.2-boot-aarch64-freebsd.tar.xz) = 100240140 +SHA256 (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 84611f37d31a43a3216274ee7dcee4b89f2c5ef6ab713222f266b5658c736e05 +SIZE (ghc-8.4.3-boot-aarch64-freebsd.tar.xz) = 99933576 SHA256 (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 61d3a4486dbb904b05a735e98f23a49c2b464d6b19212dd655ff578f36d02f0d SIZE (ghc-8.4.2-boot-armv6-freebsd.tar.xz) = 107368936 SHA256 (ghc-8.4.2-boot-armv7-freebsd.tar.xz) = eedb9416870bfe82315155751871e31e815b718b381ccf4f7e45a99a6ad7c94d diff --git a/lang/ghc843/files/build.boot.mk.in b/lang/ghc843/files/build.boot.mk.in deleted file mode 100644 index c38f6c9806f..00000000000 --- a/lang/ghc843/files/build.boot.mk.in +++ /dev/null @@ -1,9 +0,0 @@ -GhcLibWays = v -XMLDocWays = -HADDOCK_DOCS = NO -HSCOLOUR_SRCS = NO -INTEGER_LIBRARY = integer-simple -DYNAMIC_GHC_PROGRAMS = NO -BUILD_PROF_LIBS = NO -BIN_DIST_NAME = ghc-%%GHC_VERSION%%-boot -BIN_DIST_TAR = ghc-%%GHC_VERSION%%-boot.tar diff --git a/lang/ghc843/files/build.mk.in b/lang/ghc843/files/build.mk.in index 366ab8678fc..88b9aee33cc 100644 --- a/lang/ghc843/files/build.mk.in +++ b/lang/ghc843/files/build.mk.in @@ -6,6 +6,7 @@ DYNAMIC_GHC_PROGRAMS = %%WITH_DYNAMIC%% BUILD_PROF_LIBS = %%WITH_PROFILE%% HADDOCK_DOCS = %%WITH_DOCS%% HSCOLOUR_SRCS = %%WITH_DOCS%% +INTEGER_LIBRARY = %%INTEGER_LIBRARY%% # disable xelatex: PR 231438 BUILD_SPHINX_PDF = NO BSD_PATH_TO_HSC2HS = %%HSC2HS%% diff --git a/lang/pecl-perl/Makefile b/lang/pecl-perl/Makefile index 4a72e3299a7..1a5af420616 100644 --- a/lang/pecl-perl/Makefile +++ b/lang/pecl-perl/Makefile @@ -14,7 +14,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= perl5 php:pecl diff --git a/lang/php56-extensions/Makefile b/lang/php56-extensions/Makefile index 150c2af418c..53d732c9a53 100644 --- a/lang/php56-extensions/Makefile +++ b/lang/php56-extensions/Makefile @@ -16,7 +16,7 @@ USE_HARDENING= pie:off relro:off USES= metaport php PHP_VER= 56 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \ diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext index fcd276191a2..1490ede652c 100644 --- a/lang/php56/Makefile.ext +++ b/lang/php56/Makefile.ext @@ -3,7 +3,7 @@ COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 56 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} diff --git a/lang/php71-extensions/Makefile b/lang/php71-extensions/Makefile index 86a4e282fcb..87d4439e4f6 100644 --- a/lang/php71-extensions/Makefile +++ b/lang/php71-extensions/Makefile @@ -12,7 +12,7 @@ USE_HARDENING= pie:off relro:off USES= metaport php PHP_VER= 71 -IGNORE_WITH_PHP= 56 70 72 73 +IGNORE_WITH_PHP= 56 72 73 OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \ diff --git a/lang/php72-extensions/Makefile b/lang/php72-extensions/Makefile index 67e8fe05c7b..646f38dbb00 100644 --- a/lang/php72-extensions/Makefile +++ b/lang/php72-extensions/Makefile @@ -10,7 +10,7 @@ COMMENT= "meta-port" to install PHP extensions USES= metaport php PHP_VER= 72 -IGNORE_WITH_PHP= 56 70 71 73 +IGNORE_WITH_PHP= 56 71 73 OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \ diff --git a/lang/php72/Makefile b/lang/php72/Makefile index 1f47251f4d5..93829eea25e 100644 --- a/lang/php72/Makefile +++ b/lang/php72/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= php72 -DISTVERSION= 7.2.12 +DISTVERSION= 7.2.13 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= PHP/distributions diff --git a/lang/php72/Makefile.ext b/lang/php72/Makefile.ext index f0d141507ae..44953724a7e 100644 --- a/lang/php72/Makefile.ext +++ b/lang/php72/Makefile.ext @@ -5,7 +5,7 @@ COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 72 -IGNORE_WITH_PHP= 56 70 71 73 +IGNORE_WITH_PHP= 56 71 73 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} diff --git a/lang/php72/distinfo b/lang/php72/distinfo index 3081b3ff8da..26270b954d3 100644 --- a/lang/php72/distinfo +++ b/lang/php72/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541795158 -SHA256 (php-7.2.12.tar.xz) = 989c04cc879ee71a5e1131db867f3c5102f1f7565f805e2bb8bde33f93147fe1 -SIZE (php-7.2.12.tar.xz) = 12141472 +TIMESTAMP = 1544005077 +SHA256 (php-7.2.13.tar.xz) = 14b0429abdb46b65c843e5882c9a8c46b31dfbf279c747293b8ab950c2644a4b +SIZE (php-7.2.13.tar.xz) = 12116484 diff --git a/lang/php73-extensions/Makefile b/lang/php73-extensions/Makefile index 7a8e4f13330..280034c5d2c 100644 --- a/lang/php73-extensions/Makefile +++ b/lang/php73-extensions/Makefile @@ -10,7 +10,7 @@ COMMENT= "meta-port" to install PHP extensions USES= metaport php PHP_VER= 73 -IGNORE_WITH_PHP= 56 70 71 72 +IGNORE_WITH_PHP= 56 71 72 OPTIONS_DEFINE= BCMATH BZ2 CALENDAR CTYPE CURL DBA \ DOM ENCHANT EXIF FILEINFO FILTER FTP GD GETTEXT \ diff --git a/lang/php73/Makefile b/lang/php73/Makefile index d83d78cb426..4f4cdede7ad 100644 --- a/lang/php73/Makefile +++ b/lang/php73/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= php73 -DISTVERSION= 7.3.0RC6 +DISTVERSION= 7.3.0 PORTREVISION?= 0 CATEGORIES?= lang devel www -MASTER_SITES= https://downloads.php.net/~cmb/ +MASTER_SITES= PHP/distributions DISTNAME= php-${DISTVERSION} MAINTAINER= tz@FreeBSD.org diff --git a/lang/php73/Makefile.ext b/lang/php73/Makefile.ext index d97d2776711..79ff1d80af6 100644 --- a/lang/php73/Makefile.ext +++ b/lang/php73/Makefile.ext @@ -5,7 +5,7 @@ COMMENT= The ${PHP_MODNAME} shared extension for php USES+= php:ext,noflavors PHP_MODNAME= ${PKGNAMESUFFIX:S/-//} PHP_VER= 73 -IGNORE_WITH_PHP= 56 70 71 72 +IGNORE_WITH_PHP= 56 71 72 EXTSUBDIR= ${DISTNAME}/ext/${PHP_MODNAME} WRKSRC= ${WRKDIR}/${EXTSUBDIR} diff --git a/lang/php73/distinfo b/lang/php73/distinfo index 770ad09ed89..e3fad3f35af 100644 --- a/lang/php73/distinfo +++ b/lang/php73/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542968426 -SHA256 (php-7.3.0RC6.tar.xz) = 8120b5830e24d5fabc96da693ab924852e6c2a95829ad994d6a5107c69787848 -SIZE (php-7.3.0RC6.tar.xz) = 11918172 +TIMESTAMP = 1544005190 +SHA256 (php-7.3.0.tar.xz) = 7d195cad55af8b288c3919c67023a14ff870a73e3acc2165a6d17a4850a560b5 +SIZE (php-7.3.0.tar.xz) = 11928820 diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 109b9695e40..419c587f869 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rust -PORTVERSION?= 1.30.1 +PORTVERSION?= 1.31.0 PORTREVISION?= 0 CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/:src \ @@ -47,13 +47,13 @@ BROKEN_aarch64= fails to build: bootstrap compiler crashes CONFLICTS_INSTALL?= rust-nightly # See WRKSRC/src/stage0.txt for this date and version values. -BOOTSTRAPS_DATE?= 2018-10-12 +BOOTSTRAPS_DATE?= 2018-10-25 -RUST_BOOTSTRAP_VERSION?= 1.29.2 +RUST_BOOTSTRAP_VERSION?= 1.30.0 RUSTC_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rustc-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_STD_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/rust-std-${RUST_BOOTSTRAP_VERSION_${ARCH}:U${RUST_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz -CARGO_BOOTSTRAP_VERSION?= 0.30.0 +CARGO_BOOTSTRAP_VERSION?= 0.31.0 CARGO_BOOTSTRAP= ${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTRAPS_DATE}}/cargo-${CARGO_BOOTSTRAP_VERSION_${ARCH}:U${CARGO_BOOTSTRAP_VERSION}}-${RUST_TARGET}.tar.gz RUST_CHANNEL= ${PKGNAMESUFFIX:Ustable:S/^-//} diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 6980b1bf5d6..40dbcb9141b 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1541756539 -SHA256 (rust/rustc-1.30.1-src.tar.xz) = 76c824e26b6a554cd48f45993e42001816c2f515dd1b252e3c8315fe200155ae -SIZE (rust/rustc-1.30.1-src.tar.xz) = 96086232 -SHA256 (rust/2018-10-12/rustc-1.29.2-x86_64-unknown-freebsd.tar.gz) = 94fba7a7b88ca86c037a48376b7e09bb4ca66e1268fc8d664796cdbdee97c0fa -SIZE (rust/2018-10-12/rustc-1.29.2-x86_64-unknown-freebsd.tar.gz) = 66548519 -SHA256 (rust/2018-10-12/rust-std-1.29.2-x86_64-unknown-freebsd.tar.gz) = ddde8a33ddd902471c51f273087d90e9f7f184b7f09f5d14cab454c8c4965ec2 -SIZE (rust/2018-10-12/rust-std-1.29.2-x86_64-unknown-freebsd.tar.gz) = 64503048 -SHA256 (rust/2018-10-12/cargo-0.30.0-x86_64-unknown-freebsd.tar.gz) = cdee0b90aedc51a239bbd44ed788111393da227d2950005f3730df938aa8303e -SIZE (rust/2018-10-12/cargo-0.30.0-x86_64-unknown-freebsd.tar.gz) = 7411378 -SHA256 (rust/2018-10-12/rustc-1.29.2-i686-unknown-freebsd.tar.gz) = 8115f4c9958623589746dbe7cc61bcd1998077af086ca2242d1d7a771a6202ab -SIZE (rust/2018-10-12/rustc-1.29.2-i686-unknown-freebsd.tar.gz) = 67556724 -SHA256 (rust/2018-10-12/rust-std-1.29.2-i686-unknown-freebsd.tar.gz) = 31806e3fb30d48e18661af14aea920caa3a322388711a5a6f6998d22878d29c0 -SIZE (rust/2018-10-12/rust-std-1.29.2-i686-unknown-freebsd.tar.gz) = 64847326 -SHA256 (rust/2018-10-12/cargo-0.30.0-i686-unknown-freebsd.tar.gz) = e62e26635f1ee70bcbe5d6bef69dea938668ba6933fa96f32df84d2f47d131c3 -SIZE (rust/2018-10-12/cargo-0.30.0-i686-unknown-freebsd.tar.gz) = 7198097 +TIMESTAMP = 1543972935 +SHA256 (rust/rustc-1.31.0-src.tar.xz) = 9581c5673937f8b1c3c21060ef7c1fcd3e5574a0fc0b27e1888cb37c4b2ec393 +SIZE (rust/rustc-1.31.0-src.tar.xz) = 96914112 +SHA256 (rust/2018-10-25/rustc-1.30.0-x86_64-unknown-freebsd.tar.gz) = 68a74949e34118406673cf8cc0098b011907c840890e0640aa3b145ce91c521d +SIZE (rust/2018-10-25/rustc-1.30.0-x86_64-unknown-freebsd.tar.gz) = 68231553 +SHA256 (rust/2018-10-25/rust-std-1.30.0-x86_64-unknown-freebsd.tar.gz) = 4040fe677524e2ead69a2fcab4c16acaad3d4c4f1210ae36f400f82463bdfbc7 +SIZE (rust/2018-10-25/rust-std-1.30.0-x86_64-unknown-freebsd.tar.gz) = 67081473 +SHA256 (rust/2018-10-25/cargo-0.31.0-x86_64-unknown-freebsd.tar.gz) = 2b9176bb34e6cdf663d3f5ad0c89f862696eecc79b7de7db482ce4dd995eb3e8 +SIZE (rust/2018-10-25/cargo-0.31.0-x86_64-unknown-freebsd.tar.gz) = 6439361 +SHA256 (rust/2018-10-25/rustc-1.30.0-i686-unknown-freebsd.tar.gz) = 26f5fa76d6033559a21e84876b8fe11e1b3621c226b243505a5fc45a3afaae90 +SIZE (rust/2018-10-25/rustc-1.30.0-i686-unknown-freebsd.tar.gz) = 69069431 +SHA256 (rust/2018-10-25/rust-std-1.30.0-i686-unknown-freebsd.tar.gz) = 267716811f1e2813a76f30f11293fb2c69f398f69a886b94587d821e743d4e20 +SIZE (rust/2018-10-25/rust-std-1.30.0-i686-unknown-freebsd.tar.gz) = 67319097 +SHA256 (rust/2018-10-25/cargo-0.31.0-i686-unknown-freebsd.tar.gz) = c291ed53edd74fabbab85328bebbc6ca12db6eaf3d76e7c4624d642fa05c7dbe +SIZE (rust/2018-10-25/cargo-0.31.0-i686-unknown-freebsd.tar.gz) = 6146453 diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_.cargo-checksum.json b/lang/rust/files/patch-src_vendor_openssl-sys_.cargo-checksum.json index fef76471c65..f9ec73c9dd4 100644 --- a/lang/rust/files/patch-src_vendor_openssl-sys_.cargo-checksum.json +++ b/lang/rust/files/patch-src_vendor_openssl-sys_.cargo-checksum.json @@ -1,6 +1,7 @@ ---- src/vendor/openssl-sys/.cargo-checksum.json.orig 2018-09-11 04:49:55 UTC +--- src/vendor/openssl-sys/.cargo-checksum.json.orig 2018-12-03 20:08:24 UTC +++ src/vendor/openssl-sys/.cargo-checksum.json @@ -1 +1 @@ --{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"15b9e9f5255d11898d5f373ba8ac750d567155b1c81fa903f02e97b18cea5f18","Cargo.toml.orig":"3ec9308dd6326a80e0e30c076dd778f42cb1f1f616e666e924a210554681dd97","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"15b264aba47e69aa522c8cb37b320a156f0c3a3a72393338818046eac8ef4c3a","build/cfgs.rs":"b853b4100ed5421e4f4d436c3bb067f33c2a0349ff64ee121390bf23e1b769d5","build/main.rs":"bbb6b8a9b43fa47dc985c84ab6a5e64d7b77ae60c54b3038b68a4cef1a6759ab","src/lib.rs":"008a98eb5da8cb154b8f59904a9524a0a9cb22818ec734696c52d7ece384ab97","src/libressl/mod.rs":"412020ed9f0cbbb500f3f4d7157d8b2fc4a86eab6f6ba3293ca6ffd7bd0ac4f6","src/libressl/v250.rs":"8e64255d67e9e684b6d76184f96cfb8dca34c7f241fdbc08a982a221644257ea","src/libressl/v251.rs":"e823b2b5b103a9a2b3c307893f6fc8ca4213104fe3829b32fa3ce879bbc1ada9","src/libressl/v273.rs":"01492f8c44438a82466eac1b827dbed3213f21f0b5f6425259a0131e9e036aeb","src/openssl/mod.rs":"b63d420700cb96626e7795a10000e178477af90db6d6830c70a66f6d2b4e64d2","src/openssl/v10x.rs":"6b53ce40257a5ff8326ec5f0d6a83807c728c243ad5bde34b9782cdf8f157a21","src/openssl/v110.rs":"0e670f6af0bfbdb635012a3667b599a2b7c468e55ef29b289ab288e01c795e02","src/openssl/v111.rs":"26e5ef4c4faa628d8cec33cf77fc3736f9d01334227429114e91920439b65876"},"package":"912f301a749394e1025d9dcddef6106ddee9252620e6d0a0e5f8d0681de9b129"} +-{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"e40f8c3ccf6a2b34f50ae9cee3396ac398944ee253c1e5dabac802ee89732ba2","Cargo.toml.orig":"82cf41fb8d0886217e4efe5b7bd69ac9d687ddd38d002b5aeeb5fc073abc0e17","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"fae5176c2b149d190c9611b58c5882312b5c0e483d1a404cfdf850473314a58f","build/main.rs":"f509c63668156ce48b93d05d5483a5bfb112dc8f786ff6296f7801add2db7452","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"4f12d2f4c2a493888db669d1ecfd55df40861a78cae65957f801ed91dc2cae30","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"29aa053b67b47515fd15812aa0a90ff35dd9fa347da2beeba96d6deafeb9d945","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"520b282b92fa372a75bc16696dc3ee7a9a5752e517a18862182a3e9f5a976d28","src/dsa.rs":"3c294c5c45235497396ac803b723b3a0cb5bd3609f5dec18338b5b014c2adeb9","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"b22d27b01a70652384866b3d0d01d2f7a0421b2ba2db9268ed379fef4b1ac034","src/err.rs":"81230711e081277e0b6dae4ff21266052d075688c758c2b0720001849ef9192d","src/evp.rs":"57f094c7fee0a6b0611e7f8829663bff525a607e11a35eb77dc30eb159b2139a","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"17b5a1faa0fe3ab777c8cb0039a3dffd8922b211bf1330c2cd0c3e02f624353c","src/macros.rs":"a7c95174fd4cfeb42f730c7c0744194009520249888dbf43968571219fd6dfa1","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"619177f939328597e4bcf9c41fdf4d0aa9207d779c6e0dafddbe2eab9b1a6a98","src/pem.rs":"3ae1c53dbc126a04c188575294111cc04c215c2f3e031192d5cc05952f011ddf","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"156e605ecb45d4e1b7a7c404003ccd19c4a2226cbfe47938ad1dce240ed4369f","src/rsa.rs":"a0bf64f1f8ff9f6e5dbed6c38d8fa2d3d1c5dfcfe6dd3ff79f7737b072ce4681","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"e69d3b9b8f2f8ae1ed3905a4dbe064ad1b7c1eaf21d7eabb86ecdb5b41e2120a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"fd85a1683064def0a9e07d803b90102229adc1d58fa19cf4e56976f0dd7425b9","src/x509.rs":"839be2feb74755ab7df66a024ad27dfa70ce4f7889229d9152ba999f3a54b914","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"66fd646ea4caf5ce81e3c881e88d85462519c4e97a7f82e82ca8ac52ea830ad2"},"package":"ff3d1b390ab1b9700f682ad95a30dc9c0f40dd212ca57266012cfc678b0e365a"} +\ No newline at end of file ++{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"e40f8c3ccf6a2b34f50ae9cee3396ac398944ee253c1e5dabac802ee89732ba2","Cargo.toml.orig":"82cf41fb8d0886217e4efe5b7bd69ac9d687ddd38d002b5aeeb5fc073abc0e17","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"96a414be6e7e061a21a9e39a61449039f6791225264032641dd044a1a9b88111","build/cfgs.rs":"fae5176c2b149d190c9611b58c5882312b5c0e483d1a404cfdf850473314a58f","build/main.rs":"7d9c734c4bfce15d5ca86ea82e7f68e6af2b9e9d64c7414dbfefc3a84bc01487","src/aes.rs":"660efd70f809cb2f5dbbf527be8f9592911776bab7dafa1fc4cc72dd9a576b67","src/asn1.rs":"4f12d2f4c2a493888db669d1ecfd55df40861a78cae65957f801ed91dc2cae30","src/bio.rs":"5c6f394a78f258af3babb68330fa3571610476c4c3ba3404359db928f2f706ee","src/bn.rs":"c71b9c79f704a94a889d27bf75e7e5b1f9f10b0df0aeb485aef509cf05d7467f","src/cms.rs":"29aa053b67b47515fd15812aa0a90ff35dd9fa347da2beeba96d6deafeb9d945","src/conf.rs":"511e008c18039f54d856d70b80009426fc7f4ce34fe4304e2c58ebf465031de0","src/crypto.rs":"f6e8a116940755b2b53e3d0d49d1b451fc6e4269831fd1cfcee9d6ed404cf487","src/dh.rs":"520b282b92fa372a75bc16696dc3ee7a9a5752e517a18862182a3e9f5a976d28","src/dsa.rs":"3c294c5c45235497396ac803b723b3a0cb5bd3609f5dec18338b5b014c2adeb9","src/dtls1.rs":"45e1dbf94a42d587fd948d553dc30187aa6aa2b5b82d554cf725ff36df768aa0","src/ec.rs":"b22d27b01a70652384866b3d0d01d2f7a0421b2ba2db9268ed379fef4b1ac034","src/err.rs":"81230711e081277e0b6dae4ff21266052d075688c758c2b0720001849ef9192d","src/evp.rs":"57f094c7fee0a6b0611e7f8829663bff525a607e11a35eb77dc30eb159b2139a","src/hmac.rs":"fa3976d94a1383f300bdec228270afb8b47c97bb019d727c7d59ba783be3c42e","src/lib.rs":"17b5a1faa0fe3ab777c8cb0039a3dffd8922b211bf1330c2cd0c3e02f624353c","src/macros.rs":"a7c95174fd4cfeb42f730c7c0744194009520249888dbf43968571219fd6dfa1","src/obj_mac.rs":"9c20609db7115c9edb99185375426169cb5b7caee839d892b556e92285e65309","src/object.rs":"7539eb2164c3fe2162a339ef5b45f1c835010a1522307803815779a01825eed7","src/ocsp.rs":"1db59566d2f072f7ae981f0c07e1604fcdf60e66845afe0689d588f8e4272115","src/ossl_typ.rs":"619177f939328597e4bcf9c41fdf4d0aa9207d779c6e0dafddbe2eab9b1a6a98","src/pem.rs":"3ae1c53dbc126a04c188575294111cc04c215c2f3e031192d5cc05952f011ddf","src/pkcs12.rs":"93aab2820008ad90dc346a7dcc02f9201d94bff0bb7d1d71031c097850287c50","src/pkcs7.rs":"5370c8d4bfbf1502fa33aff635cb730e7c87814580f1df9bdb1412a492377813","src/rand.rs":"156e605ecb45d4e1b7a7c404003ccd19c4a2226cbfe47938ad1dce240ed4369f","src/rsa.rs":"a0bf64f1f8ff9f6e5dbed6c38d8fa2d3d1c5dfcfe6dd3ff79f7737b072ce4681","src/safestack.rs":"6c39e28565d34efad707d77561d4caa99e3f028fcac3a2ef6fd403a78de1190c","src/sha.rs":"05044d221d8d205010a4e3760c0b5c0e2e923e165db0d65f9a8c9bcedaad9961","src/srtp.rs":"306047f3f31828fe7d15de154b375f071ae07012a94c0b5c909f5fe57962a11b","src/ssl.rs":"e69d3b9b8f2f8ae1ed3905a4dbe064ad1b7c1eaf21d7eabb86ecdb5b41e2120a","src/ssl3.rs":"9336c816e00847d552dea22587d4ac72ff3cbd469fa5ff750423a19ea11e68eb","src/stack.rs":"1a509907283e5a2bf88cf193ce607f49ce7d2d95547c2ce2abc0fd4567aad334","src/tls1.rs":"fd85a1683064def0a9e07d803b90102229adc1d58fa19cf4e56976f0dd7425b9","src/x509.rs":"839be2feb74755ab7df66a024ad27dfa70ce4f7889229d9152ba999f3a54b914","src/x509_vfy.rs":"5609f6300ab37a4d4755c81f7af1e6bb93a2f1a6f333c6e42f1e73ebf83ddc05","src/x509v3.rs":"66fd646ea4caf5ce81e3c881e88d85462519c4e97a7f82e82ca8ac52ea830ad2"},"package":"ff3d1b390ab1b9700f682ad95a30dc9c0f40dd212ca57266012cfc678b0e365a"} \ No newline at end of file -+{"files":{".cargo-ok":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","Cargo.toml":"15b9e9f5255d11898d5f373ba8ac750d567155b1c81fa903f02e97b18cea5f18","Cargo.toml.orig":"3ec9308dd6326a80e0e30c076dd778f42cb1f1f616e666e924a210554681dd97","LICENSE-MIT":"378f5840b258e2779c39418f3f2d7b2ba96f1c7917dd6be0713f88305dbda397","README.md":"15b264aba47e69aa522c8cb37b320a156f0c3a3a72393338818046eac8ef4c3a","build/cfgs.rs":"499f32ddaa16e3771dca2b70f1d4f66f91491456ffb3e1954901abd57bc64e10","build/main.rs":"2383c602ce6ab23e9980e0d1dcf808ae5fb953c3b6ec7d7ea406293ddde679fd","src/lib.rs":"d3cd894a42d59f3e3d19ef1a376f2287971b68227c3ce142b307c5c05e1b2840"},"package":"912f301a749394e1025d9dcddef6106ddee9252620e6d0a0e5f8d0681de9b129"} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_build_cfgs.rs b/lang/rust/files/patch-src_vendor_openssl-sys_build_cfgs.rs deleted file mode 100644 index 7ea039ea2d4..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_build_cfgs.rs +++ /dev/null @@ -1,22 +0,0 @@ ---- src/vendor/openssl-sys/build/cfgs.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/build/cfgs.rs -@@ -16,6 +16,9 @@ pub fn get(openssl_version: Option, libressl_vers - if libressl_version >= 0x2_07_03_00_0 { - cfgs.push("libressl273"); - } -+ if libressl_version >= 0x2_08_00_00_0 { -+ cfgs.push("libressl280"); -+ } - } else { - let openssl_version = openssl_version.unwrap(); - -@@ -24,6 +27,9 @@ pub fn get(openssl_version: Option, libressl_vers - } - if openssl_version >= 0x1_00_02_00_0 { - cfgs.push("ossl102"); -+ } -+ if openssl_version >= 0x1_00_02_06_0 { -+ cfgs.push("ossl102f"); - } - if openssl_version >= 0x1_00_02_08_0 { - cfgs.push("ossl102h"); diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs b/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs index 346f198ab3a..2ddf58b8d69 100644 --- a/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs +++ b/lang/rust/files/patch-src_vendor_openssl-sys_build_main.rs @@ -1,19 +1,55 @@ ---- src/vendor/openssl-sys/build/main.rs.orig 2018-09-11 04:49:55 UTC +https://github.com/sfackler/rust-openssl/commit/9fd7584a8416 + +--- src/vendor/openssl-sys/build/main.rs.orig 2018-12-03 20:08:24 UTC +++ src/vendor/openssl-sys/build/main.rs -@@ -497,6 +497,7 @@ See rust-openssl README for more information: - (6, 2) => ('6', '2'), - (6, _) => ('6', 'x'), +@@ -1,9 +1,9 @@ + extern crate cc; ++#[cfg(feature = "vendored")] ++extern crate openssl_src; + extern crate pkg_config; + #[cfg(target_env = "msvc")] + extern crate vcpkg; +-#[cfg(feature = "vendored")] +-extern crate openssl_src; + + use std::collections::HashSet; + use std::env; +@@ -103,20 +103,23 @@ fn main() { + + #[cfg(feature = "vendored")] + mod imp { +- use std::path::PathBuf; +- use openssl_src; ++ use openssl_src; ++ use std::path::PathBuf; + +- pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) { +- let artifacts = openssl_src::Build::new().build(); +- (artifacts.lib_dir().to_path_buf(), artifacts.include_dir().to_path_buf()) +- } ++ pub fn get_openssl(_target: &str) -> (PathBuf, PathBuf) { ++ let artifacts = openssl_src::Build::new().build(); ++ ( ++ artifacts.lib_dir().to_path_buf(), ++ artifacts.include_dir().to_path_buf(), ++ ) ++ } + } + + #[cfg(not(feature = "vendored"))] + mod imp { + use pkg_config; +- use std::path::{Path, PathBuf}; + use std::ffi::OsString; ++ use std::path::{Path, PathBuf}; + use std::process::{self, Command}; + + use super::env; +@@ -500,6 +503,7 @@ See rust-openssl README for more information: (7, _) => ('7', 'x'), + (8, 0) => ('8', '0'), + (8, 1) => ('8', '1'), + (8, _) => ('8', 'x'), _ => version_error(), }; -@@ -537,7 +538,7 @@ fn version_error() -> ! { - " - - This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 --through 2.7, but a different version of OpenSSL was found. The build is now aborting -+through 2.8, but a different version of OpenSSL was found. The build is now aborting - due to this version mismatch. - - " diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_aes.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_aes.rs deleted file mode 100644 index 1b36bcc08a5..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_aes.rs +++ /dev/null @@ -1,31 +0,0 @@ ---- src/vendor/openssl-sys/src/aes.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/aes.rs -@@ -0,0 +1,28 @@ -+use libc::*; -+ -+pub const AES_ENCRYPT: c_int = 1; -+pub const AES_DECRYPT: c_int = 0; -+ -+pub const AES_MAXNR: c_int = 14; -+pub const AES_BLOCK_SIZE: c_int = 16; -+ -+#[repr(C)] -+pub struct AES_KEY { -+ // There is some business with AES_LONG which is there to ensure the values here are 32 bits -+ rd_key: [u32; 4 * (AES_MAXNR as usize + 1)], -+ rounds: c_int, -+} -+ -+extern "C" { -+ pub fn AES_set_encrypt_key(userKey: *const c_uchar, bits: c_int, key: *mut AES_KEY) -> c_int; -+ pub fn AES_set_decrypt_key(userKey: *const c_uchar, bits: c_int, key: *mut AES_KEY) -> c_int; -+ -+ pub fn AES_ige_encrypt( -+ in_: *const c_uchar, -+ out: *mut c_uchar, -+ length: size_t, -+ key: *const AES_KEY, -+ ivec: *mut c_uchar, -+ enc: c_int, -+ ); -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_asn1.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_asn1.rs deleted file mode 100644 index 2e49188070e..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_asn1.rs +++ /dev/null @@ -1,64 +0,0 @@ ---- src/vendor/openssl-sys/src/asn1.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/asn1.rs -@@ -0,0 +1,61 @@ -+use libc::*; -+ -+use *; -+ -+pub const V_ASN1_UTCTIME: c_int = 23; -+pub const V_ASN1_GENERALIZEDTIME: c_int = 24; -+ -+pub const MBSTRING_FLAG: c_int = 0x1000; -+pub const MBSTRING_UTF8: c_int = MBSTRING_FLAG; -+pub const MBSTRING_ASC: c_int = MBSTRING_FLAG | 1; -+pub const MBSTRING_BMP: c_int = MBSTRING_FLAG | 2; -+pub const MBSTRING_UNIV: c_int = MBSTRING_FLAG | 4; -+ -+#[repr(C)] -+pub struct ASN1_ENCODING { -+ pub enc: *mut c_uchar, -+ pub len: c_long, -+ pub modified: c_int, -+} -+ -+extern "C" { -+ pub fn ASN1_OBJECT_free(x: *mut ASN1_OBJECT); -+} -+ -+stack!(stack_st_ASN1_OBJECT); -+ -+extern "C" { -+ pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn ASN1_STRING_get0_data(x: *const ASN1_STRING) -> *const c_uchar; -+ #[cfg(any(all(ossl101, not(ossl110)), libressl))] -+ pub fn ASN1_STRING_data(x: *mut ASN1_STRING) -> *mut c_uchar; -+ -+ pub fn ASN1_BIT_STRING_free(x: *mut ASN1_BIT_STRING); -+ -+ pub fn ASN1_STRING_free(x: *mut ASN1_STRING); -+ pub fn ASN1_STRING_length(x: *const ASN1_STRING) -> c_int; -+ -+ pub fn ASN1_GENERALIZEDTIME_free(tm: *mut ASN1_GENERALIZEDTIME); -+ pub fn ASN1_GENERALIZEDTIME_print(b: *mut BIO, tm: *const ASN1_GENERALIZEDTIME) -> c_int; -+ pub fn ASN1_TIME_free(tm: *mut ASN1_TIME); -+ pub fn ASN1_TIME_print(b: *mut BIO, tm: *const ASN1_TIME) -> c_int; -+ -+ pub fn ASN1_INTEGER_free(x: *mut ASN1_INTEGER); -+ pub fn ASN1_INTEGER_get(dest: *const ASN1_INTEGER) -> c_long; -+ pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int; -+ pub fn BN_to_ASN1_INTEGER(bn: *const BIGNUM, ai: *mut ASN1_INTEGER) -> *mut ASN1_INTEGER; -+ pub fn ASN1_INTEGER_to_BN(ai: *const ASN1_INTEGER, bn: *mut BIGNUM) -> *mut BIGNUM; -+} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *const ASN1_STRING) -> c_int; -+ } -+ } else { -+ extern "C" { -+ pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *mut ASN1_STRING) -> c_int; -+ } -+ } -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_bio.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_bio.rs deleted file mode 100644 index 960ad99ed67..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_bio.rs +++ /dev/null @@ -1,153 +0,0 @@ ---- src/vendor/openssl-sys/src/bio.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/bio.rs -@@ -0,0 +1,150 @@ -+use libc::*; -+ -+use *; -+ -+pub const BIO_TYPE_NONE: c_int = 0; -+ -+pub const BIO_CTRL_EOF: c_int = 2; -+pub const BIO_CTRL_INFO: c_int = 3; -+pub const BIO_CTRL_FLUSH: c_int = 11; -+pub const BIO_C_SET_BUF_MEM_EOF_RETURN: c_int = 130; -+ -+extern "C" { -+ pub fn BIO_set_flags(b: *mut BIO, flags: c_int); -+ pub fn BIO_clear_flags(b: *mut BIO, flags: c_int); -+} -+ -+pub unsafe fn BIO_set_retry_read(b: *mut BIO) { -+ BIO_set_flags(b, BIO_FLAGS_READ | BIO_FLAGS_SHOULD_RETRY) -+} -+ -+pub unsafe fn BIO_set_retry_write(b: *mut BIO) { -+ BIO_set_flags(b, BIO_FLAGS_WRITE | BIO_FLAGS_SHOULD_RETRY) -+} -+ -+pub unsafe fn BIO_clear_retry_flags(b: *mut BIO) { -+ BIO_clear_flags(b, BIO_FLAGS_RWS | BIO_FLAGS_SHOULD_RETRY) -+} -+ -+pub const BIO_FLAGS_READ: c_int = 0x01; -+pub const BIO_FLAGS_WRITE: c_int = 0x02; -+pub const BIO_FLAGS_IO_SPECIAL: c_int = 0x04; -+pub const BIO_FLAGS_RWS: c_int = BIO_FLAGS_READ | BIO_FLAGS_WRITE | BIO_FLAGS_IO_SPECIAL; -+pub const BIO_FLAGS_SHOULD_RETRY: c_int = 0x08; -+ -+pub type bio_info_cb = -+ Option; -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum BIO_METHOD {} -+ } else { -+ #[repr(C)] -+ pub struct BIO_METHOD { -+ pub type_: c_int, -+ pub name: *const c_char, -+ pub bwrite: Option c_int>, -+ pub bread: Option c_int>, -+ pub bputs: Option c_int>, -+ pub bgets: Option c_int>, -+ pub ctrl: Option c_long>, -+ pub create: Option c_int>, -+ pub destroy: Option c_int>, -+ pub callback_ctrl: Option c_long>, -+ } -+ } -+} -+ -+pub unsafe fn BIO_get_mem_data(b: *mut BIO, pp: *mut *mut c_char) -> c_long { -+ BIO_ctrl(b, BIO_CTRL_INFO, 0, pp as *mut c_void) -+} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn BIO_s_file() -> *const BIO_METHOD; -+ pub fn BIO_new(type_: *const BIO_METHOD) -> *mut BIO; -+ } -+ } else { -+ extern "C" { -+ pub fn BIO_s_file() -> *mut BIO_METHOD; -+ pub fn BIO_new(type_: *mut BIO_METHOD) -> *mut BIO; -+ } -+ } -+} -+extern "C" { -+ pub fn BIO_new_fp(stream: *mut FILE, close_flag: c_int) -> *mut BIO; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_set_data(a: *mut ::BIO, data: *mut c_void); -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_get_data(a: *mut ::BIO) -> *mut c_void; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_set_init(a: *mut ::BIO, init: c_int); -+ pub fn BIO_write(b: *mut BIO, buf: *const c_void, len: c_int) -> c_int; -+ pub fn BIO_read(b: *mut BIO, buf: *mut c_void, len: c_int) -> c_int; -+ pub fn BIO_ctrl(b: *mut BIO, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long; -+ pub fn BIO_free_all(b: *mut BIO); -+} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn BIO_s_mem() -> *const BIO_METHOD; -+ } -+ } else { -+ extern "C" { -+ pub fn BIO_s_mem() -> *mut BIO_METHOD; -+ } -+ } -+} -+cfg_if! { -+ if #[cfg(any(ossl102, libressl280))] { -+ extern "C" { -+ pub fn BIO_new_mem_buf(buf: *const c_void, len: c_int) -> *mut BIO; -+ } -+ } else { -+ extern "C" { -+ pub fn BIO_new_mem_buf(buf: *mut c_void, len: c_int) -> *mut BIO; -+ } -+ } -+} -+ -+extern "C" { -+ pub fn BIO_new_socket(sock: c_int, close_flag: c_int) -> *mut BIO; -+ -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_meth_new(type_: c_int, name: *const c_char) -> *mut BIO_METHOD; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_meth_free(biom: *mut BIO_METHOD); -+ // FIXME should wrap in Option -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_meth_set_write( -+ biom: *mut BIO_METHOD, -+ write: unsafe extern "C" fn(*mut BIO, *const c_char, c_int) -> c_int, -+ ) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_meth_set_read( -+ biom: *mut BIO_METHOD, -+ read: unsafe extern "C" fn(*mut BIO, *mut c_char, c_int) -> c_int, -+ ) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_meth_set_puts( -+ biom: *mut BIO_METHOD, -+ read: unsafe extern "C" fn(*mut BIO, *const c_char) -> c_int, -+ ) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_meth_set_ctrl( -+ biom: *mut BIO_METHOD, -+ read: unsafe extern "C" fn(*mut BIO, c_int, c_long, *mut c_void) -> c_long, -+ ) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_meth_set_create( -+ biom: *mut BIO_METHOD, -+ create: unsafe extern "C" fn(*mut BIO) -> c_int, -+ ) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn BIO_meth_set_destroy( -+ biom: *mut BIO_METHOD, -+ destroy: unsafe extern "C" fn(*mut BIO) -> c_int, -+ ) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_bn.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_bn.rs deleted file mode 100644 index ec37c5661f5..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_bn.rs +++ /dev/null @@ -1,163 +0,0 @@ ---- src/vendor/openssl-sys/src/bn.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/bn.rs -@@ -0,0 +1,160 @@ -+use libc::*; -+ -+use *; -+ -+#[cfg(target_pointer_width = "64")] -+pub type BN_ULONG = c_ulonglong; -+#[cfg(target_pointer_width = "32")] -+pub type BN_ULONG = c_uint; -+ -+extern "C" { -+ pub fn BN_CTX_new() -> *mut BN_CTX; -+ pub fn BN_CTX_free(ctx: *mut BN_CTX); -+ pub fn BN_rand(r: *mut BIGNUM, bits: c_int, top: c_int, bottom: c_int) -> c_int; -+ pub fn BN_pseudo_rand(r: *mut BIGNUM, bits: c_int, top: c_int, bottom: c_int) -> c_int; -+ pub fn BN_rand_range(r: *mut BIGNUM, range: *const BIGNUM) -> c_int; -+ pub fn BN_pseudo_rand_range(r: *mut BIGNUM, range: *const BIGNUM) -> c_int; -+ pub fn BN_new() -> *mut BIGNUM; -+ pub fn BN_num_bits(bn: *const BIGNUM) -> c_int; -+ pub fn BN_clear_free(bn: *mut BIGNUM); -+ pub fn BN_bin2bn(s: *const u8, size: c_int, ret: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn BN_bn2bin(a: *const BIGNUM, to: *mut u8) -> c_int; -+ pub fn BN_sub(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM) -> c_int; -+ pub fn BN_add(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM) -> c_int; -+ pub fn BN_mul(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> c_int; -+ pub fn BN_sqr(r: *mut BIGNUM, a: *const BIGNUM, ctx: *mut BN_CTX) -> c_int; -+ pub fn BN_set_negative(bn: *mut BIGNUM, n: c_int); -+ #[cfg(ossl110)] -+ pub fn BN_is_negative(b: *const ::BIGNUM) -> c_int; -+ -+ pub fn BN_div( -+ dv: *mut BIGNUM, -+ rem: *mut BIGNUM, -+ a: *const BIGNUM, -+ b: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ pub fn BN_nnmod( -+ rem: *mut BIGNUM, -+ a: *const BIGNUM, -+ m: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ pub fn BN_mod_add( -+ r: *mut BIGNUM, -+ a: *const BIGNUM, -+ b: *const BIGNUM, -+ m: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ pub fn BN_mod_sub( -+ r: *mut BIGNUM, -+ a: *const BIGNUM, -+ b: *const BIGNUM, -+ m: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ pub fn BN_mod_mul( -+ r: *mut BIGNUM, -+ a: *const BIGNUM, -+ b: *const BIGNUM, -+ m: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ pub fn BN_mod_sqr( -+ r: *mut BIGNUM, -+ a: *const BIGNUM, -+ m: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ pub fn BN_mod_word(r: *const BIGNUM, w: BN_ULONG) -> BN_ULONG; -+ pub fn BN_div_word(r: *mut BIGNUM, w: BN_ULONG) -> BN_ULONG; -+ pub fn BN_mul_word(r: *mut BIGNUM, w: BN_ULONG) -> c_int; -+ pub fn BN_add_word(r: *mut BIGNUM, w: BN_ULONG) -> c_int; -+ pub fn BN_sub_word(r: *mut BIGNUM, w: BN_ULONG) -> c_int; -+ pub fn BN_set_word(bn: *mut BIGNUM, n: BN_ULONG) -> c_int; -+ -+ pub fn BN_cmp(a: *const BIGNUM, b: *const BIGNUM) -> c_int; -+ pub fn BN_free(bn: *mut BIGNUM); -+ pub fn BN_is_bit_set(a: *const BIGNUM, n: c_int) -> c_int; -+ pub fn BN_lshift(r: *mut BIGNUM, a: *const BIGNUM, n: c_int) -> c_int; -+ pub fn BN_lshift1(r: *mut BIGNUM, a: *const BIGNUM) -> c_int; -+ pub fn BN_exp(r: *mut BIGNUM, a: *const BIGNUM, p: *const BIGNUM, ctx: *mut BN_CTX) -> c_int; -+ -+ pub fn BN_mod_exp( -+ r: *mut BIGNUM, -+ a: *const BIGNUM, -+ p: *const BIGNUM, -+ m: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ pub fn BN_mask_bits(a: *mut BIGNUM, n: c_int) -> c_int; -+ pub fn BN_rshift(r: *mut BIGNUM, a: *const BIGNUM, n: c_int) -> c_int; -+ pub fn BN_rshift1(r: *mut BIGNUM, a: *const BIGNUM) -> c_int; -+ pub fn BN_bn2hex(a: *const BIGNUM) -> *mut c_char; -+ pub fn BN_bn2dec(a: *const BIGNUM) -> *mut c_char; -+ pub fn BN_hex2bn(a: *mut *mut BIGNUM, s: *const c_char) -> c_int; -+ pub fn BN_dec2bn(a: *mut *mut BIGNUM, s: *const c_char) -> c_int; -+ pub fn BN_gcd(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> c_int; -+ pub fn BN_mod_inverse( -+ r: *mut BIGNUM, -+ a: *const BIGNUM, -+ n: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> *mut BIGNUM; -+ pub fn BN_clear(bn: *mut BIGNUM); -+ pub fn BN_dup(n: *const BIGNUM) -> *mut BIGNUM; -+ pub fn BN_ucmp(a: *const BIGNUM, b: *const BIGNUM) -> c_int; -+ pub fn BN_set_bit(a: *mut BIGNUM, n: c_int) -> c_int; -+ pub fn BN_clear_bit(a: *mut BIGNUM, n: c_int) -> c_int; -+ -+ pub fn BN_generate_prime_ex( -+ r: *mut BIGNUM, -+ bits: c_int, -+ safe: c_int, -+ add: *const BIGNUM, -+ rem: *const BIGNUM, -+ cb: *mut BN_GENCB, -+ ) -> c_int; -+ pub fn BN_is_prime_ex( -+ p: *const BIGNUM, -+ checks: c_int, -+ ctx: *mut BN_CTX, -+ cb: *mut BN_GENCB, -+ ) -> c_int; -+ pub fn BN_is_prime_fasttest_ex( -+ p: *const BIGNUM, -+ checks: c_int, -+ ctx: *mut BN_CTX, -+ do_trial_division: c_int, -+ cb: *mut BN_GENCB, -+ ) -> c_int; -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn BN_get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn BN_get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn BN_get_rfc3526_prime_1536(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn BN_get_rfc3526_prime_2048(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn BN_get_rfc3526_prime_3072(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn BN_get_rfc3526_prime_4096(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn BN_get_rfc3526_prime_6144(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn BN_get_rfc3526_prime_8192(bn: *mut BIGNUM) -> *mut BIGNUM; -+ } -+ } else { -+ extern "C" { -+ pub fn get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn get_rfc3526_prime_1536(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn get_rfc3526_prime_2048(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn get_rfc3526_prime_3072(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn get_rfc3526_prime_4096(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn get_rfc3526_prime_6144(bn: *mut BIGNUM) -> *mut BIGNUM; -+ pub fn get_rfc3526_prime_8192(bn: *mut BIGNUM) -> *mut BIGNUM; -+ } -+ } -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_cms.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_cms.rs deleted file mode 100644 index 6dca1594566..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_cms.rs +++ /dev/null @@ -1,82 +0,0 @@ ---- src/vendor/openssl-sys/src/cms.rs.orig 2018-09-16 23:52:55 UTC -+++ src/vendor/openssl-sys/src/cms.rs -@@ -0,0 +1,79 @@ -+use libc::*; -+ -+pub enum CMS_ContentInfo {} -+ -+extern "C" { -+ #[cfg(ossl101)] -+ pub fn CMS_ContentInfo_free(cms: *mut ::CMS_ContentInfo); -+ #[cfg(ossl101)] -+ pub fn i2d_CMS_ContentInfo(a: *mut ::CMS_ContentInfo, pp: *mut *mut c_uchar) -> c_int; -+} -+ -+#[cfg(ossl101)] -+pub const CMS_TEXT: c_uint = 0x1; -+#[cfg(ossl101)] -+pub const CMS_NOCERTS: c_uint = 0x2; -+#[cfg(ossl101)] -+pub const CMS_NO_CONTENT_VERIFY: c_uint = 0x4; -+#[cfg(ossl101)] -+pub const CMS_NO_ATTR_VERIFY: c_uint = 0x8; -+#[cfg(ossl101)] -+pub const CMS_NOSIGS: c_uint = 0x4 | 0x8; -+#[cfg(ossl101)] -+pub const CMS_NOINTERN: c_uint = 0x10; -+#[cfg(ossl101)] -+pub const CMS_NO_SIGNER_CERT_VERIFY: c_uint = 0x20; -+#[cfg(ossl101)] -+pub const CMS_NOVERIFY: c_uint = 0x20; -+#[cfg(ossl101)] -+pub const CMS_DETACHED: c_uint = 0x40; -+#[cfg(ossl101)] -+pub const CMS_BINARY: c_uint = 0x80; -+#[cfg(ossl101)] -+pub const CMS_NOATTR: c_uint = 0x100; -+#[cfg(ossl101)] -+pub const CMS_NOSMIMECAP: c_uint = 0x200; -+#[cfg(ossl101)] -+pub const CMS_NOOLDMIMETYPE: c_uint = 0x400; -+#[cfg(ossl101)] -+pub const CMS_CRLFEOL: c_uint = 0x800; -+#[cfg(ossl101)] -+pub const CMS_STREAM: c_uint = 0x1000; -+#[cfg(ossl101)] -+pub const CMS_NOCRL: c_uint = 0x2000; -+#[cfg(ossl101)] -+pub const CMS_PARTIAL: c_uint = 0x4000; -+#[cfg(ossl101)] -+pub const CMS_REUSE_DIGEST: c_uint = 0x8000; -+#[cfg(ossl101)] -+pub const CMS_USE_KEYID: c_uint = 0x10000; -+#[cfg(ossl101)] -+pub const CMS_DEBUG_DECRYPT: c_uint = 0x20000; -+#[cfg(ossl102)] -+pub const CMS_KEY_PARAM: c_uint = 0x40000; -+#[cfg(ossl110)] -+pub const CMS_ASCIICRLF: c_uint = 0x80000; -+ -+extern "C" { -+ #[cfg(ossl101)] -+ pub fn SMIME_read_CMS(bio: *mut ::BIO, bcont: *mut *mut ::BIO) -> *mut ::CMS_ContentInfo; -+ -+ #[cfg(ossl101)] -+ pub fn CMS_sign( -+ signcert: *mut ::X509, -+ pkey: *mut ::EVP_PKEY, -+ certs: *mut ::stack_st_X509, -+ data: *mut ::BIO, -+ flags: c_uint, -+ ) -> *mut ::CMS_ContentInfo; -+ -+ #[cfg(ossl101)] -+ pub fn CMS_decrypt( -+ cms: *mut ::CMS_ContentInfo, -+ pkey: *mut ::EVP_PKEY, -+ cert: *mut ::X509, -+ dcont: *mut ::BIO, -+ out: *mut ::BIO, -+ flags: c_uint, -+ ) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_conf.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_conf.rs deleted file mode 100644 index c76205313bd..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_conf.rs +++ /dev/null @@ -1,10 +0,0 @@ ---- src/vendor/openssl-sys/src/conf.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/conf.rs -@@ -0,0 +1,7 @@ -+use *; -+ -+extern "C" { -+ pub fn NCONF_new(meth: *mut CONF_METHOD) -> *mut CONF; -+ pub fn NCONF_default() -> *mut CONF_METHOD; -+ pub fn NCONF_free(conf: *mut CONF); -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_crypto.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_crypto.rs deleted file mode 100644 index ad0b69c001b..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_crypto.rs +++ /dev/null @@ -1,125 +0,0 @@ ---- src/vendor/openssl-sys/src/crypto.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/crypto.rs -@@ -0,0 +1,122 @@ -+use libc::*; -+ -+use *; -+ -+#[cfg(not(ossl110))] -+pub const CRYPTO_LOCK_X509: c_int = 3; -+#[cfg(not(ossl110))] -+pub const CRYPTO_LOCK_SSL_CTX: c_int = 12; -+#[cfg(not(ossl110))] -+pub const CRYPTO_LOCK_SSL_SESSION: c_int = 14; -+ -+stack!(stack_st_void); -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub const CRYPTO_EX_INDEX_SSL: c_int = 0; -+ pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 1; -+ -+ extern "C" { -+ pub fn OpenSSL_version_num() -> c_ulong; -+ pub fn OpenSSL_version(key: c_int) -> *const c_char; -+ } -+ pub const OPENSSL_VERSION: c_int = 0; -+ pub const OPENSSL_CFLAGS: c_int = 1; -+ pub const OPENSSL_BUILT_ON: c_int = 2; -+ pub const OPENSSL_PLATFORM: c_int = 3; -+ pub const OPENSSL_DIR: c_int = 4; -+ } else { -+ extern "C" { -+ pub fn SSLeay() -> c_ulong; -+ pub fn SSLeay_version(key: c_int) -> *const c_char; -+ } -+ pub const SSLEAY_VERSION: c_int = 0; -+ pub const SSLEAY_CFLAGS: c_int = 2; -+ pub const SSLEAY_BUILT_ON: c_int = 3; -+ pub const SSLEAY_PLATFORM: c_int = 4; -+ pub const SSLEAY_DIR: c_int = 5; -+ } -+} -+ -+// FIXME should be options -+pub type CRYPTO_EX_new = unsafe extern "C" fn( -+ parent: *mut c_void, -+ ptr: *mut c_void, -+ ad: *const CRYPTO_EX_DATA, -+ idx: c_int, -+ argl: c_long, -+ argp: *const c_void, -+) -> c_int; -+pub type CRYPTO_EX_dup = unsafe extern "C" fn( -+ to: *mut CRYPTO_EX_DATA, -+ from: *mut CRYPTO_EX_DATA, -+ from_d: *mut c_void, -+ idx: c_int, -+ argl: c_long, -+ argp: *mut c_void, -+) -> c_int; -+pub type CRYPTO_EX_free = unsafe extern "C" fn( -+ parent: *mut c_void, -+ ptr: *mut c_void, -+ ad: *mut CRYPTO_EX_DATA, -+ idx: c_int, -+ argl: c_long, -+ argp: *mut c_void, -+); -+extern "C" { -+ #[cfg(ossl110)] -+ pub fn CRYPTO_get_ex_new_index( -+ class_index: c_int, -+ argl: c_long, -+ argp: *mut c_void, -+ new_func: Option, -+ dup_func: Option, -+ free_func: Option, -+ ) -> c_int; -+} -+ -+pub const CRYPTO_LOCK: c_int = 1; -+ -+extern "C" { -+ #[cfg(not(ossl110))] -+ pub fn CRYPTO_num_locks() -> c_int; -+ #[cfg(not(ossl110))] -+ pub fn CRYPTO_set_locking_callback( -+ func: unsafe extern "C" fn(mode: c_int, n: c_int, file: *const c_char, line: c_int), -+ ); -+ -+ #[cfg(not(ossl110))] -+ pub fn CRYPTO_set_id_callback(func: unsafe extern "C" fn() -> c_ulong); -+ -+ #[cfg(not(ossl110))] -+ pub fn CRYPTO_add_lock( -+ pointer: *mut c_int, -+ amount: c_int, -+ type_: c_int, -+ file: *const c_char, -+ line: c_int, -+ ) -> c_int; -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn CRYPTO_malloc(num: size_t, file: *const c_char, line: c_int) -> *mut c_void; -+ pub fn CRYPTO_free(buf: *mut c_void, file: *const c_char, line: c_int); -+ } -+ } else { -+ extern "C" { -+ pub fn CRYPTO_malloc(num: c_int, file: *const c_char, line: c_int) -> *mut c_void; -+ pub fn CRYPTO_free(buf: *mut c_void); -+ } -+ } -+} -+ -+extern "C" { -+ #[cfg(ossl101)] -+ pub fn FIPS_mode() -> c_int; -+ #[cfg(ossl101)] -+ pub fn FIPS_mode_set(onoff: c_int) -> c_int; -+ -+ pub fn CRYPTO_memcmp(a: *const c_void, b: *const c_void, len: size_t) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_dh.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_dh.rs deleted file mode 100644 index e6400c295fc..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_dh.rs +++ /dev/null @@ -1,27 +0,0 @@ ---- src/vendor/openssl-sys/src/dh.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/dh.rs -@@ -0,0 +1,24 @@ -+use *; -+ -+extern "C" { -+ pub fn DH_new() -> *mut DH; -+ pub fn DH_free(dh: *mut DH); -+ -+ pub fn d2i_DHparams(k: *mut *mut DH, pp: *mut *const c_uchar, length: c_long) -> *mut DH; -+ pub fn i2d_DHparams(dh: *const DH, pp: *mut *mut c_uchar) -> c_int; -+ -+ #[cfg(ossl102)] -+ pub fn DH_get_1024_160() -> *mut DH; -+ #[cfg(ossl102)] -+ pub fn DH_get_2048_224() -> *mut DH; -+ #[cfg(ossl102)] -+ pub fn DH_get_2048_256() -> *mut DH; -+ -+ #[cfg(any(ossl110, libressl273))] -+ pub fn DH_set0_pqg( -+ dh: *mut DH, -+ p: *mut BIGNUM, -+ q: *mut BIGNUM, -+ g: *mut BIGNUM, -+ ) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_dsa.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_dsa.rs deleted file mode 100644 index 149dabb3d5c..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_dsa.rs +++ /dev/null @@ -1,69 +0,0 @@ ---- src/vendor/openssl-sys/src/dsa.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/dsa.rs -@@ -0,0 +1,66 @@ -+use libc::*; -+ -+use *; -+ -+extern "C" { -+ pub fn DSA_new() -> *mut DSA; -+ pub fn DSA_free(dsa: *mut DSA); -+ pub fn DSA_size(dsa: *const DSA) -> c_int; -+ pub fn DSA_sign( -+ dummy: c_int, -+ dgst: *const c_uchar, -+ len: c_int, -+ sigret: *mut c_uchar, -+ siglen: *mut c_uint, -+ dsa: *mut DSA, -+ ) -> c_int; -+ pub fn DSA_verify( -+ dummy: c_int, -+ dgst: *const c_uchar, -+ len: c_int, -+ sigbuf: *const c_uchar, -+ siglen: c_int, -+ dsa: *mut DSA, -+ ) -> c_int; -+ -+ pub fn d2i_DSAPublicKey(a: *mut *mut DSA, pp: *mut *const c_uchar, length: c_long) -> *mut DSA; -+ pub fn d2i_DSAPrivateKey(a: *mut *mut DSA, pp: *mut *const c_uchar, length: c_long) -+ -> *mut DSA; -+ -+ pub fn DSA_generate_parameters_ex( -+ dsa: *mut DSA, -+ bits: c_int, -+ seed: *const c_uchar, -+ seed_len: c_int, -+ counter_ref: *mut c_int, -+ h_ret: *mut c_ulong, -+ cb: *mut BN_GENCB, -+ ) -> c_int; -+ -+ pub fn DSA_generate_key(dsa: *mut DSA) -> c_int; -+ pub fn i2d_DSAPublicKey(a: *const DSA, pp: *mut *mut c_uchar) -> c_int; -+ pub fn i2d_DSAPrivateKey(a: *const DSA, pp: *mut *mut c_uchar) -> c_int; -+ -+ #[cfg(any(ossl110, libressl273))] -+ pub fn DSA_get0_pqg( -+ d: *const DSA, -+ p: *mut *const BIGNUM, -+ q: *mut *const BIGNUM, -+ q: *mut *const BIGNUM, -+ ); -+ #[cfg(any(ossl110, libressl273))] -+ pub fn DSA_set0_pqg( -+ d: *mut DSA, -+ p: *mut BIGNUM, -+ q: *mut BIGNUM, -+ q: *mut BIGNUM, -+ ) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn DSA_get0_key( -+ d: *const DSA, -+ pub_key: *mut *const BIGNUM, -+ priv_key: *mut *const BIGNUM, -+ ); -+ #[cfg(any(ossl110, libressl273))] -+ pub fn DSA_set0_key(d: *mut DSA, pub_key: *mut BIGNUM, priv_key: *mut BIGNUM) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_dtls1.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_dtls1.rs deleted file mode 100644 index 0cc50c6dedb..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_dtls1.rs +++ /dev/null @@ -1,6 +0,0 @@ ---- src/vendor/openssl-sys/src/dtls1.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/dtls1.rs -@@ -0,0 +1,3 @@ -+use libc::*; -+ -+pub const DTLS1_COOKIE_LENGTH: c_uint = 256; diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_ec.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_ec.rs deleted file mode 100644 index 723a3b3ba50..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_ec.rs +++ /dev/null @@ -1,206 +0,0 @@ ---- src/vendor/openssl-sys/src/ec.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/ec.rs -@@ -0,0 +1,203 @@ -+use libc::*; -+ -+use *; -+ -+#[repr(C)] -+#[derive(Copy, Clone)] -+pub enum point_conversion_form_t { -+ POINT_CONVERSION_COMPRESSED = 2, -+ POINT_CONVERSION_UNCOMPRESSED = 4, -+ POINT_CONVERSION_HYBRID = 6, -+} -+ -+pub enum EC_METHOD {} -+pub enum EC_GROUP {} -+pub enum EC_POINT {} -+ -+pub const OPENSSL_EC_NAMED_CURVE: c_int = 1; -+ -+extern "C" { -+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))] -+ pub fn EC_GF2m_simple_method() -> *const EC_METHOD; -+ -+ pub fn EC_GROUP_new(meth: *const EC_METHOD) -> *mut EC_GROUP; -+ -+ pub fn EC_GROUP_free(group: *mut EC_GROUP); -+ -+ pub fn EC_GROUP_get_order( -+ group: *const EC_GROUP, -+ order: *mut BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ pub fn EC_GROUP_set_asn1_flag(key: *mut EC_GROUP, flag: c_int); -+ -+ pub fn EC_GROUP_get_curve_GFp( -+ group: *const EC_GROUP, -+ p: *mut BIGNUM, -+ a: *mut BIGNUM, -+ b: *mut BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))] -+ pub fn EC_GROUP_get_curve_GF2m( -+ group: *const EC_GROUP, -+ p: *mut BIGNUM, -+ a: *mut BIGNUM, -+ b: *mut BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ pub fn EC_GROUP_get_degree(group: *const EC_GROUP) -> c_int; -+ -+ pub fn EC_GROUP_new_curve_GFp( -+ p: *const BIGNUM, -+ a: *const BIGNUM, -+ b: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> *mut EC_GROUP; -+ -+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))] -+ pub fn EC_GROUP_new_curve_GF2m( -+ p: *const BIGNUM, -+ a: *const BIGNUM, -+ b: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> *mut EC_GROUP; -+ -+ pub fn EC_GROUP_new_by_curve_name(nid: c_int) -> *mut EC_GROUP; -+ -+ pub fn EC_POINT_new(group: *const EC_GROUP) -> *mut EC_POINT; -+ -+ pub fn EC_POINT_free(point: *mut EC_POINT); -+ -+ pub fn EC_POINT_get_affine_coordinates_GFp( -+ group: *const EC_GROUP, -+ p: *const EC_POINT, -+ x: *mut BIGNUM, -+ y: *mut BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))] -+ pub fn EC_POINT_get_affine_coordinates_GF2m( -+ group: *const EC_GROUP, -+ p: *const EC_POINT, -+ x: *mut BIGNUM, -+ y: *mut BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ pub fn EC_POINT_point2oct( -+ group: *const EC_GROUP, -+ p: *const EC_POINT, -+ form: point_conversion_form_t, -+ buf: *mut c_uchar, -+ len: size_t, -+ ctx: *mut BN_CTX, -+ ) -> size_t; -+ -+ pub fn EC_POINT_oct2point( -+ group: *const EC_GROUP, -+ p: *mut EC_POINT, -+ buf: *const c_uchar, -+ len: size_t, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ pub fn EC_POINT_add( -+ group: *const EC_GROUP, -+ r: *mut EC_POINT, -+ a: *const EC_POINT, -+ b: *const EC_POINT, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ pub fn EC_POINT_invert(group: *const EC_GROUP, r: *mut EC_POINT, ctx: *mut BN_CTX) -> c_int; -+ -+ pub fn EC_POINT_cmp( -+ group: *const EC_GROUP, -+ a: *const EC_POINT, -+ b: *const EC_POINT, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ pub fn EC_POINT_mul( -+ group: *const EC_GROUP, -+ r: *mut EC_POINT, -+ n: *const BIGNUM, -+ q: *const EC_POINT, -+ m: *const BIGNUM, -+ ctx: *mut BN_CTX, -+ ) -> c_int; -+ -+ pub fn EC_KEY_new() -> *mut EC_KEY; -+ -+ pub fn EC_KEY_new_by_curve_name(nid: c_int) -> *mut EC_KEY; -+ -+ pub fn EC_KEY_free(key: *mut EC_KEY); -+ -+ pub fn EC_KEY_dup(key: *const EC_KEY) -> *mut EC_KEY; -+ -+ pub fn EC_KEY_up_ref(key: *mut EC_KEY) -> c_int; -+ -+ pub fn EC_KEY_get0_group(key: *const EC_KEY) -> *const EC_GROUP; -+ -+ pub fn EC_KEY_set_group(key: *mut EC_KEY, group: *const EC_GROUP) -> c_int; -+ -+ pub fn EC_KEY_get0_private_key(key: *const EC_KEY) -> *const BIGNUM; -+ -+ pub fn EC_KEY_set_private_key(key: *mut EC_KEY, key: *const BIGNUM) -> c_int; -+ -+ pub fn EC_KEY_get0_public_key(key: *const EC_KEY) -> *const EC_POINT; -+ -+ pub fn EC_KEY_set_public_key(key: *mut EC_KEY, key: *const EC_POINT) -> c_int; -+ -+ pub fn EC_KEY_generate_key(key: *mut EC_KEY) -> c_int; -+ -+ pub fn EC_KEY_check_key(key: *const EC_KEY) -> c_int; -+ -+ pub fn EC_KEY_set_public_key_affine_coordinates( -+ key: *mut EC_KEY, -+ x: *mut BIGNUM, -+ y: *mut BIGNUM, -+ ) -> c_int; -+} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum ECDSA_SIG {} -+ } else { -+ #[repr(C)] -+ pub struct ECDSA_SIG { -+ pub r: *mut BIGNUM, -+ pub s: *mut BIGNUM, -+ } -+ } -+} -+ -+extern "C" { -+ pub fn ECDSA_SIG_new() -> *mut ECDSA_SIG; -+ -+ pub fn ECDSA_SIG_free(sig: *mut ECDSA_SIG); -+ -+ #[cfg(any(ossl110, libressl273))] -+ pub fn ECDSA_SIG_get0(sig: *const ECDSA_SIG, pr: *mut *const BIGNUM, ps: *mut *const BIGNUM); -+ -+ #[cfg(any(ossl110, libressl273))] -+ pub fn ECDSA_SIG_set0(sig: *mut ECDSA_SIG, pr: *mut BIGNUM, ps: *mut BIGNUM) -> c_int; -+ -+ pub fn ECDSA_do_sign( -+ dgst: *const c_uchar, -+ dgst_len: c_int, -+ eckey: *mut EC_KEY, -+ ) -> *mut ECDSA_SIG; -+ -+ pub fn ECDSA_do_verify( -+ dgst: *const c_uchar, -+ dgst_len: c_int, -+ sig: *const ECDSA_SIG, -+ eckey: *mut EC_KEY, -+ ) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_err.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_err.rs deleted file mode 100644 index 386e4597821..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_err.rs +++ /dev/null @@ -1,53 +0,0 @@ ---- src/vendor/openssl-sys/src/err.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/err.rs -@@ -0,0 +1,50 @@ -+use libc::*; -+ -+pub const ERR_TXT_MALLOCED: c_int = 0x01; -+pub const ERR_TXT_STRING: c_int = 0x02; -+ -+pub const ERR_LIB_PEM: c_int = 9; -+ -+pub fn ERR_GET_LIB(l: c_ulong) -> c_int { -+ ((l >> 24) & 0x0FF) as c_int -+} -+ -+pub fn ERR_GET_FUNC(l: c_ulong) -> c_int { -+ ((l >> 12) & 0xFFF) as c_int -+} -+ -+pub fn ERR_GET_REASON(l: c_ulong) -> c_int { -+ (l & 0xFFF) as c_int -+} -+ -+#[repr(C)] -+pub struct ERR_STRING_DATA { -+ pub error: c_ulong, -+ pub string: *const c_char, -+} -+ -+extern "C" { -+ pub fn ERR_put_error(lib: c_int, func: c_int, reason: c_int, file: *const c_char, line: c_int); -+ pub fn ERR_set_error_data(data: *mut c_char, flags: c_int); -+ -+ pub fn ERR_get_error() -> c_ulong; -+ pub fn ERR_get_error_line_data( -+ file: *mut *const c_char, -+ line: *mut c_int, -+ data: *mut *const c_char, -+ flags: *mut c_int, -+ ) -> c_ulong; -+ pub fn ERR_peek_last_error() -> c_ulong; -+ pub fn ERR_clear_error(); -+ pub fn ERR_lib_error_string(err: c_ulong) -> *const c_char; -+ pub fn ERR_func_error_string(err: c_ulong) -> *const c_char; -+ pub fn ERR_reason_error_string(err: c_ulong) -> *const c_char; -+ #[cfg(ossl110)] -+ pub fn ERR_load_strings(lib: c_int, str: *mut ERR_STRING_DATA) -> c_int; -+ #[cfg(not(ossl110))] -+ pub fn ERR_load_strings(lib: c_int, str: *mut ERR_STRING_DATA); -+ #[cfg(not(ossl110))] -+ pub fn ERR_load_crypto_strings(); -+ -+ pub fn ERR_get_next_error_library() -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_evp.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_evp.rs deleted file mode 100644 index d0dd465eaca..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_evp.rs +++ /dev/null @@ -1,313 +0,0 @@ ---- src/vendor/openssl-sys/src/evp.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/evp.rs -@@ -0,0 +1,310 @@ -+use libc::*; -+use *; -+ -+pub const EVP_MAX_MD_SIZE: c_uint = 64; -+ -+pub const PKCS5_SALT_LEN: c_int = 8; -+pub const PKCS12_DEFAULT_ITER: c_int = 2048; -+ -+pub const EVP_PKEY_RSA: c_int = NID_rsaEncryption; -+pub const EVP_PKEY_DSA: c_int = NID_dsa; -+pub const EVP_PKEY_DH: c_int = NID_dhKeyAgreement; -+pub const EVP_PKEY_EC: c_int = NID_X9_62_id_ecPublicKey; -+pub const EVP_PKEY_HMAC: c_int = NID_hmac; -+pub const EVP_PKEY_CMAC: c_int = NID_cmac; -+ -+pub const EVP_CTRL_GCM_SET_IVLEN: c_int = 0x9; -+pub const EVP_CTRL_GCM_GET_TAG: c_int = 0x10; -+pub const EVP_CTRL_GCM_SET_TAG: c_int = 0x11; -+ -+pub unsafe fn EVP_get_digestbynid(type_: c_int) -> *const EVP_MD { -+ EVP_get_digestbyname(OBJ_nid2sn(type_)) -+} -+ -+extern "C" { -+ pub fn EVP_MD_size(md: *const EVP_MD) -> c_int; -+ -+ #[cfg(any(ossl110, libressl273))] -+ pub fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn EVP_CIPHER_block_size(cipher: *const EVP_CIPHER) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn EVP_CIPHER_iv_length(cipher: *const EVP_CIPHER) -> c_int; -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn EVP_MD_CTX_new() -> *mut EVP_MD_CTX; -+ pub fn EVP_MD_CTX_free(ctx: *mut EVP_MD_CTX); -+ } -+ } else { -+ extern "C" { -+ pub fn EVP_MD_CTX_create() -> *mut EVP_MD_CTX; -+ pub fn EVP_MD_CTX_destroy(ctx: *mut EVP_MD_CTX); -+ } -+ } -+} -+ -+extern "C" { -+ pub fn EVP_DigestInit_ex(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD, imple: *mut ENGINE) -+ -> c_int; -+ pub fn EVP_DigestUpdate(ctx: *mut EVP_MD_CTX, data: *const c_void, n: size_t) -> c_int; -+ pub fn EVP_DigestFinal_ex(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int; -+ pub fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD) -> c_int; -+ pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int; -+ -+ pub fn EVP_BytesToKey( -+ typ: *const EVP_CIPHER, -+ md: *const EVP_MD, -+ salt: *const u8, -+ data: *const u8, -+ datalen: c_int, -+ count: c_int, -+ key: *mut u8, -+ iv: *mut u8, -+ ) -> c_int; -+ -+ pub fn EVP_CipherInit( -+ ctx: *mut EVP_CIPHER_CTX, -+ evp: *const EVP_CIPHER, -+ key: *const u8, -+ iv: *const u8, -+ mode: c_int, -+ ) -> c_int; -+ pub fn EVP_CipherInit_ex( -+ ctx: *mut EVP_CIPHER_CTX, -+ type_: *const EVP_CIPHER, -+ impl_: *mut ENGINE, -+ key: *const c_uchar, -+ iv: *const c_uchar, -+ enc: c_int, -+ ) -> c_int; -+ pub fn EVP_CipherUpdate( -+ ctx: *mut EVP_CIPHER_CTX, -+ outbuf: *mut u8, -+ outlen: *mut c_int, -+ inbuf: *const u8, -+ inlen: c_int, -+ ) -> c_int; -+ pub fn EVP_CipherFinal(ctx: *mut EVP_CIPHER_CTX, res: *mut u8, len: *mut c_int) -> c_int; -+ -+ pub fn EVP_DigestSignInit( -+ ctx: *mut EVP_MD_CTX, -+ pctx: *mut *mut EVP_PKEY_CTX, -+ type_: *const EVP_MD, -+ e: *mut ENGINE, -+ pkey: *mut EVP_PKEY, -+ ) -> c_int; -+ pub fn EVP_DigestSignFinal( -+ ctx: *mut EVP_MD_CTX, -+ sig: *mut c_uchar, -+ siglen: *mut size_t, -+ ) -> c_int; -+ pub fn EVP_DigestVerifyInit( -+ ctx: *mut EVP_MD_CTX, -+ pctx: *mut *mut EVP_PKEY_CTX, -+ type_: *const EVP_MD, -+ e: *mut ENGINE, -+ pkey: *mut EVP_PKEY, -+ ) -> c_int; -+} -+cfg_if! { -+ if #[cfg(any(ossl102, libressl280))] { -+ extern "C" { -+ pub fn EVP_DigestVerifyFinal( -+ ctx: *mut EVP_MD_CTX, -+ sigret: *const c_uchar, -+ siglen: size_t, -+ ) -> c_int; -+ } -+ } else { -+ extern "C" { -+ pub fn EVP_DigestVerifyFinal( -+ ctx: *mut EVP_MD_CTX, -+ sigret: *mut c_uchar, -+ siglen: size_t, -+ ) -> c_int; -+ } -+ } -+} -+ -+extern "C" { -+ pub fn EVP_CIPHER_CTX_new() -> *mut EVP_CIPHER_CTX; -+ pub fn EVP_CIPHER_CTX_free(ctx: *mut EVP_CIPHER_CTX); -+ pub fn EVP_MD_CTX_copy_ex(dst: *mut EVP_MD_CTX, src: *const EVP_MD_CTX) -> c_int; -+ pub fn EVP_CIPHER_CTX_set_key_length(ctx: *mut EVP_CIPHER_CTX, keylen: c_int) -> c_int; -+ pub fn EVP_CIPHER_CTX_set_padding(ctx: *mut EVP_CIPHER_CTX, padding: c_int) -> c_int; -+ pub fn EVP_CIPHER_CTX_ctrl( -+ ctx: *mut EVP_CIPHER_CTX, -+ type_: c_int, -+ arg: c_int, -+ ptr: *mut c_void, -+ ) -> c_int; -+ -+ pub fn EVP_md5() -> *const EVP_MD; -+ pub fn EVP_sha1() -> *const EVP_MD; -+ pub fn EVP_sha224() -> *const EVP_MD; -+ pub fn EVP_sha256() -> *const EVP_MD; -+ pub fn EVP_sha384() -> *const EVP_MD; -+ pub fn EVP_sha512() -> *const EVP_MD; -+ pub fn EVP_ripemd160() -> *const EVP_MD; -+ pub fn EVP_des_ecb() -> *const EVP_CIPHER; -+ pub fn EVP_des_ede3() -> *const EVP_CIPHER; -+ pub fn EVP_des_ede3_cbc() -> *const EVP_CIPHER; -+ pub fn EVP_des_cbc() -> *const EVP_CIPHER; -+ pub fn EVP_rc4() -> *const EVP_CIPHER; -+ pub fn EVP_bf_ecb() -> *const EVP_CIPHER; -+ pub fn EVP_bf_cbc() -> *const EVP_CIPHER; -+ pub fn EVP_bf_cfb64() -> *const EVP_CIPHER; -+ pub fn EVP_bf_ofb() -> *const EVP_CIPHER; -+ pub fn EVP_aes_128_ecb() -> *const EVP_CIPHER; -+ pub fn EVP_aes_128_cbc() -> *const EVP_CIPHER; -+ pub fn EVP_aes_128_cfb1() -> *const EVP_CIPHER; -+ pub fn EVP_aes_128_cfb8() -> *const EVP_CIPHER; -+ pub fn EVP_aes_128_cfb128() -> *const EVP_CIPHER; -+ pub fn EVP_aes_128_ctr() -> *const EVP_CIPHER; -+ pub fn EVP_aes_128_ccm() -> *const EVP_CIPHER; -+ pub fn EVP_aes_128_gcm() -> *const EVP_CIPHER; -+ pub fn EVP_aes_128_xts() -> *const EVP_CIPHER; -+ pub fn EVP_aes_256_ecb() -> *const EVP_CIPHER; -+ pub fn EVP_aes_256_cbc() -> *const EVP_CIPHER; -+ pub fn EVP_aes_256_cfb1() -> *const EVP_CIPHER; -+ pub fn EVP_aes_256_cfb8() -> *const EVP_CIPHER; -+ pub fn EVP_aes_256_cfb128() -> *const EVP_CIPHER; -+ pub fn EVP_aes_256_ctr() -> *const EVP_CIPHER; -+ pub fn EVP_aes_256_ccm() -> *const EVP_CIPHER; -+ pub fn EVP_aes_256_gcm() -> *const EVP_CIPHER; -+ pub fn EVP_aes_256_xts() -> *const EVP_CIPHER; -+ #[cfg(ossl110)] -+ pub fn EVP_chacha20() -> *const ::EVP_CIPHER; -+ #[cfg(ossl110)] -+ pub fn EVP_chacha20_poly1305() -> *const ::EVP_CIPHER; -+ -+ #[cfg(not(ossl110))] -+ pub fn OPENSSL_add_all_algorithms_noconf(); -+ -+ pub fn EVP_get_digestbyname(name: *const c_char) -> *const EVP_MD; -+ pub fn EVP_get_cipherbyname(name: *const c_char) -> *const EVP_CIPHER; -+ -+ pub fn EVP_PKEY_id(pkey: *const EVP_PKEY) -> c_int; -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn EVP_PKEY_bits(key: *const EVP_PKEY) -> c_int; -+ } -+ } else { -+ extern "C" { -+ pub fn EVP_PKEY_bits(key: *mut EVP_PKEY) -> c_int; -+ } -+ } -+} -+extern "C" { -+ pub fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *mut c_void) -> c_int; -+ -+ pub fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int; -+ pub fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA; -+ pub fn EVP_PKEY_get1_DSA(k: *mut EVP_PKEY) -> *mut DSA; -+ pub fn EVP_PKEY_get1_DH(k: *mut EVP_PKEY) -> *mut DH; -+ pub fn EVP_PKEY_get1_EC_KEY(k: *mut EVP_PKEY) -> *mut EC_KEY; -+ -+ pub fn EVP_PKEY_new() -> *mut EVP_PKEY; -+ pub fn EVP_PKEY_free(k: *mut EVP_PKEY); -+ -+ pub fn d2i_AutoPrivateKey( -+ a: *mut *mut EVP_PKEY, -+ pp: *mut *const c_uchar, -+ length: c_long, -+ ) -> *mut EVP_PKEY; -+ -+ pub fn EVP_PKEY_cmp(a: *const EVP_PKEY, b: *const EVP_PKEY) -> c_int; -+ -+ pub fn EVP_PKEY_copy_parameters(to: *mut EVP_PKEY, from: *const EVP_PKEY) -> c_int; -+ -+ pub fn PKCS5_PBKDF2_HMAC_SHA1( -+ pass: *const c_char, -+ passlen: c_int, -+ salt: *const u8, -+ saltlen: c_int, -+ iter: c_int, -+ keylen: c_int, -+ out: *mut u8, -+ ) -> c_int; -+ pub fn PKCS5_PBKDF2_HMAC( -+ pass: *const c_char, -+ passlen: c_int, -+ salt: *const c_uchar, -+ saltlen: c_int, -+ iter: c_int, -+ digest: *const EVP_MD, -+ keylen: c_int, -+ out: *mut u8, -+ ) -> c_int; -+ -+ #[cfg(ossl110)] -+ pub fn EVP_PBE_scrypt( -+ pass: *const c_char, -+ passlen: size_t, -+ salt: *const c_uchar, -+ saltlen: size_t, -+ N: u64, -+ r: u64, -+ p: u64, -+ maxmem: u64, -+ key: *mut c_uchar, -+ keylen: size_t, -+ ) -> c_int; -+} -+ -+pub const EVP_PKEY_OP_KEYGEN: c_int = 1 << 2; -+pub const EVP_PKEY_OP_SIGN: c_int = 1 << 3; -+pub const EVP_PKEY_OP_VERIFY: c_int = 1 << 4; -+pub const EVP_PKEY_OP_VERIFYRECOVER: c_int = 1 << 5; -+pub const EVP_PKEY_OP_SIGNCTX: c_int = 1 << 6; -+pub const EVP_PKEY_OP_VERIFYCTX: c_int = 1 << 7; -+pub const EVP_PKEY_OP_ENCRYPT: c_int = 1 << 8; -+pub const EVP_PKEY_OP_DECRYPT: c_int = 1 << 9; -+ -+pub const EVP_PKEY_OP_TYPE_SIG: c_int = EVP_PKEY_OP_SIGN -+ | EVP_PKEY_OP_VERIFY -+ | EVP_PKEY_OP_VERIFYRECOVER -+ | EVP_PKEY_OP_SIGNCTX -+ | EVP_PKEY_OP_VERIFYCTX; -+ -+pub const EVP_PKEY_OP_TYPE_CRYPT: c_int = EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT; -+ -+pub const EVP_PKEY_CTRL_SET_MAC_KEY: c_int = 6; -+ -+pub const EVP_PKEY_CTRL_CIPHER: c_int = 12; -+ -+pub const EVP_PKEY_ALG_CTRL: c_int = 0x1000; -+ -+extern "C" { -+ pub fn EVP_PKEY_CTX_new(k: *mut EVP_PKEY, e: *mut ENGINE) -> *mut EVP_PKEY_CTX; -+ pub fn EVP_PKEY_CTX_new_id(id: c_int, e: *mut ENGINE) -> *mut EVP_PKEY_CTX; -+ pub fn EVP_PKEY_CTX_free(ctx: *mut EVP_PKEY_CTX); -+ -+ pub fn EVP_PKEY_CTX_ctrl( -+ ctx: *mut EVP_PKEY_CTX, -+ keytype: c_int, -+ optype: c_int, -+ cmd: c_int, -+ p1: c_int, -+ p2: *mut c_void, -+ ) -> c_int; -+ -+ pub fn EVP_PKEY_new_mac_key( -+ type_: c_int, -+ e: *mut ENGINE, -+ key: *const c_uchar, -+ keylen: c_int, -+ ) -> *mut EVP_PKEY; -+ -+ pub fn EVP_PKEY_derive_init(ctx: *mut EVP_PKEY_CTX) -> c_int; -+ pub fn EVP_PKEY_derive_set_peer(ctx: *mut EVP_PKEY_CTX, peer: *mut EVP_PKEY) -> c_int; -+ pub fn EVP_PKEY_derive(ctx: *mut EVP_PKEY_CTX, key: *mut c_uchar, size: *mut size_t) -> c_int; -+ -+ pub fn EVP_PKEY_keygen_init(ctx: *mut EVP_PKEY_CTX) -> c_int; -+ pub fn EVP_PKEY_keygen(ctx: *mut EVP_PKEY_CTX, key: *mut *mut EVP_PKEY) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_hmac.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_hmac.rs deleted file mode 100644 index a96cd2892b8..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_hmac.rs +++ /dev/null @@ -1,33 +0,0 @@ ---- src/vendor/openssl-sys/src/hmac.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/hmac.rs -@@ -0,0 +1,30 @@ -+use libc::*; -+ -+use *; -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn HMAC_CTX_new() -> *mut HMAC_CTX; -+ pub fn HMAC_CTX_free(ctx: *mut HMAC_CTX); -+ } -+ } else { -+ extern "C" { -+ pub fn HMAC_CTX_init(ctx: *mut HMAC_CTX); -+ pub fn HMAC_CTX_cleanup(ctx: *mut HMAC_CTX); -+ } -+ } -+} -+ -+extern "C" { -+ pub fn HMAC_Init_ex( -+ ctx: *mut HMAC_CTX, -+ key: *const c_void, -+ len: c_int, -+ md: *const EVP_MD, -+ impl_: *mut ENGINE, -+ ) -> c_int; -+ pub fn HMAC_Update(ctx: *mut HMAC_CTX, data: *const c_uchar, len: size_t) -> c_int; -+ pub fn HMAC_Final(ctx: *mut HMAC_CTX, md: *mut c_uchar, len: *mut c_uint) -> c_int; -+ pub fn HMAC_CTX_copy(dst: *mut HMAC_CTX, src: *mut HMAC_CTX) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs deleted file mode 100644 index 85a2aa257a3..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_lib.rs +++ /dev/null @@ -1,3021 +0,0 @@ ---- src/vendor/openssl-sys/src/lib.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/src/lib.rs -@@ -1,2881 +1,165 @@ - #![allow(non_camel_case_types, non_upper_case_globals, non_snake_case)] --#![allow(dead_code, overflowing_literals)] -+#![allow(dead_code, overflowing_literals, unused_imports)] - #![doc(html_root_url = "https://docs.rs/openssl-sys/0.9")] - - extern crate libc; - --use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t, FILE}; --use std::mem; --use std::ptr; -+use libc::*; - --#[cfg(not(libressl))] --mod openssl; --#[cfg(not(libressl))] --pub use openssl::*; -+pub use aes::*; -+pub use asn1::*; -+pub use bio::*; -+pub use bn::*; -+pub use cms::*; -+pub use conf::*; -+pub use crypto::*; -+pub use dh::*; -+pub use dsa::*; -+pub use dtls1::*; -+pub use ec::*; -+pub use err::*; -+pub use evp::*; -+pub use hmac::*; -+pub use obj_mac::*; -+pub use object::*; -+pub use ocsp::*; -+pub use ossl_typ::*; -+pub use pem::*; -+pub use pkcs12::*; -+pub use rand::*; -+pub use rsa::*; -+pub use safestack::*; -+pub use sha::*; -+pub use srtp::*; -+pub use ssl::*; -+pub use ssl3::*; -+pub use stack::*; -+pub use tls1::*; -+pub use x509::*; -+pub use x509_vfy::*; -+pub use x509v3::*; - --#[cfg(libressl)] --mod libressl; --#[cfg(libressl)] --pub use libressl::*; -+#[macro_use] -+mod macros; - --pub enum ASN1_INTEGER {} --pub enum ASN1_GENERALIZEDTIME {} --pub enum ASN1_STRING {} --pub enum ASN1_BIT_STRING {} --pub enum ASN1_TIME {} --pub enum ASN1_TYPE {} --pub enum ASN1_OBJECT {} --pub enum BN_CTX {} --pub enum BN_GENCB {} --pub enum CMS_ContentInfo {} --pub enum CONF {} --pub enum CONF_METHOD {} --pub enum COMP_METHOD {} --pub enum EC_KEY {} --pub enum EC_GROUP {} --pub enum EC_METHOD {} --pub enum EC_POINT {} --pub enum ENGINE {} --pub enum EVP_CIPHER_CTX {} --pub enum EVP_MD {} --pub enum EVP_PKEY_CTX {} --pub enum OCSP_BASICRESP {} --pub enum OCSP_CERTID {} --pub enum OCSP_RESPONSE {} --pub enum OCSP_REQUEST {} --pub enum OCSP_ONEREQ {} --pub enum SSL_CIPHER {} --pub enum SSL_METHOD {} --pub enum X509_CRL {} --pub enum X509_EXTENSION {} --pub enum X509_NAME {} --pub enum X509_NAME_ENTRY {} --pub enum X509_STORE {} --pub enum X509_STORE_CTX {} --pub enum bio_st {} --pub enum DH_METHOD {} --pub enum RSA_METHOD {} --pub enum BN_MONT_CTX {} --pub enum BN_BLINDING {} --pub enum DSA_METHOD {} --pub enum EVP_PKEY_ASN1_METHOD {} -+mod aes; -+mod asn1; -+mod bio; -+mod bn; -+mod cms; -+mod conf; -+mod crypto; -+mod dh; -+mod dsa; -+mod dtls1; -+mod ec; -+mod err; -+mod evp; -+mod hmac; -+mod obj_mac; -+mod object; -+mod ocsp; -+mod ossl_typ; -+mod pem; -+mod pkcs12; -+mod rand; -+mod rsa; -+mod safestack; -+mod sha; -+mod srtp; -+mod ssl; -+mod ssl3; -+mod stack; -+mod tls1; -+mod x509; -+mod x509_vfy; -+mod x509v3; - --pub type bio_info_cb = -- Option; --pub type GEN_SESSION_CB = -- Option c_int>; --pub type tls_session_ticket_ext_cb_fn = -- Option c_int>; --pub type tls_session_secret_cb_fn = Option< -- unsafe extern "C" fn( -- *mut SSL, -- *mut c_void, -- *mut c_int, -- *mut stack_st_SSL_CIPHER, -- *mut *mut SSL_CIPHER, -- *mut c_void, -- ) -> c_int, -->; -- --#[repr(C)] --#[derive(Copy, Clone)] --pub enum point_conversion_form_t { -- POINT_CONVERSION_COMPRESSED = 2, -- POINT_CONVERSION_UNCOMPRESSED = 4, -- POINT_CONVERSION_HYBRID = 6, --} -- --#[repr(C)] --pub struct AES_KEY { -- // There is some business with AES_LONG which is there to ensure the values here are 32 bits -- rd_key: [u32; 4 * (AES_MAXNR as usize + 1)], -- rounds: c_int, --} -- --#[repr(C)] --pub struct GENERAL_NAME { -- pub type_: c_int, -- pub d: *mut c_void, --} -- --#[repr(C)] --pub struct X509V3_CTX { -- flags: c_int, -- issuer_cert: *mut c_void, -- subject_cert: *mut c_void, -- subject_req: *mut c_void, -- crl: *mut c_void, -- db_meth: *mut c_void, -- db: *mut c_void, -- // I like the last comment line, it is copied from OpenSSL sources: -- // Maybe more here --} -- --#[repr(C)] --pub struct SHA_CTX { -- pub h0: SHA_LONG, -- pub h1: SHA_LONG, -- pub h2: SHA_LONG, -- pub h3: SHA_LONG, -- pub h4: SHA_LONG, -- pub Nl: SHA_LONG, -- pub Nh: SHA_LONG, -- pub data: [SHA_LONG; SHA_LBLOCK as usize], -- pub num: c_uint, --} -- --#[repr(C)] --pub struct SHA256_CTX { -- pub h: [SHA_LONG; 8], -- pub Nl: SHA_LONG, -- pub Nh: SHA_LONG, -- pub data: [SHA_LONG; SHA_LBLOCK as usize], -- pub num: c_uint, -- pub md_len: c_uint, --} -- --#[repr(C)] --pub struct SHA512_CTX { -- pub h: [SHA_LONG64; 8], -- pub Nl: SHA_LONG64, -- pub Nh: SHA_LONG64, -- // this is a union but we don't want to require 1.19 -- u: [SHA_LONG64; SHA_LBLOCK as usize], -- pub num: c_uint, -- pub md_len: c_uint, --} -- --#[cfg(target_pointer_width = "64")] --pub type BN_ULONG = libc::c_ulonglong; --#[cfg(target_pointer_width = "32")] --pub type BN_ULONG = c_uint; -- --pub type CRYPTO_EX_new = unsafe extern "C" fn( -- parent: *mut c_void, -- ptr: *mut c_void, -- ad: *const CRYPTO_EX_DATA, -- idx: c_int, -- argl: c_long, -- argp: *const c_void, --) -> c_int; --pub type CRYPTO_EX_dup = unsafe extern "C" fn( -- to: *mut CRYPTO_EX_DATA, -- from: *mut CRYPTO_EX_DATA, -- from_d: *mut c_void, -- idx: c_int, -- argl: c_long, -- argp: *mut c_void, --) -> c_int; --pub type CRYPTO_EX_free = unsafe extern "C" fn( -- parent: *mut c_void, -- ptr: *mut c_void, -- ad: *mut CRYPTO_EX_DATA, -- idx: c_int, -- argl: c_long, -- argp: *mut c_void, --); -+// FIXME remove - pub type PasswordCallback = - unsafe extern "C" fn(buf: *mut c_char, size: c_int, rwflag: c_int, user_data: *mut c_void) - -> c_int; - --#[repr(C)] --pub struct ERR_STRING_DATA { -- pub error: c_ulong, -- pub string: *const c_char, --} -+#[cfg(ossl110)] -+pub fn init() { -+ use std::ptr; -+ use std::sync::{Once, ONCE_INIT}; - --pub type SHA_LONG = c_uint; --pub type SHA_LONG64 = u64; -+ // explicitly initialize to work around https://github.com/openssl/openssl/issues/3505 -+ static INIT: Once = ONCE_INIT; - --pub const AES_ENCRYPT: c_int = 1; --pub const AES_DECRYPT: c_int = 0; -- --pub const AES_MAXNR: c_int = 14; --pub const AES_BLOCK_SIZE: c_int = 16; -- --pub const BIO_TYPE_NONE: c_int = 0; -- --pub const BIO_CTRL_EOF: c_int = 2; --pub const BIO_CTRL_INFO: c_int = 3; --pub const BIO_CTRL_FLUSH: c_int = 11; --pub const BIO_C_SET_BUF_MEM_EOF_RETURN: c_int = 130; -- --pub const BIO_FLAGS_READ: c_int = 0x01; --pub const BIO_FLAGS_WRITE: c_int = 0x02; --pub const BIO_FLAGS_IO_SPECIAL: c_int = 0x04; --pub const BIO_FLAGS_RWS: c_int = BIO_FLAGS_READ | BIO_FLAGS_WRITE | BIO_FLAGS_IO_SPECIAL; --pub const BIO_FLAGS_SHOULD_RETRY: c_int = 0x08; -- --pub const CRYPTO_LOCK: c_int = 1; -- --pub const ERR_TXT_MALLOCED: c_int = 0x01; --pub const ERR_TXT_STRING: c_int = 0x02; -- --pub const ERR_LIB_PEM: c_int = 9; --pub const PEM_R_NO_START_LINE: c_int = 108; -- --pub const EVP_MAX_MD_SIZE: c_uint = 64; --pub const EVP_PKEY_RSA: c_int = NID_rsaEncryption; --pub const EVP_PKEY_HMAC: c_int = NID_hmac; --pub const EVP_PKEY_CMAC: c_int = NID_cmac; --pub const EVP_PKEY_DSA: c_int = NID_dsa; --pub const EVP_PKEY_DH: c_int = NID_dhKeyAgreement; --pub const EVP_PKEY_EC: c_int = NID_X9_62_id_ecPublicKey; -- --pub const EVP_PKEY_ALG_CTRL: c_int = 0x1000; -- --pub const EVP_PKEY_CTRL_RSA_PADDING: c_int = EVP_PKEY_ALG_CTRL + 1; --pub const EVP_PKEY_CTRL_RSA_PSS_SALTLEN: c_int = EVP_PKEY_ALG_CTRL + 2; -- --pub const EVP_PKEY_CTRL_RSA_MGF1_MD: c_int = EVP_PKEY_ALG_CTRL + 5; --pub const EVP_PKEY_CTRL_GET_RSA_PADDING: c_int = EVP_PKEY_ALG_CTRL + 6; -- --pub const EVP_PKEY_CTRL_SET_MAC_KEY: c_int = 6; --pub const EVP_PKEY_CTRL_CIPHER: c_int = 12; -- --pub const EVP_PKEY_OP_KEYGEN: c_int = 1 << 2; --pub const EVP_PKEY_OP_SIGN: c_int = 1 << 3; --pub const EVP_PKEY_OP_VERIFY: c_int = 1 << 4; --pub const EVP_PKEY_OP_VERIFYRECOVER: c_int = 1 << 5; --pub const EVP_PKEY_OP_SIGNCTX: c_int = 1 << 6; --pub const EVP_PKEY_OP_VERIFYCTX: c_int = 1 << 7; --pub const EVP_PKEY_OP_ENCRYPT: c_int = 1 << 8; --pub const EVP_PKEY_OP_DECRYPT: c_int = 1 << 9; -- --pub const EVP_PKEY_OP_TYPE_SIG: c_int = EVP_PKEY_OP_SIGN -- | EVP_PKEY_OP_VERIFY -- | EVP_PKEY_OP_VERIFYRECOVER -- | EVP_PKEY_OP_SIGNCTX -- | EVP_PKEY_OP_VERIFYCTX; -- --pub const EVP_PKEY_OP_TYPE_CRYPT: c_int = EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT; -- --pub const EVP_CTRL_GCM_SET_IVLEN: c_int = 0x9; --pub const EVP_CTRL_GCM_GET_TAG: c_int = 0x10; --pub const EVP_CTRL_GCM_SET_TAG: c_int = 0x11; -- --pub const MBSTRING_ASC: c_int = MBSTRING_FLAG | 1; --pub const MBSTRING_BMP: c_int = MBSTRING_FLAG | 2; --pub const MBSTRING_FLAG: c_int = 0x1000; --pub const MBSTRING_UNIV: c_int = MBSTRING_FLAG | 4; --pub const MBSTRING_UTF8: c_int = MBSTRING_FLAG; -- --pub const NID_undef: c_int = 0; --pub const NID_itu_t: c_int = 645; --pub const NID_ccitt: c_int = 404; --pub const NID_iso: c_int = 181; --pub const NID_joint_iso_itu_t: c_int = 646; --pub const NID_joint_iso_ccitt: c_int = 393; --pub const NID_member_body: c_int = 182; --pub const NID_identified_organization: c_int = 676; --pub const NID_hmac_md5: c_int = 780; --pub const NID_hmac_sha1: c_int = 781; --pub const NID_certicom_arc: c_int = 677; --pub const NID_international_organizations: c_int = 647; --pub const NID_wap: c_int = 678; --pub const NID_wap_wsg: c_int = 679; --pub const NID_selected_attribute_types: c_int = 394; --pub const NID_clearance: c_int = 395; --pub const NID_ISO_US: c_int = 183; --pub const NID_X9_57: c_int = 184; --pub const NID_X9cm: c_int = 185; --pub const NID_dsa: c_int = 116; --pub const NID_dsaWithSHA1: c_int = 113; --pub const NID_ansi_X9_62: c_int = 405; --pub const NID_X9_62_prime_field: c_int = 406; --pub const NID_X9_62_characteristic_two_field: c_int = 407; --pub const NID_X9_62_id_characteristic_two_basis: c_int = 680; --pub const NID_X9_62_onBasis: c_int = 681; --pub const NID_X9_62_tpBasis: c_int = 682; --pub const NID_X9_62_ppBasis: c_int = 683; --pub const NID_X9_62_id_ecPublicKey: c_int = 408; --pub const NID_X9_62_c2pnb163v1: c_int = 684; --pub const NID_X9_62_c2pnb163v2: c_int = 685; --pub const NID_X9_62_c2pnb163v3: c_int = 686; --pub const NID_X9_62_c2pnb176v1: c_int = 687; --pub const NID_X9_62_c2tnb191v1: c_int = 688; --pub const NID_X9_62_c2tnb191v2: c_int = 689; --pub const NID_X9_62_c2tnb191v3: c_int = 690; --pub const NID_X9_62_c2onb191v4: c_int = 691; --pub const NID_X9_62_c2onb191v5: c_int = 692; --pub const NID_X9_62_c2pnb208w1: c_int = 693; --pub const NID_X9_62_c2tnb239v1: c_int = 694; --pub const NID_X9_62_c2tnb239v2: c_int = 695; --pub const NID_X9_62_c2tnb239v3: c_int = 696; --pub const NID_X9_62_c2onb239v4: c_int = 697; --pub const NID_X9_62_c2onb239v5: c_int = 698; --pub const NID_X9_62_c2pnb272w1: c_int = 699; --pub const NID_X9_62_c2pnb304w1: c_int = 700; --pub const NID_X9_62_c2tnb359v1: c_int = 701; --pub const NID_X9_62_c2pnb368w1: c_int = 702; --pub const NID_X9_62_c2tnb431r1: c_int = 703; --pub const NID_X9_62_prime192v1: c_int = 409; --pub const NID_X9_62_prime192v2: c_int = 410; --pub const NID_X9_62_prime192v3: c_int = 411; --pub const NID_X9_62_prime239v1: c_int = 412; --pub const NID_X9_62_prime239v2: c_int = 413; --pub const NID_X9_62_prime239v3: c_int = 414; --pub const NID_X9_62_prime256v1: c_int = 415; --pub const NID_ecdsa_with_SHA1: c_int = 416; --pub const NID_ecdsa_with_Recommended: c_int = 791; --pub const NID_ecdsa_with_Specified: c_int = 792; --pub const NID_ecdsa_with_SHA224: c_int = 793; --pub const NID_ecdsa_with_SHA256: c_int = 794; --pub const NID_ecdsa_with_SHA384: c_int = 795; --pub const NID_ecdsa_with_SHA512: c_int = 796; --pub const NID_secp112r1: c_int = 704; --pub const NID_secp112r2: c_int = 705; --pub const NID_secp128r1: c_int = 706; --pub const NID_secp128r2: c_int = 707; --pub const NID_secp160k1: c_int = 708; --pub const NID_secp160r1: c_int = 709; --pub const NID_secp160r2: c_int = 710; --pub const NID_secp192k1: c_int = 711; --pub const NID_secp224k1: c_int = 712; --pub const NID_secp224r1: c_int = 713; --pub const NID_secp256k1: c_int = 714; --pub const NID_secp384r1: c_int = 715; --pub const NID_secp521r1: c_int = 716; --pub const NID_sect113r1: c_int = 717; --pub const NID_sect113r2: c_int = 718; --pub const NID_sect131r1: c_int = 719; --pub const NID_sect131r2: c_int = 720; --pub const NID_sect163k1: c_int = 721; --pub const NID_sect163r1: c_int = 722; --pub const NID_sect163r2: c_int = 723; --pub const NID_sect193r1: c_int = 724; --pub const NID_sect193r2: c_int = 725; --pub const NID_sect233k1: c_int = 726; --pub const NID_sect233r1: c_int = 727; --pub const NID_sect239k1: c_int = 728; --pub const NID_sect283k1: c_int = 729; --pub const NID_sect283r1: c_int = 730; --pub const NID_sect409k1: c_int = 731; --pub const NID_sect409r1: c_int = 732; --pub const NID_sect571k1: c_int = 733; --pub const NID_sect571r1: c_int = 734; --pub const NID_wap_wsg_idm_ecid_wtls1: c_int = 735; --pub const NID_wap_wsg_idm_ecid_wtls3: c_int = 736; --pub const NID_wap_wsg_idm_ecid_wtls4: c_int = 737; --pub const NID_wap_wsg_idm_ecid_wtls5: c_int = 738; --pub const NID_wap_wsg_idm_ecid_wtls6: c_int = 739; --pub const NID_wap_wsg_idm_ecid_wtls7: c_int = 740; --pub const NID_wap_wsg_idm_ecid_wtls8: c_int = 741; --pub const NID_wap_wsg_idm_ecid_wtls9: c_int = 742; --pub const NID_wap_wsg_idm_ecid_wtls10: c_int = 743; --pub const NID_wap_wsg_idm_ecid_wtls11: c_int = 744; --pub const NID_wap_wsg_idm_ecid_wtls12: c_int = 745; --pub const NID_cast5_cbc: c_int = 108; --pub const NID_cast5_ecb: c_int = 109; --pub const NID_cast5_cfb64: c_int = 110; --pub const NID_cast5_ofb64: c_int = 111; --pub const NID_pbeWithMD5AndCast5_CBC: c_int = 112; --pub const NID_id_PasswordBasedMAC: c_int = 782; --pub const NID_id_DHBasedMac: c_int = 783; --pub const NID_rsadsi: c_int = 1; --pub const NID_pkcs: c_int = 2; --pub const NID_pkcs1: c_int = 186; --pub const NID_rsaEncryption: c_int = 6; --pub const NID_md2WithRSAEncryption: c_int = 7; --pub const NID_md4WithRSAEncryption: c_int = 396; --pub const NID_md5WithRSAEncryption: c_int = 8; --pub const NID_sha1WithRSAEncryption: c_int = 65; --pub const NID_rsaesOaep: c_int = 919; --pub const NID_mgf1: c_int = 911; --pub const NID_rsassaPss: c_int = 912; --pub const NID_sha256WithRSAEncryption: c_int = 668; --pub const NID_sha384WithRSAEncryption: c_int = 669; --pub const NID_sha512WithRSAEncryption: c_int = 670; --pub const NID_sha224WithRSAEncryption: c_int = 671; --pub const NID_pkcs3: c_int = 27; --pub const NID_dhKeyAgreement: c_int = 28; --pub const NID_pkcs5: c_int = 187; --pub const NID_pbeWithMD2AndDES_CBC: c_int = 9; --pub const NID_pbeWithMD5AndDES_CBC: c_int = 10; --pub const NID_pbeWithMD2AndRC2_CBC: c_int = 168; --pub const NID_pbeWithMD5AndRC2_CBC: c_int = 169; --pub const NID_pbeWithSHA1AndDES_CBC: c_int = 170; --pub const NID_pbeWithSHA1AndRC2_CBC: c_int = 68; --pub const NID_id_pbkdf2: c_int = 69; --pub const NID_pbes2: c_int = 161; --pub const NID_pbmac1: c_int = 162; --pub const NID_pkcs7: c_int = 20; --pub const NID_pkcs7_data: c_int = 21; --pub const NID_pkcs7_signed: c_int = 22; --pub const NID_pkcs7_enveloped: c_int = 23; --pub const NID_pkcs7_signedAndEnveloped: c_int = 24; --pub const NID_pkcs7_digest: c_int = 25; --pub const NID_pkcs7_encrypted: c_int = 26; --pub const NID_pkcs9: c_int = 47; --pub const NID_pkcs9_emailAddress: c_int = 48; --pub const NID_pkcs9_unstructuredName: c_int = 49; --pub const NID_pkcs9_contentType: c_int = 50; --pub const NID_pkcs9_messageDigest: c_int = 51; --pub const NID_pkcs9_signingTime: c_int = 52; --pub const NID_pkcs9_countersignature: c_int = 53; --pub const NID_pkcs9_challengePassword: c_int = 54; --pub const NID_pkcs9_unstructuredAddress: c_int = 55; --pub const NID_pkcs9_extCertAttributes: c_int = 56; --pub const NID_ext_req: c_int = 172; --pub const NID_SMIMECapabilities: c_int = 167; --pub const NID_SMIME: c_int = 188; --pub const NID_id_smime_mod: c_int = 189; --pub const NID_id_smime_ct: c_int = 190; --pub const NID_id_smime_aa: c_int = 191; --pub const NID_id_smime_alg: c_int = 192; --pub const NID_id_smime_cd: c_int = 193; --pub const NID_id_smime_spq: c_int = 194; --pub const NID_id_smime_cti: c_int = 195; --pub const NID_id_smime_mod_cms: c_int = 196; --pub const NID_id_smime_mod_ess: c_int = 197; --pub const NID_id_smime_mod_oid: c_int = 198; --pub const NID_id_smime_mod_msg_v3: c_int = 199; --pub const NID_id_smime_mod_ets_eSignature_88: c_int = 200; --pub const NID_id_smime_mod_ets_eSignature_97: c_int = 201; --pub const NID_id_smime_mod_ets_eSigPolicy_88: c_int = 202; --pub const NID_id_smime_mod_ets_eSigPolicy_97: c_int = 203; --pub const NID_id_smime_ct_receipt: c_int = 204; --pub const NID_id_smime_ct_authData: c_int = 205; --pub const NID_id_smime_ct_publishCert: c_int = 206; --pub const NID_id_smime_ct_TSTInfo: c_int = 207; --pub const NID_id_smime_ct_TDTInfo: c_int = 208; --pub const NID_id_smime_ct_contentInfo: c_int = 209; --pub const NID_id_smime_ct_DVCSRequestData: c_int = 210; --pub const NID_id_smime_ct_DVCSResponseData: c_int = 211; --pub const NID_id_smime_ct_compressedData: c_int = 786; --pub const NID_id_ct_asciiTextWithCRLF: c_int = 787; --pub const NID_id_smime_aa_receiptRequest: c_int = 212; --pub const NID_id_smime_aa_securityLabel: c_int = 213; --pub const NID_id_smime_aa_mlExpandHistory: c_int = 214; --pub const NID_id_smime_aa_contentHint: c_int = 215; --pub const NID_id_smime_aa_msgSigDigest: c_int = 216; --pub const NID_id_smime_aa_encapContentType: c_int = 217; --pub const NID_id_smime_aa_contentIdentifier: c_int = 218; --pub const NID_id_smime_aa_macValue: c_int = 219; --pub const NID_id_smime_aa_equivalentLabels: c_int = 220; --pub const NID_id_smime_aa_contentReference: c_int = 221; --pub const NID_id_smime_aa_encrypKeyPref: c_int = 222; --pub const NID_id_smime_aa_signingCertificate: c_int = 223; --pub const NID_id_smime_aa_smimeEncryptCerts: c_int = 224; --pub const NID_id_smime_aa_timeStampToken: c_int = 225; --pub const NID_id_smime_aa_ets_sigPolicyId: c_int = 226; --pub const NID_id_smime_aa_ets_commitmentType: c_int = 227; --pub const NID_id_smime_aa_ets_signerLocation: c_int = 228; --pub const NID_id_smime_aa_ets_signerAttr: c_int = 229; --pub const NID_id_smime_aa_ets_otherSigCert: c_int = 230; --pub const NID_id_smime_aa_ets_contentTimestamp: c_int = 231; --pub const NID_id_smime_aa_ets_CertificateRefs: c_int = 232; --pub const NID_id_smime_aa_ets_RevocationRefs: c_int = 233; --pub const NID_id_smime_aa_ets_certValues: c_int = 234; --pub const NID_id_smime_aa_ets_revocationValues: c_int = 235; --pub const NID_id_smime_aa_ets_escTimeStamp: c_int = 236; --pub const NID_id_smime_aa_ets_certCRLTimestamp: c_int = 237; --pub const NID_id_smime_aa_ets_archiveTimeStamp: c_int = 238; --pub const NID_id_smime_aa_signatureType: c_int = 239; --pub const NID_id_smime_aa_dvcs_dvc: c_int = 240; --pub const NID_id_smime_alg_ESDHwith3DES: c_int = 241; --pub const NID_id_smime_alg_ESDHwithRC2: c_int = 242; --pub const NID_id_smime_alg_3DESwrap: c_int = 243; --pub const NID_id_smime_alg_RC2wrap: c_int = 244; --pub const NID_id_smime_alg_ESDH: c_int = 245; --pub const NID_id_smime_alg_CMS3DESwrap: c_int = 246; --pub const NID_id_smime_alg_CMSRC2wrap: c_int = 247; --pub const NID_id_alg_PWRI_KEK: c_int = 893; --pub const NID_id_smime_cd_ldap: c_int = 248; --pub const NID_id_smime_spq_ets_sqt_uri: c_int = 249; --pub const NID_id_smime_spq_ets_sqt_unotice: c_int = 250; --pub const NID_id_smime_cti_ets_proofOfOrigin: c_int = 251; --pub const NID_id_smime_cti_ets_proofOfReceipt: c_int = 252; --pub const NID_id_smime_cti_ets_proofOfDelivery: c_int = 253; --pub const NID_id_smime_cti_ets_proofOfSender: c_int = 254; --pub const NID_id_smime_cti_ets_proofOfApproval: c_int = 255; --pub const NID_id_smime_cti_ets_proofOfCreation: c_int = 256; --pub const NID_friendlyName: c_int = 156; --pub const NID_localKeyID: c_int = 157; --pub const NID_ms_csp_name: c_int = 417; --pub const NID_LocalKeySet: c_int = 856; --pub const NID_x509Certificate: c_int = 158; --pub const NID_sdsiCertificate: c_int = 159; --pub const NID_x509Crl: c_int = 160; --pub const NID_pbe_WithSHA1And128BitRC4: c_int = 144; --pub const NID_pbe_WithSHA1And40BitRC4: c_int = 145; --pub const NID_pbe_WithSHA1And3_Key_TripleDES_CBC: c_int = 146; --pub const NID_pbe_WithSHA1And2_Key_TripleDES_CBC: c_int = 147; --pub const NID_pbe_WithSHA1And128BitRC2_CBC: c_int = 148; --pub const NID_pbe_WithSHA1And40BitRC2_CBC: c_int = 149; --pub const NID_keyBag: c_int = 150; --pub const NID_pkcs8ShroudedKeyBag: c_int = 151; --pub const NID_certBag: c_int = 152; --pub const NID_crlBag: c_int = 153; --pub const NID_secretBag: c_int = 154; --pub const NID_safeContentsBag: c_int = 155; --pub const NID_md2: c_int = 3; --pub const NID_md4: c_int = 257; --pub const NID_md5: c_int = 4; --pub const NID_md5_sha1: c_int = 114; --pub const NID_hmacWithMD5: c_int = 797; --pub const NID_hmacWithSHA1: c_int = 163; --pub const NID_hmacWithSHA224: c_int = 798; --pub const NID_hmacWithSHA256: c_int = 799; --pub const NID_hmacWithSHA384: c_int = 800; --pub const NID_hmacWithSHA512: c_int = 801; --pub const NID_rc2_cbc: c_int = 37; --pub const NID_rc2_ecb: c_int = 38; --pub const NID_rc2_cfb64: c_int = 39; --pub const NID_rc2_ofb64: c_int = 40; --pub const NID_rc2_40_cbc: c_int = 98; --pub const NID_rc2_64_cbc: c_int = 166; --pub const NID_rc4: c_int = 5; --pub const NID_rc4_40: c_int = 97; --pub const NID_des_ede3_cbc: c_int = 44; --pub const NID_rc5_cbc: c_int = 120; --pub const NID_rc5_ecb: c_int = 121; --pub const NID_rc5_cfb64: c_int = 122; --pub const NID_rc5_ofb64: c_int = 123; --pub const NID_ms_ext_req: c_int = 171; --pub const NID_ms_code_ind: c_int = 134; --pub const NID_ms_code_com: c_int = 135; --pub const NID_ms_ctl_sign: c_int = 136; --pub const NID_ms_sgc: c_int = 137; --pub const NID_ms_efs: c_int = 138; --pub const NID_ms_smartcard_login: c_int = 648; --pub const NID_ms_upn: c_int = 649; --pub const NID_idea_cbc: c_int = 34; --pub const NID_idea_ecb: c_int = 36; --pub const NID_idea_cfb64: c_int = 35; --pub const NID_idea_ofb64: c_int = 46; --pub const NID_bf_cbc: c_int = 91; --pub const NID_bf_ecb: c_int = 92; --pub const NID_bf_cfb64: c_int = 93; --pub const NID_bf_ofb64: c_int = 94; --pub const NID_id_pkix: c_int = 127; --pub const NID_id_pkix_mod: c_int = 258; --pub const NID_id_pe: c_int = 175; --pub const NID_id_qt: c_int = 259; --pub const NID_id_kp: c_int = 128; --pub const NID_id_it: c_int = 260; --pub const NID_id_pkip: c_int = 261; --pub const NID_id_alg: c_int = 262; --pub const NID_id_cmc: c_int = 263; --pub const NID_id_on: c_int = 264; --pub const NID_id_pda: c_int = 265; --pub const NID_id_aca: c_int = 266; --pub const NID_id_qcs: c_int = 267; --pub const NID_id_cct: c_int = 268; --pub const NID_id_ppl: c_int = 662; --pub const NID_id_ad: c_int = 176; --pub const NID_id_pkix1_explicit_88: c_int = 269; --pub const NID_id_pkix1_implicit_88: c_int = 270; --pub const NID_id_pkix1_explicit_93: c_int = 271; --pub const NID_id_pkix1_implicit_93: c_int = 272; --pub const NID_id_mod_crmf: c_int = 273; --pub const NID_id_mod_cmc: c_int = 274; --pub const NID_id_mod_kea_profile_88: c_int = 275; --pub const NID_id_mod_kea_profile_93: c_int = 276; --pub const NID_id_mod_cmp: c_int = 277; --pub const NID_id_mod_qualified_cert_88: c_int = 278; --pub const NID_id_mod_qualified_cert_93: c_int = 279; --pub const NID_id_mod_attribute_cert: c_int = 280; --pub const NID_id_mod_timestamp_protocol: c_int = 281; --pub const NID_id_mod_ocsp: c_int = 282; --pub const NID_id_mod_dvcs: c_int = 283; --pub const NID_id_mod_cmp2000: c_int = 284; --pub const NID_info_access: c_int = 177; --pub const NID_biometricInfo: c_int = 285; --pub const NID_qcStatements: c_int = 286; --pub const NID_ac_auditEntity: c_int = 287; --pub const NID_ac_targeting: c_int = 288; --pub const NID_aaControls: c_int = 289; --pub const NID_sbgp_ipAddrBlock: c_int = 290; --pub const NID_sbgp_autonomousSysNum: c_int = 291; --pub const NID_sbgp_routerIdentifier: c_int = 292; --pub const NID_ac_proxying: c_int = 397; --pub const NID_sinfo_access: c_int = 398; --pub const NID_proxyCertInfo: c_int = 663; --pub const NID_id_qt_cps: c_int = 164; --pub const NID_id_qt_unotice: c_int = 165; --pub const NID_textNotice: c_int = 293; --pub const NID_server_auth: c_int = 129; --pub const NID_client_auth: c_int = 130; --pub const NID_code_sign: c_int = 131; --pub const NID_email_protect: c_int = 132; --pub const NID_ipsecEndSystem: c_int = 294; --pub const NID_ipsecTunnel: c_int = 295; --pub const NID_ipsecUser: c_int = 296; --pub const NID_time_stamp: c_int = 133; --pub const NID_OCSP_sign: c_int = 180; --pub const NID_dvcs: c_int = 297; --pub const NID_id_it_caProtEncCert: c_int = 298; --pub const NID_id_it_signKeyPairTypes: c_int = 299; --pub const NID_id_it_encKeyPairTypes: c_int = 300; --pub const NID_id_it_preferredSymmAlg: c_int = 301; --pub const NID_id_it_caKeyUpdateInfo: c_int = 302; --pub const NID_id_it_currentCRL: c_int = 303; --pub const NID_id_it_unsupportedOIDs: c_int = 304; --pub const NID_id_it_subscriptionRequest: c_int = 305; --pub const NID_id_it_subscriptionResponse: c_int = 306; --pub const NID_id_it_keyPairParamReq: c_int = 307; --pub const NID_id_it_keyPairParamRep: c_int = 308; --pub const NID_id_it_revPassphrase: c_int = 309; --pub const NID_id_it_implicitConfirm: c_int = 310; --pub const NID_id_it_confirmWaitTime: c_int = 311; --pub const NID_id_it_origPKIMessage: c_int = 312; --pub const NID_id_it_suppLangTags: c_int = 784; --pub const NID_id_regCtrl: c_int = 313; --pub const NID_id_regInfo: c_int = 314; --pub const NID_id_regCtrl_regToken: c_int = 315; --pub const NID_id_regCtrl_authenticator: c_int = 316; --pub const NID_id_regCtrl_pkiPublicationInfo: c_int = 317; --pub const NID_id_regCtrl_pkiArchiveOptions: c_int = 318; --pub const NID_id_regCtrl_oldCertID: c_int = 319; --pub const NID_id_regCtrl_protocolEncrKey: c_int = 320; --pub const NID_id_regInfo_utf8Pairs: c_int = 321; --pub const NID_id_regInfo_certReq: c_int = 322; --pub const NID_id_alg_des40: c_int = 323; --pub const NID_id_alg_noSignature: c_int = 324; --pub const NID_id_alg_dh_sig_hmac_sha1: c_int = 325; --pub const NID_id_alg_dh_pop: c_int = 326; --pub const NID_id_cmc_statusInfo: c_int = 327; --pub const NID_id_cmc_identification: c_int = 328; --pub const NID_id_cmc_identityProof: c_int = 329; --pub const NID_id_cmc_dataReturn: c_int = 330; --pub const NID_id_cmc_transactionId: c_int = 331; --pub const NID_id_cmc_senderNonce: c_int = 332; --pub const NID_id_cmc_recipientNonce: c_int = 333; --pub const NID_id_cmc_addExtensions: c_int = 334; --pub const NID_id_cmc_encryptedPOP: c_int = 335; --pub const NID_id_cmc_decryptedPOP: c_int = 336; --pub const NID_id_cmc_lraPOPWitness: c_int = 337; --pub const NID_id_cmc_getCert: c_int = 338; --pub const NID_id_cmc_getCRL: c_int = 339; --pub const NID_id_cmc_revokeRequest: c_int = 340; --pub const NID_id_cmc_regInfo: c_int = 341; --pub const NID_id_cmc_responseInfo: c_int = 342; --pub const NID_id_cmc_queryPending: c_int = 343; --pub const NID_id_cmc_popLinkRandom: c_int = 344; --pub const NID_id_cmc_popLinkWitness: c_int = 345; --pub const NID_id_cmc_confirmCertAcceptance: c_int = 346; --pub const NID_id_on_personalData: c_int = 347; --pub const NID_id_on_permanentIdentifier: c_int = 858; --pub const NID_id_pda_dateOfBirth: c_int = 348; --pub const NID_id_pda_placeOfBirth: c_int = 349; --pub const NID_id_pda_gender: c_int = 351; --pub const NID_id_pda_countryOfCitizenship: c_int = 352; --pub const NID_id_pda_countryOfResidence: c_int = 353; --pub const NID_id_aca_authenticationInfo: c_int = 354; --pub const NID_id_aca_accessIdentity: c_int = 355; --pub const NID_id_aca_chargingIdentity: c_int = 356; --pub const NID_id_aca_group: c_int = 357; --pub const NID_id_aca_role: c_int = 358; --pub const NID_id_aca_encAttrs: c_int = 399; --pub const NID_id_qcs_pkixQCSyntax_v1: c_int = 359; --pub const NID_id_cct_crs: c_int = 360; --pub const NID_id_cct_PKIData: c_int = 361; --pub const NID_id_cct_PKIResponse: c_int = 362; --pub const NID_id_ppl_anyLanguage: c_int = 664; --pub const NID_id_ppl_inheritAll: c_int = 665; --pub const NID_Independent: c_int = 667; --pub const NID_ad_OCSP: c_int = 178; --pub const NID_ad_ca_issuers: c_int = 179; --pub const NID_ad_timeStamping: c_int = 363; --pub const NID_ad_dvcs: c_int = 364; --pub const NID_caRepository: c_int = 785; --pub const NID_id_pkix_OCSP_basic: c_int = 365; --pub const NID_id_pkix_OCSP_Nonce: c_int = 366; --pub const NID_id_pkix_OCSP_CrlID: c_int = 367; --pub const NID_id_pkix_OCSP_acceptableResponses: c_int = 368; --pub const NID_id_pkix_OCSP_noCheck: c_int = 369; --pub const NID_id_pkix_OCSP_archiveCutoff: c_int = 370; --pub const NID_id_pkix_OCSP_serviceLocator: c_int = 371; --pub const NID_id_pkix_OCSP_extendedStatus: c_int = 372; --pub const NID_id_pkix_OCSP_valid: c_int = 373; --pub const NID_id_pkix_OCSP_path: c_int = 374; --pub const NID_id_pkix_OCSP_trustRoot: c_int = 375; --pub const NID_algorithm: c_int = 376; --pub const NID_md5WithRSA: c_int = 104; --pub const NID_des_ecb: c_int = 29; --pub const NID_des_cbc: c_int = 31; --pub const NID_des_ofb64: c_int = 45; --pub const NID_des_cfb64: c_int = 30; --pub const NID_rsaSignature: c_int = 377; --pub const NID_dsa_2: c_int = 67; --pub const NID_dsaWithSHA: c_int = 66; --pub const NID_shaWithRSAEncryption: c_int = 42; --pub const NID_des_ede_ecb: c_int = 32; --pub const NID_des_ede3_ecb: c_int = 33; --pub const NID_des_ede_cbc: c_int = 43; --pub const NID_des_ede_cfb64: c_int = 60; --pub const NID_des_ede3_cfb64: c_int = 61; --pub const NID_des_ede_ofb64: c_int = 62; --pub const NID_des_ede3_ofb64: c_int = 63; --pub const NID_desx_cbc: c_int = 80; --pub const NID_sha: c_int = 41; --pub const NID_sha1: c_int = 64; --pub const NID_dsaWithSHA1_2: c_int = 70; --pub const NID_sha1WithRSA: c_int = 115; --pub const NID_ripemd160: c_int = 117; --pub const NID_ripemd160WithRSA: c_int = 119; --pub const NID_sxnet: c_int = 143; --pub const NID_X500: c_int = 11; --pub const NID_X509: c_int = 12; --pub const NID_commonName: c_int = 13; --pub const NID_surname: c_int = 100; --pub const NID_serialNumber: c_int = 105; --pub const NID_countryName: c_int = 14; --pub const NID_localityName: c_int = 15; --pub const NID_stateOrProvinceName: c_int = 16; --pub const NID_streetAddress: c_int = 660; --pub const NID_organizationName: c_int = 17; --pub const NID_organizationalUnitName: c_int = 18; --pub const NID_title: c_int = 106; --pub const NID_description: c_int = 107; --pub const NID_searchGuide: c_int = 859; --pub const NID_businessCategory: c_int = 860; --pub const NID_postalAddress: c_int = 861; --pub const NID_postalCode: c_int = 661; --pub const NID_postOfficeBox: c_int = 862; --pub const NID_physicalDeliveryOfficeName: c_int = 863; --pub const NID_telephoneNumber: c_int = 864; --pub const NID_telexNumber: c_int = 865; --pub const NID_teletexTerminalIdentifier: c_int = 866; --pub const NID_facsimileTelephoneNumber: c_int = 867; --pub const NID_x121Address: c_int = 868; --pub const NID_internationaliSDNNumber: c_int = 869; --pub const NID_registeredAddress: c_int = 870; --pub const NID_destinationIndicator: c_int = 871; --pub const NID_preferredDeliveryMethod: c_int = 872; --pub const NID_presentationAddress: c_int = 873; --pub const NID_supportedApplicationContext: c_int = 874; --pub const NID_member: c_int = 875; --pub const NID_owner: c_int = 876; --pub const NID_roleOccupant: c_int = 877; --pub const NID_seeAlso: c_int = 878; --pub const NID_userPassword: c_int = 879; --pub const NID_userCertificate: c_int = 880; --pub const NID_cACertificate: c_int = 881; --pub const NID_authorityRevocationList: c_int = 882; --pub const NID_certificateRevocationList: c_int = 883; --pub const NID_crossCertificatePair: c_int = 884; --pub const NID_name: c_int = 173; --pub const NID_givenName: c_int = 99; --pub const NID_initials: c_int = 101; --pub const NID_generationQualifier: c_int = 509; --pub const NID_x500UniqueIdentifier: c_int = 503; --pub const NID_dnQualifier: c_int = 174; --pub const NID_enhancedSearchGuide: c_int = 885; --pub const NID_protocolInformation: c_int = 886; --pub const NID_distinguishedName: c_int = 887; --pub const NID_uniqueMember: c_int = 888; --pub const NID_houseIdentifier: c_int = 889; --pub const NID_supportedAlgorithms: c_int = 890; --pub const NID_deltaRevocationList: c_int = 891; --pub const NID_dmdName: c_int = 892; --pub const NID_pseudonym: c_int = 510; --pub const NID_role: c_int = 400; --pub const NID_X500algorithms: c_int = 378; --pub const NID_rsa: c_int = 19; --pub const NID_mdc2WithRSA: c_int = 96; --pub const NID_mdc2: c_int = 95; --pub const NID_id_ce: c_int = 81; --pub const NID_subject_directory_attributes: c_int = 769; --pub const NID_subject_key_identifier: c_int = 82; --pub const NID_key_usage: c_int = 83; --pub const NID_private_key_usage_period: c_int = 84; --pub const NID_subject_alt_name: c_int = 85; --pub const NID_issuer_alt_name: c_int = 86; --pub const NID_basic_constraints: c_int = 87; --pub const NID_crl_number: c_int = 88; --pub const NID_crl_reason: c_int = 141; --pub const NID_invalidity_date: c_int = 142; --pub const NID_delta_crl: c_int = 140; --pub const NID_issuing_distribution_point: c_int = 770; --pub const NID_certificate_issuer: c_int = 771; --pub const NID_name_constraints: c_int = 666; --pub const NID_crl_distribution_points: c_int = 103; --pub const NID_certificate_policies: c_int = 89; --pub const NID_any_policy: c_int = 746; --pub const NID_policy_mappings: c_int = 747; --pub const NID_authority_key_identifier: c_int = 90; --pub const NID_policy_constraints: c_int = 401; --pub const NID_ext_key_usage: c_int = 126; --pub const NID_freshest_crl: c_int = 857; --pub const NID_inhibit_any_policy: c_int = 748; --pub const NID_target_information: c_int = 402; --pub const NID_no_rev_avail: c_int = 403; --pub const NID_anyExtendedKeyUsage: c_int = 910; --pub const NID_netscape: c_int = 57; --pub const NID_netscape_cert_extension: c_int = 58; --pub const NID_netscape_data_type: c_int = 59; --pub const NID_netscape_cert_type: c_int = 71; --pub const NID_netscape_base_url: c_int = 72; --pub const NID_netscape_revocation_url: c_int = 73; --pub const NID_netscape_ca_revocation_url: c_int = 74; --pub const NID_netscape_renewal_url: c_int = 75; --pub const NID_netscape_ca_policy_url: c_int = 76; --pub const NID_netscape_ssl_server_name: c_int = 77; --pub const NID_netscape_comment: c_int = 78; --pub const NID_netscape_cert_sequence: c_int = 79; --pub const NID_ns_sgc: c_int = 139; --pub const NID_org: c_int = 379; --pub const NID_dod: c_int = 380; --pub const NID_iana: c_int = 381; --pub const NID_Directory: c_int = 382; --pub const NID_Management: c_int = 383; --pub const NID_Experimental: c_int = 384; --pub const NID_Private: c_int = 385; --pub const NID_Security: c_int = 386; --pub const NID_SNMPv2: c_int = 387; --pub const NID_Mail: c_int = 388; --pub const NID_Enterprises: c_int = 389; --pub const NID_dcObject: c_int = 390; --pub const NID_mime_mhs: c_int = 504; --pub const NID_mime_mhs_headings: c_int = 505; --pub const NID_mime_mhs_bodies: c_int = 506; --pub const NID_id_hex_partial_message: c_int = 507; --pub const NID_id_hex_multipart_message: c_int = 508; --pub const NID_zlib_compression: c_int = 125; --pub const NID_aes_128_ecb: c_int = 418; --pub const NID_aes_128_cbc: c_int = 419; --pub const NID_aes_128_ofb128: c_int = 420; --pub const NID_aes_128_cfb128: c_int = 421; --pub const NID_id_aes128_wrap: c_int = 788; --pub const NID_aes_128_gcm: c_int = 895; --pub const NID_aes_128_ccm: c_int = 896; --pub const NID_id_aes128_wrap_pad: c_int = 897; --pub const NID_aes_192_ecb: c_int = 422; --pub const NID_aes_192_cbc: c_int = 423; --pub const NID_aes_192_ofb128: c_int = 424; --pub const NID_aes_192_cfb128: c_int = 425; --pub const NID_id_aes192_wrap: c_int = 789; --pub const NID_aes_192_gcm: c_int = 898; --pub const NID_aes_192_ccm: c_int = 899; --pub const NID_id_aes192_wrap_pad: c_int = 900; --pub const NID_aes_256_ecb: c_int = 426; --pub const NID_aes_256_cbc: c_int = 427; --pub const NID_aes_256_ofb128: c_int = 428; --pub const NID_aes_256_cfb128: c_int = 429; --pub const NID_id_aes256_wrap: c_int = 790; --pub const NID_aes_256_gcm: c_int = 901; --pub const NID_aes_256_ccm: c_int = 902; --pub const NID_id_aes256_wrap_pad: c_int = 903; --pub const NID_aes_128_cfb1: c_int = 650; --pub const NID_aes_192_cfb1: c_int = 651; --pub const NID_aes_256_cfb1: c_int = 652; --pub const NID_aes_128_cfb8: c_int = 653; --pub const NID_aes_192_cfb8: c_int = 654; --pub const NID_aes_256_cfb8: c_int = 655; --pub const NID_aes_128_ctr: c_int = 904; --pub const NID_aes_192_ctr: c_int = 905; --pub const NID_aes_256_ctr: c_int = 906; --pub const NID_aes_128_xts: c_int = 913; --pub const NID_aes_256_xts: c_int = 914; --pub const NID_des_cfb1: c_int = 656; --pub const NID_des_cfb8: c_int = 657; --pub const NID_des_ede3_cfb1: c_int = 658; --pub const NID_des_ede3_cfb8: c_int = 659; --pub const NID_sha256: c_int = 672; --pub const NID_sha384: c_int = 673; --pub const NID_sha512: c_int = 674; --pub const NID_sha224: c_int = 675; --pub const NID_dsa_with_SHA224: c_int = 802; --pub const NID_dsa_with_SHA256: c_int = 803; --pub const NID_hold_instruction_code: c_int = 430; --pub const NID_hold_instruction_none: c_int = 431; --pub const NID_hold_instruction_call_issuer: c_int = 432; --pub const NID_hold_instruction_reject: c_int = 433; --pub const NID_data: c_int = 434; --pub const NID_pss: c_int = 435; --pub const NID_ucl: c_int = 436; --pub const NID_pilot: c_int = 437; --pub const NID_pilotAttributeType: c_int = 438; --pub const NID_pilotAttributeSyntax: c_int = 439; --pub const NID_pilotObjectClass: c_int = 440; --pub const NID_pilotGroups: c_int = 441; --pub const NID_iA5StringSyntax: c_int = 442; --pub const NID_caseIgnoreIA5StringSyntax: c_int = 443; --pub const NID_pilotObject: c_int = 444; --pub const NID_pilotPerson: c_int = 445; --pub const NID_account: c_int = 446; --pub const NID_document: c_int = 447; --pub const NID_room: c_int = 448; --pub const NID_documentSeries: c_int = 449; --pub const NID_Domain: c_int = 392; --pub const NID_rFC822localPart: c_int = 450; --pub const NID_dNSDomain: c_int = 451; --pub const NID_domainRelatedObject: c_int = 452; --pub const NID_friendlyCountry: c_int = 453; --pub const NID_simpleSecurityObject: c_int = 454; --pub const NID_pilotOrganization: c_int = 455; --pub const NID_pilotDSA: c_int = 456; --pub const NID_qualityLabelledData: c_int = 457; --pub const NID_userId: c_int = 458; --pub const NID_textEncodedORAddress: c_int = 459; --pub const NID_rfc822Mailbox: c_int = 460; --pub const NID_info: c_int = 461; --pub const NID_favouriteDrink: c_int = 462; --pub const NID_roomNumber: c_int = 463; --pub const NID_photo: c_int = 464; --pub const NID_userClass: c_int = 465; --pub const NID_host: c_int = 466; --pub const NID_manager: c_int = 467; --pub const NID_documentIdentifier: c_int = 468; --pub const NID_documentTitle: c_int = 469; --pub const NID_documentVersion: c_int = 470; --pub const NID_documentAuthor: c_int = 471; --pub const NID_documentLocation: c_int = 472; --pub const NID_homeTelephoneNumber: c_int = 473; --pub const NID_secretary: c_int = 474; --pub const NID_otherMailbox: c_int = 475; --pub const NID_lastModifiedTime: c_int = 476; --pub const NID_lastModifiedBy: c_int = 477; --pub const NID_domainComponent: c_int = 391; --pub const NID_aRecord: c_int = 478; --pub const NID_pilotAttributeType27: c_int = 479; --pub const NID_mXRecord: c_int = 480; --pub const NID_nSRecord: c_int = 481; --pub const NID_sOARecord: c_int = 482; --pub const NID_cNAMERecord: c_int = 483; --pub const NID_associatedDomain: c_int = 484; --pub const NID_associatedName: c_int = 485; --pub const NID_homePostalAddress: c_int = 486; --pub const NID_personalTitle: c_int = 487; --pub const NID_mobileTelephoneNumber: c_int = 488; --pub const NID_pagerTelephoneNumber: c_int = 489; --pub const NID_friendlyCountryName: c_int = 490; --pub const NID_organizationalStatus: c_int = 491; --pub const NID_janetMailbox: c_int = 492; --pub const NID_mailPreferenceOption: c_int = 493; --pub const NID_buildingName: c_int = 494; --pub const NID_dSAQuality: c_int = 495; --pub const NID_singleLevelQuality: c_int = 496; --pub const NID_subtreeMinimumQuality: c_int = 497; --pub const NID_subtreeMaximumQuality: c_int = 498; --pub const NID_personalSignature: c_int = 499; --pub const NID_dITRedirect: c_int = 500; --pub const NID_audio: c_int = 501; --pub const NID_documentPublisher: c_int = 502; --pub const NID_id_set: c_int = 512; --pub const NID_set_ctype: c_int = 513; --pub const NID_set_msgExt: c_int = 514; --pub const NID_set_attr: c_int = 515; --pub const NID_set_policy: c_int = 516; --pub const NID_set_certExt: c_int = 517; --pub const NID_set_brand: c_int = 518; --pub const NID_setct_PANData: c_int = 519; --pub const NID_setct_PANToken: c_int = 520; --pub const NID_setct_PANOnly: c_int = 521; --pub const NID_setct_OIData: c_int = 522; --pub const NID_setct_PI: c_int = 523; --pub const NID_setct_PIData: c_int = 524; --pub const NID_setct_PIDataUnsigned: c_int = 525; --pub const NID_setct_HODInput: c_int = 526; --pub const NID_setct_AuthResBaggage: c_int = 527; --pub const NID_setct_AuthRevReqBaggage: c_int = 528; --pub const NID_setct_AuthRevResBaggage: c_int = 529; --pub const NID_setct_CapTokenSeq: c_int = 530; --pub const NID_setct_PInitResData: c_int = 531; --pub const NID_setct_PI_TBS: c_int = 532; --pub const NID_setct_PResData: c_int = 533; --pub const NID_setct_AuthReqTBS: c_int = 534; --pub const NID_setct_AuthResTBS: c_int = 535; --pub const NID_setct_AuthResTBSX: c_int = 536; --pub const NID_setct_AuthTokenTBS: c_int = 537; --pub const NID_setct_CapTokenData: c_int = 538; --pub const NID_setct_CapTokenTBS: c_int = 539; --pub const NID_setct_AcqCardCodeMsg: c_int = 540; --pub const NID_setct_AuthRevReqTBS: c_int = 541; --pub const NID_setct_AuthRevResData: c_int = 542; --pub const NID_setct_AuthRevResTBS: c_int = 543; --pub const NID_setct_CapReqTBS: c_int = 544; --pub const NID_setct_CapReqTBSX: c_int = 545; --pub const NID_setct_CapResData: c_int = 546; --pub const NID_setct_CapRevReqTBS: c_int = 547; --pub const NID_setct_CapRevReqTBSX: c_int = 548; --pub const NID_setct_CapRevResData: c_int = 549; --pub const NID_setct_CredReqTBS: c_int = 550; --pub const NID_setct_CredReqTBSX: c_int = 551; --pub const NID_setct_CredResData: c_int = 552; --pub const NID_setct_CredRevReqTBS: c_int = 553; --pub const NID_setct_CredRevReqTBSX: c_int = 554; --pub const NID_setct_CredRevResData: c_int = 555; --pub const NID_setct_PCertReqData: c_int = 556; --pub const NID_setct_PCertResTBS: c_int = 557; --pub const NID_setct_BatchAdminReqData: c_int = 558; --pub const NID_setct_BatchAdminResData: c_int = 559; --pub const NID_setct_CardCInitResTBS: c_int = 560; --pub const NID_setct_MeAqCInitResTBS: c_int = 561; --pub const NID_setct_RegFormResTBS: c_int = 562; --pub const NID_setct_CertReqData: c_int = 563; --pub const NID_setct_CertReqTBS: c_int = 564; --pub const NID_setct_CertResData: c_int = 565; --pub const NID_setct_CertInqReqTBS: c_int = 566; --pub const NID_setct_ErrorTBS: c_int = 567; --pub const NID_setct_PIDualSignedTBE: c_int = 568; --pub const NID_setct_PIUnsignedTBE: c_int = 569; --pub const NID_setct_AuthReqTBE: c_int = 570; --pub const NID_setct_AuthResTBE: c_int = 571; --pub const NID_setct_AuthResTBEX: c_int = 572; --pub const NID_setct_AuthTokenTBE: c_int = 573; --pub const NID_setct_CapTokenTBE: c_int = 574; --pub const NID_setct_CapTokenTBEX: c_int = 575; --pub const NID_setct_AcqCardCodeMsgTBE: c_int = 576; --pub const NID_setct_AuthRevReqTBE: c_int = 577; --pub const NID_setct_AuthRevResTBE: c_int = 578; --pub const NID_setct_AuthRevResTBEB: c_int = 579; --pub const NID_setct_CapReqTBE: c_int = 580; --pub const NID_setct_CapReqTBEX: c_int = 581; --pub const NID_setct_CapResTBE: c_int = 582; --pub const NID_setct_CapRevReqTBE: c_int = 583; --pub const NID_setct_CapRevReqTBEX: c_int = 584; --pub const NID_setct_CapRevResTBE: c_int = 585; --pub const NID_setct_CredReqTBE: c_int = 586; --pub const NID_setct_CredReqTBEX: c_int = 587; --pub const NID_setct_CredResTBE: c_int = 588; --pub const NID_setct_CredRevReqTBE: c_int = 589; --pub const NID_setct_CredRevReqTBEX: c_int = 590; --pub const NID_setct_CredRevResTBE: c_int = 591; --pub const NID_setct_BatchAdminReqTBE: c_int = 592; --pub const NID_setct_BatchAdminResTBE: c_int = 593; --pub const NID_setct_RegFormReqTBE: c_int = 594; --pub const NID_setct_CertReqTBE: c_int = 595; --pub const NID_setct_CertReqTBEX: c_int = 596; --pub const NID_setct_CertResTBE: c_int = 597; --pub const NID_setct_CRLNotificationTBS: c_int = 598; --pub const NID_setct_CRLNotificationResTBS: c_int = 599; --pub const NID_setct_BCIDistributionTBS: c_int = 600; --pub const NID_setext_genCrypt: c_int = 601; --pub const NID_setext_miAuth: c_int = 602; --pub const NID_setext_pinSecure: c_int = 603; --pub const NID_setext_pinAny: c_int = 604; --pub const NID_setext_track2: c_int = 605; --pub const NID_setext_cv: c_int = 606; --pub const NID_set_policy_root: c_int = 607; --pub const NID_setCext_hashedRoot: c_int = 608; --pub const NID_setCext_certType: c_int = 609; --pub const NID_setCext_merchData: c_int = 610; --pub const NID_setCext_cCertRequired: c_int = 611; --pub const NID_setCext_tunneling: c_int = 612; --pub const NID_setCext_setExt: c_int = 613; --pub const NID_setCext_setQualf: c_int = 614; --pub const NID_setCext_PGWYcapabilities: c_int = 615; --pub const NID_setCext_TokenIdentifier: c_int = 616; --pub const NID_setCext_Track2Data: c_int = 617; --pub const NID_setCext_TokenType: c_int = 618; --pub const NID_setCext_IssuerCapabilities: c_int = 619; --pub const NID_setAttr_Cert: c_int = 620; --pub const NID_setAttr_PGWYcap: c_int = 621; --pub const NID_setAttr_TokenType: c_int = 622; --pub const NID_setAttr_IssCap: c_int = 623; --pub const NID_set_rootKeyThumb: c_int = 624; --pub const NID_set_addPolicy: c_int = 625; --pub const NID_setAttr_Token_EMV: c_int = 626; --pub const NID_setAttr_Token_B0Prime: c_int = 627; --pub const NID_setAttr_IssCap_CVM: c_int = 628; --pub const NID_setAttr_IssCap_T2: c_int = 629; --pub const NID_setAttr_IssCap_Sig: c_int = 630; --pub const NID_setAttr_GenCryptgrm: c_int = 631; --pub const NID_setAttr_T2Enc: c_int = 632; --pub const NID_setAttr_T2cleartxt: c_int = 633; --pub const NID_setAttr_TokICCsig: c_int = 634; --pub const NID_setAttr_SecDevSig: c_int = 635; --pub const NID_set_brand_IATA_ATA: c_int = 636; --pub const NID_set_brand_Diners: c_int = 637; --pub const NID_set_brand_AmericanExpress: c_int = 638; --pub const NID_set_brand_JCB: c_int = 639; --pub const NID_set_brand_Visa: c_int = 640; --pub const NID_set_brand_MasterCard: c_int = 641; --pub const NID_set_brand_Novus: c_int = 642; --pub const NID_des_cdmf: c_int = 643; --pub const NID_rsaOAEPEncryptionSET: c_int = 644; --pub const NID_ipsec3: c_int = 749; --pub const NID_ipsec4: c_int = 750; --pub const NID_whirlpool: c_int = 804; --pub const NID_cryptopro: c_int = 805; --pub const NID_cryptocom: c_int = 806; --pub const NID_id_GostR3411_94_with_GostR3410_2001: c_int = 807; --pub const NID_id_GostR3411_94_with_GostR3410_94: c_int = 808; --pub const NID_id_GostR3411_94: c_int = 809; --pub const NID_id_HMACGostR3411_94: c_int = 810; --pub const NID_id_GostR3410_2001: c_int = 811; --pub const NID_id_GostR3410_94: c_int = 812; --pub const NID_id_Gost28147_89: c_int = 813; --pub const NID_gost89_cnt: c_int = 814; --pub const NID_id_Gost28147_89_MAC: c_int = 815; --pub const NID_id_GostR3411_94_prf: c_int = 816; --pub const NID_id_GostR3410_2001DH: c_int = 817; --pub const NID_id_GostR3410_94DH: c_int = 818; --pub const NID_id_Gost28147_89_CryptoPro_KeyMeshing: c_int = 819; --pub const NID_id_Gost28147_89_None_KeyMeshing: c_int = 820; --pub const NID_id_GostR3411_94_TestParamSet: c_int = 821; --pub const NID_id_GostR3411_94_CryptoProParamSet: c_int = 822; --pub const NID_id_Gost28147_89_TestParamSet: c_int = 823; --pub const NID_id_Gost28147_89_CryptoPro_A_ParamSet: c_int = 824; --pub const NID_id_Gost28147_89_CryptoPro_B_ParamSet: c_int = 825; --pub const NID_id_Gost28147_89_CryptoPro_C_ParamSet: c_int = 826; --pub const NID_id_Gost28147_89_CryptoPro_D_ParamSet: c_int = 827; --pub const NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet: c_int = 828; --pub const NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet: c_int = 829; --pub const NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet: c_int = 830; --pub const NID_id_GostR3410_94_TestParamSet: c_int = 831; --pub const NID_id_GostR3410_94_CryptoPro_A_ParamSet: c_int = 832; --pub const NID_id_GostR3410_94_CryptoPro_B_ParamSet: c_int = 833; --pub const NID_id_GostR3410_94_CryptoPro_C_ParamSet: c_int = 834; --pub const NID_id_GostR3410_94_CryptoPro_D_ParamSet: c_int = 835; --pub const NID_id_GostR3410_94_CryptoPro_XchA_ParamSet: c_int = 836; --pub const NID_id_GostR3410_94_CryptoPro_XchB_ParamSet: c_int = 837; --pub const NID_id_GostR3410_94_CryptoPro_XchC_ParamSet: c_int = 838; --pub const NID_id_GostR3410_2001_TestParamSet: c_int = 839; --pub const NID_id_GostR3410_2001_CryptoPro_A_ParamSet: c_int = 840; --pub const NID_id_GostR3410_2001_CryptoPro_B_ParamSet: c_int = 841; --pub const NID_id_GostR3410_2001_CryptoPro_C_ParamSet: c_int = 842; --pub const NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet: c_int = 843; --pub const NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet: c_int = 844; --pub const NID_id_GostR3410_94_a: c_int = 845; --pub const NID_id_GostR3410_94_aBis: c_int = 846; --pub const NID_id_GostR3410_94_b: c_int = 847; --pub const NID_id_GostR3410_94_bBis: c_int = 848; --pub const NID_id_Gost28147_89_cc: c_int = 849; --pub const NID_id_GostR3410_94_cc: c_int = 850; --pub const NID_id_GostR3410_2001_cc: c_int = 851; --pub const NID_id_GostR3411_94_with_GostR3410_94_cc: c_int = 852; --pub const NID_id_GostR3411_94_with_GostR3410_2001_cc: c_int = 853; --pub const NID_id_GostR3410_2001_ParamSet_cc: c_int = 854; --pub const NID_camellia_128_cbc: c_int = 751; --pub const NID_camellia_192_cbc: c_int = 752; --pub const NID_camellia_256_cbc: c_int = 753; --pub const NID_id_camellia128_wrap: c_int = 907; --pub const NID_id_camellia192_wrap: c_int = 908; --pub const NID_id_camellia256_wrap: c_int = 909; --pub const NID_camellia_128_ecb: c_int = 754; --pub const NID_camellia_128_ofb128: c_int = 766; --pub const NID_camellia_128_cfb128: c_int = 757; --pub const NID_camellia_192_ecb: c_int = 755; --pub const NID_camellia_192_ofb128: c_int = 767; --pub const NID_camellia_192_cfb128: c_int = 758; --pub const NID_camellia_256_ecb: c_int = 756; --pub const NID_camellia_256_ofb128: c_int = 768; --pub const NID_camellia_256_cfb128: c_int = 759; --pub const NID_camellia_128_cfb1: c_int = 760; --pub const NID_camellia_192_cfb1: c_int = 761; --pub const NID_camellia_256_cfb1: c_int = 762; --pub const NID_camellia_128_cfb8: c_int = 763; --pub const NID_camellia_192_cfb8: c_int = 764; --pub const NID_camellia_256_cfb8: c_int = 765; --pub const NID_kisa: c_int = 773; --pub const NID_seed_ecb: c_int = 776; --pub const NID_seed_cbc: c_int = 777; --pub const NID_seed_cfb128: c_int = 779; --pub const NID_seed_ofb128: c_int = 778; --pub const NID_hmac: c_int = 855; --pub const NID_cmac: c_int = 894; --pub const NID_rc4_hmac_md5: c_int = 915; --pub const NID_aes_128_cbc_hmac_sha1: c_int = 916; --pub const NID_aes_192_cbc_hmac_sha1: c_int = 917; --pub const NID_aes_256_cbc_hmac_sha1: c_int = 918; -- --pub const OCSP_NOCERTS: c_ulong = 0x1; --pub const OCSP_NOINTERN: c_ulong = 0x2; --pub const OCSP_NOSIGS: c_ulong = 0x4; --pub const OCSP_NOCHAIN: c_ulong = 0x8; --pub const OCSP_NOVERIFY: c_ulong = 0x10; --pub const OCSP_NOEXPLICIT: c_ulong = 0x20; --pub const OCSP_NOCASIGN: c_ulong = 0x40; --pub const OCSP_NODELEGATED: c_ulong = 0x80; --pub const OCSP_NOCHECKS: c_ulong = 0x100; --pub const OCSP_TRUSTOTHER: c_ulong = 0x200; --pub const OCSP_RESPID_KEY: c_ulong = 0x400; --pub const OCSP_NOTIME: c_ulong = 0x800; -- --pub const V_OCSP_CERTSTATUS_GOOD: c_int = 0; --pub const V_OCSP_CERTSTATUS_REVOKED: c_int = 1; --pub const V_OCSP_CERTSTATUS_UNKNOWN: c_int = 2; -- --pub const OCSP_REVOKED_STATUS_NOSTATUS: c_int = -1; --pub const OCSP_REVOKED_STATUS_UNSPECIFIED: c_int = 0; --pub const OCSP_REVOKED_STATUS_KEYCOMPROMISE: c_int = 1; --pub const OCSP_REVOKED_STATUS_CACOMPROMISE: c_int = 2; --pub const OCSP_REVOKED_STATUS_AFFILIATIONCHANGED: c_int = 3; --pub const OCSP_REVOKED_STATUS_SUPERSEDED: c_int = 4; --pub const OCSP_REVOKED_STATUS_CESSATIONOFOPERATION: c_int = 5; --pub const OCSP_REVOKED_STATUS_CERTIFICATEHOLD: c_int = 6; --pub const OCSP_REVOKED_STATUS_REMOVEFROMCRL: c_int = 8; -- --pub const OCSP_RESPONSE_STATUS_SUCCESSFUL: c_int = 0; --pub const OCSP_RESPONSE_STATUS_MALFORMEDREQUEST: c_int = 1; --pub const OCSP_RESPONSE_STATUS_INTERNALERROR: c_int = 2; --pub const OCSP_RESPONSE_STATUS_TRYLATER: c_int = 3; --pub const OCSP_RESPONSE_STATUS_SIGREQUIRED: c_int = 5; --pub const OCSP_RESPONSE_STATUS_UNAUTHORIZED: c_int = 6; -- --pub const OPENSSL_EC_NAMED_CURVE: c_int = 1; -- --pub const PKCS5_SALT_LEN: c_int = 8; --pub const PKCS12_DEFAULT_ITER: c_int = 2048; -- --pub const RSA_F4: c_long = 0x10001; -- --pub const RSA_PKCS1_PADDING: c_int = 1; --pub const RSA_SSLV23_PADDING: c_int = 2; --pub const RSA_NO_PADDING: c_int = 3; --pub const RSA_PKCS1_OAEP_PADDING: c_int = 4; --pub const RSA_X931_PADDING: c_int = 5; --pub const RSA_PKCS1_PSS_PADDING: c_int = 6; -- --pub const SHA_LBLOCK: c_int = 16; -- --pub const SSL3_AD_ILLEGAL_PARAMETER: c_int = 47; --pub const SSL_AD_ILLEGAL_PARAMETER: c_int = SSL3_AD_ILLEGAL_PARAMETER; -- --pub const TLS1_AD_DECODE_ERROR: c_int = 50; --pub const SSL_AD_DECODE_ERROR: c_int = TLS1_AD_DECODE_ERROR; -- --pub const TLS1_AD_UNRECOGNIZED_NAME: c_int = 112; --pub const SSL_AD_UNRECOGNIZED_NAME: c_int = TLS1_AD_UNRECOGNIZED_NAME; -- --pub const SSL_CTRL_SET_TMP_DH: c_int = 3; --pub const SSL_CTRL_SET_TMP_ECDH: c_int = 4; --pub const SSL_CTRL_EXTRA_CHAIN_CERT: c_int = 14; --pub const SSL_CTRL_MODE: c_int = 33; --pub const SSL_CTRL_SET_READ_AHEAD: c_int = 41; --pub const SSL_CTRL_SET_SESS_CACHE_MODE: c_int = 44; --pub const SSL_CTRL_SET_TLSEXT_SERVERNAME_CB: c_int = 53; --pub const SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG: c_int = 54; --pub const SSL_CTRL_SET_TLSEXT_HOSTNAME: c_int = 55; --pub const SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB: c_int = 63; --pub const SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG: c_int = 64; --pub const SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE: c_int = 65; --pub const SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP: c_int = 70; --pub const SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP: c_int = 71; --pub const SSL_CTRL_GET_EXTRA_CHAIN_CERTS: c_int = 82; -- --pub const SSL_MODE_ENABLE_PARTIAL_WRITE: c_long = 0x1; --pub const SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER: c_long = 0x2; --pub const SSL_MODE_AUTO_RETRY: c_long = 0x4; --pub const SSL_MODE_NO_AUTO_CHAIN: c_long = 0x8; --pub const SSL_MODE_RELEASE_BUFFERS: c_long = 0x10; -- --pub const SSL_ERROR_NONE: c_int = 0; --pub const SSL_ERROR_SSL: c_int = 1; --pub const SSL_ERROR_SYSCALL: c_int = 5; --pub const SSL_ERROR_WANT_ACCEPT: c_int = 8; --pub const SSL_ERROR_WANT_CONNECT: c_int = 7; --pub const SSL_ERROR_WANT_READ: c_int = 2; --pub const SSL_ERROR_WANT_WRITE: c_int = 3; --pub const SSL_ERROR_WANT_X509_LOOKUP: c_int = 4; --pub const SSL_ERROR_ZERO_RETURN: c_int = 6; --pub const SSL_VERIFY_NONE: c_int = 0; --pub const SSL_VERIFY_PEER: c_int = 1; --pub const SSL_VERIFY_FAIL_IF_NO_PEER_CERT: c_int = 2; -- --#[cfg(any(ossl102, all(libressl, not(libressl261))))] --pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x00000010; --#[cfg(libressl261)] --pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x0; --pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: c_ulong = 0x00000800; --#[cfg(not(libressl261))] --pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x80000000; --#[cfg(libressl261)] --pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x0; --pub const SSL_OP_LEGACY_SERVER_CONNECT: c_ulong = 0x00000004; --#[cfg(not(any(libressl, ossl110f)))] --pub const SSL_OP_ALL: c_ulong = 0x80000BFF; --#[cfg(ossl110f)] --pub const SSL_OP_ALL: c_ulong = SSL_OP_CRYPTOPRO_TLSEXT_BUG -- | SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS -- | SSL_OP_LEGACY_SERVER_CONNECT -- | SSL_OP_TLSEXT_PADDING -- | SSL_OP_SAFARI_ECDHE_ECDSA_BUG; --pub const SSL_OP_NO_QUERY_MTU: c_ulong = 0x00001000; --pub const SSL_OP_COOKIE_EXCHANGE: c_ulong = 0x00002000; --pub const SSL_OP_NO_TICKET: c_ulong = 0x00004000; --pub const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: c_ulong = 0x00010000; --pub const SSL_OP_CIPHER_SERVER_PREFERENCE: c_ulong = 0x00400000; --pub const SSL_OP_TLS_ROLLBACK_BUG: c_ulong = 0x00800000; --pub const SSL_OP_NO_TLSv1: c_ulong = 0x04000000; --pub const SSL_OP_NO_TLSv1_1: c_ulong = 0x10000000; --pub const SSL_OP_NO_TLSv1_2: c_ulong = 0x08000000; -- --#[cfg(all(ossl102, not(ossl111)))] --pub const SSL_OP_NO_SSL_MASK: c_ulong = -- SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2; --#[cfg(ossl111)] --pub const SSL_OP_NO_SSL_MASK: c_ulong = SSL_OP_NO_SSLv2 -- | SSL_OP_NO_SSLv3 -- | SSL_OP_NO_TLSv1 -- | SSL_OP_NO_TLSv1_1 -- | SSL_OP_NO_TLSv1_2 -- | SSL_OP_NO_TLSv1_3; -- --pub const SSL_FILETYPE_PEM: c_int = X509_FILETYPE_PEM; --pub const SSL_FILETYPE_ASN1: c_int = X509_FILETYPE_ASN1; -- --pub const SSL_SESS_CACHE_OFF: c_long = 0; --pub const SSL_SESS_CACHE_CLIENT: c_long = 0x1; --pub const SSL_SESS_CACHE_SERVER: c_long = 0x2; --pub const SSL_SESS_CACHE_BOTH: c_long = SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_SERVER; --pub const SSL_SESS_CACHE_NO_AUTO_CLEAR: c_long = 0x80; --pub const SSL_SESS_CACHE_NO_INTERNAL_LOOKUP: c_long = 0x100; --pub const SSL_SESS_CACHE_NO_INTERNAL_STORE: c_long = 0x200; --pub const SSL_SESS_CACHE_NO_INTERNAL: c_long = -- SSL_SESS_CACHE_NO_INTERNAL_LOOKUP | SSL_SESS_CACHE_NO_INTERNAL_STORE; -- --pub const SSL3_VERSION: c_int = 0x300; --pub const TLS1_VERSION: c_int = 0x301; --pub const TLS1_1_VERSION: c_int = 0x302; --pub const TLS1_2_VERSION: c_int = 0x303; -- --pub const TLSEXT_NAMETYPE_host_name: c_int = 0; -- --pub const TLSEXT_STATUSTYPE_ocsp: c_int = 1; -- --pub const SSL_TLSEXT_ERR_OK: c_int = 0; --pub const SSL_TLSEXT_ERR_ALERT_WARNING: c_int = 1; --pub const SSL_TLSEXT_ERR_ALERT_FATAL: c_int = 2; --pub const SSL_TLSEXT_ERR_NOACK: c_int = 3; -- --pub const OPENSSL_NPN_UNSUPPORTED: c_int = 0; --pub const OPENSSL_NPN_NEGOTIATED: c_int = 1; --pub const OPENSSL_NPN_NO_OVERLAP: c_int = 2; -- --pub const V_ASN1_GENERALIZEDTIME: c_int = 24; --pub const V_ASN1_UTCTIME: c_int = 23; -- --pub const X509_FILETYPE_ASN1: c_int = 2; --pub const X509_FILETYPE_DEFAULT: c_int = 3; --pub const X509_FILETYPE_PEM: c_int = 1; -- --pub const X509_V_OK: c_int = 0; --pub const X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: c_int = 2; --pub const X509_V_ERR_UNABLE_TO_GET_CRL: c_int = 3; --pub const X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE: c_int = 4; --pub const X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE: c_int = 5; --pub const X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY: c_int = 6; --pub const X509_V_ERR_CERT_SIGNATURE_FAILURE: c_int = 7; --pub const X509_V_ERR_CRL_SIGNATURE_FAILURE: c_int = 8; --pub const X509_V_ERR_CERT_NOT_YET_VALID: c_int = 9; --pub const X509_V_ERR_CERT_HAS_EXPIRED: c_int = 10; --pub const X509_V_ERR_CRL_NOT_YET_VALID: c_int = 11; --pub const X509_V_ERR_CRL_HAS_EXPIRED: c_int = 12; --pub const X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: c_int = 13; --pub const X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: c_int = 14; --pub const X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD: c_int = 15; --pub const X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD: c_int = 16; --pub const X509_V_ERR_OUT_OF_MEM: c_int = 17; --pub const X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: c_int = 18; --pub const X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN: c_int = 19; --pub const X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY: c_int = 20; --pub const X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE: c_int = 21; --pub const X509_V_ERR_CERT_CHAIN_TOO_LONG: c_int = 22; --pub const X509_V_ERR_CERT_REVOKED: c_int = 23; --pub const X509_V_ERR_INVALID_CA: c_int = 24; --pub const X509_V_ERR_PATH_LENGTH_EXCEEDED: c_int = 25; --pub const X509_V_ERR_INVALID_PURPOSE: c_int = 26; --pub const X509_V_ERR_CERT_UNTRUSTED: c_int = 27; --pub const X509_V_ERR_CERT_REJECTED: c_int = 28; --pub const X509_V_ERR_SUBJECT_ISSUER_MISMATCH: c_int = 29; --pub const X509_V_ERR_AKID_SKID_MISMATCH: c_int = 30; --pub const X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH: c_int = 31; --pub const X509_V_ERR_KEYUSAGE_NO_CERTSIGN: c_int = 32; --pub const X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER: c_int = 33; --pub const X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION: c_int = 34; --pub const X509_V_ERR_KEYUSAGE_NO_CRL_SIGN: c_int = 35; --pub const X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION: c_int = 36; --pub const X509_V_ERR_INVALID_NON_CA: c_int = 37; --pub const X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED: c_int = 38; --pub const X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE: c_int = 39; --pub const X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED: c_int = 40; --pub const X509_V_ERR_INVALID_EXTENSION: c_int = 41; --pub const X509_V_ERR_INVALID_POLICY_EXTENSION: c_int = 42; --pub const X509_V_ERR_NO_EXPLICIT_POLICY: c_int = 43; --pub const X509_V_ERR_DIFFERENT_CRL_SCOPE: c_int = 44; --pub const X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE: c_int = 45; --pub const X509_V_ERR_UNNESTED_RESOURCE: c_int = 46; --pub const X509_V_ERR_PERMITTED_VIOLATION: c_int = 47; --pub const X509_V_ERR_EXCLUDED_VIOLATION: c_int = 48; --pub const X509_V_ERR_SUBTREE_MINMAX: c_int = 49; --pub const X509_V_ERR_APPLICATION_VERIFICATION: c_int = 50; --pub const X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE: c_int = 51; --pub const X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX: c_int = 52; --pub const X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: c_int = 53; --pub const X509_V_ERR_CRL_PATH_VALIDATION_ERROR: c_int = 54; -- --#[cfg(ossl102)] --pub const X509_V_ERR_SUITE_B_INVALID_VERSION: c_int = 56; --#[cfg(ossl102)] --pub const X509_V_ERR_SUITE_B_INVALID_ALGORITHM: c_int = 57; --#[cfg(ossl102)] --pub const X509_V_ERR_SUITE_B_INVALID_CURVE: c_int = 58; --#[cfg(ossl102)] --pub const X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM: c_int = 59; --#[cfg(ossl102)] --pub const X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED: c_int = 60; --#[cfg(ossl102)] --pub const X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256: c_int = 61; -- --#[cfg(ossl102)] --pub const X509_V_ERR_HOSTNAME_MISMATCH: c_int = 62; --#[cfg(ossl102)] --pub const X509_V_ERR_EMAIL_MISMATCH: c_int = 63; --#[cfg(ossl102)] --pub const X509_V_ERR_IP_ADDRESS_MISMATCH: c_int = 64; -- --#[cfg(any(ossl102, libressl261))] --pub const X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT: c_uint = 0x1; --#[cfg(any(ossl102, libressl261))] --pub const X509_CHECK_FLAG_NO_WILDCARDS: c_uint = 0x2; --#[cfg(any(ossl102, libressl261))] --pub const X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS: c_uint = 0x4; --#[cfg(any(ossl102, libressl261))] --pub const X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS: c_uint = 0x8; --#[cfg(any(ossl102, libressl261))] --pub const X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS: c_uint = 0x10; -- --pub const GEN_OTHERNAME: c_int = 0; --pub const GEN_EMAIL: c_int = 1; --pub const GEN_DNS: c_int = 2; --pub const GEN_X400: c_int = 3; --pub const GEN_DIRNAME: c_int = 4; --pub const GEN_EDIPARTY: c_int = 5; --pub const GEN_URI: c_int = 6; --pub const GEN_IPADD: c_int = 7; --pub const GEN_RID: c_int = 8; -- --pub const DTLS1_COOKIE_LENGTH: c_uint = 256; -- --// macros --pub unsafe fn BIO_get_mem_data(b: *mut BIO, pp: *mut *mut c_char) -> c_long { -- BIO_ctrl(b, BIO_CTRL_INFO, 0, pp as *mut c_void) -+ INIT.call_once(|| unsafe { -+ OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, ptr::null_mut()); -+ }) - } - --pub unsafe fn BIO_clear_retry_flags(b: *mut BIO) { -- BIO_clear_flags(b, BIO_FLAGS_RWS | BIO_FLAGS_SHOULD_RETRY) --} -+#[cfg(not(ossl110))] -+pub fn init() { -+ use std::io::{self, Write}; -+ use std::mem; -+ use std::process; -+ use std::sync::{Mutex, MutexGuard, Once, ONCE_INIT}; - --pub unsafe fn BIO_set_retry_read(b: *mut BIO) { -- BIO_set_flags(b, BIO_FLAGS_READ | BIO_FLAGS_SHOULD_RETRY) --} -+ static mut MUTEXES: *mut Vec> = 0 as *mut Vec>; -+ static mut GUARDS: *mut Vec>> = -+ 0 as *mut Vec>>; - --pub unsafe fn BIO_set_retry_write(b: *mut BIO) { -- BIO_set_flags(b, BIO_FLAGS_WRITE | BIO_FLAGS_SHOULD_RETRY) --} -- --pub unsafe fn EVP_get_digestbynid(type_: c_int) -> *const EVP_MD { -- EVP_get_digestbyname(OBJ_nid2sn(type_)) --} -- --// EVP_PKEY_CTX_ctrl macros --pub unsafe fn EVP_PKEY_CTX_set_rsa_padding(ctx: *mut EVP_PKEY_CTX, pad: c_int) -> c_int { -- EVP_PKEY_CTX_ctrl( -- ctx, -- EVP_PKEY_RSA, -- -1, -- EVP_PKEY_CTRL_RSA_PADDING, -- pad, -- ptr::null_mut(), -- ) --} -- --pub unsafe fn EVP_PKEY_CTX_get_rsa_padding(ctx: *mut EVP_PKEY_CTX, ppad: *mut c_int) -> c_int { -- EVP_PKEY_CTX_ctrl( -- ctx, -- EVP_PKEY_RSA, -- -1, -- EVP_PKEY_CTRL_GET_RSA_PADDING, -- 0, -- ppad as *mut c_void, -- ) --} -- --pub unsafe fn EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx: *mut EVP_PKEY_CTX, len: c_int) -> c_int { -- EVP_PKEY_CTX_ctrl( -- ctx, -- EVP_PKEY_RSA, -- EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY, -- EVP_PKEY_CTRL_RSA_PSS_SALTLEN, -- len, -- ptr::null_mut(), -- ) --} -- --pub unsafe fn EVP_PKEY_CTX_set_rsa_mgf1_md(ctx: *mut EVP_PKEY_CTX, md: *mut EVP_MD) -> c_int { -- EVP_PKEY_CTX_ctrl( -- ctx, -- EVP_PKEY_RSA, -- EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT, -- EVP_PKEY_CTRL_RSA_MGF1_MD, -- 0, -- md as *mut c_void, -- ) --} -- --pub unsafe fn SSL_CTX_set_mode(ctx: *mut SSL_CTX, op: c_long) -> c_long { -- SSL_CTX_ctrl(ctx, SSL_CTRL_MODE, op, ptr::null_mut()) --} -- --pub unsafe fn SSL_CTX_set_read_ahead(ctx: *mut SSL_CTX, m: c_long) -> c_long { -- SSL_CTX_ctrl(ctx, SSL_CTRL_SET_READ_AHEAD, m, ptr::null_mut()) --} -- --pub unsafe fn SSL_CTX_set_tmp_dh(ctx: *mut SSL_CTX, dh: *mut DH) -> c_long { -- SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TMP_DH, 0, dh as *mut c_void) --} -- --pub unsafe fn SSL_CTX_set_tmp_ecdh(ctx: *mut SSL_CTX, key: *mut EC_KEY) -> c_long { -- SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TMP_ECDH, 0, key as *mut c_void) --} -- --pub unsafe fn SSL_set_tmp_dh(ssl: *mut SSL, dh: *mut DH) -> c_long { -- SSL_ctrl(ssl, SSL_CTRL_SET_TMP_DH, 0, dh as *mut c_void) --} -- --pub unsafe fn SSL_set_tmp_ecdh(ssl: *mut SSL, key: *mut EC_KEY) -> c_long { -- SSL_ctrl(ssl, SSL_CTRL_SET_TMP_ECDH, 0, key as *mut c_void) --} -- --pub unsafe fn SSL_CTX_add_extra_chain_cert(ctx: *mut SSL_CTX, x509: *mut X509) -> c_long { -- SSL_CTX_ctrl(ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, x509 as *mut c_void) --} -- --#[cfg(ossl102)] --pub unsafe fn SSL_CTX_set0_verify_cert_store(ctx: *mut SSL_CTX, st: *mut X509_STORE) -> c_long { -- SSL_CTX_ctrl(ctx, SSL_CTRL_SET_VERIFY_CERT_STORE, 0, st as *mut c_void) --} -- --pub unsafe fn SSL_CTX_set_tlsext_servername_callback( -- ctx: *mut SSL_CTX, -- cb: Option, --) -> c_long { -- SSL_CTX_callback_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_CB, cb) --} -- --pub unsafe fn SSL_set_tlsext_host_name(s: *mut SSL, name: *mut c_char) -> c_long { -- SSL_ctrl( -- s, -- SSL_CTRL_SET_TLSEXT_HOSTNAME, -- TLSEXT_NAMETYPE_host_name as c_long, -- name as *mut c_void, -- ) --} -- --pub unsafe fn SSL_set_tlsext_status_type(s: *mut SSL, type_: c_int) -> c_long { -- SSL_ctrl( -- s, -- SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE, -- type_ as c_long, -- ptr::null_mut(), -- ) --} -- --pub unsafe fn SSL_CTX_set_tlsext_status_cb( -- ctx: *mut SSL_CTX, -- cb: Option c_int>, --) -> c_long { -- SSL_CTX_callback_ctrl(ctx, SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB, mem::transmute(cb)) --} -- --pub unsafe fn SSL_CTX_set_tlsext_status_arg(ctx: *mut SSL_CTX, arg: *mut c_void) -> c_long { -- SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG, 0, arg) --} -- --pub unsafe fn SSL_CTX_get_extra_chain_certs( -- ctx: *mut SSL_CTX, -- chain: *mut *mut stack_st_X509, --) -> c_long { -- SSL_CTX_ctrl(ctx, SSL_CTRL_GET_EXTRA_CHAIN_CERTS, 0, chain as *mut c_void) --} -- --pub unsafe fn SSL_CTX_set_session_cache_mode(ctx: *mut SSL_CTX, m: c_long) -> c_long { -- SSL_CTX_ctrl(ctx, SSL_CTRL_SET_SESS_CACHE_MODE, m, ptr::null_mut()) --} -- --pub unsafe fn SSL_get_tlsext_status_ocsp_resp(ssl: *mut SSL, resp: *mut *mut c_uchar) -> c_long { -- SSL_ctrl( -- ssl, -- SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP, -- 0, -- resp as *mut c_void, -- ) --} -- --pub unsafe fn SSL_set_tlsext_status_ocsp_resp( -- ssl: *mut SSL, -- resp: *mut c_uchar, -- len: c_long, --) -> c_long { -- SSL_ctrl( -- ssl, -- SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP, -- len, -- resp as *mut c_void, -- ) --} -- --pub fn ERR_GET_LIB(l: c_ulong) -> c_int { -- ((l >> 24) & 0x0FF) as c_int --} -- --pub fn ERR_GET_FUNC(l: c_ulong) -> c_int { -- ((l >> 12) & 0xFFF) as c_int --} -- --pub fn ERR_GET_REASON(l: c_ulong) -> c_int { -- (l & 0xFFF) as c_int --} -- --extern "C" { -- pub fn AES_set_encrypt_key(userKey: *const c_uchar, bits: c_int, key: *mut AES_KEY) -> c_int; -- pub fn AES_set_decrypt_key(userKey: *const c_uchar, bits: c_int, key: *mut AES_KEY) -> c_int; -- pub fn AES_ige_encrypt( -- in_: *const c_uchar, -- out: *mut c_uchar, -- length: size_t, -- key: *const AES_KEY, -- ivec: *mut c_uchar, -- enc: c_int, -- ); -- -- pub fn ASN1_INTEGER_get(dest: *const ASN1_INTEGER) -> c_long; -- pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int; -- pub fn ASN1_INTEGER_to_BN(ai: *const ASN1_INTEGER, bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn ASN1_GENERALIZEDTIME_free(tm: *mut ASN1_GENERALIZEDTIME); -- pub fn ASN1_GENERALIZEDTIME_print(b: *mut BIO, tm: *const ASN1_GENERALIZEDTIME) -> c_int; -- pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING; -- pub fn ASN1_TIME_free(tm: *mut ASN1_TIME); -- pub fn ASN1_TIME_print(b: *mut BIO, tm: *const ASN1_TIME) -> c_int; -- pub fn ASN1_BIT_STRING_free(x: *mut ASN1_BIT_STRING); -- pub fn ASN1_OBJECT_free(x: *mut ASN1_OBJECT); -- -- pub fn BIO_ctrl(b: *mut BIO, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long; -- pub fn BIO_free_all(b: *mut BIO); -- pub fn BIO_new_fp(stream: *mut FILE, close_flag: c_int) -> *mut BIO; -- pub fn BIO_new_socket(sock: c_int, close_flag: c_int) -> *mut BIO; -- pub fn BIO_read(b: *mut BIO, buf: *mut c_void, len: c_int) -> c_int; -- pub fn BIO_write(b: *mut BIO, buf: *const c_void, len: c_int) -> c_int; -- #[cfg(not(ossl102))] -- pub fn BIO_new_mem_buf(buf: *mut c_void, len: c_int) -> *mut BIO; -- #[cfg(ossl102)] -- pub fn BIO_new_mem_buf(buf: *const c_void, len: c_int) -> *mut BIO; -- pub fn BIO_set_flags(b: *mut BIO, flags: c_int); -- pub fn BIO_clear_flags(b: *mut BIO, flags: c_int); -- -- pub fn BN_CTX_new() -> *mut BN_CTX; -- pub fn BN_CTX_free(ctx: *mut BN_CTX); -- -- pub fn BN_new() -> *mut BIGNUM; -- pub fn BN_dup(n: *const BIGNUM) -> *mut BIGNUM; -- pub fn BN_clear(bn: *mut BIGNUM); -- pub fn BN_free(bn: *mut BIGNUM); -- pub fn BN_clear_free(bn: *mut BIGNUM); -- pub fn BN_num_bits(bn: *const BIGNUM) -> c_int; -- pub fn BN_set_negative(bn: *mut BIGNUM, n: c_int); -- pub fn BN_set_word(bn: *mut BIGNUM, n: BN_ULONG) -> c_int; -- pub fn BN_add(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM) -> c_int; -- pub fn BN_div( -- dv: *mut BIGNUM, -- rem: *mut BIGNUM, -- a: *const BIGNUM, -- b: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn BN_exp(r: *mut BIGNUM, a: *const BIGNUM, p: *const BIGNUM, ctx: *mut BN_CTX) -> c_int; -- pub fn BN_gcd(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> c_int; -- pub fn BN_mod_add( -- r: *mut BIGNUM, -- a: *const BIGNUM, -- b: *const BIGNUM, -- m: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn BN_mod_exp( -- r: *mut BIGNUM, -- a: *const BIGNUM, -- p: *const BIGNUM, -- m: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn BN_mod_inverse( -- r: *mut BIGNUM, -- a: *const BIGNUM, -- n: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> *mut BIGNUM; -- pub fn BN_mod_mul( -- r: *mut BIGNUM, -- a: *const BIGNUM, -- b: *const BIGNUM, -- m: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn BN_mod_sqr( -- r: *mut BIGNUM, -- a: *const BIGNUM, -- m: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn BN_mod_sub( -- r: *mut BIGNUM, -- a: *const BIGNUM, -- b: *const BIGNUM, -- m: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn BN_mul(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> c_int; -- pub fn BN_nnmod( -- rem: *mut BIGNUM, -- a: *const BIGNUM, -- m: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn BN_add_word(r: *mut BIGNUM, w: BN_ULONG) -> c_int; -- pub fn BN_sub_word(r: *mut BIGNUM, w: BN_ULONG) -> c_int; -- pub fn BN_mul_word(r: *mut BIGNUM, w: BN_ULONG) -> c_int; -- pub fn BN_div_word(r: *mut BIGNUM, w: BN_ULONG) -> BN_ULONG; -- pub fn BN_mod_word(r: *const BIGNUM, w: BN_ULONG) -> BN_ULONG; -- pub fn BN_sqr(r: *mut BIGNUM, a: *const BIGNUM, ctx: *mut BN_CTX) -> c_int; -- pub fn BN_sub(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM) -> c_int; -- pub fn BN_clear_bit(a: *mut BIGNUM, n: c_int) -> c_int; -- pub fn BN_is_bit_set(a: *const BIGNUM, n: c_int) -> c_int; -- pub fn BN_lshift(r: *mut BIGNUM, a: *const BIGNUM, n: c_int) -> c_int; -- pub fn BN_lshift1(r: *mut BIGNUM, a: *const BIGNUM) -> c_int; -- pub fn BN_mask_bits(a: *mut BIGNUM, n: c_int) -> c_int; -- pub fn BN_rshift(r: *mut BIGNUM, a: *const BIGNUM, n: c_int) -> c_int; -- pub fn BN_set_bit(a: *mut BIGNUM, n: c_int) -> c_int; -- pub fn BN_rshift1(r: *mut BIGNUM, a: *const BIGNUM) -> c_int; -- pub fn BN_cmp(a: *const BIGNUM, b: *const BIGNUM) -> c_int; -- pub fn BN_ucmp(a: *const BIGNUM, b: *const BIGNUM) -> c_int; -- pub fn BN_generate_prime_ex( -- r: *mut BIGNUM, -- bits: c_int, -- safe: c_int, -- add: *const BIGNUM, -- rem: *const BIGNUM, -- cb: *mut BN_GENCB, -- ) -> c_int; -- pub fn BN_is_prime_ex( -- p: *const BIGNUM, -- checks: c_int, -- ctx: *mut BN_CTX, -- cb: *mut BN_GENCB, -- ) -> c_int; -- pub fn BN_is_prime_fasttest_ex( -- p: *const BIGNUM, -- checks: c_int, -- ctx: *mut BN_CTX, -- do_trial_division: c_int, -- cb: *mut BN_GENCB, -- ) -> c_int; -- pub fn BN_rand(r: *mut BIGNUM, bits: c_int, top: c_int, bottom: c_int) -> c_int; -- pub fn BN_pseudo_rand(r: *mut BIGNUM, bits: c_int, top: c_int, bottom: c_int) -> c_int; -- pub fn BN_rand_range(r: *mut BIGNUM, range: *const BIGNUM) -> c_int; -- pub fn BN_pseudo_rand_range(r: *mut BIGNUM, range: *const BIGNUM) -> c_int; -- pub fn BN_bin2bn(s: *const u8, size: c_int, ret: *mut BIGNUM) -> *mut BIGNUM; -- pub fn BN_bn2bin(a: *const BIGNUM, to: *mut u8) -> c_int; -- pub fn BN_dec2bn(a: *mut *mut BIGNUM, s: *const c_char) -> c_int; -- pub fn BN_bn2dec(a: *const BIGNUM) -> *mut c_char; -- pub fn BN_hex2bn(a: *mut *mut BIGNUM, s: *const c_char) -> c_int; -- pub fn BN_bn2hex(a: *const BIGNUM) -> *mut c_char; -- pub fn BN_to_ASN1_INTEGER(bn: *const BIGNUM, ai: *mut ASN1_INTEGER) -> *mut ASN1_INTEGER; -- -- pub fn NCONF_default() -> *mut CONF_METHOD; -- pub fn NCONF_new(meth: *mut CONF_METHOD) -> *mut CONF; -- pub fn NCONF_free(conf: *mut CONF); -- -- pub fn CRYPTO_memcmp(a: *const c_void, b: *const c_void, len: size_t) -> c_int; -- -- pub fn DH_new() -> *mut DH; -- pub fn DH_free(dh: *mut DH); -- #[cfg(ossl102)] -- pub fn DH_get_1024_160() -> *mut DH; -- #[cfg(ossl102)] -- pub fn DH_get_2048_224() -> *mut DH; -- #[cfg(ossl102)] -- pub fn DH_get_2048_256() -> *mut DH; -- -- pub fn EC_KEY_new() -> *mut EC_KEY; -- pub fn EC_KEY_new_by_curve_name(nid: c_int) -> *mut EC_KEY; -- pub fn EC_KEY_dup(key: *const EC_KEY) -> *mut EC_KEY; -- pub fn EC_KEY_up_ref(key: *mut EC_KEY) -> c_int; -- pub fn EC_KEY_set_group(key: *mut EC_KEY, group: *const EC_GROUP) -> c_int; -- pub fn EC_KEY_get0_group(key: *const EC_KEY) -> *const EC_GROUP; -- pub fn EC_KEY_set_public_key(key: *mut EC_KEY, key: *const EC_POINT) -> c_int; -- pub fn EC_KEY_get0_public_key(key: *const EC_KEY) -> *const EC_POINT; -- pub fn EC_KEY_set_private_key(key: *mut EC_KEY, key: *const BIGNUM) -> c_int; -- pub fn EC_KEY_get0_private_key(key: *const EC_KEY) -> *const BIGNUM; -- pub fn EC_KEY_generate_key(key: *mut EC_KEY) -> c_int; -- pub fn EC_KEY_check_key(key: *const EC_KEY) -> c_int; -- pub fn EC_KEY_free(key: *mut EC_KEY); -- pub fn EC_KEY_set_public_key_affine_coordinates( -- key: *mut EC_KEY, -- x: *mut BIGNUM, -- y: *mut BIGNUM, -- ) -> c_int; -- -- #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))] -- pub fn EC_GF2m_simple_method() -> *const EC_METHOD; -- -- pub fn EC_GROUP_new(meth: *const EC_METHOD) -> *mut EC_GROUP; -- pub fn EC_GROUP_new_curve_GFp( -- p: *const BIGNUM, -- a: *const BIGNUM, -- b: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> *mut EC_GROUP; -- #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))] -- pub fn EC_GROUP_new_curve_GF2m( -- p: *const BIGNUM, -- a: *const BIGNUM, -- b: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> *mut EC_GROUP; -- pub fn EC_GROUP_new_by_curve_name(nid: c_int) -> *mut EC_GROUP; -- pub fn EC_GROUP_get_curve_GFp( -- group: *const EC_GROUP, -- p: *mut BIGNUM, -- a: *mut BIGNUM, -- b: *mut BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))] -- pub fn EC_GROUP_get_curve_GF2m( -- group: *const EC_GROUP, -- p: *mut BIGNUM, -- a: *mut BIGNUM, -- b: *mut BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn EC_GROUP_get_degree(group: *const EC_GROUP) -> c_int; -- pub fn EC_GROUP_get_order( -- group: *const EC_GROUP, -- order: *mut BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn EC_GROUP_set_asn1_flag(key: *mut EC_GROUP, flag: c_int); -- -- pub fn EC_GROUP_free(group: *mut EC_GROUP); -- -- pub fn EC_POINT_new(group: *const EC_GROUP) -> *mut EC_POINT; -- pub fn EC_POINT_add( -- group: *const EC_GROUP, -- r: *mut EC_POINT, -- a: *const EC_POINT, -- b: *const EC_POINT, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn EC_POINT_mul( -- group: *const EC_GROUP, -- r: *mut EC_POINT, -- n: *const BIGNUM, -- q: *const EC_POINT, -- m: *const BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn EC_POINT_invert(group: *const EC_GROUP, r: *mut EC_POINT, ctx: *mut BN_CTX) -> c_int; -- pub fn EC_POINT_point2oct( -- group: *const EC_GROUP, -- p: *const EC_POINT, -- form: point_conversion_form_t, -- buf: *mut c_uchar, -- len: size_t, -- ctx: *mut BN_CTX, -- ) -> size_t; -- pub fn EC_POINT_oct2point( -- group: *const EC_GROUP, -- p: *mut EC_POINT, -- buf: *const c_uchar, -- len: size_t, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn EC_POINT_cmp( -- group: *const EC_GROUP, -- a: *const EC_POINT, -- b: *const EC_POINT, -- ctx: *mut BN_CTX, -- ) -> c_int; -- pub fn EC_POINT_free(point: *mut EC_POINT); -- pub fn EC_POINT_get_affine_coordinates_GFp( -- group: *const EC_GROUP, -- p: *const EC_POINT, -- x: *mut BIGNUM, -- y: *mut BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))] -- pub fn EC_POINT_get_affine_coordinates_GF2m( -- group: *const EC_GROUP, -- p: *const EC_POINT, -- x: *mut BIGNUM, -- y: *mut BIGNUM, -- ctx: *mut BN_CTX, -- ) -> c_int; -- -- pub fn ECDSA_SIG_new() -> *mut ECDSA_SIG; -- pub fn ECDSA_SIG_free(sig: *mut ECDSA_SIG); -- pub fn ECDSA_do_verify( -- dgst: *const c_uchar, -- dgst_len: c_int, -- sig: *const ECDSA_SIG, -- eckey: *mut EC_KEY, -- ) -> c_int; -- pub fn ECDSA_do_sign( -- dgst: *const c_uchar, -- dgst_len: c_int, -- eckey: *mut EC_KEY, -- ) -> *mut ECDSA_SIG; -- -- pub fn ERR_peek_last_error() -> c_ulong; -- pub fn ERR_get_error() -> c_ulong; -- pub fn ERR_get_error_line_data( -- file: *mut *const c_char, -- line: *mut c_int, -- data: *mut *const c_char, -- flags: *mut c_int, -- ) -> c_ulong; -- pub fn ERR_lib_error_string(err: c_ulong) -> *const c_char; -- pub fn ERR_func_error_string(err: c_ulong) -> *const c_char; -- pub fn ERR_reason_error_string(err: c_ulong) -> *const c_char; -- pub fn ERR_clear_error(); -- pub fn ERR_put_error(lib: c_int, func: c_int, reason: c_int, file: *const c_char, line: c_int); -- pub fn ERR_set_error_data(data: *mut c_char, flags: c_int); -- #[cfg(ossl110)] -- pub fn ERR_load_strings(lib: c_int, str: *mut ERR_STRING_DATA) -> c_int; -- #[cfg(not(ossl110))] -- pub fn ERR_load_strings(lib: c_int, str: *mut ERR_STRING_DATA); -- pub fn ERR_get_next_error_library() -> c_int; -- -- pub fn EVP_md5() -> *const EVP_MD; -- pub fn EVP_ripemd160() -> *const EVP_MD; -- pub fn EVP_sha1() -> *const EVP_MD; -- pub fn EVP_sha224() -> *const EVP_MD; -- pub fn EVP_sha256() -> *const EVP_MD; -- pub fn EVP_sha384() -> *const EVP_MD; -- pub fn EVP_sha512() -> *const EVP_MD; -- -- pub fn EVP_aes_128_cbc() -> *const EVP_CIPHER; -- pub fn EVP_aes_128_ecb() -> *const EVP_CIPHER; -- pub fn EVP_aes_128_xts() -> *const EVP_CIPHER; -- pub fn EVP_aes_128_ctr() -> *const EVP_CIPHER; -- pub fn EVP_aes_128_gcm() -> *const EVP_CIPHER; -- pub fn EVP_aes_128_ccm() -> *const EVP_CIPHER; -- pub fn EVP_aes_128_cfb1() -> *const EVP_CIPHER; -- pub fn EVP_aes_128_cfb128() -> *const EVP_CIPHER; -- pub fn EVP_aes_128_cfb8() -> *const EVP_CIPHER; -- pub fn EVP_aes_256_cbc() -> *const EVP_CIPHER; -- pub fn EVP_aes_256_ecb() -> *const EVP_CIPHER; -- pub fn EVP_aes_256_xts() -> *const EVP_CIPHER; -- pub fn EVP_aes_256_ctr() -> *const EVP_CIPHER; -- pub fn EVP_aes_256_gcm() -> *const EVP_CIPHER; -- pub fn EVP_aes_256_ccm() -> *const EVP_CIPHER; -- pub fn EVP_aes_256_cfb1() -> *const EVP_CIPHER; -- pub fn EVP_aes_256_cfb128() -> *const EVP_CIPHER; -- pub fn EVP_aes_256_cfb8() -> *const EVP_CIPHER; -- pub fn EVP_bf_cbc() -> *const EVP_CIPHER; -- pub fn EVP_bf_ecb() -> *const EVP_CIPHER; -- pub fn EVP_bf_cfb64() -> *const EVP_CIPHER; -- pub fn EVP_bf_ofb() -> *const EVP_CIPHER; -- pub fn EVP_rc4() -> *const EVP_CIPHER; -- -- pub fn EVP_des_cbc() -> *const EVP_CIPHER; -- pub fn EVP_des_ecb() -> *const EVP_CIPHER; -- pub fn EVP_des_ede3() -> *const EVP_CIPHER; -- pub fn EVP_des_ede3_cbc() -> *const EVP_CIPHER; -- -- pub fn EVP_BytesToKey( -- typ: *const EVP_CIPHER, -- md: *const EVP_MD, -- salt: *const u8, -- data: *const u8, -- datalen: c_int, -- count: c_int, -- key: *mut u8, -- iv: *mut u8, -- ) -> c_int; -- -- pub fn EVP_CIPHER_CTX_new() -> *mut EVP_CIPHER_CTX; -- pub fn EVP_CIPHER_CTX_set_padding(ctx: *mut EVP_CIPHER_CTX, padding: c_int) -> c_int; -- pub fn EVP_CIPHER_CTX_set_key_length(ctx: *mut EVP_CIPHER_CTX, keylen: c_int) -> c_int; -- pub fn EVP_CIPHER_CTX_ctrl( -- ctx: *mut EVP_CIPHER_CTX, -- type_: c_int, -- arg: c_int, -- ptr: *mut c_void, -- ) -> c_int; -- pub fn EVP_CIPHER_CTX_free(ctx: *mut EVP_CIPHER_CTX); -- -- pub fn EVP_CipherInit( -- ctx: *mut EVP_CIPHER_CTX, -- evp: *const EVP_CIPHER, -- key: *const u8, -- iv: *const u8, -+ unsafe extern "C" fn locking_function( - mode: c_int, -- ) -> c_int; -- pub fn EVP_CipherInit_ex( -- ctx: *mut EVP_CIPHER_CTX, -- type_: *const EVP_CIPHER, -- impl_: *mut ENGINE, -- key: *const c_uchar, -- iv: *const c_uchar, -- enc: c_int, -- ) -> c_int; -- pub fn EVP_CipherUpdate( -- ctx: *mut EVP_CIPHER_CTX, -- outbuf: *mut u8, -- outlen: *mut c_int, -- inbuf: *const u8, -- inlen: c_int, -- ) -> c_int; -- pub fn EVP_CipherFinal(ctx: *mut EVP_CIPHER_CTX, res: *mut u8, len: *mut c_int) -> c_int; -+ n: c_int, -+ _file: *const c_char, -+ _line: c_int, -+ ) { -+ let mutex = &(*MUTEXES)[n as usize]; - -- pub fn EVP_DigestInit(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD) -> c_int; -- pub fn EVP_DigestInit_ex(ctx: *mut EVP_MD_CTX, typ: *const EVP_MD, imple: *mut ENGINE) -- -> c_int; -- pub fn EVP_DigestUpdate(ctx: *mut EVP_MD_CTX, data: *const c_void, n: size_t) -> c_int; -- pub fn EVP_DigestFinal(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int; -- pub fn EVP_DigestFinal_ex(ctx: *mut EVP_MD_CTX, res: *mut u8, n: *mut u32) -> c_int; -+ if mode & ::CRYPTO_LOCK != 0 { -+ (*GUARDS)[n as usize] = Some(mutex.lock().unwrap()); -+ } else { -+ if let None = (*GUARDS)[n as usize].take() { -+ let _ = writeln!( -+ io::stderr(), -+ "BUG: rust-openssl lock {} already unlocked, aborting", -+ n -+ ); -+ process::abort(); -+ } -+ } -+ } - -- pub fn EVP_DigestSignInit( -- ctx: *mut EVP_MD_CTX, -- pctx: *mut *mut EVP_PKEY_CTX, -- type_: *const EVP_MD, -- e: *mut ENGINE, -- pkey: *mut EVP_PKEY, -- ) -> c_int; -- pub fn EVP_DigestSignFinal( -- ctx: *mut EVP_MD_CTX, -- sig: *mut c_uchar, -- siglen: *mut size_t, -- ) -> c_int; -- pub fn EVP_DigestVerifyInit( -- ctx: *mut EVP_MD_CTX, -- pctx: *mut *mut EVP_PKEY_CTX, -- type_: *const EVP_MD, -- e: *mut ENGINE, -- pkey: *mut EVP_PKEY, -- ) -> c_int; -- #[cfg(not(ossl102))] -- pub fn EVP_DigestVerifyFinal( -- ctx: *mut EVP_MD_CTX, -- sigret: *mut c_uchar, -- siglen: size_t, -- ) -> c_int; -- #[cfg(ossl102)] -- pub fn EVP_DigestVerifyFinal( -- ctx: *mut EVP_MD_CTX, -- sigret: *const c_uchar, -- siglen: size_t, -- ) -> c_int; -+ cfg_if! { -+ if #[cfg(unix)] { -+ fn set_id_callback() { -+ unsafe extern "C" fn thread_id() -> c_ulong { -+ ::libc::pthread_self() as c_ulong -+ } - -- pub fn EVP_MD_CTX_copy_ex(dst: *mut EVP_MD_CTX, src: *const EVP_MD_CTX) -> c_int; -+ unsafe { -+ CRYPTO_set_id_callback(thread_id); -+ } -+ } -+ } else { -+ fn set_id_callback() {} -+ } -+ } - -- pub fn EVP_PKEY_new() -> *mut EVP_PKEY; -- pub fn EVP_PKEY_free(k: *mut EVP_PKEY); -- pub fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *mut c_void) -> c_int; -- pub fn EVP_PKEY_copy_parameters(to: *mut EVP_PKEY, from: *const EVP_PKEY) -> c_int; -- pub fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA; -- pub fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int; -- pub fn EVP_PKEY_get1_DSA(k: *mut EVP_PKEY) -> *mut DSA; -- pub fn EVP_PKEY_get1_DH(k: *mut EVP_PKEY) -> *mut DH; -- pub fn EVP_PKEY_get1_EC_KEY(k: *mut EVP_PKEY) -> *mut EC_KEY; -- pub fn EVP_PKEY_cmp(a: *const EVP_PKEY, b: *const EVP_PKEY) -> c_int; -- pub fn EVP_PKEY_id(pkey: *const EVP_PKEY) -> c_int; -- pub fn EVP_PKEY_new_mac_key( -- type_: c_int, -- e: *mut ENGINE, -- key: *const c_uchar, -- keylen: c_int, -- ) -> *mut EVP_PKEY; -- pub fn EVP_PKEY_derive_init(ctx: *mut EVP_PKEY_CTX) -> c_int; -- pub fn EVP_PKEY_derive_set_peer(ctx: *mut EVP_PKEY_CTX, peer: *mut EVP_PKEY) -> c_int; -- pub fn EVP_PKEY_derive(ctx: *mut EVP_PKEY_CTX, key: *mut c_uchar, size: *mut size_t) -> c_int; -- pub fn d2i_PKCS8PrivateKey_bio( -- bp: *mut BIO, -- x: *mut *mut EVP_PKEY, -- cb: Option, -- u: *mut c_void, -- ) -> *mut EVP_PKEY; -+ static INIT: Once = ONCE_INIT; - -- pub fn EVP_PKEY_CTX_new(k: *mut EVP_PKEY, e: *mut ENGINE) -> *mut EVP_PKEY_CTX; -- pub fn EVP_PKEY_CTX_new_id(id: c_int, e: *mut ENGINE) -> *mut EVP_PKEY_CTX; -- pub fn EVP_PKEY_CTX_free(ctx: *mut EVP_PKEY_CTX); -- pub fn EVP_PKEY_CTX_ctrl( -- ctx: *mut EVP_PKEY_CTX, -- keytype: c_int, -- optype: c_int, -- cmd: c_int, -- p1: c_int, -- p2: *mut c_void, -- ) -> c_int; -+ INIT.call_once(|| unsafe { -+ SSL_library_init(); -+ SSL_load_error_strings(); -+ OPENSSL_add_all_algorithms_noconf(); - -- pub fn EVP_PKEY_keygen_init(ctx: *mut EVP_PKEY_CTX) -> c_int; -- pub fn EVP_PKEY_keygen(ctx: *mut EVP_PKEY_CTX, key: *mut *mut EVP_PKEY) -> c_int; -+ let num_locks = ::CRYPTO_num_locks(); -+ let mut mutexes = Box::new(Vec::new()); -+ for _ in 0..num_locks { -+ mutexes.push(Mutex::new(())); -+ } -+ MUTEXES = mem::transmute(mutexes); -+ let guards: Box>>> = -+ Box::new((0..num_locks).map(|_| None).collect()); -+ GUARDS = mem::transmute(guards); - -- pub fn HMAC_CTX_copy(dst: *mut HMAC_CTX, src: *mut HMAC_CTX) -> c_int; -- -- pub fn OBJ_obj2nid(o: *const ASN1_OBJECT) -> c_int; -- pub fn OBJ_obj2txt( -- buf: *mut c_char, -- buf_len: c_int, -- a: *const ASN1_OBJECT, -- no_name: c_int, -- ) -> c_int; -- pub fn OBJ_nid2ln(nid: c_int) -> *const c_char; -- pub fn OBJ_nid2sn(nid: c_int) -> *const c_char; -- pub fn OBJ_find_sigid_algs(signid: c_int, pdig_nid: *mut c_int, ppkey_nid: *mut c_int) -- -> c_int; -- -- pub fn OCSP_BASICRESP_new() -> *mut OCSP_BASICRESP; -- pub fn OCSP_BASICRESP_free(r: *mut OCSP_BASICRESP); -- pub fn OCSP_basic_verify( -- bs: *mut OCSP_BASICRESP, -- certs: *mut stack_st_X509, -- st: *mut X509_STORE, -- flags: c_ulong, -- ) -> c_int; -- pub fn OCSP_resp_find_status( -- bs: *mut OCSP_BASICRESP, -- id: *mut OCSP_CERTID, -- status: *mut c_int, -- reason: *mut c_int, -- revtime: *mut *mut ASN1_GENERALIZEDTIME, -- thisupd: *mut *mut ASN1_GENERALIZEDTIME, -- nextupd: *mut *mut ASN1_GENERALIZEDTIME, -- ) -> c_int; -- pub fn OCSP_check_validity( -- thisupd: *mut ASN1_GENERALIZEDTIME, -- nextupd: *mut ASN1_GENERALIZEDTIME, -- sec: c_long, -- maxsec: c_long, -- ) -> c_int; -- -- pub fn OCSP_CERTID_free(id: *mut OCSP_CERTID); -- -- pub fn OCSP_RESPONSE_new() -> *mut OCSP_RESPONSE; -- pub fn OCSP_RESPONSE_free(r: *mut OCSP_RESPONSE); -- pub fn i2d_OCSP_RESPONSE(a: *mut OCSP_RESPONSE, pp: *mut *mut c_uchar) -> c_int; -- pub fn d2i_OCSP_RESPONSE( -- a: *mut *mut OCSP_RESPONSE, -- pp: *mut *const c_uchar, -- length: c_long, -- ) -> *mut OCSP_RESPONSE; -- pub fn OCSP_response_create(status: c_int, bs: *mut OCSP_BASICRESP) -> *mut OCSP_RESPONSE; -- pub fn OCSP_response_status(resp: *mut OCSP_RESPONSE) -> c_int; -- pub fn OCSP_response_get1_basic(resp: *mut OCSP_RESPONSE) -> *mut OCSP_BASICRESP; -- -- pub fn OCSP_REQUEST_new() -> *mut OCSP_REQUEST; -- pub fn OCSP_REQUEST_free(r: *mut OCSP_REQUEST); -- pub fn i2d_OCSP_REQUEST(a: *mut OCSP_REQUEST, pp: *mut *mut c_uchar) -> c_int; -- pub fn d2i_OCSP_REQUEST( -- a: *mut *mut OCSP_REQUEST, -- pp: *mut *const c_uchar, -- length: c_long, -- ) -> *mut OCSP_REQUEST; -- pub fn OCSP_request_add0_id(r: *mut OCSP_REQUEST, id: *mut OCSP_CERTID) -> *mut OCSP_ONEREQ; -- -- pub fn OCSP_ONEREQ_free(r: *mut OCSP_ONEREQ); -- -- pub fn PEM_read_bio_DHparams( -- bio: *mut BIO, -- out: *mut *mut DH, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut DH; -- pub fn PEM_read_bio_X509( -- bio: *mut BIO, -- out: *mut *mut X509, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut X509; -- pub fn PEM_read_bio_X509_REQ( -- bio: *mut BIO, -- out: *mut *mut X509_REQ, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut X509_REQ; -- pub fn PEM_read_bio_PrivateKey( -- bio: *mut BIO, -- out: *mut *mut EVP_PKEY, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut EVP_PKEY; -- pub fn PEM_read_bio_PUBKEY( -- bio: *mut BIO, -- out: *mut *mut EVP_PKEY, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut EVP_PKEY; -- -- pub fn PEM_read_bio_RSAPrivateKey( -- bio: *mut BIO, -- rsa: *mut *mut RSA, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut RSA; -- -- pub fn PEM_read_bio_RSAPublicKey( -- bio: *mut BIO, -- rsa: *mut *mut RSA, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut RSA; -- -- pub fn PEM_read_bio_RSA_PUBKEY( -- bio: *mut BIO, -- rsa: *mut *mut RSA, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut RSA; -- -- pub fn PEM_write_bio_DHparams(bio: *mut BIO, x: *const DH) -> c_int; -- pub fn PEM_write_bio_PrivateKey( -- bio: *mut BIO, -- pkey: *mut EVP_PKEY, -- cipher: *const EVP_CIPHER, -- kstr: *mut c_uchar, -- klen: c_int, -- callback: Option, -- user_data: *mut c_void, -- ) -> c_int; -- pub fn PEM_write_bio_PKCS8PrivateKey( -- bio: *mut BIO, -- pkey: *mut EVP_PKEY, -- cipher: *const EVP_CIPHER, -- kstr: *mut c_char, -- klen: c_int, -- callback: Option, -- user_data: *mut c_void, -- ) -> c_int; -- pub fn PEM_write_bio_PUBKEY(bp: *mut BIO, x: *mut EVP_PKEY) -> c_int; -- pub fn PEM_write_bio_RSAPrivateKey( -- bp: *mut BIO, -- rsa: *mut RSA, -- cipher: *const EVP_CIPHER, -- kstr: *mut c_uchar, -- klen: c_int, -- callback: Option, -- user_data: *mut c_void, -- ) -> c_int; -- pub fn PEM_write_bio_RSAPublicKey(bp: *mut BIO, rsa: *const RSA) -> c_int; -- pub fn PEM_write_bio_RSA_PUBKEY(bp: *mut BIO, rsa: *mut RSA) -> c_int; -- -- pub fn PEM_read_bio_DSAPrivateKey( -- bp: *mut BIO, -- dsa: *mut *mut DSA, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut DSA; -- pub fn PEM_read_bio_DSA_PUBKEY( -- bp: *mut BIO, -- dsa: *mut *mut DSA, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut DSA; -- pub fn PEM_write_bio_DSAPrivateKey( -- bp: *mut BIO, -- dsa: *mut DSA, -- cipher: *const EVP_CIPHER, -- kstr: *mut c_uchar, -- klen: c_int, -- callback: Option, -- user_data: *mut c_void, -- ) -> c_int; -- pub fn PEM_write_bio_DSA_PUBKEY(bp: *mut BIO, dsa: *mut DSA) -> c_int; -- -- pub fn PEM_write_bio_X509(bio: *mut BIO, x509: *mut X509) -> c_int; -- pub fn PEM_write_bio_X509_REQ(bio: *mut BIO, x509: *mut X509_REQ) -> c_int; -- -- pub fn PEM_write_bio_ECPrivateKey( -- bio: *mut BIO, -- key: *mut EC_KEY, -- cipher: *const EVP_CIPHER, -- kstr: *mut c_uchar, -- klen: c_int, -- callback: Option, -- user_data: *mut c_void, -- ) -> c_int; -- pub fn PEM_read_bio_ECPrivateKey( -- bio: *mut BIO, -- key: *mut *mut EC_KEY, -- callback: Option, -- user_data: *mut c_void, -- ) -> *mut EC_KEY; -- -- pub fn PKCS5_PBKDF2_HMAC_SHA1( -- pass: *const c_char, -- passlen: c_int, -- salt: *const u8, -- saltlen: c_int, -- iter: c_int, -- keylen: c_int, -- out: *mut u8, -- ) -> c_int; -- pub fn PKCS5_PBKDF2_HMAC( -- pass: *const c_char, -- passlen: c_int, -- salt: *const c_uchar, -- saltlen: c_int, -- iter: c_int, -- digest: *const EVP_MD, -- keylen: c_int, -- out: *mut u8, -- ) -> c_int; -- -- pub fn RAND_bytes(buf: *mut u8, num: c_int) -> c_int; -- pub fn RAND_status() -> c_int; -- -- pub fn RSA_new() -> *mut RSA; -- pub fn RSA_free(rsa: *mut RSA); -- pub fn RSA_up_ref(rsa: *mut RSA) -> c_int; -- pub fn RSA_generate_key_ex( -- rsa: *mut RSA, -- bits: c_int, -- e: *mut BIGNUM, -- cb: *mut BN_GENCB, -- ) -> c_int; -- pub fn RSA_private_decrypt( -- flen: c_int, -- from: *const u8, -- to: *mut u8, -- k: *mut RSA, -- pad: c_int, -- ) -> c_int; -- pub fn RSA_public_decrypt( -- flen: c_int, -- from: *const u8, -- to: *mut u8, -- k: *mut RSA, -- pad: c_int, -- ) -> c_int; -- pub fn RSA_private_encrypt( -- flen: c_int, -- from: *const u8, -- to: *mut u8, -- k: *mut RSA, -- pad: c_int, -- ) -> c_int; -- pub fn RSA_public_encrypt( -- flen: c_int, -- from: *const u8, -- to: *mut u8, -- k: *mut RSA, -- pad: c_int, -- ) -> c_int; -- pub fn RSA_sign( -- t: c_int, -- m: *const u8, -- mlen: c_uint, -- sig: *mut u8, -- siglen: *mut c_uint, -- k: *mut RSA, -- ) -> c_int; -- pub fn RSA_size(k: *const RSA) -> c_int; -- pub fn RSA_verify( -- t: c_int, -- m: *const u8, -- mlen: c_uint, -- sig: *const u8, -- siglen: c_uint, -- k: *mut RSA, -- ) -> c_int; -- -- pub fn RSA_padding_check_PKCS1_type_2( -- to: *mut c_uchar, -- tlen: c_int, -- f: *const c_uchar, -- fl: c_int, -- rsa_len: c_int, -- ) -> c_int; -- -- pub fn DSA_new() -> *mut DSA; -- pub fn DSA_free(dsa: *mut DSA); -- pub fn DSA_size(dsa: *const DSA) -> c_int; -- pub fn DSA_generate_parameters_ex( -- dsa: *mut DSA, -- bits: c_int, -- seed: *const c_uchar, -- seed_len: c_int, -- counter_ref: *mut c_int, -- h_ret: *mut c_ulong, -- cb: *mut BN_GENCB, -- ) -> c_int; -- pub fn DSA_generate_key(dsa: *mut DSA) -> c_int; -- pub fn DSA_sign( -- dummy: c_int, -- dgst: *const c_uchar, -- len: c_int, -- sigret: *mut c_uchar, -- siglen: *mut c_uint, -- dsa: *mut DSA, -- ) -> c_int; -- pub fn DSA_verify( -- dummy: c_int, -- dgst: *const c_uchar, -- len: c_int, -- sigbuf: *const c_uchar, -- siglen: c_int, -- dsa: *mut DSA, -- ) -> c_int; -- -- pub fn SHA1(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -- pub fn SHA224(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -- pub fn SHA256(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -- pub fn SHA384(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -- pub fn SHA512(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -- -- pub fn SHA1_Init(c: *mut SHA_CTX) -> c_int; -- pub fn SHA1_Update(c: *mut SHA_CTX, data: *const c_void, len: size_t) -> c_int; -- pub fn SHA1_Final(md: *mut c_uchar, c: *mut SHA_CTX) -> c_int; -- pub fn SHA256_Init(c: *mut SHA256_CTX) -> c_int; -- pub fn SHA256_Update(c: *mut SHA256_CTX, data: *const c_void, len: size_t) -> c_int; -- pub fn SHA256_Final(md: *mut c_uchar, c: *mut SHA256_CTX) -> c_int; -- pub fn SHA224_Init(c: *mut SHA256_CTX) -> c_int; -- pub fn SHA224_Update(c: *mut SHA256_CTX, data: *const c_void, len: size_t) -> c_int; -- pub fn SHA224_Final(md: *mut c_uchar, c: *mut SHA256_CTX) -> c_int; -- pub fn SHA384_Init(c: *mut SHA512_CTX) -> c_int; -- pub fn SHA384_Update(c: *mut SHA512_CTX, data: *const c_void, len: size_t) -> c_int; -- pub fn SHA384_Final(md: *mut c_uchar, c: *mut SHA512_CTX) -> c_int; -- pub fn SHA512_Init(c: *mut SHA512_CTX) -> c_int; -- pub fn SHA512_Update(c: *mut SHA512_CTX, data: *const c_void, len: size_t) -> c_int; -- pub fn SHA512_Final(md: *mut c_uchar, c: *mut SHA512_CTX) -> c_int; -- -- pub fn SSL_new(ctx: *mut SSL_CTX) -> *mut SSL; -- pub fn SSL_pending(ssl: *const SSL) -> c_int; -- pub fn SSL_free(ssl: *mut SSL); -- pub fn SSL_set_bio(ssl: *mut SSL, rbio: *mut BIO, wbio: *mut BIO); -- pub fn SSL_get_rbio(ssl: *const SSL) -> *mut BIO; -- pub fn SSL_get_wbio(ssl: *const SSL) -> *mut BIO; -- pub fn SSL_accept(ssl: *mut SSL) -> c_int; -- pub fn SSL_connect(ssl: *mut SSL) -> c_int; -- pub fn SSL_do_handshake(ssl: *mut SSL) -> c_int; -- pub fn SSL_ctrl(ssl: *mut SSL, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long; -- pub fn SSL_get_error(ssl: *const SSL, ret: c_int) -> c_int; -- pub fn SSL_read(ssl: *mut SSL, buf: *mut c_void, num: c_int) -> c_int; -- pub fn SSL_write(ssl: *mut SSL, buf: *const c_void, num: c_int) -> c_int; -- pub fn SSL_get_ex_data_X509_STORE_CTX_idx() -> c_int; -- pub fn SSL_get_SSL_CTX(ssl: *const SSL) -> *mut SSL_CTX; -- pub fn SSL_set_SSL_CTX(ssl: *mut SSL, ctx: *mut SSL_CTX) -> *mut SSL_CTX; -- #[cfg(not(any(osslconf = "OPENSSL_NO_COMP", libressl)))] -- pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const COMP_METHOD; -- #[cfg(libressl)] -- pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const libc::c_void; -- pub fn SSL_get_peer_certificate(ssl: *const SSL) -> *mut X509; -- pub fn SSL_get_peer_cert_chain(ssl: *const SSL) -> *mut stack_st_X509; -- pub fn SSL_get_ssl_method(ssl: *mut SSL) -> *const SSL_METHOD; -- pub fn SSL_get_version(ssl: *const SSL) -> *const c_char; -- pub fn SSL_version(ssl: *const SSL) -> c_int; -- pub fn SSL_state_string(ssl: *const SSL) -> *const c_char; -- pub fn SSL_state_string_long(ssl: *const SSL) -> *const c_char; -- pub fn SSL_set_verify( -- ssl: *mut SSL, -- mode: c_int, -- verify_callback: Option c_int>, -- ); -- pub fn SSL_set_ex_data(ssl: *mut SSL, idx: c_int, data: *mut c_void) -> c_int; -- pub fn SSL_get_ex_data(ssl: *const SSL, idx: c_int) -> *mut c_void; -- pub fn SSL_get_servername(ssl: *const SSL, name_type: c_int) -> *const c_char; -- pub fn SSL_get_current_cipher(ssl: *const SSL) -> *const SSL_CIPHER; -- #[cfg(any(ossl102, libressl261))] -- pub fn SSL_get0_param(ssl: *mut SSL) -> *mut X509_VERIFY_PARAM; -- pub fn SSL_get_verify_result(ssl: *const SSL) -> c_long; -- pub fn SSL_shutdown(ssl: *mut SSL) -> c_int; -- pub fn SSL_get_certificate(ssl: *const SSL) -> *mut X509; -- #[cfg(not(ossl102))] -- pub fn SSL_get_privatekey(ssl: *mut SSL) -> *mut EVP_PKEY; -- #[cfg(ossl102)] -- pub fn SSL_get_privatekey(ssl: *const SSL) -> *mut EVP_PKEY; -- pub fn SSL_load_client_CA_file(file: *const c_char) -> *mut stack_st_X509_NAME; -- pub fn SSL_set_tmp_dh_callback( -- ctx: *mut SSL, -- dh: unsafe extern "C" fn(ssl: *mut SSL, is_export: c_int, keylength: c_int) -> *mut DH, -- ); -- pub fn SSL_export_keying_material( -- s: *mut SSL, -- out: *mut c_uchar, -- olen: size_t, -- label: *const c_char, -- llen: size_t, -- context: *const c_uchar, -- contextlen: size_t, -- use_context: c_int, -- ) -> c_int; -- -- #[cfg(not(any(osslconf = "OPENSSL_NO_COMP", libressl)))] -- pub fn SSL_COMP_get_name(comp: *const COMP_METHOD) -> *const c_char; -- #[cfg(libressl)] -- pub fn SSL_COMP_get_name(comp: *const libc::c_void) -> *const c_char; -- -- pub fn SSL_CIPHER_get_name(cipher: *const SSL_CIPHER) -> *const c_char; -- pub fn SSL_CIPHER_get_bits(cipher: *const SSL_CIPHER, alg_bits: *mut c_int) -> c_int; -- pub fn SSL_CIPHER_description( -- cipher: *const SSL_CIPHER, -- buf: *mut c_char, -- size: c_int, -- ) -> *mut c_char; -- -- pub fn SSL_CTX_new(method: *const SSL_METHOD) -> *mut SSL_CTX; -- pub fn SSL_CTX_free(ctx: *mut SSL_CTX); -- pub fn SSL_CTX_ctrl(ctx: *mut SSL_CTX, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long; -- pub fn SSL_CTX_callback_ctrl( -- ctx: *mut SSL_CTX, -- cmd: c_int, -- fp: Option, -- ) -> c_long; -- pub fn SSL_CTX_set_verify( -- ctx: *mut SSL_CTX, -- mode: c_int, -- verify_callback: Option c_int>, -- ); -- pub fn SSL_CTX_set_verify_depth(ctx: *mut SSL_CTX, depth: c_int); -- pub fn SSL_CTX_load_verify_locations( -- ctx: *mut SSL_CTX, -- CAfile: *const c_char, -- CApath: *const c_char, -- ) -> c_int; -- pub fn SSL_CTX_set_default_verify_paths(ctx: *mut SSL_CTX) -> c_int; -- pub fn SSL_CTX_set_ex_data(ctx: *mut SSL_CTX, idx: c_int, data: *mut c_void) -> c_int; -- pub fn SSL_CTX_get_ex_data(ctx: *const SSL_CTX, idx: c_int) -> *mut c_void; -- pub fn SSL_CTX_set_session_id_context( -- ssl: *mut SSL_CTX, -- sid_ctx: *const c_uchar, -- sid_ctx_len: c_uint, -- ) -> c_int; -- -- pub fn SSL_CTX_use_certificate_file( -- ctx: *mut SSL_CTX, -- cert_file: *const c_char, -- file_type: c_int, -- ) -> c_int; -- pub fn SSL_CTX_use_certificate_chain_file( -- ctx: *mut SSL_CTX, -- cert_chain_file: *const c_char, -- ) -> c_int; -- pub fn SSL_CTX_use_certificate(ctx: *mut SSL_CTX, cert: *mut X509) -> c_int; -- -- pub fn SSL_CTX_use_PrivateKey_file( -- ctx: *mut SSL_CTX, -- key_file: *const c_char, -- file_type: c_int, -- ) -> c_int; -- pub fn SSL_CTX_use_PrivateKey(ctx: *mut SSL_CTX, key: *mut EVP_PKEY) -> c_int; -- pub fn SSL_CTX_check_private_key(ctx: *const SSL_CTX) -> c_int; -- pub fn SSL_CTX_set_client_CA_list(ctx: *mut SSL_CTX, list: *mut stack_st_X509_NAME); -- pub fn SSL_CTX_get_cert_store(ctx: *const SSL_CTX) -> *mut X509_STORE; -- // FIXME should take an option -- pub fn SSL_CTX_set_tmp_dh_callback( -- ctx: *mut SSL_CTX, -- dh: unsafe extern "C" fn(ssl: *mut SSL, is_export: c_int, keylength: c_int) -> *mut DH, -- ); -- pub fn SSL_CTX_sess_set_new_cb( -- ctx: *mut SSL_CTX, -- new_session_cb: Option c_int>, -- ); -- pub fn SSL_CTX_sess_set_remove_cb( -- ctx: *mut SSL_CTX, -- remove_session_cb: Option, -- ); -- -- #[cfg(ossl102)] -- pub fn SSL_CTX_get0_certificate(ctx: *const SSL_CTX) -> *mut X509; -- #[cfg(ossl102)] -- pub fn SSL_CTX_get0_privatekey(ctx: *const SSL_CTX) -> *mut EVP_PKEY; -- -- pub fn SSL_CTX_set_cipher_list(ssl: *mut SSL_CTX, s: *const c_char) -> c_int; -- -- pub fn SSL_CTX_set_next_protos_advertised_cb( -- ssl: *mut SSL_CTX, -- cb: extern "C" fn( -- ssl: *mut SSL, -- out: *mut *const c_uchar, -- outlen: *mut c_uint, -- arg: *mut c_void, -- ) -> c_int, -- arg: *mut c_void, -- ); -- pub fn SSL_CTX_set_next_proto_select_cb( -- ssl: *mut SSL_CTX, -- cb: extern "C" fn( -- ssl: *mut SSL, -- out: *mut *mut c_uchar, -- outlen: *mut c_uchar, -- inbuf: *const c_uchar, -- inlen: c_uint, -- arg: *mut c_void, -- ) -> c_int, -- arg: *mut c_void, -- ); -- #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -- pub fn SSL_CTX_set_psk_client_callback( -- ssl: *mut SSL_CTX, -- psk_client_cb: Option< -- extern "C" fn(*mut SSL, *const c_char, *mut c_char, c_uint, *mut c_uchar, c_uint) -- -> c_uint, -- >, -- ); -- #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -- pub fn SSL_CTX_set_psk_server_callback( -- ssl: *mut SSL_CTX, -- psk_server_cb: Option< -- extern "C" fn(*mut SSL, *const c_char, *mut c_uchar, c_uint) -> c_uint, -- >, -- ); -- -- pub fn SSL_select_next_proto( -- out: *mut *mut c_uchar, -- outlen: *mut c_uchar, -- inbuf: *const c_uchar, -- inlen: c_uint, -- client: *const c_uchar, -- client_len: c_uint, -- ) -> c_int; -- pub fn SSL_get0_next_proto_negotiated( -- s: *const SSL, -- data: *mut *const c_uchar, -- len: *mut c_uint, -- ); -- pub fn SSL_get_session(s: *const SSL) -> *mut SSL_SESSION; -- pub fn SSL_set_session(ssl: *mut SSL, session: *mut SSL_SESSION) -> c_int; -- #[cfg(all(ossl102, not(ossl110f)))] -- pub fn SSL_is_server(s: *mut SSL) -> c_int; -- #[cfg(any(ossl110f, libressl273))] -- pub fn SSL_is_server(s: *const SSL) -> c_int; -- pub fn SSL_get_finished(s: *const SSL, buf: *mut c_void, count: size_t) -> size_t; -- pub fn SSL_get_peer_finished(s: *const SSL, buf: *mut c_void, count: size_t) -> size_t; -- -- pub fn SSL_SESSION_free(s: *mut SSL_SESSION); -- pub fn SSL_SESSION_get_id(s: *const SSL_SESSION, len: *mut c_uint) -> *const c_uchar; -- -- pub fn d2i_SSL_SESSION( -- a: *mut *mut SSL_SESSION, -- pp: *mut *const c_uchar, -- len: c_long, -- ) -> *mut SSL_SESSION; -- pub fn i2d_SSL_SESSION(s: *mut SSL_SESSION, pp: *mut *mut c_uchar) -> c_int; -- -- #[cfg(any(ossl102, libressl261))] -- pub fn SSL_CTX_set_alpn_protos(s: *mut SSL_CTX, data: *const c_uchar, len: c_uint) -> c_int; -- -- #[cfg(any(ossl102, libressl261))] -- pub fn SSL_set_alpn_protos(s: *mut SSL, data: *const c_uchar, len: c_uint) -> c_int; -- -- // FIXME should take an Option -- #[cfg(any(ossl102, libressl261))] -- pub fn SSL_CTX_set_alpn_select_cb( -- ssl: *mut SSL_CTX, -- cb: extern "C" fn( -- ssl: *mut SSL, -- out: *mut *const c_uchar, -- outlen: *mut c_uchar, -- inbuf: *const c_uchar, -- inlen: c_uint, -- arg: *mut c_void, -- ) -> c_int, -- arg: *mut c_void, -- ); -- #[cfg(any(ossl102, libressl261))] -- pub fn SSL_get0_alpn_selected(s: *const SSL, data: *mut *const c_uchar, len: *mut c_uint); -- -- pub fn X509_add_ext(x: *mut X509, ext: *mut X509_EXTENSION, loc: c_int) -> c_int; -- pub fn X509_digest( -- x: *const X509, -- digest: *const EVP_MD, -- buf: *mut c_uchar, -- len: *mut c_uint, -- ) -> c_int; -- pub fn X509_free(x: *mut X509); -- pub fn X509_REQ_free(x: *mut X509_REQ); -- pub fn X509_get_serialNumber(x: *mut X509) -> *mut ASN1_INTEGER; -- pub fn X509_gmtime_adj(time: *mut ASN1_TIME, adj: c_long) -> *mut ASN1_TIME; -- pub fn X509_new() -> *mut X509; -- pub fn X509_set_issuer_name(x: *mut X509, name: *mut X509_NAME) -> c_int; -- pub fn X509_set_subject_name(x: *mut X509, name: *mut X509_NAME) -> c_int; -- pub fn X509_set_serialNumber(x: *mut X509, sn: *mut ASN1_INTEGER) -> c_int; -- pub fn X509_set_version(x: *mut X509, version: c_long) -> c_int; -- pub fn X509_set_pubkey(x: *mut X509, pkey: *mut EVP_PKEY) -> c_int; -- pub fn X509_sign(x: *mut X509, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> c_int; -- pub fn X509_get_pubkey(x: *mut X509) -> *mut EVP_PKEY; -- pub fn X509_to_X509_REQ(x: *mut X509, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> *mut X509_REQ; -- pub fn X509_verify_cert(ctx: *mut X509_STORE_CTX) -> c_int; -- pub fn X509_verify_cert_error_string(n: c_long) -> *const c_char; -- pub fn X509_get1_ocsp(x: *mut X509) -> *mut stack_st_OPENSSL_STRING; -- pub fn X509_check_issued(issuer: *mut X509, subject: *mut X509) -> c_int; -- -- pub fn X509_ALGOR_free(x: *mut X509_ALGOR); -- -- pub fn X509_EXTENSION_free(ext: *mut X509_EXTENSION); -- -- pub fn X509_NAME_new() -> *mut X509_NAME; -- pub fn X509_NAME_free(x: *mut X509_NAME); -- pub fn X509_NAME_add_entry_by_txt( -- x: *mut X509_NAME, -- field: *const c_char, -- ty: c_int, -- bytes: *const c_uchar, -- len: c_int, -- loc: c_int, -- set: c_int, -- ) -> c_int; -- pub fn X509_NAME_get_index_by_NID(n: *mut X509_NAME, nid: c_int, last_pos: c_int) -> c_int; -- -- pub fn X509_NAME_ENTRY_free(x: *mut X509_NAME_ENTRY); -- -- pub fn ASN1_STRING_free(x: *mut ASN1_STRING); -- pub fn ASN1_STRING_length(x: *const ASN1_STRING) -> c_int; -- -- pub fn ASN1_INTEGER_free(x: *mut ASN1_INTEGER); -- -- pub fn X509_STORE_new() -> *mut X509_STORE; -- pub fn X509_STORE_free(store: *mut X509_STORE); -- pub fn X509_STORE_add_cert(store: *mut X509_STORE, x: *mut X509) -> c_int; -- pub fn X509_STORE_set_default_paths(store: *mut X509_STORE) -> c_int; -- -- pub fn X509_STORE_CTX_new() -> *mut X509_STORE_CTX; -- pub fn X509_STORE_CTX_cleanup(ctx: *mut X509_STORE_CTX); -- pub fn X509_STORE_CTX_init( -- ctx: *mut X509_STORE_CTX, -- store: *mut X509_STORE, -- x509: *mut X509, -- chain: *mut stack_st_X509, -- ) -> c_int; -- pub fn X509_STORE_CTX_free(ctx: *mut X509_STORE_CTX); -- pub fn X509_STORE_CTX_get_current_cert(ctx: *mut X509_STORE_CTX) -> *mut X509; -- pub fn X509_STORE_CTX_get_error(ctx: *mut X509_STORE_CTX) -> c_int; -- pub fn X509_STORE_CTX_set_error(ctx: *mut X509_STORE_CTX, error: c_int); -- pub fn X509_STORE_CTX_get_ex_data(ctx: *mut X509_STORE_CTX, idx: c_int) -> *mut c_void; -- pub fn X509_STORE_CTX_get_error_depth(ctx: *mut X509_STORE_CTX) -> c_int; -- -- pub fn X509V3_set_ctx( -- ctx: *mut X509V3_CTX, -- issuer: *mut X509, -- subject: *mut X509, -- req: *mut X509_REQ, -- crl: *mut X509_CRL, -- flags: c_int, -- ); -- pub fn X509V3_set_nconf(ctx: *mut X509V3_CTX, conf: *mut CONF); -- -- pub fn X509_REQ_new() -> *mut X509_REQ; -- pub fn X509_REQ_set_version(req: *mut X509_REQ, version: c_long) -> c_int; -- pub fn X509_REQ_set_subject_name(req: *mut X509_REQ, name: *mut X509_NAME) -> c_int; -- pub fn X509_REQ_set_pubkey(req: *mut X509_REQ, pkey: *mut EVP_PKEY) -> c_int; -- pub fn X509_REQ_get_pubkey(req: *mut X509_REQ) -> *mut EVP_PKEY; -- pub fn X509_REQ_add_extensions(req: *mut X509_REQ, exts: *mut stack_st_X509_EXTENSION) -- -> c_int; -- pub fn X509_REQ_get_extensions(req: *mut X509_REQ) -> *mut stack_st_X509_EXTENSION; -- pub fn X509_REQ_sign(x: *mut X509_REQ, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> c_int; -- -- #[cfg(any(ossl102, libressl261))] -- pub fn X509_VERIFY_PARAM_free(param: *mut X509_VERIFY_PARAM); -- #[cfg(any(ossl102, libressl261))] -- pub fn X509_VERIFY_PARAM_set_hostflags(param: *mut X509_VERIFY_PARAM, flags: c_uint); -- #[cfg(any(ossl102, libressl261))] -- pub fn X509_VERIFY_PARAM_set1_host( -- param: *mut X509_VERIFY_PARAM, -- name: *const c_char, -- namelen: size_t, -- ) -> c_int; -- #[cfg(any(ossl102, libressl261))] -- pub fn X509_VERIFY_PARAM_set1_ip( -- param: *mut X509_VERIFY_PARAM, -- ip: *const c_uchar, -- iplen: size_t, -- ) -> c_int; -- -- pub fn d2i_DHparams(k: *mut *mut DH, pp: *mut *const c_uchar, length: c_long) -> *mut DH; -- pub fn i2d_DHparams(dh: *const DH, pp: *mut *mut c_uchar) -> c_int; -- -- pub fn d2i_DSAPublicKey(a: *mut *mut DSA, pp: *mut *const c_uchar, length: c_long) -> *mut DSA; -- pub fn i2d_DSAPublicKey(a: *const DSA, pp: *mut *mut c_uchar) -> c_int; -- pub fn d2i_DSAPrivateKey(a: *mut *mut DSA, pp: *mut *const c_uchar, length: c_long) -- -> *mut DSA; -- pub fn i2d_DSAPrivateKey(a: *const DSA, pp: *mut *mut c_uchar) -> c_int; -- pub fn d2i_DSA_PUBKEY(k: *mut *mut DSA, pp: *mut *const c_uchar, length: c_long) -> *mut DSA; -- pub fn i2d_DSA_PUBKEY(a: *mut DSA, pp: *mut *mut c_uchar) -> c_int; -- -- pub fn d2i_ECPrivateKey( -- k: *mut *mut EC_KEY, -- pp: *mut *const c_uchar, -- length: c_long, -- ) -> *mut EC_KEY; -- pub fn i2d_ECPrivateKey(ec_key: *mut EC_KEY, pp: *mut *mut c_uchar) -> c_int; -- -- pub fn d2i_X509(a: *mut *mut X509, pp: *mut *const c_uchar, length: c_long) -> *mut X509; -- pub fn d2i_X509_REQ( -- a: *mut *mut X509_REQ, -- pp: *mut *const c_uchar, -- length: c_long, -- ) -> *mut X509_REQ; -- pub fn i2d_X509_bio(b: *mut BIO, x: *mut X509) -> c_int; -- pub fn i2d_X509(x: *mut X509, buf: *mut *mut u8) -> c_int; -- pub fn i2d_X509_REQ_bio(b: *mut BIO, x: *mut X509_REQ) -> c_int; -- pub fn i2d_X509_REQ(x: *mut X509_REQ, buf: *mut *mut u8) -> c_int; -- -- pub fn d2i_AutoPrivateKey( -- a: *mut *mut EVP_PKEY, -- pp: *mut *const c_uchar, -- length: c_long, -- ) -> *mut EVP_PKEY; -- pub fn d2i_PUBKEY(k: *mut *mut EVP_PKEY, buf: *mut *const u8, len: c_long) -> *mut EVP_PKEY; -- pub fn i2d_PUBKEY_bio(b: *mut BIO, x: *mut EVP_PKEY) -> c_int; -- pub fn i2d_PrivateKey_bio(b: *mut BIO, x: *mut EVP_PKEY) -> c_int; -- pub fn i2d_PUBKEY(k: *mut EVP_PKEY, buf: *mut *mut u8) -> c_int; -- pub fn i2d_PrivateKey(k: *mut EVP_PKEY, buf: *mut *mut u8) -> c_int; -- -- pub fn i2d_RSA_PUBKEY(k: *mut RSA, buf: *mut *mut u8) -> c_int; -- pub fn d2i_RSA_PUBKEY(k: *mut *mut RSA, buf: *mut *const u8, len: c_long) -> *mut RSA; -- pub fn i2d_RSAPublicKey(k: *const RSA, buf: *mut *mut u8) -> c_int; -- pub fn d2i_RSAPublicKey(k: *mut *mut RSA, buf: *mut *const u8, len: c_long) -> *mut RSA; -- pub fn i2d_RSAPrivateKey(k: *const RSA, buf: *mut *mut u8) -> c_int; -- pub fn d2i_RSAPrivateKey(k: *mut *mut RSA, buf: *mut *const u8, len: c_long) -> *mut RSA; -- -- pub fn i2d_PKCS12_bio(b: *mut BIO, a: *mut PKCS12) -> c_int; -- pub fn i2d_PKCS12(a: *mut PKCS12, buf: *mut *mut u8) -> c_int; -- pub fn d2i_PKCS12(a: *mut *mut PKCS12, pp: *mut *const u8, length: c_long) -> *mut PKCS12; -- pub fn PKCS12_parse( -- p12: *mut PKCS12, -- pass: *const c_char, -- pkey: *mut *mut EVP_PKEY, -- cert: *mut *mut X509, -- ca: *mut *mut stack_st_X509, -- ) -> c_int; -- pub fn PKCS12_free(p12: *mut PKCS12); -- -- pub fn GENERAL_NAME_free(name: *mut GENERAL_NAME); -- -- pub fn HMAC_Init_ex( -- ctx: *mut HMAC_CTX, -- key: *const c_void, -- len: c_int, -- md: *const EVP_MD, -- impl_: *mut ENGINE, -- ) -> c_int; -- pub fn HMAC_Update(ctx: *mut HMAC_CTX, data: *const c_uchar, len: size_t) -> c_int; -- pub fn HMAC_Final(ctx: *mut HMAC_CTX, md: *mut c_uchar, len: *mut c_uint) -> c_int; -- -- // FIXME change to unsafe extern "C" fn -- pub fn SSL_CTX_set_cookie_generate_cb( -- s: *mut SSL_CTX, -- cb: Option< -- extern "C" fn(ssl: *mut SSL, cookie: *mut c_uchar, cookie_len: *mut c_uint) -> c_int, -- >, -- ); -- -- // FIXME change to unsafe extern "C" fn -- #[cfg(ossl110)] -- pub fn SSL_CTX_set_cookie_verify_cb( -- s: *mut SSL_CTX, -- cb: Option< -- extern "C" fn(ssl: *mut SSL, cookie: *const c_uchar, cookie_len: c_uint) -> c_int, -- >, -- ); -- -- #[cfg(not(ossl110))] -- pub fn SSL_CTX_set_cookie_verify_cb( -- s: *mut SSL_CTX, -- cb: Option c_int>, -- ); -- -- pub fn EVP_MD_size(md: *const EVP_MD) -> c_int; -- pub fn EVP_get_digestbyname(name: *const c_char) -> *const EVP_MD; -- pub fn EVP_get_cipherbyname(name: *const c_char) -> *const EVP_CIPHER; -- -- pub fn SSL_set_connect_state(s: *mut SSL); -- pub fn SSL_set_accept_state(s: *mut SSL); -+ CRYPTO_set_locking_callback(locking_function); -+ set_id_callback(); -+ }) - } diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs deleted file mode 100644 index 07ee846eaf9..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_mod.rs +++ /dev/null @@ -1,639 +0,0 @@ ---- src/vendor/openssl-sys/src/libressl/mod.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/src/libressl/mod.rs -@@ -1,636 +0,0 @@ --use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t}; --use std::mem; --use std::ptr; --use std::sync::{Mutex, MutexGuard}; --use std::sync::{Once, ONCE_INIT}; -- --#[cfg(not(libressl251))] --pub use libressl::v250::*; --#[cfg(libressl251)] --pub use libressl::v251::*; --#[cfg(libressl273)] --pub use libressl::v273::*; -- --#[cfg(not(libressl251))] --mod v250; --#[cfg(libressl251)] --mod v251; --#[cfg(libressl273)] --mod v273; -- --#[repr(C)] --pub struct stack_st_ASN1_OBJECT { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_X509 { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_X509_NAME { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_X509_ATTRIBUTE { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_X509_EXTENSION { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_GENERAL_NAME { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_void { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_SSL_CIPHER { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_OPENSSL_STRING { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct _STACK { -- pub num: c_int, -- pub data: *mut *mut c_char, -- pub sorted: c_int, -- pub num_alloc: c_int, -- pub comp: Option c_int>, --} -- --#[repr(C)] --pub struct BIO_METHOD { -- pub type_: c_int, -- pub name: *const c_char, -- pub bwrite: Option c_int>, -- pub bread: Option c_int>, -- pub bputs: Option c_int>, -- pub bgets: Option c_int>, -- pub ctrl: Option c_long>, -- pub create: Option c_int>, -- pub destroy: Option c_int>, -- pub callback_ctrl: Option c_long>, --} -- --#[repr(C)] --pub struct RSA { -- pub pad: c_int, -- pub version: c_long, -- pub meth: *const ::RSA_METHOD, -- -- pub engine: *mut ::ENGINE, -- pub n: *mut ::BIGNUM, -- pub e: *mut ::BIGNUM, -- pub d: *mut ::BIGNUM, -- pub p: *mut ::BIGNUM, -- pub q: *mut ::BIGNUM, -- pub dmp1: *mut ::BIGNUM, -- pub dmq1: *mut ::BIGNUM, -- pub iqmp: *mut ::BIGNUM, -- -- pub ex_data: ::CRYPTO_EX_DATA, -- pub references: c_int, -- pub flags: c_int, -- -- pub _method_mod_n: *mut ::BN_MONT_CTX, -- pub _method_mod_p: *mut ::BN_MONT_CTX, -- pub _method_mod_q: *mut ::BN_MONT_CTX, -- -- pub blinding: *mut ::BN_BLINDING, -- pub mt_blinding: *mut ::BN_BLINDING, --} -- --#[repr(C)] --pub struct DSA { -- pub pad: c_int, -- pub version: c_long, -- pub write_params: c_int, -- -- pub p: *mut ::BIGNUM, -- pub q: *mut ::BIGNUM, -- pub g: *mut ::BIGNUM, -- pub pub_key: *mut ::BIGNUM, -- pub priv_key: *mut ::BIGNUM, -- pub kinv: *mut ::BIGNUM, -- pub r: *mut ::BIGNUM, -- -- pub flags: c_int, -- pub method_mont_p: *mut ::BN_MONT_CTX, -- pub references: c_int, -- pub ex_data: ::CRYPTO_EX_DATA, -- pub meth: *const ::DSA_METHOD, -- pub engine: *mut ::ENGINE, --} -- --#[repr(C)] --pub struct ECDSA_SIG { -- pub r: *mut ::BIGNUM, -- pub s: *mut ::BIGNUM, --} -- --#[repr(C)] --pub struct EVP_PKEY { -- pub type_: c_int, -- pub save_type: c_int, -- pub references: c_int, -- pub ameth: *const ::EVP_PKEY_ASN1_METHOD, -- pub engine: *mut ::ENGINE, -- pub pkey: *mut c_void, -- pub save_parameters: c_int, -- pub attributes: *mut stack_st_X509_ATTRIBUTE, --} -- --#[repr(C)] --pub struct BIO { -- pub method: *mut ::BIO_METHOD, -- pub callback: Option< -- unsafe extern "C" fn(*mut ::BIO, c_int, *const c_char, c_int, c_long, c_long) -> c_long, -- >, -- pub cb_arg: *mut c_char, -- pub init: c_int, -- pub shutdown: c_int, -- pub flags: c_int, -- pub retry_reason: c_int, -- pub num: c_int, -- pub ptr: *mut c_void, -- pub next_bio: *mut ::BIO, -- pub prev_bio: *mut ::BIO, -- pub references: c_int, -- pub num_read: c_ulong, -- pub num_write: c_ulong, -- pub ex_data: ::CRYPTO_EX_DATA, --} -- --#[repr(C)] --pub struct CRYPTO_EX_DATA { -- pub sk: *mut ::stack_st_void, --} -- --#[repr(C)] --pub struct EVP_MD_CTX { -- digest: *mut ::EVP_MD, -- engine: *mut ::ENGINE, -- flags: c_ulong, -- md_data: *mut c_void, -- pctx: *mut ::EVP_PKEY_CTX, -- update: *mut c_void, --} -- --#[repr(C)] --pub struct EVP_CIPHER { -- pub nid: c_int, -- pub block_size: c_int, -- pub key_len: c_int, -- pub iv_len: c_int, -- pub flags: c_ulong, -- pub init: Option< -- unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX, *const c_uchar, *const c_uchar, c_int) -> c_int, -- >, -- pub do_cipher: Option< -- unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX, *mut c_uchar, *const c_uchar, size_t) -> c_int, -- >, -- pub cleanup: Option c_int>, -- pub ctx_size: c_int, -- pub set_asn1_parameters: -- Option c_int>, -- pub get_asn1_parameters: -- Option c_int>, -- pub ctrl: -- Option c_int>, -- pub app_data: *mut c_void, --} -- --#[repr(C)] --pub struct HMAC_CTX { -- md: *mut ::EVP_MD, -- md_ctx: ::EVP_MD_CTX, -- i_ctx: ::EVP_MD_CTX, -- o_ctx: ::EVP_MD_CTX, -- key_length: c_uint, -- key: [c_uchar; 128], --} -- --#[repr(C)] --pub struct BIGNUM { -- pub d: *mut ::BN_ULONG, -- pub top: c_int, -- pub dmax: c_int, -- pub neg: c_int, -- pub flags: c_int, --} -- --#[repr(C)] --pub struct DH { -- pub pad: c_int, -- pub version: c_int, -- pub p: *mut ::BIGNUM, -- pub g: *mut ::BIGNUM, -- pub length: c_long, -- pub pub_key: *mut ::BIGNUM, -- pub priv_key: *mut ::BIGNUM, -- pub flags: c_int, -- pub method_mont_p: *mut ::BN_MONT_CTX, -- pub q: *mut ::BIGNUM, -- pub j: *mut ::BIGNUM, -- pub seed: *mut c_uchar, -- pub seedlen: c_int, -- pub counter: *mut ::BIGNUM, -- pub references: c_int, -- pub ex_data: ::CRYPTO_EX_DATA, -- pub meth: *const ::DH_METHOD, -- pub engine: *mut ::ENGINE, --} -- --#[repr(C)] --pub struct X509 { -- pub cert_info: *mut X509_CINF, -- pub sig_alg: *mut ::X509_ALGOR, -- pub signature: *mut ::ASN1_BIT_STRING, -- pub valid: c_int, -- pub references: c_int, -- pub name: *mut c_char, -- pub ex_data: ::CRYPTO_EX_DATA, -- pub ex_pathlen: c_long, -- pub ex_pcpathlen: c_long, -- pub ex_flags: c_ulong, -- pub ex_kusage: c_ulong, -- pub ex_xkusage: c_ulong, -- pub ex_nscert: c_ulong, -- skid: *mut c_void, -- akid: *mut c_void, -- policy_cache: *mut c_void, -- crldp: *mut c_void, -- altname: *mut c_void, -- nc: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_SHA"))] -- sha1_hash: [c_uchar; 20], -- aux: *mut c_void, --} -- --#[repr(C)] --pub struct X509_CINF { -- version: *mut c_void, -- serialNumber: *mut c_void, -- signature: *mut c_void, -- issuer: *mut c_void, -- pub validity: *mut X509_VAL, -- subject: *mut c_void, -- key: *mut c_void, -- issuerUID: *mut c_void, -- subjectUID: *mut c_void, -- pub extensions: *mut stack_st_X509_EXTENSION, -- enc: ASN1_ENCODING, --} -- --#[repr(C)] --pub struct X509_ALGOR { -- pub algorithm: *mut ::ASN1_OBJECT, -- parameter: *mut c_void, --} -- --#[repr(C)] --pub struct ASN1_ENCODING { -- pub enc: *mut c_uchar, -- pub len: c_long, -- pub modified: c_int, --} -- --#[repr(C)] --pub struct X509_VAL { -- pub notBefore: *mut ::ASN1_TIME, -- pub notAfter: *mut ::ASN1_TIME, --} -- --#[repr(C)] --pub struct X509_REQ_INFO { -- pub enc: ASN1_ENCODING, -- pub version: *mut ::ASN1_INTEGER, -- pub subject: *mut ::X509_NAME, -- pubkey: *mut c_void, -- pub attributes: *mut stack_st_X509_ATTRIBUTE, --} -- --#[repr(C)] --pub struct X509_REQ { -- pub req_info: *mut X509_REQ_INFO, -- sig_alg: *mut c_void, -- signature: *mut c_void, -- references: c_int, --} -- --pub enum X509_VERIFY_PARAM_ID {} --pub enum PKCS12 {} -- --pub const SSL_CTRL_GET_SESSION_REUSED: c_int = 8; --pub const SSL_CTRL_OPTIONS: c_int = 32; --pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77; --pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94; -- --#[cfg(libressl261)] --pub const SSL_OP_ALL: c_ulong = 0x4; --#[cfg(not(libressl261))] --pub const SSL_OP_ALL: c_ulong = 0x80000014; --pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x0; --pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x0; --pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: c_ulong = 0x0; --pub const SSL_OP_NO_SSLv3: c_ulong = 0x0; --pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x0; --pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x0; --pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x0; --pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x0; --pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x0; --pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x0; --pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x0; --#[cfg(libressl261)] --pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0; --#[cfg(not(libressl261))] --pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000; --pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000; --pub const SSL_OP_NO_SSLv2: c_ulong = 0x0; -- --pub const SSL_MAX_SSL_SESSION_ID_LENGTH: c_int = 32; --pub const SSL_MAX_SID_CTX_LENGTH: c_int = 32; --pub const SSL_MAX_MASTER_KEY_LENGTH: c_int = 48; -- --pub const SSLEAY_VERSION: c_int = 0; --pub const SSLEAY_CFLAGS: c_int = 2; --pub const SSLEAY_BUILT_ON: c_int = 3; --pub const SSLEAY_PLATFORM: c_int = 4; --pub const SSLEAY_DIR: c_int = 5; -- --pub const CRYPTO_LOCK_X509: c_int = 3; --pub const CRYPTO_LOCK_SSL_CTX: c_int = 12; --pub const CRYPTO_LOCK_SSL_SESSION: c_int = 14; -- --static mut MUTEXES: *mut Vec> = 0 as *mut Vec>; --static mut GUARDS: *mut Vec>> = -- 0 as *mut Vec>>; -- --unsafe extern "C" fn locking_function(mode: c_int, n: c_int, _file: *const c_char, _line: c_int) { -- let mutex = &(*MUTEXES)[n as usize]; -- -- if mode & ::CRYPTO_LOCK != 0 { -- (*GUARDS)[n as usize] = Some(mutex.lock().unwrap()); -- } else { -- &(*GUARDS)[n as usize].take().expect("lock already unlocked"); -- } --} -- --pub fn init() { -- static INIT: Once = ONCE_INIT; -- -- INIT.call_once(|| unsafe { -- SSL_library_init(); -- SSL_load_error_strings(); -- OPENSSL_add_all_algorithms_noconf(); -- -- let num_locks = ::CRYPTO_num_locks(); -- let mut mutexes = Box::new(Vec::new()); -- for _ in 0..num_locks { -- mutexes.push(Mutex::new(())); -- } -- MUTEXES = mem::transmute(mutexes); -- let guards: Box>>> = -- Box::new((0..num_locks).map(|_| None).collect()); -- GUARDS = mem::transmute(guards); -- -- CRYPTO_set_locking_callback(locking_function); -- set_id_callback(); -- }) --} -- --#[cfg(unix)] --fn set_id_callback() { -- unsafe extern "C" fn thread_id() -> c_ulong { -- ::libc::pthread_self() as c_ulong -- } -- -- unsafe { -- CRYPTO_set_id_callback(thread_id); -- } --} -- --#[cfg(not(unix))] --fn set_id_callback() {} -- --// macros -- --pub unsafe fn SSL_CTX_set_ecdh_auto(ctx: *mut SSL_CTX, onoff: c_int) -> c_int { -- ::SSL_CTX_ctrl( -- ctx, -- SSL_CTRL_SET_ECDH_AUTO, -- onoff as c_long, -- ptr::null_mut(), -- ) as c_int --} -- --pub unsafe fn SSL_set_ecdh_auto(ssl: *mut ::SSL, onoff: c_int) -> c_int { -- ::SSL_ctrl( -- ssl, -- SSL_CTRL_SET_ECDH_AUTO, -- onoff as c_long, -- ptr::null_mut(), -- ) as c_int --} -- --pub unsafe fn SSL_session_reused(ssl: *mut ::SSL) -> c_int { -- ::SSL_ctrl(ssl, SSL_CTRL_GET_SESSION_REUSED, 0, ptr::null_mut()) as c_int --} -- --pub unsafe fn SSL_CTX_get_options(ctx: *const ::SSL_CTX) -> c_ulong { -- ::SSL_CTX_ctrl(ctx as *mut _, ::SSL_CTRL_OPTIONS, 0, ptr::null_mut()) as c_ulong --} -- --pub unsafe fn SSL_CTX_set_options(ctx: *const ::SSL_CTX, op: c_ulong) -> c_ulong { -- ::SSL_CTX_ctrl( -- ctx as *mut _, -- ::SSL_CTRL_OPTIONS, -- op as c_long, -- ptr::null_mut(), -- ) as c_ulong --} -- --pub unsafe fn SSL_CTX_clear_options(ctx: *const ::SSL_CTX, op: c_ulong) -> c_ulong { -- ::SSL_CTX_ctrl( -- ctx as *mut _, -- ::SSL_CTRL_CLEAR_OPTIONS, -- op as c_long, -- ptr::null_mut(), -- ) as c_ulong --} -- --extern "C" { -- pub fn BIO_new(type_: *mut BIO_METHOD) -> *mut BIO; -- pub fn BIO_s_file() -> *mut BIO_METHOD; -- pub fn BIO_s_mem() -> *mut BIO_METHOD; -- -- pub fn get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_1536(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_2048(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_3072(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_4096(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_6144(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_8192(bn: *mut BIGNUM) -> *mut BIGNUM; -- -- pub fn CRYPTO_malloc(num: c_int, file: *const c_char, line: c_int) -> *mut c_void; -- pub fn CRYPTO_free(buf: *mut c_void); -- pub fn CRYPTO_num_locks() -> c_int; -- pub fn CRYPTO_set_locking_callback( -- func: unsafe extern "C" fn(mode: c_int, n: c_int, file: *const c_char, line: c_int), -- ); -- pub fn CRYPTO_set_id_callback(func: unsafe extern "C" fn() -> c_ulong); -- -- pub fn ERR_load_crypto_strings(); -- -- pub fn RSA_generate_key( -- modsz: c_int, -- e: c_ulong, -- cb: Option, -- cbarg: *mut c_void, -- ) -> *mut RSA; -- -- pub fn OCSP_cert_to_id( -- dgst: *const ::EVP_MD, -- subject: *mut ::X509, -- issuer: *mut ::X509, -- ) -> *mut ::OCSP_CERTID; -- -- pub fn PKCS12_create( -- pass: *mut c_char, -- friendly_name: *mut c_char, -- pkey: *mut EVP_PKEY, -- cert: *mut X509, -- ca: *mut stack_st_X509, -- nid_key: c_int, -- nid_cert: c_int, -- iter: c_int, -- mac_iter: c_int, -- keytype: c_int, -- ) -> *mut PKCS12; -- -- pub fn SSL_library_init() -> c_int; -- pub fn SSL_load_error_strings(); -- pub fn OPENSSL_add_all_algorithms_noconf(); -- pub fn HMAC_CTX_init(ctx: *mut ::HMAC_CTX); -- pub fn HMAC_CTX_cleanup(ctx: *mut ::HMAC_CTX); -- pub fn TLSv1_method() -> *const ::SSL_METHOD; -- pub fn SSLv23_method() -> *const ::SSL_METHOD; -- pub fn TLSv1_1_method() -> *const ::SSL_METHOD; -- pub fn TLSv1_2_method() -> *const ::SSL_METHOD; -- pub fn DTLSv1_method() -> *const ::SSL_METHOD; -- pub fn SSL_get_ex_new_index( -- argl: c_long, -- argp: *mut c_void, -- new_func: Option<::CRYPTO_EX_new>, -- dup_func: Option<::CRYPTO_EX_dup>, -- free_func: Option<::CRYPTO_EX_free>, -- ) -> c_int; -- pub fn SSL_set_tmp_ecdh_callback( -- ssl: *mut ::SSL, -- ecdh: unsafe extern "C" fn(ssl: *mut ::SSL, is_export: c_int, keylength: c_int) -- -> *mut ::EC_KEY, -- ); -- pub fn SSL_CIPHER_get_version(cipher: *const ::SSL_CIPHER) -> *mut c_char; -- pub fn SSL_CTX_get_ex_new_index( -- argl: c_long, -- argp: *mut c_void, -- new_func: Option<::CRYPTO_EX_new>, -- dup_func: Option<::CRYPTO_EX_dup>, -- free_func: Option<::CRYPTO_EX_free>, -- ) -> c_int; -- // FIXME should take an option -- pub fn SSL_CTX_set_tmp_ecdh_callback( -- ctx: *mut ::SSL_CTX, -- ecdh: unsafe extern "C" fn(ssl: *mut ::SSL, is_export: c_int, keylength: c_int) -- -> *mut ::EC_KEY, -- ); -- pub fn SSL_CTX_sess_set_get_cb( -- ctx: *mut ::SSL_CTX, -- get_session_cb: Option< -- unsafe extern "C" fn(*mut ::SSL, *mut c_uchar, c_int, *mut c_int) -> *mut SSL_SESSION, -- >, -- ); -- #[cfg(libressl261)] -- pub fn SSL_CTX_set_min_proto_version(ctx: *mut ::SSL_CTX, version: u16) -> c_int; -- #[cfg(libressl261)] -- pub fn SSL_CTX_set_max_proto_version(ctx: *mut ::SSL_CTX, version: u16) -> c_int; -- #[cfg(libressl270)] -- pub fn SSL_CTX_get_min_proto_version(ctx: *mut ::SSL_CTX) -> c_int; -- #[cfg(libressl270)] -- pub fn SSL_CTX_get_max_proto_version(ctx: *mut ::SSL_CTX) -> c_int; -- -- pub fn X509_get_subject_name(x: *mut ::X509) -> *mut ::X509_NAME; -- pub fn X509_get_issuer_name(x: *mut ::X509) -> *mut ::X509_NAME; -- pub fn X509_set_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -- pub fn X509_set_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -- pub fn X509_get_ext_d2i( -- x: *mut ::X509, -- nid: c_int, -- crit: *mut c_int, -- idx: *mut c_int, -- ) -> *mut c_void; -- pub fn X509_NAME_add_entry_by_NID( -- x: *mut ::X509_NAME, -- field: c_int, -- ty: c_int, -- bytes: *mut c_uchar, -- len: c_int, -- loc: c_int, -- set: c_int, -- ) -> c_int; -- pub fn X509_NAME_entry_count(n: *mut ::X509_NAME) -> c_int; -- pub fn X509_NAME_get_entry(n: *mut ::X509_NAME, loc: c_int) -> *mut ::X509_NAME_ENTRY; -- pub fn X509_NAME_ENTRY_get_data(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_STRING; -- pub fn X509_NAME_ENTRY_get_object(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_OBJECT; -- pub fn X509_STORE_CTX_get_chain(ctx: *mut ::X509_STORE_CTX) -> *mut stack_st_X509; -- pub fn X509V3_EXT_nconf_nid( -- conf: *mut ::CONF, -- ctx: *mut ::X509V3_CTX, -- ext_nid: c_int, -- value: *mut c_char, -- ) -> *mut ::X509_EXTENSION; -- pub fn X509V3_EXT_nconf( -- conf: *mut ::CONF, -- ctx: *mut ::X509V3_CTX, -- name: *mut c_char, -- value: *mut c_char, -- ) -> *mut ::X509_EXTENSION; -- pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *mut ::ASN1_STRING) -> c_int; -- pub fn ASN1_STRING_data(x: *mut ::ASN1_STRING) -> *mut c_uchar; -- pub fn CRYPTO_add_lock( -- pointer: *mut c_int, -- amount: c_int, -- type_: c_int, -- file: *const c_char, -- line: c_int, -- ) -> c_int; -- pub fn EVP_MD_CTX_create() -> *mut EVP_MD_CTX; -- pub fn EVP_MD_CTX_destroy(ctx: *mut EVP_MD_CTX); -- pub fn EVP_PKEY_bits(key: *mut EVP_PKEY) -> c_int; -- -- pub fn sk_new_null() -> *mut _STACK; -- pub fn sk_num(st: *const _STACK) -> c_int; -- pub fn sk_value(st: *const _STACK, n: c_int) -> *mut c_void; -- pub fn sk_free(st: *mut _STACK); -- pub fn sk_push(st: *mut _STACK, data: *mut c_void) -> c_int; -- pub fn sk_pop_free(st: *mut _STACK, free: Option); -- pub fn sk_pop(st: *mut _STACK) -> *mut c_void; -- -- pub fn SSLeay() -> c_ulong; -- pub fn SSLeay_version(key: c_int) -> *const c_char; --} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v250.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v250.rs deleted file mode 100644 index 06937c844da..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v250.rs +++ /dev/null @@ -1,224 +0,0 @@ ---- src/vendor/openssl-sys/src/libressl/v250.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/src/libressl/v250.rs -@@ -1,221 +0,0 @@ --use libc::{c_int, c_char, c_void, c_long, c_uchar, size_t, c_uint, c_ulong, time_t}; -- --use super::*; -- --#[repr(C)] --pub struct SSL { -- version: c_int, -- type_: c_int, -- method: *const ::SSL_METHOD, -- rbio: *mut c_void, -- wbio: *mut c_void, -- bbio: *mut c_void, -- rwstate: c_int, -- in_handshake: c_int, -- handshake_func: Option c_int>, -- pub server: c_int, -- new_session: c_int, -- quiet_shutdown: c_int, -- shutdown: c_int, -- state: c_int, -- rstate: c_int, -- init_buf: *mut c_void, -- init_msg: *mut c_void, -- init_num: c_int, -- init_off: c_int, -- packet: *mut c_uchar, -- packet_length: c_uint, -- s3: *mut c_void, -- d1: *mut c_void, -- read_ahead: c_int, -- msg_callback: Option< -- unsafe extern "C" fn(c_int, -- c_int, -- c_int, -- *const c_void, -- size_t, -- *mut SSL, -- *mut c_void), -- >, -- msg_callback_arg: *mut c_void, -- hit: c_int, -- param: *mut c_void, -- cipher_list: *mut stack_st_SSL_CIPHER, -- cipher_list_by_id: *mut stack_st_SSL_CIPHER, -- mac_flags: c_int, -- aead_read_ctx: *mut c_void, -- enc_read_ctx: *mut ::EVP_CIPHER_CTX, -- read_hash: *mut ::EVP_MD_CTX, -- aead_write_ctx: *mut c_void, -- enc_write_ctx: *mut ::EVP_CIPHER_CTX, -- write_hash: *mut ::EVP_MD_CTX, -- cert: *mut c_void, -- sid_ctx_length: c_uint, -- sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -- session: *mut ::SSL_SESSION, -- generate_session_id: ::GEN_SESSION_CB, -- verify_mode: c_int, -- verify_callback: Option c_int>, -- info_callback: Option, -- error: c_int, -- error_code: c_int, -- ctx: *mut ::SSL_CTX, -- debug: c_int, -- verify_result: c_long, -- ex_data: ::CRYPTO_EX_DATA, -- client_CA: *mut stack_st_X509_NAME, -- references: c_int, -- options: c_ulong, -- mode: c_ulong, -- max_cert_list: c_long, -- first_packet: c_int, -- client_version: c_int, -- max_send_fragment: c_uint, -- tlsext_debug_cb: -- Option, -- tlsext_debug_arg: *mut c_void, -- tlsext_hostname: *mut c_char, -- servername_done: c_int, -- tlsext_status_type: c_int, -- tlsext_status_expected: c_int, -- tlsext_ocsp_ids: *mut c_void, -- tlsext_ocsp_exts: *mut c_void, -- tlsext_ocsp_resp: *mut c_uchar, -- tlsext_ocsp_resplen: c_int, -- tlsext_ticket_expected: c_int, -- tlsext_ecpointformatlist_length: size_t, -- tlsext_ecpointformatlist: *mut c_uchar, -- tlsext_ellipticcurvelist_length: size_t, -- tlsext_ellipticcurvelist: *mut c_uchar, -- tlsext_session_ticket: *mut c_void, -- tlsext_session_ticket_ext_cb: ::tls_session_ticket_ext_cb_fn, -- tls_session_ticket_ext_cb_arg: *mut c_void, -- tls_session_secret_cb: ::tls_session_secret_cb_fn, -- tls_session_secret_cb_arg: *mut c_void, -- initial_ctx: *mut ::SSL_CTX, -- next_proto_negotiated: *mut c_uchar, -- next_proto_negotiated_len: c_uchar, -- srtp_profiles: *mut c_void, -- srtp_profile: *mut c_void, -- tlsext_heartbeat: c_uint, -- tlsext_hb_pending: c_uint, -- tlsext_hb_seq: c_uint, -- alpn_client_proto_list: *mut c_uchar, -- alpn_client_proto_list_len: c_uint, -- renegotiate: c_int, --} -- --#[repr(C)] --pub struct SSL_CTX { -- method: *mut c_void, -- cipher_list: *mut c_void, -- cipher_list_by_id: *mut c_void, -- cert_store: *mut c_void, -- sessions: *mut c_void, -- session_cache_size: c_ulong, -- session_cache_head: *mut c_void, -- session_cache_tail: *mut c_void, -- session_cache_mode: c_int, -- session_timeout: c_long, -- new_session_cb: *mut c_void, -- remove_session_cb: *mut c_void, -- get_session_cb: *mut c_void, -- stats: [c_int; 11], -- pub references: c_int, -- app_verify_callback: *mut c_void, -- app_verify_arg: *mut c_void, -- default_passwd_callback: *mut c_void, -- default_passwd_callback_userdata: *mut c_void, -- client_cert_cb: *mut c_void, -- app_gen_cookie_cb: *mut c_void, -- app_verify_cookie_cb: *mut c_void, -- ex_dat: ::CRYPTO_EX_DATA, -- rsa_md5: *mut c_void, -- md5: *mut c_void, -- sha1: *mut c_void, -- extra_certs: *mut c_void, -- comp_methods: *mut c_void, -- info_callback: *mut c_void, -- client_CA: *mut c_void, -- options: c_ulong, -- mode: c_ulong, -- max_cert_list: c_long, -- cert: *mut c_void, -- read_ahead: c_int, -- msg_callback: *mut c_void, -- msg_callback_arg: *mut c_void, -- verify_mode: c_int, -- sid_ctx_length: c_uint, -- sid_ctx: [c_uchar; 32], -- default_verify_callback: *mut c_void, -- generate_session_id: *mut c_void, -- param: *mut c_void, -- quiet_shutdown: c_int, -- max_send_fragment: c_uint, -- -- #[cfg(not(osslconf = "OPENSSL_NO_ENGINE"))] -- client_cert_engine: *mut c_void, -- -- tlsext_servername_callback: *mut c_void, -- tlsect_servername_arg: *mut c_void, -- tlsext_tick_key_name: [c_uchar; 16], -- tlsext_tick_hmac_key: [c_uchar; 16], -- tlsext_tick_aes_key: [c_uchar; 16], -- tlsext_ticket_key_cb: *mut c_void, -- tlsext_status_cb: *mut c_void, -- tlsext_status_arg: *mut c_void, -- tlsext_opaque_prf_input_callback: *mut c_void, -- tlsext_opaque_prf_input_callback_arg: *mut c_void, -- -- next_protos_advertised_cb: *mut c_void, -- next_protos_advertised_cb_arg: *mut c_void, -- next_proto_select_cb: *mut c_void, -- next_proto_select_cb_arg: *mut c_void, -- -- srtp_profiles: *mut c_void, --} -- --#[repr(C)] --pub struct SSL_SESSION { -- ssl_version: c_int, -- pub master_key_length: c_int, -- pub master_key: [c_uchar; 48], -- session_id_length: c_uint, -- session_id: [c_uchar; SSL_MAX_SSL_SESSION_ID_LENGTH as usize], -- sid_ctx_length: c_uint, -- sid_ctx: [c_uchar; SSL_MAX_SID_CTX_LENGTH as usize], -- not_resumable: c_int, -- sess_cert: *mut c_void, -- peer: *mut X509, -- verify_result: c_long, -- timeout: c_long, -- time: time_t, -- pub references: c_int, -- cipher: *const c_void, -- cipher_id: c_ulong, -- ciphers: *mut c_void, -- ex_data: ::CRYPTO_EX_DATA, -- prev: *mut c_void, -- next: *mut c_void, -- tlsext_hostname: *mut c_char, -- tlsext_ecpointformatlist_length: size_t, -- tlsext_ecpointformatlist: *mut u8, -- tlsext_ellipticcurvelist_length: size_t, -- tlsext_ellipticcurvelist: *mut u16, -- tlsext_tick: *mut c_uchar, -- tlsext_ticklen: size_t, -- tlsext_tick_lifetime_hint: c_long, --} -- --#[repr(C)] --pub struct X509_VERIFY_PARAM { -- pub name: *mut c_char, -- pub check_time: time_t, -- pub inh_flags: c_ulong, -- pub flags: c_ulong, -- pub purpose: c_int, -- pub trust: c_int, -- pub depth: c_int, -- pub policies: *mut stack_st_ASN1_OBJECT, -- //pub id: *mut X509_VERIFY_PARAM_ID, --} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v251.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v251.rs deleted file mode 100644 index 8a4ed564876..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v251.rs +++ /dev/null @@ -1,92 +0,0 @@ ---- src/vendor/openssl-sys/src/libressl/v251.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/src/libressl/v251.rs -@@ -1,89 +0,0 @@ --use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t, time_t}; -- --use super::*; -- --#[repr(C)] --pub struct SSL { -- version: c_int, -- method: *const ::SSL_METHOD, -- rbio: *mut ::BIO, -- wbio: *mut ::BIO, -- bbio: *mut ::BIO, -- pub server: c_int, -- s3: *mut c_void, -- d1: *mut c_void, -- param: *mut c_void, -- cipher_list: *mut stack_st_SSL_CIPHER, -- cert: *mut c_void, -- sid_ctx_length: c_uint, -- sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -- session: *mut ::SSL_SESSION, -- verify_mode: c_int, -- error: c_int, -- error_code: c_int, -- ctx: *mut ::SSL_CTX, -- verify_result: c_long, -- references: c_int, -- client_version: c_int, -- max_send_fragment: c_uint, -- tlsext_hostname: *mut c_char, -- tlsext_status_type: c_int, -- initial_ctx: *mut ::SSL_CTX, -- enc_read_ctx: *mut ::EVP_CIPHER_CTX, -- read_hash: *mut EVP_MD_CTX, -- internal: *mut c_void, --} -- --#[repr(C)] --pub struct SSL_CTX { -- method: *const ::SSL_METHOD, -- cipher_list: *mut stack_st_SSL_CIPHER, -- cert_store: *mut c_void, -- session_timeout: c_long, -- pub references: c_int, -- extra_certs: *mut stack_st_X509, -- verify_mode: c_int, -- sid_ctx_length: c_uint, -- sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -- param: *mut ::X509_VERIFY_PARAM, -- default_passwd_callback: *mut c_void, -- default_passwd_callback_userdata: *mut c_void, -- internal: *mut c_void, --} -- --#[repr(C)] --pub struct SSL_SESSION { -- ssl_version: c_int, -- pub master_key_length: c_int, -- pub master_key: [c_uchar; 48], -- session_id_length: c_uint, -- session_id: [c_uchar; ::SSL_MAX_SSL_SESSION_ID_LENGTH as usize], -- sid_ctx_length: c_uint, -- sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -- peer: *mut ::X509, -- verify_result: c_long, -- timeout: c_long, -- time: time_t, -- pub references: c_int, -- cipher: *const ::SSL_CIPHER, -- cipher_id: c_long, -- ciphers: *mut stack_st_SSL_CIPHER, -- tlsext_hostname: *mut c_char, -- tlsext_tick: *mut c_uchar, -- tlsext_ticklen: size_t, -- tlsext_tick_lifetime_int: c_long, -- internal: *mut c_void, --} -- --#[repr(C)] --pub struct X509_VERIFY_PARAM { -- pub name: *mut c_char, -- pub check_time: time_t, -- pub inh_flags: c_ulong, -- pub flags: c_ulong, -- pub purpose: c_int, -- pub trust: c_int, -- pub depth: c_int, -- pub policies: *mut stack_st_ASN1_OBJECT, -- id: *mut c_void, --} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v273.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v273.rs deleted file mode 100644 index 3c3c400b34b..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_libressl_v273.rs +++ /dev/null @@ -1,125 +0,0 @@ ---- src/vendor/openssl-sys/src/libressl/v273.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/src/libressl/v273.rs -@@ -1,122 +0,0 @@ --use libc::{c_char, c_int, c_long, c_uchar, c_void, size_t}; -- --extern "C" { -- pub fn ASN1_STRING_get0_data(x: *const ::ASN1_STRING) -> *const c_uchar; -- -- pub fn BIO_set_init(a: *mut ::BIO, init: c_int); -- pub fn BIO_set_data(a: *mut ::BIO, data: *mut c_void); -- pub fn BIO_get_data(a: *mut ::BIO) -> *mut c_void; -- pub fn BIO_meth_new(type_: c_int, name: *const c_char) -> *mut ::BIO_METHOD; -- pub fn BIO_meth_free(biom: *mut ::BIO_METHOD); -- // FIXME should wrap in Option -- pub fn BIO_meth_set_write( -- biom: *mut ::BIO_METHOD, -- write: unsafe extern "C" fn(*mut ::BIO, *const c_char, c_int) -> c_int, -- ) -> c_int; -- pub fn BIO_meth_set_read( -- biom: *mut ::BIO_METHOD, -- read: unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int, -- ) -> c_int; -- pub fn BIO_meth_set_puts( -- biom: *mut ::BIO_METHOD, -- read: unsafe extern "C" fn(*mut ::BIO, *const c_char) -> c_int, -- ) -> c_int; -- pub fn BIO_meth_set_ctrl( -- biom: *mut ::BIO_METHOD, -- read: unsafe extern "C" fn(*mut ::BIO, c_int, c_long, *mut c_void) -> c_long, -- ) -> c_int; -- pub fn BIO_meth_set_create( -- biom: *mut ::BIO_METHOD, -- create: unsafe extern "C" fn(*mut ::BIO) -> c_int, -- ) -> c_int; -- pub fn BIO_meth_set_destroy( -- biom: *mut ::BIO_METHOD, -- destroy: unsafe extern "C" fn(*mut ::BIO) -> c_int, -- ) -> c_int; -- -- pub fn DH_set0_pqg( -- dh: *mut ::DH, -- p: *mut ::BIGNUM, -- q: *mut ::BIGNUM, -- g: *mut ::BIGNUM, -- ) -> c_int; -- -- pub fn DSA_get0_pqg( -- d: *const ::DSA, -- p: *mut *const ::BIGNUM, -- q: *mut *const ::BIGNUM, -- q: *mut *const ::BIGNUM, -- ); -- pub fn DSA_set0_pqg( -- d: *mut ::DSA, -- p: *mut ::BIGNUM, -- q: *mut ::BIGNUM, -- q: *mut ::BIGNUM, -- ) -> c_int; -- pub fn DSA_get0_key( -- d: *const ::DSA, -- pub_key: *mut *const ::BIGNUM, -- priv_key: *mut *const ::BIGNUM, -- ); -- pub fn DSA_set0_key( -- d: *mut ::DSA, -- pub_key: *mut ::BIGNUM, -- priv_key: *mut ::BIGNUM, -- ) -> c_int; -- -- pub fn ECDSA_SIG_get0( -- sig: *const ::ECDSA_SIG, -- pr: *mut *const ::BIGNUM, -- ps: *mut *const ::BIGNUM, -- ); -- pub fn ECDSA_SIG_set0(sig: *mut ::ECDSA_SIG, pr: *mut ::BIGNUM, ps: *mut ::BIGNUM) -> c_int; -- -- pub fn EVP_CIPHER_key_length(cipher: *const ::EVP_CIPHER) -> c_int; -- pub fn EVP_CIPHER_block_size(cipher: *const ::EVP_CIPHER) -> c_int; -- pub fn EVP_CIPHER_iv_length(cipher: *const ::EVP_CIPHER) -> c_int; -- -- pub fn RSA_get0_key( -- r: *const ::RSA, -- n: *mut *const ::BIGNUM, -- e: *mut *const ::BIGNUM, -- d: *mut *const ::BIGNUM, -- ); -- pub fn RSA_get0_factors(r: *const ::RSA, p: *mut *const ::BIGNUM, q: *mut *const ::BIGNUM); -- pub fn RSA_get0_crt_params( -- r: *const ::RSA, -- dmp1: *mut *const ::BIGNUM, -- dmq1: *mut *const ::BIGNUM, -- iqmp: *mut *const ::BIGNUM, -- ); -- pub fn RSA_set0_key( -- r: *mut ::RSA, -- n: *mut ::BIGNUM, -- e: *mut ::BIGNUM, -- d: *mut ::BIGNUM, -- ) -> c_int; -- pub fn RSA_set0_factors(r: *mut ::RSA, p: *mut ::BIGNUM, q: *mut ::BIGNUM) -> c_int; -- pub fn RSA_set0_crt_params( -- r: *mut ::RSA, -- dmp1: *mut ::BIGNUM, -- dmq1: *mut ::BIGNUM, -- iqmp: *mut ::BIGNUM, -- ) -> c_int; -- -- pub fn SSL_CTX_up_ref(x: *mut ::SSL_CTX) -> c_int; -- -- pub fn SSL_SESSION_get_master_key( -- session: *const ::SSL_SESSION, -- out: *mut c_uchar, -- outlen: size_t, -- ) -> size_t; -- pub fn SSL_SESSION_up_ref(ses: *mut ::SSL_SESSION) -> c_int; -- -- pub fn X509_getm_notAfter(x: *const ::X509) -> *mut ::ASN1_TIME; -- pub fn X509_getm_notBefore(x: *const ::X509) -> *mut ::ASN1_TIME; -- pub fn X509_get0_signature( -- psig: *mut *const ::ASN1_BIT_STRING, -- palg: *mut *const ::X509_ALGOR, -- x: *const ::X509, -- ); -- pub fn X509_up_ref(x: *mut ::X509) -> c_int; --} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_macros.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_macros.rs deleted file mode 100644 index e5b99e255b7..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_macros.rs +++ /dev/null @@ -1,72 +0,0 @@ ---- src/vendor/openssl-sys/src/macros.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/macros.rs -@@ -0,0 +1,69 @@ -+// vendored from the cfg-if crate to avoid breaking ctest -+macro_rules! cfg_if { -+ // match if/else chains with a final `else` -+ ($( -+ if #[cfg($($meta:meta),*)] { $($it:item)* } -+ ) else * else { -+ $($it2:item)* -+ }) => { -+ cfg_if! { -+ @__items -+ () ; -+ $( ( ($($meta),*) ($($it)*) ), )* -+ ( () ($($it2)*) ), -+ } -+ }; -+ -+ // match if/else chains lacking a final `else` -+ ( -+ if #[cfg($($i_met:meta),*)] { $($i_it:item)* } -+ $( -+ else if #[cfg($($e_met:meta),*)] { $($e_it:item)* } -+ )* -+ ) => { -+ cfg_if! { -+ @__items -+ () ; -+ ( ($($i_met),*) ($($i_it)*) ), -+ $( ( ($($e_met),*) ($($e_it)*) ), )* -+ ( () () ), -+ } -+ }; -+ -+ // Internal and recursive macro to emit all the items -+ // -+ // Collects all the negated cfgs in a list at the beginning and after the -+ // semicolon is all the remaining items -+ (@__items ($($not:meta,)*) ; ) => {}; -+ (@__items ($($not:meta,)*) ; ( ($($m:meta),*) ($($it:item)*) ), $($rest:tt)*) => { -+ // Emit all items within one block, applying an approprate #[cfg]. The -+ // #[cfg] will require all `$m` matchers specified and must also negate -+ // all previous matchers. -+ cfg_if! { @__apply cfg(all($($m,)* not(any($($not),*)))), $($it)* } -+ -+ // Recurse to emit all other items in `$rest`, and when we do so add all -+ // our `$m` matchers to the list of `$not` matchers as future emissions -+ // will have to negate everything we just matched as well. -+ cfg_if! { @__items ($($not,)* $($m,)*) ; $($rest)* } -+ }; -+ -+ // Internal macro to Apply a cfg attribute to a list of items -+ (@__apply $m:meta, $($it:item)*) => { -+ $(#[$m] $it)* -+ }; -+} -+ -+macro_rules! stack { -+ ($t:ident) => { -+ cfg_if! { -+ if #[cfg(ossl110)] { -+ pub enum $t {} -+ } else { -+ #[repr(C)] -+ pub struct $t { -+ pub stack: ::_STACK, -+ } -+ } -+ } -+ } -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_obj__mac.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_obj__mac.rs deleted file mode 100644 index 02451eddb4d..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_obj__mac.rs +++ /dev/null @@ -1,917 +0,0 @@ ---- src/vendor/openssl-sys/src/obj_mac.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/obj_mac.rs -@@ -0,0 +1,914 @@ -+use libc::*; -+ -+pub const NID_undef: c_int = 0; -+pub const NID_itu_t: c_int = 645; -+pub const NID_ccitt: c_int = 404; -+pub const NID_iso: c_int = 181; -+pub const NID_joint_iso_itu_t: c_int = 646; -+pub const NID_joint_iso_ccitt: c_int = 393; -+pub const NID_member_body: c_int = 182; -+pub const NID_identified_organization: c_int = 676; -+pub const NID_hmac_md5: c_int = 780; -+pub const NID_hmac_sha1: c_int = 781; -+pub const NID_certicom_arc: c_int = 677; -+pub const NID_international_organizations: c_int = 647; -+pub const NID_wap: c_int = 678; -+pub const NID_wap_wsg: c_int = 679; -+pub const NID_selected_attribute_types: c_int = 394; -+pub const NID_clearance: c_int = 395; -+pub const NID_ISO_US: c_int = 183; -+pub const NID_X9_57: c_int = 184; -+pub const NID_X9cm: c_int = 185; -+pub const NID_dsa: c_int = 116; -+pub const NID_dsaWithSHA1: c_int = 113; -+pub const NID_ansi_X9_62: c_int = 405; -+pub const NID_X9_62_prime_field: c_int = 406; -+pub const NID_X9_62_characteristic_two_field: c_int = 407; -+pub const NID_X9_62_id_characteristic_two_basis: c_int = 680; -+pub const NID_X9_62_onBasis: c_int = 681; -+pub const NID_X9_62_tpBasis: c_int = 682; -+pub const NID_X9_62_ppBasis: c_int = 683; -+pub const NID_X9_62_id_ecPublicKey: c_int = 408; -+pub const NID_X9_62_c2pnb163v1: c_int = 684; -+pub const NID_X9_62_c2pnb163v2: c_int = 685; -+pub const NID_X9_62_c2pnb163v3: c_int = 686; -+pub const NID_X9_62_c2pnb176v1: c_int = 687; -+pub const NID_X9_62_c2tnb191v1: c_int = 688; -+pub const NID_X9_62_c2tnb191v2: c_int = 689; -+pub const NID_X9_62_c2tnb191v3: c_int = 690; -+pub const NID_X9_62_c2onb191v4: c_int = 691; -+pub const NID_X9_62_c2onb191v5: c_int = 692; -+pub const NID_X9_62_c2pnb208w1: c_int = 693; -+pub const NID_X9_62_c2tnb239v1: c_int = 694; -+pub const NID_X9_62_c2tnb239v2: c_int = 695; -+pub const NID_X9_62_c2tnb239v3: c_int = 696; -+pub const NID_X9_62_c2onb239v4: c_int = 697; -+pub const NID_X9_62_c2onb239v5: c_int = 698; -+pub const NID_X9_62_c2pnb272w1: c_int = 699; -+pub const NID_X9_62_c2pnb304w1: c_int = 700; -+pub const NID_X9_62_c2tnb359v1: c_int = 701; -+pub const NID_X9_62_c2pnb368w1: c_int = 702; -+pub const NID_X9_62_c2tnb431r1: c_int = 703; -+pub const NID_X9_62_prime192v1: c_int = 409; -+pub const NID_X9_62_prime192v2: c_int = 410; -+pub const NID_X9_62_prime192v3: c_int = 411; -+pub const NID_X9_62_prime239v1: c_int = 412; -+pub const NID_X9_62_prime239v2: c_int = 413; -+pub const NID_X9_62_prime239v3: c_int = 414; -+pub const NID_X9_62_prime256v1: c_int = 415; -+pub const NID_ecdsa_with_SHA1: c_int = 416; -+pub const NID_ecdsa_with_Recommended: c_int = 791; -+pub const NID_ecdsa_with_Specified: c_int = 792; -+pub const NID_ecdsa_with_SHA224: c_int = 793; -+pub const NID_ecdsa_with_SHA256: c_int = 794; -+pub const NID_ecdsa_with_SHA384: c_int = 795; -+pub const NID_ecdsa_with_SHA512: c_int = 796; -+pub const NID_secp112r1: c_int = 704; -+pub const NID_secp112r2: c_int = 705; -+pub const NID_secp128r1: c_int = 706; -+pub const NID_secp128r2: c_int = 707; -+pub const NID_secp160k1: c_int = 708; -+pub const NID_secp160r1: c_int = 709; -+pub const NID_secp160r2: c_int = 710; -+pub const NID_secp192k1: c_int = 711; -+pub const NID_secp224k1: c_int = 712; -+pub const NID_secp224r1: c_int = 713; -+pub const NID_secp256k1: c_int = 714; -+pub const NID_secp384r1: c_int = 715; -+pub const NID_secp521r1: c_int = 716; -+pub const NID_sect113r1: c_int = 717; -+pub const NID_sect113r2: c_int = 718; -+pub const NID_sect131r1: c_int = 719; -+pub const NID_sect131r2: c_int = 720; -+pub const NID_sect163k1: c_int = 721; -+pub const NID_sect163r1: c_int = 722; -+pub const NID_sect163r2: c_int = 723; -+pub const NID_sect193r1: c_int = 724; -+pub const NID_sect193r2: c_int = 725; -+pub const NID_sect233k1: c_int = 726; -+pub const NID_sect233r1: c_int = 727; -+pub const NID_sect239k1: c_int = 728; -+pub const NID_sect283k1: c_int = 729; -+pub const NID_sect283r1: c_int = 730; -+pub const NID_sect409k1: c_int = 731; -+pub const NID_sect409r1: c_int = 732; -+pub const NID_sect571k1: c_int = 733; -+pub const NID_sect571r1: c_int = 734; -+pub const NID_wap_wsg_idm_ecid_wtls1: c_int = 735; -+pub const NID_wap_wsg_idm_ecid_wtls3: c_int = 736; -+pub const NID_wap_wsg_idm_ecid_wtls4: c_int = 737; -+pub const NID_wap_wsg_idm_ecid_wtls5: c_int = 738; -+pub const NID_wap_wsg_idm_ecid_wtls6: c_int = 739; -+pub const NID_wap_wsg_idm_ecid_wtls7: c_int = 740; -+pub const NID_wap_wsg_idm_ecid_wtls8: c_int = 741; -+pub const NID_wap_wsg_idm_ecid_wtls9: c_int = 742; -+pub const NID_wap_wsg_idm_ecid_wtls10: c_int = 743; -+pub const NID_wap_wsg_idm_ecid_wtls11: c_int = 744; -+pub const NID_wap_wsg_idm_ecid_wtls12: c_int = 745; -+pub const NID_cast5_cbc: c_int = 108; -+pub const NID_cast5_ecb: c_int = 109; -+pub const NID_cast5_cfb64: c_int = 110; -+pub const NID_cast5_ofb64: c_int = 111; -+pub const NID_pbeWithMD5AndCast5_CBC: c_int = 112; -+pub const NID_id_PasswordBasedMAC: c_int = 782; -+pub const NID_id_DHBasedMac: c_int = 783; -+pub const NID_rsadsi: c_int = 1; -+pub const NID_pkcs: c_int = 2; -+pub const NID_pkcs1: c_int = 186; -+pub const NID_rsaEncryption: c_int = 6; -+pub const NID_md2WithRSAEncryption: c_int = 7; -+pub const NID_md4WithRSAEncryption: c_int = 396; -+pub const NID_md5WithRSAEncryption: c_int = 8; -+pub const NID_sha1WithRSAEncryption: c_int = 65; -+pub const NID_rsaesOaep: c_int = 919; -+pub const NID_mgf1: c_int = 911; -+pub const NID_rsassaPss: c_int = 912; -+pub const NID_sha256WithRSAEncryption: c_int = 668; -+pub const NID_sha384WithRSAEncryption: c_int = 669; -+pub const NID_sha512WithRSAEncryption: c_int = 670; -+pub const NID_sha224WithRSAEncryption: c_int = 671; -+pub const NID_pkcs3: c_int = 27; -+pub const NID_dhKeyAgreement: c_int = 28; -+pub const NID_pkcs5: c_int = 187; -+pub const NID_pbeWithMD2AndDES_CBC: c_int = 9; -+pub const NID_pbeWithMD5AndDES_CBC: c_int = 10; -+pub const NID_pbeWithMD2AndRC2_CBC: c_int = 168; -+pub const NID_pbeWithMD5AndRC2_CBC: c_int = 169; -+pub const NID_pbeWithSHA1AndDES_CBC: c_int = 170; -+pub const NID_pbeWithSHA1AndRC2_CBC: c_int = 68; -+pub const NID_id_pbkdf2: c_int = 69; -+pub const NID_pbes2: c_int = 161; -+pub const NID_pbmac1: c_int = 162; -+pub const NID_pkcs7: c_int = 20; -+pub const NID_pkcs7_data: c_int = 21; -+pub const NID_pkcs7_signed: c_int = 22; -+pub const NID_pkcs7_enveloped: c_int = 23; -+pub const NID_pkcs7_signedAndEnveloped: c_int = 24; -+pub const NID_pkcs7_digest: c_int = 25; -+pub const NID_pkcs7_encrypted: c_int = 26; -+pub const NID_pkcs9: c_int = 47; -+pub const NID_pkcs9_emailAddress: c_int = 48; -+pub const NID_pkcs9_unstructuredName: c_int = 49; -+pub const NID_pkcs9_contentType: c_int = 50; -+pub const NID_pkcs9_messageDigest: c_int = 51; -+pub const NID_pkcs9_signingTime: c_int = 52; -+pub const NID_pkcs9_countersignature: c_int = 53; -+pub const NID_pkcs9_challengePassword: c_int = 54; -+pub const NID_pkcs9_unstructuredAddress: c_int = 55; -+pub const NID_pkcs9_extCertAttributes: c_int = 56; -+pub const NID_ext_req: c_int = 172; -+pub const NID_SMIMECapabilities: c_int = 167; -+pub const NID_SMIME: c_int = 188; -+pub const NID_id_smime_mod: c_int = 189; -+pub const NID_id_smime_ct: c_int = 190; -+pub const NID_id_smime_aa: c_int = 191; -+pub const NID_id_smime_alg: c_int = 192; -+pub const NID_id_smime_cd: c_int = 193; -+pub const NID_id_smime_spq: c_int = 194; -+pub const NID_id_smime_cti: c_int = 195; -+pub const NID_id_smime_mod_cms: c_int = 196; -+pub const NID_id_smime_mod_ess: c_int = 197; -+pub const NID_id_smime_mod_oid: c_int = 198; -+pub const NID_id_smime_mod_msg_v3: c_int = 199; -+pub const NID_id_smime_mod_ets_eSignature_88: c_int = 200; -+pub const NID_id_smime_mod_ets_eSignature_97: c_int = 201; -+pub const NID_id_smime_mod_ets_eSigPolicy_88: c_int = 202; -+pub const NID_id_smime_mod_ets_eSigPolicy_97: c_int = 203; -+pub const NID_id_smime_ct_receipt: c_int = 204; -+pub const NID_id_smime_ct_authData: c_int = 205; -+pub const NID_id_smime_ct_publishCert: c_int = 206; -+pub const NID_id_smime_ct_TSTInfo: c_int = 207; -+pub const NID_id_smime_ct_TDTInfo: c_int = 208; -+pub const NID_id_smime_ct_contentInfo: c_int = 209; -+pub const NID_id_smime_ct_DVCSRequestData: c_int = 210; -+pub const NID_id_smime_ct_DVCSResponseData: c_int = 211; -+pub const NID_id_smime_ct_compressedData: c_int = 786; -+pub const NID_id_ct_asciiTextWithCRLF: c_int = 787; -+pub const NID_id_smime_aa_receiptRequest: c_int = 212; -+pub const NID_id_smime_aa_securityLabel: c_int = 213; -+pub const NID_id_smime_aa_mlExpandHistory: c_int = 214; -+pub const NID_id_smime_aa_contentHint: c_int = 215; -+pub const NID_id_smime_aa_msgSigDigest: c_int = 216; -+pub const NID_id_smime_aa_encapContentType: c_int = 217; -+pub const NID_id_smime_aa_contentIdentifier: c_int = 218; -+pub const NID_id_smime_aa_macValue: c_int = 219; -+pub const NID_id_smime_aa_equivalentLabels: c_int = 220; -+pub const NID_id_smime_aa_contentReference: c_int = 221; -+pub const NID_id_smime_aa_encrypKeyPref: c_int = 222; -+pub const NID_id_smime_aa_signingCertificate: c_int = 223; -+pub const NID_id_smime_aa_smimeEncryptCerts: c_int = 224; -+pub const NID_id_smime_aa_timeStampToken: c_int = 225; -+pub const NID_id_smime_aa_ets_sigPolicyId: c_int = 226; -+pub const NID_id_smime_aa_ets_commitmentType: c_int = 227; -+pub const NID_id_smime_aa_ets_signerLocation: c_int = 228; -+pub const NID_id_smime_aa_ets_signerAttr: c_int = 229; -+pub const NID_id_smime_aa_ets_otherSigCert: c_int = 230; -+pub const NID_id_smime_aa_ets_contentTimestamp: c_int = 231; -+pub const NID_id_smime_aa_ets_CertificateRefs: c_int = 232; -+pub const NID_id_smime_aa_ets_RevocationRefs: c_int = 233; -+pub const NID_id_smime_aa_ets_certValues: c_int = 234; -+pub const NID_id_smime_aa_ets_revocationValues: c_int = 235; -+pub const NID_id_smime_aa_ets_escTimeStamp: c_int = 236; -+pub const NID_id_smime_aa_ets_certCRLTimestamp: c_int = 237; -+pub const NID_id_smime_aa_ets_archiveTimeStamp: c_int = 238; -+pub const NID_id_smime_aa_signatureType: c_int = 239; -+pub const NID_id_smime_aa_dvcs_dvc: c_int = 240; -+pub const NID_id_smime_alg_ESDHwith3DES: c_int = 241; -+pub const NID_id_smime_alg_ESDHwithRC2: c_int = 242; -+pub const NID_id_smime_alg_3DESwrap: c_int = 243; -+pub const NID_id_smime_alg_RC2wrap: c_int = 244; -+pub const NID_id_smime_alg_ESDH: c_int = 245; -+pub const NID_id_smime_alg_CMS3DESwrap: c_int = 246; -+pub const NID_id_smime_alg_CMSRC2wrap: c_int = 247; -+pub const NID_id_alg_PWRI_KEK: c_int = 893; -+pub const NID_id_smime_cd_ldap: c_int = 248; -+pub const NID_id_smime_spq_ets_sqt_uri: c_int = 249; -+pub const NID_id_smime_spq_ets_sqt_unotice: c_int = 250; -+pub const NID_id_smime_cti_ets_proofOfOrigin: c_int = 251; -+pub const NID_id_smime_cti_ets_proofOfReceipt: c_int = 252; -+pub const NID_id_smime_cti_ets_proofOfDelivery: c_int = 253; -+pub const NID_id_smime_cti_ets_proofOfSender: c_int = 254; -+pub const NID_id_smime_cti_ets_proofOfApproval: c_int = 255; -+pub const NID_id_smime_cti_ets_proofOfCreation: c_int = 256; -+pub const NID_friendlyName: c_int = 156; -+pub const NID_localKeyID: c_int = 157; -+pub const NID_ms_csp_name: c_int = 417; -+pub const NID_LocalKeySet: c_int = 856; -+pub const NID_x509Certificate: c_int = 158; -+pub const NID_sdsiCertificate: c_int = 159; -+pub const NID_x509Crl: c_int = 160; -+pub const NID_pbe_WithSHA1And128BitRC4: c_int = 144; -+pub const NID_pbe_WithSHA1And40BitRC4: c_int = 145; -+pub const NID_pbe_WithSHA1And3_Key_TripleDES_CBC: c_int = 146; -+pub const NID_pbe_WithSHA1And2_Key_TripleDES_CBC: c_int = 147; -+pub const NID_pbe_WithSHA1And128BitRC2_CBC: c_int = 148; -+pub const NID_pbe_WithSHA1And40BitRC2_CBC: c_int = 149; -+pub const NID_keyBag: c_int = 150; -+pub const NID_pkcs8ShroudedKeyBag: c_int = 151; -+pub const NID_certBag: c_int = 152; -+pub const NID_crlBag: c_int = 153; -+pub const NID_secretBag: c_int = 154; -+pub const NID_safeContentsBag: c_int = 155; -+pub const NID_md2: c_int = 3; -+pub const NID_md4: c_int = 257; -+pub const NID_md5: c_int = 4; -+pub const NID_md5_sha1: c_int = 114; -+pub const NID_hmacWithMD5: c_int = 797; -+pub const NID_hmacWithSHA1: c_int = 163; -+pub const NID_hmacWithSHA224: c_int = 798; -+pub const NID_hmacWithSHA256: c_int = 799; -+pub const NID_hmacWithSHA384: c_int = 800; -+pub const NID_hmacWithSHA512: c_int = 801; -+pub const NID_rc2_cbc: c_int = 37; -+pub const NID_rc2_ecb: c_int = 38; -+pub const NID_rc2_cfb64: c_int = 39; -+pub const NID_rc2_ofb64: c_int = 40; -+pub const NID_rc2_40_cbc: c_int = 98; -+pub const NID_rc2_64_cbc: c_int = 166; -+pub const NID_rc4: c_int = 5; -+pub const NID_rc4_40: c_int = 97; -+pub const NID_des_ede3_cbc: c_int = 44; -+pub const NID_rc5_cbc: c_int = 120; -+pub const NID_rc5_ecb: c_int = 121; -+pub const NID_rc5_cfb64: c_int = 122; -+pub const NID_rc5_ofb64: c_int = 123; -+pub const NID_ms_ext_req: c_int = 171; -+pub const NID_ms_code_ind: c_int = 134; -+pub const NID_ms_code_com: c_int = 135; -+pub const NID_ms_ctl_sign: c_int = 136; -+pub const NID_ms_sgc: c_int = 137; -+pub const NID_ms_efs: c_int = 138; -+pub const NID_ms_smartcard_login: c_int = 648; -+pub const NID_ms_upn: c_int = 649; -+pub const NID_idea_cbc: c_int = 34; -+pub const NID_idea_ecb: c_int = 36; -+pub const NID_idea_cfb64: c_int = 35; -+pub const NID_idea_ofb64: c_int = 46; -+pub const NID_bf_cbc: c_int = 91; -+pub const NID_bf_ecb: c_int = 92; -+pub const NID_bf_cfb64: c_int = 93; -+pub const NID_bf_ofb64: c_int = 94; -+pub const NID_id_pkix: c_int = 127; -+pub const NID_id_pkix_mod: c_int = 258; -+pub const NID_id_pe: c_int = 175; -+pub const NID_id_qt: c_int = 259; -+pub const NID_id_kp: c_int = 128; -+pub const NID_id_it: c_int = 260; -+pub const NID_id_pkip: c_int = 261; -+pub const NID_id_alg: c_int = 262; -+pub const NID_id_cmc: c_int = 263; -+pub const NID_id_on: c_int = 264; -+pub const NID_id_pda: c_int = 265; -+pub const NID_id_aca: c_int = 266; -+pub const NID_id_qcs: c_int = 267; -+pub const NID_id_cct: c_int = 268; -+pub const NID_id_ppl: c_int = 662; -+pub const NID_id_ad: c_int = 176; -+pub const NID_id_pkix1_explicit_88: c_int = 269; -+pub const NID_id_pkix1_implicit_88: c_int = 270; -+pub const NID_id_pkix1_explicit_93: c_int = 271; -+pub const NID_id_pkix1_implicit_93: c_int = 272; -+pub const NID_id_mod_crmf: c_int = 273; -+pub const NID_id_mod_cmc: c_int = 274; -+pub const NID_id_mod_kea_profile_88: c_int = 275; -+pub const NID_id_mod_kea_profile_93: c_int = 276; -+pub const NID_id_mod_cmp: c_int = 277; -+pub const NID_id_mod_qualified_cert_88: c_int = 278; -+pub const NID_id_mod_qualified_cert_93: c_int = 279; -+pub const NID_id_mod_attribute_cert: c_int = 280; -+pub const NID_id_mod_timestamp_protocol: c_int = 281; -+pub const NID_id_mod_ocsp: c_int = 282; -+pub const NID_id_mod_dvcs: c_int = 283; -+pub const NID_id_mod_cmp2000: c_int = 284; -+pub const NID_info_access: c_int = 177; -+pub const NID_biometricInfo: c_int = 285; -+pub const NID_qcStatements: c_int = 286; -+pub const NID_ac_auditEntity: c_int = 287; -+pub const NID_ac_targeting: c_int = 288; -+pub const NID_aaControls: c_int = 289; -+pub const NID_sbgp_ipAddrBlock: c_int = 290; -+pub const NID_sbgp_autonomousSysNum: c_int = 291; -+pub const NID_sbgp_routerIdentifier: c_int = 292; -+pub const NID_ac_proxying: c_int = 397; -+pub const NID_sinfo_access: c_int = 398; -+pub const NID_proxyCertInfo: c_int = 663; -+pub const NID_id_qt_cps: c_int = 164; -+pub const NID_id_qt_unotice: c_int = 165; -+pub const NID_textNotice: c_int = 293; -+pub const NID_server_auth: c_int = 129; -+pub const NID_client_auth: c_int = 130; -+pub const NID_code_sign: c_int = 131; -+pub const NID_email_protect: c_int = 132; -+pub const NID_ipsecEndSystem: c_int = 294; -+pub const NID_ipsecTunnel: c_int = 295; -+pub const NID_ipsecUser: c_int = 296; -+pub const NID_time_stamp: c_int = 133; -+pub const NID_OCSP_sign: c_int = 180; -+pub const NID_dvcs: c_int = 297; -+pub const NID_id_it_caProtEncCert: c_int = 298; -+pub const NID_id_it_signKeyPairTypes: c_int = 299; -+pub const NID_id_it_encKeyPairTypes: c_int = 300; -+pub const NID_id_it_preferredSymmAlg: c_int = 301; -+pub const NID_id_it_caKeyUpdateInfo: c_int = 302; -+pub const NID_id_it_currentCRL: c_int = 303; -+pub const NID_id_it_unsupportedOIDs: c_int = 304; -+pub const NID_id_it_subscriptionRequest: c_int = 305; -+pub const NID_id_it_subscriptionResponse: c_int = 306; -+pub const NID_id_it_keyPairParamReq: c_int = 307; -+pub const NID_id_it_keyPairParamRep: c_int = 308; -+pub const NID_id_it_revPassphrase: c_int = 309; -+pub const NID_id_it_implicitConfirm: c_int = 310; -+pub const NID_id_it_confirmWaitTime: c_int = 311; -+pub const NID_id_it_origPKIMessage: c_int = 312; -+pub const NID_id_it_suppLangTags: c_int = 784; -+pub const NID_id_regCtrl: c_int = 313; -+pub const NID_id_regInfo: c_int = 314; -+pub const NID_id_regCtrl_regToken: c_int = 315; -+pub const NID_id_regCtrl_authenticator: c_int = 316; -+pub const NID_id_regCtrl_pkiPublicationInfo: c_int = 317; -+pub const NID_id_regCtrl_pkiArchiveOptions: c_int = 318; -+pub const NID_id_regCtrl_oldCertID: c_int = 319; -+pub const NID_id_regCtrl_protocolEncrKey: c_int = 320; -+pub const NID_id_regInfo_utf8Pairs: c_int = 321; -+pub const NID_id_regInfo_certReq: c_int = 322; -+pub const NID_id_alg_des40: c_int = 323; -+pub const NID_id_alg_noSignature: c_int = 324; -+pub const NID_id_alg_dh_sig_hmac_sha1: c_int = 325; -+pub const NID_id_alg_dh_pop: c_int = 326; -+pub const NID_id_cmc_statusInfo: c_int = 327; -+pub const NID_id_cmc_identification: c_int = 328; -+pub const NID_id_cmc_identityProof: c_int = 329; -+pub const NID_id_cmc_dataReturn: c_int = 330; -+pub const NID_id_cmc_transactionId: c_int = 331; -+pub const NID_id_cmc_senderNonce: c_int = 332; -+pub const NID_id_cmc_recipientNonce: c_int = 333; -+pub const NID_id_cmc_addExtensions: c_int = 334; -+pub const NID_id_cmc_encryptedPOP: c_int = 335; -+pub const NID_id_cmc_decryptedPOP: c_int = 336; -+pub const NID_id_cmc_lraPOPWitness: c_int = 337; -+pub const NID_id_cmc_getCert: c_int = 338; -+pub const NID_id_cmc_getCRL: c_int = 339; -+pub const NID_id_cmc_revokeRequest: c_int = 340; -+pub const NID_id_cmc_regInfo: c_int = 341; -+pub const NID_id_cmc_responseInfo: c_int = 342; -+pub const NID_id_cmc_queryPending: c_int = 343; -+pub const NID_id_cmc_popLinkRandom: c_int = 344; -+pub const NID_id_cmc_popLinkWitness: c_int = 345; -+pub const NID_id_cmc_confirmCertAcceptance: c_int = 346; -+pub const NID_id_on_personalData: c_int = 347; -+pub const NID_id_on_permanentIdentifier: c_int = 858; -+pub const NID_id_pda_dateOfBirth: c_int = 348; -+pub const NID_id_pda_placeOfBirth: c_int = 349; -+pub const NID_id_pda_gender: c_int = 351; -+pub const NID_id_pda_countryOfCitizenship: c_int = 352; -+pub const NID_id_pda_countryOfResidence: c_int = 353; -+pub const NID_id_aca_authenticationInfo: c_int = 354; -+pub const NID_id_aca_accessIdentity: c_int = 355; -+pub const NID_id_aca_chargingIdentity: c_int = 356; -+pub const NID_id_aca_group: c_int = 357; -+pub const NID_id_aca_role: c_int = 358; -+pub const NID_id_aca_encAttrs: c_int = 399; -+pub const NID_id_qcs_pkixQCSyntax_v1: c_int = 359; -+pub const NID_id_cct_crs: c_int = 360; -+pub const NID_id_cct_PKIData: c_int = 361; -+pub const NID_id_cct_PKIResponse: c_int = 362; -+pub const NID_id_ppl_anyLanguage: c_int = 664; -+pub const NID_id_ppl_inheritAll: c_int = 665; -+pub const NID_Independent: c_int = 667; -+pub const NID_ad_OCSP: c_int = 178; -+pub const NID_ad_ca_issuers: c_int = 179; -+pub const NID_ad_timeStamping: c_int = 363; -+pub const NID_ad_dvcs: c_int = 364; -+pub const NID_caRepository: c_int = 785; -+pub const NID_id_pkix_OCSP_basic: c_int = 365; -+pub const NID_id_pkix_OCSP_Nonce: c_int = 366; -+pub const NID_id_pkix_OCSP_CrlID: c_int = 367; -+pub const NID_id_pkix_OCSP_acceptableResponses: c_int = 368; -+pub const NID_id_pkix_OCSP_noCheck: c_int = 369; -+pub const NID_id_pkix_OCSP_archiveCutoff: c_int = 370; -+pub const NID_id_pkix_OCSP_serviceLocator: c_int = 371; -+pub const NID_id_pkix_OCSP_extendedStatus: c_int = 372; -+pub const NID_id_pkix_OCSP_valid: c_int = 373; -+pub const NID_id_pkix_OCSP_path: c_int = 374; -+pub const NID_id_pkix_OCSP_trustRoot: c_int = 375; -+pub const NID_algorithm: c_int = 376; -+pub const NID_md5WithRSA: c_int = 104; -+pub const NID_des_ecb: c_int = 29; -+pub const NID_des_cbc: c_int = 31; -+pub const NID_des_ofb64: c_int = 45; -+pub const NID_des_cfb64: c_int = 30; -+pub const NID_rsaSignature: c_int = 377; -+pub const NID_dsa_2: c_int = 67; -+pub const NID_dsaWithSHA: c_int = 66; -+pub const NID_shaWithRSAEncryption: c_int = 42; -+pub const NID_des_ede_ecb: c_int = 32; -+pub const NID_des_ede3_ecb: c_int = 33; -+pub const NID_des_ede_cbc: c_int = 43; -+pub const NID_des_ede_cfb64: c_int = 60; -+pub const NID_des_ede3_cfb64: c_int = 61; -+pub const NID_des_ede_ofb64: c_int = 62; -+pub const NID_des_ede3_ofb64: c_int = 63; -+pub const NID_desx_cbc: c_int = 80; -+pub const NID_sha: c_int = 41; -+pub const NID_sha1: c_int = 64; -+pub const NID_dsaWithSHA1_2: c_int = 70; -+pub const NID_sha1WithRSA: c_int = 115; -+pub const NID_ripemd160: c_int = 117; -+pub const NID_ripemd160WithRSA: c_int = 119; -+pub const NID_sxnet: c_int = 143; -+pub const NID_X500: c_int = 11; -+pub const NID_X509: c_int = 12; -+pub const NID_commonName: c_int = 13; -+pub const NID_surname: c_int = 100; -+pub const NID_serialNumber: c_int = 105; -+pub const NID_countryName: c_int = 14; -+pub const NID_localityName: c_int = 15; -+pub const NID_stateOrProvinceName: c_int = 16; -+pub const NID_streetAddress: c_int = 660; -+pub const NID_organizationName: c_int = 17; -+pub const NID_organizationalUnitName: c_int = 18; -+pub const NID_title: c_int = 106; -+pub const NID_description: c_int = 107; -+pub const NID_searchGuide: c_int = 859; -+pub const NID_businessCategory: c_int = 860; -+pub const NID_postalAddress: c_int = 861; -+pub const NID_postalCode: c_int = 661; -+pub const NID_postOfficeBox: c_int = 862; -+pub const NID_physicalDeliveryOfficeName: c_int = 863; -+pub const NID_telephoneNumber: c_int = 864; -+pub const NID_telexNumber: c_int = 865; -+pub const NID_teletexTerminalIdentifier: c_int = 866; -+pub const NID_facsimileTelephoneNumber: c_int = 867; -+pub const NID_x121Address: c_int = 868; -+pub const NID_internationaliSDNNumber: c_int = 869; -+pub const NID_registeredAddress: c_int = 870; -+pub const NID_destinationIndicator: c_int = 871; -+pub const NID_preferredDeliveryMethod: c_int = 872; -+pub const NID_presentationAddress: c_int = 873; -+pub const NID_supportedApplicationContext: c_int = 874; -+pub const NID_member: c_int = 875; -+pub const NID_owner: c_int = 876; -+pub const NID_roleOccupant: c_int = 877; -+pub const NID_seeAlso: c_int = 878; -+pub const NID_userPassword: c_int = 879; -+pub const NID_userCertificate: c_int = 880; -+pub const NID_cACertificate: c_int = 881; -+pub const NID_authorityRevocationList: c_int = 882; -+pub const NID_certificateRevocationList: c_int = 883; -+pub const NID_crossCertificatePair: c_int = 884; -+pub const NID_name: c_int = 173; -+pub const NID_givenName: c_int = 99; -+pub const NID_initials: c_int = 101; -+pub const NID_generationQualifier: c_int = 509; -+pub const NID_x500UniqueIdentifier: c_int = 503; -+pub const NID_dnQualifier: c_int = 174; -+pub const NID_enhancedSearchGuide: c_int = 885; -+pub const NID_protocolInformation: c_int = 886; -+pub const NID_distinguishedName: c_int = 887; -+pub const NID_uniqueMember: c_int = 888; -+pub const NID_houseIdentifier: c_int = 889; -+pub const NID_supportedAlgorithms: c_int = 890; -+pub const NID_deltaRevocationList: c_int = 891; -+pub const NID_dmdName: c_int = 892; -+pub const NID_pseudonym: c_int = 510; -+pub const NID_role: c_int = 400; -+pub const NID_X500algorithms: c_int = 378; -+pub const NID_rsa: c_int = 19; -+pub const NID_mdc2WithRSA: c_int = 96; -+pub const NID_mdc2: c_int = 95; -+pub const NID_id_ce: c_int = 81; -+pub const NID_subject_directory_attributes: c_int = 769; -+pub const NID_subject_key_identifier: c_int = 82; -+pub const NID_key_usage: c_int = 83; -+pub const NID_private_key_usage_period: c_int = 84; -+pub const NID_subject_alt_name: c_int = 85; -+pub const NID_issuer_alt_name: c_int = 86; -+pub const NID_basic_constraints: c_int = 87; -+pub const NID_crl_number: c_int = 88; -+pub const NID_crl_reason: c_int = 141; -+pub const NID_invalidity_date: c_int = 142; -+pub const NID_delta_crl: c_int = 140; -+pub const NID_issuing_distribution_point: c_int = 770; -+pub const NID_certificate_issuer: c_int = 771; -+pub const NID_name_constraints: c_int = 666; -+pub const NID_crl_distribution_points: c_int = 103; -+pub const NID_certificate_policies: c_int = 89; -+pub const NID_any_policy: c_int = 746; -+pub const NID_policy_mappings: c_int = 747; -+pub const NID_authority_key_identifier: c_int = 90; -+pub const NID_policy_constraints: c_int = 401; -+pub const NID_ext_key_usage: c_int = 126; -+pub const NID_freshest_crl: c_int = 857; -+pub const NID_inhibit_any_policy: c_int = 748; -+pub const NID_target_information: c_int = 402; -+pub const NID_no_rev_avail: c_int = 403; -+pub const NID_anyExtendedKeyUsage: c_int = 910; -+pub const NID_netscape: c_int = 57; -+pub const NID_netscape_cert_extension: c_int = 58; -+pub const NID_netscape_data_type: c_int = 59; -+pub const NID_netscape_cert_type: c_int = 71; -+pub const NID_netscape_base_url: c_int = 72; -+pub const NID_netscape_revocation_url: c_int = 73; -+pub const NID_netscape_ca_revocation_url: c_int = 74; -+pub const NID_netscape_renewal_url: c_int = 75; -+pub const NID_netscape_ca_policy_url: c_int = 76; -+pub const NID_netscape_ssl_server_name: c_int = 77; -+pub const NID_netscape_comment: c_int = 78; -+pub const NID_netscape_cert_sequence: c_int = 79; -+pub const NID_ns_sgc: c_int = 139; -+pub const NID_org: c_int = 379; -+pub const NID_dod: c_int = 380; -+pub const NID_iana: c_int = 381; -+pub const NID_Directory: c_int = 382; -+pub const NID_Management: c_int = 383; -+pub const NID_Experimental: c_int = 384; -+pub const NID_Private: c_int = 385; -+pub const NID_Security: c_int = 386; -+pub const NID_SNMPv2: c_int = 387; -+pub const NID_Mail: c_int = 388; -+pub const NID_Enterprises: c_int = 389; -+pub const NID_dcObject: c_int = 390; -+pub const NID_mime_mhs: c_int = 504; -+pub const NID_mime_mhs_headings: c_int = 505; -+pub const NID_mime_mhs_bodies: c_int = 506; -+pub const NID_id_hex_partial_message: c_int = 507; -+pub const NID_id_hex_multipart_message: c_int = 508; -+pub const NID_zlib_compression: c_int = 125; -+pub const NID_aes_128_ecb: c_int = 418; -+pub const NID_aes_128_cbc: c_int = 419; -+pub const NID_aes_128_ofb128: c_int = 420; -+pub const NID_aes_128_cfb128: c_int = 421; -+pub const NID_id_aes128_wrap: c_int = 788; -+pub const NID_aes_128_gcm: c_int = 895; -+pub const NID_aes_128_ccm: c_int = 896; -+pub const NID_id_aes128_wrap_pad: c_int = 897; -+pub const NID_aes_192_ecb: c_int = 422; -+pub const NID_aes_192_cbc: c_int = 423; -+pub const NID_aes_192_ofb128: c_int = 424; -+pub const NID_aes_192_cfb128: c_int = 425; -+pub const NID_id_aes192_wrap: c_int = 789; -+pub const NID_aes_192_gcm: c_int = 898; -+pub const NID_aes_192_ccm: c_int = 899; -+pub const NID_id_aes192_wrap_pad: c_int = 900; -+pub const NID_aes_256_ecb: c_int = 426; -+pub const NID_aes_256_cbc: c_int = 427; -+pub const NID_aes_256_ofb128: c_int = 428; -+pub const NID_aes_256_cfb128: c_int = 429; -+pub const NID_id_aes256_wrap: c_int = 790; -+pub const NID_aes_256_gcm: c_int = 901; -+pub const NID_aes_256_ccm: c_int = 902; -+pub const NID_id_aes256_wrap_pad: c_int = 903; -+pub const NID_aes_128_cfb1: c_int = 650; -+pub const NID_aes_192_cfb1: c_int = 651; -+pub const NID_aes_256_cfb1: c_int = 652; -+pub const NID_aes_128_cfb8: c_int = 653; -+pub const NID_aes_192_cfb8: c_int = 654; -+pub const NID_aes_256_cfb8: c_int = 655; -+pub const NID_aes_128_ctr: c_int = 904; -+pub const NID_aes_192_ctr: c_int = 905; -+pub const NID_aes_256_ctr: c_int = 906; -+pub const NID_aes_128_xts: c_int = 913; -+pub const NID_aes_256_xts: c_int = 914; -+pub const NID_des_cfb1: c_int = 656; -+pub const NID_des_cfb8: c_int = 657; -+pub const NID_des_ede3_cfb1: c_int = 658; -+pub const NID_des_ede3_cfb8: c_int = 659; -+pub const NID_sha256: c_int = 672; -+pub const NID_sha384: c_int = 673; -+pub const NID_sha512: c_int = 674; -+pub const NID_sha224: c_int = 675; -+pub const NID_dsa_with_SHA224: c_int = 802; -+pub const NID_dsa_with_SHA256: c_int = 803; -+pub const NID_hold_instruction_code: c_int = 430; -+pub const NID_hold_instruction_none: c_int = 431; -+pub const NID_hold_instruction_call_issuer: c_int = 432; -+pub const NID_hold_instruction_reject: c_int = 433; -+pub const NID_data: c_int = 434; -+pub const NID_pss: c_int = 435; -+pub const NID_ucl: c_int = 436; -+pub const NID_pilot: c_int = 437; -+pub const NID_pilotAttributeType: c_int = 438; -+pub const NID_pilotAttributeSyntax: c_int = 439; -+pub const NID_pilotObjectClass: c_int = 440; -+pub const NID_pilotGroups: c_int = 441; -+pub const NID_iA5StringSyntax: c_int = 442; -+pub const NID_caseIgnoreIA5StringSyntax: c_int = 443; -+pub const NID_pilotObject: c_int = 444; -+pub const NID_pilotPerson: c_int = 445; -+pub const NID_account: c_int = 446; -+pub const NID_document: c_int = 447; -+pub const NID_room: c_int = 448; -+pub const NID_documentSeries: c_int = 449; -+pub const NID_Domain: c_int = 392; -+pub const NID_rFC822localPart: c_int = 450; -+pub const NID_dNSDomain: c_int = 451; -+pub const NID_domainRelatedObject: c_int = 452; -+pub const NID_friendlyCountry: c_int = 453; -+pub const NID_simpleSecurityObject: c_int = 454; -+pub const NID_pilotOrganization: c_int = 455; -+pub const NID_pilotDSA: c_int = 456; -+pub const NID_qualityLabelledData: c_int = 457; -+pub const NID_userId: c_int = 458; -+pub const NID_textEncodedORAddress: c_int = 459; -+pub const NID_rfc822Mailbox: c_int = 460; -+pub const NID_info: c_int = 461; -+pub const NID_favouriteDrink: c_int = 462; -+pub const NID_roomNumber: c_int = 463; -+pub const NID_photo: c_int = 464; -+pub const NID_userClass: c_int = 465; -+pub const NID_host: c_int = 466; -+pub const NID_manager: c_int = 467; -+pub const NID_documentIdentifier: c_int = 468; -+pub const NID_documentTitle: c_int = 469; -+pub const NID_documentVersion: c_int = 470; -+pub const NID_documentAuthor: c_int = 471; -+pub const NID_documentLocation: c_int = 472; -+pub const NID_homeTelephoneNumber: c_int = 473; -+pub const NID_secretary: c_int = 474; -+pub const NID_otherMailbox: c_int = 475; -+pub const NID_lastModifiedTime: c_int = 476; -+pub const NID_lastModifiedBy: c_int = 477; -+pub const NID_domainComponent: c_int = 391; -+pub const NID_aRecord: c_int = 478; -+pub const NID_pilotAttributeType27: c_int = 479; -+pub const NID_mXRecord: c_int = 480; -+pub const NID_nSRecord: c_int = 481; -+pub const NID_sOARecord: c_int = 482; -+pub const NID_cNAMERecord: c_int = 483; -+pub const NID_associatedDomain: c_int = 484; -+pub const NID_associatedName: c_int = 485; -+pub const NID_homePostalAddress: c_int = 486; -+pub const NID_personalTitle: c_int = 487; -+pub const NID_mobileTelephoneNumber: c_int = 488; -+pub const NID_pagerTelephoneNumber: c_int = 489; -+pub const NID_friendlyCountryName: c_int = 490; -+pub const NID_organizationalStatus: c_int = 491; -+pub const NID_janetMailbox: c_int = 492; -+pub const NID_mailPreferenceOption: c_int = 493; -+pub const NID_buildingName: c_int = 494; -+pub const NID_dSAQuality: c_int = 495; -+pub const NID_singleLevelQuality: c_int = 496; -+pub const NID_subtreeMinimumQuality: c_int = 497; -+pub const NID_subtreeMaximumQuality: c_int = 498; -+pub const NID_personalSignature: c_int = 499; -+pub const NID_dITRedirect: c_int = 500; -+pub const NID_audio: c_int = 501; -+pub const NID_documentPublisher: c_int = 502; -+pub const NID_id_set: c_int = 512; -+pub const NID_set_ctype: c_int = 513; -+pub const NID_set_msgExt: c_int = 514; -+pub const NID_set_attr: c_int = 515; -+pub const NID_set_policy: c_int = 516; -+pub const NID_set_certExt: c_int = 517; -+pub const NID_set_brand: c_int = 518; -+pub const NID_setct_PANData: c_int = 519; -+pub const NID_setct_PANToken: c_int = 520; -+pub const NID_setct_PANOnly: c_int = 521; -+pub const NID_setct_OIData: c_int = 522; -+pub const NID_setct_PI: c_int = 523; -+pub const NID_setct_PIData: c_int = 524; -+pub const NID_setct_PIDataUnsigned: c_int = 525; -+pub const NID_setct_HODInput: c_int = 526; -+pub const NID_setct_AuthResBaggage: c_int = 527; -+pub const NID_setct_AuthRevReqBaggage: c_int = 528; -+pub const NID_setct_AuthRevResBaggage: c_int = 529; -+pub const NID_setct_CapTokenSeq: c_int = 530; -+pub const NID_setct_PInitResData: c_int = 531; -+pub const NID_setct_PI_TBS: c_int = 532; -+pub const NID_setct_PResData: c_int = 533; -+pub const NID_setct_AuthReqTBS: c_int = 534; -+pub const NID_setct_AuthResTBS: c_int = 535; -+pub const NID_setct_AuthResTBSX: c_int = 536; -+pub const NID_setct_AuthTokenTBS: c_int = 537; -+pub const NID_setct_CapTokenData: c_int = 538; -+pub const NID_setct_CapTokenTBS: c_int = 539; -+pub const NID_setct_AcqCardCodeMsg: c_int = 540; -+pub const NID_setct_AuthRevReqTBS: c_int = 541; -+pub const NID_setct_AuthRevResData: c_int = 542; -+pub const NID_setct_AuthRevResTBS: c_int = 543; -+pub const NID_setct_CapReqTBS: c_int = 544; -+pub const NID_setct_CapReqTBSX: c_int = 545; -+pub const NID_setct_CapResData: c_int = 546; -+pub const NID_setct_CapRevReqTBS: c_int = 547; -+pub const NID_setct_CapRevReqTBSX: c_int = 548; -+pub const NID_setct_CapRevResData: c_int = 549; -+pub const NID_setct_CredReqTBS: c_int = 550; -+pub const NID_setct_CredReqTBSX: c_int = 551; -+pub const NID_setct_CredResData: c_int = 552; -+pub const NID_setct_CredRevReqTBS: c_int = 553; -+pub const NID_setct_CredRevReqTBSX: c_int = 554; -+pub const NID_setct_CredRevResData: c_int = 555; -+pub const NID_setct_PCertReqData: c_int = 556; -+pub const NID_setct_PCertResTBS: c_int = 557; -+pub const NID_setct_BatchAdminReqData: c_int = 558; -+pub const NID_setct_BatchAdminResData: c_int = 559; -+pub const NID_setct_CardCInitResTBS: c_int = 560; -+pub const NID_setct_MeAqCInitResTBS: c_int = 561; -+pub const NID_setct_RegFormResTBS: c_int = 562; -+pub const NID_setct_CertReqData: c_int = 563; -+pub const NID_setct_CertReqTBS: c_int = 564; -+pub const NID_setct_CertResData: c_int = 565; -+pub const NID_setct_CertInqReqTBS: c_int = 566; -+pub const NID_setct_ErrorTBS: c_int = 567; -+pub const NID_setct_PIDualSignedTBE: c_int = 568; -+pub const NID_setct_PIUnsignedTBE: c_int = 569; -+pub const NID_setct_AuthReqTBE: c_int = 570; -+pub const NID_setct_AuthResTBE: c_int = 571; -+pub const NID_setct_AuthResTBEX: c_int = 572; -+pub const NID_setct_AuthTokenTBE: c_int = 573; -+pub const NID_setct_CapTokenTBE: c_int = 574; -+pub const NID_setct_CapTokenTBEX: c_int = 575; -+pub const NID_setct_AcqCardCodeMsgTBE: c_int = 576; -+pub const NID_setct_AuthRevReqTBE: c_int = 577; -+pub const NID_setct_AuthRevResTBE: c_int = 578; -+pub const NID_setct_AuthRevResTBEB: c_int = 579; -+pub const NID_setct_CapReqTBE: c_int = 580; -+pub const NID_setct_CapReqTBEX: c_int = 581; -+pub const NID_setct_CapResTBE: c_int = 582; -+pub const NID_setct_CapRevReqTBE: c_int = 583; -+pub const NID_setct_CapRevReqTBEX: c_int = 584; -+pub const NID_setct_CapRevResTBE: c_int = 585; -+pub const NID_setct_CredReqTBE: c_int = 586; -+pub const NID_setct_CredReqTBEX: c_int = 587; -+pub const NID_setct_CredResTBE: c_int = 588; -+pub const NID_setct_CredRevReqTBE: c_int = 589; -+pub const NID_setct_CredRevReqTBEX: c_int = 590; -+pub const NID_setct_CredRevResTBE: c_int = 591; -+pub const NID_setct_BatchAdminReqTBE: c_int = 592; -+pub const NID_setct_BatchAdminResTBE: c_int = 593; -+pub const NID_setct_RegFormReqTBE: c_int = 594; -+pub const NID_setct_CertReqTBE: c_int = 595; -+pub const NID_setct_CertReqTBEX: c_int = 596; -+pub const NID_setct_CertResTBE: c_int = 597; -+pub const NID_setct_CRLNotificationTBS: c_int = 598; -+pub const NID_setct_CRLNotificationResTBS: c_int = 599; -+pub const NID_setct_BCIDistributionTBS: c_int = 600; -+pub const NID_setext_genCrypt: c_int = 601; -+pub const NID_setext_miAuth: c_int = 602; -+pub const NID_setext_pinSecure: c_int = 603; -+pub const NID_setext_pinAny: c_int = 604; -+pub const NID_setext_track2: c_int = 605; -+pub const NID_setext_cv: c_int = 606; -+pub const NID_set_policy_root: c_int = 607; -+pub const NID_setCext_hashedRoot: c_int = 608; -+pub const NID_setCext_certType: c_int = 609; -+pub const NID_setCext_merchData: c_int = 610; -+pub const NID_setCext_cCertRequired: c_int = 611; -+pub const NID_setCext_tunneling: c_int = 612; -+pub const NID_setCext_setExt: c_int = 613; -+pub const NID_setCext_setQualf: c_int = 614; -+pub const NID_setCext_PGWYcapabilities: c_int = 615; -+pub const NID_setCext_TokenIdentifier: c_int = 616; -+pub const NID_setCext_Track2Data: c_int = 617; -+pub const NID_setCext_TokenType: c_int = 618; -+pub const NID_setCext_IssuerCapabilities: c_int = 619; -+pub const NID_setAttr_Cert: c_int = 620; -+pub const NID_setAttr_PGWYcap: c_int = 621; -+pub const NID_setAttr_TokenType: c_int = 622; -+pub const NID_setAttr_IssCap: c_int = 623; -+pub const NID_set_rootKeyThumb: c_int = 624; -+pub const NID_set_addPolicy: c_int = 625; -+pub const NID_setAttr_Token_EMV: c_int = 626; -+pub const NID_setAttr_Token_B0Prime: c_int = 627; -+pub const NID_setAttr_IssCap_CVM: c_int = 628; -+pub const NID_setAttr_IssCap_T2: c_int = 629; -+pub const NID_setAttr_IssCap_Sig: c_int = 630; -+pub const NID_setAttr_GenCryptgrm: c_int = 631; -+pub const NID_setAttr_T2Enc: c_int = 632; -+pub const NID_setAttr_T2cleartxt: c_int = 633; -+pub const NID_setAttr_TokICCsig: c_int = 634; -+pub const NID_setAttr_SecDevSig: c_int = 635; -+pub const NID_set_brand_IATA_ATA: c_int = 636; -+pub const NID_set_brand_Diners: c_int = 637; -+pub const NID_set_brand_AmericanExpress: c_int = 638; -+pub const NID_set_brand_JCB: c_int = 639; -+pub const NID_set_brand_Visa: c_int = 640; -+pub const NID_set_brand_MasterCard: c_int = 641; -+pub const NID_set_brand_Novus: c_int = 642; -+pub const NID_des_cdmf: c_int = 643; -+pub const NID_rsaOAEPEncryptionSET: c_int = 644; -+pub const NID_ipsec3: c_int = 749; -+pub const NID_ipsec4: c_int = 750; -+pub const NID_whirlpool: c_int = 804; -+pub const NID_cryptopro: c_int = 805; -+pub const NID_cryptocom: c_int = 806; -+pub const NID_id_GostR3411_94_with_GostR3410_2001: c_int = 807; -+pub const NID_id_GostR3411_94_with_GostR3410_94: c_int = 808; -+pub const NID_id_GostR3411_94: c_int = 809; -+pub const NID_id_HMACGostR3411_94: c_int = 810; -+pub const NID_id_GostR3410_2001: c_int = 811; -+pub const NID_id_GostR3410_94: c_int = 812; -+pub const NID_id_Gost28147_89: c_int = 813; -+pub const NID_gost89_cnt: c_int = 814; -+pub const NID_id_Gost28147_89_MAC: c_int = 815; -+pub const NID_id_GostR3411_94_prf: c_int = 816; -+pub const NID_id_GostR3410_2001DH: c_int = 817; -+pub const NID_id_GostR3410_94DH: c_int = 818; -+pub const NID_id_Gost28147_89_CryptoPro_KeyMeshing: c_int = 819; -+pub const NID_id_Gost28147_89_None_KeyMeshing: c_int = 820; -+pub const NID_id_GostR3411_94_TestParamSet: c_int = 821; -+pub const NID_id_GostR3411_94_CryptoProParamSet: c_int = 822; -+pub const NID_id_Gost28147_89_TestParamSet: c_int = 823; -+pub const NID_id_Gost28147_89_CryptoPro_A_ParamSet: c_int = 824; -+pub const NID_id_Gost28147_89_CryptoPro_B_ParamSet: c_int = 825; -+pub const NID_id_Gost28147_89_CryptoPro_C_ParamSet: c_int = 826; -+pub const NID_id_Gost28147_89_CryptoPro_D_ParamSet: c_int = 827; -+pub const NID_id_Gost28147_89_CryptoPro_Oscar_1_1_ParamSet: c_int = 828; -+pub const NID_id_Gost28147_89_CryptoPro_Oscar_1_0_ParamSet: c_int = 829; -+pub const NID_id_Gost28147_89_CryptoPro_RIC_1_ParamSet: c_int = 830; -+pub const NID_id_GostR3410_94_TestParamSet: c_int = 831; -+pub const NID_id_GostR3410_94_CryptoPro_A_ParamSet: c_int = 832; -+pub const NID_id_GostR3410_94_CryptoPro_B_ParamSet: c_int = 833; -+pub const NID_id_GostR3410_94_CryptoPro_C_ParamSet: c_int = 834; -+pub const NID_id_GostR3410_94_CryptoPro_D_ParamSet: c_int = 835; -+pub const NID_id_GostR3410_94_CryptoPro_XchA_ParamSet: c_int = 836; -+pub const NID_id_GostR3410_94_CryptoPro_XchB_ParamSet: c_int = 837; -+pub const NID_id_GostR3410_94_CryptoPro_XchC_ParamSet: c_int = 838; -+pub const NID_id_GostR3410_2001_TestParamSet: c_int = 839; -+pub const NID_id_GostR3410_2001_CryptoPro_A_ParamSet: c_int = 840; -+pub const NID_id_GostR3410_2001_CryptoPro_B_ParamSet: c_int = 841; -+pub const NID_id_GostR3410_2001_CryptoPro_C_ParamSet: c_int = 842; -+pub const NID_id_GostR3410_2001_CryptoPro_XchA_ParamSet: c_int = 843; -+pub const NID_id_GostR3410_2001_CryptoPro_XchB_ParamSet: c_int = 844; -+pub const NID_id_GostR3410_94_a: c_int = 845; -+pub const NID_id_GostR3410_94_aBis: c_int = 846; -+pub const NID_id_GostR3410_94_b: c_int = 847; -+pub const NID_id_GostR3410_94_bBis: c_int = 848; -+pub const NID_id_Gost28147_89_cc: c_int = 849; -+pub const NID_id_GostR3410_94_cc: c_int = 850; -+pub const NID_id_GostR3410_2001_cc: c_int = 851; -+pub const NID_id_GostR3411_94_with_GostR3410_94_cc: c_int = 852; -+pub const NID_id_GostR3411_94_with_GostR3410_2001_cc: c_int = 853; -+pub const NID_id_GostR3410_2001_ParamSet_cc: c_int = 854; -+pub const NID_camellia_128_cbc: c_int = 751; -+pub const NID_camellia_192_cbc: c_int = 752; -+pub const NID_camellia_256_cbc: c_int = 753; -+pub const NID_id_camellia128_wrap: c_int = 907; -+pub const NID_id_camellia192_wrap: c_int = 908; -+pub const NID_id_camellia256_wrap: c_int = 909; -+pub const NID_camellia_128_ecb: c_int = 754; -+pub const NID_camellia_128_ofb128: c_int = 766; -+pub const NID_camellia_128_cfb128: c_int = 757; -+pub const NID_camellia_192_ecb: c_int = 755; -+pub const NID_camellia_192_ofb128: c_int = 767; -+pub const NID_camellia_192_cfb128: c_int = 758; -+pub const NID_camellia_256_ecb: c_int = 756; -+pub const NID_camellia_256_ofb128: c_int = 768; -+pub const NID_camellia_256_cfb128: c_int = 759; -+pub const NID_camellia_128_cfb1: c_int = 760; -+pub const NID_camellia_192_cfb1: c_int = 761; -+pub const NID_camellia_256_cfb1: c_int = 762; -+pub const NID_camellia_128_cfb8: c_int = 763; -+pub const NID_camellia_192_cfb8: c_int = 764; -+pub const NID_camellia_256_cfb8: c_int = 765; -+pub const NID_kisa: c_int = 773; -+pub const NID_seed_ecb: c_int = 776; -+pub const NID_seed_cbc: c_int = 777; -+pub const NID_seed_cfb128: c_int = 779; -+pub const NID_seed_ofb128: c_int = 778; -+pub const NID_hmac: c_int = 855; -+pub const NID_cmac: c_int = 894; -+pub const NID_rc4_hmac_md5: c_int = 915; -+pub const NID_aes_128_cbc_hmac_sha1: c_int = 916; -+pub const NID_aes_192_cbc_hmac_sha1: c_int = 917; -+pub const NID_aes_256_cbc_hmac_sha1: c_int = 918; diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_object.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_object.rs deleted file mode 100644 index 66ff8669385..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_object.rs +++ /dev/null @@ -1,21 +0,0 @@ ---- src/vendor/openssl-sys/src/object.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/object.rs -@@ -0,0 +1,18 @@ -+use libc::*; -+ -+use *; -+ -+extern "C" { -+ pub fn OBJ_nid2ln(nid: c_int) -> *const c_char; -+ pub fn OBJ_nid2sn(nid: c_int) -> *const c_char; -+ pub fn OBJ_obj2nid(o: *const ASN1_OBJECT) -> c_int; -+ pub fn OBJ_obj2txt( -+ buf: *mut c_char, -+ buf_len: c_int, -+ a: *const ASN1_OBJECT, -+ no_name: c_int, -+ ) -> c_int; -+ -+ pub fn OBJ_find_sigid_algs(signid: c_int, pdig_nid: *mut c_int, ppkey_nid: *mut c_int) -+ -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_ocsp.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_ocsp.rs deleted file mode 100644 index c09d9f0c773..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_ocsp.rs +++ /dev/null @@ -1,121 +0,0 @@ ---- src/vendor/openssl-sys/src/ocsp.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/ocsp.rs -@@ -0,0 +1,118 @@ -+use libc::*; -+ -+use *; -+ -+pub const OCSP_REVOKED_STATUS_NOSTATUS: c_int = -1; -+pub const OCSP_REVOKED_STATUS_UNSPECIFIED: c_int = 0; -+pub const OCSP_REVOKED_STATUS_KEYCOMPROMISE: c_int = 1; -+pub const OCSP_REVOKED_STATUS_CACOMPROMISE: c_int = 2; -+pub const OCSP_REVOKED_STATUS_AFFILIATIONCHANGED: c_int = 3; -+pub const OCSP_REVOKED_STATUS_SUPERSEDED: c_int = 4; -+pub const OCSP_REVOKED_STATUS_CESSATIONOFOPERATION: c_int = 5; -+pub const OCSP_REVOKED_STATUS_CERTIFICATEHOLD: c_int = 6; -+pub const OCSP_REVOKED_STATUS_REMOVEFROMCRL: c_int = 8; -+ -+pub const OCSP_NOCERTS: c_ulong = 0x1; -+pub const OCSP_NOINTERN: c_ulong = 0x2; -+pub const OCSP_NOSIGS: c_ulong = 0x4; -+pub const OCSP_NOCHAIN: c_ulong = 0x8; -+pub const OCSP_NOVERIFY: c_ulong = 0x10; -+pub const OCSP_NOEXPLICIT: c_ulong = 0x20; -+pub const OCSP_NOCASIGN: c_ulong = 0x40; -+pub const OCSP_NODELEGATED: c_ulong = 0x80; -+pub const OCSP_NOCHECKS: c_ulong = 0x100; -+pub const OCSP_TRUSTOTHER: c_ulong = 0x200; -+pub const OCSP_RESPID_KEY: c_ulong = 0x400; -+pub const OCSP_NOTIME: c_ulong = 0x800; -+ -+pub enum OCSP_CERTID {} -+ -+pub enum OCSP_ONEREQ {} -+ -+pub enum OCSP_REQUEST {} -+ -+pub const OCSP_RESPONSE_STATUS_SUCCESSFUL: c_int = 0; -+pub const OCSP_RESPONSE_STATUS_MALFORMEDREQUEST: c_int = 1; -+pub const OCSP_RESPONSE_STATUS_INTERNALERROR: c_int = 2; -+pub const OCSP_RESPONSE_STATUS_TRYLATER: c_int = 3; -+pub const OCSP_RESPONSE_STATUS_SIGREQUIRED: c_int = 5; -+pub const OCSP_RESPONSE_STATUS_UNAUTHORIZED: c_int = 6; -+ -+pub const V_OCSP_CERTSTATUS_GOOD: c_int = 0; -+pub const V_OCSP_CERTSTATUS_REVOKED: c_int = 1; -+pub const V_OCSP_CERTSTATUS_UNKNOWN: c_int = 2; -+ -+pub enum OCSP_BASICRESP {} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn OCSP_cert_to_id( -+ dgst: *const EVP_MD, -+ subject: *const X509, -+ issuer: *const X509, -+ ) -> *mut OCSP_CERTID; -+ } -+ } else { -+ extern "C" { -+ pub fn OCSP_cert_to_id( -+ dgst: *const EVP_MD, -+ subject: *mut X509, -+ issuer: *mut X509, -+ ) -> *mut ::OCSP_CERTID; -+ } -+ } -+} -+ -+extern "C" { -+ pub fn OCSP_request_add0_id(r: *mut OCSP_REQUEST, id: *mut OCSP_CERTID) -> *mut OCSP_ONEREQ; -+ -+ pub fn OCSP_resp_find_status( -+ bs: *mut OCSP_BASICRESP, -+ id: *mut OCSP_CERTID, -+ status: *mut c_int, -+ reason: *mut c_int, -+ revtime: *mut *mut ASN1_GENERALIZEDTIME, -+ thisupd: *mut *mut ASN1_GENERALIZEDTIME, -+ nextupd: *mut *mut ASN1_GENERALIZEDTIME, -+ ) -> c_int; -+ pub fn OCSP_check_validity( -+ thisupd: *mut ASN1_GENERALIZEDTIME, -+ nextupd: *mut ASN1_GENERALIZEDTIME, -+ sec: c_long, -+ maxsec: c_long, -+ ) -> c_int; -+ -+ pub fn OCSP_response_status(resp: *mut OCSP_RESPONSE) -> c_int; -+ pub fn OCSP_response_get1_basic(resp: *mut OCSP_RESPONSE) -> *mut OCSP_BASICRESP; -+ -+ pub fn OCSP_response_create(status: c_int, bs: *mut OCSP_BASICRESP) -> *mut OCSP_RESPONSE; -+ -+ pub fn OCSP_BASICRESP_new() -> *mut OCSP_BASICRESP; -+ pub fn OCSP_BASICRESP_free(r: *mut OCSP_BASICRESP); -+ pub fn OCSP_RESPONSE_new() -> *mut OCSP_RESPONSE; -+ pub fn OCSP_RESPONSE_free(r: *mut OCSP_RESPONSE); -+ pub fn i2d_OCSP_RESPONSE(a: *mut OCSP_RESPONSE, pp: *mut *mut c_uchar) -> c_int; -+ pub fn d2i_OCSP_RESPONSE( -+ a: *mut *mut OCSP_RESPONSE, -+ pp: *mut *const c_uchar, -+ length: c_long, -+ ) -> *mut OCSP_RESPONSE; -+ pub fn OCSP_ONEREQ_free(r: *mut OCSP_ONEREQ); -+ pub fn OCSP_CERTID_free(id: *mut OCSP_CERTID); -+ pub fn OCSP_REQUEST_new() -> *mut OCSP_REQUEST; -+ pub fn OCSP_REQUEST_free(r: *mut OCSP_REQUEST); -+ pub fn i2d_OCSP_REQUEST(a: *mut OCSP_REQUEST, pp: *mut *mut c_uchar) -> c_int; -+ pub fn d2i_OCSP_REQUEST( -+ a: *mut *mut OCSP_REQUEST, -+ pp: *mut *const c_uchar, -+ length: c_long, -+ ) -> *mut OCSP_REQUEST; -+ -+ pub fn OCSP_basic_verify( -+ bs: *mut OCSP_BASICRESP, -+ certs: *mut stack_st_X509, -+ st: *mut X509_STORE, -+ flags: c_ulong, -+ ) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_mod.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_mod.rs deleted file mode 100644 index 42c7ad925c3..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_mod.rs +++ /dev/null @@ -1,86 +0,0 @@ ---- src/vendor/openssl-sys/src/openssl/mod.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/src/openssl/mod.rs -@@ -1,83 +0,0 @@ --use libc::{c_int, c_long, c_uchar, c_uint, c_ulong}; -- --#[cfg(not(ossl110))] --mod v10x; --#[cfg(not(ossl110))] --pub use openssl::v10x::*; -- --#[cfg(ossl110)] --mod v110; --#[cfg(ossl110)] --pub use openssl::v110::*; -- --#[cfg(ossl111)] --mod v111; --#[cfg(ossl111)] --pub use openssl::v111::*; -- --#[cfg(ossl102)] --pub const SSL_CTRL_SET_VERIFY_CERT_STORE: c_int = 106; -- --pub const SSL_MODE_SEND_CLIENTHELLO_TIME: c_long = 0x20; --pub const SSL_MODE_SEND_SERVERHELLO_TIME: c_long = 0x40; --pub const SSL_MODE_SEND_FALLBACK_SCSV: c_long = 0x80; -- --pub const SSL_OP_SAFARI_ECDHE_ECDSA_BUG: c_ulong = 0x00000040; -- --pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x00008000; --pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x00020000; --pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: c_ulong = 0x00040000; --pub const SSL_OP_NO_SSLv3: c_ulong = 0x02000000; --#[cfg(ossl102)] --pub const SSL_OP_NO_DTLSv1: c_ulong = 0x04000000; --#[cfg(ossl102)] --pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x08000000; -- --pub const X509_V_ERR_UNSPECIFIED: c_int = 1; -- --pub const CMS_TEXT: c_uint = 0x1; --pub const CMS_NOCERTS: c_uint = 0x2; --pub const CMS_NO_CONTENT_VERIFY: c_uint = 0x4; --pub const CMS_NO_ATTR_VERIFY: c_uint = 0x8; --pub const CMS_NOSIGS: c_uint = 0x4 | 0x8; --pub const CMS_NOINTERN: c_uint = 0x10; --pub const CMS_NO_SIGNER_CERT_VERIFY: c_uint = 0x20; --pub const CMS_NOVERIFY: c_uint = 0x20; --pub const CMS_DETACHED: c_uint = 0x40; --pub const CMS_BINARY: c_uint = 0x80; --pub const CMS_NOATTR: c_uint = 0x100; --pub const CMS_NOSMIMECAP: c_uint = 0x200; --pub const CMS_NOOLDMIMETYPE: c_uint = 0x400; --pub const CMS_CRLFEOL: c_uint = 0x800; --pub const CMS_STREAM: c_uint = 0x1000; --pub const CMS_NOCRL: c_uint = 0x2000; --pub const CMS_PARTIAL: c_uint = 0x4000; --pub const CMS_REUSE_DIGEST: c_uint = 0x8000; --pub const CMS_USE_KEYID: c_uint = 0x10000; --pub const CMS_DEBUG_DECRYPT: c_uint = 0x20000; --#[cfg(ossl102)] --pub const CMS_KEY_PARAM: c_uint = 0x40000; -- --extern "C" { -- pub fn CMS_decrypt( -- cms: *mut ::CMS_ContentInfo, -- pkey: *mut ::EVP_PKEY, -- cert: *mut ::X509, -- dcont: *mut ::BIO, -- out: *mut ::BIO, -- flags: c_uint, -- ) -> c_int; -- pub fn SMIME_read_CMS(bio: *mut ::BIO, bcont: *mut *mut ::BIO) -> *mut ::CMS_ContentInfo; -- pub fn CMS_ContentInfo_free(cms: *mut ::CMS_ContentInfo); -- pub fn CMS_sign( -- signcert: *mut ::X509, -- pkey: *mut ::EVP_PKEY, -- certs: *mut ::stack_st_X509, -- data: *mut ::BIO, -- flags: c_uint, -- ) -> *mut ::CMS_ContentInfo; -- pub fn i2d_CMS_ContentInfo(a: *mut ::CMS_ContentInfo, pp: *mut *mut c_uchar) -> c_int; -- -- pub fn FIPS_mode_set(onoff: c_int) -> c_int; -- pub fn FIPS_mode() -> c_int; --} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v10x.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v10x.rs deleted file mode 100644 index 0f0a25c6830..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v10x.rs +++ /dev/null @@ -1,1008 +0,0 @@ ---- src/vendor/openssl-sys/src/openssl/v10x.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/src/openssl/v10x.rs -@@ -1,1005 +0,0 @@ --use std::io::{self, Write}; --use std::mem; --use std::process; --use std::ptr; --use std::sync::{Mutex, MutexGuard}; --use std::sync::{Once, ONCE_INIT}; -- --#[cfg(ossl102)] --use libc::time_t; --use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t}; -- --#[repr(C)] --pub struct stack_st_ASN1_OBJECT { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_X509 { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_X509_NAME { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_X509_ATTRIBUTE { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_X509_EXTENSION { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_GENERAL_NAME { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_void { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_SSL_CIPHER { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct stack_st_OPENSSL_STRING { -- pub stack: _STACK, --} -- --#[repr(C)] --pub struct _STACK { -- pub num: c_int, -- pub data: *mut *mut c_char, -- pub sorted: c_int, -- pub num_alloc: c_int, -- pub comp: Option c_int>, --} -- --#[repr(C)] --pub struct BIO_METHOD { -- pub type_: c_int, -- pub name: *const c_char, -- pub bwrite: Option c_int>, -- pub bread: Option c_int>, -- pub bputs: Option c_int>, -- pub bgets: Option c_int>, -- pub ctrl: Option c_long>, -- pub create: Option c_int>, -- pub destroy: Option c_int>, -- pub callback_ctrl: Option c_long>, --} -- --#[repr(C)] --pub struct RSA { -- pub pad: c_int, -- pub version: c_long, -- pub meth: *const ::RSA_METHOD, -- -- pub engine: *mut ::ENGINE, -- pub n: *mut ::BIGNUM, -- pub e: *mut ::BIGNUM, -- pub d: *mut ::BIGNUM, -- pub p: *mut ::BIGNUM, -- pub q: *mut ::BIGNUM, -- pub dmp1: *mut ::BIGNUM, -- pub dmq1: *mut ::BIGNUM, -- pub iqmp: *mut ::BIGNUM, -- -- pub ex_data: ::CRYPTO_EX_DATA, -- pub references: c_int, -- pub flags: c_int, -- -- pub _method_mod_n: *mut ::BN_MONT_CTX, -- pub _method_mod_p: *mut ::BN_MONT_CTX, -- pub _method_mod_q: *mut ::BN_MONT_CTX, -- -- pub bignum_data: *mut c_char, -- pub blinding: *mut ::BN_BLINDING, -- pub mt_blinding: *mut ::BN_BLINDING, --} -- --#[repr(C)] --pub struct DSA { -- pub pad: c_int, -- pub version: c_long, -- pub write_params: c_int, -- -- pub p: *mut ::BIGNUM, -- pub q: *mut ::BIGNUM, -- pub g: *mut ::BIGNUM, -- pub pub_key: *mut ::BIGNUM, -- pub priv_key: *mut ::BIGNUM, -- pub kinv: *mut ::BIGNUM, -- pub r: *mut ::BIGNUM, -- -- pub flags: c_int, -- pub method_mont_p: *mut ::BN_MONT_CTX, -- pub references: c_int, -- pub ex_data: ::CRYPTO_EX_DATA, -- pub meth: *const ::DSA_METHOD, -- pub engine: *mut ::ENGINE, --} -- --#[repr(C)] --pub struct ECDSA_SIG { -- pub r: *mut BIGNUM, -- pub s: *mut BIGNUM, --} -- --#[repr(C)] --pub struct EVP_PKEY { -- pub type_: c_int, -- pub save_type: c_int, -- pub references: c_int, -- pub ameth: *const ::EVP_PKEY_ASN1_METHOD, -- pub engine: *mut ::ENGINE, -- pub pkey: *mut c_void, -- pub save_parameters: c_int, -- pub attributes: *mut stack_st_X509_ATTRIBUTE, --} -- --#[repr(C)] --pub struct BIO { -- pub method: *mut ::BIO_METHOD, -- pub callback: Option< -- unsafe extern "C" fn(*mut ::BIO, c_int, *const c_char, c_int, c_long, c_long) -> c_long, -- >, -- pub cb_arg: *mut c_char, -- pub init: c_int, -- pub shutdown: c_int, -- pub flags: c_int, -- pub retry_reason: c_int, -- pub num: c_int, -- pub ptr: *mut c_void, -- pub next_bio: *mut ::BIO, -- pub prev_bio: *mut ::BIO, -- pub references: c_int, -- pub num_read: c_ulong, -- pub num_write: c_ulong, -- pub ex_data: ::CRYPTO_EX_DATA, --} -- --#[repr(C)] --pub struct CRYPTO_EX_DATA { -- pub sk: *mut ::stack_st_void, -- pub dummy: c_int, --} -- --#[repr(C)] --pub struct EVP_MD_CTX { -- digest: *mut ::EVP_MD, -- engine: *mut ::ENGINE, -- flags: c_ulong, -- md_data: *mut c_void, -- pctx: *mut ::EVP_PKEY_CTX, -- update: *mut c_void, --} -- --#[repr(C)] --pub struct EVP_CIPHER { -- pub nid: c_int, -- pub block_size: c_int, -- pub key_len: c_int, -- pub iv_len: c_int, -- pub flags: c_ulong, -- pub init: Option< -- unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX, *const c_uchar, *const c_uchar, c_int) -> c_int, -- >, -- pub do_cipher: Option< -- unsafe extern "C" fn(*mut ::EVP_CIPHER_CTX, *mut c_uchar, *const c_uchar, size_t) -> c_int, -- >, -- pub cleanup: Option c_int>, -- pub ctx_size: c_int, -- pub set_asn1_parameters: -- Option c_int>, -- pub get_asn1_parameters: -- Option c_int>, -- pub ctrl: -- Option c_int>, -- pub app_data: *mut c_void, --} -- --#[repr(C)] --pub struct HMAC_CTX { -- md: *mut ::EVP_MD, -- md_ctx: ::EVP_MD_CTX, -- i_ctx: ::EVP_MD_CTX, -- o_ctx: ::EVP_MD_CTX, -- key_length: c_uint, -- key: [c_uchar; 128], --} -- --#[repr(C)] --pub struct BIGNUM { -- pub d: *mut ::BN_ULONG, -- pub top: c_int, -- pub dmax: c_int, -- pub neg: c_int, -- pub flags: c_int, --} -- --#[repr(C)] --pub struct DH { -- pub pad: c_int, -- pub version: c_int, -- pub p: *mut ::BIGNUM, -- pub g: *mut ::BIGNUM, -- pub length: c_long, -- pub pub_key: *mut ::BIGNUM, -- pub priv_key: *mut ::BIGNUM, -- pub flags: c_int, -- pub method_mont_p: *mut ::BN_MONT_CTX, -- pub q: *mut ::BIGNUM, -- pub j: *mut ::BIGNUM, -- pub seed: *mut c_uchar, -- pub seedlen: c_int, -- pub counter: *mut ::BIGNUM, -- pub references: c_int, -- pub ex_data: ::CRYPTO_EX_DATA, -- pub meth: *const ::DH_METHOD, -- pub engine: *mut ::ENGINE, --} -- --#[repr(C)] --pub struct X509 { -- pub cert_info: *mut X509_CINF, -- pub sig_alg: *mut ::X509_ALGOR, -- pub signature: *mut ::ASN1_BIT_STRING, -- pub valid: c_int, -- pub references: c_int, -- pub name: *mut c_char, -- pub ex_data: ::CRYPTO_EX_DATA, -- pub ex_pathlen: c_long, -- pub ex_pcpathlen: c_long, -- pub ex_flags: c_ulong, -- pub ex_kusage: c_ulong, -- pub ex_xkusage: c_ulong, -- pub ex_nscert: c_ulong, -- skid: *mut c_void, -- akid: *mut c_void, -- policy_cache: *mut c_void, -- crldp: *mut c_void, -- altname: *mut c_void, -- nc: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_RFC3779"))] -- rfc3779_addr: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_RFC3779"))] -- rfc3779_asid: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_SHA"))] -- sha1_hash: [c_uchar; 20], -- aux: *mut c_void, --} -- --#[repr(C)] --pub struct X509_CINF { -- version: *mut c_void, -- serialNumber: *mut c_void, -- signature: *mut c_void, -- issuer: *mut c_void, -- pub validity: *mut X509_VAL, -- subject: *mut c_void, -- key: *mut c_void, -- issuerUID: *mut c_void, -- subjectUID: *mut c_void, -- pub extensions: *mut stack_st_X509_EXTENSION, -- enc: ASN1_ENCODING, --} -- --#[repr(C)] --pub struct X509_ALGOR { -- pub algorithm: *mut ::ASN1_OBJECT, -- parameter: *mut c_void, --} -- --#[repr(C)] --pub struct ASN1_ENCODING { -- pub enc: *mut c_uchar, -- pub len: c_long, -- pub modified: c_int, --} -- --#[repr(C)] --pub struct X509_VAL { -- pub notBefore: *mut ::ASN1_TIME, -- pub notAfter: *mut ::ASN1_TIME, --} -- --#[repr(C)] --pub struct X509_REQ_INFO { -- pub enc: ASN1_ENCODING, -- pub version: *mut ::ASN1_INTEGER, -- pub subject: *mut ::X509_NAME, -- pubkey: *mut c_void, -- pub attributes: *mut stack_st_X509_ATTRIBUTE, --} -- --#[repr(C)] --pub struct X509_REQ { -- pub req_info: *mut X509_REQ_INFO, -- sig_alg: *mut c_void, -- signature: *mut c_void, -- references: c_int, --} -- --#[repr(C)] --pub struct SSL { -- version: c_int, -- type_: c_int, -- method: *const ::SSL_METHOD, -- rbio: *mut c_void, -- wbio: *mut c_void, -- bbio: *mut c_void, -- rwstate: c_int, -- in_handshake: c_int, -- handshake_func: Option c_int>, -- pub server: c_int, -- new_session: c_int, -- quiet_session: c_int, -- shutdown: c_int, -- state: c_int, -- rstate: c_int, -- init_buf: *mut c_void, -- init_msg: *mut c_void, -- init_num: c_int, -- init_off: c_int, -- packet: *mut c_uchar, -- packet_length: c_uint, -- s2: *mut c_void, -- s3: *mut c_void, -- d1: *mut c_void, -- read_ahead: c_int, -- msg_callback: Option< -- unsafe extern "C" fn(c_int, c_int, c_int, *const c_void, size_t, *mut SSL, *mut c_void), -- >, -- msg_callback_arg: *mut c_void, -- hit: c_int, -- param: *mut c_void, -- cipher_list: *mut stack_st_SSL_CIPHER, -- cipher_list_by_id: *mut stack_st_SSL_CIPHER, -- mac_flags: c_int, -- enc_read_ctx: *mut ::EVP_CIPHER_CTX, -- read_hash: *mut ::EVP_MD_CTX, -- expand: *mut c_void, -- enc_write_ctx: *mut ::EVP_CIPHER_CTX, -- write_hash: *mut ::EVP_MD_CTX, -- compress: *mut c_void, -- cert: *mut c_void, -- sid_ctx_length: c_uint, -- sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -- session: *mut ::SSL_SESSION, -- generate_session_id: ::GEN_SESSION_CB, -- verify_mode: c_int, -- verify_callback: Option c_int>, -- info_callback: Option, -- error: c_int, -- error_code: c_int, -- #[cfg(not(osslconf = "OPENSSL_NO_KRB5"))] -- kssl_ctx: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -- psk_client_callback: Option< -- unsafe extern "C" fn(*mut SSL, *const c_char, *mut c_char, c_uint, *mut c_uchar, c_uint) -- -> c_uint, -- >, -- #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -- psk_server_callback: -- Option c_uint>, -- ctx: *mut ::SSL_CTX, -- debug: c_int, -- verify_result: c_long, -- ex_data: ::CRYPTO_EX_DATA, -- client_CA: *mut stack_st_X509_NAME, -- references: c_int, -- options: c_ulong, -- mode: c_ulong, -- max_cert_list: c_long, -- first_packet: c_int, -- client_version: c_int, -- max_send_fragment: c_uint, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_debug_cb: -- Option, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_debug_arg: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_hostname: *mut c_char, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- servername_done: c_int, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_status_type: c_int, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_status_expected: c_int, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_ocsp_ids: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_ocsp_exts: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_ocsp_resp: *mut c_uchar, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_ocsp_resplen: c_int, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_ticket_expected: c_int, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))] -- tlsext_ecpointformatlist_length: size_t, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))] -- tlsext_ecpointformatlist: *mut c_uchar, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))] -- tlsext_ellipticcurvelist_length: size_t, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))] -- tlsext_ellipticcurvelist: *mut c_uchar, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_opaque_prf_input: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_opaque_prf_input_len: size_t, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_session_ticket: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_session_ticket_ext_cb: ::tls_session_ticket_ext_cb_fn, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tls_session_ticket_ext_cb_arg: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tls_session_secret_cb: ::tls_session_secret_cb_fn, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tls_session_secret_cb_arg: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- initial_ctx: *mut ::SSL_CTX, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))] -- next_proto_negotiated: *mut c_uchar, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))] -- next_proto_negotiated_len: c_uchar, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- srtp_profiles: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- srtp_profile: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_heartbeat: c_uint, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_hb_pending: c_uint, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_hb_seq: c_uint, -- renegotiate: c_int, -- #[cfg(not(osslconf = "OPENSSL_NO_SRP"))] -- srp_ctx: ::SRP_CTX, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -- alpn_client_proto_list: *mut c_uchar, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -- alpn_client_proto_list_len: c_uint, --} -- --#[repr(C)] --pub struct SSL_CTX { -- method: *mut c_void, -- cipher_list: *mut c_void, -- cipher_list_by_id: *mut c_void, -- cert_store: *mut c_void, -- sessions: *mut c_void, -- session_cache_size: c_ulong, -- session_cache_head: *mut c_void, -- session_cache_tail: *mut c_void, -- session_cache_mode: c_int, -- session_timeout: c_long, -- new_session_cb: *mut c_void, -- remove_session_cb: *mut c_void, -- get_session_cb: *mut c_void, -- stats: [c_int; 11], -- pub references: c_int, -- app_verify_callback: *mut c_void, -- app_verify_arg: *mut c_void, -- default_passwd_callback: *mut c_void, -- default_passwd_callback_userdata: *mut c_void, -- client_cert_cb: *mut c_void, -- app_gen_cookie_cb: *mut c_void, -- app_verify_cookie_cb: *mut c_void, -- ex_dat: ::CRYPTO_EX_DATA, -- rsa_md5: *mut c_void, -- md5: *mut c_void, -- sha1: *mut c_void, -- extra_certs: *mut c_void, -- comp_methods: *mut c_void, -- info_callback: *mut c_void, -- client_CA: *mut c_void, -- options: c_ulong, -- mode: c_ulong, -- max_cert_list: c_long, -- cert: *mut c_void, -- read_ahead: c_int, -- msg_callback: *mut c_void, -- msg_callback_arg: *mut c_void, -- verify_mode: c_int, -- sid_ctx_length: c_uint, -- sid_ctx: [c_uchar; 32], -- default_verify_callback: *mut c_void, -- generate_session_id: *mut c_void, -- param: *mut c_void, -- quiet_shutdown: c_int, -- max_send_fragment: c_uint, -- -- #[cfg(not(osslconf = "OPENSSL_NO_ENGINE"))] -- client_cert_engine: *mut c_void, -- -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_servername_callback: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsect_servername_arg: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_tick_key_name: [c_uchar; 16], -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_tick_hmac_key: [c_uchar; 16], -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_tick_aes_key: [c_uchar; 16], -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_ticket_key_cb: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_status_cb: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_status_arg: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_opaque_prf_input_callback: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_opaque_prf_input_callback_arg: *mut c_void, -- -- #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -- psk_identity_hint: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -- psk_client_callback: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -- psk_server_callback: *mut c_void, -- -- #[cfg(not(osslconf = "OPENSSL_NO_BUF_FREELISTS"))] -- freelist_max_len: c_uint, -- #[cfg(not(osslconf = "OPENSSL_NO_BUF_FREELISTS"))] -- wbuf_freelist: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_BUF_FREELISTS"))] -- rbuf_freelist: *mut c_void, -- -- #[cfg(not(osslconf = "OPENSSL_NO_SRP"))] -- srp_ctx: SRP_CTX, -- -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))] -- next_protos_advertised_cb: *mut c_void, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))] -- next_protos_advertised_cb_arg: *mut c_void, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))] -- next_proto_select_cb: *mut c_void, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_NEXTPROTONEG")))] -- next_proto_select_cb_arg: *mut c_void, -- -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl101))] -- srtp_profiles: *mut c_void, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -- alpn_select_cb: *mut c_void, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -- alpn_select_cb_arg: *mut c_void, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -- alpn_client_proto_list: *mut c_void, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -- alpn_client_proto_list_len: c_uint, -- -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC"), ossl102))] -- tlsext_ecpointformatlist_length: size_t, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC"), ossl102))] -- tlsext_ecpointformatlist: *mut c_uchar, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC"), ossl102))] -- tlsext_ellipticcurvelist_length: size_t, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC"), ossl102))] -- tlsext_ellipticcurvelist: *mut c_uchar, --} -- --#[repr(C)] --pub struct SSL_SESSION { -- ssl_version: c_int, -- key_arg_length: c_uint, -- key_arg: [c_uchar; SSL_MAX_KEY_ARG_LENGTH as usize], -- pub master_key_length: c_int, -- pub master_key: [c_uchar; 48], -- session_id_length: c_uint, -- session_id: [c_uchar; SSL_MAX_SSL_SESSION_ID_LENGTH as usize], -- sid_ctx_length: c_uint, -- sid_ctx: [c_uchar; SSL_MAX_SID_CTX_LENGTH as usize], -- #[cfg(not(osslconf = "OPENSSL_NO_KRB5"))] -- krb5_client_princ_len: c_uint, -- #[cfg(not(osslconf = "OPENSSL_NO_KRB5"))] -- krb5_client_princ: [c_uchar; SSL_MAX_KRB5_PRINCIPAL_LENGTH as usize], -- #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -- psk_identity_hint: *mut c_char, -- #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -- psk_identity: *mut c_char, -- not_resumable: c_int, -- sess_cert: *mut c_void, -- peer: *mut X509, -- verify_result: c_long, -- pub references: c_int, -- timeout: c_long, -- time: c_long, -- compress_meth: c_uint, -- cipher: *const c_void, -- cipher_id: c_ulong, -- ciphers: *mut c_void, -- ex_data: ::CRYPTO_EX_DATA, -- prev: *mut c_void, -- next: *mut c_void, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_hostname: *mut c_char, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))] -- tlsext_ecpointformatlist_length: size_t, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))] -- tlsext_ecpointformatlist: *mut c_uchar, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))] -- tlsext_ellipticcurvelist_length: size_t, -- #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), not(osslconf = "OPENSSL_NO_EC")))] -- tlsext_ellipticcurvelist: *mut c_uchar, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_tick: *mut c_uchar, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_ticklen: size_t, -- #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -- tlsext_tick_lifetime_hint: c_long, -- #[cfg(not(osslconf = "OPENSSL_NO_SRP"))] -- srp_username: *mut c_char, --} -- --#[repr(C)] --pub struct SRP_CTX { -- SRP_cb_arg: *mut c_void, -- TLS_ext_srp_username_callback: *mut c_void, -- SRP_verify_param_callback: *mut c_void, -- SRP_give_srp_client_pwd_callback: *mut c_void, -- login: *mut c_void, -- N: *mut c_void, -- g: *mut c_void, -- s: *mut c_void, -- B: *mut c_void, -- A: *mut c_void, -- a: *mut c_void, -- b: *mut c_void, -- v: *mut c_void, -- info: *mut c_void, -- stringth: c_int, -- srp_Mask: c_ulong, --} -- --#[repr(C)] --#[cfg(ossl102)] --pub struct X509_VERIFY_PARAM { -- pub name: *mut c_char, -- pub check_time: time_t, -- pub inh_flags: c_ulong, -- pub flags: c_ulong, -- pub purpose: c_int, -- pub trust: c_int, -- pub depth: c_int, -- pub policies: *mut stack_st_ASN1_OBJECT, -- pub id: *mut X509_VERIFY_PARAM_ID, --} -- --#[cfg(ossl102)] --pub enum X509_VERIFY_PARAM_ID {} --pub enum PKCS12 {} -- --pub const SSL_CTRL_GET_SESSION_REUSED: c_int = 8; --pub const SSL_CTRL_OPTIONS: c_int = 32; --pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77; --#[cfg(ossl102)] --pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94; -- --pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x00000001; --pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x00000002; --pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x00000008; --pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x00000020; --pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x00000080; --pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x00000100; --pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x00000200; --pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000; --pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000; --pub const SSL_OP_NO_SSLv2: c_ulong = 0x01000000; -- --pub const SSL_MAX_SSL_SESSION_ID_LENGTH: c_int = 32; --pub const SSL_MAX_SID_CTX_LENGTH: c_int = 32; --pub const SSL_MAX_KEY_ARG_LENGTH: c_int = 8; --pub const SSL_MAX_MASTER_KEY_LENGTH: c_int = 48; --pub const SSL_MAX_KRB5_PRINCIPAL_LENGTH: c_int = 256; -- --pub const SSLEAY_VERSION: c_int = 0; --pub const SSLEAY_CFLAGS: c_int = 2; --pub const SSLEAY_BUILT_ON: c_int = 3; --pub const SSLEAY_PLATFORM: c_int = 4; --pub const SSLEAY_DIR: c_int = 5; -- --pub const CRYPTO_LOCK_X509: c_int = 3; --pub const CRYPTO_LOCK_SSL_CTX: c_int = 12; --pub const CRYPTO_LOCK_SSL_SESSION: c_int = 14; -- --#[cfg(ossl102h)] --pub const X509_V_ERR_INVALID_CALL: c_int = 65; --#[cfg(ossl102h)] --pub const X509_V_ERR_STORE_LOOKUP: c_int = 66; --#[cfg(ossl102h)] --pub const X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION: c_int = 67; -- --static mut MUTEXES: *mut Vec> = 0 as *mut Vec>; --static mut GUARDS: *mut Vec>> = -- 0 as *mut Vec>>; -- --unsafe extern "C" fn locking_function(mode: c_int, n: c_int, _file: *const c_char, _line: c_int) { -- let mutex = &(*MUTEXES)[n as usize]; -- -- if mode & ::CRYPTO_LOCK != 0 { -- (*GUARDS)[n as usize] = Some(mutex.lock().unwrap()); -- } else { -- if let None = (*GUARDS)[n as usize].take() { -- let _ = writeln!( -- io::stderr(), -- "BUG: rust-openssl lock {} already unlocked, aborting", -- n -- ); -- process::abort(); -- } -- } --} -- --pub fn init() { -- static INIT: Once = ONCE_INIT; -- -- INIT.call_once(|| unsafe { -- SSL_library_init(); -- SSL_load_error_strings(); -- OPENSSL_add_all_algorithms_noconf(); -- -- let num_locks = ::CRYPTO_num_locks(); -- let mut mutexes = Box::new(Vec::new()); -- for _ in 0..num_locks { -- mutexes.push(Mutex::new(())); -- } -- MUTEXES = mem::transmute(mutexes); -- let guards: Box>>> = -- Box::new((0..num_locks).map(|_| None).collect()); -- GUARDS = mem::transmute(guards); -- -- CRYPTO_set_locking_callback(locking_function); -- set_id_callback(); -- }) --} -- --#[cfg(unix)] --fn set_id_callback() { -- unsafe extern "C" fn thread_id() -> c_ulong { -- ::libc::pthread_self() as c_ulong -- } -- -- unsafe { -- CRYPTO_set_id_callback(thread_id); -- } --} -- --#[cfg(not(unix))] --fn set_id_callback() {} -- --// macros -- --#[cfg(ossl102)] --pub unsafe fn SSL_CTX_set_ecdh_auto(ctx: *mut SSL_CTX, onoff: c_int) -> c_int { -- ::SSL_CTX_ctrl( -- ctx, -- SSL_CTRL_SET_ECDH_AUTO, -- onoff as c_long, -- ptr::null_mut(), -- ) as c_int --} -- --#[cfg(ossl102)] --pub unsafe fn SSL_set_ecdh_auto(ssl: *mut ::SSL, onoff: c_int) -> c_int { -- ::SSL_ctrl( -- ssl, -- SSL_CTRL_SET_ECDH_AUTO, -- onoff as c_long, -- ptr::null_mut(), -- ) as c_int --} -- --pub unsafe fn SSL_session_reused(ssl: *mut ::SSL) -> c_int { -- ::SSL_ctrl(ssl, SSL_CTRL_GET_SESSION_REUSED, 0, ptr::null_mut()) as c_int --} -- --pub unsafe fn SSL_CTX_get_options(ctx: *const ::SSL_CTX) -> c_ulong { -- ::SSL_CTX_ctrl(ctx as *mut _, ::SSL_CTRL_OPTIONS, 0, ptr::null_mut()) as c_ulong --} -- --pub unsafe fn SSL_CTX_set_options(ctx: *const ::SSL_CTX, op: c_ulong) -> c_ulong { -- ::SSL_CTX_ctrl( -- ctx as *mut _, -- ::SSL_CTRL_OPTIONS, -- op as c_long, -- ptr::null_mut(), -- ) as c_ulong --} -- --pub unsafe fn SSL_CTX_clear_options(ctx: *const ::SSL_CTX, op: c_ulong) -> c_ulong { -- ::SSL_CTX_ctrl( -- ctx as *mut _, -- ::SSL_CTRL_CLEAR_OPTIONS, -- op as c_long, -- ptr::null_mut(), -- ) as c_ulong --} -- --extern "C" { -- pub fn BIO_new(type_: *mut BIO_METHOD) -> *mut BIO; -- pub fn BIO_s_file() -> *mut BIO_METHOD; -- pub fn BIO_s_mem() -> *mut BIO_METHOD; -- -- pub fn get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_1536(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_2048(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_3072(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_4096(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_6144(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn get_rfc3526_prime_8192(bn: *mut BIGNUM) -> *mut BIGNUM; -- -- pub fn CRYPTO_malloc(num: c_int, file: *const c_char, line: c_int) -> *mut c_void; -- pub fn CRYPTO_free(buf: *mut c_void); -- pub fn CRYPTO_num_locks() -> c_int; -- pub fn CRYPTO_set_locking_callback( -- func: unsafe extern "C" fn(mode: c_int, n: c_int, file: *const c_char, line: c_int), -- ); -- pub fn CRYPTO_set_id_callback(func: unsafe extern "C" fn() -> c_ulong); -- -- pub fn ERR_load_crypto_strings(); -- -- pub fn RSA_generate_key( -- modsz: c_int, -- e: c_ulong, -- cb: Option, -- cbarg: *mut c_void, -- ) -> *mut RSA; -- -- pub fn OCSP_cert_to_id( -- dgst: *const ::EVP_MD, -- subject: *mut ::X509, -- issuer: *mut ::X509, -- ) -> *mut ::OCSP_CERTID; -- -- pub fn PKCS12_create( -- pass: *mut c_char, -- friendly_name: *mut c_char, -- pkey: *mut EVP_PKEY, -- cert: *mut X509, -- ca: *mut stack_st_X509, -- nid_key: c_int, -- nid_cert: c_int, -- iter: c_int, -- mac_iter: c_int, -- keytype: c_int, -- ) -> *mut PKCS12; -- -- pub fn SSL_library_init() -> c_int; -- pub fn SSL_load_error_strings(); -- pub fn OPENSSL_add_all_algorithms_noconf(); -- pub fn HMAC_CTX_init(ctx: *mut ::HMAC_CTX); -- pub fn HMAC_CTX_cleanup(ctx: *mut ::HMAC_CTX); -- #[cfg(not(osslconf = "OPENSSL_NO_SSL3_METHOD"))] -- pub fn SSLv3_method() -> *const ::SSL_METHOD; -- pub fn TLSv1_method() -> *const ::SSL_METHOD; -- pub fn SSLv23_method() -> *const ::SSL_METHOD; -- pub fn TLSv1_1_method() -> *const ::SSL_METHOD; -- pub fn TLSv1_2_method() -> *const ::SSL_METHOD; -- pub fn DTLSv1_method() -> *const ::SSL_METHOD; -- #[cfg(ossl102)] -- pub fn DTLSv1_2_method() -> *const ::SSL_METHOD; -- pub fn SSL_get_ex_new_index( -- argl: c_long, -- argp: *mut c_void, -- new_func: Option<::CRYPTO_EX_new>, -- dup_func: Option<::CRYPTO_EX_dup>, -- free_func: Option<::CRYPTO_EX_free>, -- ) -> c_int; -- pub fn SSL_set_tmp_ecdh_callback( -- ssl: *mut ::SSL, -- ecdh: unsafe extern "C" fn(ssl: *mut ::SSL, is_export: c_int, keylength: c_int) -- -> *mut ::EC_KEY, -- ); -- pub fn SSL_CIPHER_get_version(cipher: *const ::SSL_CIPHER) -> *mut c_char; -- pub fn SSL_CTX_get_ex_new_index( -- argl: c_long, -- argp: *mut c_void, -- new_func: Option<::CRYPTO_EX_new>, -- dup_func: Option<::CRYPTO_EX_dup>, -- free_func: Option<::CRYPTO_EX_free>, -- ) -> c_int; -- // FIXME should take an option -- pub fn SSL_CTX_set_tmp_ecdh_callback( -- ctx: *mut ::SSL_CTX, -- ecdh: unsafe extern "C" fn(ssl: *mut ::SSL, is_export: c_int, keylength: c_int) -- -> *mut ::EC_KEY, -- ); -- pub fn SSL_CTX_sess_set_get_cb( -- ctx: *mut ::SSL_CTX, -- get_session_cb: Option< -- unsafe extern "C" fn(*mut ::SSL, *mut c_uchar, c_int, *mut c_int) -> *mut SSL_SESSION, -- >, -- ); -- pub fn X509_get_subject_name(x: *mut ::X509) -> *mut ::X509_NAME; -- pub fn X509_get_issuer_name(x: *mut ::X509) -> *mut ::X509_NAME; -- pub fn X509_set_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -- pub fn X509_set_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -- pub fn X509_get_ext_d2i( -- x: *mut ::X509, -- nid: c_int, -- crit: *mut c_int, -- idx: *mut c_int, -- ) -> *mut c_void; -- pub fn X509_NAME_add_entry_by_NID( -- x: *mut ::X509_NAME, -- field: c_int, -- ty: c_int, -- bytes: *mut c_uchar, -- len: c_int, -- loc: c_int, -- set: c_int, -- ) -> c_int; -- #[cfg(ossl102)] -- pub fn X509_get0_signature( -- psig: *mut *mut ::ASN1_BIT_STRING, -- palg: *mut *mut ::X509_ALGOR, -- x: *const ::X509, -- ); -- #[cfg(ossl102)] -- pub fn X509_get_signature_nid(x: *const X509) -> c_int; -- #[cfg(ossl102)] -- pub fn X509_ALGOR_get0( -- paobj: *mut *mut ::ASN1_OBJECT, -- pptype: *mut c_int, -- ppval: *mut *mut c_void, -- alg: *mut ::X509_ALGOR, -- ); -- pub fn X509_NAME_entry_count(n: *mut ::X509_NAME) -> c_int; -- pub fn X509_NAME_get_entry(n: *mut ::X509_NAME, loc: c_int) -> *mut ::X509_NAME_ENTRY; -- pub fn X509_NAME_ENTRY_get_data(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_STRING; -- pub fn X509_NAME_ENTRY_get_object(ne: *mut ::X509_NAME_ENTRY) -> *mut ::ASN1_OBJECT; -- pub fn X509_STORE_CTX_get_chain(ctx: *mut ::X509_STORE_CTX) -> *mut stack_st_X509; -- pub fn X509V3_EXT_nconf_nid( -- conf: *mut ::CONF, -- ctx: *mut ::X509V3_CTX, -- ext_nid: c_int, -- value: *mut c_char, -- ) -> *mut ::X509_EXTENSION; -- pub fn X509V3_EXT_nconf( -- conf: *mut ::CONF, -- ctx: *mut ::X509V3_CTX, -- name: *mut c_char, -- value: *mut c_char, -- ) -> *mut ::X509_EXTENSION; -- pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *mut ::ASN1_STRING) -> c_int; -- pub fn ASN1_STRING_data(x: *mut ::ASN1_STRING) -> *mut c_uchar; -- pub fn CRYPTO_add_lock( -- pointer: *mut c_int, -- amount: c_int, -- type_: c_int, -- file: *const c_char, -- line: c_int, -- ) -> c_int; -- pub fn EVP_MD_CTX_create() -> *mut EVP_MD_CTX; -- pub fn EVP_MD_CTX_destroy(ctx: *mut EVP_MD_CTX); -- pub fn EVP_PKEY_bits(key: *mut EVP_PKEY) -> c_int; -- -- pub fn sk_new_null() -> *mut _STACK; -- pub fn sk_num(st: *const _STACK) -> c_int; -- pub fn sk_value(st: *const _STACK, n: c_int) -> *mut c_void; -- pub fn sk_free(st: *mut _STACK); -- pub fn sk_push(st: *mut _STACK, data: *mut c_void) -> c_int; -- pub fn sk_pop_free(st: *mut _STACK, free: Option); -- pub fn sk_pop(st: *mut _STACK) -> *mut c_void; -- -- pub fn SSLeay() -> c_ulong; -- pub fn SSLeay_version(key: c_int) -> *const c_char; -- -- #[cfg(ossl102)] -- pub fn SSL_extension_supported(ext_type: c_uint) -> c_int; --} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v110.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v110.rs deleted file mode 100644 index 7798ae89bf7..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v110.rs +++ /dev/null @@ -1,398 +0,0 @@ ---- src/vendor/openssl-sys/src/openssl/v110.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/src/openssl/v110.rs -@@ -1,395 +0,0 @@ --use libc::{c_char, c_int, c_long, c_uchar, c_uint, c_ulong, c_void, size_t}; --use std::ptr; --use std::sync::{Once, ONCE_INIT}; -- --pub enum BIGNUM {} --pub enum BIO {} --pub enum BIO_METHOD {} --pub enum CRYPTO_EX_DATA {} --pub enum DH {} --pub enum DSA {} --pub enum ECDSA_SIG {} --pub enum EVP_CIPHER {} --pub enum EVP_MD_CTX {} --pub enum EVP_PKEY {} --pub enum HMAC_CTX {} --pub enum OPENSSL_STACK {} --pub enum PKCS12 {} --pub enum RSA {} --pub enum SSL {} --pub enum SSL_CTX {} --pub enum SSL_SESSION {} --pub enum stack_st_ASN1_OBJECT {} --pub enum stack_st_GENERAL_NAME {} --pub enum stack_st_OPENSSL_STRING {} --pub enum stack_st_void {} --pub enum stack_st_X509 {} --pub enum stack_st_X509_NAME {} --pub enum stack_st_X509_ATTRIBUTE {} --pub enum stack_st_X509_EXTENSION {} --pub enum stack_st_SSL_CIPHER {} --pub enum OPENSSL_INIT_SETTINGS {} --pub enum X509 {} --pub enum X509_ALGOR {} --pub enum X509_VERIFY_PARAM {} --pub enum X509_REQ {} -- --pub const CMS_ASCIICRLF: c_uint = 0x80000; -- --pub const SSL_CTRL_SET_MIN_PROTO_VERSION: c_int = 123; --pub const SSL_CTRL_SET_MAX_PROTO_VERSION: c_int = 124; --#[cfg(ossl110g)] --pub const SSL_CTRL_GET_MIN_PROTO_VERSION: c_int = 130; --#[cfg(ossl110g)] --pub const SSL_CTRL_GET_MAX_PROTO_VERSION: c_int = 131; -- --pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x00000000; --pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x00000000; --pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x00000000; --pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x00000000; --pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x00000000; --pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x00000000; --pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x00000000; --pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00000000; --pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00000000; --pub const SSL_OP_NO_SSLv2: c_ulong = 0x00000000; -- --pub const OPENSSL_VERSION: c_int = 0; --pub const OPENSSL_CFLAGS: c_int = 1; --pub const OPENSSL_BUILT_ON: c_int = 2; --pub const OPENSSL_PLATFORM: c_int = 3; --pub const OPENSSL_DIR: c_int = 4; -- --pub const CRYPTO_EX_INDEX_SSL: c_int = 0; --pub const CRYPTO_EX_INDEX_SSL_CTX: c_int = 1; -- --pub const OPENSSL_INIT_LOAD_SSL_STRINGS: u64 = 0x00200000; -- --pub const X509_V_ERR_DANE_NO_MATCH: c_int = 65; --pub const X509_V_ERR_EE_KEY_TOO_SMALL: c_int = 66; --pub const X509_V_ERR_CA_KEY_TOO_SMALL: c_int = 67; --pub const X509_V_ERR_CA_MD_TOO_WEAK: c_int = 68; --pub const X509_V_ERR_INVALID_CALL: c_int = 69; --pub const X509_V_ERR_STORE_LOOKUP: c_int = 70; --pub const X509_V_ERR_NO_VALID_SCTS: c_int = 71; -- --pub const X509_CHECK_FLAG_NEVER_CHECK_SUBJECT: c_uint = 0x20; -- --pub fn init() { -- // explicitly initialize to work around https://github.com/openssl/openssl/issues/3505 -- static INIT: Once = ONCE_INIT; -- -- INIT.call_once(|| unsafe { -- OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS, ptr::null_mut()); -- }) --} -- --pub unsafe fn SSL_CTX_set_min_proto_version(ctx: *mut ::SSL_CTX, version: c_int) -> c_int { -- ::SSL_CTX_ctrl( -- ctx, -- SSL_CTRL_SET_MIN_PROTO_VERSION, -- version as c_long, -- ptr::null_mut(), -- ) as c_int --} -- --pub unsafe fn SSL_CTX_set_max_proto_version(ctx: *mut ::SSL_CTX, version: c_int) -> c_int { -- ::SSL_CTX_ctrl( -- ctx, -- SSL_CTRL_SET_MAX_PROTO_VERSION, -- version as c_long, -- ptr::null_mut(), -- ) as c_int --} -- --#[cfg(ossl110g)] --pub unsafe fn SSL_CTX_get_min_proto_version(ctx: *mut ::SSL_CTX) -> c_int { -- ::SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, ptr::null_mut()) as c_int --} -- --#[cfg(ossl110g)] --pub unsafe fn SSL_CTX_get_max_proto_version(ctx: *mut ::SSL_CTX) -> c_int { -- ::SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, ptr::null_mut()) as c_int --} -- --pub unsafe fn SSL_set_min_proto_version(s: *mut ::SSL, version: c_int) -> c_int { -- ::SSL_ctrl( -- s, -- SSL_CTRL_SET_MIN_PROTO_VERSION, -- version as c_long, -- ptr::null_mut(), -- ) as c_int --} -- --pub unsafe fn SSL_set_max_proto_version(s: *mut ::SSL, version: c_int) -> c_int { -- ::SSL_ctrl( -- s, -- SSL_CTRL_SET_MAX_PROTO_VERSION, -- version as c_long, -- ptr::null_mut(), -- ) as c_int --} -- --#[cfg(ossl110g)] --pub unsafe fn SSL_get_min_proto_version(s: *mut ::SSL) -> c_int { -- ::SSL_ctrl(s, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, ptr::null_mut()) as c_int --} -- --#[cfg(ossl110g)] --pub unsafe fn SSL_get_max_proto_version(s: *mut ::SSL) -> c_int { -- ::SSL_ctrl(s, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, ptr::null_mut()) as c_int --} -- --extern "C" { -- pub fn BIO_new(type_: *const BIO_METHOD) -> *mut BIO; -- pub fn BIO_s_file() -> *const BIO_METHOD; -- pub fn BIO_s_mem() -> *const BIO_METHOD; -- -- pub fn BN_get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn BN_get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn BN_get_rfc3526_prime_1536(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn BN_get_rfc3526_prime_2048(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn BN_get_rfc3526_prime_3072(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn BN_get_rfc3526_prime_4096(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn BN_get_rfc3526_prime_6144(bn: *mut BIGNUM) -> *mut BIGNUM; -- pub fn BN_get_rfc3526_prime_8192(bn: *mut BIGNUM) -> *mut BIGNUM; -- -- pub fn CRYPTO_malloc(num: size_t, file: *const c_char, line: c_int) -> *mut c_void; -- pub fn CRYPTO_free(buf: *mut c_void, file: *const c_char, line: c_int); -- -- pub fn EVP_chacha20() -> *const ::EVP_CIPHER; -- pub fn EVP_chacha20_poly1305() -> *const ::EVP_CIPHER; -- -- pub fn HMAC_CTX_new() -> *mut HMAC_CTX; -- pub fn HMAC_CTX_free(ctx: *mut HMAC_CTX); -- -- pub fn OCSP_cert_to_id( -- dgst: *const ::EVP_MD, -- subject: *const ::X509, -- issuer: *const ::X509, -- ) -> *mut ::OCSP_CERTID; -- -- pub fn TLS_method() -> *const ::SSL_METHOD; -- pub fn DTLS_method() -> *const ::SSL_METHOD; -- pub fn SSL_CIPHER_get_version(cipher: *const ::SSL_CIPHER) -> *const c_char; -- pub fn X509_get_subject_name(x: *const ::X509) -> *mut ::X509_NAME; -- pub fn X509_get_issuer_name(x: *const ::X509) -> *mut ::X509_NAME; -- pub fn X509_set1_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -- pub fn X509_set1_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -- pub fn X509_get_ext_d2i( -- x: *const ::X509, -- nid: c_int, -- crit: *mut c_int, -- idx: *mut c_int, -- ) -> *mut c_void; -- pub fn X509_NAME_add_entry_by_NID( -- x: *mut ::X509_NAME, -- field: c_int, -- ty: c_int, -- bytes: *const c_uchar, -- len: c_int, -- loc: c_int, -- set: c_int, -- ) -> c_int; -- pub fn X509_get_signature_nid(x: *const X509) -> c_int; -- pub fn X509_ALGOR_get0( -- paobj: *mut *const ::ASN1_OBJECT, -- pptype: *mut c_int, -- ppval: *mut *const c_void, -- alg: *const ::X509_ALGOR, -- ); -- pub fn X509_NAME_entry_count(n: *const ::X509_NAME) -> c_int; -- pub fn X509_NAME_get_entry(n: *const ::X509_NAME, loc: c_int) -> *mut ::X509_NAME_ENTRY; -- pub fn X509_NAME_ENTRY_get_data(ne: *const ::X509_NAME_ENTRY) -> *mut ::ASN1_STRING; -- pub fn X509_NAME_ENTRY_get_object(ne: *const ::X509_NAME_ENTRY) -> *mut ::ASN1_OBJECT; -- pub fn X509V3_EXT_nconf_nid( -- conf: *mut ::CONF, -- ctx: *mut ::X509V3_CTX, -- ext_nid: c_int, -- value: *const c_char, -- ) -> *mut ::X509_EXTENSION; -- pub fn X509V3_EXT_nconf( -- conf: *mut ::CONF, -- ctx: *mut ::X509V3_CTX, -- name: *const c_char, -- value: *const c_char, -- ) -> *mut ::X509_EXTENSION; -- pub fn ASN1_STRING_to_UTF8(out: *mut *mut c_uchar, s: *const ::ASN1_STRING) -> c_int; -- pub fn BN_is_negative(b: *const ::BIGNUM) -> c_int; -- pub fn EVP_CIPHER_key_length(cipher: *const EVP_CIPHER) -> c_int; -- pub fn EVP_CIPHER_block_size(cipher: *const EVP_CIPHER) -> c_int; -- pub fn EVP_CIPHER_iv_length(cipher: *const EVP_CIPHER) -> c_int; -- pub fn EVP_PBE_scrypt( -- pass: *const c_char, -- passlen: size_t, -- salt: *const c_uchar, -- saltlen: size_t, -- N: u64, -- r: u64, -- p: u64, -- maxmem: u64, -- key: *mut c_uchar, -- keylen: size_t, -- ) -> c_int; -- pub fn DSA_get0_pqg( -- d: *const ::DSA, -- p: *mut *const ::BIGNUM, -- q: *mut *const ::BIGNUM, -- q: *mut *const ::BIGNUM, -- ); -- pub fn DSA_set0_pqg( -- d: *mut ::DSA, -- p: *mut ::BIGNUM, -- q: *mut ::BIGNUM, -- q: *mut ::BIGNUM, -- ) -> c_int; -- pub fn DSA_get0_key( -- d: *const ::DSA, -- pub_key: *mut *const ::BIGNUM, -- priv_key: *mut *const ::BIGNUM, -- ); -- pub fn DSA_set0_key( -- d: *mut ::DSA, -- pub_key: *mut ::BIGNUM, -- priv_key: *mut ::BIGNUM, -- ) -> c_int; -- pub fn RSA_get0_key( -- r: *const ::RSA, -- n: *mut *const ::BIGNUM, -- e: *mut *const ::BIGNUM, -- d: *mut *const ::BIGNUM, -- ); -- pub fn RSA_get0_factors(r: *const ::RSA, p: *mut *const ::BIGNUM, q: *mut *const ::BIGNUM); -- pub fn RSA_get0_crt_params( -- r: *const ::RSA, -- dmp1: *mut *const ::BIGNUM, -- dmq1: *mut *const ::BIGNUM, -- iqmp: *mut *const ::BIGNUM, -- ); -- pub fn RSA_set0_key( -- r: *mut ::RSA, -- n: *mut ::BIGNUM, -- e: *mut ::BIGNUM, -- d: *mut ::BIGNUM, -- ) -> c_int; -- pub fn RSA_set0_factors(r: *mut ::RSA, p: *mut ::BIGNUM, q: *mut ::BIGNUM) -> c_int; -- pub fn RSA_set0_crt_params( -- r: *mut ::RSA, -- dmp1: *mut ::BIGNUM, -- dmq1: *mut ::BIGNUM, -- iqmp: *mut ::BIGNUM, -- ) -> c_int; -- pub fn ASN1_STRING_get0_data(x: *const ::ASN1_STRING) -> *const c_uchar; -- pub fn OPENSSL_sk_num(stack: *const ::OPENSSL_STACK) -> c_int; -- pub fn OPENSSL_sk_value(stack: *const ::OPENSSL_STACK, idx: c_int) -> *mut c_void; -- pub fn SSL_CTX_get_options(ctx: *const ::SSL_CTX) -> c_ulong; -- pub fn SSL_CTX_set_options(ctx: *mut ::SSL_CTX, op: c_ulong) -> c_ulong; -- pub fn SSL_CTX_clear_options(ctx: *mut ::SSL_CTX, op: c_ulong) -> c_ulong; -- pub fn SSL_CTX_sess_set_get_cb( -- ctx: *mut ::SSL_CTX, -- get_session_cb: Option< -- unsafe extern "C" fn(*mut ::SSL, *const c_uchar, c_int, *mut c_int) -> *mut SSL_SESSION, -- >, -- ); -- pub fn SSL_get_client_random(ssl: *const SSL, out: *mut c_uchar, len: size_t) -> size_t; -- pub fn SSL_get_server_random(ssl: *const SSL, out: *mut c_uchar, len: size_t) -> size_t; -- pub fn SSL_get0_verified_chain(ssl: *const SSL) -> *mut stack_st_X509; -- pub fn X509_getm_notAfter(x: *const ::X509) -> *mut ::ASN1_TIME; -- pub fn X509_getm_notBefore(x: *const ::X509) -> *mut ::ASN1_TIME; -- pub fn X509_get0_signature( -- psig: *mut *const ::ASN1_BIT_STRING, -- palg: *mut *const ::X509_ALGOR, -- x: *const ::X509, -- ); -- pub fn DH_set0_pqg( -- dh: *mut ::DH, -- p: *mut ::BIGNUM, -- q: *mut ::BIGNUM, -- g: *mut ::BIGNUM, -- ) -> c_int; -- pub fn BIO_set_init(a: *mut ::BIO, init: c_int); -- pub fn BIO_set_data(a: *mut ::BIO, data: *mut c_void); -- pub fn BIO_get_data(a: *mut ::BIO) -> *mut c_void; -- pub fn BIO_meth_new(type_: c_int, name: *const c_char) -> *mut ::BIO_METHOD; -- pub fn BIO_meth_free(biom: *mut ::BIO_METHOD); -- // FIXME should wrap in Option -- pub fn BIO_meth_set_write( -- biom: *mut ::BIO_METHOD, -- write: unsafe extern "C" fn(*mut ::BIO, *const c_char, c_int) -> c_int, -- ) -> c_int; -- pub fn BIO_meth_set_read( -- biom: *mut ::BIO_METHOD, -- read: unsafe extern "C" fn(*mut ::BIO, *mut c_char, c_int) -> c_int, -- ) -> c_int; -- pub fn BIO_meth_set_puts( -- biom: *mut ::BIO_METHOD, -- read: unsafe extern "C" fn(*mut ::BIO, *const c_char) -> c_int, -- ) -> c_int; -- pub fn BIO_meth_set_ctrl( -- biom: *mut ::BIO_METHOD, -- read: unsafe extern "C" fn(*mut ::BIO, c_int, c_long, *mut c_void) -> c_long, -- ) -> c_int; -- pub fn BIO_meth_set_create( -- biom: *mut ::BIO_METHOD, -- create: unsafe extern "C" fn(*mut ::BIO) -> c_int, -- ) -> c_int; -- pub fn BIO_meth_set_destroy( -- biom: *mut ::BIO_METHOD, -- destroy: unsafe extern "C" fn(*mut ::BIO) -> c_int, -- ) -> c_int; -- pub fn CRYPTO_get_ex_new_index( -- class_index: c_int, -- argl: c_long, -- argp: *mut c_void, -- new_func: Option<::CRYPTO_EX_new>, -- dup_func: Option<::CRYPTO_EX_dup>, -- free_func: Option<::CRYPTO_EX_free>, -- ) -> c_int; -- pub fn X509_up_ref(x: *mut X509) -> c_int; -- pub fn SSL_CTX_up_ref(x: *mut SSL_CTX) -> c_int; -- pub fn SSL_session_reused(ssl: *mut SSL) -> c_int; -- pub fn SSL_SESSION_get_master_key( -- session: *const SSL_SESSION, -- out: *mut c_uchar, -- outlen: size_t, -- ) -> size_t; -- pub fn SSL_SESSION_up_ref(ses: *mut SSL_SESSION) -> c_int; -- pub fn X509_get0_extensions(req: *const ::X509) -> *const stack_st_X509_EXTENSION; -- pub fn X509_STORE_CTX_get0_chain(ctx: *mut ::X509_STORE_CTX) -> *mut stack_st_X509; -- pub fn EVP_MD_CTX_new() -> *mut EVP_MD_CTX; -- pub fn EVP_MD_CTX_free(ctx: *mut EVP_MD_CTX); -- pub fn EVP_PKEY_bits(key: *const EVP_PKEY) -> c_int; -- -- pub fn OpenSSL_version_num() -> c_ulong; -- pub fn OpenSSL_version(key: c_int) -> *const c_char; -- pub fn OPENSSL_init_ssl(opts: u64, settings: *const OPENSSL_INIT_SETTINGS) -> c_int; -- pub fn OPENSSL_sk_new_null() -> *mut ::OPENSSL_STACK; -- pub fn OPENSSL_sk_free(st: *mut ::OPENSSL_STACK); -- pub fn OPENSSL_sk_pop_free( -- st: *mut ::OPENSSL_STACK, -- free: Option, -- ); -- pub fn OPENSSL_sk_push(st: *mut ::OPENSSL_STACK, data: *const c_void) -> c_int; -- pub fn OPENSSL_sk_pop(st: *mut ::OPENSSL_STACK) -> *mut c_void; -- -- pub fn PKCS12_create( -- pass: *const c_char, -- friendly_name: *const c_char, -- pkey: *mut EVP_PKEY, -- cert: *mut X509, -- ca: *mut stack_st_X509, -- nid_key: c_int, -- nid_cert: c_int, -- iter: c_int, -- mac_iter: c_int, -- keytype: c_int, -- ) -> *mut PKCS12; -- pub fn X509_REQ_get_version(req: *const X509_REQ) -> c_long; -- pub fn X509_REQ_get_subject_name(req: *const X509_REQ) -> *mut ::X509_NAME; -- pub fn SSL_extension_supported(ext_type: c_uint) -> c_int; -- pub fn ECDSA_SIG_get0(sig: *const ECDSA_SIG, pr: *mut *const BIGNUM, ps: *mut *const BIGNUM); -- pub fn ECDSA_SIG_set0(sig: *mut ECDSA_SIG, pr: *mut BIGNUM, ps: *mut BIGNUM) -> c_int; -- -- pub fn SSL_CIPHER_get_cipher_nid(c: *const ::SSL_CIPHER) -> c_int; -- pub fn SSL_CIPHER_get_digest_nid(c: *const ::SSL_CIPHER) -> c_int; --} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v111.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v111.rs deleted file mode 100644 index a68b1e39ebe..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_openssl_v111.rs +++ /dev/null @@ -1,140 +0,0 @@ ---- src/vendor/openssl-sys/src/openssl/v111.rs.orig 2018-09-11 04:49:55 UTC -+++ src/vendor/openssl-sys/src/openssl/v111.rs -@@ -1,137 +0,0 @@ --use libc::{c_char, c_int, c_uchar, c_uint, c_ulong, c_void, size_t}; -- --pub type SSL_CTX_keylog_cb_func = -- Option; -- --pub type SSL_custom_ext_add_cb_ex = Option< -- unsafe extern "C" fn( -- ssl: *mut ::SSL, -- ext_type: c_uint, -- context: c_uint, -- out: *mut *const c_uchar, -- outlen: *mut size_t, -- x: *mut ::X509, -- chainidx: size_t, -- al: *mut c_int, -- add_arg: *mut c_void, -- ) -> c_int, -->; -- --pub type SSL_custom_ext_free_cb_ex = Option< -- unsafe extern "C" fn( -- ssl: *mut ::SSL, -- ext_type: c_uint, -- context: c_uint, -- out: *mut *const c_uchar, -- add_arg: *mut c_void, -- ), -->; -- --pub type SSL_custom_ext_parse_cb_ex = Option< -- unsafe extern "C" fn( -- ssl: *mut ::SSL, -- ext_type: c_uint, -- context: c_uint, -- input: *const c_uchar, -- inlen: size_t, -- x: *mut ::X509, -- chainidx: size_t, -- al: *mut c_int, -- parse_arg: *mut c_void, -- ) -> c_int, -->; -- --pub const SSL_COOKIE_LENGTH: c_int = 4096; -- --pub const SSL_OP_ENABLE_MIDDLEBOX_COMPAT: c_ulong = 0x00100000; --pub const SSL_OP_NO_TLSv1_3: c_ulong = 0x20000000; -- --pub const TLS1_3_VERSION: c_int = 0x304; -- --pub const SSL_EXT_TLS_ONLY: c_uint = 0x0001; --/* This extension is only allowed in DTLS */ --pub const SSL_EXT_DTLS_ONLY: c_uint = 0x0002; --/* Some extensions may be allowed in DTLS but we don't implement them for it */ --pub const SSL_EXT_TLS_IMPLEMENTATION_ONLY: c_uint = 0x0004; --/* Most extensions are not defined for SSLv3 but EXT_TYPE_renegotiate is */ --pub const SSL_EXT_SSL3_ALLOWED: c_uint = 0x0008; --/* Extension is only defined for TLS1.2 and below */ --pub const SSL_EXT_TLS1_2_AND_BELOW_ONLY: c_uint = 0x0010; --/* Extension is only defined for TLS1.3 and above */ --pub const SSL_EXT_TLS1_3_ONLY: c_uint = 0x0020; --/* Ignore this extension during parsing if we are resuming */ --pub const SSL_EXT_IGNORE_ON_RESUMPTION: c_uint = 0x0040; --pub const SSL_EXT_CLIENT_HELLO: c_uint = 0x0080; --/* Really means TLS1.2 or below */ --pub const SSL_EXT_TLS1_2_SERVER_HELLO: c_uint = 0x0100; --pub const SSL_EXT_TLS1_3_SERVER_HELLO: c_uint = 0x0200; --pub const SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS: c_uint = 0x0400; --pub const SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST: c_uint = 0x0800; --pub const SSL_EXT_TLS1_3_CERTIFICATE: c_uint = 0x1000; --pub const SSL_EXT_TLS1_3_NEW_SESSION_TICKET: c_uint = 0x2000; --pub const SSL_EXT_TLS1_3_CERTIFICATE_REQUEST: c_uint = 0x4000; -- --pub const SSL_READ_EARLY_DATA_ERROR: c_int = 0; --pub const SSL_READ_EARLY_DATA_SUCCESS: c_int = 1; --pub const SSL_READ_EARLY_DATA_FINISH: c_int = 2; -- --extern "C" { -- pub fn SSL_CTX_set_keylog_callback(ctx: *mut ::SSL_CTX, cb: SSL_CTX_keylog_cb_func); -- pub fn SSL_CTX_add_custom_ext( -- ctx: *mut ::SSL_CTX, -- ext_type: c_uint, -- context: c_uint, -- add_cb: SSL_custom_ext_add_cb_ex, -- free_cb: SSL_custom_ext_free_cb_ex, -- add_arg: *mut c_void, -- parse_cb: SSL_custom_ext_parse_cb_ex, -- parse_arg: *mut c_void, -- ) -> c_int; -- pub fn SSL_CIPHER_get_handshake_digest(cipher: *const ::SSL_CIPHER) -> *const ::EVP_MD; -- pub fn SSL_CTX_set_stateless_cookie_generate_cb( -- s: *mut ::SSL_CTX, -- cb: Option< -- unsafe extern "C" fn(ssl: *mut ::SSL, cookie: *mut c_uchar, cookie_len: *mut size_t) -- -> c_int, -- >, -- ); -- pub fn SSL_CTX_set_stateless_cookie_verify_cb( -- s: *mut ::SSL_CTX, -- cb: Option< -- unsafe extern "C" fn(ssl: *mut ::SSL, cookie: *const c_uchar, cookie_len: size_t) -- -> c_int, -- >, -- ); -- pub fn SSL_CTX_set_max_early_data(ctx: *mut ::SSL_CTX, max_early_data: u32) -> c_int; -- pub fn SSL_CTX_get_max_early_data(ctx: *const ::SSL_CTX) -> u32; -- pub fn SSL_CTX_set_ciphersuites(ctx: *mut ::SSL_CTX, str: *const c_char) -> c_int; -- -- pub fn SSL_set_max_early_data(ctx: *mut ::SSL, max_early_data: u32) -> c_int; -- pub fn SSL_get_max_early_data(ctx: *const ::SSL) -> u32; -- pub fn SSL_stateless(s: *mut ::SSL) -> c_int; -- pub fn SSL_export_keying_material_early( -- s: *mut ::SSL, -- out: *mut c_uchar, -- olen: size_t, -- label: *const c_char, -- llen: size_t, -- context: *const c_uchar, -- contextlen: size_t, -- ) -> c_int; -- pub fn SSL_write_early_data( -- s: *mut ::SSL, -- buf: *const c_void, -- num: size_t, -- written: *mut size_t, -- ) -> c_int; -- pub fn SSL_read_early_data( -- s: *mut ::SSL, -- buf: *mut c_void, -- num: size_t, -- readbytes: *mut size_t, -- ) -> c_int; -- pub fn SSL_set_ciphersuites(ssl: *mut ::SSL, str: *const c_char) -> c_int; -- -- pub fn SSL_SESSION_set_max_early_data(ctx: *mut ::SSL_SESSION, max_early_data: u32) -> c_int; -- pub fn SSL_SESSION_get_max_early_data(ctx: *const ::SSL_SESSION) -> u32; --} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_ossl__typ.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_ossl__typ.rs deleted file mode 100644 index 906180aea2b..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_ossl__typ.rs +++ /dev/null @@ -1,992 +0,0 @@ ---- src/vendor/openssl-sys/src/ossl_typ.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/ossl_typ.rs -@@ -0,0 +1,989 @@ -+use libc::*; -+ -+#[allow(unused_imports)] -+use *; -+ -+pub enum ASN1_INTEGER {} -+pub enum ASN1_GENERALIZEDTIME {} -+pub enum ASN1_STRING {} -+pub enum ASN1_BIT_STRING {} -+pub enum ASN1_TIME {} -+pub enum ASN1_TYPE {} -+pub enum ASN1_OBJECT {} -+ -+pub enum bio_st {} // FIXME remove -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum BIO {} -+ } else { -+ #[repr(C)] -+ pub struct BIO { -+ pub method: *mut BIO_METHOD, -+ pub callback: Option< -+ unsafe extern "C" fn(*mut BIO, c_int, *const c_char, c_int, c_long, c_long) -> c_long, -+ >, -+ pub cb_arg: *mut c_char, -+ pub init: c_int, -+ pub shutdown: c_int, -+ pub flags: c_int, -+ pub retry_reason: c_int, -+ pub num: c_int, -+ pub ptr: *mut c_void, -+ pub next_bio: *mut BIO, -+ pub prev_bio: *mut BIO, -+ pub references: c_int, -+ pub num_read: c_ulong, -+ pub num_write: c_ulong, -+ pub ex_data: CRYPTO_EX_DATA, -+ } -+ } -+} -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub enum BIGNUM {} -+ } else { -+ #[repr(C)] -+ pub struct BIGNUM { -+ pub d: *mut BN_ULONG, -+ pub top: c_int, -+ pub dmax: c_int, -+ pub neg: c_int, -+ pub flags: c_int, -+ } -+ } -+} -+pub enum BN_BLINDING {} -+pub enum BN_MONT_CTX {} -+ -+pub enum BN_CTX {} -+pub enum BN_GENCB {} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum EVP_CIPHER {} -+ } else { -+ #[repr(C)] -+ pub struct EVP_CIPHER { -+ pub nid: c_int, -+ pub block_size: c_int, -+ pub key_len: c_int, -+ pub iv_len: c_int, -+ pub flags: c_ulong, -+ pub init: Option< -+ unsafe extern "C" fn(*mut EVP_CIPHER_CTX, *const c_uchar, *const c_uchar, c_int) -> c_int, -+ >, -+ pub do_cipher: Option< -+ unsafe extern "C" fn(*mut EVP_CIPHER_CTX, *mut c_uchar, *const c_uchar, size_t) -> c_int, -+ >, -+ pub cleanup: Option c_int>, -+ pub ctx_size: c_int, -+ pub set_asn1_parameters: -+ Option c_int>, -+ pub get_asn1_parameters: -+ Option c_int>, -+ pub ctrl: -+ Option c_int>, -+ pub app_data: *mut c_void, -+ } -+ } -+} -+pub enum EVP_CIPHER_CTX {} -+pub enum EVP_MD {} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum EVP_MD_CTX {} -+ } else { -+ #[repr(C)] -+ pub struct EVP_MD_CTX { -+ digest: *mut EVP_MD, -+ engine: *mut ENGINE, -+ flags: c_ulong, -+ md_data: *mut c_void, -+ pctx: *mut EVP_PKEY_CTX, -+ update: *mut c_void, -+ } -+ } -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum EVP_PKEY {} -+ } else { -+ #[repr(C)] -+ pub struct EVP_PKEY { -+ pub type_: c_int, -+ pub save_type: c_int, -+ pub references: c_int, -+ pub ameth: *const EVP_PKEY_ASN1_METHOD, -+ pub engine: *mut ENGINE, -+ pub pkey: *mut c_void, -+ pub save_parameters: c_int, -+ pub attributes: *mut stack_st_X509_ATTRIBUTE, -+ } -+ } -+} -+ -+pub enum EVP_PKEY_ASN1_METHOD {} -+ -+pub enum EVP_PKEY_CTX {} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum HMAC_CTX {} -+ } else { -+ #[repr(C)] -+ pub struct HMAC_CTX { -+ md: *mut EVP_MD, -+ md_ctx: EVP_MD_CTX, -+ i_ctx: EVP_MD_CTX, -+ o_ctx: EVP_MD_CTX, -+ key_length: c_uint, -+ key: [c_uchar; 128], -+ } -+ } -+} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum DH {} -+ } else { -+ #[repr(C)] -+ pub struct DH { -+ pub pad: c_int, -+ pub version: c_int, -+ pub p: *mut ::BIGNUM, -+ pub g: *mut ::BIGNUM, -+ pub length: c_long, -+ pub pub_key: *mut ::BIGNUM, -+ pub priv_key: *mut ::BIGNUM, -+ pub flags: c_int, -+ pub method_mont_p: *mut ::BN_MONT_CTX, -+ pub q: *mut ::BIGNUM, -+ pub j: *mut ::BIGNUM, -+ pub seed: *mut c_uchar, -+ pub seedlen: c_int, -+ pub counter: *mut ::BIGNUM, -+ pub references: c_int, -+ pub ex_data: ::CRYPTO_EX_DATA, -+ pub meth: *const ::DH_METHOD, -+ pub engine: *mut ::ENGINE, -+ } -+ } -+} -+pub enum DH_METHOD {} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum DSA {} -+ } else { -+ #[repr(C)] -+ pub struct DSA { -+ pub pad: c_int, -+ pub version: c_long, -+ pub write_params: c_int, -+ -+ pub p: *mut BIGNUM, -+ pub q: *mut BIGNUM, -+ pub g: *mut BIGNUM, -+ pub pub_key: *mut BIGNUM, -+ pub priv_key: *mut BIGNUM, -+ pub kinv: *mut BIGNUM, -+ pub r: *mut BIGNUM, -+ -+ pub flags: c_int, -+ pub method_mont_p: *mut BN_MONT_CTX, -+ pub references: c_int, -+ pub ex_data: CRYPTO_EX_DATA, -+ pub meth: *const DSA_METHOD, -+ pub engine: *mut ENGINE, -+ } -+ } -+} -+pub enum DSA_METHOD {} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum RSA {} -+ } else if #[cfg(libressl)] { -+ #[repr(C)] -+ pub struct RSA { -+ pub pad: c_int, -+ pub version: c_long, -+ pub meth: *const ::RSA_METHOD, -+ -+ pub engine: *mut ::ENGINE, -+ pub n: *mut ::BIGNUM, -+ pub e: *mut ::BIGNUM, -+ pub d: *mut ::BIGNUM, -+ pub p: *mut ::BIGNUM, -+ pub q: *mut ::BIGNUM, -+ pub dmp1: *mut ::BIGNUM, -+ pub dmq1: *mut ::BIGNUM, -+ pub iqmp: *mut ::BIGNUM, -+ -+ pub ex_data: ::CRYPTO_EX_DATA, -+ pub references: c_int, -+ pub flags: c_int, -+ -+ pub _method_mod_n: *mut ::BN_MONT_CTX, -+ pub _method_mod_p: *mut ::BN_MONT_CTX, -+ pub _method_mod_q: *mut ::BN_MONT_CTX, -+ -+ pub blinding: *mut ::BN_BLINDING, -+ pub mt_blinding: *mut ::BN_BLINDING, -+ } -+ } else { -+ #[repr(C)] -+ pub struct RSA { -+ pub pad: c_int, -+ pub version: c_long, -+ pub meth: *const ::RSA_METHOD, -+ -+ pub engine: *mut ::ENGINE, -+ pub n: *mut ::BIGNUM, -+ pub e: *mut ::BIGNUM, -+ pub d: *mut ::BIGNUM, -+ pub p: *mut ::BIGNUM, -+ pub q: *mut ::BIGNUM, -+ pub dmp1: *mut ::BIGNUM, -+ pub dmq1: *mut ::BIGNUM, -+ pub iqmp: *mut ::BIGNUM, -+ -+ pub ex_data: ::CRYPTO_EX_DATA, -+ pub references: c_int, -+ pub flags: c_int, -+ -+ pub _method_mod_n: *mut ::BN_MONT_CTX, -+ pub _method_mod_p: *mut ::BN_MONT_CTX, -+ pub _method_mod_q: *mut ::BN_MONT_CTX, -+ -+ pub bignum_data: *mut c_char, -+ pub blinding: *mut ::BN_BLINDING, -+ pub mt_blinding: *mut ::BN_BLINDING, -+ } -+ } -+} -+pub enum RSA_METHOD {} -+ -+pub enum EC_KEY {} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum X509 {} -+ } else if #[cfg(libressl)] { -+ #[repr(C)] -+ pub struct X509 { -+ pub cert_info: *mut X509_CINF, -+ pub sig_alg: *mut ::X509_ALGOR, -+ pub signature: *mut ::ASN1_BIT_STRING, -+ pub valid: c_int, -+ pub references: c_int, -+ pub name: *mut c_char, -+ pub ex_data: ::CRYPTO_EX_DATA, -+ pub ex_pathlen: c_long, -+ pub ex_pcpathlen: c_long, -+ pub ex_flags: c_ulong, -+ pub ex_kusage: c_ulong, -+ pub ex_xkusage: c_ulong, -+ pub ex_nscert: c_ulong, -+ skid: *mut c_void, -+ akid: *mut c_void, -+ policy_cache: *mut c_void, -+ crldp: *mut c_void, -+ altname: *mut c_void, -+ nc: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_SHA"))] -+ sha1_hash: [c_uchar; 20], -+ aux: *mut c_void, -+ } -+ } else { -+ #[repr(C)] -+ pub struct X509 { -+ pub cert_info: *mut X509_CINF, -+ pub sig_alg: *mut X509_ALGOR, -+ pub signature: *mut ASN1_BIT_STRING, -+ pub valid: c_int, -+ pub references: c_int, -+ pub name: *mut c_char, -+ pub ex_data: CRYPTO_EX_DATA, -+ pub ex_pathlen: c_long, -+ pub ex_pcpathlen: c_long, -+ pub ex_flags: c_ulong, -+ pub ex_kusage: c_ulong, -+ pub ex_xkusage: c_ulong, -+ pub ex_nscert: c_ulong, -+ skid: *mut c_void, -+ akid: *mut c_void, -+ policy_cache: *mut c_void, -+ crldp: *mut c_void, -+ altname: *mut c_void, -+ nc: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_RFC3779"))] -+ rfc3779_addr: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_RFC3779"))] -+ rfc3779_asid: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_SHA"))] -+ sha1_hash: [c_uchar; 20], -+ aux: *mut c_void, -+ } -+ } -+} -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub enum X509_ALGOR {} -+ } else { -+ #[repr(C)] -+ pub struct X509_ALGOR { -+ pub algorithm: *mut ::ASN1_OBJECT, -+ parameter: *mut c_void, -+ } -+ } -+} -+pub enum X509_CRL {} -+pub enum X509_NAME {} -+pub enum X509_STORE {} -+pub enum X509_STORE_CTX {} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum X509_VERIFY_PARAM {} -+ } else if #[cfg(libressl251)] { -+ #[repr(C)] -+ pub struct X509_VERIFY_PARAM { -+ pub name: *mut c_char, -+ pub check_time: time_t, -+ pub inh_flags: c_ulong, -+ pub flags: c_ulong, -+ pub purpose: c_int, -+ pub trust: c_int, -+ pub depth: c_int, -+ pub policies: *mut stack_st_ASN1_OBJECT, -+ id: *mut c_void, -+ } -+ } else if #[cfg(libressl)] { -+ #[repr(C)] -+ pub struct X509_VERIFY_PARAM { -+ pub name: *mut c_char, -+ pub check_time: time_t, -+ pub inh_flags: c_ulong, -+ pub flags: c_ulong, -+ pub purpose: c_int, -+ pub trust: c_int, -+ pub depth: c_int, -+ pub policies: *mut stack_st_ASN1_OBJECT, -+ //pub id: *mut X509_VERIFY_PARAM_ID, -+ } -+ } else if #[cfg(ossl102)] { -+ #[repr(C)] -+ pub struct X509_VERIFY_PARAM { -+ pub name: *mut c_char, -+ pub check_time: time_t, -+ pub inh_flags: c_ulong, -+ pub flags: c_ulong, -+ pub purpose: c_int, -+ pub trust: c_int, -+ pub depth: c_int, -+ pub policies: *mut stack_st_ASN1_OBJECT, -+ pub id: *mut X509_VERIFY_PARAM_ID, -+ } -+ } -+} -+ -+#[repr(C)] -+pub struct X509V3_CTX { -+ flags: c_int, -+ issuer_cert: *mut c_void, -+ subject_cert: *mut c_void, -+ subject_req: *mut c_void, -+ crl: *mut c_void, -+ db_meth: *mut c_void, -+ db: *mut c_void, -+ // I like the last comment line, it is copied from OpenSSL sources: -+ // Maybe more here -+} -+pub enum CONF {} -+#[cfg(ossl110)] -+pub enum OPENSSL_INIT_SETTINGS {} -+ -+pub enum ENGINE {} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum SSL {} -+ } else if #[cfg(libressl251)] { -+ #[repr(C)] -+ pub struct SSL { -+ version: c_int, -+ method: *const ::SSL_METHOD, -+ rbio: *mut ::BIO, -+ wbio: *mut ::BIO, -+ bbio: *mut ::BIO, -+ pub server: c_int, -+ s3: *mut c_void, -+ d1: *mut c_void, -+ param: *mut c_void, -+ cipher_list: *mut stack_st_SSL_CIPHER, -+ cert: *mut c_void, -+ sid_ctx_length: c_uint, -+ sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -+ session: *mut ::SSL_SESSION, -+ verify_mode: c_int, -+ error: c_int, -+ error_code: c_int, -+ ctx: *mut ::SSL_CTX, -+ verify_result: c_long, -+ references: c_int, -+ client_version: c_int, -+ max_send_fragment: c_uint, -+ tlsext_hostname: *mut c_char, -+ tlsext_status_type: c_int, -+ initial_ctx: *mut ::SSL_CTX, -+ enc_read_ctx: *mut ::EVP_CIPHER_CTX, -+ read_hash: *mut EVP_MD_CTX, -+ internal: *mut c_void, -+ } -+ } else if #[cfg(libressl)] { -+ #[repr(C)] -+ pub struct SSL { -+ version: c_int, -+ type_: c_int, -+ method: *const ::SSL_METHOD, -+ rbio: *mut c_void, -+ wbio: *mut c_void, -+ bbio: *mut c_void, -+ rwstate: c_int, -+ in_handshake: c_int, -+ handshake_func: Option c_int>, -+ pub server: c_int, -+ new_session: c_int, -+ quiet_shutdown: c_int, -+ shutdown: c_int, -+ state: c_int, -+ rstate: c_int, -+ init_buf: *mut c_void, -+ init_msg: *mut c_void, -+ init_num: c_int, -+ init_off: c_int, -+ packet: *mut c_uchar, -+ packet_length: c_uint, -+ s3: *mut c_void, -+ d1: *mut c_void, -+ read_ahead: c_int, -+ msg_callback: Option< -+ unsafe extern "C" fn(c_int, -+ c_int, -+ c_int, -+ *const c_void, -+ size_t, -+ *mut SSL, -+ *mut c_void), -+ >, -+ msg_callback_arg: *mut c_void, -+ hit: c_int, -+ param: *mut c_void, -+ cipher_list: *mut stack_st_SSL_CIPHER, -+ cipher_list_by_id: *mut stack_st_SSL_CIPHER, -+ mac_flags: c_int, -+ aead_read_ctx: *mut c_void, -+ enc_read_ctx: *mut ::EVP_CIPHER_CTX, -+ read_hash: *mut ::EVP_MD_CTX, -+ aead_write_ctx: *mut c_void, -+ enc_write_ctx: *mut ::EVP_CIPHER_CTX, -+ write_hash: *mut ::EVP_MD_CTX, -+ cert: *mut c_void, -+ sid_ctx_length: c_uint, -+ sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -+ session: *mut ::SSL_SESSION, -+ generate_session_id: ::GEN_SESSION_CB, -+ verify_mode: c_int, -+ verify_callback: Option c_int>, -+ info_callback: Option, -+ error: c_int, -+ error_code: c_int, -+ ctx: *mut ::SSL_CTX, -+ debug: c_int, -+ verify_result: c_long, -+ ex_data: ::CRYPTO_EX_DATA, -+ client_CA: *mut stack_st_X509_NAME, -+ references: c_int, -+ options: c_ulong, -+ mode: c_ulong, -+ max_cert_list: c_long, -+ first_packet: c_int, -+ client_version: c_int, -+ max_send_fragment: c_uint, -+ tlsext_debug_cb: -+ Option, -+ tlsext_debug_arg: *mut c_void, -+ tlsext_hostname: *mut c_char, -+ servername_done: c_int, -+ tlsext_status_type: c_int, -+ tlsext_status_expected: c_int, -+ tlsext_ocsp_ids: *mut c_void, -+ tlsext_ocsp_exts: *mut c_void, -+ tlsext_ocsp_resp: *mut c_uchar, -+ tlsext_ocsp_resplen: c_int, -+ tlsext_ticket_expected: c_int, -+ tlsext_ecpointformatlist_length: size_t, -+ tlsext_ecpointformatlist: *mut c_uchar, -+ tlsext_ellipticcurvelist_length: size_t, -+ tlsext_ellipticcurvelist: *mut c_uchar, -+ tlsext_session_ticket: *mut c_void, -+ tlsext_session_ticket_ext_cb: ::tls_session_ticket_ext_cb_fn, -+ tls_session_ticket_ext_cb_arg: *mut c_void, -+ tls_session_secret_cb: ::tls_session_secret_cb_fn, -+ tls_session_secret_cb_arg: *mut c_void, -+ initial_ctx: *mut ::SSL_CTX, -+ next_proto_negotiated: *mut c_uchar, -+ next_proto_negotiated_len: c_uchar, -+ srtp_profiles: *mut c_void, -+ srtp_profile: *mut c_void, -+ tlsext_heartbeat: c_uint, -+ tlsext_hb_pending: c_uint, -+ tlsext_hb_seq: c_uint, -+ alpn_client_proto_list: *mut c_uchar, -+ alpn_client_proto_list_len: c_uint, -+ renegotiate: c_int, -+ } -+ } else { -+ #[repr(C)] -+ pub struct SSL { -+ version: c_int, -+ type_: c_int, -+ method: *const ::SSL_METHOD, -+ rbio: *mut c_void, -+ wbio: *mut c_void, -+ bbio: *mut c_void, -+ rwstate: c_int, -+ in_handshake: c_int, -+ handshake_func: Option c_int>, -+ pub server: c_int, -+ new_session: c_int, -+ quiet_session: c_int, -+ shutdown: c_int, -+ state: c_int, -+ rstate: c_int, -+ init_buf: *mut c_void, -+ init_msg: *mut c_void, -+ init_num: c_int, -+ init_off: c_int, -+ packet: *mut c_uchar, -+ packet_length: c_uint, -+ s2: *mut c_void, -+ s3: *mut c_void, -+ d1: *mut c_void, -+ read_ahead: c_int, -+ msg_callback: Option< -+ unsafe extern "C" fn(c_int, c_int, c_int, *const c_void, size_t, *mut SSL, *mut c_void), -+ >, -+ msg_callback_arg: *mut c_void, -+ hit: c_int, -+ param: *mut c_void, -+ cipher_list: *mut stack_st_SSL_CIPHER, -+ cipher_list_by_id: *mut stack_st_SSL_CIPHER, -+ mac_flags: c_int, -+ enc_read_ctx: *mut ::EVP_CIPHER_CTX, -+ read_hash: *mut ::EVP_MD_CTX, -+ expand: *mut c_void, -+ enc_write_ctx: *mut ::EVP_CIPHER_CTX, -+ write_hash: *mut ::EVP_MD_CTX, -+ compress: *mut c_void, -+ cert: *mut c_void, -+ sid_ctx_length: c_uint, -+ sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -+ session: *mut ::SSL_SESSION, -+ generate_session_id: ::GEN_SESSION_CB, -+ verify_mode: c_int, -+ verify_callback: Option c_int>, -+ info_callback: Option, -+ error: c_int, -+ error_code: c_int, -+ #[cfg(not(osslconf = "OPENSSL_NO_KRB5"))] -+ kssl_ctx: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -+ psk_client_callback: Option< -+ unsafe extern "C" fn(*mut SSL, *const c_char, *mut c_char, c_uint, *mut c_uchar, c_uint) -+ -> c_uint, -+ >, -+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -+ psk_server_callback: -+ Option c_uint>, -+ ctx: *mut ::SSL_CTX, -+ debug: c_int, -+ verify_result: c_long, -+ ex_data: ::CRYPTO_EX_DATA, -+ client_CA: *mut stack_st_X509_NAME, -+ references: c_int, -+ options: c_ulong, -+ mode: c_ulong, -+ max_cert_list: c_long, -+ first_packet: c_int, -+ client_version: c_int, -+ max_send_fragment: c_uint, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_debug_cb: -+ Option, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_debug_arg: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_hostname: *mut c_char, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ servername_done: c_int, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_status_type: c_int, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_status_expected: c_int, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_ocsp_ids: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_ocsp_exts: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_ocsp_resp: *mut c_uchar, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_ocsp_resplen: c_int, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_ticket_expected: c_int, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC") -+ ))] -+ tlsext_ecpointformatlist_length: size_t, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC") -+ ))] -+ tlsext_ecpointformatlist: *mut c_uchar, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC") -+ ))] -+ tlsext_ellipticcurvelist_length: size_t, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC") -+ ))] -+ tlsext_ellipticcurvelist: *mut c_uchar, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_opaque_prf_input: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_opaque_prf_input_len: size_t, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_session_ticket: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_session_ticket_ext_cb: ::tls_session_ticket_ext_cb_fn, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tls_session_ticket_ext_cb_arg: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tls_session_secret_cb: ::tls_session_secret_cb_fn, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tls_session_secret_cb_arg: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ initial_ctx: *mut ::SSL_CTX, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG") -+ ))] -+ next_proto_negotiated: *mut c_uchar, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG") -+ ))] -+ next_proto_negotiated_len: c_uchar, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ srtp_profiles: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ srtp_profile: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_heartbeat: c_uint, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_hb_pending: c_uint, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_hb_seq: c_uint, -+ renegotiate: c_int, -+ #[cfg(not(osslconf = "OPENSSL_NO_SRP"))] -+ srp_ctx: ::SRP_CTX, -+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -+ alpn_client_proto_list: *mut c_uchar, -+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -+ alpn_client_proto_list_len: c_uint, -+ } -+ } -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum SSL_CTX {} -+ } else if #[cfg(libressl251)] { -+ #[repr(C)] -+ pub struct SSL_CTX { -+ method: *const ::SSL_METHOD, -+ cipher_list: *mut stack_st_SSL_CIPHER, -+ cert_store: *mut c_void, -+ session_timeout: c_long, -+ pub references: c_int, -+ extra_certs: *mut stack_st_X509, -+ verify_mode: c_int, -+ sid_ctx_length: c_uint, -+ sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -+ param: *mut ::X509_VERIFY_PARAM, -+ default_passwd_callback: *mut c_void, -+ default_passwd_callback_userdata: *mut c_void, -+ internal: *mut c_void, -+ } -+ } else if #[cfg(libressl)] { -+ #[repr(C)] -+ pub struct SSL_CTX { -+ method: *mut c_void, -+ cipher_list: *mut c_void, -+ cipher_list_by_id: *mut c_void, -+ cert_store: *mut c_void, -+ sessions: *mut c_void, -+ session_cache_size: c_ulong, -+ session_cache_head: *mut c_void, -+ session_cache_tail: *mut c_void, -+ session_cache_mode: c_int, -+ session_timeout: c_long, -+ new_session_cb: *mut c_void, -+ remove_session_cb: *mut c_void, -+ get_session_cb: *mut c_void, -+ stats: [c_int; 11], -+ pub references: c_int, -+ app_verify_callback: *mut c_void, -+ app_verify_arg: *mut c_void, -+ default_passwd_callback: *mut c_void, -+ default_passwd_callback_userdata: *mut c_void, -+ client_cert_cb: *mut c_void, -+ app_gen_cookie_cb: *mut c_void, -+ app_verify_cookie_cb: *mut c_void, -+ ex_dat: ::CRYPTO_EX_DATA, -+ rsa_md5: *mut c_void, -+ md5: *mut c_void, -+ sha1: *mut c_void, -+ extra_certs: *mut c_void, -+ comp_methods: *mut c_void, -+ info_callback: *mut c_void, -+ client_CA: *mut c_void, -+ options: c_ulong, -+ mode: c_ulong, -+ max_cert_list: c_long, -+ cert: *mut c_void, -+ read_ahead: c_int, -+ msg_callback: *mut c_void, -+ msg_callback_arg: *mut c_void, -+ verify_mode: c_int, -+ sid_ctx_length: c_uint, -+ sid_ctx: [c_uchar; 32], -+ default_verify_callback: *mut c_void, -+ generate_session_id: *mut c_void, -+ param: *mut c_void, -+ quiet_shutdown: c_int, -+ max_send_fragment: c_uint, -+ -+ #[cfg(not(osslconf = "OPENSSL_NO_ENGINE"))] -+ client_cert_engine: *mut c_void, -+ -+ tlsext_servername_callback: *mut c_void, -+ tlsect_servername_arg: *mut c_void, -+ tlsext_tick_key_name: [c_uchar; 16], -+ tlsext_tick_hmac_key: [c_uchar; 16], -+ tlsext_tick_aes_key: [c_uchar; 16], -+ tlsext_ticket_key_cb: *mut c_void, -+ tlsext_status_cb: *mut c_void, -+ tlsext_status_arg: *mut c_void, -+ tlsext_opaque_prf_input_callback: *mut c_void, -+ tlsext_opaque_prf_input_callback_arg: *mut c_void, -+ -+ next_protos_advertised_cb: *mut c_void, -+ next_protos_advertised_cb_arg: *mut c_void, -+ next_proto_select_cb: *mut c_void, -+ next_proto_select_cb_arg: *mut c_void, -+ -+ srtp_profiles: *mut c_void, -+ } -+ } else { -+ #[repr(C)] -+ pub struct SSL_CTX { -+ method: *mut c_void, -+ cipher_list: *mut c_void, -+ cipher_list_by_id: *mut c_void, -+ cert_store: *mut c_void, -+ sessions: *mut c_void, -+ session_cache_size: c_ulong, -+ session_cache_head: *mut c_void, -+ session_cache_tail: *mut c_void, -+ session_cache_mode: c_int, -+ session_timeout: c_long, -+ new_session_cb: *mut c_void, -+ remove_session_cb: *mut c_void, -+ get_session_cb: *mut c_void, -+ stats: [c_int; 11], -+ pub references: c_int, -+ app_verify_callback: *mut c_void, -+ app_verify_arg: *mut c_void, -+ default_passwd_callback: *mut c_void, -+ default_passwd_callback_userdata: *mut c_void, -+ client_cert_cb: *mut c_void, -+ app_gen_cookie_cb: *mut c_void, -+ app_verify_cookie_cb: *mut c_void, -+ ex_dat: ::CRYPTO_EX_DATA, -+ rsa_md5: *mut c_void, -+ md5: *mut c_void, -+ sha1: *mut c_void, -+ extra_certs: *mut c_void, -+ comp_methods: *mut c_void, -+ info_callback: *mut c_void, -+ client_CA: *mut c_void, -+ options: c_ulong, -+ mode: c_ulong, -+ max_cert_list: c_long, -+ cert: *mut c_void, -+ read_ahead: c_int, -+ msg_callback: *mut c_void, -+ msg_callback_arg: *mut c_void, -+ verify_mode: c_int, -+ sid_ctx_length: c_uint, -+ sid_ctx: [c_uchar; 32], -+ default_verify_callback: *mut c_void, -+ generate_session_id: *mut c_void, -+ param: *mut c_void, -+ quiet_shutdown: c_int, -+ max_send_fragment: c_uint, -+ -+ #[cfg(not(osslconf = "OPENSSL_NO_ENGINE"))] -+ client_cert_engine: *mut c_void, -+ -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_servername_callback: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsect_servername_arg: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_tick_key_name: [c_uchar; 16], -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_tick_hmac_key: [c_uchar; 16], -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_tick_aes_key: [c_uchar; 16], -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_ticket_key_cb: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_status_cb: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_status_arg: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_opaque_prf_input_callback: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_opaque_prf_input_callback_arg: *mut c_void, -+ -+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -+ psk_identity_hint: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -+ psk_client_callback: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -+ psk_server_callback: *mut c_void, -+ -+ #[cfg(not(osslconf = "OPENSSL_NO_BUF_FREELISTS"))] -+ freelist_max_len: c_uint, -+ #[cfg(not(osslconf = "OPENSSL_NO_BUF_FREELISTS"))] -+ wbuf_freelist: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_BUF_FREELISTS"))] -+ rbuf_freelist: *mut c_void, -+ -+ #[cfg(not(osslconf = "OPENSSL_NO_SRP"))] -+ srp_ctx: SRP_CTX, -+ -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG") -+ ))] -+ next_protos_advertised_cb: *mut c_void, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG") -+ ))] -+ next_protos_advertised_cb_arg: *mut c_void, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG") -+ ))] -+ next_proto_select_cb: *mut c_void, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_NEXTPROTONEG") -+ ))] -+ next_proto_select_cb_arg: *mut c_void, -+ -+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl101))] -+ srtp_profiles: *mut c_void, -+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -+ alpn_select_cb: *mut c_void, -+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -+ alpn_select_cb_arg: *mut c_void, -+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -+ alpn_client_proto_list: *mut c_void, -+ #[cfg(all(not(osslconf = "OPENSSL_NO_TLSEXT"), ossl102))] -+ alpn_client_proto_list_len: c_uint, -+ -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC"), -+ ossl102 -+ ))] -+ tlsext_ecpointformatlist_length: size_t, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC"), -+ ossl102 -+ ))] -+ tlsext_ecpointformatlist: *mut c_uchar, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC"), -+ ossl102 -+ ))] -+ tlsext_ellipticcurvelist_length: size_t, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC"), -+ ossl102 -+ ))] -+ tlsext_ellipticcurvelist: *mut c_uchar, -+ } -+ -+ #[repr(C)] -+ pub struct SRP_CTX { -+ SRP_cb_arg: *mut c_void, -+ TLS_ext_srp_username_callback: *mut c_void, -+ SRP_verify_param_callback: *mut c_void, -+ SRP_give_srp_client_pwd_callback: *mut c_void, -+ login: *mut c_void, -+ N: *mut c_void, -+ g: *mut c_void, -+ s: *mut c_void, -+ B: *mut c_void, -+ A: *mut c_void, -+ a: *mut c_void, -+ b: *mut c_void, -+ v: *mut c_void, -+ info: *mut c_void, -+ stringth: c_int, -+ srp_Mask: c_ulong, -+ } -+ } -+} -+ -+pub enum COMP_METHOD {} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum CRYPTO_EX_DATA {} -+ } else if #[cfg(libressl)] { -+ #[repr(C)] -+ pub struct CRYPTO_EX_DATA { -+ pub sk: *mut ::stack_st_void, -+ } -+ } else { -+ #[repr(C)] -+ pub struct CRYPTO_EX_DATA { -+ pub sk: *mut stack_st_void, -+ pub dummy: c_int, -+ } -+ } -+} -+ -+pub enum OCSP_RESPONSE {} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_pem.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_pem.rs deleted file mode 100644 index 0c5c755601a..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_pem.rs +++ /dev/null @@ -1,140 +0,0 @@ ---- src/vendor/openssl-sys/src/pem.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/pem.rs -@@ -0,0 +1,137 @@ -+use libc::*; -+ -+use *; -+ -+pub type pem_password_cb = -+ Option c_int>; -+ -+extern "C" { -+ pub fn PEM_read_bio_X509( -+ bio: *mut BIO, -+ out: *mut *mut X509, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut X509; -+ pub fn PEM_write_bio_X509(bio: *mut BIO, x509: *mut X509) -> c_int; -+ pub fn PEM_read_bio_X509_REQ( -+ bio: *mut BIO, -+ out: *mut *mut X509_REQ, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut X509_REQ; -+ pub fn PEM_write_bio_X509_REQ(bio: *mut BIO, x509: *mut X509_REQ) -> c_int; -+ pub fn PEM_read_bio_RSAPrivateKey( -+ bio: *mut BIO, -+ rsa: *mut *mut RSA, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut RSA; -+ pub fn PEM_write_bio_RSAPrivateKey( -+ bp: *mut BIO, -+ rsa: *mut RSA, -+ cipher: *const EVP_CIPHER, -+ kstr: *mut c_uchar, -+ klen: c_int, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> c_int; -+ pub fn PEM_read_bio_RSAPublicKey( -+ bio: *mut BIO, -+ rsa: *mut *mut RSA, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut RSA; -+ pub fn PEM_write_bio_RSAPublicKey(bp: *mut BIO, rsa: *const RSA) -> c_int; -+ pub fn PEM_read_bio_RSA_PUBKEY( -+ bio: *mut BIO, -+ rsa: *mut *mut RSA, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut RSA; -+ pub fn PEM_write_bio_RSA_PUBKEY(bp: *mut BIO, rsa: *mut RSA) -> c_int; -+ pub fn PEM_read_bio_DSAPrivateKey( -+ bp: *mut BIO, -+ dsa: *mut *mut DSA, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut DSA; -+ pub fn PEM_write_bio_DSAPrivateKey( -+ bp: *mut BIO, -+ dsa: *mut DSA, -+ cipher: *const EVP_CIPHER, -+ kstr: *mut c_uchar, -+ klen: c_int, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> c_int; -+ pub fn PEM_read_bio_DSA_PUBKEY( -+ bp: *mut BIO, -+ dsa: *mut *mut DSA, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut DSA; -+ pub fn PEM_write_bio_DSA_PUBKEY(bp: *mut BIO, dsa: *mut DSA) -> c_int; -+ pub fn PEM_read_bio_ECPrivateKey( -+ bio: *mut BIO, -+ key: *mut *mut EC_KEY, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut EC_KEY; -+ pub fn PEM_write_bio_ECPrivateKey( -+ bio: *mut BIO, -+ key: *mut EC_KEY, -+ cipher: *const EVP_CIPHER, -+ kstr: *mut c_uchar, -+ klen: c_int, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> c_int; -+ pub fn PEM_read_bio_DHparams( -+ bio: *mut BIO, -+ out: *mut *mut DH, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut DH; -+ pub fn PEM_write_bio_DHparams(bio: *mut BIO, x: *const DH) -> c_int; -+ pub fn PEM_read_bio_PrivateKey( -+ bio: *mut BIO, -+ out: *mut *mut EVP_PKEY, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut EVP_PKEY; -+ pub fn PEM_write_bio_PrivateKey( -+ bio: *mut BIO, -+ pkey: *mut EVP_PKEY, -+ cipher: *const EVP_CIPHER, -+ kstr: *mut c_uchar, -+ klen: c_int, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> c_int; -+ pub fn PEM_read_bio_PUBKEY( -+ bio: *mut BIO, -+ out: *mut *mut EVP_PKEY, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> *mut EVP_PKEY; -+ pub fn PEM_write_bio_PUBKEY(bp: *mut BIO, x: *mut EVP_PKEY) -> c_int; -+ -+ pub fn PEM_write_bio_PKCS8PrivateKey( -+ bio: *mut BIO, -+ pkey: *mut EVP_PKEY, -+ cipher: *const EVP_CIPHER, -+ kstr: *mut c_char, -+ klen: c_int, -+ callback: pem_password_cb, -+ user_data: *mut c_void, -+ ) -> c_int; -+ pub fn d2i_PKCS8PrivateKey_bio( -+ bp: *mut BIO, -+ x: *mut *mut EVP_PKEY, -+ cb: pem_password_cb, -+ u: *mut c_void, -+ ) -> *mut EVP_PKEY; -+} -+ -+pub const PEM_R_NO_START_LINE: c_int = 108; diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_pkcs12.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_pkcs12.rs deleted file mode 100644 index 9b7a2aaedc3..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_pkcs12.rs +++ /dev/null @@ -1,59 +0,0 @@ ---- src/vendor/openssl-sys/src/pkcs12.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/pkcs12.rs -@@ -0,0 +1,56 @@ -+use libc::*; -+ -+use *; -+ -+pub enum PKCS12 {} -+ -+extern "C" { -+ pub fn PKCS12_free(p12: *mut PKCS12); -+ pub fn i2d_PKCS12(a: *mut PKCS12, buf: *mut *mut u8) -> c_int; -+ pub fn d2i_PKCS12(a: *mut *mut PKCS12, pp: *mut *const u8, length: c_long) -> *mut PKCS12; -+ -+ pub fn PKCS12_parse( -+ p12: *mut PKCS12, -+ pass: *const c_char, -+ pkey: *mut *mut EVP_PKEY, -+ cert: *mut *mut X509, -+ ca: *mut *mut stack_st_X509, -+ ) -> c_int; -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn PKCS12_create( -+ pass: *const c_char, -+ friendly_name: *const c_char, -+ pkey: *mut EVP_PKEY, -+ cert: *mut X509, -+ ca: *mut stack_st_X509, -+ nid_key: c_int, -+ nid_cert: c_int, -+ iter: c_int, -+ mac_iter: c_int, -+ keytype: c_int, -+ ) -> *mut PKCS12; -+ } -+ } else { -+ extern "C" { -+ pub fn PKCS12_create( -+ pass: *mut c_char, -+ friendly_name: *mut c_char, -+ pkey: *mut EVP_PKEY, -+ cert: *mut X509, -+ ca: *mut stack_st_X509, -+ nid_key: c_int, -+ nid_cert: c_int, -+ iter: c_int, -+ mac_iter: c_int, -+ keytype: c_int, -+ ) -> *mut PKCS12; -+ } -+ } -+} -+ -+extern "C" { -+ pub fn i2d_PKCS12_bio(b: *mut BIO, a: *mut PKCS12) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_rand.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_rand.rs deleted file mode 100644 index e9c0cde7425..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_rand.rs +++ /dev/null @@ -1,9 +0,0 @@ ---- src/vendor/openssl-sys/src/rand.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/rand.rs -@@ -0,0 +1,6 @@ -+use libc::*; -+ -+extern "C" { -+ pub fn RAND_bytes(buf: *mut u8, num: c_int) -> c_int; -+ pub fn RAND_status() -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_rsa.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_rsa.rs deleted file mode 100644 index 6727ed9a2aa..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_rsa.rs +++ /dev/null @@ -1,181 +0,0 @@ ---- src/vendor/openssl-sys/src/rsa.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/rsa.rs -@@ -0,0 +1,178 @@ -+use libc::*; -+use std::ptr; -+ -+use *; -+ -+pub const RSA_F4: c_long = 0x10001; -+ -+pub unsafe fn EVP_PKEY_CTX_set_rsa_padding(ctx: *mut EVP_PKEY_CTX, pad: c_int) -> c_int { -+ EVP_PKEY_CTX_ctrl( -+ ctx, -+ EVP_PKEY_RSA, -+ -1, -+ EVP_PKEY_CTRL_RSA_PADDING, -+ pad, -+ ptr::null_mut(), -+ ) -+} -+ -+pub unsafe fn EVP_PKEY_CTX_get_rsa_padding(ctx: *mut EVP_PKEY_CTX, ppad: *mut c_int) -> c_int { -+ EVP_PKEY_CTX_ctrl( -+ ctx, -+ EVP_PKEY_RSA, -+ -1, -+ EVP_PKEY_CTRL_GET_RSA_PADDING, -+ 0, -+ ppad as *mut c_void, -+ ) -+} -+ -+pub unsafe fn EVP_PKEY_CTX_set_rsa_pss_saltlen(ctx: *mut EVP_PKEY_CTX, len: c_int) -> c_int { -+ EVP_PKEY_CTX_ctrl( -+ ctx, -+ EVP_PKEY_RSA, -+ EVP_PKEY_OP_SIGN | EVP_PKEY_OP_VERIFY, -+ EVP_PKEY_CTRL_RSA_PSS_SALTLEN, -+ len, -+ ptr::null_mut(), -+ ) -+} -+ -+pub unsafe fn EVP_PKEY_CTX_set_rsa_mgf1_md(ctx: *mut EVP_PKEY_CTX, md: *mut EVP_MD) -> c_int { -+ EVP_PKEY_CTX_ctrl( -+ ctx, -+ EVP_PKEY_RSA, -+ EVP_PKEY_OP_TYPE_SIG | EVP_PKEY_OP_TYPE_CRYPT, -+ EVP_PKEY_CTRL_RSA_MGF1_MD, -+ 0, -+ md as *mut c_void, -+ ) -+} -+ -+pub const EVP_PKEY_CTRL_RSA_PADDING: c_int = EVP_PKEY_ALG_CTRL + 1; -+pub const EVP_PKEY_CTRL_RSA_PSS_SALTLEN: c_int = EVP_PKEY_ALG_CTRL + 2; -+ -+pub const EVP_PKEY_CTRL_RSA_MGF1_MD: c_int = EVP_PKEY_ALG_CTRL + 5; -+ -+pub const EVP_PKEY_CTRL_GET_RSA_PADDING: c_int = EVP_PKEY_ALG_CTRL + 6; -+ -+pub const RSA_PKCS1_PADDING: c_int = 1; -+pub const RSA_SSLV23_PADDING: c_int = 2; -+pub const RSA_NO_PADDING: c_int = 3; -+pub const RSA_PKCS1_OAEP_PADDING: c_int = 4; -+pub const RSA_X931_PADDING: c_int = 5; -+pub const RSA_PKCS1_PSS_PADDING: c_int = 6; -+ -+extern "C" { -+ pub fn RSA_new() -> *mut RSA; -+ pub fn RSA_size(k: *const RSA) -> c_int; -+ -+ #[cfg(any(ossl110, libressl273))] -+ pub fn RSA_set0_key( -+ r: *mut ::RSA, -+ n: *mut ::BIGNUM, -+ e: *mut ::BIGNUM, -+ d: *mut ::BIGNUM, -+ ) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn RSA_set0_factors(r: *mut ::RSA, p: *mut ::BIGNUM, q: *mut ::BIGNUM) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn RSA_set0_crt_params( -+ r: *mut ::RSA, -+ dmp1: *mut ::BIGNUM, -+ dmq1: *mut ::BIGNUM, -+ iqmp: *mut ::BIGNUM, -+ ) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn RSA_get0_key( -+ r: *const ::RSA, -+ n: *mut *const ::BIGNUM, -+ e: *mut *const ::BIGNUM, -+ d: *mut *const ::BIGNUM, -+ ); -+ #[cfg(any(ossl110, libressl273))] -+ pub fn RSA_get0_factors(r: *const ::RSA, p: *mut *const ::BIGNUM, q: *mut *const ::BIGNUM); -+ #[cfg(any(ossl110, libressl273))] -+ pub fn RSA_get0_crt_params( -+ r: *const ::RSA, -+ dmp1: *mut *const ::BIGNUM, -+ dmq1: *mut *const ::BIGNUM, -+ iqmp: *mut *const ::BIGNUM, -+ ); -+ -+ #[cfg(not(ossl110))] -+ pub fn RSA_generate_key( -+ modsz: c_int, -+ e: c_ulong, -+ cb: Option, -+ cbarg: *mut c_void, -+ ) -> *mut RSA; -+ -+ pub fn RSA_generate_key_ex( -+ rsa: *mut RSA, -+ bits: c_int, -+ e: *mut BIGNUM, -+ cb: *mut BN_GENCB, -+ ) -> c_int; -+ -+ pub fn RSA_public_encrypt( -+ flen: c_int, -+ from: *const u8, -+ to: *mut u8, -+ k: *mut RSA, -+ pad: c_int, -+ ) -> c_int; -+ pub fn RSA_private_encrypt( -+ flen: c_int, -+ from: *const u8, -+ to: *mut u8, -+ k: *mut RSA, -+ pad: c_int, -+ ) -> c_int; -+ pub fn RSA_public_decrypt( -+ flen: c_int, -+ from: *const u8, -+ to: *mut u8, -+ k: *mut RSA, -+ pad: c_int, -+ ) -> c_int; -+ pub fn RSA_private_decrypt( -+ flen: c_int, -+ from: *const u8, -+ to: *mut u8, -+ k: *mut RSA, -+ pad: c_int, -+ ) -> c_int; -+ pub fn RSA_free(rsa: *mut RSA); -+ pub fn RSA_up_ref(rsa: *mut RSA) -> c_int; -+ -+ pub fn i2d_RSAPublicKey(k: *const RSA, buf: *mut *mut u8) -> c_int; -+ pub fn d2i_RSAPublicKey(k: *mut *mut RSA, buf: *mut *const u8, len: c_long) -> *mut RSA; -+ pub fn i2d_RSAPrivateKey(k: *const RSA, buf: *mut *mut u8) -> c_int; -+ pub fn d2i_RSAPrivateKey(k: *mut *mut RSA, buf: *mut *const u8, len: c_long) -> *mut RSA; -+ -+ pub fn RSA_sign( -+ t: c_int, -+ m: *const u8, -+ mlen: c_uint, -+ sig: *mut u8, -+ siglen: *mut c_uint, -+ k: *mut RSA, -+ ) -> c_int; -+ pub fn RSA_verify( -+ t: c_int, -+ m: *const u8, -+ mlen: c_uint, -+ sig: *const u8, -+ siglen: c_uint, -+ k: *mut RSA, -+ ) -> c_int; -+ -+ pub fn RSA_padding_check_PKCS1_type_2( -+ to: *mut c_uchar, -+ tlen: c_int, -+ f: *const c_uchar, -+ fl: c_int, -+ rsa_len: c_int, -+ ) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_safestack.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_safestack.rs deleted file mode 100644 index f29fdaaa7c3..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_safestack.rs +++ /dev/null @@ -1,4 +0,0 @@ ---- src/vendor/openssl-sys/src/safestack.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/safestack.rs -@@ -0,0 +1 @@ -+stack!(stack_st_OPENSSL_STRING); diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_sha.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_sha.rs deleted file mode 100644 index 75dd3850d3a..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_sha.rs +++ /dev/null @@ -1,73 +0,0 @@ ---- src/vendor/openssl-sys/src/sha.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/sha.rs -@@ -0,0 +1,70 @@ -+use libc::*; -+ -+pub type SHA_LONG = c_uint; -+ -+pub const SHA_LBLOCK: c_int = 16; -+ -+#[repr(C)] -+pub struct SHA_CTX { -+ pub h0: SHA_LONG, -+ pub h1: SHA_LONG, -+ pub h2: SHA_LONG, -+ pub h3: SHA_LONG, -+ pub h4: SHA_LONG, -+ pub Nl: SHA_LONG, -+ pub Nh: SHA_LONG, -+ pub data: [SHA_LONG; SHA_LBLOCK as usize], -+ pub num: c_uint, -+} -+ -+extern "C" { -+ pub fn SHA1_Init(c: *mut SHA_CTX) -> c_int; -+ pub fn SHA1_Update(c: *mut SHA_CTX, data: *const c_void, len: size_t) -> c_int; -+ pub fn SHA1_Final(md: *mut c_uchar, c: *mut SHA_CTX) -> c_int; -+ pub fn SHA1(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -+} -+ -+#[repr(C)] -+pub struct SHA256_CTX { -+ pub h: [SHA_LONG; 8], -+ pub Nl: SHA_LONG, -+ pub Nh: SHA_LONG, -+ pub data: [SHA_LONG; SHA_LBLOCK as usize], -+ pub num: c_uint, -+ pub md_len: c_uint, -+} -+ -+extern "C" { -+ pub fn SHA224_Init(c: *mut SHA256_CTX) -> c_int; -+ pub fn SHA224_Update(c: *mut SHA256_CTX, data: *const c_void, len: size_t) -> c_int; -+ pub fn SHA224_Final(md: *mut c_uchar, c: *mut SHA256_CTX) -> c_int; -+ pub fn SHA224(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -+ pub fn SHA256_Init(c: *mut SHA256_CTX) -> c_int; -+ pub fn SHA256_Update(c: *mut SHA256_CTX, data: *const c_void, len: size_t) -> c_int; -+ pub fn SHA256_Final(md: *mut c_uchar, c: *mut SHA256_CTX) -> c_int; -+ pub fn SHA256(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -+} -+ -+pub type SHA_LONG64 = u64; -+ -+#[repr(C)] -+pub struct SHA512_CTX { -+ pub h: [SHA_LONG64; 8], -+ pub Nl: SHA_LONG64, -+ pub Nh: SHA_LONG64, -+ // this is a union but we don't want to require 1.19 -+ u: [SHA_LONG64; SHA_LBLOCK as usize], -+ pub num: c_uint, -+ pub md_len: c_uint, -+} -+ -+extern "C" { -+ pub fn SHA384_Init(c: *mut SHA512_CTX) -> c_int; -+ pub fn SHA384_Update(c: *mut SHA512_CTX, data: *const c_void, len: size_t) -> c_int; -+ pub fn SHA384_Final(md: *mut c_uchar, c: *mut SHA512_CTX) -> c_int; -+ pub fn SHA384(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -+ pub fn SHA512_Init(c: *mut SHA512_CTX) -> c_int; -+ pub fn SHA512_Update(c: *mut SHA512_CTX, data: *const c_void, len: size_t) -> c_int; -+ pub fn SHA512_Final(md: *mut c_uchar, c: *mut SHA512_CTX) -> c_int; -+ pub fn SHA512(d: *const c_uchar, n: size_t, md: *mut c_uchar) -> *mut c_uchar; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_srtp.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_srtp.rs deleted file mode 100644 index 9a0fa75f7ae..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_srtp.rs +++ /dev/null @@ -1,21 +0,0 @@ ---- src/vendor/openssl-sys/src/srtp.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/srtp.rs -@@ -0,0 +1,18 @@ -+use libc::*; -+ -+use *; -+ -+pub const SRTP_AES128_CM_SHA1_80: c_ulong = 0x0001; -+pub const SRTP_AES128_CM_SHA1_32: c_ulong = 0x0002; -+pub const SRTP_AES128_F8_SHA1_80: c_ulong = 0x0003; -+pub const SRTP_AES128_F8_SHA1_32: c_ulong = 0x0004; -+pub const SRTP_NULL_SHA1_80: c_ulong = 0x0005; -+pub const SRTP_NULL_SHA1_32: c_ulong = 0x0006; -+ -+extern "C" { -+ pub fn SSL_CTX_set_tlsext_use_srtp(ctx: *mut SSL_CTX, profiles: *const c_char) -> c_int; -+ pub fn SSL_set_tlsext_use_srtp(ssl: *mut SSL, profiles: *const c_char) -> c_int; -+ -+ pub fn SSL_get_srtp_profiles(ssl: *mut SSL) -> *mut stack_st_SRTP_PROTECTION_PROFILE; -+ pub fn SSL_get_selected_srtp_profile(ssl: *mut SSL) -> *mut SRTP_PROTECTION_PROFILE; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_ssl.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_ssl.rs deleted file mode 100644 index d9e188266d1..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_ssl.rs +++ /dev/null @@ -1,1232 +0,0 @@ ---- src/vendor/openssl-sys/src/ssl.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/ssl.rs -@@ -0,0 +1,1229 @@ -+use libc::*; -+use std::ptr; -+ -+use *; -+ -+#[cfg(not(any(libressl, ossl110)))] -+pub const SSL_MAX_KRB5_PRINCIPAL_LENGTH: c_int = 256; -+ -+#[cfg(not(ossl110))] -+pub const SSL_MAX_SSL_SESSION_ID_LENGTH: c_int = 32; -+#[cfg(not(ossl110))] -+pub const SSL_MAX_SID_CTX_LENGTH: c_int = 32; -+ -+#[cfg(not(any(libressl, ossl110)))] -+pub const SSL_MAX_KEY_ARG_LENGTH: c_int = 8; -+#[cfg(not(ossl110))] -+pub const SSL_MAX_MASTER_KEY_LENGTH: c_int = 48; -+ -+pub const SSL_SENT_SHUTDOWN: c_int = 1; -+pub const SSL_RECEIVED_SHUTDOWN: c_int = 2; -+ -+pub const SSL_FILETYPE_PEM: c_int = X509_FILETYPE_PEM; -+pub const SSL_FILETYPE_ASN1: c_int = X509_FILETYPE_ASN1; -+ -+pub enum SSL_METHOD {} -+pub enum SSL_CIPHER {} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ pub enum SSL_SESSION {} -+ } else if #[cfg(libressl251)] { -+ #[repr(C)] -+ pub struct SSL_SESSION { -+ ssl_version: c_int, -+ pub master_key_length: c_int, -+ pub master_key: [c_uchar; 48], -+ session_id_length: c_uint, -+ session_id: [c_uchar; ::SSL_MAX_SSL_SESSION_ID_LENGTH as usize], -+ sid_ctx_length: c_uint, -+ sid_ctx: [c_uchar; ::SSL_MAX_SID_CTX_LENGTH as usize], -+ peer: *mut ::X509, -+ verify_result: c_long, -+ timeout: c_long, -+ time: time_t, -+ pub references: c_int, -+ cipher: *const ::SSL_CIPHER, -+ cipher_id: c_long, -+ ciphers: *mut stack_st_SSL_CIPHER, -+ tlsext_hostname: *mut c_char, -+ tlsext_tick: *mut c_uchar, -+ tlsext_ticklen: size_t, -+ tlsext_tick_lifetime_int: c_long, -+ internal: *mut c_void, -+ } -+ } else if #[cfg(libressl)] { -+ #[repr(C)] -+ pub struct SSL_SESSION { -+ ssl_version: c_int, -+ pub master_key_length: c_int, -+ pub master_key: [c_uchar; 48], -+ session_id_length: c_uint, -+ session_id: [c_uchar; SSL_MAX_SSL_SESSION_ID_LENGTH as usize], -+ sid_ctx_length: c_uint, -+ sid_ctx: [c_uchar; SSL_MAX_SID_CTX_LENGTH as usize], -+ not_resumable: c_int, -+ sess_cert: *mut c_void, -+ peer: *mut X509, -+ verify_result: c_long, -+ timeout: c_long, -+ time: time_t, -+ pub references: c_int, -+ cipher: *const c_void, -+ cipher_id: c_ulong, -+ ciphers: *mut c_void, -+ ex_data: ::CRYPTO_EX_DATA, -+ prev: *mut c_void, -+ next: *mut c_void, -+ tlsext_hostname: *mut c_char, -+ tlsext_ecpointformatlist_length: size_t, -+ tlsext_ecpointformatlist: *mut u8, -+ tlsext_ellipticcurvelist_length: size_t, -+ tlsext_ellipticcurvelist: *mut u16, -+ tlsext_tick: *mut c_uchar, -+ tlsext_ticklen: size_t, -+ tlsext_tick_lifetime_hint: c_long, -+ } -+ } else { -+ #[repr(C)] -+ pub struct SSL_SESSION { -+ ssl_version: c_int, -+ key_arg_length: c_uint, -+ key_arg: [c_uchar; SSL_MAX_KEY_ARG_LENGTH as usize], -+ pub master_key_length: c_int, -+ pub master_key: [c_uchar; 48], -+ session_id_length: c_uint, -+ session_id: [c_uchar; SSL_MAX_SSL_SESSION_ID_LENGTH as usize], -+ sid_ctx_length: c_uint, -+ sid_ctx: [c_uchar; SSL_MAX_SID_CTX_LENGTH as usize], -+ #[cfg(not(osslconf = "OPENSSL_NO_KRB5"))] -+ krb5_client_princ_len: c_uint, -+ #[cfg(not(osslconf = "OPENSSL_NO_KRB5"))] -+ krb5_client_princ: [c_uchar; SSL_MAX_KRB5_PRINCIPAL_LENGTH as usize], -+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -+ psk_identity_hint: *mut c_char, -+ #[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -+ psk_identity: *mut c_char, -+ not_resumable: c_int, -+ sess_cert: *mut c_void, -+ peer: *mut X509, -+ verify_result: c_long, -+ pub references: c_int, -+ timeout: c_long, -+ time: c_long, -+ compress_meth: c_uint, -+ cipher: *const c_void, -+ cipher_id: c_ulong, -+ ciphers: *mut c_void, -+ ex_data: ::CRYPTO_EX_DATA, -+ prev: *mut c_void, -+ next: *mut c_void, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_hostname: *mut c_char, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC") -+ ))] -+ tlsext_ecpointformatlist_length: size_t, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC") -+ ))] -+ tlsext_ecpointformatlist: *mut c_uchar, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC") -+ ))] -+ tlsext_ellipticcurvelist_length: size_t, -+ #[cfg(all( -+ not(osslconf = "OPENSSL_NO_TLSEXT"), -+ not(osslconf = "OPENSSL_NO_EC") -+ ))] -+ tlsext_ellipticcurvelist: *mut c_uchar, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_tick: *mut c_uchar, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_ticklen: size_t, -+ #[cfg(not(osslconf = "OPENSSL_NO_TLSEXT"))] -+ tlsext_tick_lifetime_hint: c_long, -+ #[cfg(not(osslconf = "OPENSSL_NO_SRP"))] -+ srp_username: *mut c_char, -+ } -+ } -+} -+ -+stack!(stack_st_SSL_CIPHER); -+ -+#[repr(C)] -+pub struct SRTP_PROTECTION_PROFILE { -+ pub name: *const c_char, -+ pub id: c_ulong, -+} -+ -+stack!(stack_st_SRTP_PROTECTION_PROFILE); -+ -+pub type tls_session_ticket_ext_cb_fn = -+ Option c_int>; -+pub type tls_session_secret_cb_fn = Option< -+ unsafe extern "C" fn( -+ *mut SSL, -+ *mut c_void, -+ *mut c_int, -+ *mut stack_st_SSL_CIPHER, -+ *mut *mut SSL_CIPHER, -+ *mut c_void, -+ ) -> c_int, -+>; -+ -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS_ONLY: c_uint = 0x0001; -+/* This extension is only allowed in DTLS */ -+#[cfg(ossl111)] -+pub const SSL_EXT_DTLS_ONLY: c_uint = 0x0002; -+/* Some extensions may be allowed in DTLS but we don't implement them for it */ -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS_IMPLEMENTATION_ONLY: c_uint = 0x0004; -+/* Most extensions are not defined for SSLv3 but EXT_TYPE_renegotiate is */ -+#[cfg(ossl111)] -+pub const SSL_EXT_SSL3_ALLOWED: c_uint = 0x0008; -+/* Extension is only defined for TLS1.2 and below */ -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS1_2_AND_BELOW_ONLY: c_uint = 0x0010; -+/* Extension is only defined for TLS1.3 and above */ -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS1_3_ONLY: c_uint = 0x0020; -+/* Ignore this extension during parsing if we are resuming */ -+#[cfg(ossl111)] -+pub const SSL_EXT_IGNORE_ON_RESUMPTION: c_uint = 0x0040; -+#[cfg(ossl111)] -+pub const SSL_EXT_CLIENT_HELLO: c_uint = 0x0080; -+/* Really means TLS1.2 or below */ -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS1_2_SERVER_HELLO: c_uint = 0x0100; -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS1_3_SERVER_HELLO: c_uint = 0x0200; -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS1_3_ENCRYPTED_EXTENSIONS: c_uint = 0x0400; -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS1_3_HELLO_RETRY_REQUEST: c_uint = 0x0800; -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS1_3_CERTIFICATE: c_uint = 0x1000; -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS1_3_NEW_SESSION_TICKET: c_uint = 0x2000; -+#[cfg(ossl111)] -+pub const SSL_EXT_TLS1_3_CERTIFICATE_REQUEST: c_uint = 0x4000; -+ -+#[cfg(ossl111)] -+pub type SSL_custom_ext_add_cb_ex = Option< -+ unsafe extern "C" fn( -+ ssl: *mut ::SSL, -+ ext_type: c_uint, -+ context: c_uint, -+ out: *mut *const c_uchar, -+ outlen: *mut size_t, -+ x: *mut ::X509, -+ chainidx: size_t, -+ al: *mut c_int, -+ add_arg: *mut c_void, -+ ) -> c_int, -+>; -+ -+#[cfg(ossl111)] -+pub type SSL_custom_ext_free_cb_ex = Option< -+ unsafe extern "C" fn( -+ ssl: *mut ::SSL, -+ ext_type: c_uint, -+ context: c_uint, -+ out: *mut *const c_uchar, -+ add_arg: *mut c_void, -+ ), -+>; -+ -+#[cfg(ossl111)] -+pub type SSL_custom_ext_parse_cb_ex = Option< -+ unsafe extern "C" fn( -+ ssl: *mut ::SSL, -+ ext_type: c_uint, -+ context: c_uint, -+ input: *const c_uchar, -+ inlen: size_t, -+ x: *mut ::X509, -+ chainidx: size_t, -+ al: *mut c_int, -+ parse_arg: *mut c_void, -+ ) -> c_int, -+>; -+ -+pub const SSL_OP_LEGACY_SERVER_CONNECT: c_ulong = 0x00000004; -+cfg_if! { -+ if #[cfg(libressl261)] { -+ pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x0; -+ } else if #[cfg(any(ossl102, libressl))] { -+ pub const SSL_OP_TLSEXT_PADDING: c_ulong = 0x10; -+ } -+} -+#[cfg(ossl101)] -+pub const SSL_OP_SAFARI_ECDHE_ECDSA_BUG: c_ulong = 0x00000040; -+ -+pub const SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: c_ulong = 0x00000800; -+ -+pub const SSL_OP_NO_QUERY_MTU: c_ulong = 0x00001000; -+pub const SSL_OP_COOKIE_EXCHANGE: c_ulong = 0x00002000; -+pub const SSL_OP_NO_TICKET: c_ulong = 0x00004000; -+cfg_if! { -+ if #[cfg(ossl101)] { -+ pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x00008000; -+ } else { -+ pub const SSL_OP_CISCO_ANYCONNECT: c_ulong = 0x0; -+ } -+} -+ -+pub const SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: c_ulong = 0x00010000; -+cfg_if! { -+ if #[cfg(ossl101)] { -+ pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x00020000; -+ pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: c_ulong = 0x00040000; -+ } else { -+ pub const SSL_OP_NO_COMPRESSION: c_ulong = 0x0; -+ pub const SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: c_ulong = 0x0; -+ } -+} -+ -+#[cfg(ossl111)] -+pub const SSL_OP_ENABLE_MIDDLEBOX_COMPAT: c_ulong = 0x00100000; -+ -+pub const SSL_OP_CIPHER_SERVER_PREFERENCE: c_ulong = 0x00400000; -+cfg_if! { -+ if #[cfg(libressl280)] { -+ pub const SSL_OP_TLS_ROLLBACK_BUG: c_ulong = 0; -+ } else { -+ pub const SSL_OP_TLS_ROLLBACK_BUG: c_ulong = 0x00800000; -+ } -+} -+ -+ -+cfg_if! { -+ if #[cfg(ossl101)] { -+ pub const SSL_OP_NO_SSLv3: c_ulong = 0x02000000; -+ } else { -+ pub const SSL_OP_NO_SSLv3: c_ulong = 0x0; -+ } -+} -+pub const SSL_OP_NO_TLSv1_1: c_ulong = 0x10000000; -+pub const SSL_OP_NO_TLSv1_2: c_ulong = 0x08000000; -+ -+pub const SSL_OP_NO_TLSv1: c_ulong = 0x04000000; -+#[cfg(ossl102)] -+pub const SSL_OP_NO_DTLSv1: c_ulong = 0x04000000; -+#[cfg(ossl102)] -+pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x08000000; -+#[cfg(ossl111)] -+pub const SSL_OP_NO_TLSv1_3: c_ulong = 0x20000000; -+ -+cfg_if! { -+ if #[cfg(ossl111)] { -+ pub const SSL_OP_NO_SSL_MASK: c_ulong = SSL_OP_NO_SSLv2 -+ | SSL_OP_NO_SSLv3 -+ | SSL_OP_NO_TLSv1 -+ | SSL_OP_NO_TLSv1_1 -+ | SSL_OP_NO_TLSv1_2 -+ | SSL_OP_NO_TLSv1_3; -+ } else if #[cfg(ossl102)] { -+ pub const SSL_OP_NO_SSL_MASK: c_ulong = -+ SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 | SSL_OP_NO_TLSv1_2; -+ } -+} -+ -+cfg_if! { -+ if #[cfg(libressl261)] { -+ pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x0; -+ } else { -+ pub const SSL_OP_CRYPTOPRO_TLSEXT_BUG: c_ulong = 0x80000000; -+ } -+} -+ -+cfg_if! { -+ if #[cfg(ossl110f)] { -+ pub const SSL_OP_ALL: c_ulong = SSL_OP_CRYPTOPRO_TLSEXT_BUG -+ | SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS -+ | SSL_OP_LEGACY_SERVER_CONNECT -+ | SSL_OP_TLSEXT_PADDING -+ | SSL_OP_SAFARI_ECDHE_ECDSA_BUG; -+ } else if #[cfg(libressl261)] { -+ pub const SSL_OP_ALL: c_ulong = 0x4; -+ } else if #[cfg(libressl)] { -+ pub const SSL_OP_ALL: c_ulong = 0x80000014; -+ } else { -+ pub const SSL_OP_ALL: c_ulong = 0x80000BFF; -+ } -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x00000000; -+ pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x00000000; -+ pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x00000000; -+ pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x00000000; -+ pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x00000000; -+ pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x00000000; -+ pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x00000000; -+ pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00000000; -+ pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00000000; -+ pub const SSL_OP_NO_SSLv2: c_ulong = 0x00000000; -+ } else if #[cfg(ossl101)] { -+ pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x00000001; -+ pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x00000002; -+ pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x00000008; -+ pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x00000020; -+ pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x00000080; -+ pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x00000100; -+ pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x00000200; -+ pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000; -+ pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000; -+ pub const SSL_OP_NO_SSLv2: c_ulong = 0x01000000; -+ } else { -+ pub const SSL_OP_MICROSOFT_SESS_ID_BUG: c_ulong = 0x0; -+ pub const SSL_OP_NETSCAPE_CHALLENGE_BUG: c_ulong = 0x0; -+ pub const SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: c_ulong = 0x0; -+ pub const SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: c_ulong = 0x0; -+ pub const SSL_OP_SSLEAY_080_CLIENT_DH_BUG: c_ulong = 0x0; -+ pub const SSL_OP_TLS_D5_BUG: c_ulong = 0x0; -+ pub const SSL_OP_TLS_BLOCK_PADDING_BUG: c_ulong = 0x0; -+ #[cfg(libressl261)] -+ pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x0; -+ #[cfg(not(libressl261))] -+ pub const SSL_OP_SINGLE_ECDH_USE: c_ulong = 0x00080000; -+ pub const SSL_OP_SINGLE_DH_USE: c_ulong = 0x00100000; -+ pub const SSL_OP_NO_SSLv2: c_ulong = 0x0; -+ } -+} -+ -+pub const SSL_MODE_ENABLE_PARTIAL_WRITE: c_long = 0x1; -+pub const SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER: c_long = 0x2; -+pub const SSL_MODE_AUTO_RETRY: c_long = 0x4; -+pub const SSL_MODE_NO_AUTO_CHAIN: c_long = 0x8; -+pub const SSL_MODE_RELEASE_BUFFERS: c_long = 0x10; -+#[cfg(ossl101)] -+pub const SSL_MODE_SEND_CLIENTHELLO_TIME: c_long = 0x20; -+#[cfg(ossl101)] -+pub const SSL_MODE_SEND_SERVERHELLO_TIME: c_long = 0x40; -+#[cfg(ossl101)] -+pub const SSL_MODE_SEND_FALLBACK_SCSV: c_long = 0x80; -+ -+pub unsafe fn SSL_CTX_set_mode(ctx: *mut SSL_CTX, op: c_long) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_MODE, op, ptr::null_mut()) -+} -+ -+#[cfg(ossl111)] -+pub const SSL_COOKIE_LENGTH: c_int = 4096; -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn SSL_CTX_get_options(ctx: *const SSL_CTX) -> c_ulong; -+ pub fn SSL_CTX_set_options(ctx: *mut SSL_CTX, op: c_ulong) -> c_ulong; -+ pub fn SSL_CTX_clear_options(ctx: *mut SSL_CTX, op: c_ulong) -> c_ulong; -+ } -+ } else { -+ pub unsafe fn SSL_CTX_get_options(ctx: *const SSL_CTX) -> c_ulong { -+ SSL_CTX_ctrl(ctx as *mut _, SSL_CTRL_OPTIONS, 0, ptr::null_mut()) as c_ulong -+ } -+ -+ pub unsafe fn SSL_CTX_set_options(ctx: *const SSL_CTX, op: c_ulong) -> c_ulong { -+ SSL_CTX_ctrl( -+ ctx as *mut _, -+ SSL_CTRL_OPTIONS, -+ op as c_long, -+ ptr::null_mut(), -+ ) as c_ulong -+ } -+ -+ pub unsafe fn SSL_CTX_clear_options(ctx: *const SSL_CTX, op: c_ulong) -> c_ulong { -+ SSL_CTX_ctrl( -+ ctx as *mut _, -+ SSL_CTRL_CLEAR_OPTIONS, -+ op as c_long, -+ ptr::null_mut(), -+ ) as c_ulong -+ } -+ } -+} -+ -+pub type GEN_SESSION_CB = -+ Option c_int>; -+ -+pub const SSL_SESS_CACHE_OFF: c_long = 0x0; -+pub const SSL_SESS_CACHE_CLIENT: c_long = 0x1; -+pub const SSL_SESS_CACHE_SERVER: c_long = 0x2; -+pub const SSL_SESS_CACHE_BOTH: c_long = SSL_SESS_CACHE_CLIENT | SSL_SESS_CACHE_SERVER; -+pub const SSL_SESS_CACHE_NO_AUTO_CLEAR: c_long = 0x80; -+pub const SSL_SESS_CACHE_NO_INTERNAL_LOOKUP: c_long = 0x100; -+pub const SSL_SESS_CACHE_NO_INTERNAL_STORE: c_long = 0x200; -+pub const SSL_SESS_CACHE_NO_INTERNAL: c_long = -+ SSL_SESS_CACHE_NO_INTERNAL_LOOKUP | SSL_SESS_CACHE_NO_INTERNAL_STORE; -+ -+extern "C" { -+ pub fn SSL_CTX_sess_set_new_cb( -+ ctx: *mut SSL_CTX, -+ new_session_cb: Option c_int>, -+ ); -+ pub fn SSL_CTX_sess_set_remove_cb( -+ ctx: *mut SSL_CTX, -+ remove_session_cb: Option, -+ ); -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn SSL_CTX_sess_set_get_cb( -+ ctx: *mut ::SSL_CTX, -+ get_session_cb: Option< -+ unsafe extern "C" fn(*mut ::SSL, *const c_uchar, c_int, *mut c_int) -> *mut SSL_SESSION, -+ >, -+ ); -+ } -+ } else { -+ extern "C" { -+ pub fn SSL_CTX_sess_set_get_cb( -+ ctx: *mut ::SSL_CTX, -+ get_session_cb: Option< -+ unsafe extern "C" fn(*mut ::SSL, *mut c_uchar, c_int, *mut c_int) -> *mut SSL_SESSION, -+ >, -+ ); -+ } -+ } -+} -+extern "C" { -+ // FIXME change to unsafe extern "C" fn -+ pub fn SSL_CTX_set_cookie_generate_cb( -+ s: *mut SSL_CTX, -+ cb: Option< -+ extern "C" fn(ssl: *mut SSL, cookie: *mut c_uchar, cookie_len: *mut c_uint) -> c_int, -+ >, -+ ); -+} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn SSL_CTX_set_cookie_verify_cb( -+ s: *mut SSL_CTX, -+ cb: Option< -+ extern "C" fn(ssl: *mut SSL, cookie: *const c_uchar, cookie_len: c_uint) -> c_int, -+ >, -+ ); -+ } -+ } else { -+ extern "C" { -+ pub fn SSL_CTX_set_cookie_verify_cb( -+ s: *mut SSL_CTX, -+ cb: Option c_int>, -+ ); -+ } -+ } -+} -+ -+extern "C" { -+ #[cfg(ossl111)] -+ pub fn SSL_CTX_set_stateless_cookie_generate_cb( -+ s: *mut SSL_CTX, -+ cb: Option< -+ unsafe extern "C" fn(ssl: *mut SSL, cookie: *mut c_uchar, cookie_len: *mut size_t) -+ -> c_int, -+ >, -+ ); -+ #[cfg(ossl111)] -+ pub fn SSL_CTX_set_stateless_cookie_verify_cb( -+ s: *mut SSL_CTX, -+ cb: Option< -+ unsafe extern "C" fn(ssl: *mut SSL, cookie: *const c_uchar, cookie_len: size_t) -+ -> c_int, -+ >, -+ ); -+ -+ pub fn SSL_CTX_set_next_protos_advertised_cb( -+ ssl: *mut SSL_CTX, -+ cb: extern "C" fn( -+ ssl: *mut SSL, -+ out: *mut *const c_uchar, -+ outlen: *mut c_uint, -+ arg: *mut c_void, -+ ) -> c_int, -+ arg: *mut c_void, -+ ); -+ pub fn SSL_CTX_set_next_proto_select_cb( -+ ssl: *mut SSL_CTX, -+ cb: extern "C" fn( -+ ssl: *mut SSL, -+ out: *mut *mut c_uchar, -+ outlen: *mut c_uchar, -+ inbuf: *const c_uchar, -+ inlen: c_uint, -+ arg: *mut c_void, -+ ) -> c_int, -+ arg: *mut c_void, -+ ); -+ pub fn SSL_get0_next_proto_negotiated( -+ s: *const SSL, -+ data: *mut *const c_uchar, -+ len: *mut c_uint, -+ ); -+ -+ pub fn SSL_select_next_proto( -+ out: *mut *mut c_uchar, -+ outlen: *mut c_uchar, -+ inbuf: *const c_uchar, -+ inlen: c_uint, -+ client: *const c_uchar, -+ client_len: c_uint, -+ ) -> c_int; -+} -+ -+pub const OPENSSL_NPN_UNSUPPORTED: c_int = 0; -+pub const OPENSSL_NPN_NEGOTIATED: c_int = 1; -+pub const OPENSSL_NPN_NO_OVERLAP: c_int = 2; -+ -+extern "C" { -+ #[cfg(any(ossl102, libressl261))] -+ pub fn SSL_CTX_set_alpn_protos(s: *mut SSL_CTX, data: *const c_uchar, len: c_uint) -> c_int; -+ #[cfg(any(ossl102, libressl261))] -+ pub fn SSL_set_alpn_protos(s: *mut SSL, data: *const c_uchar, len: c_uint) -> c_int; -+ // FIXME should take an Option -+ #[cfg(any(ossl102, libressl261))] -+ pub fn SSL_CTX_set_alpn_select_cb( -+ ssl: *mut SSL_CTX, -+ cb: extern "C" fn( -+ ssl: *mut SSL, -+ out: *mut *const c_uchar, -+ outlen: *mut c_uchar, -+ inbuf: *const c_uchar, -+ inlen: c_uint, -+ arg: *mut c_void, -+ ) -> c_int, -+ arg: *mut c_void, -+ ); -+ #[cfg(any(ossl102, libressl261))] -+ pub fn SSL_get0_alpn_selected(s: *const SSL, data: *mut *const c_uchar, len: *mut c_uint); -+} -+ -+#[cfg(not(osslconf = "OPENSSL_NO_PSK"))] -+extern "C" { -+ pub fn SSL_CTX_set_psk_client_callback( -+ ssl: *mut SSL_CTX, -+ psk_client_cb: Option< -+ extern "C" fn(*mut SSL, *const c_char, *mut c_char, c_uint, *mut c_uchar, c_uint) -+ -> c_uint, -+ >, -+ ); -+ pub fn SSL_CTX_set_psk_server_callback( -+ ssl: *mut SSL_CTX, -+ psk_server_cb: Option< -+ extern "C" fn(*mut SSL, *const c_char, *mut c_uchar, c_uint) -> c_uint, -+ >, -+ ); -+} -+ -+extern "C" { -+ #[cfg(ossl111)] -+ pub fn SSL_CTX_add_custom_ext( -+ ctx: *mut ::SSL_CTX, -+ ext_type: c_uint, -+ context: c_uint, -+ add_cb: SSL_custom_ext_add_cb_ex, -+ free_cb: SSL_custom_ext_free_cb_ex, -+ add_arg: *mut c_void, -+ parse_cb: SSL_custom_ext_parse_cb_ex, -+ parse_arg: *mut c_void, -+ ) -> c_int; -+ -+ #[cfg(ossl102)] -+ pub fn SSL_extension_supported(ext_type: c_uint) -> c_int; -+} -+ -+#[cfg(ossl111)] -+pub type SSL_CTX_keylog_cb_func = -+ Option; -+ -+extern "C" { -+ #[cfg(ossl111)] -+ pub fn SSL_CTX_set_keylog_callback(ctx: *mut SSL_CTX, cb: SSL_CTX_keylog_cb_func); -+ -+ #[cfg(ossl111)] -+ pub fn SSL_CTX_set_max_early_data(ctx: *mut SSL_CTX, max_early_data: u32) -> c_int; -+ #[cfg(ossl111)] -+ pub fn SSL_CTX_get_max_early_data(ctx: *const SSL_CTX) -> u32; -+ #[cfg(ossl111)] -+ pub fn SSL_set_max_early_data(ctx: *mut SSL, max_early_data: u32) -> c_int; -+ #[cfg(ossl111)] -+ pub fn SSL_get_max_early_data(ctx: *const SSL) -> u32; -+ -+ pub fn SSL_get_finished(s: *const SSL, buf: *mut c_void, count: size_t) -> size_t; -+ pub fn SSL_get_peer_finished(s: *const SSL, buf: *mut c_void, count: size_t) -> size_t; -+} -+ -+pub const SSL_AD_ILLEGAL_PARAMETER: c_int = SSL3_AD_ILLEGAL_PARAMETER; -+pub const SSL_AD_DECODE_ERROR: c_int = TLS1_AD_DECODE_ERROR; -+pub const SSL_AD_UNRECOGNIZED_NAME: c_int = TLS1_AD_UNRECOGNIZED_NAME; -+pub const SSL_ERROR_NONE: c_int = 0; -+pub const SSL_ERROR_SSL: c_int = 1; -+pub const SSL_ERROR_SYSCALL: c_int = 5; -+pub const SSL_ERROR_WANT_ACCEPT: c_int = 8; -+pub const SSL_ERROR_WANT_CONNECT: c_int = 7; -+pub const SSL_ERROR_WANT_READ: c_int = 2; -+pub const SSL_ERROR_WANT_WRITE: c_int = 3; -+pub const SSL_ERROR_WANT_X509_LOOKUP: c_int = 4; -+pub const SSL_ERROR_ZERO_RETURN: c_int = 6; -+pub const SSL_VERIFY_NONE: c_int = 0; -+pub const SSL_VERIFY_PEER: c_int = 1; -+pub const SSL_VERIFY_FAIL_IF_NO_PEER_CERT: c_int = 2; -+pub const SSL_CTRL_SET_TMP_DH: c_int = 3; -+pub const SSL_CTRL_SET_TMP_ECDH: c_int = 4; -+#[cfg(any(libressl, all(ossl101, not(ossl110))))] -+pub const SSL_CTRL_GET_SESSION_REUSED: c_int = 8; -+pub const SSL_CTRL_EXTRA_CHAIN_CERT: c_int = 14; -+#[cfg(any(libressl, all(ossl101, not(ossl110))))] -+pub const SSL_CTRL_OPTIONS: c_int = 32; -+pub const SSL_CTRL_MODE: c_int = 33; -+pub const SSL_CTRL_SET_READ_AHEAD: c_int = 41; -+pub const SSL_CTRL_SET_SESS_CACHE_MODE: c_int = 44; -+pub const SSL_CTRL_SET_TLSEXT_SERVERNAME_CB: c_int = 53; -+pub const SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG: c_int = 54; -+pub const SSL_CTRL_SET_TLSEXT_HOSTNAME: c_int = 55; -+pub const SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB: c_int = 63; -+pub const SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG: c_int = 64; -+pub const SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE: c_int = 65; -+pub const SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP: c_int = 70; -+pub const SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP: c_int = 71; -+#[cfg(any(libressl, all(ossl101, not(ossl110))))] -+pub const SSL_CTRL_CLEAR_OPTIONS: c_int = 77; -+pub const SSL_CTRL_GET_EXTRA_CHAIN_CERTS: c_int = 82; -+#[cfg(any(libressl, all(ossl102, not(ossl110))))] -+pub const SSL_CTRL_SET_ECDH_AUTO: c_int = 94; -+#[cfg(ossl102)] -+pub const SSL_CTRL_SET_VERIFY_CERT_STORE: c_int = 106; -+#[cfg(ossl110)] -+pub const SSL_CTRL_SET_MIN_PROTO_VERSION: c_int = 123; -+#[cfg(ossl110)] -+pub const SSL_CTRL_SET_MAX_PROTO_VERSION: c_int = 124; -+#[cfg(ossl110g)] -+pub const SSL_CTRL_GET_MIN_PROTO_VERSION: c_int = 130; -+#[cfg(ossl110g)] -+pub const SSL_CTRL_GET_MAX_PROTO_VERSION: c_int = 131; -+ -+pub unsafe fn SSL_CTX_set_tmp_dh(ctx: *mut SSL_CTX, dh: *mut DH) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TMP_DH, 0, dh as *mut c_void) -+} -+ -+pub unsafe fn SSL_CTX_set_tmp_ecdh(ctx: *mut SSL_CTX, key: *mut EC_KEY) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TMP_ECDH, 0, key as *mut c_void) -+} -+ -+pub unsafe fn SSL_set_tmp_dh(ssl: *mut SSL, dh: *mut DH) -> c_long { -+ SSL_ctrl(ssl, SSL_CTRL_SET_TMP_DH, 0, dh as *mut c_void) -+} -+ -+pub unsafe fn SSL_set_tmp_ecdh(ssl: *mut SSL, key: *mut EC_KEY) -> c_long { -+ SSL_ctrl(ssl, SSL_CTRL_SET_TMP_ECDH, 0, key as *mut c_void) -+} -+ -+pub unsafe fn SSL_CTX_add_extra_chain_cert(ctx: *mut SSL_CTX, x509: *mut X509) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_EXTRA_CHAIN_CERT, 0, x509 as *mut c_void) -+} -+ -+pub unsafe fn SSL_CTX_get_extra_chain_certs( -+ ctx: *mut SSL_CTX, -+ chain: *mut *mut stack_st_X509, -+) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_GET_EXTRA_CHAIN_CERTS, 0, chain as *mut c_void) -+} -+ -+#[cfg(ossl102)] -+pub unsafe fn SSL_CTX_set0_verify_cert_store(ctx: *mut SSL_CTX, st: *mut X509_STORE) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_VERIFY_CERT_STORE, 0, st as *mut c_void) -+} -+ -+#[cfg(any(libressl, all(ossl102, not(ossl110))))] -+pub unsafe fn SSL_CTX_set_ecdh_auto(ctx: *mut SSL_CTX, onoff: c_int) -> c_int { -+ SSL_CTX_ctrl( -+ ctx, -+ SSL_CTRL_SET_ECDH_AUTO, -+ onoff as c_long, -+ ptr::null_mut(), -+ ) as c_int -+} -+ -+#[cfg(any(libress, all(ossl102, not(ossl110))))] -+pub unsafe fn SSL_set_ecdh_auto(ssl: *mut ::SSL, onoff: c_int) -> c_int { -+ SSL_ctrl( -+ ssl, -+ SSL_CTRL_SET_ECDH_AUTO, -+ onoff as c_long, -+ ptr::null_mut(), -+ ) as c_int -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub unsafe fn SSL_CTX_set_min_proto_version(ctx: *mut SSL_CTX, version: c_int) -> c_int { -+ SSL_CTX_ctrl( -+ ctx, -+ SSL_CTRL_SET_MIN_PROTO_VERSION, -+ version as c_long, -+ ptr::null_mut(), -+ ) as c_int -+ } -+ -+ pub unsafe fn SSL_CTX_set_max_proto_version(ctx: *mut SSL_CTX, version: c_int) -> c_int { -+ SSL_CTX_ctrl( -+ ctx, -+ SSL_CTRL_SET_MAX_PROTO_VERSION, -+ version as c_long, -+ ptr::null_mut(), -+ ) as c_int -+ } -+ } else if #[cfg(libressl261)] { -+ extern "C" { -+ pub fn SSL_CTX_set_min_proto_version(ctx: *mut ::SSL_CTX, version: u16) -> c_int; -+ pub fn SSL_CTX_set_max_proto_version(ctx: *mut ::SSL_CTX, version: u16) -> c_int; -+ } -+ } -+} -+ -+cfg_if! { -+ if #[cfg(ossl110g)] { -+ #[cfg(ossl110g)] -+ pub unsafe fn SSL_CTX_get_min_proto_version(ctx: *mut SSL_CTX) -> c_int { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, ptr::null_mut()) as c_int -+ } -+ -+ #[cfg(ossl110g)] -+ pub unsafe fn SSL_CTX_get_max_proto_version(ctx: *mut SSL_CTX) -> c_int { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, ptr::null_mut()) as c_int -+ } -+ } else if #[cfg(libressl270)] { -+ extern "C" { -+ pub fn SSL_CTX_get_min_proto_version(ctx: *mut ::SSL_CTX) -> c_int; -+ pub fn SSL_CTX_get_max_proto_version(ctx: *mut ::SSL_CTX) -> c_int; -+ } -+ } -+} -+ -+#[cfg(ossl110)] -+pub unsafe fn SSL_set_min_proto_version(s: *mut SSL, version: c_int) -> c_int { -+ SSL_ctrl( -+ s, -+ SSL_CTRL_SET_MIN_PROTO_VERSION, -+ version as c_long, -+ ptr::null_mut(), -+ ) as c_int -+} -+ -+#[cfg(ossl110)] -+pub unsafe fn SSL_set_max_proto_version(s: *mut SSL, version: c_int) -> c_int { -+ SSL_ctrl( -+ s, -+ SSL_CTRL_SET_MAX_PROTO_VERSION, -+ version as c_long, -+ ptr::null_mut(), -+ ) as c_int -+} -+ -+#[cfg(ossl110g)] -+pub unsafe fn SSL_get_min_proto_version(s: *mut SSL) -> c_int { -+ SSL_ctrl(s, SSL_CTRL_GET_MIN_PROTO_VERSION, 0, ptr::null_mut()) as c_int -+} -+ -+#[cfg(ossl110g)] -+pub unsafe fn SSL_get_max_proto_version(s: *mut SSL) -> c_int { -+ SSL_ctrl(s, SSL_CTRL_GET_MAX_PROTO_VERSION, 0, ptr::null_mut()) as c_int -+} -+ -+extern "C" { -+ pub fn SSL_CTX_set_cipher_list(ssl: *mut SSL_CTX, s: *const c_char) -> c_int; -+ pub fn SSL_CTX_new(method: *const SSL_METHOD) -> *mut SSL_CTX; -+ pub fn SSL_CTX_free(ctx: *mut SSL_CTX); -+ #[cfg(any(ossl110, libressl273))] -+ pub fn SSL_CTX_up_ref(x: *mut SSL_CTX) -> c_int; -+ pub fn SSL_CTX_get_cert_store(ctx: *const SSL_CTX) -> *mut X509_STORE; -+ -+ pub fn SSL_get_current_cipher(ssl: *const SSL) -> *const SSL_CIPHER; -+ pub fn SSL_CIPHER_get_bits(cipher: *const SSL_CIPHER, alg_bits: *mut c_int) -> c_int; -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn SSL_CIPHER_get_version(cipher: *const SSL_CIPHER) -> *const c_char; -+ } -+ } else { -+ extern "C" { -+ pub fn SSL_CIPHER_get_version(cipher: *const SSL_CIPHER) -> *mut c_char; -+ } -+ } -+} -+extern "C" { -+ #[cfg(ossl111)] -+ pub fn SSL_CIPHER_get_handshake_digest(cipher: *const ::SSL_CIPHER) -> *const ::EVP_MD; -+ pub fn SSL_CIPHER_get_name(cipher: *const SSL_CIPHER) -> *const c_char; -+ -+ pub fn SSL_pending(ssl: *const SSL) -> c_int; -+ pub fn SSL_set_bio(ssl: *mut SSL, rbio: *mut BIO, wbio: *mut BIO); -+ pub fn SSL_get_rbio(ssl: *const SSL) -> *mut BIO; -+ pub fn SSL_get_wbio(ssl: *const SSL) -> *mut BIO; -+ #[cfg(ossl111)] -+ pub fn SSL_CTX_set_ciphersuites(ctx: *mut SSL_CTX, str: *const c_char) -> c_int; -+ #[cfg(ossl111)] -+ pub fn SSL_set_ciphersuites(ssl: *mut ::SSL, str: *const c_char) -> c_int; -+ pub fn SSL_set_verify( -+ ssl: *mut SSL, -+ mode: c_int, -+ // FIXME should be unsafe -+ verify_callback: Option c_int>, -+ ); -+ pub fn SSL_CTX_use_PrivateKey(ctx: *mut SSL_CTX, key: *mut EVP_PKEY) -> c_int; -+ pub fn SSL_CTX_use_certificate(ctx: *mut SSL_CTX, cert: *mut X509) -> c_int; -+ -+ pub fn SSL_CTX_use_PrivateKey_file( -+ ctx: *mut SSL_CTX, -+ key_file: *const c_char, -+ file_type: c_int, -+ ) -> c_int; -+ pub fn SSL_CTX_use_certificate_file( -+ ctx: *mut SSL_CTX, -+ cert_file: *const c_char, -+ file_type: c_int, -+ ) -> c_int; -+ pub fn SSL_CTX_use_certificate_chain_file( -+ ctx: *mut SSL_CTX, -+ cert_chain_file: *const c_char, -+ ) -> c_int; -+ pub fn SSL_load_client_CA_file(file: *const c_char) -> *mut stack_st_X509_NAME; -+ -+ #[cfg(not(ossl110))] -+ pub fn SSL_load_error_strings(); -+ pub fn SSL_state_string(ssl: *const SSL) -> *const c_char; -+ pub fn SSL_state_string_long(ssl: *const SSL) -> *const c_char; -+ -+ #[cfg(ossl111)] -+ pub fn SSL_SESSION_set_max_early_data(ctx: *mut SSL_SESSION, max_early_data: u32) -> c_int; -+ #[cfg(ossl111)] -+ pub fn SSL_SESSION_get_max_early_data(ctx: *const SSL_SESSION) -> u32; -+ -+ pub fn SSL_SESSION_get_id(s: *const SSL_SESSION, len: *mut c_uint) -> *const c_uchar; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn SSL_SESSION_up_ref(ses: *mut SSL_SESSION) -> c_int; -+ pub fn SSL_SESSION_free(s: *mut SSL_SESSION); -+ pub fn i2d_SSL_SESSION(s: *mut SSL_SESSION, pp: *mut *mut c_uchar) -> c_int; -+ pub fn SSL_set_session(ssl: *mut SSL, session: *mut SSL_SESSION) -> c_int; -+ pub fn d2i_SSL_SESSION( -+ a: *mut *mut SSL_SESSION, -+ pp: *mut *const c_uchar, -+ len: c_long, -+ ) -> *mut SSL_SESSION; -+ -+ pub fn SSL_get_peer_certificate(ssl: *const SSL) -> *mut X509; -+ -+ pub fn SSL_get_peer_cert_chain(ssl: *const SSL) -> *mut stack_st_X509; -+ -+ pub fn SSL_CTX_set_verify( -+ ctx: *mut SSL_CTX, -+ mode: c_int, -+ verify_callback: Option c_int>, -+ ); -+ pub fn SSL_CTX_set_verify_depth(ctx: *mut SSL_CTX, depth: c_int); -+ -+ pub fn SSL_CTX_check_private_key(ctx: *const SSL_CTX) -> c_int; -+ -+ pub fn SSL_CTX_set_session_id_context( -+ ssl: *mut SSL_CTX, -+ sid_ctx: *const c_uchar, -+ sid_ctx_len: c_uint, -+ ) -> c_int; -+ -+ pub fn SSL_new(ctx: *mut SSL_CTX) -> *mut SSL; -+ -+ #[cfg(any(ossl102, libressl261))] -+ pub fn SSL_get0_param(ssl: *mut SSL) -> *mut X509_VERIFY_PARAM; -+ -+ pub fn SSL_free(ssl: *mut SSL); -+ pub fn SSL_accept(ssl: *mut SSL) -> c_int; -+ #[cfg(ossl111)] -+ pub fn SSL_stateless(s: *mut SSL) -> c_int; -+ pub fn SSL_connect(ssl: *mut SSL) -> c_int; -+ pub fn SSL_read(ssl: *mut SSL, buf: *mut c_void, num: c_int) -> c_int; -+ #[cfg(ossl111)] -+ pub fn SSL_read_early_data( -+ s: *mut ::SSL, -+ buf: *mut c_void, -+ num: size_t, -+ readbytes: *mut size_t, -+ ) -> c_int; -+} -+ -+#[cfg(ossl111)] -+pub const SSL_READ_EARLY_DATA_ERROR: c_int = 0; -+#[cfg(ossl111)] -+pub const SSL_READ_EARLY_DATA_SUCCESS: c_int = 1; -+#[cfg(ossl111)] -+pub const SSL_READ_EARLY_DATA_FINISH: c_int = 2; -+ -+extern "C" { -+ pub fn SSL_write(ssl: *mut SSL, buf: *const c_void, num: c_int) -> c_int; -+ #[cfg(ossl111)] -+ pub fn SSL_write_early_data( -+ s: *mut SSL, -+ buf: *const c_void, -+ num: size_t, -+ written: *mut size_t, -+ ) -> c_int; -+ pub fn SSL_ctrl(ssl: *mut SSL, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long; -+ pub fn SSL_CTX_ctrl(ctx: *mut SSL_CTX, cmd: c_int, larg: c_long, parg: *mut c_void) -> c_long; -+ pub fn SSL_CTX_callback_ctrl( -+ ctx: *mut SSL_CTX, -+ cmd: c_int, -+ fp: Option, -+ ) -> c_long; -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn TLS_method() -> *const SSL_METHOD; -+ -+ pub fn DTLS_method() -> *const SSL_METHOD; -+ } -+ } else { -+ extern "C" { -+ #[cfg(not(osslconf = "OPENSSL_NO_SSL3_METHOD"))] -+ pub fn SSLv3_method() -> *const SSL_METHOD; -+ -+ pub fn SSLv23_method() -> *const SSL_METHOD; -+ -+ pub fn TLSv1_method() -> *const SSL_METHOD; -+ -+ pub fn TLSv1_1_method() -> *const SSL_METHOD; -+ -+ pub fn TLSv1_2_method() -> *const SSL_METHOD; -+ -+ pub fn DTLSv1_method() -> *const SSL_METHOD; -+ -+ #[cfg(ossl102)] -+ pub fn DTLSv1_2_method() -> *const SSL_METHOD; -+ } -+ } -+} -+ -+extern "C" { -+ pub fn SSL_get_error(ssl: *const SSL, ret: c_int) -> c_int; -+ pub fn SSL_get_version(ssl: *const SSL) -> *const c_char; -+ -+ pub fn SSL_do_handshake(ssl: *mut SSL) -> c_int; -+ pub fn SSL_shutdown(ssl: *mut SSL) -> c_int; -+ -+ pub fn SSL_CTX_set_client_CA_list(ctx: *mut SSL_CTX, list: *mut stack_st_X509_NAME); -+ -+ pub fn SSL_CTX_set_default_verify_paths(ctx: *mut SSL_CTX) -> c_int; -+ pub fn SSL_CTX_load_verify_locations( -+ ctx: *mut SSL_CTX, -+ CAfile: *const c_char, -+ CApath: *const c_char, -+ ) -> c_int; -+ -+ pub fn SSL_get_ssl_method(ssl: *mut SSL) -> *const SSL_METHOD; -+ -+ pub fn SSL_set_connect_state(s: *mut SSL); -+ pub fn SSL_set_accept_state(s: *mut SSL); -+ -+ #[cfg(not(ossl110))] -+ pub fn SSL_library_init() -> c_int; -+ -+ pub fn SSL_CIPHER_description( -+ cipher: *const SSL_CIPHER, -+ buf: *mut c_char, -+ size: c_int, -+ ) -> *mut c_char; -+ -+ pub fn SSL_get_certificate(ssl: *const SSL) -> *mut X509; -+} -+cfg_if! { -+ if #[cfg(any(ossl102, libressl280))] { -+ extern "C" { -+ pub fn SSL_get_privatekey(ssl: *const SSL) -> *mut EVP_PKEY; -+ } -+ } else { -+ extern "C" { -+ pub fn SSL_get_privatekey(ssl: *mut SSL) -> *mut EVP_PKEY; -+ } -+ } -+} -+ -+extern "C" { -+ #[cfg(ossl102)] -+ pub fn SSL_CTX_get0_certificate(ctx: *const SSL_CTX) -> *mut X509; -+ #[cfg(ossl102)] -+ pub fn SSL_CTX_get0_privatekey(ctx: *const SSL_CTX) -> *mut EVP_PKEY; -+ -+ pub fn SSL_set_shutdown(ss: *mut SSL, mode: c_int); -+ pub fn SSL_get_shutdown(ssl: *const SSL) -> c_int; -+ pub fn SSL_version(ssl: *const SSL) -> c_int; -+ pub fn SSL_get_session(s: *const SSL) -> *mut SSL_SESSION; -+ pub fn SSL_get_SSL_CTX(ssl: *const SSL) -> *mut SSL_CTX; -+ pub fn SSL_set_SSL_CTX(ssl: *mut SSL, ctx: *mut SSL_CTX) -> *mut SSL_CTX; -+ -+ pub fn SSL_get_verify_result(ssl: *const SSL) -> c_long; -+ #[cfg(ossl110)] -+ pub fn SSL_get0_verified_chain(ssl: *const SSL) -> *mut stack_st_X509; -+ -+ #[cfg(ossl110)] -+ pub fn SSL_get_client_random(ssl: *const SSL, out: *mut c_uchar, len: size_t) -> size_t; -+ #[cfg(ossl110)] -+ pub fn SSL_get_server_random(ssl: *const SSL, out: *mut c_uchar, len: size_t) -> size_t; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn SSL_SESSION_get_master_key( -+ session: *const SSL_SESSION, -+ out: *mut c_uchar, -+ outlen: size_t, -+ ) -> size_t; -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub unsafe fn SSL_get_ex_new_index( -+ l: c_long, -+ p: *mut c_void, -+ newf: Option, -+ dupf: Option, -+ freef: Option, -+ ) -> c_int { -+ CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL, l, p, newf, dupf, freef) -+ } -+ } else { -+ extern "C" { -+ pub fn SSL_get_ex_new_index( -+ argl: c_long, -+ argp: *mut c_void, -+ new_func: Option, -+ dup_func: Option, -+ free_func: Option, -+ ) -> c_int; -+ } -+ } -+} -+extern "C" { -+ pub fn SSL_set_ex_data(ssl: *mut SSL, idx: c_int, data: *mut c_void) -> c_int; -+ pub fn SSL_get_ex_data(ssl: *const SSL, idx: c_int) -> *mut c_void; -+} -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub unsafe fn SSL_CTX_get_ex_new_index( -+ l: c_long, -+ p: *mut c_void, -+ newf: Option, -+ dupf: Option, -+ freef: Option, -+ ) -> c_int { -+ CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_SSL_CTX, l, p, newf, dupf, freef) -+ } -+ } else { -+ extern "C" { -+ pub fn SSL_CTX_get_ex_new_index( -+ argl: c_long, -+ argp: *mut c_void, -+ new_func: Option<::CRYPTO_EX_new>, -+ dup_func: Option<::CRYPTO_EX_dup>, -+ free_func: Option<::CRYPTO_EX_free>, -+ ) -> c_int; -+ } -+ } -+} -+extern "C" { -+ pub fn SSL_CTX_set_ex_data(ctx: *mut SSL_CTX, idx: c_int, data: *mut c_void) -> c_int; -+ pub fn SSL_CTX_get_ex_data(ctx: *const SSL_CTX, idx: c_int) -> *mut c_void; -+ -+ pub fn SSL_get_ex_data_X509_STORE_CTX_idx() -> c_int; -+} -+ -+pub unsafe fn SSL_CTX_set_session_cache_mode(ctx: *mut SSL_CTX, m: c_long) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_SESS_CACHE_MODE, m, ptr::null_mut()) -+} -+ -+pub unsafe fn SSL_CTX_set_read_ahead(ctx: *mut SSL_CTX, m: c_long) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_READ_AHEAD, m, ptr::null_mut()) -+} -+ -+extern "C" { -+ // FIXME should take an option -+ pub fn SSL_CTX_set_tmp_dh_callback( -+ ctx: *mut SSL_CTX, -+ dh: unsafe extern "C" fn(ssl: *mut SSL, is_export: c_int, keylength: c_int) -> *mut DH, -+ ); -+ // FIXME should take an option -+ pub fn SSL_set_tmp_dh_callback( -+ ctx: *mut SSL, -+ dh: unsafe extern "C" fn(ssl: *mut SSL, is_export: c_int, keylength: c_int) -> *mut DH, -+ ); -+ // FIXME should take an option -+ #[cfg(not(ossl110))] -+ pub fn SSL_CTX_set_tmp_ecdh_callback( -+ ctx: *mut ::SSL_CTX, -+ ecdh: unsafe extern "C" fn(ssl: *mut ::SSL, is_export: c_int, keylength: c_int) -+ -> *mut ::EC_KEY, -+ ); -+ // FIXME should take an option -+ #[cfg(not(ossl110))] -+ pub fn SSL_set_tmp_ecdh_callback( -+ ssl: *mut SSL, -+ ecdh: unsafe extern "C" fn(ssl: *mut SSL, is_export: c_int, keylength: c_int) -+ -> *mut EC_KEY, -+ ); -+} -+ -+cfg_if! { -+ if #[cfg(libressl)] { -+ extern "C" { -+ pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const libc::c_void; -+ pub fn SSL_COMP_get_name(comp: *const libc::c_void) -> *const c_char; -+ } -+ } else if #[cfg(not(osslconf = "OPENSSL_NO_COMP"))] { -+ extern "C" { -+ pub fn SSL_get_current_compression(ssl: *mut SSL) -> *const COMP_METHOD; -+ pub fn SSL_COMP_get_name(comp: *const COMP_METHOD) -> *const c_char; -+ } -+ } -+} -+ -+extern "C" { -+ #[cfg(ossl110)] -+ pub fn SSL_CIPHER_get_cipher_nid(c: *const SSL_CIPHER) -> c_int; -+ #[cfg(ossl110)] -+ pub fn SSL_CIPHER_get_digest_nid(c: *const SSL_CIPHER) -> c_int; -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn SSL_session_reused(ssl: *mut SSL) -> c_int; -+ } -+ } else { -+ pub unsafe fn SSL_session_reused(ssl: *mut SSL) -> c_int { -+ SSL_ctrl(ssl, SSL_CTRL_GET_SESSION_REUSED, 0, ptr::null_mut()) as c_int -+ } -+ } -+} -+cfg_if! { -+ if #[cfg(any(ossl110f, libressl273))] { -+ extern "C" { -+ pub fn SSL_is_server(s: *const SSL) -> c_int; -+ } -+ } else if #[cfg(ossl102)] { -+ extern "C" { -+ pub fn SSL_is_server(s: *mut SSL) -> c_int; -+ } -+ } -+} -+ -+#[cfg(ossl110)] -+pub const OPENSSL_INIT_LOAD_SSL_STRINGS: u64 = 0x00200000; -+ -+extern "C" { -+ #[cfg(ossl110)] -+ pub fn OPENSSL_init_ssl(opts: u64, settings: *const OPENSSL_INIT_SETTINGS) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_ssl3.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_ssl3.rs deleted file mode 100644 index 69522e7c80b..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_ssl3.rs +++ /dev/null @@ -1,8 +0,0 @@ ---- src/vendor/openssl-sys/src/ssl3.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/ssl3.rs -@@ -0,0 +1,5 @@ -+use libc::*; -+ -+pub const SSL3_VERSION: c_int = 0x300; -+ -+pub const SSL3_AD_ILLEGAL_PARAMETER: c_int = 47; diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_stack.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_stack.rs deleted file mode 100644 index a59662e2f65..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_stack.rs +++ /dev/null @@ -1,48 +0,0 @@ ---- src/vendor/openssl-sys/src/stack.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/stack.rs -@@ -0,0 +1,45 @@ -+use libc::*; -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub enum OPENSSL_STACK {} -+ } else { -+ #[repr(C)] -+ pub struct _STACK { -+ pub num: c_int, -+ pub data: *mut *mut c_char, -+ pub sorted: c_int, -+ pub num_alloc: c_int, -+ pub comp: Option c_int>, -+ } -+ } -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn OPENSSL_sk_num(stack: *const OPENSSL_STACK) -> c_int; -+ pub fn OPENSSL_sk_value(stack: *const OPENSSL_STACK, idx: c_int) -> *mut c_void; -+ -+ pub fn OPENSSL_sk_new_null() -> *mut OPENSSL_STACK; -+ pub fn OPENSSL_sk_free(st: *mut OPENSSL_STACK); -+ pub fn OPENSSL_sk_pop_free( -+ st: *mut OPENSSL_STACK, -+ free: Option, -+ ); -+ pub fn OPENSSL_sk_push(st: *mut OPENSSL_STACK, data: *const c_void) -> c_int; -+ pub fn OPENSSL_sk_pop(st: *mut OPENSSL_STACK) -> *mut c_void; -+ } -+ } else { -+ extern "C" { -+ pub fn sk_num(st: *const _STACK) -> c_int; -+ pub fn sk_value(st: *const _STACK, n: c_int) -> *mut c_void; -+ -+ pub fn sk_new_null() -> *mut _STACK; -+ pub fn sk_free(st: *mut _STACK); -+ pub fn sk_pop_free(st: *mut _STACK, free: Option); -+ pub fn sk_push(st: *mut _STACK, data: *mut c_void) -> c_int; -+ pub fn sk_pop(st: *mut _STACK) -> *mut c_void; -+ } -+ } -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_tls1.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_tls1.rs deleted file mode 100644 index 53c8cf0e3e1..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_tls1.rs +++ /dev/null @@ -1,114 +0,0 @@ ---- src/vendor/openssl-sys/src/tls1.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/tls1.rs -@@ -0,0 +1,111 @@ -+use libc::*; -+use std::ptr; -+use std::mem; -+ -+use *; -+ -+pub const TLS1_VERSION: c_int = 0x301; -+pub const TLS1_1_VERSION: c_int = 0x302; -+pub const TLS1_2_VERSION: c_int = 0x303; -+#[cfg(ossl111)] -+pub const TLS1_3_VERSION: c_int = 0x304; -+ -+pub const TLS1_AD_DECODE_ERROR: c_int = 50; -+pub const TLS1_AD_UNRECOGNIZED_NAME: c_int = 112; -+ -+pub const TLSEXT_NAMETYPE_host_name: c_int = 0; -+pub const TLSEXT_STATUSTYPE_ocsp: c_int = 1; -+ -+extern "C" { -+ pub fn SSL_get_servername(ssl: *const SSL, name_type: c_int) -> *const c_char; -+ -+ pub fn SSL_export_keying_material( -+ s: *mut SSL, -+ out: *mut c_uchar, -+ olen: size_t, -+ label: *const c_char, -+ llen: size_t, -+ context: *const c_uchar, -+ contextlen: size_t, -+ use_context: c_int, -+ ) -> c_int; -+ -+ #[cfg(ossl111)] -+ pub fn SSL_export_keying_material_early( -+ s: *mut ::SSL, -+ out: *mut c_uchar, -+ olen: size_t, -+ label: *const c_char, -+ llen: size_t, -+ context: *const c_uchar, -+ contextlen: size_t, -+ ) -> c_int; -+} -+ -+pub unsafe fn SSL_set_tlsext_host_name(s: *mut SSL, name: *mut c_char) -> c_long { -+ SSL_ctrl( -+ s, -+ SSL_CTRL_SET_TLSEXT_HOSTNAME, -+ TLSEXT_NAMETYPE_host_name as c_long, -+ name as *mut c_void, -+ ) -+} -+ -+pub unsafe fn SSL_set_tlsext_status_type(s: *mut SSL, type_: c_int) -> c_long { -+ SSL_ctrl( -+ s, -+ SSL_CTRL_SET_TLSEXT_STATUS_REQ_TYPE, -+ type_ as c_long, -+ ptr::null_mut(), -+ ) -+} -+ -+pub unsafe fn SSL_get_tlsext_status_ocsp_resp(ssl: *mut SSL, resp: *mut *mut c_uchar) -> c_long { -+ SSL_ctrl( -+ ssl, -+ SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP, -+ 0, -+ resp as *mut c_void, -+ ) -+} -+ -+pub unsafe fn SSL_set_tlsext_status_ocsp_resp( -+ ssl: *mut SSL, -+ resp: *mut c_uchar, -+ len: c_long, -+) -> c_long { -+ SSL_ctrl( -+ ssl, -+ SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP, -+ len, -+ resp as *mut c_void, -+ ) -+} -+ -+pub unsafe fn SSL_CTX_set_tlsext_servername_callback( -+ ctx: *mut SSL_CTX, -+ // FIXME should have the right signature -+ cb: Option, -+) -> c_long { -+ SSL_CTX_callback_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_CB, cb) -+} -+ -+pub const SSL_TLSEXT_ERR_OK: c_int = 0; -+pub const SSL_TLSEXT_ERR_ALERT_WARNING: c_int = 1; -+pub const SSL_TLSEXT_ERR_ALERT_FATAL: c_int = 2; -+pub const SSL_TLSEXT_ERR_NOACK: c_int = 3; -+ -+pub unsafe fn SSL_CTX_set_tlsext_servername_arg(ctx: *mut SSL_CTX, arg: *mut c_void) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG, 0, arg) -+} -+ -+pub unsafe fn SSL_CTX_set_tlsext_status_cb( -+ ctx: *mut SSL_CTX, -+ cb: Option c_int>, -+) -> c_long { -+ SSL_CTX_callback_ctrl(ctx, SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB, mem::transmute(cb)) -+} -+ -+pub unsafe fn SSL_CTX_set_tlsext_status_arg(ctx: *mut SSL_CTX, arg: *mut c_void) -> c_long { -+ SSL_CTX_ctrl(ctx, SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG, 0, arg) -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_x509.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_x509.rs deleted file mode 100644 index 78fd07e792c..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_x509.rs +++ /dev/null @@ -1,351 +0,0 @@ ---- src/vendor/openssl-sys/src/x509.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/x509.rs -@@ -0,0 +1,348 @@ -+use libc::*; -+ -+use *; -+ -+pub const X509_FILETYPE_PEM: c_int = 1; -+pub const X509_FILETYPE_ASN1: c_int = 2; -+pub const X509_FILETYPE_DEFAULT: c_int = 3; -+ -+#[repr(C)] -+pub struct X509_VAL { -+ pub notBefore: *mut ASN1_TIME, -+ pub notAfter: *mut ASN1_TIME, -+} -+ -+pub enum X509_NAME_ENTRY {} -+ -+stack!(stack_st_X509_NAME); -+ -+pub enum X509_EXTENSION {} -+ -+stack!(stack_st_X509_EXTENSION); -+ -+stack!(stack_st_X509_ATTRIBUTE); -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub enum X509_REQ_INFO {} -+ } else { -+ #[repr(C)] -+ pub struct X509_REQ_INFO { -+ pub enc: ASN1_ENCODING, -+ pub version: *mut ::ASN1_INTEGER, -+ pub subject: *mut ::X509_NAME, -+ pubkey: *mut c_void, -+ pub attributes: *mut stack_st_X509_ATTRIBUTE, -+ } -+ } -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub enum X509_REQ {} -+ } else { -+ #[repr(C)] -+ pub struct X509_REQ { -+ pub req_info: *mut X509_REQ_INFO, -+ sig_alg: *mut c_void, -+ signature: *mut c_void, -+ references: c_int, -+ } -+ } -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub enum X509_CINF {} -+ } else { -+ #[repr(C)] -+ pub struct X509_CINF { -+ version: *mut c_void, -+ serialNumber: *mut c_void, -+ signature: *mut c_void, -+ issuer: *mut c_void, -+ pub validity: *mut X509_VAL, -+ subject: *mut c_void, -+ key: *mut c_void, -+ issuerUID: *mut c_void, -+ subjectUID: *mut c_void, -+ pub extensions: *mut stack_st_X509_EXTENSION, -+ enc: ASN1_ENCODING, -+ } -+ } -+} -+ -+stack!(stack_st_X509); -+ -+extern "C" { -+ pub fn X509_verify_cert_error_string(n: c_long) -> *const c_char; -+ -+ pub fn X509_sign(x: *mut X509, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> c_int; -+ -+ pub fn X509_digest( -+ x: *const X509, -+ digest: *const EVP_MD, -+ buf: *mut c_uchar, -+ len: *mut c_uint, -+ ) -> c_int; -+ -+ pub fn X509_REQ_sign(x: *mut X509_REQ, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> c_int; -+ -+ pub fn i2d_X509_bio(b: *mut BIO, x: *mut X509) -> c_int; -+ pub fn i2d_X509_REQ_bio(b: *mut BIO, x: *mut X509_REQ) -> c_int; -+ pub fn i2d_PrivateKey_bio(b: *mut BIO, x: *mut EVP_PKEY) -> c_int; -+ pub fn i2d_PUBKEY_bio(b: *mut BIO, x: *mut EVP_PKEY) -> c_int; -+ -+ pub fn i2d_PUBKEY(k: *mut EVP_PKEY, buf: *mut *mut u8) -> c_int; -+ pub fn d2i_PUBKEY(k: *mut *mut EVP_PKEY, buf: *mut *const u8, len: c_long) -> *mut EVP_PKEY; -+ pub fn d2i_RSA_PUBKEY(k: *mut *mut RSA, buf: *mut *const u8, len: c_long) -> *mut RSA; -+ pub fn i2d_RSA_PUBKEY(k: *mut RSA, buf: *mut *mut u8) -> c_int; -+ pub fn d2i_DSA_PUBKEY(k: *mut *mut DSA, pp: *mut *const c_uchar, length: c_long) -> *mut DSA; -+ pub fn i2d_DSA_PUBKEY(a: *mut DSA, pp: *mut *mut c_uchar) -> c_int; -+ pub fn i2d_PrivateKey(k: *mut EVP_PKEY, buf: *mut *mut u8) -> c_int; -+ -+ pub fn d2i_ECPrivateKey( -+ k: *mut *mut EC_KEY, -+ pp: *mut *const c_uchar, -+ length: c_long, -+ ) -> *mut EC_KEY; -+ pub fn i2d_ECPrivateKey(ec_key: *mut EC_KEY, pp: *mut *mut c_uchar) -> c_int; -+} -+ -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn X509_ALGOR_get0( -+ paobj: *mut *const ASN1_OBJECT, -+ pptype: *mut c_int, -+ ppval: *mut *const c_void, -+ alg: *const X509_ALGOR, -+ ); -+ } -+ } else if #[cfg(ossl102)] { -+ extern "C" { -+ pub fn X509_ALGOR_get0( -+ paobj: *mut *mut ASN1_OBJECT, -+ pptype: *mut c_int, -+ ppval: *mut *mut c_void, -+ alg: *mut X509_ALGOR, -+ ); -+ } -+ } -+} -+ -+extern "C" { -+ pub fn X509_gmtime_adj(time: *mut ASN1_TIME, adj: c_long) -> *mut ASN1_TIME; -+ -+ pub fn X509_to_X509_REQ(x: *mut X509, pkey: *mut EVP_PKEY, md: *const EVP_MD) -> *mut X509_REQ; -+ -+ pub fn X509_ALGOR_free(x: *mut X509_ALGOR); -+ -+ pub fn X509_REQ_new() -> *mut X509_REQ; -+ pub fn X509_REQ_free(x: *mut X509_REQ); -+ pub fn d2i_X509_REQ( -+ a: *mut *mut X509_REQ, -+ pp: *mut *const c_uchar, -+ length: c_long, -+ ) -> *mut X509_REQ; -+ pub fn i2d_X509_REQ(x: *mut X509_REQ, buf: *mut *mut u8) -> c_int; -+} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl273))] { -+ extern "C" { -+ pub fn X509_get0_signature( -+ psig: *mut *const ASN1_BIT_STRING, -+ palg: *mut *const X509_ALGOR, -+ x: *const X509, -+ ); -+ } -+ } else if #[cfg(ossl102)] { -+ extern "C" { -+ pub fn X509_get0_signature( -+ psig: *mut *mut ASN1_BIT_STRING, -+ palg: *mut *mut X509_ALGOR, -+ x: *const X509, -+ ); -+ } -+ } -+} -+extern "C" { -+ #[cfg(ossl102)] -+ pub fn X509_get_signature_nid(x: *const X509) -> c_int; -+ -+ pub fn X509_EXTENSION_free(ext: *mut X509_EXTENSION); -+ -+ pub fn X509_NAME_ENTRY_free(x: *mut X509_NAME_ENTRY); -+ -+ pub fn X509_NAME_new() -> *mut X509_NAME; -+ pub fn X509_NAME_free(x: *mut X509_NAME); -+ -+ pub fn X509_new() -> *mut X509; -+ pub fn X509_free(x: *mut X509); -+ pub fn i2d_X509(x: *mut X509, buf: *mut *mut u8) -> c_int; -+ pub fn d2i_X509(a: *mut *mut X509, pp: *mut *const c_uchar, length: c_long) -> *mut X509; -+ -+ pub fn X509_get_pubkey(x: *mut X509) -> *mut EVP_PKEY; -+ -+ pub fn X509_set_version(x: *mut X509, version: c_long) -> c_int; -+ pub fn X509_set_serialNumber(x: *mut X509, sn: *mut ASN1_INTEGER) -> c_int; -+ pub fn X509_get_serialNumber(x: *mut X509) -> *mut ASN1_INTEGER; -+ pub fn X509_set_issuer_name(x: *mut X509, name: *mut X509_NAME) -> c_int; -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn X509_get_issuer_name(x: *const ::X509) -> *mut ::X509_NAME; -+ } -+ } else { -+ extern "C" { -+ pub fn X509_get_issuer_name(x: *mut ::X509) -> *mut ::X509_NAME; -+ } -+ } -+} -+extern "C" { -+ pub fn X509_set_subject_name(x: *mut X509, name: *mut X509_NAME) -> c_int; -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn X509_get_subject_name(x: *const ::X509) -> *mut ::X509_NAME; -+ } -+ } else { -+ extern "C" { -+ pub fn X509_get_subject_name(x: *mut ::X509) -> *mut ::X509_NAME; -+ } -+ } -+} -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn X509_set1_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -+ pub fn X509_set1_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -+ } -+ } else { -+ extern "C" { -+ pub fn X509_set_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -+ pub fn X509_set_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int; -+ } -+ } -+} -+extern "C" { -+ #[cfg(ossl110)] -+ pub fn X509_REQ_get_version(req: *const X509_REQ) -> c_long; -+ pub fn X509_REQ_set_version(req: *mut X509_REQ, version: c_long) -> c_int; -+ #[cfg(ossl110)] -+ pub fn X509_REQ_get_subject_name(req: *const X509_REQ) -> *mut X509_NAME; -+ pub fn X509_REQ_set_subject_name(req: *mut X509_REQ, name: *mut X509_NAME) -> c_int; -+ pub fn X509_REQ_set_pubkey(req: *mut X509_REQ, pkey: *mut EVP_PKEY) -> c_int; -+ pub fn X509_REQ_get_pubkey(req: *mut X509_REQ) -> *mut EVP_PKEY; -+ pub fn X509_REQ_get_extensions(req: *mut X509_REQ) -> *mut stack_st_X509_EXTENSION; -+ pub fn X509_REQ_add_extensions(req: *mut X509_REQ, exts: *mut stack_st_X509_EXTENSION) -+ -> c_int; -+ pub fn X509_set_pubkey(x: *mut X509, pkey: *mut EVP_PKEY) -> c_int; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn X509_getm_notBefore(x: *const X509) -> *mut ASN1_TIME; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn X509_getm_notAfter(x: *const X509) -> *mut ASN1_TIME; -+ #[cfg(any(ossl110, libressl273))] -+ pub fn X509_up_ref(x: *mut X509) -> c_int; -+ -+ #[cfg(ossl110)] -+ pub fn X509_get0_extensions(req: *const ::X509) -> *const stack_st_X509_EXTENSION; -+} -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn X509_NAME_entry_count(n: *const X509_NAME) -> c_int; -+ } -+ } else { -+ extern "C" { -+ pub fn X509_NAME_entry_count(n: *mut X509_NAME) -> c_int; -+ } -+ } -+} -+ -+cfg_if! { -+ if #[cfg(libressl280)] { -+ extern "C" { -+ pub fn X509_NAME_get_index_by_NID(n: *const X509_NAME, nid: c_int, last_pos: c_int) -> c_int; -+ } -+ } else { -+ extern "C" { -+ pub fn X509_NAME_get_index_by_NID(n: *mut X509_NAME, nid: c_int, last_pos: c_int) -> c_int; -+ } -+ } -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn X509_NAME_get_entry(n: *const X509_NAME, loc: c_int) -> *mut X509_NAME_ENTRY; -+ pub fn X509_NAME_add_entry_by_NID( -+ x: *mut X509_NAME, -+ field: c_int, -+ ty: c_int, -+ bytes: *const c_uchar, -+ len: c_int, -+ loc: c_int, -+ set: c_int, -+ ) -> c_int; -+ pub fn X509_NAME_ENTRY_get_object(ne: *const X509_NAME_ENTRY) -> *mut ASN1_OBJECT; -+ pub fn X509_NAME_ENTRY_get_data(ne: *const X509_NAME_ENTRY) -> *mut ASN1_STRING; -+ } -+ } else { -+ extern "C" { -+ pub fn X509_NAME_get_entry(n: *mut X509_NAME, loc: c_int) -> *mut X509_NAME_ENTRY; -+ pub fn X509_NAME_add_entry_by_NID( -+ x: *mut X509_NAME, -+ field: c_int, -+ ty: c_int, -+ bytes: *mut c_uchar, -+ len: c_int, -+ loc: c_int, -+ set: c_int, -+ ) -> c_int; -+ pub fn X509_NAME_ENTRY_get_object(ne: *mut X509_NAME_ENTRY) -> *mut ASN1_OBJECT; -+ pub fn X509_NAME_ENTRY_get_data(ne: *mut X509_NAME_ENTRY) -> *mut ASN1_STRING; -+ } -+ } -+} -+extern "C" { -+ pub fn X509_NAME_add_entry_by_txt( -+ x: *mut X509_NAME, -+ field: *const c_char, -+ ty: c_int, -+ bytes: *const c_uchar, -+ len: c_int, -+ loc: c_int, -+ set: c_int, -+ ) -> c_int; -+ -+ pub fn X509_add_ext(x: *mut X509, ext: *mut X509_EXTENSION, loc: c_int) -> c_int; -+} -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn X509_get_ext_d2i( -+ x: *const ::X509, -+ nid: c_int, -+ crit: *mut c_int, -+ idx: *mut c_int, -+ ) -> *mut c_void; -+ } -+ } else { -+ extern "C" { -+ pub fn X509_get_ext_d2i( -+ x: *mut ::X509, -+ nid: c_int, -+ crit: *mut c_int, -+ idx: *mut c_int, -+ ) -> *mut c_void; -+ } -+ } -+} -+ -+extern "C" { -+ pub fn X509_verify_cert(ctx: *mut X509_STORE_CTX) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_x509__vfy.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_x509__vfy.rs deleted file mode 100644 index 6663696cb16..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_x509__vfy.rs +++ /dev/null @@ -1,156 +0,0 @@ ---- src/vendor/openssl-sys/src/x509_vfy.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/x509_vfy.rs -@@ -0,0 +1,153 @@ -+use libc::*; -+ -+use *; -+ -+#[cfg(any(libressl, all(ossl102, not(ossl110))))] -+pub enum X509_VERIFY_PARAM_ID {} -+ -+pub const X509_V_OK: c_int = 0; -+#[cfg(ossl102f)] -+pub const X509_V_ERR_UNSPECIFIED: c_int = 1; -+pub const X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: c_int = 2; -+pub const X509_V_ERR_UNABLE_TO_GET_CRL: c_int = 3; -+pub const X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE: c_int = 4; -+pub const X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE: c_int = 5; -+pub const X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY: c_int = 6; -+pub const X509_V_ERR_CERT_SIGNATURE_FAILURE: c_int = 7; -+pub const X509_V_ERR_CRL_SIGNATURE_FAILURE: c_int = 8; -+pub const X509_V_ERR_CERT_NOT_YET_VALID: c_int = 9; -+pub const X509_V_ERR_CERT_HAS_EXPIRED: c_int = 10; -+pub const X509_V_ERR_CRL_NOT_YET_VALID: c_int = 11; -+pub const X509_V_ERR_CRL_HAS_EXPIRED: c_int = 12; -+pub const X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD: c_int = 13; -+pub const X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD: c_int = 14; -+pub const X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD: c_int = 15; -+pub const X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD: c_int = 16; -+pub const X509_V_ERR_OUT_OF_MEM: c_int = 17; -+pub const X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT: c_int = 18; -+pub const X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN: c_int = 19; -+pub const X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY: c_int = 20; -+pub const X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE: c_int = 21; -+pub const X509_V_ERR_CERT_CHAIN_TOO_LONG: c_int = 22; -+pub const X509_V_ERR_CERT_REVOKED: c_int = 23; -+pub const X509_V_ERR_INVALID_CA: c_int = 24; -+pub const X509_V_ERR_PATH_LENGTH_EXCEEDED: c_int = 25; -+pub const X509_V_ERR_INVALID_PURPOSE: c_int = 26; -+pub const X509_V_ERR_CERT_UNTRUSTED: c_int = 27; -+pub const X509_V_ERR_CERT_REJECTED: c_int = 28; -+pub const X509_V_ERR_SUBJECT_ISSUER_MISMATCH: c_int = 29; -+pub const X509_V_ERR_AKID_SKID_MISMATCH: c_int = 30; -+pub const X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH: c_int = 31; -+pub const X509_V_ERR_KEYUSAGE_NO_CERTSIGN: c_int = 32; -+pub const X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER: c_int = 33; -+pub const X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION: c_int = 34; -+pub const X509_V_ERR_KEYUSAGE_NO_CRL_SIGN: c_int = 35; -+pub const X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION: c_int = 36; -+pub const X509_V_ERR_INVALID_NON_CA: c_int = 37; -+pub const X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED: c_int = 38; -+pub const X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE: c_int = 39; -+pub const X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED: c_int = 40; -+pub const X509_V_ERR_INVALID_EXTENSION: c_int = 41; -+pub const X509_V_ERR_INVALID_POLICY_EXTENSION: c_int = 42; -+pub const X509_V_ERR_NO_EXPLICIT_POLICY: c_int = 43; -+pub const X509_V_ERR_DIFFERENT_CRL_SCOPE: c_int = 44; -+pub const X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE: c_int = 45; -+pub const X509_V_ERR_UNNESTED_RESOURCE: c_int = 46; -+pub const X509_V_ERR_PERMITTED_VIOLATION: c_int = 47; -+pub const X509_V_ERR_EXCLUDED_VIOLATION: c_int = 48; -+pub const X509_V_ERR_SUBTREE_MINMAX: c_int = 49; -+pub const X509_V_ERR_APPLICATION_VERIFICATION: c_int = 50; -+pub const X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE: c_int = 51; -+pub const X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX: c_int = 52; -+pub const X509_V_ERR_UNSUPPORTED_NAME_SYNTAX: c_int = 53; -+pub const X509_V_ERR_CRL_PATH_VALIDATION_ERROR: c_int = 54; -+#[cfg(ossl102)] -+pub const X509_V_ERR_SUITE_B_INVALID_VERSION: c_int = 56; -+#[cfg(ossl102)] -+pub const X509_V_ERR_SUITE_B_INVALID_ALGORITHM: c_int = 57; -+#[cfg(ossl102)] -+pub const X509_V_ERR_SUITE_B_INVALID_CURVE: c_int = 58; -+#[cfg(ossl102)] -+pub const X509_V_ERR_SUITE_B_INVALID_SIGNATURE_ALGORITHM: c_int = 59; -+#[cfg(ossl102)] -+pub const X509_V_ERR_SUITE_B_LOS_NOT_ALLOWED: c_int = 60; -+#[cfg(ossl102)] -+pub const X509_V_ERR_SUITE_B_CANNOT_SIGN_P_384_WITH_P_256: c_int = 61; -+#[cfg(ossl102)] -+pub const X509_V_ERR_HOSTNAME_MISMATCH: c_int = 62; -+#[cfg(ossl102)] -+pub const X509_V_ERR_EMAIL_MISMATCH: c_int = 63; -+#[cfg(ossl102)] -+pub const X509_V_ERR_IP_ADDRESS_MISMATCH: c_int = 64; -+cfg_if! { -+ if #[cfg(ossl110)] { -+ pub const X509_V_ERR_DANE_NO_MATCH: c_int = 65; -+ pub const X509_V_ERR_EE_KEY_TOO_SMALL: c_int = 66; -+ pub const X509_V_ERR_CA_KEY_TOO_SMALL: c_int = 67; -+ pub const X509_V_ERR_CA_MD_TOO_WEAK: c_int = 68; -+ pub const X509_V_ERR_INVALID_CALL: c_int = 69; -+ pub const X509_V_ERR_STORE_LOOKUP: c_int = 70; -+ pub const X509_V_ERR_NO_VALID_SCTS: c_int = 71; -+ } else if #[cfg(ossl102h)] { -+ pub const X509_V_ERR_INVALID_CALL: c_int = 65; -+ pub const X509_V_ERR_STORE_LOOKUP: c_int = 66; -+ pub const X509_V_ERR_PROXY_SUBJECT_NAME_VIOLATION: c_int = 67; -+ } -+} -+ -+extern "C" { -+ pub fn X509_STORE_new() -> *mut X509_STORE; -+ pub fn X509_STORE_free(store: *mut X509_STORE); -+ -+ pub fn X509_STORE_CTX_new() -> *mut X509_STORE_CTX; -+ -+ pub fn X509_STORE_CTX_free(ctx: *mut X509_STORE_CTX); -+ pub fn X509_STORE_CTX_init( -+ ctx: *mut X509_STORE_CTX, -+ store: *mut X509_STORE, -+ x509: *mut X509, -+ chain: *mut stack_st_X509, -+ ) -> c_int; -+ pub fn X509_STORE_CTX_cleanup(ctx: *mut X509_STORE_CTX); -+ -+ pub fn X509_STORE_add_cert(store: *mut X509_STORE, x: *mut X509) -> c_int; -+ -+ pub fn X509_STORE_set_default_paths(store: *mut X509_STORE) -> c_int; -+ -+ pub fn X509_STORE_CTX_get_ex_data(ctx: *mut X509_STORE_CTX, idx: c_int) -> *mut c_void; -+ pub fn X509_STORE_CTX_get_error(ctx: *mut X509_STORE_CTX) -> c_int; -+ pub fn X509_STORE_CTX_set_error(ctx: *mut X509_STORE_CTX, error: c_int); -+ pub fn X509_STORE_CTX_get_error_depth(ctx: *mut X509_STORE_CTX) -> c_int; -+ pub fn X509_STORE_CTX_get_current_cert(ctx: *mut X509_STORE_CTX) -> *mut X509; -+} -+cfg_if! { -+ if #[cfg(ossl110)] { -+ extern "C" { -+ pub fn X509_STORE_CTX_get0_chain(ctx: *mut X509_STORE_CTX) -> *mut stack_st_X509; -+ } -+ } else { -+ extern "C" { -+ pub fn X509_STORE_CTX_get_chain(ctx: *mut X509_STORE_CTX) -> *mut stack_st_X509; -+ } -+ } -+} -+ -+extern "C" { -+ #[cfg(any(ossl102, libressl261))] -+ pub fn X509_VERIFY_PARAM_free(param: *mut X509_VERIFY_PARAM); -+ -+ #[cfg(any(ossl102, libressl261))] -+ pub fn X509_VERIFY_PARAM_set1_host( -+ param: *mut X509_VERIFY_PARAM, -+ name: *const c_char, -+ namelen: size_t, -+ ) -> c_int; -+ #[cfg(any(ossl102, libressl261))] -+ pub fn X509_VERIFY_PARAM_set_hostflags(param: *mut X509_VERIFY_PARAM, flags: c_uint); -+ #[cfg(any(ossl102, libressl261))] -+ pub fn X509_VERIFY_PARAM_set1_ip( -+ param: *mut X509_VERIFY_PARAM, -+ ip: *const c_uchar, -+ iplen: size_t, -+ ) -> c_int; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl-sys_src_x509v3.rs b/lang/rust/files/patch-src_vendor_openssl-sys_src_x509v3.rs deleted file mode 100644 index 585005c256c..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl-sys_src_x509v3.rs +++ /dev/null @@ -1,95 +0,0 @@ ---- src/vendor/openssl-sys/src/x509v3.rs.orig 2018-09-16 20:29:19 UTC -+++ src/vendor/openssl-sys/src/x509v3.rs -@@ -0,0 +1,92 @@ -+use libc::*; -+ -+use *; -+ -+pub enum CONF_METHOD {} -+ -+pub const GEN_OTHERNAME: c_int = 0; -+pub const GEN_EMAIL: c_int = 1; -+pub const GEN_DNS: c_int = 2; -+pub const GEN_X400: c_int = 3; -+pub const GEN_DIRNAME: c_int = 4; -+pub const GEN_EDIPARTY: c_int = 5; -+pub const GEN_URI: c_int = 6; -+pub const GEN_IPADD: c_int = 7; -+pub const GEN_RID: c_int = 8; -+ -+#[repr(C)] -+pub struct GENERAL_NAME { -+ pub type_: c_int, -+ // FIXME should be a union -+ pub d: *mut c_void, -+} -+ -+stack!(stack_st_GENERAL_NAME); -+ -+extern "C" { -+ pub fn GENERAL_NAME_free(name: *mut GENERAL_NAME); -+} -+ -+#[cfg(any(ossl102, libressl261))] -+pub const X509_CHECK_FLAG_ALWAYS_CHECK_SUBJECT: c_uint = 0x1; -+#[cfg(any(ossl102, libressl261))] -+pub const X509_CHECK_FLAG_NO_WILDCARDS: c_uint = 0x2; -+#[cfg(any(ossl102, libressl261))] -+pub const X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS: c_uint = 0x4; -+#[cfg(any(ossl102, libressl261))] -+pub const X509_CHECK_FLAG_MULTI_LABEL_WILDCARDS: c_uint = 0x8; -+#[cfg(any(ossl102, libressl261))] -+pub const X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS: c_uint = 0x10; -+#[cfg(ossl110)] -+pub const X509_CHECK_FLAG_NEVER_CHECK_SUBJECT: c_uint = 0x20; -+ -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ extern "C" { -+ pub fn X509V3_EXT_nconf_nid( -+ conf: *mut CONF, -+ ctx: *mut X509V3_CTX, -+ ext_nid: c_int, -+ value: *const c_char, -+ ) -> *mut X509_EXTENSION; -+ pub fn X509V3_EXT_nconf( -+ conf: *mut CONF, -+ ctx: *mut X509V3_CTX, -+ name: *const c_char, -+ value: *const c_char, -+ ) -> *mut X509_EXTENSION; -+ } -+ } else { -+ extern "C" { -+ pub fn X509V3_EXT_nconf_nid( -+ conf: *mut CONF, -+ ctx: *mut X509V3_CTX, -+ ext_nid: c_int, -+ value: *mut c_char, -+ ) -> *mut X509_EXTENSION; -+ pub fn X509V3_EXT_nconf( -+ conf: *mut CONF, -+ ctx: *mut X509V3_CTX, -+ name: *mut c_char, -+ value: *mut c_char, -+ ) -> *mut X509_EXTENSION; -+ } -+ } -+} -+ -+extern "C" { -+ pub fn X509_check_issued(issuer: *mut X509, subject: *mut X509) -> c_int; -+ -+ pub fn X509V3_set_nconf(ctx: *mut X509V3_CTX, conf: *mut CONF); -+ -+ pub fn X509V3_set_ctx( -+ ctx: *mut X509V3_CTX, -+ issuer: *mut X509, -+ subject: *mut X509, -+ req: *mut X509_REQ, -+ crl: *mut X509_CRL, -+ flags: c_int, -+ ); -+ -+ pub fn X509_get1_ocsp(x: *mut X509) -> *mut stack_st_OPENSSL_STRING; -+} diff --git a/lang/rust/files/patch-src_vendor_openssl_build.rs b/lang/rust/files/patch-src_vendor_openssl_build.rs deleted file mode 100644 index 7091007ea24..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl_build.rs +++ /dev/null @@ -1,12 +0,0 @@ ---- src/vendor/openssl/build.rs.orig 2018-09-11 04:49:47 UTC -+++ src/vendor/openssl/build.rs -@@ -49,5 +49,9 @@ fn main() { - if version >= 0x2_07_03_00_0 { - println!("cargo:rustc-cfg=libressl273"); - } -+ -+ if version >= 0x2_08_00_00_0 { -+ println!("cargo:rustc-cfg=libressl280"); -+ } - } - } diff --git a/lang/rust/files/patch-src_vendor_openssl_src_ssl_callbacks.rs b/lang/rust/files/patch-src_vendor_openssl_src_ssl_callbacks.rs deleted file mode 100644 index a62ca889345..00000000000 --- a/lang/rust/files/patch-src_vendor_openssl_src_ssl_callbacks.rs +++ /dev/null @@ -1,39 +0,0 @@ ---- src/vendor/openssl/src/ssl/callbacks.rs.orig 2018-09-11 04:49:47 UTC -+++ src/vendor/openssl/src/ssl/callbacks.rs -@@ -381,10 +381,13 @@ pub unsafe extern "C" fn raw_remove_session( - callback(ctx, session) - } - --#[cfg(ossl110)] --type DataPtr = *const c_uchar; --#[cfg(not(ossl110))] --type DataPtr = *mut c_uchar; -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ type DataPtr = *const c_uchar; -+ } else { -+ type DataPtr = *mut c_uchar; -+ } -+} - - pub unsafe extern "C" fn raw_get_session( - ssl: *mut ffi::SSL, -@@ -505,11 +508,13 @@ where - } - } - --#[cfg(ossl110)] --type CookiePtr = *const c_uchar; -- --#[cfg(not(ossl110))] --type CookiePtr = *mut c_uchar; -+cfg_if! { -+ if #[cfg(any(ossl110, libressl280))] { -+ type CookiePtr = *const c_uchar; -+ } else { -+ type CookiePtr = *mut c_uchar; -+ } -+} - - pub extern "C" fn raw_cookie_verify( - ssl: *mut ffi::SSL, diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index f63cb392576..a77652bec90 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -7,7 +7,7 @@ # [1] x11-wm/stumpwm PORTNAME= sbcl -DISTVERSION= 1.4.13 +DISTVERSION= 1.4.14 DISTVERSIONSUFFIX= -source PORTEPOCH= 1 CATEGORIES= lang lisp diff --git a/lang/sbcl/distinfo b/lang/sbcl/distinfo index d17f531114f..c0235883c14 100644 --- a/lang/sbcl/distinfo +++ b/lang/sbcl/distinfo @@ -1,8 +1,8 @@ -TIMESTAMP = 1541185784 -SHA256 (sbcl-1.4.13-source.tar.bz2) = 75bfef4e2eba160cf0242b6adcd1380d2c525becc8512ce999f49881beb51988 -SIZE (sbcl-1.4.13-source.tar.bz2) = 6172361 -SHA256 (sbcl-1.4.13-documentation-html.tar.bz2) = 6c32b6f0097f30d4eea22528c965de80d764175dd91d496ed1803d53706a1234 -SIZE (sbcl-1.4.13-documentation-html.tar.bz2) = 228271 +TIMESTAMP = 1544118704 +SHA256 (sbcl-1.4.14-source.tar.bz2) = 4df26ed44d45580ceecbf9e1a6e9e4095de73c7699c6b945bbe8cc8710301c2c +SIZE (sbcl-1.4.14-source.tar.bz2) = 6187821 +SHA256 (sbcl-1.4.14-documentation-html.tar.bz2) = 7d4712b9d2305812830215a02cbc99ae02f0107bf1a13548ffab2e9b2132a9d4 +SIZE (sbcl-1.4.14-documentation-html.tar.bz2) = 228319 SHA256 (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = c61f5e777e56921d2452d0fa6b71024ccd9b99bc659676498d398b8663176492 SIZE (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = 10463348 SHA256 (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = cf68bfab780a14964d9593f5b47fa3e174cf43e95ae3e558712d218f1c37bdbe diff --git a/mail/dracmail/Makefile b/mail/dracmail/Makefile index 95a11ea58bf..fe1f55ea01b 100644 --- a/mail/dracmail/Makefile +++ b/mail/dracmail/Makefile @@ -14,7 +14,7 @@ COMMENT= DracMail is a webmail interface built using PHP DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USE_PHP+= mysql imap dom tidy iconv mbstring USE_MYSQL= yes NO_BUILD= yes diff --git a/mail/pecl-mailparse2/Makefile b/mail/pecl-mailparse2/Makefile index 914b16ea1af..f5d8732ebfa 100644 --- a/mail/pecl-mailparse2/Makefile +++ b/mail/pecl-mailparse2/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP202 USES= php:pecl USE_PHP= mbstring:build -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 PORTSCOUT= limit:^2.* diff --git a/mail/pecl-pop3/Makefile b/mail/pecl-pop3/Makefile index f06114bbe10..f97e49648aa 100644 --- a/mail/pecl-pop3/Makefile +++ b/mail/pecl-pop3/Makefile @@ -13,6 +13,6 @@ DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/mail/php71-imap/Makefile b/mail/php71-imap/Makefile index 076bb217f5a..7c56e35e986 100644 --- a/mail/php71-imap/Makefile +++ b/mail/php71-imap/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ CATEGORIES= mail -PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php71 diff --git a/mail/php71-imap/files/patch-php__imap.c b/mail/php71-imap/files/patch-php__imap.c deleted file mode 100644 index faa12adafa1..00000000000 --- a/mail/php71-imap/files/patch-php__imap.c +++ /dev/null @@ -1,40 +0,0 @@ ---- php_imap.c.orig 2018-09-11 22:12:36 UTC -+++ php_imap.c -@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] - }; - /* }}} */ - -+ -+/* {{{ PHP_INI -+ */ -+PHP_INI_BEGIN() -+STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) -+PHP_INI_END() -+/* }}} */ -+ -+ - /* {{{ imap_module_entry - */ - zend_module_entry imap_module_entry = { -@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) - { - unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; - -+ REGISTER_INI_ENTRIES(); -+ - #ifndef PHP_WIN32 - mail_link(&unixdriver); /* link in the unix driver */ - mail_link(&mhdriver); /* link in the mh driver */ -@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) - GC_TEXTS texts - */ - -+ if (!IMAPG(enable_rsh)) { -+ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ -+ mail_parameters (NIL, SET_RSHTIMEOUT, 0); -+ mail_parameters (NIL, SET_SSHTIMEOUT, 0); -+ } -+ - le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); - return SUCCESS; - } diff --git a/mail/php71-imap/files/patch-php__imap.h b/mail/php71-imap/files/patch-php__imap.h deleted file mode 100644 index f27f888f2ee..00000000000 --- a/mail/php71-imap/files/patch-php__imap.h +++ /dev/null @@ -1,10 +0,0 @@ ---- php_imap.h.orig 2018-09-11 22:12:36 UTC -+++ php_imap.h -@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) - #endif - /* php_stream for php_mail_gets() */ - php_stream *gets_stream; -+ zend_bool enable_rsh; - ZEND_END_MODULE_GLOBALS(imap) - - #ifdef ZTS diff --git a/mail/php72-imap/Makefile b/mail/php72-imap/Makefile index 8391b4ca8c1..0d9e7835f44 100644 --- a/mail/php72-imap/Makefile +++ b/mail/php72-imap/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ CATEGORIES= mail -PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php72 diff --git a/mail/php72-imap/files/patch-php__imap.c b/mail/php72-imap/files/patch-php__imap.c deleted file mode 100644 index faa12adafa1..00000000000 --- a/mail/php72-imap/files/patch-php__imap.c +++ /dev/null @@ -1,40 +0,0 @@ ---- php_imap.c.orig 2018-09-11 22:12:36 UTC -+++ php_imap.c -@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] - }; - /* }}} */ - -+ -+/* {{{ PHP_INI -+ */ -+PHP_INI_BEGIN() -+STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) -+PHP_INI_END() -+/* }}} */ -+ -+ - /* {{{ imap_module_entry - */ - zend_module_entry imap_module_entry = { -@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) - { - unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; - -+ REGISTER_INI_ENTRIES(); -+ - #ifndef PHP_WIN32 - mail_link(&unixdriver); /* link in the unix driver */ - mail_link(&mhdriver); /* link in the mh driver */ -@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) - GC_TEXTS texts - */ - -+ if (!IMAPG(enable_rsh)) { -+ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ -+ mail_parameters (NIL, SET_RSHTIMEOUT, 0); -+ mail_parameters (NIL, SET_SSHTIMEOUT, 0); -+ } -+ - le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); - return SUCCESS; - } diff --git a/mail/php72-imap/files/patch-php__imap.h b/mail/php72-imap/files/patch-php__imap.h deleted file mode 100644 index f27f888f2ee..00000000000 --- a/mail/php72-imap/files/patch-php__imap.h +++ /dev/null @@ -1,10 +0,0 @@ ---- php_imap.h.orig 2018-09-11 22:12:36 UTC -+++ php_imap.h -@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) - #endif - /* php_stream for php_mail_gets() */ - php_stream *gets_stream; -+ zend_bool enable_rsh; - ZEND_END_MODULE_GLOBALS(imap) - - #ifdef ZTS diff --git a/mail/php73-imap/files/patch-php__imap.c b/mail/php73-imap/files/patch-php__imap.c deleted file mode 100644 index faa12adafa1..00000000000 --- a/mail/php73-imap/files/patch-php__imap.c +++ /dev/null @@ -1,40 +0,0 @@ ---- php_imap.c.orig 2018-09-11 22:12:36 UTC -+++ php_imap.c -@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] - }; - /* }}} */ - -+ -+/* {{{ PHP_INI -+ */ -+PHP_INI_BEGIN() -+STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) -+PHP_INI_END() -+/* }}} */ -+ -+ - /* {{{ imap_module_entry - */ - zend_module_entry imap_module_entry = { -@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) - { - unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; - -+ REGISTER_INI_ENTRIES(); -+ - #ifndef PHP_WIN32 - mail_link(&unixdriver); /* link in the unix driver */ - mail_link(&mhdriver); /* link in the mh driver */ -@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) - GC_TEXTS texts - */ - -+ if (!IMAPG(enable_rsh)) { -+ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ -+ mail_parameters (NIL, SET_RSHTIMEOUT, 0); -+ mail_parameters (NIL, SET_SSHTIMEOUT, 0); -+ } -+ - le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); - return SUCCESS; - } diff --git a/mail/php73-imap/files/patch-php__imap.h b/mail/php73-imap/files/patch-php__imap.h deleted file mode 100644 index f27f888f2ee..00000000000 --- a/mail/php73-imap/files/patch-php__imap.h +++ /dev/null @@ -1,10 +0,0 @@ ---- php_imap.h.orig 2018-09-11 22:12:36 UTC -+++ php_imap.h -@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) - #endif - /* php_stream for php_mail_gets() */ - php_stream *gets_stream; -+ zend_bool enable_rsh; - ZEND_END_MODULE_GLOBALS(imap) - - #ifdef ZTS diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index 1e55b9fe9d4..94dc3ea2841 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= thunderbird-i18n -PORTVERSION= 60.3.2 +PORTVERSION= 60.3.3 CATEGORIES= mail news net-im MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-x86_64/xpi \ MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build2/linux-x86_64/xpi diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo index f4eab4adf77..6b87605974e 100644 --- a/mail/thunderbird-i18n/distinfo +++ b/mail/thunderbird-i18n/distinfo @@ -1,117 +1,117 @@ -TIMESTAMP = 1543595237 -SHA256 (xpi/thunderbird-i18n-60.3.2/ar.xpi) = 896ccd179ffc31870278bbddf5b2b5f864b6221217f7797d03c4d46a421285ee -SIZE (xpi/thunderbird-i18n-60.3.2/ar.xpi) = 627181 -SHA256 (xpi/thunderbird-i18n-60.3.2/ast.xpi) = a15c63913ae33e37b23c82e34eeb5bbfebd5e678ab96b55491c47956d3811c8d -SIZE (xpi/thunderbird-i18n-60.3.2/ast.xpi) = 560867 -SHA256 (xpi/thunderbird-i18n-60.3.2/be.xpi) = efd7215faac5a16ab3850a5f62e99d9a181b255e8d6f8ccbc6e423ce788dc5b4 -SIZE (xpi/thunderbird-i18n-60.3.2/be.xpi) = 659079 -SHA256 (xpi/thunderbird-i18n-60.3.2/bg.xpi) = fb156ed7e5a7293aa7890bb389945c88e18049bd030c8dcd5e4b0388603a5817 -SIZE (xpi/thunderbird-i18n-60.3.2/bg.xpi) = 665510 -SHA256 (xpi/thunderbird-i18n-60.3.2/br.xpi) = d48621064c77d1249254221e1f0ebc1fcd2fde1703ce5ee76b5d3dee84481826 -SIZE (xpi/thunderbird-i18n-60.3.2/br.xpi) = 581592 -SHA256 (xpi/thunderbird-i18n-60.3.2/ca.xpi) = 6dcac998cf49f56ef2e73b4d15bec5b8bbcd3d1e6a0b275ed638ad24b9150c45 -SIZE (xpi/thunderbird-i18n-60.3.2/ca.xpi) = 591970 -SHA256 (xpi/thunderbird-i18n-60.3.2/cs.xpi) = 3a0e18b00047ebd954aa43d1adf8281e78a75cd82bc7a7c3af98cfc451882e38 -SIZE (xpi/thunderbird-i18n-60.3.2/cs.xpi) = 611201 -SHA256 (xpi/thunderbird-i18n-60.3.2/cy.xpi) = 66efb0bb78d918064fbc1e29910a18c38cd08f44d8f9e706583262bafd09e5f4 -SIZE (xpi/thunderbird-i18n-60.3.2/cy.xpi) = 582233 -SHA256 (xpi/thunderbird-i18n-60.3.2/da.xpi) = ef5c7f145464ff34ef3369d642d6fec09ca1eaf5ccc23f8139b712de9b0eaaee -SIZE (xpi/thunderbird-i18n-60.3.2/da.xpi) = 570805 -SHA256 (xpi/thunderbird-i18n-60.3.2/de.xpi) = 0b82a5f259c5221ff598b54596182a5976f838cafb7b47574106e14e32cb4b34 -SIZE (xpi/thunderbird-i18n-60.3.2/de.xpi) = 582573 -SHA256 (xpi/thunderbird-i18n-60.3.2/dsb.xpi) = 0ec5a996cc91fef198484640ddb8f5995b9f9008164e7b07583eee89f1ae79b9 -SIZE (xpi/thunderbird-i18n-60.3.2/dsb.xpi) = 613758 -SHA256 (xpi/thunderbird-i18n-60.3.2/el.xpi) = 4d3d3509a14b766ec8752bac80c7e81cc927f3084539b2b55589046cb1805fe9 -SIZE (xpi/thunderbird-i18n-60.3.2/el.xpi) = 691053 -SHA256 (xpi/thunderbird-i18n-60.3.2/en-GB.xpi) = 9b8a6c31b85c07a7ab557c39e830564bead8b9403956e7e05aaf2e5b36d2e69a -SIZE (xpi/thunderbird-i18n-60.3.2/en-GB.xpi) = 550354 -SHA256 (xpi/thunderbird-i18n-60.3.2/en-US.xpi) = d944098b1fc308afe030be228f5d92e55fefdd92845924a327d795a349e701db -SIZE (xpi/thunderbird-i18n-60.3.2/en-US.xpi) = 546992 -SHA256 (xpi/thunderbird-i18n-60.3.2/es-AR.xpi) = 680f0cb343636792b7ad5dd0985bee6b210249890834b5f82288663f72401a96 -SIZE (xpi/thunderbird-i18n-60.3.2/es-AR.xpi) = 595048 -SHA256 (xpi/thunderbird-i18n-60.3.2/es-ES.xpi) = 3f0fb2afb8e3f32e788c01e57d86c3362128151b8d548b8fcdd4cfe89dee080f -SIZE (xpi/thunderbird-i18n-60.3.2/es-ES.xpi) = 492211 -SHA256 (xpi/thunderbird-i18n-60.3.2/et.xpi) = 8feef17eca060e0881714f5db7b408d5fd7b517d9f9d8af22543e27928510b66 -SIZE (xpi/thunderbird-i18n-60.3.2/et.xpi) = 570866 -SHA256 (xpi/thunderbird-i18n-60.3.2/eu.xpi) = 9cb7c0d3aa33e3ea330d7f08893fd0fa95dc53057239b1943fb1d24b1652ce08 -SIZE (xpi/thunderbird-i18n-60.3.2/eu.xpi) = 577579 -SHA256 (xpi/thunderbird-i18n-60.3.2/fi.xpi) = d55467b9b03acff4294a1351b87fd78fa8284aa6fae3660986fa8d8307b5ad7b -SIZE (xpi/thunderbird-i18n-60.3.2/fi.xpi) = 575754 -SHA256 (xpi/thunderbird-i18n-60.3.2/fr.xpi) = fb863da3f5df78c5ba2bfce66eba0913c264be099d2e5e6e3fc3778bdc4d35d0 -SIZE (xpi/thunderbird-i18n-60.3.2/fr.xpi) = 608465 -SHA256 (xpi/thunderbird-i18n-60.3.2/fy-NL.xpi) = 40a24810462d4e2ff5989bbceaf48b1e201241557205ad71fa47bc3addc02d50 -SIZE (xpi/thunderbird-i18n-60.3.2/fy-NL.xpi) = 590032 -SHA256 (xpi/thunderbird-i18n-60.3.2/ga-IE.xpi) = 9badfdeaba5dd67c9572528c151b794f9d54e2173bf4826d81fa7e77ac4183cc -SIZE (xpi/thunderbird-i18n-60.3.2/ga-IE.xpi) = 603506 -SHA256 (xpi/thunderbird-i18n-60.3.2/gd.xpi) = e574f9951d8c1c15cb35b5b6c69bf15e83f64fac08c1e6465c38752efa0d3ac1 -SIZE (xpi/thunderbird-i18n-60.3.2/gd.xpi) = 599261 -SHA256 (xpi/thunderbird-i18n-60.3.2/gl.xpi) = 3c84cd675587362860143add3e3ca181ff41374cbc427da78d9bfbcd1d5da64a -SIZE (xpi/thunderbird-i18n-60.3.2/gl.xpi) = 576547 -SHA256 (xpi/thunderbird-i18n-60.3.2/he.xpi) = d2d31d39d83844897916c9bea32a7f256b7d017c4a776b14843d659ee69b0c06 -SIZE (xpi/thunderbird-i18n-60.3.2/he.xpi) = 618365 -SHA256 (xpi/thunderbird-i18n-60.3.2/hr.xpi) = 75b24f3c92a85f338d2db0322273b499a6b62e3fddff5f0babbf72b847fd1f7c -SIZE (xpi/thunderbird-i18n-60.3.2/hr.xpi) = 583460 -SHA256 (xpi/thunderbird-i18n-60.3.2/hsb.xpi) = cb4170a092f9f217ae44cee870c0a3e44e7455ffd742e3a1235ccc362d59640f -SIZE (xpi/thunderbird-i18n-60.3.2/hsb.xpi) = 611322 -SHA256 (xpi/thunderbird-i18n-60.3.2/hu.xpi) = cece1242d515fc7fc47a6e5f6b5c89307fd4bea97df7c9d137ea0617b377ee9f -SIZE (xpi/thunderbird-i18n-60.3.2/hu.xpi) = 615346 -SHA256 (xpi/thunderbird-i18n-60.3.2/hy-AM.xpi) = bf5da18439d4cb8ac3dfa0f59bb03b240ef19cdbcb6beef13332abbdba4ce03e -SIZE (xpi/thunderbird-i18n-60.3.2/hy-AM.xpi) = 649713 -SHA256 (xpi/thunderbird-i18n-60.3.2/id.xpi) = 0febf39ccf273fd6f058a6f03a8552cceaa1fe7d08023711b33cd7c633e676ab -SIZE (xpi/thunderbird-i18n-60.3.2/id.xpi) = 568859 -SHA256 (xpi/thunderbird-i18n-60.3.2/is.xpi) = 5053d2939bb0f86173b80ff9ff74c5e5e2e5367bf24c76c61f6b658149e7a9f0 -SIZE (xpi/thunderbird-i18n-60.3.2/is.xpi) = 579047 -SHA256 (xpi/thunderbird-i18n-60.3.2/it.xpi) = 0a7dc4e7f634a62a4391636a9bfb22c6cda0d9ade5d82131b76ec9e96b01fb45 -SIZE (xpi/thunderbird-i18n-60.3.2/it.xpi) = 477500 -SHA256 (xpi/thunderbird-i18n-60.3.2/ja.xpi) = e185eca692668bdc601ebabb11dce7db3a33a4a58021c41eb3999b21f698bef9 -SIZE (xpi/thunderbird-i18n-60.3.2/ja.xpi) = 653342 -SHA256 (xpi/thunderbird-i18n-60.3.2/kab.xpi) = 0c8943441ef6a3b844da8c5abea6fbdea36d21208a9635a42611e508be3f3180 -SIZE (xpi/thunderbird-i18n-60.3.2/kab.xpi) = 595240 -SHA256 (xpi/thunderbird-i18n-60.3.2/kk.xpi) = 01af6cb381a1daf829c8d8a526cac89985562d46cecc2ee01b542d860ab577e2 -SIZE (xpi/thunderbird-i18n-60.3.2/kk.xpi) = 670449 -SHA256 (xpi/thunderbird-i18n-60.3.2/ko.xpi) = 02e0824a69a622aa4333091c8d924ca53a607888c9fb595326f2fabc1806cfe8 -SIZE (xpi/thunderbird-i18n-60.3.2/ko.xpi) = 619730 -SHA256 (xpi/thunderbird-i18n-60.3.2/lt.xpi) = aea0101281103581b7e0a8d46a4bd1e50093039561c58f53bf5fab0360163831 -SIZE (xpi/thunderbird-i18n-60.3.2/lt.xpi) = 605440 -SHA256 (xpi/thunderbird-i18n-60.3.2/ms.xpi) = 3d7f0734f99ad8490176625f643ef562821fd1c19ffb06a33a93d6fd964e16d2 -SIZE (xpi/thunderbird-i18n-60.3.2/ms.xpi) = 574306 -SHA256 (xpi/thunderbird-i18n-60.3.2/nb-NO.xpi) = a2c8c7c6c29349454e334e543d13715f68cf8ca2586c7654768c9d09daaa2d85 -SIZE (xpi/thunderbird-i18n-60.3.2/nb-NO.xpi) = 578234 -SHA256 (xpi/thunderbird-i18n-60.3.2/nl.xpi) = d3dd7bee644f5aaa0d4bc3ec46d2f78311641033fdebd21b8faa357039034aed -SIZE (xpi/thunderbird-i18n-60.3.2/nl.xpi) = 583913 -SHA256 (xpi/thunderbird-i18n-60.3.2/nn-NO.xpi) = c62de778e8157f31df813de37c10220180fab311024e499ef5756e13545bd49d -SIZE (xpi/thunderbird-i18n-60.3.2/nn-NO.xpi) = 577653 -SHA256 (xpi/thunderbird-i18n-60.3.2/pl.xpi) = 8e5163efdb0a57e3ff48035cf0f4359421b5b36d1bb7fc7761966a432e448229 -SIZE (xpi/thunderbird-i18n-60.3.2/pl.xpi) = 480724 -SHA256 (xpi/thunderbird-i18n-60.3.2/pt-BR.xpi) = 02830c38d254f94af99e396579ac3674467e187435995c82f17f4ed0227a8a44 -SIZE (xpi/thunderbird-i18n-60.3.2/pt-BR.xpi) = 585017 -SHA256 (xpi/thunderbird-i18n-60.3.2/pt-PT.xpi) = 302312859a31cce43461535fdacc8ff15fb14cac222c17cd9810f8cefc72b48b -SIZE (xpi/thunderbird-i18n-60.3.2/pt-PT.xpi) = 593185 -SHA256 (xpi/thunderbird-i18n-60.3.2/rm.xpi) = 98d92dbcde288e5fe71d055436119a401eef8b9de4716bcaeefa26a4250f5b34 -SIZE (xpi/thunderbird-i18n-60.3.2/rm.xpi) = 578384 -SHA256 (xpi/thunderbird-i18n-60.3.2/ro.xpi) = 2a1fbe420f9645ba4e98a01bd404282233319fdfc725092d3fc862534d29605b -SIZE (xpi/thunderbird-i18n-60.3.2/ro.xpi) = 584308 -SHA256 (xpi/thunderbird-i18n-60.3.2/ru.xpi) = 8bcfa90ceecafb4ae7c1404c6c26faa89cf00a327a6f7021921769de6e4ab8ff -SIZE (xpi/thunderbird-i18n-60.3.2/ru.xpi) = 694704 -SHA256 (xpi/thunderbird-i18n-60.3.2/si.xpi) = 524e41a67aefc4c976dae2c03ce8e06b562e8f10c6bd61adf430021116924bef -SIZE (xpi/thunderbird-i18n-60.3.2/si.xpi) = 643790 -SHA256 (xpi/thunderbird-i18n-60.3.2/sk.xpi) = 9b09cedd853ae2ce29e56b8b97ef39dd478c1135b9026352b5b5b1a1d4d5bd17 -SIZE (xpi/thunderbird-i18n-60.3.2/sk.xpi) = 612216 -SHA256 (xpi/thunderbird-i18n-60.3.2/sl.xpi) = bcaecc9ce702621cace0d8e8fb8ebfecc1030f050ee393fd1327dd222e804200 -SIZE (xpi/thunderbird-i18n-60.3.2/sl.xpi) = 589947 -SHA256 (xpi/thunderbird-i18n-60.3.2/sq.xpi) = 6b630debf2eee308d0b5b57e67560c83118cd2e7bf147ee3a1862eec3f49a330 -SIZE (xpi/thunderbird-i18n-60.3.2/sq.xpi) = 593094 -SHA256 (xpi/thunderbird-i18n-60.3.2/sr.xpi) = 4eb841cc41d04751fa85affdf572235dc118a8df5d69091bb43af8b3cd203434 -SIZE (xpi/thunderbird-i18n-60.3.2/sr.xpi) = 637719 -SHA256 (xpi/thunderbird-i18n-60.3.2/sv-SE.xpi) = 5ad20a801c60f9bf0104f938f21ea3fb888cbc4396cae4c3f65b27010bad2929 -SIZE (xpi/thunderbird-i18n-60.3.2/sv-SE.xpi) = 594078 -SHA256 (xpi/thunderbird-i18n-60.3.2/tr.xpi) = 439c7dd3b5342228fd674738c7442b0e5cce73c713536314cd32efb86d3b06f6 -SIZE (xpi/thunderbird-i18n-60.3.2/tr.xpi) = 598010 -SHA256 (xpi/thunderbird-i18n-60.3.2/uk.xpi) = 5cf38caf8af6208da4b2e6c788f6df1135e258831401117a928efa6023256415 -SIZE (xpi/thunderbird-i18n-60.3.2/uk.xpi) = 684153 -SHA256 (xpi/thunderbird-i18n-60.3.2/vi.xpi) = 210600636b1982a02a0374a4d1a846ab7698587e656526df80d17dd344941761 -SIZE (xpi/thunderbird-i18n-60.3.2/vi.xpi) = 638421 -SHA256 (xpi/thunderbird-i18n-60.3.2/zh-CN.xpi) = b6dd3b6c188742e6541c7800d23b1500680f98bf1995897a87d77e22abafe955 -SIZE (xpi/thunderbird-i18n-60.3.2/zh-CN.xpi) = 622466 -SHA256 (xpi/thunderbird-i18n-60.3.2/zh-TW.xpi) = 96c538ba06202c3d72c809367c245fb43eeca68a3551fc024f2ce01e1542b998 -SIZE (xpi/thunderbird-i18n-60.3.2/zh-TW.xpi) = 626189 +TIMESTAMP = 1544045169 +SHA256 (xpi/thunderbird-i18n-60.3.3/ar.xpi) = cbbd8e88f224986885968b8cf1bc793ef797a4ad67699897f1241c505aa1468a +SIZE (xpi/thunderbird-i18n-60.3.3/ar.xpi) = 627181 +SHA256 (xpi/thunderbird-i18n-60.3.3/ast.xpi) = 3ff5b95378b67f9656c1b8899c4091187cc6d9aaecee04f6b960b02e544caeb6 +SIZE (xpi/thunderbird-i18n-60.3.3/ast.xpi) = 560866 +SHA256 (xpi/thunderbird-i18n-60.3.3/be.xpi) = 103e49abd506638fed88dec6690f003bd247f6b6eceb0b672e8eec67a5c46aa5 +SIZE (xpi/thunderbird-i18n-60.3.3/be.xpi) = 659079 +SHA256 (xpi/thunderbird-i18n-60.3.3/bg.xpi) = 082f936c6705f4b6a30da095df6a06738afeac89b8d2486486b230bfa486c8f1 +SIZE (xpi/thunderbird-i18n-60.3.3/bg.xpi) = 665511 +SHA256 (xpi/thunderbird-i18n-60.3.3/br.xpi) = 3d978b5ad1e10d3d06048f063da6f171d2e2fcf702ae503fe95e27975449cf5a +SIZE (xpi/thunderbird-i18n-60.3.3/br.xpi) = 581592 +SHA256 (xpi/thunderbird-i18n-60.3.3/ca.xpi) = 020ac3d2f842b25004fbfcd8630d6183952a8d40b86a710796edf4b6699b6a92 +SIZE (xpi/thunderbird-i18n-60.3.3/ca.xpi) = 591970 +SHA256 (xpi/thunderbird-i18n-60.3.3/cs.xpi) = 442cfaa3f6e383f7c8ca4009c2f4e1830bcef20ec43b238515ed4e09c0a451d4 +SIZE (xpi/thunderbird-i18n-60.3.3/cs.xpi) = 611200 +SHA256 (xpi/thunderbird-i18n-60.3.3/cy.xpi) = bdb5e8d63168d04a4f12f4884f60bd6bdf6dfae380b180d554721557928e7517 +SIZE (xpi/thunderbird-i18n-60.3.3/cy.xpi) = 582232 +SHA256 (xpi/thunderbird-i18n-60.3.3/da.xpi) = 17c3f150de5259fb21e87e9857cb461ee772628162d2674a2c8a59a7c80a50b7 +SIZE (xpi/thunderbird-i18n-60.3.3/da.xpi) = 570806 +SHA256 (xpi/thunderbird-i18n-60.3.3/de.xpi) = ff3d45f0c7d3becc230a0b6ee76d3e27c13aca92bc66c1378f727310fd645920 +SIZE (xpi/thunderbird-i18n-60.3.3/de.xpi) = 582574 +SHA256 (xpi/thunderbird-i18n-60.3.3/dsb.xpi) = a467431c12de694b71d95c9ff6c9bf1a1870378ad33419d04301ba3ea5eb6e4f +SIZE (xpi/thunderbird-i18n-60.3.3/dsb.xpi) = 613757 +SHA256 (xpi/thunderbird-i18n-60.3.3/el.xpi) = 392b81ae56bd67c29a8fdb89e55ab2a60bf28b63e80b7f0ddd1a87c199f4df75 +SIZE (xpi/thunderbird-i18n-60.3.3/el.xpi) = 691055 +SHA256 (xpi/thunderbird-i18n-60.3.3/en-GB.xpi) = 9679cfc192615121a095e6d0ab3be40ed797edaa01410a2c090db08cc21aeadb +SIZE (xpi/thunderbird-i18n-60.3.3/en-GB.xpi) = 550355 +SHA256 (xpi/thunderbird-i18n-60.3.3/en-US.xpi) = c2dac5733748ef0eb2b618654c0fdcf83341c305e835d4396e874a8c4c30fb7b +SIZE (xpi/thunderbird-i18n-60.3.3/en-US.xpi) = 546992 +SHA256 (xpi/thunderbird-i18n-60.3.3/es-AR.xpi) = bee46105952f3332ef6985c54c9e5de70b4b8e797f862feb301d7b9d623a9a08 +SIZE (xpi/thunderbird-i18n-60.3.3/es-AR.xpi) = 595046 +SHA256 (xpi/thunderbird-i18n-60.3.3/es-ES.xpi) = e97b955a9b3460e1682f82884bb92781b3f2498c0527047910149dddf11f6609 +SIZE (xpi/thunderbird-i18n-60.3.3/es-ES.xpi) = 492211 +SHA256 (xpi/thunderbird-i18n-60.3.3/et.xpi) = dfbdb5fed59436ba6a23c088740e5d4b1f5da559c6073e0858a864180889c445 +SIZE (xpi/thunderbird-i18n-60.3.3/et.xpi) = 570866 +SHA256 (xpi/thunderbird-i18n-60.3.3/eu.xpi) = fc46b25891048e574ef7ab404311b6d0f0477b7a45b7fa9b46a48698b5ee7e9f +SIZE (xpi/thunderbird-i18n-60.3.3/eu.xpi) = 577578 +SHA256 (xpi/thunderbird-i18n-60.3.3/fi.xpi) = 4a2cdbb9ab6755eb436cfc06a34c337f14c3fae8a683b4d620e653790ba469be +SIZE (xpi/thunderbird-i18n-60.3.3/fi.xpi) = 575754 +SHA256 (xpi/thunderbird-i18n-60.3.3/fr.xpi) = cb7219aad7fa58c41937bcca25ac72637ab92c7d26de94baf13e64c44feed1f4 +SIZE (xpi/thunderbird-i18n-60.3.3/fr.xpi) = 608466 +SHA256 (xpi/thunderbird-i18n-60.3.3/fy-NL.xpi) = ff98e6d94e2022adbf36d71d91ea5036db0efbbd2dab2dd10a0c960020f0aa01 +SIZE (xpi/thunderbird-i18n-60.3.3/fy-NL.xpi) = 590033 +SHA256 (xpi/thunderbird-i18n-60.3.3/ga-IE.xpi) = c56efc8397f8cc9b75ee8cbd7e367cf2002b88faa5afd8d3ef55f1416da0bfa7 +SIZE (xpi/thunderbird-i18n-60.3.3/ga-IE.xpi) = 603505 +SHA256 (xpi/thunderbird-i18n-60.3.3/gd.xpi) = 9890671efe348d1623da1916830a8aea8f318318d46c154fb098ad25e4e5d56f +SIZE (xpi/thunderbird-i18n-60.3.3/gd.xpi) = 599261 +SHA256 (xpi/thunderbird-i18n-60.3.3/gl.xpi) = 9ce8698f74ef45d5232063459d5fef1a5ef3329d01f014a9b1d5137b52990b67 +SIZE (xpi/thunderbird-i18n-60.3.3/gl.xpi) = 576546 +SHA256 (xpi/thunderbird-i18n-60.3.3/he.xpi) = e899e3ba40ab38d41090648b595dfcadbe80546f74dd8c0704de8f9be6a5b826 +SIZE (xpi/thunderbird-i18n-60.3.3/he.xpi) = 618364 +SHA256 (xpi/thunderbird-i18n-60.3.3/hr.xpi) = 0522e6533f372836cdedcd8cc41ff2e274d0da77be7f2d6de4e9b685dcefa569 +SIZE (xpi/thunderbird-i18n-60.3.3/hr.xpi) = 583460 +SHA256 (xpi/thunderbird-i18n-60.3.3/hsb.xpi) = 11bd61c42aa486f50ae6df6e064fc658816f1de71ebfa430451c6c4acbe49828 +SIZE (xpi/thunderbird-i18n-60.3.3/hsb.xpi) = 611321 +SHA256 (xpi/thunderbird-i18n-60.3.3/hu.xpi) = a8687a7e38bac986da6320ec658526a6687e4f0f7f4fe0d57e5395a3dc4240e2 +SIZE (xpi/thunderbird-i18n-60.3.3/hu.xpi) = 615346 +SHA256 (xpi/thunderbird-i18n-60.3.3/hy-AM.xpi) = 2810a28a88c7b3949f598d9b4f4f0bf5bc0641433d5a92afc93b383e711d8b7a +SIZE (xpi/thunderbird-i18n-60.3.3/hy-AM.xpi) = 649712 +SHA256 (xpi/thunderbird-i18n-60.3.3/id.xpi) = e5bf6c97f6f65155c22655d01e4db7538de66bfaf6f6fdb23e7ce2de5c754431 +SIZE (xpi/thunderbird-i18n-60.3.3/id.xpi) = 568860 +SHA256 (xpi/thunderbird-i18n-60.3.3/is.xpi) = f5906bf96ce3cb50b4c01fe5d628f7ceb5836bc2a13bd681cafb1d031416a209 +SIZE (xpi/thunderbird-i18n-60.3.3/is.xpi) = 579047 +SHA256 (xpi/thunderbird-i18n-60.3.3/it.xpi) = 896369dc19aee03ec708eda01ec790def1de6d8e28cae51199132b31b3a82a19 +SIZE (xpi/thunderbird-i18n-60.3.3/it.xpi) = 477499 +SHA256 (xpi/thunderbird-i18n-60.3.3/ja.xpi) = 0b3e7d4592bdc8ab5d98acf5ec8cd889458e5a93d5efa395e92ca20e8ddea387 +SIZE (xpi/thunderbird-i18n-60.3.3/ja.xpi) = 653343 +SHA256 (xpi/thunderbird-i18n-60.3.3/kab.xpi) = 2327e495c7f49e1181a279b2e6694c194480919e329f32db8401c8e59894af4d +SIZE (xpi/thunderbird-i18n-60.3.3/kab.xpi) = 595237 +SHA256 (xpi/thunderbird-i18n-60.3.3/kk.xpi) = 2935dd4b2e57b53b9298fa77b92e429bf3e0706e9c5aee2a95a1c59d58a8ba4d +SIZE (xpi/thunderbird-i18n-60.3.3/kk.xpi) = 670450 +SHA256 (xpi/thunderbird-i18n-60.3.3/ko.xpi) = 2e6fbcd9ebedd14de3529a8b92be3cda1213bdc3d224c15b5131d8a5683e2959 +SIZE (xpi/thunderbird-i18n-60.3.3/ko.xpi) = 619729 +SHA256 (xpi/thunderbird-i18n-60.3.3/lt.xpi) = e85ca7ca5adf2a9d4a7cc18e3332a72145b577b8bb709d03973fd625694b6883 +SIZE (xpi/thunderbird-i18n-60.3.3/lt.xpi) = 605440 +SHA256 (xpi/thunderbird-i18n-60.3.3/ms.xpi) = 41d57d3a8d639bbc3c36bbf1f1d5b58d98640f0bae5afa50fca504a673bd1187 +SIZE (xpi/thunderbird-i18n-60.3.3/ms.xpi) = 574306 +SHA256 (xpi/thunderbird-i18n-60.3.3/nb-NO.xpi) = d3a2c61cca2678696a0f1e51bfb6bd8bc0e8256dbb09423a3a21c1aa620a88a0 +SIZE (xpi/thunderbird-i18n-60.3.3/nb-NO.xpi) = 578233 +SHA256 (xpi/thunderbird-i18n-60.3.3/nl.xpi) = ae7d9b573887887940a0be7ab136e7b4b4b7243c122b6f3db2a3d4e027360150 +SIZE (xpi/thunderbird-i18n-60.3.3/nl.xpi) = 583912 +SHA256 (xpi/thunderbird-i18n-60.3.3/nn-NO.xpi) = 61abdc0fcc8f0ce5c419de517f33f2ee272d622c2f7086e40667858c806c4ba0 +SIZE (xpi/thunderbird-i18n-60.3.3/nn-NO.xpi) = 577654 +SHA256 (xpi/thunderbird-i18n-60.3.3/pl.xpi) = 13bb2e72ffa8570ceabffe94997a732fdbaf8e280397f41c4acecc2c359eeae4 +SIZE (xpi/thunderbird-i18n-60.3.3/pl.xpi) = 480723 +SHA256 (xpi/thunderbird-i18n-60.3.3/pt-BR.xpi) = 6a39b3e58c38c0af3311f0ffd4d311936b81ea6e55506bb822c7d586a2308852 +SIZE (xpi/thunderbird-i18n-60.3.3/pt-BR.xpi) = 585017 +SHA256 (xpi/thunderbird-i18n-60.3.3/pt-PT.xpi) = 0d2c651ccb28d3cc79bac756cf230532252e96ba05b1f960586a1d58b746b92d +SIZE (xpi/thunderbird-i18n-60.3.3/pt-PT.xpi) = 593185 +SHA256 (xpi/thunderbird-i18n-60.3.3/rm.xpi) = a245561bfaf4859bda708267577e0c76cb4f87cf31ddf1cdbd8dadaf650b26d8 +SIZE (xpi/thunderbird-i18n-60.3.3/rm.xpi) = 578383 +SHA256 (xpi/thunderbird-i18n-60.3.3/ro.xpi) = 9e75c25305a31ca9896996602e1a3a6b9fd7834dc5f7faabbf93d7eac88754b0 +SIZE (xpi/thunderbird-i18n-60.3.3/ro.xpi) = 584308 +SHA256 (xpi/thunderbird-i18n-60.3.3/ru.xpi) = a92f1410574a475ecd4deaed8d3f5f671428eb7467cb9d5994b6cac4f757e187 +SIZE (xpi/thunderbird-i18n-60.3.3/ru.xpi) = 694702 +SHA256 (xpi/thunderbird-i18n-60.3.3/si.xpi) = eee5086885c829a204282b6ef778c7efa334e085a39a3d991d625e9340795aec +SIZE (xpi/thunderbird-i18n-60.3.3/si.xpi) = 643789 +SHA256 (xpi/thunderbird-i18n-60.3.3/sk.xpi) = ae242f82d3e0494a5775658bf70c15652a2fee7b21fd7b57d32aecb0487a0732 +SIZE (xpi/thunderbird-i18n-60.3.3/sk.xpi) = 612216 +SHA256 (xpi/thunderbird-i18n-60.3.3/sl.xpi) = 9811ec5569e7bb9fe87e357660f9b676a98bb14657d5a7a1120618551541b590 +SIZE (xpi/thunderbird-i18n-60.3.3/sl.xpi) = 589946 +SHA256 (xpi/thunderbird-i18n-60.3.3/sq.xpi) = efa2fc7ecfe0e6f9afdd258f09156bf23bdd7e0cf5cb374bd1e5ef5037214011 +SIZE (xpi/thunderbird-i18n-60.3.3/sq.xpi) = 593096 +SHA256 (xpi/thunderbird-i18n-60.3.3/sr.xpi) = 19b1038382c3a1d0eb1e4ec082cdbf10673d0801b09be647fcb940573ae3a232 +SIZE (xpi/thunderbird-i18n-60.3.3/sr.xpi) = 637721 +SHA256 (xpi/thunderbird-i18n-60.3.3/sv-SE.xpi) = d96945bc41d24a8ed24425ce5b26426f160cb4b40496e6b58d2788d8e620d308 +SIZE (xpi/thunderbird-i18n-60.3.3/sv-SE.xpi) = 594078 +SHA256 (xpi/thunderbird-i18n-60.3.3/tr.xpi) = 13bfb45c1881efbb96c20ad9edb19a9c1b66bfd0f74e4fca2627a2b4b900297e +SIZE (xpi/thunderbird-i18n-60.3.3/tr.xpi) = 598009 +SHA256 (xpi/thunderbird-i18n-60.3.3/uk.xpi) = a333b8548cfacaace05dad6f1ebd2592004a33d6df9960d05d75cc24ba3e86d1 +SIZE (xpi/thunderbird-i18n-60.3.3/uk.xpi) = 684153 +SHA256 (xpi/thunderbird-i18n-60.3.3/vi.xpi) = a1de755a90412b823a1f453c7117d66232fd9ac6c993895a097e21d5bbcadb35 +SIZE (xpi/thunderbird-i18n-60.3.3/vi.xpi) = 638418 +SHA256 (xpi/thunderbird-i18n-60.3.3/zh-CN.xpi) = b48bf845c7e7c87e97886a66c6d543c4b317904427c8d8607599d0389a19d014 +SIZE (xpi/thunderbird-i18n-60.3.3/zh-CN.xpi) = 622465 +SHA256 (xpi/thunderbird-i18n-60.3.3/zh-TW.xpi) = 9cfb2c5e031ea77b8c82421659c618930f1f00df548bd201d6924d298c3b44ce +SIZE (xpi/thunderbird-i18n-60.3.3/zh-TW.xpi) = 626188 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index dbe67c5a2f3..8b8e00bc7e0 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PORTNAME= thunderbird -DISTVERSION= 60.3.2 +DISTVERSION= 60.3.3 +PORTREVISION= 1 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 7f3c0c13d9a..0834c76e231 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543595073 -SHA256 (thunderbird-60.3.2.source.tar.xz) = 979707651662ed3654a327e9c568dac5894e73a40d2776bb94ed2950dab4e041 -SIZE (thunderbird-60.3.2.source.tar.xz) = 286027944 +TIMESTAMP = 1544045621 +SHA256 (thunderbird-60.3.3.source.tar.xz) = 8524dd3f2b78b639fdebcf91170c3c2d8ec812ba7c407cae636c3e88ddc4b196 +SIZE (thunderbird-60.3.3.source.tar.xz) = 283847516 diff --git a/math/Makefile b/math/Makefile index 020ff3b3a01..89d5d4276e4 100644 --- a/math/Makefile +++ b/math/Makefile @@ -134,6 +134,7 @@ SUBDIR += aspcud SUBDIR += asymptote SUBDIR += atlas + SUBDIR += barvinok SUBDIR += biggles SUBDIR += blacs SUBDIR += blas @@ -306,6 +307,7 @@ SUBDIR += kmplot SUBDIR += kmplot-kde4 SUBDIR += labplot + SUBDIR += latte-integrale SUBDIR += lambda SUBDIR += lapack SUBDIR += lapack++ @@ -670,6 +672,7 @@ SUBDIR += ploticus-nox11 SUBDIR += plplot SUBDIR += plplot-ada + SUBDIR += polylib SUBDIR += primegen SUBDIR += primme SUBDIR += prng @@ -700,6 +703,7 @@ SUBDIR += py-cvxopt SUBDIR += py-cvxpy SUBDIR += py-cyipopt + SUBDIR += py-deap SUBDIR += py-ecos SUBDIR += py-fastcluster SUBDIR += py-fastdtw @@ -869,6 +873,7 @@ SUBDIR += units SUBDIR += unuran SUBDIR += viennacl + SUBDIR += visualpolylib SUBDIR += vowpal_wabbit SUBDIR += vtk6 SUBDIR += vtk8 diff --git a/math/R-cran-RcppEigen/Makefile b/math/R-cran-RcppEigen/Makefile index 750dabb5ff4..b98d51c3e85 100644 --- a/math/R-cran-RcppEigen/Makefile +++ b/math/R-cran-RcppEigen/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= RcppEigen -PORTVERSION= 0.3.3.4.0 +PORTVERSION= 0.3.3.5.0 CATEGORIES= math DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/math/R-cran-RcppEigen/distinfo b/math/R-cran-RcppEigen/distinfo index c6b96eab763..4ac5d3057a4 100644 --- a/math/R-cran-RcppEigen/distinfo +++ b/math/R-cran-RcppEigen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1522216392 -SHA256 (RcppEigen_0.3.3.4.0.tar.gz) = 11020c567b299b1eac95e8a4d57abf0315931286907823dc7b66c44d0dd6dad4 -SIZE (RcppEigen_0.3.3.4.0.tar.gz) = 1631870 +TIMESTAMP = 1544160744 +SHA256 (RcppEigen_0.3.3.5.0.tar.gz) = e5c6af17770c5f57b7cf2fba04ad1a519901b446e8138bfff221952458207f05 +SIZE (RcppEigen_0.3.3.5.0.tar.gz) = 1633859 diff --git a/math/barvinok/Makefile b/math/barvinok/Makefile new file mode 100644 index 00000000000..16948ee074c --- /dev/null +++ b/math/barvinok/Makefile @@ -0,0 +1,25 @@ +# $FreeBSD$ + +PORTNAME= barvinok +DISTVERSION= 0.41 +CATEGORIES= math +MASTER_SITES= http://barvinok.gforge.inria.fr/ + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Library for counting the number of integer points in polytopes + +LICENSE= GPLv2 + +LIB_DEPENDS= libglpk.so:math/glpk \ + libgmp.so:math/gmp \ + libisl.so:devel/isl \ + libntl.so:math/ntl \ + libpolylibgmp.so:math/polylib + +USES= gmake libtool localbase:ldflags pkgconfig +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static --enable-shared --enable-shared-barvinok \ + --with-gmp=system --with-polylib=system --with-isl=system +USE_LDCONFIG= yes + +.include diff --git a/math/barvinok/distinfo b/math/barvinok/distinfo new file mode 100644 index 00000000000..be5b5eb070c --- /dev/null +++ b/math/barvinok/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544131896 +SHA256 (barvinok-0.41.tar.gz) = b6aec6e6fd5b1574f5397cebb819c686f076a4a9d679ff023fe2999bc01054a5 +SIZE (barvinok-0.41.tar.gz) = 5340156 diff --git a/math/barvinok/files/patch-interface_all__barvinok.h b/math/barvinok/files/patch-interface_all__barvinok.h new file mode 100644 index 00000000000..5a0eeea964c --- /dev/null +++ b/math/barvinok/files/patch-interface_all__barvinok.h @@ -0,0 +1,6 @@ +--- interface/all_barvinok.h.orig 2018-12-07 04:15:52 UTC ++++ interface/all_barvinok.h +@@ -1,2 +1,2 @@ +-#include ++//#include + #include diff --git a/math/barvinok/pkg-descr b/math/barvinok/pkg-descr new file mode 100644 index 00000000000..6c85b3be84a --- /dev/null +++ b/math/barvinok/pkg-descr @@ -0,0 +1,6 @@ +barvinok is a library for counting the number of integer points in parametric +and non-parametric polytopes based on polylib. For a parametric polytope, the +number of points is represented by either a piecewise quasi-polynomial or an +Ehrhart series. + +WWW: http://freshmeat.sourceforge.net/projects/barvinok diff --git a/math/barvinok/pkg-plist b/math/barvinok/pkg-plist new file mode 100644 index 00000000000..2bc64118d94 --- /dev/null +++ b/math/barvinok/pkg-plist @@ -0,0 +1,22 @@ +bin/barvinok_count +bin/barvinok_ehrhart +bin/barvinok_enumerate +bin/barvinok_enumerate_e +bin/iscc +bin/polytope_scan +include/barvinok/NTL.h +include/barvinok/NTL_QQ.h +include/barvinok/barvinok.h +include/barvinok/basis_reduction.h +include/barvinok/evalue.h +include/barvinok/genfun.h +include/barvinok/isl.h +include/barvinok/options.h +include/barvinok/polylib.h +include/barvinok/sample.h +include/barvinok/set.h +include/barvinok/util.h +lib/libbarvinok.so +lib/libbarvinok.so.23 +lib/libbarvinok.so.23.0.6 +libdata/pkgconfig/barvinok.pc diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile index 449c1af6f6c..19aa2eaed58 100644 --- a/math/cadabra2/Makefile +++ b/math/cadabra2/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cadabra2 -DISTVERSION= 2.2.0 -PORTREVISION= 3 +DISTVERSION= 2.2.2 CATEGORIES= math PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -24,7 +23,7 @@ LIB_DEPENDS= ${PY_BOOST} \ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \ ${PYTHON_SITELIBDIR}/matplotlib/__init__.py:math/py-matplotlib@${PY_FLAVOR} -USES= compiler:c++14-lang cmake:outsource dos2unix gettext-runtime localbase:ldflags pkgconfig python:3.4+ sqlite # USES=python picks random python versions +USES= compiler:c++14-lang cmake:outsource dos2unix gettext-runtime gnome localbase:ldflags pkgconfig python:3.4+ sqlite # USES=python picks random python versions USE_GITHUB= yes GH_ACCOUNT= kpeeters DOS2UNIX_FILES= cmake/version.cmake @@ -33,7 +32,7 @@ USE_TEX= base texmf texhash USE_LDCONFIG= yes OPTIONS_SUB= yes -CMAKE_ON= USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76 +CMAKE_ON= BUILD_SHARED_LIBS USE_PYTHON_3 # OFF doesn't work, still links to python3: https://github.com/kpeeters/cadabra2/issues/76 CMAKE_OFF= ENABLE_MATHEMATICA CXXFLAGS+= -I${LOCALBASE}/include/jsoncpp LDFLAGS+= -ljsoncpp diff --git a/math/cadabra2/distinfo b/math/cadabra2/distinfo index 8ea142c71f3..571d501f9ea 100644 --- a/math/cadabra2/distinfo +++ b/math/cadabra2/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1522534466 -SHA256 (kpeeters-cadabra2-2.2.0_GH0.tar.gz) = 4e0a408ab8fa611091bc4d776dd44efd730c2651e02e62cfd0251bd1d6b96249 -SIZE (kpeeters-cadabra2-2.2.0_GH0.tar.gz) = 23915602 +TIMESTAMP = 1544157018 +SHA256 (kpeeters-cadabra2-2.2.2_GH0.tar.gz) = 9245ceb5b5b3901709060364356bb6db2f6d2d3c7f03f51f9a0ee7d239e15351 +SIZE (kpeeters-cadabra2-2.2.2_GH0.tar.gz) = 23979382 SHA256 (5d52108df5b05eeba2ffbd7220776887297c2846.patch) = 91c1259345332b9fc4b52eafa1c510d2a851b99ca708fa25af5673cdf737be87 SIZE (5d52108df5b05eeba2ffbd7220776887297c2846.patch) = 735 diff --git a/math/cadabra2/files/patch-client__server_CMakeLists.txt b/math/cadabra2/files/patch-client__server_CMakeLists.txt index 5eb0b54f943..0ddba45234f 100644 --- a/math/cadabra2/files/patch-client__server_CMakeLists.txt +++ b/math/cadabra2/files/patch-client__server_CMakeLists.txt @@ -1,35 +1,26 @@ ---- client_server/CMakeLists.txt.orig 2018-03-30 09:33:27 UTC +--- client_server/CMakeLists.txt.orig 2018-12-07 04:46:45 UTC +++ client_server/CMakeLists.txt -@@ -28,7 +28,6 @@ find_package(Boost 1.53.0 COMPONENTS sys - set(CADABRA_SERVER_SRC - Server.cc - Snoop.cc -- jsoncpp/jsoncpp.cpp - ../core/CdbPython.cc - ../core/Stopwatch.cc - ../core/ProgressMonitor.cc -@@ -43,7 +42,6 @@ set(CADABRA_CLIENT_SRC - ../core/DataCell.cc - Actions.cc - Snoop.cc -- jsoncpp/jsoncpp.cpp - ../libs/whereami/whereami.c - ../core/InstallPrefix.cc - # ../libs/sqlite3/sqlite3.c -@@ -58,7 +56,6 @@ include_directories( - "../core" - "../libs/pybind11/include" - "websocketpp" -- "jsoncpp" - "../libs/internal/include" - "../libs/whereami" - ${Boost_INCLUDE_DIRS} -@@ -114,7 +111,7 @@ add_executable(cadabra2html cadabra2html - target_link_libraries(cadabra2html cadabra_client) +@@ -32,7 +32,6 @@ set(CADABRA_SERVER_SRC + ${CADABRA_CORE_DIR}/InstallPrefix.cc + ${CADABRA_CORE_DIR}/CdbPython.cc + ${CADABRA_CORE_DIR}/Stopwatch.cc +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ${CADABRA_LIBS_DIR}/whereami/whereami.c + ) - # Client library --add_library(cadabra_client STATIC ${CADABRA_CLIENT_SRC}) -+add_library(cadabra_client SHARED ${CADABRA_CLIENT_SRC}) - target_link_libraries(cadabra_client - ${Boost_LIBRARIES} - ${SQLITE3_LIBRARIES} +@@ -43,7 +42,6 @@ set(CADABRA_CLIENT_SRC + Snoop.cc + ${CADABRA_CORE_DIR}/DataCell.cc + ${CADABRA_CORE_DIR}/InstallPrefix.cc +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ${CADABRA_LIBS_DIR}/whereami/whereami.c + ) + +@@ -56,7 +54,6 @@ include_directories( + "${CADABRA_CORE_DIR}" + "${CADABRA_LIBS_DIR}/pybind11/include" + "${CADABRA_LIBS_DIR}/websocketpp" +- "${CADABRA_LIBS_DIR}/jsoncpp" + "${CADABRA_LIBS_DIR}/internal/include" + "${CADABRA_LIBS_DIR}/whereami" + ${Boost_INCLUDE_DIRS} diff --git a/math/cadabra2/files/patch-client__server_Server.cc b/math/cadabra2/files/patch-client__server_Server.cc deleted file mode 100644 index 8484130502f..00000000000 --- a/math/cadabra2/files/patch-client__server_Server.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- client_server/Server.cc.orig 2018-03-31 19:40:16 UTC -+++ client_server/Server.cc -@@ -466,7 +466,7 @@ void Server::run() - - wserver.init_asio(); - wserver.set_reuse_addr(true); -- wserver.listen(0); -+ wserver.listen(websocketpp::lib::asio::ip::tcp::v4(), 0); // makes up for a failed assumption that IPv6 is mapped into IPv4: (see net.inet6.ip6.v6only=0) - wserver.start_accept(); - websocketpp::lib::asio::error_code ec; - auto p = wserver.get_local_endpoint(ec); diff --git a/math/cadabra2/files/patch-cmake_version.cmake b/math/cadabra2/files/patch-cmake_version.cmake index 058e3e7331e..70cbec0ab74 100644 --- a/math/cadabra2/files/patch-cmake_version.cmake +++ b/math/cadabra2/files/patch-cmake_version.cmake @@ -1,15 +1,15 @@ ---- cmake/version.cmake.orig 2018-03-31 20:48:09 UTC +--- cmake/version.cmake.orig 2018-12-07 05:19:36 UTC +++ cmake/version.cmake -@@ -3,13 +3,13 @@ set(CADABRA_VERSION_MINOR 2) - set(CADABRA_VERSION_PATCH 0) +@@ -4,7 +4,7 @@ set(CADABRA_VERSION_PATCH 2) set(CADABRA_VERSION_TWEAK 0) set(COPYRIGHT_YEARS "2001-2018") --execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process(COMMAND git rev-list --count HEAD OUTPUT_VARIABLE GIT_COMMIT_SERIAL OUTPUT_STRIP_TRAILING_WHITESPACE) --execute_process(COMMAND git log -1 --date=short --pretty=format:%cd OUTPUT_VARIABLE GIT_COMMIT_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) -+#execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA OUTPUT_STRIP_TRAILING_WHITESPACE) -+#execute_process(COMMAND git rev-list --count HEAD OUTPUT_VARIABLE GIT_COMMIT_SERIAL OUTPUT_STRIP_TRAILING_WHITESPACE) -+#execute_process(COMMAND git log -1 --date=short --pretty=format:%cd OUTPUT_VARIABLE GIT_COMMIT_DATE OUTPUT_STRIP_TRAILING_WHITESPACE) + math(EXPR SYSTEM_BITS "${CMAKE_SIZEOF_VOID_P} * 8") +-find_program(GIT git PATHS ${GIT_DIR}) ++#find_program(GIT git PATHS ${GIT_DIR}) + if(GIT) + message("-- Git found: ${GIT}") + execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE GIT_SHORT_SHA OUTPUT_STRIP_TRAILING_WHITESPACE) +@@ -16,7 +16,7 @@ endif() if(GIT_SHORT_SHA) set(CADABRA_VERSION_BUILD "${GIT_COMMIT_SERIAL}.${GIT_SHORT_SHA}") else() diff --git a/math/cadabra2/files/patch-core_CMakeLists.txt b/math/cadabra2/files/patch-core_CMakeLists.txt index cabacf9a483..9bcd7e63210 100644 --- a/math/cadabra2/files/patch-core_CMakeLists.txt +++ b/math/cadabra2/files/patch-core_CMakeLists.txt @@ -1,19 +1,34 @@ ---- core/CMakeLists.txt.orig 2018-03-31 17:08:45 UTC +--- core/CMakeLists.txt.orig 2018-12-07 05:20:52 UTC +++ core/CMakeLists.txt -@@ -197,7 +197,6 @@ include_directories( - "." - "../libs/internal/include" - "../libs/whereami" -- "../client_server/jsoncpp" - ${Boost_INCLUDE_DIRS} +@@ -204,7 +204,6 @@ set(LOCAL_SRC_FILES + modules/xperm_new.cc + ${ALGORITHM_SRC_FILES} + ${PROPERTY_SRC_FILES} +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ) + if(MATHEMATICA_FOUND) + set(LOCAL_SRC_FILES +@@ -227,7 +226,6 @@ include_directories( + "." + "${CADABRA_LIBS_DIR}/internal/include" + "${CADABRA_LIBS_DIR}/whereami" +- "${CADABRA_LIBS_DIR}/jsoncpp" + ${Boost_INCLUDE_DIRS} ) # FIXME: 2nd line is to find Config.hh -@@ -246,7 +245,7 @@ target_link_libraries(cadabra2python - ) - - # cadabra2cadabra --add_executable(cadabra2cadabra cadabra2cadabra.cc DataCell.cc ../client_server/jsoncpp/jsoncpp.cpp ../libs/whereami/whereami.c InstallPrefix.cc) -+add_executable(cadabra2cadabra cadabra2cadabra.cc DataCell.cc ../libs/whereami/whereami.c InstallPrefix.cc) - target_link_libraries(cadabra2cadabra ${Boost_LIBRARIES}) - - # Mathematica WSTP test +@@ -263,7 +261,6 @@ add_executable(test_preprocessor + add_executable(cadabra2python + cadabra2python.cc + CdbPython.cc +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ) + target_link_libraries(cadabra2python + ${Boost_LIBRARIES} +@@ -275,7 +272,6 @@ add_executable(cadabra2cadabra + cadabra2cadabra.cc + DataCell.cc + InstallPrefix.cc +- ${CADABRA_LIBS_DIR}/jsoncpp/jsoncpp.cpp + ${CADABRA_LIBS_DIR}/whereami/whereami.c + ) + target_link_libraries(cadabra2cadabra ${Boost_LIBRARIES} ${GLIBMM3_LIBRARIES}) diff --git a/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt b/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt index 84d2d10e29f..f47dd7ecf00 100644 --- a/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt +++ b/math/cadabra2/files/patch-frontend_gtkmm_CMakeLists.txt @@ -1,31 +1,15 @@ ---- frontend/gtkmm/CMakeLists.txt.orig 2018-03-30 09:33:27 UTC +--- frontend/gtkmm/CMakeLists.txt.orig 2018-12-07 05:18:13 UTC +++ frontend/gtkmm/CMakeLists.txt -@@ -126,11 +126,11 @@ install(FILES ${PROJECT_SOURCE_DIR}/. - # there anyway. - # - gtk-update-icon-cache is broken and only works half of the time. +@@ -165,9 +165,9 @@ if (NOT INSTALL_TARGETS_ONLY) + install(FILES ${CADABRA_IMAGES_DIR}/256x256/cadabra2-gtk.png DESTINATION ${ICON_PREFIX}/share/icons/hicolor/256x256/apps) + install(FILES ${CADABRA_IMAGES_DIR}/cadabra2-gtk.svg DESTINATION ${ICON_PREFIX}/share/icons/hicolor/scalable/apps) + install(FILES ${CADABRA_ROOT_DIR}/config/cadabra2-gtk.desktop DESTINATION ${ICON_PREFIX}/share/applications) +- install(CODE "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") +- install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)") +- install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") ++ #install(CODE "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") ++ #install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)") ++ #install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") --if(APPLE) -+#if(APPLE) - set(ICON_PREFIX "${CMAKE_INSTALL_PREFIX}") --else() -- set(ICON_PREFIX "/usr") --endif() -+#else() -+# set(ICON_PREFIX "/usr") -+#endif() - - #set(ICON_THEME ${ICON_PREFIX}/share/icons/hicolor/index.theme) - #if(EXISTS "${ICON_THEME}") -@@ -144,9 +144,9 @@ install(FILES ${PROJECT_SOURCE_DIR}/. - install(FILES ${PROJECT_SOURCE_DIR}/../../images/256x256/cadabra2-gtk.png DESTINATION ${ICON_PREFIX}/share/icons/hicolor/256x256/apps) - install(FILES ${PROJECT_SOURCE_DIR}/../../images/cadabra2-gtk.svg DESTINATION ${ICON_PREFIX}/share/icons/hicolor/scalable/apps) - install(FILES ${PROJECT_SOURCE_DIR}/../../config/cadabra2-gtk.desktop DESTINATION ${ICON_PREFIX}/share/applications) --install(CODE "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") --install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)") --install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") -+#install(CODE "execute_process(COMMAND touch ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") -+#install(CODE "execute_process(COMMAND gtk-update-icon-cache-3.0 ${ICON_PREFIX}/share/icons/hicolor)") -+#install(CODE "execute_process(COMMAND chmod go+r ${ICON_PREFIX}/share/icons/hicolor/icon-theme.cache)") - - # Install shared libraries on Windows. - # https://stackoverflow.com/questions/32662215/how-do-you-install-gtk-3-0-on-windows + # Install shared libraries on Windows. + # https://stackoverflow.com/questions/32662215/how-do-you-install-gtk-3-0-on-windows diff --git a/math/cadabra2/files/patch-pybind11-libc++7 b/math/cadabra2/files/patch-pybind11-libc++7 deleted file mode 100644 index e41d44dbba0..00000000000 --- a/math/cadabra2/files/patch-pybind11-libc++7 +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/pybind/pybind11/commit/ff6bd092d482b0c4e51aeb7367c3e5ecbc18a9de - ---- libs/pybind11/include/pybind11/cast.h.orig 2018-03-30 09:33:27 UTC -+++ libs/pybind11/include/pybind11/cast.h -@@ -1685,6 +1685,9 @@ template <> inline void cast_safe(object &&) {} - - NAMESPACE_END(detail) - -+template -+tuple make_tuple() { return tuple(0); } -+ - template tuple make_tuple(Args&&... args_) { - constexpr size_t size = sizeof...(Args); ---- libs/pybind11/include/pybind11/stl.h.orig 2018-03-30 09:33:27 UTC -+++ libs/pybind11/include/pybind11/stl.h -@@ -30,7 +30,8 @@ - # define PYBIND11_HAS_OPTIONAL 1 - # endif - // std::experimental::optional (but not allowed in c++11 mode) --# if defined(PYBIND11_CPP14) && __has_include() -+# if defined(PYBIND11_CPP14) && (__has_include() && \ -+ !__has_include()) - # include - # define PYBIND11_HAS_EXP_OPTIONAL 1 - # endif diff --git a/math/cadabra2/pkg-plist b/math/cadabra2/pkg-plist index 5f24c169797..3bd26f904ef 100644 --- a/math/cadabra2/pkg-plist +++ b/math/cadabra2/pkg-plist @@ -4,21 +4,21 @@ bin/cadabra2 bin/cadabra2cadabra bin/cadabra2html bin/cadabra2python -lib/libcadabra_client.so +lib/libcadabra_client.a %%GUI%%share/applications/cadabra2-gtk.desktop %%GUI%%%%DATADIR%%/images/cadabra2-gtk.png %%GUI%%%%DATADIR%%/latex/preamble.tex -%%GUI%%%%DATADIR%%/latex/tableaux.sty -%%GUI%%@dir %%DATADIR%%/manual/properties %%GUI%%%%DATADIR%%/manual/algorithms/asym.cnb %%GUI%%%%DATADIR%%/manual/algorithms/canonicalise.cnb %%GUI%%%%DATADIR%%/manual/algorithms/collect_factors.cnb %%GUI%%%%DATADIR%%/manual/algorithms/collect_terms.cnb %%GUI%%%%DATADIR%%/manual/algorithms/combine.cnb %%GUI%%%%DATADIR%%/manual/algorithms/complete.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/decompose.cnb %%GUI%%%%DATADIR%%/manual/algorithms/decompose_product.cnb %%GUI%%%%DATADIR%%/manual/algorithms/distribute.cnb %%GUI%%%%DATADIR%%/manual/algorithms/drop_weight.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/einsteinify.cnb %%GUI%%%%DATADIR%%/manual/algorithms/eliminate_kronecker.cnb %%GUI%%%%DATADIR%%/manual/algorithms/eliminate_metric.cnb %%GUI%%%%DATADIR%%/manual/algorithms/epsilon_to_delta.cnb @@ -33,9 +33,11 @@ lib/libcadabra_client.so %%GUI%%%%DATADIR%%/manual/algorithms/integrate_by_parts.cnb %%GUI%%%%DATADIR%%/manual/algorithms/join_gamma.cnb %%GUI%%%%DATADIR%%/manual/algorithms/keep_weight.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/lower_free_indices.cnb %%GUI%%%%DATADIR%%/manual/algorithms/lr_tensor.cnb %%GUI%%%%DATADIR%%/manual/algorithms/map_sympy.cnb %%GUI%%%%DATADIR%%/manual/algorithms/product_rule.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/raise_free_indices.cnb %%GUI%%%%DATADIR%%/manual/algorithms/reduce_delta.cnb %%GUI%%%%DATADIR%%/manual/algorithms/rename_dummies.cnb %%GUI%%%%DATADIR%%/manual/algorithms/replace_match.cnb @@ -52,6 +54,7 @@ lib/libcadabra_client.so %%GUI%%%%DATADIR%%/manual/algorithms/vary.cnb %%GUI%%%%DATADIR%%/manual/algorithms/young_project_product.cnb %%GUI%%%%DATADIR%%/manual/algorithms/young_project_tensor.cnb +%%GUI%%%%DATADIR%%/manual/algorithms/zoom.cnb %%GUI%%%%DATADIR%%/manual/properties/Accent.cnb %%GUI%%%%DATADIR%%/manual/properties/AntiCommuting.cnb %%GUI%%%%DATADIR%%/manual/properties/AntiSymmetric.cnb @@ -62,6 +65,7 @@ lib/libcadabra_client.so %%GUI%%%%DATADIR%%/manual/properties/DAntiSymmetric.cnb %%GUI%%%%DATADIR%%/manual/properties/Depends.cnb %%GUI%%%%DATADIR%%/manual/properties/Derivative.cnb +%%GUI%%%%DATADIR%%/manual/properties/Determinant.cnb %%GUI%%%%DATADIR%%/manual/properties/Diagonal.cnb %%GUI%%%%DATADIR%%/manual/properties/DiracBar.cnb %%GUI%%%%DATADIR%%/manual/properties/Distributable.cnb @@ -94,10 +98,15 @@ lib/libcadabra_client.so %%GUI%%%%DATADIR%%/notebook.tex %%DATADIR%%/python/cadabra2.so %%DATADIR%%/python/cadabra2_defaults.py +%%DATADIR%%/python/cdb/core/component.cnb +%%DATADIR%%/python/cdb/core/manip.cnb +%%DATADIR%%/python/cdb/core/solve.cnb %%DATADIR%%/python/cdb/gauge_theory/__init__.py %%DATADIR%%/python/cdb/gauge_theory/instantons.py %%DATADIR%%/python/cdb/relativity/__init__.py %%DATADIR%%/python/cdb/relativity/schwarzschild.py +%%DATADIR%%/python/cdb/utils/node.cnb +%%DATADIR%%/python/cdb_appdirs.py %%GUI%%share/icons/hicolor/128x128/apps/cadabra2-gtk.png %%GUI%%share/icons/hicolor/256x256/apps/cadabra2-gtk.png %%GUI%%share/icons/hicolor/64x64/apps/cadabra2-gtk.png diff --git a/math/latte-integrale/Makefile b/math/latte-integrale/Makefile new file mode 100644 index 00000000000..880839dcfcd --- /dev/null +++ b/math/latte-integrale/Makefile @@ -0,0 +1,39 @@ +# $FreeBSD$ + +PORTNAME= latte-integrale +DISTVERSIONPREFIX= version_ +DISTVERSION= 1_7_5 +CATEGORIES= math + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Software for counting lattice points/integration over convex polytopes + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= lrs:math/lrslib \ + points2triangs:math/topcom +LIB_DEPENDS= lib4ti2util.so:math/4ti2 \ + libcddgmp.so:math/cddlib \ + libgmp.so:math/gmp \ + libntl.so:math/ntl +RUN_DEPENDS= lrs:math/lrslib \ + points2triangs:math/topcom + +USES= autoreconf gmake libtool localbase:ldflags +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static \ + --with-topcom=${LOCALBASE} --with-4ti2=${LOCALBASE} --with-cddlib=${LOCALBASE} --with-gmp=${LOCALBASE} --with-ntl=${LOCALBASE} +USE_GITHUB= yes +GH_ACCOUNT= latte-int +GH_PROJECT= latte +USE_LDCONFIG= yes + +CONFLICTS_INSTALL= latte + +OPTIONS_DEFINE= DOCS EXAMPLES + +PORTDOCS= * +PORTEXAMPLES= * + +.include diff --git a/math/latte-integrale/distinfo b/math/latte-integrale/distinfo new file mode 100644 index 00000000000..7dcbbc50a86 --- /dev/null +++ b/math/latte-integrale/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1543993357 +SHA256 (latte-int-latte-version_1_7_5_GH0.tar.gz) = 3da7cff7e451a12b29f5df28456367f66cd0092437e88aca5e61cc3f13eaa91c +SIZE (latte-int-latte-version_1_7_5_GH0.tar.gz) = 9772961 diff --git a/math/latte-integrale/files/patch-EXAMPLES_Makefile.am b/math/latte-integrale/files/patch-EXAMPLES_Makefile.am new file mode 100644 index 00000000000..287c844d6b6 --- /dev/null +++ b/math/latte-integrale/files/patch-EXAMPLES_Makefile.am @@ -0,0 +1,9 @@ +--- EXAMPLES/Makefile.am.orig 2018-12-05 08:27:21 UTC ++++ EXAMPLES/Makefile.am +@@ -1,5 +1,5 @@ + +-examplesdir = $(pkgdatadir)/examples ++examplesdir = $(prefix)/share/examples/latte-integrale + + # Install and distribute these examples. + # Without "nobase" the directories would be flattened diff --git a/math/latte-integrale/files/patch-Makefile.am b/math/latte-integrale/files/patch-Makefile.am new file mode 100644 index 00000000000..752a4c588ee --- /dev/null +++ b/math/latte-integrale/files/patch-Makefile.am @@ -0,0 +1,14 @@ +--- Makefile.am.orig 2018-12-05 08:20:55 UTC ++++ Makefile.am +@@ -2,9 +2,9 @@ ACLOCAL_AMFLAGS = -I m4 -I m4/gnulib + + SUBDIRS = code EXAMPLES doc + +-docdir = $(pkgdatadir)/doc ++docdir = ${prefix}/share/doc/latte-integrale + +-dist_doc_DATA = NEWS README ++dist_doc_DATA = # NEWS README + + + cvstag: diff --git a/math/latte-integrale/files/patch-code_maple_Makefile.am b/math/latte-integrale/files/patch-code_maple_Makefile.am new file mode 100644 index 00000000000..c566e3ca96e --- /dev/null +++ b/math/latte-integrale/files/patch-code_maple_Makefile.am @@ -0,0 +1,8 @@ +--- code/maple/Makefile.am.orig 2018-12-05 22:17:29 UTC ++++ code/maple/Makefile.am +@@ -1,4 +1,4 @@ +-nobase_dist_pkgdata_DATA = \ ++#nobase_dist_pkgdata_DATA = \ + Conebyconeapproximations_08_11_2010.mpl RealBarvinok-mars-exemples-2014-03-10.mpl m-knapsack.mpl \ + README + diff --git a/math/latte-integrale/files/patch-configure.ac b/math/latte-integrale/files/patch-configure.ac new file mode 100644 index 00000000000..d1cd3ac9529 --- /dev/null +++ b/math/latte-integrale/files/patch-configure.ac @@ -0,0 +1,11 @@ +--- configure.ac.orig 2018-12-05 08:19:48 UTC ++++ configure.ac +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.59) +-AC_INIT(latte-int, 1.7.5) ++AC_INIT(latte-integrale, 1.7.5) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_HEADERS([code/config.h:code/config.hin]) + AM_INIT_AUTOMAKE([gnu 1.11]) # Need 1.11 for parallel test harness in code/maple diff --git a/math/latte-integrale/files/patch-doc_Makefile.am b/math/latte-integrale/files/patch-doc_Makefile.am new file mode 100644 index 00000000000..532a84b10c8 --- /dev/null +++ b/math/latte-integrale/files/patch-doc_Makefile.am @@ -0,0 +1,8 @@ +--- doc/Makefile.am.orig 2018-12-05 22:18:20 UTC ++++ doc/Makefile.am +@@ -1,4 +1,4 @@ +-docdir = $(pkgdatadir)/doc ++docdir = $(prefix)/share/doc/latte-integrale + + doc_DATA = manual.pdf + diff --git a/math/latte-integrale/pkg-descr b/math/latte-integrale/pkg-descr new file mode 100644 index 00000000000..74b3a71ce89 --- /dev/null +++ b/math/latte-integrale/pkg-descr @@ -0,0 +1,12 @@ +LattE (Lattice point Enumeration) is a computer software dedicated to the +problems of counting lattice points and integration inside convex polytopes. +LattE contains the first ever implementation of Barvinok's algorithm. The LattE +macchiato version (by M. Koppe) incorporated fundamental improvements and +speedups. + +LattE integrale, the latest version, has the ability to directly compute +integrals of polynomial functions over polytopes and in particular to do exact +volume computations. Version 1.6 adds the capability of computing the highest +coefficients of weighted Ehrhart quasipolynomials. + +WWW: https://www.math.ucdavis.edu/~latte/ diff --git a/math/latte-integrale/pkg-plist b/math/latte-integrale/pkg-plist new file mode 100644 index 00000000000..c8e85647d6d --- /dev/null +++ b/math/latte-integrale/pkg-plist @@ -0,0 +1,25 @@ +bin/ConvertCDDextToLatte +bin/ConvertCDDineToLatte +bin/count +bin/count-linear-forms-from-polynomial +bin/ehrhart +bin/ehrhart3 +bin/hilbert-from-rays +bin/hilbert-from-rays-symm +bin/integrate +bin/latte-maximize +bin/latte-minimize +bin/latte2ext +bin/latte2ine +bin/polyhedron-to-cones +bin/top-ehrhart-knapsack +bin/triangulate +lib/liblatte.so +lib/liblatte.so.0 +lib/liblatte.so.0.0.0 +lib/libnormalize.so +lib/libnormalize.so.0 +lib/libnormalize.so.0.0.0 +%%DATADIR%%/simplify.add +%%DATADIR%%/simplify2.add +%%DATADIR%%/simplify3.add diff --git a/math/pecl-big_int/Makefile b/math/pecl-big_int/Makefile index 1d251d653b8..03a1d5f8604 100644 --- a/math/pecl-big_int/Makefile +++ b/math/pecl-big_int/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-big-int=shared diff --git a/math/pecl-bitset2/Makefile b/math/pecl-bitset2/Makefile index 2ec0bcdf157..953636635f5 100644 --- a/math/pecl-bitset2/Makefile +++ b/math/pecl-bitset2/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE PORTSCOUT= limit:^2\. -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 USES= php:pecl .include diff --git a/math/pecl-stats/Makefile b/math/pecl-stats/Makefile index b440a05d93a..92395b22920 100644 --- a/math/pecl-stats/Makefile +++ b/math/pecl-stats/Makefile @@ -15,7 +15,7 @@ LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 PORTSCOUT= limit:^1.* diff --git a/math/pecl-trader/Makefile b/math/pecl-trader/Makefile index 1a45541d87a..3086db19c86 100644 --- a/math/pecl-trader/Makefile +++ b/math/pecl-trader/Makefile @@ -15,6 +15,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= BSD2CLAUSE USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/math/polylib/Makefile b/math/polylib/Makefile new file mode 100644 index 00000000000..7203e2fcb8c --- /dev/null +++ b/math/polylib/Makefile @@ -0,0 +1,22 @@ +# $FreeBSD$ + +PORTNAME= polylib +DISTVERSION= 5.22.5 +CATEGORIES= math +MASTER_SITES= http://icps.u-strasbg.fr/polylib/polylib_src/ + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Library of polyhedral functions + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libgmp.so:math/gmp + +USES= gmake libtool +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static \ + --with-libgmp=${LOCALBASE} # can also be built w/out libgmp, in which case the suffix on some files changes. Not sure if/how this is useful. +USE_LDCONFIG= yes + +.include diff --git a/math/polylib/distinfo b/math/polylib/distinfo new file mode 100644 index 00000000000..c9ea49d2858 --- /dev/null +++ b/math/polylib/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544133099 +SHA256 (polylib-5.22.5.tar.gz) = 84622ff9dfa5d06f0c266960ed078bd3577a30fde6d7f8bed1041b9838cb731f +SIZE (polylib-5.22.5.tar.gz) = 2673630 diff --git a/math/polylib/pkg-descr b/math/polylib/pkg-descr new file mode 100644 index 00000000000..ae2efda06ba --- /dev/null +++ b/math/polylib/pkg-descr @@ -0,0 +1,20 @@ +The Polyhedral Library (PolyLib for short) operates on objects made up of +unions of polyhedra of any dimension. It was first developed by Doran Wilde at +IRISA, in Rennes, France, in connection with the ALPHA project. This first +version (1.1) manipulates non parameterized unions of polyhedra through the +following operations: intersection, difference, union, convex hull, simplify, +image and preimage, plus some input and output functions. The polyhedra are +computed in their dual implicit and Minkowski representations, in homogeneous +spaces. + +Version 2 of the PolyLib included parameterized vertices computation. +PolyLib3.14 includes Ehrhart polynomials computation, which permits to count +the number of integer points contained in a parameterized polyhedron. PolyLib4 +included the GNU MP library (as a compilation option), and 64 bits computations, +in order to avoid integer overflows. Polylib5 is a merge of Strasbourg, Rennes +and BYU Polylib. + +There is also the 'visualpolylib' project that permits to use the PolyLib +interactively. + +WWW: https://icps.u-strasbg.fr/polylib/ diff --git a/math/polylib/pkg-plist b/math/polylib/pkg-plist new file mode 100644 index 00000000000..137486e13ae --- /dev/null +++ b/math/polylib/pkg-plist @@ -0,0 +1,43 @@ +bin/c2p +bin/disjoint_union_adj +bin/disjoint_union_sep +bin/ehrhart_lower_bound +bin/ehrhart_quick_apx +bin/ehrhart_rankinggmp +bin/ehrhart_uniongmp +bin/ehrhart_upper_bound +bin/findv +bin/ppgmp +bin/r2p +bin/testehrhartgmp +include/polylib/Lattice.h +include/polylib/Matop.h +include/polylib/NormalForms.h +include/polylib/SolveDio.h +include/polylib/Zpolyhedron.h +include/polylib/alpha.h +include/polylib/arithmetic_errors.h +include/polylib/arithmetique.h +include/polylib/compress_parms.h +include/polylib/ehrhart.h +include/polylib/errormsg.h +include/polylib/eval_ehrhart.h +include/polylib/ext_ehrhart.h +include/polylib/homogenization.h +include/polylib/matrix.h +include/polylib/matrix_addon.h +include/polylib/matrix_permutations.h +include/polylib/param.h +include/polylib/polyhedron.h +include/polylib/polylib.h +include/polylib/polylib32.h +include/polylib/polylib64.h +include/polylib/polylibgmp.h +include/polylib/polyparam.h +include/polylib/ranking.h +include/polylib/types.h +include/polylib/vector.h +lib/libpolylibgmp.so +lib/libpolylibgmp.so.8 +lib/libpolylibgmp.so.8.1.0 +libdata/pkgconfig/polylibgmp.pc diff --git a/math/py-deap/Makefile b/math/py-deap/Makefile new file mode 100644 index 00000000000..6e95852dcf7 --- /dev/null +++ b/math/py-deap/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +PORTNAME= deap +DISTVERSION= 1.2.2 +CATEGORIES= math biology science devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Distributed Evolutionary Algorithms in Python + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +BUILD_DEPENDS= ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} + +USES= python:3.5+ +USE_PYTHON= distutils autoplist + +.include diff --git a/math/py-deap/distinfo b/math/py-deap/distinfo new file mode 100644 index 00000000000..d9bd8259746 --- /dev/null +++ b/math/py-deap/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544165307 +SHA256 (deap-1.2.2.tar.gz) = 95c63e66d755ec206c80fdb2908851c0bef420ee8651ad7be4f0578e9e909bcf +SIZE (deap-1.2.2.tar.gz) = 936584 diff --git a/math/py-deap/pkg-descr b/math/py-deap/pkg-descr new file mode 100644 index 00000000000..d263cf7c44f --- /dev/null +++ b/math/py-deap/pkg-descr @@ -0,0 +1,23 @@ +DEAP is a novel evolutionary computation framework for rapid prototyping and +testing of ideas. It seeks to make algorithms explicit and data structures +transparent. It works in perfect harmony with parallelisation mechanisms such +as multiprocessing and SCOOP. + +DEAP includes the following features: +* Genetic algorithm using any imaginable representation + o List, Array, Set, Dictionary, Tree, Numpy Array, etc. +* Genetic programing using prefix trees + o Loosely typed, Strongly typed + o Automatically defined functions +* Evolution strategies (including CMA-ES) +* Multi-objective optimisation (NSGA-II, SPEA2, MO-CMA-ES) +* Co-evolution (cooperative and competitive) of multiple populations +* Parallelization of the evaluations (and more) +* Hall of Fame of the best individuals that lived in the population +* Checkpoints that take snapshots of a system regularly +* Benchmarks module containing most common test functions +* Genealogy of an evolution (that is compatible with NetworkX) +* Examples of alternative algorithms : Particle Swarm Optimization, Differential + Evolution, Estimation of Distribution Algorithm + +WWW: https://github.com/DEAP/deap diff --git a/math/timbl/Makefile b/math/timbl/Makefile index 0974c78b518..2be3e63765a 100644 --- a/math/timbl/Makefile +++ b/math/timbl/Makefile @@ -2,22 +2,31 @@ # $FreeBSD$ PORTNAME= timbl -PORTVERSION= 6.4.2 -PORTREVISION= 2 +DISTVERSIONPREFIX= v +DISTVERSION= 6.4.13 CATEGORIES= math -MASTER_SITES= http://ilk.uvt.nl/downloads/pub/software/ MAINTAINER= yuri@FreeBSD.org COMMENT= Tilburg Memory Based Learner -LIB_DEPENDS= libxml2.so:textproc/libxml2 +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libomp.so:devel/openmp \ + libticcutils.so:devel/ticcutils + +USES= autoreconf gmake gnome libtool pathfix pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= LanguageMachines GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip -USES= gmake libtool pathfix pkgconfig +CONFIGURE_ARGS= --disable-static +USE_GNOME= libxml2 USE_LDCONFIG= yes -post-patch: - @${REINPLACE_CMD} 's#doc/@PACKAGE@/examples#examples/@PACKAGE@#' ${WRKSRC}/demos/Makefile.in +INSTALL_TARGET= install-strip + +OPTIONS_DEFINE= DOCS + +PORTDOCS= * .include diff --git a/math/timbl/distinfo b/math/timbl/distinfo index 509ec2dcb5d..4b3feaaee05 100644 --- a/math/timbl/distinfo +++ b/math/timbl/distinfo @@ -1,2 +1,3 @@ -SHA256 (timbl-6.4.2.tar.gz) = a10075f0406032fd9e1c3ee4e56fb66bc056284505ca54ac4890ff065ec4c7e8 -SIZE (timbl-6.4.2.tar.gz) = 548063 +TIMESTAMP = 1544226148 +SHA256 (LanguageMachines-timbl-v6.4.13_GH0.tar.gz) = 0e8acd112e9118af683e312242a01d5960f333c32b73fc6185a1c7d1984d56ca +SIZE (LanguageMachines-timbl-v6.4.13_GH0.tar.gz) = 1093242 diff --git a/math/timbl/pkg-plist b/math/timbl/pkg-plist index c803b210320..5e1d0b52098 100644 --- a/math/timbl/pkg-plist +++ b/math/timbl/pkg-plist @@ -1,14 +1,10 @@ bin/timbl -man/man1/timbl.1.gz include/timbl/BestArray.h include/timbl/Choppers.h -include/timbl/CommandLine.h include/timbl/Common.h include/timbl/GetOptClass.h include/timbl/IBtree.h include/timbl/Instance.h -include/timbl/LogBuffer.h -include/timbl/LogStream.h include/timbl/MBLClass.h include/timbl/Matrices.h include/timbl/Metrics.h @@ -19,22 +15,10 @@ include/timbl/StringOps.h include/timbl/Testers.h include/timbl/TimblAPI.h include/timbl/TimblExperiment.h -include/timbl/Tree.h -include/timbl/Trie.h include/timbl/Types.h -include/timbl/XMLtools.h include/timbl/neighborSet.h -lib/libtimbl.a lib/libtimbl.so -lib/libtimbl.so.3 -lib/libtimbl.so.3.0.0 +lib/libtimbl.so.4 +lib/libtimbl.so.4.0.1 libdata/pkgconfig/timbl.pc -%%EXAMPLESDIR%%/cross_val.test -%%EXAMPLESDIR%%/dimin.script -%%EXAMPLESDIR%%/dimin.test -%%EXAMPLESDIR%%/dimin.train -%%EXAMPLESDIR%%/small_1.train -%%EXAMPLESDIR%%/small_2.train -%%EXAMPLESDIR%%/small_3.train -%%EXAMPLESDIR%%/small_4.train -%%EXAMPLESDIR%%/small_5.train +man/man1/timbl.1.gz diff --git a/math/topcom/Makefile b/math/topcom/Makefile index 222d90b592a..1c390bb745c 100644 --- a/math/topcom/Makefile +++ b/math/topcom/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= topcom -DISTVERSIONPREFIX= Release_ DISTVERSION= 0.17.8 CATEGORIES= math MASTER_SITES= http://www.rambau.wm.uni-bayreuth.de/Software/ diff --git a/math/visualpolylib/Makefile b/math/visualpolylib/Makefile new file mode 100644 index 00000000000..1033440eaf9 --- /dev/null +++ b/math/visualpolylib/Makefile @@ -0,0 +1,29 @@ +# $FreeBSD$ + +PORTNAME= visualpolylib +DISTVERSION= 0.9 +DISTVERSIONSUFFIX= e +CATEGORIES= math +MASTER_SITES= http://icps.u-strasbg.fr/polylib/download/ +DISTNAME= ${PORTNAME}.${DISTVERSION}${DISTVERSIONSUFFIX} + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Visualization program for PolyLib + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgmp.so:math/gmp \ + libpolylibgmp.so:math/polylib + +USES= gettext-runtime gmake gnome pkgconfig +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static \ + --with-polylib=${LOCALBASE}/lib/libpolylibgmp.so +USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk20 pango + +PLIST_FILES= bin/${PORTNAME} + +.include diff --git a/math/visualpolylib/distinfo b/math/visualpolylib/distinfo new file mode 100644 index 00000000000..f8af38db9ca --- /dev/null +++ b/math/visualpolylib/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544154010 +SHA256 (visualpolylib.0.9e.tar.gz) = 7ec46972d2aa527ec407c604db5518c0884dbe22aa79a25f1f59dbf7984ce981 +SIZE (visualpolylib.0.9e.tar.gz) = 433947 diff --git a/math/visualpolylib/files/patch-configure b/math/visualpolylib/files/patch-configure new file mode 100644 index 00000000000..8a2d751b8f6 --- /dev/null +++ b/math/visualpolylib/files/patch-configure @@ -0,0 +1,16 @@ +--- configure.orig 2018-12-07 03:44:09 UTC ++++ configure +@@ -3502,11 +3502,11 @@ echo "$as_me: error: \"No libpolylib64.s + or give the path with ./configure --with-polylib=LOCATION \"" >&2;} + { (exit 1); exit 1; }; } + else +- POLY_ADD_FLAGS="-lpolylib64" ++ POLY_ADD_FLAGS="-lpolylibgmp" + fi + else + POLY_LD_FLAGS="${polylibloc}" +- POLY_ADD_FLAGS="-lpolylib64" ++ POLY_ADD_FLAGS="-lpolylibgmp" + fi + + echo "$as_me:$LINENO: checking if polylib uses GNUmp" >&5 diff --git a/math/visualpolylib/pkg-descr b/math/visualpolylib/pkg-descr new file mode 100644 index 00000000000..c43259213a7 --- /dev/null +++ b/math/visualpolylib/pkg-descr @@ -0,0 +1,5 @@ +VisualPolylib is the visualization application for PolyLib, The Polyhedral +Library, that operates on objects made up of unions of polyhedra of any +dimension. + +WWW: https://icps.u-strasbg.fr/polylib/ diff --git a/math/vtk8/Makefile b/math/vtk8/Makefile index 5dfb62df031..5ee5457b791 100644 --- a/math/vtk8/Makefile +++ b/math/vtk8/Makefile @@ -107,11 +107,6 @@ post-patch: .include -.if ${PORT_OPTIONS:MQT4} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 -.endif - .for g in ${VTK_GROUPS} . if ${PORT_OPTIONS:M${g}} CMAKE_ARGS+= -DVTK_Group_${g}:BOOL=ON diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile index eb23a4b5901..349dbba0c70 100644 --- a/multimedia/aom/Makefile +++ b/multimedia/aom/Makefile @@ -2,8 +2,8 @@ PORTNAME= aom DISTVERSIONPREFIX= v -DISTVERSION= 1.0.0-1004 -DISTVERSIONSUFFIX= -g70dde4bc5 +DISTVERSION= 1.0.0-1012 +DISTVERSIONSUFFIX= -g98dae942e CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo index 10c13b1db57..32c14329e6f 100644 --- a/multimedia/aom/distinfo +++ b/multimedia/aom/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544051131 -SHA256 (jbeich-aom-v1.0.0-1004-g70dde4bc5_GH0.tar.gz) = 9fc0c76757d9dbd12308f8399384562a1bab2878fa0e745fb5107eecc1d51704 -SIZE (jbeich-aom-v1.0.0-1004-g70dde4bc5_GH0.tar.gz) = 3077577 +TIMESTAMP = 1544207927 +SHA256 (jbeich-aom-v1.0.0-1012-g98dae942e_GH0.tar.gz) = 2ffa7681e313e9fc28914ddfed9348c97fd888722b899fc4ed828fba680959cc +SIZE (jbeich-aom-v1.0.0-1012-g98dae942e_GH0.tar.gz) = 3078052 diff --git a/multimedia/dtv-scan-tables/Makefile b/multimedia/dtv-scan-tables/Makefile index 080ffcad6f6..cd57dda49a2 100644 --- a/multimedia/dtv-scan-tables/Makefile +++ b/multimedia/dtv-scan-tables/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dtv-scan-tables -PORTVERSION= 20180606 +PORTVERSION= 20180927 CATEGORIES= multimedia MASTER_SITES= LOCAL/decke diff --git a/multimedia/dtv-scan-tables/distinfo b/multimedia/dtv-scan-tables/distinfo index 02f7aa6eb7e..75b8f165ca9 100644 --- a/multimedia/dtv-scan-tables/distinfo +++ b/multimedia/dtv-scan-tables/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529399277 -SHA256 (dtv-scan-tables-20180606.tar.xz) = 49625e9f9a5c1d2759657698674049bef35ab85a803268ab493f43e272bf0b1a -SIZE (dtv-scan-tables-20180606.tar.xz) = 197404 +TIMESTAMP = 1544087068 +SHA256 (dtv-scan-tables-20180927.tar.xz) = e4116393519d5dd511dad8bf906d7e7ba0d42aff806048c3ddd170e95c07d8f3 +SIZE (dtv-scan-tables-20180927.tar.xz) = 197536 diff --git a/multimedia/libva-intel-media-driver/Makefile b/multimedia/libva-intel-media-driver/Makefile index 69a958d4be3..29aa4fd9df6 100644 --- a/multimedia/libva-intel-media-driver/Makefile +++ b/multimedia/libva-intel-media-driver/Makefile @@ -3,6 +3,7 @@ PORTNAME= media-driver DISTVERSIONPREFIX= intel-media- DISTVERSION= 18.3.0 +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= libva-intel- @@ -24,12 +25,11 @@ USES= cmake:outsource compiler:c++11-lib pkgconfig USE_GITHUB= yes GH_ACCOUNT= intel ARCH_SUFX= ${ARCH:S/i386/32/:S/amd//:S/x86_//} -CMAKE_OFF= MEDIA_BUILD_FATAL_WARNINGS +CMAKE_OFF= MEDIA_BUILD_FATAL_WARNINGS INSTALL_DRIVER_SYSCONF CMAKE_ARGS= -DBUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ -DARCH:STRING="${ARCH_SUFX}" \ -DUFO_MARCH:STRING="${CPUTYPE}" -PLIST_FILES= etc/profile.d/intel-media.sh \ - lib/dri/iHD_drv_video.so \ +PLIST_FILES= lib/dri/iHD_drv_video.so \ lib/igfxcmrt${ARCH_SUFX}.so OPTIONS_DEFINE= TEST diff --git a/multimedia/libva-intel-media-driver/pkg-message b/multimedia/libva-intel-media-driver/pkg-message new file mode 100644 index 00000000000..b9d4cd3a29d --- /dev/null +++ b/multimedia/libva-intel-media-driver/pkg-message @@ -0,0 +1,7 @@ +To enable the driver set up environ(7) e.g., + +For sh/bash/ksh/zsh run and (optionally) add into ~/.profile: + export LIBVA_DRIVER_NAME=iHD + +For csh/tcsh run and (optionally) add into ~/.login: + setenv LIBVA_DRIVER_NAME iHD diff --git a/multimedia/tvheadend/Makefile b/multimedia/tvheadend/Makefile index 558f5e4f3b8..7765e403812 100644 --- a/multimedia/tvheadend/Makefile +++ b/multimedia/tvheadend/Makefile @@ -4,7 +4,7 @@ PORTNAME= tvheadend PORTVERSION= 4.2.7 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org diff --git a/multimedia/tvheadend/files/patch-src_webui_static_app_epg.js b/multimedia/tvheadend/files/patch-src_webui_static_app_epg.js new file mode 100644 index 00000000000..ce3f35c2372 --- /dev/null +++ b/multimedia/tvheadend/files/patch-src_webui_static_app_epg.js @@ -0,0 +1,44 @@ +From 5363fb5cefbf8f9f0f4d38f81252ce93942665e4 Mon Sep 17 00:00:00 2001 +From: Jongsung Kim +Date: Tue, 20 Nov 2018 17:36:10 +0900 +Subject: [PATCH 2/2] webui: epg: fix compatibility issue for FreeBSD + +The EPG screen serviced by FreeBSD port of tvheadend has two abnormal control +behaviors: + + Reset All button makes the list empty + Typing and then deleting any search string also makes the list empty. + +This patch fixes the symptoms above. + +Patch tested with the latest FreeBSD port of tvheadend-4.2.7. + +Changes since v1: +- call reset only if required +--- + src/webui/static/app/epg.js | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/webui/static/app/epg.js b/src/webui/static/app/epg.js +index 2c8b914b2..7337177ef 100644 +--- src/webui/static/app/epg.js ++++ src/webui/static/app/epg.js +@@ -902,10 +902,11 @@ tvheadend.epg = function() { + epgFilterTitle.on('valid', function(c) { + var value = c.getValue(); + +- if (value.length < 1) +- value = null; +- +- if (epgStore.baseParams.title !== value) { ++ if (value.length < 1) { ++ delete epgStore.baseParams.title; ++ epgView.reset(); ++ } ++ else if (epgStore.baseParams.title !== value) { + epgStore.baseParams.title = value; + epgView.reset(); + } +-- +2.19.1 + diff --git a/multimedia/tvheadend/files/patch-src_webui_webui.c b/multimedia/tvheadend/files/patch-src_webui_webui.c new file mode 100644 index 00000000000..9896e020b41 --- /dev/null +++ b/multimedia/tvheadend/files/patch-src_webui_webui.c @@ -0,0 +1,80 @@ +From 411f957733222e24df4ead9fb15332dcb2c116da Mon Sep 17 00:00:00 2001 +From: Jongsung Kim +Date: Tue, 29 May 2018 03:42:04 +0900 +Subject: [PATCH 1/2] webui: fix http_serve_file() for FreeBSD + +This patch fixes two major problems of FreeBSD port of tvheadend: + +1. very high CPU usage while streaming a recored program +2. unable to stream the recorded program beyond 128MB. + +Unlike Linux sendfile(), FreeBSD sendfile() requires an explicit +file offset, and return value must be checked to catch any error +occurred. (i.e., closed connection) + +Patch tested with the latest FreeBSD port of tvheadend-4.2.6. +--- + src/webui/webui.c | 24 +++++++++++++++++------- + 1 file changed, 17 insertions(+), 7 deletions(-) + +diff --git a/src/webui/webui.c b/src/webui/webui.c +index 12b965230..331d998e9 100644 +--- src/webui/webui.c ++++ src/webui/webui.c +@@ -1570,7 +1570,7 @@ http_serve_file(http_connection_t *hc, const char *fname, + #if defined(PLATFORM_LINUX) + ssize_t r; + #elif defined(PLATFORM_FREEBSD) || defined(PLATFORM_DARWIN) +- off_t r; ++ off_t o, r; + #endif + + if (fconv) { +@@ -1631,11 +1631,15 @@ http_serve_file(http_connection_t *hc, const char *fname, + sprintf(range_buf, "bytes %jd-%jd/%jd", + file_start, file_end, (intmax_t)st.st_size); + ++#if defined(PLATFORM_LINUX) + if(file_start > 0) + if (lseek(fd, file_start, SEEK_SET) != file_start) { + close(fd); + return HTTP_STATUS_INTERNAL; + } ++#elif defined(PLATFORM_FREEBSD) || defined(PLATFORM_DARWIN) ++ o = file_start; ++#endif + + if (preop) { + ret = preop(hc, file_start, content_len, opaque); +@@ -1656,16 +1660,22 @@ http_serve_file(http_connection_t *hc, const char *fname, + chunk = MIN(1024 * ((stats ? 128 : 1024) * 1024), content_len); + #if defined(PLATFORM_LINUX) + r = sendfile(hc->hc_fd, fd, NULL, chunk); ++ if (r < 0) { ++ ret = -1; ++ break; ++ } + #elif defined(PLATFORM_FREEBSD) +- sendfile(fd, hc->hc_fd, 0, chunk, NULL, &r, 0); ++ ret = sendfile(fd, hc->hc_fd, o, chunk, NULL, &r, 0); ++ if (ret < 0) ++ break; ++ o += r; + #elif defined(PLATFORM_DARWIN) + r = chunk; +- sendfile(fd, hc->hc_fd, 0, &r, NULL, 0); +-#endif +- if(r < 0) { +- ret = -1; ++ ret = sendfile(fd, hc->hc_fd, o, &r, NULL, 0); ++ if (ret < 0) + break; +- } ++ o += r; ++#endif + content_len -= r; + if (stats) + stats(hc, r, opaque); +-- +2.19.1 + diff --git a/net-im/fractal/Makefile b/net-im/fractal/Makefile index 5a5cc471a04..8496cae6626 100644 --- a/net-im/fractal/Makefile +++ b/net-im/fractal/Makefile @@ -2,7 +2,7 @@ PORTNAME= fractal DISTVERSION= 3.30.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MASTER_SITES= https://gitlab.gnome.org/World/fractal/uploads/${GL_HASH}/ diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile index e5c3e1d03b6..bf8639b670e 100644 --- a/net-im/ktp-accounts-kcm/Makefile +++ b/net-im/ktp-accounts-kcm/Makefile @@ -7,6 +7,9 @@ CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE instant messaging account management module +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt5 \ libkaccounts.so:net-im/kaccounts-integration \ libtelepathy-qt5.so:net-im/telepathy-qt@qt5 \ @@ -14,11 +17,10 @@ LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt5 \ libKTpCommonInternals.so:net-im/ktp-common-internals \ libKF5AkonadiPrivate.so:databases/akonadi \ libsignon-qt5.so:sysutils/signon-qt5 - RUN_DEPENDS= ${KDE_PREFIX}/bin/ktp-contactlist:net-im/ktp-contact-list \ ${QT_PLUGINDIR}/kaccounts/ui/owncloud_plugin_kaccounts.so:net-im/kaccounts-providers -USES= cmake:outsource gettext kde:5 pkgconfig qt:5 tar:xz +USES= cmake:outsource gettext gnome kde:5 pkgconfig qt:5 tar:xz USE_GNOME= intltool USE_KDE= auth codecs config configwidgets coreaddons ecm i18n \ iconthemes itemviews kcmutils kio notifications notifyconfig \ diff --git a/net-im/ktp-accounts-kcm/pkg-descr b/net-im/ktp-accounts-kcm/pkg-descr index 31a5df5ea05..8259ca721ea 100644 --- a/net-im/ktp-accounts-kcm/pkg-descr +++ b/net-im/ktp-accounts-kcm/pkg-descr @@ -5,4 +5,4 @@ development of collaborative features for KDE Applications. This is a KControl module which handles adding/editing/removing Telepathy accounts. -WWW: http://community.kde.org/KTp +WWW: https://community.kde.org/KTp diff --git a/net-im/pecl-stomp/Makefile b/net-im/pecl-stomp/Makefile index 4c0cb21d855..e355f263297 100644 --- a/net-im/pecl-stomp/Makefile +++ b/net-im/pecl-stomp/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 PORTSCOUT= limit:^1.* diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile index d6aba525c60..84219a3df21 100644 --- a/net-im/py-xmpppy/Makefile +++ b/net-im/py-xmpppy/Makefile @@ -12,6 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}rc1 MAINTAINER= python@FreeBSD.org COMMENT= Python library that provides easy scripting with Jabber +LICENSE= GPLv2+ + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython@${PY_FLAVOR} USES= python:2.7 shebangfix diff --git a/net-mgmt/cacti88/Makefile b/net-mgmt/cacti88/Makefile index f4012be8085..d91cfafcb9a 100644 --- a/net-mgmt/cacti88/Makefile +++ b/net-mgmt/cacti88/Makefile @@ -23,7 +23,7 @@ USE_PHP= mysqli pcre session sockets snmp xml NO_ARCH= yes NO_BUILD= yes -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 SUB_FILES= pkg-message diff --git a/net-mgmt/hawk/Makefile b/net-mgmt/hawk/Makefile index 4998ba56f74..19955339798 100644 --- a/net-mgmt/hawk/Makefile +++ b/net-mgmt/hawk/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= p5-Net-Netmask>=0:net-mgmt/p5-Net-Netmask \ USES= mysql:server php:mod perl5 USE_PHP= mysql -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 NO_BUILD= yes USE_RC_SUBR= hawk diff --git a/net-mgmt/ipplan/Makefile b/net-mgmt/ipplan/Makefile index efabc91aa96..3dff2ed207c 100644 --- a/net-mgmt/ipplan/Makefile +++ b/net-mgmt/ipplan/Makefile @@ -13,7 +13,7 @@ COMMENT= IP address management and tracking DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 RUN_DEPENDS= nmap:security/nmap diff --git a/net-mgmt/nedi/Makefile b/net-mgmt/nedi/Makefile index 2e669fdc13b..f39e565d045 100644 --- a/net-mgmt/nedi/Makefile +++ b/net-mgmt/nedi/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 RUN_DEPENDS= p5-Net-SNMP>=0:net-mgmt/p5-Net-SNMP \ p5-Net-Telnet-Cisco>=0:net-mgmt/p5-Telnet-Cisco \ diff --git a/net-mgmt/pandorafms_console/Makefile b/net-mgmt/pandorafms_console/Makefile index 2cbc4a92ca0..942be1f4221 100644 --- a/net-mgmt/pandorafms_console/Makefile +++ b/net-mgmt/pandorafms_console/Makefile @@ -13,7 +13,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= ${PANDORA_LICENSE} LICENSE_FILE= ${PANDORA_LICENSE_FILE} -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 RUN_DEPENDS= ${LOCALBASE}/bin/twopi:graphics/graphviz diff --git a/net-mgmt/phpip/Makefile b/net-mgmt/phpip/Makefile index 5eccf2dc9a0..7961575410c 100644 --- a/net-mgmt/phpip/Makefile +++ b/net-mgmt/phpip/Makefile @@ -22,7 +22,7 @@ NO_BUILD= yes USE_PHP= mysql USES= dos2unix php:web -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 PHPIP?= www/phpip PLIST_SUB+= PHPIP=${PHPIP} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} diff --git a/net-mgmt/zabbix22-frontend/Makefile b/net-mgmt/zabbix22-frontend/Makefile index a2f48e7513c..5eccceafbaa 100644 --- a/net-mgmt/zabbix22-frontend/Makefile +++ b/net-mgmt/zabbix22-frontend/Makefile @@ -21,7 +21,7 @@ OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= MySQLI backend -MYSQL_VARS= IGNORE_WITH_PHP+="70 71 72 73" +MYSQL_VARS= IGNORE_WITH_PHP+="71 72 73" .include diff --git a/net-mgmt/zabbix3-frontend/Makefile b/net-mgmt/zabbix3-frontend/Makefile index a0e6b203547..2ad8e8ef331 100644 --- a/net-mgmt/zabbix3-frontend/Makefile +++ b/net-mgmt/zabbix3-frontend/Makefile @@ -21,7 +21,7 @@ OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= MySQLI backend -MYSQL_VARS= IGNORE_WITH_PHP+="70 71 72 73" +MYSQL_VARS= IGNORE_WITH_PHP+="71 72 73" .include diff --git a/net-mgmt/zabbix32-frontend/Makefile b/net-mgmt/zabbix32-frontend/Makefile index 9a41f98fe1b..e6ba9cad836 100644 --- a/net-mgmt/zabbix32-frontend/Makefile +++ b/net-mgmt/zabbix32-frontend/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= MySQLI backend -MYSQL_VARS= IGNORE_WITH_PHP+="70 71 72 73" +MYSQL_VARS= IGNORE_WITH_PHP+="71 72 73" .include diff --git a/net-mgmt/zabbix34-frontend/Makefile b/net-mgmt/zabbix34-frontend/Makefile index c507b17ec27..e5c4f64d047 100644 --- a/net-mgmt/zabbix34-frontend/Makefile +++ b/net-mgmt/zabbix34-frontend/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= MySQLI backend -MYSQL_VARS= IGNORE_WITH_PHP+="70 71 72 73" +MYSQL_VARS= IGNORE_WITH_PHP+="71 72 73" .include diff --git a/net-mgmt/zabbix4-frontend/Makefile b/net-mgmt/zabbix4-frontend/Makefile index b23c82f2cf6..8a95a1eafea 100644 --- a/net-mgmt/zabbix4-frontend/Makefile +++ b/net-mgmt/zabbix4-frontend/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= MYSQL MYSQLI PGSQL ORACLE OPTIONS_DEFAULT= MYSQLI MYSQLI_DESC= MySQLI backend -MYSQL_VARS= IGNORE_WITH_PHP+="70 71 72 73" +MYSQL_VARS= IGNORE_WITH_PHP+="71 72 73" MYSQL_USE= PHP=mysql MYSQLI_USE= PHP=mysqli diff --git a/net-p2p/qtum/Makefile b/net-p2p/qtum/Makefile index 664ab39598d..cdbc87dd93e 100644 --- a/net-p2p/qtum/Makefile +++ b/net-p2p/qtum/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= qtum -PORTVERSION= 0.16.1 -PORTREVISION= 1 +PORTVERSION= 0.16.2 DISTVERSIONPREFIX= mainnet-ignition-v CATEGORIES= net-p2p finance diff --git a/net-p2p/qtum/distinfo b/net-p2p/qtum/distinfo index 5ab6aaf5f28..a980707d8fc 100644 --- a/net-p2p/qtum/distinfo +++ b/net-p2p/qtum/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1540482356 -SHA256 (qtumproject-qtum-mainnet-ignition-v0.16.1_GH0.tar.gz) = baf8f0fc1f0d0782090e272e092349b628d032e94c67e611717b1a90ec116484 -SIZE (qtumproject-qtum-mainnet-ignition-v0.16.1_GH0.tar.gz) = 12229824 +TIMESTAMP = 1544131893 +SHA256 (qtumproject-qtum-mainnet-ignition-v0.16.2_GH0.tar.gz) = d5ad877c4b77b71e5b393d9f8db33862628565008f794cb144566486350f4ba9 +SIZE (qtumproject-qtum-mainnet-ignition-v0.16.2_GH0.tar.gz) = 12232918 SHA256 (qtumproject-cpp-eth-qtum-d6081ecc98e3c5f4701363_GH0.tar.gz) = 62c858543510aaf656ce0a247e26fbce4a9b11d1fa424f40e9ff0fdc822b4b34 SIZE (qtumproject-cpp-eth-qtum-d6081ecc98e3c5f4701363_GH0.tar.gz) = 1114149 diff --git a/net/Makefile b/net/Makefile index e1e54edba91..d471d1a1a86 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1216,6 +1216,7 @@ SUBDIR += rfbproxy SUBDIR += rinetd SUBDIR += ripe-whois + SUBDIR += routinator SUBDIR += rp-pppoe SUBDIR += rsplib SUBDIR += rsync diff --git a/net/intel-ixl-kmod/Makefile b/net/intel-ixl-kmod/Makefile index 5ffd69888fd..6035bad6de9 100644 --- a/net/intel-ixl-kmod/Makefile +++ b/net/intel-ixl-kmod/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= ixl -PORTVERSION?= 1.9.13 -PORTREVISION?= 1 +PORTVERSION?= 1.10.4 CATEGORIES= net MASTER_SITES= https://downloadmirror.intel.com/${MASTER_SITE_SUBDIR}/ \ http://downloadmirror.intel.com/${MASTER_SITE_SUBDIR}/ diff --git a/net/intel-ixl-kmod/distinfo b/net/intel-ixl-kmod/distinfo index 37a6b552bbe..d80ea10b8ce 100644 --- a/net/intel-ixl-kmod/distinfo +++ b/net/intel-ixl-kmod/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1530096050 -SHA256 (ixl-1.9.13.tar.gz) = 6b2ff4b9ee64d573522bf65711abe3837627b4f9959ae6a0d1b6be853202c9cf -SIZE (ixl-1.9.13.tar.gz) = 271062 +TIMESTAMP = 1544021313 +SHA256 (ixl-1.10.4.tar.gz) = 981e76d40664798aea1045837b4121056a5dbf88e2b29e62968c23e45205211d +SIZE (ixl-1.10.4.tar.gz) = 273388 diff --git a/net/pecl-apn/Makefile b/net/pecl-apn/Makefile index 565d7bc15ed..0ac1fd325a7 100644 --- a/net/pecl-apn/Makefile +++ b/net/pecl-apn/Makefile @@ -19,6 +19,6 @@ LIB_DEPENDS= libcapn.so:net/libcapn USES= php:pecl ssl:build,run CONFIGURE_ARGS= --with-apn=${LOCALBASE} CFLAGS+= -I${OPENSSLINC} -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/net/pecl-ip2location/Makefile b/net/pecl-ip2location/Makefile index 90bf6c194ca..8b01a160d76 100644 --- a/net/pecl-ip2location/Makefile +++ b/net/pecl-ip2location/Makefile @@ -17,6 +17,6 @@ LICENSE= PHP301 LIB_DEPENDS= libIP2Location.so:net/ip2location USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/net/pecl-mosquitto/Makefile b/net/pecl-mosquitto/Makefile index a97fc63c087..77a494b7457 100644 --- a/net/pecl-mosquitto/Makefile +++ b/net/pecl-mosquitto/Makefile @@ -18,6 +18,6 @@ LICENSE= BSD3CLAUSE BUILD_DEPENDS= mosquitto>=0:net/mosquitto USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/net/pecl-oauth/Makefile b/net/pecl-oauth/Makefile index 4d690e50ea3..3b211db9652 100644 --- a/net/pecl-oauth/Makefile +++ b/net/pecl-oauth/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcurl.so:ftp/curl USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/net/pecl-yaz/Makefile b/net/pecl-yaz/Makefile index f77c4b369ea..cf51a194452 100644 --- a/net/pecl-yaz/Makefile +++ b/net/pecl-yaz/Makefile @@ -14,7 +14,7 @@ LIB_DEPENDS= libyaz.so:net/yaz USES= php:pecl USE_GNOME+= libxslt -IGNORE_WITH_PHP= 70 73 +IGNORE_WITH_PHP= 73 CONFIGURE_ARGS= --with-yaz=${LOCALBASE} diff --git a/net/pecl-yp/Makefile b/net/pecl-yp/Makefile index 087649b3816..4f5e0aad9d5 100644 --- a/net/pecl-yp/Makefile +++ b/net/pecl-yp/Makefile @@ -15,6 +15,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/net/py-netif/Makefile b/net/py-netif/Makefile index dabe28a11f9..9bc86a28316 100644 --- a/net/py-netif/Makefile +++ b/net/py-netif/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= netif -PORTVERSION= 1.0.20181005 -PORTREVISION= 1 +PORTVERSION= 1.0.20181207 CATEGORIES= net python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -18,7 +17,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsd>0:devel/py-bsd@${PY_FLAVOR} \ USE_GITHUB= yes GH_ACCOUNT= freenas GH_PROJECT= py-netif -GH_TAGNAME= ebffafe +GH_TAGNAME= 5dce20c HAS_CONFIGURE= yes USES= python diff --git a/net/py-netif/distinfo b/net/py-netif/distinfo index 02ba6898889..a4a9fc84334 100644 --- a/net/py-netif/distinfo +++ b/net/py-netif/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1538733910 -SHA256 (freenas-py-netif-1.0.20181005-ebffafe_GH0.tar.gz) = b81a78efc134a7a68a1ab5a7f0af366a66ae7d88931e10be8c38e836ee550bfc -SIZE (freenas-py-netif-1.0.20181005-ebffafe_GH0.tar.gz) = 59574 +TIMESTAMP = 1544182114 +SHA256 (freenas-py-netif-1.0.20181207-5dce20c_GH0.tar.gz) = 74f0a885f5aa8c8f3fe5118a7cd0fabdad52d2d87dd08d0d8bcc7de09221afcf +SIZE (freenas-py-netif-1.0.20181207-5dce20c_GH0.tar.gz) = 59955 diff --git a/net/rabbiteer/Makefile b/net/rabbiteer/Makefile index 905842e09e5..49b0e507858 100644 --- a/net/rabbiteer/Makefile +++ b/net/rabbiteer/Makefile @@ -2,7 +2,7 @@ PORTNAME= rabbiteer DISTVERSION= 1.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= dch@FreeBSD.org diff --git a/net/routinator/Makefile b/net/routinator/Makefile new file mode 100644 index 00000000000..1d277a2e226 --- /dev/null +++ b/net/routinator/Makefile @@ -0,0 +1,154 @@ +# $FreeBSD$ + +PORTNAME= routinator +PORTVERSION= 0.1.2 +DISTVERSIONPREFIX= v +PORTREVISION= 1 +CATEGORIES= net + +MAINTAINER= jaap@NLnetLabs.nl +COMMENT= RPKI signed route collector and validator + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +RUN_DEPENDS= rsync:net/rsync + +USES= cargo +USE_GITHUB= yes +GH_ACCOUNT= NLnetLabs + +CARGO_CRATES= aho-corasick-0.6.9 \ + ansi_term-0.11.0 \ + arc-swap-0.3.4 \ + argon2rs-0.2.5 \ + arrayvec-0.4.7 \ + atty-0.2.11 \ + backtrace-0.3.9 \ + backtrace-sys-0.1.24 \ + base64-0.9.3 \ + bcder-0.1.0 \ + bitflags-1.0.4 \ + blake2-rfc-0.2.18 \ + byteorder-1.2.7 \ + bytes-0.4.10 \ + cc-1.0.25 \ + cfg-if-0.1.6 \ + chrono-0.4.6 \ + clap-2.32.0 \ + cloudabi-0.0.3 \ + constant_time_eq-0.1.3 \ + crossbeam-deque-0.6.1 \ + crossbeam-epoch-0.5.2 \ + crossbeam-utils-0.5.0 \ + daemonize-0.3.0 \ + dirs-1.0.4 \ + env_logger-0.5.13 \ + error-chain-0.11.0 \ + failure-0.1.3 \ + failure_derive-0.1.3 \ + fuchsia-zircon-0.3.3 \ + fuchsia-zircon-sys-0.3.3 \ + futures-0.1.25 \ + futures-cpupool-0.1.8 \ + hex-0.3.2 \ + humantime-1.1.1 \ + iovec-0.1.2 \ + json-0.11.13 \ + kernel32-sys-0.2.2 \ + lazy_static-1.2.0 \ + lazycell-1.2.0 \ + libc-0.2.43 \ + lock_api-0.1.4 \ + log-0.4.6 \ + memchr-2.1.1 \ + memoffset-0.2.1 \ + mio-0.6.16 \ + mio-named-pipes-0.1.6 \ + mio-uds-0.6.7 \ + miow-0.2.1 \ + miow-0.3.3 \ + net2-0.2.33 \ + nodrop-0.1.12 \ + num-integer-0.1.39 \ + num-traits-0.2.6 \ + num_cpus-1.8.0 \ + owning_ref-0.3.3 \ + parking_lot-0.6.4 \ + parking_lot_core-0.3.1 \ + proc-macro2-0.4.20 \ + quick-error-1.2.2 \ + quote-0.6.9 \ + rand-0.4.3 \ + rand-0.5.5 \ + rand_core-0.2.2 \ + rand_core-0.3.0 \ + redox_syscall-0.1.40 \ + redox_termios-0.1.1 \ + redox_users-0.2.0 \ + regex-1.0.6 \ + regex-syntax-0.6.2 \ + ring-0.13.3 \ + rpki-0.1.0 \ + rustc-demangle-0.1.9 \ + rustc_version-0.2.3 \ + safemem-0.3.0 \ + scoped_threadpool-0.1.9 \ + scopeguard-0.3.3 \ + semver-0.9.0 \ + semver-parser-0.7.0 \ + signal-hook-0.1.5 \ + slab-0.4.1 \ + smallvec-0.6.5 \ + socket2-0.3.8 \ + stable_deref_trait-1.1.1 \ + strsim-0.7.0 \ + syn-0.15.18 \ + synstructure-0.10.1 \ + syslog-4.0.1 \ + termcolor-1.0.4 \ + termion-1.5.1 \ + textwrap-0.10.0 \ + thread_local-0.3.6 \ + time-0.1.40 \ + tokio-0.1.11 \ + tokio-codec-0.1.1 \ + tokio-current-thread-0.1.3 \ + tokio-executor-0.1.5 \ + tokio-fs-0.1.4 \ + tokio-io-0.1.10 \ + tokio-process-0.2.3 \ + tokio-reactor-0.1.6 \ + tokio-signal-0.2.6 \ + tokio-tcp-0.1.2 \ + tokio-threadpool-0.1.8 \ + tokio-timer-0.2.7 \ + tokio-udp-0.1.2 \ + tokio-uds-0.2.3 \ + ucd-util-0.1.2 \ + unicode-width-0.1.5 \ + unicode-xid-0.1.0 \ + unreachable-1.0.0 \ + untrusted-0.6.2 \ + utf8-ranges-1.0.2 \ + vec_map-0.8.1 \ + version_check-0.1.5 \ + void-1.0.2 \ + winapi-0.2.8 \ + winapi-0.3.6 \ + winapi-build-0.1.1 \ + winapi-i686-pc-windows-gnu-0.4.0 \ + winapi-util-0.1.1 \ + winapi-x86_64-pc-windows-gnu-0.4.0 \ + wincolor-1.0.1 \ + ws2_32-sys-0.2.1 \ + xml-rs-0.8.0 + +PLIST_FILES= bin/routinator \ + man/man1/routinator.1.gz + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/routinator + ${INSTALL_MAN} ${WRKSRC}/doc/routinator.1 ${STAGEDIR}${PREFIX}/man/man1/ + +.include diff --git a/net/routinator/distinfo b/net/routinator/distinfo new file mode 100644 index 00000000000..3e8abe3a6d6 --- /dev/null +++ b/net/routinator/distinfo @@ -0,0 +1,253 @@ +TIMESTAMP = 1541801171 +SHA256 (rust/crates/aho-corasick-0.6.9.tar.gz) = 1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e +SIZE (rust/crates/aho-corasick-0.6.9.tar.gz) = 25979 +SHA256 (rust/crates/ansi_term-0.11.0.tar.gz) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b +SIZE (rust/crates/ansi_term-0.11.0.tar.gz) = 17087 +SHA256 (rust/crates/arc-swap-0.3.4.tar.gz) = af192669a9f44d2fb63c691a04183c8e12428f34041449270b08c0456587f5a5 +SIZE (rust/crates/arc-swap-0.3.4.tar.gz) = 35767 +SHA256 (rust/crates/argon2rs-0.2.5.tar.gz) = 3f67b0b6a86dae6e67ff4ca2b6201396074996379fba2b92ff649126f37cb392 +SIZE (rust/crates/argon2rs-0.2.5.tar.gz) = 353096 +SHA256 (rust/crates/arrayvec-0.4.7.tar.gz) = a1e964f9e24d588183fcb43503abda40d288c8657dfc27311516ce2f05675aef +SIZE (rust/crates/arrayvec-0.4.7.tar.gz) = 22946 +SHA256 (rust/crates/atty-0.2.11.tar.gz) = 9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652 +SIZE (rust/crates/atty-0.2.11.tar.gz) = 5916 +SHA256 (rust/crates/backtrace-0.3.9.tar.gz) = 89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a +SIZE (rust/crates/backtrace-0.3.9.tar.gz) = 31054 +SHA256 (rust/crates/backtrace-sys-0.1.24.tar.gz) = c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0 +SIZE (rust/crates/backtrace-sys-0.1.24.tar.gz) = 522332 +SHA256 (rust/crates/base64-0.9.3.tar.gz) = 489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643 +SIZE (rust/crates/base64-0.9.3.tar.gz) = 37993 +SHA256 (rust/crates/bcder-0.1.0.tar.gz) = 5f3c9ea672decc964b19eab3be7cf23c8c3869ec122b53d49f50d0622f104d57 +SIZE (rust/crates/bcder-0.1.0.tar.gz) = 47486 +SHA256 (rust/crates/bitflags-1.0.4.tar.gz) = 228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12 +SIZE (rust/crates/bitflags-1.0.4.tar.gz) = 15282 +SHA256 (rust/crates/blake2-rfc-0.2.18.tar.gz) = 5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400 +SIZE (rust/crates/blake2-rfc-0.2.18.tar.gz) = 15676 +SHA256 (rust/crates/byteorder-1.2.7.tar.gz) = 94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d +SIZE (rust/crates/byteorder-1.2.7.tar.gz) = 19640 +SHA256 (rust/crates/bytes-0.4.10.tar.gz) = 0ce55bd354b095246fc34caf4e9e242f5297a7fd938b090cadfea6eee614aa62 +SIZE (rust/crates/bytes-0.4.10.tar.gz) = 45541 +SHA256 (rust/crates/cc-1.0.25.tar.gz) = f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16 +SIZE (rust/crates/cc-1.0.25.tar.gz) = 43191 +SHA256 (rust/crates/cfg-if-0.1.6.tar.gz) = 082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4 +SIZE (rust/crates/cfg-if-0.1.6.tar.gz) = 7411 +SHA256 (rust/crates/chrono-0.4.6.tar.gz) = 45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878 +SIZE (rust/crates/chrono-0.4.6.tar.gz) = 133108 +SHA256 (rust/crates/clap-2.32.0.tar.gz) = b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e +SIZE (rust/crates/clap-2.32.0.tar.gz) = 196073 +SHA256 (rust/crates/cloudabi-0.0.3.tar.gz) = ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f +SIZE (rust/crates/cloudabi-0.0.3.tar.gz) = 22156 +SHA256 (rust/crates/constant_time_eq-0.1.3.tar.gz) = 8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e +SIZE (rust/crates/constant_time_eq-0.1.3.tar.gz) = 1279 +SHA256 (rust/crates/crossbeam-deque-0.6.1.tar.gz) = 3486aefc4c0487b9cb52372c97df0a48b8c249514af1ee99703bf70d2f2ceda1 +SIZE (rust/crates/crossbeam-deque-0.6.1.tar.gz) = 14343 +SHA256 (rust/crates/crossbeam-epoch-0.5.2.tar.gz) = 30fecfcac6abfef8771151f8be4abc9e4edc112c2bcb233314cafde2680536e9 +SIZE (rust/crates/crossbeam-epoch-0.5.2.tar.gz) = 34136 +SHA256 (rust/crates/crossbeam-utils-0.5.0.tar.gz) = 677d453a17e8bd2b913fa38e8b9cf04bcdbb5be790aa294f2389661d72036015 +SIZE (rust/crates/crossbeam-utils-0.5.0.tar.gz) = 12162 +SHA256 (rust/crates/daemonize-0.3.0.tar.gz) = 4093d27eb267d617f03c2ee25d4c3ca525b89a76154001954a11984508ffbde5 +SIZE (rust/crates/daemonize-0.3.0.tar.gz) = 14236 +SHA256 (rust/crates/dirs-1.0.4.tar.gz) = 88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a +SIZE (rust/crates/dirs-1.0.4.tar.gz) = 12844 +SHA256 (rust/crates/env_logger-0.5.13.tar.gz) = 15b0a4d2e39f8420210be8b27eeda28029729e2fd4291019455016c348240c38 +SIZE (rust/crates/env_logger-0.5.13.tar.gz) = 25275 +SHA256 (rust/crates/error-chain-0.11.0.tar.gz) = ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3 +SIZE (rust/crates/error-chain-0.11.0.tar.gz) = 27207 +SHA256 (rust/crates/failure-0.1.3.tar.gz) = 6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7 +SIZE (rust/crates/failure-0.1.3.tar.gz) = 34107 +SHA256 (rust/crates/failure_derive-0.1.3.tar.gz) = 64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596 +SIZE (rust/crates/failure_derive-0.1.3.tar.gz) = 4349 +SHA256 (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82 +SIZE (rust/crates/fuchsia-zircon-0.3.3.tar.gz) = 22565 +SHA256 (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7 +SIZE (rust/crates/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191 +SHA256 (rust/crates/futures-0.1.25.tar.gz) = 49e7653e374fe0d0c12de4250f0bdb60680b8c80eed558c5c7538eec9c89e21b +SIZE (rust/crates/futures-0.1.25.tar.gz) = 158626 +SHA256 (rust/crates/futures-cpupool-0.1.8.tar.gz) = ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4 +SIZE (rust/crates/futures-cpupool-0.1.8.tar.gz) = 10583 +SHA256 (rust/crates/hex-0.3.2.tar.gz) = 805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77 +SIZE (rust/crates/hex-0.3.2.tar.gz) = 9053 +SHA256 (rust/crates/humantime-1.1.1.tar.gz) = 0484fda3e7007f2a4a0d9c3a703ca38c71c54c55602ce4660c419fd32e188c9e +SIZE (rust/crates/humantime-1.1.1.tar.gz) = 16689 +SHA256 (rust/crates/iovec-0.1.2.tar.gz) = dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08 +SIZE (rust/crates/iovec-0.1.2.tar.gz) = 8565 +SHA256 (rust/crates/json-0.11.13.tar.gz) = 9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be +SIZE (rust/crates/json-0.11.13.tar.gz) = 46704 +SHA256 (rust/crates/kernel32-sys-0.2.2.tar.gz) = 7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d +SIZE (rust/crates/kernel32-sys-0.2.2.tar.gz) = 24537 +SHA256 (rust/crates/lazy_static-1.2.0.tar.gz) = a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1 +SIZE (rust/crates/lazy_static-1.2.0.tar.gz) = 10840 +SHA256 (rust/crates/lazycell-1.2.0.tar.gz) = ddba4c30a78328befecec92fc94970e53b3ae385827d28620f0f5bb2493081e0 +SIZE (rust/crates/lazycell-1.2.0.tar.gz) = 11259 +SHA256 (rust/crates/libc-0.2.43.tar.gz) = 76e3a3ef172f1a0b9a9ff0dd1491ae5e6c948b94479a3021819ba7d860c8645d +SIZE (rust/crates/libc-0.2.43.tar.gz) = 353810 +SHA256 (rust/crates/lock_api-0.1.4.tar.gz) = 775751a3e69bde4df9b38dd00a1b5d6ac13791e4223d4a0506577f0dd27cfb7a +SIZE (rust/crates/lock_api-0.1.4.tar.gz) = 16959 +SHA256 (rust/crates/log-0.4.6.tar.gz) = c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6 +SIZE (rust/crates/log-0.4.6.tar.gz) = 22303 +SHA256 (rust/crates/memchr-2.1.1.tar.gz) = 0a3eb002f0535929f1199681417029ebea04aadc0c7a4224b46be99c7f5d6a16 +SIZE (rust/crates/memchr-2.1.1.tar.gz) = 19591 +SHA256 (rust/crates/memoffset-0.2.1.tar.gz) = 0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3 +SIZE (rust/crates/memoffset-0.2.1.tar.gz) = 4618 +SHA256 (rust/crates/mio-0.6.16.tar.gz) = 71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432 +SIZE (rust/crates/mio-0.6.16.tar.gz) = 126174 +SHA256 (rust/crates/mio-named-pipes-0.1.6.tar.gz) = f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3 +SIZE (rust/crates/mio-named-pipes-0.1.6.tar.gz) = 14766 +SHA256 (rust/crates/mio-uds-0.6.7.tar.gz) = 966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125 +SIZE (rust/crates/mio-uds-0.6.7.tar.gz) = 14389 +SHA256 (rust/crates/miow-0.2.1.tar.gz) = 8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919 +SIZE (rust/crates/miow-0.2.1.tar.gz) = 21133 +SHA256 (rust/crates/miow-0.3.3.tar.gz) = 396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226 +SIZE (rust/crates/miow-0.3.3.tar.gz) = 22850 +SHA256 (rust/crates/net2-0.2.33.tar.gz) = 42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88 +SIZE (rust/crates/net2-0.2.33.tar.gz) = 20936 +SHA256 (rust/crates/nodrop-0.1.12.tar.gz) = 9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2 +SIZE (rust/crates/nodrop-0.1.12.tar.gz) = 3033 +SHA256 (rust/crates/num-integer-0.1.39.tar.gz) = e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea +SIZE (rust/crates/num-integer-0.1.39.tar.gz) = 17881 +SHA256 (rust/crates/num-traits-0.2.6.tar.gz) = 0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1 +SIZE (rust/crates/num-traits-0.2.6.tar.gz) = 39923 +SHA256 (rust/crates/num_cpus-1.8.0.tar.gz) = c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30 +SIZE (rust/crates/num_cpus-1.8.0.tar.gz) = 10539 +SHA256 (rust/crates/owning_ref-0.3.3.tar.gz) = cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37 +SIZE (rust/crates/owning_ref-0.3.3.tar.gz) = 11710 +SHA256 (rust/crates/parking_lot-0.6.4.tar.gz) = f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5 +SIZE (rust/crates/parking_lot-0.6.4.tar.gz) = 31890 +SHA256 (rust/crates/parking_lot_core-0.3.1.tar.gz) = ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c +SIZE (rust/crates/parking_lot_core-0.3.1.tar.gz) = 26635 +SHA256 (rust/crates/proc-macro2-0.4.20.tar.gz) = 3d7b7eaaa90b4a90a932a9ea6666c95a389e424eff347f0f793979289429feee +SIZE (rust/crates/proc-macro2-0.4.20.tar.gz) = 30516 +SHA256 (rust/crates/quick-error-1.2.2.tar.gz) = 9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0 +SIZE (rust/crates/quick-error-1.2.2.tar.gz) = 15132 +SHA256 (rust/crates/quote-0.6.9.tar.gz) = 63b5829244f52738cfee93b3a165c1911388675be000c888d2fae620dee8fa5b +SIZE (rust/crates/quote-0.6.9.tar.gz) = 15673 +SHA256 (rust/crates/rand-0.4.3.tar.gz) = 8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd +SIZE (rust/crates/rand-0.4.3.tar.gz) = 76094 +SHA256 (rust/crates/rand-0.5.5.tar.gz) = e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c +SIZE (rust/crates/rand-0.5.5.tar.gz) = 137359 +SHA256 (rust/crates/rand_core-0.2.2.tar.gz) = 1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372 +SIZE (rust/crates/rand_core-0.2.2.tar.gz) = 15450 +SHA256 (rust/crates/rand_core-0.3.0.tar.gz) = 0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db +SIZE (rust/crates/rand_core-0.3.0.tar.gz) = 20581 +SHA256 (rust/crates/redox_syscall-0.1.40.tar.gz) = c214e91d3ecf43e9a4e41e578973adeb14b474f2bee858742d127af75a0112b1 +SIZE (rust/crates/redox_syscall-0.1.40.tar.gz) = 14745 +SHA256 (rust/crates/redox_termios-0.1.1.tar.gz) = 7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76 +SIZE (rust/crates/redox_termios-0.1.1.tar.gz) = 3227 +SHA256 (rust/crates/redox_users-0.2.0.tar.gz) = 214a97e49be64fd2c86f568dd0cb2c757d2cc53de95b273b6ad0a1c908482f26 +SIZE (rust/crates/redox_users-0.2.0.tar.gz) = 11104 +SHA256 (rust/crates/regex-1.0.6.tar.gz) = ee84f70c8c08744ea9641a731c7fadb475bf2ecc52d7f627feb833e0b3990467 +SIZE (rust/crates/regex-1.0.6.tar.gz) = 239455 +SHA256 (rust/crates/regex-syntax-0.6.2.tar.gz) = 747ba3b235651f6e2f67dfa8bcdcd073ddb7c243cb21c442fc12395dfcac212d +SIZE (rust/crates/regex-syntax-0.6.2.tar.gz) = 238572 +SHA256 (rust/crates/ring-0.13.3.tar.gz) = 7ed733c36010c3d4d4718588f16a6c06a670b01c0047029ae81c3ca0acd81ff5 +SIZE (rust/crates/ring-0.13.3.tar.gz) = 5420229 +SHA256 (rust/crates/rpki-0.1.0.tar.gz) = 9fa5d3d2bb1e0d4adcdee4e97907063e587cfd53332b28579e9a027b03e98158 +SIZE (rust/crates/rpki-0.1.0.tar.gz) = 63251 +SHA256 (rust/crates/rustc-demangle-0.1.9.tar.gz) = bcfe5b13211b4d78e5c2cadfebd7769197d95c639c35a50057eb4c05de811395 +SIZE (rust/crates/rustc-demangle-0.1.9.tar.gz) = 11463 +SHA256 (rust/crates/rustc_version-0.2.3.tar.gz) = 138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a +SIZE (rust/crates/rustc_version-0.2.3.tar.gz) = 10210 +SHA256 (rust/crates/safemem-0.3.0.tar.gz) = 8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9 +SIZE (rust/crates/safemem-0.3.0.tar.gz) = 6947 +SHA256 (rust/crates/scoped_threadpool-0.1.9.tar.gz) = 1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8 +SIZE (rust/crates/scoped_threadpool-0.1.9.tar.gz) = 7800 +SHA256 (rust/crates/scopeguard-0.3.3.tar.gz) = 94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27 +SIZE (rust/crates/scopeguard-0.3.3.tar.gz) = 9605 +SHA256 (rust/crates/semver-0.9.0.tar.gz) = 1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403 +SIZE (rust/crates/semver-0.9.0.tar.gz) = 17344 +SHA256 (rust/crates/semver-parser-0.7.0.tar.gz) = 388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3 +SIZE (rust/crates/semver-parser-0.7.0.tar.gz) = 10268 +SHA256 (rust/crates/signal-hook-0.1.5.tar.gz) = f7ca1f1c0ed6c8beaab713ad902c041e4f09d06e1b4bb74c5fc553c078ed0110 +SIZE (rust/crates/signal-hook-0.1.5.tar.gz) = 22527 +SHA256 (rust/crates/slab-0.4.1.tar.gz) = 5f9776d6b986f77b35c6cf846c11ad986ff128fe0b2b63a3628e3755e8d3102d +SIZE (rust/crates/slab-0.4.1.tar.gz) = 9479 +SHA256 (rust/crates/smallvec-0.6.5.tar.gz) = 153ffa32fd170e9944f7e0838edf824a754ec4c1fc64746fcc9fe1f8fa602e5d +SIZE (rust/crates/smallvec-0.6.5.tar.gz) = 20238 +SHA256 (rust/crates/socket2-0.3.8.tar.gz) = c4d11a52082057d87cb5caa31ad812f4504b97ab44732cd8359df2e9ff9f48e7 +SIZE (rust/crates/socket2-0.3.8.tar.gz) = 30379 +SHA256 (rust/crates/stable_deref_trait-1.1.1.tar.gz) = dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8 +SIZE (rust/crates/stable_deref_trait-1.1.1.tar.gz) = 8007 +SHA256 (rust/crates/strsim-0.7.0.tar.gz) = bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550 +SIZE (rust/crates/strsim-0.7.0.tar.gz) = 8435 +SHA256 (rust/crates/syn-0.15.18.tar.gz) = 90c39a061e2f412a9f869540471ab679e85e50c6b05604daf28bc3060f75c430 +SIZE (rust/crates/syn-0.15.18.tar.gz) = 144614 +SHA256 (rust/crates/synstructure-0.10.1.tar.gz) = 73687139bf99285483c96ac0add482c3776528beac1d97d444f6e91f203a2015 +SIZE (rust/crates/synstructure-0.10.1.tar.gz) = 17836 +SHA256 (rust/crates/syslog-4.0.1.tar.gz) = a0641142b4081d3d44beffa4eefd7346a228cdf91ed70186db2ca2cef762d327 +SIZE (rust/crates/syslog-4.0.1.tar.gz) = 7131 +SHA256 (rust/crates/termcolor-1.0.4.tar.gz) = 4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f +SIZE (rust/crates/termcolor-1.0.4.tar.gz) = 14416 +SHA256 (rust/crates/termion-1.5.1.tar.gz) = 689a3bdfaab439fd92bc87df5c4c78417d3cbe537487274e9b0b2dce76e92096 +SIZE (rust/crates/termion-1.5.1.tar.gz) = 20659 +SHA256 (rust/crates/textwrap-0.10.0.tar.gz) = 307686869c93e71f94da64286f9a9524c0f308a9e1c87a583de8e9c9039ad3f6 +SIZE (rust/crates/textwrap-0.10.0.tar.gz) = 15986 +SHA256 (rust/crates/thread_local-0.3.6.tar.gz) = c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b +SIZE (rust/crates/thread_local-0.3.6.tar.gz) = 12388 +SHA256 (rust/crates/time-0.1.40.tar.gz) = d825be0eb33fda1a7e68012d51e9c7f451dc1a69391e7fdc197060bb8c56667b +SIZE (rust/crates/time-0.1.40.tar.gz) = 29518 +SHA256 (rust/crates/tokio-0.1.11.tar.gz) = 6e93c78d23cc61aa245a8acd2c4a79c4d7fa7fb5c3ca90d5737029f043a84895 +SIZE (rust/crates/tokio-0.1.11.tar.gz) = 76732 +SHA256 (rust/crates/tokio-codec-0.1.1.tar.gz) = 5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f +SIZE (rust/crates/tokio-codec-0.1.1.tar.gz) = 7617 +SHA256 (rust/crates/tokio-current-thread-0.1.3.tar.gz) = f90fcd90952f0a496d438a976afba8e5c205fb12123f813d8ab3aa1c8436638c +SIZE (rust/crates/tokio-current-thread-0.1.3.tar.gz) = 19187 +SHA256 (rust/crates/tokio-executor-0.1.5.tar.gz) = c117b6cf86bb730aab4834f10df96e4dd586eff2c3c27d3781348da49e255bde +SIZE (rust/crates/tokio-executor-0.1.5.tar.gz) = 10540 +SHA256 (rust/crates/tokio-fs-0.1.4.tar.gz) = 60ae25f6b17d25116d2cba342083abe5255d3c2c79cb21ea11aa049c53bf7c75 +SIZE (rust/crates/tokio-fs-0.1.4.tar.gz) = 12706 +SHA256 (rust/crates/tokio-io-0.1.10.tar.gz) = 7392fe0a70d5ce0c882c4778116c519bd5dbaa8a7c3ae3d04578b3afafdcda21 +SIZE (rust/crates/tokio-io-0.1.10.tar.gz) = 33143 +SHA256 (rust/crates/tokio-process-0.2.3.tar.gz) = 88e1281e412013f1ff5787def044a9577a0bed059f451e835f1643201f8b777d +SIZE (rust/crates/tokio-process-0.2.3.tar.gz) = 19886 +SHA256 (rust/crates/tokio-reactor-0.1.6.tar.gz) = 4b26fd37f1125738b2170c80b551f69ff6fecb277e6e5ca885e53eec2b005018 +SIZE (rust/crates/tokio-reactor-0.1.6.tar.gz) = 23376 +SHA256 (rust/crates/tokio-signal-0.2.6.tar.gz) = 40da88e6445ed335e14746b60986a6c8b3632b09bc9097df76b4a6ddd16f1f92 +SIZE (rust/crates/tokio-signal-0.2.6.tar.gz) = 14571 +SHA256 (rust/crates/tokio-tcp-0.1.2.tar.gz) = 7ad235e9dadd126b2d47f6736f65aa1fdcd6420e66ca63f44177bc78df89f912 +SIZE (rust/crates/tokio-tcp-0.1.2.tar.gz) = 10633 +SHA256 (rust/crates/tokio-threadpool-0.1.8.tar.gz) = 3929aee321c9220ed838ed6c3928be7f9b69986b0e3c22c972a66dbf8a298c68 +SIZE (rust/crates/tokio-threadpool-0.1.8.tar.gz) = 48430 +SHA256 (rust/crates/tokio-timer-0.2.7.tar.gz) = 3a52f00c97fedb6d535d27f65cccb7181c8dd4c6edc3eda9ea93f6d45d05168e +SIZE (rust/crates/tokio-timer-0.2.7.tar.gz) = 35395 +SHA256 (rust/crates/tokio-udp-0.1.2.tar.gz) = da941144b816d0dcda4db3a1ba87596e4df5e860a72b70783fe435891f80601c +SIZE (rust/crates/tokio-udp-0.1.2.tar.gz) = 9765 +SHA256 (rust/crates/tokio-uds-0.2.3.tar.gz) = df195376b43508f01570bacc73e13a1de0854dc59e79d1ec09913e8db6dd2a70 +SIZE (rust/crates/tokio-uds-0.2.3.tar.gz) = 9389 +SHA256 (rust/crates/ucd-util-0.1.2.tar.gz) = d0f8bfa9ff0cadcd210129ad9d2c5f145c13e9ced3d3e5d948a6213487d52444 +SIZE (rust/crates/ucd-util-0.1.2.tar.gz) = 24992 +SHA256 (rust/crates/unicode-width-0.1.5.tar.gz) = 882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526 +SIZE (rust/crates/unicode-width-0.1.5.tar.gz) = 15761 +SHA256 (rust/crates/unicode-xid-0.1.0.tar.gz) = fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc +SIZE (rust/crates/unicode-xid-0.1.0.tar.gz) = 16000 +SHA256 (rust/crates/unreachable-1.0.0.tar.gz) = 382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56 +SIZE (rust/crates/unreachable-1.0.0.tar.gz) = 6355 +SHA256 (rust/crates/untrusted-0.6.2.tar.gz) = 55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f +SIZE (rust/crates/untrusted-0.6.2.tar.gz) = 7526 +SHA256 (rust/crates/utf8-ranges-1.0.2.tar.gz) = 796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737 +SIZE (rust/crates/utf8-ranges-1.0.2.tar.gz) = 8510 +SHA256 (rust/crates/vec_map-0.8.1.tar.gz) = 05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a +SIZE (rust/crates/vec_map-0.8.1.tar.gz) = 14959 +SHA256 (rust/crates/version_check-0.1.5.tar.gz) = 914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd +SIZE (rust/crates/version_check-0.1.5.tar.gz) = 8173 +SHA256 (rust/crates/void-1.0.2.tar.gz) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d +SIZE (rust/crates/void-1.0.2.tar.gz) = 2356 +SHA256 (rust/crates/winapi-0.2.8.tar.gz) = 167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a +SIZE (rust/crates/winapi-0.2.8.tar.gz) = 455145 +SHA256 (rust/crates/winapi-0.3.6.tar.gz) = 92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0 +SIZE (rust/crates/winapi-0.3.6.tar.gz) = 1029391 +SHA256 (rust/crates/winapi-build-0.1.1.tar.gz) = 2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc +SIZE (rust/crates/winapi-build-0.1.1.tar.gz) = 669 +SHA256 (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 +SIZE (rust/crates/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 +SHA256 (rust/crates/winapi-util-0.1.1.tar.gz) = afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab +SIZE (rust/crates/winapi-util-0.1.1.tar.gz) = 7635 +SHA256 (rust/crates/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f +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 +SIZE (rust/crates/wincolor-1.0.1.tar.gz) = 4737 +SHA256 (rust/crates/ws2_32-sys-0.2.1.tar.gz) = d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e +SIZE (rust/crates/ws2_32-sys-0.2.1.tar.gz) = 4697 +SHA256 (rust/crates/xml-rs-0.8.0.tar.gz) = 541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5 +SIZE (rust/crates/xml-rs-0.8.0.tar.gz) = 50974 +SHA256 (NLnetLabs-routinator-v0.1.2_GH0.tar.gz) = a3c3c1bfddb9a2f66318b4ecd43d1df139df1fc7b1f2f2f5090820baf9813f90 +SIZE (NLnetLabs-routinator-v0.1.2_GH0.tar.gz) = 42500 diff --git a/net/routinator/pkg-descr b/net/routinator/pkg-descr new file mode 100644 index 00000000000..143bed3dcca --- /dev/null +++ b/net/routinator/pkg-descr @@ -0,0 +1,8 @@ +Routinator collects Resource Public Key Infrastructure cryptographically +signed statements about the association of Internet routing resources +and constructs a list of associations between IP address prefixes +and AS numbers. It provides this information to routers supporting +the RPKI-RTR protocol or publishes this in a number of useful +formats. + +WWW: https://github.com/NLnetLabs/routinator diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 26ce32cc1a2..1e0b09eac9d 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= wireshark -PORTVERSION= 2.6.4 +PORTVERSION= 2.6.5 PORTREVISION?= 0 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ @@ -52,7 +52,7 @@ CFLAGS+= -funit-at-a-time PLIST_SUB+= PORTVERSION=${PORTVERSION} .for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \ - reordercap captype randpktdump udpdump sharkd dumpcap + reordercap captype randpktdump udpdump sharkd dumpcap ciscodump sshdump .if defined(LITE) PKGNAMESUFFIX= -lite PLIST_SUB+= ${x:tu}="@comment $x not installed" \ diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo index 1343e9a9706..5c69a5d29ba 100644 --- a/net/wireshark/distinfo +++ b/net/wireshark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539426230 -SHA256 (wireshark-2.6.4.tar.xz) = a06b007e6343f148b8b93443b2fcfc9bb3204311cd268565d54d1b71660bc861 -SIZE (wireshark-2.6.4.tar.xz) = 28218232 +TIMESTAMP = 1544215216 +SHA256 (wireshark-2.6.5.tar.xz) = 93155b798544b2f07693920f4ac1b531c952965ee4eb1d98419961240177438a +SIZE (wireshark-2.6.5.tar.xz) = 28390292 diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist index 940deb816f8..32218b96b71 100644 --- a/net/wireshark/pkg-plist +++ b/net/wireshark/pkg-plist @@ -637,10 +637,10 @@ include/wireshark/wsutil/wspcap.h include/wireshark/wsutil/xtea.h lib/libwireshark.so lib/libwireshark.so.10 -lib/libwireshark.so.10.1.4 +lib/libwireshark.so.10.1.5 lib/libwiretap.so lib/libwiretap.so.8 -lib/libwiretap.so.8.0.4 +lib/libwiretap.so.8.0.5 %%GUI%%lib/libwscodecs.so %%GUI%%lib/libwscodecs.so.2 %%GUI%%lib/libwscodecs.so.2.0.0 @@ -648,7 +648,9 @@ lib/libwsutil.so lib/libwsutil.so.9 lib/libwsutil.so.9.0.0 %%ANDROIDDUMP_LIB%%lib/wireshark/extcap/androiddump +%%CISCODUMP_LIB%%lib/wireshark/extcap/ciscodump %%RANDPKTDUMP_LIB%%lib/wireshark/extcap/randpktdump +%%SSHDUMP_LIB%%lib/wireshark/extcap/sshdump %%UDPDUMP_LIB%%lib/wireshark/extcap/udpdump lib/wireshark/plugins/2.6/codecs/l16mono.so lib/wireshark/plugins/2.6/epan/ethercat.so @@ -668,6 +670,7 @@ libdata/pkgconfig/wireshark.pc %%ANDROIDDUMP_MAN%%man/man1/androiddump.1.gz %%CAPINFOS_MAN%%man/man1/capinfos.1.gz %%CAPTYPE_MAN%%man/man1/captype.1.gz +%%CISCODUMP_MAN%%man/man1/ciscodump.1.gz %%DFTEST_MAN%%man/man1/dftest.1.gz %%DUMPCAP_MAN%%man/man1/dumpcap.1.gz %%EDITCAP_MAN%%man/man1/editcap.1.gz @@ -676,6 +679,7 @@ libdata/pkgconfig/wireshark.pc %%RANDPKTDUMP_MAN%%man/man1/randpktdump.1.gz %%RAWSHARK_MAN%%man/man1/rawshark.1.gz %%REORDERCAP_MAN%%man/man1/reordercap.1.gz +%%SSHDUMP_MAN%%man/man1/sshdump.1.gz %%TEXT2PCAP_MAN%%man/man1/text2pcap.1.gz man/man1/tshark.1.gz %%UDPDUMP_MAN%%man/man1/udpdump.1.gz diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile index 91a0553db36..34656abe9cb 100644 --- a/ports-mgmt/tinderbox/Makefile +++ b/ports-mgmt/tinderbox/Makefile @@ -14,7 +14,7 @@ COMMENT= Port build tinderbox system DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 RUN_DEPENDS= dialog4ports-static:ports-mgmt/dialog4ports-static diff --git a/print/lyx/Makefile b/print/lyx/Makefile index a8037898c92..40db97b640e 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -3,7 +3,7 @@ PORTNAME= lyx PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION} -PORTREVISION= 1 +DISTVERSIONSUFFIX= -2 CATEGORIES= print editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \ @@ -14,12 +14,15 @@ MAINTAINER= rakuco@FreeBSD.org COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libboost_regex.so:devel/boost-libs \ libmythes-1.2.so:textproc/mythes +WRKSRC= ${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX}$$,,} + MAJOR_VERSION= 2.3 -MINOR_VERSION= 0 +MINOR_VERSION= 1 USES= desktop-file-utils gmake iconv pkgconfig perl5 \ python:2.7 qt:5 shebangfix tar:xz diff --git a/print/lyx/distinfo b/print/lyx/distinfo index 43247b70de3..ecaf8b23e44 100644 --- a/print/lyx/distinfo +++ b/print/lyx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1526500182 -SHA256 (lyx-2.3.0.tar.xz) = 310f556adbfafd243f2c17a0be0d22fa50b9b4f7de41e66625cace8ea088b92b -SIZE (lyx-2.3.0.tar.xz) = 15676680 +TIMESTAMP = 1544182147 +SHA256 (lyx-2.3.1-2.tar.xz) = f5c9450ba196ed9d49fbc573f65b10d1726d16a62453466957aba2a9f6d66f84 +SIZE (lyx-2.3.1-2.tar.xz) = 15800168 diff --git a/print/lyx/files/patch-gentoo_git-lyx-2.3.0-qt-5.11.patch b/print/lyx/files/patch-gentoo_git-lyx-2.3.0-qt-5.11.patch deleted file mode 100644 index d21053e3658..00000000000 --- a/print/lyx/files/patch-gentoo_git-lyx-2.3.0-qt-5.11.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://gitweb.gentoo.org/repo/gentoo.git/plain/app-office/lyx/files/lyx-2.3.0-qt-5.11.patch - ---- src/frontends/qt4/GuiDocument.cpp 2018-02-25 01:11:18.000000000 +0100 -+++ src/frontends/qt4/GuiDocument.cpp 2018-03-30 19:45:47.283928297 +0200 -@@ -68,11 +68,12 @@ - #include "frontends/alert.h" - - #include --#include -+#include - #include - #include - #include - #include -+#include - #include - #include - #include - diff --git a/print/pecl-haru/Makefile b/print/pecl-haru/Makefile index 4c488314bfb..3f5c8167e7c 100644 --- a/print/pecl-haru/Makefile +++ b/print/pecl-haru/Makefile @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/hpdf.h:print/libharu RUN_DEPENDS:= ${LOCALBASE}/include/hpdf.h:print/libharu USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS+= --with-haru=${LOCALBASE} CFLAGS+= -I${LOCALBASE}/include diff --git a/print/pecl-ps/Makefile b/print/pecl-ps/Makefile index 49e7e390cb3..4a1a1c09765 100644 --- a/print/pecl-ps/Makefile +++ b/print/pecl-ps/Makefile @@ -14,7 +14,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP202 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 LIB_DEPENDS= libps.so:print/pslib diff --git a/science/Makefile b/science/Makefile index c2a52b40656..df94b532ae5 100644 --- a/science/Makefile +++ b/science/Makefile @@ -238,6 +238,7 @@ SUBDIR += py-pupynere SUBDIR += py-pyaixi SUBDIR += py-pydicom + SUBDIR += py-pygeodesy SUBDIR += py-pymatgen SUBDIR += py-pymol SUBDIR += py-pyosf diff --git a/science/atompaw/Makefile b/science/atompaw/Makefile index c72500d49af..7b23e3619c1 100644 --- a/science/atompaw/Makefile +++ b/science/atompaw/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= atompaw -DISTVERSION= 4.1.0.4 +DISTVERSION= 4.1.0.5 CATEGORIES= science -MASTER_SITES= http://www.wfu.edu/~natalie/papers/pwpaw/ +MASTER_SITES= http://users.wfu.edu/natalie/papers/pwpaw/ MAINTAINER= yuri@FreeBSD.org COMMENT= Tool for projector augmented wave functions for molecular simulations @@ -13,12 +13,12 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= liblapack.so:math/lapack \ libblas.so:math/blas -OPTIONS_DEFINE= DOCS - USES= fortran gmake libtool GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes +OPTIONS_DEFINE= DOCS + PORTDOCS= * PLIST_FILES= bin/atompaw \ diff --git a/science/atompaw/distinfo b/science/atompaw/distinfo index 4e255931b28..db6ff251bf3 100644 --- a/science/atompaw/distinfo +++ b/science/atompaw/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537454795 -SHA256 (atompaw-4.1.0.4.tar.gz) = 9f9d118e11b30856e4dd7b41deaeb9bf70ee416e1dd193637fc6154701fca281 -SIZE (atompaw-4.1.0.4.tar.gz) = 5643383 +TIMESTAMP = 1544168885 +SHA256 (atompaw-4.1.0.5.tar.gz) = d71d4c0ac83638b6b50aa976d97197ca8ed45188a13372a1d141d810857a05c1 +SIZE (atompaw-4.1.0.5.tar.gz) = 5643526 diff --git a/science/bagel/Makefile b/science/bagel/Makefile index 744620da9d1..a6d10aa4b4f 100644 --- a/science/bagel/Makefile +++ b/science/bagel/Makefile @@ -2,7 +2,7 @@ PORTNAME= bagel DISTVERSIONPREFIX= v -DISTVERSION= 1.2.0 +DISTVERSION= 1.2.1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -48,4 +48,6 @@ SMITH_DESC= Compile SMITH generated code SMITH_CONFIGURE_ENABLE= smith SMITH_IMPLIES= MPI +TEST_TARGET= check # tests fail to build: https://github.com/nubakery/bagel/issues/145 + .include diff --git a/science/bagel/distinfo b/science/bagel/distinfo index 6056a17d195..62ea338141a 100644 --- a/science/bagel/distinfo +++ b/science/bagel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540701986 -SHA256 (nubakery-bagel-v1.2.0_GH0.tar.gz) = a7676dbd2ecae3e9edc8d16f22d3b82d72ed7b01f6aa2d3ec28f6b7f3a85b580 -SIZE (nubakery-bagel-v1.2.0_GH0.tar.gz) = 41549094 +TIMESTAMP = 1544159002 +SHA256 (nubakery-bagel-v1.2.1_GH0.tar.gz) = b9051ed068f99bbf04dd7b40df260f2dab07f4231829462207bbf70d3e65e4f0 +SIZE (nubakery-bagel-v1.2.1_GH0.tar.gz) = 41549726 diff --git a/science/cdo/Makefile b/science/cdo/Makefile index d50c298356a..c97c9859bae 100644 --- a/science/cdo/Makefile +++ b/science/cdo/Makefile @@ -14,8 +14,6 @@ COMMENT= Climate Data Operators LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_powerpc64= fails to compile: remaplib.cc:1504:6: internal compiler error: in gsi_insert_seq_nodes_after, at gimple-iterator.c:283 - OPTIONS_DEFINE= CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID OPTIONS_DEFAULT=CGRIBEX HDF5 JASPER NETCDF PROJ SZIP UDUNITS UUID OPTIONS_SUB= yes diff --git a/science/coordgenlibs/Makefile b/science/coordgenlibs/Makefile index 228750e16f1..1de35663586 100644 --- a/science/coordgenlibs/Makefile +++ b/science/coordgenlibs/Makefile @@ -2,7 +2,7 @@ PORTNAME= coordgenlibs DISTVERSIONPREFIX= v -DISTVERSION= 1.1 +DISTVERSION= 1.2 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org diff --git a/science/coordgenlibs/distinfo b/science/coordgenlibs/distinfo index ddbe7773b36..c7c3799364f 100644 --- a/science/coordgenlibs/distinfo +++ b/science/coordgenlibs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540452456 -SHA256 (schrodinger-coordgenlibs-v1.1_GH0.tar.gz) = ed98793e819ed9a5c4bc1a10cb3335d335cbf69f84f35b78ba4a66389a8dea4f -SIZE (schrodinger-coordgenlibs-v1.1_GH0.tar.gz) = 131353 +TIMESTAMP = 1544082636 +SHA256 (schrodinger-coordgenlibs-v1.2_GH0.tar.gz) = d67e9982cd7ab560edee7d68e75fbc983ea49629411673bbce681683be26be54 +SIZE (schrodinger-coordgenlibs-v1.2_GH0.tar.gz) = 131439 diff --git a/science/coordgenlibs/pkg-plist b/science/coordgenlibs/pkg-plist index c41aea4b5cf..aa639862753 100644 --- a/science/coordgenlibs/pkg-plist +++ b/science/coordgenlibs/pkg-plist @@ -1,3 +1,4 @@ +include/coordgen/CoordgenConfig.hpp include/coordgen/CoordgenFragmentBuilder.h include/coordgen/CoordgenFragmenter.h include/coordgen/CoordgenMacrocycleBuilder.h @@ -17,4 +18,7 @@ include/coordgen/sketcherMinimizerResidue.h include/coordgen/sketcherMinimizerResidueInteraction.h include/coordgen/sketcherMinimizerRing.h include/coordgen/sketcherMinimizerStretchInteraction.h -lib/libcoordgenlibs.so +lib/libcoordgen.so +lib/libcoordgen.so.1 +lib/libcoordgen.so.1.2 +share/coordgen/templates.mae diff --git a/science/latte/Makefile b/science/latte/Makefile index d218af9617d..20eca45943b 100644 --- a/science/latte/Makefile +++ b/science/latte/Makefile @@ -41,4 +41,6 @@ MPI_PLIST_FILES_OFF= bin/LATTE_DOUBLE PLIST_FILES= lib/liblatte.so +CONFLICTS_INSTALL= latte-integrale + .include diff --git a/science/nwchem/Makefile b/science/nwchem/Makefile index 215f04a5a12..bf8da513206 100644 --- a/science/nwchem/Makefile +++ b/science/nwchem/Makefile @@ -4,6 +4,9 @@ PORTNAME= nwchem PORTVERSION= 6.8.1.20181107 CATEGORIES= science +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ +PATCHFILES= ce7c387b4f37c70947cb3b41a6beaf8fce628634.patch:-p2 + MAINTAINER= yuri@FreeBSD.org COMMENT= High-performance computational chemistry software diff --git a/science/nwchem/distinfo b/science/nwchem/distinfo index 86553ee13ab..3aedfda333b 100644 --- a/science/nwchem/distinfo +++ b/science/nwchem/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1541645398 +TIMESTAMP = 1544143113 SHA256 (nwchemgit-nwchem-6.8.1.20181107-master-oct22_2018-21-gd3913ef8b_GH0.tar.gz) = d496c76782299224ce42e944c69df6b5b1a8b1b9a20b18bacd7045c6228e9571 SIZE (nwchemgit-nwchem-6.8.1.20181107-master-oct22_2018-21-gd3913ef8b_GH0.tar.gz) = 166929038 +SHA256 (ce7c387b4f37c70947cb3b41a6beaf8fce628634.patch) = 7e690db9ab1af457bbd02086084deb9ab83c591dd332c0797890dd5c6be78019 +SIZE (ce7c387b4f37c70947cb3b41a6beaf8fce628634.patch) = 718 diff --git a/science/py-chempy/Makefile b/science/py-chempy/Makefile index f902f44d1f9..0d1145d2820 100644 --- a/science/py-chempy/Makefile +++ b/science/py-chempy/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= chempy -DISTVERSION= 0.7.6 +DISTVERSION= 0.7.7 CATEGORIES= science python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/science/py-chempy/distinfo b/science/py-chempy/distinfo index 28f3020fff0..b57fcb59b07 100644 --- a/science/py-chempy/distinfo +++ b/science/py-chempy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540786146 -SHA256 (chempy-0.7.6.tar.gz) = 07484905d40c267f9c5e4c498b93a3d5a4de50a0ad51943b5d9a735769c98ac3 -SIZE (chempy-0.7.6.tar.gz) = 163303 +TIMESTAMP = 1544076926 +SHA256 (chempy-0.7.7.tar.gz) = 9d27f9a9f96d87c40c939660a89861142b49049e89e41b73b91ac17c6a05ec19 +SIZE (chempy-0.7.7.tar.gz) = 157143 diff --git a/science/py-pygeodesy/Makefile b/science/py-pygeodesy/Makefile new file mode 100644 index 00000000000..a195ffc87dc --- /dev/null +++ b/science/py-pygeodesy/Makefile @@ -0,0 +1,19 @@ +# Created by: Po-Chuan Hsieh +# $FreeBSD$ + +PORTNAME= pygeodesy +PORTVERSION= 18.11.12 +CATEGORIES= science python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= PyGeodesy-${PORTVERSION} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Pure Python geodesy tools + +LICENSE= MIT + +USES= python zip +USE_PYTHON= autoplist concurrent distutils + +.include diff --git a/science/py-pygeodesy/distinfo b/science/py-pygeodesy/distinfo new file mode 100644 index 00000000000..49a9d82cc10 --- /dev/null +++ b/science/py-pygeodesy/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544027032 +SHA256 (PyGeodesy-18.11.12.zip) = bed752795ea2b597e01b785ebcbf041f7b55aef897dc6a04dd0d62bb232460a2 +SIZE (PyGeodesy-18.11.12.zip) = 1277718 diff --git a/science/py-pygeodesy/pkg-descr b/science/py-pygeodesy/pkg-descr new file mode 100644 index 00000000000..3ef892e7314 --- /dev/null +++ b/science/py-pygeodesy/pkg-descr @@ -0,0 +1,6 @@ +PyGeodesy is a pure Python implementation of geodesy tools for various +ellipsoidal and spherical earth models using precision trigonometric, +vector-based and approximate methods for geodetic (lat-/longitude) and +geocentric cartesian (x/y/z) coordinates. + +WWW: https://github.com/mrJean1/PyGeodesy diff --git a/security/cargo-audit/Makefile b/security/cargo-audit/Makefile index 85caefeb4e2..fd58d5ab3af 100644 --- a/security/cargo-audit/Makefile +++ b/security/cargo-audit/Makefile @@ -3,7 +3,7 @@ PORTNAME= cargo-audit DISTVERSIONPREFIX= v DISTVERSION= 0.5.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org diff --git a/security/cl-md5-sbcl/Makefile b/security/cl-md5-sbcl/Makefile index 89a636d4e9c..6f889756f8a 100644 --- a/security/cl-md5-sbcl/Makefile +++ b/security/cl-md5-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= md5 PORTVERSION= 1.8.5 -PORTREVISION= 29 +PORTREVISION= 30 CATEGORIES= security lisp PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/security/kr/Makefile b/security/kr/Makefile index 9e585370f6f..b625278f1b4 100644 --- a/security/kr/Makefile +++ b/security/kr/Makefile @@ -3,7 +3,7 @@ PORTNAME= kr PORTVERSION= 2.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= security MAINTAINER= feld@FreeBSD.org diff --git a/security/p5-OpenCA-OpenSSL/Makefile b/security/p5-OpenCA-OpenSSL/Makefile index 27c45fa00ce..67e446dd155 100644 --- a/security/p5-OpenCA-OpenSSL/Makefile +++ b/security/p5-OpenCA-OpenSSL/Makefile @@ -12,8 +12,10 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Perl crypto extension to OpenSSL -BROKEN_SSL= openssl111 +BROKEN_SSL= openssl111 ${BROKEN_SSL_${OSREL:R}} BROKEN_SSL_REASON_openssl111= incomplete definition of type 'struct x509_st' +BROKEN_SSL_12= base +BROKEN_SSL_13= base BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Locale-libintl>=0:devel/p5-Locale-libintl \ diff --git a/security/pecl-crack/Makefile b/security/pecl-crack/Makefile index 681560fc141..f63f34181ab 100644 --- a/security/pecl-crack/Makefile +++ b/security/pecl-crack/Makefile @@ -18,7 +18,7 @@ LICENSE= PHP30 LIB_DEPENDS= libcrack.so:security/cracklib USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 EXTRACT_AFTER_ARGS=--no-same-permissions --no-same-owner --exclude libcrack CONFIGURE_ARGS= --with-crack=${LOCALBASE} diff --git a/security/pecl-mcrypt/Makefile b/security/pecl-mcrypt/Makefile index 5e89384238d..3ca55f2b693 100644 --- a/security/pecl-mcrypt/Makefile +++ b/security/pecl-mcrypt/Makefile @@ -9,7 +9,7 @@ COMMENT= PHP extension for mcrypt, removed in PHP 7.2 LICENSE= PHP301 -IGNORE_WITH_PHP= 56 70 71 +IGNORE_WITH_PHP= 56 71 LIB_DEPENDS= libltdl.so:devel/libltdl \ libmcrypt.so:security/libmcrypt diff --git a/security/pecl-ssh2-0/Makefile b/security/pecl-ssh2-0/Makefile index 23f5f638259..ae91e7b455e 100644 --- a/security/pecl-ssh2-0/Makefile +++ b/security/pecl-ssh2-0/Makefile @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libssh2.so:security/libssh2 USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${EXTRA_LIBS} diff --git a/security/php-suhosin/Makefile b/security/php-suhosin/Makefile index 0f0d3454963..c3d1b52ac50 100644 --- a/security/php-suhosin/Makefile +++ b/security/php-suhosin/Makefile @@ -20,7 +20,7 @@ OPTIONS_DEFINE= EXAMPLES USES= php:ext USE_PHP= session:build -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-suhosin diff --git a/security/phpdeadlock/Makefile b/security/phpdeadlock/Makefile index 6cf61134114..0c6fed396fe 100644 --- a/security/phpdeadlock/Makefile +++ b/security/phpdeadlock/Makefile @@ -27,7 +27,7 @@ USE_PHP= mysql session ctype pcre NO_BUILD= yes NO_ARCH= yes -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 SUB_FILES= pkg-message SUB_LIST= DLURL=${DLURL} DLDIR=${DLDIR} diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo index 501ff6186a1..d07102fcb79 100644 --- a/security/py-acme/distinfo +++ b/security/py-acme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775005 -SHA256 (acme-0.28.0.tar.gz) = bf7c2f1c24a26ab5b9fce3a6abca1d74a5914d46919649ae00ad5817db62bb85 -SIZE (acme-0.28.0.tar.gz) = 81539 +TIMESTAMP = 1544126661 +SHA256 (acme-0.29.1.tar.gz) = a2e203ade83cd1eaf19112004a63073830211cf7759d437f634babb08c49b47c +SIZE (acme-0.29.1.tar.gz) = 83226 diff --git a/security/py-acme/version.mk b/security/py-acme/version.mk index 9f34a1441d0..5e1921fd699 100644 --- a/security/py-acme/version.mk +++ b/security/py-acme/version.mk @@ -1 +1 @@ -ACME_VERSION= 0.28.0 +ACME_VERSION= 0.29.1 diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo index ba3f64a4d24..95f95a27199 100644 --- a/security/py-certbot-apache/distinfo +++ b/security/py-certbot-apache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775029 -SHA256 (certbot-apache-0.28.0.tar.gz) = 3f93f5de4a548e973c493a6cac5eeeb3dbbcae2988b61299ea0727d04a00f5bb -SIZE (certbot-apache-0.28.0.tar.gz) = 167327 +TIMESTAMP = 1544126680 +SHA256 (certbot-apache-0.29.1.tar.gz) = c3af1c66c86cfeef7dac4fe9b16c7c755ebd12bc526408c27781bd34b9de8128 +SIZE (certbot-apache-0.29.1.tar.gz) = 161776 diff --git a/security/py-certbot-dns-cloudflare/distinfo b/security/py-certbot-dns-cloudflare/distinfo index b933227866b..9417abcab16 100644 --- a/security/py-certbot-dns-cloudflare/distinfo +++ b/security/py-certbot-dns-cloudflare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775039 -SHA256 (certbot-dns-cloudflare-0.28.0.tar.gz) = fe7a97e888ea6c86b082b93785aaa3548945749d010e6bf09dfd5fa879e30055 -SIZE (certbot-dns-cloudflare-0.28.0.tar.gz) = 12937 +TIMESTAMP = 1544126689 +SHA256 (certbot-dns-cloudflare-0.29.1.tar.gz) = 4ef3bcae0f880763b16b301355cfdcb4dfedc336b57183de3e09d891493e1e47 +SIZE (certbot-dns-cloudflare-0.29.1.tar.gz) = 13387 diff --git a/security/py-certbot-dns-cloudxns/distinfo b/security/py-certbot-dns-cloudxns/distinfo index 9482cc45af9..c9d5ac1dc22 100644 --- a/security/py-certbot-dns-cloudxns/distinfo +++ b/security/py-certbot-dns-cloudxns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775048 -SHA256 (certbot-dns-cloudxns-0.28.0.tar.gz) = 3ca53ea31b9b4c2df860ec3d25d2607dbe2e8856c83d984c13cc5809be3925de -SIZE (certbot-dns-cloudxns-0.28.0.tar.gz) = 11400 +TIMESTAMP = 1544126697 +SHA256 (certbot-dns-cloudxns-0.29.1.tar.gz) = e81aea8b5828ccd5e006ea2c48e60a9ee1ce8ba436649369843c828b3c9d538b +SIZE (certbot-dns-cloudxns-0.29.1.tar.gz) = 11431 diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo index 6e70f04d6a9..3c3bea0deb9 100644 --- a/security/py-certbot-dns-digitalocean/distinfo +++ b/security/py-certbot-dns-digitalocean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775057 -SHA256 (certbot-dns-digitalocean-0.28.0.tar.gz) = 4ba35c7a1d1b6db1f44cb98cfdaaa836112ac38e55c471be8ba1c0a5385c0026 -SIZE (certbot-dns-digitalocean-0.28.0.tar.gz) = 12702 +TIMESTAMP = 1544126706 +SHA256 (certbot-dns-digitalocean-0.29.1.tar.gz) = bc5b043a3dbdd3d8c4f060daac7756c4a2a54a6cebe24d6bb6cdf9a70e63a3a0 +SIZE (certbot-dns-digitalocean-0.29.1.tar.gz) = 12694 diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo index 844ff5e8dc2..9ddebb332fc 100644 --- a/security/py-certbot-dns-dnsimple/distinfo +++ b/security/py-certbot-dns-dnsimple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775066 -SHA256 (certbot-dns-dnsimple-0.28.0.tar.gz) = 932a311e35bc38f8d002dc7fd75def27cd3b9b587285fa34b2b57a7d8115f59b -SIZE (certbot-dns-dnsimple-0.28.0.tar.gz) = 11478 +TIMESTAMP = 1544126714 +SHA256 (certbot-dns-dnsimple-0.29.1.tar.gz) = 25912bd2c705eba28e1671b980363b30520360718a6b27038f1ea983b0b9d00c +SIZE (certbot-dns-dnsimple-0.29.1.tar.gz) = 11402 diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo index 2f52eb1498f..f38c85ba301 100644 --- a/security/py-certbot-dns-dnsmadeeasy/distinfo +++ b/security/py-certbot-dns-dnsmadeeasy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775075 -SHA256 (certbot-dns-dnsmadeeasy-0.28.0.tar.gz) = 349b96bd3c68738ab710dff6283930ecb341c4a4c095b4f6ed905a09ee3a7697 -SIZE (certbot-dns-dnsmadeeasy-0.28.0.tar.gz) = 11475 +TIMESTAMP = 1544126723 +SHA256 (certbot-dns-dnsmadeeasy-0.29.1.tar.gz) = f39cfd45252ca9b069550c26c2f9015b5790a148ed1acdd981cf2947c340b40b +SIZE (certbot-dns-dnsmadeeasy-0.29.1.tar.gz) = 11445 diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo index 8a6b14ce6d3..c1cc211b564 100644 --- a/security/py-certbot-dns-gehirn/distinfo +++ b/security/py-certbot-dns-gehirn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775084 -SHA256 (certbot-dns-gehirn-0.28.0.tar.gz) = 56c371e6928bfecff78d5f5ce0b5636c829cc3135d0f9e45340f7792756e45bf -SIZE (certbot-dns-gehirn-0.28.0.tar.gz) = 11546 +TIMESTAMP = 1544126732 +SHA256 (certbot-dns-gehirn-0.29.1.tar.gz) = 0ea29a84e5454796c5c584ea94a0c5b6b97f75eaf3cc2bf6f6c94fc4e7c5725d +SIZE (certbot-dns-gehirn-0.29.1.tar.gz) = 11479 diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo index 585c3cc8e03..f11c8e3b64f 100644 --- a/security/py-certbot-dns-google/distinfo +++ b/security/py-certbot-dns-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775094 -SHA256 (certbot-dns-google-0.28.0.tar.gz) = 882e7bd12a35e2d9cc29446faffda5bd5f7e32f67622aa10e3b11cfe1446f8e6 -SIZE (certbot-dns-google-0.28.0.tar.gz) = 22103 +TIMESTAMP = 1544126741 +SHA256 (certbot-dns-google-0.29.1.tar.gz) = fe077241843551e87153accb25d8956f9605d3ac7764d2dbd689b3de6dbb661a +SIZE (certbot-dns-google-0.29.1.tar.gz) = 22401 diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo index d52d3eaef64..c846c960238 100644 --- a/security/py-certbot-dns-linode/distinfo +++ b/security/py-certbot-dns-linode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775103 -SHA256 (certbot-dns-linode-0.28.0.tar.gz) = f283c8e85c006ff345e33a685c07f5273dc6dd711bb7f29d88859de19dfab255 -SIZE (certbot-dns-linode-0.28.0.tar.gz) = 11502 +TIMESTAMP = 1544126750 +SHA256 (certbot-dns-linode-0.29.1.tar.gz) = 5eabe87c8010c4ed30cc8e4a9080f28eb7cd7735bdcd63d3a0e1b5e82e458327 +SIZE (certbot-dns-linode-0.29.1.tar.gz) = 11406 diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo index e057d890088..4dc7469c882 100644 --- a/security/py-certbot-dns-luadns/distinfo +++ b/security/py-certbot-dns-luadns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775113 -SHA256 (certbot-dns-luadns-0.28.0.tar.gz) = 3d45b4cbad36546d2298e7e0c8b3a668a143d2a8b05003f534b731d09bf85a28 -SIZE (certbot-dns-luadns-0.28.0.tar.gz) = 11583 +TIMESTAMP = 1544126758 +SHA256 (certbot-dns-luadns-0.29.1.tar.gz) = 3efa5c6dee9df3650ca90a692ee12a5b1dce45b792406905ca045a0357f3afe9 +SIZE (certbot-dns-luadns-0.29.1.tar.gz) = 11327 diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo index 5499b9e8c9a..11b9d7373c1 100644 --- a/security/py-certbot-dns-nsone/distinfo +++ b/security/py-certbot-dns-nsone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775122 -SHA256 (certbot-dns-nsone-0.28.0.tar.gz) = 0c5e2ac6bc1978ddcbdac87b926a2e3dca522b45636a7d7097c9f1a1d07250f1 -SIZE (certbot-dns-nsone-0.28.0.tar.gz) = 11355 +TIMESTAMP = 1544126767 +SHA256 (certbot-dns-nsone-0.29.1.tar.gz) = ce09a457383cf348482850328d7d8efe620a613c65ba59278f06e37aaa60a913 +SIZE (certbot-dns-nsone-0.29.1.tar.gz) = 11372 diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo index c7f4985f5cb..3835958eefe 100644 --- a/security/py-certbot-dns-ovh/distinfo +++ b/security/py-certbot-dns-ovh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775131 -SHA256 (certbot-dns-ovh-0.28.0.tar.gz) = fd293a2b525dfaa5faac5bf44b9a1a8aedf6c73f86caeb9be81022dad8936d65 -SIZE (certbot-dns-ovh-0.28.0.tar.gz) = 11668 +TIMESTAMP = 1544126776 +SHA256 (certbot-dns-ovh-0.29.1.tar.gz) = cd9a33726e7272a6f53fd390d93cd3a4135421293242a605dd6abccb066281f1 +SIZE (certbot-dns-ovh-0.29.1.tar.gz) = 11841 diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo index 464050a9fd5..182c0ec0df6 100644 --- a/security/py-certbot-dns-rfc2136/distinfo +++ b/security/py-certbot-dns-rfc2136/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775141 -SHA256 (certbot-dns-rfc2136-0.28.0.tar.gz) = 0c1912f3f4a838f15e9d7d1755b0147ab060ca071cb02bf5964b7773af1c7565 -SIZE (certbot-dns-rfc2136-0.28.0.tar.gz) = 13671 +TIMESTAMP = 1544126785 +SHA256 (certbot-dns-rfc2136-0.29.1.tar.gz) = 8f2c3aa43591eb4dec7ed62d7c31693a80c557e258e64f4f17c3efe90d15976c +SIZE (certbot-dns-rfc2136-0.29.1.tar.gz) = 13968 diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo index ee8feb15b97..b4f5a1d3cd3 100644 --- a/security/py-certbot-dns-route53/distinfo +++ b/security/py-certbot-dns-route53/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775151 -SHA256 (certbot-dns-route53-0.28.0.tar.gz) = 3b5799563cff43e0602404a9adaa30c94ac38be6f3eb372536b8740472eae0e1 -SIZE (certbot-dns-route53-0.28.0.tar.gz) = 14497 +TIMESTAMP = 1544126794 +SHA256 (certbot-dns-route53-0.29.1.tar.gz) = 020d5e45e6160cd73d547496cb52930652749870fe78cac31aafbe9316ab1c33 +SIZE (certbot-dns-route53-0.29.1.tar.gz) = 14166 diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo index b27dbea8803..b4c2327db92 100644 --- a/security/py-certbot-dns-sakuracloud/distinfo +++ b/security/py-certbot-dns-sakuracloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775160 -SHA256 (certbot-dns-sakuracloud-0.28.0.tar.gz) = ab9b0d12a3d020adb6d2ce34a0e64256bba0d3581e2c0564d4992963a63139a1 -SIZE (certbot-dns-sakuracloud-0.28.0.tar.gz) = 11575 +TIMESTAMP = 1544126802 +SHA256 (certbot-dns-sakuracloud-0.29.1.tar.gz) = f846672e1ca364952a88353a13620738284c5f21eccfdc806f4e92d73990568d +SIZE (certbot-dns-sakuracloud-0.29.1.tar.gz) = 11300 diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo index 0a1490365fb..bd3c2e05b10 100644 --- a/security/py-certbot-nginx/distinfo +++ b/security/py-certbot-nginx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775169 -SHA256 (certbot-nginx-0.28.0.tar.gz) = 426fb403b0a7b203629f4e350a862cbc3bc1f69936fdab8ec7eafe0d8a3b5ddb -SIZE (certbot-nginx-0.28.0.tar.gz) = 78413 +TIMESTAMP = 1544126811 +SHA256 (certbot-nginx-0.29.1.tar.gz) = 0c1205ebb91eef4b7d15293c6778ffc962d09563b315120b2d226348d751e38d +SIZE (certbot-nginx-0.29.1.tar.gz) = 78626 diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index 86074c44071..8a93df8d2a0 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -41,6 +41,7 @@ post-patch: -e 's|/etc/|${LOCALBASE}/etc/|' \ -e 's|/var/lib|/var/db|' \ ${WRKSRC}/${PORTNAME}/constants.py + do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo index be747aae8d3..0832858bd1c 100644 --- a/security/py-certbot/distinfo +++ b/security/py-certbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1541775017 -SHA256 (certbot-0.28.0.tar.gz) = 31e3e2ee2a25c009a621c59ac9182f85d937a897c7bd1d47d0e01f3c712a090a -SIZE (certbot-0.28.0.tar.gz) = 332827 +TIMESTAMP = 1544126670 +SHA256 (certbot-0.29.1.tar.gz) = 6fc604d207c48b95dea3458bb33a11b17aa625628eb197927ffee8b458f62692 +SIZE (certbot-0.29.1.tar.gz) = 333218 diff --git a/security/py-gnutls/Makefile b/security/py-gnutls/Makefile index 86d3a970301..b88689d4dda 100644 --- a/security/py-gnutls/Makefile +++ b/security/py-gnutls/Makefile @@ -1,9 +1,7 @@ -# Created by: Li-Wen Hsu # $FreeBSD$ PORTNAME= gnutls -PORTVERSION= 3.1.1 -PORTREVISION= 1 +PORTVERSION= 3.1.2 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-gnutls/distinfo b/security/py-gnutls/distinfo index 213831fe60d..250d4a8e668 100644 --- a/security/py-gnutls/distinfo +++ b/security/py-gnutls/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1487396410 -SHA256 (python-gnutls-3.1.1.tar.gz) = 8892681519a89adb5bb1fba62199bb83bb86c999c983d46edf306f13c5f99a59 -SIZE (python-gnutls-3.1.1.tar.gz) = 40593 +TIMESTAMP = 1544176841 +SHA256 (python-gnutls-3.1.2.tar.gz) = 28748e02a8035c31826152944e41217ebcc58ab7793ae5a22850cd23d3cfbbbe +SIZE (python-gnutls-3.1.2.tar.gz) = 40668 diff --git a/security/py-trezor/Makefile b/security/py-trezor/Makefile index 9e4422550f6..553e275f6c9 100644 --- a/security/py-trezor/Makefile +++ b/security/py-trezor/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= trezor -PORTVERSION= 0.10.2 +PORTVERSION= 0.11.0 CATEGORIES= security MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,6 +13,8 @@ COMMENT= Client side implementation for TREZOR Bitcoin hardware wallets LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= protoc:devel/protobuf \ + ${PYTHON_PKGNAMEPREFIX}protobuf>=2.5.0:devel/py-protobuf@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hidapi>=0:comms/py-hidapi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \ @@ -20,8 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mnemonic>=0:security/py-mnemonic@${PY_FLAVOR USES= python:3.3+ shebangfix USE_PYTHON= autoplist concurrent distutils + NO_ARCH= yes -SHEBANG_FILES= vendor/trezor-common/defs/coins/tools/build_coins.py - .include diff --git a/security/py-trezor/distinfo b/security/py-trezor/distinfo index 769b0b77c15..ccbe8306ff3 100644 --- a/security/py-trezor/distinfo +++ b/security/py-trezor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1529839309 -SHA256 (trezor-0.10.2.tar.gz) = 4dba4d5c53d3ca22884d79fb4aa68905fb8353a5da5f96c734645d8cf537138d -SIZE (trezor-0.10.2.tar.gz) = 497984 +TIMESTAMP = 1544191178 +SHA256 (trezor-0.11.0.tar.gz) = 1132f6a97afb0979c5018b067494bc8917b881c02d965f991270a70543b5050c +SIZE (trezor-0.11.0.tar.gz) = 1422722 diff --git a/security/py-trezor/files/patch-vendor_trezor-common_tools_coin__info.py b/security/py-trezor/files/patch-vendor_trezor-common_tools_coin__info.py new file mode 100644 index 00000000000..35a91c13bca --- /dev/null +++ b/security/py-trezor/files/patch-vendor_trezor-common_tools_coin__info.py @@ -0,0 +1,11 @@ +--- vendor/trezor-common/tools/coin_info.py.orig 2018-11-08 13:20:31 UTC ++++ vendor/trezor-common/tools/coin_info.py +@@ -25,7 +25,7 @@ def load_json(*path): + else: + filename = os.path.join(DEFS_DIR, *path) + +- with open(filename) as f: ++ with open(filename, encoding="utf-8") as f: + return json.load(f, object_pairs_hook=OrderedDict) + + diff --git a/sysutils/cfengine-masterfiles310/Makefile b/sysutils/cfengine-masterfiles310/Makefile index 9c1252bd7d3..446d0895d3d 100644 --- a/sysutils/cfengine-masterfiles310/Makefile +++ b/sysutils/cfengine-masterfiles310/Makefile @@ -35,6 +35,8 @@ USES= cpe gmake python:build shebangfix HAS_CONFIGURE= yes EXAMPLESDIR= ${PREFIX}/share/examples/cfengine-masterfiles CONFIGURE_ARGS= --prefix=${EXAMPLESDIR} -SHEBANG_FILES= modules/packages/yum +SHEBANG_FILES= modules/packages/yum \ + modules/packages/zypper +NO_ARCH= yes .include diff --git a/sysutils/exa/Makefile b/sysutils/exa/Makefile index 7f344b1d38d..eb73f7c19be 100644 --- a/sysutils/exa/Makefile +++ b/sysutils/exa/Makefile @@ -3,7 +3,7 @@ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.8.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org diff --git a/sysutils/fd/Makefile b/sysutils/fd/Makefile index 5245fce44d8..18612cf37d5 100644 --- a/sysutils/fd/Makefile +++ b/sysutils/fd/Makefile @@ -4,7 +4,7 @@ PORTNAME= fd DISTVERSIONPREFIX= v DISTVERSION= 7.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils PKGNAMESUFFIX= -find diff --git a/sysutils/flowgger/Makefile b/sysutils/flowgger/Makefile index 2458023535d..e436c5725cd 100644 --- a/sysutils/flowgger/Makefile +++ b/sysutils/flowgger/Makefile @@ -3,7 +3,7 @@ PORTNAME= flowgger DISTVERSION= 0.2.6-28 DISTVERSIONSUFFIX= -gab572a0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MAINTAINER= ports@FreeBSD.org diff --git a/sysutils/iocage-devel/Makefile b/sysutils/iocage-devel/Makefile index 475ca98f4ed..9a83bcebe4a 100644 --- a/sysutils/iocage-devel/Makefile +++ b/sysutils/iocage-devel/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= iocage-devel -PORTVERSION= 1.0.0.20181203 +PORTVERSION= 1.0.0.20181207 PORTEPOCH= 1 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -28,7 +28,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \ USE_GITHUB= yes GH_ACCOUNT= iocage GH_PROJECT= iocage -GH_TAGNAME= 531a5cf +GH_TAGNAME= 704b5c2 NO_ARCH= yes USES= python:3.6+ diff --git a/sysutils/iocage-devel/distinfo b/sysutils/iocage-devel/distinfo index 0cc9e6186ca..9d1cd81fde2 100644 --- a/sysutils/iocage-devel/distinfo +++ b/sysutils/iocage-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543833591 -SHA256 (iocage-iocage-1.0.0.20181203-531a5cf_GH0.tar.gz) = 75ec5c4ef9142d7f0a235f7e1b7a0bb25e207cae35c50b9c736648aabadad28a -SIZE (iocage-iocage-1.0.0.20181203-531a5cf_GH0.tar.gz) = 320035 +TIMESTAMP = 1544177538 +SHA256 (iocage-iocage-1.0.0.20181207-704b5c2_GH0.tar.gz) = 3e40c683eb0a6c4c469480269d49d38f40227879b1f918fdca343fc355bd43da +SIZE (iocage-iocage-1.0.0.20181207-704b5c2_GH0.tar.gz) = 321013 diff --git a/sysutils/mkdesktop/Makefile b/sysutils/mkdesktop/Makefile index be740ad87a4..896d1f3c46c 100644 --- a/sysutils/mkdesktop/Makefile +++ b/sysutils/mkdesktop/Makefile @@ -1,28 +1,29 @@ # $FreeBSD$ PORTNAME= mkdesktop -PORTVERSION= 1.8 +PORTVERSION= 2.8 CATEGORIES= sysutils MAINTAINER= bourne.identity@hotmail.com COMMENT= Powerful, flexible utility to setup a FreeBSD desktop -RUN_DEPENDS= pkg>0:ports-mgmt/pkg - -USE_GITHUB= yes -GH_ACCOUNT= bourne-again +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENSE NO_BUILD= yes NO_ARCH= yes -DATA1= stage-definitions -DATA2= mkdesktop.help -PLIST_FILES= bin/${PORTNAME} ${DATADIR}/${DATA1} ${DATADIR}/${DATA2} +USE_GITHUB= yes +GH_ACCOUNT= bourne-again + +PLIST_FILES= bin/mkdesktop \ + share/mkdesktop/stage-definitions \ + man/man1/mkdesktop.1.gz do-install: ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/${DATA1} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/${DATA2} ${STAGEDIR}${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/stage-definitions ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/mkdesktop ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/mkdesktop.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include diff --git a/sysutils/mkdesktop/distinfo b/sysutils/mkdesktop/distinfo index fd2734cd02f..e3fcfb5b34e 100644 --- a/sysutils/mkdesktop/distinfo +++ b/sysutils/mkdesktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527016876 -SHA256 (bourne-again-mkdesktop-1.8_GH0.tar.gz) = 79e4d1b4c9466b6052eb6f280e2ec47666c6ce287d16c29b5c8bf854b925e91f -SIZE (bourne-again-mkdesktop-1.8_GH0.tar.gz) = 9380 +TIMESTAMP = 1541099999 +SHA256 (bourne-again-mkdesktop-2.8_GH0.tar.gz) = 905b594931713770c06eeba0640b545f61afc6cf3a42ff7b4d59d9db97c29d4a +SIZE (bourne-again-mkdesktop-2.8_GH0.tar.gz) = 16172 diff --git a/sysutils/mkdesktop/pkg-descr b/sysutils/mkdesktop/pkg-descr index e0dad17f939..0eb70d12039 100644 --- a/sysutils/mkdesktop/pkg-descr +++ b/sysutils/mkdesktop/pkg-descr @@ -1,10 +1,8 @@ -mkdesktop is a Bourne script that helps to standardize the process of FreeBSD -desktop installation as much as possible per user, with plenty of flexibility as -well as modularity. By default, you get 5 distinct stages for defining your -desktop environment. But you can always add/subtract/customize the stages as -much as you wish. Once you start using mkdesktop, you will pretty soon love it - -particularly its post-processor which automatically kicks in once the stages -have been processed - it sets up emulation layers and configuration of system -files, if the user so desires. +Installing a FreeBSD desktop from scratch can be messy : you often +forget the correct steps/packages. The mkdesktop script helps to +standardize the process as much as possible per user, with plenty of +flexibility as well as modularity. The script sets up X & your desktop, +configures emulation layers (Wine / Linuxulator) if so desired, and +then configures the essential system files under /etc and /boot. WWW: https://github.com/bourne-again/mkdesktop diff --git a/sysutils/p5-Sys-Hostname-Long/Makefile b/sysutils/p5-Sys-Hostname-Long/Makefile index 4bec9bc8585..54f561878ad 100644 --- a/sysutils/p5-Sys-Hostname-Long/Makefile +++ b/sysutils/p5-Sys-Hostname-Long/Makefile @@ -11,6 +11,9 @@ PKGNAMEPREFIX= p5- MAINTAINER= tdb@FreeBSD.org COMMENT= Try every conceivable way to get full hostname +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual + USES= perl5 shebangfix SHEBANG_FILES= testall.pl USE_PERL5= configure diff --git a/sysutils/pecl-mogilefs/Makefile b/sysutils/pecl-mogilefs/Makefile index 13e1adb8b43..ff46f43ad44 100644 --- a/sysutils/pecl-mogilefs/Makefile +++ b/sysutils/pecl-mogilefs/Makefile @@ -17,7 +17,7 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libneon.so:www/neon USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 post-extract: @${REINPLACE_CMD} -e 's#/usr/local#${LOCALBASE}#g' ${WRKSRC}/config.m4 diff --git a/sysutils/potnet/Makefile b/sysutils/potnet/Makefile index 84b74bf0415..eda3703956c 100644 --- a/sysutils/potnet/Makefile +++ b/sysutils/potnet/Makefile @@ -2,6 +2,7 @@ PORTNAME= potnet DISTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= pizzamig@FreeBSD.org diff --git a/textproc/Makefile b/textproc/Makefile index 2c82e21b44f..30e0f160a25 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -422,6 +422,7 @@ SUBDIR += libexttextcat SUBDIR += libflate SUBDIR += libfo + SUBDIR += libfolia SUBDIR += libgepub SUBDIR += libguess SUBDIR += libkmfl @@ -1788,6 +1789,8 @@ SUBDIR += txt2man SUBDIR += txt2tags SUBDIR += uchardet + SUBDIR += ucto + SUBDIR += uctodata SUBDIR += uim SUBDIR += uim-el SUBDIR += uim-gtk diff --git a/textproc/bat/Makefile b/textproc/bat/Makefile index 691e677e651..72cfce01710 100644 --- a/textproc/bat/Makefile +++ b/textproc/bat/Makefile @@ -3,6 +3,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org diff --git a/textproc/cl-meta-sbcl/Makefile b/textproc/cl-meta-sbcl/Makefile index 438fe835d71..4f2bb48e14a 100644 --- a/textproc/cl-meta-sbcl/Makefile +++ b/textproc/cl-meta-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= meta PORTVERSION= 0.1 -PORTREVISION= 30 +PORTREVISION= 31 PORTEPOCH= 1 CATEGORIES= textproc lisp PKGNAMEPREFIX= cl- diff --git a/textproc/cl-ppcre-sbcl/Makefile b/textproc/cl-ppcre-sbcl/Makefile index 4efe091da44..baefc58d769 100644 --- a/textproc/cl-ppcre-sbcl/Makefile +++ b/textproc/cl-ppcre-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= cl-ppcre PORTVERSION= 2.0.3 -PORTREVISION= 28 +PORTREVISION= 29 CATEGORIES= textproc lisp DISTFILES= # none diff --git a/textproc/libfolia/Makefile b/textproc/libfolia/Makefile new file mode 100644 index 00000000000..42de72b1175 --- /dev/null +++ b/textproc/libfolia/Makefile @@ -0,0 +1,29 @@ +# $FreeBSD$ + +PORTNAME= libfolia +DISTVERSIONPREFIX= v +DISTVERSION= 1.15 +CATEGORIES= textproc + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Library for FoLiA, a format for annotated language resources + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= autoconf-archive>=0:devel/autoconf-archive +LIB_DEPENDS= libicui18n.so:devel/icu \ + libomp.so:devel/openmp \ + libticcutils.so:devel/ticcutils + +USES= autoreconf gmake gnome libtool pkgconfig +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static +USE_GITHUB= yes +GH_ACCOUNT= LanguageMachines +USE_GNOME= libxml2 +USE_LDCONFIG= yes + +INSTALL_TARGET= install-strip + +.include diff --git a/textproc/libfolia/distinfo b/textproc/libfolia/distinfo new file mode 100644 index 00000000000..dd01f1fc75e --- /dev/null +++ b/textproc/libfolia/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544205030 +SHA256 (LanguageMachines-libfolia-v1.15_GH0.tar.gz) = 6a045dff386663ef6cd634cb15b6898e1e9ebe214430aff443edd96344d3c0bf +SIZE (LanguageMachines-libfolia-v1.15_GH0.tar.gz) = 104934 diff --git a/textproc/libfolia/pkg-descr b/textproc/libfolia/pkg-descr new file mode 100644 index 00000000000..f3ba5f72373 --- /dev/null +++ b/textproc/libfolia/pkg-descr @@ -0,0 +1,9 @@ +FoLiA is an XML-based annotation format, suitable for the representation of +linguistically annotated language resources. FoLiA's intended use is as a format +for storing and/or exchanging language resources, including corpora. Our aim is +to introduce a single rich format that can accomodate a wide variety of +linguistic annotation types through a single generalised paradigm. We do not +commit to any label set, language or linguistic theory. This is always left to +the developer of the language resource, and provides maximum flexibility. + +WWW: https://proycon.github.io/folia/ diff --git a/textproc/libfolia/pkg-plist b/textproc/libfolia/pkg-plist new file mode 100644 index 00000000000..7e81a1839b9 --- /dev/null +++ b/textproc/libfolia/pkg-plist @@ -0,0 +1,14 @@ +bin/foliadiff.sh +bin/folialint +include/libfolia/folia.h +include/libfolia/folia_builder.h +include/libfolia/folia_document.h +include/libfolia/folia_impl.h +include/libfolia/folia_processor.h +include/libfolia/folia_properties.h +include/libfolia/folia_types.h +include/libfolia/folia_utils.h +lib/libfolia.so +lib/libfolia.so.9 +lib/libfolia.so.9.0.0 +libdata/pkgconfig/folia.pc diff --git a/textproc/libmrss-php/Makefile b/textproc/libmrss-php/Makefile index 83424180cc1..b24c39e1ced 100644 --- a/textproc/libmrss-php/Makefile +++ b/textproc/libmrss-php/Makefile @@ -27,7 +27,7 @@ USES= libtool php:ext USE_LDCONFIG= yes PHP_MODNAME= mrss -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/phpmrss post-install: diff --git a/textproc/p5-Text-Trac/Makefile b/textproc/p5-Text-Trac/Makefile index a5b32e710e9..a0a667c7152 100644 --- a/textproc/p5-Text-Trac/Makefile +++ b/textproc/p5-Text-Trac/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Text-Trac -PORTVERSION= 0.19 +PORTVERSION= 0.20 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-Text-Trac/distinfo b/textproc/p5-Text-Trac/distinfo index e5b1683adff..d576514d299 100644 --- a/textproc/p5-Text-Trac/distinfo +++ b/textproc/p5-Text-Trac/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1540136855 -SHA256 (Text-Trac-0.19.tar.gz) = 54fcbd25c1bcfe4ec150c5e95a8a34e331d25149ed8b39387cecb185de078716 -SIZE (Text-Trac-0.19.tar.gz) = 113940 +TIMESTAMP = 1544114764 +SHA256 (Text-Trac-0.20.tar.gz) = 08b07c70959e0c738cba58e55e47098b1b4f25cf6ea863b02cdcf9b72345961f +SIZE (Text-Trac-0.20.tar.gz) = 113972 diff --git a/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile b/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile index 66ef8c198bf..16e3b27e02f 100644 --- a/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile +++ b/textproc/pear-Structures_DataGrid_DataSource_RSS/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear- USES= pear USE_PHP= mysql -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 .include diff --git a/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile b/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile index 8c230f498ff..b490f7a41f4 100644 --- a/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile +++ b/textproc/pear-Structures_DataGrid_DataSource_XML/Makefile @@ -16,6 +16,6 @@ RUN_DEPENDS= ${PEARDIR}/Structures/DataGrid/DataSource/Array.php:databases/pear- USES= pear USE_PHP= mysql -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 .include diff --git a/textproc/pecl-ctemplate/Makefile b/textproc/pecl-ctemplate/Makefile index 9f21debc17b..5afbaddf538 100644 --- a/textproc/pecl-ctemplate/Makefile +++ b/textproc/pecl-ctemplate/Makefile @@ -20,7 +20,7 @@ USES= php:ext localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= vanillahsu GH_PROJECT= pecl-ctemplate -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --with-cTemplate=${LOCALBASE} diff --git a/textproc/pecl-doublemetaphone/Makefile b/textproc/pecl-doublemetaphone/Makefile index 5d951a3ea97..5111a3f1edd 100644 --- a/textproc/pecl-doublemetaphone/Makefile +++ b/textproc/pecl-doublemetaphone/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP301 LICENSE_FILE= ${WRKSRC}/LICENSE USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-doublemetaphone diff --git a/textproc/pecl-stem/Makefile b/textproc/pecl-stem/Makefile index 2b4a5206aac..7f821846b31 100644 --- a/textproc/pecl-stem/Makefile +++ b/textproc/pecl-stem/Makefile @@ -16,7 +16,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 post-configure: echo "#define HAVE_XDL_ALLOCATOR_PRIV 1" >>${WRKSRC}/config.h diff --git a/textproc/pecl-syck/Makefile b/textproc/pecl-syck/Makefile index cd94ffbd435..cf9d7ae9626 100644 --- a/textproc/pecl-syck/Makefile +++ b/textproc/pecl-syck/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libsyck.a:textproc/syck USES= php:pecl USE_PHP= spl:build hash:build -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-syck diff --git a/textproc/pecl-wbxml/Makefile b/textproc/pecl-wbxml/Makefile index 2591b781edd..3c989678a87 100644 --- a/textproc/pecl-wbxml/Makefile +++ b/textproc/pecl-wbxml/Makefile @@ -18,7 +18,7 @@ USES= php:pecl CONFIGURE_ARGS= --with-wbxml=${LOCALBASE} \ --with-libexpat-dir=${LOCALBASE} -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/config.m4 diff --git a/textproc/pecl-xdiff/Makefile b/textproc/pecl-xdiff/Makefile index 4bd088f964b..bb5a680c419 100644 --- a/textproc/pecl-xdiff/Makefile +++ b/textproc/pecl-xdiff/Makefile @@ -17,7 +17,7 @@ LICENSE= PHP301 LIB_DEPENDS= libxdiff.so:textproc/libxdiff USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 LDFLAGS+= -L${LOCALBASE}/lib diff --git a/textproc/pecl-xslcache/Makefile b/textproc/pecl-xslcache/Makefile index afd256ba8b6..b02897ede0c 100644 --- a/textproc/pecl-xslcache/Makefile +++ b/textproc/pecl-xslcache/Makefile @@ -16,6 +16,6 @@ LICENSE= PHP301 USES= php:pecl USE_PHP= dom:build xml:build xsl:build -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/textproc/pecl-yaml1/Makefile b/textproc/pecl-yaml1/Makefile index e2776d4f413..d7e59088709 100644 --- a/textproc/pecl-yaml1/Makefile +++ b/textproc/pecl-yaml1/Makefile @@ -19,6 +19,6 @@ LIB_DEPENDS= libyaml.so:textproc/libyaml PORTSCOUT= limit:^1.* USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/textproc/ripgrep/Makefile b/textproc/ripgrep/Makefile index 101c2f71b21..d915ba08282 100644 --- a/textproc/ripgrep/Makefile +++ b/textproc/ripgrep/Makefile @@ -5,7 +5,7 @@ PORTNAME= ripgrep DISTVERSION= 0.10.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc MAINTAINER= petteri.valkonen@iki.fi diff --git a/textproc/rubygem-autoprefixer-rails/Makefile b/textproc/rubygem-autoprefixer-rails/Makefile index 1d8544c958c..ac41d552cfb 100644 --- a/textproc/rubygem-autoprefixer-rails/Makefile +++ b/textproc/rubygem-autoprefixer-rails/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= autoprefixer-rails -PORTVERSION= 9.4.0 +PORTVERSION= 9.4.2 CATEGORIES= textproc ruby MASTER_SITES= RG diff --git a/textproc/rubygem-autoprefixer-rails/distinfo b/textproc/rubygem-autoprefixer-rails/distinfo index cf661e18dbc..3a3b463109d 100644 --- a/textproc/rubygem-autoprefixer-rails/distinfo +++ b/textproc/rubygem-autoprefixer-rails/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544019539 -SHA256 (rubygem/autoprefixer-rails-9.4.0.gem) = 7dc44ddbb33ce8ac67d522f700c9e939d8d311fd75783313ae1dba1d42d58687 -SIZE (rubygem/autoprefixer-rails-9.4.0.gem) = 211968 +TIMESTAMP = 1544193848 +SHA256 (rubygem/autoprefixer-rails-9.4.2.gem) = bac469c074b1ee6c1158d52f92c0114658a6cab05e94b6e590d628a390b5ebc2 +SIZE (rubygem/autoprefixer-rails-9.4.2.gem) = 211968 diff --git a/textproc/ucto/Makefile b/textproc/ucto/Makefile new file mode 100644 index 00000000000..13793707aeb --- /dev/null +++ b/textproc/ucto/Makefile @@ -0,0 +1,33 @@ +# $FreeBSD$ + +PORTNAME= ucto +DISTVERSIONPREFIX= v +DISTVERSION= 0.14 +CATEGORIES= textproc + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Advanced rule-based (regular-expression) and unicode-aware tokenizer + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= autoconf-archive>0:devel/autoconf-archive \ + uctodata>0:textproc/uctodata +LIB_DEPENDS= libexttextcat-2.0.so:textproc/libexttextcat \ + libfolia.so:textproc/libfolia \ + libicuio.so:devel/icu \ + libomp.so:devel/openmp \ + libticcutils.so:devel/ticcutils +RUN_DEPENDS= uctodata>0:textproc/uctodata + +USES= autoreconf gmake gnome libedit libtool pkgconfig readline +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-static +USE_GITHUB= yes +GH_ACCOUNT= LanguageMachines +USE_GNOME= libxml2 +USE_LDCONFIG= yes + +INSTALL_TARGET= install-strip + +.include diff --git a/textproc/ucto/distinfo b/textproc/ucto/distinfo new file mode 100644 index 00000000000..0123227cea8 --- /dev/null +++ b/textproc/ucto/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544204678 +SHA256 (LanguageMachines-ucto-v0.14_GH0.tar.gz) = ba40c28b0baba4eef98f88abc7c894a4b6fbaf153eaacd2ea3c9c177b0e85ea5 +SIZE (LanguageMachines-ucto-v0.14_GH0.tar.gz) = 350837 diff --git a/textproc/ucto/files/patch-config_Makefile.am b/textproc/ucto/files/patch-config_Makefile.am new file mode 100644 index 00000000000..d27cdd1baef --- /dev/null +++ b/textproc/ucto/files/patch-config_Makefile.am @@ -0,0 +1,12 @@ +--- config/Makefile.am.orig 2018-12-08 03:11:07 UTC ++++ config/Makefile.am +@@ -7,7 +7,7 @@ EXTRA_DIST = $(config_DATA) + install-data-hook: + rm -f $(configdir)/textcat.cfg + if OLD_LM +- $(LN_S) $(configdir)/textcat_alt.cfg $(configdir)/textcat.cfg ++ cd $(DESTDIR)$(configdir) && $(LN_S) textcat_alt.cfg textcat.cfg + else +- $(LN_S) $(configdir)/textcat_normal.cfg $(configdir)/textcat.cfg ++ cd $(DESTDIR)$(configdir) && $(LN_S) textcat_normal.cfg textcat.cfg + endif diff --git a/textproc/ucto/pkg-descr b/textproc/ucto/pkg-descr new file mode 100644 index 00000000000..c731cb06705 --- /dev/null +++ b/textproc/ucto/pkg-descr @@ -0,0 +1,10 @@ +Ucto tokenizes text files: it separates words from punctuation, and splits +sentences. It offers several other basic preprocessing steps such as changing +case that you can all use to make your text suited for further processing such +as indexing, part-of-speech tagging, or machine translation. + +Ucto comes with tokenisation rules for several languages and can be easily +extended to suit other languages. It has been incorporated for tokenizing Dutch +text in Frog, our Dutch morpho-syntactic processor. + +WWW: https://languagemachines.github.io/ucto/ diff --git a/textproc/ucto/pkg-plist b/textproc/ucto/pkg-plist new file mode 100644 index 00000000000..8364aed5662 --- /dev/null +++ b/textproc/ucto/pkg-plist @@ -0,0 +1,12 @@ +bin/ucto +include/ucto/my_textcat.h +include/ucto/setting.h +include/ucto/tokenize.h +lib/libucto.so +lib/libucto.so.3 +lib/libucto.so.%%GTK3_VERSION%% +libdata/pkgconfig/ucto.pc +man/man1/ucto.1.gz +%%DATADIR%%/textcat.cfg +%%DATADIR%%/textcat_alt.cfg +%%DATADIR%%/textcat_normal.cfg diff --git a/textproc/uctodata/Makefile b/textproc/uctodata/Makefile new file mode 100644 index 00000000000..d93728a13f8 --- /dev/null +++ b/textproc/uctodata/Makefile @@ -0,0 +1,23 @@ +# $FreeBSD$ + +PORTNAME= uctodata +DISTVERSIONPREFIX= v +DISTVERSION= 0.8 +CATEGORIES= textproc + +MAINTAINER= yuri@FreeBSD.org +COMMENT= Datafiles for the tokenizer 'ucto' + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= autoreconf gmake +GNU_CONFIGURE= yes +USE_GITHUB= yes +GH_ACCOUNT= LanguageMachines + +NO_ARCH= yes + +DATADIR= ${PREFIX}/share/ucto + +.include diff --git a/textproc/uctodata/distinfo b/textproc/uctodata/distinfo new file mode 100644 index 00000000000..14ac076b679 --- /dev/null +++ b/textproc/uctodata/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1544225721 +SHA256 (LanguageMachines-uctodata-v0.8_GH0.tar.gz) = a8e5e69696facbd2c2251406560762cf7f4817620179e4a8ee8d241cf0371a5e +SIZE (LanguageMachines-uctodata-v0.8_GH0.tar.gz) = 37527 diff --git a/textproc/uctodata/pkg-descr b/textproc/uctodata/pkg-descr new file mode 100644 index 00000000000..aab02567a2e --- /dev/null +++ b/textproc/uctodata/pkg-descr @@ -0,0 +1,4 @@ +Datafiles for ucto, the rule-based tokenization package that is used to +parse texts in different languages. + +WWW: https://languagemachines.github.io/ucto/ diff --git a/textproc/uctodata/pkg-plist b/textproc/uctodata/pkg-plist new file mode 100644 index 00000000000..8f93d4a2e50 --- /dev/null +++ b/textproc/uctodata/pkg-plist @@ -0,0 +1,33 @@ +libdata/pkgconfig/uctodata.pc +%%DATADIR%%/e-mail.rule +%%DATADIR%%/exotic-eos.eos +%%DATADIR%%/exotic-quotes.quote +%%DATADIR%%/fra.abr +%%DATADIR%%/fry.abr +%%DATADIR%%/ligatures.filter +%%DATADIR%%/nld_afk.abr +%%DATADIR%%/por.abr +%%DATADIR%%/rus.abr +%%DATADIR%%/smiley.rule +%%DATADIR%%/spa.abr +%%DATADIR%%/standard-eos.eos +%%DATADIR%%/standard-quotes.quote +%%DATADIR%%/swe.abr +%%DATADIR%%/tokconfig-deu +%%DATADIR%%/tokconfig-eng +%%DATADIR%%/tokconfig-fra +%%DATADIR%%/tokconfig-fry +%%DATADIR%%/tokconfig-generic +%%DATADIR%%/tokconfig-ita +%%DATADIR%%/tokconfig-nld +%%DATADIR%%/tokconfig-nld-historical +%%DATADIR%%/tokconfig-nld-sonarchat +%%DATADIR%%/tokconfig-nld-twitter +%%DATADIR%%/tokconfig-nld-withplaceholder +%%DATADIR%%/tokconfig-por +%%DATADIR%%/tokconfig-rus +%%DATADIR%%/tokconfig-spa +%%DATADIR%%/tokconfig-swe +%%DATADIR%%/tokconfig-tur +%%DATADIR%%/tur.abr +%%DATADIR%%/url.rule diff --git a/textproc/xsv-rs/Makefile b/textproc/xsv-rs/Makefile index 602a26113c5..b8a958b4f79 100644 --- a/textproc/xsv-rs/Makefile +++ b/textproc/xsv-rs/Makefile @@ -2,7 +2,7 @@ PORTNAME= xsv DISTVERSION= 0.13.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc PKGNAMESUFFIX= -rs diff --git a/www/asterisk-stat/Makefile b/www/asterisk-stat/Makefile index 628ee8351d0..d155977d8f8 100644 --- a/www/asterisk-stat/Makefile +++ b/www/asterisk-stat/Makefile @@ -14,7 +14,7 @@ COMMENT= ASTERISK call detail records analyzer DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 LIB_DEPENDS= libgd.so:graphics/gd diff --git a/www/atutor/Makefile b/www/atutor/Makefile index 1eb96b0272d..469d8eb00cf 100644 --- a/www/atutor/Makefile +++ b/www/atutor/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= cpe php diff --git a/www/cl-lml-sbcl/Makefile b/www/cl-lml-sbcl/Makefile index c2a9a5f2ebc..671af465129 100644 --- a/www/cl-lml-sbcl/Makefile +++ b/www/cl-lml-sbcl/Makefile @@ -3,7 +3,7 @@ PORTNAME= lml PORTVERSION= 2.5.7 -PORTREVISION= 30 +PORTREVISION= 31 CATEGORIES= www textproc PKGNAMEPREFIX= cl- DISTFILES= # none diff --git a/www/claroline/Makefile b/www/claroline/Makefile index f904008d124..57159ea21e4 100644 --- a/www/claroline/Makefile +++ b/www/claroline/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= cpe php diff --git a/www/cliqz/Makefile b/www/cliqz/Makefile index 57c1f379762..64d153bddb8 100644 --- a/www/cliqz/Makefile +++ b/www/cliqz/Makefile @@ -2,6 +2,7 @@ PORTNAME= cliqz DISTVERSION= 1.23.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://s3.amazonaws.com/cdn.cliqz.com/browser-f/APT/:amazon \ http://repository.cliqz.com/dist/${CLIQZ_CHANNEL}/${DISTVERSION}/${CLIQZ_LAST_BUILD_ID}/:cliqz diff --git a/www/cmsmadesimple/Makefile b/www/cmsmadesimple/Makefile index 3898cc75683..3ac9f0b09e0 100644 --- a/www/cmsmadesimple/Makefile +++ b/www/cmsmadesimple/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= php USE_PHP= mysql tokenizer gd diff --git a/www/coppermine/Makefile b/www/coppermine/Makefile index 4c3ad5755db..087c734e21c 100644 --- a/www/coppermine/Makefile +++ b/www/coppermine/Makefile @@ -14,7 +14,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv3 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 OPTIONS_DEFINE= DOCS IMAGEMAGICK IMAGEMAGICK_DESC= Use ImageMagick instead of PHP GD extension diff --git a/www/dotproject/Makefile b/www/dotproject/Makefile index 921aed31912..ae3b0235e1c 100644 --- a/www/dotproject/Makefile +++ b/www/dotproject/Makefile @@ -14,7 +14,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= apache:run,2.2+ cpe shebangfix php:web SHEBANG_FILES= misc/cvs2cl/cvs2cl.pl diff --git a/www/entrans/Makefile b/www/entrans/Makefile index 73b7121e87d..2f63c983d18 100644 --- a/www/entrans/Makefile +++ b/www/entrans/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= php:web USE_PHP= mysql diff --git a/www/firefox-esr-i18n/Makefile b/www/firefox-esr-i18n/Makefile index cd83a1bba20..30eb54806f5 100644 --- a/www/firefox-esr-i18n/Makefile +++ b/www/firefox-esr-i18n/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= firefox -PORTVERSION= 60.3.0 +PORTVERSION= 60.4.0 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}esr/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build1/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}esr-candidates/build2/linux-i686/xpi PKGNAMEPREFIX= PKGNAMESUFFIX= -esr-i18n DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} diff --git a/www/firefox-esr-i18n/distinfo b/www/firefox-esr-i18n/distinfo index cf674580bc7..20eb32e7647 100644 --- a/www/firefox-esr-i18n/distinfo +++ b/www/firefox-esr-i18n/distinfo @@ -1,197 +1,197 @@ -TIMESTAMP = 1539808809 -SHA256 (xpi/firefox-60.3.0/ach.xpi) = b0bbd33b33c22a7e30ca9e826295a256ea6a20008d98ca338579ccd8ec2d65b8 -SIZE (xpi/firefox-60.3.0/ach.xpi) = 496841 -SHA256 (xpi/firefox-60.3.0/af.xpi) = 8400214562e036bd28f6d9f785b38b5b071613aacd71ef4cc3fad511c99a16da -SIZE (xpi/firefox-60.3.0/af.xpi) = 487308 -SHA256 (xpi/firefox-60.3.0/an.xpi) = 7618a77771376a3decb22c6acdc2c0510bcd3a17fa70a40a3f07909889e04aa9 -SIZE (xpi/firefox-60.3.0/an.xpi) = 520503 -SHA256 (xpi/firefox-60.3.0/ar.xpi) = a1760344b5f2606162a63025d24fa33e9120825fad47c053cb77d0f98b86d574 -SIZE (xpi/firefox-60.3.0/ar.xpi) = 547820 -SHA256 (xpi/firefox-60.3.0/as.xpi) = fbc300eead3d622c571cdd20b1ae83afb4ca1b389ed17102c63f3ab279128492 -SIZE (xpi/firefox-60.3.0/as.xpi) = 530720 -SHA256 (xpi/firefox-60.3.0/ast.xpi) = cb9c277dfb621f24991397e18ddb954e2f924d08084b047c6f39dfe2e5a3a10c -SIZE (xpi/firefox-60.3.0/ast.xpi) = 508650 -SHA256 (xpi/firefox-60.3.0/az.xpi) = 94d260ba86acbe76ee2e709eded0e3ecbc58fa89a19b6c02da9a534d1a527851 -SIZE (xpi/firefox-60.3.0/az.xpi) = 524751 -SHA256 (xpi/firefox-60.3.0/be.xpi) = b4d5623c1e70c5bd9c283bab08f9f9c8dd434bb99ed696d3af266d9739f1ea69 -SIZE (xpi/firefox-60.3.0/be.xpi) = 580712 -SHA256 (xpi/firefox-60.3.0/bg.xpi) = 757a862d6ad512ba6229723f5717814d65865daf0fb716a1a194a94ae9f20ee9 -SIZE (xpi/firefox-60.3.0/bg.xpi) = 573846 -SHA256 (xpi/firefox-60.3.0/bn-BD.xpi) = e4c091c6da5dac795fcbc70465db877b5fbf589f6a9f54bce291df41f2d12cc2 -SIZE (xpi/firefox-60.3.0/bn-BD.xpi) = 590421 -SHA256 (xpi/firefox-60.3.0/bn-IN.xpi) = 6b4ee455d61f232a0be3e3e716b4de0b4b64a0ac22b6ca9f192b91b4ff0271d3 -SIZE (xpi/firefox-60.3.0/bn-IN.xpi) = 570868 -SHA256 (xpi/firefox-60.3.0/br.xpi) = 5c15684264a21adf00d99422c61a1188da88f0f8d0ce4d03c3d7db7f0c2b8c99 -SIZE (xpi/firefox-60.3.0/br.xpi) = 512026 -SHA256 (xpi/firefox-60.3.0/bs.xpi) = 031d2a80645bb3ce88f67af59dc152dc6596efd9910f640ff67a59fdcacaeedd -SIZE (xpi/firefox-60.3.0/bs.xpi) = 514715 -SHA256 (xpi/firefox-60.3.0/ca.xpi) = ebd248c1908cfd6f3d2db96026f65157b27c02b2676addf467290f09f4de8a89 -SIZE (xpi/firefox-60.3.0/ca.xpi) = 525261 -SHA256 (xpi/firefox-60.3.0/cak.xpi) = 894c9cb71202b485a6f8b3d468e655261e6757ed9864a11551966eacf76fb658 -SIZE (xpi/firefox-60.3.0/cak.xpi) = 536297 -SHA256 (xpi/firefox-60.3.0/cs.xpi) = 381d7bec5697fa67ffbdf6ce7242ed497c84adb7f0721d91fedbaf792050c1c9 -SIZE (xpi/firefox-60.3.0/cs.xpi) = 531796 -SHA256 (xpi/firefox-60.3.0/cy.xpi) = c76eb31941e263c0a075a64ed6f7e2d6c5d31e9315eeac42c153dd28327daa09 -SIZE (xpi/firefox-60.3.0/cy.xpi) = 516645 -SHA256 (xpi/firefox-60.3.0/da.xpi) = 98df9fb58f0aba5f3b4e033ed866ce2457a13b8afe967f4241ae7322de34ee0f -SIZE (xpi/firefox-60.3.0/da.xpi) = 510756 -SHA256 (xpi/firefox-60.3.0/de.xpi) = edd1630fe9b5690ae7d61f1f7458cc92fc3a5e7102f0320d65226d0b264c2c3c -SIZE (xpi/firefox-60.3.0/de.xpi) = 526517 -SHA256 (xpi/firefox-60.3.0/dsb.xpi) = 324a15e77b880a38d4b742dae73e6605248a4fd70f4fe85b6e944811d52c1c4c -SIZE (xpi/firefox-60.3.0/dsb.xpi) = 539521 -SHA256 (xpi/firefox-60.3.0/el.xpi) = a491e7a6becb3b52b2cbed482e2d34510df2cdf4cd96c26ceb279ab044ef8894 -SIZE (xpi/firefox-60.3.0/el.xpi) = 593698 -SHA256 (xpi/firefox-60.3.0/en-GB.xpi) = e0d2c4250ff2827af81f9d1e1e8feb854b36f3b713be7b58e699bb16d92dfdb6 -SIZE (xpi/firefox-60.3.0/en-GB.xpi) = 491692 -SHA256 (xpi/firefox-60.3.0/en-US.xpi) = 157a806a12db50ac9a76d57cdbb1f52f505c46965235e1fb59367f30bdc12588 -SIZE (xpi/firefox-60.3.0/en-US.xpi) = 473176 -SHA256 (xpi/firefox-60.3.0/en-ZA.xpi) = 0867633104fad73da1b9e4414dff19abaaa3d5bca6d26ac24f04ed64d905d086 -SIZE (xpi/firefox-60.3.0/en-ZA.xpi) = 474677 -SHA256 (xpi/firefox-60.3.0/eo.xpi) = 29d3734f5373e9fdd4518ac12ce4326d22a7b2e9db388a8d1cab463912f34d31 -SIZE (xpi/firefox-60.3.0/eo.xpi) = 511264 -SHA256 (xpi/firefox-60.3.0/es-AR.xpi) = 64068a5323988432eb3099049883fde8c95a05932481fb90377a9757890e04bf -SIZE (xpi/firefox-60.3.0/es-AR.xpi) = 524646 -SHA256 (xpi/firefox-60.3.0/es-CL.xpi) = f2b852a5bc64af838d18dd9b1ea04f870db724dbd2d6cc699aabb474dc7060ad -SIZE (xpi/firefox-60.3.0/es-CL.xpi) = 527324 -SHA256 (xpi/firefox-60.3.0/es-ES.xpi) = f3a631f4c93f53901e8283be53a1823b1711238a662054e30635f0bcdf9fbd6c -SIZE (xpi/firefox-60.3.0/es-ES.xpi) = 459961 -SHA256 (xpi/firefox-60.3.0/es-MX.xpi) = 5cfc96b9265ac2876f3f0679c31dcfaa7ea6e58a2baca257fc8315fc5af90c28 -SIZE (xpi/firefox-60.3.0/es-MX.xpi) = 528665 -SHA256 (xpi/firefox-60.3.0/et.xpi) = 29853371609e98f79a6d13e6ce9b4eef31171827b4f080defe2ca8b6e36c5e73 -SIZE (xpi/firefox-60.3.0/et.xpi) = 504975 -SHA256 (xpi/firefox-60.3.0/eu.xpi) = 7e0c7bd4ed9925a5eb615150f2894db534937c6e61275f7abf6749c27554fe34 -SIZE (xpi/firefox-60.3.0/eu.xpi) = 511705 -SHA256 (xpi/firefox-60.3.0/fa.xpi) = 982ef5263955a69cb3a0feeee297aaa7f3a6dc0638e471d7d38f4775c953be0f -SIZE (xpi/firefox-60.3.0/fa.xpi) = 566267 -SHA256 (xpi/firefox-60.3.0/ff.xpi) = e12573718b1e732dc74bc7e50965105524b7178dd01ecbbc26507868ad044e62 -SIZE (xpi/firefox-60.3.0/ff.xpi) = 512206 -SHA256 (xpi/firefox-60.3.0/fi.xpi) = 4f2260f65af52f0acb8f37ce6b879a8392e1d2b5e00090206f423f18d7ec7762 -SIZE (xpi/firefox-60.3.0/fi.xpi) = 506183 -SHA256 (xpi/firefox-60.3.0/fr.xpi) = 25ae7acb918f1c18f208d383f78a50060c572b25b4023ecdd68e0daebe832821 -SIZE (xpi/firefox-60.3.0/fr.xpi) = 536071 -SHA256 (xpi/firefox-60.3.0/fy-NL.xpi) = 25931239276a37e6ec314c4a3fbdabc6f4ac057859ae1ee43d1cb28ffd2ba49e -SIZE (xpi/firefox-60.3.0/fy-NL.xpi) = 524525 -SHA256 (xpi/firefox-60.3.0/ga-IE.xpi) = 229b78ccad71a1410dd3ce4db0c3a516057f757397fc74e43298ac0b5b345ecc -SIZE (xpi/firefox-60.3.0/ga-IE.xpi) = 526990 -SHA256 (xpi/firefox-60.3.0/gd.xpi) = 7461f37ac778784893e0eea6d402ccd94d83b334f760cedb0d1482fc47eeaf48 -SIZE (xpi/firefox-60.3.0/gd.xpi) = 520863 -SHA256 (xpi/firefox-60.3.0/gl.xpi) = bc1a55afdd71ee940896ce31ea0bceff71b3c8083a3f9d431938f8fd505151da -SIZE (xpi/firefox-60.3.0/gl.xpi) = 497372 -SHA256 (xpi/firefox-60.3.0/gn.xpi) = 35c1eabd982153cd123b7f571ea6c4da6586fa026cf675f4dc243c354bc0e283 -SIZE (xpi/firefox-60.3.0/gn.xpi) = 533216 -SHA256 (xpi/firefox-60.3.0/gu-IN.xpi) = d4304667fd3df6312fce7584e6370efa87e756a13943a2c35ca84f0bc9c3da4b -SIZE (xpi/firefox-60.3.0/gu-IN.xpi) = 590264 -SHA256 (xpi/firefox-60.3.0/he.xpi) = fec2341b62f4b77080ea02502eb0fdb3473b079fd713acea19f9f413e598b903 -SIZE (xpi/firefox-60.3.0/he.xpi) = 535980 -SHA256 (xpi/firefox-60.3.0/hi-IN.xpi) = c39860fa51dc60e11ef38925b24f835bccc82b0ac309e1d7dba06278ff58106b -SIZE (xpi/firefox-60.3.0/hi-IN.xpi) = 590859 -SHA256 (xpi/firefox-60.3.0/hr.xpi) = caabb52fc34a957e82a390795b3d4244984cce8c2762d9e3b7bbe600451210f0 -SIZE (xpi/firefox-60.3.0/hr.xpi) = 515964 -SHA256 (xpi/firefox-60.3.0/hsb.xpi) = 83157adce2b667cb7dac0657a4af8ba4e383372de6294ee3be27ed7eb8b136c2 -SIZE (xpi/firefox-60.3.0/hsb.xpi) = 537062 -SHA256 (xpi/firefox-60.3.0/hu.xpi) = f17b7caa46a2332b32a1ff28d410956bffed1f2181a687981f4407c09ada22de -SIZE (xpi/firefox-60.3.0/hu.xpi) = 538414 -SHA256 (xpi/firefox-60.3.0/hy-AM.xpi) = 1c512b4e76b4b0d09e84c3e61798cdefef5a4a8f8e94891f4b773f6e38d06c06 -SIZE (xpi/firefox-60.3.0/hy-AM.xpi) = 569420 -SHA256 (xpi/firefox-60.3.0/ia.xpi) = 9b36112a645f508e292d878e9608d9318dc8e24b428b83e09716b9dee6e0cb82 -SIZE (xpi/firefox-60.3.0/ia.xpi) = 510738 -SHA256 (xpi/firefox-60.3.0/id.xpi) = ccd1a33d9bce8a136c04d0c995c35b41d03bcf9af57969fca04f25236e0689ed -SIZE (xpi/firefox-60.3.0/id.xpi) = 502225 -SHA256 (xpi/firefox-60.3.0/is.xpi) = 42038be29be2db04236038e5ed7670e8d8549c728b1ddd62b98067b0dcb294c9 -SIZE (xpi/firefox-60.3.0/is.xpi) = 513268 -SHA256 (xpi/firefox-60.3.0/it.xpi) = 7b8e3b93b695f177edf3b9b1494cd0bed94020c3fef41154731a2285f82b4f85 -SIZE (xpi/firefox-60.3.0/it.xpi) = 399097 -SHA256 (xpi/firefox-60.3.0/ja.xpi) = 5944569b7061640bb8222b6a4cd2a6d205023fa7f9941a2ea581c8c292c4a07a -SIZE (xpi/firefox-60.3.0/ja.xpi) = 572018 -SHA256 (xpi/firefox-60.3.0/ka.xpi) = 3f01f709407db0a54a9cbb68f5752e01b6119e33c1bd579656aea76635f00f01 -SIZE (xpi/firefox-60.3.0/ka.xpi) = 556845 -SHA256 (xpi/firefox-60.3.0/kab.xpi) = 89d065986880411dae008cdb6c470c6ecb1cb6be443f6fd7180d9f5416e9837d -SIZE (xpi/firefox-60.3.0/kab.xpi) = 520399 -SHA256 (xpi/firefox-60.3.0/kk.xpi) = 904558c456c61bc3be4eb9f199f53842714ad4af29bf023acdf1ba413ec14d53 -SIZE (xpi/firefox-60.3.0/kk.xpi) = 582981 -SHA256 (xpi/firefox-60.3.0/km.xpi) = 3417c8a69cddc1910d014db92e1b053013ac0608dd33351cfd5be6c3ba2932f5 -SIZE (xpi/firefox-60.3.0/km.xpi) = 583109 -SHA256 (xpi/firefox-60.3.0/kn.xpi) = 6e70e100da9d1f52c35c76e409daece8d7618ade33a70f93f830bdab63e02cd8 -SIZE (xpi/firefox-60.3.0/kn.xpi) = 585876 -SHA256 (xpi/firefox-60.3.0/ko.xpi) = eaf4df8778c73c66837a60434dbcd5965b5e9e072c6a8d38ffa18d40214a856d -SIZE (xpi/firefox-60.3.0/ko.xpi) = 547827 -SHA256 (xpi/firefox-60.3.0/lij.xpi) = df0c792859d12a7767450d565100076b6b443a048f6610b70a0dbdb563171168 -SIZE (xpi/firefox-60.3.0/lij.xpi) = 513182 -SHA256 (xpi/firefox-60.3.0/lt.xpi) = d3052013cdde28d225df6dd30c176e74ec809bc280fad8c760b7bcf65d374570 -SIZE (xpi/firefox-60.3.0/lt.xpi) = 536462 -SHA256 (xpi/firefox-60.3.0/lv.xpi) = 2132094914101026ad4289fb7b0386fa5ddaf3219494d1dca49e2a2bb4d6e108 -SIZE (xpi/firefox-60.3.0/lv.xpi) = 526416 -SHA256 (xpi/firefox-60.3.0/mai.xpi) = 64f4672c2a08d1b6f94236e470fd12ab9388384de58691520b630bc006c569e6 -SIZE (xpi/firefox-60.3.0/mai.xpi) = 549255 -SHA256 (xpi/firefox-60.3.0/mk.xpi) = 8a1e5ad944012e97aeda5688ad7c757d0ac764a5c7d7e5772055ba6c23ad87f1 -SIZE (xpi/firefox-60.3.0/mk.xpi) = 513806 -SHA256 (xpi/firefox-60.3.0/ml.xpi) = ef12810a590838668fa7587017c4f6c3944e58b477697efe2bca1cebe0e5e4b4 -SIZE (xpi/firefox-60.3.0/ml.xpi) = 598984 -SHA256 (xpi/firefox-60.3.0/mr.xpi) = 3f15817200c0b1d0ea8300aa445ec763b46bf8760343715e487d251a16f2c953 -SIZE (xpi/firefox-60.3.0/mr.xpi) = 579122 -SHA256 (xpi/firefox-60.3.0/ms.xpi) = 962bccb389ea981a9811a042227e7ee799eb29676f6e47d113ceb92500ea396e -SIZE (xpi/firefox-60.3.0/ms.xpi) = 509558 -SHA256 (xpi/firefox-60.3.0/my.xpi) = b7b51250ceb1679033e6a8777eba2757eefd100e31344a24a542d60d6dac54a0 -SIZE (xpi/firefox-60.3.0/my.xpi) = 570353 -SHA256 (xpi/firefox-60.3.0/nb-NO.xpi) = e528f52231e6c606c5fefa17a89bd9f2f90fd7ca92c99ad48c3f96f77aabdc74 -SIZE (xpi/firefox-60.3.0/nb-NO.xpi) = 509890 -SHA256 (xpi/firefox-60.3.0/ne-NP.xpi) = e8ab7d05fb37ea7346c9b57fcc036c629f733b1781a51848039a556cc888a396 -SIZE (xpi/firefox-60.3.0/ne-NP.xpi) = 555364 -SHA256 (xpi/firefox-60.3.0/nl.xpi) = 6d396039913d40892fe97a7f958ef556ddc393d9e633a896e823763efd4e4868 -SIZE (xpi/firefox-60.3.0/nl.xpi) = 517461 -SHA256 (xpi/firefox-60.3.0/nn-NO.xpi) = 06aa328df682316401aac6505c8432395822fc0e7b66f77d2335ededd8ef074d -SIZE (xpi/firefox-60.3.0/nn-NO.xpi) = 511433 -SHA256 (xpi/firefox-60.3.0/oc.xpi) = 971296802cb03b9be4757a58a839a9361227d56015a48a1f7470527245d92e44 -SIZE (xpi/firefox-60.3.0/oc.xpi) = 526981 -SHA256 (xpi/firefox-60.3.0/or.xpi) = 68f5476c66afd69c8db8ab2ce97b688da92539363604c7322ba107357c40ae87 -SIZE (xpi/firefox-60.3.0/or.xpi) = 540872 -SHA256 (xpi/firefox-60.3.0/pa-IN.xpi) = f9ec0cbda3ad58af64e02683882fe4ddcf64a9d198459f8de96205e4ad15b7e1 -SIZE (xpi/firefox-60.3.0/pa-IN.xpi) = 557874 -SHA256 (xpi/firefox-60.3.0/pl.xpi) = d371b1b7a1b5cbe3023a199feb3a1050a9840435be895e8501e3c08d0e72136d -SIZE (xpi/firefox-60.3.0/pl.xpi) = 419029 -SHA256 (xpi/firefox-60.3.0/pt-BR.xpi) = 9ad73bb14bc107dd9e8879b9104f23cc7547c7b4fe7f3e0bcd2dc1379ce2d4fb -SIZE (xpi/firefox-60.3.0/pt-BR.xpi) = 514770 -SHA256 (xpi/firefox-60.3.0/pt-PT.xpi) = 6e908c6f731e747a3a2a560e3a4e762298180cfa40b961572727de7683014b7a -SIZE (xpi/firefox-60.3.0/pt-PT.xpi) = 519361 -SHA256 (xpi/firefox-60.3.0/rm.xpi) = 3221db1c1cf6e593979001d50ea6963bb3bfd071dbcd1db8088a29b7670b5b7d -SIZE (xpi/firefox-60.3.0/rm.xpi) = 506051 -SHA256 (xpi/firefox-60.3.0/ro.xpi) = b3f129decde7df529a48040bcb10f99ae0b1650fadfd4573c119b8ef72e9e800 -SIZE (xpi/firefox-60.3.0/ro.xpi) = 514054 -SHA256 (xpi/firefox-60.3.0/ru.xpi) = 1c321fc3a6c10b5fdb7bce1f1f35815a9fb5741f278831b1e563462530d71c5e -SIZE (xpi/firefox-60.3.0/ru.xpi) = 591395 -SHA256 (xpi/firefox-60.3.0/si.xpi) = d3d8d5e3a554520f59eca3f4dd94a6e3a76119ff0e9daca9b67fa45495330c0f -SIZE (xpi/firefox-60.3.0/si.xpi) = 545581 -SHA256 (xpi/firefox-60.3.0/sk.xpi) = 2d86ae5527abc5f76d36b8d9f9095c1ba644ee569c29576315a13a7c0b2c81db -SIZE (xpi/firefox-60.3.0/sk.xpi) = 541703 -SHA256 (xpi/firefox-60.3.0/sl.xpi) = 82ba340140fcafcd26bdc8f9b77f2cfdd24811ac4f6c635cf864f89cabe5802e -SIZE (xpi/firefox-60.3.0/sl.xpi) = 519378 -SHA256 (xpi/firefox-60.3.0/son.xpi) = a454960ee79f47e6086ee96e63585b6a347c9789515fa4d22abd1d540bb582d1 -SIZE (xpi/firefox-60.3.0/son.xpi) = 497697 -SHA256 (xpi/firefox-60.3.0/sq.xpi) = 297265d54732fed1ee8f8f73eec2da69302ca5b3539d319204e917ec42b3d823 -SIZE (xpi/firefox-60.3.0/sq.xpi) = 521266 -SHA256 (xpi/firefox-60.3.0/sr.xpi) = 281d3bd00cd90f2ffde53b20cf696e92e9f4fa5479e0ac37828b3c94844e80a2 -SIZE (xpi/firefox-60.3.0/sr.xpi) = 548777 -SHA256 (xpi/firefox-60.3.0/sv-SE.xpi) = 208b39fce0317f3ec05e6b4677de5114f819e1e0ed8d9627aa61131c807465e7 -SIZE (xpi/firefox-60.3.0/sv-SE.xpi) = 518662 -SHA256 (xpi/firefox-60.3.0/ta.xpi) = bad74c913de6faae2a3cff0c8868aaf571a159624c0ca9496f760ee1cadb4277 -SIZE (xpi/firefox-60.3.0/ta.xpi) = 577925 -SHA256 (xpi/firefox-60.3.0/te.xpi) = a5dc3a8deda27ae74652b085f226dd8309b5dc772a0ae536c774a251eb2aa1e1 -SIZE (xpi/firefox-60.3.0/te.xpi) = 590955 -SHA256 (xpi/firefox-60.3.0/th.xpi) = 690ed8b98d20c9f57e1e368ae422e3fc851a9faedfddff5e934cbea854493ca1 -SIZE (xpi/firefox-60.3.0/th.xpi) = 562819 -SHA256 (xpi/firefox-60.3.0/tr.xpi) = f5a8ac9153b63667c7521ca1cf7c010e640dd2ef2a1e9d895968d30fd53a3a34 -SIZE (xpi/firefox-60.3.0/tr.xpi) = 525854 -SHA256 (xpi/firefox-60.3.0/uk.xpi) = 208a172100fe7229b39b67d64fd6820b390df0c8fb4c342f34d187383319254b -SIZE (xpi/firefox-60.3.0/uk.xpi) = 580918 -SHA256 (xpi/firefox-60.3.0/ur.xpi) = 34a0b11c65558236ca0b8ec682ef6077c31b6509d92f0211ba4839c6891e8d59 -SIZE (xpi/firefox-60.3.0/ur.xpi) = 563372 -SHA256 (xpi/firefox-60.3.0/uz.xpi) = 9e29fd77c44845d591b51c5dc1ced6ca0b21068d3aeb3a729658ab6a2e608657 -SIZE (xpi/firefox-60.3.0/uz.xpi) = 513688 -SHA256 (xpi/firefox-60.3.0/vi.xpi) = ac2628d8d3ed74f5c6be86b4875cf739bb5b2e871c83c605161bcd82229f14f8 -SIZE (xpi/firefox-60.3.0/vi.xpi) = 528186 -SHA256 (xpi/firefox-60.3.0/xh.xpi) = 0685ffa285c674bb79b6d2f11f87a1a4092622a4fce48640bee4dfccdc68d7df -SIZE (xpi/firefox-60.3.0/xh.xpi) = 511853 -SHA256 (xpi/firefox-60.3.0/zh-CN.xpi) = 920feb459841eaf3e87c3cc5359f7a352b222262854e3e94bfdf2bcc5a2a4c43 -SIZE (xpi/firefox-60.3.0/zh-CN.xpi) = 543582 -SHA256 (xpi/firefox-60.3.0/zh-TW.xpi) = e57bd11987d45fd7c5062b4629f599f4b1b4873866498f6213a5118964755d42 -SIZE (xpi/firefox-60.3.0/zh-TW.xpi) = 541908 +TIMESTAMP = 1543878683 +SHA256 (xpi/firefox-60.4.0/ach.xpi) = 6c5994f79cd186bd9c12b309f7fe4dcccfea6467cdef752e5808f8b999f4e863 +SIZE (xpi/firefox-60.4.0/ach.xpi) = 496839 +SHA256 (xpi/firefox-60.4.0/af.xpi) = 533f29c135b81f87b4d0e16a1c1024bb88fb765530006346632dfcabae775efd +SIZE (xpi/firefox-60.4.0/af.xpi) = 487313 +SHA256 (xpi/firefox-60.4.0/an.xpi) = 1386a3c3ec49171f0f36cc402e42947da237f685c337c350190de260b65d0c08 +SIZE (xpi/firefox-60.4.0/an.xpi) = 520500 +SHA256 (xpi/firefox-60.4.0/ar.xpi) = 28c1493982afd32ccb1533140fdc2f72cf5202be6917a6ee549d44a93180ce91 +SIZE (xpi/firefox-60.4.0/ar.xpi) = 547812 +SHA256 (xpi/firefox-60.4.0/as.xpi) = 8686a58ecba3b3fc16335ce3178f7958c0d3a2af36a9365ce73ec946af87bfbd +SIZE (xpi/firefox-60.4.0/as.xpi) = 530723 +SHA256 (xpi/firefox-60.4.0/ast.xpi) = b4a37f8336ca24670c83d9efb92ffb4ed263c1a5d3a9bf4219f887eb80ea5d90 +SIZE (xpi/firefox-60.4.0/ast.xpi) = 508654 +SHA256 (xpi/firefox-60.4.0/az.xpi) = 6aec8e5f2ec6e6022a64ffa78d362355fad1b1bc244bd98bdf8ed357e0c27c51 +SIZE (xpi/firefox-60.4.0/az.xpi) = 524747 +SHA256 (xpi/firefox-60.4.0/be.xpi) = 830f80a2d2d82067a44a39b10d13b9ca48c19703ae346f561bf39230fc67c33d +SIZE (xpi/firefox-60.4.0/be.xpi) = 580716 +SHA256 (xpi/firefox-60.4.0/bg.xpi) = aea44af29929a9623c2eec09841c1886d6f5ca28cc5850cbbf4bfc6f9629ae40 +SIZE (xpi/firefox-60.4.0/bg.xpi) = 573847 +SHA256 (xpi/firefox-60.4.0/bn-BD.xpi) = b9a405fb1188b9f9d0e412653ccfb3bf7ac0442a97fecdecf03a62e8cf45f5f6 +SIZE (xpi/firefox-60.4.0/bn-BD.xpi) = 590424 +SHA256 (xpi/firefox-60.4.0/bn-IN.xpi) = cd470e9980bcd4695c144cb6015e3daa35a996743916404574959d9dd441076d +SIZE (xpi/firefox-60.4.0/bn-IN.xpi) = 570865 +SHA256 (xpi/firefox-60.4.0/br.xpi) = 509881c785d1a9f55cf7fa9e30de444ac9af5886748dca4a2cd45df60d9df257 +SIZE (xpi/firefox-60.4.0/br.xpi) = 512028 +SHA256 (xpi/firefox-60.4.0/bs.xpi) = b9c140cc80ea283c014b14261fdb9a9ef3b80a555bf82006d75ac4e1ca267e0a +SIZE (xpi/firefox-60.4.0/bs.xpi) = 514708 +SHA256 (xpi/firefox-60.4.0/ca.xpi) = b93070ce533d706d81aa23d8c86d40f7b4ab12530a61eab1db16f044616156dc +SIZE (xpi/firefox-60.4.0/ca.xpi) = 525255 +SHA256 (xpi/firefox-60.4.0/cak.xpi) = 247ea7d7505d4b628cb61f2e3cc3f117ad6361b4068651e7ef9e1e2d6e2daaa9 +SIZE (xpi/firefox-60.4.0/cak.xpi) = 536300 +SHA256 (xpi/firefox-60.4.0/cs.xpi) = 61a1b2ac458acb878b117c1d6c69a84754d1b6aa0c0cabfb4949dab8c4d72e12 +SIZE (xpi/firefox-60.4.0/cs.xpi) = 531794 +SHA256 (xpi/firefox-60.4.0/cy.xpi) = 973c736b181fe17fa9178a56520ee1fe859bd29fb34ee4d608025e9ad32daa79 +SIZE (xpi/firefox-60.4.0/cy.xpi) = 516632 +SHA256 (xpi/firefox-60.4.0/da.xpi) = 9a4cdbfa1d7a8df5d8d0cf593e702ab9a64a0d7bf8f7e5e5f52c0b926a1a2bb9 +SIZE (xpi/firefox-60.4.0/da.xpi) = 510750 +SHA256 (xpi/firefox-60.4.0/de.xpi) = 4fd7c13c3f7d3b35f4e8e6b78c0ffc346ac997dabdbcdc4ae325b32ba9205f53 +SIZE (xpi/firefox-60.4.0/de.xpi) = 526520 +SHA256 (xpi/firefox-60.4.0/dsb.xpi) = b3146a23988fed470c20a464e24bccaa32436b1c496a7c3cb7b6f88c7c445966 +SIZE (xpi/firefox-60.4.0/dsb.xpi) = 539525 +SHA256 (xpi/firefox-60.4.0/el.xpi) = e4063533df98d216b95513782536c5df4ce61e3c1c04a16d5454767fb091395c +SIZE (xpi/firefox-60.4.0/el.xpi) = 593689 +SHA256 (xpi/firefox-60.4.0/en-GB.xpi) = 63ed16629f8abacc5246760e87878604390f5501bfaf81770cd9d772cf74963a +SIZE (xpi/firefox-60.4.0/en-GB.xpi) = 491695 +SHA256 (xpi/firefox-60.4.0/en-US.xpi) = c253f340f02c8c3a1d0dbf7b68fde4055892e69fc45c0e144ff74fd487dadacd +SIZE (xpi/firefox-60.4.0/en-US.xpi) = 473178 +SHA256 (xpi/firefox-60.4.0/en-ZA.xpi) = 0c1b753e59455191a79d5f11c2dfbec7778dbf39242eb49a668c5eb297fba33a +SIZE (xpi/firefox-60.4.0/en-ZA.xpi) = 474674 +SHA256 (xpi/firefox-60.4.0/eo.xpi) = 449f6581cb43407675aae277b37b974d7785b6526956fb2434cf4bef60d44e60 +SIZE (xpi/firefox-60.4.0/eo.xpi) = 511268 +SHA256 (xpi/firefox-60.4.0/es-AR.xpi) = 014b6a3dd4fba99c19c61ebc9a886147aedd69fbc4d5f5d26970cd14319f9d8b +SIZE (xpi/firefox-60.4.0/es-AR.xpi) = 524653 +SHA256 (xpi/firefox-60.4.0/es-CL.xpi) = 60437b90b11c35ae0071d491a17af9b9708fd570db85a0c1643178ac1d9fa65e +SIZE (xpi/firefox-60.4.0/es-CL.xpi) = 527320 +SHA256 (xpi/firefox-60.4.0/es-ES.xpi) = e99b60f519a100303c7a36af33cf65146043a74f676e9c7996f7e21c211ea01d +SIZE (xpi/firefox-60.4.0/es-ES.xpi) = 459964 +SHA256 (xpi/firefox-60.4.0/es-MX.xpi) = 3d77b4a0d3beabc64208198479192e00e1eeb184def90e9dcc5ab27676b18138 +SIZE (xpi/firefox-60.4.0/es-MX.xpi) = 528665 +SHA256 (xpi/firefox-60.4.0/et.xpi) = 6ce4afd678cd214b76671b2a8aa63d58cbe85d32692c27c221ee13f6bd8095a9 +SIZE (xpi/firefox-60.4.0/et.xpi) = 504965 +SHA256 (xpi/firefox-60.4.0/eu.xpi) = 4adb45e03a94dd409a84ee466127871c338e4c842e46218f48474e7c676be125 +SIZE (xpi/firefox-60.4.0/eu.xpi) = 511708 +SHA256 (xpi/firefox-60.4.0/fa.xpi) = 8869a4c54df2806563e97f60144c78137ab539295870d22ae616b8e6b4508a31 +SIZE (xpi/firefox-60.4.0/fa.xpi) = 566264 +SHA256 (xpi/firefox-60.4.0/ff.xpi) = 31870f3e69c7c4c87b933ccde828da337012a1cd48c90d585ce878fea235557f +SIZE (xpi/firefox-60.4.0/ff.xpi) = 512205 +SHA256 (xpi/firefox-60.4.0/fi.xpi) = ce639812fd26d480cbb132400a114a1dbfd83a9c97da6a68f633dbec638a74da +SIZE (xpi/firefox-60.4.0/fi.xpi) = 506183 +SHA256 (xpi/firefox-60.4.0/fr.xpi) = f7f52f50f36835be12707c4e44e3000b12a9ba7533d110930289499fee1a995f +SIZE (xpi/firefox-60.4.0/fr.xpi) = 536067 +SHA256 (xpi/firefox-60.4.0/fy-NL.xpi) = b0f419ee2bfb6cb0da3ebcf5f43f7d2b4435161b12ffc1d922946353b64ad543 +SIZE (xpi/firefox-60.4.0/fy-NL.xpi) = 524530 +SHA256 (xpi/firefox-60.4.0/ga-IE.xpi) = 27890cb3850aa0dc2795ba474b6671e90386068d602fc7b3b82e325afa05334f +SIZE (xpi/firefox-60.4.0/ga-IE.xpi) = 526983 +SHA256 (xpi/firefox-60.4.0/gd.xpi) = c611343e3305c61c0bb3fbe2b9a54efea092e714930bbe3f40c0bdb1630a9d5a +SIZE (xpi/firefox-60.4.0/gd.xpi) = 520873 +SHA256 (xpi/firefox-60.4.0/gl.xpi) = f9278c95c96c097597a3c226ae3bf516c47be6967f96ee993c47eb382b185a1d +SIZE (xpi/firefox-60.4.0/gl.xpi) = 497370 +SHA256 (xpi/firefox-60.4.0/gn.xpi) = f9a80dd819a039c4923eb6be6b99bad8ddfa3929b8fd0aa033a020c1d271bebd +SIZE (xpi/firefox-60.4.0/gn.xpi) = 533216 +SHA256 (xpi/firefox-60.4.0/gu-IN.xpi) = f0428fe69468ebd2eea170d9d7257f86c348b233dafb5ff351e8e026158ffe54 +SIZE (xpi/firefox-60.4.0/gu-IN.xpi) = 590266 +SHA256 (xpi/firefox-60.4.0/he.xpi) = 1c77961f575e7987507f5ebc7c91b8d104a0dccc893db6bdfc1ad4e03d92f760 +SIZE (xpi/firefox-60.4.0/he.xpi) = 535985 +SHA256 (xpi/firefox-60.4.0/hi-IN.xpi) = af38739494d7348e7e5f53b1c14548110f8f5d1869e4de2f2c559fc458a69218 +SIZE (xpi/firefox-60.4.0/hi-IN.xpi) = 590865 +SHA256 (xpi/firefox-60.4.0/hr.xpi) = 21b05b3332c8c417b21133291b9189c929339bd33ac85c0e133c1762e6899296 +SIZE (xpi/firefox-60.4.0/hr.xpi) = 515957 +SHA256 (xpi/firefox-60.4.0/hsb.xpi) = 7bac818f9228cfc14f2ce2630af40a19ca62a8f698f30bd42dc12274e3dc5428 +SIZE (xpi/firefox-60.4.0/hsb.xpi) = 537060 +SHA256 (xpi/firefox-60.4.0/hu.xpi) = ca76e1ad2f5b0566d1e724173482131d0dbf001e0f7ffd15eff2108e645155c9 +SIZE (xpi/firefox-60.4.0/hu.xpi) = 538411 +SHA256 (xpi/firefox-60.4.0/hy-AM.xpi) = 56fd2362e3472b24fa9f193c1bb518a45fc8f66ec761f1cd0a2d6ab50d7931b9 +SIZE (xpi/firefox-60.4.0/hy-AM.xpi) = 569416 +SHA256 (xpi/firefox-60.4.0/ia.xpi) = 472f3f127a0bd1b40336ab002bf169bc75a91b99f620e102dc5641e804f2759f +SIZE (xpi/firefox-60.4.0/ia.xpi) = 510729 +SHA256 (xpi/firefox-60.4.0/id.xpi) = 6d19a040775eed58b3bdbe6ea4b7d471c2a7501936f5e8e9a860cd50302ef0c6 +SIZE (xpi/firefox-60.4.0/id.xpi) = 502222 +SHA256 (xpi/firefox-60.4.0/is.xpi) = cb3929f9aacfec38027e2d7e9aaeeed3c8480904b39318ceb7d46396292a1150 +SIZE (xpi/firefox-60.4.0/is.xpi) = 513273 +SHA256 (xpi/firefox-60.4.0/it.xpi) = eb437d8fb09550dab8660076185d8c229f5d3e7cde03698896dce7bc983d7671 +SIZE (xpi/firefox-60.4.0/it.xpi) = 399106 +SHA256 (xpi/firefox-60.4.0/ja.xpi) = 4effde2a5c6694281a81a6d47e3a4422655db06329721923e5a13a2e0757ebef +SIZE (xpi/firefox-60.4.0/ja.xpi) = 572011 +SHA256 (xpi/firefox-60.4.0/ka.xpi) = 96591b99c9516c93bde22783bbec58a5cbcffc272e5688229b51a1adc10f82e8 +SIZE (xpi/firefox-60.4.0/ka.xpi) = 556851 +SHA256 (xpi/firefox-60.4.0/kab.xpi) = 8b0ea6983a234e50fa502ed7d8e42201fb8dc186395296a52bbf282c4a66b9b0 +SIZE (xpi/firefox-60.4.0/kab.xpi) = 520400 +SHA256 (xpi/firefox-60.4.0/kk.xpi) = ded846cfe2cb80f129d2874648c3dbc714bfce43ec0e56b54977f0a4b62ecc3a +SIZE (xpi/firefox-60.4.0/kk.xpi) = 582977 +SHA256 (xpi/firefox-60.4.0/km.xpi) = 8205b3a0e405750e6bbef1a4bcd0375374d0651761d28718b8257d9e5065e080 +SIZE (xpi/firefox-60.4.0/km.xpi) = 583111 +SHA256 (xpi/firefox-60.4.0/kn.xpi) = d80186be24ddceee96b87f80138a370e8879b4100954bf18d2e38b7785482a61 +SIZE (xpi/firefox-60.4.0/kn.xpi) = 585871 +SHA256 (xpi/firefox-60.4.0/ko.xpi) = ec0444e78fa7651873ed5576f052117b02baa6e24228bed4baf820307919988f +SIZE (xpi/firefox-60.4.0/ko.xpi) = 547828 +SHA256 (xpi/firefox-60.4.0/lij.xpi) = 089f2bdeeedef607aa6fd3b83a1be73d24a1ecf59d4127689690ef0511b88975 +SIZE (xpi/firefox-60.4.0/lij.xpi) = 513181 +SHA256 (xpi/firefox-60.4.0/lt.xpi) = 52b69dc62f1b0915aabea613a32dc438e9ecdb04cf5bf0a86486ccabb59ae951 +SIZE (xpi/firefox-60.4.0/lt.xpi) = 536463 +SHA256 (xpi/firefox-60.4.0/lv.xpi) = 77d97caaf9ce22a35b43e3723219323002a1cb7d013470cefa99020b6b8fa4e1 +SIZE (xpi/firefox-60.4.0/lv.xpi) = 526417 +SHA256 (xpi/firefox-60.4.0/mai.xpi) = 3a30240c7c2d3d8428a6c2a902ebcc8c427f6348b4f0115b3dc16ebde87b9081 +SIZE (xpi/firefox-60.4.0/mai.xpi) = 549248 +SHA256 (xpi/firefox-60.4.0/mk.xpi) = 400e9920beaf8ba0e7deb085c5a3fcdd01e9331bc17d6f72aa9037051b9a779b +SIZE (xpi/firefox-60.4.0/mk.xpi) = 513808 +SHA256 (xpi/firefox-60.4.0/ml.xpi) = 5fa399baa1ebe7839a100602cfc224e826f5eb19af071a52cd820cc7970ca230 +SIZE (xpi/firefox-60.4.0/ml.xpi) = 598979 +SHA256 (xpi/firefox-60.4.0/mr.xpi) = dd72dd03d4d17d7cf31a1a226b4a0c3409dd009394404b3cb8f54f9b2f942334 +SIZE (xpi/firefox-60.4.0/mr.xpi) = 579111 +SHA256 (xpi/firefox-60.4.0/ms.xpi) = b30f0459ab5450a32d4afce816358506fe2893407f83b1766e397ad523616cc7 +SIZE (xpi/firefox-60.4.0/ms.xpi) = 509556 +SHA256 (xpi/firefox-60.4.0/my.xpi) = 96695c1a83f8be86281594b985f7e9b8b457851f2e96b93627aaf4d4559ea51e +SIZE (xpi/firefox-60.4.0/my.xpi) = 570351 +SHA256 (xpi/firefox-60.4.0/nb-NO.xpi) = e0b532164d0c205ad7f0ecb1c385056d594cd6739881eca9d3a41ad01b12d265 +SIZE (xpi/firefox-60.4.0/nb-NO.xpi) = 509887 +SHA256 (xpi/firefox-60.4.0/ne-NP.xpi) = 2070c51153b071a762ee86b79b08b5cc949c169c15f1b970eb8e10765285122b +SIZE (xpi/firefox-60.4.0/ne-NP.xpi) = 555363 +SHA256 (xpi/firefox-60.4.0/nl.xpi) = ff01bbc0b7f14bdcac59c172772607cbd2e7b39fa6606eb823e5c7b836b8c6be +SIZE (xpi/firefox-60.4.0/nl.xpi) = 517458 +SHA256 (xpi/firefox-60.4.0/nn-NO.xpi) = d4bf54a03f8340cef80ff2bb2f052d64904da6b861bd69da8d13d65eaeef9ecf +SIZE (xpi/firefox-60.4.0/nn-NO.xpi) = 511433 +SHA256 (xpi/firefox-60.4.0/oc.xpi) = 396d39257841d62d0ba0bd0afa52363959221d2cdc75fbaeedcf7f18246cb199 +SIZE (xpi/firefox-60.4.0/oc.xpi) = 526984 +SHA256 (xpi/firefox-60.4.0/or.xpi) = de5a59fc86a8f3bec1889b642eea1bfc0ed71306f6536e43028e75f004842040 +SIZE (xpi/firefox-60.4.0/or.xpi) = 540864 +SHA256 (xpi/firefox-60.4.0/pa-IN.xpi) = 6829648639d2501a9836f09f23e087a7d6011868eea65728a818a35182f67643 +SIZE (xpi/firefox-60.4.0/pa-IN.xpi) = 557874 +SHA256 (xpi/firefox-60.4.0/pl.xpi) = aa76272480d526d462c33809b90d018ad8f2bfa23f62703623c85c18329bab60 +SIZE (xpi/firefox-60.4.0/pl.xpi) = 419029 +SHA256 (xpi/firefox-60.4.0/pt-BR.xpi) = 9876de5ac0d45af3a2f97e7a354215b3bdc766674565ee1a2fabd4d97b3388c5 +SIZE (xpi/firefox-60.4.0/pt-BR.xpi) = 514761 +SHA256 (xpi/firefox-60.4.0/pt-PT.xpi) = 50ab49d5a76a234f65b2577af92a2e0805743212e3995f58d66e61540b4790b7 +SIZE (xpi/firefox-60.4.0/pt-PT.xpi) = 519363 +SHA256 (xpi/firefox-60.4.0/rm.xpi) = 3f09406658fa066aceb85053897fba5c4798bc7e035ee803443bbacb2cc40293 +SIZE (xpi/firefox-60.4.0/rm.xpi) = 506044 +SHA256 (xpi/firefox-60.4.0/ro.xpi) = 1417b4da31080b1d9a1e4fba9d8dbd8127150cac276f1754522ec40a7f2dbfbc +SIZE (xpi/firefox-60.4.0/ro.xpi) = 514056 +SHA256 (xpi/firefox-60.4.0/ru.xpi) = b54cb486377eaaf7a5ff5c01e3ee6eaab55a0c893afd513868dbc29df38a6eb8 +SIZE (xpi/firefox-60.4.0/ru.xpi) = 591396 +SHA256 (xpi/firefox-60.4.0/si.xpi) = 2d30b26181b6cf1f62f21e58c8220cf4f07fdef498c6501f9f62b164af282eee +SIZE (xpi/firefox-60.4.0/si.xpi) = 545576 +SHA256 (xpi/firefox-60.4.0/sk.xpi) = 0a9109c3d40b9dcfadc39399acf805182e8713fcc8f600e472b084289c30277f +SIZE (xpi/firefox-60.4.0/sk.xpi) = 541703 +SHA256 (xpi/firefox-60.4.0/sl.xpi) = 9e892bf500c93a414ce4b9ec92f41241cd7b8fae45379aa5e0bdccb2c931370b +SIZE (xpi/firefox-60.4.0/sl.xpi) = 519373 +SHA256 (xpi/firefox-60.4.0/son.xpi) = ff261bc0ef624014c4d5fd91d45ad7445fdb82517353fbf1a2f5ba749fa3a572 +SIZE (xpi/firefox-60.4.0/son.xpi) = 497700 +SHA256 (xpi/firefox-60.4.0/sq.xpi) = 43fdaebedb1c10d9706340cc4636e732cdd0288eee9a328a322e6b486666fa89 +SIZE (xpi/firefox-60.4.0/sq.xpi) = 521262 +SHA256 (xpi/firefox-60.4.0/sr.xpi) = 9f7226ad8764daf416147b859a54416cb020f324c3f956c78c806e7259ec56f5 +SIZE (xpi/firefox-60.4.0/sr.xpi) = 548773 +SHA256 (xpi/firefox-60.4.0/sv-SE.xpi) = 1800232094c7155114105002dd33c08f2fdcc92e41551ba1d480f4612e7f7077 +SIZE (xpi/firefox-60.4.0/sv-SE.xpi) = 518658 +SHA256 (xpi/firefox-60.4.0/ta.xpi) = 5270288b98966f6b3fa3276b2a02e03ca38dca33bb757190ee2999d5b64d309c +SIZE (xpi/firefox-60.4.0/ta.xpi) = 577921 +SHA256 (xpi/firefox-60.4.0/te.xpi) = 1df0426f98e4096818c2c37dcf7c77d3f5c0f5f0ffe2a1f69820e4ee5ef9dad5 +SIZE (xpi/firefox-60.4.0/te.xpi) = 590964 +SHA256 (xpi/firefox-60.4.0/th.xpi) = 3ae7e912052724a7b9c63a51889a49596cadd8718db53aaad91a41aaf4bdbd7b +SIZE (xpi/firefox-60.4.0/th.xpi) = 562819 +SHA256 (xpi/firefox-60.4.0/tr.xpi) = 2deb102c37e8d5dc006ad1eb551f17fd0363d3930009cd42f2057a9432872663 +SIZE (xpi/firefox-60.4.0/tr.xpi) = 525859 +SHA256 (xpi/firefox-60.4.0/uk.xpi) = ccb412aef1f753adf3d8d0f00064ceb577e1a93ef81219fd80e378edbf116900 +SIZE (xpi/firefox-60.4.0/uk.xpi) = 580919 +SHA256 (xpi/firefox-60.4.0/ur.xpi) = d5baa384cf1ad6c4b8e92f5751aab31ad7a10464936d7b9af347c69e7c1c8924 +SIZE (xpi/firefox-60.4.0/ur.xpi) = 563382 +SHA256 (xpi/firefox-60.4.0/uz.xpi) = c0a2ed70997900393a4db969603a7acf20418a2fd998768ced127bb507a061a0 +SIZE (xpi/firefox-60.4.0/uz.xpi) = 513686 +SHA256 (xpi/firefox-60.4.0/vi.xpi) = ff4c4893b0313e3ea7720c7b4dc485229f0228f6a86f943789bb4f0b371ed788 +SIZE (xpi/firefox-60.4.0/vi.xpi) = 528187 +SHA256 (xpi/firefox-60.4.0/xh.xpi) = bd455ced24f9f38bfbba68a7f0781d78d1e0eb2f2590e6fc666bf4bc3e1db8d9 +SIZE (xpi/firefox-60.4.0/xh.xpi) = 511859 +SHA256 (xpi/firefox-60.4.0/zh-CN.xpi) = 47037f75daba786f81a4789ab84b7c77d9d5fe5f14c1de266715ff12193df3ce +SIZE (xpi/firefox-60.4.0/zh-CN.xpi) = 543585 +SHA256 (xpi/firefox-60.4.0/zh-TW.xpi) = 5bee6ca745bc28ecc64c7d89fc9c4914e8d9fc22b2add02b94a8b856b77a8f19 +SIZE (xpi/firefox-60.4.0/zh-TW.xpi) = 541910 diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile index b576433a2ff..6e2cbf26a76 100644 --- a/www/firefox-esr/Makefile +++ b/www/firefox-esr/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= firefox -DISTVERSION= 60.3.0 -PORTREVISION= 5 +DISTVERSION= 60.4.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build2/source PKGNAMESUFFIX= -esr DISTFILES= ${DISTNAME}esr.source${EXTRACT_SUFX} diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo index 8dded042fed..efff0e8edbe 100644 --- a/www/firefox-esr/distinfo +++ b/www/firefox-esr/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539808809 -SHA256 (firefox-60.3.0esr.source.tar.xz) = 5566f3181aba169cae4b026cf1ea5e6b477d3e91b575fb3a42b5a33eeb2b5361 -SIZE (firefox-60.3.0esr.source.tar.xz) = 268340600 +TIMESTAMP = 1543878683 +SHA256 (firefox-60.4.0esr.source.tar.xz) = 205258548c3f245d42377b338f0db1272df39489d61305c39b83e52750ebff85 +SIZE (firefox-60.4.0esr.source.tar.xz) = 268425148 diff --git a/www/firefox-esr/files/patch-bug1500484 b/www/firefox-esr/files/patch-bug1500484 deleted file mode 100644 index f69ae8ed266..00000000000 --- a/www/firefox-esr/files/patch-bug1500484 +++ /dev/null @@ -1,12 +0,0 @@ -Drop unused header breaking build on non-Linux - ---- widget/gtk/nsClipboardWayland.cpp -+++ widget/gtk/nsClipboardWayland.cpp -@@ -29,7 +29,6 @@ - - #include - #include --#include - #include - #include - #include diff --git a/www/firefox-esr/files/patch-bug1500850 b/www/firefox-esr/files/patch-bug1500850 new file mode 100644 index 00000000000..906d91a5d8a --- /dev/null +++ b/www/firefox-esr/files/patch-bug1500850 @@ -0,0 +1,26 @@ +commit 4425b9140c4c +Author: Martin Stransky +Date: Mon Oct 22 09:14:07 2018 +0000 + + Bug 1500850 - [Wayland] Add missing dbus header dbus-glib-lowlevel.h. r=jhorak, a=RyanVM + + Differential Revision: https://phabricator.services.mozilla.com/D9365 + + --HG-- + extra : source : 5203edd6ea29e4b73681674d2a5268dd6a310102 +--- + widget/xremoteclient/DBusRemoteClient.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git widget/xremoteclient/DBusRemoteClient.cpp widget/xremoteclient/DBusRemoteClient.cpp +index ba5bda06201d..b2f03dccc133 100644 +--- widget/xremoteclient/DBusRemoteClient.cpp ++++ widget/xremoteclient/DBusRemoteClient.cpp +@@ -13,6 +13,7 @@ + #include "nsPrintfCString.h" + + #include ++#include + + using mozilla::LogLevel; + static mozilla::LazyLogModule sRemoteLm("DBusRemoteClient"); diff --git a/www/firefox-esr/files/patch-bug1509757 b/www/firefox-esr/files/patch-bug1509757 deleted file mode 100644 index 9260fc5d5f8..00000000000 --- a/www/firefox-esr/files/patch-bug1509757 +++ /dev/null @@ -1,20 +0,0 @@ -Don't rely on GNU regex extension for character classes. - -$ echo --with-system-nspr --with-system-nss | gsed -e 's/--with-system-nspr\S* *//' ---with-system-nss -$ echo --with-system-nspr --with-system-nss | sed -e 's/--with-system-nspr\S* *//' -sed: 1: "s/--with-system-nspr\S* ...": RE error: trailing backslash (\) - -diff --git old-configure.in old-configure.in -index 7722587fadac..acf5d8d67a60 100644 ---- old-configure.in -+++ old-configure.in -@@ -4405,7 +4405,7 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS" - - # --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS - # and $NSPR_LIBS. --ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr\S* *//'`" -+ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[[^[:space:]]]* *//'`" - - if test "$_INTL_API" = no; then - ac_configure_args="$ac_configure_args --without-intl-api" diff --git a/www/firefox-i18n/Makefile b/www/firefox-i18n/Makefile index 95d4cc151d7..6794a16af26 100644 --- a/www/firefox-i18n/Makefile +++ b/www/firefox-i18n/Makefile @@ -3,9 +3,10 @@ PORTNAME= firefox-i18n PORTVERSION= 64.0 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${DISTVERSION}/linux-i686/xpi \ - MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build1/linux-i686/xpi + MOZILLA/${PORTNAME:S|-i18n||}/candidates/${DISTVERSION}-candidates/build3/linux-i686/xpi PKGNAMEPREFIX= DISTFILES= ${FIREFOX_I18N_:S/$/.xpi/} DIST_SUBDIR= xpi/${DISTNAME} diff --git a/www/firefox-i18n/distinfo b/www/firefox-i18n/distinfo index 0df430ced4f..feefdd2397a 100644 --- a/www/firefox-i18n/distinfo +++ b/www/firefox-i18n/distinfo @@ -1,199 +1,199 @@ -TIMESTAMP = 1543880118 -SHA256 (xpi/firefox-i18n-64.0/ach.xpi) = bed3163961fc7b80a0561d37a68b3b982d10c9d46378f0a1a212b3222297d685 -SIZE (xpi/firefox-i18n-64.0/ach.xpi) = 455466 -SHA256 (xpi/firefox-i18n-64.0/af.xpi) = bcc24cb14add98aa52c0c1af436be48c7812527a1746a9ea0f0cea62eacf40d3 -SIZE (xpi/firefox-i18n-64.0/af.xpi) = 431980 -SHA256 (xpi/firefox-i18n-64.0/an.xpi) = 32f9c335664179498c077f2b7110dbe4e59cbd1e159fa3be2b67a65bdb3d4ec7 -SIZE (xpi/firefox-i18n-64.0/an.xpi) = 473571 -SHA256 (xpi/firefox-i18n-64.0/ar.xpi) = 70055177105cf5395920dc7e7df8edd123fe8c0705d330f3bfbe879a3ce9e2df -SIZE (xpi/firefox-i18n-64.0/ar.xpi) = 513399 -SHA256 (xpi/firefox-i18n-64.0/as.xpi) = 92f35ecaebc4c93d8ef6183463b5b37e3898eb2af303b742b028e0faa3217bd2 -SIZE (xpi/firefox-i18n-64.0/as.xpi) = 478292 -SHA256 (xpi/firefox-i18n-64.0/ast.xpi) = 43a699ffda269e81f398e4e8de8dcf0e517f67e6fd91b179b8112b5b108cb19c -SIZE (xpi/firefox-i18n-64.0/ast.xpi) = 461823 -SHA256 (xpi/firefox-i18n-64.0/az.xpi) = 9779c6a84b985ae688d38375e709fcf7540813264732a6ab8ee49732d7f946ec -SIZE (xpi/firefox-i18n-64.0/az.xpi) = 490041 -SHA256 (xpi/firefox-i18n-64.0/be.xpi) = a74f1adec1ca303ee49878d170b026b415c799422bbf5138000eefedba9512c3 -SIZE (xpi/firefox-i18n-64.0/be.xpi) = 553259 -SHA256 (xpi/firefox-i18n-64.0/bg.xpi) = 722fc19c6c58d3695cd7a53133109a907fc18273acdb7c47c13aacb3d295e6d2 -SIZE (xpi/firefox-i18n-64.0/bg.xpi) = 523737 -SHA256 (xpi/firefox-i18n-64.0/bn-BD.xpi) = 0a518e463ea8c18d09a8cb7c6dcd67eb0ec2113b0ad7482fc38fb3711a93396a -SIZE (xpi/firefox-i18n-64.0/bn-BD.xpi) = 541867 -SHA256 (xpi/firefox-i18n-64.0/bn-IN.xpi) = 3e27482ae7a7d2f49098178d579d1e59ec99513e95f3a1497385a4b8a25da474 -SIZE (xpi/firefox-i18n-64.0/bn-IN.xpi) = 528985 -SHA256 (xpi/firefox-i18n-64.0/br.xpi) = 29cea610889594acb999b1f20d91768b355d1370a044174a3da43e0493a7256d -SIZE (xpi/firefox-i18n-64.0/br.xpi) = 479237 -SHA256 (xpi/firefox-i18n-64.0/bs.xpi) = 62c51b09249edd504406461614d196aae9a8c092e4d1460cd2f4d1535794539d -SIZE (xpi/firefox-i18n-64.0/bs.xpi) = 471754 -SHA256 (xpi/firefox-i18n-64.0/ca.xpi) = 2a1a52973eb3d2a5fddd1350d483bfbb1cf39e13b2b4b5ee31a4f27c99c1195c -SIZE (xpi/firefox-i18n-64.0/ca.xpi) = 469699 -SHA256 (xpi/firefox-i18n-64.0/cak.xpi) = 83940182b63b14d94f15044571c090e0be7b25698ce9c96be0a5ee02957cf441 -SIZE (xpi/firefox-i18n-64.0/cak.xpi) = 506035 -SHA256 (xpi/firefox-i18n-64.0/cs.xpi) = 78b8b8306bc12f0680e4ad444350d8d7795d07232c77c7679aa2cfe05f10ef88 -SIZE (xpi/firefox-i18n-64.0/cs.xpi) = 494711 -SHA256 (xpi/firefox-i18n-64.0/cy.xpi) = 6d29418447ebcc4caef8c2c86c4e900dcec11b1000b0de45ee15c4f839655a0c -SIZE (xpi/firefox-i18n-64.0/cy.xpi) = 484369 -SHA256 (xpi/firefox-i18n-64.0/da.xpi) = 63c38215f5a09ad90e3e1f9bc5945c5213ab81211095e7e9e0ec3e33b051a19f -SIZE (xpi/firefox-i18n-64.0/da.xpi) = 486851 -SHA256 (xpi/firefox-i18n-64.0/de.xpi) = 015a6c8209b44d9b32af879aeeb5ac75c051b75bef263d65bd74e2283b7c061a -SIZE (xpi/firefox-i18n-64.0/de.xpi) = 494530 -SHA256 (xpi/firefox-i18n-64.0/dsb.xpi) = a72325d63515ad317c991747b0e4b60b8184005069a45a4a685e1c45bd2bff43 -SIZE (xpi/firefox-i18n-64.0/dsb.xpi) = 504230 -SHA256 (xpi/firefox-i18n-64.0/el.xpi) = bc672e3dc29e77117064bdbc6592ee370362108e5e992dad146902498c16e780 -SIZE (xpi/firefox-i18n-64.0/el.xpi) = 558821 -SHA256 (xpi/firefox-i18n-64.0/en-CA.xpi) = 3238e4edad4eb4832ae75a2cd0a559705f0ea3a5d886855e3de8b06d6ba0c10a -SIZE (xpi/firefox-i18n-64.0/en-CA.xpi) = 454071 -SHA256 (xpi/firefox-i18n-64.0/en-GB.xpi) = e5707406ffc8cb78ffcc8cb16ceb689ea3037662b2912412f52f78b8b8a24976 -SIZE (xpi/firefox-i18n-64.0/en-GB.xpi) = 440962 -SHA256 (xpi/firefox-i18n-64.0/en-US.xpi) = 6e38e4401af1bf7d616905ea821128f9284ea5755f70099a3dd5ed137269ea12 -SIZE (xpi/firefox-i18n-64.0/en-US.xpi) = 413601 -SHA256 (xpi/firefox-i18n-64.0/en-ZA.xpi) = ece8c4a86dead88d181211c42ac2562c2e4cab006b7b54d794cf4e11912e12f2 -SIZE (xpi/firefox-i18n-64.0/en-ZA.xpi) = 424502 -SHA256 (xpi/firefox-i18n-64.0/eo.xpi) = dc50b04a15f9d7d950bf9153d8d7a6ece57b77ce6eadb06008b71de33a820ecc -SIZE (xpi/firefox-i18n-64.0/eo.xpi) = 482464 -SHA256 (xpi/firefox-i18n-64.0/es-AR.xpi) = 16af6d2f23262e7655a367f386445ae017d0cfa37685ecdbac09b8e9766978f5 -SIZE (xpi/firefox-i18n-64.0/es-AR.xpi) = 490543 -SHA256 (xpi/firefox-i18n-64.0/es-CL.xpi) = 8be4b30ee3e3fa6dfec7c1bf6645191013d276b0c9915324779056edbc47ec07 -SIZE (xpi/firefox-i18n-64.0/es-CL.xpi) = 490250 -SHA256 (xpi/firefox-i18n-64.0/es-ES.xpi) = 9002d02d9a3a7b1e48d2e3ab69edff84106b913cc71f9a0db1b394bbd6874e1e +TIMESTAMP = 1544151497 +SHA256 (xpi/firefox-i18n-64.0/ach.xpi) = f7892be24ac5ef42c22edf86a012e95e25502c5c5f737f54f8b9c63173857372 +SIZE (xpi/firefox-i18n-64.0/ach.xpi) = 455463 +SHA256 (xpi/firefox-i18n-64.0/af.xpi) = 7ef092a89156e88d11c67574d56f36c0e711021fc82536562c4f62bd1f707e0f +SIZE (xpi/firefox-i18n-64.0/af.xpi) = 431976 +SHA256 (xpi/firefox-i18n-64.0/an.xpi) = eeefe78961a3c0b51dac647f9e57858c11e68831b51f6c5831c7a0b375797521 +SIZE (xpi/firefox-i18n-64.0/an.xpi) = 473568 +SHA256 (xpi/firefox-i18n-64.0/ar.xpi) = 13f8d3f342b4b36b5bfd43468bedcf84e576cd7c39ca25cbcc39d94f37a3f671 +SIZE (xpi/firefox-i18n-64.0/ar.xpi) = 513398 +SHA256 (xpi/firefox-i18n-64.0/as.xpi) = 27a3014d5309f9a9e75633bb30cde0468c3f96e1a6083186f1bdb6961f7f113e +SIZE (xpi/firefox-i18n-64.0/as.xpi) = 478291 +SHA256 (xpi/firefox-i18n-64.0/ast.xpi) = 1304896adead0aa137a92efb31e6ea5fc08ecf834eb473dc19d4fae00769790c +SIZE (xpi/firefox-i18n-64.0/ast.xpi) = 461828 +SHA256 (xpi/firefox-i18n-64.0/az.xpi) = 5694a4d92272202e033f0b675ecfeea11594b8f1ad72e291888a87e366e8aa6a +SIZE (xpi/firefox-i18n-64.0/az.xpi) = 490034 +SHA256 (xpi/firefox-i18n-64.0/be.xpi) = a5faf2dbadd4e02dd091c1d4e5ab081d15a81c5e94be6de417656ec4671bf41d +SIZE (xpi/firefox-i18n-64.0/be.xpi) = 553257 +SHA256 (xpi/firefox-i18n-64.0/bg.xpi) = b0e29cc4524f06ca76d28831f6a998668aa6d05d3d54ea089c704e98bccf2ea9 +SIZE (xpi/firefox-i18n-64.0/bg.xpi) = 523739 +SHA256 (xpi/firefox-i18n-64.0/bn-BD.xpi) = b1db2f78a91ffd26d9d507990b90d03d85c189386645e5a941e551ed7a0f42b7 +SIZE (xpi/firefox-i18n-64.0/bn-BD.xpi) = 541873 +SHA256 (xpi/firefox-i18n-64.0/bn-IN.xpi) = 2d8e5b653fbb3558bff174b0c3719471838f0725127b596c96a6d515da71b5c9 +SIZE (xpi/firefox-i18n-64.0/bn-IN.xpi) = 528978 +SHA256 (xpi/firefox-i18n-64.0/br.xpi) = 62045a918544b5993defe7567e5e7e8521ffe74812bc0fbbb17be62a0b59ec47 +SIZE (xpi/firefox-i18n-64.0/br.xpi) = 479238 +SHA256 (xpi/firefox-i18n-64.0/bs.xpi) = fdfb7b9a220a38c3190f160a8cd0591f0d8aa6c235d6a765d8779473a52951f2 +SIZE (xpi/firefox-i18n-64.0/bs.xpi) = 471750 +SHA256 (xpi/firefox-i18n-64.0/ca.xpi) = 70834220149e07d6724dc5014257fe73e888eef69d1a91ef629ca060a7f133d5 +SIZE (xpi/firefox-i18n-64.0/ca.xpi) = 469698 +SHA256 (xpi/firefox-i18n-64.0/cak.xpi) = ea3fc352224300a815bdea8f9e21803b96333f00d1a5f3cd3d298558c9a89076 +SIZE (xpi/firefox-i18n-64.0/cak.xpi) = 506033 +SHA256 (xpi/firefox-i18n-64.0/cs.xpi) = 3e7dc361d22cce7edcf76737ae933c6fc1055f8b5de3ed818d951399337eed0f +SIZE (xpi/firefox-i18n-64.0/cs.xpi) = 494715 +SHA256 (xpi/firefox-i18n-64.0/cy.xpi) = 55c04bb8d52f17d76753fb8f86028e18b6a2ca5c2d31372cd702811f426abecd +SIZE (xpi/firefox-i18n-64.0/cy.xpi) = 484374 +SHA256 (xpi/firefox-i18n-64.0/da.xpi) = 7e65181d73225429007c10e55d7df58c112ca3d98ff07e161cdf32bda3771e2e +SIZE (xpi/firefox-i18n-64.0/da.xpi) = 486848 +SHA256 (xpi/firefox-i18n-64.0/de.xpi) = 77a083106fa0d5ac093cda891d1dbd0d1cdbff5d7b2052af4afb371ed7981175 +SIZE (xpi/firefox-i18n-64.0/de.xpi) = 494533 +SHA256 (xpi/firefox-i18n-64.0/dsb.xpi) = 65bf177d7329c30ce40a39d7361a339ecfea14f365b2fc743789b19536c72f40 +SIZE (xpi/firefox-i18n-64.0/dsb.xpi) = 504229 +SHA256 (xpi/firefox-i18n-64.0/el.xpi) = 67c2156fa4780082c17a4a7bd6b0edaed446ea2465f47afbe0568ea6183b4681 +SIZE (xpi/firefox-i18n-64.0/el.xpi) = 558813 +SHA256 (xpi/firefox-i18n-64.0/en-CA.xpi) = cd11eba938c0ebfd42bd1a1e80f1ff3108ad78f88c56d48eb13b0522329b509f +SIZE (xpi/firefox-i18n-64.0/en-CA.xpi) = 454068 +SHA256 (xpi/firefox-i18n-64.0/en-GB.xpi) = 879d9544cea983d17b8206c37bb7833a6a423fbe73b142f280dd6b3d7c61581b +SIZE (xpi/firefox-i18n-64.0/en-GB.xpi) = 440963 +SHA256 (xpi/firefox-i18n-64.0/en-US.xpi) = de9dc47b1f56c8a9a6f4164ca33b22c00e2bed80f1e8553a8a7ed1c45383d9e7 +SIZE (xpi/firefox-i18n-64.0/en-US.xpi) = 413609 +SHA256 (xpi/firefox-i18n-64.0/en-ZA.xpi) = ae61c96e7046beeb692f8fed5be4787bc5bac704ce001bf80672ee93a7a281fe +SIZE (xpi/firefox-i18n-64.0/en-ZA.xpi) = 424501 +SHA256 (xpi/firefox-i18n-64.0/eo.xpi) = 9224b4f6cd16a642804619a143502c2d485af8f389fac2f1b403faed55c9f34d +SIZE (xpi/firefox-i18n-64.0/eo.xpi) = 482461 +SHA256 (xpi/firefox-i18n-64.0/es-AR.xpi) = 14c662b64faf232835d0e3ca3b5494a3b4f9ef65a03a2636544785e0037a2a1b +SIZE (xpi/firefox-i18n-64.0/es-AR.xpi) = 490544 +SHA256 (xpi/firefox-i18n-64.0/es-CL.xpi) = 67767c7fac17f6b442de39a50f7f46a08dfd45d817277650c71ea27d971897e4 +SIZE (xpi/firefox-i18n-64.0/es-CL.xpi) = 490254 +SHA256 (xpi/firefox-i18n-64.0/es-ES.xpi) = 3c2e2cf654f222927cae113dd7a807292723a9fa4fac1772bd7b0f9c92f9c736 SIZE (xpi/firefox-i18n-64.0/es-ES.xpi) = 437807 -SHA256 (xpi/firefox-i18n-64.0/es-MX.xpi) = 72ecc7d007b01dfd1bc4e06a1d79e6f4dc00a173e707c01e4d35de7a045b7b88 -SIZE (xpi/firefox-i18n-64.0/es-MX.xpi) = 493150 -SHA256 (xpi/firefox-i18n-64.0/et.xpi) = 9c1f8fb004d704866318a2ff4e72fdc425773e0b2226c4c3728d78d6a7d1dc85 +SHA256 (xpi/firefox-i18n-64.0/es-MX.xpi) = c8706e3730119089c1ff90a547d45f4b03731e2009cd6690f2310fdd4e91a227 +SIZE (xpi/firefox-i18n-64.0/es-MX.xpi) = 493155 +SHA256 (xpi/firefox-i18n-64.0/et.xpi) = 862425a3d7c21d41b75aed6404d53c2ce5be7052454ab00ec305e4726513f77e SIZE (xpi/firefox-i18n-64.0/et.xpi) = 473517 -SHA256 (xpi/firefox-i18n-64.0/eu.xpi) = 7f111be8a9fa83993aa8ce0b745b612de5c0175af14574cee63752c8aaae161f -SIZE (xpi/firefox-i18n-64.0/eu.xpi) = 477298 -SHA256 (xpi/firefox-i18n-64.0/fa.xpi) = 7e75ab343400387eba48f52db9c102139e1ace6c69630cc93734d7eb001be872 -SIZE (xpi/firefox-i18n-64.0/fa.xpi) = 529981 -SHA256 (xpi/firefox-i18n-64.0/ff.xpi) = 9183069c60f54b507618bc8ccc244a35fd4ab851f9ef00d715002d558223b794 -SIZE (xpi/firefox-i18n-64.0/ff.xpi) = 470387 -SHA256 (xpi/firefox-i18n-64.0/fi.xpi) = c760ebddc336eb058aff7c201d67f399444894e2fc673923a76d5f9073c4ea85 -SIZE (xpi/firefox-i18n-64.0/fi.xpi) = 470569 -SHA256 (xpi/firefox-i18n-64.0/fr.xpi) = 3bf2b914d25988b67c111b92b13a46d45eba0d529b22ca9e9fd62023ec2b6017 -SIZE (xpi/firefox-i18n-64.0/fr.xpi) = 499967 -SHA256 (xpi/firefox-i18n-64.0/fy-NL.xpi) = 74b616fa8a120551003fcdcaaf0b6886a38480bdf1e9ff39600abf16fc22afe8 -SIZE (xpi/firefox-i18n-64.0/fy-NL.xpi) = 488320 -SHA256 (xpi/firefox-i18n-64.0/ga-IE.xpi) = 93f1f61d231c82a5f5ebab67663fcceca72a99bf3180c9c83d8d3de591acd70b -SIZE (xpi/firefox-i18n-64.0/ga-IE.xpi) = 474812 -SHA256 (xpi/firefox-i18n-64.0/gd.xpi) = 248ae06a90a7b8e6a052eefb4b06e39a3146c8d56ba3c3f8e5cf42102661750b -SIZE (xpi/firefox-i18n-64.0/gd.xpi) = 491216 -SHA256 (xpi/firefox-i18n-64.0/gl.xpi) = 97115938f2ba139ea3a49ea46cd9b51af1cbc87bafbc284251d3805ba982201f -SIZE (xpi/firefox-i18n-64.0/gl.xpi) = 467029 -SHA256 (xpi/firefox-i18n-64.0/gn.xpi) = 838bf353c41a21e343e2e2632ea8114af9c4240b1ff1cff99df97d8121056e35 -SIZE (xpi/firefox-i18n-64.0/gn.xpi) = 497405 -SHA256 (xpi/firefox-i18n-64.0/gu-IN.xpi) = b163dd819ed5df7df974c12a2a2f20b59faf2b57df9216bdcaa747956b878ca9 -SIZE (xpi/firefox-i18n-64.0/gu-IN.xpi) = 559368 -SHA256 (xpi/firefox-i18n-64.0/he.xpi) = b9a49910faf20a86f232924b5dcde12198237865f5f1075e7d129187efcfd7b7 -SIZE (xpi/firefox-i18n-64.0/he.xpi) = 485006 -SHA256 (xpi/firefox-i18n-64.0/hi-IN.xpi) = f4fd9cfa83815617bb96d1aad07f06eeddb2e5884ec01db19859235226294f3a +SHA256 (xpi/firefox-i18n-64.0/eu.xpi) = 9d63a9332bd6ac379d55396cae8decc1117be86acc757708a906fa1b7df0efb6 +SIZE (xpi/firefox-i18n-64.0/eu.xpi) = 477302 +SHA256 (xpi/firefox-i18n-64.0/fa.xpi) = 08cef3c2c90078067d13b623f7a5c5ae59d7de41da2bc18e08fd2f03bbd04b1b +SIZE (xpi/firefox-i18n-64.0/fa.xpi) = 529978 +SHA256 (xpi/firefox-i18n-64.0/ff.xpi) = a500ae05f7680966a4500ae1802bc4b01bc03d5a908af8f091881be48784ae99 +SIZE (xpi/firefox-i18n-64.0/ff.xpi) = 470384 +SHA256 (xpi/firefox-i18n-64.0/fi.xpi) = 690d781512e9e4927070464d8bf4de22d909f896439e59e893c1e9d8fd3fb2f8 +SIZE (xpi/firefox-i18n-64.0/fi.xpi) = 470566 +SHA256 (xpi/firefox-i18n-64.0/fr.xpi) = 12eaefb0cc5a7ed71ca23b9c1bf939ad6a0fe81d767b3fd09fbbf10901ad6957 +SIZE (xpi/firefox-i18n-64.0/fr.xpi) = 499969 +SHA256 (xpi/firefox-i18n-64.0/fy-NL.xpi) = 196c2bd479011ffaf0eb63bbc7d1cd162ea3ce652a471c2c0510f3c456b6426b +SIZE (xpi/firefox-i18n-64.0/fy-NL.xpi) = 488309 +SHA256 (xpi/firefox-i18n-64.0/ga-IE.xpi) = 97cbb1f60869cdd9f9dab53c907697d83d37d79f69fc632fd367428a68b7bd8d +SIZE (xpi/firefox-i18n-64.0/ga-IE.xpi) = 474811 +SHA256 (xpi/firefox-i18n-64.0/gd.xpi) = 04bda09e52d28211089e7505d5cb08c4d3e0506440d83dfab83f7ac9e5a3e046 +SIZE (xpi/firefox-i18n-64.0/gd.xpi) = 491207 +SHA256 (xpi/firefox-i18n-64.0/gl.xpi) = db4a88b2a2d9ab18f1efcb2d12d7c919d023e8727238128857d10f460db7ca71 +SIZE (xpi/firefox-i18n-64.0/gl.xpi) = 467033 +SHA256 (xpi/firefox-i18n-64.0/gn.xpi) = 19dd1406c4539ff5b7b972d4024b21fb022f3574ed4e81b7bd8c7eb6c2d78cec +SIZE (xpi/firefox-i18n-64.0/gn.xpi) = 497408 +SHA256 (xpi/firefox-i18n-64.0/gu-IN.xpi) = 5bef251086e9b6d7b3685f707350974ac1b7ea47cad03fadf32101aacedec64c +SIZE (xpi/firefox-i18n-64.0/gu-IN.xpi) = 559365 +SHA256 (xpi/firefox-i18n-64.0/he.xpi) = 6c800f7e838a565c3a210acdaa3263f3e3293d469b3188bcc53f0f27eab1d80d +SIZE (xpi/firefox-i18n-64.0/he.xpi) = 485009 +SHA256 (xpi/firefox-i18n-64.0/hi-IN.xpi) = 766cfd3ab92ed8e8a7a7d4ec58eb6ab8ea4030cfda64e552da825dbe16f7d65a SIZE (xpi/firefox-i18n-64.0/hi-IN.xpi) = 544055 -SHA256 (xpi/firefox-i18n-64.0/hr.xpi) = 48b86f2a82ce5f9bcdd7a630f0b95fc6f7bb668747a2dee31d23e14194761a10 -SIZE (xpi/firefox-i18n-64.0/hr.xpi) = 464601 -SHA256 (xpi/firefox-i18n-64.0/hsb.xpi) = f089d72d0e1495b6daaf47fa82c2803993720bcb471d3f18fb29dd016f31c4c9 -SIZE (xpi/firefox-i18n-64.0/hsb.xpi) = 503925 -SHA256 (xpi/firefox-i18n-64.0/hu.xpi) = c86da3fda420b44c5283de42f22179a42bb3727dc5276395649b8e11808cce8a -SIZE (xpi/firefox-i18n-64.0/hu.xpi) = 501535 -SHA256 (xpi/firefox-i18n-64.0/hy-AM.xpi) = 47755d1c795655a85dccc6a69a091611d3487f820f736c7b7e75813a8742e3ff -SIZE (xpi/firefox-i18n-64.0/hy-AM.xpi) = 520937 -SHA256 (xpi/firefox-i18n-64.0/ia.xpi) = 75dae499dd353915a69adf2eeda61a38a11c3734e3be1a9b801ac5b3d95a1695 -SIZE (xpi/firefox-i18n-64.0/ia.xpi) = 478730 -SHA256 (xpi/firefox-i18n-64.0/id.xpi) = 7ca4ef4426547dd90b0870c581c4f43c8d3098703e22bdad2079ebc4e71adcc3 -SIZE (xpi/firefox-i18n-64.0/id.xpi) = 471527 -SHA256 (xpi/firefox-i18n-64.0/is.xpi) = ffbab042c6834ce7ecd19aae9f50566792de425eb4dd3ce5689b1988fe294881 -SIZE (xpi/firefox-i18n-64.0/is.xpi) = 469907 -SHA256 (xpi/firefox-i18n-64.0/it.xpi) = 52110e91465142a853424ddc5340e4c37254b7e4eced82e554050c337a0cd9eb -SIZE (xpi/firefox-i18n-64.0/it.xpi) = 355573 -SHA256 (xpi/firefox-i18n-64.0/ja.xpi) = 15b2e61e938298af58447fcd70d37203f51890c4b73307c76e35a6e0156059ca -SIZE (xpi/firefox-i18n-64.0/ja.xpi) = 506349 -SHA256 (xpi/firefox-i18n-64.0/ka.xpi) = 9d5811a439201ded7b16021b417a5bf69ddfd9cad7d2ae187e92d6ea2623d473 -SIZE (xpi/firefox-i18n-64.0/ka.xpi) = 521856 -SHA256 (xpi/firefox-i18n-64.0/kab.xpi) = 377b1bdd22b1dc6e5f16d6ab9dc4f7188426a8c8dfc1610902fc50ffbb6f71a4 -SIZE (xpi/firefox-i18n-64.0/kab.xpi) = 493582 -SHA256 (xpi/firefox-i18n-64.0/kk.xpi) = c2e47a0d41f1eb117f354cb34348970c93ae914b8f16124d69e49a413e0d4360 -SIZE (xpi/firefox-i18n-64.0/kk.xpi) = 550181 -SHA256 (xpi/firefox-i18n-64.0/km.xpi) = 65cfd6c70f9c855995079b3b241e906e0edcdbef53468395a54784eabe8af30e -SIZE (xpi/firefox-i18n-64.0/km.xpi) = 535443 -SHA256 (xpi/firefox-i18n-64.0/kn.xpi) = 36f73636103b6dc6413337e517709f5dcd29933f15e066f975f50eb8c9cafcb8 -SIZE (xpi/firefox-i18n-64.0/kn.xpi) = 538347 -SHA256 (xpi/firefox-i18n-64.0/ko.xpi) = b3d046f8572b5f2ec5700ddc9d7df74424e0c6630cd2c181611c3167089add0f -SIZE (xpi/firefox-i18n-64.0/ko.xpi) = 500860 -SHA256 (xpi/firefox-i18n-64.0/lij.xpi) = a4b7cd20fbd9b3b31918d5eb9fab9ed59573d020b94be4341fe48ccf0f53bbfe -SIZE (xpi/firefox-i18n-64.0/lij.xpi) = 476180 -SHA256 (xpi/firefox-i18n-64.0/lt.xpi) = c71d16a4c9f6770aaf538cf3430cc45733c39bcc257ee73954deb8fba342163b -SIZE (xpi/firefox-i18n-64.0/lt.xpi) = 504608 -SHA256 (xpi/firefox-i18n-64.0/lv.xpi) = a663b091c8debaae211c66dd6469763dc5a800ba2c7c4ee2ec51b3f45923ae71 -SIZE (xpi/firefox-i18n-64.0/lv.xpi) = 490766 -SHA256 (xpi/firefox-i18n-64.0/mai.xpi) = f48292a64eaa22a127ade30925bf550f8da33baa873ec917ccb0abefab5086c9 -SIZE (xpi/firefox-i18n-64.0/mai.xpi) = 496198 -SHA256 (xpi/firefox-i18n-64.0/mk.xpi) = 69f207ac8ea125e25b52080baf81e86ead253c72d6e18c7d6fd07b04cc1e4ffc -SIZE (xpi/firefox-i18n-64.0/mk.xpi) = 457982 -SHA256 (xpi/firefox-i18n-64.0/ml.xpi) = 782b27dc050a65fff84ab774a6a24e6b668cacc17fc6abb1cd53b0d080f4c13e -SIZE (xpi/firefox-i18n-64.0/ml.xpi) = 542321 -SHA256 (xpi/firefox-i18n-64.0/mr.xpi) = d3d0e65a88381ea2b7daa79544246376960b191e54beef11b7fa40ca00cd8687 +SHA256 (xpi/firefox-i18n-64.0/hr.xpi) = 77ac5ba67a94bd27990df70d630929f377334924e848dfa8ac25a72211daaff8 +SIZE (xpi/firefox-i18n-64.0/hr.xpi) = 464599 +SHA256 (xpi/firefox-i18n-64.0/hsb.xpi) = bf324c51afbabbd0504e7b7c20a4a7573a69b351ba9a75f72b9d87987b461034 +SIZE (xpi/firefox-i18n-64.0/hsb.xpi) = 503924 +SHA256 (xpi/firefox-i18n-64.0/hu.xpi) = 9f0aa6b7dd2df887487bfbcadf8abfc46f2b8fd8b7a451d481da973696df9c45 +SIZE (xpi/firefox-i18n-64.0/hu.xpi) = 501529 +SHA256 (xpi/firefox-i18n-64.0/hy-AM.xpi) = 081eb9a2778e441d3fb9136a4dba5e56190167c20db690dda31ac9387316fc56 +SIZE (xpi/firefox-i18n-64.0/hy-AM.xpi) = 520935 +SHA256 (xpi/firefox-i18n-64.0/ia.xpi) = f171c2703fee4fce8ed3e7cdc5297fe089b0a36c4df45dc7522b8417f265be51 +SIZE (xpi/firefox-i18n-64.0/ia.xpi) = 478734 +SHA256 (xpi/firefox-i18n-64.0/id.xpi) = da12f9c5aae88cb39fe0f2f9f3e9e7f735af8ec91210e49ee384d7be7c9efed0 +SIZE (xpi/firefox-i18n-64.0/id.xpi) = 471524 +SHA256 (xpi/firefox-i18n-64.0/is.xpi) = 3816157abe978c0d52445444a54fa26b325c294a36eeac7d6d31dd0db81f5450 +SIZE (xpi/firefox-i18n-64.0/is.xpi) = 469900 +SHA256 (xpi/firefox-i18n-64.0/it.xpi) = 4bf2ca86dc3242a721b272eb2cb9c1bca0e9378464e0b3b5c53b04d8b8581788 +SIZE (xpi/firefox-i18n-64.0/it.xpi) = 355574 +SHA256 (xpi/firefox-i18n-64.0/ja.xpi) = 26f07c033d74b5c8b7e7becb693f8a26c4fadee9cace1ae6af7369af773c7600 +SIZE (xpi/firefox-i18n-64.0/ja.xpi) = 506350 +SHA256 (xpi/firefox-i18n-64.0/ka.xpi) = 8870756a30c0362c5163d81590b1d1313c3f886a1a31edde5a6b03472056e71f +SIZE (xpi/firefox-i18n-64.0/ka.xpi) = 521844 +SHA256 (xpi/firefox-i18n-64.0/kab.xpi) = f75f59db9286702720f2c9dc3337c9dd77386103b01d33958cada724e66c27b7 +SIZE (xpi/firefox-i18n-64.0/kab.xpi) = 493579 +SHA256 (xpi/firefox-i18n-64.0/kk.xpi) = 8d6833608809edeb34290e33eac6b2956e83ac1b033fc067e3de34d9b4f691f1 +SIZE (xpi/firefox-i18n-64.0/kk.xpi) = 550177 +SHA256 (xpi/firefox-i18n-64.0/km.xpi) = 676289edf6779f5386ab3c26d066796b30de2cca6cca6b1eef616c8275f022ed +SIZE (xpi/firefox-i18n-64.0/km.xpi) = 535433 +SHA256 (xpi/firefox-i18n-64.0/kn.xpi) = 497494e1414fe9afd72bc7e3bddeb7de98e3331348ef260d523d81ea795f9e86 +SIZE (xpi/firefox-i18n-64.0/kn.xpi) = 538349 +SHA256 (xpi/firefox-i18n-64.0/ko.xpi) = 9602f5168767d8df7b1470d91550d68a9a908bb189d46230d3638277c39119d1 +SIZE (xpi/firefox-i18n-64.0/ko.xpi) = 500867 +SHA256 (xpi/firefox-i18n-64.0/lij.xpi) = afc4159d3e250a3b5232c8e11258562a213129e5f244209ac8c0c468dbc3f728 +SIZE (xpi/firefox-i18n-64.0/lij.xpi) = 476179 +SHA256 (xpi/firefox-i18n-64.0/lt.xpi) = 59664e10e45de7459467e7e44fa318673792ad2ef782db6c6a6433b584709fca +SIZE (xpi/firefox-i18n-64.0/lt.xpi) = 504607 +SHA256 (xpi/firefox-i18n-64.0/lv.xpi) = 980fa3959dfcb512f30643ccb8f58dd04fa7b87f1dc7c4cc727dd236cc224e72 +SIZE (xpi/firefox-i18n-64.0/lv.xpi) = 490763 +SHA256 (xpi/firefox-i18n-64.0/mai.xpi) = 4b105acd807131fcab8df57ecbd9067fa5086ac83dcca2971024d67ed02d1e2e +SIZE (xpi/firefox-i18n-64.0/mai.xpi) = 496190 +SHA256 (xpi/firefox-i18n-64.0/mk.xpi) = f2c7e7e343bb9efd25039683c88164890924de51658bf49f2698a9b5263ae967 +SIZE (xpi/firefox-i18n-64.0/mk.xpi) = 457991 +SHA256 (xpi/firefox-i18n-64.0/ml.xpi) = aa276e580e80221c8dd2d3bfd97b642014a27032b6a5a1793dec4e6bfc8d6e6c +SIZE (xpi/firefox-i18n-64.0/ml.xpi) = 542325 +SHA256 (xpi/firefox-i18n-64.0/mr.xpi) = 5bb9ab7930b1c42968a7e44cdf5b10d319a3140fbdb67a3be7056d0668acbb82 SIZE (xpi/firefox-i18n-64.0/mr.xpi) = 540017 -SHA256 (xpi/firefox-i18n-64.0/ms.xpi) = a5f4d54fce70d884801c588dea339d7754fd719e22f6bd173cb27fe86b97f728 -SIZE (xpi/firefox-i18n-64.0/ms.xpi) = 473934 -SHA256 (xpi/firefox-i18n-64.0/my.xpi) = e5d1f6659ab2e119488f92bc4d1c9f64587e2e924f5b9c376759b3cf061bfd8f -SIZE (xpi/firefox-i18n-64.0/my.xpi) = 518173 -SHA256 (xpi/firefox-i18n-64.0/nb-NO.xpi) = 0d1a7cb8d5acc9130284a23576dcdfd10c816ef4f50accf337d96746336854fa +SHA256 (xpi/firefox-i18n-64.0/ms.xpi) = 9ec63c6b87db6958ae14c1199c4e96fec570aa5fdb6188c06bbddeb8ed964b9c +SIZE (xpi/firefox-i18n-64.0/ms.xpi) = 473931 +SHA256 (xpi/firefox-i18n-64.0/my.xpi) = 87ec74434cab18aa32e3ce5fd70f35bb3b6e6286f10fcce030751ba1a44c98e2 +SIZE (xpi/firefox-i18n-64.0/my.xpi) = 518178 +SHA256 (xpi/firefox-i18n-64.0/nb-NO.xpi) = 140a4eaa9275979ea620603a739f34a7ff035de848c76ebaa392824414fbfbb4 SIZE (xpi/firefox-i18n-64.0/nb-NO.xpi) = 473416 -SHA256 (xpi/firefox-i18n-64.0/ne-NP.xpi) = c33e305f3adfd0d6d72be669c537f7ea6b458ceabaee5942d2fba8d083559ca5 -SIZE (xpi/firefox-i18n-64.0/ne-NP.xpi) = 505819 -SHA256 (xpi/firefox-i18n-64.0/nl.xpi) = 957a3e310c2433e41f2401b0a866f8bfe999fcf25e31e5be051e39650d569289 -SIZE (xpi/firefox-i18n-64.0/nl.xpi) = 465185 -SHA256 (xpi/firefox-i18n-64.0/nn-NO.xpi) = 0f31a330193a705dfe31cedfa2b28641aedab8e401c1a9928097d426521a338e -SIZE (xpi/firefox-i18n-64.0/nn-NO.xpi) = 472039 -SHA256 (xpi/firefox-i18n-64.0/oc.xpi) = e706fc34e0004b450b2f658785afadc76d2743bc654ec443541c3d6f00fbf59c -SIZE (xpi/firefox-i18n-64.0/oc.xpi) = 486839 -SHA256 (xpi/firefox-i18n-64.0/or.xpi) = 69387714d034e7f02a673cb27b5deb2e2022bf2fb683b716004488f9ccedfe3f -SIZE (xpi/firefox-i18n-64.0/or.xpi) = 485456 -SHA256 (xpi/firefox-i18n-64.0/pa-IN.xpi) = 32c673064070322de3722d1bb3b4977ee62e098988905e662cb68a28ce83f3fb -SIZE (xpi/firefox-i18n-64.0/pa-IN.xpi) = 505885 -SHA256 (xpi/firefox-i18n-64.0/pl.xpi) = fcf436c1b25a6ee7069a8ff542b5fd5bdd209b40f44e9cce865074a795f0ab49 -SIZE (xpi/firefox-i18n-64.0/pl.xpi) = 383259 -SHA256 (xpi/firefox-i18n-64.0/pt-BR.xpi) = 9788d18876803b0e1fe7608b2aface8311ac4fff64f63776ddffe34443729b8f -SIZE (xpi/firefox-i18n-64.0/pt-BR.xpi) = 475687 -SHA256 (xpi/firefox-i18n-64.0/pt-PT.xpi) = c5db5dccf38c7755e29ff182e5d208372f049aa9396d4f9b21eb2c25eda63347 -SIZE (xpi/firefox-i18n-64.0/pt-PT.xpi) = 488746 -SHA256 (xpi/firefox-i18n-64.0/rm.xpi) = e19e6aff7dd96d0671e73c3ca91bc4a6a218f3c13353bcd673fb2bc88fb17f50 -SIZE (xpi/firefox-i18n-64.0/rm.xpi) = 478602 -SHA256 (xpi/firefox-i18n-64.0/ro.xpi) = f6e9a692bd69b54e16943bab6f38a781493abf1ca710728a16113333f21a365a -SIZE (xpi/firefox-i18n-64.0/ro.xpi) = 479970 -SHA256 (xpi/firefox-i18n-64.0/ru.xpi) = 53b2a00ca9ef38daedb67409293551790aa52813cdcdeee404d5d49304ade673 -SIZE (xpi/firefox-i18n-64.0/ru.xpi) = 546349 -SHA256 (xpi/firefox-i18n-64.0/si.xpi) = 8a8036d0fa43882488c0579bda242a8c2d3f1cc00d06efa20ff52de33c358746 -SIZE (xpi/firefox-i18n-64.0/si.xpi) = 489560 -SHA256 (xpi/firefox-i18n-64.0/sk.xpi) = cb775a337f993047dc8c3d4e3974ee55bb5bae4aaf6c96e926928ad0fac5392c -SIZE (xpi/firefox-i18n-64.0/sk.xpi) = 504067 -SHA256 (xpi/firefox-i18n-64.0/sl.xpi) = 7286b2c0d610601df6ab798008b450e4e64df40de294aa75b1f994bacb0cfdc1 -SIZE (xpi/firefox-i18n-64.0/sl.xpi) = 484987 -SHA256 (xpi/firefox-i18n-64.0/son.xpi) = 9c88cb4a0c08796403926be5587703c7cdd363ecd93e7c391a75896a50c8d0c3 -SIZE (xpi/firefox-i18n-64.0/son.xpi) = 448996 -SHA256 (xpi/firefox-i18n-64.0/sq.xpi) = 9743dbc1c8f3f03ce261df748ee5d411e3d6f67dfbc683a6b075e18a82a8192a -SIZE (xpi/firefox-i18n-64.0/sq.xpi) = 492687 -SHA256 (xpi/firefox-i18n-64.0/sr.xpi) = 251715bc3533ddc0d2e12c355ad30f5270afa4e911deb6e7755f864ebd181f34 -SIZE (xpi/firefox-i18n-64.0/sr.xpi) = 506360 -SHA256 (xpi/firefox-i18n-64.0/sv-SE.xpi) = 7014dfba4fc522c2c50e7fb4d32383c5447526b40dde33080b97d35e61c942c8 -SIZE (xpi/firefox-i18n-64.0/sv-SE.xpi) = 484137 -SHA256 (xpi/firefox-i18n-64.0/ta.xpi) = 1ed4b5b36f470c12cafa59e9a9b156e1389b4b0d6482c72455732f1a4d22d8ea -SIZE (xpi/firefox-i18n-64.0/ta.xpi) = 530863 -SHA256 (xpi/firefox-i18n-64.0/te.xpi) = 354c875f9843fc7048748edc2c0bff5554ddf97c806aece434b6289bd3d4e80f -SIZE (xpi/firefox-i18n-64.0/te.xpi) = 547596 -SHA256 (xpi/firefox-i18n-64.0/th.xpi) = 135ea6ed8cbdc22ac1e003738444750a01c0756a3d7f0b413549f12f536a4c51 -SIZE (xpi/firefox-i18n-64.0/th.xpi) = 508205 -SHA256 (xpi/firefox-i18n-64.0/tr.xpi) = cb09ce5c88e96b9188ffc081a48e1c92b2dff25784d1468e160ce5182c371932 +SHA256 (xpi/firefox-i18n-64.0/ne-NP.xpi) = 5e85eaf0ca4dd8c9839716ddf1272aaccf6d0e3875526655b1a5f7b57d0393e7 +SIZE (xpi/firefox-i18n-64.0/ne-NP.xpi) = 505818 +SHA256 (xpi/firefox-i18n-64.0/nl.xpi) = e8f350b39ba754b5cb4fece06cb36e0bb3d3e4df7cb7907f6002ca920aed348b +SIZE (xpi/firefox-i18n-64.0/nl.xpi) = 465178 +SHA256 (xpi/firefox-i18n-64.0/nn-NO.xpi) = f39dfa5faca15761430a4f5ae5ae387494780251df90d78c44193c7048f154b0 +SIZE (xpi/firefox-i18n-64.0/nn-NO.xpi) = 472041 +SHA256 (xpi/firefox-i18n-64.0/oc.xpi) = e2f0a52bacfd18cc123c614efeae7076e691371b3569d388b9762a46f52e4142 +SIZE (xpi/firefox-i18n-64.0/oc.xpi) = 486836 +SHA256 (xpi/firefox-i18n-64.0/or.xpi) = 7d987d55037f75f80001f73e757a20770fca2a3138e06fde74133e1b6cdbb5b3 +SIZE (xpi/firefox-i18n-64.0/or.xpi) = 485454 +SHA256 (xpi/firefox-i18n-64.0/pa-IN.xpi) = c078bbcd3904b1c8b71076a2bea567da77a19df9d67cae41e0e58252e21e515d +SIZE (xpi/firefox-i18n-64.0/pa-IN.xpi) = 505897 +SHA256 (xpi/firefox-i18n-64.0/pl.xpi) = 6e39e7c09bf789295e85c12291db7fc3a179ad2f3532efb8423dd0daf7d491d7 +SIZE (xpi/firefox-i18n-64.0/pl.xpi) = 383257 +SHA256 (xpi/firefox-i18n-64.0/pt-BR.xpi) = a535255ab05fbb332ea8268cca1fb8919b22342ff1e0877a54cd5d9201a2fa73 +SIZE (xpi/firefox-i18n-64.0/pt-BR.xpi) = 475690 +SHA256 (xpi/firefox-i18n-64.0/pt-PT.xpi) = 5da6464caa38f0ac56313f13b1ae2e900e7cf7ab06cf7ae6f26f04a222f8a6a6 +SIZE (xpi/firefox-i18n-64.0/pt-PT.xpi) = 488741 +SHA256 (xpi/firefox-i18n-64.0/rm.xpi) = 2d947ad3d44f006ecee083cd8fe37f57e19bfaaf20151f211f54694c3520603e +SIZE (xpi/firefox-i18n-64.0/rm.xpi) = 478596 +SHA256 (xpi/firefox-i18n-64.0/ro.xpi) = 6f5aaa492ca2a49e4cf2272f60e422660fe6e330575df442ee10743f41cae033 +SIZE (xpi/firefox-i18n-64.0/ro.xpi) = 479967 +SHA256 (xpi/firefox-i18n-64.0/ru.xpi) = cb374fdceb3d4f7f3300cda97caa767d43f2bff6360075c8b91ef64ef8fd97a5 +SIZE (xpi/firefox-i18n-64.0/ru.xpi) = 546345 +SHA256 (xpi/firefox-i18n-64.0/si.xpi) = 0483ce757807e63f7569b88e46664d1179a163977b256d307d00a1bf23264334 +SIZE (xpi/firefox-i18n-64.0/si.xpi) = 489556 +SHA256 (xpi/firefox-i18n-64.0/sk.xpi) = ca866df6173877ed0bc5206a8b926ea6af84f7c93579234396e5930cdabdeda4 +SIZE (xpi/firefox-i18n-64.0/sk.xpi) = 504064 +SHA256 (xpi/firefox-i18n-64.0/sl.xpi) = 64d08cfb2363dcaff5c4bea74c22a8d73dcacb8ceaa06c5d1570d2ed2afce7bd +SIZE (xpi/firefox-i18n-64.0/sl.xpi) = 484982 +SHA256 (xpi/firefox-i18n-64.0/son.xpi) = 2117ebec8511e67ee8ca59b2a25365a63b93693ed92a6c7c261e0cd8e811f772 +SIZE (xpi/firefox-i18n-64.0/son.xpi) = 448995 +SHA256 (xpi/firefox-i18n-64.0/sq.xpi) = f2496fcc19c62241676ae1ce3084d8ca286aea22891323bea205d5344dc00ead +SIZE (xpi/firefox-i18n-64.0/sq.xpi) = 492688 +SHA256 (xpi/firefox-i18n-64.0/sr.xpi) = faf5ec9e043acb26a393db3d4928ab97733309e6197c2788238237c6d7c4b821 +SIZE (xpi/firefox-i18n-64.0/sr.xpi) = 506359 +SHA256 (xpi/firefox-i18n-64.0/sv-SE.xpi) = 24682aab7308dd328c8e205e2dd85354807311b8e7c4515f078a8ae7fa3af9f6 +SIZE (xpi/firefox-i18n-64.0/sv-SE.xpi) = 484134 +SHA256 (xpi/firefox-i18n-64.0/ta.xpi) = e236c66b7b75deb9e6692a4b1620f37339d7a54ffdabfbdb68eae6a4734a0053 +SIZE (xpi/firefox-i18n-64.0/ta.xpi) = 530867 +SHA256 (xpi/firefox-i18n-64.0/te.xpi) = 82d45a3f5dfa0c2e316ef27c30414a24866afafdb625fda322b4923fb2817811 +SIZE (xpi/firefox-i18n-64.0/te.xpi) = 547595 +SHA256 (xpi/firefox-i18n-64.0/th.xpi) = 5b406c3454a998a517fc7691ef47c8dfb5b4a7bebb5d080f0a64b4e2b27a8ad7 +SIZE (xpi/firefox-i18n-64.0/th.xpi) = 508198 +SHA256 (xpi/firefox-i18n-64.0/tr.xpi) = 993de7c31db7d98c221de0e9a8c57e373e39b011cf95dba4369de9a86331cff5 SIZE (xpi/firefox-i18n-64.0/tr.xpi) = 494709 -SHA256 (xpi/firefox-i18n-64.0/uk.xpi) = 66a41bcbd43326d3752198a1d8ec1f8e2582e0134c832b4489a563423498d24c -SIZE (xpi/firefox-i18n-64.0/uk.xpi) = 521002 -SHA256 (xpi/firefox-i18n-64.0/ur.xpi) = a7975896cdcad3eaec2314ed22faed410aed74c88b31c92792aadcf8af92d6e0 -SIZE (xpi/firefox-i18n-64.0/ur.xpi) = 521722 -SHA256 (xpi/firefox-i18n-64.0/uz.xpi) = 2979996022a96772445a35b69d312841cbd67fab7c4ed179ec62b112945cbcf1 -SIZE (xpi/firefox-i18n-64.0/uz.xpi) = 466668 -SHA256 (xpi/firefox-i18n-64.0/vi.xpi) = 0db515293efd1c506fbba00ecdf160ef8d1c939d349b1ffffe3cd0a928c75b8a -SIZE (xpi/firefox-i18n-64.0/vi.xpi) = 488330 -SHA256 (xpi/firefox-i18n-64.0/xh.xpi) = 6571def1c24c6c3355503958ca490ae1dda3a7418180666e132791d16bdc7938 -SIZE (xpi/firefox-i18n-64.0/xh.xpi) = 463275 -SHA256 (xpi/firefox-i18n-64.0/zh-CN.xpi) = f23d0953d47222f00bab6af3ffee8882b7f3a47258e7b9077e20e85abc0ce081 -SIZE (xpi/firefox-i18n-64.0/zh-CN.xpi) = 507522 -SHA256 (xpi/firefox-i18n-64.0/zh-TW.xpi) = aa44da6331b45528ccba95c133ef381cb9b44aaeb222a65298fc515800b5c059 -SIZE (xpi/firefox-i18n-64.0/zh-TW.xpi) = 510612 +SHA256 (xpi/firefox-i18n-64.0/uk.xpi) = 7ff50a27e3c4f019510634734f8df1e1419fbc084792986ad9ebf4ded4ac091f +SIZE (xpi/firefox-i18n-64.0/uk.xpi) = 520997 +SHA256 (xpi/firefox-i18n-64.0/ur.xpi) = 7db69120a9cebcfd9ddff8691fad9fc1f5f0abe62d9d4530157d29a708873721 +SIZE (xpi/firefox-i18n-64.0/ur.xpi) = 521724 +SHA256 (xpi/firefox-i18n-64.0/uz.xpi) = 7503af7b3aff3374229a5218fd1b1ed004203746ea7924031550b086bbc6993f +SIZE (xpi/firefox-i18n-64.0/uz.xpi) = 466671 +SHA256 (xpi/firefox-i18n-64.0/vi.xpi) = 062c12a75f2fb4b1feec11ae84f01b1d26dbc2581bb00ba2ec4346fb01144bdc +SIZE (xpi/firefox-i18n-64.0/vi.xpi) = 488332 +SHA256 (xpi/firefox-i18n-64.0/xh.xpi) = c5e176b33f2c32c418a1960b01280bf18980ed5706cfe5f2891a9bac4b8fbb5a +SIZE (xpi/firefox-i18n-64.0/xh.xpi) = 463285 +SHA256 (xpi/firefox-i18n-64.0/zh-CN.xpi) = 23d0a7e234b3734df8fb6fa31a15f250a4f82e017df7ddc92f779c0765a8719d +SIZE (xpi/firefox-i18n-64.0/zh-CN.xpi) = 507516 +SHA256 (xpi/firefox-i18n-64.0/zh-TW.xpi) = 224af39ae1ce61d1f4228d5898a43803caee04f3fd4617adb7dcb52e2da5b76f +SIZE (xpi/firefox-i18n-64.0/zh-TW.xpi) = 510618 diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 207fc32fed2..88d5f762717 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -3,10 +3,11 @@ PORTNAME= firefox DISTVERSION= 64.0 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build3/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 9ba686ef846..0399abc9e3d 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543880118 -SHA256 (firefox-64.0.source.tar.xz) = 41745cf53af5dca0e154fe256d9f86d27181aa8a8c2e341a2b9b201b3be240e6 -SIZE (firefox-64.0.source.tar.xz) = 272974688 +TIMESTAMP = 1544151497 +SHA256 (firefox-64.0.source.tar.xz) = da40f2f8f1cbf0ddb3454aa9f65bb1a2b2043ca9b1724aecd016337be77d537f +SIZE (firefox-64.0.source.tar.xz) = 271865888 diff --git a/www/flashplayer/Makefile b/www/flashplayer/Makefile index fd705aa6b02..010ace0c46f 100644 --- a/www/flashplayer/Makefile +++ b/www/flashplayer/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 31.0 -PORTREVISION= 2 +PORTVERSION= 32.0 CATEGORIES= www multimedia DISTFILES= diff --git a/www/fluxbb/Makefile b/www/fluxbb/Makefile index 50220043b94..2de9b571c7f 100644 --- a/www/fluxbb/Makefile +++ b/www/fluxbb/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= cpe php SUB_FILES= pkg-message diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile index 8f5cde89c93..a885d95442a 100644 --- a/www/gallery3/Makefile +++ b/www/gallery3/Makefile @@ -14,7 +14,7 @@ COMMENT= Web based photo album organizer written in PHP DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= zip php:web diff --git a/www/geckodriver/Makefile b/www/geckodriver/Makefile index 0300b0aee6c..50770cd434e 100644 --- a/www/geckodriver/Makefile +++ b/www/geckodriver/Makefile @@ -3,7 +3,7 @@ PORTNAME= geckodriver DISTVERSIONPREFIX= v DISTVERSION= 0.23.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MAINTAINER= daniel@blodan.se diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 4046b55d412..6fc3f67ac63 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.5.2 +PORTVERSION= 11.5.3 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -215,7 +215,7 @@ USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags -GL_COMMIT= 900cbabc54fced54fdf0415cc64c98dcc082bbac +GL_COMMIT= aa117376d89f0146cc7c573ec9091ada6041b417 USERS= git GROUPS= git diff --git a/www/gitlab-ce/distinfo b/www/gitlab-ce/distinfo index 2cdefc58787..1454c7001a8 100644 --- a/www/gitlab-ce/distinfo +++ b/www/gitlab-ce/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1544029391 -SHA256 (gitlab-org-gitlab-ce-900cbabc54fced54fdf0415cc64c98dcc082bbac_GL0.tar.gz) = 64f1632d1c453bdd47fe356fba7ccc2ca6e49d1f9a6f7473c32e35ab24b41935 -SIZE (gitlab-org-gitlab-ce-900cbabc54fced54fdf0415cc64c98dcc082bbac_GL0.tar.gz) = 50980968 +TIMESTAMP = 1544124680 +SHA256 (gitlab-org-gitlab-ce-aa117376d89f0146cc7c573ec9091ada6041b417_GL0.tar.gz) = 5fb79cd6b05aeb497f9c7fb9e76d00f009fa1fe21bdefe10b83bbe2d5171ccd8 +SIZE (gitlab-org-gitlab-ce-aa117376d89f0146cc7c573ec9091ada6041b417_GL0.tar.gz) = 50977775 diff --git a/www/gitlab-ce/pkg-plist b/www/gitlab-ce/pkg-plist index 2a8827c82c0..772bc06f5c3 100644 --- a/www/gitlab-ce/pkg-plist +++ b/www/gitlab-ce/pkg-plist @@ -13419,6 +13419,7 @@ %%WWWDIR%%/spec/lib/gitlab/string_range_marker_spec.rb %%WWWDIR%%/spec/lib/gitlab/string_regex_marker_spec.rb %%WWWDIR%%/spec/lib/gitlab/tcp_checker_spec.rb +%%WWWDIR%%/spec/lib/gitlab/template/finders/global_template_finder_spec.rb %%WWWDIR%%/spec/lib/gitlab/template/finders/repo_template_finders_spec.rb %%WWWDIR%%/spec/lib/gitlab/template/gitignore_template_spec.rb %%WWWDIR%%/spec/lib/gitlab/template/gitlab_ci_yml_template_spec.rb diff --git a/www/kplaylist/Makefile b/www/kplaylist/Makefile index 33b138052e9..55c391fc1e2 100644 --- a/www/kplaylist/Makefile +++ b/www/kplaylist/Makefile @@ -14,7 +14,7 @@ COMMENT= PHP based music database DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 RUN_DEPENDS= lame:audio/lame \ oggenc:audio/vorbis-tools \ diff --git a/www/limesurvey/Makefile b/www/limesurvey/Makefile index 53b3d8a94a3..c5fdd591ba8 100644 --- a/www/limesurvey/Makefile +++ b/www/limesurvey/Makefile @@ -16,7 +16,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= cpe php:web diff --git a/www/linux-flashplayer/Makefile b/www/linux-flashplayer/Makefile index f8ed25fab20..4ccd4761b50 100644 --- a/www/linux-flashplayer/Makefile +++ b/www/linux-flashplayer/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 31.0.0.153 +PORTVERSION= 32.0.0.101 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- diff --git a/www/linux-flashplayer/distinfo b/www/linux-flashplayer/distinfo index 6b57e20ee91..5346edf0d20 100644 --- a/www/linux-flashplayer/distinfo +++ b/www/linux-flashplayer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542741577 -SHA256 (flashplayer/31.0.0.153/flash_player_npapi_linux.i386.tar.gz) = 478cf3011bcb0eebc87b08a718f07ca4aeff48f1ce5b15615da452df8793bb6b -SIZE (flashplayer/31.0.0.153/flash_player_npapi_linux.i386.tar.gz) = 8529821 +TIMESTAMP = 1544081072 +SHA256 (flashplayer/32.0.0.101/flash_player_npapi_linux.i386.tar.gz) = fa328e6f68a56522e7e5f3e47fc299796cbf3532a26885ff545a6b6aad6eb5ea +SIZE (flashplayer/32.0.0.101/flash_player_npapi_linux.i386.tar.gz) = 8528897 diff --git a/www/magento/Makefile b/www/magento/Makefile index 7bc021445b7..084565d4d28 100644 --- a/www/magento/Makefile +++ b/www/magento/Makefile @@ -13,7 +13,7 @@ COMMENT= Feature-rich eCommerce platform DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= cpe php CPE_VENDDOR= magentocommerce diff --git a/www/mahara/Makefile b/www/mahara/Makefile index e705c745099..4301bf17f5a 100644 --- a/www/mahara/Makefile +++ b/www/mahara/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/../COPYING -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= cpe php tar:bzip2 USE_PHP= dom gd session json curl xml xmlrpc openssl simplexml \ diff --git a/www/miniflux/Makefile b/www/miniflux/Makefile index 4ff3c1e63eb..e94dc869f30 100644 --- a/www/miniflux/Makefile +++ b/www/miniflux/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= miniflux -DISTVERSION= 2.0.10 +DISTVERSION= 2.0.13 CATEGORIES= www MAINTAINER= krion@FreeBSD.org @@ -12,28 +12,35 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss +USES= go pgsql + USERS= miniflux GROUPS= miniflux -USES= go pgsql WANT_PGSQL= client - USE_RC_SUBR= miniflux USE_GITHUB= yes GH_ACCOUNT= miniflux -GO_PKGNAME= github.com/miniflux/${PORTNAME} +GO_PKGNAME= miniflux.app +GO_TARGET= ${GO_PKGNAME} +GO_BUILDFLAGS= -ldflags="-X miniflux.app/version.Version=${DISTVERSION} \ + -X miniflux.app/version.BuildDate=$$(date +'%Y-%m-%dT%H:%M:%SZ')" -OPTIONS_DEFINE= PGSQL_SERVER +OPTIONS_DEFINE= PGSQL_SERVER OPTIONS_DEFAULT= PGSQL_SERVER_DESC= Install the PostgreSQL Server Component PGSQL_SERVER_VARS= WANT_PGSQL=server .include +do-install: + ${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/miniflux.app ${STAGEDIR}${PREFIX}/bin/miniflux + ${INSTALL_MAN} ${WRKSRC}/miniflux.1 ${STAGEDIR}${PREFIX}/man/man1/ + post-install: - ${INSTALL_DATA} ${FILESDIR}/miniflux.env.sample \ - ${STAGEDIR}${PREFIX}/etc + ${INSTALL_DATA} ${FILESDIR}/miniflux.env.sample \ + ${STAGEDIR}${PREFIX}/etc .include diff --git a/www/miniflux/distinfo b/www/miniflux/distinfo index 03265d8011f..ca4723afa0f 100644 --- a/www/miniflux/distinfo +++ b/www/miniflux/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532528762 -SHA256 (miniflux-miniflux-2.0.10_GH0.tar.gz) = 9169c22fc71f6c9d0f310654f1bd2c74ba0a53414afacb23b7e017c80a81f4ea -SIZE (miniflux-miniflux-2.0.10_GH0.tar.gz) = 12964698 +TIMESTAMP = 1543732130 +SHA256 (miniflux-miniflux-2.0.13_GH0.tar.gz) = c0213cdc2d6dbdb5cc8fd68a94fe8dd5d699b49faf6c77ad189376117e4e1ceb +SIZE (miniflux-miniflux-2.0.13_GH0.tar.gz) = 6649748 diff --git a/www/miniflux/files/miniflux.env.sample b/www/miniflux/files/miniflux.env.sample index 00137e275ce..2c7517ca05e 100644 --- a/www/miniflux/files/miniflux.env.sample +++ b/www/miniflux/files/miniflux.env.sample @@ -1,3 +1,3 @@ -# See https://docs.miniflux.net/en/latest/configuration.html +# See https://docs.miniflux.app/en/latest/configuration.html LISTEN_ADDR=0.0.0.0:8080 diff --git a/www/miniflux/pkg-descr b/www/miniflux/pkg-descr index f1d560f1d55..1c6eb5acc6b 100644 --- a/www/miniflux/pkg-descr +++ b/www/miniflux/pkg-descr @@ -1,3 +1,3 @@ Miniflux is a minimalist and opinionated feed reader written in Go. -WWW: https://miniflux.net/ +WWW: https://miniflux.app/ diff --git a/www/miniflux/pkg-plist b/www/miniflux/pkg-plist index 023701f123a..993df3ef561 100644 --- a/www/miniflux/pkg-plist +++ b/www/miniflux/pkg-plist @@ -1,2 +1,3 @@ bin/miniflux +man/man1/miniflux.1.gz @sample etc/miniflux.env.sample diff --git a/www/minio/Makefile b/www/minio/Makefile index 371aa8493b8..03410cb0e01 100644 --- a/www/minio/Makefile +++ b/www/minio/Makefile @@ -14,9 +14,9 @@ BUILD_DEPENDS= go>=1.9.4:lang/go USES= compiler USE_GITHUB= yes -GH_TAGNAME= RELEASE.2018-11-30T03-56-59Z +GH_TAGNAME= RELEASE.2018-12-06T01-27-43Z GH_SUBDIR= src/github.com/${PORTNAME}/${PORTNAME} -COMMIT_ID= 26120d7838a76cc878ad4e12bf3dd44ce9872e81 +COMMIT_ID= 40852801ea63d0e10f220c0d7d2a8d6a8efa5688 PLIST_FILES= bin/minio diff --git a/www/minio/distinfo b/www/minio/distinfo index 83fdc6e934d..d5b91ed1081 100644 --- a/www/minio/distinfo +++ b/www/minio/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543584715 -SHA256 (minio-minio-2018.11.30.03.56.59-RELEASE.2018-11-30T03-56-59Z_GH0.tar.gz) = 974e05b1280e66e5be5f59a2016cd46afe378aacd41a621410362a7deb4f1fa4 -SIZE (minio-minio-2018.11.30.03.56.59-RELEASE.2018-11-30T03-56-59Z_GH0.tar.gz) = 9085930 +TIMESTAMP = 1544100679 +SHA256 (minio-minio-2018.12.06.01.27.43-RELEASE.2018-12-06T01-27-43Z_GH0.tar.gz) = ebf557e3cbaf5c548e8644f9e73683736455f6b71b6c39bfaeb1c0a0efd13293 +SIZE (minio-minio-2018.12.06.01.27.43-RELEASE.2018-12-06T01-27-43Z_GH0.tar.gz) = 9087439 diff --git a/www/mysar/Makefile b/www/mysar/Makefile index b94ef718959..df18b5436e0 100644 --- a/www/mysar/Makefile +++ b/www/mysar/Makefile @@ -14,7 +14,7 @@ COMMENT= MySQL Squid Access Report DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 LICENSE= GPLv2 LICENSE_FILE= ${WRKROOT}/COPYING diff --git a/www/netoffice/Makefile b/www/netoffice/Makefile index 7ec8f3fbc39..7ed5bd7dc51 100644 --- a/www/netoffice/Makefile +++ b/www/netoffice/Makefile @@ -13,7 +13,7 @@ COMMENT= NetOffice is a free web based project-management environment DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 NO_BUILD= yes NO_ARCH= yes diff --git a/www/oscommerce/Makefile b/www/oscommerce/Makefile index dec178d27ac..b529495e119 100644 --- a/www/oscommerce/Makefile +++ b/www/oscommerce/Makefile @@ -13,7 +13,7 @@ COMMENT= Full-featured open source e-commerce system DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= cpe php:web zip USE_PHP= mysql session pcre gd curl openssl diff --git a/www/p5-Catalyst-Plugin-Session/Makefile b/www/p5-Catalyst-Plugin-Session/Makefile index 66b8fb09c41..a0c3566343b 100644 --- a/www/p5-Catalyst-Plugin-Session/Makefile +++ b/www/p5-Catalyst-Plugin-Session/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Catalyst-Plugin-Session -PORTVERSION= 0.40 +PORTVERSION= 0.41 CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -16,6 +16,7 @@ LICENSE_COMB= dual # Do not add p5-Catalyst-Plugin-Session-State-Cookie to TEST_DEPENDS to avoid cyclic dependency BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= p5-Catalyst-Runtime>=5.71001:www/p5-Catalyst-Runtime \ + p5-HTML-Parser>=0:www/p5-HTML-Parser \ p5-MRO-Compat>=0:devel/p5-MRO-Compat \ p5-Moose>=0.76:devel/p5-Moose \ p5-MooseX-Emulate-Class-Accessor-Fast>=0.00801:devel/p5-MooseX-Emulate-Class-Accessor-Fast \ diff --git a/www/p5-Catalyst-Plugin-Session/distinfo b/www/p5-Catalyst-Plugin-Session/distinfo index 9b876b27a1d..0ae86b9e256 100644 --- a/www/p5-Catalyst-Plugin-Session/distinfo +++ b/www/p5-Catalyst-Plugin-Session/distinfo @@ -1,2 +1,3 @@ -SHA256 (Catalyst-Plugin-Session-0.40.tar.gz) = fb41aaef97cb3c3bd613af77906d5819fc8d6b73cc11ae24d3e51cca7a8a3b9c -SIZE (Catalyst-Plugin-Session-0.40.tar.gz) = 49803 +TIMESTAMP = 1544114806 +SHA256 (Catalyst-Plugin-Session-0.41.tar.gz) = 85610a17ca1f40eb99ddbeb5e53462f1e6d568e8afd99d4f975bb07f520a8528 +SIZE (Catalyst-Plugin-Session-0.41.tar.gz) = 49922 diff --git a/www/pecl-amfext/Makefile b/www/pecl-amfext/Makefile index d61da433f7f..23921379873 100644 --- a/www/pecl-amfext/Makefile +++ b/www/pecl-amfext/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP30 USES= dos2unix libtool php:pecl PHP_MODNAME= amf -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --with-amf diff --git a/www/pecl-http1/Makefile b/www/pecl-http1/Makefile index b8a06926ab7..eb454645022 100644 --- a/www/pecl-http1/Makefile +++ b/www/pecl-http1/Makefile @@ -20,7 +20,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libcurl.so:ftp/curl USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFLICTS= pecl-http-* CONFIGURE_ARGS+= --with-http-curl-requests \ diff --git a/www/pecl-http2/Makefile b/www/pecl-http2/Makefile index e20c2d7e52e..24757abc2ca 100644 --- a/www/pecl-http2/Makefile +++ b/www/pecl-http2/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/php/${PHP_EXT_DIR}/raphf.so:devel/pecl-raphf@${PHP LIB_DEPENDS= libcurl.so:ftp/curl \ libevent.so:devel/libevent -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 USES= php:pecl CONFLICTS= pecl-http1* pecl-http-* diff --git a/www/pecl-sphinx/Makefile b/www/pecl-sphinx/Makefile index 720fe90b141..4fa4109ff20 100644 --- a/www/pecl-sphinx/Makefile +++ b/www/pecl-sphinx/Makefile @@ -14,7 +14,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= PHP301 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 LIB_DEPENDS= libsphinxclient.so:textproc/libsphinxclient diff --git a/www/pecl-swish/Makefile b/www/pecl-swish/Makefile index 58df123fc8d..4b9fda6766d 100644 --- a/www/pecl-swish/Makefile +++ b/www/pecl-swish/Makefile @@ -18,7 +18,7 @@ BUILD_DEPENDS= swish-config:www/swish-e RUN_DEPENDS:= swish-config:www/swish-e USES= php:pecl -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-swish --with-swish=${LOCALBASE}/bin diff --git a/www/pecl-twig/Makefile b/www/pecl-twig/Makefile index 340a4da46a9..4d8b44e9a04 100644 --- a/www/pecl-twig/Makefile +++ b/www/pecl-twig/Makefile @@ -17,6 +17,6 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= BSD3CLAUSE USES= php:ext tar:tgz -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .include diff --git a/www/pecl-yaf2/Makefile b/www/pecl-yaf2/Makefile index d4ea57ed32f..48779dcd40b 100644 --- a/www/pecl-yaf2/Makefile +++ b/www/pecl-yaf2/Makefile @@ -18,6 +18,6 @@ LIB_DEPENDS= libpcre.so:devel/pcre PORTSCOUT= limit:^2\. USES= localbase php:pecl -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 .include diff --git a/www/pecl-yar1/Makefile b/www/pecl-yar1/Makefile index 3a98e2779c2..ec9170faf68 100644 --- a/www/pecl-yar1/Makefile +++ b/www/pecl-yar1/Makefile @@ -16,7 +16,7 @@ LICENSE= PHP301 USES= localbase php:pecl USE_PHP= json:build curl:build -IGNORE_WITH_PHP=70 71 72 73 +IGNORE_WITH_PHP=71 72 73 OPTIONS_DEFINE= MSGPACK MSGPACK_DESC= Enable MSGPACK module diff --git a/www/php-templates/Makefile b/www/php-templates/Makefile index 136a7244bcc..9f76316cf44 100644 --- a/www/php-templates/Makefile +++ b/www/php-templates/Makefile @@ -21,7 +21,7 @@ EXPIRATION_DATE= 2018-12-30 WRKSRC= ${WRKDIR}/templates USES= dos2unix php:phpize -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-templates=shared diff --git a/www/phpgroupware/Makefile b/www/phpgroupware/Makefile index f311ff6d61c..94eef716006 100644 --- a/www/phpgroupware/Makefile +++ b/www/phpgroupware/Makefile @@ -9,7 +9,6 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Web based GroupWare system USES= php:mod tar:bzip2 -IGNORE_WITH_PHP= 70 NO_BUILD= yes NO_ARCH= yes diff --git a/www/phprecipebook/Makefile b/www/phprecipebook/Makefile index 43e389f0f93..fa91de0cee3 100644 --- a/www/phprecipebook/Makefile +++ b/www/phprecipebook/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFAULT= PGSQL MYSQL_USE= PHP=mysql MYSQL_USES= mysql -MYSQL_VARS= IGNORE_WITH_PHP+="70 71 72 73" +MYSQL_VARS= IGNORE_WITH_PHP+="71 72 73" PGSQL_USE= PHP=pgsql PGSQL_USES= pgsql diff --git a/www/py-httplib2/Makefile b/www/py-httplib2/Makefile index c01120291fc..90f3a048d8a 100644 --- a/www/py-httplib2/Makefile +++ b/www/py-httplib2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= httplib2 -PORTVERSION= 0.11.3 +PORTVERSION= 0.12.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-httplib2/distinfo b/www/py-httplib2/distinfo index 3606441eeab..961315cbe16 100644 --- a/www/py-httplib2/distinfo +++ b/www/py-httplib2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523459445 -SHA256 (httplib2-0.11.3.tar.gz) = e71daed9a0e6373642db61166fa70beecc9bf04383477f84671348c02a04cbdf -SIZE (httplib2-0.11.3.tar.gz) = 215815 +TIMESTAMP = 1544176960 +SHA256 (httplib2-0.12.0.tar.gz) = f61fb838a94ce3b349aa32c92fd8430f7e3511afdb18bf9640d647e30c90a6d6 +SIZE (httplib2-0.12.0.tar.gz) = 218367 diff --git a/www/py-python-digitalocean/Makefile b/www/py-python-digitalocean/Makefile index e60064f12e0..9b7dabac4ab 100644 --- a/www/py-python-digitalocean/Makefile +++ b/www/py-python-digitalocean/Makefile @@ -12,16 +12,16 @@ COMMENT= API to manage digitalocean.com droplets LICENSE= GPLv3 -BROKEN= fails to configure, non ascii char in position 820 of long_description - RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=2.0.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jsonpickle>0:devel/py-jsonpickle@${PY_FLAVOR} +USES= python +USE_PYTHON= distutils autoplist + USE_GITHUB= yes GH_ACCOUNT= koalalorenzo -USES= python -USE_PYTHON= distutils autoplist +USE_LOCALE= en_US.UTF-8 NO_ARCH= yes .include diff --git a/www/py-python-dotenv/Makefile b/www/py-python-dotenv/Makefile index 87b97641272..781e5461d22 100644 --- a/www/py-python-dotenv/Makefile +++ b/www/py-python-dotenv/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= python-dotenv -PORTVERSION= 0.9.1 +PORTVERSION= 0.10.0 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,8 +15,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} -NO_ARCH= yes -USE_PYTHON= autoplist concurrent distutils USES= python +USE_PYTHON= autoplist concurrent distutils + +NO_ARCH= yes .include diff --git a/www/py-python-dotenv/distinfo b/www/py-python-dotenv/distinfo index 1cdd3f9ac05..a5e13b9d852 100644 --- a/www/py-python-dotenv/distinfo +++ b/www/py-python-dotenv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533566996 -SHA256 (python-dotenv-0.9.1.tar.gz) = 122290a38ece9fe4f162dc7c95cae3357b983505830a154d3c98ef7f6c6cea77 -SIZE (python-dotenv-0.9.1.tar.gz) = 17577 +TIMESTAMP = 1544114585 +SHA256 (python-dotenv-0.10.0.tar.gz) = 4f3582904d08dac5ab4c9aa44cb17ce056c9a35e585cfda6183d80054d247307 +SIZE (python-dotenv-0.10.0.tar.gz) = 19313 diff --git a/www/redaxo/Makefile b/www/redaxo/Makefile index 566484d6cd9..b64633889b6 100644 --- a/www/redaxo/Makefile +++ b/www/redaxo/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 NO_BUILD= yes diff --git a/www/revive-adserver/Makefile b/www/revive-adserver/Makefile index 4573861b2cc..5ec8b613594 100644 --- a/www/revive-adserver/Makefile +++ b/www/revive-adserver/Makefile @@ -27,7 +27,7 @@ PLIST_SUB+= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" .if !defined(WITHOUT_PHP_DEPENDS) USES+= php USE_PHP= xml pcre zlib mysql pgsql ftp -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 .endif do-install: diff --git a/www/rnews/Makefile b/www/rnews/Makefile index b89be2bd48c..38a8bd75210 100644 --- a/www/rnews/Makefile +++ b/www/rnews/Makefile @@ -14,7 +14,7 @@ COMMENT= Server-side RSS aggregator written in PHP with MySQL DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 NO_BUILD= yes diff --git a/www/sams2/Makefile b/www/sams2/Makefile index e3ab2664d61..2f533f5f996 100644 --- a/www/sams2/Makefile +++ b/www/sams2/Makefile @@ -14,7 +14,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= BSD4CLAUSE -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 LIB_DEPENDS= libpcre.so:devel/pcre RUN_DEPENDS= ${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER} diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index f318bbf655e..d88494f1af4 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,7 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.49.4 -PORTREVISION= 18 +PORTREVISION= 19 MOZILLA_VER= 52 # above + 3 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ diff --git a/www/sit/Makefile b/www/sit/Makefile index 9f09b99bc4d..77ea62c71fb 100644 --- a/www/sit/Makefile +++ b/www/sit/Makefile @@ -16,7 +16,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= php:web USE_PHP= pcre mysql session zlib mbstring diff --git a/www/sitebar/Makefile b/www/sitebar/Makefile index 4b2964a97ee..7c5cd3baead 100644 --- a/www/sitebar/Makefile +++ b/www/sitebar/Makefile @@ -13,7 +13,7 @@ COMMENT= The Bookmark Server for Personal and Team Use DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= php:web tar:bzip2 USE_PHP= mysql pcre diff --git a/www/testlink/Makefile b/www/testlink/Makefile index 93133148a31..5d994cc378c 100644 --- a/www/testlink/Makefile +++ b/www/testlink/Makefile @@ -15,7 +15,7 @@ EXPIRATION_DATE= 2018-12-30 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 USES= cpe php:web CPE_VENDOR= teamst diff --git a/www/typo3-9/Makefile b/www/typo3-9/Makefile index 0d04511f53b..e410a7be043 100644 --- a/www/typo3-9/Makefile +++ b/www/typo3-9/Makefile @@ -13,7 +13,7 @@ COMMENT= Typo3 content management system LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -IGNORE_WITH_PHP=56 70 71 +IGNORE_WITH_PHP=56 71 USES= cpe php:web,flavors shebangfix USE_PHP= ctype dom fileinfo filter hash intl json openssl pcre session simplexml \ diff --git a/www/usermanager/Makefile b/www/usermanager/Makefile index 84044998192..92dd62f0949 100644 --- a/www/usermanager/Makefile +++ b/www/usermanager/Makefile @@ -13,7 +13,7 @@ COMMENT= Easily create, change, or delete virtual PureFTPd users DEPRECATED= Works only with EOL php 5.6 EXPIRATION_DATE= 2018-12-30 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 WRKSRC= ${WRKDIR}/ftp diff --git a/www/webkit-gtk3/files/patch-Source_WTF_wtf_Platform.h b/www/webkit-gtk3/files/patch-Source_WTF_wtf_Platform.h index 06247d79c58..41cf3511ac3 100644 --- a/www/webkit-gtk3/files/patch-Source_WTF_wtf_Platform.h +++ b/www/webkit-gtk3/files/patch-Source_WTF_wtf_Platform.h @@ -1,7 +1,25 @@ -This patch reportedly fixes build for ARM. See PR 208569 +This patch reportedly fixes build for ARM and powerpc64. See PR 208569 --- Source/WTF/wtf/Platform.h.orig 2016-04-10 06:48:36 UTC +++ Source/WTF/wtf/Platform.h +@@ -119,11 +119,16 @@ + + /* CPU(PPC64) - PowerPC 64-bit Big Endian */ + #if ( defined(__ppc64__) \ +- || defined(__PPC64__)) \ ++ || defined(__PPC64__) \ ++ || defined(__powerpc64__)) \ + && defined(__BYTE_ORDER__) \ + && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) + #define WTF_CPU_PPC64 1 + #define WTF_CPU_BIG_ENDIAN 1 ++#define ENABLE_ASSEMBLER 0 ++#define ENABLE_JIT 0 ++#define ENABLE_YARR_JIT 0 ++#define ENABLE_SAMPLING_PROFILER 0 + #endif + + /* CPU(PPC64) - PowerPC 64-bit Little Endian */ @@ -218,6 +218,7 @@ #elif defined(__ARM_ARCH_6__) \ || defined(__ARM_ARCH_6J__) \ diff --git a/www/websocat/Makefile b/www/websocat/Makefile index e73a2b364e9..b32f3c3df6c 100644 --- a/www/websocat/Makefile +++ b/www/websocat/Makefile @@ -4,6 +4,7 @@ PORTNAME= websocat DISTVERSION= 1.2.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= www MAINTAINER= osa@FreeBSD.org diff --git a/www/xcache/Makefile b/www/xcache/Makefile index 0a0feac3e49..a70c3e74140 100644 --- a/www/xcache/Makefile +++ b/www/xcache/Makefile @@ -17,7 +17,7 @@ LICENSE= BSD3CLAUSE USES= php:phpize tar:bzip2 -IGNORE_WITH_PHP= 70 71 72 73 +IGNORE_WITH_PHP= 71 72 73 CONFIGURE_ARGS= --enable-xcache=shared diff --git a/www/you-get/Makefile b/www/you-get/Makefile index d701e31af0d..31c30ed35fb 100644 --- a/www/you-get/Makefile +++ b/www/you-get/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= you-get -PORTVERSION= 0.4.1148 -PORTREVISION= 1 +PORTVERSION= 0.4.1181 CATEGORIES= www MASTER_SITES= CHEESESHOP @@ -17,9 +16,10 @@ RUN_DEPENDS= ffmpeg:multimedia/ffmpeg OPTIONS_DEFINE= RTMPDUMP -NO_ARCH= yes -USE_PYTHON= autoplist distutils noflavors USES= python:3.4+ +USE_PYTHON= autoplist distutils noflavors + +NO_ARCH= yes RTMPDUMP_RUN_DEPENDS= rtmpdump:multimedia/rtmpdump diff --git a/www/you-get/distinfo b/www/you-get/distinfo index fe5babbd502..084ee2ed980 100644 --- a/www/you-get/distinfo +++ b/www/you-get/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1537213401 -SHA256 (you-get-0.4.1148.tar.gz) = 45490fe0592f96c68628debed26fdd776fdf63d40c122bd858c5e2e2bac2effa -SIZE (you-get-0.4.1148.tar.gz) = 143919 +TIMESTAMP = 1544201009 +SHA256 (you-get-0.4.1181.tar.gz) = 03cd27c7da857a43f5d2f6cdfad6ec390d4a8d7be88ff895645e8934402a9ee5 +SIZE (you-get-0.4.1181.tar.gz) = 145310 diff --git a/x11-toolkits/bwidget/Makefile b/x11-toolkits/bwidget/Makefile index bc56b6f6a7a..d6dd9cf2b58 100644 --- a/x11-toolkits/bwidget/Makefile +++ b/x11-toolkits/bwidget/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bwidget -PORTVERSION= 1.9.12 +PORTVERSION= 1.9.13 CATEGORIES= x11-toolkits MASTER_SITES= SF/tcllib/BWidget/${PORTVERSION} @@ -14,9 +14,10 @@ LICENSE_NAME= Tcl/Tk License LICENSE_FILE= ${WRKSRC}/LICENSE.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +USES= tk:run zip + OPTIONS_DEFINE= DOCS -USES= tk:run zip NO_BUILD= yes NO_ARCH= yes PORTDOCS= * diff --git a/x11-toolkits/bwidget/distinfo b/x11-toolkits/bwidget/distinfo index ab7138674eb..9d0e52796d1 100644 --- a/x11-toolkits/bwidget/distinfo +++ b/x11-toolkits/bwidget/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1516700872 -SHA256 (bwidget-1.9.12.zip) = fbdd349d5d4844d640dbcc6a582bc49fabcace254a6eda39cb82c902b0353ab7 -SIZE (bwidget-1.9.12.zip) = 313928 +TIMESTAMP = 1544178629 +SHA256 (bwidget-1.9.13.zip) = dd184701e245bfaa801cff53c8ef3ae6fe42fee5b23350fc67883cd63c3a3b85 +SIZE (bwidget-1.9.13.zip) = 321957 diff --git a/x11-toolkits/gtksourceview3/Makefile b/x11-toolkits/gtksourceview3/Makefile index 660d5a62a75..6e14ff67b63 100644 --- a/x11-toolkits/gtksourceview3/Makefile +++ b/x11-toolkits/gtksourceview3/Makefile @@ -12,7 +12,7 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Text widget that adds syntax highlighting to the GtkTextView widget -USES= tar:xz +USES= compiler:c11 tar:xz PORTSCOUT= limitw:1,even @@ -21,7 +21,7 @@ PORTSCOUT= limitw:1,even BUILD_DEPENDS= vala:lang/vala LIB_DEPENDS= libfribidi.so:converters/fribidi -USES+= compiler:c11 gettext gmake gnome libtool pathfix pkgconfig +USES+= gettext gmake gnome libtool pathfix pkgconfig USE_CSTD= c11 USE_GNOME= cairo gdkpixbuf2 gnomeprefix gtk30 intlhack \ introspection:build libxml2 referencehack diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index b67b7d2d387..06b0d651c18 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS= xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \ PORTSCOUT= limitw:1,even -USES= gettext gnome localbase meson pkgconfig tar:xz +USES= compiler:c11 gettext gnome localbase meson pkgconfig tar:xz USE_LDCONFIG= yes USE_GNOME= cairo glib20 introspection:build diff --git a/x11-wm/stumpwm/Makefile b/x11-wm/stumpwm/Makefile index 165c18cdc32..b9e22d67f64 100644 --- a/x11-wm/stumpwm/Makefile +++ b/x11-wm/stumpwm/Makefile @@ -3,7 +3,7 @@ PORTNAME= stumpwm DISTVERSION= 18.05 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-wm lisp MAINTAINER= jrm@FreeBSD.org diff --git a/x11/admiral/Makefile b/x11/admiral/Makefile index 7e932e476f3..49a8543ec60 100644 --- a/x11/admiral/Makefile +++ b/x11/admiral/Makefile @@ -4,7 +4,7 @@ PORTNAME= admiral DISTVERSIONPREFIX= v DISTVERSION= 1.0.0-7 DISTVERSIONSUFFIX= -g5a9f33b -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MAINTAINER= rigoletto@FreeBSD.org diff --git a/x11/alacritty/Makefile b/x11/alacritty/Makefile index 8636e972447..887ccc56560 100644 --- a/x11/alacritty/Makefile +++ b/x11/alacritty/Makefile @@ -3,6 +3,7 @@ PORTNAME= alacritty PORTVERSION= 0.2.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= zeising@FreeBSD.org diff --git a/x11/cl-clx-sbcl/Makefile b/x11/cl-clx-sbcl/Makefile index d9f0120c759..2ec7882a676 100644 --- a/x11/cl-clx-sbcl/Makefile +++ b/x11/cl-clx-sbcl/Makefile @@ -2,7 +2,7 @@ PORTNAME= clx DISTVERSION= 0.7.5 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= x11 lisp PKGNAMEPREFIX= cl- PKGNAMESUFFIX= -sbcl diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 6b4c457e492..a2bc8d35120 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -23,7 +23,8 @@ RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:sysutils/consolekit2 \ PORTSCOUT= limitw:1,even -USES= gettext gnome localbase:ldflags meson pkgconfig python:3.6+,build tar:xz +USES= compiler:c11 gettext gnome localbase:ldflags meson pkgconfig \ + python:3.6+,build tar:xz USE_GNOME= gnomedesktop3 gtk30 USE_XORG= ice sm x11 xcomposite xtrans USE_GL= egl gl glesv2