cvs-1.12.13-9

c/cvs/cvs-vl.spec

@@ -4,29 +4,28 @@ Summary: A version control system.
 Summary(ja): バージョン管理システム
 Name: cvs
 Version: %{version}
-Release: 8%{?_dist_release}
+Release: 9%{?_dist_release}
+Group: programming
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPL
-Group: Development/Tools
-URL: http://www.cvshome.org/
-Source0: http://ftp.cvshome.org/release/feature/cvs-%{version}/cvs-%{version}.tar.bz2
+URL: https://www.nongnu.org/cvs/
+Source0: https://ftp.gnu.org/non-gnu/cvs/source/feature/%{version}/cvs-%{version}.tar.bz2
 Source100: filter-requires-getopts-pl.sh
 Patch2: cvs-1.12.13-authserver.patch
 Patch3: cvs-1.11.2-cvspass.patch
 Patch5: cvs-1.11.2-install.patch 
 Patch101: can-2005-2693.patch
 Patch102: cvs-1.12.13_CVE-2012-0804.patch
+Patch103: cvs-1.12.13-format_not_a_string_literal_and_no_format_arguments.diff
+Patch104: cvs-1.11.23-Fix-CVE-2017-12836.patch
 
-Requires(pre): install-info
-Prefix: %{_prefix}
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: perl, zlib
 BuildRequires: zlib-devel
-BuildRequires: openssl-devel
 BuildRequires: vim
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 # for perl
 %define __find_requires %{SOURCE100}
 
@@ -61,6 +60,9 @@ CVS は，ソースファイルを複数の開発者が同時に編集する際
 バージョン管理システムが必要なら cvs パッケージをインストールして下さい．
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch2 -p1 -b .authserver
@@ -68,8 +70,19 @@ CVS は，ソースファイルを複数の開発者が同時に編集する際
 %patch5 -p1 -b .install
 %patch101 -p1 -b .can-2005-2693
 %patch102 -p1 -b .CVE-2012-0804
+%patch103 -p1
+%patch104 -p1
+
+# make autoreconf happy
+perl -p -i -e 's/AM_GNU_GETTEXT_VERSION.*/AM_GNU_GETTEXT_REQUIRE_VERSION(\[0.18.0\])/' configure.in
+perl -p -i -e 's/gl_AC_TYPE_LONG_LONG/AC_TYPE_LONG_LONG_INT/' m4/* configure.in
+
+autoreconf -vif
+
 
 %build
+export SENDMAIL="%{_sbindir}/sendmail"
+
 %configure --with-external-zlib
 
 make %{?_smp_mflags}
@@ -83,22 +96,11 @@ make -C doc info
 gzip %{buildroot}%{_infodir}/cvs* || true
 rm -f %{buildroot}%{_infodir}/dir
 
+
 %clean
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
 
-%post
-/sbin/install-info /%{_infodir}/cvs.info.gz /%{_infodir}/dir
-/sbin/install-info /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir 
-
-
-%preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete /%{_infodir}/cvs.info.gz /%{_infodir}/dir
-    /sbin/install-info --delete /%{_infodir}/cvsclient.info.gz /%{_infodir}/dir
-fi
-
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING COPYING.LIB ChangeLog ChangeLog.zoo DEVEL-CVS HACKING FAQ INSTALL MINOR-BUGS NEWS PROJECTS TODO README README.VMS
@@ -112,7 +114,13 @@ fi
 %{_infodir}/cvs*
 %{_datadir}/cvs
 
+
 %changelog
+* Sun Oct 17 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.13-9
+- rebuilt without openssl.
+- dropped install-info scriptlets.
+- imported Patch103 and 104 from Mageia.
+
 * Mon Nov 05 2018 Toshiaki Ara <ara_t@384.jp> 1.12.13-8
 - rebuild with openssl-1.1.1