mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-19 15:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

cracklib: upgrade to v2.9.10

Browse Source 
Remove a patch which has been applied upstream and rebase
another patch on top of v2.9.10

(From OE-Core rev: d9e8baaca5a6dfd1517f9f328d6644c72404f19e)

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Sudip Mukherjee
2023-03-29 12:30:00 +01:00
committed by Richard Purdie
parent 46fda7a1a8
commit 1e752c3a31
3 changed files with 15 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
meta/recipes-extended/cracklib/cracklib/0001-packlib.c-support-dictionary-byte-order-dependent.patch
View File

@@ -26,7 +26,7 @@ Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
1 file changed, 210 insertions(+), 4 deletions(-)
diff --git a/lib/packlib.c b/lib/packlib.c
index 8acb7be..a9d8750 100644
index 9396e1d..d0bb181 100644
--- a/lib/packlib.c
+++ b/lib/packlib.c
@@ -16,6 +16,12 @@
@@ -41,8 +41,8 @@ index 8acb7be..a9d8750 100644
+#include <byteswap.h>
#include "packer.h"
static const char vers_id[] = "packlib.c : v2.3p2 Alec Muffett 18 May 1993";
@@ -45,6 +51,185 @@ typedef struct
#define DEBUG 0
@@ -43,6 +49,185 @@ typedef struct
char data_get[NUMWORDS][MAXWORDLEN];
} PWDICT64;
@@ -228,7 +228,7 @@ index 8acb7be..a9d8750 100644
static int
_PWIsBroken64(FILE *ifp)
@@ -57,6 +242,7 @@ _PWIsBroken64(FILE *ifp)
@@ -55,6 +240,7 @@ _PWIsBroken64(FILE *ifp)
return 0;
}
@@ -236,7 +236,7 @@ index 8acb7be..a9d8750 100644
return (pdesc64.header.pih_magic == PIH_MAGIC);
}
@@ -149,7 +335,11 @@ PWOpen(prefix, mode)
@@ -147,7 +333,11 @@ PWOpen(prefix, mode)
pdesc.header.pih_blocklen = NUMWORDS;
pdesc.header.pih_numwords = 0;
@@ -249,7 +249,7 @@ index 8acb7be..a9d8750 100644
} else
{
pdesc.flags &= ~PFOR_WRITE;
@@ -173,6 +363,7 @@ PWOpen(prefix, mode)
@@ -171,6 +361,7 @@ PWOpen(prefix, mode)
return NULL;
}
@@ -257,7 +257,7 @@ index 8acb7be..a9d8750 100644
if ((pdesc.header.pih_magic == 0) || (pdesc.header.pih_numwords == 0))
{
/* uh-oh. either a broken "64-bit" file or a garbage file. */
@@ -195,6 +386,7 @@ PWOpen(prefix, mode)
@@ -193,6 +384,7 @@ PWOpen(prefix, mode)
}
return NULL;
}
@@ -265,7 +265,7 @@ index 8acb7be..a9d8750 100644
if (pdesc64.header.pih_magic != PIH_MAGIC)
{
/* nope, not "64-bit" after all */
@@ -290,6 +482,7 @@ PWOpen(prefix, mode)
@@ -288,6 +480,7 @@ PWOpen(prefix, mode)
{
pdesc.flags &= ~PFOR_USEHWMS;
}
@@ -273,7 +273,7 @@ index 8acb7be..a9d8750 100644
for (i = 0; i < sizeof(pdesc.hwms) / sizeof(pdesc.hwms[0]); i++)
{
pdesc.hwms[i] = pdesc64.hwms[i];
@@ -299,6 +492,7 @@ PWOpen(prefix, mode)
@@ -297,6 +490,7 @@ PWOpen(prefix, mode)
{
pdesc.flags &= ~PFOR_USEHWMS;
}
@@ -281,7 +281,7 @@ index 8acb7be..a9d8750 100644
#if DEBUG
for (i=1; i<=0xff; i++)
{
@@ -332,7 +526,11 @@ PWClose(pwp)
@@ -330,7 +524,11 @@ PWClose(pwp)
return (-1);
}
@@ -294,7 +294,7 @@ index 8acb7be..a9d8750 100644
{
fprintf(stderr, "index magic fwrite failed\n");
return (-1);
@@ -351,7 +549,12 @@ PWClose(pwp)
@@ -349,7 +547,12 @@ PWClose(pwp)
printf("hwm[%02x] = %d\n", i, pwp->hwms[i]);
#endif
}
@@ -308,7 +308,7 @@ index 8acb7be..a9d8750 100644
}
}
@@ -405,7 +608,8 @@ PutPW(pwp, string)
@@ -403,7 +606,8 @@ PutPW(pwp, string)
datum = (uint32_t) ftell(pwp->dfp);
@@ -318,7 +318,7 @@ index 8acb7be..a9d8750 100644
fputs(pwp->data_put[0], pwp->dfp);
putc(0, (FILE*) pwp->dfp);
@@ -464,6 +668,7 @@ GetPW(pwp, number)
@@ -462,6 +666,7 @@ GetPW(pwp, number)
perror("(index fread failed)");
return NULL;
}
@@ -326,7 +326,7 @@ index 8acb7be..a9d8750 100644
datum = datum64;
} else {
if (fseek(pwp->ifp, sizeof(struct pi_header) + (thisblock * sizeof(uint32_t)), 0))
@@ -477,6 +682,7 @@ GetPW(pwp, number)
@@ -475,6 +680,7 @@ GetPW(pwp, number)
perror("(index fread failed)");
return NULL;
}

53
meta/recipes-extended/cracklib/cracklib/0002-craklib-fix-testnum-and-teststr-failed.patch
View File

@@ -1,53 +0,0 @@
From 7250328d7f77069726603ef7132826c9260d3c92 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Sat, 27 Apr 2013 16:02:30 +0800
Subject: [PATCH 2/2] craklib:fix testnum and teststr failed
Error log:
...
$ ./testnum
(null).pwd.gz: No such file or directory
PWOpen: No such file or directory
$ ./util/teststr
(null).pwd.gz: No such file or directory
PWOpen: No such file or directory
...
Set DEFAULT_CRACKLIB_DICT as the path of PWOpen
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Upstream-Status: Submitted [https://github.com/cracklib/cracklib/pull/42]
---
util/testnum.c | 2 +-
util/teststr.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/testnum.c b/util/testnum.c
index ae2246d..ca210ff 100644
--- a/util/testnum.c
+++ b/util/testnum.c
@@ -20,7 +20,7 @@ main ()
PWDICT *pwp;
char buffer[STRINGSIZE];
- if (!(pwp = PWOpen (NULL, "r")))
+ if (!(pwp = PWOpen (DEFAULT_CRACKLIB_DICT, "r")))
{
perror ("PWOpen");
return (-1);
diff --git a/util/teststr.c b/util/teststr.c
index 2a31fa4..9fb9cda 100644
--- a/util/teststr.c
+++ b/util/teststr.c
@@ -15,7 +15,7 @@ main ()
PWDICT *pwp;
char buffer[STRINGSIZE];
- if (!(pwp = PWOpen (NULL, "r")))
+ if (!(pwp = PWOpen (DEFAULT_CRACKLIB_DICT, "r")))
{
perror ("PWOpen");
return (-1);
--
2.20.1

3
meta/recipes-extended/cracklib/cracklib_2.9.8.bb → meta/recipes-extended/cracklib/cracklib_2.9.10.bb
View File

@@ -11,10 +11,9 @@ EXTRA_OECONF = "--without-python --libdir=${base_libdir}"
SRC_URI = "git://github.com/cracklib/cracklib;protocol=https;branch=main \
file://0001-packlib.c-support-dictionary-byte-order-dependent.patch \
file://0002-craklib-fix-testnum-and-teststr-failed.patch \
"
SRCREV = "d9e8f9f47718539aeba80f90f4e072549926dc9c"
SRCREV = "e74c539344d024709ee76e2920b0af7f9a5c5556"
S = "${WORKDIR}/git/src"
inherit autotools gettext