Package: pipemeter
Version: 1.1.4-1
Followup-For: Bug #972958
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
X-Debbugs-Cc: lo...@ubuntu.com
Control: tags -1 patch
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* d/p/format-security-error.patch: Fix format-security error by using fputs
instead of fprintf.
* d/p/fix-make-install.patch: Fix issues with make install by using DESTDIR
and adjusting install arguments.
Thanks for considering the patch.
Logan
-- System Information:
Debian Release: bullseye/sid
APT prefers groovy-updates
APT policy: (500, 'groovy-updates'), (500, 'groovy-security'), (500,
'groovy'), (100, 'groovy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.8.0-33-generic (SMP w/8 CPU threads)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru pipemeter-1.1.4/debian/patches/fix-make-install.patch
pipemeter-1.1.4/debian/patches/fix-make-install.patch
--- pipemeter-1.1.4/debian/patches/fix-make-install.patch 1969-12-31
19:00:00.000000000 -0500
+++ pipemeter-1.1.4/debian/patches/fix-make-install.patch 2020-12-31
00:13:00.000000000 -0500
@@ -0,0 +1,13 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -24,8 +24,8 @@
+
+
+ install: pipemeter pipemeter.1
+- install -p pipemeter $(PREFIX)/bin
+- install -p pipemeter.1 $(PREFIX)/man/man1
++ install -Dp -t $(DESTDIR)$(PREFIX)/bin pipemeter
++ install -Dp -t $(DESTDIR)$(PREFIX)/man/man1 pipemeter.1
+
+ dist: pipemeter
+ sh pkgpipemeter.sh
diff -Nru pipemeter-1.1.4/debian/patches/format-security-error.patch
pipemeter-1.1.4/debian/patches/format-security-error.patch
--- pipemeter-1.1.4/debian/patches/format-security-error.patch 1969-12-31
19:00:00.000000000 -0500
+++ pipemeter-1.1.4/debian/patches/format-security-error.patch 2020-12-31
00:12:44.000000000 -0500
@@ -0,0 +1,29 @@
+--- a/pipemeter.c
++++ b/pipemeter.c
+@@ -397,7 +397,7 @@
+ fprintf(stderr,"\n");
+ exit(1);
+ } else {
+- fprintf(stderr,trailer);
++ fputs(trailer,stderr);
+ }
+ }
+
+@@ -487,7 +487,7 @@
+ }
+
+ strncpy(progressbar+1,progressfill,progress);
+- fprintf(stderr, progressbar);
++ fputs(progressbar,stderr);
+ fprintf(stderr," %s/s",buf2);
+ formatbytes(buf2,bytes);
+ fprintf(stderr," %s",buf2);
+@@ -497,7 +497,7 @@
+ fprintf(stderr,"\n");
+ exit(0);
+ } else {
+- fprintf(stderr,trailer);
++ fputs(trailer,stderr);
+ }
+ }
+
diff -Nru pipemeter-1.1.4/debian/patches/series
pipemeter-1.1.4/debian/patches/series
--- pipemeter-1.1.4/debian/patches/series 1969-12-31 19:00:00.000000000
-0500
+++ pipemeter-1.1.4/debian/patches/series 2020-12-31 00:13:00.000000000
-0500
@@ -0,0 +1,2 @@
+format-security-error.patch
+fix-make-install.patch
