Browse Source

updated 9 packages

LibRaw-0.20.0-2

exiv2-0.27.3-1

firefox-78.3.0-1

gnuplot-5.4.0-2

lksctp-tools-1.0.18-1

libjpeg-turbo-2.0.5-1

libxml2-2.9.10-5

rust-1.46.0-1

unzip-6.0-8

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12499 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 1 year ago
parent
commit
cc6a2a3855

+ 6 - 1
L/LibRaw/LibRaw-vl.spec

@@ -4,7 +4,7 @@ Summary: Library for reading RAW files obtained from digital photo cameras
 Summary(ja): デジタルカメラから取り込んだ RAW ファイルを読むためのライブラリ
 Name: LibRaw
 Version: 0.20.0
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -12,6 +12,7 @@ Distribution: Vine Linux
 License: BSD and (CDDL or LGPLv2)
 URL: https://www.libraw.org/
 Source0: https://www.libraw.org/data/LibRaw-%{version}.tar.gz
+Patch1000: LibRaw-Additional-checks-in-hassy-model-parser.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gcc libtool make
@@ -56,6 +57,7 @@ This package contains the static library for %{name}.
 
 %prep
 %setup -q
+%patch1000 -p1
 
 
 %build
@@ -116,6 +118,9 @@ rm -rf %{buildroot}%{_libdir}/*.la
 
 
 %changelog
+* Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.20.0-2
+- imported Patch1000 from upstream to fix CVE-2020-24890.
+
 * Fri Sep 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.20.0-1
 - new upstream release.
 

+ 14 - 10
e/exiv2/exiv2-vl.spec

@@ -3,13 +3,14 @@
 Name: exiv2
 Summary: Exif and IPTC metadata manipulation library
 Summary(ja): Exif, IPTC メタデータ操作ライブラリ
-Version: 0.27.2
+Version: 0.27.3
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Group: System Environment/Libraries
 License: GPLv2
 URL: https://www.exiv2.org/
-
 Source0: https://www.exiv2.org/builds/exiv2-%{version}-Source.tar.gz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -24,9 +25,6 @@ BuildRequires: zlib-devel
 Obsoletes: libexiv2 <= 0.13
 Provides:  libexiv2 = %{version}-%{release}
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 Exiv2 comprises of a C++ library and a command line utility to access image metadata. Exiv2 supports full read and write access to the Exif and Iptc metadata, Exif MakerNote support, extract and delete methods for Exif thumbnails, classes to access Ifd and so on.
 The command line utility allows you to:
@@ -59,16 +57,16 @@ Exif サムネイルを抽出/削除するためのメソッド,Ifd 等にア
 * EXIF メタデータ,IPTC メタデータ,JPEG コメントを抽出/挿入/削除する
 * EXIF メタデータ中のサムネイルイメージを抽出/挿入/削除する
 
+
 #'
 %package devel
 Summary: Header files, libraries and development documentation for exiv2
 Summary(ja): exiv2 の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Obsoletes: libexiv2-devel <= 0.13
 Provides: libexiv2-devel = %{version}-%{release}
 
-
 %description devel
 Header files, libraries and development documentation for exiv2
 
@@ -76,6 +74,9 @@ Header files, libraries and development documentation for exiv2
 exiv2 用ヘッダファイル,ライブラリ,開発用ドキュメントです.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}-Source
 
@@ -90,6 +91,7 @@ exiv2 用ヘッダファイル,ライブラリ,開発用ドキュメント
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT 
 
@@ -107,12 +109,12 @@ chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
 
 ## FIXME/TODO: patch installed exiv2-config to instead pull values from pkgconfig
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 
@@ -124,7 +126,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.so.*
 %{_mandir}/man1/*
 
-
 %files devel
 %defattr(-,root,root,-)
 #doc doc/index.html doc/include
@@ -139,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Sep 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.27.3-1
+- new upstream release.
+
 * Fri Nov 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.27.2-1
 - new upstream release.
 

+ 5 - 2
f/firefox/firefox-vl.spec

@@ -1,8 +1,8 @@
 %bcond_with clang
 
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 78.2
-%global geckomajor 78.2
+%global ffmajor 78.3
+%global geckomajor 78.3
 %global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
@@ -571,6 +571,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.3.0-1
+- updated to 78.3.0.
+
 * Fri Aug 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.2.0-1
 - updated to 78.2.0.
 - updated metainfo.

+ 79 - 28
g/gnuplot/gnuplot-vl.spec

@@ -1,6 +1,6 @@
 %global major 5
-%global minor 0
-%global patchlevel 5
+%global minor 4
+%global patchlevel 0
 
 %global x11_app_defaults_dir %{_datadir}/X11/app-defaults
 
@@ -8,25 +8,37 @@ Summary: A program for plotting mathematical expressions and data.
 Summary(ja):  数学系の関数やデータのプロット・プログラム
 Name: gnuplot
 Version: %{major}.%{minor}.%{patchlevel}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Group: graphics,science
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke, inagaki, shaolin
 
 # MIT .. term/PostScript/aglfn.txt
 License: gnuplot and MIT
-Group: Applications/Engineering
 URL: http://www.gnuplot.info/
+# Need to remove non-free lena files
+# rm -rf demo/lena*
+# Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source: %{name}-%{version}-clean.tar.gz
 
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-
-Patch0: gnuplot-4.2.0-refers_to.patch
+#Patch0: gnuplot-4.2.0-refers_to.patch
 #Patch1: gnuplot-4.2.0-fonts.patch
 # resolves: #812225
 # submitted upstream: http://sourceforge.net/tracker/?func=detail&aid=3558973&group_id=2055&atid=302055
 Patch3: gnuplot-4.6.1-plot-sigsegv.patch
 Patch4: gnuplot-4.6.4-singlethread.patch
 Patch5: gnuplot-5.0.0-lua_checkint.patch
+Patch6: gnuplot-5.4.0-no-lena.patch
+Patch7: gnuplot-5.2.2-doc.patch
+Patch8: gnuplot-5.2.8-cmd-opts.patch
+Patch9: gnuplot-config.patch
 
 # Vine Patches (replaces Patch1)
-Patch70: gnuplot-5.0.0-fonts.patch
+Patch70: gnuplot-5.4.0-fonts.patch
+
+Patch1000: CVE-2020-25559.patch
+Patch1001: CVE-2020-25412.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
 #libedit-devel can not handle utf8, readline-devel is not legal with gnuplot, stick to builtin
@@ -45,9 +57,23 @@ BuildRequires: wxGTK-devel
 BuildRequires: zlib-devel
 
 BuildRequires: texlive
-BuildRequires: texlive-common
 BuildRequires: texlive-collection-latexextra
-BuildRequires: texlive-collection-htmlxml
+BuildRequires: texlive-collection-formatsextra
+BuildRequires: texlive-collection-langchinese
+BuildRequires: texlive-collection-langcjk
+BuildRequires: texlive-collection-langcyrillic
+BuildRequires: texlive-collection-langczechslovak
+BuildRequires: texlive-collection-langenglish
+BuildRequires: texlive-collection-langeuropean
+BuildRequires: texlive-collection-langfrench
+BuildRequires: texlive-collection-langgerman
+BuildRequires: texlive-collection-langgreek
+BuildRequires: texlive-collection-langitalian
+BuildRequires: texlive-collection-langjapanese
+BuildRequires: texlive-collection-langother
+BuildRequires: texlive-collection-langpolish
+BuildRequires: texlive-collection-langportuguese
+BuildRequires: texlive-collection-langspanish
 BuildRequires: texinfo
 BuildRequires: latex2html
 BuildRequires: emacs
@@ -56,10 +82,6 @@ Requires: TrueType-dejavu
 Requires(post): install-info
 Requires(preun): install-info
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke, inagaki, shaolin
-
 %description
 Gnuplot is a command-line driven, interactive function plotting
 program especially suited for scientific data representation.  Gnuplot
@@ -78,9 +100,10 @@ Gnuplotは関数や座標データを同時にプロットしたり、3次元化
 科学データプレゼンテーション用のグラフィック・パッケージが必要な
 場合、gnuplotをインストールしてください。
 
+
 %package doc
 Summary: Documentation for the gnuplot main application
-Group: Applications/Documentation
+Group: documentation
 BuildArch: noarch
 Requires: %{name} = %{version}-%{release}
 
@@ -88,9 +111,10 @@ Requires: %{name} = %{version}-%{release}
 The gnuplot-doc package contains the documentation related to gnuplot
 plotting tool
 
+
 %package latex
 Summary: Configuration for LaTeX typesetting using gnuplot
-Group: Applications/Engineering
+Group: publishing
 BuildArch: noarch
 Requires: %{name} = %{version}-%{release}
 Requires: texlive-collection-latexextra
@@ -101,22 +125,30 @@ The gnuplot-latex package contains LaTeX configuration file related to gnuplot
 plotting tool.
 
 
+%debug_package
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .refto
+#patch0 -p1 -b .refto
 #patch1 -p1 -b .font
 %patch3 -p1 -b .plot-sigsegv
 %patch4 -p1 -b .isinglethread
 %patch5 -p1 -b .checkint
+%patch6 -p1 -b .nolena
+%patch7 -p1 -b .doc
+%patch8 -p1 -b .cmd-opts
+%patch9 -p1 -b .config
 sed -i -e 's:"/usr/lib/X11/app-defaults":"%{x11_app_defaults_dir}":' src/gplt_x11.c
-iconv -f windows-1252 -t utf-8 ChangeLog > ChangeLog.aux
-mv ChangeLog.aux ChangeLog
 chmod 644 src/getcolor.h
 chmod 644 demo/html/webify.pl
 chmod 644 demo/html/webify_svg.pl
 chmod 644 demo/html/webify_canvas.pl
 
 %patch70 -p1 -b .font
+%patch1000 -p1 -b .CVE-2020-25559
+%patch1001 -p1 -b .CVE-2020-25412
+
 
 %build
 #remove binaries from source tarball
@@ -125,7 +157,12 @@ rm -rf docs_to_include
 mkdir -p docs_to_include
 cp -pr demo docs_to_include
 
-%configure --with-readline=builtin --without-linux-vga --enable-history-file --with-tutorial --without-qt
+%configure \
+  --with-texdir=%{_datadir}/texmf/texmf-dist/tex/latex/gnuplot \
+  --with-readline=builtin \
+  --without-linux-vga \
+  --enable-history-file \
+  --without-qt
 
 make %{?_smp_mflags}
 
@@ -133,12 +170,13 @@ make -C docs html info
 export GNUPLOT_PS_DIR=../../term/PostScript
 make -C docs/psdoc ps_symbols.ps ps_fontfile_doc.pdf
 rm -rf docs/htmldocs/images.idx
-make -C tutorial
+
 
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 make -C docs install-info DESTDIR=%{buildroot} INSTALL='install -p'
+make -C share/LaTeX install DESTDIR=%{buildroot} INSTALL='install -p'
 
 #rm -f demo/Makefile* tutorial/Makefile*
 #packaged by info package, updated by post-installation script, do not package here
@@ -149,7 +187,8 @@ mv $RPM_BUILD_ROOT%{_datadir}/gnuplot/%{major}.%{minor}/app-defaults/Gnuplot $RP
 rm -rf $RPM_BUILD_ROOT%{_libdir}/
 
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}/ja/man1
-mv $RPM_BUILD_ROOT%{_mandir}/man1/gnuplot-ja.1 $RPM_BUILD_ROOT/%{_mandir}/ja/man1/gnuplot.1
+install -p -m644 man/gnuplot-ja_JP.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/ja/man1/gnuplot.1
+
 
 %clean
 rm -rf %{buildroot}
@@ -170,7 +209,8 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc BUGS ChangeLog Copyright NEWS README
+%license Copyright
+%doc BUGS NEWS README
 %{_bindir}/gnuplot
 %dir %{_libexecdir}/gnuplot/%{major}.%{minor}
 %{_libexecdir}/gnuplot/%{major}.%{minor}/gnuplot_x11
@@ -192,18 +232,29 @@ fi
 
 %files doc
 %defattr(-,root,root)
-%doc ChangeLog Copyright
+%license Copyright
 %doc docs/psdoc/ps_guide.ps docs/psdoc/ps_symbols.ps
-%doc tutorial/tutorial.dvi docs/psdoc/ps_file.doc
-%doc docs/psdoc/ps_fontfile_doc.pdf docs/htmldocs tutorial/eg7.eps
+%doc docs/psdoc/ps_file.doc
+%doc docs/psdoc/ps_fontfile_doc.pdf docs/htmldocs
 %doc docs_to_include/demo
 
 %files latex
 %defattr(-,root,root)
-%doc ChangeLog Copyright
-%{_datadir}/texmf/tex/latex/gnuplot/
+%license Copyright
+%{_datadir}/texmf/texmf-dist/tex/latex/gnuplot
+
 
 %changelog
+* Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.4.0-2
+- imported Patch1001 to fix CVE-2020-25412.
+
+* Tue Sep 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.4.0-1
+- new upstream release.
+- imported Patch6-9 from rawhide.
+- dropped Patch0.
+- updated Patch70.
+- added Patch1000 to fix CVE-2020-25559.
+
 * Sat Nov 19 2016 Toshiaki Ara <ara_t@384.jp> - 5.0.5-1
 - new upstream release
 

+ 48 - 20
l/lksctp-tools/lksctp-tools-vl.spec

@@ -1,21 +1,27 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Name:    lksctp-tools
-Summary: User-space access to Linux Kernel SCTP
-Version: 1.0.17
-Release: 1%{?_dist_release}
-# src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification
-License: GPLv2 and GPLv2+ and LGPLv2 and MIT
-Group:   System Environment/Libraries
-URL:     http://lksctp.sourceforge.net
-
-Source0: http://downloads.sourceforge.net/lksctp/%{name}-%{version}.tar.gz
-Patch0: lksctp-tools-1.0.16-libdir.patch
-BuildRequires: libtool, automake, autoconf
+Name:           lksctp-tools
+Summary:        User-space access to Linux Kernel SCTP
+Version:        1.0.18
+Release:        1%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       tomop
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
+# src/apps/bindx_test.C is GPLv2, I've asked upstream for clarification
+License:        GPLv2 and GPLv2+ and LGPLv2 and MIT
+URL:            http://lksctp.sourceforge.net
+Source0:        https://github.com/sctp/lksctp-tools/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         lksctp-tools-1.0.16-libdir.patch
+Patch1: lksctp-tools-1.0.18-withsctp-use-PACKAGE_VERSION-in-withsctp.h.patch
+Patch2: lksctp-tools-1.0.18-configure.ac-add-CURRENT-REVISION-and-AGE-for-libsct.patch
+Patch3: lksctp-tools-1.0.18-build-fix-netinet-sctp.h-not-to-be-installed.patch
+Patch4: lksctp-tools-1.0.18-build-remove-v4.12-secondary-defines-in-favor-of-HAV.patch
+Patch5: lksctp-tools-1.0.18-build-fix-probing-for-HAVE_SCTP_SENDV.patch
+Patch6: lksctp-tools-1.0.18-build-0b0dce7a36fb-actually-belongs-to-v4.19.patch
+
+BuildRequires:  libtool, automake, autoconf
 
 %description
 This is the lksctp-tools package for Linux Kernel SCTP (Stream Control
@@ -29,9 +35,10 @@ Kernel SCTP."
 
 This package contains the base run-time library and command-line tools.
 
+
 %package devel
 Summary: Development files for lksctp-tools
-Group: Development/Libraries
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -39,18 +46,20 @@ Requires: pkgconfig
 Development files for lksctp-tools which include man pages, header files,
 static libraries, symlinks to dynamic libraries and some tutorial source code.
 
+
 %package doc
 Summary: Documents pertaining to SCTP
-Group: System Environment/Libraries
+Group: documentation
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description doc
 Documents pertaining to LKSCTP & SCTP in general (IETF RFC's & Internet
 Drafts).
 
+
 %package -n compat32-%{name}
 Summary: User-space access to Linux Kernel SCTP
-Group:   System Environment/Libraries
+Group: system
 Requires: %{name}-%{version}-%{release}
 
 %description -n compat32-%{name}
@@ -64,9 +73,19 @@ package documentation README file, section titled "LKSCTP - Linux
 Kernel SCTP."
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
 
 %build
 [ ! -x ./configure ] && sh bootstrap
@@ -77,18 +96,21 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
+
 %install
 rm -f doc/rfc2960.txt doc/states.txt
 make install DESTDIR="$RPM_BUILD_ROOT" INSTALL="install -p"
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
-%doc AUTHORS ChangeLog COPYING* README
+%license COPYING*
+%doc AUTHORS ChangeLog README
 %{_bindir}/*
 %{_libdir}/libsctp.so.1*
 %dir %{_libdir}/lksctp-tools/
@@ -109,10 +131,16 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 %if %{build_compat32}
 %files -n compat32-%{name}
 %{_libdir}/libsctp.so.1*
+%dir %{_libdir}/lksctp-tools/
 %{_libdir}/lksctp-tools/libwithsctp.so.1*
 %endif
 
+
 %changelog
+* Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.18-1
+- new upstream release.
+- imported Patch1-6 from rawhide.
+
 * Wed Oct 31 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.0.17-1
 - new upstream release.
 

+ 19 - 9
lib/libj/libjpeg-turbo/libjpeg-turbo-vl.spec

@@ -4,10 +4,10 @@ Summary:	A MMX/SSE2/SIMD accelerated library for manipulating JPEG image files
 Summary(ja):	MMX/SSE2/SIMD でアクセラレーションされた libjpeg ライブラリ
 
 Name:		libjpeg-turbo
-Version:	2.0.4
-Release:	2%{?_dist_release}
+Version:	2.0.5
+Release:	1%{?_dist_release}
 
-Group:		System Environment/Libraries
+Group:		system
 License:	IJG
 URL:		http://sourceforge.net/projects/libjpeg-turbo
 Vendor:		Project Vine
@@ -16,7 +16,7 @@ Distribution:	Vine Linux
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		libjpeg-turbo-cmake.patch
 Patch1:		libjpeg-turbo-CET.patch
-Patch1000:	CVE-2020-13790.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	cmake
@@ -31,10 +31,11 @@ Provides:	libjpeg = 6b-50vl6
 The libjpeg-turbo package contains a library of functions for manipulating
 JPEG images
 
+
 %package devel
 Summary:	Headers for the libjpeg-turbo library
 Summary(ja):	libjpeg-turbo ライブラリのヘッダファイル
-Group:		Development/Libraries
+Group:		programming
 Obsoletes:	libjpeg-devel < 6b-50vl6
 Obsoletes:	libjpeg-static < 6b-50vl6
 Provides:	libjpeg-devel = 6b-50vl6
@@ -44,10 +45,11 @@ Requires:	libjpeg-turbo = %{version}-%{release}
 This package contains header files necessary for developing programs which
 will manipulate JPEG files using the libjpeg-turbo library
 
+
 %package utils
 Summary:	Utilities for manipulating JPEG images
 Summary(ja):	JPEG イメージを操作するためのユーティリティ
-Group:		Applications/Multimedia
+Group:		graphics
 Requires:	libjpeg-turbo = %{version}-%{release}
 
 %description utils
@@ -59,11 +61,12 @@ can perform various useful transformations on JPEG files. Rdjpgcom
 displays any text comments included in a JPEG file. Wrjpgcom inserts
 text comments into a JPEG file.
 
+
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary:	A MMX/SSE2 accelerated library for manipulating JPEG image files
 Summary(ja):	MMX/SSE2 でアクセラレーションされた libjpeg ライブラリ
-Group:		System Environment/Libraries
+Group:		system
 Obsoletes:	compat32-libjpeg < 6b-50vl6
 Provides:	compat32-libjpeg = 6b-50vl6
 
@@ -71,10 +74,11 @@ Provides:	compat32-libjpeg = 6b-50vl6
 The libjpeg-turbo package contains a library of functions for manipulating
 JPEG images
 
+
 %package -n compat32-%{name}-devel
 Summary:	Headers for the libjpeg-turbo library
 Summary(ja):	libjpeg-turbo ライブラリのヘッダファイル
-Group:		Development/Libraries
+Group:		programming
 Obsoletes:	compat32-libjpeg-devel < 6b-50vl6
 Provides:	compat32-libjpeg-devel = 6b-50vl6
 Requires:	libjpeg-turbo = %{version}-%{release}
@@ -84,11 +88,13 @@ This package contains header files necessary for developing programs which
 will manipulate JPEG files using the libjpeg-turbo library
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch1000 -p1
 
 
 %build
@@ -212,6 +218,10 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.5-1
+- new upstream release.
+- dropped Patch1000: fixed in upstream.
+
 * Mon Jun 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.4-2
 - added Patch1000 to fix CVE-2020-13790.
 

+ 9 - 1
lib/libx/libxml2/libxml2-vl.spec

@@ -2,7 +2,7 @@ Summary: Library providing XML and HTML support
 Summary(ja): XML や HTML サポートを提供するライブラリ
 Name: libxml2
 Version: 2.9.10
-Release: 4%{_dist_release}
+Release: 5%{_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -17,6 +17,7 @@ Patch1:         libxml2-2.9.8-python3-unicode-errors.patch
 
 Patch1000:      CVE-2019-20388.patch
 Patch1001:      CVE-2020-7595.patch
+Patch1002:      CVE-2020-24977.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python-rpm-macros
@@ -205,6 +206,9 @@ DTDに対応しており、パース時や一度ドキュメントが修正さ
 DTDであってもパースと確認が出来ます。
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -213,6 +217,7 @@ DTDであってもパースと確認が出来ます。
 
 %patch1000 -p1
 %patch1001 -p1
+%patch1002 -p1
 
 find doc -type f -executable -print -exec chmod 0644 {} ';'
 
@@ -327,6 +332,9 @@ chmod -x doc/*.py
 
 
 %changelog
+* Sat Sep 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.10-5
+- imported Patch1002 from upstream to fix CVE-2020-24977.
+
 * Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9.10-4
 - fixed dependency.
 

+ 33 - 32
r/rust/rust-vl.spec

@@ -7,7 +7,7 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.42.0
+%global rustc_version 1.46.0
 %global cargo_version %{rustc_version}
 %global rustfmt_version %{rustc_version}
 %global rls_version %{rustc_version}
@@ -25,8 +25,8 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.txt
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_rust 1.42.0
-%global bootstrap_cargo 1.42.0
+%global bootstrap_rust 1.46.0
+%global bootstrap_cargo 1.46.0
 %global bootstrap_channel %{bootstrap_rust}
 
 # Only the specified arches will use bootstrap binaries.
@@ -54,17 +54,19 @@
 %bcond_with lldb
 %endif
 
+Summary:        The Rust Programming Language
 Name:           rust
 Version:        %{rustc_version}
 Release:        1%{?_dist_release}
-Summary:        The Rust Programming Language
+Group:          programming
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        (ASL 2.0 or MIT) and (BSD and ISC and MIT)
 # ^ written as: (rust itself) and (bundled libraries)
 URL:            https://www.rust-lang.org
-ExclusiveArch:  %{rust_arches}
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
+ExclusiveArch:  %{rust_arches}
 
 %if "%{channel}" == "stable"
 %global rustc_package rustc-%{version}-src
@@ -225,6 +227,7 @@ This package includes the Rust compiler and documentation generator.
 
 %package std-static
 Summary:        Standard library for Rust
+Group:          programming
 
 %description std-static
 This package includes the standard libraries for building applications
@@ -233,6 +236,7 @@ written in Rust.
 
 %package debugger-common
 Summary:        Common debugger pretty printers for Rust
+Group:          programming
 BuildArch:      noarch
 
 %description debugger-common
@@ -241,6 +245,7 @@ This package includes the common functionality for %{name}-gdb and %{name}-lldb.
 
 %package gdb
 Summary:        GDB pretty printers for Rust
+Group:          programming
 BuildArch:      noarch
 Requires:       gdb
 Requires:       %{name}-debugger-common = %{version}-%{release}
@@ -254,12 +259,13 @@ programs.
 
 %package lldb
 Summary:        LLDB pretty printers for Rust
+Group:          programming
 
 # It could be noarch, but lldb has limited availability
 #BuildArch:      noarch
 
 Requires:       lldb
-Requires:       python-lldb
+Requires:       python3-lldb
 Requires:       %{name}-debugger-common = %{version}-%{release}
 
 %description lldb
@@ -271,6 +277,7 @@ programs.
 
 %package doc
 Summary:        Documentation for Rust
+Group:          documentation
 # NOT BuildArch:      noarch
 # Note, while docs are mostly noarch, some things do vary by target_arch.
 # Koji will fail the build in rpmdiff if two architectures build a noarch
@@ -284,6 +291,7 @@ its standard library.
 %package -n cargo
 Summary:        Rust's package manager and build tool
 Version:        %{cargo_version}
+Group:          programming
 # For tests:
 BuildRequires:  git
 # Cargo is not much use without Rust
@@ -297,6 +305,7 @@ and ensure that you'll always get a repeatable build.
 %package -n cargo-doc
 Summary:        Documentation for Cargo
 Version:        %{cargo_version}
+Group:          programming
 BuildArch:      noarch
 # Cargo no longer builds its own documentation
 # https://github.com/rust-lang/cargo/pull/4904
@@ -309,6 +318,7 @@ This package includes HTML documentation for Cargo.
 %package -n rustfmt
 Summary:        Tool to find and fix Rust formatting issues
 Version:        %{rustfmt_version}
+Group:          programming
 Requires:       cargo
 Obsoletes:      rustfmt-preview < 1.0.0
 
@@ -319,6 +329,7 @@ A tool for formatting Rust code according to style guidelines.
 %package -n rls
 Summary:        Rust Language Server for IDE integration
 Version:        %{rls_version}
+Group:          programming
 Requires:       rust-analysis
 # /usr/bin/rls is dynamically linked against internal rustc libs
 Requires:       %{name} = %{rustc_version}-%{release}
@@ -334,6 +345,7 @@ reformatting, and code completion, and enables renaming and refactorings.
 %package -n clippy
 Summary:        Lints to catch common mistakes and improve your Rust code
 Version:        %{clippy_version}
+Group:          programming
 License:        MPLv2.0
 Requires:       cargo
 # /usr/bin/clippy-driver is dynamically linked against internal rustc libs
@@ -346,6 +358,7 @@ A collection of lints to catch common mistakes and improve your Rust code.
 
 %package src
 Summary:        Sources for the Rust standard library
+Group:          programming
 BuildArch:      noarch
 
 %description src
@@ -355,6 +368,7 @@ useful as a reference for code completion tools in various editors.
 
 %package analysis
 Summary:        Compiler analysis data for the Rust standard library
+Group:          programming
 Requires:       rust-std-static = %{rustc_version}-%{release}
 
 %description analysis
@@ -367,7 +381,6 @@ data to provide information about the Rust standard library.
 
 
 %prep
-
 %ifarch %{bootstrap_arches}
 %setup -q -n %{bootstrap_root} -T -b %{bootstrap_source}
 ./install.sh --components=cargo,rustc,rust-std-%{rust_triple} \
@@ -378,9 +391,7 @@ test -f '%{local_rust_root}/bin/rustc'
 
 %setup -q -n %{rustc_package}
 
-%if "%{python}" == "python3"
 sed -i.try-py3 -e '/try python2.7/i try python3 "$@"' ./configure
-%endif
 
 %if %without bundled_llvm
 rm -rf src/llvm-project/
@@ -431,7 +442,6 @@ find vendor -name .cargo-checksum.json \
 
 
 %build
-
 %if %{without bundled_libgit2}
 export LIBGIT2_SYS_USE_PKG_CONFIG=1
 %endif
@@ -464,7 +474,6 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
 # workaround for https://github.com/rust-lang/rust/issues/69953
 #  --set rust.deny-warnings=false
 
-
 %configure \
   --disable-option-checking \
   --libdir=%{common_libdir} \
@@ -585,11 +594,11 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %endif
 
 # The results are not stable on koji, so mask errors and just log it.
-%{__python} ./x.py test --no-fail-fast || :
-%{__python} ./x.py test --no-fail-fast cargo || :
-%{__python} ./x.py test --no-fail-fast clippy || :
-%{__python} ./x.py test --no-fail-fast rls || :
-%{__python} ./x.py test --no-fail-fast rustfmt || :
+%{__python3} ./x.py test --no-fail-fast || :
+%{__python3} ./x.py test --no-fail-fast cargo || :
+%{__python3} ./x.py test --no-fail-fast clippy || :
+%{__python3} ./x.py test --no-fail-fast rls || :
+%{__python3} ./x.py test --no-fail-fast rustfmt || :
 %endif
 
 
@@ -612,33 +621,28 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %{rustlibdir}/%{rust_triple}/lib/*.so
 %exclude %{_bindir}/*miri
 
-
 %files std-static
 %dir %{rustlibdir}
 %dir %{rustlibdir}/%{rust_triple}
 %dir %{rustlibdir}/%{rust_triple}/lib
 %{rustlibdir}/%{rust_triple}/lib/*.rlib
 
-
 %files debugger-common
 %dir %{rustlibdir}
 %dir %{rustlibdir}/etc
-%{rustlibdir}/etc/debugger_*.py*
-
+%{rustlibdir}/etc/rust_types.py*
 
 %files gdb
 %{_bindir}/rust-gdb
 %{rustlibdir}/etc/gdb_*.py*
 %exclude %{_bindir}/rust-gdbgui
 
-
 %if %with lldb
 %files lldb
 %{_bindir}/rust-lldb
 %{rustlibdir}/etc/lldb_*.py*
 %endif
 
-
 %files doc
 %docdir %{_docdir}/%{name}
 %dir %{_docdir}/%{name}
@@ -651,11 +655,9 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %{_docdir}/%{name}/html/*.png
 %{_docdir}/%{name}/html/*.svg
 %{_docdir}/%{name}/html/*.woff
-%{_docdir}/%{name}/html/SourceSerifPro-LICENSE.md
 %license %{_docdir}/%{name}/html/*.txt
 %license %{_docdir}/%{name}/html/*.md
 
-
 %files -n cargo
 %license src/tools/cargo/LICENSE-APACHE src/tools/cargo/LICENSE-MIT src/tools/cargo/LICENSE-THIRD-PARTY
 %doc src/tools/cargo/README.md
@@ -669,42 +671,41 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %dir %{_datadir}/cargo
 %dir %{_datadir}/cargo/registry
 
-
 %files -n cargo-doc
 %docdir %{_docdir}/cargo
 %dir %{_docdir}/cargo
 %{_docdir}/cargo/html
 
-
 %files -n rustfmt
 %{_bindir}/rustfmt
 %{_bindir}/cargo-fmt
 %doc src/tools/rustfmt/{README,CHANGELOG,Configurations}.md
 %license src/tools/rustfmt/LICENSE-{APACHE,MIT}
 
-
 %files -n rls
 %{_bindir}/rls
 %doc src/tools/rls/{README.md,COPYRIGHT,debugging.md}
 %license src/tools/rls/LICENSE-{APACHE,MIT}
 
-
 %files -n clippy
 %{_bindir}/cargo-clippy
 %{_bindir}/clippy-driver
 %doc src/tools/clippy/{README.md,CHANGELOG.md}
 %license src/tools/clippy/LICENSE*
 
-
 %files src
 %dir %{rustlibdir}
 %{rustlibdir}/src
 
-
 %files analysis
+%{_bindir}/rust-analyzer
 %{rustlibdir}/%{rust_triple}/analysis/
 
+
 %changelog
+* Thu Sep 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.46.0-1
+- new upstream release.
+
 * Thu Mar 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.42.0-1
 - new upstream release.
 - separated debuginfo.

+ 21 - 7
u/unzip/unzip-vl.spec

@@ -4,7 +4,7 @@ Summary: A utility for unpacking zip files.
 Summary(ja): zip ファイルを展開するユーティリティ
 Name: unzip
 Version: 6.0
-Release: 6%{?_dist_release}
+Release: 8%{?_dist_release}
 Group: accessories
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -71,6 +71,10 @@ Patch26: unzip-zipbomb-part1.patch
 Patch27: unzip-zipbomb-part2.patch
 Patch28: unzip-zipbomb-part3.patch
 Patch29: unzip-zipbomb-manpage.patch
+# https://github.com/madler/unzip/commit/13f0260beae851f7d5dd96e9ef757d8d6d7daac1
+Patch30: unzip-6.0-fix-false-overlap-detection-on-32bit-systems.patch
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=963996
+Patch31: unzip-fix-buffer-length.patch
 
 # japanese charset support
 # https://gist.github.com/hamano/573753
@@ -104,8 +108,8 @@ zip と unzip は PKWARE(R) の MS-DOS 用 PKZIP で作成された zip アー
 対応していますが,デフォルトの動作やプログラムオプション等一部が
 異なります.
 
-# debuginfo is empty.
-#debug_package
+
+%debug_package
 
 
 %prep
@@ -140,21 +144,24 @@ zip と unzip は PKWARE(R) の MS-DOS 用 PKZIP で作成された zip アー
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
 
 %patch200 -p1 -b .jp
 %patch201 -p1 -b .ignore-E
 %patch202 -p1 -b .utf8
 
-ln -s unix/Makefile Makefile
-
 
 %build
-make LOCAL_UNZIP="-D_FILE_OFFSET_BITS=64 -DNO_LCHMOD -D_MBCS -DNO_WORKING_ISPRINT" linux_noasm
+make -f unix/Makefile \
+  CF_NOOPT="-I. -DUNIX $RPM_OPT_FLAGS -DNOMEMCPY -DIZ_HAVE_UXUIDGID -DNO_LCHMOD  -D_MBCS" \
+  LFLAGS2="%{?__global_ldflags}" \
+  generic_gcc
 
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
-make prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 install LF2=""
+make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 INSTALL="cp -p" install
 
 
 %clean
@@ -170,6 +177,13 @@ make prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 ins
 
 
 %changelog
+* Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0-8
+- added Patch31.
+- changed options for make.
+
+* Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0-7
+- imported Patch30 from gentoo.
+
 * Sun Sep 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0-6
 - re-imported Patch1-29 from rawhide.