diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-extended/quota')
6 files changed, 495 insertions, 0 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch new file mode 100644 index 000000000..6add4708a --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch @@ -0,0 +1,33 @@ +From 776757a23e9930588950c7fcbc7827ec7a3e51c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com> +Date: Mon, 4 Jan 2016 15:48:19 +0100 +Subject: [PATCH] Do not accidentaly override commandline passed CFLAGS. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport + +Signed-off-by: Tomáš Chvátal <tchvatal@suse.com> +Signed-off-by: Jan Kara <jack@suse.cz> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3ba1386..1552c15 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,7 +53,7 @@ AS_IF([test "x${prefix}" = "xNONE"], [ + # ================ + # Check for cflags + # ================ +-CFLAGS="-D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ++CFLAGS="$CFLAGS -D_GNU_SOURCE -Wall -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" + AC_ARG_ENABLE([werror], + [AS_HELP_STRING([--enable-werror], [Treat all warnings as errors, useful for development])], + [enable_werror="$enableval"], +-- +2.4.0 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch new file mode 100644 index 000000000..a79e47796 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/0001-Fix-build-with-disabled-ldap.patch @@ -0,0 +1,93 @@ +From 39fd30ce57e3c34c3649866bf9345a71f0b78667 Mon Sep 17 00:00:00 2001 +From: Jan Kara <jack@suse.cz> +Date: Mon, 4 Jan 2016 15:10:53 +0100 +Subject: [PATCH] Fix build with disabled ldap + +Upstream-Status: Backport + +Reported-by: Tomas Chvatal <tchvatal@suse.com> +Signed-off-by: Jan Kara <jack@suse.cz> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + warnquota.c | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/warnquota.c b/warnquota.c +index 3734f0e..e9868c1 100644 +--- a/warnquota.c ++++ b/warnquota.c +@@ -109,13 +109,13 @@ struct configparams { + char *user_signature; + char *group_message; + char *group_signature; ++ time_t cc_before; ++#ifdef USE_LDAP_MAIL_LOOKUP + int use_ldap_mail; /* 0 */ ++ int ldap_is_setup; /* 0 */ + int ldap_starttls; /* 0 */ + int ldap_tls; /* LDAP_OPT_X_TLS_NEVER */ + int ldap_vers; /* LDAP_VERSION3 */ +- time_t cc_before; +-#ifdef USE_LDAP_MAIL_LOOKUP +- int ldap_is_setup; /* 0 */ + char ldap_host[CNF_BUFFER]; + int ldap_port; + char ldap_uri[CNF_BUFFER]; +@@ -729,13 +729,13 @@ static int readconfigfile(const char *filename, struct configparams *config) + } + maildev[0] = 0; + config->user_signature = config->user_message = config->group_signature = config->group_message = NULL; ++ config->cc_before = -1; ++ ++#ifdef USE_LDAP_MAIL_LOOKUP + config->use_ldap_mail = 0; + config->ldap_starttls = 0; + config->ldap_tls = LDAP_OPT_X_TLS_NEVER; + config->ldap_vers = LDAP_VERSION3; +- config->cc_before = -1; +- +-#ifdef USE_LDAP_MAIL_LOOKUP + config->ldap_port = config->ldap_is_setup = 0; + config->ldap_host[0] = 0; + config->ldap_uri[0] = 0; +@@ -820,6 +820,18 @@ static int readconfigfile(const char *filename, struct configparams *config) + create_eoln(config->group_signature); + verify_format(config->group_signature, "GROUP_SIGNATURE"); + } ++ else if (!strcmp(var, "CC_BEFORE")) { ++ int num; ++ char unit[10]; ++ ++ if (sscanf(value, "%d%s", &num, unit) != 2) ++ goto cc_parse_err; ++ if (str2timeunits(num, unit, &config->cc_before) < 0) { ++cc_parse_err: ++ die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line); ++ } ++ } ++#ifdef USE_LDAP_MAIL_LOOKUP + else if (!strcmp(var, "LDAP_MAIL")) { + if(strcasecmp(value, "true") == 0) + config->use_ldap_mail = 1; +@@ -846,18 +858,6 @@ static int readconfigfile(const char *filename, struct configparams *config) + else + config->ldap_starttls = 0; + } +- else if (!strcmp(var, "CC_BEFORE")) { +- int num; +- char unit[10]; +- +- if (sscanf(value, "%d%s", &num, unit) != 2) +- goto cc_parse_err; +- if (str2timeunits(num, unit, &config->cc_before) < 0) { +-cc_parse_err: +- die(1, _("Cannot parse time at CC_BEFORE variable (line %d).\n"), line); +- } +- } +-#ifdef USE_LDAP_MAIL_LOOKUP + else if (!strcmp(var, "LDAP_HOST")) + sstrncpy(config->ldap_host, value, CNF_BUFFER); + else if (!strcmp(var, "LDAP_PORT")) +-- +2.4.0 + diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/fcntl.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/fcntl.patch new file mode 100644 index 000000000..27e60fd07 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/fcntl.patch @@ -0,0 +1,113 @@ +Include fcntl.h to pacify compiler errors on musl +like + +error: unknown type name 'loff_t' +Cover rpc headers under proper conditional +Dont use __P its undefined + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +ndex: quota-tools/quota.h +=================================================================== +Index: quota-tools/quota.h +=================================================================== +--- quota-tools.orig/quota.h ++++ quota-tools/quota.h +@@ -165,6 +165,6 @@ enum { + #endif + #endif + +-long quotactl __P((int, const char *, qid_t, caddr_t)); ++long quotactl (int, const char *, qid_t, caddr_t); + + #endif /* _QUOTA_ */ +Index: quota-tools/quotacheck.c +=================================================================== +--- quota-tools.orig/quotacheck.c ++++ quota-tools/quotacheck.c +@@ -19,6 +19,7 @@ + #include <unistd.h> + #include <stdlib.h> + #include <errno.h> ++#include <fcntl.h> + + #include <sys/stat.h> + #include <sys/types.h> +Index: quota-tools/quotaio.c +=================================================================== +--- quota-tools.orig/quotaio.c ++++ quota-tools/quotaio.c +@@ -12,6 +12,7 @@ + #include <string.h> + #include <unistd.h> + #include <stdlib.h> ++#include <fcntl.h> + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/file.h> +Index: quota-tools/dqblk_v2.h +=================================================================== +--- quota-tools.orig/dqblk_v2.h ++++ quota-tools/dqblk_v2.h +@@ -7,6 +7,7 @@ + #ifndef GUARD_DQBLK_V2_H + #define GUARD_DQBLK_V2_H + ++#include <fcntl.h> + #include <sys/types.h> + #include "quota_tree.h" + +Index: quota-tools/quotaops.c +=================================================================== +--- quota-tools.orig/quotaops.c ++++ quota-tools/quotaops.c +@@ -34,7 +34,9 @@ + + #include "config.h" + ++#if defined(RPC) + #include <rpc/rpc.h> ++#endif + #include <sys/types.h> + #include <sys/stat.h> + #include <sys/file.h> +Index: quota-tools/rquota_client.c +=================================================================== +--- quota-tools.orig/rquota_client.c ++++ quota-tools/rquota_client.c +@@ -19,7 +19,9 @@ + + #include "config.h" + ++#if defined(RPC) + #include <rpc/rpc.h> ++#endif + #include <sys/types.h> + #include <sys/param.h> + #include <sys/stat.h> +@@ -35,7 +37,9 @@ + #include <stdint.h> + + #include "mntopt.h" ++#if defined(RPC) + #include "rquota.h" ++#endif + #include "common.h" + #include "quotaio.h" + #include "quotasys.h" +Index: quota-tools/setquota.c +=================================================================== +--- quota-tools.orig/setquota.c ++++ quota-tools/setquota.c +@@ -7,7 +7,9 @@ + + #include "config.h" + ++#if defined(RPC) + #include <rpc/rpc.h> ++#endif + #include <sys/types.h> + #include <errno.h> + #include <stdio.h> diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/remove_non_posix_types.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/remove_non_posix_types.patch new file mode 100644 index 000000000..06ff13cb9 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/remove_non_posix_types.patch @@ -0,0 +1,198 @@ +Use proper C99 integer types + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: quota-tools/bylabel.c +=================================================================== +--- quota-tools.orig/bylabel.c ++++ quota-tools/bylabel.c +@@ -20,6 +20,7 @@ + #include <ctype.h> + #include <fcntl.h> + #include <unistd.h> ++#include <stdint.h> + + #include "bylabel.h" + #include "common.h" +@@ -37,32 +38,32 @@ static struct uuidCache_s { + + #define EXT2_SUPER_MAGIC 0xEF53 + struct ext2_super_block { +- u_char s_dummy1[56]; +- u_char s_magic[2]; +- u_char s_dummy2[46]; +- u_char s_uuid[16]; +- u_char s_volume_name[16]; ++ uint8_t s_dummy1[56]; ++ uint8_t s_magic[2]; ++ uint8_t s_dummy2[46]; ++ uint8_t s_uuid[16]; ++ uint8_t s_volume_name[16]; + }; + +-#define ext2magic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8)) ++#define ext2magic(s) ((uint32_t) s.s_magic[0] + (((uint32_t) s.s_magic[1]) << 8)) + + #define XFS_SUPER_MAGIC "XFSB" + #define XFS_SUPER_MAGIC2 "BSFX" + struct xfs_super_block { +- u_char s_magic[4]; +- u_char s_dummy[28]; +- u_char s_uuid[16]; +- u_char s_dummy2[60]; +- u_char s_fsname[12]; ++ uint8_t s_magic[4]; ++ uint8_t s_dummy[28]; ++ uint8_t s_uuid[16]; ++ uint8_t s_dummy2[60]; ++ uint8_t s_fsname[12]; + }; + + #define REISER_SUPER_MAGIC "ReIsEr2Fs" + struct reiserfs_super_block { +- u_char s_dummy1[52]; +- u_char s_magic[10]; +- u_char s_dummy2[22]; +- u_char s_uuid[16]; +- u_char s_volume_name[16]; ++ uint8_t s_dummy1[52]; ++ uint8_t s_magic[10]; ++ uint8_t s_dummy2[22]; ++ uint8_t s_uuid[16]; ++ uint8_t s_volume_name[16]; + }; + + static inline unsigned short swapped(unsigned short a) +@@ -222,7 +223,7 @@ static char *get_spec_by_x(int n, const + return NULL; + } + +-static u_char fromhex(char c) ++static uint8_t fromhex(char c) + { + if (isdigit(c)) + return (c - '0'); +@@ -234,7 +235,7 @@ static u_char fromhex(char c) + + static char *get_spec_by_uuid(const char *s) + { +- u_char uuid[16]; ++ uint8_t uuid[16]; + int i; + + if (strlen(s) != 36 || s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-') +Index: quota-tools/quot.c +=================================================================== +--- quota-tools.orig/quot.c ++++ quota-tools/quot.c +@@ -47,6 +47,7 @@ + #include <utmp.h> + #include <pwd.h> + #include <grp.h> ++#include <stdint.h> + + #include "pot.h" + #include "quot.h" +@@ -56,8 +57,8 @@ + #include "quotasys.h" + + #define TSIZE 500 +-static __uint64_t sizes[TSIZE]; +-static __uint64_t overflow; ++static uint64_t sizes[TSIZE]; ++static uint64_t overflow; + + static int aflag; + static int cflag; +@@ -72,7 +73,7 @@ static time_t now; + char *progname; + + static void mounttable(void); +-static char *idname(__uint32_t, int); ++static char *idname(uint32_t, int); + static void report(const char *, const char *, int); + static void creport(const char *, const char *); + +@@ -173,7 +174,7 @@ static int qcmp(du_t * p1, du_t * p2) + static void creport(const char *file, const char *fsdir) + { + int i; +- __uint64_t t = 0; ++ uint64_t t = 0; + + printf(_("%s (%s):\n"), file, fsdir); + for (i = 0; i < TSIZE - 1; i++) +@@ -219,7 +220,7 @@ static void report(const char *file, con + } + } + +-static idcache_t *getnextent(int type, __uint32_t id, int byid) ++static idcache_t *getnextent(int type, uint32_t id, int byid) + { + struct passwd *pw; + struct group *gr; +@@ -240,7 +241,7 @@ static idcache_t *getnextent(int type, _ + return &idc; + } + +-static char *idname(__uint32_t id, int type) ++static char *idname(uint32_t id, int type) + { + idcache_t *ncp, *idp; + static idcache_t nc[2][NID]; +@@ -286,8 +287,8 @@ static void acctXFS(xfs_bstat_t *p) + { + register du_t *dp; + du_t **hp; +- __uint64_t size; +- __uint32_t i, id; ++ uint64_t size; ++ uint32_t i, id; + + if ((p->bs_mode & S_IFMT) == 0) + return; +Index: quota-tools/quot.h +=================================================================== +--- quota-tools.orig/quot.h ++++ quota-tools/quot.h +@@ -35,18 +35,18 @@ + #define SEC24HR (60*60*24) /* seconds per day */ + + typedef struct { +- __uint32_t id; ++ uint32_t id; + char name[UT_NAMESIZE + 1]; + } idcache_t; + + typedef struct du { + struct du *next; +- __uint64_t blocks; +- __uint64_t blocks30; +- __uint64_t blocks60; +- __uint64_t blocks90; +- __uint64_t nfiles; +- __uint32_t id; ++ uint64_t blocks; ++ uint64_t blocks30; ++ uint64_t blocks60; ++ uint64_t blocks90; ++ uint64_t nfiles; ++ uint32_t id; + } du_t; + + #define NDU 60000 +Index: quota-tools/rquota_server.c +=================================================================== +--- quota-tools.orig/rquota_server.c ++++ quota-tools/rquota_server.c +@@ -60,7 +60,7 @@ extern char nfs_pseudoroot[PATH_MAX]; + */ + extern struct authunix_parms *unix_cred; + +-int in_group(gid_t * gids, u_int len, gid_t gid) ++int in_group(gid_t * gids, uint32_t len, gid_t gid) + { + gid_t *gidsp = gids + len; + diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch new file mode 100644 index 000000000..9ca2ffc0d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/quota/quota/replace_getrpcbynumber_r.patch @@ -0,0 +1,20 @@ +Replace getrpcbynumber_r with getrpcbynumber +musl and uclibc dont implement it + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Index: quota-tools/svc_socket.c +=================================================================== +--- quota-tools.orig/svc_socket.c ++++ quota-tools/svc_socket.c +@@ -55,7 +55,8 @@ static int svc_socket (u_long number, in + addr.sin_family = AF_INET; + + if (!port) { +- ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp); ++ rpcp = getrpcbynumber(number); ++ ret = 0; + if (ret == 0 && rpcp != NULL) { + /* First try name */ + ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, diff --git a/import-layers/yocto-poky/meta/recipes-extended/quota/quota_4.03.bb b/import-layers/yocto-poky/meta/recipes-extended/quota/quota_4.03.bb new file mode 100644 index 000000000..4a980464b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-extended/quota/quota_4.03.bb @@ -0,0 +1,38 @@ +SUMMARY = "Tools for monitoring & limiting user disk usage per filesystem" +SECTION = "base" +HOMEPAGE = "http://sourceforge.net/projects/linuxquota/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=18136&atid=118136" +LICENSE = "BSD & GPLv2+ & LGPLv2.1+" +LIC_FILES_CHKSUM = "file://quota.c;beginline=1;endline=33;md5=331c7d77744bfe0ad24027f0651028ec \ + file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11c6f820f8fa62a5af71230f \ + file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \ + file://0001-Fix-build-with-disabled-ldap.patch \ + file://0001-Do-not-accidentaly-override-commandline-passed-CFLAG.patch \ + file://fcntl.patch \ + file://remove_non_posix_types.patch \ + " +SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch" + +SRC_URI[md5sum] = "6b09f9c93515c25a528be5754cdfb6f5" +SRC_URI[sha256sum] = "9c6c4d9ae7bf30506dd2aa3d8056c4ff2f8d087930d7c721616f5c093bdc674b" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/linuxquota/files/quota-tools/" +UPSTREAM_CHECK_REGEX = "/quota-tools/(?P<pver>(\d+[\.\-_]*)+)/" + +DEPENDS = "gettext-native e2fsprogs libnl dbus" + +inherit autotools-brokensep gettext pkgconfig + +CFLAGS += "-I${STAGING_INCDIR}/tirpc" +LDFLAGS += "-ltirpc" +ASNEEDED = "" + +PACKAGECONFIG ??= "tcp-wrappers rpc bsd" +PACKAGECONFIG_libc-musl = "tcp-wrappers rpc" + +PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" +PACKAGECONFIG[rpc] = "--enable-rpc,--disable-rpc,libtirpc" +PACKAGECONFIG[bsd] = "--enable-bsd_behaviour=yes,--enable-bsd_behaviour=no," +PACKAGECONFIG[ldapmail] = "--enable-ldapmail,--disable-ldapmail,openldap" |
