updated 6 packages

appstream-data-7-4

libid3tag-0.15.1b-6

openldap-2.4.53-1

p7zip-16.02-1

shotwell-0.30.10-1

unzip-6.0-6

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

a/appstream-data/appstream-data-vl.spec

@@ -2,7 +2,7 @@ Summary:        AppStream metadata of Vine Linux packages
 Summary(ja):    Vine LinuxパッケージのAppStreamメタデータ
 Name:           appstream-data
 Version:        7
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -55,6 +55,9 @@ DESTDIR=%{buildroot} appstream-util install-origin vine-plus %{SOURCE2} %{SOURCE
 
 
 %changelog
+* Sun Sep 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7-4
+- updated appstream data.
+
 * Fri Aug 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7-3
 - updated appstream data.
 

lib/libi/libid3tag/libid3tag-vl.spec

@@ -4,30 +4,37 @@ Summary: Library for reading and writing ID3v1 and ID3v2 tags.
 Summary(ja): ID3 タグを読み書きするためのライブラリ
 Name: libid3tag
 Version: 0.15.1b
-Release: 5%{_dist_release}
-Group: System Environment/Libraries
-Source: ftp://ftp.mars.org/pub/mpeg/%{name}-%{version}.tar.gz
-Patch10: libid3tag-0.15.1b-gentoo-CVE-2008-2109_fix_overflow.patch
-URL: http://www.underbit.com/products/mad/
+Release: 6%{_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: inagaki
+
 License: GPLv2
+URL: https://www.underbit.com/products/mad/
+Source: ftp://ftp.mars.org/pub/mpeg/%{name}-%{version}.tar.gz
+Patch0: libid3tag-0.15.1b-fix_overflow.patch
+Patch1: libid3tag-0.15.1b-id3v1-zero-padding.patch
+Patch2: libid3tag-0.15.1b-handle-unknown-encoding.patch
+Patch3: libid3tag-0.15.1b-id3v2-endless-loop.patch
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869598
+Patch4: libid3tag-0.15.1b-gperf-size_t.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 BuildRequires: gcc-c++
+BuildRequires: gperf
 Conflicts: libmad < 0.15.1b
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
-Packager: inagaki
-
 %description
 A library for reading and (eventually) writing ID3 tags, both ID3v1 and the
 various versions of ID3v2.
 
+
 %package devel
 Summary: Header and library for developing programs that will use libid3tag.
 Summary(ja): libid3tag を使うプログラムを開発するためのライブラリ
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}
 Requires: zlib-devel
 
@@ -39,14 +46,21 @@ This package contains the header file as well as the static library needed
 to develop programs that will use libid3tag for ID3 tar reading and writing.
 
 
+%debug_package
+
+
 %prep
 %setup -q
+%patch0 -p0 -b .CVE-2008-2109
+%patch1 -p1 -b .zero-padding
+%patch2 -p1 -b .unknown-encoding
+%patch3 -p0 -b .endless-loop
+%patch4 -p1 -b .gperf
 
-%patch10 -p0 -b .CVE-2008-2109
+touch NEWS AUTHORS ChangeLog
 
-%build
-%configure --disable-static
-make %{_smp_mflags}
+# Force these files to be regenerated from the .gperf sources.
+rm compat.c frametype.c
 
 cat << EOF > id3tag.pc
 prefix=%{_prefix}
@@ -62,32 +76,47 @@ Libs: -L%{_libdir} -lid3tag -lz
 Cflags: -I%{_includedir}
 EOF
 
+
+%build
+autoreconf -vfi
+%configure --disable-static
+make %{_smp_mflags}
+
+
 %install
 rm -rf %{buildroot}
 %makeinstall
+rm -vf $RPM_BUILD_ROOT%{_libdir}/*.la
 install -m 644 -D id3tag.pc %{buildroot}%{_libdir}/pkgconfig/id3tag.pc
 
+
 %clean
 rm -rf %{buildroot}
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files 
 %defattr(-, root, root)
-%doc CHANGES COPYING COPYRIGHT CREDITS README TODO
+%license COPYRIGHT
+%doc CHANGES COPYING CREDITS README TODO
 %{_libdir}/*.so.*
 
+
 %files devel
 %defattr(-, root, root)
-#{_libdir}/*.a
-%exclude %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/*
 
+
 %changelog
+* Sun Sep 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.15.1b-6
+- dropped Patch10.
+- imported Patch0-4 from rawhide.
+
 * Sun Aug 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.15.1b-5
 - rebuild with VineSeed environment
 

o/openldap/openldap-vl.spec

@@ -1,5 +1,6 @@
+%bcond_with systemd
 %bcond_with sql
-%define _unpackaged_files_terminate_build 1
+
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define __perl_requires %{SOURCE11}
 
@@ -8,13 +9,15 @@
 Summary: The configuration files, libraries and documentation for OpenLDAP.
 Summary(ja): OpenLDAP の設定ファイル，ライブラリ，ドキュメント.
 Name: openldap
-Version: 2.4.46
-Release: 3%{?_dist_release}
-License: OpenLDAP
-Group: System Environment/Libraries
-URL: http://www.openldap.org/
+Version: 2.4.53
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
+License: OpenLDAP
+URL: https://www.openldap.org/
+Source0: https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-%{version}.tgz
 Source2: ldap.init
 Source4: slapd.ldif
 Source5: ldap.conf
@@ -24,6 +27,8 @@ Source12: ltb-project-openldap-ppolicy-check-password-%{check_password_version}.
 Source50: libexec-functions
 Source52: libexec-check-config.sh
 Source53: libexec-upgrade-db.sh
+Source101: slapd.service
+Source102: slapd.tmpfiles
 
 # Patches for 2.4
 Patch0: openldap-manpages.patch
@@ -41,6 +46,7 @@ Patch19: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
 Patch20: openldap-ldapi-sasl.patch
 Patch22: openldap-openssl-ITS7595-Add-EC-support-1.patch
 Patch23: openldap-openssl-ITS7595-Add-EC-support-2.patch
+Patch24: openldap-openssl-manpage-defaultCA.patch
 
 # check-password module specific patches
 Patch90: check-password-makefile.patch
@@ -49,10 +55,6 @@ Patch91: check-password.patch
 # Vine Patches
 
 # security fixes
-# CVE-2015-1545
-# Patch1000: its8027.patch
-# CVE-2015-1546
-# Patch1001: its8046.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf, automake, libtool >= 2.2.6a
@@ -62,12 +64,12 @@ BuildRequires: libdb-devel, pam-devel, pkgconfig, tcp_wrappers
 BuildRequires: unixODBC-devel, bind-devel, libtool-ltdl-devel >= 2.2.6a
 BuildRequires: krb5-devel
 BuildRequires: groff
+%if %{with systemd}
+BuildRequires: systemd
+%endif
 #BuildConflicts: libicu-devel
 Requires: cyrus-sasl, mktemp
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 OpenLDAP is an open source suite of LDAP (Lightweight Directory Access
 Protocol) applications and development tools.  LDAP is a set of
@@ -80,10 +82,11 @@ libraries and documentation for OpenLDAP.
 %description -l ja
 OpenLDAPはオープンソースなLDAP (Lightweight Directory Access Protocol)アプリケーションと開発ツール集です。LDAPはディレクトリサービス（電話帳の様な情報や他の情報）にInternelからアクセスするプロトコルであり、DNS(Domain Name System)情報に似た方式でInternetに伝えられます。opanldapパッケージはOpanLDAP用の設定ファイルやライブラリ、ドキュメントを含んでいます。
 
+
 %package devel
 Summary: OpenLDAP development libraries and header files.
 Summary(ja): OpenLDAP の開発用ライブラリおよびヘッダファイル.
-Group: Development/Libraries
+Group: programming
 Requires: openldap = %{version}-%{release}, cyrus-sasl-devel >= 2.1
 Provides: openldap-evolution-devel = %{version}-%{release}
 
@@ -98,12 +101,19 @@ customized LDAP clients.
 %description devel -l ja
 openldap-develパッケージはLDAP(Lightweight Directory Access Protocol)を使うためにコンパイルするアプリケーションに必要な開発用ライブラリやヘッダファイルを含んでいます。LDAPはInternet上にディレクトリサービスを可能にするプロトコルです。LDAPクライアントを開発したりカスタマイズする場合には、このパッケージをインストールしてください。
 
+
 %package servers
 Summary: OpenLDAP servers and related files.
 Summary(ja): OpenLDAP サーバおよび関連ファイル.
-Requires(post): fileutils, make, openldap = %{version}-%{release}, openssl, shadow-utils, chkconfig, coreutils
-Requires(pre): fileutils, make, openldap = %{version}-%{release}, openssl, shadow-utils, chkconfig, coreutils
-Group: System Environment/Daemons
+Group: servers
+Requires(pre): fileutils, make, openldap = %{version}-%{release}, openssl, shadow-utils, coreutils
+Requires(post): fileutils, make, openldap = %{version}-%{release}, openssl, shadow-utils, coreutils
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires(pre): chkconfig
+Requires(post): chkconfig
+%endif
 
 %description servers
 OpenLDAP is an open source suite of LDAP (Lightweight Directory Access
@@ -122,8 +132,8 @@ OpenLDAPはオープンソースなLDAP (Lightweight Directory Access Protocol)
 %package servers-sql
 Summary: OpenLDAP server SQL support module.
 Summary(ja): SQLサポートモジュールを含んだOpenLDAPサーバ
+Group: servers
 Requires(post): openldap-servers = %{version}-%{release}
-Group: System Environment/Daemons
 
 %description servers-sql
 OpenLDAP is an open-source suite of LDAP (Lightweight Directory Access
@@ -142,11 +152,12 @@ OpenLDAPはオープンソースなLDAP (Lightweight Directory Access Protocol)
 このパッケージはslapdサーバがRDBMSからデータを読み込むためのモジュールを含んでいます。
 %endif
 
+
 %package clients
 Summary: Client programs for OpenLDAP.
 Summary(ja): OpenLDAP のクライアントプログラム.
 Requires(post): openldap = %{version}-%{release}
-Group: Applications/Internet
+Group: admin-tools
 
 %description clients
 OpenLDAP is an open source suite of LDAP (Lightweight Directory Access
@@ -160,10 +171,11 @@ programs needed for accessing and modifying OpenLDAP directories.
 %description clients -l ja
 OpenLDAPはオープンソースなLDAP (Lightweight Directory Access Protocol)アプリケーションと開発ツール集です。LDAPはディレクトリサービス（電話帳の様な情報や他の情報）にInternelからアクセスするプロトコルであり、DNS(Domain Name System)情報に似た\方式でInternetに伝えられます。openldap-clientsパッケージはOpenLDAPディレクトリにアクセスしたり、修正したりするためのクライアントプログラムを含んでいます。
 
+
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary: libraries for OpenLDAP.
-Group: System Environment/Libraries
+Group: system
 
 %description -n compat32-%{name}
 OpenLDAP is an open source suite of LDAP (Lightweight Directory Access
@@ -189,7 +201,7 @@ libraries and documentation for OpenLDAP.
 
 %package -n compat32-%{name}-devel
 Summary: OpenLDAP development libraries and header files.
-Group: Development/Libraries
+Group: programming
 
 %description -n compat32-%{name}-devel
 The openldap-devel package includes the development libraries and
@@ -200,6 +212,9 @@ this package only if you plan to develop or will need to compile
 customized LDAP clients.
 
 
+%debug_package
+
+
 %prep
 %setup -q -c -a 0 -a 12
 
@@ -213,9 +228,10 @@ AUTOMAKE=/bin/true autoreconf -fi
 %patch5 -p1
 %patch17 -p1
 %patch19 -p1
-%patch20 -p1
-%patch22 -p1
-%patch23 -p1
+#%patch20 -p1
+#%patch22 -p1
+#%patch23 -p1
+%patch24 -p1
 
 # security
 # %patch1000 -p1 -b .CVE-2015-1545
@@ -299,7 +315,6 @@ popd
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
 mkdir -p %{buildroot}%{_libdir}/
 
 pushd openldap-%{version}
@@ -353,13 +368,21 @@ perl -pi -e "s|%{buildroot}||g" %{buildroot}%{_mandir}/*/*.*
 rm -f %{buildroot}%{_sysconfdir}/openldap/*.default
 rm -f %{buildroot}%{_sysconfdir}/openldap/schema/*.default
 
+%if %{with systemd}
+# install an init script for the servers
+mkdir -p %{buildroot}%{_unitdir}
+install -m 0644 %{SOURCE101} %{buildroot}%{_unitdir}/slapd.service
+# setup autocreation of runtime directories on tmpfs
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -m 0644 %{SOURCE102} %{buildroot}%{_tmpfilesdir}/slapd.conf
+%else
 # Install an init script for the servers.
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 install -m 755 $RPM_SOURCE_DIR/ldap.init $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ldap
-
 # install syconfig/ldap
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644 %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/slapd
+%endif
 
 # move slapd out of _libdir
 mv %{buildroot}%{_libdir}/slapd %{buildroot}%{_sbindir}/
@@ -427,8 +450,10 @@ fi
 exit 0
 
 %post servers
-
 /sbin/ldconfig -n %{_libdir}/openldap
+%if %{with systemd}
+%systemd_post slapd.service
+%endif
 
 # generate configuration if necessary
 if [[ ! -f %{_sysconfdir}/openldap/slapd.d/cn=config.ldif && \
@@ -438,18 +463,27 @@ if [[ ! -f %{_sysconfdir}/openldap/slapd.d/cn=config.ldif && \
       mkdir -p %{_sysconfdir}/openldap/slapd.d/ &>/dev/null || :
       /usr/sbin/slapadd -F %{_sysconfdir}/openldap/slapd.d/ -n0 -l %{_datadir}/openldap-servers/slapd.ldif
       chown -R ldap:ldap %{_sysconfdir}/openldap/slapd.d/
+%if %{with systemd}
+      systemctl try-restart slapd.service &>/dev/null
+%else
       /sbin/service ldap condrestart > /dev/null 2>&1 || :
+%endif
 fi
 
 start_slapd=0
 
 # upgrade the database
-running=`/sbin/service ldap status >/dev/null; echo $?`
 if [ -f %{_sharedstatedir}/ldap/rpm_upgrade_openldap ]; then
-	if [ $running -eq 0 ]; then
+%if %{with systemd}
+    systemctl stop slapd.service
+    start_slapd=1
+%else
+    running=`/sbin/service ldap status >/dev/null; echo $?`
+    if [ $running -eq 0 ]; then
 		/sbin/service ldap stop > /dev/null 2>&1 || :
 		start_slapd=1
 	fi
+%endif
 
 	%{_libexecdir}/openldap/upgrade-db.sh &>/dev/null
 	rm -f %{_sharedstatedir}/ldap/rpm_upgrade_openldap
@@ -457,17 +491,28 @@ fi
 
 # restart after upgrade
 if [ $1 -ge 1 ]; then
+%if %{with systemd}
+	if [ $start_slapd -eq 1 ]; then
+		systemctl start slapd.service &>/dev/null || :
+	else
+		systemctl condrestart slapd.service &>/dev/null || :
+	fi
+%else
 	if [ $start_slapd -eq 1 ]; then
 		/sbin/service ldap start > /dev/null 2>&1 || :
 	else
 		/sbin/service ldap condrestart > /dev/null 2>&1 || :
 	fi
+%endif
 fi
 
 exit 0
 
 %preun servers
-if [ "$1" = "0" ] ; then
+%if %{with systemd}
+%systemd_preun slapd.service
+%else
+if [ "$1" = "0" -o -x /bin/systemctl ] ; then
 	/sbin/service ldap stop > /dev/null 2>&1 || :
 	/sbin/chkconfig --del ldap
 # Openldap-servers are being removed from system.
@@ -476,16 +521,19 @@ if [ "$1" = "0" ] ; then
 # it can be restored later - but it's up to the administrator 
 # to save the database, if he/she wants so.
 fi
+%endif
 
 %postun servers
 /sbin/ldconfig ${_libdir}/openldap
-
+%if %{with systemd}
+%systemd_postun_with_restart slapd.service
+%else
 if [ $1 -ge 1 ] ; then
 	/sbin/service ldap condrestart > /dev/null 2>&1 || :
 fi
+%endif
 
 %post devel -p /sbin/ldconfig
-
 %postun devel -p /sbin/ldconfig
 
 %triggerin servers -- libdb
@@ -551,9 +599,14 @@ exit 0
 %doc README.schema
 %config(noreplace) %dir %attr(0750,ldap,ldap) %{_sysconfdir}/openldap/slapd.d
 %config(noreplace) %{_sysconfdir}/openldap/schema
-%config(noreplace) %{_sysconfdir}/sysconfig/slapd
 %config(noreplace) %{_sysconfdir}/openldap/check_password.conf
+%if %{with systemd}
+%{_unitdir}/slapd.service
+%{_tmpfilesdir}/slapd.conf
+%else
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ldap
+%config(noreplace) %{_sysconfdir}/sysconfig/slapd
+%endif
 %attr(0700,ldap,ldap) %dir /var/lib/ldap
 %attr(0755,ldap,ldap) %dir /var/run/openldap
 %{_datadir}/openldap-servers/
@@ -638,6 +691,10 @@ exit 0
 
 
 %changelog
+* Sun Sep 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.53-1
+- new upstream release.
+- added systemd support (disabled as default).
+
 * Sat May 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.46-3
 - rebuilt with perl-5.26.
 

p/p7zip/p7zip-vl.spec

@@ -1,20 +1,35 @@
 Summary:	A file archiver with very high compression ratio
 Summary(ja):	非常に圧縮率の高いファイルアーカイバ
 Name:		p7zip
-Version:	15.14.1
-Release:	2%{?_dist_release}
-License:	LGPL
-Group:		Applications/Archiving
+Version:	16.02
+Release:	1%{?_dist_release}
+Group:		accessories
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
+License:	LGPLv2 and (LGPLv2+ or CPL)
 URL:		http://p7zip.sourceforge.net/
-Source0		http://prdownloads.sourceforge.net/p7zip/p7zip_%{version}_src_all.tar.bz2
+# RAR sources removed since their license is incompatible with the LGPL
+#Source: http://downloads.sf.net/p7zip/p7zip_%%{version}_src_all.tar.bz2
+# export VERSION=15.14.1
+# wget http://downloads.sf.net/p7zip/p7zip_${VERSION}_src_all.tar.bz2
+# tar xjvf p7zip_${VERSION}_src_all.tar.bz2
+# rm -rf p7zip_${VERSION}/CPP/7zip/{Archive,Compress,Crypto,QMAKE}/Rar*
+# rm p7zip_${VERSION}/DOC/unRarLicense.txt
+# tar --numeric-owner -cjvf p7zip_${VERSION}_src_all-norar.tar.bz2 p7zip_${VERSION}
+Source: p7zip_%{version}_src_all-norar.tar.bz2
 
 Patch0: p7zip_15.14-norar_cmake.patch
-# from Debain
-Patch5: 02_man.patch
+# from Debian
+Patch4: p7zip-manpages.patch
+Patch5: 02-man.patch
+Patch6: CVE-2016-9296.patch
+Patch7: 05-hardening-flags.patch
+Patch10: CVE-2017-17969.patch
+Patch11: 14-Fix-g++-warning.patch
+Patch12: gcc10-conversion.patch
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root
-Vendor:		Project Vine
-Distribution:	Vine Linux
 
 BuildRequires:	cmake
 %ifarch %{ix86}
@@ -40,10 +55,11 @@ GZIP, BZIP2, Z, TAR, CPIO, RPM, DEB フォーマットをサポートしてい
 新しい 7z フォーマットで圧縮すると、ZIP フォーマットで圧縮するよりも、
 圧縮率が 30〜50% 向上します。
 
+
 %package plugins
 Summary:	Additional plugins for p7zip
 Summary(ja):	p7zip の追加プラグイン
-Group:		Applications/Archiving
+Group:		accessories
 Requires:	%{name} = %{version}
 
 %description plugins
@@ -54,16 +70,17 @@ This package contains also a virtual file system for Midnight Commander.
 このパッケージには 7z の機能を拡張するための追加が含まれています。
 また、Midnight Commander のための仮想ファイルシステムも含まれています。
 
+
+%debug_package
+
+
 %prep
-%setup -q -n %{name}_%{version}
+%autosetup -p1 -n %{name}_%{version}
 
-%patch0 -p1 -b .norar_cmake
-#Remove backups from DOC directory
-rm DOC/License.txt.*
-%patch5 -p1 -b .man
 # move license files
 mv DOC/License.txt DOC/copying.txt .
 
+
 %build
 pushd CPP/7zip/CMAKE/
 sh ./generate.sh
@@ -74,9 +91,6 @@ cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine
 %ifarch x86_64
 cp -f makefile.linux_amd64_asm makefile.machine
 %endif
-%ifarch ppc ppc64
-cp -f makefile.linux_any_cpu_gcc_4.X makefile.machine
-%endif
 
 make %{?_smp_mflags} all2 \
     OPTFLAGS="%{optflags}" \
@@ -85,8 +99,6 @@ make %{?_smp_mflags} all2 \
     DEST_SHARE=%{_libdir}/p7zip \
     DEST_MAN=%{_mandir}
 
-%check
-%__make test
 
 %install
 %__rm -rf %{buildroot}
@@ -102,9 +114,15 @@ make install \
 mv %{buildroot}%{_docdir}/p7zip/DOC/* %{buildroot}%{_docdir}/p7zip
 rmdir %{buildroot}%{_docdir}/p7zip/DOC/
 
+
+%check
+%__make test
+
+
 %clean
 %__rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root)
 %{_docdir}/p7zip
@@ -127,7 +145,12 @@ rmdir %{buildroot}%{_docdir}/p7zip/DOC/
 #{_libdir}/p7zip/Formats/
 %{_mandir}/man1/7z.1*
 
+
 %changelog
+* Sun Sep 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 16.02-1
+- new upstream release.
+- imported Patch4, 6-12 from rawhide.
+
 * Tue Jul  5 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 15.14.1-2
 - rebuilt with new toolchain.
 

s/shotwell/shotwell-vl.spec

@@ -1,26 +1,30 @@
-Name:           shotwell
-Version:        0.23.2
-Release:        1%{?_dist_release}
 Summary:        A photo manager for the GNOME desktop
 Summary(ja):    GNOME デスクトップ向けの写真管理ツール
+Name:           shotwell
+Version:        0.30.10
+Release:        1%{?_dist_release}
+Group:          graphics,desktop-gnome
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       kudoh
 
-Group:          Applications/Graphics
 # LGPLv2+ for the code
 # CC-BY-SA for some of the icons
 License:        LGPLv2+ and CC-BY-SA
-URL:            http://www.yorba.org/shotwell/
-Source0:        http://www.yorba.org/download/shotwell/stable/shotwell-%{version}.tar.xz
-# https://bugzilla.gnome.org/show_bug.cgi?id=715578
-Source2:        shotwell.1
+URL:            https://wiki.gnome.org/Apps/Shotwell
+%global         shortver %(echo %{version} | cut -d . -f 1-2)
+Source0:        https://download.gnome.org/sources/shotwell/%{shortver}/shotwell-%{version}.tar.xz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
+BuildRequires:  meson
 BuildRequires:  GConf2-devel
 BuildRequires:  LibRaw-devel
 BuildRequires:  LibRaw-static
 BuildRequires:  dbus-glib-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
+BuildRequires:  itstool
 BuildRequires:  gtk3-devel
 #BuildRequires:  gstreamer-devel
 #BuildRequires:  gstreamer-plugins-base-devel
@@ -32,6 +36,7 @@ BuildRequires:  libgee-devel
 BuildRequires:  libgee-vala
 BuildRequires:  libgphoto2-devel
 BuildRequires:  eudev-libgudev1-devel
+BuildRequires:  libgdata-devel
 BuildRequires:  libgexiv2-devel >= 0.2.0
 BuildRequires:  libsoup-devel
 BuildRequires:  libxml2-devel
@@ -46,10 +51,6 @@ BuildRequires:  webkitgtk4-devel
 # used by shotwell-settings-migrator
 Requires: dconf
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: kudoh
-
 %description
 Shotwell is a new open source photo manager designed for the GNOME desktop
 environment. It allows you to import photos from your camera, view and edit
@@ -61,38 +62,34 @@ Shotwell は GNOME デスクトップ環境用に設計された新しいオー
 あなたのカメラから写真を取り込んだり、それらを表示・編集したり、
 他の人々と共有するなどができます。
 
+
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}
 
-%build
-./configure \
-  --prefix=%{_prefix} \
-  --lib=%{_lib} \
-  --disable-schemas-compile \
-  --disable-icon-update
-
-#make %{?_smp_mflags}
-make
 
+%build
+%meson \
+    -Dinstall-apport-hook=false
+%meson_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export XDG_DISABLE_MAKEFILE_UPDATES=1
-# otherwise gettext always returns English text regardless of LANGUAGE asked
-export LANG=en_US.utf8
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%meson_install
+
+%find_lang %{name} --all-name --with-gnome
 
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell.desktop
-desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/shotwell-viewer.desktop
 
-# install man page
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_mandir}/man1
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/shotwell.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/shotwell-viewer.desktop
 
-%find_lang %{name} --all-name
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -110,6 +107,7 @@ update-desktop-database &> /dev/null || :
 gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor &>/dev/null || :
 glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %license COPYING
@@ -117,19 +115,19 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %{_bindir}/shotwell
 %{_libdir}/*
 %{_libexecdir}/shotwell
-%{_datadir}/shotwell
 %{_datadir}/applications/shotwell.desktop
 %{_datadir}/applications/shotwell-viewer.desktop
-%{_datadir}/appdata/shotwell.appdata.xml
-%{_datadir}/GConf/gsettings/shotwell.convert
+%{_datadir}/metainfo/*.xml
 %{_datadir}/glib-2.0/schemas/*.xml
 %{_datadir}/icons/hicolor/*/apps/shotwell.png
 %{_datadir}/icons/hicolor/symbolic/apps/shotwell-symbolic.svg
-%{_datadir}/gnome/help/shotwell
 %{_mandir}/man1/*
 
 
 %changelog
+* Sun Sep 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.30.10-1
+- new upstream release.
+
 * Wed Jun 29 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.23.2-1
 - new upstream release.
 - remove %%_smp_mflags: Makefile has wrong dependency(?).

u/unzip/unzip-vl.spec

@@ -4,11 +4,14 @@ Summary: A utility for unpacking zip files.
 Summary(ja): zip ファイルを展開するユーティリティ
 Name: unzip
 Version: 6.0
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
+Group: accessories
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: BSD
-Group: Applications/Archiving
 URL: http://www.info-zip.org/UnZip.html
-
 Source: http://downloads.sourceforge.net/infozip/%{src_file}.tar.gz
 
 # Not sent to upstream.
@@ -21,8 +24,9 @@ Patch3: unzip-6.0-close.patch
 # Reported to upstream: http://www.info-zip.org/board/board.pl?m-1259575993/
 Patch4: unzip-6.0-attribs-overflow.patch
 # Not sent to upstream, as it's Fedora/RHEL specific.
-# Modify the configure script not to request the strip of binaries.
-Patch5: unzip-6.0-nostrip.patch
+# Modify the configure script to accept var LFLAGS2 so linking can be configurable
+# from the spec file. In addition '-s' is still removed as before
+Patch5: unzip-6.0-configure.patch
 Patch6: unzip-6.0-manpage-fix.patch
 # Update match.c with recmatch() from zip 3.0's util.c
 # This also resolves the license issue in that old function.
@@ -35,20 +39,21 @@ Patch9: unzip-6.0-caseinsensitive.patch
 # downstream fix for "-Werror=format-security"
 # upstream doesn't want hear about this option again
 Patch10: unzip-6.0-format-secure.patch
+
 Patch11: unzip-6.0-valgrind.patch
 Patch12: unzip-6.0-x-option.patch
-
-# security
-Patch100: unzip-6.0-cve-2014-8139.patch
-Patch110: unzip-6.0-cve-2014-8140.patch
-Patch120: unzip-6.0-cve-2014-8141.patch
-## http://www.openwall.com/lists/oss-security/2014/11/03/10
-Patch130: unzip-6.0-CVE-2014-9636.patch
-
+Patch13: unzip-6.0-overflow.patch
+Patch14: unzip-6.0-cve-2014-8139.patch
+Patch15: unzip-6.0-cve-2014-8140.patch
+Patch16: unzip-6.0-cve-2014-8141.patch
 Patch17: unzip-6.0-overflow-long-fsize.patch
+
 # Fix heap overflow and infinite loop when invalid input is given (#1260947)
 Patch18: unzip-6.0-heap-overflow-infloop.patch
 
+# support non-{latin,unicode} encoding
+Patch19: unzip-6.0-alt-iconv-utf8.patch
+Patch20: unzip-6.0-alt-iconv-utf8-print.patch
 Patch21: 0001-Fix-CVE-2016-9844-rhbz-1404283.patch
 
 # restore unix timestamp accurately
@@ -59,6 +64,13 @@ Patch23: unzip-6.0-cve-2018-1000035-heap-based-overflow.patch
 
 Patch24: unzip-6.0-cve-2018-18384.patch
 
+# covscan issues
+Patch25: unzip-6.0-COVSCAN-fix-unterminated-string.patch
+
+Patch26: unzip-zipbomb-part1.patch
+Patch27: unzip-zipbomb-part2.patch
+Patch28: unzip-zipbomb-part3.patch
+Patch29: unzip-zipbomb-manpage.patch
 
 # japanese charset support
 # https://gist.github.com/hamano/573753
@@ -71,10 +83,6 @@ Patch202: unzip-6.0-japanese_charset-utf8.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  bzip2-devel, gcc
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 The unzip utility is used to list, test, or extract files from a zip
 archive.  Zip archives are commonly found on MS-DOS systems.  The zip
@@ -96,34 +104,42 @@ zip と unzip は PKWARE(R) の MS-DOS 用 PKZIP で作成された zip アー
 対応していますが，デフォルトの動作やプログラムオプション等一部が
 異なります．
 
+# debuginfo is empty.
+#debug_package
+
 
 %prep
 %setup -q -n %{src_file}
-%patch1 -p1 -b .bzip2-configure
-%patch2 -p1 -b .exec-shield
-%patch3 -p1 -b .close
-%patch4 -p1 -b .attribs-overflow
-%patch5 -p1 -b .nostrip
-%patch6 -p1 -b .manpage-fix
-%patch7 -p1 -b .recmatch
-%patch8 -p1 -b .symlink
-%patch9 -p1 -b .caseinsensitive
-%patch10 -p1 -b .format-secure
-%patch11 -p1 -b .valgrind
-%patch12 -p1 -b .x-option
-
-# security
-%patch100 -p1 -b .CVE-2014-8139
-%patch110 -p1 -b .CVE-2014-8140
-%patch120 -p1 -b .CVE-2014-8141
-%patch130 -p1 -b .CVE-2014-9636
-
-%patch17 -p1 -b .overflow-long-fsize
-%patch18 -p1 -b .heap-overflow-infloop
-%patch21 -p1 -b .cve-2016-9844
-%patch22 -p1 -b .timestamp
-%patch23 -p1 -b .cve-2018-1000035
-%patch24 -p1 -b .cve-2018-18384
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
 
 %patch200 -p1 -b .jp
 %patch201 -p1 -b .ignore-E
@@ -131,12 +147,13 @@ zip と unzip は PKWARE(R) の MS-DOS 用 PKZIP で作成された zip アー
 
 ln -s unix/Makefile Makefile
 
+
 %build
 make LOCAL_UNZIP="-D_FILE_OFFSET_BITS=64 -DNO_LCHMOD -D_MBCS -DNO_WORKING_ISPRINT" linux_noasm
 
+
 %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=""
 
 
@@ -146,12 +163,16 @@ make prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 ins
 
 %files
 %defattr(-,root,root)
-%doc README BUGS LICENSE INSTALL
+%license LICENSE
+%doc README BUGS INSTALL
 %{_bindir}/*
 %{_mandir}/*/*
 
 
 %changelog
+* Sun Sep 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0-6
+- re-imported Patch1-29 from rawhide.
+
 * Sun May 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.0-5
 - imported Patch17-18, 21-24 from rawhide.
 - replaced Patch100-120 to rawhide's one.