diff -Nru rng-tools5-5/debian/changelog rng-tools5-5/debian/changelog
--- rng-tools5-5/debian/changelog	2022-12-03 21:21:14.000000000 +0000
+++ rng-tools5-5/debian/changelog	2022-12-03 10:33:40.000000000 +0000
@@ -1,3 +1,11 @@
+rng-tools5 (5-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Drop Vcs fields (points to upstream)
+  * Convert to 3.0 source format (Closes: #1007302)
+
+ -- Bastian Germann <bage@debian.org>  Sat, 03 Dec 2022 11:33:40 +0100
+
 rng-tools5 (5-4) unstable; urgency=low
 
   * Include init script (Closes: #909788)
diff -Nru rng-tools5-5/debian/control rng-tools5-5/debian/control
--- rng-tools5-5/debian/control	2022-12-03 21:21:14.000000000 +0000
+++ rng-tools5-5/debian/control	2022-12-03 10:33:40.000000000 +0000
@@ -4,8 +4,6 @@
 Maintainer: Michael Stone <mstone@debian.org>
 Build-Depends: debhelper (>= 10), debhelper (>= 9.20160709~) | dh-systemd, autoconf, automake, libgcrypt20-dev
 Standards-Version: 4.2.1
-Vcs-Browser: https://git.kernel.org/cgit/utils/kernel/rng-tools/rng-tools.git/
-Vcs-git: git://git.kernel.org/pub/scm/utils/kernel/rng-tools/rng-tools.git
 
 Package: rng-tools5
 Architecture: any
diff -Nru rng-tools5-5/debian/patches/debian.patch rng-tools5-5/debian/patches/debian.patch
--- rng-tools5-5/debian/patches/debian.patch	1970-01-01 00:00:00.000000000 +0000
+++ rng-tools5-5/debian/patches/debian.patch	2022-12-03 10:33:40.000000000 +0000
@@ -0,0 +1,23 @@
+--- rng-tools5-5.orig/rngd.c
++++ rng-tools5-5/rngd.c
+@@ -218,6 +218,8 @@ static int update_kernel_random(int rand
+ 
+ 	for (p = buf; p + random_step <= &buf[FIPS_RNG_BUFFER_SIZE];
+ 		 p += random_step) {
++		if (!server_running)
++			return 0;
+ 		random_add_entropy(p, random_step);
+ 		random_sleep();
+ 	}
+@@ -239,10 +241,10 @@ static void do_loop(int random_step)
+ 		{
+ 			int rc;
+ 
++		retry_same:
+ 			if (!server_running)
+ 				return;
+ 
+-		retry_same:
+ 			if (iter->disabled)
+ 				continue;	/* failed, no work */
+ 
diff -Nru rng-tools5-5/debian/patches/series rng-tools5-5/debian/patches/series
--- rng-tools5-5/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ rng-tools5-5/debian/patches/series	2022-12-03 10:33:40.000000000 +0000
@@ -0,0 +1 @@
+debian.patch
diff -Nru rng-tools5-5/debian/source/format rng-tools5-5/debian/source/format
--- rng-tools5-5/debian/source/format	1970-01-01 00:00:00.000000000 +0000
+++ rng-tools5-5/debian/source/format	2022-12-03 10:33:40.000000000 +0000
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru rng-tools5-5/rngd.c rng-tools5-5/rngd.c
--- rng-tools5-5/rngd.c	2022-12-03 21:21:14.000000000 +0000
+++ rng-tools5-5/rngd.c	2016-12-05 16:35:22.000000000 +0000
@@ -218,8 +218,6 @@
 
 	for (p = buf; p + random_step <= &buf[FIPS_RNG_BUFFER_SIZE];
 		 p += random_step) {
-		if (!server_running)
-			return 0;
 		random_add_entropy(p, random_step);
 		random_sleep();
 	}
@@ -241,10 +239,10 @@
 		{
 			int rc;
 
-		retry_same:
 			if (!server_running)
 				return;
 
+		retry_same:
 			if (iter->disabled)
 				continue;	/* failed, no work */