summaryrefslogtreecommitdiff
path: root/security/cryptlib/files/patch-tools_ccopts.sh
diff options
context:
space:
mode:
authorAlex Dupre <ale@FreeBSD.org>2024-10-22 17:31:22 +0200
committerAlex Dupre <ale@FreeBSD.org>2024-10-22 17:33:29 +0200
commit53b58221ade14504875fbd818f42ee551f65f79e (patch)
tree7f2397267264a271f39c35865efc102e528e5747 /security/cryptlib/files/patch-tools_ccopts.sh
parentnet/bird2: Bump PORTREVISION after libssh update (diff)
security/cryptlib: update to 3.4.7 release.
PR: 282203 Submitted by: Alven <alster@vinterdalen.se> Security: CVE-2024-0202
Diffstat (limited to 'security/cryptlib/files/patch-tools_ccopts.sh')
-rw-r--r--security/cryptlib/files/patch-tools_ccopts.sh36
1 files changed, 2 insertions, 34 deletions
diff --git a/security/cryptlib/files/patch-tools_ccopts.sh b/security/cryptlib/files/patch-tools_ccopts.sh
index 040bf62ddbf0..ad81eac26a3d 100644
--- a/security/cryptlib/files/patch-tools_ccopts.sh
+++ b/security/cryptlib/files/patch-tools_ccopts.sh
@@ -1,6 +1,6 @@
---- tools/ccopts.sh.orig 2021-10-21 02:27:26 UTC
+--- tools/ccopts.sh.orig 2023-07-11 00:09:58 UTC
+++ tools/ccopts.sh
-@@ -675,7 +675,7 @@ hasSafeStackLibs()
+@@ -603,7 +603,7 @@ if [ $ISCLANG -gt 0 ] && [ $ISSPECIAL -eq 0 ] ; then
if [ $ISCLANG -gt 0 ] && [ $ISSPECIAL -eq 0 ] ; then
if [ $COMPILER_VER -ge 47 ] ; then
@@ -9,35 +9,3 @@
# The versions of clang shipped with OS X or OpenBSD don't
# support -fsanitize=safe-stack even as late as clang 12, so
# there's not much that we can do.
-@@ -892,31 +892,6 @@ fi
- # a big deal. As a convenient side-effect, this also enables the use of
- # ASLR where it's supported.
-
--if [ "$ARCH" = "i586" ] || [ "$ARCH" = "i686" ] || [ "$ARCH" = "x86_64" ] ; then
-- if [ "$COMPILER_VER" -ge 45 ] ; then
-- if [ $GENERICBUILD -gt 0 ] ; then
-- echo " (Enabling lowest-common-denominator build options for cross-platform library)." >&2 ;
-- else
-- CCARGS="$CCARGS -march=native -mtune=generic" ;
-- fi
-- if [ "$ARCH" = "x86_64" ] ; then
-- CCARGS="$CCARGS -fPIC" ;
-- fi ;
-- elif [ "$COMPILER_VER" -ge 30 ] ; then
-- case $ARCH in
-- 'x86_64')
-- CCARGS="$CCARGS -march=opteron -fPIC" ;;
--
-- 'i686')
-- CCARGS="$CCARGS -march=pentiumpro" ;;
--
-- *)
-- CCARGS="$CCARGS -march=pentium" ;;
-- esac ;
-- else
-- CCARGS="$CCARGS -mcpu=pentium" ;
-- fi ;
--fi
-
- # gcc 4.x for 64-bit architectures has an optimiser bug that removes an
- # empty-list check in cryptlib's list-management code (this has been