From a1c660848d8f3879ad4396b021e3dafdefeda333 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Thu, 26 Oct 2017 14:15:14 -0700 Subject: passwdqc: move to recipes-security Signed-off-by: Armin Kuster --- .../passwdqc/passwdqc/makefile-add-ldflags.patch | 31 +++++++++++ .../recipes-security/passwdqc/passwdqc_1.3.1.bb | 63 ++++++++++++++++++++++ .../passwdqc/passwdqc/makefile-add-ldflags.patch | 31 ----------- meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb | 63 ---------------------- 4 files changed, 94 insertions(+), 94 deletions(-) create mode 100644 meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch create mode 100644 meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb delete mode 100644 meta-oe/recipes-support/passwdqc/passwdqc/makefile-add-ldflags.patch delete mode 100644 meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.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 new file mode 100644 index 0000000000..e9023492e0 --- /dev/null +++ b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch @@ -0,0 +1,31 @@ +Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this variable. + +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 + +-LDFLAGS = + LDFLAGS_shared = --shared + LDFLAGS_shared_LINUX = --shared + LDFLAGS_shared_SUN = -G + LDFLAGS_shared_HP = -b + LDFLAGS_lib = $(LDFLAGS_shared) +-LDFLAGS_lib_LINUX = $(LDFLAGS_shared_LINUX) \ ++LDFLAGS_lib_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ + -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB) + LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN) + LDFLAGS_lib_HP = $(LDFLAGS_shared_HP) + LDFLAGS_pam = $(LDFLAGS_shared) +-LDFLAGS_pam_LINUX = $(LDFLAGS_shared_LINUX) \ ++LDFLAGS_pam_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ + -Wl,--version-script,$(MAP_PAM) + LDFLAGS_pam_SUN = $(LDFLAGS_shared_SUN) + LDFLAGS_pam_HP = $(LDFLAGS_shared_HP) diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb new file mode 100644 index 0000000000..198db3ce72 --- /dev/null +++ b/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb @@ -0,0 +1,63 @@ +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" + +LICENSE = "BSD" +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-support/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-oe/recipes-support/passwdqc/passwdqc/makefile-add-ldflags.patch deleted file mode 100644 index e9023492e0..0000000000 --- a/meta-oe/recipes-support/passwdqc/passwdqc/makefile-add-ldflags.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this variable. - -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 - --LDFLAGS = - LDFLAGS_shared = --shared - LDFLAGS_shared_LINUX = --shared - LDFLAGS_shared_SUN = -G - LDFLAGS_shared_HP = -b - LDFLAGS_lib = $(LDFLAGS_shared) --LDFLAGS_lib_LINUX = $(LDFLAGS_shared_LINUX) \ -+LDFLAGS_lib_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ - -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB) - LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN) - LDFLAGS_lib_HP = $(LDFLAGS_shared_HP) - LDFLAGS_pam = $(LDFLAGS_shared) --LDFLAGS_pam_LINUX = $(LDFLAGS_shared_LINUX) \ -+LDFLAGS_pam_LINUX = $(LDFLAGS) $(LDFLAGS_shared_LINUX) \ - -Wl,--version-script,$(MAP_PAM) - LDFLAGS_pam_SUN = $(LDFLAGS_shared_SUN) - LDFLAGS_pam_HP = $(LDFLAGS_shared_HP) diff --git a/meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb b/meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb deleted file mode 100644 index 198db3ce72..0000000000 --- a/meta-oe/recipes-support/passwdqc/passwdqc_1.3.1.bb +++ /dev/null @@ -1,63 +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" - -LICENSE = "BSD" -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}" -- cgit 1.2.3-korg