summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/quota
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/quota')
-rw-r--r--meta/recipes-extended/quota/quota/fcntl.patch48
-rw-r--r--meta/recipes-extended/quota/quota/remove_non_posix_types.patch198
-rw-r--r--meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch32
-rw-r--r--meta/recipes-extended/quota/quota_4.05.bb (renamed from meta/recipes-extended/quota/quota_4.04.bb)10
4 files changed, 20 insertions, 268 deletions
diff --git a/meta/recipes-extended/quota/quota/fcntl.patch b/meta/recipes-extended/quota/quota/fcntl.patch
index 2d37971321..51a770ce6e 100644
--- a/meta/recipes-extended/quota/quota/fcntl.patch
+++ b/meta/recipes-extended/quota/quota/fcntl.patch
@@ -9,13 +9,11 @@ Upstream-Status: Pending
9 9
10Signed-off-by: Khem Raj <raj.khem@gmail.com> 10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 11
12ndex: quota-tools/quota.h 12diff --git a/quota.h b/quota.h
13=================================================================== 13index 4c21411..d20c217 100644
14Index: quota-tools/quota.h 14--- a/quota.h
15=================================================================== 15+++ b/quota.h
16--- quota-tools.orig/quota.h 16@@ -182,6 +182,6 @@ enum {
17+++ quota-tools/quota.h
18@@ -165,6 +165,6 @@ enum {
19 #endif 17 #endif
20 #endif 18 #endif
21 19
@@ -23,10 +21,10 @@ Index: quota-tools/quota.h
23+long quotactl (int, const char *, qid_t, caddr_t); 21+long quotactl (int, const char *, qid_t, caddr_t);
24 22
25 #endif /* _QUOTA_ */ 23 #endif /* _QUOTA_ */
26Index: quota-tools/quotacheck.c 24diff --git a/quotacheck.c b/quotacheck.c
27=================================================================== 25index 2cdf475..07c18a7 100644
28--- quota-tools.orig/quotacheck.c 26--- a/quotacheck.c
29+++ quota-tools/quotacheck.c 27+++ b/quotacheck.c
30@@ -19,6 +19,7 @@ 28@@ -19,6 +19,7 @@
31 #include <unistd.h> 29 #include <unistd.h>
32 #include <stdlib.h> 30 #include <stdlib.h>
@@ -35,10 +33,10 @@ Index: quota-tools/quotacheck.c
35 33
36 #include <sys/stat.h> 34 #include <sys/stat.h>
37 #include <sys/types.h> 35 #include <sys/types.h>
38Index: quota-tools/quotaio.c 36diff --git a/quotaio.c b/quotaio.c
39=================================================================== 37index 94ae458..d57fc1a 100644
40--- quota-tools.orig/quotaio.c 38--- a/quotaio.c
41+++ quota-tools/quotaio.c 39+++ b/quotaio.c
42@@ -12,6 +12,7 @@ 40@@ -12,6 +12,7 @@
43 #include <string.h> 41 #include <string.h>
44 #include <unistd.h> 42 #include <unistd.h>
@@ -47,22 +45,10 @@ Index: quota-tools/quotaio.c
47 #include <sys/types.h> 45 #include <sys/types.h>
48 #include <sys/stat.h> 46 #include <sys/stat.h>
49 #include <sys/file.h> 47 #include <sys/file.h>
50Index: quota-tools/dqblk_v2.h 48diff --git a/rquota_client.c b/rquota_client.c
51=================================================================== 49index a3a4ae3..0ffe7a9 100644
52--- quota-tools.orig/dqblk_v2.h 50--- a/rquota_client.c
53+++ quota-tools/dqblk_v2.h 51+++ b/rquota_client.c
54@@ -7,6 +7,7 @@
55 #ifndef GUARD_DQBLK_V2_H
56 #define GUARD_DQBLK_V2_H
57
58+#include <fcntl.h>
59 #include <sys/types.h>
60 #include "quota_tree.h"
61
62Index: quota-tools/rquota_client.c
63===================================================================
64--- quota-tools.orig/rquota_client.c
65+++ quota-tools/rquota_client.c
66@@ -19,7 +19,9 @@ 52@@ -19,7 +19,9 @@
67 53
68 #include "config.h" 54 #include "config.h"
diff --git a/meta/recipes-extended/quota/quota/remove_non_posix_types.patch b/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
deleted file mode 100644
index 06ff13cb98..0000000000
--- a/meta/recipes-extended/quota/quota/remove_non_posix_types.patch
+++ /dev/null
@@ -1,198 +0,0 @@
1Use proper C99 integer types
2
3Upstream-Status: Pending
4
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: quota-tools/bylabel.c
8===================================================================
9--- quota-tools.orig/bylabel.c
10+++ quota-tools/bylabel.c
11@@ -20,6 +20,7 @@
12 #include <ctype.h>
13 #include <fcntl.h>
14 #include <unistd.h>
15+#include <stdint.h>
16
17 #include "bylabel.h"
18 #include "common.h"
19@@ -37,32 +38,32 @@ static struct uuidCache_s {
20
21 #define EXT2_SUPER_MAGIC 0xEF53
22 struct ext2_super_block {
23- u_char s_dummy1[56];
24- u_char s_magic[2];
25- u_char s_dummy2[46];
26- u_char s_uuid[16];
27- u_char s_volume_name[16];
28+ uint8_t s_dummy1[56];
29+ uint8_t s_magic[2];
30+ uint8_t s_dummy2[46];
31+ uint8_t s_uuid[16];
32+ uint8_t s_volume_name[16];
33 };
34
35-#define ext2magic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8))
36+#define ext2magic(s) ((uint32_t) s.s_magic[0] + (((uint32_t) s.s_magic[1]) << 8))
37
38 #define XFS_SUPER_MAGIC "XFSB"
39 #define XFS_SUPER_MAGIC2 "BSFX"
40 struct xfs_super_block {
41- u_char s_magic[4];
42- u_char s_dummy[28];
43- u_char s_uuid[16];
44- u_char s_dummy2[60];
45- u_char s_fsname[12];
46+ uint8_t s_magic[4];
47+ uint8_t s_dummy[28];
48+ uint8_t s_uuid[16];
49+ uint8_t s_dummy2[60];
50+ uint8_t s_fsname[12];
51 };
52
53 #define REISER_SUPER_MAGIC "ReIsEr2Fs"
54 struct reiserfs_super_block {
55- u_char s_dummy1[52];
56- u_char s_magic[10];
57- u_char s_dummy2[22];
58- u_char s_uuid[16];
59- u_char s_volume_name[16];
60+ uint8_t s_dummy1[52];
61+ uint8_t s_magic[10];
62+ uint8_t s_dummy2[22];
63+ uint8_t s_uuid[16];
64+ uint8_t s_volume_name[16];
65 };
66
67 static inline unsigned short swapped(unsigned short a)
68@@ -222,7 +223,7 @@ static char *get_spec_by_x(int n, const
69 return NULL;
70 }
71
72-static u_char fromhex(char c)
73+static uint8_t fromhex(char c)
74 {
75 if (isdigit(c))
76 return (c - '0');
77@@ -234,7 +235,7 @@ static u_char fromhex(char c)
78
79 static char *get_spec_by_uuid(const char *s)
80 {
81- u_char uuid[16];
82+ uint8_t uuid[16];
83 int i;
84
85 if (strlen(s) != 36 || s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-')
86Index: quota-tools/quot.c
87===================================================================
88--- quota-tools.orig/quot.c
89+++ quota-tools/quot.c
90@@ -47,6 +47,7 @@
91 #include <utmp.h>
92 #include <pwd.h>
93 #include <grp.h>
94+#include <stdint.h>
95
96 #include "pot.h"
97 #include "quot.h"
98@@ -56,8 +57,8 @@
99 #include "quotasys.h"
100
101 #define TSIZE 500
102-static __uint64_t sizes[TSIZE];
103-static __uint64_t overflow;
104+static uint64_t sizes[TSIZE];
105+static uint64_t overflow;
106
107 static int aflag;
108 static int cflag;
109@@ -72,7 +73,7 @@ static time_t now;
110 char *progname;
111
112 static void mounttable(void);
113-static char *idname(__uint32_t, int);
114+static char *idname(uint32_t, int);
115 static void report(const char *, const char *, int);
116 static void creport(const char *, const char *);
117
118@@ -173,7 +174,7 @@ static int qcmp(du_t * p1, du_t * p2)
119 static void creport(const char *file, const char *fsdir)
120 {
121 int i;
122- __uint64_t t = 0;
123+ uint64_t t = 0;
124
125 printf(_("%s (%s):\n"), file, fsdir);
126 for (i = 0; i < TSIZE - 1; i++)
127@@ -219,7 +220,7 @@ static void report(const char *file, con
128 }
129 }
130
131-static idcache_t *getnextent(int type, __uint32_t id, int byid)
132+static idcache_t *getnextent(int type, uint32_t id, int byid)
133 {
134 struct passwd *pw;
135 struct group *gr;
136@@ -240,7 +241,7 @@ static idcache_t *getnextent(int type, _
137 return &idc;
138 }
139
140-static char *idname(__uint32_t id, int type)
141+static char *idname(uint32_t id, int type)
142 {
143 idcache_t *ncp, *idp;
144 static idcache_t nc[2][NID];
145@@ -286,8 +287,8 @@ static void acctXFS(xfs_bstat_t *p)
146 {
147 register du_t *dp;
148 du_t **hp;
149- __uint64_t size;
150- __uint32_t i, id;
151+ uint64_t size;
152+ uint32_t i, id;
153
154 if ((p->bs_mode & S_IFMT) == 0)
155 return;
156Index: quota-tools/quot.h
157===================================================================
158--- quota-tools.orig/quot.h
159+++ quota-tools/quot.h
160@@ -35,18 +35,18 @@
161 #define SEC24HR (60*60*24) /* seconds per day */
162
163 typedef struct {
164- __uint32_t id;
165+ uint32_t id;
166 char name[UT_NAMESIZE + 1];
167 } idcache_t;
168
169 typedef struct du {
170 struct du *next;
171- __uint64_t blocks;
172- __uint64_t blocks30;
173- __uint64_t blocks60;
174- __uint64_t blocks90;
175- __uint64_t nfiles;
176- __uint32_t id;
177+ uint64_t blocks;
178+ uint64_t blocks30;
179+ uint64_t blocks60;
180+ uint64_t blocks90;
181+ uint64_t nfiles;
182+ uint32_t id;
183 } du_t;
184
185 #define NDU 60000
186Index: quota-tools/rquota_server.c
187===================================================================
188--- quota-tools.orig/rquota_server.c
189+++ quota-tools/rquota_server.c
190@@ -60,7 +60,7 @@ extern char nfs_pseudoroot[PATH_MAX];
191 */
192 extern struct authunix_parms *unix_cred;
193
194-int in_group(gid_t * gids, u_int len, gid_t gid)
195+int in_group(gid_t * gids, uint32_t len, gid_t gid)
196 {
197 gid_t *gidsp = gids + len;
198
diff --git a/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch b/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch
deleted file mode 100644
index 4687ca06f5..0000000000
--- a/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From a3808fd165847298d025971eb3c7be7d11caba9d Mon Sep 17 00:00:00 2001
2From: "Maxin B. John" <maxin.john@intel.com>
3Date: Wed, 8 Nov 2017 11:56:55 +0200
4Subject: [PATCH] Replace getrpcbynumber_r with getrpcbynumber
5
6musl and uclibc dont implement it
7
8Upstream-Status: Pending
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Signed-off-by: Maxin B. John <maxin.john@intel.com>
12---
13 svc_socket.c | 3 ++-
14 1 file changed, 2 insertions(+), 1 deletion(-)
15
16diff --git a/svc_socket.c b/svc_socket.c
17index 8a44604..5bdaaa0 100644
18--- a/svc_socket.c
19+++ b/svc_socket.c
20@@ -36,7 +36,8 @@ static int get_service_port(u_long number, const char *proto)
21 struct servent servbuf, *servp = NULL;
22 int ret;
23
24- ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp);
25+ rpcp = getrpcbynumber(number);
26+ ret = 0;
27 if (ret == 0 && rpcp != NULL) {
28 /* First try name */
29 ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata,
30--
312.4.0
32
diff --git a/meta/recipes-extended/quota/quota_4.04.bb b/meta/recipes-extended/quota/quota_4.05.bb
index 93f376286a..c5da1e71ed 100644
--- a/meta/recipes-extended/quota/quota_4.04.bb
+++ b/meta/recipes-extended/quota/quota_4.05.bb
@@ -3,18 +3,14 @@ SECTION = "base"
3HOMEPAGE = "http://sourceforge.net/projects/linuxquota/" 3HOMEPAGE = "http://sourceforge.net/projects/linuxquota/"
4BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136&atid=118136" 4BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136&atid=118136"
5LICENSE = "BSD & GPLv2+ & LGPLv2.1+" 5LICENSE = "BSD & GPLv2+ & LGPLv2.1+"
6LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad24027f0651028ec \ 6LIC_FILES_CHKSUM = "file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11c6f820f8fa62a5af71230f \
7 file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11c6f820f8fa62a5af71230f \
8 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" 7 file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
9 8
10SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ 9SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \
11 file://fcntl.patch \ 10 file://fcntl.patch \
12 file://remove_non_posix_types.patch \
13 " 11 "
14SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch" 12SRC_URI[md5sum] = "1c1dbd2cd3d680ccac661239b067e147"
15 13SRC_URI[sha256sum] = "ef3b5b5d1014ed1344b46c1826145e20cbef8db967b522403c9a060761cf7ab9"
16SRC_URI[md5sum] = "f46f3b0b5141f032f25684005dac49d3"
17SRC_URI[sha256sum] = "735be1887e7f51f54165e778ae43fc859c04e44d88834ecb2f470e91d4ef8edf"
18 14
19CVE_PRODUCT = "linux_diskquota" 15CVE_PRODUCT = "linux_diskquota"
20 16
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 14:47:17 +0000