diff options
| -rw-r--r-- | package/nfs-utils/Makefile | 11 | ||||
| -rw-r--r-- | package/nfs-utils/patches/patch-tools_Makefile_in | 10 | ||||
| -rw-r--r-- | package/nfs-utils/patches/patch-tools_locktest_Makefile_in | 47 | ||||
| -rw-r--r-- | package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in | 84 | ||||
| -rw-r--r-- | package/nfs-utils/patches/patch-utils_gssd_Makefile_in | 25 | ||||
| -rw-r--r-- | package/nfs-utils/patches/patch-utils_statd_simu_c | 10 |
6 files changed, 39 insertions, 148 deletions
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index 31cf3fc29..ac12a8662 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,19 +4,16 @@ include ${TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 1.2.8 -PKG_RELEASE:= 3 -PKG_MD5SUM:= fb48630b7c145fb9d6602a79c6eaab11 +PKG_VERSION:= 1.2.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 18869d16db3f49c053f8c68eba3fe2e0 PKG_DESCR:= Utilities for NFS kernel server implementation PKG_SECTION:= net/fs PKG_DEPENDS:= keyutils libtirpc rpcbind libdevmapper libpthread PKG_FDEPENDS:= $(PKG_DEPENDS) PKG_BUILDDEP:= keyutils libtirpc lvm PKG_URL:= http://sourceforge.net/projects/nfs -# as long as there are tar archives of nfs-utils with object files -# on some sourceforge mirrors -PKG_SITES:= http://openadk.org/distfiles/ -#PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=nfs/} PKG_LIBC_DEPENDS:= uclibc eglibc glibc diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in index cea868b4e..e0c95feb8 100644 --- a/package/nfs-utils/patches/patch-tools_Makefile_in +++ b/package/nfs-utils/patches/patch-tools_Makefile_in @@ -1,7 +1,7 @@ ---- nfs-utils-1.2.8.orig/tools/Makefile.in 2013-04-22 18:48:22.000000000 +0200 -+++ nfs-utils-1.2.8/tools/Makefile.in 2013-08-13 10:46:17.000000000 +0200 -@@ -95,7 +95,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE - distdir +--- nfs-utils-1.2.9.orig/tools/Makefile.in 2013-11-05 21:58:15.000000000 +0100 ++++ nfs-utils-1.2.9/tools/Makefile.in 2014-02-19 13:46:55.000000000 +0100 +@@ -156,7 +156,7 @@ am__define_uniq_tagged_files = \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcgen @@ -9,7 +9,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ -@@ -299,7 +299,7 @@ top_build_prefix = @top_build_prefix@ +@@ -361,7 +361,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ OPTDIRS = $(am__append_1) diff --git a/package/nfs-utils/patches/patch-tools_locktest_Makefile_in b/package/nfs-utils/patches/patch-tools_locktest_Makefile_in deleted file mode 100644 index 56d14b860..000000000 --- a/package/nfs-utils/patches/patch-tools_locktest_Makefile_in +++ /dev/null @@ -1,47 +0,0 @@ ---- nfs-utils-1.2.8.orig/tools/locktest/Makefile.in 2013-04-22 18:48:22.000000000 +0200 -+++ nfs-utils-1.2.8/tools/locktest/Makefile.in 2013-08-13 10:46:17.000000000 +0200 -@@ -81,20 +81,20 @@ am_testlk_OBJECTS = testlk-testlk.$(OBJE - testlk_OBJECTS = $(am_testlk_OBJECTS) - testlk_LDADD = $(LDADD) - testlk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(testlk_CFLAGS) $(CFLAGS) \ -- $(testlk_LDFLAGS) $(LDFLAGS) -o $@ -+ --mode=link $(CCLD) $(testlk_CFLAGS) \ -+ $(testlk_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) -+ $(CPPFLAGS) $(AM_CFLAGS) - LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) - CCLD = $(CC) - LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ - SOURCES = $(testlk_SOURCES) - DIST_SOURCES = $(testlk_SOURCES) -@@ -120,15 +120,15 @@ 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@ - CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ -+CXXFLAGS = - CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ diff --git a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in index 5aa76ea22..d6b448e59 100644 --- a/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in +++ b/package/nfs-utils/patches/patch-tools_rpcgen_Makefile_in @@ -1,70 +1,26 @@ ---- nfs-utils-1.2.8.orig/tools/rpcgen/Makefile.in 2013-04-22 18:48:22.000000000 +0200 -+++ nfs-utils-1.2.8/tools/rpcgen/Makefile.in 2013-08-13 11:04:51.000000000 +0200 -@@ -87,21 +87,21 @@ rpcgen_OBJECTS = $(am_rpcgen_OBJECTS) - am__DEPENDENCIES_1 = - rpcgen_DEPENDENCIES = $(am__DEPENDENCIES_1) - rpcgen_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -- --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS) \ +--- nfs-utils-1.2.9.orig/tools/rpcgen/Makefile.in 2013-11-05 21:58:16.000000000 +0100 ++++ nfs-utils-1.2.9/tools/rpcgen/Makefile.in 2014-02-19 20:12:32.000000000 +0100 +@@ -119,8 +119,8 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) + am__v_lt_0 = --silent + am__v_lt_1 = + rpcgen_LINK = $(LIBTOOL) $(AM_V_lt) --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) $(CFLAGS_FOR_BUILD) - 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) $(CFLAGS_FOR_BUILD) \ -+ -o $@ - SOURCES = $(rpcgen_SOURCES) - DIST_SOURCES = $(rpcgen_SOURCES) - am__can_run_installinfo = \ -@@ -117,7 +117,7 @@ ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@ - ALLOCA = @ALLOCA@ - AMTAR = @AMTAR@ - AM_CFLAGS = @AM_CFLAGS@ --AM_CPPFLAGS = @AM_CPPFLAGS@ -+AM_CPPFLAGS = - AR = @AR@ - AUTOCONF = @AUTOCONF@ - AUTOHEADER = @AUTOHEADER@ -@@ -126,10 +126,10 @@ AWK = @AWK@ ++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(rpcgen_CFLAGS) $(CFLAGS_FOR_BUILD) \ ++ $(rpcgen_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) + am__v_P_0 = false +@@ -197,7 +197,7 @@ AWK = @AWK@ CC = $(CC_FOR_BUILD) CCDEPMODE = @CCDEPMODE@ CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ -+CFLAGS = ++CFLAGS = CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = - CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ - CXX = @CXX@ - CXXCPP = @CXXCPP@ -@@ -167,10 +167,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@ -@@ -296,7 +296,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout. + CPPFLAGS = @CPPFLAGS@ +@@ -367,7 +367,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout. rpcgen_CFLAGS = $(CFLAGS_FOR_BUILD) rpcgen_CPPLAGS = $(CPPFLAGS_FOR_BUILD) rpcgen_LDFLAGS = $(LDFLAGS_FOR_BUILD) @@ -72,12 +28,12 @@ MAINTAINERCLEANFILES = Makefile.in EXTRA_DIST = rpcgen.new.1 all: all-am -@@ -344,7 +343,7 @@ clean-noinstPROGRAMS: - rm -f $$list +@@ -416,7 +415,7 @@ clean-noinstPROGRAMS: + rpcgen$(EXEEXT): $(rpcgen_OBJECTS) $(rpcgen_DEPENDENCIES) $(EXTRA_rpcgen_DEPENDENCIES) @rm -f rpcgen$(EXEEXT) -- $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS) -+ $(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) +- $(AM_V_CCLD)$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(rpcgen_LINK) $(rpcgen_OBJECTS) $(rpcgen_LDADD) mostlyclean-compile: -rm -f *.$(OBJEXT) diff --git a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in b/package/nfs-utils/patches/patch-utils_gssd_Makefile_in deleted file mode 100644 index 5499e21a9..000000000 --- a/package/nfs-utils/patches/patch-utils_gssd_Makefile_in +++ /dev/null @@ -1,25 +0,0 @@ ---- nfs-utils-1.2.8.orig/utils/gssd/Makefile.in 2013-04-22 18:48:23.000000000 +0200 -+++ nfs-utils-1.2.8/utils/gssd/Makefile.in 2013-08-13 10:59:43.000000000 +0200 -@@ -390,7 +390,7 @@ gssd_LDADD = ../../support/nfs/libnfs.a - $(RPCSECGSS_LIBS) $(KRBLIBS) $(GSSAPI_LIBS) - - gssd_LDFLAGS = $(KRBLDFLAGS) $(LIBTIRPC) --gssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ -+gssd_CFLAGS = $(AM_CFLAGS) \ - $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS) - - svcgssd_SOURCES = \ -@@ -410,11 +410,11 @@ svcgssd_LDADD = \ - $(KRBLIBS) $(GSSAPI_LIBS) $(LIBTIRPC) - - svcgssd_LDFLAGS = $(KRBLDFLAGS) --svcgssd_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ -+svcgssd_CFLAGS = $(AM_CFLAGS) \ - $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS) - - gss_clnt_send_err_SOURCES = gss_clnt_send_err.c --gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) $(CFLAGS) \ -+gss_clnt_send_err_CFLAGS = $(AM_CFLAGS) \ - $(RPCSECGSS_CFLAGS) $(KRBCFLAGS) $(GSSAPI_CFLAGS) - - MAINTAINERCLEANFILES = Makefile.in diff --git a/package/nfs-utils/patches/patch-utils_statd_simu_c b/package/nfs-utils/patches/patch-utils_statd_simu_c new file mode 100644 index 000000000..2ca71cf74 --- /dev/null +++ b/package/nfs-utils/patches/patch-utils_statd_simu_c @@ -0,0 +1,10 @@ +--- nfs-utils-1.2.9.orig/utils/statd/simu.c 2013-11-05 21:41:27.000000000 +0100 ++++ nfs-utils-1.2.9/utils/statd/simu.c 2014-02-20 07:25:35.000000000 +0100 +@@ -10,6 +10,7 @@ + + #include <netdb.h> + #include <arpa/inet.h> ++#include <stdlib.h> + + #include "sockaddr.h" + #include "rpcmisc.h" |