From: Wang Mingyu <wangmy@fujitsu.com>
To: <openembedded-core@lists.openembedded.org>
Cc: Wang Mingyu <wangmy@fujitsu.com>
Subject: [OE-core] [PATCH] cracklib: upgrade 2.9.7 -> 2.9.8
Date: Mon, 5 Sep 2022 17:03:17 +0800 [thread overview]
Message-ID: <1662368601-32265-1-git-send-email-wangmy@fujitsu.com> (raw)
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 <wangmy@fujitsu.com>
---
...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%)
diff --git a/meta/recipes-extended/cracklib/cracklib/0001-rules-Drop-using-register-keyword.patch b/meta/recipes-extended/cracklib/cracklib/0001-rules-Drop-using-register-keyword.patch
deleted file mode 100644
index a8446653eb..0000000000
--- a/meta/recipes-extended/cracklib/cracklib/0001-rules-Drop-using-register-keyword.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-From fe49471cfa7fe0618615c065f4c0ad04e888bf92 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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
-
diff --git a/meta/recipes-extended/cracklib/cracklib/0002-rules-Correct-parameter-types-to-Debug-calls.patch b/meta/recipes-extended/cracklib/cracklib/0002-rules-Correct-parameter-types-to-Debug-calls.patch
deleted file mode 100644
index a8692b0cca..0000000000
--- a/meta/recipes-extended/cracklib/cracklib/0002-rules-Correct-parameter-types-to-Debug-calls.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 793921a8ee4ae7f20e1fd2bbec5196bc83176b01 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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
-
diff --git a/meta/recipes-extended/cracklib/cracklib_2.9.7.bb b/meta/recipes-extended/cracklib/cracklib_2.9.8.bb
similarity index 83%
rename from meta/recipes-extended/cracklib/cracklib_2.9.7.bb
rename to meta/recipes-extended/cracklib/cracklib_2.9.8.bb
index ffed88ed01..786940a7e0 100644
--- a/meta/recipes-extended/cracklib/cracklib_2.9.7.bb
+++ b/meta/recipes-extended/cracklib/cracklib_2.9.8.bb
@@ -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
--
2.25.1
next reply other threads:[~2022-09-05 9:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-05 9:03 Wang Mingyu [this message]
2022-09-05 9:03 ` [OE-core] [PATCH] kmscube: upgrade to latest revision Wang Mingyu
2022-09-05 9:03 ` [OE-core] [PATCH] mesa: upgrade 22.1.6 -> 22.1.7 Wang Mingyu
2022-09-05 9:03 ` [OE-core] [PATCH] piglit: upgrade to latest revision Wang Mingyu
2022-09-05 9:03 ` [OE-core] [PATCH] python3-dtschema: upgrade 2022.8.1 -> 2022.8.3 Wang Mingyu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1662368601-32265-1-git-send-email-wangmy@fujitsu.com \
--to=wangmy@fujitsu.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.