ok?
Index: security/openssl/3.1/Makefile
===================================================================
RCS file: /cvs/ports/security/openssl/3.1/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- security/openssl/3.1/Makefile 30 Jan 2024 16:49:39 -0000 1.18
+++ security/openssl/3.1/Makefile 18 Feb 2024 22:25:50 -0000
@@ -10,6 +10,7 @@ V= 3.1.5
PKGNAME= openssl-${V}
PKGSPEC= openssl->=3.1v0,<3.2v0
EPOCH= 0
+REVISION= 0
SHLIBVER= 15.1
SHARED_LIBS= crypto ${SHLIBVER} \
Index: security/openssl/3.1/patches/patch-Configurations_10-main_conf
===================================================================
RCS file:
/cvs/ports/security/openssl/3.1/patches/patch-Configurations_10-main_conf,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Configurations_10-main_conf
--- security/openssl/3.1/patches/patch-Configurations_10-main_conf 19 Sep
2023 14:33:57 -0000 1.2
+++ security/openssl/3.1/patches/patch-Configurations_10-main_conf 18 Feb
2024 22:25:50 -0000
@@ -1,7 +1,7 @@
Index: Configurations/10-main.conf
--- Configurations/10-main.conf.orig
+++ Configurations/10-main.conf
-@@ -1043,6 +1043,7 @@ my %targets = (
+@@ -1044,6 +1044,7 @@ my %targets = (
},
"BSD-x86-elf" => {
inherit_from => [ "BSD-x86" ],
Index: security/openssl/3.1/patches/patch-Configurations_unix-Makefile_tmpl
===================================================================
RCS file:
/cvs/ports/security/openssl/3.1/patches/patch-Configurations_unix-Makefile_tmpl,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Configurations_unix-Makefile_tmpl
--- security/openssl/3.1/patches/patch-Configurations_unix-Makefile_tmpl
30 May 2023 14:10:40 -0000 1.3
+++ security/openssl/3.1/patches/patch-Configurations_unix-Makefile_tmpl
18 Feb 2024 22:25:50 -0000
@@ -1,7 +1,7 @@
Index: Configurations/unix-Makefile.tmpl
--- Configurations/unix-Makefile.tmpl.orig
+++ Configurations/unix-Makefile.tmpl
-@@ -1399,7 +1399,7 @@ libcrypto.pc:
+@@ -1400,7 +1400,7 @@ libcrypto.pc:
else \
echo 'libdir=$(libdir)'; \
fi; \
@@ -10,7 +10,7 @@ Index: Configurations/unix-Makefile.tmpl
echo 'enginesdir=$${libdir}/engines-{- $sover_dirname -}'; \
echo 'modulesdir=$${libdir}/ossl-modules'; \
echo ''; \
-@@ -1418,12 +1418,12 @@ libssl.pc:
+@@ -1419,12 +1419,12 @@ libssl.pc:
else \
echo 'libdir=$(libdir)'; \
fi; \
@@ -25,7 +25,7 @@ Index: Configurations/unix-Makefile.tmpl
echo 'Libs: -L$${libdir} -lssl'; \
echo 'Cflags: -I$${includedir}' ) > libssl.pc
-@@ -1435,12 +1435,12 @@ openssl.pc:
+@@ -1436,12 +1436,12 @@ openssl.pc:
else \
echo 'libdir=$(libdir)'; \
fi; \
@@ -40,7 +40,7 @@ Index: Configurations/unix-Makefile.tmpl
Makefile: configdata.pm \
{- join(" \\\n" . ' ' x 10,
-@@ -1570,7 +1570,7 @@ EOF
+@@ -1571,7 +1571,7 @@ EOF
$generator = 'CC="$(CC)" $(PERL)'.$gen_incs.' '.$gen0.$gen_args
.' "$(PERLASM_SCHEME)"'.$incs.' '.$cppflags.$defs.'
$(PROCESSOR)';
} elsif ($gen0 =~ /\.m4$/) {
Index: security/openssl/3.1/patches/patch-crypto_modes_asm_ghash-x86_64_pl
===================================================================
RCS file:
/cvs/ports/security/openssl/3.1/patches/patch-crypto_modes_asm_ghash-x86_64_pl,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-crypto_modes_asm_ghash-x86_64_pl
--- security/openssl/3.1/patches/patch-crypto_modes_asm_ghash-x86_64_pl 14 Mar
2023 18:54:42 -0000 1.1.1.1
+++ security/openssl/3.1/patches/patch-crypto_modes_asm_ghash-x86_64_pl 18 Feb
2024 22:25:50 -0000
@@ -1,7 +1,23 @@
Index: crypto/modes/asm/ghash-x86_64.pl
--- crypto/modes/asm/ghash-x86_64.pl.orig
+++ crypto/modes/asm/ghash-x86_64.pl
-@@ -1609,6 +1609,7 @@ ___
+@@ -534,6 +534,7 @@ $code.=<<___;
+ .align 16
+ gcm_init_clmul:
+ .cfi_startproc
++ endbranch
+ .L_init_clmul:
+ ___
+ $code.=<<___ if ($win64);
+@@ -1026,6 +1027,7 @@ $code.=<<___;
+ .type gcm_init_avx,\@abi-omnipotent
+ .align 32
+ gcm_init_avx:
++ endbranch
+ .cfi_startproc
+ ___
+ if ($avx) {
+@@ -1609,6 +1611,7 @@ ___
}
$code.=<<___;
@@ -9,7 +25,7 @@ Index: crypto/modes/asm/ghash-x86_64.pl
.align 64
.Lbswap_mask:
.byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -1662,6 +1663,7 @@ $code.=<<___;
+@@ -1662,6 +1665,7 @@ $code.=<<___;
.asciz "GHASH for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
.align 64
Index: security/openssl/3.1/patches/patch-crypto_poly1305_asm_poly1305-x86_64_pl
===================================================================
RCS file:
/cvs/ports/security/openssl/3.1/patches/patch-crypto_poly1305_asm_poly1305-x86_64_pl,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-crypto_poly1305_asm_poly1305-x86_64_pl
--- security/openssl/3.1/patches/patch-crypto_poly1305_asm_poly1305-x86_64_pl
14 Mar 2023 18:54:42 -0000 1.1.1.1
+++ security/openssl/3.1/patches/patch-crypto_poly1305_asm_poly1305-x86_64_pl
18 Feb 2024 22:25:50 -0000
@@ -1,7 +1,55 @@
Index: crypto/poly1305/asm/poly1305-x86_64.pl
--- crypto/poly1305/asm/poly1305-x86_64.pl.orig
+++ crypto/poly1305/asm/poly1305-x86_64.pl
-@@ -3778,6 +3778,7 @@ poly1305_emit_base2_44:
+@@ -229,6 +229,7 @@ $code.=<<___;
+ .align 32
+ poly1305_blocks:
+ .cfi_startproc
++ endbranch
+ .Lblocks:
+ shr \$4,$len
+ jz .Lno_data # too short
+@@ -303,6 +304,7 @@ $code.=<<___;
+ .align 32
+ poly1305_emit:
+ .cfi_startproc
++ endbranch
+ .Lemit:
+ mov 0($ctx),%r8 # load hash value
+ mov 8($ctx),%r9
+@@ -524,6 +526,7 @@ __poly1305_init_avx:
+ .align 32
+ poly1305_blocks_avx:
+ .cfi_startproc
++ endbranch
+ mov 20($ctx),%r8d # is_base2_26
+ cmp \$128,$len
+ jae .Lblocks_avx
+@@ -1384,6 +1387,7 @@ $code.=<<___;
+ .align 32
+ poly1305_emit_avx:
+ .cfi_startproc
++ endbranch
+ cmpl \$0,20($ctx) # is_base2_26?
+ je .Lemit
+
+@@ -1448,6 +1452,7 @@ $code.=<<___;
+ .align 32
+ poly1305_blocks_avx2:
+ .cfi_startproc
++ endbranch
+ mov 20($ctx),%r8d # is_base2_26
+ cmp \$128,$len
+ jae .Lblocks_avx2
+@@ -2144,6 +2149,7 @@ $code.=<<___;
+ .align 32
+ poly1305_blocks_avx512:
+ .cfi_startproc
++ endbranch
+ .Lblocks_avx512:
+ mov \$15,%eax
+ kmovw %eax,%k2
+@@ -3778,6 +3784,7 @@ poly1305_emit_base2_44:
___
} } }
$code.=<<___;
@@ -9,7 +57,7 @@ Index: crypto/poly1305/asm/poly1305-x86_
.align 64
.Lconst:
.Lmask24:
-@@ -3809,6 +3810,7 @@ $code.=<<___;
+@@ -3809,6 +3816,7 @@ $code.=<<___;
.Lx_mask42:
.quad 0x3ffffffffff,0x3ffffffffff,0x3ffffffffff,0x3ffffffffff
.quad 0x3ffffffffff,0x3ffffffffff,0x3ffffffffff,0x3ffffffffff
