Message ID | 1688699627-2519-8-git-send-email-wangmy@fujitsu.com |
---|---|
State | New |
Headers | show |
Series | [meta-oe] passwdqc: upgrade 2.0.2 -> 2.0.3 | expand |
On Thu, Jul 6, 2023 at 8:14 PM wangmy <wangmy@fujitsu.com> wrote: > > From: Wang Mingyu <wangmy@fujitsu.com> > > makefile-add-ldflags.patch > refreshed for 2.0.3 > > Changelog: > =========== > -Added pkg-config file. > -Changed enforce=users to support "chpasswd" PAM service in addition to > traditionally supported "passwd". > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > ...rkmanager_1.42.6.bb => networkmanager_1.42.8.bb} | 2 +- > .../passwdqc/passwdqc/makefile-add-ldflags.patch | 13 ++++++++++++- > .../{passwdqc_2.0.2.bb => passwdqc_2.0.3.bb} | 2 +- > 3 files changed, 14 insertions(+), 3 deletions(-) > rename meta-networking/recipes-connectivity/networkmanager/{networkmanager_1.42.6.bb => networkmanager_1.42.8.bb} (99%) > rename meta-oe/recipes-security/passwdqc/{passwdqc_2.0.2.bb => passwdqc_2.0.3.bb} (96%) > > diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.8.bb > similarity index 99% > rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb > rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.8.bb > index 3196b0c244..5d9c6f4274 100644 > --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb > +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.8.bb > @@ -32,7 +32,7 @@ SRC_URI = " \ > file://enable-iwd.conf \ > " > > -SRC_URI[sha256sum] = "8c388ac3775ac6bceb605fae21be2c3e261cafe6067994a89f0dfa4610ed0279" > +SRC_URI[sha256sum] = "0337e7583d2ec5ade2ba2e8c625d2f09eeccda1d22836ee29aa72925d399c353" Please separate the networkmanager update into a patch of its own. > > S = "${WORKDIR}/NetworkManager-${PV}" > > 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 6e4803f4f3..4e9659aa58 100644 > --- a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch > +++ b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch > @@ -3,10 +3,15 @@ Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this > Upstream-Status: Pending > > Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > +--- > + Makefile | 5 ++--- > + 1 file changed, 2 insertions(+), 3 deletions(-) > > +diff --git a/Makefile b/Makefile > +index 404f036..a9b18f0 100644 > --- a/Makefile > +++ b/Makefile > -@@ -68,18 +68,17 @@ XGETTEXT = xgettext > +@@ -75,13 +75,12 @@ XGETTEXT = xgettext > XGETTEXT_OPTS = --keyword=_ --keyword=P2_:1,1 --keyword=P3_:1,2 --language=C --add-comments > MSGMERGE = msgmerge > > @@ -21,9 +26,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB) > LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN) > LDFLAGS_lib_HP = $(LDFLAGS_shared_HP) > +@@ -90,7 +89,7 @@ LDFLAGS_lib_CYGWIN = $(LDFLAGS_shared) \ > + -Wl,--export-all-symbols \ > + -Wl,--enable-auto-import > 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) > +-- > +2.34.1 > + > diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb > similarity index 96% > rename from meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb > rename to meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb > index 8462701b31..8694052e61 100644 > --- a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb > +++ b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb > @@ -30,7 +30,7 @@ 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" > +SRC_URI[sha256sum] = "53b0f4bc49369f06195e9e13abb6cff352d5acb79e861004ec95973896488cf4" > > # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam > # this package's pam_passwdqc.so needs pam > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#103695): https://lists.openembedded.org/g/openembedded-devel/message/103695 > Mute This Topic: https://lists.openembedded.org/mt/99999658/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.8.bb similarity index 99% rename from meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb rename to meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.8.bb index 3196b0c244..5d9c6f4274 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.8.bb @@ -32,7 +32,7 @@ SRC_URI = " \ file://enable-iwd.conf \ " -SRC_URI[sha256sum] = "8c388ac3775ac6bceb605fae21be2c3e261cafe6067994a89f0dfa4610ed0279" +SRC_URI[sha256sum] = "0337e7583d2ec5ade2ba2e8c625d2f09eeccda1d22836ee29aa72925d399c353" S = "${WORKDIR}/NetworkManager-${PV}" 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 6e4803f4f3..4e9659aa58 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch +++ b/meta-oe/recipes-security/passwdqc/passwdqc/makefile-add-ldflags.patch @@ -3,10 +3,15 @@ Add LDFLAGS variable to Makefile so that extra linker flags can be sent via this Upstream-Status: Pending Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +diff --git a/Makefile b/Makefile +index 404f036..a9b18f0 100644 --- a/Makefile +++ b/Makefile -@@ -68,18 +68,17 @@ XGETTEXT = xgettext +@@ -75,13 +75,12 @@ XGETTEXT = xgettext XGETTEXT_OPTS = --keyword=_ --keyword=P2_:1,1 --keyword=P3_:1,2 --language=C --add-comments MSGMERGE = msgmerge @@ -21,9 +26,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> -Wl,--soname,$(SHARED_LIB),--version-script,$(MAP_LIB) LDFLAGS_lib_SUN = $(LDFLAGS_shared_SUN) LDFLAGS_lib_HP = $(LDFLAGS_shared_HP) +@@ -90,7 +89,7 @@ LDFLAGS_lib_CYGWIN = $(LDFLAGS_shared) \ + -Wl,--export-all-symbols \ + -Wl,--enable-auto-import 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) +-- +2.34.1 + diff --git a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb similarity index 96% rename from meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb rename to meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb index 8462701b31..8694052e61 100644 --- a/meta-oe/recipes-security/passwdqc/passwdqc_2.0.2.bb +++ b/meta-oe/recipes-security/passwdqc/passwdqc_2.0.3.bb @@ -30,7 +30,7 @@ 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" +SRC_URI[sha256sum] = "53b0f4bc49369f06195e9e13abb6cff352d5acb79e861004ec95973896488cf4" # explicitly define LINUX_PAM in case DISTRO_FEATURES no pam # this package's pam_passwdqc.so needs pam