updated 16 packages

bluez-5.55-1

firefox-78.4.0-1

llvm-11.0.0-2

libdrm-2.4.102-1

libmodsecurity-3.0.4-2

mesa-20.2.1-1

nginx-1.18.0-8

nspr-4.29-1

nss-3.58-1

oniguruma-6.9.5.rev1-3

python-mako-1.1.3-1

python-markupsafe-1.1.1-2

rust-1.47.0-1

thunderbird-78.4.0-1

tigervnc-1.11.0-1

xorg-x11-server-1.20.9-2

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

b/bluez/bluez-vl.spec

@@ -1,11 +1,16 @@
+%bcond_with systemd
+
 %define _unpackaged_files_terminate_build 1
+%if "0%{?_udevrulesdir}" == "0"
+%global _udevrulesdir /lib/udev/rules.d
+%endif
 
 Summary: Bluetooth utilities
 Summary(ja): Bluetooth ユーティリティ 
 Name: bluez
-Version: 5.54
-Release: 1%{?_dist_release}
-Group: Applications/System
+Version: 5.55
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: system,admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke
@@ -22,9 +27,23 @@ Source3: bluez-uinput.modules
 Source11: trusts.txt
 Source20: main.conf
 
+# Scripts for automatically btattach-ing serial ports connected to Broadcom HCIs
+Source22: 69-btattach-bcm.rules
+Source23: btattach-bcm@.service
+Source24: btattach-bcm-service.sh
+
 # from http://www.linuxfromscratch.org/patches/downloads/bluez/
 Patch0: 0001-bluez-5.54-obexd_without_systemd-1.patch
 
+# https://github.com/hadess/bluez/commits/obex-5.46
+Patch1: 0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+# https://github.com/hadess/bluez/commits/systemd-hardening
+Patch10: 0001-build-Always-define-confdir-and-statedir.patch
+Patch11: 0002-systemd-Add-PrivateTmp-and-NoNewPrivileges-options.patch
+Patch12: 0003-systemd-Add-more-filesystem-lockdown.patch
+Patch13: 0004-systemd-More-lockdown.patch
+
 # Patch for Vine
 Patch100: 0002-bluez-5.54-daemon.patch
 Patch101: 0003-bluez-5.54-config-vine.patch
@@ -36,9 +55,18 @@ BuildRequires:	flex
 BuildRequires:	bison
 BuildRequires:	dbus-devel
 BuildRequires:	glib2-devel
-BuildRequires:	eudev-libudev-devel
 BuildRequires:	readline-devel
 BuildRequires:  libical-devel
+BuildRequires:  json-c-devel
+%if %{with systemd}
+BuildRequires: systemd-devel
+%{?systemd_requires}
+%else
+BuildRequires:	eudev-libudev-devel
+Requires(post): /sbin/chkconfig, /sbin/service
+Requires(preun): /sbin/chkconfig, /sbin/service
+Requires(postun): /sbin/service
+%endif
 
 ExcludeArch: s390 s390x
 
@@ -48,10 +76,6 @@ Requires: dbus >= 0.60
 # Requires: fuse
 ## Requires: hwdata >= 0.215
 Requires: hwdata >= 0.146
-# virtual provides "dbus-bluez-pin-helper" ex. bluez-gnome
-Requires: dbus-bluez-pin-helper
-Requires(preun): /sbin/chkconfig, /sbin/service
-Requires(post): /sbin/chkconfig, /sbin/service
 #----------------------------------------------------------------------------
 
 Obsoletes: bluez-utils < 4.5-2
@@ -90,7 +114,7 @@ Bluetooth ユーティリティ (bluez-utils):
 %package libs
 Summary: Libraries for use in Bluetooth applications
 Summary(ja): BlueTooth アプリケーションの使用するライブラリ(BlueZ)
-Group: System Environment/Libraries
+Group: system
 
 %description libs
 Libraries for use in Bluetooth applications.
@@ -103,7 +127,7 @@ Bluetooth アプリケーションのためのライブラリです。
 %package libs-devel
 Summary: Development libraries for Bluetooth applications
 Summary(ja): Bluetooth アプリケーション開発のためのdevelパッケージ
-Group: Development/Libraries
+Group: programming
 Requires: bluez-libs = %{version}
 Requires: pkgconfig
 Obsoletes: bluez-sdp-devel < 4.0
@@ -120,7 +144,7 @@ bluez-libs-devel パッケージは Bluetooth アプリケーション開発の
 %package cups
 Summary: CUPS printer backend for Bluetooth printers
 Summary(ja): Bluetooth 経由の CUPS プリンタシステム用
-Group: System Environment/Daemons
+Group: servers
 Obsoletes: bluez-utils-cups < 4.5-2
 Provides: bluez-utils-cups = %{version}-%{release}
 Requires: bluez-libs = %{version}
@@ -139,70 +163,110 @@ Bluetooth対応 プリンターを CUPS印刷システムから利用する
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q
+%if !%{with systemd}
 %patch0 -p1
+%patch1 -p1
+%else
+%patch1 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%endif
 %patch100 -p1
 %patch101 -p1
 
 %build
 %configure \
+%if %{with systemd}
+	--with-systemdsystemunitdir=%{_unitdir} \
+	--with-systemduserunitdir=%{_userunitdir} \
+	--enable-mesh \
+%else
 	--disable-systemd \
+%endif
 	--enable-library \
     --enable-cups \
     --enable-tools \
     --enable-sixaxis \
     --enable-nfc \
+	--enable-hid2hci \
 	--disable-android
 
-# copy txt
-#cp %{SOURCE11} .
-
-make
+make %{?_smp_mflags}
 
 #----------------------------------------------------------------------------
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT 
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} 
 
 # Remove autocrap and libtool droppings
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth/
-mkdir -p $RPM_BUILD_ROOT%{_libdir}/bluetooth/
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-
-install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/bluetooth
-ln -s ../libexec/bluetooth/bluetoothd $RPM_BUILD_ROOT%{_sbindir}/bluetoothd
-
-#install -D -m0644 %{SOURCE20} $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth/
-install -D -m0644 src/main.conf $RPM_BUILD_ROOT%{_sysconfdir}/bluetooth/
-# rename serial-api.txt 
-#mv  doc/serial-api.txt doc/serial-api_doc.txt
-
-install -D -m0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
+find %{buildroot} -name '*.la' -exec rm -f {} \;
+
+mkdir -p %{buildroot}%{_sysconfdir}/bluetooth/
+mkdir -p %{buildroot}%{_libdir}/bluetooth/
+mkdir -p %{buildroot}%{_sbindir}
+
+install -d -m0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/bluetooth
+%if %{with systemd}
+install -d -m0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/bluetooth/mesh
+#serial port connected Broadcom HCIs scripts
+install -D -p -m0644 %{SOURCE22} %{buildroot}/%{_udevrulesdir}/
+install -D -p -m0644 %{SOURCE23} %{buildroot}/%{_unitdir}/
+install -D -p -m0755 %{SOURCE24} %{buildroot}/%{_libexecdir}/bluetooth/
+%else
+install -D -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/bluetooth
+ln -s ../libexec/bluetooth/bluetoothd %{buildroot}%{_sbindir}/bluetoothd
+%endif
+
+#copy bluetooth config file and setup auto enable
+install -D -p -m0644 src/main.conf %{buildroot}/etc/bluetooth/main.conf
+install -D -p -m0644 mesh/mesh-main.conf %{buildroot}/etc/bluetooth/mesh-main.conf
+sed -i 's/#\[Policy\]$/\[Policy\]/; s/#AutoEnable=false/AutoEnable=true/' %{buildroot}/%{_sysconfdir}/bluetooth/main.conf
+
+install -D -m0755 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 
+#----------------------------------------------------------------------------
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 #----------------------------------------------------------------------------
 %post
+%if %{with systemd}
+%systemd_post bluetooth.service
+%systemd_user_post bluetooth-mesh.service
+%systemd_user_post obex.service
+/bin/udevadm trigger --subsystem-match=usb
+%else
 /sbin/chkconfig --add bluetooth
-if [ "$1" -ge "1" ]; then
-        /sbin/service bluetooth condrestart >/dev/null 2>&1 || :
-fi
+/sbin/udevadm trigger --subsystem-match=usb
+%endif
 exit 0
 
 %preun
-if [ "$1" = "0" ]; then
+%if %{with systemd}
+%systemd_preun bluetooth.service
+%systemd_user_preun bluetooth-mesh.service
+%systemd_user_preun obex.service
+%else
+if [ "$1" = "0" -o -x /bin/systemctl ]; then
         /sbin/service bluetooth stop >/dev/null 2>&1 || :
         /sbin/chkconfig --del bluetooth
 fi
 exit 0
+%endif
 
-%post libs
-/sbin/ldconfig
+%postun
+%if %{with systemd}
+%systemd_postun_with_restart bluetooth.service
+%else
+if [ "$1" -ge "0" ]; then
+        /sbin/service bluetooth condrestart >/dev/null 2>&1 || :
+fi
+%endif
 
-%postun libs
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 #----------------------------------------------------------------------------
 %files
@@ -212,10 +276,8 @@ exit 0
 %dir %{_sysconfdir}/bluetooth/
 %config(noreplace) %{_sysconfdir}/bluetooth/*
 %{_sysconfdir}/dbus-1/system.d/bluetooth.conf
-%{_sysconfdir}/rc.d/init.d/bluetooth
 %{_sysconfdir}/sysconfig/modules/bluez-uinput.modules
 %{_bindir}/*
-%{_sbindir}/bluetoothd
 %{_libexecdir}/bluetooth/bluetoothd
 %{_libexecdir}/bluetooth/obexd
 %dir %{_libdir}/bluetooth
@@ -224,10 +286,30 @@ exit 0
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 /lib/udev/hid2hci
-/lib/udev/rules.d/97-hid2hci.rules
+%{_udevrulesdir}/97-hid2hci.rules
 %dir %{_datadir}/zsh
 %dir %{_datadir}/zsh/site-functions
 %{_datadir}/zsh/site-functions/_bluetoothctl
+%dir %{_localstatedir}/lib/bluetooth
+%if %{with systemd}
+%{_unitdir}/bluetooth.service
+%{_unitdir}/btattach-bcm@.service
+%{_libexecdir}/bluetooth/btattach-bcm-service.sh
+%{_udevrulesdir}/69-btattach-bcm.rules
+%{_userunitdir}/obex.service
+%{_datadir}/dbus-1/system-services/org.bluez.service
+%{_datadir}/dbus-1/services/org.bluez.obex.service
+# mesh files
+%doc tools/mesh-gatt/*.json
+%config %{_sysconfdir}/dbus-1/system.d/bluetooth-mesh.conf
+%{_datadir}/dbus-1/system-services/org.bluez.mesh.service
+%{_libexecdir}/bluetooth/bluetooth-meshd
+%{_unitdir}/bluetooth-mesh.service
+%dir %{_localstatedir}/lib/bluetooth/mesh
+%else
+%{_sysconfdir}/rc.d/init.d/bluetooth
+%{_sbindir}/bluetoothd
+%endif
 
 %files libs
 %defattr(-, root, root)
@@ -246,6 +328,10 @@ exit 0
 
 
 %changelog
+* Thu Oct 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.55-1
+- updated to 5.55.
+- added systemd support (disabled as default).
+
 * Sun Mar 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.54-1
 - updated to 5.54.
 - updated all patches.

f/firefox/firefox-vl.spec

@@ -1,9 +1,9 @@
 %bcond_with clang
 
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 78.3
-%global geckomajor 78.3
-%global ffminor 1
+%global ffmajor 78.4
+%global geckomajor 78.4
+%global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
 %define tarballdir firefox-%{ffversion}
@@ -45,7 +45,7 @@ URL:            https://www.mozilla.org/ja/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          internet
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
-Source2:        cbindgen-vendor.tar.xz
+Source2:        cbindgen-vendor-0.14.3.tar.xz
 
 Source230:      mozconfig-firefox-vine6
 Source240:      mozconfig-firefox-vine7
@@ -124,6 +124,8 @@ Patch589:        mozilla-1634213.patch
 Patch600:        pgo.patch
 Patch602:        mozilla-1516803.patch
 
+Patch700:        rust-1.47.patch
+
 # customization patches
 
 ## Vine patch
@@ -244,6 +246,9 @@ cd %{tarballdir}
 #fix
 %patch602 -p1 -b .1516803
 
+# for rust-1.47
+%patch700 -p1 -b .rust-1.47
+
 #%patch1000 -p0 -b .ignore-exception
 
 perl -pi \
@@ -573,6 +578,9 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Oct 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.4.0-1
+- updated to 78.4.0.
+
 * Fri Oct 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.3.1-1
 - updated to 78.3.1.
 

l/llvm/llvm-vl.spec

@@ -22,8 +22,8 @@
 Summary:        The Low Level Virtual Machine
 Summary(ja):    LLVM - 低レベルバーチャルマシン
 Name:           llvm
-Version:        10.0.1
-Release:        1%{?_dist_release}
+Version:        11.0.0
+Release:        2%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -409,6 +409,9 @@ Requires:       %{name}%{ver_suffix}-libs = %{version}-%{release}
 Shared libraries for the LLVM compiler infrastructure.
 
 
+%debug_package
+
+
 %prep
 %setup -q -a1 -a2 -a3 -a4 -a6 -n llvm-%{version}.src 
 
@@ -490,14 +493,21 @@ cd build
         -DLLVM_ENABLE_EH=ON \
         -DLLVM_BINUTILS_INCDIR=%{_includedir} \
         -DLLVM_BUILD_RUNTIME:BOOL=ON \
+        \
         -DLLVM_INCLUDE_TOOLS:BOOL=ON \
         -DLLVM_BUILD_TOOLS:BOOL=ON \
+        \
         -DLLVM_INCLUDE_TESTS:BOOL=ON \
         -DLLVM_BUILD_TESTS:BOOL=ON \
+        \
         -DLLVM_INCLUDE_EXAMPLES:BOOL=ON \
         -DLLVM_BUILD_EXAMPLES:BOOL=OFF \
+        \
         -DLLVM_INCLUDE_UTILS:BOOL=ON \
-        -DLLVM_INSTALL_UTILS:BOOL=OFF \
+        -DLLVM_INSTALL_UTILS:BOOL=ON \
+        -DLLVM_UTILS_INSTALL_DIR:PATH=%{_bindir} \
+        -DLLVM_TOOLS_INSTALL_DIR:PATH=bin \
+        \
         -DLLVM_INCLUDE_DOCS:BOOL=ON \
         -DLLVM_ENABLE_SPHINX:BOOL=OFF \
 %if %{with doxygen}
@@ -639,6 +649,7 @@ ninja -C build check-lldb
 ninja -C build check-lld
 %endif
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -688,6 +699,7 @@ exit 0
 %files
 %defattr(-,root,root,-)
 %doc CREDITS.TXT README.txt
+%{_bindir}/FileCheck
 %{_bindir}/bugpoint
 %{_bindir}/dsymutil
 %{_bindir}/llc
@@ -698,6 +710,9 @@ exit 0
 %{_bindir}/sanstats
 %{_bindir}/verify-uselistorder
 %{_bindir}/yaml2obj
+%{_bindir}/count
+%{_bindir}/not
+%{_bindir}/yaml-bench
 %exclude %{_bindir}/llvm-config
 %exclude %{_bindir}/llvm-config-%{__isa_bits}
 %{_bindir}/llvm*
@@ -706,6 +721,16 @@ exit 0
 %doc %{_mandir}/man1/*.1.*
 %{_datadir}/opt-viewer
 
+%files -n llvm%{ver_suffix}-libs
+%defattr(-,root,root,-)
+%license LICENSE.TXT
+#config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
+#dir %{_libdir}/%{name}
+%{_libdir}/libLLVM-*.so
+%{_libdir}/LLVMgold.so
+%{_libdir}/libLTO.so*
+%{_libdir}/libRemarks.so*
+
 %files devel
 %defattr(-,root,root,-)
 #doc %{llvmdocdir %{name}-devel}/
@@ -715,21 +740,9 @@ exit 0
 %{_includedir}/%{name}-c
 #{_libdir}/BugpointPasses.so
 %{_libdir}/libLLVM.so
-%{_libdir}/libLTO.so*
-%{_libdir}/libRemarks.so
-%{_libdir}/LLVMgold.so
 %{_libdir}/cmake/llvm
 #exclude %{_libdir}/cmake/llvm/LLVMStaticExports.cmake
 
-%files -n llvm%{ver_suffix}-libs
-%defattr(-,root,root,-)
-%doc LICENSE.TXT
-#config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
-#dir %{_libdir}/%{name}
-%{_libdir}/libLLVM-*.so
-%{_libdir}/libRemarks.so.*
-#exclude %{_libdir}/LLVMHello.so
-
 %files static
 %{_libdir}/*.a
 #{_libdir}/cmake/llvm/LLVMStaticExports.cmake
@@ -816,6 +829,7 @@ exit 0
 %{_libdir}/clang/%{version}/include/omp.h
 %{_libdir}/clang/%{version}/include/omp-tools.h
 %{_libdir}/clang/%{version}/include/ompt.h
+%{_includedir}/ompt-multiplex.h
 
 %files doc
 %defattr(-,root,root,-)
@@ -854,19 +868,25 @@ exit 0
 %if %{build_compat32}
 %files -n compat32-%{name}%{ver_suffix}-libs
 %defattr(-,root,root)
-%doc LICENSE.TXT
+%license LICENSE.TXT
 #config(noreplace) %{_sysconfdir}/ld.so.conf.d/llvm-%{_arch}.conf
 %exclude %{_libdir}/libLTO.so
 #exclude %{_libdir}/BugpointPasses.so
 %exclude %{_libdir}/libclang*.so
 %exclude %{_libdir}/liblld*.so
-%exclude %{_libdir}/LLVMGold.so
-%exclude %{_libdir}/LLVMHello.so
+%exclude %{_libdir}/LLVMgold.so
 %{_libdir}/*.so
-%{_libdir}/libLTO.so.*
+%{_libdir}/libRemarks.so.*
 %endif
 
+
 %changelog
+* Fri Oct 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 11.0.0-2
+- enabled to build utils.
+
+* Thu Oct 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 11.0.0-1
+- new upstream release.
+
 * Mon Aug 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.0.1-1
 - new upstream release.
 

lib/libd/libdrm/libdrm-vl.spec

@@ -4,118 +4,116 @@
 Summary: Direct Rendering Manager runtime library
 Summary(ja): Direct Rendering Manager ランタイムライブラリ
 Name: libdrm
-Version: 2.4.100
+Version: 2.4.102
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: MIT
-Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
-
-Source0: https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
+Source0: https://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.xz
 Source2: 91-drm-modeset.rules
 Patch3: libdrm-make-dri-perms-okay.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: meson
 BuildRequires: pkgconfig
 BuildRequires: libxcb-devel >= 1.9-2
 BuildRequires: libpciaccess-devel
 BuildRequires: libatomic_ops-devel
 BuildRequires: eudev-libudev-devel
 BuildRequires: kernel-headers >= 2.6.27-1
-BuildRequires: automake autoconf libtool
 BuildRequires: xorg-x11-util-macros
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 Direct Rendering Manager runtime library
 
+
 %package devel
 Summary: Direct Rendering Manager development package
 Summary(ja): Direct Rendering Manager 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: kernel-headers >= 2.6.27-7
 
 %description devel
 Direct Rendering Manager development package
 
+
 %package -n drm-utils
 Summary: Direct Rendering Manager utilities
 Summary(ja): Direct Rendering Manager ユーティリティ
-Group: Development/Tools
+Group: programming
 
 %description -n drm-utils
 Utility programs for the kernel DRM interface.  Will void your warranty.
 
+
 # compat32
 %package -n compat32-%{name}
 Summary: Direct Rendering Manager runtime library
 Summary(ja): Direct Rendering Manager ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
 Direct Rendering Manager runtime library
 
+
 %package -n compat32-%{name}-devel
 Summary: Direct Rendering Manager development package
 Summary(ja): Direct Rendering Manager 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 
 %description -n compat32-%{name}-devel
 Direct Rendering Manager development package
 
+
+%debug_package
+
+
 %prep
 %setup -q
 %patch3 -p1 -b .forceperms
 
+
 %build
-autoreconf -vfi
-%configure \
-  --enable-udev \
-  --enable-install-test-programs \
+%meson \
+  -Dudev=true \
+  -Dinstall-test-programs=true \
 %ifarch %{ix86} x86_64 ia64
-  --enable-intel \
+  -Dintel=true \
 %endif
-%ifarch %{arm}
-  --enable-omap-experimental-api \
-  --enable-exynos-experimental-api \
-%endif
-  --enable-amdgpu \
-  --enable-radeon \
-  --enable-nouveau \
-  --enable-vmwgfx
-make %{?smp_mflags}
-pushd tests
-make %{?smp_mflags} $(make check-programs)
-popd
+  -Damdgpu=true \
+  -Dradeon=true \
+  -Dnouveau=true \
+  -Dvmwgfx=true
+
+%meson_build
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-pushd tests
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-for foo in $(make check-programs) ; do
- install -m 0755 $foo $RPM_BUILD_ROOT%{_bindir}
-done
-popd
+rm -rf %{buildroot}
+%meson_install
  
-mkdir -p $RPM_BUILD_ROOT/lib/udev/rules.d/
-install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/lib/udev/rules.d/
+mkdir -p %{buildroot}/lib/udev/rules.d/
+install -m 0644 %{SOURCE2} %{buildroot}/lib/udev/rules.d/
 
 # NOTE: We intentionally don't ship *.la files
-find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
+find %{buildroot} -type f -name '*.la' | xargs rm -f -- || :
 for i in r300_reg.h via_3d_reg.h
 do
-rm -f $RPM_BUILD_ROOT/usr/include/libdrm/$i
+rm -f %{buildroot}/usr/include/libdrm/$i
 done
 
+
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -123,6 +121,7 @@ rm -rf $RPM_BUILD_ROOT
 %post -n compat32-%{name} -p /sbin/ldconfig
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %doc README
@@ -233,7 +232,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libkms.so
 %endif
 
+
 %changelog
+* Thu Oct 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.102-1
+- updated to 2.4.102.
+
 * Thu Mar 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.100-1
 - updated to 2.4.100.
 

lib/libm/libmodsecurity/libmodsecurity-vl.spec

@@ -1,10 +1,9 @@
 
+Summary:        A library that loads/interprets rules written in the ModSecurity SecRules
 Name:           libmodsecurity
 Version:        3.0.4
-Release:        1%{?_dist_release}
-Summary:        A library that loads/interprets rules written in the ModSecurity SecRules
-Group:          Development/Libraries
-
+Release:        2%{?_dist_release}
+Group:          security
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -12,6 +11,7 @@ License:        ASL 2.0
 URL:            https://www.modsecurity.org/
 
 Source0:        https://github.com/SpiderLabs/ModSecurity/releases/download/v%{version}/modsecurity-v%{version}.tar.gz
+Patch1000:      CVE-2020-15598.patch
 
 BuildRequires: gcc-c++
 BuildRequires: make
@@ -41,14 +41,17 @@ by your application via Connectors.
 
 %package devel
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+
 %package static
 Summary: Development files for %{name}
+Group: programming
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description static
@@ -56,9 +59,11 @@ The %{name}-static package contains static libraries for developing
 applications that use %{name}.
 
 
+%debug_package
+
 
 %prep
-%autosetup -n modsecurity-v%{version}
+%autosetup -p1 -n modsecurity-v%{version}
 
 
 %build
@@ -94,6 +99,9 @@ applications that use %{name}.
 
 
 %changelog
+* Wed Oct 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.4-2
+- imported Patch1000 to fix CVE-2020-15598.
+
 * Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.0.4-1
 - new upstream release.
 

m/mesa/mesa-vl.spec

@@ -36,12 +36,13 @@
 Summary:        Mesa graphics libraries
 Summary(ja):    Mesa グラフィックスライブラリ
 Name:           mesa
-Version:        20.1.4
+Version:        20.2.1
 Release:        1%{?_dist_release}
-Group:          System Environment/Libraries
-License:        MIT
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
+
+License:        MIT
 URL:            https://www.mesa3d.org/
 Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}.tar.xz
 
@@ -103,10 +104,11 @@ BuildRequires: vulkan-devel
 %description
 Mesa
 
+
 %package libGL
 Summary: Mesa libGL runtime libraries
 Summary(ja): Mesa libGL ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Provides: libGL
@@ -119,7 +121,7 @@ Mesa libGL runtime libraries and DRI drivers.
 %package libGL-devel
 Summary: Mesa libGL development package
 Summary(ja): Mesa libGL 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Provides: libGL-devel
 Requires: mesa-libGL = %{version}-%{release}
 Requires: libX11-devel
@@ -137,16 +139,17 @@ Mesa libGL development package
 %package dri-drivers
 Summary: Mesa-based DRI drivers
 Summary(ja): Mesa ベースの DRI ドライバ
-Group: User Interface/X Hardware Support
+Group: system
 Obsoletes: mesa-libGL < 8.0.4
 
 %description dri-drivers
 Mesa-based DRI drivers.
 
+
 %package vdpau-drivers
 Summary: Mesa-based VDPAU drivers
 Summary(ja): Mesa ベースの VDPAU ドライバ
-Group: User Interface/X Hardware Support
+Group: system
 Requires: libvdpau
 
 %description vdpau-drivers
@@ -156,7 +159,7 @@ Mesa-based VDPAU drivers.
 %package libEGL
 Summary: Mesa libEGL runtime libraries
 Summary(ja): Mesa libEGL ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: libdrm >= 2.4.24-1
@@ -164,10 +167,11 @@ Requires: libdrm >= 2.4.24-1
 %description libEGL
 Mesa libEGL runtime libraries
 
+
 %package libEGL-devel
 Summary: Mesa libEGL development package
 Summary(ja): Mesa libEGL 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: mesa-libEGL = %{version}-%{release}
 
 %description libEGL-devel
@@ -177,7 +181,7 @@ Mesa libEGL development package
 %package libGLES
 Summary: Mesa libGLES runtime libraries
 Summary(ja): Mesa libGLES ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: libdrm >= 2.4.24-1
@@ -185,10 +189,11 @@ Requires: libdrm >= 2.4.24-1
 %description libGLES
 Mesa GLES runtime libraries
 
+
 %package libGLES-devel
 Summary: Mesa libGLES development package
 Summary(ja): Mesa libGLES 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: mesa-libGLES = %{version}-%{release}
 
 %description libGLES-devel
@@ -198,7 +203,7 @@ Mesa libGLES development package
 %package libOSMesa
 Summary: Mesa offscreen rendering libraries
 Summary(ja): Mesa オフスクリーンレンダリングライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Provides: libOSMesa
@@ -210,7 +215,7 @@ Mesa offscreen rendering libraries
 %package libOSMesa-devel
 Summary: Mesa offscreen rendering development package
 Summary(ja): Mesa オフスクリーンレンダリング開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: mesa-libOSMesa = %{version}-%{release}
 
 %description libOSMesa-devel
@@ -220,7 +225,7 @@ Mesa offscreen rendering development package
 %package libgbm
 Summary: Mesa gbm library
 Summary(ja): Mesa gbm ライブラリ
-Group: System Environment/Libraries
+Group: system
 Provides: libgbm
 
 %description libgbm
@@ -230,7 +235,7 @@ Mesa gbm runtime library.
 %package libgbm-devel
 Summary: Mesa libgbm development package
 Summary(ja): Mesa gbm ライブラリ開発パッケージ
-Group: Development/Libraries
+Group: programming
 Provides: libgbm-devel
 Requires: mesa-libgbm = %{version}-%{release}
 
@@ -240,7 +245,7 @@ Mesa libgbm development package
 
 %package libglapi
 Summary: Mesa shared glapi
-Group: System Environment/Libraries
+Group: system
 Provides: libglapi
 
 %description libglapi
@@ -250,7 +255,7 @@ Mesa shared glapi
 %package libxatracker
 Summary: Mesa XA state tracker for vmware
 Summary(ja): VMware 用 Mesa XA ステートトラッカー
-Group: System Environment/Libraries
+Group: system
 Provides: libxatracker
 
 %description libxatracker
@@ -259,34 +264,37 @@ Mesa XA state tracker for vmware
 %package libxatracker-devel
 Summary: Mesa XA state tracker development package
 Summary(ja): Mesa XA ステートトラッカー開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: mesa-libxatracker = %{version}-%{release}
 Provides: libxatracker-devel
 
 %description libxatracker-devel
 Mesa XA state tracker development package
 
+
 %if 0%{?with_nine}
 %package libd3d
-Group:          System Environment/Libraries
+Group:          system
 Summary:        Mesa Direct3D9 state tracker
 
 %description libd3d
 %{summary}.
 
+
 %package libd3d-devel
 Summary:        Mesa Direct3D9 state tracker development package
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name}-libd3d%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libd3d-devel
 %{summary}.
 %endif
 
+
 %package source
 Summary: Mesa source code required to build X server
 Summary(ja): X サーバをビルドするために必要な Mesa ソースコード
-Group: Development/Libraries
+Group: programming
 
 %description source
 The mesa-source package provides the minimal source code needed to
@@ -297,7 +305,7 @@ build DRI enabled X servers, etc.
 %package -n compat32-%{name}-libGL
 Summary: Mesa libGL runtime libraries and DRI drivers
 Summary(ja): Mesa libGL ランタイプライブラリおよび DRI ドライバ
-Group: System Environment/Libraries
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: %{name}-libGL = %{version}-%{release}
@@ -309,7 +317,7 @@ Mesa libGL runtime libraries and DRI drivers.
 %package -n compat32-%{name}-libGL-devel
 Summary: Mesa libGL development package
 Summary(ja): Mesa libGL 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: compat32-%{name}-libGL = %{version}-%{release}
 Requires: %{name}-libGL-devel = %{version}-%{release}
 Requires: compat32-libX11-devel
@@ -322,7 +330,7 @@ Mesa libGL development package
 %package -n compat32-%{name}-libEGL
 Summary: Mesa libEGL runtime libraries
 Summary(ja): Mesa libEGL ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: compat32-libdrm >= 2.4.24-1
@@ -333,7 +341,7 @@ Mesa libEGL runtime libraries
 %package -n compat32-%{name}-libEGL-devel
 Summary: Mesa libEGL development package
 Summary(ja): Mesa libEGL 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: mesa-libEGL = %{version}-%{release}
 Requires: compat32-mesa-libEGL = %{version}-%{release}
 
@@ -344,7 +352,7 @@ Mesa libEGL development package
 %package -n compat32-%{name}-libGLES
 Summary: Mesa libGLES runtime libraries
 Summary(ja): Mesa libGLES ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: compat32-libdrm >= 2.4.24-1
@@ -355,7 +363,7 @@ Mesa GLES runtime libraries
 %package -n compat32-%{name}-libGLES-devel
 Summary: Mesa libGLES development package
 Summary(ja): Mesa libGLES 開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: mesa-libGLES = %{version}-%{release}
 Requires: compat32-mesa-libGLES = %{version}-%{release}
 
@@ -365,7 +373,7 @@ Mesa libGLES development package
 %package -n compat32-%{name}-libOSMesa
 Summary: Mesa offscreen rendering libraries
 Summary(ja): Mesa オフスクリーンレンダリングライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: %{name}-libOSMesa
@@ -377,7 +385,7 @@ Mesa offscreen rendering libraries
 %package -n compat32-%{name}-libOSMesa-devel
 Summary: Mesa offscreen rendering development package
 Summary(ja): Mesa オフスクリーンレンダリング開発パッケージ
-Group: Development/Libraries
+Group: programming
 Requires: compat32-%{name}-libOSMesa = %{version}-%{release}
 Requires: %{name}-libOSMesa-devel = %{version}-%{release}
 
@@ -388,7 +396,7 @@ Mesa offscreen rendering development package
 %package -n compat32-%{name}-libxatracker
 Summary: Mesa XA state tracker for vmware
 Summary(ja): VMware 用 Mesa XA ステートトラッカー
-Group: System Environment/Libraries
+Group: system
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: %{name}-libxatracker
@@ -400,7 +408,7 @@ Mesa XA state tracker for vmware
 %package -n compat32-%{name}-libgbm
 Summary: Mesa gbm library
 Summary(ja): Mesa gbm ライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires: %{name}-libgbm
 
 %description -n compat32-%{name}-libgbm
@@ -409,7 +417,7 @@ Mesa gbm runtime library.
 
 %package -n compat32-%{name}-libglapi
 Summary: Mesa shared glapi
-Group: System Environment/Libraries
+Group: system
 Requires: %{name}-libglapi
 
 %description -n compat32-%{name}-libglapi
@@ -419,7 +427,7 @@ Mesa shared glapi
 %package -n compat32-%{name}-dri-drivers
 Summary: Mesa-based DRI drivers
 Summary(ja): Mesa ベースの DRI ドライバ
-Group: User Interface/X Hardware Support
+Group: system
 Obsoletes: mesa-libGL < 8.0.4
 
 %description -n compat32-%{name}-dri-drivers
@@ -429,13 +437,16 @@ Mesa-based DRI drivers.
 %if %{with vulkan}
 %package vulkan-drivers
 Summary:        Mesa Vulkan drivers
+Group:          system
 Requires:       vulkan%{_isa}
 
 %description vulkan-drivers
 The drivers with support for the Vulkan API.
 
+
 %package vulkan-devel
 Summary:        Mesa Vulkan development files
+Group:          programming
 Requires:       %{name}-vulkan-drivers%{?_isa} = %{?epoch:%{epoch}}%{version}-%{release}
 Requires:       vulkan-devel
 
@@ -817,6 +828,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Oct 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.2.1-1
+- updated to 20.2.1.
+
 * Thu Jul 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20.1.4-1
 - updated to 20.1.4.
 - dropped Patch7 and 1000: fixed in upstream.

n/nginx/nginx-vl.spec

@@ -38,10 +38,13 @@
 Summary:        Robust, small and high performance http and reverse proxy server
 Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロキシサーバ
 Name:           nginx
-Group:          System Environment/Daemons   
+Group:          servers
 Version:        %{nginx_version}
 # do not reset or decrease.
-Release:        7%{?_dist_release}%{?with_systemd:.systemd}
+Release:        8%{?_dist_release}%{?with_systemd:.systemd}
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       daisuke
 
 # BSD License (two clause)
 # http://www.freebsd.org/copyright/freebsd-license.html
@@ -101,6 +104,7 @@ Source2030:     https://github.com/leev/ngx_http_geoip2_module/archive/%{geoip2_
 %global         with_modsecurity 1
 %global         modsecurity_version 1.0.1
 Source2040:     https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v%{modsecurity_version}/modsecurity-nginx-v%{modsecurity_version}.tar.gz
+Patch2040:      modsecurity-nginx-1.0.1-20201014.patch
 %endif
 
 # removes -Werror in upstream build scripts.  -Werror conflicts with
@@ -150,10 +154,6 @@ Requires(pre):	    www-common
 
 Provides: webserver
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
 proxy server written by Igor Sysoev.
@@ -165,21 +165,22 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
  - HTTP(S) リバースプロキシサーバ
  - IMAP/POP3 プロキシサーバ
 
+
 %package passenger
-Summary: Nginx with mod_passenger support
-Summary(ja): Passenger サポート入りの Nginx 
-Version: %{passenger_version}
-Group: System Environment/Daemons
-BuildRequires: ruby, rubygem-rake
-Requires: ruby, rubygem-rake
+Summary:        mod_passenger for Nginx
+Summary(ja):    Nginx用Passenger
+Version:        %{passenger_version}
+Group:          servers
+BuildRequires:  ruby, rubygem-rake
+Requires:       ruby, rubygem-rake
 %if "%{_dist_release}" >= "vl7"
-BuildRequires: ruby-devel, ruby-rubygems
-Requires: ruby-rubygems
+BuildRequires:  ruby-devel, ruby-rubygems
+Requires:       ruby-rubygems
 %else
-BuildRequires: rubygems
-Requires: rubygems
+BuildRequires:  rubygems
+Requires:       rubygems
 %endif
-Requires: %{name} = %{nginx_version}-%{release}
+Requires:       %{name} = %{nginx_version}-%{release}
 
 %description passenger
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
@@ -193,9 +194,11 @@ Nginx [engine x/エンジンX] は Igor Sysoev により開発された以下の
  - IMAP/POP3 プロキシサーバ
 このパッケージには Passenger サポートを含んだ nginxサーバが入っています。
 
+
 %if %{with geoip}
 %package geoip
 Summary:           Nginx HTTP geoip module
+Group:             servers
 BuildRequires:     GeoIP-devel
 Requires:          %{name} = %{nginx_version}-%{release}
 Requires:          GeoIP
@@ -204,8 +207,10 @@ Requires:          GeoIP
 %{summary}.
 %endif
 
+
 %package image-filter
 Summary:           Nginx HTTP image filter module
+Group:             servers
 BuildRequires:     gd-devel
 Requires:          %{name} = %{nginx_version}-%{release}
 Requires:          gd
@@ -213,8 +218,10 @@ Requires:          gd
 %description image-filter
 %{summary}.
 
+
 %package perl
 Summary:           Nginx HTTP perl module
+Group:             servers
 BuildRequires:     perl
 BuildRequires:     perl(ExtUtils::Embed)
 Requires:          %{name} = %{nginx_version}-%{release}
@@ -223,49 +230,61 @@ Requires:          perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $ve
 %description perl
 %{summary}.
 
+
 %package xslt-filter
 Summary:           Nginx XSLT module
+Group:             servers
 BuildRequires:     libxslt-devel
 Requires:          %{name} = %{nginx_version}-%{release}
 
 %description xslt-filter
 %{summary}.
 
+
 %package mail
 Summary:           Nginx mail modules
+Group:             servers
 Requires:          %{name} = %{nginx_version}-%{release}
 
 %description mail
 %{summary}.
 
+
 %package stream
 Summary:           Nginx stream modules
+Group:             servers
 Requires:          %{name} = %{nginx_version}-%{release}
 
 %description stream
 %{summary}.
 
+
 %package dav-ext
 Summary:           Nginx dav-ext modules
 Version:           %{nginx_dav_ext_module_version}
+Group:             servers
 Requires:          %{name} = %{nginx_version}-%{release}
 
 %description dav-ext
 %{summary}.
 
+
 %if %{with geoip2}
 %package http-geoip2
 Summary:           Nginx HTTP geoip2 modules
 Version:           %{geoip2_version}
+Group:             servers
 BuildRequires:     libmaxminddb-devel
 Requires:          %{name} = %{nginx_version}-%{release}
 
 %description http-geoip2
 %{summary}.
 
+
 %package stream-geoip2
 Summary:           Nginx stream geoip2 modules
 Version:           %{geoip2_version}
+Group:             servers
 BuildRequires:     libmaxminddb-devel
 Requires:          %{name} = %{nginx_version}-%{release}
 Requires:          %{name}-stream = %{nginx_version}-%{release}
@@ -274,11 +293,13 @@ Requires:          %{name}-stream = %{nginx_version}-%{release}
 %{summary}.
 %endif
 
+
 %if %{with naxsi}
 %package naxsi
 Summary:           an open-source, high performance, low rules maintenance WAF for NGINX
 Summary(ja):       NGiNXのためのOSS・高パフォーマンス・低メンテナンスコストなWAF
 Version:           %{naxsi_version}
+Group:             servers
 License:           GPL3
 Requires:          %{name} = %{nginx_version}-%{release}
 
@@ -301,11 +322,13 @@ rules regarding a website's behaviour.
 to add required ACCEPT rules for the target website to work properly.
 %endif
 
+
 %if %{with modsecurity}
 %package modsecurity
 Summary:           The ModSecurity-nginx connector
 Summary(ja):       ModSecurity Nginxコネクター
 Version:           %{modsecurity_version}
+Group:             servers
 License:           ASL 2.0
 BuildRequires:     libmodsecurity-devel
 Requires:          %{name} = %{nginx_version}-%{release}
@@ -342,8 +365,10 @@ popd
 
 %if %{with modsecurity}
 pushd modsecurity-nginx-v%{modsecurity_version}
+%patch2040 -p1
 %endif
 
+
 %build
 # nginx does not utilize a standard configure script.  It has its own
 # and the standard configure options cause the nginx configure script
@@ -352,8 +377,6 @@ pushd modsecurity-nginx-v%{modsecurity_version}
 # Patch2) in order to support installing into a build environment.
 
 export DESTDIR=%{buildroot}
-
-
 CONFIGOPTS="\
     --user=%{nginx_user} \
     --group=%{nginx_group} \
@@ -430,6 +453,7 @@ CONFIGOPTS="\
 
 make %{?_smp_mflags} 
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALLDIRS=vendor
@@ -552,9 +576,11 @@ do
     rm -f $textfile.old
 done
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %pre
 if [ -L %{_sbindir}/nginx ]; then
     update-alternatives --remove nginx %{_sbindir}/nginx.normal ||:
@@ -785,8 +811,12 @@ fi
 %config(noreplace) %{nginx_modconfdir}/modsecurity.conf
 %endif
 
+
 %changelog
-* Tue May 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.18.0-1
+* Wed Oct 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.18.0-8
+- added Patch2040 to fix several bugs.
+
+* Tue May 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.18.0-7
 - updated to 1.18.0.
 - disabled NAXSI as default.
 

n/nspr/nspr-vl.spec

@@ -3,9 +3,9 @@
 Summary:	Netscape Portable Runtime
 Summary(ja):    Netscape ポータブルランタイム
 Name:		nspr
-Version:	4.25
+Version:	4.29
 Release:	1%{?_dist_release}
-Group:		System Environment/Libraries
+Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Packager:	daisuke
@@ -26,9 +26,10 @@ facilities. These facilities include threads, thread synchronization,
 normal file and network I/O, interval timing and calendar time, basic 
 memory management (malloc and free) and shared library linking.
 
+
 %package devel
 Summary:	Development libraries for the Netscape Portable Runtime
-Group:		Development/Libraries
+Group:		programming
 Requires:	nspr = %{version}-%{release}
 Requires:       pkgconfig
 Provides:	mozilla-nspr-devel
@@ -41,7 +42,7 @@ Header files for doing development with the Netscape Portable Runtime.
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary:	Netscape Portable Runtime
-Group: System Environment/Libraries
+Group: system
 
 %description -n compat32-%{name}
 NSPR provides platform independence for non-GUI operating system 
@@ -50,9 +51,10 @@ normal file and network I/O, interval timing and calendar time, basic
 memory management (malloc and free) and shared library linking.
 
 
+%debug_package
 
-%prep
 
+%prep
 %setup -q
 
 # Original nspr-config is not suitable for our distribution,
@@ -65,6 +67,7 @@ memory management (malloc and free) and shared library linking.
 cp ./nspr/config/nspr-config.in ./nspr/config/nspr-config-pc.in
 %patch1 -p0
 
+
 %build
 
 LDFLAGS+=-Wl,-z,relro
@@ -136,6 +139,9 @@ NSPR_VERSION=`./config/nspr-config --version`
 
 
 %changelog
+* Fri Oct 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.29-1
+- update to 4.29.
+
 * Sun Apr 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.25-1
 - update to 4.25.
 

n/nss/nss-vl.spec

@@ -1,6 +1,6 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%define nspr_version 4.22
+%define nspr_version 4.29
 %define pem_version 1.0.6
 %define unsupported_tools_directory %{_libdir}/nss/unsupported-tools
 %global allTools "certutil cmsutil crlutil derdump modutil pk12util pp signtool signver ssltap vfychain vfyserv"
@@ -27,9 +27,9 @@
 
 Summary:          Network Security Services
 Name:             nss
-Version:          3.51.1
-Release:          2%{?_dist_release}
-Group:            System Environment/Libraries
+Version:          3.58
+Release:          1%{?_dist_release}
+Group:            system
 Vendor:           Project Vine
 Distribution:     Vine Linux
 
@@ -61,6 +61,8 @@ Source104:        nss-softokn-config.in
 
 Source1000:       https://github.com/kdudka/nss-pem/releases/download/nss-pem-%{pem_version}/nss-pem-%{pem_version}.tar.xz
 Source1001:       pem-makefile.tar.gz
+# https://github.com/kdudka/nss-pem/commit/e14d5b53ad588e45b2bcffb778563daf2fead5df
+Patch1001:        nss-pem-replace-deprecated-constants.patch
 
 Patch2:           add-relro-linker-option.patch
 Patch3:           renegotiate-transitional.patch
@@ -111,7 +113,7 @@ v3 certificates, and other security standards.
 
 %package tools
 Summary:          Tools for the Network Security Services
-Group:            System Environment/Base
+Group:            security
 Requires:         nss = %{version}-%{release}
 
 %description tools
@@ -127,7 +129,7 @@ manipulate the NSS certificate and key database.
 
 %package devel
 Summary:          Development libraries for Network Security Services
-Group:            Development/Libraries
+Group:            programming
 Requires:         nss = %{version}-%{release}
 Requires:         nspr-devel >= %{nspr_version}
 Provides:         mozilla-nss-devel
@@ -139,7 +141,7 @@ Header and Library files for doing development with Network Security Services.
 
 %package pkcs11-devel
 Summary:          Development libraries for PKCS #11 (Cryptoki) using NSS
-Group:            Development/Libraries
+Group:            programming
 Requires:         nss-devel = %{version}-%{release}
 
 %description pkcs11-devel
@@ -150,7 +152,7 @@ low level services.
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary:          Network Security Services
-Group: System Environment/Libraries
+Group: system
 
 %description -n compat32-%{name}
 Network Security Services (NSS) is a set of libraries designed to
@@ -166,6 +168,9 @@ v3 certificates, and other security standards.
 %prep
 %setup -q
 %setup -q -T -D -n %{name}-%{version} -a 1000
+pushd nss-pem-%{pem_version}
+%patch1001 -p1
+popd
 %{__mv} nss-pem-%{pem_version}/src nss/lib/ckfw/pem
 pushd nss/lib/ckfw/pem/
 tar xvf %{SOURCE1001}
@@ -181,7 +186,7 @@ pushd nss
 popd
 
 # enable nss-pem
-sed -i -e 's/^DIRS = builtins/DIRS = builtins pem/' \
+sed -i -e 's/^DIRS = \. builtins/DIRS = . builtins pem/' \
 	nss/lib/ckfw/manifest.mn
 
 pemNeedsFromSoftoken="lowkeyi lowkeyti softoken softoknt"
@@ -199,52 +204,38 @@ cat sslstress.txt| sed -r "s/^([^#].*EXPORT|^[^#].*SSL2)/#disabled \1/" > sslstr
 popd
 
 %build
-
 export NSS_NO_SSL2=1
-
-NSS_NO_PKCS11_BYPASS=1
-export NSS_NO_PKCS11_BYPASS
+export NSS_NO_PKCS11_BYPASS=1
 
 # partial RELRO support as a security enhancement
 #LDFLAGS+=-Wl,-z,relro
 #export LDFLAGS
 
-FREEBL_NO_DEPEND=1
-export FREEBL_NO_DEPEND
+export FREEBL_NO_DEPEND=1
 
 # Must export FREEBL_LOWHASH=1 for nsslowhash.h so that it gets
 # copied to dist and the rpm install phase can find it
 # This due of the upstream changes to fix
 # https://bugzilla.mozilla.org/show_bug.cgi?id=717906
-FREEBL_LOWHASH=1
-export FREEBL_LOWHASH
+export FREEBL_LOWHASH=1
 
 # Enable compiler optimizations and disable debugging code
-BUILD_OPT=1
-export BUILD_OPT
+export BUILD_OPT=1
 
 # Generate symbolic info for debuggers
-XCFLAGS=$RPM_OPT_FLAGS
-export XCFLAGS
+export XCFLAGS=$RPM_OPT_FLAGS
 
-PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
+export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
+export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
 
-export PKG_CONFIG_ALLOW_SYSTEM_LIBS
-export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
-
-NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
-NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
-
-export NSPR_INCLUDE_DIR
-export NSPR_LIB_DIR
+export NSPR_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nspr | sed 's/-I//'`
+export NSPR_LIB_DIR=`/usr/bin/pkg-config --libs-only-L nspr | sed 's/-L//'`
 
 #export FREEBL_INCLUDE_DIR=`/usr/bin/pkg-config --cflags-only-I nss-softokn | sed 's/-I//'`
 #export FREEBL_LIB_DIR=%{_libdir}
 export USE_SYSTEM_FREEBL=0
 
-NSS_USE_SYSTEM_SQLITE=1
-export NSS_USE_SYSTEM_SQLITE
+export NSS_USE_SYSTEM_SQLITE=1
 
 export NSS_ALLOW_SSLKEYLOGFILE=1
 
@@ -252,8 +243,7 @@ export USE_SYSTEM_ZLIB=1
 export ZLIB_LIBS=%{_libdir}
 
 %ifarch x86_64 ppc64 ia64 s390x
-USE_64=1
-export USE_64
+export USE_64=1
 %endif
 
 # uncomment if the iquote patch is activated
@@ -264,6 +254,8 @@ export IN_TREE_FREEBL_HEADERS_FIRST=1
 #%{__make} -C ./nss/coreconf
 #%{__make} -C ./nss/lib/dbm
 
+%{__make} -C ./nss prepare_build
+%{__make} -C ./nss/lib/freebl
 %{__make} -C ./nss
 
 
@@ -555,6 +547,7 @@ chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 %{_includedir}/nss3/p12plcy.h
 %{_includedir}/nss3/p12t.h
 %{_includedir}/nss3/pk11func.h
+%{_includedir}/nss3/pk11hpke.h
 %{_includedir}/nss3/pk11pqg.h
 %{_includedir}/nss3/pk11priv.h
 %{_includedir}/nss3/pk11pub.h
@@ -634,6 +627,10 @@ chmod 755 $RPM_BUILD_ROOT/%{_bindir}/nss-softokn-config
 
 
 %changelog
+* Fri Oct 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.58-1
+- update to 3.58.
+- imported Patch1001 from upstream of nss-pem.
+
 * Wed May 06 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.51.1-2
 - added missing libnsssysinit.so.
 

o/oniguruma/oniguruma-vl.spec

@@ -6,14 +6,17 @@ Summary:	Oniguruma - A regular expressions library
 Summary(ja):	鬼車 - 正規表現ライブラリ
 Name:		oniguruma
 Version:	%{ver}%{?rev:.}%{?rev}
-Release:	2%{?_dist_release}
+Release:	3%{?_dist_release}
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
 License:	BSD
 Group:		system
 URL:		https://github.com/kkos/oniguruma
 Source0:	https://github.com/kkos/oniguruma/releases/download/v%{ver}%{?rev:_}%{?rev}/%{srcname}-%{ver}%{?rev:-}%{?rev}.tar.gz
+Patch1000:	CVE-2020-26159.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Vendor:		Project Vine
-Distribution:	Vine Linux
 
 Requires(post):   ldconfig
 Requires(postun): ldconfig
@@ -52,8 +55,11 @@ applications with Oniguruma.
 ライブラリ及びヘッダファイルが含まれています。
 
 
+%debug_package
+
+
 %prep
-%setup -q -n %{srcname}-%{ver}
+%autosetup -p1 -n %{srcname}-%{ver}
 
 
 %build
@@ -96,7 +102,11 @@ applications with Oniguruma.
 %{_libdir}/libonig.so
 %{_includedir}/onig*.h
 
+
 %changelog
+* Wed Oct 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.9.5.rev1-3
+- imported Patch1 from upstream to fix CVE-2020-26159.
+
 * Fri Aug 21 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.9.5.rev1-2
 - enabled POSIX API.
 

p/python-mako/python-mako-vl.spec

@@ -1,16 +1,20 @@
-Name:           python-mako
-Version:        1.1.0
-Release:        1%{?_dist_release}
 Summary:        Mako template library for Python
 Summary(ja):    Python の Mako テンプレートライブラリ
-Group:          Development/Libraries
-License:        MIT
+Name:           python-mako
+Version:        1.1.3
+Release:        1%{?_dist_release}
+Group:          programming
 Vendor:         Project Vine
 Distribution:   Vine Linux
+
+License:        MIT
 URL:            http://www.makotemplates.org/
 Source0:        Mako-%{version}.tar.gz
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildArch:      noarch
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-setuptools
 BuildRequires:  python-rpm-macros
 BuildRequires:  python-setuptools
 Requires:       python-beaker
@@ -25,13 +29,12 @@ componentized layout and inheritance to produce one of the most straightforward
 and flexible models available, while also maintaining close ties to Python
 calling and scoping semantics.
 
-%package -n python3-mako
-Summary: Mako template library for Python3
-Summary(ja): Python3 の Mako テンプレートライブラリ
-Group: Development/Libraries
-BuildRequires: python3-rpm-macros
-BuildRequires: python3-setuptools
-Requires: python3-markupsafe
+
+%package -n     python3-mako
+Summary:        Mako template library for Python3
+Summary(ja):    Python3 の Mako テンプレートライブラリ
+Group:          programming
+Requires:       python3-markupsafe
 
 %description -n python3-mako
 Mako is a template library written in Python. It provides a familiar, non-XML
@@ -43,6 +46,7 @@ componentized layout and inheritance to produce one of the most straightforward
 and flexible models available, while also maintaining close ties to Python
 calling and scoping semantics.
 
+
 %prep
 %setup -q -n Mako-%{version}
 
@@ -75,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitelib}/*
 
 %changelog
+* Thu Oct 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.3-1
+- new upstream release.
+
 * Fri Sep 20 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.0-1
 - new upstream release.
 - added python3 support.

p/python-markupsafe/python-markupsafe-vl.spec

@@ -3,7 +3,7 @@
 Summary: Implements a XML/HTML/XHTML Markup safe string for Python
 Name: python-markupsafe
 Version: 1.1.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -88,6 +88,9 @@ export CFLAGS="$RPM_OPT_FLAGS"
 
 
 %changelog
+* Thu Oct 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.1-2
+- rebuilt with python3.8.
+
 * Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.1-1
 - new upstream release.
 

r/rust/rust-vl.spec

@@ -1,5 +1,6 @@
 %bcond_with bootstrap
 %bcond_with test
+%bcond_with newrpm
 %bcond_without clang
 %bcond_without bundled_libgit2
 %bcond_without bundled_libssh2
@@ -7,14 +8,12 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.46.0
+%global rustc_version 1.47.0
 %global cargo_version %{rustc_version}
 %global rustfmt_version %{rustc_version}
 %global rls_version %{rustc_version}
 %global clippy_version %{rustc_version}
 
-%global llvm_major 10
-
 # The channel can be stable, beta, or nightly
 %{!?channel: %global channel stable}
 
@@ -152,19 +151,19 @@ BuildRequires:  cmake
 BuildRequires:  git
 Provides:       bundled(llvm) = 6.0
 %else
+BuildRequires:  cmake
 %if %defined llvm
 %global llvm_root %{_libdir}/%{llvm}
 %else
 %global llvm llvm
 %global llvm_root %{_prefix}
+%global llvm_has_filecheck 1
 %endif
-BuildRequires:  %{llvm}-devel >= 7.0.0
+BuildRequires:  %{llvm}-devel >= 11.0.0
 %if %{with llvm_static}
 BuildRequires:  %{llvm}-static
 BuildRequires:  libffi-devel
 %else
-# Make sure llvm-config doesn't see it.
-Requires:       %{llvm}%{llvm_major}-libs
 BuildConflicts: %{llvm}-static
 %endif
 %endif
@@ -192,22 +191,19 @@ Requires:       %{name}-std-static%{?_isa} = %{version}-%{release}
 Requires:       /usr/bin/cc
 
 # ALL Rust libraries are private, because they don't keep an ABI.
-%global _privatelibs lib.*-[[:xdigit:]]*[.]so.*
+%global _privatelibs lib(.*-[[:xdigit:]]{16}*|rustc.*)[.]so.*
 %global __provides_exclude ^(%{_privatelibs})$
 %global __requires_exclude ^(%{_privatelibs})$
-%global __provides_exclude_from ^%{_docdir}/.*$
-%global __requires_exclude_from ^%{_docdir}/.*$
-
-# While we don't want to encourage dynamic linking to Rust shared libraries, as
-# there's no stable ABI, we still need the unallocated metadata (.rustc) to
-# support custom-derive plugins like #[proc_macro_derive(Foo)].  But eu-strip is
-# very eager by default, so we have to limit it to -g, only debugging symbols.
-%if 0%{?fedora} >= 27
-# Newer find-debuginfo.sh supports --keep-section, which is preferable. rhbz1465997
-%global _find_debuginfo_opts --keep-section .rustc
-%else
+%global __provides_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$
+%global __requires_exclude_from ^(%{_docdir}|%{rustlibdir}/src)/.*$
+
+%if !%{with newrpm}
+# eu-strip is very eager by default, so we have to limit it to -g, only debugging symbols.
 %global _find_debuginfo_opts -g
 %undefine _include_minidebuginfo
+%else
+# Newer find-debuginfo.sh supports --keep-section, which is preferable. rhbz1465997
+%global _find_debuginfo_opts --keep-section .rustc
 %endif
 
 # Use hardening ldflags.
@@ -459,11 +455,25 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
 %global rustlibdir %{common_libdir}/rustlib
 
 %ifarch x86_64
+%if %{with newrpm}
 %define enable_debuginfo --debuginfo-level=0 --debuginfo-level-std=2
 %else
 %define enable_debuginfo --debuginfo-level=0
+%global debug_package %{nil}
+%endif
+%else
+%define enable_debuginfo --debuginfo-level=0
+%global debug_package %{nil}
 %endif
 
+# Some builders have relatively little memory for their CPU count.
+# At least 2GB per CPU is a good rule of thumb for building rustc.
+ncpus=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+max_cpus=$(( ($(LANG=C free -g | awk '/^Mem:/{print $2}') + 1) / 2 ))
+if [ "$max_cpus" -ge 1 -a "$max_cpus" -lt "$ncpus" ]; then
+  ncpus="$max_cpus"
+fi
+
 %if %{with clang}
 export CC=clang
 export CXX=clang++
@@ -479,7 +489,8 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
   --libdir=%{common_libdir} \
   --build=%{rust_triple} --host=%{rust_triple} --target=%{rust_triple} \
   --enable-local-rust --local-rust-root=%{local_rust_root} \
-  %{!?with_bundled_llvm: --llvm-root=%{llvm_root} --disable-codegen-tests \
+  %{!?with_bundled_llvm: --llvm-root=%{llvm_root} \
+    %{!?llvm_has_filecheck: --disable-codegen-tests} \
     %{!?with_llvm_static: --enable-llvm-link-shared } } \
   --disable-rpath \
   %{enable_debuginfo} \
@@ -491,8 +502,8 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
   --set rust.deny-warnings=false \
   %{nil}
 
-RUST_BACKTRACE=1 %{__python3} ./x.py build
-%{__python3} ./x.py doc
+RUST_BACKTRACE=1 %{__python3} ./x.py build -j "$ncpus" --stage 2
+%{__python3} ./x.py doc --stage 2
 
 
 %install
@@ -574,6 +585,7 @@ ln -sT ../rust/html/cargo/ %{buildroot}%{_docdir}/cargo/html
 %if %{without lldb}
 rm -f %{buildroot}%{_bindir}/rust-lldb
 rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
+rm -f %{buildroot}%{rustlibdir}/etc/lldb_commands
 %endif
 
 %if %{with bundled_llvm}
@@ -641,6 +653,7 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %files lldb
 %{_bindir}/rust-lldb
 %{rustlibdir}/etc/lldb_*.py*
+%{rustlibdir}/etc/lldb_commands
 %endif
 
 %files doc
@@ -703,6 +716,9 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 
 
 %changelog
+* Fri Oct 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.47.0-1
+- new upstream release.
+
 * Thu Sep 24 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.46.0-1
 - new upstream release.
 

t/thunderbird/thunderbird-vl.spec

@@ -2,14 +2,6 @@
 
 %global disable_elfhack 1
 
-# The tarball is pretty inconsistent with directory structure.
-# Sometimes there is a top level directory.  That goes here.
-#
-# IMPORTANT: If there is no top level directory, this should be 
-# set to the cwd, ie: '.'
-%define tarballdir .
-#define tarballdir comm-esr38
-
 %define objdir       objdir
 %define mozappdir    %{_libdir}/%{name}
 %define thunderbird_app_id \{3550f703-e582-4d05-9a08-453d09bdfdc6\} 
@@ -36,7 +28,7 @@
 Summary:	Thunderbird Community Edition, Mail/newsgroup client
 Summary(ja):	Thunderbirdコミュニティエディション, メール・ニュースクライアント
 Name:		thunderbird
-Version:	68.12.1
+Version:	78.4.0
 Release:	1%{?_dist_release}
 Group:		internet,communication
 Vendor:		Project Vine
@@ -47,19 +39,18 @@ License:	MPLv1.1 or GPLv2+ or LGPLv2+
 URL:		http://www.mozilla.org/projects/thunderbird/
 Source0:	https://archive.mozilla.org/pub/thunderbird/releases/%{tbversion}/source/thunderbird-%{version}.source.tar.xz
 Source1:	thunderbird-langpacks-%{version}.tar.xz
-Source2:	lightning-langpacks-%{version}.tar.xz
-Source3:	get-calendar-langpacks.sh
 Source4:	thunderbird-legacy-aurora.tar.xz
 Source12:	thunderbird-vine-default-prefs.js
 Source20:	thunderbird.desktop
 Source21:	thunderbird.vine.sh.in
 Source30:	thunderbird-open-browser.sh
+Source32:	node-stdout-nonblocking-wrapper
 Source40:	thunderbird-unofficial-branding-tb-brand.properties
 Source41:	thunderbird-unofficial-branding-tb-brand.dtd
 Source42:	thunderbird-unofficial-branding-tb-ja-brand.properties
 Source43:	thunderbird-unofficial-branding-tb-ja-brand.dtd
 Source44:	tb-about-wordmark.svg
-Source99:	cbindgen-vendor.tar.xz
+Source99:	cbindgen-vendor-0.14.3.tar.xz
 Source100:  find-external-requires
 
 # for newer rust
@@ -72,39 +63,25 @@ Source1030:	thunderbird.metainfo.xml
 %define tbversion %{version}
 %define version_internal %{version}
 
-## Firefox patches
-
 # Build patches
-# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
-Patch1001:      build-ppc64le-inline.patch
-# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
-Patch1:         no-rust-lto.patch
-Patch2:         rust-network-check.patch
-Patch4:         build-mozconfig-fix.patch
-#Patch6:         build-nss-version.patch
-Patch7:         firefox-debugedits-error.patch
-Patch8:         firefox-dont-check-binary.patch
-Patch9:         nss-build-mozilla-1564499.patch
-# Always feel lucky for unsupported platforms:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
-Patch45:        build-disable-elfhack.patch
-
-# Fedora/RHEL specific patches
-Patch215:        firefox-enable-addons.patch
-Patch219:        rhbz-1173156.patch
-Patch224:        mozilla-1170092.patch
-Patch225:        mozilla-1005640-accept-lang.patch
-
-Patch230:        rhbz-1503632-nss.patch
+Patch9:         mozilla-build-arm.patch
+Patch226:       rhbz-1354671.patch
+Patch415:       Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+Patch416:       firefox-SIOCGSTAMP.patch
+Patch417:       build-aarch64-user_vfp.patch
+Patch418:       mozilla-1512162.patch
+Patch419:       bindgen-d0dfc52706f23db9dc9d74642eeebd89d73cb8d0.patch
+Patch103:       rhbz-1219542-s390-build.patch
 
-# Upstream patches
-Patch402:        mozilla-1196777.patch
-Patch413:        mozilla-1353817.patch
-#Removing this patch would lead to losing user saved credentials in profile!
+# PPC fix
+Patch304:       mozilla-1245783.patch
+Patch307:       build-disable-elfhack.patch
 
-## Thunderbird patches
+# Fedora specific patches
 
-Patch501:        python-encode.patch
+# Upstream patches
+Patch402:       mozilla-526293.patch
+Patch404:        rust-1.47.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{with clang}
@@ -183,45 +160,35 @@ Thunderbird はスタンドアローンのメールおよびニュースクラ
 
 %prep
 %setup -q
-cd %{tarballdir}
-
-# Mozilla (XULRunner) patches
-#cd mozilla
 
-
-# Firefox patches
-#patch1 -p1 -b .no-rust-lto
-%patch2 -p1 -b .rust-network-check
-%patch7 -p1 -b .debugedits-error
-%ifarch %{ix86} %{arm} ppc
-# binary check fails OOM on 32bit arches
-%patch8 -p1 -b .dont-check-binary
+# Build patches
+%patch9   -p2 -b .arm
+%ifarch s390
+%patch103 -p1 -b .rhbz-1219542-s390-build
 %endif
-%patch9 -p1 -b .nss-build-mozilla-1564499
-
-%patch45 -p1 -b .elfhack
 
-%patch4  -p1 -b .build-mozconfig-fix
-#patch6  -p1 -b .nss-version
+%patch304 -p1 -b .1245783
 
-# Fedora patches
-%patch215 -p1 -b .addons
-%patch219 -p1 -b .rhbz-1173156
-#FIXME %patch224 -p1 -b .1170092
-%patch225 -p1 -b .1005640-accept-lang
-
-# This ensures no migration of certdb to sqlite on the RHEL6 and RHEL7.
-# This needs to stay for the future releases
-%if 0%{?rhel} < 8
-%patch230 -p1 -b .1503632-nss
+#ARM run-time patch
+%ifarch aarch64
+#%patch226 -p1 -b .1354671
 %endif
+%ifarch %{arm}
+%patch415 -p1 -b .mozilla-1238661
+%endif
+%patch416 -p1 -b .SIOCGSTAMP
+%patch417 -p1 -b .aarch64-user_vfp
+%patch418 -p1 -b .mozbz-1512162
+# most likely fixed
+#%patch419 -p1 -b .bindgen
+
+%if 0%{?disable_elfhack}
+%patch307 -p1 -b .elfhack
+%endif
+#cd ..
 
-%patch402 -p1 -b .1196777
-#%patch413 -p1 -b .1353817
-
-# Thunderbird patches
-%patch501 -p1 -b .python-encode
-
+%patch402 -p1 -b .526293
+%patch404 -p1 -b .rust-1.47
 
 # replace source for newer rust
 #cp -f %{SOURCE900} ./third_party/rust/cssparser/src/
@@ -245,17 +212,28 @@ popd
 
 echo "ac_add_options --without-system-nspr" >> .mozconfig
 echo "ac_add_options --without-system-nss" >> .mozconfig
-echo "ac_add_options --disable-system-sqlite" >> .mozconfig
 echo "ac_add_options --without-system-icu" >> .mozconfig
 
 %if %{with clang}
 echo "ac_add_options --enable-linker=lld" >> .mozconfig
 %endif
 
+echo 'export NODEJS="%{_buildrootdir}/bin/node-stdout-nonblocking-wrapper"' >> .mozconfig
+
+# Remove executable bit to make brp-mangle-shebangs happy.
+chmod -x third_party/rust/itertools/src/lib.rs
+chmod a-x third_party/rust/gfx-backend-vulkan/src/*.rs
+chmod a-x third_party/rust/gfx-hal/src/*.rs
+chmod a-x third_party/rust/ash/src/extensions/ext/*.rs
+chmod a-x third_party/rust/ash/src/extensions/khr/*.rs
+
 #===============================================================================
 
 %build
-cd %{tarballdir}
+export LANG=ja_JP.UTF-8
+
+# Disable LTO to work around rhbz#1883904
+%define _lto_cflags %{nil}
 
 # install bundled cbindgen
 mkdir -p my_rust_vendor
@@ -274,6 +252,8 @@ EOL
 env CARGO_HOME=.cargo cargo install cbindgen
 export PATH=`pwd`/.cargo/bin:$PATH
 
+mkdir %{_buildrootdir}/bin || :
+cp %{SOURCE32} %{_buildrootdir}/bin || :
 
 INTERNAL_GECKO=%{version_internal}
 MOZ_APP_DIR=%{mozappdir}
@@ -281,13 +261,13 @@ MOZ_APP_DIR=%{mozappdir}
 # Update the various config.guess to upstream release for aarch64 support
 find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
 
-MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | \
+MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \
                 %{__sed} -e 's/-Wall//')
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//')
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
+MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/')
-
+export MOZ_DEBUG_FLAGS=" "
 
 export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
@@ -312,6 +292,7 @@ MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 export CFLAGS=`echo $MOZ_OPT_FLAGS |sed -e 's/-fpermissive//g'`
 export CXXFLAGS=$MOZ_OPT_FLAGS
 export LDFLAGS=$MOZ_LINK_FLAGS
+export RUSTFLAGS="-Cdebuginfo=0"
 
 MOZ_SMP_FLAGS=-j1
 # On x86 architectures, Mozilla can build up to 4 jobs at once in parallel,
@@ -332,6 +313,7 @@ export STRIP=/bin/true
 #===============================================================================
 
 %install
+export LANG=ja_JP.UTF-8
 %{__rm} -rf $RPM_BUILD_ROOT
 cd %{objdir}
 
@@ -405,13 +387,6 @@ for langpack in `ls thunderbird-langpacks/*.xpi`; do
 done
 %{__rm} -rf thunderbird-langpacks
 
-# lightning langpacks install
-cd %{buildroot}%{langpackdir}
-%{__tar} xf %{SOURCE2}
-chmod a+r *.xpi
-cd -
-
-
 # Get rid of devel package and its debugsymbols
 %{__rm} -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-devel-%{tb_version}
 
@@ -480,6 +455,9 @@ fi
 #===============================================================================
 
 %changelog
+* Mon Oct 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.4.0-1
+- new upstream release.
+
 * Sat Oct 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.12.1-1
 - new upstream release.
 

t/tigervnc/tigervnc-vl.spec

@@ -1,8 +1,8 @@
 %bcond_with systemd
 
 Name:           tigervnc
-Version:        1.10.1
-Release:        2%{?_dist_release}%{?with_systemd:.systemd}
+Version:        1.11.0
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        A TigerVNC remote display system
 Group:          network
 Vendor:         Project Vine
@@ -14,26 +14,24 @@ Source0:        https://github.com/TigerVNC/tigervnc/archive/v%{version}.tar.gz#
 Source1:        vncserver.service.upstart
 Source2:        vncserver.sysconfig.upstart
 Source3:        10-libvnc.conf
-Source6:        vncviewer.desktop
+# Backwards compatibility
+Source5:        vncserver
+Source6:        vncserver.man
+# for systemd
 Source11:       xvnc.service
 Source12:       xvnc.socket
 
-#[ad-hoc] xorg-x11-server-source: has no hw/xfree86/Xorg.sh.in
-Source1000:     Xorg.sh.in
-
-Patch1:         tigervnc-manpages.patch
-Patch2:         tigervnc-getmaster.patch
-Patch3:         tigervnc-shebang.patch
-Patch4:         tigervnc-xstartup.patch
-Patch5:         tigervnc-utilize-system-crypto-policies.patch
-Patch7:         tigervnc-passwd-crash-with-malloc-checks.patch
-
-Patch1000:      xorg-server-1.20.7-ddxInputThreadInit.patch
+Patch1:         tigervnc-getmaster.patch
+Patch2:         tigervnc-utilize-system-crypto-policies.patch
+Patch3:         tigervnc-passwd-crash-with-malloc-checks.patch
+Patch4:         tigervnc-systemd-service.patch
+# Upstream patches
+Patch50:        tigervnc-tolerate-specifying-boolparam.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	libX11-devel, automake, autoconf, libtool, gettext
-BuildRequires:	libXext-devel, xorg-x11-server-source, libXi-devel
+BuildRequires:	libXext-devel, libXi-devel
 BuildRequires:	xorg-x11-xtrans-devel, xorg-x11-util-macros, libXtst-devel
 BuildRequires:	libdrm-devel, libXt-devel, pixman-devel libXfont2-devel
 BuildRequires:	libxkbfile-devel, openssl-devel, libpciaccess-devel
@@ -42,6 +40,7 @@ BuildRequires:	libXinerama-devel, ImageMagick
 BuildRequires:  freetype2-devel, libXdmcp-devel, libxshmfence-devel
 BuildRequires:	desktop-file-utils
 BuildRequires:	libjpeg-turbo-devel, gnutls-devel, pam-devel
+BuildRequires:	xorg-x11-server-source >= 1.20.9-2vl7
 BuildRequires:	cmake
 # TigerVNC 1.4.x requires fltk 1.3.3 for keyboard handling support
 # See https://github.com/TigerVNC/tigervnc/issues/8, also bug #1208814
@@ -99,7 +98,6 @@ This package includes the following components:
 %setup -q
 
 cp -r /usr/share/xorg-x11-server-source/* unix/xserver || exit 1
-cp -a %{SOURCE1000} unix/xserver/hw/xfree86/ || exit 1
 pushd unix/xserver
 for all in `find . -type f -perm -001`; do
 	chmod -x "$all"
@@ -107,24 +105,19 @@ done
 patch -p1 < ../xserver120.patch
 popd
 
-# Synchronise manpages and --help output (bug #980870).
-%patch1 -p1 -b .manpages
-
 # libvnc.so: don't use unexported GetMaster function (bug #744881 again).
-%patch2 -p1 -b .getmaster
-
-# Don't use shebang in vncserver script.
-%patch3 -p1 -b .shebang
-
-# Clearer xstartup file (bug #923655).
-%patch4 -p1 -b .xstartup
+%patch1 -p1 -b .getmaster
 
 # Utilize system-wide crypto policies
-#patch5 -p1 -b .utilize-system-crypto-policies
+# %patch2 -p1 -b .utilize-system-crypto-policies
+
+%patch3 -p1 -b .tigervnc-passwd-crash-with-malloc-checks
 
-%patch7 -p1 -b .tigervnc-passwd-crash-with-malloc-checks
+# Enable once this is reviewed by upstream
+# https://github.com/TigerVNC/tigervnc/pull/1115
+%patch4 -p1 -b .tigervnc-systemd-service
 
-%patch1000 -p1
+%patch50 -p1 -b .tigervnc-tolerate-specifying-boolparam
 
 
 %build
@@ -134,7 +127,11 @@ export CFLAGS="$RPM_OPT_FLAGS -fpic -I%{_includedir}/libdrm"
 #export CXXFLAGS="$CFLAGS"
 export CXXFLAGS="$CFLAGS -std=c++11"
 
+%if %{with systemd}
+%{cmake} -DCMAKE_INSTALL_UNITDIR=%{_unitdir} .
+%else
 %{cmake} .
+%endif
 make %{?_smp_mflags}
 
 pushd unix/xserver
@@ -166,17 +163,15 @@ make
 popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/{README.txt,LICENCE.TXT}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_docdir}/%{name}-%{version}/{README.txt,LICENCE.TXT}
 
 pushd unix/xserver/hw/vnc
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 popd
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vncservers
-
+sed -i -e '/pam_selinux/d' %{buildroot}%{_sysconfdir}/pam.d/tigervnc
 
 %if %{with systemd}
 mkdir -p %{buildroot}%{_unitdir}
@@ -185,36 +180,42 @@ mkdir -p %{buildroot}%{_unitdir}
 install -m644 %{SOURCE11} %{buildroot}%{_unitdir}/xvnc@.service
 install -m644 %{SOURCE12} %{buildroot}%{_unitdir}/xvnc.socket
 %else
+rm -f %{buildroot}/%{_mandir}/man8/vncserver.8
+install -m 755 %{SOURCE5} %{buildroot}/%{_bindir}/vncserver
+install -m 644 %{SOURCE6} %{buildroot}/%{_mandir}/man8/vncserver.8
+sed -i -e '/pam_systemd/d' %{buildroot}%{_sysconfdir}/pam.d/tigervnc
+
 # Install init stuff
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d
-install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/vncserver
+mkdir -p %{buildroot}%{_sysconfdir}/init.d
+install -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/vncserver
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/vncservers
 %endif
 
 # Install desktop stuff
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/{16x16,24x24,48x48}/apps
 
 pushd media/icons
 for s in 16 24 48; do
-install -m644 tigervnc_$s.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${s}x$s/apps/tigervnc.png
+install -m644 tigervnc_$s.png %{buildroot}%{_datadir}/icons/hicolor/${s}x$s/apps/tigervnc.png
 done
 popd
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install \
-	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
-	%{SOURCE6}
-
 %find_lang %{name} %{name}.lang
 
-# remove unwanted files
-rm -f  $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/libvnc.la
-
 mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/
 install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf
 
+# remove unwanted files
+rm -f  %{buildroot}%{_libdir}/xorg/modules/extensions/libvnc.la
+rm -rf %{buildroot}%{_docdir}/tigervnc
+%if !%{with systemd}
+rm -rf %{buildroot}/usr/lib/systemd
+%endif
+
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
@@ -231,7 +232,7 @@ fi
 
 %post server
 %if %{with systemd}
-%systemd_post xvnc.service
+%systemd_post xvnc@.service
 %systemd_post xvnc.socket
 %else
 /sbin/chkconfig --add vncserver
@@ -239,7 +240,7 @@ fi
 
 %preun server
 %if %{with systemd}
-%systemd_preun xvnc.service
+%systemd_preun xvnc@.service
 %systemd_preun xvnc.socket
 %else
 if [ "$1" = 0 -o -x /bin/systemctl ]; then
@@ -250,7 +251,7 @@ fi
 
 %postun server
 %if %{with systemd}
-%systemd_postun xvnc.service
+%systemd_postun xvnc@.service
 %systemd_postun xvnc.socket
 %else
   /sbin/service vncserver condrestart 2>&1 ||:
@@ -272,28 +273,42 @@ fi
 
 %files server
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/sysconfig/vncservers
+%config(noreplace) %{_sysconfdir}/pam.d/tigervnc
+%dir %{_sysconfdir}/tigervnc
+%config(noreplace) %{_sysconfdir}/tigervnc/vncserver-config-defaults
+%config(noreplace) %{_sysconfdir}/tigervnc/vncserver-config-mandatory
+%config(noreplace) %{_sysconfdir}/tigervnc/vncserver.users
 %{_bindir}/x0vncserver
-%{_bindir}/vncserver
 %{_bindir}/vncconfig
 %{_bindir}/vncpasswd
 %{_bindir}/Xvnc
-%{_mandir}/man1/vncserver.1*
+%{_sbindir}/vncsession
+%{_libexecdir}/vncserver
+%{_libexecdir}/vncsession-start
 %{_mandir}/man1/x0vncserver.1*
 %{_mandir}/man1/Xvnc.1*
 %{_mandir}/man1/vncpasswd.1*
 %{_mandir}/man1/vncconfig.1*
+%{_mandir}/man8/vncserver.8*
+%{_mandir}/man8/vncsession.8*
 %{_libdir}/xorg/modules/extensions/libvnc.so
 %config %{_sysconfdir}/X11/xorg.conf.d/10-libvnc.conf
 %if %{with systemd}
-#%{_unitdir}/vncserver@.service
+%{_unitdir}/vncserver@.service
 %{_unitdir}/xvnc@.service
 %{_unitdir}/xvnc.socket
 %else
+%{_bindir}/vncserver
 %config(noreplace) %{_sysconfdir}/init.d/vncserver
+%config(noreplace) %{_sysconfdir}/sysconfig/vncservers
 %endif
 
+
 %changelog
+* Sun Oct 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.11.0-1
+- new upstream release.
+- re-imported all patches from rawhide.
+
 * Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.1-2
 - rebuilt with nettle-3.6.
 - added systemd support (disabled as default).

x/xorg-x11-server/xorg-x11-server-vl.spec

@@ -8,7 +8,7 @@ Summary:        X.Org X11 X server
 Summary(ja):    X.Org X11 X サーバ
 Name:           xorg-x11-server
 Version:        1.20.9
-Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -382,6 +382,7 @@ cp {,%{inst_srcdir}/}man/Xserver.man
 cp {,%{inst_srcdir}/}doc/smartsched
 cp {,%{inst_srcdir}/}hw/dmx/doxygen/doxygen.conf.in
 cp {,%{inst_srcdir}/}xserver.ent.in
+cp {,%{inst_srcdir}/}hw/xfree86/Xorg.sh.in
 cp xkb/README.compiled %{inst_srcdir}/xkb
 cp hw/xfree86/xorgconf.cpp %{inst_srcdir}/hw/xfree86
 
@@ -545,6 +546,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Oct 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.9-2
+- fixed %%files.
+
 * Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.9-1
 - new upstream release.
 - dropped Patch9000: fixed in upstream.