| 1 |
commit: 4c33f10215c26c17fafd0c31a7a3f324ce14aeff |
| 2 |
Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
| 3 |
AuthorDate: Sat Oct 1 01:37:17 2022 +0000 |
| 4 |
Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc> |
| 5 |
CommitDate: Sat Oct 1 01:37:17 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4c33f102 |
| 7 |
|
| 8 |
app-crypt/intel-ipsec-mb: update to 1.3 |
| 9 |
|
| 10 |
Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc> |
| 11 |
|
| 12 |
app-crypt/intel-ipsec-mb/Manifest | 1 + |
| 13 |
.../intel-ipsec-mb-1.3_remove-werror-and-O3.patch | 182 +++++++++++++++++++++ |
| 14 |
...ec-mb-9999.ebuild => intel-ipsec-mb-1.3.ebuild} | 4 +- |
| 15 |
.../intel-ipsec-mb/intel-ipsec-mb-9999.ebuild | 4 +- |
| 16 |
4 files changed, 187 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-crypt/intel-ipsec-mb/Manifest b/app-crypt/intel-ipsec-mb/Manifest |
| 19 |
index 01c6d513a..3a14699a2 100644 |
| 20 |
--- a/app-crypt/intel-ipsec-mb/Manifest |
| 21 |
+++ b/app-crypt/intel-ipsec-mb/Manifest |
| 22 |
@@ -1,2 +1,3 @@ |
| 23 |
DIST intel-ipsec-mb-1.1.tar.gz 1227915 BLAKE2B 56d104c2bcebd4a8125d64362c14603b7005c8ef0978d4039da3128f06fbba7f469ac8df23e3315b9f3fe33c392804fd718a533edd34e4a545f767a1c2e2fd60 SHA512 aca5863d36b333c4c896549074242fb4c2c0a4d6598b27baa794944436527bdd6e1a5dbca9d39e0c3a89e61d7d175adcf5bf6c6cbdffd0a43bca1fea0be42ebe |
| 24 |
DIST intel-ipsec-mb-1.2.tar.gz 1251965 BLAKE2B f92172ea727f8c0a5beff6e8fe6bb1630b5e83ddffa7384b998ebb6dfe09fd2657203ab53358296ade0106240278f659c297c0897e2de364b434032a58f417b3 SHA512 dc566ea433f7c85109e833d1debb3c8dc3686b4c0562a00872dd9801ba3530bf87b7b382e167e7d5cec17c3b3535834cc5bdc78f349f501bdfe8920ee51532ac |
| 25 |
+DIST intel-ipsec-mb-1.3.tar.gz 2139105 BLAKE2B f7ae09cb2721a0193879ee4a3a04fa6d190ebcd70c681a1f885554dbd644d39511cd0832eb22edc5566d72f0fcaba955450d2208b17a040f053aef6134e174b0 SHA512 4b91bffcd62f69245da90b70586df425fa6f17fa63d530b0cd09b990fb1ac4c85c2ebc8ed5d8952bd4b8a20e82c3b418e9ef4d61cfe1811af04f1ee16630ec67 |
| 26 |
|
| 27 |
diff --git a/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.3_remove-werror-and-O3.patch b/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.3_remove-werror-and-O3.patch |
| 28 |
new file mode 100644 |
| 29 |
index 000000000..97ba6da0d |
| 30 |
--- /dev/null |
| 31 |
+++ b/app-crypt/intel-ipsec-mb/files/intel-ipsec-mb-1.3_remove-werror-and-O3.patch |
| 32 |
@@ -0,0 +1,182 @@ |
| 33 |
+diff --git a/lib/Makefile b/lib/Makefile |
| 34 |
+index c592114..f2ea5b6 100644 |
| 35 |
+--- a/lib/Makefile |
| 36 |
++++ b/lib/Makefile |
| 37 |
+@@ -117,10 +117,10 @@ YASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I $i) |
| 38 |
+ NASM_INCLUDES := $(foreach i,$(ASM_INCLUDE_DIRS),-I$i/) |
| 39 |
+ ifneq ($(MINGW),0) |
| 40 |
+ YASM_FLAGS := -f x64 -f win64 -X gnu -g dwarf2 -DWIN_ABI $(YASM_INCLUDES) |
| 41 |
+-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES) |
| 42 |
++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI $(NASM_INCLUDES) |
| 43 |
+ else |
| 44 |
+ YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__ $(YASM_INCLUDES) |
| 45 |
+-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES) |
| 46 |
++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ $(NASM_INCLUDES) |
| 47 |
+ endif |
| 48 |
+ |
| 49 |
+ DEBUG_OPT ?= -O0 |
| 50 |
+@@ -170,7 +170,6 @@ endif |
| 51 |
+ |
| 52 |
+ # prevent SIMD optimizations for non-aesni modules |
| 53 |
+ CFLAGS_NO_SIMD = $(CFLAGS) -O1 |
| 54 |
+-CFLAGS += $(OPT) |
| 55 |
+ |
| 56 |
+ # Set generic architectural optimizations |
| 57 |
+ OPT_X86 := -msse4.2 |
| 58 |
+@@ -758,7 +757,7 @@ install: $(LIB_DIR)/$(LIBNAME) |
| 59 |
+ install -m 0444 $(MAN2) $(MAN_DIR) |
| 60 |
+ install -d $(LIB_INSTALL_DIR) |
| 61 |
+ ifeq ($(SHARED),y) |
| 62 |
+- install -s -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR) |
| 63 |
++ install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR) |
| 64 |
+ else |
| 65 |
+ # must not strip symbol table for static libs |
| 66 |
+ install -m $(LIBPERM) $(LIB_DIR)/$(LIBNAME) $(LIB_INSTALL_DIR) |
| 67 |
+diff --git a/lib/win_x64.mak b/lib/win_x64.mak |
| 68 |
+index b33f5b1..69603d5 100644 |
| 69 |
+--- a/lib/win_x64.mak |
| 70 |
++++ b/lib/win_x64.mak |
| 71 |
+@@ -125,7 +125,7 @@ LINK_TOOL = link |
| 72 |
+ LINKFLAGS = $(DLFLAGS) /nologo /machine:X64 |
| 73 |
+ |
| 74 |
+ AS = nasm |
| 75 |
+-AFLAGS = $(DAFLAGS) -Werror -fwin64 -Xvc -DWIN_ABI -I. |
| 76 |
++AFLAGS = $(DAFLAGS) -fwin64 -Xvc -DWIN_ABI -I. |
| 77 |
+ |
| 78 |
+ # dependency |
| 79 |
+ !ifndef DEPTOOL |
| 80 |
+diff --git a/perf/Makefile b/perf/Makefile |
| 81 |
+index f204e57..9db0818 100644 |
| 82 |
+--- a/perf/Makefile |
| 83 |
++++ b/perf/Makefile |
| 84 |
+@@ -45,9 +45,9 @@ endif |
| 85 |
+ |
| 86 |
+ ifeq ($(MINGW),0) |
| 87 |
+ CFLAGS += -DLINUX |
| 88 |
+-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ |
| 89 |
++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ |
| 90 |
+ else |
| 91 |
+-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI |
| 92 |
++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI |
| 93 |
+ endif |
| 94 |
+ |
| 95 |
+ # if "-z ibt" is supported then assume "-z shstk, -z cet-report=error" are also supported |
| 96 |
+@@ -62,21 +62,21 @@ CFLAGS += -fcf-protection=full |
| 97 |
+ endif |
| 98 |
+ |
| 99 |
+ ifeq ($(MINGW),0) |
| 100 |
+-LDFLAGS = -fPIE -z noexecstack -z relro -z now -pthread |
| 101 |
++LDFLAGS += -fPIE -z noexecstack -z relro -z now -pthread |
| 102 |
+ endif |
| 103 |
+ ifeq ($(CC_HAS_CET),1) |
| 104 |
+ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error |
| 105 |
+ endif |
| 106 |
+ LDLIBS = -lIPSec_MB |
| 107 |
+ |
| 108 |
+-ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes") |
| 109 |
++#ifeq ("$(shell test -e $(INSTPATH) && echo -n yes)","yes") |
| 110 |
+ # library installed |
| 111 |
+-CFLAGS += |
| 112 |
+-else |
| 113 |
++#CFLAGS += |
| 114 |
++#else |
| 115 |
+ # library not installed |
| 116 |
+ CFLAGS += -I../lib/include -I../lib |
| 117 |
+ LDFLAGS += -L$(LIB_DIR) |
| 118 |
+-endif |
| 119 |
++#endif |
| 120 |
+ |
| 121 |
+ DEBUG_OPT ?= -O0 |
| 122 |
+ ifeq ($(DEBUG),y) |
| 123 |
+diff --git a/perf/win_x64.mak b/perf/win_x64.mak |
| 124 |
+index 2f28549..3790e5f 100644 |
| 125 |
+--- a/perf/win_x64.mak |
| 126 |
++++ b/perf/win_x64.mak |
| 127 |
+@@ -69,7 +69,7 @@ LNK = link |
| 128 |
+ LFLAGS = /out:$(APP).exe $(DLFLAGS) |
| 129 |
+ |
| 130 |
+ AS = nasm |
| 131 |
+-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI |
| 132 |
++AFLAGS = -fwin64 -Xvc -DWIN_ABI |
| 133 |
+ |
| 134 |
+ OBJECTS = ipsec_perf.obj msr.obj misc.obj |
| 135 |
+ |
| 136 |
+diff --git a/test/Makefile b/test/Makefile |
| 137 |
+index 72c0dc8..dfeb862 100644 |
| 138 |
+--- a/test/Makefile |
| 139 |
++++ b/test/Makefile |
| 140 |
+@@ -66,15 +66,15 @@ endif |
| 141 |
+ YASM_FLAGS := -f x64 -f elf64 -X gnu -g dwarf2 -DLINUX -D__linux__ |
| 142 |
+ ifeq ($(MINGW),0) |
| 143 |
+ CFLAGS += -DLINUX |
| 144 |
+-NASM_FLAGS := -Werror -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ |
| 145 |
++NASM_FLAGS := -felf64 -Xgnu -gdwarf -DLINUX -D__linux__ |
| 146 |
+ else |
| 147 |
+-NASM_FLAGS := -Werror -fwin64 -Xvc -gcv8 -DWIN_ABI |
| 148 |
++NASM_FLAGS := -fwin64 -Xvc -gcv8 -DWIN_ABI |
| 149 |
+ endif |
| 150 |
+ |
| 151 |
+ ifeq ($(MINGW),0) |
| 152 |
+-LDFLAGS = -fPIE -z noexecstack -z relro -z now |
| 153 |
++LDFLAGS += -fPIE -z noexecstack -z relro -z now |
| 154 |
+ else |
| 155 |
+-LDFLAGS = -fPIE |
| 156 |
++LDFLAGS += -fPIE |
| 157 |
+ endif |
| 158 |
+ |
| 159 |
+ ifeq ($(CC_HAS_CET),1) |
| 160 |
+@@ -82,14 +82,14 @@ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error |
| 161 |
+ endif |
| 162 |
+ LDLIBS = -lIPSec_MB |
| 163 |
+ |
| 164 |
+-ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes") |
| 165 |
++#ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes") |
| 166 |
+ # library installed |
| 167 |
+-CFLAGS += |
| 168 |
+-else |
| 169 |
++#CFLAGS += |
| 170 |
++#else |
| 171 |
+ # library not installed |
| 172 |
+ CFLAGS += -I../lib/include -I../lib |
| 173 |
+ LDFLAGS += -L$(LIB_DIR) |
| 174 |
+-endif |
| 175 |
++#endif |
| 176 |
+ |
| 177 |
+ FUZZ_CFLAGS = -I../lib -L../lib $(CFLAGS) -g -fsanitize=fuzzer,address,leak |
| 178 |
+ |
| 179 |
+diff --git a/test/win_x64.mak b/test/win_x64.mak |
| 180 |
+index 67959bb..2b4585e 100644 |
| 181 |
+--- a/test/win_x64.mak |
| 182 |
++++ b/test/win_x64.mak |
| 183 |
+@@ -68,7 +68,7 @@ TEST_LFLAGS = /out:$(TEST_APP).exe $(DLFLAGS) |
| 184 |
+ XVALID_LFLAGS = /out:$(XVALID_APP).exe $(DLFLAGS) |
| 185 |
+ |
| 186 |
+ AS = nasm |
| 187 |
+-AFLAGS = -Werror -fwin64 -Xvc -DWIN_ABI |
| 188 |
++AFLAGS = -fwin64 -Xvc -DWIN_ABI |
| 189 |
+ |
| 190 |
+ # dependency |
| 191 |
+ !ifndef DEPTOOL |
| 192 |
+diff --git a/test/wycheproof/Makefile b/test/wycheproof/Makefile |
| 193 |
+index faf051d..5b86b09 100644 |
| 194 |
+--- a/test/wycheproof/Makefile |
| 195 |
++++ b/test/wycheproof/Makefile |
| 196 |
+@@ -67,14 +67,14 @@ LDFLAGS += -fcf-protection=full -Wl,-z,ibt -Wl,-z,shstk -Wl,-z,cet-report=error |
| 197 |
+ endif |
| 198 |
+ LDLIBS = -lIPSec_MB |
| 199 |
+ |
| 200 |
+-ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes") |
| 201 |
++#ifeq ("$(shell test -r $(INSTPATH) && echo -n yes)","yes") |
| 202 |
+ # library installed |
| 203 |
+-CFLAGS += |
| 204 |
+-else |
| 205 |
++#CFLAGS += |
| 206 |
++#else |
| 207 |
+ # library not installed |
| 208 |
+ CFLAGS += -I../../lib |
| 209 |
+ LDFLAGS += -L$(LIB_DIR) |
| 210 |
+-endif |
| 211 |
++#endif |
| 212 |
+ |
| 213 |
+ DEBUG_OPT ?= -O0 |
| 214 |
+ ifeq ($(DEBUG),y) |
| 215 |
|
| 216 |
diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.3.ebuild |
| 217 |
similarity index 94% |
| 218 |
copy from app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild |
| 219 |
copy to app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.3.ebuild |
| 220 |
index 4d8f17f15..8f9457fef 100644 |
| 221 |
--- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild |
| 222 |
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-1.3.ebuild |
| 223 |
@@ -1,7 +1,7 @@ |
| 224 |
# Copyright 2021-2022 Gentoo Authors |
| 225 |
# Distributed under the terms of the GNU General Public License v2 |
| 226 |
|
| 227 |
-EAPI=7 |
| 228 |
+EAPI=8 |
| 229 |
|
| 230 |
inherit toolchain-funcs |
| 231 |
|
| 232 |
@@ -25,7 +25,7 @@ BDEPEND=" |
| 233 |
>=dev-lang/nasm-2.13.03 |
| 234 |
" |
| 235 |
|
| 236 |
-PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.2_remove-werror-and-O3.patch" ) |
| 237 |
+PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.3_remove-werror-and-O3.patch" ) |
| 238 |
|
| 239 |
src_configure(){ |
| 240 |
tc-export CC LD AR |
| 241 |
|
| 242 |
diff --git a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild |
| 243 |
index 4d8f17f15..8f9457fef 100644 |
| 244 |
--- a/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild |
| 245 |
+++ b/app-crypt/intel-ipsec-mb/intel-ipsec-mb-9999.ebuild |
| 246 |
@@ -1,7 +1,7 @@ |
| 247 |
# Copyright 2021-2022 Gentoo Authors |
| 248 |
# Distributed under the terms of the GNU General Public License v2 |
| 249 |
|
| 250 |
-EAPI=7 |
| 251 |
+EAPI=8 |
| 252 |
|
| 253 |
inherit toolchain-funcs |
| 254 |
|
| 255 |
@@ -25,7 +25,7 @@ BDEPEND=" |
| 256 |
>=dev-lang/nasm-2.13.03 |
| 257 |
" |
| 258 |
|
| 259 |
-PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.2_remove-werror-and-O3.patch" ) |
| 260 |
+PATCHES=( "${FILESDIR}/intel-ipsec-mb-1.3_remove-werror-and-O3.patch" ) |
| 261 |
|
| 262 |
src_configure(){ |
| 263 |
tc-export CC LD AR |
Archives