Skip to contentSkip to conversation

nmap: Fix typo in pcre PACKAGECONFIG

PATCH In review Scott Ellis 4 participants 5 messages Feb 3, 2019 – Feb 5, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 nmap: Fix typo in pcre PACKAGECONFIG

---
 meta-oe/recipes-security/nmap/nmap_7.70.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-security/nmap/nmap_7.70.bb +1 -1
index 01be151..1b4163a 100644
@@ -18,7 +18,7 @@ inherit autotools-brokensep pkgconfig pythonnative
 PACKAGECONFIG ?= "ncat nping ndiff pcap"
 
 PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap"
-PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpre"
+PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre"
 PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl"
 PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2"
 PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib"
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/2 nmap: Include additional FILES path for certs

If both ncat and ssl are in PACKAGECONFIG then the installer adds a cert bundle to

/usr/share/ncat/ca-bundle.crt

---
 meta-oe/recipes-security/nmap/nmap_7.70.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-security/nmap/nmap_7.70.bb +1 -1
index 1b4163a..df9b00c 100644
@@ -43,6 +43,6 @@ do_configure() {
     oe_runconf
 }
 
-FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"
+FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}/ncat"
 
 RDEPENDS_${PN} = "python"
Signature · 1 line
2.7.4
#2 lore raw

Re: [meta-oe][PATCH 2/2] nmap: Include additional FILES path for certs

These nmap patches got applied to master, thanks.

Do I need to send additional patches to get them into thud?

They are both bug fixes only and should both apply cleanly. The nmap recipe for master and thud were the same.

#3 lore raw

Re: [meta-oe][PATCH 2/2] nmap: Include additional FILES path for certs

Quoted 8 lines · Scott Ellis

These nmap patches got applied to master, thanks.

Do I need to send additional patches to get them into thud?

They are both bug fixes only and should both apply cleanly. The nmap recipe for master and thud were the same.
--

Yes please send a thud pull request and CC Armin who maintains the releases

Quoted 4 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

#4 lore raw

Re: [meta-oe][PATCH 2/2] nmap: Include additional FILES path for certs

Quoted 9 lines · Khem Raj
Quoted 7 lines · Scott Ellis

These nmap patches got applied to master, thanks.

Do I need to send additional patches to get them into thud?

They are both bug fixes only and should both apply cleanly. The nmap recipe for master and thud were the same.
--

Yes please send a thud pull request and CC Armin who maintains the releases

got it stagged already.

thanks.

Quoted 5 lines
Quoted 5 lines

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel