summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-05-22 19:45:50 +0000
committerMike Frysinger <vapier@gentoo.org>2012-05-22 19:45:50 +0000
commitfbe28ed702f64ec09a9f4e84ffccc7a9c4221286 (patch)
tree9964ae78a6d6db0062d1c6725ff753d9f77b12b3 /sys-fs/e2fsprogs/files
parentVersion bump #416771 by Samuli Suominen. (diff)
downloadgentoo-2-fbe28ed702f64ec09a9f4e84ffccc7a9c4221286.tar.gz
gentoo-2-fbe28ed702f64ec09a9f4e84ffccc7a9c4221286.tar.bz2
gentoo-2-fbe28ed702f64ec09a9f4e84ffccc7a9c4221286.zip
Version bump #416771 by Samuli Suominen.
(Portage version: 2.2.0_alpha102/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/e2fsprogs/files')
-rw-r--r--sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch28
-rw-r--r--sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch33
2 files changed, 61 insertions, 0 deletions
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch
new file mode 100644
index 000000000000..1797105dc0f5
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quota-time.patch
@@ -0,0 +1,28 @@
+From 90202c13466fcde28fd56d349a3380d68dbda5f2 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 22 May 2012 15:05:18 -0400
+Subject: [PATCH] libquota: add missing time.h include
+
+This code uses time() but doesn't include time.h leading to:
+quotaio.c:89:2: warning: implicit declaration of function 'time'
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/quota/quotaio.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/lib/quota/quotaio.c b/lib/quota/quotaio.c
+index 481d5f5..6e917f0 100644
+--- a/lib/quota/quotaio.c
++++ b/lib/quota/quotaio.c
+@@ -11,6 +11,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <time.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/file.h>
+--
+1.7.8.6
+
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch
new file mode 100644
index 000000000000..52fb6d2cd0f5
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.3-quotactl.patch
@@ -0,0 +1,33 @@
+From f06c5004f410d0a0a9ed706dad194aabf1be0077 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 22 May 2012 15:02:42 -0400
+Subject: [PATCH] libquota: add a quotactl prototype
+
+The commit 0df8a27bbaf51b55c0e8c3a533ef4c2ff9d79c9f removed the system
+quota.h include, but in doing so, added the problem:
+mkquota.c:55:2: warning: implicit declaration of function 'quotactl'
+
+Since we're maintaining a copy of quota.h, add a proper func prototype.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/quota/quota.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/lib/quota/quota.h b/lib/quota/quota.h
+index a943ec6..3eaec1d 100644
+--- a/lib/quota/quota.h
++++ b/lib/quota/quota.h
+@@ -152,4 +152,9 @@ enum {
+ };
+ #define QUOTA_NL_A_MAX (__QUOTA_NL_A_MAX - 1)
+
++#ifdef HAVE_QUOTACTL
++extern int quotactl(int __cmd, const char *__special, int __id,
++ caddr_t __addr);
++#endif
++
+ #endif /* _QUOTA_ */
+--
+1.7.8.6
+