From 665cfcf4c11816e17428369b5985b701e542bf93 Mon Sep 17 00:00:00 2001
From: Jan Palus <atler@pld-linux.org>
Date: Tue, 7 Dec 2021 12:12:02 +0100
Subject: [PATCH] remove patches: format-security, 4Gigbug and link dropped
 from spec in 71f4f5d

---
 format-security.patch  | 11 -----------
 librsync-4Gigbug.patch | 31 -------------------------------
 librsync-link.patch    | 26 --------------------------
 3 files changed, 68 deletions(-)
 delete mode 100644 format-security.patch
 delete mode 100644 librsync-4Gigbug.patch
 delete mode 100644 librsync-link.patch

diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index c0b7a64..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- librsync-0.9.7/buf.c~	2004-02-08 00:17:57.000000000 +0100
-+++ librsync-0.9.7/buf.c	2015-07-25 11:19:24.237688098 +0200
-@@ -213,7 +213,7 @@
- 
-     got = fread(*buf, 1, *len, f);
-     if (got == -1) {
--        rs_error(strerror(errno));
-+        rs_error("%s", strerror(errno));
-         return RS_IO_ERROR;
-     } else if (got == 0) {
-         rs_error("unexpected eof on fd%d", fileno(f));
diff --git a/librsync-4Gigbug.patch b/librsync-4Gigbug.patch
deleted file mode 100644
index fef0894..0000000
--- a/librsync-4Gigbug.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urN librsync-0.9.7/mdfour.h librsync-0.9.7dev/mdfour.h
---- librsync-0.9.7/mdfour.h	2004-02-07 18:17:57.000000000 -0500
-+++ librsync-0.9.7dev/mdfour.h	2006-03-06 03:21:46.000000000 -0500
-@@ -24,7 +24,7 @@
- #include "types.h"
- 
- struct rs_mdfour {
--    int                 A, B, C, D;
-+    unsigned int        A, B, C, D;
- #if HAVE_UINT64
-     uint64_t            totalN;
- #else
-diff -urN librsync-0.9.7/patch.c librsync-0.9.7dev/patch.c
---- librsync-0.9.7/patch.c	2004-09-17 17:35:50.000000000 -0400
-+++ librsync-0.9.7dev/patch.c	2006-03-06 03:21:06.000000000 -0500
-@@ -214,12 +214,12 @@
-     void            *buf, *ptr;
-     rs_buffers_t    *buffs = job->stream;
- 
--    len = job->basis_len;
--    
-     /* copy only as much as will fit in the output buffer, so that we
-      * don't have to block or store the input. */
--    if (len > buffs->avail_out)
-+    if (job->basis_len > buffs->avail_out)
-         len = buffs->avail_out;
-+    else
-+        len = job->basis_len;
- 
-     if (!len)
-         return RS_BLOCKED;
diff --git a/librsync-link.patch b/librsync-link.patch
deleted file mode 100644
index 7bd49a0..0000000
--- a/librsync-link.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- librsync-0.9.7/configure.ac.orig	2004-10-10 11:52:26.000000000 +0200
-+++ librsync-0.9.7/configure.ac	2004-10-18 22:39:40.600385603 +0200
-@@ -27,9 +27,9 @@
- AC_PROG_LIBTOOL
- 
- # Checks for libraries.
--AC_CHECK_LIB(z, deflate)
--AC_CHECK_LIB(bz2, BZ2_bzCompress)
--AC_CHECK_LIB(popt, poptGetContext,,[BUILD_POPT='popt/libpopt.a'; CFLAGS="$CFLAGS -I$srcdir/popt"])
-+dnl AC_CHECK_LIB(z, deflate)  -- unued
-+dnl AC_CHECK_LIB(bz2, BZ2_bzCompress)  -- unused
-+AC_CHECK_LIB(popt, poptGetContext,[BUILD_POPT=-lpopt],[BUILD_POPT='popt/libpopt.a'; CFLAGS="$CFLAGS -I$srcdir/popt"])
- 
- # Checks for header files.
- AC_FUNC_ALLOCA
---- librsync-0.9.7/Makefile.am.orig	2004-02-08 00:17:57.000000000 +0100
-+++ librsync-0.9.7/Makefile.am	2004-10-18 22:36:07.967024276 +0200
-@@ -60,7 +60,7 @@
- 
- rdiff_LDADD = @BUILD_POPT@ librsync.la
- 
--rdiff_DEPENDENCIES = @BUILD_POPT@ librsync.la
-+rdiff_DEPENDENCIES = librsync.la
- 
- # this script is used to build prototab.[ch]
- noinst_SCRIPTS = mkprototab.pl
-- 
2.44.0