diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-security/passwdqc')
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch | 16 | ||||
| -rw-r--r-- | meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb (renamed from meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb) | 7 |
2 files changed, 10 insertions, 13 deletions
diff --git a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch index e9023492e0..6e4803f4f3 100644 --- a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch +++ b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch @@ -4,19 +4,17 @@ Upstream-Status: Pending Signed-off-by: Yi Zhao <yi.zhao@windriver.com> -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-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb index b148fdcb59..8462701b31 100644 --- a/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_1.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb @@ -25,13 +25,12 @@ inherit features_check REQUIRED_DISTRO_FEATURES = "pam" LICENSE = "BSD-1-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1b4af6f3d4ee079a38107366e93b334d" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ac99c8678577a1c2f9f04cccee411d5d" SRC_URI = "http://www.openwall.com/${BPN}/${BP}.tar.gz \ file://makefile-add-ldflags.patch \ " -SRC_URI[md5sum] = "3878b57bcd3fdbcf3d4b362dbc6228b9" -SRC_URI[sha256sum] = "d1fedeaf759e8a0f32d28b5811ef11b5a5365154849190f4b7fab670a70ffb14" +SRC_URI[sha256sum] = "ff1f505764c020f6a4484b1e0cc4fdbf2e3f71b522926d90b4709104ca0604ab" # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam # this package's pam_passwdqc.so needs pam @@ -58,7 +57,7 @@ do_install() { PROVIDES += "pam-${BPN}" PACKAGES =+ "lib${BPN} pam-${BPN}" -FILES:lib${BPN} = "${base_libdir}/libpasswdqc.so.0" +FILES:lib${BPN} = "${base_libdir}/libpasswdqc.so.1" FILES:pam-${BPN} = "${base_libdir}/security/pam_passwdqc.so" FILES:${PN}-dbg += "${base_libdir}/security/.debug" |