Commit 2006f37a authored by HardenedBSD Sync Service's avatar HardenedBSD Sync Service
Browse files

Merge branch 'freebsd/main' into hardenedbsd/main

parents 885d3fa8 4787e5c9
--- regress/fetch/Makefile.orig 2020-09-11 17:05:16 UTC
--- regress/fetch/Makefile.orig 2022-07-03 11:08:45 UTC
+++ regress/fetch/Makefile
@@ -11,7 +11,7 @@ LDADD = -lutil -lz
@@ -12,7 +12,7 @@ LDADD = -lutil -lz -lm
NOMAN = yes
......
......@@ -11,23 +11,15 @@ COMMENT= Python library for OAuth 1.0/a, 2.0, and Ofly consumers
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Depends on expired security/py-pycrypto
EXPIRATION_DATE=2022-09-30
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:www/py-requests@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=1.2.1:devel/py-nose@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pycrypto>=2.5:security/py-pycrypto@${PY_FLAVOR}
TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>=1.0.1:devel/py-mock@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR}
USES= python:3.6+
USE_GITHUB= yes
USE_PYTHON= distutils autoplist
GH_ACCOUNT= litl
USE_PYTHON= autoplist distutils nose
NO_ARCH= yes
do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
.include <bsd.port.mk>
......@@ -2,7 +2,7 @@ PORTNAME= libheif
DISTVERSIONPREFIX= v
DISTVERSION= 1.12.0-62
DISTVERSIONSUFFIX= -g0082fea
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics
MAINTAINER= makc@FreeBSD.org
......@@ -17,12 +17,10 @@ CPE_VENDOR= struktur
USE_GNOME= gdkpixbuf2 glib20
USE_LDCONFIG= yes
CMAKE_OFF= WITH_EXAMPLES
USE_GITHUB= yes
GH_ACCOUNT= strukturag
OPTIONS_DEFINE= AOM DAV1D LIBDE265 RAV1E X265
OPTIONS_DEFINE= AOM DAV1D EXAMPLES LIBDE265 RAV1E X265
OPTIONS_DEFAULT= AOM DAV1D LIBDE265 X265
OPTIONS_SUB= yes
......@@ -38,6 +36,19 @@ AOM_CMAKE_BOOL= WITH_AOM
DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d
DAV1D_CMAKE_BOOL= WITH_DAV1D
EXAMPLES_LIB_DEPENDS= libpng16.so:graphics/png
EXAMPLES_USES= jpeg
EXAMPLES_CMAKE_ON= -DWITH_EXAMPLES:bool=ON
EXAMPLES_CMAKE_OFF= -DWITH_EXAMPLES:bool=OFF
EXAMPLES_PLIST_FILES= bin/heif-convert \
bin/heif-enc \
bin/heif-info \
bin/heif-thumbnailer \
share/man/man1/heif-convert.1.gz \
share/man/man1/heif-enc.1.gz \
share/man/man1/heif-info.1.gz \
share/man/man1/heif-thumbnailer.1.gz
LIBDE265_LIB_DEPENDS= libde265.so:multimedia/libde265
LIBDE265_CMAKE_BOOL= WITH_LIBDE265
......
......@@ -2,8 +2,7 @@
# $MCom: ports/lang/guile/Makefile,v 1.1 2006/09/12 14:57:06 ahze Exp $
PORTNAME= guile
PORTVERSION= 3.0.7
PORTREVISION= 1
PORTVERSION= 3.0.8
CATEGORIES= lang scheme
MASTER_SITES= GNU
......@@ -13,38 +12,42 @@ COMMENT= GNU Ubiquitous Intelligent Language for Extension
LICENSE= GPLv3 LGPL3
LICENSE_COMB= multi
# Currently has linker error in i386. Feel free to add other ARCHS in
# case of failure
NOT_FOR_ARCHS= i386
LIB_DEPENDS= libffi.so:devel/libffi \
libgmp.so:math/gmp \
libltdl.so:devel/libltdl \
libunistring.so:devel/libunistring
USES= charsetfix compiler:c11 cpe gmake iconv libtool makeinfo pathfix pkgconfig \
readline tar:lz
USE_LDCONFIG= yes
USES= charsetfix compiler:gcc-c++11-lib cpe gmake iconv libtool \
makeinfo pathfix pkgconfig readline tar:lz
CPE_VENDOR= gnu
USE_GCC= 12
USE_LDCONFIG= yes
CONFLICTS_INSTALL= guile1 guile2
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
CONFLICTS_INSTALL= guile1 guile2
INFO= guile r5rs
PLIST_SUB= GUILE_VER=${PORTVERSION:R}
OPTIONS_DEFINE= NLS THREADS
OPTIONS_DEFAULT=NLS THREADS
OPTIONS_SUB= yes
OPTIONS_DEFINE= NLS THREADS
OPTIONS_DEFAULT= NLS THREADS
OPTIONS_SUB= yes
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext
THREADS_CONFIGURE_WITH= threads
THREADS_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded
THREADS_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded
THREADS_LIB_DEPENDS_OFF= libgc.so:devel/boehm-gc
THREADS_CONFIGURE_WITH= threads
.include <bsd.port.options.mk>
......@@ -62,4 +65,7 @@ post-patch:
post-patch-THREADS-on:
@${REINPLACE_CMD} -e 's|bdw-gc|bdw-gc-threaded|g' ${WRKSRC}/configure
post-install:
@${FIND} ${STAGEDIR}${PREFIX}/lib -name "*.go" | ${XARGS} ${STRIP_CMD}
.include <bsd.port.mk>
TIMESTAMP = 1621920572
SHA256 (guile-3.0.7.tar.lz) = f02166205ced31651d27bd037f947e199a442545ca73f913907c69469ddd7b54
SIZE (guile-3.0.7.tar.lz) = 10797035
TIMESTAMP = 1656779066
SHA256 (guile-3.0.8.tar.lz) = 96f5263f89dda2d757fe1129e489e672f5a0b7540ee6710ec7ef352120d8af52
SIZE (guile-3.0.8.tar.lz) = 5890261
......@@ -45,7 +45,6 @@ include/guile/%%GUILE_VER%%/libguile/fports.h
include/guile/%%GUILE_VER%%/libguile/frames.h
include/guile/%%GUILE_VER%%/libguile/gc-inline.h
include/guile/%%GUILE_VER%%/libguile/gc.h
include/guile/%%GUILE_VER%%/libguile/generalized-arrays.h
include/guile/%%GUILE_VER%%/libguile/generalized-vectors.h
include/guile/%%GUILE_VER%%/libguile/gettext.h
include/guile/%%GUILE_VER%%/libguile/goops.h
......@@ -223,6 +222,7 @@ lib/guile/%%GUILE_VER%%/ccache/language/cps/contification.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/cse.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/dce.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/devirtualize-integers.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/dump.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/effects-analysis.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/elide-arity-checks.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/graphs.go
......@@ -235,6 +235,7 @@ lib/guile/%%GUILE_VER%%/ccache/language/cps/peel-loops.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/prune-top-level-scopes.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/reify-primitives.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/renumber.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/return-types.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/rotate-loops.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/self-references.go
lib/guile/%%GUILE_VER%%/ccache/language/cps/simplify.go
......@@ -280,10 +281,12 @@ lib/guile/%%GUILE_VER%%/ccache/language/tree-il/debug.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/effects.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/eta-expand.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/fix-letrec.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/inlinable-exports.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/letrectify.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/optimize.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/peval.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/primitives.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/resolve-free-vars.go
lib/guile/%%GUILE_VER%%/ccache/language/tree-il/spec.go
lib/guile/%%GUILE_VER%%/ccache/language/value/spec.go
lib/guile/%%GUILE_VER%%/ccache/oop/goops.go
......@@ -466,8 +469,8 @@ lib/guile/%%GUILE_VER%%/extensions/guile-readline.so.0.0.0
lib/libguile-%%GUILE_VER%%.a
lib/libguile-%%GUILE_VER%%.so
lib/libguile-%%GUILE_VER%%.so.1
lib/libguile-%%GUILE_VER%%.so.1.4.0
lib/libguile-%%GUILE_VER%%.so.1.4.0-gdb.scm
lib/libguile-%%GUILE_VER%%.so.1.5.0
lib/libguile-%%GUILE_VER%%.so.1.5.0-gdb.scm
libdata/pkgconfig/guile-%%GUILE_VER%%.pc
man/man1/guile.1.gz
share/aclocal/guile.m4
......@@ -569,6 +572,7 @@ share/aclocal/guile.m4
%%DATADIR%%/%%GUILE_VER%%/language/cps/cse.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/dce.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/devirtualize-integers.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/dump.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/effects-analysis.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/elide-arity-checks.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/graphs.scm
......@@ -581,6 +585,7 @@ share/aclocal/guile.m4
%%DATADIR%%/%%GUILE_VER%%/language/cps/prune-top-level-scopes.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/reify-primitives.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/renumber.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/return-types.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/rotate-loops.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/self-references.scm
%%DATADIR%%/%%GUILE_VER%%/language/cps/simplify.scm
......@@ -626,10 +631,12 @@ share/aclocal/guile.m4
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/effects.scm
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/eta-expand.scm
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/fix-letrec.scm
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/inlinable-exports.scm
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/letrectify.scm
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/optimize.scm
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/peval.scm
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/primitives.scm
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/resolve-free-vars.scm
%%DATADIR%%/%%GUILE_VER%%/language/tree-il/spec.scm
%%DATADIR%%/%%GUILE_VER%%/language/value/spec.scm
%%DATADIR%%/%%GUILE_VER%%/oop/goops.scm
......
# Created by: Marc Fonvieille <blackend@FreeBSD.org>
PORTNAME= freebsd-doc-all
PORTVERSION= 20220527
PORTVERSION= 20220702
PORTEPOCH= 1
CATEGORIES= misc docs
......
# Created by: Marc Fonvieille <blackend@FreeBSD.org>
PORTNAME= freebsd-doc
PORTVERSION= 20220527
PORTVERSION= 20220702
PORTEPOCH= 1
CATEGORIES= misc docs
MASTER_SITES= LOCAL/blackend
......
TIMESTAMP = 1653642292
SHA256 (freebsd-doc-20220527.tar.gz) = 80cd9aba94143e16194042ca3d2692db10348da9668df41ec1afd4b5efb9e720
SIZE (freebsd-doc-20220527.tar.gz) = 32140813
TIMESTAMP = 1656853242
SHA256 (freebsd-doc-20220702.tar.gz) = 6ce5ba3666d352818e054a04dc1babbff9619da0e2a74b35d05cd4f0c7965ad2
SIZE (freebsd-doc-20220702.tar.gz) = 32146348
# Created by: vanhu <vanhu@netasq.com>
PORTNAME= scapy
PORTVERSION= 2.4.5
CATEGORIES= net python
......@@ -12,9 +11,6 @@ COMMENT= Powerful interactive packet manipulation program in python
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
DEPRECATED= Depends on expired security/py-pycrypto
EXPIRATION_DATE=2022-09-30
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libdnet>0:net/py-libdnet@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pypcap>0:net/py-pypcap@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR}
......@@ -42,7 +38,7 @@ NMAP_RUN_DEPENDS= ${LOCALBASE}/share/nmap/nmap-os-db:security/nmap
MANUF_RUN_DEPENDS= ${LOCALBASE}/share/wireshark/manuf:net/wireshark
MATPLOT_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
P0F_BASE_RUN_DEPENDS= ${LOCALBASE}/etc/p0f.fp:net-mgmt/p0f
PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
PYCRYPTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR}
PYX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyx>0:graphics/py-pyx@${PY_FLAVOR}
SOX_RUN_DEPENDS= ${LOCALBASE}/bin/sox:audio/sox
......
<vuln vid="5be19b0d-fb85-11ec-95cd-080027b24e86">
<topic>Django -- multiple vulnerabilities</topic>
<affects>
<package>
<name>py37-django32</name>
<name>py38-django32</name>
<name>py39-django32</name>
<name>py310-django32</name>
<range><lt>3.2.14</lt></range>
</package>
<package>
<name>py38-django40</name>
<name>py39-django40</name>
<name>py310-django40</name>
<range><lt>4.0.6</lt></range>
</package>
</affects>
<description>
<body xmlns="http://www.w3.org/1999/xhtml">
<p>SO-AND-SO reports:</p>
<blockquote cite="https://www.djangoproject.com/weblog/2022/jul/04/security-releases/">
<p>CVE-2022-34265: Potential SQL injection via Trunc(kind) and
Extract(lookup_name) arguments.</p>
</blockquote>
</body>
</description>
<references>
<cvename>CVE-2022-34265</cvename>
<url>https://www.djangoproject.com/weblog/2022/jul/04/security-releases/</url>
</references>
<dates>
<discovery>2022-06-21</discovery>
<entry>2022-07-04</entry>
</dates>
</vuln>
<vuln vid="f0e45968-faff-11ec-856e-d4c9ef517024">
<topic>OpenSSL -- Bug in RSA implementation for AVX512IFMA</topic>
<affects>
......@@ -2140,7 +2176,7 @@
<package>
<name>py38-django40</name>
<name>py39-django40</name>
<name>py31-django40</name>
<name>py310-django40</name>
<range><lt>4.0.4</lt></range>
</package>
</affects>
......
PORTNAME= ansible
DISTVERSION= 5.5.0
DISTVERSION= 5.10.0
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
......@@ -21,7 +21,7 @@ SHEBANG_FILES= ansible_collections/community/zabbix/roles/zabbix_proxy/files/ins
ansible_collections/cyberark/conjur/ci/build_release \
ansible_collections/cyberark/conjur/ci/publish_to_galaxy \
ansible_collections/ovirt/ovirt/roles/disaster_recovery/files/ovirt-dr
SHEBANG_GLOB= *.py *.sh
SHEBANG_GLOB= *.py *.sh build.py.generic
CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}}
......
TIMESTAMP = 1647445101
SHA256 (ansible-5.5.0.tar.gz) = b8a76d737889c9bfd0e6b0f2276dcf8d836da667067a355776f3504d7a66d518
SIZE (ansible-5.5.0.tar.gz) = 42044944
TIMESTAMP = 1656930983
SHA256 (ansible-5.10.0.tar.gz) = c77f556a7c3d9948f86639c5742aa885be25a7cdbda3bfb41a8314b60a3341e8
SIZE (ansible-5.10.0.tar.gz) = 36898833
......@@ -22,7 +22,7 @@ OPTIONS_DEFINE= SSL PGSQL
OPTIONS_DEFAULT= SSL
LIB_DEPENDS= libyaml.so:textproc/libyaml
LDFLAGS= -lexecinfo
LDFLAGS+= -lexecinfo
CMAKE_ARGS= -DFLB_DEBUG=Off -DFLB_TRACE=Off
CFLAGS+= -I${LOCALBASE}/include
......
PORTNAME= ansible-core
DISTVERSION= 2.12.4
DISTVERSION= 2.12.7
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
......
TIMESTAMP = 1648570219
SHA256 (ansible-core-2.12.4.tar.gz) = 827af75985a6f04b980bd371027bf038cb187640628557298acb9983a8f2c2da
SIZE (ansible-core-2.12.4.tar.gz) = 7756536
TIMESTAMP = 1656930069
SHA256 (ansible-core-2.12.7.tar.gz) = a31c1b0a3e2efedcb4c48cf95d36aa0ab19cef40eba1719ddb0d92ba1a9cf62a
SIZE (ansible-core-2.12.7.tar.gz) = 7756456
# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
PORTNAME= django
PORTVERSION= 3.2.13
PORTVERSION= 3.2.14
CATEGORIES= www python
MASTER_SITES= CHEESESHOP \
https://www.djangoproject.com/m/releases/${PORTVERSION}/
......
TIMESTAMP = 1649721149
SHA256 (python/Django-3.2.13.tar.gz) = 6d93497a0a9bf6ba0e0b1a29cccdc40efbfc76297255b1309b3a884a688ec4b6
SIZE (python/Django-3.2.13.tar.gz) = 9813985
TIMESTAMP = 1656927069
SHA256 (python/Django-3.2.14.tar.gz) = 677182ba8b5b285a4e072f3ac17ceee6aff1b5ce77fd173cc5b6a2d3dc022fcf
SIZE (python/Django-3.2.14.tar.gz) = 9814965
# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
PORTNAME= django
PORTVERSION= 4.0.5
PORTVERSION= 4.0.6
CATEGORIES= www python
MASTER_SITES= CHEESESHOP \
https://www.djangoproject.com/m/releases/${PORTVERSION}/
......
TIMESTAMP = 1654136336
SHA256 (python/Django-4.0.5.tar.gz) = f7431a5de7277966f3785557c3928433347d998c1e6459324501378a291e5aab
SIZE (python/Django-4.0.5.tar.gz) = 10410720
TIMESTAMP = 1656926985
SHA256 (python/Django-4.0.6.tar.gz) = a67a793ff6827fd373555537dca0da293a63a316fe34cb7f367f898ccca3c3ae
SIZE (python/Django-4.0.6.tar.gz) = 10389543
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment