mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-21 14:31:02 +02:00
Merge pull request #1318 from glevand/for-merge-move2ps
coreos-overlay: Move to portage-stable
This commit is contained in:
Geoff Levand
commit
13174352d2
@ -1,2 +0,0 @@
|
||||
DIST nmap-6.40.tar.bz2 7871636 SHA256 491f77d8b3fb3bb38ba4e3850011fe6fb43bbe197f9382b88cb59fa4e8f7a401 SHA512 b0ccb7634838e814dc0e36a0dbfc8c74853ef9dc6a119b73ffc90caab8875cbae893e0d24371ea568f9fff969440ed2a2e89953a6dbb6eb26313a4ea25b02b3b WHIRLPOOL 18424b67a8ace959c129e00e4b0d8a8e893aa08cfabb1b47b4fe9fc4316c29f713a2f83b789db28b4158c18bf80aea0bee071751187c0eb7e1a4b6693c3f4f98
|
||||
DIST nmap-logo-64.png 3289 SHA256 4c72ff1eeffeeaa1039b251d9f2d675936e65db686fe3b57a35c2183ce67a8aa SHA512 fb102d12aaeebc8a97543ecd653a3606e86996ad679bc26d6e6e274ad05ec3e9f92521289d1a24153c521b699e8c0cfa65d8856bb49af53ee4837268bbc6b5d3 WHIRLPOOL 6093aadcb9880587e17d39d45fcbe57bb62777f220655e6ed5b5f900ce49cb8c5a53e24d7db0de6f8909eb0f8981f7565e6ae9b9bf9283a4ccccb0526eab5313
|
||||
@ -1,10 +0,0 @@
|
||||
diff -Naur nmap-4.75-orig/Makefile.in nmap-4.75/Makefile.in
|
||||
--- nmap-4.75-orig/Makefile.in 2008-09-05 07:32:06.000000000 +0200
|
||||
+++ nmap-4.75/Makefile.in 2008-09-09 16:34:38.000000000 +0200
|
||||
@@ -258,5 +258,5 @@
|
||||
./config.status --recheck
|
||||
|
||||
makefile.dep:
|
||||
- $(CXX) -MM $(CPPFLAGS) $(SRCS) > $@
|
||||
+ $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $(SRCS) > $@
|
||||
include makefile.dep
|
||||
@ -1,11 +0,0 @@
|
||||
--- nmap-5.10BETA1/Target.h.org 2009-12-08 08:21:59.000000000 +0100
|
||||
+++ nmap-5.10BETA1/Target.h 2009-12-08 08:22:02.000000000 +0100
|
||||
@@ -99,6 +99,8 @@
|
||||
|
||||
#ifndef NOLUA
|
||||
#include "nse_main.h"
|
||||
+#else
|
||||
+#include <string>
|
||||
#endif
|
||||
|
||||
#include "portreasons.h"
|
||||
@ -1,21 +0,0 @@
|
||||
diff -Naurp nmap-5.21-orig/Makefile.in nmap-5.21/Makefile.in
|
||||
--- nmap-5.21-orig/Makefile.in 2010-01-31 09:53:53.000000000 +0100
|
||||
+++ nmap-5.21/Makefile.in 2010-01-31 09:54:48.000000000 +0100
|
||||
@@ -253,7 +253,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZE
|
||||
|
||||
install-zenmap: $(ZENMAPDIR)/setup.py
|
||||
$(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
|
||||
- cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)")
|
||||
+ cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
|
||||
$(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
|
||||
# Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is
|
||||
# already a link.
|
||||
@@ -267,7 +267,7 @@ build-ndiff:
|
||||
cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)")
|
||||
|
||||
install-ndiff:
|
||||
- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)")
|
||||
+ cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" $(if $(DESTDIR),--root "$(DESTDIR)") --no-compile
|
||||
|
||||
NSE_FILES = scripts/script.db scripts/*.nse
|
||||
NSE_LIB_LUA_FILES = nselib/*.lua
|
||||
@ -1,20 +0,0 @@
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -119,6 +119,8 @@
|
||||
rm -f $@
|
||||
$(CXX) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
|
||||
|
||||
+$(NBASEDIR)/libnbase.a: nbase_build
|
||||
+
|
||||
build-%: %/Makefile
|
||||
cd $* && $(MAKE)
|
||||
|
||||
@@ -152,7 +154,7 @@
|
||||
liblinear_build: $(LIBLINEARDIR)/Makefile
|
||||
@echo Compiling liblinear; cd $(LIBLINEARDIR) && $(MAKE) liblinear.a CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)"
|
||||
|
||||
-build-nmap-update: nmap-update/default_channel.h
|
||||
+build-nmap-update: nbase_build nmap-update/default_channel.h
|
||||
|
||||
#$(LIBPCAPDIR)/Makefile:
|
||||
# @echo Configuring libpcap; cd $(LIBPCAPDIR); ./configure
|
||||
@ -1,20 +0,0 @@
|
||||
--- a/liblua/Makefile
|
||||
+++ b/liblua/Makefile
|
||||
@@ -11,7 +11,7 @@
|
||||
LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
|
||||
LIBS= -lm $(SYSLIBS) $(MYLIBS)
|
||||
|
||||
-AR= ar rcu
|
||||
+AR= ar
|
||||
RANLIB= ranlib
|
||||
RM= rm -f
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
a: $(ALL_A)
|
||||
|
||||
$(LUA_A): $(BASE_O)
|
||||
- $(AR) $@ $(BASE_O)
|
||||
+ $(AR) rcu $@ $(BASE_O)
|
||||
$(RANLIB) $@
|
||||
|
||||
$(LUA_T): $(LUA_O) $(LUA_A)
|
||||
@ -1,13 +0,0 @@
|
||||
--- nmap-6.40/ncat/ncat_posix.c.orig 2014-02-12 17:09:12.970777567 -0800
|
||||
+++ nmap-6.40/ncat/ncat_posix.c 2014-02-12 17:10:06.135387292 -0800
|
||||
@@ -122,7 +122,10 @@
|
||||
/* $Id$ */
|
||||
|
||||
#include "ncat.h"
|
||||
+
|
||||
+#ifdef HAVE_LUA
|
||||
#include "ncat_lua.h"
|
||||
+#endif
|
||||
|
||||
char **cmdline_split(const char *cmdexec);
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
--- a/zenmap/setup.py
|
||||
+++ b/zenmap/setup.py
|
||||
@@ -238,7 +238,6 @@
|
||||
self.set_perms()
|
||||
self.set_modules_path()
|
||||
self.fix_paths()
|
||||
- self.create_uninstaller()
|
||||
self.write_installed_files()
|
||||
|
||||
def get_installed_files(self):
|
||||
@@ -255,7 +254,6 @@
|
||||
for dirpath, dirs, files in os.walk(os.path.join(self.install_data, data_dir)):
|
||||
for dir in dirs:
|
||||
installed_files.append(os.path.join(dirpath, dir))
|
||||
- installed_files.append(os.path.join(self.install_scripts, "uninstall_" + APP_NAME))
|
||||
return installed_files
|
||||
|
||||
def create_uninstaller(self):
|
||||
@ -1,141 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-6.40-r1.ebuild,v 1.3 2013/12/01 20:36:20 zerochaos Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
PYTHON_REQ_USE="sqlite"
|
||||
inherit eutils flag-o-matic python-single-r1 toolchain-funcs
|
||||
|
||||
MY_P=${P/_beta/BETA}
|
||||
|
||||
DESCRIPTION="A utility for network exploration or security auditing"
|
||||
HOMEPAGE="http://nmap.org/"
|
||||
SRC_URI="
|
||||
http://nmap.org/dist/${MY_P}.tar.bz2
|
||||
http://dev.gentoo.org/~jer/nmap-logo-64.png
|
||||
"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
|
||||
IUSE="ipv6 +lua ncat ndiff nls nmap-update nping ssl zenmap"
|
||||
NMAP_LINGUAS=( de es fr hr hu id it ja pl pt_BR pt_PT ro ru sk zh )
|
||||
IUSE+=" ${NMAP_LINGUAS[@]/#/linguas_}"
|
||||
|
||||
NMAP_PYTHON_DEPEND="
|
||||
|| ( ${PYTHON_DEPS} )
|
||||
"
|
||||
RDEPEND="
|
||||
dev-libs/libpcre
|
||||
net-libs/libpcap[ipv6?]
|
||||
zenmap? (
|
||||
dev-python/pygtk:2
|
||||
${NMAP_PYTHON_DEPEND}
|
||||
)
|
||||
lua? ( >=dev-lang/lua-5.2[deprecated] )
|
||||
ndiff? ( ${NMAP_PYTHON_DEPEND} )
|
||||
nls? ( virtual/libintl )
|
||||
nmap-update? ( dev-libs/apr dev-vcs/subversion )
|
||||
ssl? ( dev-libs/openssl )
|
||||
"
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
src_unpack() {
|
||||
# prevent unpacking the logo
|
||||
unpack ${MY_P}.tar.bz2
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${PN}-4.75-nolua.patch \
|
||||
"${FILESDIR}"/${PN}-5.10_beta1-string.patch \
|
||||
"${FILESDIR}"/${PN}-5.21-python.patch \
|
||||
"${FILESDIR}"/${PN}-6.01-make.patch \
|
||||
"${FILESDIR}"/${PN}-6.25-liblua-ar.patch \
|
||||
"${FILESDIR}"/${P}-ncat-no-lua.patch \
|
||||
"${FILESDIR}"/${P}-uninstaller.patch
|
||||
|
||||
sed -i \
|
||||
-e 's/-m 755 -s ncat/-m 755 ncat/' \
|
||||
ncat/Makefile.in || die
|
||||
|
||||
if use nls; then
|
||||
local lingua=''
|
||||
for lingua in ${NMAP_LINGUAS}; do
|
||||
if ! use linguas_${lingua}; then
|
||||
rm -rf zenmap/share/zenmap/locale/${lingua}
|
||||
rm -f zenmap/share/zenmap/locale/${lingua}.po
|
||||
fi
|
||||
done
|
||||
else
|
||||
# configure/make ignores --disable-nls
|
||||
for lingua in ${NMAP_LINGUAS}; do
|
||||
rm -rf zenmap/share/zenmap/locale/${lingua}
|
||||
rm -f zenmap/share/zenmap/locale/${lingua}.po
|
||||
done
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e '/^ALL_LINGUAS =/{s|$| id|g;s|jp|ja|g}' \
|
||||
Makefile.in || die
|
||||
|
||||
# Fix desktop files wrt bug #432714
|
||||
sed -i \
|
||||
-e '/^Encoding/d' \
|
||||
-e 's|^Categories=.*|Categories=Network;System;Security;|g' \
|
||||
zenmap/install_scripts/unix/zenmap-root.desktop \
|
||||
zenmap/install_scripts/unix/zenmap.desktop || die
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# The bundled libdnet is incompatible with the version available in the
|
||||
# tree, so we cannot use the system library here.
|
||||
econf \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable nls) \
|
||||
$(use_with zenmap) \
|
||||
$(usex lua --with-liblua=/usr --without-liblua) \
|
||||
$(use_with ncat) \
|
||||
$(use_with ndiff) \
|
||||
$(use_with nmap-update) \
|
||||
$(use_with nping) \
|
||||
$(use_with ssl openssl) \
|
||||
--with-libdnet=included \
|
||||
--with-pcre=/usr
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake \
|
||||
AR=$(tc-getAR) \
|
||||
RANLIB=$(tc-getRANLIB )
|
||||
}
|
||||
|
||||
src_install() {
|
||||
LC_ALL=C emake -j1 \
|
||||
DESTDIR="${D}" \
|
||||
STRIP=: \
|
||||
nmapdatadir="${EPREFIX}"/usr/share/nmap \
|
||||
install
|
||||
if use nmap-update;then
|
||||
LC_ALL=C emake -j1 \
|
||||
-C nmap-update \
|
||||
DESTDIR="${D}" \
|
||||
STRIP=: \
|
||||
nmapdatadir="${EPREFIX}"/usr/share/nmap \
|
||||
install
|
||||
fi
|
||||
|
||||
dodoc CHANGELOG HACKING docs/README docs/*.txt
|
||||
|
||||
use zenmap && doicon "${DISTDIR}/nmap-logo-64.png"
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
DIST iperf-2.0.4.tar.gz 248493 RMD160 b021cc5f2a05465ff04d4b914c94692489e49a9e SHA1 78b6b78789eccf42b5deb783bd8a92469d1383e1 SHA256 3b52f1c178d6a99c27114929d5469c009197d15379c967b329bafb956f397944
|
||||
@ -1,107 +0,0 @@
|
||||
Set SO_LINGER on client sockets so that we don't stop timing a
|
||||
transfer until the server has acked our data. Without this, we end up
|
||||
stopping timing while data is still in flight and, if there's enough
|
||||
data in flight, we overreport bandwidth.
|
||||
|
||||
|
||||
diff --git a/include/Client.hpp b/include/Client.hpp
|
||||
index 1309a00..e1ab11c 100644
|
||||
--- a/include/Client.hpp
|
||||
+++ b/include/Client.hpp
|
||||
@@ -82,6 +82,9 @@ public:
|
||||
// client connect
|
||||
void Connect( );
|
||||
|
||||
+ // Closes underlying socket
|
||||
+ void Close( );
|
||||
+
|
||||
protected:
|
||||
thread_Settings *mSettings;
|
||||
char* mBuf;
|
||||
diff --git a/src/Client.cpp b/src/Client.cpp
|
||||
index e0a6950..484a240 100644
|
||||
--- a/src/Client.cpp
|
||||
+++ b/src/Client.cpp
|
||||
@@ -104,13 +104,18 @@ Client::Client( thread_Settings *inSettings ) {
|
||||
* ------------------------------------------------------------------- */
|
||||
|
||||
Client::~Client() {
|
||||
+ Close();
|
||||
+ DELETE_ARRAY( mBuf );
|
||||
+} // end ~Client
|
||||
+
|
||||
+void Client::Close() {
|
||||
if ( mSettings->mSock != INVALID_SOCKET ) {
|
||||
int rc = close( mSettings->mSock );
|
||||
WARN_errno( rc == SOCKET_ERROR, "close" );
|
||||
mSettings->mSock = INVALID_SOCKET;
|
||||
}
|
||||
- DELETE_ARRAY( mBuf );
|
||||
-} // end ~Client
|
||||
+}
|
||||
+
|
||||
|
||||
const double kSecs_to_usecs = 1e6;
|
||||
const int kBytes_to_Bits = 8;
|
||||
@@ -176,6 +181,8 @@ void Client::RunTCP( void ) {
|
||||
} while ( ! (sInterupted ||
|
||||
(!mMode_Time && 0 >= mSettings->mAmount)) && canRead );
|
||||
|
||||
+ Close();
|
||||
+
|
||||
// stop timing
|
||||
gettimeofday( &(reportstruct->packetTime), NULL );
|
||||
|
||||
@@ -193,7 +200,6 @@ void Client::RunTCP( void ) {
|
||||
/* -------------------------------------------------------------------
|
||||
* Send data using the connected UDP/TCP socket,
|
||||
* until a termination flag is reached.
|
||||
- * Does not close the socket.
|
||||
* ------------------------------------------------------------------- */
|
||||
|
||||
void Client::Run( void ) {
|
||||
@@ -316,7 +322,9 @@ void Client::Run( void ) {
|
||||
} while ( ! (sInterupted ||
|
||||
(mMode_Time && mEndTime.before( reportstruct->packetTime )) ||
|
||||
(!mMode_Time && 0 >= mSettings->mAmount)) && canRead );
|
||||
-
|
||||
+ if (! isUDP( mSettings)) {
|
||||
+ Close();
|
||||
+ }
|
||||
// stop timing
|
||||
gettimeofday( &(reportstruct->packetTime), NULL );
|
||||
CloseReport( mSettings->reporthdr, reportstruct );
|
||||
@@ -422,6 +430,9 @@ void Client::write_UDP_FIN( ) {
|
||||
fd_set readSet;
|
||||
struct timeval timeout;
|
||||
|
||||
+ FAIL(mSettings->mSock == INVALID_SOCKET,
|
||||
+ "Closed socket in write_UDP_FIN", mSettings);
|
||||
+
|
||||
int count = 0;
|
||||
while ( count < 10 ) {
|
||||
count++;
|
||||
diff --git a/src/PerfSocket.cpp b/src/PerfSocket.cpp
|
||||
index 3ecdbe0..0a9a27a 100644
|
||||
--- a/src/PerfSocket.cpp
|
||||
+++ b/src/PerfSocket.cpp
|
||||
@@ -152,6 +152,19 @@ void SetSocketOptions( thread_Settings *inSettings ) {
|
||||
(char*) &nodelay, len );
|
||||
WARN_errno( rc == SOCKET_ERROR, "setsockopt TCP_NODELAY" );
|
||||
}
|
||||
+
|
||||
+#ifdef SO_LINGER
|
||||
+ {
|
||||
+ // Set SO_LINGER so that we don't stop timing before the
|
||||
+ // far end acks our data.
|
||||
+ struct linger linger = {1, 360}; // { linger, seconds to linger for}
|
||||
+ int rc = setsockopt(inSettings->mSock, SOL_SOCKET, SO_LINGER,
|
||||
+ &linger, sizeof(linger));
|
||||
+ WARN_errno( rc == SOCKET_ERROR, "setsockopt SO_LINGER");
|
||||
+ }
|
||||
+#endif // SO_LINGER
|
||||
+
|
||||
+
|
||||
#endif
|
||||
}
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
# Copyright 1999-2005 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.confd,v 1.1 2005/01/23 10:52:13 ka0ttic Exp $
|
||||
|
||||
# extra options (run iperf -h for a list of supported options)
|
||||
IPERF_OPTS="--format Mbytes"
|
||||
@ -1,21 +0,0 @@
|
||||
#!/sbin/runscript
|
||||
# Copyright 1999-2005 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/files/iperf.initd,v 1.2 2005/01/23 10:52:13 ka0ttic Exp $
|
||||
|
||||
depend() {
|
||||
need net
|
||||
}
|
||||
|
||||
start() {
|
||||
ebegin "Starting iperf server"
|
||||
start-stop-daemon --start --quiet \
|
||||
--exec /usr/bin/iperf -- -s -D ${IPERF_OPTS} &>/dev/null
|
||||
eend $?
|
||||
}
|
||||
|
||||
stop() {
|
||||
ebegin "Shutting down iperf server"
|
||||
start-stop-daemon --stop --quiet --exec /usr/bin/iperf
|
||||
eend $?
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2010 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-misc/iperf/iperf-2.0.4.ebuild,v 1.11 2010/01/07 15:48:39 fauli Exp $
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="tool to measure IP bandwidth using UDP or TCP"
|
||||
HOMEPAGE="http://iperf.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
|
||||
IUSE="ipv6 threads debug"
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
cd "${S}"
|
||||
epatch "${FILESDIR}"/${PN}-so_linger.patch
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
econf \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable threads) \
|
||||
$(use_enable debug debuginfo)
|
||||
emake || die "emake failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
make DESTDIR="${D}" install || die "make install failed"
|
||||
dodoc INSTALL README
|
||||
dohtml doc/*
|
||||
newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN} || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
echo
|
||||
einfo "To run iperf in server mode, run:"
|
||||
einfo " /etc/init.d/iperf start"
|
||||
echo
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user