From 0402144371df4e7d005524bc4340366c35b48eac Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 20 Apr 2026 12:40:31 +0200 Subject: [PATCH] add ipx back --- net-fs/ncpfs-modules/Manifest | 3 +- .../files/ncpfs-module-readd-ipx.patch | 30 ++++++++ .../ncpfs-modules/ncpfs-modules-9999.ebuild | 68 +++++++++++++------ 3 files changed, 79 insertions(+), 22 deletions(-) create mode 100644 net-fs/ncpfs-modules/files/ncpfs-module-readd-ipx.patch diff --git a/net-fs/ncpfs-modules/Manifest b/net-fs/ncpfs-modules/Manifest index 2e2b424e..0d82baf9 100644 --- a/net-fs/ncpfs-modules/Manifest +++ b/net-fs/ncpfs-modules/Manifest @@ -1 +1,2 @@ -EBUILD ncpfs-modules-9999.ebuild 1655 BLAKE2B 1f4f67119b1505fe5bb080ec868bcd255f591ddfe4b1ac14295a4093e9cd364207bb960cf94736316a2a782e8caad3a90517dc8a7a303a359e27ec5f4acf420f SHA512 773427fc68334594aeb428c64b840bc3009182c06d7299d2d0e31144fc141684cfed1f65e61cfe9a5d8e5dedad65f1040b407b48d6f3a3b71942d97e315e1212 +AUX ncpfs-module-readd-ipx.patch 1032 BLAKE2B b1f52480f1e15daff604b1dcc7f13cf63b1fa725b80ad11b4aec707a8cdec9425345f5ffcb045c6b6aa140a85dc25a90d1bb882799f223a8a3bc55742c580a4e SHA512 24b7e455e2c4e31c3bbbe4ac56c4ec774b9c971aa7754a82d94b7359fec9dfddb7a85c730626bd749377f1ecb1d0a765d8b58c4d503ede68bf736ab857e5462b +EBUILD ncpfs-modules-9999.ebuild 2393 BLAKE2B 79f073b1b6977bc42c892ce3ec13fcd264a61ab9fd4776a45516310882e88a880ad57b19fc1aa7fa6cdc188e1064039411131dbf59ce8834080360417ef97cf8 SHA512 807151d78d95dd2da5f983934469f0c2ff772e49cb1e7f021a6a4ed21f9a4dc0ec85818af564d49a6604636385784949a505691c386affc4210ba7448e05758f diff --git a/net-fs/ncpfs-modules/files/ncpfs-module-readd-ipx.patch b/net-fs/ncpfs-modules/files/ncpfs-module-readd-ipx.patch new file mode 100644 index 00000000..c3acca99 --- /dev/null +++ b/net-fs/ncpfs-modules/files/ncpfs-module-readd-ipx.patch @@ -0,0 +1,30 @@ +diff '--color=auto' -uNr ncpfs-modules-9999.orig/include/linux/ncp_fs.h ncpfs-modules-9999/include/linux/ncp_fs.h +--- ncpfs-modules-9999.orig/include/linux/ncp_fs.h 2026-04-20 11:30:29.324482309 +0200 ++++ ncpfs-modules-9999/include/linux/ncp_fs.h 2026-04-20 11:31:04.373149585 +0200 +@@ -14,6 +14,7 @@ + #include + #include + ++#include + #include + + /* +@@ -28,6 +29,7 @@ + + struct ncp_fs_info { + int version; ++ struct sockaddr_ipx addr; + __kernel_uid_t mounted_uid; + int connection; /* Connection number the server assigned us */ + int buffer_size; /* The negotiated buffer size, to be +diff '--color=auto' -uNr ncpfs-modules-9999.orig/sock.c ncpfs-modules-9999/sock.c +--- ncpfs-modules-9999.orig/sock.c 2026-04-20 11:30:29.324482309 +0200 ++++ ncpfs-modules-9999/sock.c 2026-04-20 11:31:33.605380049 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + diff --git a/net-fs/ncpfs-modules/ncpfs-modules-9999.ebuild b/net-fs/ncpfs-modules/ncpfs-modules-9999.ebuild index b6817d51..366fb792 100644 --- a/net-fs/ncpfs-modules/ncpfs-modules-9999.ebuild +++ b/net-fs/ncpfs-modules/ncpfs-modules-9999.ebuild @@ -6,73 +6,99 @@ EAPI=8 inherit git-r3 linux-info linux-mod-r1 DESCRIPTION="ncpfs kernel module for Linux 4.18+" -HOMEPAGE="https://github.com/EnzephaloN/ncpfs-module" -EGIT_REPO_URI="https://github.com/EnzephaloN/ncpfs-module.git" -# EGIT_REPO_URI="https://github.com/hundertzwei/ncpfs-module.git" -KEYWORDS="~amd64" +HOMEPAGE=" + https://github.com/EnzephaloN/ncpfs-module + https://github.com/pasis/ipx +" LICENSE="GPL-2" SLOT="0" +KEYWORDS="~amd64" CONFIG_CHECK="NET" +PATCHES=( + "${FILESDIR}/ncpfs-module-readd-ipx.patch" +) + +NCPFS_REPO_URI="https://github.com/EnzephaloN/ncpfs-module.git" +IPX_REPO_URI="https://github.com/pasis/ipx.git" + pkg_setup() { linux-mod-r1_pkg_setup } src_unpack() { + local ncpfs_branch="master" + if kernel_is gt 4 18 0; then - EGIT_BRANCH="kernel_4.19" + ncpfs_branch="kernel_4.19" fi if kernel_is gt 4 20 0; then - EGIT_BRANCH="kernel_4.20" + ncpfs_branch="kernel_4.20" fi if kernel_is gt 5 2 0; then - EGIT_BRANCH="kernel_5.2" + ncpfs_branch="kernel_5.2" fi if kernel_is gt 5 6 0; then - EGIT_BRANCH="kernel_5.6" + ncpfs_branch="kernel_5.6" fi if kernel_is gt 5 12 0; then - EGIT_BRANCH="kernel_5.12" + ncpfs_branch="kernel_5.12" fi if kernel_is gt 5 15 0; then - EGIT_BRANCH="kernel_5.15" + ncpfs_branch="kernel_5.15" fi if kernel_is gt 5 19 0; then - EGIT_BRANCH="kernel_5.19" + ncpfs_branch="kernel_5.19" fi if kernel_is gt 6 3 0; then - EGIT_BRANCH="kernel_6.3" + ncpfs_branch="kernel_6.3" fi if kernel_is gt 6 5 0; then - EGIT_BRANCH="kernel_6.5" + ncpfs_branch="kernel_6.5" fi if kernel_is gt 6 6 0; then - EGIT_BRANCH="kernel_6.6" + ncpfs_branch="kernel_6.6" fi if kernel_is gt 6 8 0; then - EGIT_BRANCH="kernel_6.8" + ncpfs_branch="kernel_6.8" fi if kernel_is gt 6 12 0; then - EGIT_BRANCH="kernel_6.12" + ncpfs_branch="kernel_6.12" fi if kernel_is gt 6 14 0; then - EGIT_BRANCH="kernel_6.14" + ncpfs_branch="kernel_6.14" fi if kernel_is gt 6 16 0; then - EGIT_BRANCH="master" + ncpfs_branch="master" fi - git-r3_src_unpack + git-r3_fetch "${NCPFS_REPO_URI}" "refs/heads/${ncpfs_branch}" "${PN}-ncpfs" || die + git-r3_checkout "${NCPFS_REPO_URI}" "${S}" "${PN}-ncpfs" || die + + git-r3_fetch "${IPX_REPO_URI}" "refs/heads/master" "${PN}-ipx" || die + git-r3_checkout "${IPX_REPO_URI}" "${WORKDIR}/ipx" "${PN}-ipx" || die +} + +src_prepare() { + default + + mkdir -p "${S}/linux" "${S}/net" || die + + cp "${WORKDIR}/ipx/linux/ipx.h" "${S}/linux/ipx.h" || die + cp "${WORKDIR}/ipx/net/ipx.h" "${S}/net/ipx.h" || die } src_compile() { local modlist=( - ncpfs=ncpfs:${S}:${S}:all + ncpfs=ncpfs:${S}:${S}:all ) - local modargs=( KDIR=${KV_OUT_DIR} M=${S} ) + local modargs=( + KDIR="${KV_OUT_DIR}" + M="${S}" + ) linux-mod-r1_src_compile }