[OE-core] [PATCH] quote: update to 4.05
Paul Barker
paul at betafive.co.uk
Tue Apr 2 08:57:42 UTC 2019
On 31/03/2019 17:17, Oleksandr Kravchuk wrote:
> License checksum from quota.c was removed since according to the
> project, copyrighted code in question has been replaced with own
> implementation (see @bcbc0d08e5cd).
>
> Removed patch has been upstreamed.
>
> Signed-off-by: Oleksandr Kravchuk <open.source at oleksandr-kravchuk.com>
> ---
> .../quota/quota/remove_non_posix_types.patch | 198 ------------------
> .../quota/{quota_4.04.bb => quota_4.05.bb} | 8 +-
> 2 files changed, 3 insertions(+), 203 deletions(-)
> delete mode 100644 meta/recipes-extended/quota/quota/remove_non_posix_types.patch
> rename meta/recipes-extended/quota/{quota_4.04.bb => quota_4.05.bb} (80%)
>
> 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 @@
> -Use proper C99 integer types
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Khem Raj <raj.khem at 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/meta/recipes-extended/quota/quota_4.04.bb b/meta/recipes-extended/quota/quota_4.05.bb
> similarity index 80%
> rename from meta/recipes-extended/quota/quota_4.04.bb
> rename to meta/recipes-extended/quota/quota_4.05.bb
> index 93f376286a..477d6b1a2a 100644
> --- a/meta/recipes-extended/quota/quota_4.04.bb
> +++ b/meta/recipes-extended/quota/quota_4.05.bb
> @@ -3,18 +3,16 @@ 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 \
> +LIC_FILES_CHKSUM = "file://rquota_server.c;beginline=1;endline=20;md5=fe7e0d7e11c6f820f8fa62a5af71230f \
> file://svc_socket.c;beginline=1;endline=17;md5=24d5a8792da45910786eeac750be8ceb"
You've explained why quota.c is dropped from LIC_FILES_CHKSUM, but it's
also worth explaining why svc_socket.c is added.
>
> SRC_URI = "${SOURCEFORGE_MIRROR}/project/linuxquota/quota-tools/${PV}/quota-${PV}.tar.gz \
> file://fcntl.patch \
> - file://remove_non_posix_types.patch \
> "
> SRC_URI_append_libc-musl = " file://replace_getrpcbynumber_r.patch"
>
> -SRC_URI[md5sum] = "f46f3b0b5141f032f25684005dac49d3"
> -SRC_URI[sha256sum] = "735be1887e7f51f54165e778ae43fc859c04e44d88834ecb2f470e91d4ef8edf"
> +SRC_URI[md5sum] = "1c1dbd2cd3d680ccac661239b067e147"
> +SRC_URI[sha256sum] = "ef3b5b5d1014ed1344b46c1826145e20cbef8db967b522403c9a060761cf7ab9"
>
> CVE_PRODUCT = "linux_diskquota"
>
>
--
Paul Barker
Managing Director & Principal Engineer
Beta Five Ltd
More information about the Openembedded-core
mailing list