diff --git a/package/base/nfs-utils/nfs-utils-gcc4.patch b/package/base/nfs-utils/nfs-utils-gcc4.patch deleted file mode 100644 index 31fcc6044..000000000 --- a/package/base/nfs-utils/nfs-utils-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./support/rpc/svc_auth_gss.c.vanilla 2005-12-22 15:27:37.000000000 +0100 -+++ ./support/rpc/svc_auth_gss.c 2005-12-22 15:30:28.000000000 +0100 -@@ -382,7 +382,7 @@ - return (AUTH_FAILED); - } - auth->svc_ah_ops = &svc_auth_gss_ops; -- SVCAUTH_PRIVATE(auth) = gd; -+ auth = gd; - rqst->rq_xprt->xp_auth = auth; - } - else gd = SVCAUTH_PRIVATE(rqst->rq_xprt->xp_auth); diff --git a/package/base/nfs-utils/nfs-utils.conf b/package/base/nfs-utils/nfs-utils.conf index 87ed4289e..41fbe5a06 100644 --- a/package/base/nfs-utils/nfs-utils.conf +++ b/package/base/nfs-utils/nfs-utils.conf @@ -25,5 +25,5 @@ hook_add postmake 3 "install_init knfsd $confdir/nfsd.init" hook_add postmake 4 "cp -avf $confdir/exports $root/etc/" var_append configprefix " " 'CFLAGS="-I$pkg_openldap_prefix/include"' -var_append configprefix " " 'LDFLAGS="-L$pkg_openldap_prefix/lib -lldap"' +var_append configprefix " " 'LDFLAGS="-L$pkg_openldap_prefix/lib -Wl,-rpath-link,$pkg_openldap_prefix/lib -lldap"' diff --git a/package/base/nfs-utils/nfs-utils.desc b/package/base/nfs-utils/nfs-utils.desc index af6d84fd4..41b6610f5 100644 --- a/package/base/nfs-utils/nfs-utils.desc +++ b/package/base/nfs-utils/nfs-utils.desc @@ -40,8 +40,8 @@ [L] GPL [S] Stable -[V] 1.0.7 +[V] 1.1.0 [P] X -?---5---9 190.500 -[D] 2394368942 nfs-utils-1.0.7.tar.gz http://dl.sourceforge.net/sourceforge/nfs/ +[D] 824029558 nfs-utils-1.1.0.tar.gz http://dl.sourceforge.net/sourceforge/nfs/ diff --git a/package/base/nfs-utils/utsrelease.patch b/package/base/nfs-utils/utsrelease.patch deleted file mode 100644 index f7061c5d2..000000000 --- a/package/base/nfs-utils/utsrelease.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./tools/getkversion/getkversion.c.orig 2007-05-23 19:32:18.000000000 +0200 -+++ ./tools/getkversion/getkversion.c 2007-05-23 19:32:26.000000000 +0200 -@@ -12,6 +12,9 @@ - int - main(void) /* This is for Dan Popp ;) */ - { -- printf("%s\n", UTS_RELEASE); -+ int a = LINUX_VERSION_CODE >> 16; -+ int b = (LINUX_VERSION_CODE & 0xff00) >> 8; -+ int c = LINUX_VERSION_CODE & 0xff; -+ printf("%d.%d.%d\n", a, b, c); - return 0; - } diff --git a/package/base/util-linux/no-man5-nfs.patch b/package/base/util-linux/no-man5-nfs.patch new file mode 100644 index 000000000..03b6695bc --- /dev/null +++ b/package/base/util-linux/no-man5-nfs.patch @@ -0,0 +1,11 @@ +--- ./mount/Makefile.orig 2007-05-25 19:58:22.000000000 +0000 ++++ ./mount/Makefile 2007-05-25 19:58:33.000000000 +0000 +@@ -12,7 +12,7 @@ + + SUID_PROGS = mount umount + NOSUID_PROGS = swapon losetup +-MAN5 = fstab.5 nfs.5 ++MAN5 = fstab.5 + MAN8 = mount.8 swapoff.8 swapon.8 umount.8 losetup.8 + + ifeq "$(HAVE_PIVOT_ROOT)" "yes"