diff --git a/net-fs/ncpfs/Manifest b/net-fs/ncpfs/Manifest index 2490a85b..609e822f 100644 --- a/net-fs/ncpfs/Manifest +++ b/net-fs/ncpfs/Manifest @@ -1,4 +1,3 @@ -AUX ncpfs-2.2.5-php.patch 559 BLAKE2B eb696360cf1ed7610c8349f3ed7796a81f3ce5f464dbd66e16cba7ce0414710d51cd772df3ef367fdb2fee144a30c7a01b2284237a4ba8ffc8866798f1072748 SHA512 1c8509216b759df915f046c42dbb8a56d101ef9382f22f7830c089fc4f4310c75291c3984c1f079fe7b23f94717debb272c7d2b166619d415ea9df87168a52ca AUX ncpfs-2.2.6-align-fix.patch 421 BLAKE2B 6c701b37f0ed63014cbd0553189610c8bac9863721a764e6459bc405fe1a175bf4e388e3198d3b5511a2e08eb11691e6a7794af5971ed209ef5c1a6ef4aff468 SHA512 cf76a9866926048a0792e315c1296cb144432f8d576d9e7d68004f5eb7e10a19ff097ea4d450d2f36da05d97650f1a3411cb6a45bd88b44f6050d5b6df254528 AUX ncpfs-2.2.6-drop-kernel-check.patch 728 BLAKE2B 562d33007d23f8b2792b7d3e4f77187fab364f1107c723cbf6ae8ab8698b83f4a06d18cdeb0642afff3caa5c6ff1d0c03d40c28898fa9ffcd1498736127d0219 SHA512 6433bd1df6e9d830b0e23882dd4d00afddbd9780d994de0ca480155d817e077b88ae7f46538855631e14a62cc52ec8c1fc5c230b1b64687ada5f2cccb61e392a AUX ncpfs-2.2.6-drop-mtab-support.patch 7196 BLAKE2B 2f932599c5dea7c071c6d29f00dd2a88bc0e961ad435b3dc3a59153e8e2643f94ccedeced389a3f73648dfe1b527c3299866a51e1ed9727941bb93a0f88a2add SHA512 a7498d8927c251f882f5d63c2250a8ef2ec72191531bd95bdd1c65aad1f8600602dd2ae54fc0ed6ca95c431fe330168abe972d3d3acad8e71733dde1452eed0b @@ -13,14 +12,14 @@ AUX ncpfs-2.2.6-missing-includes.patch 758 BLAKE2B dd250f53198444500f15faad84b2a AUX ncpfs-2.2.6-multiple-vulns.patch 14138 BLAKE2B 6f612b14d194b595a8c5baa5cd1e5a6af9e43873a3b437d004c212934ac2f0bbc638abe8bf0d7aef91c8d5084e2514f03bb9c0999e57dcc6bf210b7bf1cc3a8e SHA512 a58a3d5f4ff7540a880e064bfe7602d38671ddd737bc8e4a9e48ef52f0864de8e0ae51f0fea2ae0be82cc6910d4a47ff8562f9a730dd1930a37fd870bc2823c9 AUX ncpfs-2.2.6-no-suid-root.patch 544 BLAKE2B 7e5b15d524cba691cd5266d2eaaf579c2180d870235254c8a77caa07e9c72dee36b6215a5681eef16e1a30274862d6bab01b2ca824571de3ac39ecd863c84364 SHA512 697d577aab12c94cbdb36c2f9f2cd51b82e3ab5efb4a9e8246a7c93b7004d004e7d4fdb1ec003585daf1a11f9f559fd65ea86fe8933f2a7d89b0ce810f21c975 AUX ncpfs-2.2.6-pam_ncp_auth-fix.patch 556 BLAKE2B 66289abdd6b8adc0a53538365c03f30eda980c3eaeaf2c6d7105757b3bdb69c3a53d7b12bc7a06dc9d1f91bcdfbcdd81b4e027fdd5054979aaf872851ac8b148 SHA512 3c20c36bb2b8c72440e359bb3f66d5a91bc91132accc518bae8db0fbc77aaf966e676f494c8add959178e315513aaddc9f627a05b9e0c376cf7ece5bba0b0dde -AUX ncpfs-2.2.6-php-install-root.patch 494 BLAKE2B 6010f85cabef7b6f736cc9512147c42fce3be53d66ce2885a8f9cf1450fe5aeaecc1e5528f3028b1052c3b173b9e6275b10643ac6e5ae53d94bd8fc85dce652e SHA512 e867d2782166b49226ab4377d9a8ab251e0b69db832d47d0a634c1c1e0850d3a651d92aece95494552635a22548c515972b03ab6ff52ab821a113257ba128e34 +AUX ncpfs-2.2.6-php-install-root.patch 479 BLAKE2B 6d7aa6c8dfbace020b933a3c23d594ff6b98f3c01a1aed2aed499c2f54c8321c932058c4b588b1638bb6bb7bb658a0c5ee8e7c48e3d7a2a7c237ccac126ef71a SHA512 9038d701583157591109cfec8c10bfae5df20f5d8af6f9eafdd4c103169d6c00f9018eaf11fa14d5acaa61ec25f217d3b09222dea3eb659cd820c964e6a3d699 AUX ncpfs-2.2.6-php5x.patch 400 BLAKE2B 14147adf99435c144f3d1ed221e9d6796a2ce493423556ff8abe34e6527e5d3b86f5cfc14de1a97dc26732c88fa3705e4fa50649ad6c885f635617360266df4f SHA512 893d90e60b3ace99080ba0ae343c6dcab2ecaad9e2b6bb1082b63190833e1b3b3aa398efc204d5161517b6737b2b6fe8407e148da01ecb0a5f5c71ce3b83d35e +AUX ncpfs-2.2.6-php_auth_nds-php8.patch 9935 BLAKE2B 22e0105a8d09713dd054cebcaa1455d01433aa5176b7a21757aaec3a4902e888a1b9d1e25561530a93cf43e0efe7824c4439a9191011ff037ba5bfd639b1c655 SHA512 5430eb4162bc1c46ed41ec6185c4934ae0fb67387a3c2f4f3080cb8a457903366259180715fe720ec562b792864de6706bf10160e9f5de4a357c6e1c95bad800 AUX ncpfs-2.2.6-remove-libncp_atomic-header.patch 572 BLAKE2B 17d8bf08a9cfa63a0ace4f9f3a7983ec70a7c5ed3ad5d83a61383408c8b350a0f25368bb271658a4ac7e26ed0f2ea62d82322a55d4e02f6f0d8d3b6e995367cf SHA512 07689c979e8e6a40aca410ac8211c6af9fa640679c34ab3431e70c849e9f3c42d26b204310a697ef1494f33b5296e642b977dfc56453f680527ee54d697abe1c AUX ncpfs-2.2.6-remove-packed-attrib.patch 10312 BLAKE2B 9fe98d402ec9e4435128ff903c6cf6eec7144cfa5ba75b1732707e5f50bcdd12ce693cb156d6a1d7c90b947ab52380bd1ff6d1ba44b282cb0f68319838030aa7 SHA512 efd11c2cf08f3b7b1458b836ee863f31e3ae470986a02a3d2db0ec6fbb7a984e2d33643765d7223b797732d80187412a907a9ca971233eb0f95ed4744ef6f44a AUX ncpfs-2.2.6-servername-array-fix.patch 523 BLAKE2B 6cf9c27ae7bda17722a74f550beb8a2f027517db264a4f895977c05b78609cf818d88fa79e2264a99e99ea09e6de626eb209c394d286b9cae84fd4636db3de47 SHA512 10c8a0b7c6d715018acf77ea3bcca2e50add48d479cc0ee07035f3f8fb910069c2c508a25ab3de945ef19c78add6d8192f0cb484e756d9a15ceb3afcd8195a69 AUX ncpfs-2.2.6-usr-merge.patch 514 BLAKE2B 44873b8731d062b2fe802f9ecc145509d12625be4e62b1025738a6076cb003d5577c2d5c21e338ff5fade6e0bea844a254509287a82aabc0bb92db20b0c7ec5d SHA512 cf05a0b2e41c45a8215bf1b150b79a16cdaa040c4e41ab6f361fffaa2a937fb792b464b1a9b49ecde18ae5df8e58e1887b1e965ff39adf1f05a2418f89efca11 AUX ncpfs-2.2.6-zend_function_entry.patch 296 BLAKE2B 3bb6db87517e0fb086e95462e9b567628ede7fbeef77b5d6e101dec8a316f2a5185cad8846bbaf37dada789acfedf6f6bbc75dafa92f3eb140cfde4eb038e1eb SHA512 c96723a840cb1b0cdddb91ebe74620b87a32350be084f21b741bda4e399a7648fd00522e9f2ec8404d5a98835d3f5a343dd588f4279848cc031de5bed01680e0 -AUX php_auth_nds-php8.patch 9935 BLAKE2B 22e0105a8d09713dd054cebcaa1455d01433aa5176b7a21757aaec3a4902e888a1b9d1e25561530a93cf43e0efe7824c4439a9191011ff037ba5bfd639b1c655 SHA512 5430eb4162bc1c46ed41ec6185c4934ae0fb67387a3c2f4f3080cb8a457903366259180715fe720ec562b792864de6706bf10160e9f5de4a357c6e1c95bad800 AUX php_auth_nds.fixed.c 29651 BLAKE2B 6b0e6b56547d152c6e9cc327374d1b492c912bca85e87fca6b5e244d61cb09f71cb0e8dcaf0f9bb6d7224132842c3a2cfe4170c67d0035c0e0ddd5e80e7ec83f SHA512 78dbe6b636281ac6540cce996b8983fdd9d689781c984555eb09b95f479467326f82d8d164618f5a210a89c817ac8cbd13ca79afa1b11be3ea721703eceba62c DIST ncpfs-2.2.6.tar.gz 2100545 BLAKE2B b95c8c0b097227c7b9e526e978efdca2234cdd0833468be99abaa68b0feba09794be26ebcb3a1c3371bc99f6c9d007eee164fa5f918aaee3eca44aeb1420211f SHA512 51f85eaae85deb66cea2ff434974699f6aa45ed1ed75217ef6176ac0b7d0f9f1c4fb186afc64c1b495474d5bad9ac7614033128c0bec39c05de723a9b29c8602 -EBUILD ncpfs-2.2.6-r5.ebuild 2981 BLAKE2B 5f95c7ba00a5deea0db38569ddbdffb56707839495ebcb3d5e3266518fd2453a0569e3a4dd4b6997b436db0d0a69cd24c89278f756316eafbbdecbfe5eb98429 SHA512 e9d9661465509a9864e93581eec8126d1000db94c5661f6337bb5716d154e39ebe9815327dcb9a578ec764c6b81bd526e73332ea1b1a68446d60652618b6b8c8 +EBUILD ncpfs-2.2.6-r5.ebuild 2985 BLAKE2B 4440b4336f6cc88bed084104cb438f8b19b63e89c84f7747eaac501a47eb6e053d72d212fc77914a2273862e3f03d83b14edd9d12ea5485774fe775eb5084ee9 SHA512 82f27d1e03bca4511dd6baccf87e40b01a81b637a61db46f52a3efc8861924751aaa569eff4b71d932364f2487971c29a24ea62b8f115b30b0045163e3064174 diff --git a/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch b/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch deleted file mode 100644 index 81908acd..00000000 --- a/net-fs/ncpfs/files/ncpfs-2.2.5-php.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/contrib/php/build/rules.mk.orig 2004-12-09 13:01:04.417854240 +0000 -+++ b/contrib/php/build/rules.mk 2004-12-09 13:01:42.460070944 +0000 -@@ -63,10 +63,10 @@ - - install-modules: - @test -d modules && \ -- $(mkinstalldirs) $(moduledir) && \ -- echo "installing shared modules into $(moduledir)" && \ -+ $(mkinstalldirs) $(DESTDIR)/$(moduledir) && \ -+ echo "installing shared modules into $(DESTDIR)/$(moduledir)" && \ - rm -f modules/*.la && \ -- cp modules/* $(moduledir) || true -+ cp modules/* $(DESTDIR)/$(moduledir) || true - - include $(builddir)/.deps - diff --git a/net-fs/ncpfs/files/ncpfs-2.2.6-php-install-root.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-php-install-root.patch index 79b380e2..190eb428 100644 --- a/net-fs/ncpfs/files/ncpfs-2.2.6-php-install-root.patch +++ b/net-fs/ncpfs/files/ncpfs-2.2.6-php-install-root.patch @@ -6,11 +6,11 @@ @test -d modules && \ - $(mkinstalldirs) $(moduledir) && \ - echo "installing shared modules into $(moduledir)" && \ -+ $(mkinstalldirs) $(INSTALL_ROOT)$(moduledir) && \ -+ echo "installing shared modules into $(INSTALL_ROOT)$(moduledir)" && \ ++ $(mkinstalldirs) $(DESTDIR)$(moduledir) && \ ++ echo "installing shared modules into $(DESTDIR)$(moduledir)" && \ rm -f modules/*.la && \ - cp modules/* $(moduledir) || true -+ cp modules/* $(INSTALL_ROOT)$(moduledir) || true ++ cp modules/* $(DESTDIR)$(moduledir) || true include $(builddir)/.deps diff --git a/net-fs/ncpfs/files/php_auth_nds-php8.patch b/net-fs/ncpfs/files/ncpfs-2.2.6-php_auth_nds-php8.patch similarity index 100% rename from net-fs/ncpfs/files/php_auth_nds-php8.patch rename to net-fs/ncpfs/files/ncpfs-2.2.6-php_auth_nds-php8.patch diff --git a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild index 0a040efb..76cefdaf 100644 --- a/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild +++ b/net-fs/ncpfs/ncpfs-2.2.6-r5.ebuild @@ -67,8 +67,7 @@ PATCHES=( "${FILESDIR}"/${P}-fix-build-with-gcc14.patch "${FILESDIR}"/${P}-php5x.patch - - "${FILESDIR}"/php_auth_nds-php8.patch + "${FILESDIR}"/${P}-php_auth_nds-php8.patch "${FILESDIR}"/${P}-php-install-root.patch )