From 4187bba080530c5ca1c7dae9c233e88f3fc8f535 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 6 Jul 2024 08:06:16 +0100 Subject: gentoo auto-resync : 06:07:2024 - 08:06:15 --- net-libs/xrootd/Manifest | 2 - net-libs/xrootd/files/xrootd-4.8.3-crc32.patch | 58 ---------------------- .../files/xrootd-5.4.3-cmake_no_python.patch | 15 ------ 3 files changed, 75 deletions(-) delete mode 100644 net-libs/xrootd/files/xrootd-4.8.3-crc32.patch delete mode 100644 net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch (limited to 'net-libs/xrootd') diff --git a/net-libs/xrootd/Manifest b/net-libs/xrootd/Manifest index f78fff01b942..a8ac2de8c413 100644 --- a/net-libs/xrootd/Manifest +++ b/net-libs/xrootd/Manifest @@ -1,8 +1,6 @@ AUX cmsd.initd 885 BLAKE2B 9198afa01850da74519a6869894ebd86313f87781e3e2401d429e5e05a938a19a583feca808f78c4b497fd459a8adaece01d0482b132646033575cd50ad5b1b7 SHA512 7f666e98634b205964d69fd540fb79c7ff3b6f1b423ed416a966d1e0d6a18d950908e1dc463e3cc8029fc062b2ff7d29693af8e5af2fb13a36500d40b16345e9 AUX frm_purged.initd 895 BLAKE2B c192a3c69d3161a8342242789cfc1559f189c0748cd0bdd1ee6baf9b5ba98c80d8103fa55344e1c9b040a513045c7a473272da46c800ff2afa45a0665a93c3b2 SHA512 f9c09f8baae7ed391d5248f5dfb7a1d4d60f23605b2646e6f3c2ec33b05838918a4ba4874424e9b4e674f1ca127d57760364552f6f948dcd3ef84245730efc30 AUX frm_xfrd.initd 899 BLAKE2B bdfc83f7bbad7e0d7aea91720798c10367c7ac27851414b99013c01d4f9681e010082bfef332ba2cc520afdbef67051ea80ee6922e515a30de32e735f0a6c6a7 SHA512 1c38b20c9b54cab17706c040a90b00df61c9b2f5e4e7a9cc26fa3b125e1d132097222921b5627a33f69b80c8ae5a64cfbaea0a4880588de9fa9d18f6aaa04768 -AUX xrootd-4.8.3-crc32.patch 1987 BLAKE2B be57f7be2a897a2399f923e4670d219be79053221cc62ca0f6cf9b7abe6fae4f99dde0ccc72f6617bb07a871a396072db59aa57265382dab7928cbffdac1706e SHA512 4c390ed4329f21839ca2b481408c0114e5d4839cf0b04e673677e175c2e7e92573c9f56ec69660d4f5256c824676f65f9fb6c683d0e77d3b1f97bee7e5f65bc9 -AUX xrootd-5.4.3-cmake_no_python.patch 403 BLAKE2B 8e13c64de9bb8504dae8c309fccfb52a13bf5c86be40493272002437c8b5838c75badbdfc8eef3d04e7f62d15509dda138fcecfd4299794c73bbb92f4665182c SHA512 0d082f52a4c6fd0e569d6df9653065d1438a55c047edefbdb882465a6c83d66bca1c358e64e724a656595a2d1e453adaaa662915d74382508338f3d98e98e44e AUX xrootd-5.4.3-python_tests_py3.patch 4491 BLAKE2B 61e3eb0e10de6e746b1447c7a1df8d6345c9533e6285e21263f5e65f8d7c4a6e7d50eef56be48fb9ac88c4efaee488e6f90fe046cbd9b24ace322a8781a5ea5a SHA512 6b854907e1fa45b44492c5224eb977ac7b4682ad1a74319efdf3a9907b252a2bdfd9510fa942f253319b80fa25947b05e3ab2f92b23d7fc1be0282c248741c9d AUX xrootd.confd 651 BLAKE2B a35bf51b82334757dbd27bd48923e59f955361ab009c4b92eef83050d5d4e23904abc2b0b9577f8a5888c875c34bf736cf4072b6684a91ca6ad8cd90fe9a2ba9 SHA512 60ab5b6d77cf79437960044bf201127c8adf5134e7f61a18dcccd2e474a4e41eda971e3ada71dea987716080fb308af98a5237bab2a0b82f50f932ff59e3fdea AUX xrootd.initd 858 BLAKE2B 306970196c9f69db3f94c095c8518b837f5f4723a1cbae273273821e4d77d30a7fe65ac4fccbb640ad5e0b6f879e549dbbc4e799f87b5b5c813d66f2d270af2b SHA512 dcdb75341d904c9850c2bf97393ccbb68ad37b095e0a20ca4dab27b10dd7525874c8ad6e07e5b9c1f3c3566391a50c06dee70622d865fa51a7e73aa4096da955 diff --git a/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch b/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch deleted file mode 100644 index 9f27c4369880..000000000000 --- a/net-libs/xrootd/files/xrootd-4.8.3-crc32.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 64f81b7fad227097f5e135d25a5574cfecf4d50d Mon Sep 17 00:00:00 2001 -From: Guilherme Amadio -Date: Fri, 18 May 2018 11:30:58 +0200 -Subject: [PATCH] Remove declarations of crc32 and adler32 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These break compilation with the error below: - -xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc: - In function ‘int DoA32(const char*)’: -xrootd-4.8.3/tests/XrdSsiTests/XrdShMap.cc:418:34: - error: expected initializer before ‘OF’ -ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); - ^^ ---- - src/XrdSsi/XrdSsiShMam.cc | 2 +- - tests/XrdSsiTests/XrdShMap.cc | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/XrdSsi/XrdSsiShMam.cc b/src/XrdSsi/XrdSsiShMam.cc -index 013dc855..a4803d71 100644 ---- a/src/XrdSsi/XrdSsiShMam.cc -+++ b/src/XrdSsi/XrdSsiShMam.cc -@@ -882,7 +882,7 @@ bool XrdSsiShMam::GetItem(void *data, const char *key, int hash) - /******************************************************************************/ - - int XrdSsiShMam::HashVal(const char *key) --{ ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -+{ - uLong crc; - int hval, klen = strlen(key); - -diff --git a/tests/XrdSsiTests/XrdShMap.cc b/tests/XrdSsiTests/XrdShMap.cc -index bb642ac3..860fa7ad 100644 ---- a/tests/XrdSsiTests/XrdShMap.cc -+++ b/tests/XrdSsiTests/XrdShMap.cc -@@ -415,7 +415,6 @@ void Explain(const char *what) - - int DoA32(const char *buff) - { -- ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); - uLong adler = adler32(0L, Z_NULL, 0); - - // Check for ID request now -@@ -438,8 +437,6 @@ int DoA32(const char *buff) - - int DoC32(const char *buff) - { -- ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -- - // Check for ID request now - // - if (!buff) {int myID; memcpy(&myID, "c32 ", sizeof(int)); return myID;} --- -2.17.0 - diff --git a/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch b/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch deleted file mode 100644 index 04607cdd7b04..000000000000 --- a/net-libs/xrootd/files/xrootd-5.4.3-cmake_no_python.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/bindings/python/CMakeLists.txt -+++ b/bindings/python/CMakeLists.txt -@@ -32,6 +32,7 @@ - - configure_file(${SETUP_PY_IN} ${SETUP_PY}) - -+if (0) - string(FIND "${PIP_OPTIONS}" "--prefix" PIP_OPTIONS_PREFIX_POSITION) - if( "${PIP_OPTIONS_PREFIX_POSITION}" EQUAL "-1" ) - string(APPEND PIP_OPTIONS " --prefix \$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}") -@@ -100,3 +101,4 @@ - )" - ) - endif() -+endif() -- cgit v1.2.3