Skip to contentSkip to conversation

Add 'tcp-wrappers' PACKAGECONFIG

PATCH In review Christopher Larson 2 participants 8 messages May 31, 2013

lore
Share & tools
lore

Christopher Larson

author
#0 lore raw

cover Add 'tcp-wrappers' PACKAGECONFIG

From: Christopher Larson <[email protected]>

This makes rpcbind, quota, systemd, portmap, and nfs-utils obey the same tcp wrappers PACKAGECONFIG which xinetd obeys.

The following changes since commit aa500de527b3afdac8765d68f9cd1c2e09149477:

hicolor-icon-theme: keep inherited dependencies and switch to gnomebase (2013-05-30 22:31:33 +0100)

are available in the git repository at:

https://github.com/kergoth/oe-core.git tcp-wrappers-packageconfig
https://github.com/kergoth/oe-core/tree/tcp-wrappers-packageconfig

Christopher Larson (5):
rpcbind: obey 'tcp-wrappers' PACKAGECONFIG
quota: obey 'tcp-wrappers' PACKAGECONFIG
systemd: obey 'tcp-wrappers' PACKAGECONFIG
portmap: obey 'tcp-wrappers' PACKAGECONFIG
nfs-utils: obey 'tcp-wrappers' PACKAGECONFIG

 meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb | 5 ++++-
 meta/recipes-connectivity/portmap/portmap_6.0.bb       | 5 ++++-
 meta/recipes-core/systemd/systemd_204.bb               | 5 +++--
 meta/recipes-extended/quota/quota_4.01.bb              | 3 +++
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb         | 3 +++
 5 files changed, 17 insertions(+), 4 deletions(-)
Signature · 1 line
1.8.3
author
#1 lore raw

PATCH 1/5 rpcbind: obey 'tcp-wrappers' PACKAGECONFIG

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-extended/rpcbind/rpcbind_0.2.0.bb +3 -0
index 1007613..f4a0367 100644
@@ -29,6 +29,9 @@ PR = "r4"
 
 inherit autotools update-rc.d
 
+PACKAGECONFIG ??= "tcp-wrappers"
+PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers"
+
 INITSCRIPT_NAME = "rpcbind"
 INITSCRIPT_PARAMS = "start 43 S . start 32 0 6 . stop 81 1 ."
Signature · 1 line
1.8.3
author
#2 lore raw

PATCH 2/5 quota: obey 'tcp-wrappers' PACKAGECONFIG

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/recipes-extended/quota/quota_4.01.bb | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-extended/quota/quota_4.01.bb +3 -0
index 80159a9..4dc7e68 100644
@@ -21,6 +21,9 @@ inherit autotools gettext
 
 EXTRA_OEMAKE += 'STRIP=""'
 
+PACKAGECONFIG ??= "tcp-wrappers"
+PACKAGECONFIG[tcp-wrappers] = "--with-tcpwrappers,--without-tcpwrappers,tcp-wrappers"
+
 do_install() {
 	oe_runmake prefix=${D}${prefix} install
 }
Signature · 1 line
1.8.3
author
#3 lore raw

PATCH 3/5 systemd: obey 'tcp-wrappers' PACKAGECONFIG

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/recipes-core/systemd/systemd_204.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/systemd/systemd_204.bb +3 -2
index e7b9f6a..5a63c7c 100644
@@ -10,7 +10,7 @@ PROVIDES = "udev"
 
 PE = "1"
 
-DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup tcp-wrappers glib-2.0 qemu-native util-linux"
+DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux"
 DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 
 SECTION = "base/shell"

@@ -41,7 +41,7 @@ LDFLAGS_libc-uclibc_append = " -lrt"
 
 GTKDOC_DOCDIR = "${S}/docs/"
 
-PACKAGECONFIG ??= "xz"
+PACKAGECONFIG ??= "xz tcp-wrappers"
 # Sign the journal for anti-tampering
 PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
 # regardless of PACKAGECONFIG, libgcrypt is always required to expand

@@ -49,6 +49,7 @@ PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt"
 DEPENDS += "libgcrypt"
 # Compress the journal
 PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz"
+PACKAGECONFIG[tcp-wrappers] = "--enable-tcpwrap,--disable-tcpwrap,tcp-wrappers"
 
 CACHED_CONFIGUREVARS = "ac_cv_path_KILL=${base_bindir}/kill"
Signature · 1 line
1.8.3
author
#4 lore raw

PATCH 4/5 portmap: obey 'tcp-wrappers' PACKAGECONFIG

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/recipes-connectivity/portmap/portmap_6.0.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-connectivity/portmap/portmap_6.0.bb +4 -1
index 07aa360..2ec6981 100644
@@ -1,6 +1,5 @@
 require portmap.inc
 
-DEPENDS += "tcp-wrappers"
 PR = "r7"
 
 SRC_URI = "http://www.sourcefiles.org/Networking/Tools/Miscellanenous/portmap-6.0.tgz \

@@ -13,8 +12,12 @@ SRC_URI[sha256sum] = "02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a28
 
 S = "${WORKDIR}/${BPN}_${PV}/"
 
+PACKAGECONFIG ??= "tcp-wrappers"
+PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers"
+
 CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS"
 CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
+EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@base_contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'"
 
 fakeroot do_install() {
     install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
Signature · 1 line
1.8.3
author
#5 lore raw

PATCH 5/5 nfs-utils: obey 'tcp-wrappers' PACKAGECONFIG

In reply to Christopher Larson

From: Christopher Larson <[email protected]>

Signed-off-by Christopher Larson <[email protected]>
---
 meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
meta/recipes-connectivity/nfs-utils/nfs-utils_1.2.8.bb +4 -1
index 2f35094..40b897b 100644
@@ -8,7 +8,7 @@ LICENSE = "MIT & GPLv2+ & BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84"
 
 # util-linux for libblkid
-DEPENDS = "libcap libnfsidmap libevent util-linux tcp-wrappers sqlite3"
+DEPENDS = "libcap libnfsidmap libevent util-linux sqlite3"
 RDEPENDS_${PN} = "rpcbind"
 RRECOMMENDS_${PN} = "kernel-module-nfsd"
 

@@ -45,6 +45,9 @@ EXTRA_OECONF = "--with-statduser=nobody \
                 --with-statdpath=/var/lib/nfs/statd \
                "
 
+PACKAGECONFIG ??= "tcp-wrappers"
+PACKAGECONFIG[tcp-wrappers] = "--with-tcp-wrappers,--without-tcp-wrappers,tcp-wrappers"
+
 INHIBIT_AUTO_STAGE = "1"
 
 PACKAGES =+ "${PN}-client ${PN}-stats"
Signature · 1 line
1.8.3
#6 lore raw
In reply to Christopher Larson
Quoted 2 lines · Christopher Larson

This makes rpcbind, quota, systemd, portmap, and nfs-utils obey the same tcp wrappers PACKAGECONFIG which xinetd obeys.

If many packages have the same packageconfig option, should this be a distro feature?

Ross

author
#7 lore raw
Quoted 7 lines · Ross
Quoted 1 line · Christopher Larson

This makes rpcbind, quota, systemd, portmap, and nfs-utils obey the same

tcp

Quoted 1 line

wrappers PACKAGECONFIG which xinetd obeys.

If many packages have the same packageconfig option, should this be a distro feature?

It's a good point. At first I thought to avoid that due to feature proliferation, but as you say, it would probably be a good idea.

Signature · 1 line
Christopher Larson