package/quota: renumber patches

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/quota/0001-tools-getrpcbynumber.patch b/package/quota/0001-tools-getrpcbynumber.patch
new file mode 100644 (file)
index 0000000..899db91
--- /dev/null
+++ b/package/quota/0001-tools-getrpcbynumber.patch
@@ -0,0 +1,42 @@
+allow usage of getrpcbynumber() instead of getrpcbynumber_r()
+
+libtirpc does not implement the reentrant function getrpcbynumber_r(),
+so allow quota to use the non-reentrant version getrpcbynumber(). This
+should not be a problem as quota tools are not multi-threaded.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -182,6 +182,12 @@
+ AC_C_CONST
+ AC_C_INLINE
+ 
++AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r])
++
++if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then
++   AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available])
++fi
++
+ AC_ARG_ENABLE(rpc,
+       [  --enable-rpc=[yes/no]           Enable RPC support [default=yes].],
+       ,
+Index: b/svc_socket.c
+===================================================================
+--- a/svc_socket.c
++++ b/svc_socket.c
+@@ -55,7 +55,12 @@
+       addr.sin_family = AF_INET;
+ 
+       if (!port) {
++#if HAVE_GETRPCBYNUMBER_R
+               ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp);
++#else
++              rpcp = getrpcbynumber(number);
++              ret = 0;
++#endif
+               if (ret == 0 && rpcp != NULL) {
+                       /* First try name */
+                       ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,

diff --git a/package/quota/0002-fix-static-linking.patch b/package/quota/0002-fix-static-linking.patch
new file mode 100644 (file)
index 0000000..fd73f64
--- /dev/null
+++ b/package/quota/0002-fix-static-linking.patch
@@ -0,0 +1,55 @@
+Use $(LIBS) properly
+
+This patch makes sure the quota build system uses $(LIBS) where
+appropriate, so that it can be used to link with additional libraries,
+which is needed when linking statically.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -105,30 +105,40 @@
+       -$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8
+ 
+ quotaon: quotaon.o quotaon_xfs.o $(LIBOBJS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ quotacheck: quotacheck.o quotacheck_v1.o quotacheck_v2.o quotaops.o $(LIBOBJS)
+-      $(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS) $(LIBS)
+ 
+ quota: quota.o quotaops.o $(LIBOBJS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ quotasync: quotasync.o $(LIBOBJS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ quot: quot.o $(LIBOBJS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ repquota: repquota.o $(LIBOBJS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ warnquota: warnquota.o $(LIBOBJS)
+-      $(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS) $(LIBS)
+ 
+ quotastats: quotastats.o common.o pot.o
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ xqmstats: xqmstats.o common.o pot.o
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ edquota: edquota.o quotaops.o $(LIBOBJS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ setquota: setquota.o quotaops.o $(LIBOBJS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ convertquota: convertquota.o $(LIBOBJS)
++      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS)
+       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)

diff --git a/package/quota/01-tools-getrpcbynumber.patch b/package/quota/01-tools-getrpcbynumber.patch
deleted file mode 100644 (file)
index 899db91..0000000
--- a/package/quota/01-tools-getrpcbynumber.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-allow usage of getrpcbynumber() instead of getrpcbynumber_r()
-
-libtirpc does not implement the reentrant function getrpcbynumber_r(),
-so allow quota to use the non-reentrant version getrpcbynumber(). This
-should not be a problem as quota tools are not multi-threaded.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/configure.in
-===================================================================
---- a/configure.in
-+++ b/configure.in
-@@ -182,6 +182,12 @@
- AC_C_CONST
- AC_C_INLINE
- 
-+AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r])
-+
-+if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then
-+   AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available])
-+fi
-+
- AC_ARG_ENABLE(rpc,
-       [  --enable-rpc=[yes/no]           Enable RPC support [default=yes].],
-       ,
-Index: b/svc_socket.c
-===================================================================
---- a/svc_socket.c
-+++ b/svc_socket.c
-@@ -55,7 +55,12 @@
-       addr.sin_family = AF_INET;
- 
-       if (!port) {
-+#if HAVE_GETRPCBYNUMBER_R
-               ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp);
-+#else
-+              rpcp = getrpcbynumber(number);
-+              ret = 0;
-+#endif
-               if (ret == 0 && rpcp != NULL) {
-                       /* First try name */
-                       ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,

diff --git a/package/quota/02-fix-static-linking.patch b/package/quota/02-fix-static-linking.patch
deleted file mode 100644 (file)
index fd73f64..0000000
--- a/package/quota/02-fix-static-linking.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Use $(LIBS) properly
-
-This patch makes sure the quota build system uses $(LIBS) where
-appropriate, so that it can be used to link with additional libraries,
-which is needed when linking statically.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/Makefile.in
-===================================================================
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -105,30 +105,40 @@
-       -$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8
- 
- quotaon: quotaon.o quotaon_xfs.o $(LIBOBJS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- quotacheck: quotacheck.o quotacheck_v1.o quotacheck_v2.o quotaops.o $(LIBOBJS)
--      $(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS) $(LIBS)
- 
- quota: quota.o quotaops.o $(LIBOBJS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- quotasync: quotasync.o $(LIBOBJS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- quot: quot.o $(LIBOBJS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- repquota: repquota.o $(LIBOBJS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- warnquota: warnquota.o $(LIBOBJS)
--      $(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS) $(LIBS)
- 
- quotastats: quotastats.o common.o pot.o
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- xqmstats: xqmstats.o common.o pot.o
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- edquota: edquota.o quotaops.o $(LIBOBJS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- setquota: setquota.o quotaops.o $(LIBOBJS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- convertquota: convertquota.o $(LIBOBJS)
-+      $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS)
-       $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)