summaryrefslogtreecommitdiff
path: root/package/nfs-utils
diff options
context:
space:
mode:
Diffstat (limited to 'package/nfs-utils')
-rw-r--r--package/nfs-utils/Makefile56
-rw-r--r--package/nfs-utils/files/nfs-utils.postinst2
-rw-r--r--package/nfs-utils/files/nfsd.init2
-rw-r--r--package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in66
-rw-r--r--package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c12
5 files changed, 114 insertions, 24 deletions
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 76c7e66cc..bb36d9a2b 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -5,32 +5,38 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= nfs-utils
PKG_VERSION:= 1.2.1
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= c3ccd16c147befd49fe4541a506dd177
PKG_DESCR:= Utilities for NFS kernel server implementation
PKG_SECTION:= net
-PKG_DEPENDS:= portmap libtirpc
-PKG_BUILDDEP+= libtirpc
+PKG_DEPENDS:= kmod-nfsd
+
ifeq (${ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS},y)
+PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom-err libgssglue
PKG_BUILDDEP+= libnfsidmap krb5 libevent libgssglue librpcsecgss
endif
+
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y)
+PKG_DEPENDS+= libtirpc rpcbind
+PKG_BUILDDEP+= libtirpc rpcbind
+else
+PKG_DEPENDS:= portmap
+endif
+
PKG_URL:= http://sourceforge.net/projects/nfs
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
-PKG_FLAVOURS:= WITH_KERBEROS
+PKG_FLAVOURS:= WITH_KERBEROS WITH_TIRPC
PKGFD_WITH_KERBEROS:= enable Kerberos support (MIT)
+PKGFD_WITH_TIRPC:= enable Transport Independent RPC
include ${TOPDIR}/mk/package.mk
-ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
-PKG_DEPENDS+= krb5-libs libevent libnfsidmap librpcsecgss libcom-err libgssglue
-endif
-
$(eval $(call PKG_template,NFS_UTILS,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-TCPPFLAGS+= -I${LINUX_DIR}/include
+#TCPPFLAGS+= -I${LINUX_DIR}/include
ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
CONFIGURE_ARGS+= --enable-nfsv4 \
@@ -42,11 +48,16 @@ CONFIGURE_ARGS+= --disable-nfsv4 \
--disable-gss
endif
+ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y)
+CONFIGURE_ARGS+= --enable-tirpc \
+ --with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc
+else
+CONFIGURE_ARGS+= --disable-tirpc
+endif
+
CONFIGURE_ENV+= knfsd_cv_bsd_signals=no \
ac_cv_lib_nsl_gethostbyname=no
CONFIGURE_ARGS+= --without-tcp-wrappers \
- --enable-tirpc \
- --with-tirpcinclude=${STAGING_DIR}/usr/include/tirpc \
--disable-uuid
CONFIGURE_STYLE:= gnu
@@ -54,20 +65,23 @@ BUILD_STYLE:= auto
INSTALL_STYLE:= auto
post-install:
- ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin
- ${INSTALL_DIR} ${IDIR_NFS_UTILS}/etc
+ ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin ${IDIR_NFS_UTILS}/etc
${INSTALL_DATA} ./files/rpc ${IDIR_NFS_UTILS}/etc
- ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs ${IDIR_NFS_UTILS}/usr/sbin/
- ${INSTALL_DIR} ${IDIR_NFS_UTILS}/usr/sbin
+ ${INSTALL_BIN} ${WRKBUILD}/utils/exportfs/exportfs \
+ ${IDIR_NFS_UTILS}/usr/sbin/
${INSTALL_DATA} ./files/nfsd.exports ${IDIR_NFS_UTILS}/etc/exports
- ${INSTALL_BIN} ${WRKBUILD}/utils/statd/statd ${IDIR_NFS_UTILS}/usr/sbin/
- ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd ${IDIR_NFS_UTILS}/usr/sbin/
- ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd ${IDIR_NFS_UTILS}/usr/sbin/
+ ${INSTALL_BIN} ${WRKBUILD}/utils/nfsd/nfsd \
+ ${IDIR_NFS_UTILS}/usr/sbin/
+ ${INSTALL_BIN} ${WRKBUILD}/utils/mountd/mountd \
+ ${IDIR_NFS_UTILS}/usr/sbin/
ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_KERBEROS),y)
${INSTALL_DATA} ./files/idmapd.conf ${IDIR_NFS_UTILS}/etc
- ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd ${IDIR_NFS_UTILS}/usr/sbin/
- ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd ${IDIR_NFS_UTILS}/usr/sbin/
- ${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd ${IDIR_NFS_UTILS}/usr/sbin/
+ ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/gssd \
+ ${IDIR_NFS_UTILS}/usr/sbin/
+ ${INSTALL_BIN} ${WRKBUILD}/utils/gssd/svcgssd \
+ ${IDIR_NFS_UTILS}/usr/sbin/
+ ${INSTALL_BIN} ${WRKBUILD}/utils/idmapd/idmapd \
+ ${IDIR_NFS_UTILS}/usr/sbin/
endif
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nfs-utils/files/nfs-utils.postinst b/package/nfs-utils/files/nfs-utils.postinst
index bfb7481d0..131ed1608 100644
--- a/package/nfs-utils/files/nfs-utils.postinst
+++ b/package/nfs-utils/files/nfs-utils.postinst
@@ -2,7 +2,7 @@
. $IPKG_INSTROOT/etc/functions.sh
add_rcconf "kernel nfs server" nfs_server NO
add_rcconf "kernel nfs server version" nfs_server_version 3
-add_service nfs 2049/tdp
+add_service nfs 2049/tcp
add_service nfs 2049/udp
gid=$(get_next_gid)
add_group nfs $gid
diff --git a/package/nfs-utils/files/nfsd.init b/package/nfs-utils/files/nfsd.init
index 9379d6a39..8d438e219 100644
--- a/package/nfs-utils/files/nfsd.init
+++ b/package/nfs-utils/files/nfsd.init
@@ -21,7 +21,6 @@ start)
/usr/sbin/exportfs -r
/usr/sbin/mountd
/usr/sbin/nfsd
- /usr/sbin/statd
if [ ${nfs_server_version} -eq 4 ];then
mkdir -p /var/lib/nfs/rpc_pipefs
mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
@@ -32,7 +31,6 @@ start)
stop)
pkill nfsd
pkill mountd
- pkill statd
if [ ${nfs_server_version} -eq 4 ];then
pkill idmapd
pkill svcgssd
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
new file mode 100644
index 000000000..16af3373b
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in
@@ -0,0 +1,66 @@
+--- nfs-utils-1.2.1.orig/tools/rpcgen/Makefile.in 2009-11-04 12:15:52.000000000 +0100
++++ nfs-utils-1.2.1/tools/rpcgen/Makefile.in 2010-01-16 11:01:44.015625000 +0100
+@@ -66,21 +66,21 @@ am_rpcgen_OBJECTS = rpcgen-rpc_clntout.$
+ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS)
+ rpcgen_LDADD = $(LDADD)
+ rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \
+- $(rpcgen_LDFLAGS) $(LDFLAGS) -o $@
++ --mode=link $(CCLD) $(rpcgen_CFLAGS) \
++ $(rpcgen_LDFLAGS) -o $@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/support/include
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CFLAGS) $(HOSTCFLAGS)
+ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+- $(LDFLAGS) -o $@
++ --mode=link $(CCLD) $(AM_CFLAGS) $(HOSTCFLAGS) \
++ -o $@
+ SOURCES = $(rpcgen_SOURCES)
+ DIST_SOURCES = $(rpcgen_SOURCES)
+ ETAGS = etags
+@@ -100,10 +100,10 @@ AWK = @AWK@
+ CC = $(CC_FOR_BUILD)
+ CCDEPMODE = @CCDEPMODE@
+ CC_FOR_BUILD = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS@
++CFLAGS =
+ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
+ CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
++CPPFLAGS =
+ CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+@@ -136,10 +136,10 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
+ K5VERS = @K5VERS@
+ KRBCFLAGS = @KRBCFLAGS@
+ KRBDIR = @KRBDIR@
+-KRBLDFLAGS = @KRBLDFLAGS@
++KRBLDFLAGS =
+ KRBLIBS = @KRBLIBS@
+ LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS =
+ LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
+ LIBBLKID = @LIBBLKID@
+ LIBBSD = @LIBBSD@
+@@ -299,7 +299,7 @@ clean-noinstPROGRAMS:
+ rm -f $$list
+ rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES)
+ @rm -f rpcgen$(EXEEXT)
+- $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS)
++ $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
new file mode 100644
index 000000000..5bc54e758
--- /dev/null
+++ b/package/nfs-utils/patches/patch-tools_rpcgen_rpc_main_c
@@ -0,0 +1,12 @@
+--- nfs-utils-1.2.1.orig/tools/rpcgen/rpc_main.c 2009-11-04 12:13:56.000000000 +0100
++++ nfs-utils-1.2.1/tools/rpcgen/rpc_main.c 2010-01-16 11:22:02.359375000 +0100
+@@ -562,9 +562,6 @@ s_output(int argc, char **argv, char *in
+ f_print(fout, "#include <sys/types.h>\n");
+
+ f_print(fout, "#include <memory.h>\n");
+-#ifndef linux
+- f_print(fout, "#include <stropts.h>\n");
+-#endif
+ if (inetdflag || !tirpcflag ) {
+ f_print(fout, "#include <sys/socket.h>\n");
+ f_print(fout, "#include <netinet/in.h>\n");
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-25 09:56:04 +0000