updated 7 packages

ghostscript-9.53.3-1

lua-5.4.2-1

libjpeg-turbo-2.0.6-1

libtiff-4.2.0-1

openjpeg2-2.4.0-1

proftpd-1.3.7a-1

wireshark-3.4.2-1

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

g/ghostscript/ghostscript-vl.spec

@@ -13,7 +13,7 @@
 Summary:        A PostScript(TM) interpreter and renderer.
 Summary(ja):    日本語 PostScript(TM) インタプリタ/レンダラ/ビュア
 Name:           ghostscript
-Version:        9.53.0
+Version:        9.53.3
 Release:        1%{?_dist_release}
 Group:          publishing
 Vendor:         Project Vine
@@ -42,9 +42,10 @@ Source5:        cidfmap.ja
 Source10:       Changelog.gs7.vine
 
 # patches from upstream
+Patch001:       ghostscript-9.53.3-drop-ft-callback-def.patch
+Patch002:       ghostscript-9.53.3-restore-opvp-device.patch
 
 # patches from fedora
-Patch100:       ghostscript-9.23-100-run-dvipdf-securely.patch
 
 # security patches
 
@@ -153,7 +154,8 @@ A GTK-enabled version of Ghostscript, called 'gsx'.
 %setup -q -n %{name}-%{version}
 rm -rf cups/libs expat freetype jasper jpeg jpegxr lcms2* libpng openjpeg tiff windows zlib
 
-%patch100 -p1
+%patch001 -p1
+%patch002 -p1
 %patch1000 -p1
 
 
@@ -382,6 +384,11 @@ fi
 
 
 %changelog
+* Tue Dec 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.53.3-1
+- new upstream release.
+- dropped Patch100.
+- imported Patch001 and 002 from rawhide.
+
 * Fri Sep 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.53.0-1
 - new upstream release.
 - dropped Patch000: fixed in upstream.

l/lua/lua-vl.spec

@@ -1,11 +1,11 @@
 # No tests yet for 5.3.5
-%global test_version 5.4.0
+%global test_version 5.4.2
 # If you are incrementing major_version, enable bootstrapping and adjust accordingly.
 # Version should be the latest prior build. If you don't do this, RPM will break and
 # everything will grind to a halt.
 %global bootstrap 1
 %global bootstrap_major_version 5.3
-%global bootstrap_version %{bootstrap_major_version}.5
+%global bootstrap_version %{bootstrap_major_version}.6
 
 # Place rpm-macros into proper location.
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
@@ -13,7 +13,7 @@
 Summary:        Lua is a powerful, light-weight programming language designed for extending applications.
 Summary(ja):    アプリケーション拡張向けに設計された強力かつ軽量なプログラミング言語
 Name:           lua
-Version:        5.4.0
+Version:        5.4.2
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -43,19 +43,8 @@ Patch4:         %{name}-5.3.0-configure-compat-module.patch
 Patch5:         %{name}-5.3.0-autotoolize.patch
 Patch6:		%{name}-5.3.5-luac-shared-link-fix.patch
 %endif
-Patch7:		%{name}-5.4.0-CVE-2020-15889.patch
-Patch8:		%{name}-5.4.0-CVE-2020-15945.patch
 # https://www.lua.org/bugs.html
-# Bug 1 is CVE-2020-15889
+# none
-Patch9:		%{name}-5.4.0-bug2.patch
-Patch10:	%{name}-5.4.0-bug3.patch
-Patch11:	%{name}-5.4.0-bug4.patch
-Patch12:	%{name}-5.4.0-bug5.patch
-Patch13:	%{name}-5.4.0-bug6.patch
-Patch14:	%{name}-5.4.0-bug7.patch
-Patch15:	%{name}-5.4.0-bug8.patch
-
-Patch1000:	CVE-2020-24342.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  readline-devel
@@ -130,18 +119,6 @@ mv src/luaconf.h src/luaconf.h.template.in
 #%% patch2 -p1 -z .luac-shared
 %patch3 -p1 -z .configure-linux
 %patch4 -p1 -z .configure-compat-all
-%patch7 -p1 -b .CVE-2020-15889
-%patch8 -p1 -b .CVE-2020-15945
-%patch9 -p1 -b .bug2
-%patch10 -p1 -b .bug3
-%patch11 -p1 -b .bug4
-%patch12 -p1 -b .bug5
-%patch13 -p1 -b .bug6
-%patch14 -p1 -b .bug7
-%patch15 -p1 -b .bug8
-pushd src
-%patch1000 -p1 -b .CVE-2020-24342
-popd
 
 # Put proper version in configure.ac, patch0 hardcodes 5.3.0
 sed -i 's|5.3.0|%{version}|g' configure.ac
@@ -280,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Dec 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.2-1
+- new upstream release.
+- dropped Patch8-15 and 1000: fixed in upstream.
+
 * Fri Aug 21 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.0-1
 - new upstream release.
 

lib/libj/libjpeg-turbo/libjpeg-turbo-vl.spec

@@ -4,15 +4,15 @@ Summary:	A MMX/SSE2/SIMD accelerated library for manipulating JPEG image files
 Summary(ja):	MMX/SSE2/SIMD でアクセラレーションされた libjpeg ライブラリ
 
 Name:		libjpeg-turbo
-Version:	2.0.5
+Version:	2.0.6
 Release:	1%{?_dist_release}
-
 Group:		system
-License:	IJG
-URL:		http://sourceforge.net/projects/libjpeg-turbo
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
+License:	IJG
+URL:		http://sourceforge.net/projects/libjpeg-turbo
+
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0:		libjpeg-turbo-cmake.patch
 Patch1:		libjpeg-turbo-CET.patch
@@ -218,6 +218,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Dec 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.6-1
+- new upstream release.
+
 * Wed Sep 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.5-1
 - new upstream release.
 - dropped Patch1000: fixed in upstream.

lib/libt/libtiff/libtiff-vl.spec

@@ -3,9 +3,9 @@
 Summary: A library of functions for manipulating TIFF format image files.
 Summary(ja): TIFF フォーマットの画像ファイルを扱うライブラリ
 Name: libtiff
-Version: 4.1.0
+Version: 4.2.0
 Release: 1%{_dist_release}
-Group: System Environment/Libraries
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke, iwamoto
@@ -49,7 +49,7 @@ libtiff パッケージを是非インストールして下さい．
 %package devel
 Summary: Development tools for programs which will use the libtiff library.
 Summary(ja): libtiff ライブラリを使うプログラム向け開発ツール
-Group: Development/Libraries
+Group: programming
 Requires: libtiff = %{version}
 
 
@@ -75,7 +75,7 @@ TIFF 形式画像ファイルを扱うプログラムを開発する必要があ
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary: A library of functions for manipulating TIFF format image files.
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}
 Provides: libtiff.so.4
 Obsoletes: compat32-libtiff4
@@ -90,7 +90,7 @@ format image files.
 
 %package -n compat32-%{name}-devel
 Summary: Development tools for programs which will use the libtiff library.
-Group: Development/Libraries
+Group: programming
 Requires: compat32-%{name} = %{version}
 Requires: %{name}-devel = %{version}
 %description -n compat32-%{name}-devel
@@ -101,8 +101,12 @@ using the libtiff library.
 If you need to develop programs which will manipulate TIFF format
 image files, you should install this package.  You'll also need to
 install the libtiff package.
-
 #'
+
+
+%debug_package
+
+
 %prep
 %setup -q -n tiff-%{version}
 
@@ -118,6 +122,7 @@ automake --add-missing --copy
 autoconf
 autoheader
 
+
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
 %configure \
@@ -127,6 +132,7 @@ export CFLAGS="%{optflags} -fno-strict-aliasing"
 %__make %{?_smp_mflags}
 %__make clean
 
+
 %install
 rm -fr %{buildroot}
 %makeinstall
@@ -137,8 +143,11 @@ rm -rf %{buildroot}/usr/share/doc/tiff-%{version}
 rm -f %{buildroot}%{_libdir}/libtiff*.{a,la}
 
 
-%post -p /sbin/ldconfig
+%clean
+rm -rf $RPM_BUILD_ROOT
 
+
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %if %{build_compat32}
@@ -146,8 +155,6 @@ rm -f %{buildroot}%{_libdir}/libtiff*.{a,la}
 %postun -n compat32-%{name} -p /sbin/ldconfig
 %endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -178,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.2.0-1
+- new upstream release.
+
 * Mon Jun 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.0-1
 - new upstream release.
 - dropped Patch1001-1004: fixed in upstream.

o/openjpeg2/openjpeg2-vl.spec

@@ -6,17 +6,19 @@
 
 #global optional_components 1
 
-%global minor_version 2.3
+%global minor_version 2.4
 
 Name:           openjpeg2
-Version:        2.3.1
-Release:        2%{?_dist_release}
 Summary:        C-Library for JPEG 2000
 Summary(ja):    JPEG 2000 用の C ライブラリ
+Version:        2.4.0
+Release:        1%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 # windirent.h is MIT, the rest is BSD
 License:        BSD and MIT
-Group:          System Environment/Libraries
 URL:            http://www.openjpeg.org/
 %if 0%{?snap:1}
 # Snapshots taken from stable release branch:
@@ -37,9 +39,6 @@ Patch0:         openjpeg2_remove-thirdparty.patch
 # opj_* to opj2_*
 Patch1:         openjpeg2_opj2.patch
 
-Vendor:         Project Vine
-Distribution:   Vine Linux
-
 BuildRequires:  cmake
 BuildRequires:  zlib-devel
 BuildRequires:  libpng-devel
@@ -66,7 +65,7 @@ This package contains
 %package devel
 Summary:        Development files for OpenJPEG 2
 Summary(ja):    OpenJPEG 2 の開発用ファイル
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 # OpenJPEGTargets.cmake refers to the tools
 Requires:       %{name}-tools%{?_isa} = %{version}-%{release}
@@ -79,7 +78,7 @@ applications that use OpenJPEG 2.
 %package devel-docs
 Summary:        Developer documentation for OpenJPEG 2
 Summary(ja):    OpenJPEG 2 の開発用ドキュメント
-Group:          Documentation
+Group:          documentation
 BuildArch:      noarch
 
 %description devel-docs
@@ -90,7 +89,7 @@ applications that use OpenJPEG 2.
 %package tools
 Summary:        OpenJPEG 2 command line tools
 Summary(ja):    OpenJPEG 2 のコマンドラインツール集
-Group:          Applications/Graphics
+Group:          graphics
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description tools
@@ -220,6 +219,9 @@ OpenJPEG2 JP3D module command line tools
 %endif
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{upname}-%{version} %{?runcheck:-a 1}
 
@@ -272,8 +274,6 @@ chmod +x %{buildroot}%{_bindir}/opj2_jpip_viewer
 
 
 %post -p /sbin/ldconfig
-
-
 %postun -p /sbin/ldconfig
 
 
@@ -356,6 +356,9 @@ make test -C %{_target_platform}
 
 
 %changelog
+* Tue Dec 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.0-1
+- new upstream release.
+
 * Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.1-2
 - fixed files for cmake.
 

p/proftpd/proftpd-vl.spec

@@ -1,20 +1,30 @@
+%bcond_with systemd
+
+%if %{with systemd}
+%define rundir		/run
+%else
+%define rundir		/var/run
+%endif
+
 %define _prefix		/usr
-%define _localstatedir	/var/run
+%define _localstatedir	%{rundir}
 %define _sysconfdir	/etc
-%define _rundir		/var/run/proftpd
+%define _rundir		%{rundir}/proftpd
-%define tarballversion	1.3.6c
+%define tarballversion	1.3.7a
-%define origversion	1.3.6c
+%define origversion	1.3.7a
 
 Summary: ProFTPd -- Professional FTP Server.
 Summary(ja): ProFTPd -- プロフェッショナル FTP サーバ
 Name: proftpd
 Epoch: 1
 Version: %{origversion}
-Release: 1%{?_dist_release}
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: servers,internet
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPL
-Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-
 Source0: https://github.com/proftpd/proftpd/archive/v%{origversion}.tar.gz#/%{name}-%{origversion}.tar.gz
 Source1: proftpd.vine.conf
 Source2: ftpusers.vine
@@ -26,10 +36,6 @@ Source5: welcome.msg
 # auth 
 Patch201: proftpd-1.3.1-use-system-auth-instead-of-pam_pwdb.patch
 
-# iconv patch (CharsetLocal/CharsetRemote)
-# Patch300: http://www.hakusan.tsg.ne.jp/tjkawa/software/misc/proftpd-iconv/pack/proftpd-1.3.0-iconv.patch.gz
-Patch300: proftpd-1.3.6b-iconv.patch
-
 # fix build on recent kernel headers
 # Patch400: proftpd-1.3.1-umode.patch
 
@@ -44,9 +50,6 @@ Requires: pam > 0.59
 Obsoletes: wu-ftpd, anonftp
 Provides: ftpserver
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 ProFTPd is an enhanced FTP server with a focus toward simplicity,
 security, and ease of configuration.  It features a very Apache-like
@@ -63,7 +66,7 @@ anonymous FTP, パーミッションベースのディレクトリ可視性の
 
 %package utils
 Summary: ProFTPD - Additional utilities
-Group:	 	 System Environment/Daemons
+Group:	 	 admin-tools
 Requires:	 %{name} = %{epoch}:%{version}-%{release}
 
 %description utils
@@ -77,6 +80,10 @@ ProFTPD server:
 * ftptop: show the current status of FTP sessions
 * ftpwho: show the current process information for each FTP session
 
+
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{tarballversion}
 find . -type d -name CVS | xargs -r rm -frv
@@ -87,27 +94,30 @@ find . -type d -name CVS | xargs -r rm -frv
 # use system-auth instead of pam_pwdb
 %patch201 -p1
 
-# iconv patch (CharsetLocal/CharsetRemote)
-%patch300 -p1
-
 # fix build on recent kernel headers
 # %patch400 -p0
 
 # security fixes
 
+
 %build
 # Disable stripping in order to get useful debuginfo packages
 %{__perl} -pi -e 's|"-s"|""|g' configure
 
 %configure \
     --libexecdir="%{_libexecdir}/proftpd" \
-    --localstatedir="%{_var}/run/proftpd" \
+    --localstatedir="%{rundir}/proftpd" \
+    --disable-strip \
     --enable-ctrls \
     --enable-facl \
     --enable-dso \
     --enable-nls \
     --enable-ipv6 \
-    --with-modules=mod_readme:mod_auth_pam:mod_tls:mod_codeconv:mod_df:\
+    --enable-openssl \
+    --disable-pcre \
+    --disable-redis \
+    --enable-shadow \
+    --with-modules=mod_readme:mod_auth_pam:mod_tls:\
 mod_ban:mod_dynmasq:mod_load:mod_ratio:mod_rewrite \
     --with-shared=mod_ldap:mod_quotatab:mod_quotatab_file:mod_quotatab_ldap
 
@@ -119,7 +129,7 @@ mod_ban:mod_dynmasq:mod_load:mod_ratio:mod_rewrite \
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot} \
-    rundir="%{_var}/run/proftpd" \
+    rundir="%{rundir}/proftpd" \
     INSTALL_USER=`id -un` \
     INSTALL_GROUP=`id -gn`
 
@@ -131,16 +141,28 @@ mkdir -p %{buildroot}%{_sysconfdir}/pam.d
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 %{__install} -m 644 contrib/dist/rpm/proftpd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/proftpd
 
-# init.d
-%{__install} -D -p -m 0755 %{SOURCE3} \
-    %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
-
 %{__install} -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/proftpd.conf
 %{__install} -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/ftpusers
 %{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/%{_var}/ftp/welcome.msg
 
 touch %{buildroot}%{_sysconfdir}/ftpusers
 
+%if %{with systemd}
+install -D -p -m 644 contrib/dist/rpm/proftpd.service \
+        %{buildroot}%{_unitdir}/proftpd.service
+install -D -p -m 644 contrib/dist/systemd/proftpd.socket \
+        %{buildroot}%{_unitdir}/proftpd.socket
+install -D -p -m 644 contrib/dist/systemd/proftpd@.service \
+        %{buildroot}%{_unitdir}/proftpd@.service
+install -d -m 755 %{buildroot}%{_tmpfilesdir}
+install -p -m 644 contrib/dist/rpm/proftpd-tmpfs.conf \
+        %{buildroot}%{_tmpfilesdir}/proftpd.conf
+%else
+# init.d
+%{__install} -D -p -m 0755 %{SOURCE3} \
+    %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
+%endif
+
 rm contrib/README.* || :
 # eliminate executable bit in %doc
 find doc/ sample-configurations/ -type f -perm +111 | xargs -r chmod -x
@@ -153,32 +175,56 @@ rm -f %{buildroot}%{_libexecdir}/proftpd/*.{la,a}
 rm -rf %{buildroot}%{_includedir}/proftpd
 rm -rf %{buildroot}%{_libdir}/pkgconfig
 
+# Find translations
+%find_lang proftpd
+
+
+%clean
+rm -rf %{buildroot}
+
+
 %preun
+%if %{with systemd}
+if [ $1 -eq 0 ]; then
+	systemctl --no-reload disable proftpd.service &>/dev/null || :
+	systemctl stop proftpd.service &>/dev/null || :
+fi
+%else
+if [ $1 = 0 -o -x /bin/systemctl ] ; then
+	/sbin/service proftpd stop &>/dev/null || :
+	/sbin/chkconfig --del proftpd || :
+fi
+%endif
 if [ -d %{_rundir} ] ; then
 	rm -rf %{_rundir}/*
 fi
 
-if [ $1 = 0 ] ; then
-	/sbin/chkconfig --del proftpd
-fi
-
 %postun
+%if %{with systemd}
+systemctl daemon-reload &>/dev/null || :
+if [ $1 -ge 1 ]; then
+	systemctl try-restart proftpd.service &>/dev/null || :
+fi
+%else
 if [ $1 -ge 1 ]; then
     /sbin/service proftpd condrestart
 fi
+%endif
 
 %post
+%if %{with systemd}
+systemctl daemon-reload &>/dev/null || :
+systemctl preset proftpd.service &>/dev/null || :
+%else
 /sbin/chkconfig --add proftpd
+%endif
 
 
-%clean
+%files -f proftpd.lang
-rm -rf %{buildroot}
-
-%files
 %defattr(-,root,root)
 %license COPYING
 %doc CREDITS INSTALL NEWS
-%doc README.{md,LDAP,PAM,modules}
+%doc README.{md,LDAP,modules}
 %doc doc/*
 %doc contrib/README contrib/xferstats.holger-preiss
 %doc sample-configurations/
@@ -194,10 +240,16 @@ rm -rf %{buildroot}
 %{_var}/ftp/welcome.msg
 %dir %{_libexecdir}/proftpd/
 %{_libexecdir}/proftpd/mod_*
-%{_localedir}/*
-%dir %{_rundir}
 %dir %{_var}/ftp
+%if %{with systemd}
+%{_unitdir}/proftpd.service
+%{_unitdir}/proftpd.socket
+%{_unitdir}/proftpd@.service
+%{_tmpfilesdir}/proftpd.conf
+%else
 %config %{_sysconfdir}/rc.d/init.d/proftpd
+%dir %{_rundir}
+%endif
 %config(noreplace) %{_sysconfdir}/pam.d/ftp
 %config(noreplace) %{_sysconfdir}/proftpd.conf
 %config(noreplace) %{_sysconfdir}/ftpusers
@@ -220,6 +272,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Dec 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.7a-1
+- new upstream release.
+- added systemd support (disabled as default).
+- dropped Patch300.
+
 * Sat Feb 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.6c-1
 - new upstream release.
 

w/wireshark/wireshark-vl.spec

@@ -7,7 +7,7 @@
 Summary: 	Network traffic analyzer
 Summary(ja):    ネットワークトラフィック解析プログラム
 Name: 		wireshark
-Version:	3.4.1
+Version:	3.4.2
 Release: 	1%{_dist_release}
 Group: 		network,admin-tools
 Vendor:		Project Vine
@@ -307,6 +307,9 @@ getent group usbmon >/dev/null || groupadd -r usbmon
 
 
 %changelog
+* Thu Dec 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.2-1
+- new upstream release.
+
 * Thu Dec 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.1-1
 - new upstream release.
 - updated Patch6.