summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-10-31 12:42:20 +0000
committerJavier Jardón <jjardon@gnome.org>2014-10-31 12:42:34 +0000
commit1fedb0fe3de29ecbedb746546b70f3a84087ca5d (patch)
treedee43ecd55a8fd4088f52fa4c3e58b7f935bd027
parente41fed5540f4989073c3c93303875661676d7ccf (diff)
parent6749144f0fed5ce1218151ea4cedde70a85f9f38 (diff)
downloaddefinitions-1fedb0fe3de29ecbedb746546b70f3a84087ca5d.tar.gz
Merge branch 'baserock/jjardon/tcpwrappers'
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
-rw-r--r--strata/nfs.morph8
-rw-r--r--strata/nfs/nfs-utils.morph2
-rw-r--r--strata/nfs/rpcbind.morph2
3 files changed, 2 insertions, 10 deletions
diff --git a/strata/nfs.morph b/strata/nfs.morph
index f0956ff7..68988d54 100644
--- a/strata/nfs.morph
+++ b/strata/nfs.morph
@@ -9,12 +9,6 @@ chunks:
ref: 9364dff5c20e9e8c18f7f20ee1c92463e9e9c8a7
unpetrify-ref: baserock/release-2.0.21-stable
build-depends: []
-- name: tcp-wrappers
- morph: strata/nfs/tcp-wrappers.morph
- repo: upstream:tcp-wrappers
- ref: 23b65f29b324b65a057a3fa87613b788856d6e4e
- unpetrify-ref: baserock/fedora-patches
- build-depends: []
- name: ti-rpc
morph: strata/nfs/ti-rpc.morph
repo: upstream:ti-rpc
@@ -28,7 +22,6 @@ chunks:
unpetrify-ref: baserock/master
build-depends:
- ti-rpc
- - tcp-wrappers
- name: nfs-utils
morph: strata/nfs/nfs-utils.morph
repo: upstream:nfs-utils
@@ -36,5 +29,4 @@ chunks:
unpetrify-ref: baserock/master
build-depends:
- libevent
- - tcp-wrappers
- ti-rpc
diff --git a/strata/nfs/nfs-utils.morph b/strata/nfs/nfs-utils.morph
index d09c063e..c412e1d0 100644
--- a/strata/nfs/nfs-utils.morph
+++ b/strata/nfs/nfs-utils.morph
@@ -3,7 +3,7 @@ kind: chunk
build-system: autotools
configure-commands:
- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal
+- ./configure --prefix="$PREFIX" --disable-nfsv4 --disable-nfsv41 --disable-gss --with-rpcgen=internal --without-tcp-wrappers
install-commands:
- make DESTDIR="$DESTDIR" install
- mkdir -p "$DESTDIR"/lib/systemd/system
diff --git a/strata/nfs/rpcbind.morph b/strata/nfs/rpcbind.morph
index 35b9c77a..0ca929dc 100644
--- a/strata/nfs/rpcbind.morph
+++ b/strata/nfs/rpcbind.morph
@@ -3,7 +3,7 @@ kind: chunk
build-system: autotools
configure-commands:
- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX" --enable-libwrap --with-rpcuser=nobody --enable-warmstarts
+- ./configure --prefix="$PREFIX" --with-rpcuser=nobody --enable-warmstarts
install-commands:
- make DESTDIR="$DESTDIR" install
- mkdir -p "$DESTDIR"/lib/systemd/system