updated 9 packages

apache2-2.4.46-1

appstream-data-7-2

apr-util-1.6.1-2

apr-1.7.0-2

e2fsprogs-1.45.6-1

gnome-calculator-3.36.0-1

golang-1.15-1

tmux-3.1b-1

valgrind-3.16.1-1

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

a/apache2/apache2-vl.spec

@@ -1,3 +1,5 @@
+%bcond_with systemd
+
 %define contentdir %{_datadir}/apache2
 %define docroot /var/www/apache2
 %define suexec_caller www-data
@@ -6,17 +8,18 @@
 %define pkgname apache2
 %define vstring Vine
 
-Summary: Apache HTTP Server
 Name: %{pkgname}
-Version: 2.4.41
-Release: 1%{_dist_release}
-URL: http://httpd.apache.org/
-
+Summary: Apache HTTP Server
+Version: 2.4.46
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
+Group: servers
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke
 
-Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
+License: Apache Software License
+URL: https://httpd.apache.org/
+Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source2: index.html
 Source3: apache2.logrotate
 Source4: apache2.init
@@ -44,40 +47,49 @@ Source31: README.confmod
 # add vine entry to config.layout
 Source100: vine-config.layout
 
+Source105: httpd-ssl-pass-dialog
+Source106: httpd.tmpfiles
+Source107: httpd.service
+Source125: 00-systemd.conf
+Source128: httpd.socket
+Source127: 10-listen443.conf
+Source140: htcacheclean.service
+Source141: htcacheclean.sysconf
+Source142: httpd-init.service
+Source143: httpd-ssl-gencerts
+Source144: httpd@.service
+
 # build/scripts patches
-Patch2: httpd-2.4.9-apxs.patch
-Patch3: httpd-2.4.1-deplibs.patch
+Patch2: httpd-2.4.43-apxs.patch
+Patch3: httpd-2.4.43-deplibs.patch
 # Needed for socket activation and mod_systemd patch
-#Patch19: httpd-2.4.25-detect-systemd.patch
+Patch19: httpd-2.4.43-detect-systemd.patch
 # Features/functional changes
-Patch21: httpd-2.4.39-r1842929+.patch
-Patch23: httpd-2.4.41-export.patch
-Patch24: httpd-2.4.1-corelimit.patch
-#Patch25: httpd-2.4.25-selinux.patch
-#Patch26: httpd-2.4.4-r1337344+.patch
-Patch27: httpd-2.4.2-icons.patch
-#Patch29: httpd-2.4.27-systemd.patch
-Patch30: httpd-2.4.4-cachehardmax.patch
-Patch31: httpd-2.4.33-sslmultiproxy.patch
-Patch34: httpd-2.4.17-socket-activation.patch
-Patch36: httpd-2.4.38-r1830819+.patch
-#Patch37: httpd-2.4.34-r1827912+.patch
-Patch38: httpd-2.4.34-sslciphdefault.patch
-Patch39: httpd-2.4.37-sslprotdefault.patch
-Patch40: httpd-2.4.39-r1861269.patch
-Patch41: httpd-2.4.37-r1861793+.patch
-Patch42: httpd-2.4.37-r1828172+.patch
+Patch21: httpd-2.4.43-r1842929+.patch
+Patch22: httpd-2.4.43-mod_systemd.patch
+Patch23: httpd-2.4.43-export.patch
+Patch24: httpd-2.4.43-corelimit.patch
+Patch25: httpd-2.4.43-selinux.patch
+Patch26: httpd-2.4.43-gettid.patch
+Patch27: httpd-2.4.43-icons.patch
+Patch30: httpd-2.4.43-cachehardmax.patch
+Patch31: httpd-2.4.43-sslmultiproxy.patch
+Patch34: httpd-2.4.43-socket-activation.patch
+Patch38: httpd-2.4.43-sslciphdefault.patch
+Patch39: httpd-2.4.43-sslprotdefault.patch
+Patch40: httpd-2.4.43-r1861269.patch
+Patch41: httpd-2.4.43-r1861793+.patch
+Patch42: httpd-2.4.43-r1828172+.patch
+Patch43: httpd-2.4.43-sslcoalesce.patch
+Patch44: httpd-2.4.43-lua-resume.patch
 
 # Bug fixes
 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
-Patch58: httpd-2.4.34-r1738878.patch
-Patch60: httpd-2.4.34-enable-sslv3.patch
+Patch60: httpd-2.4.43-enable-sslv3.patch
+Patch62: httpd-2.4.43-r1870095+.patch
 
 # Security fixes
 
-
-License: Apache Software License
-Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: db4-devel, expat-devel, xmlto
 BuildRequires: findutils, perl, openldap-devel, zlib-devel
@@ -85,12 +97,19 @@ BuildRequires: apr-devel, apr-util-devel
 BuildRequires: pcre-devel, sqlite3-devel
 BuildRequires: lua-devel, libxml2-devel
 BuildRequires: libnghttp2-devel
+BuildRequires: brotli-devel
 BuildRequires: www-common
 Requires: mailcap, gawk, file, findutils, apr, apr-util
 Requires(pre): www-common
-Requires(pre): chkconfig, mktemp, fileutils
+Requires(pre): mktemp, fileutils
+%if %{with systemd}
+BuildRequires: systemd-devel
+%{?systemd_requires}
+%else
+Requires(pre): chkconfig
 Requires(pre): sh-utils, textutils, shadow-utils
 Requires(post): alternatives
+%endif
 Provides: webserver
 Provides: httpd = %{version}
 Provides: httpd-mmn = %{mmn}
@@ -103,8 +122,9 @@ Apache is a powerful, full-featured, efficient, and freely-available
 Web server. Apache is also the most popular Web server on the
 Internet.
 
+
 %package devel
-Group: Development/Libraries
+Group: programming
 Summary: Development tools for the Apache HTTP server.
 Requires: libtool, apache2 = %{version}
 Requires: apr-devel, apr-util-devel
@@ -117,8 +137,9 @@ If you are installing the Apache HTTP server and you want to be
 able to compile or develop additional modules for Apache, you need
 to install this package.
 
+
 %package manual
-Group: Applications/Documentation
+Group: documentation
 Summary: Documentation for the Apache HTTP server.
 
 %description manual
@@ -126,8 +147,9 @@ The httpd-manual package contains the complete manual and
 reference guide for the Apache HTTP server. The information can
 also be found at http://httpd.apache.org/docs/.
 
+
 %package -n mod_ssl-apache2
-Group: System Environment/Daemons
+Group: servers
 Summary: SSL/TLS module for the Apache HTTP server
 Epoch: 1
 BuildRequires: openssl-devel
@@ -139,35 +161,39 @@ The mod_ssl module provides strong cryptography for the Apache Web
 server via the Secure Sockets Layer (SSL) and Transport Layer
 Security (TLS) protocols.
 
+
 %prep
 %setup -q -n httpd-%{version}
 
 %patch2 -p1 -b .apxs
 %patch3 -p1 -b .deplibs
-#%patch6 -p1 -b .apctlsystemd
-
-#%patch19 -p1 -b .detectsystemd
-
+%if %{with systemd}
+%patch19 -p1 -b .detectsystemd
+%endif
 %patch21 -p1 -b .r1842929+
+%if %{with systemd}
+%patch22 -p1 -b .mod_systemd
 %patch23 -p1 -b .export
+%endif
 %patch24 -p1 -b .corelimit
-#%patch25 -p1 -b .selinux
-#patch26 -p1 -b .r1337344+
+%patch25 -p1 -b .selinux
+%patch26 -p1 -b .gettid
 %patch27 -p1 -b .icons
-#patch29 -p1 -b .systemd
 %patch30 -p1 -b .cachehardmax
-#%patch31 -p1 -b .sslmultiproxy
+#patch31 -p1 -b .sslmultiproxy
+%if %{with systemd}
 %patch34 -p1 -b .socketactivation
-%patch36 -p1 -b .r1830819+
-#%patch37 -p1 -b .r1827912+
+%endif
 %patch38 -p1 -b .sslciphdefault
 %patch39 -p1 -b .sslprotdefault
 %patch40 -p1 -b .r1861269
 %patch41 -p1 -b .r1861793+
 %patch42 -p1 -b .r1828172+
+%patch43 -p1 -b .sslcoalesce
+#patch44 -p1 -b .luaresume
 
-%patch58 -p1 -b .r1738878
 %patch60 -p1 -b .enable-sslv3
+%patch62 -p1 -b .r1870095
 
 perl -pi -e 's|/httpd/build|/apache2/build|' support/apxs.in
 
@@ -181,6 +207,7 @@ sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
 sed -e "s|${prefix}/lib|${prefix}/%{_lib}|" \
   < $RPM_SOURCE_DIR/vine-config.layout >> config.layout
 
+
 %build
 # remove bundled apr, apr-util, pcre
 rm -rf srclib/{apr,apr-util,pcre}
@@ -188,11 +215,13 @@ rm -rf srclib/{apr,apr-util,pcre}
 # regenerate configure scripts
 autoheader && autoconf || exit 1
 
-CFLAGS="$RPM_OPT_FLAGS"
-SH_LDFLAGS="-Wl,-z,relro"
-export CFLAGS SH_LDFLAGS
+export CFLAGS="$RPM_OPT_FLAGS"
+export LDFLAGS="-Wl,-z,relro,-z,now"
+%if %{with systemd}
+export HTTPD_LIBS="-lsystemd"
+%endif
 
-AP_CONFOPTS="\
+./configure \
 	--prefix=%{_sysconfdir}/apache2 \
 	--exec-prefix=%{_prefix} \
 	--bindir=%{_bindir} \
@@ -200,7 +229,7 @@ AP_CONFOPTS="\
 	--mandir=%{_mandir} \
 	--libdir=%{_libdir} \
 	--sysconfdir=%{_sysconfdir}/apache2/conf \
-        --includedir=%{_includedir}/apache2 \
+	--includedir=%{_includedir}/apache2 \
 	--libexecdir=%{_libdir}/apache2/modules \
 	--datadir=%{contentdir} \
 	--with-installbuilddir=%{_libdir}/apache2/build \
@@ -209,39 +238,84 @@ AP_CONFOPTS="\
 	--with-ldap \
 	--enable-ldap --enable-authnz-ldap \
 	--enable-mods-shared=all \
-        --enable-cache=shared \
-        --enable-cgi=shared \
-        --enable-cgid=shared \
-        --enable-rewrite=shared \
-        --enable-disk-cache=shared \
-        --enable-file-cache=shared \
-        --enable-mem-cache=shared \
+	--enable-cache=shared \
+	--enable-cgi=shared \
+	--enable-cgid=shared \
+	--enable-rewrite=shared \
+	--enable-disk-cache=shared \
+	--enable-file-cache=shared \
+	--enable-mem-cache=shared \
 	--enable-authn-anon --enable-authn-alias \
 	--with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--enable-suexec --with-suexec \
-        --enable-suexec-capabilities \
+	--enable-suexec-capabilities \
 	--with-suexec-caller=%{suexec_caller} \
 	--with-suexec-docroot=%{docroot} \
 	--with-suexec-logfile=%{_localstatedir}/log/apache2/suexec.log \
 	--with-suexec-bin=%{_sbindir}/suexec \
 	--with-suexec-uidmin=500 --with-suexec-gidmin=500 \
-	--with-pcre \
+	--with-brotli \
 	--enable-pie \
+	--with-pcre \
 	--enable-ssl --with-ssl \
 	--enable-deflate \
 	--enable-proxy --enable-proxy-connect \
 	--enable-proxy-http --enable-proxy-ftp \
 	--enable-case-filter --enable-case-filter-in \
 	--enable-http2 \
-	--enable-mpms-shared=all"
-./configure ${AP_CONFOPTS}
+%if %{with systemd}
+	--enable-systemd \
+%endif
+	--enable-mpms-shared=all
+
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
 
+%if %{with systemd}
+# Install systemd service files
+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
+for s in httpd.service htcacheclean.service httpd.socket \
+         httpd@.service httpd-init.service; do
+  install -p -m 644 $RPM_SOURCE_DIR/${s} \
+                    $RPM_BUILD_ROOT%{_unitdir}/${s}
+done
+# install systemd override drop directory
+# Web application packages can drop snippets into this location if
+# they need ExecStart[pre|post].
+mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d
+mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d
+
+install -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf \
+      $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf
+mkdir $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
+install -m 644 -p $RPM_SOURCE_DIR/htcacheclean.sysconf \
+   $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean
+# tmpfiles.d configuration
+mkdir -p $RPM_BUILD_ROOT%{_tmpfilesdir}
+install -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \
+   $RPM_BUILD_ROOT%{_tmpfilesdir}/httpd.conf
+
+# install http-ssl-pass-dialog
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
+install -m755 $RPM_SOURCE_DIR/httpd-ssl-pass-dialog \
+        $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-pass-dialog
+# install http-ssl-gencerts
+install -m755 $RPM_SOURCE_DIR/httpd-ssl-gencerts \
+        $RPM_BUILD_ROOT%{_libexecdir}/httpd-ssl-gencerts
+%else
+# install SYSV init stuff
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -m755 $RPM_SOURCE_DIR/apache2.init \
+	$RPM_BUILD_ROOT/etc/rc.d/init.d/apache2
+%{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \
+	$RPM_BUILD_ROOT/etc/rc.d/init.d/apache2	
+%endif
+
 # create apache2ctl symlink
 ln -sf apachectl $RPM_BUILD_ROOT%{_sbindir}/apache2ctl
 
@@ -260,6 +334,10 @@ for f in 00-base.conf 00-mpm.conf 00-lua.conf 01-cgi.conf 00-dav.conf \
   install -m 644 -p $RPM_SOURCE_DIR/$f \
                     $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.modules.d/$f
 done
+%if %{with systemd}
+  install -m 644 -p %{SOURCE125} \
+                    $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.modules.d/
+%endif
 
 for f in welcome.conf ssl.conf manual.conf userdir.conf; do
   install -m 644 -p $RPM_SOURCE_DIR/$f \
@@ -268,10 +346,10 @@ done
 
 # Split-out extra config shipped as default in conf.d:
 for f in autoindex; do
-  mv docs/conf/extra/httpd-${f}.conf \
+  install -m 644 docs/conf/extra/httpd-${f}.conf \
      $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf.d/${f}.conf
 done
-	  
+
 # Extra config trimmed:
 rm -v docs/conf/extra/httpd-{ssl,userdir}.conf
 
@@ -280,11 +358,6 @@ install -m 644 -p $RPM_SOURCE_DIR/httpd.conf \
    $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf/httpd.conf
 ln -sf httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache2/conf/apache2.conf
 
-# tmpfiles.d configuration
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d 
-install -m 644 -p $RPM_SOURCE_DIR/apache2.tmpfiles \
-   $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/apache2.conf
-
 # Other directories
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/dav \
          $RPM_BUILD_ROOT/run/apache2/htcacheclean
@@ -344,13 +417,6 @@ ln -s ../..%{_localstatedir}/log/apache2 $RPM_BUILD_ROOT/etc/apache2/logs
 ln -s /run/apache2 $RPM_BUILD_ROOT/etc/apache2/run
 ln -s ../..%{_libdir}/apache2/modules $RPM_BUILD_ROOT/etc/apache2/modules
 
-# install SYSV init stuff
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-install -m755 $RPM_SOURCE_DIR/apache2.init \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d/apache2
-%{__perl} -pi -e "s:\@docdir\@:%{_docdir}/%{name}-%{version}:g" \
-	$RPM_BUILD_ROOT/etc/rc.d/init.d/apache2	
-
 # Install logrotate config
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 install -m 644 -p $RPM_SOURCE_DIR/apache2.logrotate \
@@ -389,24 +455,38 @@ rm -vf \
 rm -rf $RPM_BUILD_ROOT/etc/apache2/conf/{original,extra}
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 
 %triggerpostun -- apache < 2.0
 /sbin/chkconfig --add apache2
 
-
 %post
+%if %{with systemd}
+%systemd_post httpd.service htcacheclean.service httpd.socket
+%else
 /sbin/chkconfig --add apache2
+%endif
 
 %preun
-if [ $1 = 0 ]; then
+%if %{with systemd}
+%systemd_preun httpd.service htcacheclean.service httpd.socket
+%else
+if [ $1 = 0 -o -x /bin/systemctl ]; then
 	/sbin/service apache2 stop > /dev/null 2>&1
 	/sbin/chkconfig --del apache2
 fi
+%endif
 
 %postun
+%if %{with systemd}
+%systemd_postun httpd.service htcacheclean.service httpd.socket
+%else
 if [ "$1" -ge 1 ]; then
 	/sbin/service apache2 condrestart
 fi
+%endif
 /sbin/ldconfig
 
 %define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
@@ -440,8 +520,6 @@ ${FQDN}
 root@${FQDN}
 EOF
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
@@ -460,7 +538,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %config(noreplace) %{_sysconfdir}/logrotate.d/apache2
 
+%if %{with systemd}
+%{_unitdir}/httpd.service
+%{_unitdir}/httpd@.service
+%{_unitdir}/htcacheclean.service
+%{_unitdir}/*.socket
+%attr(755,root,root) %dir %{_unitdir}/httpd.service.d
+%attr(755,root,root) %dir %{_unitdir}/httpd.socket.d
+%config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean
+%{_tmpfilesdir}/httpd.conf
+%else
 %config %{_sysconfdir}/rc.d/init.d/apache2
+%endif
 
 %dir %{_sysconfdir}/apache2/conf.d
 %{_sysconfdir}/apache2/conf.d/README
@@ -475,8 +564,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir %{_sysconfdir}/apache2/sites.d
 
-%{_prefix}/lib/tmpfiles.d/apache2.conf
-
 %{_bindir}/ab
 %{_bindir}/ht*
 %{_bindir}/logresolve
@@ -517,23 +604,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %{_mandir}/man1/*
 %exclude %{_mandir}/man1/apxs*
-
 %{_mandir}/man8/*
 
-
 %files manual
 %defattr(-,root,root)
 %{contentdir}/manual
 %config(noreplace) %{_sysconfdir}/apache2/conf.d/manual.conf
 
-
 %files -n mod_ssl-apache2
 %defattr(-,root,root)
 %{_libdir}/apache2/modules/mod_ssl.so
 %config(noreplace) %{_sysconfdir}/apache2/conf.modules.d/00-ssl.conf
 %config(noreplace) %{_sysconfdir}/apache2/conf.d/ssl.conf
 %attr(0700,www-data,www-data) %dir %{_localstatedir}/cache/apache2/ssl
-
+%if %{with systemd}
+%{_libexecdir}/httpd-ssl-pass-dialog
+%{_libexecdir}/httpd-ssl-gencerts
+%{_unitdir}/httpd-init.service
+%{_unitdir}/httpd.socket.d/10-listen443.conf
+%endif
 
 %files devel
 %defattr(-,root,root)
@@ -547,6 +636,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.46-1
+- new upstream release.
+- added systemd support (disabled as default).
+
 * Thu Aug 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.41-1
 - new upstream release.
 - dropped Patch1 and 5.

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

@@ -2,16 +2,16 @@ Summary:        AppStream metadata of Vine Linux packages
 Summary(ja):    Vine LinuxパッケージのAppStreamメタデータ
 Name:           appstream-data
 Version:        7
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPL2
 Source0:        appstream-main.xml.gz
-Source1:        appstream-icons-main.tar.gz
+Source1:        appstream-main-icons.tar.gz
 Source2:        appstream-plus.xml.gz
-Source3:        appstream-icons-plus.tar.gz
+Source3:        appstream-plus-icons.tar.gz
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
@@ -39,6 +39,10 @@ DESTDIR=%{buildroot} appstream-util install-origin vine-plus %{SOURCE2} %{SOURCE
 %{__rm} -rf %{buildroot}
 
 
+%posttrans
+/usr/bin/appstreamcli refresh >& /dev/null ||:
+
+
 %files
 %defattr(-,root,root)
 %dir %{_datadir}/app-info
@@ -51,5 +55,8 @@ DESTDIR=%{buildroot} appstream-util install-origin vine-plus %{SOURCE2} %{SOURCE
 
 
 %changelog
+* Thu Aug 20 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7-2
+- updated appstream data.
+
 * Sat Aug 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7-1
 - initial build.

a/apr-util/apr-util-vl.spec

@@ -4,15 +4,13 @@ Summary: Apache Portable Runtime Utility library
 Summary(ja): Apache ポータブルランタイムユーティリティライブラリ
 Name: apr-util
 Version: 1.6.1
-Release: 1%{?_dist_release}
-
-License: Apache Software License 2.0
-Group: System Environment/Libraries
-URL: http://apr.apache.org/
-
+Release: 2%{?_dist_release}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
+License: Apache Software License 2.0
+URL: http://apr.apache.org/
 Source0: %{name}-%{version}.tar.bz2
 Patch1: apr-util-1.2.7-pkgconf.patch
 Patch4: apr-util-1.4.1-private.patch
@@ -36,10 +34,11 @@ free library of C data structures and routines.  This library
 contains additional utility interfaces for APR; including support
 for XML, LDAP, database interfaces, URI parsing and more.
 
+
 %package devel
 Summary: APR utility library development kit
 Summary(ja): APR ユーティリティライブラリ開発キット
-Group: Development/Libraries
+Group: programming
 Requires: apr-util = %{version}-%{release}, apr-devel, pkgconfig
 Requires: openldap-devel, libdb-devel, expat-devel
 Conflicts: subversion-devel < 0.20.1-2
@@ -51,33 +50,37 @@ build applications using the APR utility library.  The mission
 of the Apache Portable Runtime (APR) is to provide a free 
 library of C data structures and routines.
 
+
 %package pgsql
 Summary: APR utility library PostgreSQL DBD driver
-Group: System Environment/Libraries
+Group: system
 Requires: apr-util = %{version}-%{release}
 
 %description pgsql
 This package provides the PostgreSQL driver for the apr-util
 DBD (database abstraction) interface.
 
+
 %package mysql
 Summary: APR utility library MySQL DBD driver
-Group: System Environment/Libraries
+Group: system
 Requires: apr-util = %{version}-%{release}
 
 %description mysql
 This package provides the MySQL driver for the apr-util DBD
 (database abstraction) interface.
 
+
 %package sqlite
 Summary: APR utility library SQLite DBD driver
-Group: System Environment/Libraries
+Group: system
 Requires: apr-util = %{version}-%{release}
 
 %description sqlite
 This package provides the SQLite driver for the apr-util DBD
 (database abstraction) interface.
 
+
 #%package freetds
 #Group: Development/Libraries
 #Summary: APR utility library FreeTDS DBD driver
@@ -90,27 +93,30 @@ This package provides the SQLite driver for the apr-util DBD
 
 %package odbc
 Summary: APR utility library ODBC DBD driver
-Group: System Environment/Libraries
+Group: system
 Requires: apr-util = %{version}-%{release}
 
 %description odbc
 This package provides the ODBC driver for the apr-util DBD
 (database abstraction) interface.
 
+
 %package ldap
 Summary: APR utility library LDAP support
-Group: System Environment/Libraries
+Group: system
 Requires: apr-util = %{version}-%{release}
 
 %description ldap
 This package provides the LDAP support for the apr-util.
 
+
 %prep
 %setup -q
 %patch1 -p1 -b .pkgconf
 %patch4 -p1 -b .private
 %patch5 -p1 -b .mariadb
 
+
 %build
 autoheader && autoconf
 %configure --with-apr=%{_prefix} \
@@ -122,6 +128,7 @@ autoheader && autoconf
 #        --disable-util-dso        
 make %{?_smp_mflags} && make dox
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -153,6 +160,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libapr*.la
 # Trim libtool DSO cruft
 rm -f $RPM_BUILD_ROOT%{_libdir}/apr-util-%{apuver}/*.*a
 
+
 %check
 # Run the less verbose test suites
 export MALLOC_CHECK_=2 MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
@@ -164,16 +172,19 @@ export LD_LIBRARY_PATH="`echo "../dbm/.libs:../dbd/.libs:../ldap/.libs:$LD_LIBRA
 ./testall testrmm
 ./testall testdbm
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
-%doc CHANGES LICENSE NOTICE
+%license LICENSE
+%doc CHANGES NOTICE
 %{_libdir}/libaprutil-%{apuver}.so.*
 %dir %{_libdir}/apr-util-%{apuver}
 %{_libdir}/apr-util-%{apuver}/apr_dbm_db*
@@ -211,7 +222,11 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/apr-util-%{apuver}/apr_ldap*
 
+
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.1-2
+- rebuilt with current environment.
+
 * Sun Nov 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.1-1
 - updated to 1.6.1.
 - dropped Patch2.

a/apr/apr-vl.spec

@@ -3,19 +3,17 @@
 # Arches on which the multilib apr.h hack is needed:
 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
 
-Name: apr
 Summary: Apache Portable Runtime library
 Summary(ja): Apache ポータブルランタイムライブラリ
+Name: apr
 Version: 1.7.0
-Release: 1%{?_dist_release}
-
-Group: System Environment/Libraries
-License: Apache Software License
-URL: https://apr.apache.org/
-
+Release: 2%{?_dist_release}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
+License: Apache Software License
+URL: https://apr.apache.org/
 Source0: http://ftp.tsukuba.wide.ad.jp/software/apache//apr/%{name}-%{version}.tar.bz2
 Source1: apr-wrapper.h
 Patch4: apr-1.2.2-libdir.patch
@@ -36,10 +34,11 @@ free library of C data structures and routines, forming a system
 portability layer to as many operating systems as possible,
 including Unices, MS Win32, BeOS and OS/2.
 
+
 %package devel
 Summary: APR library development kit
 Summary(ja): APR ライブラリ開発キット
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Conflicts: subversion-devel < 0.20.1-2
 Obsoletes: apache2-apr-devel
@@ -50,11 +49,13 @@ build applications using the APR library.  The mission of the
 Apache Portable Runtime (APR) is to provide a free library of 
 C data structures and routines.
 
+
 %prep
 %setup -q
 %patch4 -p1 -b .libdir
 %patch5 -p1 -b .pkgconf
 
+
 %build
 # regenerate configure script etc.
 ./buildconf
@@ -71,6 +72,7 @@ export ac_cv_search_shm_open=no
         CC=gcc CXX=g++
 make %{?_smp_mflags} && make dox
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -99,6 +101,7 @@ install -c -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/apr-%{aprver}/apr.h
 rm -f $RPM_BUILD_ROOT%{_libdir}/apr.exp
 rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
+
 %check
 # Fail if LFS support isn't present in a 32-bit build, since this
 # breaks ABI and the soname doesn't change: see #254241
@@ -113,13 +116,15 @@ pushd test
   ./testall -v -q
 popd
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %license LICENSE
@@ -140,7 +145,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_includedir}/apr-%{aprver}
 %{_includedir}/apr-%{aprver}/*.h
 
+
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.0-2
+- rebuilt with current environment.
+
 * Sat Oct 19 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.0-1
 - updated to 1.7.0.
 - dropped Patch1 and 3: fixed in upstream.

e/e2fsprogs/e2fsprogs-vl.spec

@@ -5,15 +5,14 @@
 Summary:        Utilities for managing ext2/3/4 filesystem.
 Summary(ja):    ext2/3/4 ファイルシステム操作ユーティリティ
 Name:           e2fsprogs
-Version:        1.45.5
+Version:        1.45.6
 Release:        1%{?_dist_release}
-License:        GPL
-Group:          System Environment/Base
-
+Group:          admin-tools,system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
-Url:            http://e2fsprogs.sourceforge.net/
+License:        GPL
+URL:            http://e2fsprogs.sourceforge.net/
 Source0:        https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/%{name}-%{version}.tar.xz
 Source1:        ext2_types-wrapper.h
 
@@ -63,11 +62,10 @@ e2fsprogs パッケージを是非インストールしておきましょう．
 %package devel
 Summary:     Ext2/3/4 filesystem-specific static libraries and headers.
 Summary(ja): ext2/3/4 ファイルシステム特有のライブラリとヘッダ
-Group:       Development/Libraries
+Group:       programming
 Requires:    e2fsprogs = %{version}
 Requires(post): install-info
 
-
 %description devel
 E2fsprogs-devel contains the libraries and header files needed to
 develop ext2/3/4 filesystem-specific programs.
@@ -77,11 +75,10 @@ e2fsprogs-devel には ext2/3/4 ファイルシステム固有のプログラム
 のに必要なライブラリとヘッダファイルが収められています．
 
 
-
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary:     Utilities for managing ext2/3/4 filesystem.
-Group:       System Environment/Base
+Group:       system
 %description -n compat32-%{name}
 The e2fsprogs package contains a number of utilities for creating,
 checking, modifying, and correcting any inconsistencies in ext2/3/4
@@ -96,9 +93,10 @@ other core ext2fs filesystem utilities.
 You should install the e2fsprogs package if you need to manage the
 performance of an ext2/3/4 filesystem.
 
+
 %package -n compat32-%{name}-devel
 Summary:     Ext2/3/4 filesystem-specific static libraries and headers.
-Group:       Development/Libraries
+Group:       programming
 Requires:    compat32-%{name} = %{version}
 %description -n compat32-%{name}-devel
 E2fsprogs-devel contains the libraries and header files needed to
@@ -284,6 +282,9 @@ exit 0
 
 
 %changelog
+* Tue Aug 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.45.6-1
+- new upstream release.
+
 * Wed Feb 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.45.5-1
 - new upstream release.
 

g/gnome-calculator/gnome-calculator-vl.spec

@@ -1,38 +1,40 @@
-Name:           gnome-calculator
-Version:        3.30.1
-Release:        1%{?_dist_release}
 Summary:        Gnome Calculator application
 Summary(ja):    GNOME 電卓アプリケーション
-Group:          Applications/Productivity
+Name:           gnome-calculator
+Version:        3.36.0
+Release:        1%{?_dist_release}
+Group:          accessories,desktop-gnome
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        GPL
 %global         shortver %(echo %{version} | sed -e 's/\.[0-9]*$//')
 Source0:        https://download.gnome.org/sources/%{name}/%{shortver}/%{name}-%{version}.tar.xz
-Patch0:         Use-GLib.List.deep_copy-to-fix-type-argument-mismatch.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: gtk3-devel >= 3.0.0
-BuildRequires: gtksourceview3-devel
+BuildRequires: bison
+BuildRequires: desktop-file-utils
+BuildRequires: docbook-utils
+BuildRequires: flex
 BuildRequires: glib2-devel
-BuildRequires: libxml2-devel
+BuildRequires: gtk3-devel >= 3.0.0
+BuildRequires: gtksourceview4-devel
+BuildRequires: libgee-devel
+BuildRequires: libgee-vala
+BuildRequires: libmpc-devel
 BuildRequires: libsoup-devel
+BuildRequires: libxml2-devel
+BuildRequires: meson
 BuildRequires: mpfr-devel
-BuildRequires: libmpc-devel
+BuildRequires: ninja
 BuildRequires: perl-XML-Parser
-BuildRequires: flex
-BuildRequires: bison
 BuildRequires: vala
-BuildRequires: docbook-utils
-BuildRequires: desktop-file-utils
 BuildRequires: yelp-tools
-BuildRequires: meson, ninja
 Requires(postun,posttrans): glib2
 
 Obsoletes: gcalctool < 6.6.2-2vl7
 Provides: gcalctool = 6.6.2-2vl7
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 gcalctool is a calculator application based on Gtk3.
   
@@ -40,14 +42,25 @@ gcalctool is a calculator application based on Gtk3.
 gcalctool は Gtk3 ベースの電卓アプリケーションです。
 
 
+%package devel
+Summary:        Development files for gnome-calculator
+Group:          programming
+Requires:       %{name}%{_isa} = %{version}-%{release}
+
+%description devel
+ This package contains libraries and header files for developing applications
+that use gnome-calculator.
+
+
 %prep
 %setup -q
-%patch0 -p1
+
 
 %build
 %meson
 %meson_build
 
+
 %install
 rm -fr $RPM_BUILD_ROOT
 %meson_install
@@ -61,6 +74,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
 %find_lang %{name} --with-gnome
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -78,16 +92,32 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas ||:
 %doc NEWS 
 %{_bindir}/gcalccmd
 %{_bindir}/%{name}
+%{_libdir}/*.so.*
+%{_libdir}/girepository-1.0/*.typelib
 %{_libexecdir}/%{name}-search-provider
 %{_datadir}/applications/gnome-org.gnome.Calculator.desktop
 %{_datadir}/metainfo/org.gnome.Calculator.appdata.xml
 %{_datadir}/dbus-1/services/org.gnome.Calculator.SearchProvider.service
 %{_datadir}/glib-2.0/schemas/org.gnome.calculator.gschema.xml
 %{_datadir}/gnome-shell/search-providers/org.gnome.Calculator-search-provider.ini
-%{_datadir}/icons/hicolor/*/apps/gnome-calculator*
+%{_datadir}/icons/hicolor/*/apps/org.gnome.Calculator*
 %{_mandir}/man1/*
 
+%files devel
+%{_includedir}/*
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*.pc
+%{_datadir}/gir-1.0/*.gir
+%dir %{_datadir}/vala
+%dir %{_datadir}/vala/vapi
+%{_datadir}/vala/vapi/*
+
+
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.36.0-1
+- new upstream release.
+- added a subpackage: devel.
+
 * Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.30.1-1
 - new upstream release.
 

g/golang/golang-vl.spec

@@ -75,16 +75,15 @@
 %global gohostarch  386
 %endif
 
-%global go_api 1.14
-%global go_version 1.14.6
+%global go_version 1.15
+%global go_api %(echo "%{version}" | cut -d . -f 1,2)
 
+Summary:        The Go Programming Language
+Summary(ja):    プログラミング言語 Go
 Name:           golang
 Version:        %{go_version}
 Release:        1%{?_dist_release}
-Summary:        The Go Programming Language
-Summary(ja):    プログラミング言語 Go
-Group:          Development/Languages
-
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -94,6 +93,13 @@ URL:            http://golang.org/
 # pre-processed by source.sh to make Mark.Twain-Tom.Sawyer.txt free again
 Source0:        https://dl.google.com/go/go%{go_version}.src.tar.gz
 
+Source100:      golang-gdbinit
+Source101:      golang-prelink.conf
+Source102:      macros.golang
+
+# These are the only RHEL/Fedora architectures that we compile this package for
+ExclusiveArch:  %{golang_arches}
+
 # The compiler is written in Go. Needs go(1.4+) compiler for build.
 BuildRequires:  golang > 1.4
 BuildRequires:  net-tools
@@ -105,49 +111,52 @@ Provides:       go = %{version}-%{release}
 Requires:       %{name}-bin
 Requires:       %{name}-src = %{version}-%{release}
 
-# These are the only RHEL/Fedora architectures that we compile this package for
-ExclusiveArch:  %{golang_arches}
-
-Source100:      golang-gdbinit
-Source101:      golang-prelink.conf
-Source102:      macros.golang
-
 %description
 %{summary}.
 
-%package       docs
-Summary:       Golang compiler docs
-Requires:      %{name} = %{version}-%{release}
+
+%package        docs
+Summary:        Golang compiler docs
+Group:          documentation
+Requires:       %{name} = %{version}-%{release}
 #BuildArch:     noarch
-Obsoletes:     %{name}-docs < 1.1-4
+Obsoletes:      %{name}-docs < 1.1-4
 
 %description   docs
 %{summary}.
 
-%package       misc
-Summary:       Golang compiler miscellaneous sources
-Requires:      %{name} = %{version}-%{release}
+
+%package        misc
+Summary:        Golang compiler miscellaneous sources
+Group:          programming
+Requires:       %{name} = %{version}-%{release}
 #BuildArch:     noarch
 
 %description   misc
 %{summary}.
 
-%package       tests
-Summary:       Golang compiler tests for stdlib
-Requires:      %{name} = %{version}-%{release}
+
+%package        tests
+Summary:        Golang compiler tests for stdlib
+Group:          programming
+Requires:       %{name} = %{version}-%{release}
 #BuildArch:     noarch
 
 %description   tests
 %{summary}.
 
+
 %package        src
 Summary:        Golang compiler source tree
+Group:          programming
 #BuildArch:      noarch
 %description    src
 %{summary}
 
+
 %package        bin
 Summary:        Golang core compiler tools
+Group:          programming
 Requires:       go = %{version}-%{release}
 Requires(post): %{_sbindir}/update-alternatives
 Requires(postun): %{_sbindir}/update-alternatives
@@ -159,6 +168,7 @@ Requires:       gcc
 %description    bin
 %{summary}
 
+
 # Workaround old RPM bug of symlink-replaced-with-dir failure
 %pretrans -p <lua>
 for _,d in pairs({"api", "doc", "include", "lib", "src"}) do
@@ -172,6 +182,7 @@ end
 %if %{shared}
 %package        shared
 Summary:        Golang shared object libraries
+Group:          system
 
 %description    shared
 %{summary}.
@@ -184,6 +195,7 @@ Summary:        Golang shared object libraries
 %prep
 %setup -q -n go
 
+
 %build
 # bootstrap compiler GOROOT
 %if !%{golang_bootstrap}
@@ -220,6 +232,7 @@ popd
 GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -buildmode=shared std
 %endif
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -399,6 +412,9 @@ fi
 %endif
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15-1
+- new upstream release.
+
 * Sat Jul 25 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.6-1
 - new upstream release.
 

t/tmux/tmux-vl.spec

@@ -1,8 +1,8 @@
+Summary:        A terminal multiplexer
 Name:           tmux
-Version:        3.0a
+Version:        3.1b
 Release:        1%{?_dist_release}
-Summary:        A terminal multiplexer
-Group:          Applications/System
+Group:          accessories
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -21,17 +21,21 @@ windows) to be accessed and controlled from a single terminal.  tmux is
 intended to be a simple, modern, BSD-licensed alternative to programs such
 as GNU Screen.
 
+
 %prep
 %setup -q
 
+
 %build
 %configure
 make %{?_smp_mflags} LDFLAGS="%{optflags}"
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALLBIN="install -p -m 755" INSTALLMAN="install -p -m 644"
 
+
 %post
 if [ ! -f %{_sysconfdir}/shells ] ; then
     echo "%{_bindir}/tmux" > %{_sysconfdir}/shells
@@ -39,14 +43,18 @@ else
     grep -q "^%{_bindir}/tmux$" %{_sysconfdir}/shells || echo "%{_bindir}/tmux" >> %{_sysconfdir}/shells
 fi
 
+
 %files
 %defattr(-,root,root,-)
 %license COPYING
-%doc CHANGES FAQ TODO examples/
+%doc CHANGES README*
 %{_bindir}/tmux
 %{_mandir}/man1/tmux.1.*
 
 %changelog
+* Fri Aug 21 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1b-1
+- new upstream release.
+
 * Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0a-1
 - new upstream release.
 

v/valgrind/valgrind-vl.spec

@@ -26,20 +26,18 @@
 %define _find_debuginfo_dwz_opts %{nil}
 %undefine _include_minidebuginfo
 
-Name:           valgrind
-Version:        3.14.0
-Release:        1%{?_dist_release}
 Summary:        Tool for finding memory management bugs in programs
 Summary(ja):    プログラムのメモリ管理バグを発見するためのツール
-
+Name:           valgrind
+Version:        3.16.1
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPLv2+
-Group:          Development/Debuggers
-URL:            http://valgrind.org/
-
-Source0:        http://valgrind.org/downloads/%{name}-%{version}.tar.bz2
+URL:            https://valgrind.org/
+Source0:        https://sourceware.org/pub/valgrind/%{name}-%{version}.tar.bz2
 
 # Needs investigation and pushing upstream
 Patch1: valgrind-3.9.0-cachegrind-improvements.patch
@@ -50,75 +48,28 @@ Patch2: valgrind-3.9.0-helgrind-race-supp.patch
 # Make ld.so supressions slightly less specific.
 Patch3: valgrind-3.9.0-ldso-supp.patch
 
-# KDE#400490 s390x: Fix register allocation for VRs vs FPRs
-Patch4: valgrind-3.14.0-s390x-fix-reg-alloc-vr-vs-fpr.patch
-
-# KDE#400491 s390x: Sign-extend immediate operand of LOCHI and friends
-Patch5: valgrind-3.14.0-s390x-sign-extend-lochi.patch
-
-# KDE#397187 s390x: Add vector register support for vgdb
-Patch6: valgrind-3.14.0-s390x-vec-reg-vgdb.patch
-
-# KDE#385411 s390x: z13 vector floating-point instructions not implemented
-Patch7: valgrind-3.14.0-s390x-vec-float-point-code.patch
-Patch8: valgrind-3.14.0-s390x-vec-float-point-tests.patch
-
-# KDE#401277 More bugs in z13 support
-Patch9: valgrind-3.14.0-s390z-more-z13-fixes.patch
-
-# KDE#386945 Bogus memcheck errors on ppc64(le) when using strcmp
-Patch10: valgrind-3.14.0-get_otrack_shadow_offset_wrk-ppc.patch
-Patch11: valgrind-3.14.0-new-strlen-IROps.patch
-Patch12: valgrind-3.14.0-ppc-instr-new-IROps.patch
-Patch13: valgrind-3.14.0-memcheck-new-IROps.patch
-Patch14: valgrind-3.14.0-ppc-frontend-new-IROps.patch
-Patch15: valgrind-3.14.0-transform-popcount64-ctznat64.patch
-Patch16: valgrind-3.14.0-enable-ppc-Iop_Sar_Shr8.patch
-
-# KDE#401627 memcheck errors with glibc avx2 optimized wcsncmp
-Patch17: valgrind-3.14.0-wcsncmp.patch
-
-# KDE#402006 mark helper regs defined in final_tidyup before freeres_wrapper
-# Prereq for KDE#386945
-Patch18: valgrind-3.14.0-final_tidyup.patch
-
-# KDE#386945 Bogus memcheck errors on ppc64(le) when using strcmp
-# See also patches 10 to 16 (yes, there are this many...)
-Patch19: valgrind-3.14.0-ppc64-ldbrx.patch
-Patch20: valgrind-3.14.0-ppc64-unaligned-words.patch
-Patch21: valgrind-3.14.0-ppc64-lxvd2x.patch
-Patch22: valgrind-3.14.0-ppc64-unaligned-vecs.patch
-Patch23: valgrind-3.14.0-ppc64-lxvb16x.patch
-Patch24: valgrind-3.14.0-set_AV_CR6.patch
-Patch25: valgrind-3.14.0-undef_malloc_args.patch
-
-# KDE#401822 none/tests/ppc64/jm-vmx fails and produces assembler warnings
-Patch26: valgrind-3.14.0-jm-vmx-constraints.patch
+# We want all executables and libraries in libexec instead of lib
+# so they are only available for valgrind usage itself and so the
+# same directory is used independent of arch.
+Patch4: valgrind-3.16.0-pkglibexecdir.patch
 
-# commit 0c701ba2a Fix sigkill.stderr.exp for glibc-2.28.
-Patch27: valgrind-3.14.0-sigkill.patch
+# Add some stack-protector
+Patch5: valgrind-3.16.0-some-stack-protector.patch
 
-# KDE#402048 Implement minimal ptrace support for ppc64[le]-linux.
-Patch28: valgrind-3.14.0-ppc64-ptrace.patch
+# Add some -Wl,z,now.
+Patch6: valgrind-3.16.0-some-Wl-z-now.patch
 
-# commit 43fe4bc23 arm64: Fix PTRACE_TRACEME
-Patch29: valgrind-3.14.0-arm64-ptrace-traceme.patch
+# KDE#422174  unhandled instruction bytes: 0x48 0xE9 (REX prefix JMP instr)
+Patch7: valgrind-3.16.1-REX-prefix-JMP.patch
 
-# KDE#402134 - assert fail mc_translate.c (noteTmpUsesIn) Iex_VECRET on arm64
-Patch30: valgrind-3.14.0-mc_translate-vecret.patch
+# KDE#422623  epoll_ctl warns for uninit padding on non-amd64 64bit arches
+Patch8: valgrind-3.16.1-epoll.patch
 
-# KDE#402481 vbit-test fails on x86 for Iop_CmpEQ64 iselInt64Expr Sar64
-Patch31: valgrind-3.14.0-vbit-test-sec.patch
-Patch32: valgrind-3.14.0-x86-Iop_Sar64.patch
+# KDE#369029  handle linux syscalls sched_getattr and sched_setattr
+Patch9: valgrind-3.16.1-sched_getsetattr.patch
 
-# KDE#402519 POWER 3.0 addex instruction incorrectly implemented
-Patch33: valgrind-3.14.0-power9-addex.patch
-
-# KDE#402480  Do not use %rsp in clobber list
-Patch34: valgrind-3.14.0-rsp-clobber.patch
-
-# commit 3528f8 Accept DW_TAG_subrange_type with DW_AT_count
-Patch35: valgrind-3.14.0-subrange_type-count.patch
+# KDE#415293  Incorrect call-graph tracking due to new _dl_runtime_resolve*
+Patch10: valgrind-3.16.1-dl_runtime_resolve.patch
 
 Buildroot: 	%{_tmppath}/%{name}-%{version}-root
 %if %{build_multilib}
@@ -182,7 +133,6 @@ ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64
 %define _find_debuginfo_dwz_opts %{nil}
 %undefine _include_minidebuginfo
 
-
 %description 
 Valgrind is a tool to help you find memory-management problems in your
 programs. When a program is run under Valgrind's supervision, all
@@ -191,10 +141,11 @@ malloc/new/free/delete are intercepted. As a result, Valgrind can
 detect a lot of problems that are otherwise very hard to
 find/diagnose.
 
+
 %package devel
 Summary:	Development files for valgrind
 Summary(ja):	Valgrind の開発用ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires: 	%{name} = %{version}-%{release}
 Provides: 	%{name}-static = %{version}-%{release}
 
@@ -202,10 +153,11 @@ Provides: 	%{name}-static = %{version}-%{release}
 Header files and libraries for development of valgrind aware programs
 or valgrind plugins.
 
+
 %package openmpi
 Summary: 	OpenMPI support for valgrind
 Summary(ja): 	Valgrind の OpenMPI サポート
-Group: 		Development/Debuggers
+Group:		programming
 Requires: 	%{name} = %{version}-%{release}
 
 %description openmpi
@@ -214,6 +166,9 @@ See the section on Debugging MPI Parallel Programs with Valgrind in the
 Valgrind User Manual for details.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1
@@ -226,31 +181,11 @@ Valgrind User Manual for details.
 %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
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
+
+# Some patches (might) touch Makefile.am or configure.ac files.
+# Just always autoreconf so we don't need patches to prebuild files.
+./autogen.sh
+
 
 %build
 CC=gcc
@@ -286,6 +221,7 @@ CC="gcc -B `pwd`/shared/libgcc/"
 %undefine _hardened_build
 %undefine _strict_symbol_defs_build
 OPTFLAGS="`echo " %{optflags} " | sed 's/ -m\(64\|3[21]\) / /g;s/ -fexceptions / /g;s/ -fstack-protector\([-a-z]*\) / / g;s/ -Wp,-D_FORTIFY_SOURCE=2 / /g;s/ -O2 / /g;s/ -mcpu=\([a-z0-9]\+\) / /g;s/^ //;s/ $//'`"
+
 %configure CC="$CC" CFLAGS="$OPTFLAGS" CXXFLAGS="$OPTFLAGS" \
   --with-mpicc=%{mpiccpath} \
   GDB=%{_bindir}/gdb
@@ -310,9 +246,11 @@ int main (int argc, char *const argv[])
 EOF
 gcc $RPM_OPT_FLAGS -o close_fds close_fds.c
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+rm -rf docs/installed
 mkdir docs/installed
 mv $RPM_BUILD_ROOT%{_datadir}/doc/valgrind/* docs/installed/
 rm -f docs/installed/*.ps
@@ -367,7 +305,7 @@ rm $RPM_BUILD_ROOT%{_libdir}/valgrind/*.a
 # We don't want debuginfo generated for the vgpreload libraries.
 # Turn off execute bit so they aren't included in the debuginfo.list.
 # We'll turn the execute bit on again in %%files.
-chmod 644 $RPM_BUILD_ROOT%{_libdir}/valgrind/vgpreload*-%{valarch}-*so
+chmod 644 $RPM_BUILD_ROOT%{_libexecdir}/valgrind/vgpreload*-*-*so
 
 
 %if %{with check}
@@ -413,22 +351,26 @@ else
 fi
 cat diffs
 echo ===============END TESTING===============
-
 %endif
 
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf ${RPM_BUILD_ROOT}
 
+
 %files
 %defattr(-,root,root)
 %license COPYING
 %doc NEWS README_*
 %doc docs/installed/html docs/installed/*.pdf
 %{_bindir}/*
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/*[^ao]
-%{_libdir}/%{name}/[^l]*o
+%dir %{_libexecdir}/%{name}
+# Install everything in the libdir except the .so.
+# The vgpreload so files might need file mode adjustment.
+%{_libexecdir}/valgrind/*[^o]
+# Turn on executable bit again for vgpreload libraries.
+# Was disabled in %%install to prevent debuginfo stripping.
+%attr(0755,root,root) %{_libexecdir}/valgrind/vgpreload*-*-*so
 %{_mandir}/man1/*
 
 %files devel
@@ -461,6 +403,11 @@ echo ===============END TESTING===============
 
 
 %changelog
+* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.16.1-1
+- new upstream release.
+- dropped Patch4-35.
+- import Patch4-10 from rawhide.
+
 * Tue Jan 22 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.14.0-1
 - dropped Patch4-19.
 - import Patch4-35 from rawhide.