From 24f99219fdf06ae62b0f09ba634be1eeb0f009fd Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Wed, 9 Apr 2014 14:19:39 -0700 Subject: [PATCH 1/4] Add admonition about using our tarballs, not the autogenerated ones from GitHub Releases. --- docs/obtaining.rst | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docs/obtaining.rst b/docs/obtaining.rst index a746beb..aece584 100644 --- a/docs/obtaining.rst +++ b/docs/obtaining.rst @@ -28,6 +28,22 @@ http://stats.es.net/software/ tarball was not compressed, even though its filename had a ``.tar.gz`` suffix. +**Note:** GitHub, which currently hosts the iperf3 project, supports +a "Releases" feature, which can automatically generate ``.zip`` or ``.tar.gz`` +archives, on demand, from tags in the iperf3 source tree. These tags are +created during the release engineering process to mark the exact +version of files making up a release. + +In theory, the ``.tar.gz`` files produced by GitHub contain the same +contents as what are in the official tarballs, note that the tarballs +themselves will be different due to internal timestamps or other +metadata. Therefore these files will *not* match the published SHA256 +checksums and no guarantees can be made about the integrity of the +files. The authors of iperf3 always recommend downloading source +distributions from the the directory above (or a mirror site), and +verifying the SHA256 checksums before using them for any purpose, to +ensure the files have not been tampered with. + Source Code Repository ---------------------- From 5a657ae89463af8e463b5247b78af0845c440d60 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Thu, 10 Apr 2014 11:33:11 -0700 Subject: [PATCH 2/4] Get rid of this obsolete file. --- src/Makefile.old | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 src/Makefile.old diff --git a/src/Makefile.old b/src/Makefile.old deleted file mode 100644 index a544455..0000000 --- a/src/Makefile.old +++ /dev/null @@ -1,36 +0,0 @@ -CFLAGS=-g -Wall -OBJS=main.o iperf_api.o iperf_server_api.o iperf_tcp.o iperf_udp.o timer.o net.o tcp_window_size.o units.o iperf_util.o tcp_info.o locale.o iperf_error.o iperf_client_api.o -LDFLAGS= - -UNAME=$(shell uname) -ifeq ($(UNAME), Linux) -LDFLAGS= -luuid -endif - -all: iperf - -iperf: $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) -o iperf3 $(OBJS) - -profile: iperf - $(CC) -pg -o iperf-profile $(OBJS) - -dist: - make clean ; cd .. ; tar cvfz iperf3.0a3.tar.gz iperf3 --exclude .svn; cd iperf3 - -test: t_timer t_units t_uuid - ./t_timer - ./t_units - ./t_uuid - -t_timer: timer.o t_timer.o - $(CC) -o t_timer timer.o t_timer.o - -t_units: units.o t_units.o - $(CC) -o t_units units.o t_units.o - -t_uuid: uuid.o t_uuid.o - $(CC) -o t_uuid uuid.o t_uuid.o - -clean: - rm -f *.o iperf iperf-profile t_timer t_units t_uuid *.gz iperf3 *.BAK *~ From e5663022bd48fbb91c0e7e8a338e433c48b1ff05 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Thu, 10 Apr 2014 14:59:03 -0700 Subject: [PATCH 3/4] The LINUX Makefile variable is not used anywhere in the current Makefile infrastructure. So get rid of the autoconf goop that sets it. --- configure.ac | 5 ----- 1 file changed, 5 deletions(-) diff --git a/configure.ac b/configure.ac index 6a2979f..d82380c 100644 --- a/configure.ac +++ b/configure.ac @@ -20,11 +20,6 @@ AC_PROG_RANLIB AC_PROG_LN_S AC_PROG_LIBTOOL - -# Sets a conditional makefile variable so that certain Makefile tasks will be -# performed only on linux (currently, add -luuid to LD_FLAGS) -AM_CONDITIONAL(LINUX, [case $host_os in linux*) true;; *) false;; esac]) - # Checks for header files. AC_HEADER_STDC From d70a0bb238a1d13bbb07d4b4142e6be679fb7719 Mon Sep 17 00:00:00 2001 From: "Bruce A. Mah" Date: Thu, 10 Apr 2014 15:00:05 -0700 Subject: [PATCH 4/4] Regen. --- configure | 49 ++++++++++++++----------------------------------- 1 file changed, 14 insertions(+), 35 deletions(-) diff --git a/configure b/configure index 03453c2..c8aad82 100755 --- a/configure +++ b/configure @@ -789,8 +789,6 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -LINUX_FALSE -LINUX_TRUE CPP OTOOL64 OTOOL @@ -4479,13 +4477,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4482: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4480: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4485: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4483: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4488: output\"" >&5) + (eval echo "\"\$as_me:4486: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5680,7 +5678,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5683 "configure"' > conftest.$ac_ext + echo '#line 5681 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7533,11 +7531,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7536: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7534: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7540: \$? = $ac_status" >&5 + echo "$as_me:7538: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7872,11 +7870,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7875: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7873: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7879: \$? = $ac_status" >&5 + echo "$as_me:7877: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7977,11 +7975,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7980: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7978: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7984: \$? = $ac_status" >&5 + echo "$as_me:7982: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8032,11 +8030,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8035: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8033: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8039: \$? = $ac_status" >&5 + echo "$as_me:8037: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10835,7 +10833,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10838 "configure" +#line 10836 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10931,7 +10929,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10934 "configure" +#line 10932 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11159,18 +11157,6 @@ CC="$lt_save_CC" - -# Sets a conditional makefile variable so that certain Makefile tasks will be -# performed only on linux (currently, add -luuid to LD_FLAGS) - if case $host_os in linux*) true;; *) false;; esac; then - LINUX_TRUE= - LINUX_FALSE='#' -else - LINUX_TRUE='#' - LINUX_FALSE= -fi - - # Checks for header files. { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } @@ -11772,13 +11758,6 @@ $as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${LINUX_TRUE}" && test -z "${LINUX_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"LINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"LINUX\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0