mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-31 10:46:16 +00:00
Code Issues Releases Activity

misc/mbuffer: Update to 20200929

Browse Source 
Upstream changes according to the ChangeLog:
  - enhancement: added option --no-direct to disable use of O_DIRECT
  - defaults: raised default TCP timeout to 10ms for WAN connections
  - fix: leave TCP buffer size untouched if not set
  - enhancement: add option to set TCP timeout
  - performance optimization: use recv with MSG_WAITALL instead of read
  - configure fix: look for objdump also with target prefix
  - testing: make sure to use gtar for testing to avoid unexpected failures
  - portability: NetBSD compatibility fix
  - build enhancement: added dependency calculation for make
  - build enhancement: automatic version string generation

PR:		252737
Submitted by:	Fabian Keil <fk@fabiankeil.de>
This commit is contained in:
Joseph Mingrone 2021-01-16 16:56:30 +00:00
parent c63daa1f70
commit 051501c445
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=561737
4 changed files with 95 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/mbuffer/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mbuffer
PORTVERSION= 20200505
PORTVERSION= 20200929
CATEGORIES= misc
MASTER_SITES= http://www.maier-komor.de/software/mbuffer/

6
misc/mbuffer/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1588997358
SHA256 (mbuffer-20200505.tgz) = cc046183149e51814c23b9f83fd748cc1625a88ee128651ea500aa7bd5f01f0b
SIZE (mbuffer-20200505.tgz) = 146020
TIMESTAMP = 1608187011
SHA256 (mbuffer-20200929.tgz) = 53a6e3c14e9a049f18a09840653dd84f18e7ec7560f2dcf2b61c0ab5f0ead4e8
SIZE (mbuffer-20200929.tgz) = 147855

31
misc/mbuffer/files/patch-Makefile.in
View File

@ -1,21 +1,40 @@
--- Makefile.in.orig 2019-07-25 21:31:45 UTC
--- Makefile.in.orig 2020-09-29 20:57:02 UTC
+++ Makefile.in
@@ -42,7 +42,7 @@ TAR = @TAR@
@@ -42,26 +42,19 @@ TAR = @TAR@
TARGET = mbuffer$(EXE)
SOURCES = log.c network.c mbuffer.c hashing.c input.c common.c settings.c globals.c
-OBJECTS = $(SOURCES:%.c=build/%.o)
-DEPS = $(SOURCES:%.c=build/%.d)
+OBJECTS = $(SOURCES:.c=.o)
TESTTREE = /bin /usr/bin
@@ -54,9 +54,6 @@ $(OBJECTS): build config.h Makefile
.PHONY: clean all distclean install check testcleanup
-all: $(TARGET) idev.so tapetest.so have-af
+all: $(TARGET) idev.so have-af
-$(OBJECTS): config.h Makefile
+$(OBJECTS): config.h version.h Makefile
build:
mkdir build
-
-build/%.o: %.c
- $(CC) $(CFLAGS) -c $< -o $@
-
-build/%.d: %.c
- $(CC) -MM -MG -MT $(@:%.d=%.o) $(CFLAGS) $< -o $@
-
always:
$(TARGET): $(OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
version.h: always
@@ -195,7 +188,3 @@ tapetest.so: tapetest.c config.h
idev.so: idev.c config.h
$(CC) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)
-
-$(DEPS): | build
-
-include $(DEPS)

188
misc/mbuffer/files/patch-configure
View File

@ -1,43 +1,42 @@
Remove objdump and open/read/write/fstat symbol names check. objdump
is not available on all architectures and the symbol names are
unlikely to ever change from their visible names on FreeBSD.
Remove objdump symbol names check. objdump is not available on all
architectures and the symbol names are unlikely to ever change from
their visible names on FreeBSD.
--- configure.orig 2020-05-05 17:31:17 UTC
--- configure.orig 2020-09-29 20:57:02 UTC
+++ configure
@@ -625,7 +625,6 @@ LIBOBJS
@@ -625,8 +625,6 @@ LIBOBJS
AUTOCONF
DEBUG
ALLOCA
-ac_ct_OBJDUMP
-OBJDUMP
AWK
TAR
MT
@@ -4394,51 +4393,6 @@ $as_echo "no" >&6; }
fi
CP
@@ -4649,97 +4647,6 @@ fi
-for ac_prog in objdump gobjdump
-for ac_prog in gobjdump objdump
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
- # Extract the first word of "$target_alias-$ac_prog", so it can be a program name with args.
-set dummy $target_alias-$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_OBJDUMP+:} false; then :
-if ${ac_cv_prog_OBJDUMP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $OBJDUMP in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_OBJDUMP="$OBJDUMP" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- if test -n "$OBJDUMP"; then
- ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_OBJDUMP="$as_dir/$ac_word$ac_exec_ext"
- ac_cv_prog_OBJDUMP="$target_alias-$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
@ -45,10 +44,9 @@ unlikely to ever change from their visible names on FreeBSD.
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-OBJDUMP=$ac_cv_path_OBJDUMP
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
@ -60,110 +58,56 @@ unlikely to ever change from their visible names on FreeBSD.
-
- test -n "$OBJDUMP" && break
-done
-
# Check whether --enable-largefile was given.
if test "${enable_largefile+set}" = set; then :
enableval=$enable_largefile;
@@ -4653,11 +4607,7 @@ fi
-if test -z "$OBJDUMP"; then
- as_fn_error $? "unable to find objdump" "$LINENO" 5
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable assertions" >&5
$as_echo_n "checking whether to enable assertions... " >&6; }
# Check whether --enable-assert was given.
@@ -5673,86 +5623,12 @@ fi
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linking open() and write() to detect libc names" >&5
-$as_echo_n "checking linking open() and write() to detect libc names... " >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-
- #define _LARGEFILE64_SOURCE
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/stat.h>
- int main(int argc, char **argv) {
- unsigned x;
- struct stat st;
- open(*argv,O_RDONLY);
- fstat(0,&st);
- read(0,&x,sizeof(x));
- write(1,"null",4);
- }
-
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5
-$as_echo "OK" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking name of open() in C library" >&5
-$as_echo_n "checking name of open() in C library... " >&6; }
- libc_open=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^open/ { print $NF }'`
-
cat >>confdefs.h <<_ACEOF
-#define LIBC_OPEN $libc_open
+#define LIBC_OPEN open
+#define LIBC_READ read
+#define LIBC_WRITE write
+#define LIBC_FSTAT fstat
_ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_open" >&5
-$as_echo "$libc_open" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking name of read() in C library" >&5
-$as_echo_n "checking name of read() in C library... " >&6; }
- libc_read=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^read/ { print $NF }'`
-
-cat >>confdefs.h <<_ACEOF
-#define LIBC_READ $libc_read
-_ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_read" >&5
-$as_echo "$libc_read" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking name of write() in C library" >&5
-$as_echo_n "checking name of write() in C library... " >&6; }
- libc_write=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^write/ { print $NF }'`
-
-cat >>confdefs.h <<_ACEOF
-#define LIBC_WRITE $libc_write
-_ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_write" >&5
-$as_echo "$libc_write" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking name of fstat() in C library" >&5
-$as_echo_n "checking name of fstat() in C library... " >&6; }
- libc_fstat=`$OBJDUMP -T conftest | $AWK '/\*UND\*/ && $NF ~ /^fstat/ { print $NF }'`
-
-cat >>confdefs.h <<_ACEOF
-#define LIBC_FSTAT $libc_fstat
-_ACEOF
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_fstat" >&5
-$as_echo "$libc_fstat" >&6; }
-
- if test "$build" = "$target"; then
- ac_ct_OBJDUMP=$OBJDUMP
- for ac_prog in gobjdump objdump
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to link open/write test
-See \`config.log' for more details" "$LINENO" 5; }
- if test -n "$ac_ct_OBJDUMP"; then
- ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_OBJDUMP="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$ac_ct_OBJDUMP" && break
-done
-
- OBJDUMP=$ac_ct_OBJDUMP
- else
- OBJDUMP=""
- fi
-fi