gentoo auto-resync : 21:09:2022 - 05:25:18

4 files changed, 2 insertions, 80 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 634a8deada2b..96220106a635 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/xdp-tools/Manifest b/net-libs/xdp-tools/Manifest
index 79fe224151e7..31102a0b4e3b 100644
--- a/net-libs/xdp-tools/Manifest
+++ b/net-libs/xdp-tools/Manifest
@@ -1,4 +1,3 @@
-AUX xdp-tools-1.2.3-no-werror.patch 2594 BLAKE2B cadf223f0076131efbe69ca8af10b79ace8179dec1deaee45cb38e31f2215fb2c550e7102a99774bb575b9dc329c584915f0cc77e9dc7033f5ec6c244af41e27 SHA512 b3ee7a8e545d88f095f3896ce06751e1e9c1e2270cb2921df74efc0db3191ba8ead526b7108338ba57a28cfc48a56e05ebd5ec7f9fe73f0e8e4112239568aee7
-DIST xdp-tools-1.2.3.tar.gz 252515 BLAKE2B 26c1bfd5b6c3457794801db64d020b8d6eb254661a0a44fa89dde6a1ff7c04dec1207d38a755029c8caaa955cabec70f196e37257f337cf484b8e3525261119e SHA512 588cda7010592f34ac600993ea528b76be4a8786c1b4e4599c92c5683a80848a11ae90db825f56b67adec60bd8c684bb4ced21dc1bc1b750cbd5d0704d67390d
-EBUILD xdp-tools-1.2.3.ebuild 1317 BLAKE2B cd9f853de69c8dc4a6efdc154e2b89f8a6dccfe69db01879c8f5972fff03892dd833a270f4aba09c69bb6ae01dce1cb7d0107ee4ec0c7ad8a6a6096799368842 SHA512 173b2ee5a86b6e8ba5449356035c57bdca45c0003e39777f8b05ea630c58c2fe1d05bab4a63347882f24a3c4392cb70f8a3e54d1300008e98449fe0aa164d31e
+DIST xdp-tools-1.2.8.tar.gz 253786 BLAKE2B f745085b73da5193c3cdaf60c20dfa5de62f3d83487413c87b4c3d07b755dcf91cfbeb4ba970b4e04eef74b4cec4238057f4462074f49b7139d7652cb0f22998 SHA512 6ada9e433fcbefd13cebdffe93c3ce9159e9e09f1498d1615918ca6ecc4f11f03fcd9096980e8ceb7de126d4d8b953fa64917e777d54b5a3dfd1a9556de81626
+EBUILD xdp-tools-1.2.8.ebuild 1261 BLAKE2B 41ebbef1014c7730007c0765283cd8e34d66d75f99be846d762aada7045a5a72e23a0a02364eddd32f2d67b4baff54fdd97a70b585b3ced57cf3e3d91959bb1b SHA512 3cbbeae820d0cedfefc4c2b17f086dd86c55c39994606d6fe245c88e47eb6f9342474d3f0796db15b67d772e8734509cb900f202eb0cdcb618fecc040589294b
 MISC metadata.xml 448 BLAKE2B 5e76000a49c2578dc872010907deab803bf25d58e5383b81f8953f3ac8549f017895c7afa39a2b8c3eb47efb66c5c322177032542cdffec41de733502da41ce4 SHA512 4010fb44ad655a9c58e3328623652d2f6c10aee934daeaaa2c5738c44b086cc2674e011e5de0b6e6a058c24131a16be679e971a692800458492cf3addbd761c2
diff --git a/net-libs/xdp-tools/files/xdp-tools-1.2.3-no-werror.patch b/net-libs/xdp-tools/files/xdp-tools-1.2.3-no-werror.patch
deleted file mode 100644
index 6d7d7fd955a3..000000000000
--- a/net-libs/xdp-tools/files/xdp-tools-1.2.3-no-werror.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://bugs.gentoo.org/831339
-https://bugs.gentoo.org/846938
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -1,5 +1,5 @@
- 
--LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Werror -Wall) -fPIC
-+LIBBPF_CFLAGS:=$(if $(CFLAGS),$(CFLAGS),-g -O2 -Wall) -fPIC
- 
- LIB_DIR = .
- include defines.mk
---- a/lib/common.mk
-+++ b/lib/common.mk
-@@ -113,7 +113,6 @@ $(XDP_OBJ): %.o: %.c $(KERN_USER_H) $(EXTRA_DEPS) $(BPF_HEADERS) $(LIBMK)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
---- a/lib/defines.mk
-+++ b/lib/defines.mk
-@@ -39,7 +39,7 @@ endif
- 
- DEFINES += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- 
--CFLAGS += -std=gnu11 -Wextra -Werror $(DEFINES)
-+CFLAGS += -std=gnu11 -Wextra $(DEFINES)
- BPF_CFLAGS += $(DEFINES)
- 
- CONFIGMK := $(LIB_DIR)/../config.mk
---- a/lib/libxdp/Makefile
-+++ b/lib/libxdp/Makefile
-@@ -19,7 +19,7 @@ MAN_OBJ := ${MAN_PAGE:.3=.man}
- MAN_FILES := $(MAN_PAGE)
- TEST_DIR := tests
- TEST_FILE := $(TEST_DIR)/test-libxdp.sh
--TEST_CFLAGS := $(CFLAGS) -I$(realpath $(HEADER_DIR)) -L$(realpath $(OBJDIR)) -Wall -Werror $(LDFLAGS)
-+TEST_CFLAGS := $(CFLAGS) -I$(realpath $(HEADER_DIR)) -L$(realpath $(OBJDIR)) -Wall $(LDFLAGS)
- TEST_LDLIBS := $(LDLIBS)
- 
- SHARED_CFLAGS += -fPIC -DSHARED
-@@ -144,7 +144,6 @@ $(XDP_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK)
- 	    -Wno-unused-value \
- 	    -Wno-pointer-sign \
- 	    -Wno-compare-distinct-pointer-types \
--	    -Werror \
- 	    -O2 -emit-llvm -c -g -o ${@:.o=.ll} $<
- 	$(QUIET_LLC)$(LLC) -march=$(BPF_TARGET) -filetype=obj -o $@ ${@:.o=.ll}
- 
-diff --git a/configure b/configure
-index 0a17eae..fd251b7 100755
---- a/configure
-+++ b/configure
-@@ -186,7 +186,7 @@ int main(int argc, char **argv) {
-     return 0;
- }
- EOF
--    libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
-+    libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
-     if [ "$?" -eq "0" ]; then
-         echo "HAVE_FEATURES+=${config_var}" >>"$CONFIG"
-         echo "yes"
-@@ -254,7 +254,7 @@ int main(int argc, char **argv) {
- }
- EOF
- 
--        libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c -Werror $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
-+        libbpf_err=$($CC -o $TMPDIR/libbpftest $TMPDIR/libbpftest.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS 2>&1)
-         if [ "$?" -eq "0" ]; then
-             echo "SYSTEM_LIBBPF:=y" >>$CONFIG
-             echo "LIBBPF_VERSION=$LIBBPF_VERSION" >>$CONFIG
diff --git a/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild b/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild
index 4077d16404d0..0dd14f1dc39b 100644
--- a/net-libs/xdp-tools/xdp-tools-1.2.3.ebuild
+++ b/net-libs/xdp-tools/xdp-tools-1.2.8.ebuild
@@ -25,10 +25,6 @@ QA_PREBUILT="usr/lib/bpf/*.o"
 
 MAKEOPTS+=" V=1"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.3-no-werror.patch
-)
-
 src_configure() {
 	export PRODUCTION=1
 	export DYNAMIC_LIBXDP=1