diff --git a/net/nfs-kernel-server/Makefile b/net/nfs-kernel-server/Makefile index 2efedcd9a..fcf6e44e2 100644 --- a/net/nfs-kernel-server/Makefile +++ b/net/nfs-kernel-server/Makefile @@ -7,9 +7,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nfs-kernel-server -PKG_VERSION:=1.2.5 -PKG_RELEASE:=2 -PKG_MD5SUM:=8395ac770720b83c5c469f88306d7765 +PKG_VERSION:=1.2.6 +PKG_RELEASE:=1 +PKG_MD5SUM:=8be543ca270c2234ff18f8c8d35e0d37 PKG_SOURCE_URL:=@SF/nfs PKG_SOURCE:=nfs-utils-$(PKG_VERSION).tar.bz2 @@ -76,7 +76,9 @@ CONFIGURE_ARGS += \ --disable-nfsv41 \ --enable-static \ --enable-shared \ - --disable-caps + --disable-caps \ + --disable-tirpc \ + --disable-nfsdcld MAKE_FLAGS += \ OPT="$(TARGET_CFLAGS)" \ diff --git a/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch b/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch index 221f25f55..09aa65e5a 100644 --- a/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch +++ b/net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch @@ -31,7 +31,7 @@ ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, --- a/utils/mountd/cache.c +++ b/utils/mountd/cache.c -@@ -162,6 +162,7 @@ static void auth_unix_gid(FILE *f) +@@ -168,6 +168,7 @@ static void auth_unix_gid(FILE *f) pw = getpwuid(uid); if (!pw) rv = -1; @@ -39,7 +39,7 @@ else { rv = getgrouplist(pw->pw_name, pw->pw_gid, groups, &ngroups); if (rv == -1 && ngroups >= groups_len) { -@@ -176,6 +177,7 @@ static void auth_unix_gid(FILE *f) +@@ -182,6 +183,7 @@ static void auth_unix_gid(FILE *f) } } } diff --git a/net/nfs-kernel-server/patches/200-configure.patch b/net/nfs-kernel-server/patches/200-configure.patch new file mode 100644 index 000000000..65208e47f --- /dev/null +++ b/net/nfs-kernel-server/patches/200-configure.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -868,6 +868,8 @@ RPCSECGSS_LIBS' + + + # Initialize some variables set by options. ++CONFIG_SQLITE3_TRUE='#' ++CONFIG_NFSDCLD_TRUE='#' + ac_init_help= + ac_init_version=false + ac_unrecognized_opts= diff --git a/net/nfs-kernel-server/patches/300-osd_login-install.patch b/net/nfs-kernel-server/patches/300-osd_login-install.patch new file mode 100644 index 000000000..749443fbb --- /dev/null +++ b/net/nfs-kernel-server/patches/300-osd_login-install.patch @@ -0,0 +1,10 @@ +--- a/utils/osd_login/Makefile.in ++++ b/utils/osd_login/Makefile.in +@@ -426,6 +426,7 @@ uninstall-am: + all-local: $(OSD_LOGIN_FILES) + + install-data-hook: ++ mkdir -p $(DESTDIR)/sbin + $(INSTALL) --mode 755 osd_login $(DESTDIR)/sbin/osd_login + + # Tell versions [3.59,3.63) of GNU make to not export all variables.