Browse Source

updated 22 packages

actdiag-0.5.4-1

blockdiag-1.5.4-1

clamav-0.102.1-1

ghostscript-9.27-3

git-2.24.1-1

incron-0.5.12-4

iputils-20190709-2

libsass-3.6.3-1

libxslt-1.1.34-1

nginx-1.16.1-4

nsd-4.2.4-1

nwdiag-1.0.4-1

oniguruma-6.9.4-1

php73-7.3.12-1

python-funcparserlib-0.3.6-1

python-webcolors-1.10-1

samba-4.10.10-1

seqdiag-0.9.6-1

strongswan-5.8.1-1

trousers-0.3.14-1

unbound-1.9.6-1

unrar-free-0.0.1.20140707-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12316 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 2 years ago
parent
commit
9b8fa4f95b

+ 38 - 12
a/actdiag/actdiag-vl.spec

@@ -1,25 +1,22 @@
-%define ver 0.5.1
-%define rel 1
-
 Summary: simple activity-diagram image generator
 Summary(ja): シンプルなテキストからアクティビティ図を生成するツール
 Name: actdiag
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
+Version: 0.5.4
+Release: 1%{?_dist_release}
 
 License: Apache License 2.0
 Group: Applications/Text
 URL: http://blockdiag.com/ja/actdiag/
-Source0: http://pypi.python.org/packages/source/a/actdiag/%{name}-%{version}.tar.gz
+Source0: https://pypi.python.org/packages/source/a/actdiag/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
+BuildRequires: python-rpm-macros
 Requires: python >= 2.4
 Requires: python(abi) = %pyver
-Requires: python-imaging >= 1.1.5
-Requires: python-funcparserlib >= 0.3.4
+Requires: blockdiag
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -28,28 +25,57 @@ Packager: iwaim
 %description
 actdiag generate activity-diagram image file from spec-text file.
 
+
+%package -n python3-actdiag
+Summary: simple activity-diagram image generator
+Summary(ja): シンプルなテキストからアクティビティ図を生成するツール
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-rpm-macros
+Requires: python3
+Requires: python3-blockdiag
+
+%description -n python3-actdiag
+seqdiag generate sequence-diagram image file from spec-text file.
+
+
 %prep
 %setup -q
 
 %build
-%__python setup.py build
+%py_build
+%py3_build
 
 %install
 %__rm -rf %{buildroot}
-%__python setup.py install --skip-build --root %{buildroot}
+%py_install
+%py3_install
 
 %clean
 %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc src/README.txt src/TODO.txt LICENSE
+%license LICENSE
+%doc README*
 %{_bindir}/actdiag
-%{python_sitelib}/actdiag-%{ver}-py*.egg-info
+%{python_sitelib}/actdiag-%{version}-py*.egg-info
 %{python_sitelib}/actdiag
 %{python_sitelib}/actdiag_sphinxhelper.*
 
+%files -n python3-actdiag
+%defattr(-,root,root,-)
+%license LICENSE
+%doc README*
+%{_bindir}/actdiag
+%{python3_sitelib}/actdiag*
+%{python3_sitelib}/__pycache__/*
+
 %changelog
+* Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.4-1
+- new upstream release.
+- added python3 support.
+
 * Mon Dec 30 2013 IWAI, Masaharu <iwaim.sub@gmail.com> 0.5.1-1
 - update to 0.5.1
 

+ 41 - 13
b/blockdiag/blockdiag-vl.spec

@@ -1,24 +1,22 @@
-%define ver 1.3.2
-%define rel 1
-
 Summary: simple block-diagram image generator
 Summary(ja): シンプルなテキストからブロック図を生成するツール
 Name: blockdiag
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
+Version: 1.5.4
+Release: 1%{?_dist_release}
+Group: Applications/Text
 
 License: Apache License 2.0
-Group: Applications/Text
 URL: http://blockdiag.com/ja/
-Source0: http://pypi.python.org/packages/source/b/blockdiag/%{name}-%{version}.tar.gz
+Source0: https://pypi.python.org/packages/source/b/blockdiag/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
+BuildRequires: python-rpm-macros
 Requires: python >= 2.4
 Requires: python(abi) = %pyver
-Requires: python-imaging >= 1.1.5
+Requires: python-pillow
 Requires: python-funcparserlib >= 0.3.4
 Requires: python-webcolors
 
@@ -29,28 +27,58 @@ Packager: iwaim
 %description
 blockdiag generate block-diagram image file from spec-text file.
 
+
+%package -n python3-blockdiag
+Summary: simple block-diagram image generator
+Summary(ja): シンプルなテキストからブロック図を生成するツール
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-rpm-macros
+Requires: python3
+Requires: python3-pillow
+Requires: python3-funcparserlib
+Requires: python3-webcolors
+
+%description -n python3-blockdiag
+blockdiag generate block-diagram image file from spec-text file.
+
 %prep
 %setup -q
 
 %build
-%__python setup.py build
+%py_build
+%py3_build
 
 %install
 %__rm -rf %{buildroot}
-%__python setup.py install --skip-build --root %{buildroot}
+%py_install
+%py3_install
 
 %clean
 %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc examples src/README.txt src/TODO.txt
-%{_bindir}/blockdiag
-%{python_sitelib}/blockdiag-%{ver}-py*.egg-info
+%license LICENSE
+%doc examples README.rst
+#%{_bindir}/blockdiag
+%{python_sitelib}/blockdiag-%{version}-py*.egg-info
 %{python_sitelib}/blockdiag
 %{python_sitelib}/blockdiag_sphinxhelper.*
 
+%files -n python3-blockdiag
+%defattr(-,root,root,-)
+%license LICENSE
+%doc examples README.rst
+%{_bindir}/blockdiag
+%{python3_sitelib}/blockdiag*
+%{python3_sitelib}/__pycache__/*
+
 %changelog
+* Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.4-1
+- new upstream release.
+- added python3 support.
+
 * Mon Dec 30 2013 IWAI, Masaharu <iwaim.sub@gmail.com> 1.3.2-1
 - update to 1.3.2
 

+ 6 - 3
c/clamav/clamav-vl.spec

@@ -13,11 +13,11 @@
 Summary: Clam AntiVirus
 Summary(ja): Clamアンチウィルススキャナ
 Name: clamav
-Version: 0.102.0
-Release: 2%{?_dist_release}
+Version: 0.102.1
+Release: 1%{?_dist_release}
 License: GPL
 Group: Applications/System
-URL: http://www.clamav.net/
+URL: https://www.clamav.net/
 Source0: https://www.clamav.net/downloads/production/%{name}-%{version}.tar.gz
 Source1: clamd.init
 Source2: freshclam.init
@@ -243,6 +243,9 @@ fi
 %{_includedir}/*
 
 %changelog
+* Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.102.1-1
+- new upstream release.
+
 * Thu Oct 10 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.102.0-2
 - fixed freshclam.init.
 

+ 6 - 1
g/ghostscript/ghostscript-vl.spec

@@ -7,7 +7,7 @@ Summary: A PostScript(TM) interpreter and renderer.
 Summary(ja): 日本語 PostScript(TM) インタプリタ/レンダラ/ビュア
 Name: ghostscript
 Version: %{gs_dot_ver}
-Release: 2%{?_dist_release}
+Release: 3%{?_dist_release}
 
 # Included CMap data is Redistributable, no modification permitted,
 # see http://bugzilla.redhat.com/487510
@@ -34,6 +34,7 @@ Patch100: ghostscript-9.23-100-run-dvipdf-securely.patch
 Patch001: ghostscript-cve-2019-10216.patch
 Patch002: CVE-2019-14811_14812_14813.patch
 Patch003: 0001-fix-CVE-2019-14817.patch
+Patch004: CVE-2019-14869.patch
 
 # Vine patch(es)
 Patch1000: runlibfileifexists.patch
@@ -141,6 +142,7 @@ rm -rf windows
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %patch100 -p1
 
@@ -348,6 +350,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libgs.so
 
 %changelog
+* Thu Nov 28 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.27-3
+- added Patch004 to fix CVE-2019-14869.
+
 * Sun Sep 08 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.27-2
 - added missing fonts.
 

+ 4 - 1
g/git/git-vl.spec

@@ -5,7 +5,7 @@
 
 # Pass --without docs to rpmbuild if you don't want the documentation
 Name:    git
-Version: 2.21.0
+Version: 2.24.1
 Release: 1%{?_dist_release}
 Summary: Core git tools
 Summary(ja): Core git ツール
@@ -450,6 +450,9 @@ fi
 # No files for you!
 
 %changelog
+* Mon Dec 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.24.1-1
+- updated to 2.24.1.
+
 * Sat May 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.21.0-1
 - updated to 2.21.0.
 - rebuilt with perl-5.26.

+ 7 - 1
i/incron/incron-vl.spec

@@ -1,7 +1,7 @@
 Summary:     Inotify cron system
 Name:        incron
 Version:     0.5.12
-Release:     3%{?_dist_release}
+Release:     4%{?_dist_release}
 
 Group:       System Environment/Base          
 License:     GPLv2
@@ -10,6 +10,8 @@ Source0:     https://github.com/ar-/incron/archive/%{version}.tar.gz#/%{name}-%{
 Source1:     incrond.init
 Patch0:      incron-0.5.10-gcc.patch
 Patch1:      incron-0.5.12-prevent-zombies.patch
+# https://github.com/ar-/incron/pull/45/commits/134900ea1dd19834ba6e6c7e7e07611a0e0d78a0
+Patch2:      incron-fix-segv-on-mkdir.patch
 BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post):   /sbin/chkconfig
@@ -30,6 +32,7 @@ filesystem events rather than time periods.
 %setup -q
 %patch0 -p1 -b .gcc
 %patch1 -p1 -b .zombie
+%patch2 -p1 -b .mkdir
 
 %build
 make %{?_smp_mflags} CXXFLAGS="%{optflags}"
@@ -89,6 +92,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Dec 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.12-4
+- imported Patch2.
+
 * Mon Nov 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.12-3
 - replaced Patch1.
 

+ 7 - 1
i/iputils/iputils-vl.spec

@@ -2,7 +2,7 @@ Summary: Network monitoring tools including ping.
 Summary(ja): ping 等のネットワークモニタツール集
 Name: iputils
 Version: 20190709
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 # some parts are under the original BSD (ping.c)
 # some are under GPLv2+ (tracepath.c)
 License: BSD and GPLv2+
@@ -19,6 +19,7 @@ Source10: bsd.txt
 Source11: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
 
 Patch1: iputils-ifenslave.patch
+Patch2: iputils-fix-arping.patch
 
 # Vine Source(s)/Patch(es)
 
@@ -52,6 +53,7 @@ the target machine is alive and receiving network traffic.
 cp %{SOURCE10} %{SOURCE11} .
 
 %patch1 -p1
+%patch2 -p1
 
 %build
 %ifarch s390 s390x
@@ -116,6 +118,7 @@ install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ninfod
 
 %find_lang %{name}
 
+
 %post
 /sbin/chkconfig --add rdisc
 /sbin/chkconfig --add ninfod
@@ -161,6 +164,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/sysconfig/ninfod
 
 %changelog
+* Wed Nov 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20190709-2
+- imported Patch2 from upstream to fix arping.
+
 * Tue Oct 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20190709-1
 - updated to 20190709.
 - dropped Source1000 and Patch1000: merged into upstream.

+ 4 - 1
lib/libs/libsass/libsass-vl.spec

@@ -1,5 +1,5 @@
 Name:           libsass
-Version:        3.6.1
+Version:        3.6.3
 Release:        1%{?_dist_release}
 Summary:        C/C++ port of the Sass CSS precompiler
 Summary(ja):    C/C++ Sass CSS プリコンパイラ
@@ -71,6 +71,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 
 %changelog
+* Wed Nov 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.6.3-1
+- new upstream release.
+
 * Fri Aug 30 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.6.1-1
 - new upstream release.
 

+ 6 - 7
lib/libx/libxslt/libxslt-vl.spec

@@ -4,8 +4,8 @@
 Summary: Library providing the Gnome XSLT engine
 Summary(ja): XSLT エンジンライブラリ
 Name: libxslt
-Version: 1.1.33
-Release: 2%{_dist_release}
+Version: 1.1.34
+Release: 1%{_dist_release}
 Group: System Environment/Libraries
 
 Vendor: Project Vine
@@ -15,11 +15,6 @@ License: MIT
 URL: http://xmlsoft.org/XSLT/
 Source0: ftp://xmlsoft.org/libxslt/%{name}-%{version}.tar.gz
 
-Patch1: CVE-2019-11068.patch
-Patch2: CVE-2019-13117.patch
-Patch3: CVE-2019-13118.patch
-Patch4: CVE-2019-18197.patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtirpc-devel
 BuildRequires: libxcrypt-devel
@@ -250,6 +245,10 @@ rm -vrf %{buildroot}%{_docdir}
 %endif
 
 %changelog
+* Mon Dec 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.34-1
+- updated to 1.1.34.
+- dropped Patch1-4: fixed in upstream.
+
 * Sat Oct 26 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.33-2
 - added Patch1-4.
 

+ 6 - 1
n/nginx/nginx-vl.spec

@@ -35,7 +35,7 @@ Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロ
 Name:           nginx
 Version:        %{nginx_version}
 # do not reset or decrease.
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 
 Group:          System Environment/Daemons   
 # BSD License (two clause)
@@ -96,6 +96,7 @@ Source2030: https://github.com/leev/ngx_http_geoip2_module/archive/%{geoip2_vers
 %global modsecurity_version 1.0.0
 Source2040: https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v%{modsecurity_version}/modsecurity-nginx-v%{modsecurity_version}.tar.gz
 Patch2040: modsecurity-nginx-master.patch
+Patch2041: modsecurity-fix-host_ip.patch
 %endif
 
 # removes -Werror in upstream build scripts.  -Werror conflicts with
@@ -328,6 +329,7 @@ popd
 %if %{with modsecurity}
 pushd modsecurity-nginx-v%{modsecurity_version}
 %patch2040 -p1
+%patch2041 -p1
 %endif
 
 %build
@@ -666,6 +668,9 @@ fi
 %endif
 
 %changelog
+* Wed Nov 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.1-4
+- added Patch2041.
+
 * Thu Oct 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.1-3
 - added Patch2040.
 

+ 4 - 1
n/nsd/nsd-vl.spec

@@ -1,7 +1,7 @@
 Summary: Fast and lean authoritative DNS Name Server
 Summary(ja): 高速で最小限のAuthoritative専用DNSネームサーバ
 Name: nsd
-Version: 4.2.2
+Version: 4.2.4
 Release: 1%{?_dist_release}
 License: BSD
 Url: http://www.nlnetlabs.nl/%{name}/
@@ -114,6 +114,9 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Mon Dec 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.2.4-1
+- new upstream release.
+
 * Sat Aug 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.2.2-1
 - new upstream release.
 

+ 46 - 16
n/nwdiag/nwdiag-vl.spec

@@ -1,16 +1,13 @@
-%define ver 1.0.0
-%define rel 1
-
 Summary: simple network-diagram image generator
 Summary(ja): シンプルなテキストからネットワーク図を生成するツール
 Name: nwdiag
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
+Version: 1.0.4
+Release: 1%{?_dist_release}
+Group: Applications/Text
 
 License: Apache License 2.0
-Group: Applications/Text
 URL: http://blockdiag.com/ja/nwdiag/
-Source0: http://pypi.python.org/packages/source/n/nwdiag/%{name}-%{version}.tar.gz
+Source0: https://pypi.python.org/packages/source/n/nwdiag/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 
@@ -18,8 +15,7 @@ BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
 Requires: python(abi) = %pyver
 Requires: python >= 2.4
-Requires: python-imaging >= 1.1.5
-Requires: python-funcparserlib >= 0.3.4
+Requires: blockdiag
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -28,26 +24,43 @@ Packager: iwaim
 %description
 nwdiag generate network-diagram image file from spec-text file.
 
+
+%package -n python3-nwdiag
+Summary: simple network-diagram image generator
+Summary(ja): シンプルなテキストからネットワーク図を生成するツール
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-rpm-macros
+Requires: python3
+Requires: python3-blockdiag
+
+%description -n python3-nwdiag
+nwdiag generate network-diagram image file from spec-text file.
+
+
 %prep
 %setup -q
 
 %build
-%__python setup.py build
+%py_build
+%py3_build
 
 %install
 %__rm -rf %{buildroot}
-%__python setup.py install --skip-build --root %{buildroot}
+%py_install
+%py3_install
 
 %clean
 %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc src/README.txt src/TODO.txt LICENSE examples
-%{_bindir}/nwdiag
-%{_bindir}/packetdiag
-%{_bindir}/rackdiag
-%{python_sitelib}/nwdiag-%{ver}-py*.egg-info
+%license LICENSE
+%doc README* examples
+#%{_bindir}/nwdiag
+#%{_bindir}/packetdiag
+#%{_bindir}/rackdiag
+%{python_sitelib}/nwdiag-%{version}-py*.egg-info
 %{python_sitelib}/nwdiag
 %{python_sitelib}/packetdiag
 %{python_sitelib}/rackdiag
@@ -55,7 +68,24 @@ nwdiag generate network-diagram image file from spec-text file.
 %{python_sitelib}/packetdiag_sphinxhelper.*
 %{python_sitelib}/rackdiag_sphinxhelper.*
 
+%files -n python3-nwdiag
+%defattr(-,root,root,-)
+%license LICENSE
+%doc README* examples
+%{_bindir}/nwdiag
+%{_bindir}/packetdiag
+%{_bindir}/rackdiag
+%{python3_sitelib}/nwdiag*
+%{python3_sitelib}/packetdiag*
+%{python3_sitelib}/rackdiag*
+%{python3_sitelib}/__pycache__/*
+
+
 %changelog
+* Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.4-1
+- new upstream release.
+- added python3 support.
+
 * Mon Dec 30 2013 IWAI, Masaharu <iwaim.sub@gmail.com> 1.0.0-1
 - update to 1.0.0
 

+ 4 - 1
o/oniguruma/oniguruma-vl.spec

@@ -3,7 +3,7 @@
 Summary:	Oniguruma - A regular expressions library
 Summary(ja):	鬼車 - 正規表現ライブラリ
 Name:		oniguruma
-Version:	6.9.3
+Version:	6.9.4
 Release:	1%{?_dist_release}
 License:	BSD
 Group:		System Environment/Libraries
@@ -87,6 +87,9 @@ applications with Oniguruma.
 %{_includedir}/onig*.h
 
 %changelog
+* Wed Dec 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.9.4-1
+- new upstream release.
+
 * Sat Sep 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.9.3-1
 - new upstream release.
 

+ 4 - 1
p/php73/php73-vl.spec

@@ -50,7 +50,7 @@
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 7.3.11
+Version: 7.3.12
 Release: 1%{_dist_release}
 Conflicts: php5 < 5.6.11
 
@@ -1008,6 +1008,9 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.3.12-1
+- new upstream release.
+
 * Thu Oct 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.3.11-1
 - new upstream release.
 

+ 59 - 15
p/python-funcparserlib/python-funcparserlib-vl.spec

@@ -1,21 +1,22 @@
-%define ver 0.3.5
-%define rel 3
-
 Summary: Recursive descent parsing library for Python based on functional combinators
 Name: python-funcparserlib
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
-License: MIT License
+Version: 0.3.6
+Release: 1%{?_dist_release}
 Group: Development/Libraries
-URL: http://code.google.com/p/funcparserlib/
-Source0:http://pypi.python.org/packages/source/f/funcparserlib/funcparserlib-%{version}.tar.gz
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: MIT License
+URL: https://pypi.org/project/funcparserlib/
+Source0:https://pypi.python.org/packages/source/f/funcparserlib/funcparserlib-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 BuildRequires: python-devel
+BuildRequires: python-setuptools
+BuildRequires: python-rpm-macros
 Requires: python
 
-Vendor: Project Vine
-Distribution: Vine Linux
 
 %description
 Parser combinators are just higher-order functions that take parsers as 
@@ -34,26 +35,69 @@ rather slow method compared to LL(k) or LR(k) algorithms.
 So the primary domain for funcparserlib is parsing little languages or 
 external DSLs (domain specific languages).
 
+
+%package -n python3-funcparserlib
+Summary: Recursive descent parsing library for Python based on functional combinators
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-rpm-macros
+Requires: python3
+
+%description -n python3-funcparserlib
+Parser combinators are just higher-order functions that take parsers as 
+their arguments and return them as result values. Parser combinators are:
+
+- First-class values
+- Extremely composable
+- Tend to make the code quite compact
+- Resemble the readable notation of xBNF grammars
+
+Parsers made with funcparserlib are pure-Python LL(*) parsers. It means 
+that it's very easy to write them without thinking about look-aheads and 
+all that hardcore parsing stuff. But the recursive descent parsing is a 
+rather slow method compared to LL(k) or LR(k) algorithms.
+
+So the primary domain for funcparserlib is parsing little languages or 
+external DSLs (domain specific languages).
+
+
 %prep
-%setup -q -n funcparserlib-%{ver}
+%setup -q -n funcparserlib-%{version}
 
 %build
-%__python setup.py build
+%py_build
+%py3_build
 
 %install
 %__rm -rf %{buildroot}
-%__python setup.py install --skip-build --root %{buildroot}
+%py_install
+%py3_install
+
+sed -i \
+	-e 's/except NoParseError, e:/except NoParseError as e:/' \
+	%{buildroot}%{python3_sitelib}/funcparserlib/parser.py
 
 %clean
 %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES LICENSE README doc examples
-%{python_sitelib}/funcparserlib-%{ver}-py*.egg-info
+%license LICENSE
+%doc CHANGES README doc examples
+%{python_sitelib}/funcparserlib-%{version}-py*.egg-info
 %{python_sitelib}/funcparserlib
 
+%files -n python3-funcparserlib
+%defattr(-,root,root,-)
+%license LICENSE
+%doc CHANGES README doc examples
+%{python3_sitelib}/funcparserlib*
+
 %changelog
+* Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.3.6-1
+- new upstream release.
+- added python3 support.
+
 * Sun Jan 12 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.3.5-3
 - rebuild with VineSeed environment
 

+ 45 - 14
p/python-webcolors/python-webcolors-vl.spec

@@ -1,17 +1,16 @@
-%define ver 1.4
-%define rel 1
-
 Summary: a Python library for working with color names and color value formats defined by the HTML etc.
 Name: python-webcolors
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
-License: MIT License
+Version: 1.10
+Release: 1%{?_dist_release}
 Group: Development/Libraries
+License: MIT License
 URL: https://pypi.python.org/pypi/webcolors
-Source0:https://pypi.python.org/packages/source/w/webcolors/webcolors-%{version}.tar.gz
+Source0: https://pypi.python.org/packages/source/w/webcolors/webcolors-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 BuildRequires: python-devel
+BuildRequires: python-setuptools
+BuildRequires: python-rpm-macros
 Requires: python(abi) = %pyver
 
 Vendor: Project Vine
@@ -29,26 +28,58 @@ Support is included for the following formats (RGB colorspace only; conversion t
 - Integer rgb() triplet
 - Percentage rgb() triplet
 
+
+%package -n python3-webcolors
+Summary: a Python library for working with color names and color value formats defined by the HTML etc.
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-rpm-macros
+Requires: python3
+
+%description -n python3-webcolors
+A library for working with color names and color value formats defined by the HTML and CSS specifications for use in documents on the Web.
+
+Support is included for the following formats (RGB colorspace only; conversion to/from HSL can be handled by the colorsys module in the Python standard library):
+
+- Specification-defined color names
+- Six-digit hexadecimal
+- Three-digit hexadecimal
+- Integer rgb() triplet
+- Percentage rgb() triplet
+
+
 %prep
-%setup -q -n webcolors-%{ver}
+%setup -q -n webcolors-%{version}
 
 %build
-%__python setup.py build
+%py_build
+%py3_build
 
 %install
 %__rm -rf %{buildroot}
-%__python setup.py install --skip-build --root %{buildroot}
+%py_install
+%py3_install
 
 %clean
 %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
-%{python_sitelib}/webcolors-%{ver}-py*.egg-info
-%{python_sitelib}/webcolors.py
-%{python_sitelib}/webcolors.pyc
+%license LICENSE
+%doc README
+%{python_sitelib}/webcolors*
 
+%files -n python3-webcolors
+%defattr(-,root,root,-)
+%license LICENSE
+%doc README
+%{python3_sitelib}/webcolors*
+%{python3_sitelib}/__pycache__/webcolors*
+ 
 %changelog
+* Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10-1
+- new upstream release.
+- added python3 support.
+
 * Sun Mar  3 2013 IWAI, Masaharu <iwai@alib.jp> 1.4-1
 - initial build for Vine Linux

+ 4 - 1
s/samba/samba-vl.spec

@@ -1,4 +1,4 @@
-%define samba_version 4.10.9
+%define samba_version 4.10.10
 #define rc_number rc4
 %define samba_release 1
 
@@ -1674,6 +1674,9 @@ fi
 %endif
 
 %changelog
+* Wed Nov 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.10.10-1
+- new upstream release.
+
 * Thu Oct 17 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.10.9-1
 - new upstream release.
 

+ 40 - 14
s/seqdiag/seqdiag-vl.spec

@@ -1,25 +1,22 @@
-%define ver 0.9.0
-%define rel 1
-
 Summary: simple sequence-diagram image generator
 Summary(ja): シンプルなテキストからシーケンス図を生成するツール
 Name: seqdiag
-Version: %{ver}
-Release: %{rel}%{?_dist_release}
+Version: 0.9.6
+Release: 1%{?_dist_release}
+Group: Applications/Text
 
 License: Apache License 2.0
-Group: Applications/Text
 URL: http://blockdiag.com/ja/seqdiag/
-Source0: http://pypi.python.org/packages/source/s/seqdiag/%{name}-%{version}.tar.gz
+Source0: https://pypi.python.org/packages/source/s/seqdiag/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 
 BuildRequires: python-devel >= 2.4
 BuildRequires: python-setuptools
+BuildRequires: python-rpm-macros
 Requires: python >= 2.4
 Requires: python(abi) = %pyver
-Requires: python-imaging >= 1.1.5
-Requires: python-funcparserlib >= 0.3.4
+Requires: blockdiag
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -28,28 +25,57 @@ Packager: iwaim
 %description
 seqdiag generate sequence-diagram image file from spec-text file.
 
+
+%package -n python3-seqdiag
+Summary: simple sequence-diagram image generator
+Summary(ja): シンプルなテキストからシーケンス図を生成するツール
+BuildRequires: python3-devel
+BuildRequires: python3-setuptools
+BuildRequires: python3-rpm-macros
+Requires: python3
+Requires: python3-blockdiag
+
+%description -n python3-seqdiag
+seqdiag generate sequence-diagram image file from spec-text file.
+
+
 %prep
 %setup -q
 
 %build
-%__python setup.py build
+%py_build
+%py3_build
 
 %install
 %__rm -rf %{buildroot}
-%__python setup.py install --skip-build --root %{buildroot}
+%py_install
+%py3_install
 
 %clean
 %__rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc examples src/README.txt
-%{_bindir}/seqdiag
-%{python_sitelib}/seqdiag-%{ver}-py*.egg-info
+%license LICENSE
+%doc examples README*
+#%{_bindir}/seqdiag
+%{python_sitelib}/seqdiag-%{version}-py*.egg-info
 %{python_sitelib}/seqdiag
 %{python_sitelib}/seqdiag_sphinxhelper.*
 
+%files -n python3-seqdiag
+%defattr(-,root,root,-)
+%license LICENSE
+%doc examples README*
+%{_bindir}/seqdiag
+%{python3_sitelib}/seqdiag*
+%{python3_sitelib}/__pycache__/*
+
 %changelog
+* Thu Nov 21 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.6-1
+- new upstream release.
+- added python3 support.
+
 * Mon Dec 30 2013 IWAI, Masaharu <iwaim.sub@gmail.com> 0.9.0-1
 - update to 0.9.0
 - drop src/TODO.txt: upstream deleted

+ 7 - 4
s/strongswan/strongswan-vl.spec

@@ -7,16 +7,16 @@
 #%%define prerelease dr1
 
 Name:           strongswan
-Version:        5.7.2
+Version:        5.8.1
 Release:        1%{?_dist_release}
 Summary:        An OpenSource IPsec-based VPN and TNC solution
 Summary(ja):    オープンソースのIPsec VPN/TNCソリューション
-License:        GPLv2+
-URL:            http://www.strongswan.org/
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Packager:       tomop
-Source0:        http://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2
+License:        GPLv2+
+URL:            http://www.strongswan.org/
+Source0:        https://download.strongswan.org/%{name}-%{version}%{?prerelease}.tar.bz2
 Source1000:     strongswan.init
 Patch1:         strongswan-5.6.0-uintptr_t.patch
 Patch3:         strongswan-5.6.2-CVE-2018-5388.patch
@@ -327,6 +327,9 @@ fi
 %endif
 
 %changelog
+* Wed Nov 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.8.1-1
+- new upstream release.
+
 * Tue Jan 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.7.2-1
 - new upstream release.
 

+ 10 - 6
t/trousers/trousers-vl.spec

@@ -3,16 +3,17 @@
 
 Name: trousers
 Summary: TCG's Software Stack v1.2
-Version: 0.3.13
-Release: 12%{?_dist_release}
-License: BSD
+Version: 0.3.14
+Release: 1%{?_dist_release}
 Group: System Environment/Libraries
-Url: http://trousers.sourceforge.net
+
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: tomop
 
-Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+License: BSD
+URL: http://trousers.sourceforge.net
+Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Source1: tcsd.service
 Source1000: tcsd.init
 Patch1:  trousers-0.3.13-noinline.patch
@@ -65,7 +66,7 @@ Header files and man pages for use in creating Trusted Computing enabled
 applications.
 
 %prep
-%setup -q
+%setup -q -c
 %patch1 -p1 -b .noinline
 %patch2 -p1 -b .ssl1.1
 # fix man page paths
@@ -158,6 +159,9 @@ fi
 %{_libdir}/libtddl.a
 
 %changelog
+* Wed Nov 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.3.14-1
+- new upstream release.
+
 * Wed Nov 07 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.3.13-12
 - rebuilt with openssl-1.1.1.
 - enabled Patch2.

+ 4 - 1
u/unbound/unbound-vl.spec

@@ -10,7 +10,7 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.9.4
+Version: 1.9.6
 Release: 1%{?_dist_release}
 License: BSD
 Url: http://www.unbound.net/
@@ -281,6 +281,9 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Mon Dec 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.6-1
+- updated to 1.9.6.
+
 * Fri Oct 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.4-1
 - updated to 1.9.4.
 

+ 27 - 7
u/unrar-free/unrar-free-vl.spec

@@ -1,15 +1,27 @@
-%define _version        0.0.1-20071127
+%define _version        0.0.1-20140707
 
 Name:           unrar-free
-Version:        0.0.1.20071127
-Release:        3%{?_dist_release}
+Version:        0.0.1.20140707
+Release:        1%{?_dist_release}
 Summary:        Utility for extracting RAR archives (free version)
-Summary(ja):        RARアーカイブを解凍するためのユーティリティ (free version)
+Summary(ja):    RARアーカイブを解凍するためのユーティリティ (free version)
+Group:          Applications/Archiving
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 License:        GPLv2
-Group:          Applications/Archiving
 URL:            http://home.gna.org/unrar/
 Source0:        unrar-%{_version}.tar.gz
+
+Patch0:         0001-CVE-2017-14120.patch
+Patch1:         0002-CVE-2017-14122.patch
+Patch2:         0003-CVE-2017-14121.patch
+Patch3:         0004-unrar-nonfree-compat-ignored-options.patch
+
+# Vine
+Patch1000:      0001-fixed-warnings.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 Conflicts:      unrar
 
@@ -27,9 +39,11 @@ unrar-free はRAR archivesを展開するためのユーティリティです。
 それらのアーカイブを処理できます。
 
 %prep
-%setup -q -n unrar-0.0.1-20071127
+%autosetup -p1 -n unrar-0.0.1
 
 %build
+autoreconf -ivf
+%configure
 make %{?_smp_mflags}
 
 
@@ -44,11 +58,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README
+%license COPYING
+%doc AUTHORS ChangeLog README
 %{_bindir}/unrar
 
 
 %changelog
+* Fri Nov 15 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.0.1-20140707-1
+- updated to 20140707.
+- imported Patch0-4 from debian.
+- added Patch1000 to fix warnings.
+
 * Sun Jan 12 2014 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.0.1.20071127-3
 - rebuilt with current toolchain