updated 13 packages

cpio-2.13-1

curl-7.68.0-1

e2fsprogs-1.45.5-1

firefox-68.5.0-1

flex-2.6.4-1

libarchive-3.4.2-1

libogg-1.3.4-1

libssh-0.9.3-1

libtasn1-4.16.0-1

libvorbis-1.3.6-1

nghttp2-1.40.0-1

thunderbird-68.5.0-1

vorbis-tools-1.4.0-5

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12322 ec354946-7b23-47d6-9f5a-488ba84defc7

c/cpio/cpio-vl.spec

@@ -6,19 +6,50 @@
 Summary: A GNU archiving program.
 Summary(ja): GNU アーカイブプログラム
 Name: cpio
-Version: 2.12
+Version: 2.13
 Release: 1%{?_dist_release}
+Group: Applications/Archiving
 
 License: GPLv3
-Group: Applications/Archiving
-URL: ftp://ftp.gnu.org/pub/gnu/cpio/
+URL: https://www.gnu.org/software/cpio/cpio.html
 
-Source: ftp://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2
+Source: https://ftp.gnu.org/gnu/cpio/cpio-%{version}.tar.bz2
 Source1: cpio.1
-Patch1: cpio-2.6-setLocale.patch
-Patch2: cpio-2.12-rh.patch
-Patch4: cpio-2.9-exitCode.patch
-Patch6: cpio-2.9-dev_number.patch
+
+# We use SVR4 portable format as default.
+Patch1: cpio-2.9-rh.patch
+
+# fix warn_if_file_changed() and set exit code to 1 when cpio fails to store
+# file > 4GB (#183224)
+# http://lists.gnu.org/archive/html/bug-cpio/2006-11/msg00000.html
+Patch2: cpio-2.13-exitCode.patch
+
+# Support major/minor device numbers over 127 (bz#450109)
+# http://lists.gnu.org/archive/html/bug-cpio/2008-07/msg00000.html
+Patch3: cpio-2.13-dev_number.patch
+
+# Define default remote shell as /usr/bin/ssh (#452904)
+Patch4: cpio-2.9.90-defaultremoteshell.patch
+
+# Fix segfault with nonexisting file with patternnames (#567022)
+# http://savannah.gnu.org/bugs/index.php?28954
+# We have slightly different solution than upstream.
+Patch5: cpio-2.10-patternnamesigsegv.patch
+
+# Fix bad file name splitting while creating ustar archive (#866467)
+# (fix backported from tar's source)
+Patch7: cpio-2.10-longnames-split.patch
+
+# Cpio does Sum32 checksum, not CRC (downstream)
+Patch8: cpio-2.11-crc-fips-nit.patch
+
+# Fix multiple definition of `program_name'
+Patch9: cpio-2.13-mutiple-definition.patch
+
+# Revert fix for CVE-2015-1197 (#1797163)
+# reverts upstream commit 45b0ee2b4
+Patch10: cpio-2.13-revert-CVE-2015-1197-fix.patch
+
 #security
 
 %ifnos linux
@@ -65,14 +96,9 @@ GNU cpio がサポートしているアーカイブ形式は以下の通りで
 
 
 %prep
-%setup -q
-%patch1  -p1 -b .setLocale
-%patch2  -p1 -b .rh
-%patch4  -p1 -b .exitCode
-%patch6  -p1 -b .dev_number
-# security
+%autosetup -p1
 
-autoheader
+autoreconf -vif
 
 %build
 
@@ -111,7 +137,8 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog NEWS README THANKS TODO
+%license COPYING
+%doc AUTHORS NEWS README THANKS TODO
 %ifnos linux
 %{_libexecdir}/*
 %endif
@@ -121,6 +148,11 @@ fi
 %{_datadir}/locale/*
 
 %changelog
+* Tue Feb 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.13-1
+- updated to 2.13.
+- dropped all patches.
+- imported Patch1-10 from rawhide.
+
 * Mon Nov 09 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.12-1
 - update to 2.12
 - update Patch2 (cpio-2.12-rh.patch)

c/curl/curl-vl.spec

@@ -7,7 +7,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Name: curl 
-Version: 7.66.0
+Version: 7.68.0
 Release: 1%{?_dist_release}
 
 License: MIT
@@ -207,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Feb 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.68.0-1
+- new upstream release.
+
 * Sat Sep 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.66.0-1
 - new upstream release.
 - dropped Patch1 and 2: fixed in upstream.

e/e2fsprogs/e2fsprogs-vl.spec

@@ -5,7 +5,7 @@
 Summary:        Utilities for managing ext2/3/4 filesystem.
 Summary(ja):    ext2/3/4 ファイルシステム操作ユーティリティ
 Name:           e2fsprogs
-Version:        1.45.4
+Version:        1.45.5
 Release:        1%{?_dist_release}
 License:        GPL
 Group:          System Environment/Base
@@ -14,7 +14,7 @@ Vendor:         Project Vine
 Distribution:   Vine Linux
 
 Url:            http://e2fsprogs.sourceforge.net/
-Source0:        https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.45.4/%{name}-%{version}.tar.xz
+Source0:        https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/%{name}-%{version}.tar.xz
 Source1:        ext2_types-wrapper.h
 
 Patch2:         e2fsprogs-1.40.4-sb_feature_check_ignore.patch
@@ -284,6 +284,9 @@ exit 0
 
 
 %changelog
+* Wed Feb 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.45.5-1
+- new upstream release.
+
 * Fri Oct 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.45.4-1
 - new upstream release.
 

f/firefox/firefox-vl.spec

@@ -1,8 +1,8 @@
 %bcond_with clang
 
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 68.2
-%global geckomajor 68.2
+%global ffmajor 68.5
+%global geckomajor 68.5
 %global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
@@ -65,7 +65,7 @@ Source50:       firefox-xremote-client.sh.in
 Source100:      find-external-requires
 
 # for newer rust
-Source900:      https://raw.githubusercontent.com/servo/rust-cssparser/master/src/parser.rs
+#Source900:      https://raw.githubusercontent.com/servo/rust-cssparser/master/src/parser.rs
 
 # locale sources
 %define MOZ_BUILD_LOCALES "ja"
@@ -220,8 +220,8 @@ perl -pi \
 browser/branding/unofficial/locales/browserconfig.properties
 
 # replace source for newer rust
-cp -f %{SOURCE900} ./third_party/rust/cssparser/src/
-sed -i -e 's/"files":{[^}]*}/"files":{ }/' ./third_party/rust/cssparser/.cargo-checksum.json
+#cp -f %{SOURCE900} ./third_party/rust/cssparser/src/
+#sed -i -e 's/"files":{[^}]*}/"files":{ }/' ./third_party/rust/cssparser/.cargo-checksum.json
 
 %{__rm} -f .mozconfig
 
@@ -524,6 +524,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Feb 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.5.0-1
+- updated to 68.5.0.
+- dropped Source900: fixed in upstream.
+
 * Fri Nov 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.2.0-1
 - updated to 68.2.0.
 

f/flex/flex-vl.spec

@@ -1,18 +1,18 @@
 Summary: A tool for creating scanners (text pattern recognizers).
 Summary(ja): スキャナ (テキストパターン認識器) 作成ツール
 Name: flex
-Version: 2.5.37
+Version: 2.6.4
 Release: 1%{?_dist_release}
 
 Group: Development/Tools
 License: BSD
-URL: http://flex.sourceforge.net/
+URL: https://github.com/westes/flex
 
-Source: flex-%{version}.tar.bz2
-Patch0: flex-2.5.36-bison-2.6.1.patch
+Source: https://github.com/westes/flex/releases/download/v%{version}/flex-%{version}.tar.gz
+Patch0: flex-rh1389575.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gettext bison m4
+BuildRequires: gettext bison m4 help2man
 Requires: m4
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -51,16 +51,18 @@ C のコードを入力とし，C のソースファイルを出力します．
 %setup -q 
 %patch0 -p1
 
+autoreconf -ivf
+
 %build
 %configure --disable-dependency-tracking CFLAGS="-fPIC $RPM_OPT_FLAGS"
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
+rm -f %{buildroot}/%{_infodir}/dir
 
-( cd ${RPM_BUILD_ROOT}
+( cd %{buildroot}
   strip .%{_bindir}/flex
   ln -sf flex .%{_bindir}/lex
   ln -s flex.1 .%{_mandir}/man1/lex.1
@@ -68,9 +70,12 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
   ln -s libfl.a .%{_libdir}/libl.a
 )
 
+rm -f %{buildroot}%{_libdir}/libfl.so*
+rm -f %{buildroot}%{_libdir}/libfl.la
+
 %find_lang %{name}
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+rm -rf %{buildroot}%{_docdir}/%{name}
 
 %check
 echo ============TESTING===============
@@ -78,7 +83,7 @@ make check
 echo ============END TESTING===========
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
 /sbin/install-info %{_infodir}/flex.info.gz --dir-file=%{_infodir}/dir ||:
@@ -90,7 +95,8 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING NEWS README
+%license COPYING
+%doc NEWS README.md
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_libdir}/*.a
@@ -98,6 +104,11 @@ fi
 %{_infodir}/flex.info*
 
 %changelog
+* Mon Feb 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.6.4-1
+- updated to 2.6.4.
+- dropped Patch0.
+- imported Patch0 (flex-rh1389575.patch) from rawhide.
+
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.5.37-1
 - update to 2.5.37
 - remove old patches

lib/liba/libarchive/libarchive-vl.spec

@@ -1,6 +1,6 @@
 Name:          libarchive
 Summary:       A library for handling streaming archive formats 
-Version:       3.4.0
+Version:       3.4.2
 Release:       1%{?_dist_release}
 Group:         System Environment/Libraries
 
@@ -77,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Feb 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.2-1
+- new upstream release.
+
 * Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.0-1
 - new upstream release.
 

lib/libo/libogg/libogg-vl.spec

@@ -2,12 +2,12 @@
 
 Summary:	The Ogg bitstream file format library.
 Name:		libogg
-Version:	1.3.3
+Version:	1.3.4
 Release:	1%{?_dist_release}
 
 Group:		System Environment/Libraries
 License:	BSD
-URL:		http://www.xiph.org/
+URL:		https://www.xiph.org/
 
 Source:		http://downloads.xiph.org/releases/ogg/%{name}-%{version}.tar.xz
 
@@ -96,7 +96,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS CHANGES COPYING README
+%license COPYING
+%doc AUTHORS CHANGES README
 %{_libdir}/*.so.*
 
 %files devel
@@ -126,6 +127,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %endif
 
 %changelog
+* Mon Feb 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.4-1
+- new upstream release.
+
 * Thu Feb 22 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.3-1
 - new upstream release.
 

lib/libs/libssh/libssh-vl.spec

@@ -4,14 +4,14 @@ Summary:        A library implementing the SSH2 protocol
 Summary(ja):    SSH2プロトコルを実装するためのライブラリ
 
 Name:           libssh
-Version:        0.8.5
+Version:        0.9.3
 Release:        1%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://www.libssh.org/
-Source0:        http://www.libssh.org/files/%{name}-%{version}.tar.xz
-Patch0:         libssh-0.8.3-strict-overflow.patch
+%global         shortver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
+Source0:        https://www.libssh.org/files/%{shortver}/%{name}-%{version}.tar.xz
 
 # security fix
 # Nothing so far.
@@ -62,7 +62,6 @@ The SSH library with
 
 %prep
 %setup -q
-%patch0 -p1 -b .strict-overflow
 
 %build
 mkdir -p %{_target_platform}
@@ -89,7 +88,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README
+%license COPYING
+%doc AUTHORS ChangeLog README
 %{_libdir}/*.so.*
 
 %files devel
@@ -106,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Feb 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.3-1
+- new upstream release.
+- dropped Patch0: fixed in upstream.
+
 * Sat Nov 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.8.5-1
 - new upstream release.
 - built with openssl-1.1.1.

lib/libt/libtasn1/libtasn1-vl.spec

@@ -2,12 +2,12 @@
 
 Summary: This is the ASN.1 library used in GNUTLS
 Name: libtasn1
-Version: 4.13
+Version: 4.16.0
 Release: 1%{?_dist_release}
 License: LGPL
 Group: System Environment/Libraries
 URL: http://www.gnu.org/software/libtasn1/
-Source0: http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz
+Source0: https://ftp.gnu.org/gnu/libtasn1/%{name}-%{version}.tar.gz
 Patch1:	libtasn1-3.4-rpath.patch
 BuildRequires: bison, gcc-c++, texinfo
 
@@ -78,7 +78,8 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, 0755)
-%doc AUTHORS ChangeLog COPYING* NEWS README THANKS
+%license LICENSE
+%doc AUTHORS NEWS README* THANKS
 %doc %{_mandir}/man1/asn1*
 %{_libdir}/*.so.*
 %{_bindir}/asn1Coding
@@ -109,6 +110,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Feb 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.16.0-1
+- new upstream release.
+
 * Thu Nov 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13-1
 - new upstream release.
 

lib/libv/libvorbis/libvorbis-vl.spec

@@ -5,15 +5,16 @@
 Summary:	The Vorbis General Audio Compression Codec.
 Summary(ja):	Vorbis - 汎用オーディオ圧縮コーデック
 Name:		libvorbis
-Version:	1.3.5
+Version:	1.3.6
 Release:	1%{?_dist_release}
 Epoch:          %{epoch_num}
 
 Group:		System Environment/Libraries
 License:	BSD
-URL:		http://www.xiph.org/
+URL:		https://www.xiph.org/
 
 Source:		http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.xz
+Patch0:		libvorbis-1.3.6-git.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	libogg-devel >= %{liboggver}
@@ -92,6 +93,7 @@ and documentation needed to develop applications with libvorbis.
 
 %prep
 %setup -q
+%patch0 -p1
 
 perl -p -i -e "s/-O20/%{optflags}/" configure
 perl -p -i -e "s/-ffast-math//" configure
@@ -120,7 +122,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING README todo.txt
+%license COPYING
+%doc AUTHORS README todo.txt
 %{_libdir}/*.so.*
 
 %files devel
@@ -143,6 +146,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 %endif
 
 %changelog
+* Mon Feb 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.6-1
+- new upstream release.
+- imported Patch0 from rawhide.
+
 * Sat May 16 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 1.3.5-1
 - new upstream release
 

n/nghttp2/nghttp2-vl.spec

@@ -8,7 +8,7 @@
 Summary: Experimental HTTP/2 client, server and proxy
 Summary(ja): HTTP/2クライアント・サーバ・プロキシの実験的実装
 Name: nghttp2
-Version: 1.39.2
+Version: 1.40.0
 Release: 1%{?_dist_release}
 License: MIT
 Group: Applications/Internet
@@ -213,6 +213,9 @@ make %{?_smp_mflags} check
 %endif
 
 %changelog
+* Sun Feb 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.40.0-1
+- new upstream release.
+
 * Thu Aug 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.39.2-1
 - new upstream release.
 

t/thunderbird/thunderbird-vl.spec

@@ -36,7 +36,7 @@
 Summary:	Thunderbird Community Edition, Mail/newsgroup client
 Summary(ja):	Thunderbirdコミュニティエディション, メール・ニュースクライアント
 Name:		thunderbird
-Version:	68.2.1
+Version:	68.5.0
 Release:	1%{?_dist_release}
 URL:		http://www.mozilla.org/projects/thunderbird/
 License:	MPL
@@ -60,7 +60,7 @@ Source99:	cbindgen-vendor.tar.xz
 Source100:  find-external-requires
 
 # for newer rust
-Source900:      https://raw.githubusercontent.com/servo/rust-cssparser/master/src/parser.rs
+#Source900:      https://raw.githubusercontent.com/servo/rust-cssparser/master/src/parser.rs
 
 Source1010:	mozconfig-thunderbird-vine6
 Source1020:	mozconfig-thunderbird-vine7
@@ -78,7 +78,7 @@ Patch1001:      build-ppc64le-inline.patch
 Patch1:         no-rust-lto.patch
 Patch2:         rust-network-check.patch
 Patch4:         build-mozconfig-fix.patch
-Patch6:         build-nss-version.patch
+#Patch6:         build-nss-version.patch
 Patch7:         firefox-debugedits-error.patch
 Patch8:         firefox-dont-check-binary.patch
 Patch9:         nss-build-mozilla-1564499.patch
@@ -201,7 +201,7 @@ cd %{tarballdir}
 %patch45 -p1 -b .elfhack
 
 %patch4  -p1 -b .build-mozconfig-fix
-%patch6  -p1 -b .nss-version
+#patch6  -p1 -b .nss-version
 
 # Fedora patches
 %patch215 -p1 -b .addons
@@ -223,8 +223,8 @@ cd %{tarballdir}
 
 
 # replace source for newer rust
-cp -f %{SOURCE900} ./third_party/rust/cssparser/src/
-sed -i -e 's/"files":{[^}]*}/"files":{ }/' ./third_party/rust/cssparser/.cargo-checksum.json
+#cp -f %{SOURCE900} ./third_party/rust/cssparser/src/
+#sed -i -e 's/"files":{[^}]*}/"files":{ }/' ./third_party/rust/cssparser/.cargo-checksum.json
 
 %{__rm} -f .mozconfig
 %if %{build_vine6}
@@ -479,6 +479,11 @@ fi
 #===============================================================================
 
 %changelog
+* Tue Feb 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.5.0-1
+- new upstream release.
+- dropped Source900: fixed in upstream.
+- dropped Patch6: was not needed.
+
 * Sun Nov 03 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.2.1-1
 - new upstream release.
 

v/vorbis-tools/vorbis-tools-vl.spec

@@ -5,7 +5,7 @@ Summary:	Several Ogg Vorbis Tools
 Summary(ja):	各種 Ogg Vorvis 用ツール
 Name:		vorbis-tools
 Version:	1.4.0
-Release:	4%{?_dist_release}
+Release:	5%{?_dist_release}
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://www.xiph.org/
@@ -15,11 +15,24 @@ Source1:	vorbis-tools-ogg123rc
 
 Patch1:		vorbis-tools-1.1.1-include-config.h.patch
 
+Patch2:		vorbis-tools-1.4.0-bz887540.patch
+# http://thread.gmane.org/gmane.comp.multimedia.ogg.vorbis.devel/5729
+Patch3:		vorbis-tools-1.4.0-man-page.patch
+
+# update po files from translationproject.org (#1116650)
+Patch4:		vorbis-tools-1.4.0-bz1116650.patch
+
 # security fixes
 Patch1000: CVE-2014-9638-9639.patch
-Patch1001: CVE-2014-9640.patch
+# CVE-2014-9640
+# do not use stack variable out of its scope of validity (#1185558)
+Patch1001: vorbis-tools-1.4.0-bz1185558.patch
 Patch1002: CVE-2015-6749.patch
 
+# http://thread.gmane.org/gmane.comp.multimedia.ogg.vorbis.devel/5738
+Patch1003: vorbis-tools-1.4.0-bz1003607.patch
+
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	libvorbis-devel >= 1.0
 BuildRequires:  libao-devel
@@ -57,14 +70,7 @@ vorbis-tools には、Ogg Vorbis のエンコーダ oggenc と再生ツール og
 # - vcut          : vorbis ファイルを分割
 
 %prep
-%setup -q
-
-%patch1 -p1 -b .config-h
-
-# security fixes
-%patch1000 -p1 -b .CVE-2014-9638-9639
-%patch1001 -p3 -b .CVE-2014-9640
-%patch1002 -p1 -b .CVE-2015-6749
+%autosetup -p1
 
 %build
 perl -p -i -e "s/-O20/%{optflags}/" configure
@@ -97,8 +103,12 @@ make
 %{_mandir}/man1/*
 
 %changelog
+* Mon Feb 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.0-5
+- replaced Patch1001.
+- imported Patch2-4 and 1003.
+
 * Sat Jul 30 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.0-4
-- added Patch1000-1003.
+- added Patch1000-1002.
   - CVE-2014-9638
   - CVE-2014-9639
   - CVE-2014-9640