summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/Config.in1
-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/portmap/files/portmap.init2
-rw-r--r--package/portmap/files/portmap.postinst3
-rw-r--r--package/rpcbind/Makefile36
-rw-r--r--package/rpcbind/files/rpcbind.init28
-rw-r--r--package/rpcbind/files/rpcbind.postinst5
-rw-r--r--package/rpcbind/patches/patch-src_Makefile_in11
10 files changed, 121 insertions, 25 deletions
diff --git a/package/Config.in b/package/Config.in
index 41db9ecfd..c1db8eb17 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -445,6 +445,7 @@ source "package/pipacs/Config.in"
#source "package/pmacct/Config.in"
source "package/portmap/Config.in"
source "package/rarpd/Config.in"
+source "package/rpcbind/Config.in"
source "package/rrs/Config.in"
source "package/rsync/Config.in"
source "package/shat/Config.in"
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/portmap/files/portmap.init b/package/portmap/files/portmap.init
index a42c2e2e0..ad0c2b075 100644
--- a/package/portmap/files/portmap.init
+++ b/package/portmap/files/portmap.init
@@ -15,7 +15,7 @@ start)
portmap -t /tmp/.portmap
;;
stop)
- kill $(pidof portmap|cut -d ' ' -f 3)
+ pkill portmap
;;
restart)
sh $0 stop
diff --git a/package/portmap/files/portmap.postinst b/package/portmap/files/portmap.postinst
index 1017d2251..b8b30f45b 100644
--- a/package/portmap/files/portmap.postinst
+++ b/package/portmap/files/portmap.postinst
@@ -3,3 +3,6 @@
add_rcconf portmap
add_group portmap 20
add_user portmap 20 20 /tmp/.portmap
+add_service sunrpc 111/tcp
+add_service sunrpc 111/udp
+
diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile
new file mode 100644
index 000000000..6afd4b8bd
--- /dev/null
+++ b/package/rpcbind/Makefile
@@ -0,0 +1,36 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:= rpcbind
+PKG_VERSION:= 0.2.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 1a77ddb1aaea8099ab19c351eeb26316
+PKG_DESCR:= converts RPC program numbers into universal addresses
+PKG_SECTION:= net
+PKG_DEPENDS:= libtirpc
+PKG_BUILDDEP+= libtirpc
+PKG_URL:= http://sourceforge.net/projects/rpcbind/
+PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=rpcbind/}
+
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,RPCBIND,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+TCFLAGS+= -I${STAGING_DIR}/usr/include/tirpc
+CONFIGURE_STYLE:= gnu
+CONFIGURE_ARGS+= --disable-libwrap
+BUILD_STYLE:= auto
+INSTALL_STYLE:= auto
+
+post-install:
+ $(INSTALL_DIR) $(IDIR_RPCBIND)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/rpcbind \
+ $(IDIR_RPCBIND)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/rpcinfo \
+ $(IDIR_RPCBIND)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/rpcbind/files/rpcbind.init b/package/rpcbind/files/rpcbind.init
new file mode 100644
index 000000000..d11f01100
--- /dev/null
+++ b/package/rpcbind/files/rpcbind.init
@@ -0,0 +1,28 @@
+#!/bin/sh
+#PKG rpcbind
+#INIT 60
+
+. /etc/rc.conf
+
+case $1 in
+autostop) ;;
+autostart)
+ test x"${rpcbind:-NO}" = x"NO" && exit 0
+ exec sh $0 start
+ ;;
+start)
+ rpcbind
+ ;;
+stop)
+ pkill rpcbind
+ ;;
+restart)
+ sh $0 stop
+ sh $0 start
+ ;;
+*)
+ echo "Usage: $0 {start | stop | restart}"
+ exit 1
+ ;;
+esac
+exit $?
diff --git a/package/rpcbind/files/rpcbind.postinst b/package/rpcbind/files/rpcbind.postinst
new file mode 100644
index 000000000..7d26be995
--- /dev/null
+++ b/package/rpcbind/files/rpcbind.postinst
@@ -0,0 +1,5 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf rpcbind
+add_service rpcbind 111/tcp
+add_service rpcbind 111/udp
diff --git a/package/rpcbind/patches/patch-src_Makefile_in b/package/rpcbind/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..037bff1b3
--- /dev/null
+++ b/package/rpcbind/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- rpcbind-0.2.0.orig/src/Makefile.in 2009-05-29 18:37:50.000000000 +0200
++++ rpcbind-0.2.0/src/Makefile.in 2010-01-31 17:27:20.000000000 +0100
+@@ -207,7 +207,7 @@ rpcinfo_LDFLAGS = -lpthread -ltirpc
+ rpcinfo_LDADD = $(LIB_TIRPC)
+ rpcbind_LDFLAGS = -lpthread -ltirpc
+ rpcbind_LDADD = $(LIB_TIRPC)
+-AM_CPPFLAGS = -I/usr/include/tirpc -DCHECK_LOCAL -DPORTMAP \
++AM_CPPFLAGS = -DCHECK_LOCAL -DPORTMAP \
+ -DFACILITY=LOG_MAIL -DSEVERITY=LOG_INFO
+
+ all: config.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 16:05:49 +0000