sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (9212d00d4a200d1da92dd77d7f440142fcc4dee4)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (9212d00d4a200d1da92dd77d7f440142fcc4dee4)
- Date: Mon, 29 Dec 2014 23:49:11 -0600
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
ChangeLog | 4
crypto/cryptcat/CONFLICTS | 3
crypto/cryptcat/HISTORY | 3
libs/libvirt/DEPENDS | 6 -
libs/libvirt/HISTORY | 5
net/ebtables/BUILD | 2
net/ebtables/DETAILS | 27 +++++
net/ebtables/HISTORY | 3
net/ebtables/INSTALL | 3
net/ebtables/PRE_BUILD | 8 +
net/ebtables/ebtables-v2.0.10-4.tar.gz.sig |binary
net/ebtables/init.d/ebtables | 147
+++++++++++++++++++++++++++++
net/libnftnl/DEPENDS | 1
net/libnftnl/DETAILS | 20 +++
net/libnftnl/HISTORY | 3
net/libnftnl/PRE_BUILD | 8 +
net/nc/CONFLICTS | 1
net/nc/HISTORY | 3
net/netcat/CONFLICTS | 1
net/netcat/HISTORY | 3
net/nftables/DEPENDS | 2
net/nftables/DETAILS | 23 ++++
net/nftables/HISTORY | 3
net/nftables/PRE_BUILD | 8 +
security/nmap/BUILD | 2
security/nmap/CONFIGURE | 6 -
security/nmap/CONFLICTS | 3
security/nmap/DEPENDS | 5
security/nmap/HISTORY | 8 +
security/nmap/INSTALL | 5
security/nmap/PRE_SUB_DEPENDS | 5
security/nmap/REPAIR^none^PRE_SUB_DEPENDS | 5
security/nmap/SUB_DEPENDS | 11 ++
33 files changed, 325 insertions(+), 12 deletions(-)
New commits:
commit 9212d00d4a200d1da92dd77d7f440142fcc4dee4
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libvirt: Uses ebtables for firewall/NAT
commit 0eb6cd53bd3aaf4c2ed5e65b48b8f957db0590e6
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
ebtables: Install to /sbin not /usr/sbin
commit 78304e674ab95f7766b5dbadf92f0ce2d934aed0
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Added some Netfilter table user-space programs and libraries.
commit 41f7450ac7a8bb684af12e45de2e5b86009cfbec
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
libvirt: requires nmap version of ncat and symlink as nc
commit a57c56c7f495f459df9fbe55d9aff7f019b8ba63
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
nmap: Remove libdnet, add option for nc symlink, update CONFLICTS
Remove libdnet, the latest (from 2005) version is not compatible with
this version of nmap.
nmap.cc:166:45: fatal error: libdnet-stripped/include/config.h: No
such file or directory
Add option for nc -> ncat symlink
Conflict with nc/netcat (even if `nc` symlink option is not selected)
diff --git a/ChangeLog b/ChangeLog
index a99a7eb..9e87788 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * net/ebtables,nftables,libnftnl: Added some Netfilter table
user-space
+ programs and libraries.
+
2014-12-29 Ismael Luceno <ismael AT sourcemage.org>
* python-pypi/ranger: new spell, File manager with an ncurses frontend
* devel/cbp2make: new spell, Makefile generation tool for
Code::Blocks IDE
diff --git a/crypto/cryptcat/CONFLICTS b/crypto/cryptcat/CONFLICTS
index c1f0747..6ce94a8 100755
--- a/crypto/cryptcat/CONFLICTS
+++ b/crypto/cryptcat/CONFLICTS
@@ -1,2 +1,3 @@
conflicts netcat &&
-conflicts nc
+conflicts nc &&
+conflicts nmap
diff --git a/crypto/cryptcat/HISTORY b/crypto/cryptcat/HISTORY
index 0e53e52..706e744 100644
--- a/crypto/cryptcat/HISTORY
+++ b/crypto/cryptcat/HISTORY
@@ -1,2 +1,5 @@
+2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not
selected)
+
2013-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS, DEPENDS, BUILD, INSTALL, CONFIGURE, CONFLICTS: spell
created
diff --git a/libs/libvirt/DEPENDS b/libs/libvirt/DEPENDS
index ff5ba9e..ea9b7de 100755
--- a/libs/libvirt/DEPENDS
+++ b/libs/libvirt/DEPENDS
@@ -81,9 +81,9 @@ optional_depends 'fuse' \
'--without-fuse' \
'for FUSE filesystem support for lxc' &&
-suggest_depends nc '' '' 'for remote SSH tunneling' &&
+suggest_depends -sub 'NMAP_NCAT NMAP_NC_SYMLINK' nmap '' '' 'for remote SSH
tunneling' &&
suggest_depends 'bridge-utils' '' '' 'for creating TUN/TAP bridges' &&
suggest_depends 'iproute2' '' '' 'for routing between TUN/TAP interfaces' &&
suggest_depends 'dnsmasq' '' '' 'for providing DHCP on virtual networks' &&
-suggest_depends QEMU '' '' "for QEMU (use
${SPELL_COLOR}kvm${DEFAULT_COLOR} for QEMU/KVM) binaries?"
-
+suggest_depends QEMU '' '' "for QEMU (use
${SPELL_COLOR}kvm${DEFAULT_COLOR} for QEMU/KVM) binaries?" &&
+suggest_depends 'ebtables' '' '' 'for firewall/NAT support'
diff --git a/libs/libvirt/HISTORY b/libs/libvirt/HISTORY
index 2099ac4..0bb714f 100644
--- a/libs/libvirt/HISTORY
+++ b/libs/libvirt/HISTORY
@@ -1,3 +1,6 @@
+2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * DEPENDS: Uses ebtables for firewall/NAT
+
2014-12-04 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 1.2.9
* DEPENDS: Python is still optional, but ./configure no longer has
flags
@@ -6,7 +9,7 @@
* DETAILS: Updated to 1.1.1
* DEPENDS: --*-libssh2 -> --*-ssh2
-2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
+2013-07-28 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: udev => UDEV
2013-04-11 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/net/ebtables/BUILD b/net/ebtables/BUILD
new file mode 100755
index 0000000..1e007c9
--- /dev/null
+++ b/net/ebtables/BUILD
@@ -0,0 +1,2 @@
+sedit "s!CFLAGS:=.*!CFLAGS=${CFLAGS}!" ${SOURCE_DIRECTORY}/Makefile &&
+default_build_make
diff --git a/net/ebtables/DETAILS b/net/ebtables/DETAILS
new file mode 100755
index 0000000..dec5f31
--- /dev/null
+++ b/net/ebtables/DETAILS
@@ -0,0 +1,27 @@
+ SPELL=ebtables
+ VERSION=2.0.10-4
+ SOURCE=$SPELL-v$VERSION.tar.gz
+ SOURCE_URL[0]=ftp://ftp.netfilter.org/pub/${SPELL}/${SOURCE}
+ SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-v${VERSION}"
+ WEB_SITE=http://ebtables.netfilter.org/
+ ENTERED=20141229
+ LICENSE[0]=GPLv2
+ KEYWORDS="net"
+ SHORT='ebtables is a filtering tool for a bridging firewall'
+cat << EOF
+The ebtables program is a filtering tool for a Linux-based bridging firewall.
+It enables transparent filtering of network traffic passing through a Linux
+bridge. The filtering possibilities are limited to link layer filtering and
+some basic filtering on higher network layers. Advanced logging, MAC
DNAT/SNAT
+and brouter facilities are also included.
+
+The ebtables tool can be combined with the other Linux filtering tools
+(iptables, ip6tables and arptables) to make a bridging firewall that is also
+capable of filtering these higher network layers. This is enabled through the
+bridge-netfilter architecture which is a part of the standard Linux kernel.
+
+The ebtables and arptables codebase is maintained by the netfilter
developers,
+who were so kind to take over maintenance of the software. This website is
kept
+mainly as a documentation reference.
+EOF
diff --git a/net/ebtables/HISTORY b/net/ebtables/HISTORY
new file mode 100644
index 0000000..c66f725
--- /dev/null
+++ b/net/ebtables/HISTORY
@@ -0,0 +1,3 @@
+2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * Created
+
diff --git a/net/ebtables/INSTALL b/net/ebtables/INSTALL
new file mode 100755
index 0000000..ab5f059
--- /dev/null
+++ b/net/ebtables/INSTALL
@@ -0,0 +1,3 @@
+make install \
+ MANDIR=${INSTALL_ROOT}/usr/share/man \
+ BINDIR=${INSTALL_ROOT}/sbin
diff --git a/net/ebtables/PRE_BUILD b/net/ebtables/PRE_BUILD
new file mode 100755
index 0000000..da7fbce
--- /dev/null
+++ b/net/ebtables/PRE_BUILD
@@ -0,0 +1,8 @@
+if [[ "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "y" &&
+ "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "m" ]]; then
+ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
+ "CONFIG_BRIDGE_NF_EBTABLES module/built-in${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+default_pre_build
diff --git a/net/ebtables/ebtables-v2.0.10-4.tar.gz.sig
b/net/ebtables/ebtables-v2.0.10-4.tar.gz.sig
new file mode 100644
index 0000000..90a605b
Binary files /dev/null and b/net/ebtables/ebtables-v2.0.10-4.tar.gz.sig differ
diff --git a/net/ebtables/init.d/ebtables b/net/ebtables/init.d/ebtables
new file mode 100755
index 0000000..b79c829
--- /dev/null
+++ b/net/ebtables/init.d/ebtables
@@ -0,0 +1,147 @@
+#!/bin/bash
+#
+# init script for the Ethernet Bridge filter tables
+#
+# Written by Dag Wieers <dag AT wieers.com>
+# Modified by Rok Papez <rok.papez AT arnes.si>
+# Bart De Schuymer <bdschuym AT pandora.be>
+# Eric Sandall <sandalle AT sourcemage.org> for SMGL
simpleinit-msb
+#
+# chkconfig: - 15 85
+# description: Ethernet Bridge filtering tables
+#
+# config: /etc/sysconfig/ebtables (text)
+# /etc/sysconfig/ebtables.<table> (binary)
+
+PROGRAM=/sbin/ebtables
+RUNLEVEL=3
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+
+umask 0077
+
+#default configuration
+EBTABLES_TEXT_FORMAT="yes"
+EBTABLES_BINARY_FORMAT="yes"
+EBTABLES_MODULES_UNLOAD="yes"
+EBTABLES_SAVE_ON_STOP="no"
+EBTABLES_SAVE_ON_RESTART="no"
+EBTABLES_SAVE_COUNTER="no"
+
+config=/etc/sysconfig/ebtables-config
+[ -f "$config" ] && . "$config"
+
+[ -x ${PROGRAM} ] || exit 1
+[ -x ${PROGRAM}-save ] || exit 1
+[ -x ${PROGRAM}-restore ] || exit 1
+
+RETVAL=0
+desc="Ethernet bridge filtering"
+umask 0077
+
+start() {
+ echo -n $"Starting $desc (ebtables): "
+ if [ "$EBTABLES_BINARY_FORMAT" = "yes" ]; then
+ for table in $(ls /etc/sysconfig/ebtables.* 2>/dev/null | sed
-e 's/.*ebtables\.//' -e '/save/d' ); do
+ ${PROGRAM} -t $table --atomic-file
/etc/sysconfig/ebtables.$table --atomic-commit || RETVAL=1
+ done
+ else
+ ${PROGRAM}-restore < /etc/sysconfig/ebtables || RETVAL=1
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
+ print_status success
+ rm -f /var/lock/subsys/ebtables
+ else
+ print_status failure
+ fi
+ echo
+}
+
+stop() {
+ echo -n $"Stopping $desc (ebtables): "
+ for table in $(grep '^ebtable_' /proc/modules | sed -e
's/ebtable_\([^ ]*\).*/\1/'); do
+ ${PROGRAM} -t $table --init-table || RETVAL=1
+ done
+
+ if [ "$EBTABLES_MODULES_UNLOAD" = "yes" ]; then
+ for mod in $(grep -E '^(ebt|ebtable)_' /proc/modules | cut
-f1 -d' ') ebtables; do
+ rmmod $mod 2> /dev/null
+ done
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
+ print_status success
+ rm -f /var/lock/subsys/ebtables
+ else
+ print_status failure
+ fi
+ echo
+}
+
+restart() {
+ stop
+ start
+}
+
+save() {
+ echo -n $"Saving $desc (ebtables): "
+ if [ "$EBTABLES_TEXT_FORMAT" = "yes" ]; then
+ if [ -e /etc/sysconfig/ebtables ]; then
+ chmod 0600 /etc/sysconfig/ebtables
+ mv -f /etc/sysconfig/ebtables
/etc/sysconfig/ebtables.save
+ fi
+ ${PROGRAM}-save > /etc/sysconfig/ebtables || RETVAL=1
+ fi
+ if [ "$EBTABLES_BINARY_FORMAT" = "yes" ]; then
+ rm -f /etc/sysconfig/ebtables.*.save
+ for oldtable in $(ls /etc/sysconfig/ebtables.* 2>/dev/null |
grep -vF 'ebtables.save'); do
+ chmod 0600 $oldtable
+ mv -f $oldtable $oldtable.save
+ done
+ for table in $(grep '^ebtable_' /proc/modules | sed -e
's/ebtable_\([^ ]*\).*/\1/'); do
+ ${PROGRAM} -t $table --atomic-file
/etc/sysconfig/ebtables.$table --atomic-save || RETVAL=1
+ if [ "$EBTABLES_SAVE_COUNTER" = "no" ]; then
+ ${PROGRAM} -t $table --atomic-file
/etc/sysconfig/ebtables.$table -Z || RETVAL=1
+ fi
+ done
+ fi
+
+ if [ $RETVAL -eq 0 ]; then
+ print_status success
+ else
+ print_status failure
+ fi
+ echo
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ [ "$EBTABLES_SAVE_ON_STOP" = "yes" ] && save
+ stop
+ ;;
+ restart|reload)
+ [ "$EBTABLES_SAVE_ON_RESTART" = "yes" ] && save
+ restart
+ ;;
+ condrestart)
+ [ -e /var/lock/subsys/ebtables ] && restart
+ RETVAL=$?
+ ;;
+ save)
+ save
+ ;;
+ status)
+ ${PROGRAM}-save
+ RETVAL=$?
+ ;;
+ *)
+ echo $"Usage $0 {start|stop|restart|condrestart|save|status}"
+ RETVAL=1
+esac
+
+exit $RETVAL
diff --git a/net/libnftnl/DEPENDS b/net/libnftnl/DEPENDS
new file mode 100755
index 0000000..aa49cf1
--- /dev/null
+++ b/net/libnftnl/DEPENDS
@@ -0,0 +1 @@
+depends libmnl
diff --git a/net/libnftnl/DETAILS b/net/libnftnl/DETAILS
new file mode 100755
index 0000000..7353fb4
--- /dev/null
+++ b/net/libnftnl/DETAILS
@@ -0,0 +1,20 @@
+ SPELL=libnftnl
+ VERSION=1.0.3
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
+ SOURCE_URL[0]=http://www.netfilter.org/projects/${SPELL}/files/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL}.sig
+ SOURCE_GPG=netfilter.gpg:${SOURCE2}:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.netfilter.org/projects/${SPELL}/index.html
+ ENTERED=20141229
+ LICENSE[0]=GPLv2
+ KEYWORDS="net"
+ SHORT='libnftnl is a low-level userspace library to nf_tables'
+cat << EOF
+libnftnl is a userspace library providing a low-level netlink programming
+interface (API) to the in-kernel nf_tables subsystem. The library libnftnl
has
+been previously known as libnftables. This library is currently used by
+nftables.
+EOF
diff --git a/net/libnftnl/HISTORY b/net/libnftnl/HISTORY
new file mode 100644
index 0000000..c66f725
--- /dev/null
+++ b/net/libnftnl/HISTORY
@@ -0,0 +1,3 @@
+2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * Created
+
diff --git a/net/libnftnl/PRE_BUILD b/net/libnftnl/PRE_BUILD
new file mode 100755
index 0000000..139bcd8
--- /dev/null
+++ b/net/libnftnl/PRE_BUILD
@@ -0,0 +1,8 @@
+if [[ "$(get_kernel_config CONFIG_NF_TABLES)" != "y" &&
+ "$(get_kernel_config CONFIG_NF_TABLES)" != "m" ]]; then
+ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
+ "CONFIG_NF_TABLES module/built-in${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+default_pre_build
diff --git a/net/nc/CONFLICTS b/net/nc/CONFLICTS
index bc7c602..27928de 100755
--- a/net/nc/CONFLICTS
+++ b/net/nc/CONFLICTS
@@ -1,2 +1,3 @@
conflicts netcat &&
+conflicts nmap &&
conflicts cryptcat
diff --git a/net/nc/HISTORY b/net/nc/HISTORY
index 24ee934..f867055 100644
--- a/net/nc/HISTORY
+++ b/net/nc/HISTORY
@@ -1,3 +1,6 @@
+2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not
selected)
+
2013-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: fixed multijob build
* CONFLICTS: conflicts cryptcat
diff --git a/net/netcat/CONFLICTS b/net/netcat/CONFLICTS
index 30f1f19..ed5223e 100755
--- a/net/netcat/CONFLICTS
+++ b/net/netcat/CONFLICTS
@@ -1,2 +1,3 @@
conflicts nc &&
+conflicts nmap &&
conflicts cryptcat
diff --git a/net/netcat/HISTORY b/net/netcat/HISTORY
index 3062dd1..13738b1 100644
--- a/net/netcat/HISTORY
+++ b/net/netcat/HISTORY
@@ -1,3 +1,6 @@
+2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Conflicts with nmap (even if `nc` symlink option is not
selected)
+
2013-01-07 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: conflicts cryptcat
diff --git a/net/nftables/DEPENDS b/net/nftables/DEPENDS
new file mode 100755
index 0000000..4e3cb28
--- /dev/null
+++ b/net/nftables/DEPENDS
@@ -0,0 +1,2 @@
+depends libmnl &&
+depends libnftnl
diff --git a/net/nftables/DETAILS b/net/nftables/DETAILS
new file mode 100755
index 0000000..008b79f
--- /dev/null
+++ b/net/nftables/DETAILS
@@ -0,0 +1,23 @@
+ SPELL=nftables
+ VERSION=0.4
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=$SOURCE.sig
+ SOURCE_URL[0]=http://www.netfilter.org/projects/${SPELL}/files/${SOURCE}
+ SOURCE2_URL[0]=${SOURCE_URL}.sig
+ SOURCE_GPG=netfilter.gpg:${SOURCE2}:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://www.netfilter.org/projects/${SPELL}/index.html
+ ENTERED=20141229
+ LICENSE[0]=GPLv2
+ KEYWORDS="net"
+ SHORT='nftables is a user-space utility for {ip,ip6,arp,eb}tables'
+cat << EOF
+nftables is the project that aims to replace the existing
{ip,ip6,arp,eb}tables
+framework. Basically, this project provides a new packet filtering
framework, a
+new userspace utility and also a compatibility layer for {ip,ip6}tables.
+
+nftables is built upon the building blocks of the Netfilter infrastructure
such
+as the existing hooks, the connection tracking system, the userspace queueing
+component and the logging subsystem.
+EOF
diff --git a/net/nftables/HISTORY b/net/nftables/HISTORY
new file mode 100644
index 0000000..c66f725
--- /dev/null
+++ b/net/nftables/HISTORY
@@ -0,0 +1,3 @@
+2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * Created
+
diff --git a/net/nftables/PRE_BUILD b/net/nftables/PRE_BUILD
new file mode 100755
index 0000000..da7fbce
--- /dev/null
+++ b/net/nftables/PRE_BUILD
@@ -0,0 +1,8 @@
+if [[ "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "y" &&
+ "$(get_kernel_config CONFIG_BRIDGE_NF_EBTABLES)" != "m" ]]; then
+ message "${SPELL_COLOR}$SPELL${DEFAULT_COLOR}${PROBLEM_COLOR} requires" \
+ "CONFIG_BRIDGE_NF_EBTABLES module/built-in${DEFAULT_COLOR}" &&
+ return 1
+fi &&
+
+default_pre_build
diff --git a/security/nmap/BUILD b/security/nmap/BUILD
index 6f4c9ff..feecaf6 100755
--- a/security/nmap/BUILD
+++ b/security/nmap/BUILD
@@ -1,4 +1,4 @@
LDFLAGS="${LDFLAGS/-Wl,--as-needed/}" &&
-OPTS="$NMAP_OPTS $OPTS" &&
+OPTS="$NMAP_OPTS --with-libdnet=included $OPTS" &&
default_build
diff --git a/security/nmap/CONFIGURE b/security/nmap/CONFIGURE
index 681f66f..6e6e626 100755
--- a/security/nmap/CONFIGURE
+++ b/security/nmap/CONFIGURE
@@ -8,4 +8,8 @@ config_query_option NMAP_OPTS "Build Nping utility?" y \
config_query_option NMAP_OPTS "Build Ncat utility?" y \
"--with-ncat" \
- "--without-ncat"
+ "--without-ncat" &&
+
+if list_find "$NMAP_OPTS" '--with-ncat'; then
+ config_query NMAP_NC_SYMLINK "Symlink nc to ncat?" n
+fi
diff --git a/security/nmap/CONFLICTS b/security/nmap/CONFLICTS
new file mode 100755
index 0000000..3b918f5
--- /dev/null
+++ b/security/nmap/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts nc &&
+conflicts netcat &&
+conflicts cryptcat
diff --git a/security/nmap/DEPENDS b/security/nmap/DEPENDS
index 22833ec..f21f4ab 100755
--- a/security/nmap/DEPENDS
+++ b/security/nmap/DEPENDS
@@ -29,11 +29,6 @@ optional_depends pcre \
"--with-libpcre=included" \
"use external PCRE lib?" &&
-optional_depends libdnet \
- "--with-libdnet=$INSTALL_ROOT/usr" \
- "--with-libdnet=included" \
- "use external dnet lib?" &&
-
optional_depends LUA \
"--with-liblua=$INSTALL_ROOT/usr" \
"--with-liblua=included" \
diff --git a/security/nmap/HISTORY b/security/nmap/HISTORY
index 90d103a..40a4524 100644
--- a/security/nmap/HISTORY
+++ b/security/nmap/HISTORY
@@ -1,3 +1,11 @@
+2014-12-29 Eric Sandall <sandalle AT sourcemage.org>
+ * BUILD, DEPENDS: Remove libdnet, the latest (from 2005) version is
not
+ compatible with this version of nmap.
+ nmap.cc:166:45: fatal error: libdnet-stripped/include/config.h: No
such file or directory
+ * CONFIGURE: Add option for nc -> ncat symlink
+ * INSTALL, CONFLICTS: Conflict with nc/netcat (even if `nc` symlink
option is not selected)
+ * *SUB_DEPENDS: Allow forcing ncat utility and nc symlink
+
2014-10-24 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: use SSL provider
diff --git a/security/nmap/INSTALL b/security/nmap/INSTALL
new file mode 100755
index 0000000..5183e40
--- /dev/null
+++ b/security/nmap/INSTALL
@@ -0,0 +1,5 @@
+default_install &&
+if [[ "x$NMAP_NC_SYMLINK" == "xy" ]]; then
+ message "${MESSAGE_COLOR}Setting /usr/bin/nc ->
/usr/bin/ncat${DEFAULT_COLOR}" &&
+ ln -sf "${INSTALL_ROOT}"/usr/bin/ncat "${INSTALL_ROOT}"/usr/bin/nc
+fi
diff --git a/security/nmap/PRE_SUB_DEPENDS b/security/nmap/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..ec57b5e
--- /dev/null
+++ b/security/nmap/PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ NMAP_NCAT) list_find "NMAP_OPTS" '--with-ncat' && return 0 ;;
+ NMAP_NC_SYMLINK) [[ "x$NMAP_NC_SYMLINK" == "xy" ]] && return 0 ;;
+ *) echo "Unknown sub-depends!"; return 1;;
+esac
diff --git a/security/nmap/REPAIR^none^PRE_SUB_DEPENDS
b/security/nmap/REPAIR^none^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..ec57b5e
--- /dev/null
+++ b/security/nmap/REPAIR^none^PRE_SUB_DEPENDS
@@ -0,0 +1,5 @@
+case $THIS_SUB_DEPENDS in
+ NMAP_NCAT) list_find "NMAP_OPTS" '--with-ncat' && return 0 ;;
+ NMAP_NC_SYMLINK) [[ "x$NMAP_NC_SYMLINK" == "xy" ]] && return 0 ;;
+ *) echo "Unknown sub-depends!"; return 1;;
+esac
diff --git a/security/nmap/SUB_DEPENDS b/security/nmap/SUB_DEPENDS
new file mode 100755
index 0000000..d2918dc
--- /dev/null
+++ b/security/nmap/SUB_DEPENDS
@@ -0,0 +1,11 @@
+case $THIS_SUB_DEPENDS in
+ NMAP_NCAT) message "${MESSAGE_COLOR}ncat utility requested, forcing
it.${DEFAULT_COLOR}" &&
+ list_remove "NMAP_OPTS" '--without-ncat' &&
+ list_add "NMAP_OPTS" '--with-ncat'
+ ;;
+ NMAP_NC_SYMLINK) message "${MESSAGE_COLOR}nc -> ncat symlink requested,
forcing it.${DEFAULT_COLOR}" &&
+ persistent_add NMAP_NC_SYMLINK &&
+ NMAP_NC_SYMLINK="y"
+ ;;
+ *) message "${WARNING_COLOR}Unknown sub-depends!${DEFAULT_COLOR}"; return
1;;
+esac
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (9212d00d4a200d1da92dd77d7f440142fcc4dee4), Eric Sandall, 12/30/2014
Archive powered by MHonArc 2.6.24.