From f8918966a3eace36ce5a6b64eadbc2ae2ddfe7f8 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Wed, 8 Jan 2020 11:57:54 +0000
Subject: [PATCH] 1.7, fixes #1786376.

---
 .gitignore                              |  1 +
 sources                                 |  2 +-
 symlinks-coverity-overrun-dynamic.patch | 12 ------------
 symlinks-coverity-readlink.patch        | 12 ------------
 symlinks.spec                           | 22 +++++++++-------------
 5 files changed, 11 insertions(+), 38 deletions(-)
 delete mode 100644 symlinks-coverity-overrun-dynamic.patch
 delete mode 100644 symlinks-coverity-readlink.patch

diff --git a/.gitignore b/.gitignore
index e48e75b..7c0351b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 symlinks-1.2.tar.gz
 symlinks-1.4.tar.gz
+/symlinks-1.7.tar.gz
diff --git a/sources b/sources
index 6d757bf..0668c8a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c38ef760574c25c8a06fd2b5b141307d  symlinks-1.4.tar.gz
+SHA512 (symlinks-1.7.tar.gz) = 4a60440fc10f74256639086b28de52fdda8cad41d0935bd49729b0e4c787b40f6a75dc0fbc8b775c7a860d2929a808b1a165c05aa5b885e3c1eb0f05ab49cc5e
diff --git a/symlinks-coverity-overrun-dynamic.patch b/symlinks-coverity-overrun-dynamic.patch
deleted file mode 100644
index e5f0b49..0000000
--- a/symlinks-coverity-overrun-dynamic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up symlinks-1.4/symlinks.c.coverity-overrun-dynamic symlinks-1.4/symlinks.c
---- symlinks-1.4/symlinks.c.coverity-overrun-dynamic	2011-05-20 14:10:25.682843723 +0100
-+++ symlinks-1.4/symlinks.c	2011-05-20 14:11:15.792920839 +0100
-@@ -44,7 +44,7 @@ static int substr (char *s, char *old, c
- 		newlen = strlen(new);
- 
- 	if (newlen > oldlen) {
--		if ((tmp = malloc(strlen(s))) == NULL) {
-+		if ((tmp = malloc(strlen(s)+1)) == NULL) {
- 			fprintf(stderr, "no memory\n");
- 			exit (1);
- 		}
diff --git a/symlinks-coverity-readlink.patch b/symlinks-coverity-readlink.patch
deleted file mode 100644
index ce28ff8..0000000
--- a/symlinks-coverity-readlink.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up symlinks-1.4/symlinks.c.coverity-readlink symlinks-1.4/symlinks.c
---- symlinks-1.4/symlinks.c.coverity-readlink	2009-10-09 15:03:55.000000000 +0100
-+++ symlinks-1.4/symlinks.c	2011-05-20 14:10:25.682843723 +0100
-@@ -160,7 +160,7 @@ static void fix_symlink (char *path, dev
- 	struct stat stbuf, lstbuf;
- 	int c, fix_abs = 0, fix_messy = 0, fix_long = 0;
- 
--	if ((c = readlink(path, lpath, sizeof(lpath))) == -1) {
-+	if ((c = readlink(path, lpath, sizeof(lpath)-1)) == -1) {
- 		perror(path);
- 		return;
- 	}
diff --git a/symlinks.spec b/symlinks.spec
index 7d00ccf..19bbcdd 100644
--- a/symlinks.spec
+++ b/symlinks.spec
@@ -1,14 +1,13 @@
 Summary: A utility which maintains a system's symbolic links
 Name: symlinks
 URL: http://ibiblio.org/pub/Linux/utils/file/
-Version: 1.4
-Release: 23%{?dist}
+Version: 1.7
+Release: 1%{?dist}
 License: Copyright only
+# Upstream maintainer provided tarball, ibiblio no longer allowing uploads
 Source0: http://ibiblio.org/pub/Linux/utils/file/%{name}-%{version}.tar.gz
 # Taken from http://packages.debian.org/changelogs/pool/main/s/symlinks/symlinks_1.2-4.2/symlinks.copyright
 Source1: symlinks-LICENSE.txt
-Patch1: symlinks-coverity-readlink.patch
-Patch2: symlinks-coverity-overrun-dynamic.patch
 BuildRequires: gcc
 
 %description
@@ -24,28 +23,25 @@ symlinks on your system.
 %setup -q
 cp %{SOURCE1} .
 
-# Fix off-by-one error in call to readlink.
-%patch1 -p1 -b .coverity-readlink
-
-# Fix possible buffer overrun found by coverity.
-%patch2 -p1 -b .coverity-overrun-dynamic
-
 %build
 make CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) %{build_ldflags}" %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
 install -m 755 symlinks $RPM_BUILD_ROOT%{_bindir}
-install -m 644 symlinks.8 $RPM_BUILD_ROOT%{_mandir}/man8
+install -m 644 symlinks.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 %files
 %doc symlinks-LICENSE.txt
 %{_bindir}/symlinks
-%{_mandir}/man8/symlinks.8*
+%{_mandir}/man1/symlinks.1*
 
 %changelog
+* Wed Jan  8 2020 Tim Waugh <twaugh@redhta.com> - 1.7-1
+- 1.7, fixes #1786376.
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-23
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild