cracklib: upgrade 2.9.7 -> 2.9.8
PATCH 1/1 cracklib: upgrade 2.9.7 -> 2.9.8
0001-rules-Drop-using-register-keyword.patch 0002-rules-Correct-parameter-types-to-Debug-calls.patch removed since they're included in 2.9.8
Signed-off-by Wang Mingyu <[email protected]>
---
...01-rules-Drop-using-register-keyword.patch | 278 ------------------
...rrect-parameter-types-to-Debug-calls.patch | 40 ---
.../{cracklib_2.9.7.bb => cracklib_2.9.8.bb} | 4 +-
3 files changed, 1 insertion(+), 321 deletions(-)
delete mode 100644 meta/recipes-extended/cracklib/cracklib/0001-rules-Drop-using-register-keyword.patch
delete mode 100644 meta/recipes-extended/cracklib/cracklib/0002-rules-Correct-parameter-types-to-Debug-calls.patch
rename meta/recipes-extended/cracklib/{cracklib_2.9.7.bb => cracklib_2.9.8.bb} (83%)meta/recipes-extended/cracklib/cracklib/0001-rules-Drop-using-register-keyword.patch deleted +0 -278
@@ -1,278 +0,0 @@ -From fe49471cfa7fe0618615c065f4c0ad04e888bf92 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 7 Aug 2022 12:24:39 -0700 -Subject: [PATCH 1/2] rules: Drop using register keyword - -This is a deprecated keyword - -Upstream-Status: Submitted [https://github.com/cracklib/cracklib/pull/48] -Signed-off-by: Khem Raj <[email protected]> ---- - src/lib/rules.c | 94 ++++++++++++++++++++++++------------------------- - 1 file changed, 47 insertions(+), 47 deletions(-) - -diff --git a/lib/rules.c b/lib/rules.c -index 3a2aa46..6e7a12a 100644 ---- a/lib/rules.c -+++ b/lib/rules.c -@@ -67,8 +67,8 @@ Suffix(myword, suffix) - char *myword; - char *suffix; - { -- register int i; -- register int j; -+ int i; -+ int j; - i = strlen(myword); - j = strlen(suffix); - -@@ -83,10 +83,10 @@ Suffix(myword, suffix) - - char * - Reverse(str) /* return a pointer to a reversal */ -- register char *str; -+ char *str; - { -- register int i; -- register int j; -+ int i; -+ int j; - static char area[STRINGSIZE]; - j = i = strlen(str); - while (*str) -@@ -99,9 +99,9 @@ Reverse(str) /* return a pointer to a reversal */ - - char * - Uppercase(str) /* return a pointer to an uppercase */ -- register char *str; -+ char *str; - { -- register char *ptr; -+ char *ptr; - static char area[STRINGSIZE]; - ptr = area; - while (*str) -@@ -116,9 +116,9 @@ Uppercase(str) /* return a pointer to an uppercase */ - - char * - Lowercase(str) /* return a pointer to an lowercase */ -- register char *str; -+ char *str; - { -- register char *ptr; -+ char *ptr; - static char area[STRINGSIZE]; - ptr = area; - while (*str) -@@ -133,9 +133,9 @@ Lowercase(str) /* return a pointer to an lowercase */ - - char * - Capitalise(str) /* return a pointer to an capitalised */ -- register char *str; -+ char *str; - { -- register char *ptr; -+ char *ptr; - static char area[STRINGSIZE]; - ptr = area; - -@@ -152,9 +152,9 @@ Capitalise(str) /* return a pointer to an capitalised */ - - char * - Pluralise(string) /* returns a pointer to a plural */ -- register char *string; -+ char *string; - { -- register int length; -+ int length; - static char area[STRINGSIZE]; - length = strlen(string); - strcpy(area, string); -@@ -193,11 +193,11 @@ Pluralise(string) /* returns a pointer to a plural */ - - char * - Substitute(string, old, new) /* returns pointer to a swapped about copy */ -- register char *string; -- register char old; -- register char new; -+ char *string; -+ char old; -+ char new; - { -- register char *ptr; -+ char *ptr; - static char area[STRINGSIZE]; - ptr = area; - while (*string) -@@ -211,11 +211,11 @@ Substitute(string, old, new) /* returns pointer to a swapped about copy */ - - char * - Purge(string, target) /* returns pointer to a purged copy */ -- register char *string; -- register char target; -+ char *string; -+ char target; - { -- register char *ptr; -- static char area[STRINGSIZE]; -+ char *ptr; -+ char area[STRINGSIZE]; - ptr = area; - while (*string) - { -@@ -238,11 +238,11 @@ Purge(string, target) /* returns pointer to a purged copy */ - - int - MatchClass(class, input) -- register char class; -- register char input; -+ char class; -+ char input; - { -- register char c; -- register int retval; -+ char c; -+ int retval; - retval = 0; - - switch (class) -@@ -357,8 +357,8 @@ MatchClass(class, input) - - char * - PolyStrchr(string, class) -- register char *string; -- register char class; -+ char *string; -+ char class; - { - while (*string) - { -@@ -373,11 +373,11 @@ PolyStrchr(string, class) - - char * - PolySubst(string, class, new) /* returns pointer to a swapped about copy */ -- register char *string; -- register char class; -- register char new; -+ char *string; -+ char class; -+ char new; - { -- register char *ptr; -+ char *ptr; - static char area[STRINGSIZE]; - ptr = area; - while (*string) -@@ -391,10 +391,10 @@ PolySubst(string, class, new) /* returns pointer to a swapped about copy */ - - char * - PolyPurge(string, class) /* returns pointer to a purged copy */ -- register char *string; -- register char class; -+ char *string; -+ char class; - { -- register char *ptr; -+ char *ptr; - static char area[STRINGSIZE]; - ptr = area; - while (*string) -@@ -433,7 +433,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - char *control; - { - int limit; -- register char *ptr; -+ char *ptr; - static char area[STRINGSIZE * 2] = {0}; - char area2[STRINGSIZE * 2] = {0}; - strcpy(area, input); -@@ -523,7 +523,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - return NULL; - } else - { -- register char *string; -+ char *string; - string = area; - while (*(string++)); - string[-1] = *(++ptr); -@@ -537,7 +537,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - return NULL; - } else - { -- register int i; -+ int i; - int start; - int length; - start = Char2Int(*(++ptr)); -@@ -563,7 +563,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - return NULL; - } else - { -- register int i; -+ int i; - i = Char2Int(*(++ptr)); - if (i < 0) - { -@@ -587,9 +587,9 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - return NULL; - } else - { -- register int i; -- register char *p1; -- register char *p2; -+ int i; -+ char *p1; -+ char *p2; - i = Char2Int(*(++ptr)); - if (i < 0) - { -@@ -696,7 +696,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - return NULL; - } else - { -- register int i; -+ int i; - if ((i = Char2Int(ptr[1])) < 0) - { - Debug(1, "Mangle: '=' weird argument in '%s'\n", control); -@@ -723,7 +723,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - case RULE_DFIRST: - if (area[0]) - { -- register int i; -+ int i; - for (i = 1; area[i]; i++) - { - area[i - 1] = area[i]; -@@ -735,7 +735,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - case RULE_DLAST: - if (area[0]) - { -- register int i; -+ int i; - for (i = 1; area[i]; i++); - area[i - 1] = '\0'; - } -@@ -771,7 +771,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - return NULL; - } else - { -- register int i; -+ int i; - - for (i = 0; area[i]; i++); - -@@ -815,8 +815,8 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - - int - PMatch(control, string) --register char *control; --register char *string; -+char *control; -+char *string; - { - while (*string && *control) - { --- -2.37.1 -
meta/recipes-extended/cracklib/cracklib/0002-rules-Correct-parameter-types-to-Debug-calls.patch deleted +0 -40
@@ -1,40 +0,0 @@ -From 793921a8ee4ae7f20e1fd2bbec5196bc83176b01 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -Date: Sun, 7 Aug 2022 12:25:24 -0700 -Subject: [PATCH 2/2] rules: Correct parameter types to Debug() calls - -Fixes -src/lib/rules.c:346:45: error: incompatible integer to pointer conversion passing 'char' to parameter of type 'char *'; take the address with & [-Wint-conversion] -src/lib/rules.c:804:53: error: incompatible integer to pointer conversion passing 'char' to parameter of type 'char *'; remove * [-Wint-conversion] Debug(1, "Mangle: unknown command %c in %s\n", *ptr, control); - ^~~~ -Upstream-Status: Submitted [https://github.com/cracklib/cracklib/pull/48] -Signed-off-by: Khem Raj <[email protected]> ---- - src/lib/rules.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/rules.c b/lib/rules.c -index 6e7a12a..4a34f91 100644 ---- a/lib/rules.c -+++ b/lib/rules.c -@@ -343,7 +343,7 @@ MatchClass(class, input) - break; - - default: -- Debug(1, "MatchClass: unknown class %c\n", class); -+ Debug(1, "MatchClass: unknown class %c\n", &class); - return (0); - break; - } -@@ -801,7 +801,7 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - } - - default: -- Debug(1, "Mangle: unknown command %c in %s\n", *ptr, control); -+ Debug(1, "Mangle: unknown command %c in %s\n", ptr, control); - return NULL; - break; - } --- -2.37.1 -
meta/recipes-extended/cracklib/cracklib_2.9.8.bb renamed from meta/recipes-extended/cracklib/cracklib_2.9.7.bb +1 -3
@@ -12,11 +12,9 @@ EXTRA_OECONF = "--without-python --libdir=${base_libdir}" SRC_URI = "git://github.com/cracklib/cracklib;protocol=https;branch=master \ file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \ file://0002-craklib-fix-testnum-and-teststr-failed.patch \ - file://0001-rules-Drop-using-register-keyword.patch \ - file://0002-rules-Correct-parameter-types-to-Debug-calls.patch \ " -SRCREV = "f83934cf3cced0c9600c7d81332f4169f122a2cf" +SRCREV = "d9e8f9f47718539aeba80f90f4e072549926dc9c" S = "${WORKDIR}/git/src" inherit autotools gettext
Signature · 1 line
2.25.1
PATCH 1/1 kmscube: upgrade to latest revision
0001-drm-common.c-do-not-use-invalid-modifier.patch 0001-texturator-Use-correct-GL-extension-header.patch removed since they're included in new version.
Signed-off-by Wang Mingyu <[email protected]>
--- ...common.c-do-not-use-invalid-modifier.patch | 27 --------------- ...ator-Use-correct-GL-extension-header.patch | 33 ------------------- meta/recipes-graphics/kmscube/kmscube_git.bb | 7 ++-- 3 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch delete mode 100644 meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch
meta/recipes-graphics/kmscube/kmscube/0001-drm-common.c-do-not-use-invalid-modifier.patch deleted +0 -27
@@ -1,27 +0,0 @@ -From bdde833c254092a47df6c7109a9751653c82aaae Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Mon, 8 Aug 2022 20:22:39 +0200 -Subject: [PATCH] drm-common.c: do not use invalid modifier - -Prior to kernel 5.19 this was a soft failure, but 5.19 -adds checks that result in a hard syscall fail. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/33] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - drm-common.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drm-common.c b/drm-common.c -index 5c9cca2..964e1c3 100644 ---- a/drm-common.c -+++ b/drm-common.c -@@ -92,7 +92,7 @@ struct drm_fb * drm_fb_get_from_bo(struct gbm_bo *bo) - modifiers[i] = modifiers[0]; - } - -- if (modifiers[0]) { -+ if (modifiers[0] && modifiers[0] != DRM_FORMAT_MOD_INVALID) { - flags = DRM_MODE_FB_MODIFIERS; - printf("Using modifier %" PRIx64 "\n", modifiers[0]); - }
meta/recipes-graphics/kmscube/kmscube/0001-texturator-Use-correct-GL-extension-header.patch deleted +0 -33
@@ -1,33 +0,0 @@ -From 2b74e0e32235f6ab2e3e42d53dea985a7ba6227f Mon Sep 17 00:00:00 2001 -From: Damian Hobson-Garcia <[email protected]> -Date: Wed, 16 Dec 2020 11:08:25 +0900 -Subject: [PATCH] texturator: Use correct GL extension header - -gl2ext.h is the extenstion header for OpenGL ES 2.0 and all later -versions according to the Khronos documentation [1]. gl3ext.h is either -an empty stub, or may not even exist on some platforms. - -[1]: https://www.khronos.org/registry/OpenGL/index_es.php#headers - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/kmscube/-/merge_requests/26] -Signed-off-by: Quentin Schulz <[email protected]> ---- - texturator.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/texturator.c b/texturator.c -index d9335d7..6d97856 100644 ---- a/texturator.c -+++ b/texturator.c -@@ -30,7 +30,7 @@ - #include <math.h> - - #include <GLES3/gl3.h> --#include <GLES3/gl3ext.h> -+#include <GLES2/gl2ext.h> - - #ifdef HAVE_LIBPNG - #include <png.h> --- -2.33.1 -
meta/recipes-graphics/kmscube/kmscube_git.bb +2 -5
@@ -10,11 +10,8 @@ DEPENDS = "virtual/libgles3 virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0" -SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https \ - file://0001-texturator-Use-correct-GL-extension-header.patch \ - file://0001-drm-common.c-do-not-use-invalid-modifier.patch \ - " +SRCREV = "3bf6ee1a02334386d87cfe356c3bfb0b24e1fed8" +SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git"
Signature · 1 line
2.25.1
PATCH 1/1 mesa: upgrade 22.1.6 -> 22.1.7
In reply to Wang MingyuSigned-off-by Wang Mingyu <[email protected]>
---
.../mesa/{mesa-gl_22.1.6.bb => mesa-gl_22.1.7.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
meta/recipes-graphics/mesa/{mesa_22.1.6.bb => mesa_22.1.7.bb} | 0
3 files changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-graphics/mesa/{mesa-gl_22.1.6.bb => mesa-gl_22.1.7.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_22.1.6.bb => mesa_22.1.7.bb} (100%)meta/recipes-graphics/mesa/mesa-gl_22.1.7.bb renamed from meta/recipes-graphics/mesa/mesa-gl_22.1.6.bb +0 -0
meta/recipes-graphics/mesa/mesa.inc +1 -1
@@ -25,7 +25,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-nir-nir_opt_move-fix-ALWAYS_INLINE-compiler-error.patch \ " -SRC_URI[sha256sum] = "22ced061eb9adab8ea35368246c1995c09723f3f71653cd5050c5cec376e671a" +SRC_URI[sha256sum] = "da838eb2cf11d0e08d0e9944f6bd4d96987fdc59ea2856f8c70a31a82b355d89" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)"
meta/recipes-graphics/mesa/mesa_22.1.7.bb renamed from meta/recipes-graphics/mesa/mesa_22.1.6.bb +0 -0
Signature · 1 line
2.25.1
PATCH 1/1 piglit: upgrade to latest revision
In reply to Wang Mingyu0004-CMakeLists.txt-add-missing-endian.h-check.patch removed sinct it's included in new version.
Signed-off-by Wang Mingyu <[email protected]>
--- ...Lists.txt-add-missing-endian.h-check.patch | 25 ------------------- meta/recipes-graphics/piglit/piglit_git.bb | 6 ++--- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-graphics/piglit/piglit/0004-CMakeLists.txt-add-missing-endian.h-check.patch
meta/recipes-graphics/piglit/piglit/0004-CMakeLists.txt-add-missing-endian.h-check.patch deleted +0 -25
@@ -1,25 +0,0 @@ -From a8ea135125b284a8a9c965d8091b3d1d9a31849c Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -Date: Tue, 5 Apr 2022 16:51:34 +0200 -Subject: [PATCH] CMakeLists.txt: add missing endian.h check - -This is needed to actually have HAVE_ENDIAN_H defined properly in config.h. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/648] -Signed-off-by: Alexander Kanavin <[email protected]> ---- - CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9fb0508da..158fac4bc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -481,6 +481,7 @@ check_include_file(sys/stat.h HAVE_SYS_STAT_H) - check_include_file(unistd.h HAVE_UNISTD_H) - check_include_file(fcntl.h HAVE_FCNTL_H) - check_include_file(linux/sync_file.h HAVE_LINUX_SYNC_FILE_H) -+check_include_file(endian.h HAVE_ENDIAN_H) - - if(DEFINED PIGLIT_INSTALL_VERSION) - set(PIGLIT_INSTALL_VERSION_SUFFIX
meta/recipes-graphics/piglit/piglit_git.bb +3 -3
@@ -10,11 +10,11 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma file://0001-cmake-install-bash-completions-in-the-right-place.patch \ file://0002-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ file://0003-tests-util-piglit-shader.c-do-not-hardcode-build-pat.patch \ - file://0004-CMakeLists.txt-add-missing-endian.h-check.patch \ - file://0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch" + file://0005-cmake-Don-t-enable-GLX-if-tests-are-disabled.patch \ + " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "6403e90dc7da02d486906cddab8d02c2552a8d46" +SRCREV = "265896c86f90cb72e8f218ba6a3617fca8b9a1e3" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}"
Signature · 1 line
2.25.1
PATCH 1/1 python3-dtschema: upgrade 2022.8.1 -> 2022.8.3
In reply to Wang MingyuSigned-off-by Wang Mingyu <[email protected]>
---
...ython3-dtschema_2022.8.1.bb => python3-dtschema_2022.8.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-devtools/python/{python3-dtschema_2022.8.1.bb => python3-dtschema_2022.8.3.bb} (83%)meta/recipes-devtools/python/python3-dtschema_2022.8.3.bb renamed from meta/recipes-devtools/python/python3-dtschema_2022.8.1.bb +1 -1
@@ -7,7 +7,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "dtschema" -SRC_URI[sha256sum] = "3e56a9920944223d6f93fd51ada19dd8db554ac9182ef52c1c5c9d4966ab30aa" +SRC_URI[sha256sum] = "128c88a393cd04154cef4d4b10a643e4473ae290b436e8e61d2e97ae8e53255d" DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += "python3-ruamel-yaml python3-jsonschema python3-rfc3987"
Signature · 1 line
2.25.1