From 747adab514e5f1572a12ad3b0aaf8f09dbcc0c1b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 6 Sep 2022 21:54:52 -0700 Subject: passwdqc: Upgrade to 2.0.2 License-Update: install-dependencies.sh and run-build-and-tests.sh are mentioned under GPL-2.0 but they are not included in release tarball Signed-off-by: Khem Raj --- .../passwdqc/passwdqc/makefile-add-ldflags.patch | 16 +++--- .../recipes-security/passwdqc/passwdqc_1.3.1.bb | 66 ---------------------- .../recipes-security/passwdqc/passwdqc_2.0.2.bb | 65 +++++++++++++++++++++ 3 files changed, 72 insertions(+), 75 deletions(-) delete mode 100644 meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb create mode 100644 meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb diff --git a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch index e9023492e0..6e4803f4f3 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch +++ b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch @@ -4,19 +4,17 @@ Upstream-Status: Pending Signed-off-by: Yi Zhao -diff --git a/Makefile b/Makefile -index 49d622d..cd17334 100644 --- a/Makefile +++ b/Makefile -@@ -48,18 +48,17 @@ CFLAGS = -Wall -W -O2 - CFLAGS_lib = $(CFLAGS) -fPIC - CFLAGS_bin = $(CFLAGS) -fomit-frame-pointer +@@ -68,18 +68,17 @@ XGETTEXT = xgettext + XGETTEXT_OPTS = --keyword=_ --keyword=P2_:1,1 --keyword=P3_:1,2 --language=C --add-comments + MSGMERGE = msgmerge -LDFLAGS = - LDFLAGS_shared = --shared - LDFLAGS_shared_LINUX = --shared - LDFLAGS_shared_SUN = -G - LDFLAGS_shared_HP = -b + LDFLAGS_shared = $(LDFLAGS) --shared + LDFLAGS_shared_LINUX = $(LDFLAGS) --shared + LDFLAGS_shared_SUN = $(LDFLAGS) -G + LDFLAGS_shared_HP = $(LDFLAGS) -b LDFLAGS_lib = $(LDFLAGS_shared) -LDFLAGS_lib_LINUX = $(LDFLAGS_shared_LINUX) \ +LDFLAGS_lib_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb deleted file mode 100644 index b148fdcb59..0000000000 --- a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb +++ /dev/null @@ -1,66 +0,0 @@ -SUMMARY = "A password/passphrase strength checking and enforcement toolset" -DESCRIPTION = "\ -passwdqc is a password/passphrase strength checking and policy enforcement \ -toolset, including an optional PAM module (pam_passwdqc), command-line \ -programs (pwqcheck and pwqgen), and a library (libpasswdqc). \ -pam_passwdqc is normally invoked on password changes by programs such as \ -passwd(1). It is capable of checking password or passphrase strength, \ -enforcing a policy, and offering randomly-generated passphrases, with \ -all of these features being optional and easily (re-)configurable. \ -\ -pwqcheck and pwqgen are standalone password/passphrase strength checking \ -and random passphrase generator programs, respectively, which are usable \ -from scripts. \ -\ -libpasswdqc is the underlying library, which may also be used from \ -third-party programs. \ -" - -HOMEPAGE = "http://www.openwall.com/passwdqc" -SECTION = "System Environment/Base" - -DEPENDS += "libpam" - -inherit features_check -REQUIRED_DISTRO_FEATURES = "pam" - -LICENSE = "BSD-1-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" - -SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ - file://makefile-add-ldflags.patch \ - " -SRC_URI[md5sum] = "3878b57bcd3fdbcf3d4b362dbc6228b9" -SRC_URI[sha256sum] = "d1fedeaf759e8a0f32d28b5811ef11b5a5365154849190f4b7fab670a70ffb14" - -# explicitly define LINUX_PAM in case DISTRO_FEATURES no pam -# this package's pam_passwdqc.so needs pam -CFLAGS:append = " -Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM" - -# -e is no longer default setting in bitbake.conf -EXTRA_OEMAKE = "-e" - -do_compile() { - # make sure sub make use environment to override variables in Makefile - # Linux) $(MAKE), there is a tab between - sed -i -e 's/Linux) $(MAKE) CFLAGS_lib/Linux) $(MAKE) -e CFLAGS_lib/' ${S}/Makefile - - # LD_lib and LD must be CC because of Makefile - oe_runmake LD="${CC}" -} - -do_install() { - oe_runmake install DESTDIR=${D} SHARED_LIBDIR=${base_libdir} \ - DEVEL_LIBDIR=${libdir} SECUREDIR=${base_libdir}/security \ - INSTALL="install -p" -} - -PROVIDES += "pam-${BPN}" -PACKAGES =+ "lib${BPN} pam-${BPN}" - -FILES:lib${BPN} = "${base_libdir}/libpasswdqc.so.0" -FILES:pam-${BPN} = "${base_libdir}/security/pam_passwdqc.so" -FILES:${PN}-dbg += "${base_libdir}/security/.debug" - -RDEPENDS:${PN} = "lib${BPN} pam-${BPN}" -RDEPENDS:pam-${BPN} = "lib${BPN}" diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb new file mode 100644 index 0000000000..de4bff8c79 --- /dev/null +++ b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb @@ -0,0 +1,65 @@ +SUMMARY = "A password/passphrase strength checking and enforcement toolset" +DESCRIPTION = "\ +passwdqc is a password/passphrase strength checking and policy enforcement \ +toolset, including an optional PAM module (pam_passwdqc), command-line \ +programs (pwqcheck and pwqgen), and a library (libpasswdqc). \ +pam_passwdqc is normally invoked on password changes by programs such as \ +passwd(1). It is capable of checking password or passphrase strength, \ +enforcing a policy, and offering randomly-generated passphrases, with \ +all of these features being optional and easily (re-)configurable. \ +\ +pwqcheck and pwqgen are standalone password/passphrase strength checking \ +and random passphrase generator programs, respectively, which are usable \ +from scripts. \ +\ +libpasswdqc is the underlying library, which may also be used from \ +third-party programs. \ +" + +HOMEPAGE = "http://www.openwall.com/passwdqc" +SECTION = "System Environment/Base" + +DEPENDS += "libpam" + +inherit features_check +REQUIRED_DISTRO_FEATURES = "pam" + +LICENSE = "BSD-1-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ac99c8678577a1c2f9f04cccee411d5d" + +SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ + file://makefile-add-ldflags.patch \ + " +SRC_URI[sha256sum] = "ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab" + +# explicitly define LINUX_PAM in case DISTRO_FEATURES no pam +# this package's pam_passwdqc.so needs pam +CFLAGS:append = " -Wall -fPIC -DHAVE_SHADOW -DLINUX_PAM" + +# -e is no longer default setting in bitbake.conf +EXTRA_OEMAKE = "-e" + +do_compile() { + # make sure sub make use environment to override variables in Makefile + # Linux) $(MAKE), there is a tab between + sed -i -e 's/Linux) $(MAKE) CFLAGS_lib/Linux) $(MAKE) -e CFLAGS_lib/' ${S}/Makefile + + # LD_lib and LD must be CC because of Makefile + oe_runmake LD="${CC}" +} + +do_install() { + oe_runmake install DESTDIR=${D} SHARED_LIBDIR=${base_libdir} \ + DEVEL_LIBDIR=${libdir} SECUREDIR=${base_libdir}/security \ + INSTALL="install -p" +} + +PROVIDES += "pam-${BPN}" +PACKAGES =+ "lib${BPN} pam-${BPN}" + +FILES:lib${BPN} = "${base_libdir}/libpasswdqc.so.0" +FILES:pam-${BPN} = "${base_libdir}/security/pam_passwdqc.so" +FILES:${PN}-dbg += "${base_libdir}/security/.debug" + +RDEPENDS:${PN} = "lib${BPN} pam-${BPN}" +RDEPENDS:pam-${BPN} = "lib${BPN}" -- cgit v1.2.3-54-g00ecf