From e583acf52c9f050e33c88d6a607a67eac6d5747d Mon Sep 17 00:00:00 2001
From: chenmaodong <chenmaodong@huawei.com>
Date: Wed, 8 Jan 2020 22:02:52 +0800
Subject: [PATCH] remove sensitive information

---
 libsndfile.spec | 15 ++++++++++-----
 revert.patch    | 37 -------------------------------------
 2 files changed, 10 insertions(+), 42 deletions(-)
 delete mode 100644 revert.patch

diff --git a/libsndfile.spec b/libsndfile.spec
index 355f5d6..faf83ad 100644
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -1,6 +1,6 @@
 Name: libsndfile
 Version: 1.0.28
-Release: 15
+Release: 16
 Summary: Library for reading and writing sound files
 License: LGPLv2+ and GPLv2+ and BSD
 URL: http://www.mega-nerd.com/libsndfile/
@@ -12,10 +12,9 @@ BuildRequires: sqlite-devel
 
 Patch0:		libsndfile-1.0.25-system-gsm.patch
 Patch1:		libsndfile-1.0.25-zerodivfix.patch
-Patch2:		revert.patch
-Patch3:		libsndfile-1.0.28-flacbufovfl.patch
-Patch4:		libsndfile-1.0.29-cve2017_6892.patch
-Patch5:		libsndfile-1.0.28-cve2017_12562.patch
+Patch2:		libsndfile-1.0.28-flacbufovfl.patch
+Patch3:		libsndfile-1.0.29-cve2017_6892.patch
+Patch4:		libsndfile-1.0.28-cve2017_12562.patch
 Patch6000:	libsndfile-1.0.28-CVE-2018-13139-CVE-2018-19432.patch
 Patch6001:	libsndfile-1.0.28-src-wav.c-Fix-WAV-Sampler-Chunk-tune-parsing.patch
 Patch6002:	libsndfile-1.0.28-CVE-2018-19758.patch
@@ -130,6 +129,12 @@ LD_LIBRARY_PATH=$PWD/src/.libs make check
 %{_mandir}/man1/sndfile-salvage.1*
 
 %changelog
+* Wed Jan 08 2020 chenmaodong<chenmaodong@huawei.com> - 1.0.28-16
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:remove sensitive information
+
 * Mon Dec 23 2019 chenmaodong<chenmaodong@huawei.com> - 1.0.28-15
 - Type:enhancement
 - ID:NA
diff --git a/revert.patch b/revert.patch
deleted file mode 100644
index fbdd96d..0000000
--- a/revert.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- libsndfile-1.0.28/src/rf64.c	2017-04-02 09:43:22.000000000 +0200
-+++ libsndfile-1.0.27/src/rf64.c	2016-04-01 23:08:53.000000000 +0200
-@@ -735,25 +734,27 @@ rf64_write_header (SF_PRIVATE *psf, int
- 
- #endif
- 
--	pad_size = psf->dataoffset - 16 - psf->header.indx ;
--	if (pad_size >= 0)
--		psf_binheader_writef (psf, "m4z", PAD_MARKER, pad_size, make_size_t (pad_size)) ;
-+	if (psf->header.indx + 8 < psf->dataoffset)
-+	{	/* Add PAD data if necessary. */
-+		int k = psf->dataoffset - 16 - psf->header.indx ;
-+		psf_binheader_writef (psf, "m4z", PAD_MARKER, k, make_size_t (k)) ;
-+		} ;
- 
- 	if (wpriv->rf64_downgrade && (psf->filelength < RIFF_DOWNGRADE_BYTES))
- 		psf_binheader_writef (psf, "tm8", data_MARKER, psf->datalength) ;
- 	else
- 		psf_binheader_writef (psf, "m4", data_MARKER, 0xffffffff) ;
- 
--	psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ;
-+	psf_fwrite (psf->header.ptr, psf->header.indx, 1, psf) ;
- 	if (psf->error)
- 		return psf->error ;
- 
--	if (has_data && psf->dataoffset != psf->header.indx)
--	{	psf_log_printf (psf, "Oooops : has_data && psf->dataoffset != psf->header.indx\n") ;
-+	if (has_data && psf->dataoffset != psf->header.indx)
-+	{	psf_log_printf (psf, "Oooops : has_data && psf->dataoffset != psf->header.indx\n") ;
- 		return psf->error = SFE_INTERNAL ;
- 		} ;
- 
--	psf->dataoffset = psf->header.indx ;
-+	psf->dataoffset = psf->header.indx ;
- 
- 	if (NOT (has_data))
- 		psf_fseek (psf, psf->dataoffset, SEEK_SET) ;
-- 
Gitee