Run of fresh-snapshots for fling

Merge these changes:

git pull https://janitor.debian.net/git/fling fresh-snapshots/main
git pull https://janitor.debian.net/git/fling fresh-snapshots/pristine-tar
git pull https://janitor.debian.net/git/fling fresh-snapshots/upstream

Summary

Merged new upstream version: 1.1+git20201025.1.a616429 (was: 1.1).

Diff

Branch: main

diff --git a/Makefile b/Makefile
index 8342586..59f4e7f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-CFLAGS += -O2 -Wall -Wextra -pedantic -std=c99 -lm -lrt
+CFLAGS += -O2 -Wall -Wextra -pedantic -std=c99
+LIBS += -lm -lrt
 CC ?= gcc
 INSTALL ?= install
 DESTDIR ?=
@@ -7,7 +8,7 @@ exec_prefix ?= $(prefix)
 bindir = $(exec_prefix)/bin
 
 fling: fling.c
-	$(CC) -o fling $(CFLAGS) fling.c
+	$(CC) -o fling $(CFLAGS) fling.c $(LIBS)
 
 clean:
 	rm -f fling
diff --git a/debian/changelog b/debian/changelog
index 3b87a4d..f4472b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fling (1.1+git20201025.1.a616429-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+  * Drop patch 0001-Fails-to-build-due-to-due-to-Wl-as-needed.patch, present
+    upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 15 Mar 2022 14:28:37 -0000
+
 fling (1.1-3) unstable; urgency=medium
 
   * Fix FTBFS due to -Wl,--as-needed. (Closes: #972799)
diff --git a/debian/patches/0001-Fails-to-build-due-to-due-to-Wl-as-needed.patch b/debian/patches/0001-Fails-to-build-due-to-due-to-Wl-as-needed.patch
deleted file mode 100644
index 536c521..0000000
--- a/debian/patches/0001-Fails-to-build-due-to-due-to-Wl-as-needed.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0feaeca9b6df0369d2deb676478500d42144dcff Mon Sep 17 00:00:00 2001
-From: Helmut Grohne <helmut@subdivi.de>
-Date: Sat, 24 Oct 2020 23:59:36 +0100
-Subject: [PATCH] Fails to build due to due to -Wl,--as-needed
-
-fling fails to build from source on a number of 32bit architectures,
-because it links libraries in the wrong order. Nowadays, gcc defaults to
--Wl,--as-needed. Since it passes -lm before the main object, -lm is
-discarded and the floor symbol remains unresolved. Simply reordering the
-flags makes fling build.
-
-Bug: http://bugs.debian.org/972799
-Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
----
-
-upstream link: https://github.com/rjek/fling/commit/0feaeca9b6df0369d2deb676478500d42144dcff
-
- Makefile | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 8342586..59f4e7f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,4 +1,5 @@
--CFLAGS += -O2 -Wall -Wextra -pedantic -std=c99 -lm -lrt
-+CFLAGS += -O2 -Wall -Wextra -pedantic -std=c99
-+LIBS += -lm -lrt
- CC ?= gcc
- INSTALL ?= install
- DESTDIR ?=
-@@ -7,7 +8,7 @@ exec_prefix ?= $(prefix)
- bindir = $(exec_prefix)/bin
- 
- fling: fling.c
--	$(CC) -o fling $(CFLAGS) fling.c
-+	$(CC) -o fling $(CFLAGS) fling.c $(LIBS)
- 
- clean:
- 	rm -f fling
--- 
-2.11.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 2060021..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-0001-Fails-to-build-due-to-due-to-Wl-as-needed.patch
diff --git a/fling.c b/fling.c
index deb692e..4b0fe40 100644
--- a/fling.c
+++ b/fling.c
@@ -160,7 +160,7 @@ static int stats(off64_t bytes, off64_t predicted_size, const struct timespec *
     (void) clock_gettime(CLOCK_MONOTONIC_RAW, &current_time);
 
     passed.tv_sec = current_time.tv_sec - start_time->tv_sec;
-    passed.tv_nsec = current_time.tv_nsec - start_time->tv_sec;
+    passed.tv_nsec = current_time.tv_nsec - start_time->tv_nsec;
     passed_in_sec = passed.tv_sec + (passed.tv_nsec * 0.000000001);
 
     pretty_bytes(bytes, pretty_transferred, sizeof pretty_transferred);

Branch: pristine-tar

diff --git a/fling_1.1+git20201025.1.a616429.orig.tar.gz.delta b/fling_1.1+git20201025.1.a616429.orig.tar.gz.delta
new file mode 100644
index 0000000..39afd6e
Binary files /dev/null and b/fling_1.1+git20201025.1.a616429.orig.tar.gz.delta differ
diff --git a/fling_1.1+git20201025.1.a616429.orig.tar.gz.id b/fling_1.1+git20201025.1.a616429.orig.tar.gz.id
new file mode 100644
index 0000000..f4d830e
--- /dev/null
+++ b/fling_1.1+git20201025.1.a616429.orig.tar.gz.id
@@ -0,0 +1 @@
+f7e922cf94a17793c97d3c3c2e0df58cfaea9235

Branch: upstream

Tag: upstream/1.1+git20201025.1.a616429
diff --git a/Makefile b/Makefile
index 8342586..59f4e7f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-CFLAGS += -O2 -Wall -Wextra -pedantic -std=c99 -lm -lrt
+CFLAGS += -O2 -Wall -Wextra -pedantic -std=c99
+LIBS += -lm -lrt
 CC ?= gcc
 INSTALL ?= install
 DESTDIR ?=
@@ -7,7 +8,7 @@ exec_prefix ?= $(prefix)
 bindir = $(exec_prefix)/bin
 
 fling: fling.c
-	$(CC) -o fling $(CFLAGS) fling.c
+	$(CC) -o fling $(CFLAGS) fling.c $(LIBS)
 
 clean:
 	rm -f fling
diff --git a/fling.c b/fling.c
index deb692e..4b0fe40 100644
--- a/fling.c
+++ b/fling.c
@@ -160,7 +160,7 @@ static int stats(off64_t bytes, off64_t predicted_size, const struct timespec *
     (void) clock_gettime(CLOCK_MONOTONIC_RAW, &current_time);
 
     passed.tv_sec = current_time.tv_sec - start_time->tv_sec;
-    passed.tv_nsec = current_time.tv_nsec - start_time->tv_sec;
+    passed.tv_nsec = current_time.tv_nsec - start_time->tv_nsec;
     passed_in_sec = passed.tv_sec + (passed.tv_nsec * 0.000000001);
 
     pretty_bytes(bytes, pretty_transferred, sizeof pretty_transferred);

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☑ proposals not currently being rate-limited for maintainer sudipm.mukherjee@gmail.com
  • ☑ change set d755e4bd-c107-4a48-85b9-83f906180b21 is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots fling-dbgsymapt install -t fresh-snapshots fling

Lintian Result

Full worker log Full build log