updated 5 packages

cifs-utils-6.11-1

libproxy-0.4.15-3

netpbm-10.86.16-1

squashfs-tools-4.4-1

xorg-x11-server-1.20.9-1

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

c/cifs-utils/cifs-utils-vl.spec

@@ -1,18 +1,16 @@
+Summary:        Utilities for mounting and managing CIFS mounts
 Name:           cifs-utils
-Version:        6.10
+Version:        6.11
 Release:        1%{?_dist_release}
-Summary:        Utilities for mounting and managing CIFS mounts
-
-Group:          System Environment/Daemons
-License:        GPLv3
-URL:            https://wiki.samba.org/index.php/LinuxCIFS_utils
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Group:          system,network
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
+License:        GPLv3
+URL:            https://wiki.samba.org/index.php/LinuxCIFS_utils
 Source0:        https://download.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-%{version}.tar.bz2
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libcap-devel libcap-ng-devel krb5-devel
 BuildRequires:  keyutils-libs-devel libwbclient-devel
 BuildRequires:  autoconf automake
@@ -26,14 +24,20 @@ work in conjunction with support in the kernel to allow one to mount a
 SMB/CIFS share onto a client and use it as if it were a standard Linux
 file system.
 
+
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}
 
+
 %build
 autoreconf -ivf
 %configure --prefix=/usr
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/sbin
@@ -44,9 +48,11 @@ make install DESTDIR=%{buildroot} ROOTSBINDIR=%{buildroot}/sbin mandir=%{buildro
 mv %{buildroot}%{buildroot}/sbin/* %{buildroot}/sbin/
 rm -rf %{buildroot}%{_mandir}
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
 %license COPYING
@@ -57,7 +63,11 @@ rm -rf %{buildroot}
 %{_includedir}/*
 %{_libdir}/cifs-utils
 
+
 %changelog
+* Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.11-1
+- new upstream release.
+
 * Mon Mar 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.10-1
 - new upstream release.
 

lib/libp/libproxy/libproxy-vl.spec

@@ -5,12 +5,17 @@
 Summary:        A library handling all the details of proxy configuration
 Name:           libproxy
 Version:        0.4.15
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://libproxy.github.io/libproxy
 Source0:        https://github.com/libproxy/libproxy/releases/download/%{version}/libproxy-%{version}.tar.xz
+Patch0:         libproxy-0.4.15-python38.patch
+Patch1000:      CVE-2020-25219.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -49,9 +54,6 @@ BuildRequires:  python3-rpm-macros
 Provides: %{name}-webkit = %{version}-%{release}
 Obsoletes: %{name}-webkit < %{version}-%{release}
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 libproxy offers the following features:
 
@@ -69,15 +71,16 @@ Non-default rpmbuild options:
 
 %package        bin
 Summary:        Binary to test %{name}
-Group:          Applications/System
+Group:          network
 Requires:       %{name} = %{version}-%{release}
 
 %description    bin
 The %{name}-bin package contains the proxy binary for %{name}
 
+
 %package        python
 Summary:        Binding for %{name} and python
-Group:          System Environment/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 
 %description    python
@@ -85,32 +88,35 @@ The %{name}-python package contains the python binding for %{name}
 
 %package        python3
 Summary:        Binding for %{name} and python
-Group:          System Environment/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 
+
 %description    python3
 The %{name}-python package contains the python binding for %{name}
 
 %package        gnome
 Summary:        Plugin for %{name} and gnome
-Group:          System Environment/Libraries
+Group:          system
 Requires:       %{name} = %{version}-%{release}
 
 %description    gnome
 The %{name}-gnome package contains the %{name} plugin for gnome.
 
+
 %package        kde
 Summary:        Plugin for %{name} and kde
-Group:          System Environment/Libraries
+Group:          system
 Requires:       %{name} = %{version}-%{release}
 
 %description    kde
 The %{name}-kde package contains the %{name} plugin for kde.
 
+
 %if %{with mozjs}
 %package        mozjs
 Summary:        Plugin for %{name} and mozjs
-Group:          System Environment/Libraries
+Group:          system
 Requires:       %{name} = %{version}
 #Tweak this according to the current gecko-libs version
 Requires:       js
@@ -119,21 +125,22 @@ Provides:       %{name}-pac = %{version}-%{release}
 %description    mozjs
 The %{name}-mozjs package contains the %{name} plugin for mozjs.
 
+
 %package        webkitgtk4
 Summary:        Plugin for %{name} and webkitgtk4
-Group:          System Environment/Libraries
+Group:          system
 Requires:       %{name} = %{version}
 Provides:       %{name}-pac = %{version}-%{release}
 
 %description    webkitgtk4
 The %{name}-webkitgtk3 package contains the %{name} plugin for
 webkitgtk3.
-
 %endif
 
+
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -142,8 +149,13 @@ The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
 
+%debug_package
+
+
 %prep
 %setup -q
+%patch0 -p1
+%patch1000 -p1
 #sed -i "s|mozjs185>=1.8.5|mozjs185|" libproxy/cmake/modules/pacrunner_mozjs.cmk
 
 %build
@@ -168,7 +180,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 
@@ -223,6 +234,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.15-3
+- imported Patch1000 to fix CVE-2020-25219 from debian.
+- imported Patch0 to support python-3.8 from upstream.
+
 * Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.15-2
 - rebuilt with current environment.
 

n/netpbm/netpbm-vl.spec

@@ -1,56 +1,47 @@
-Summary: A library for handling different graphics file formats.
-Summary(ja): 異なる画像ファイル形式を取り扱うためのライブラリ
-Name: netpbm
-Version: 10.61.02
-Release: 2%{?_dist_release}
-License: Artistic License/GPL/MIT
-Group: System Environment/Libraries
-Source0: netpbm-%{version}.tar.xz
-Source3: jpeg-to-pnm.fpi
-Source4: pnm-to-ps.fpi
-Source5: bmp-to-pnm.fpi
-Source6: gif-to-pnm.fpi
-Source7: rast-to-pnm.fpi
-Source8: tiff-to-pnm.fpi
-Source9: png-to-pnm.fpi
-#Source10: netpbmdoc-%{version}.tar.bz2
+Summary:        A library for handling different graphics file formats.
+Summary(ja):    異なる画像ファイル形式を取り扱うためのライブラリ
+Name:           netpbm
+Version:        10.86.16
+Release:        1%{?_dist_release}
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Group:          system
+
+# See copyright_summary for details
+License:        BSD and GPLv2 and IJG and MIT and Public Domain
+URL:            https://netpbm.sourceforge.net/
+Source0:        netpbm-%{version}.tar.xz
 # Patches from fedora core
-Patch1: netpbm-time.patch
-Patch2: netpbm-message.patch
-Patch3: netpbm-security-scripts.patch
-Patch4: netpbm-security-code.patch
-Patch5: netpbm-nodoc.patch
-Patch6: netpbm-gcc4.patch
-Patch7: netpbm-bmptopnm.patch
-Patch8: netpbm-CAN-2005-2471.patch
-Patch9: netpbm-xwdfix.patch
-Patch11: netpbm-multilib.patch
-Patch13: netpbm-glibc.patch
-Patch15: netpbm-docfix.patch
-Patch16: netpbm-ppmfadeusage.patch
-Patch17: netpbm-fiasco-overflow.patch
-Patch20: netpbm-noppmtompeg.patch
-Patch21: netpbm-cmuwtopbm.patch
-Patch22: netpbm-pamtojpeg2k.patch
-Patch23: netpbm-manfix.patch
-Patch24: netpbm-ppmtopict.patch
-Patch25: netpbm-pnmtopclxl.patch
-Patch27: netpbm-multipage-pam.patch
-Patch28: netpbm-compare-same-images.patch
-Patch29: netpbm-manual-pages.patch
+Patch0:         netpbm-security-scripts.patch
+#Patch1:         netpbm-security-code.patch
+Patch2:         netpbm-ppmfadeusage.patch
+Patch3:         netpbm-CVE-2017-2587.patch
+Patch4:         netpbm-python3.patch
+Patch5:         netpbm-time.patch
+Patch6:         netpbm-gcc4.patch
+Patch7:         netpbm-bmptopnm.patch
+Patch8:         netpbm-CAN-2005-2471.patch
+Patch9:         netpbm-xwdfix.patch
+Patch10:        netpbm-multilib.patch
+Patch11:        netpbm-glibc.patch
+#Patch12:        netpbm-docfix.patch
+Patch13:        netpbm-fiasco-overflow.patch
+Patch14:        netpbm-cmuwtopbm.patch
+Patch15:        netpbm-pamtojpeg2k.patch
+#Patch16:        netpbm-manfix.patch
+#Patch17:        netpbm-manual-pages.patch
+Patch18:        netpbm-jasper.patch
+#Patch19:        netpbm-userguide.patch
+Patch20:        netpbm-libdir-so.patch
 
 #Security fix
 
-
-URL: http://netpbm.sourceforge.net/
-Buildroot: %{_tmppath}/%{name}-root
-BuildRequires: libjpeg-devel, libtiff-devel, zlib-devel, jasper-devel
-BuildRequires: libpng-devel >= 1.2.5, libX11-devel, libxml2-devel
-BuildRequires: flex, python, perl
-Obsoletes: libgr
-
-Vendor: Project Vine
-Distribution: Vine Linux
+BuildRoot:      %{_tmppath}/%{name}-root
+BuildRequires:  libjpeg-devel, libtiff-devel, zlib-devel, jasper-devel
+BuildRequires:  libpng-devel, libX11-devel, libxml2-devel
+BuildRequires:  flex, python, perl
+BuildRequires:  ghostscript
+Obsoletes:      libgr
 
 %description
 The netpbm package contains a library of functions which support
@@ -58,10 +49,11 @@ programs for handling various graphics file formats, including .pbm
 (portable bitmaps), .pgm (portable graymaps), .pnm (portable anymaps),
 .ppm (portable pixmaps) and others.
 
+
 %package devel
 Summary: Development tools for programs which will use the netpbm libraries.
 Summary(ja): netpbm ライブラリを使うプログラムの開発ツール
-Group: Development/Libraries
+Group: programming
 Requires: netpbm = %{version}-%{release}
 Obsoletes: libgr-devel
 
@@ -74,10 +66,11 @@ Install netpbm-devel if you want to develop programs for handling the
 graphics file formats supported by the netpbm libraries.  You will also 
 need to have the netpbm package installed.
 
+
 %package progs
 Summary: Tools for manipulating graphics files in netpbm supported formats.
 Summary(ja): netpbm でサポートするフォーマットの画像ファイルを操作するツール
-Group: Applications/Graphics
+Group: graphics
 Requires: netpbm = %{version}-%{release}
 Requires: libpng libtiff libjpeg zlib perl bash
 Obsoletes: libgr-progs
@@ -92,11 +85,12 @@ scripts for converting from one graphics file format to another.
 If you need to use these conversion scripts, you should install
 netpbm-progs.  You will also need to install the netpbm package.
 
+
 %package doc
 Summary: Documentation for manipulating graphics files with netpbm-progs formats
 
 Summary(ja): netpbm-progs による画像ファイル操作のドキュメント
-Group: Applications/Documentation
+Group: documentation
 Requires: netpbm-progs = %{version}-%{release}
 
 %description doc
@@ -106,32 +100,14 @@ present in netpbm-progs package.
 If you need to look into the HTML documentation, you should install
 netpbm-doc.  You'll also need to install the netpbm-progs package.
 
+
+%debug_package
+
+
 %prep
-%setup -q
-%patch1 -p1 -b .time
-%patch2 -p1 -b .message
-%patch3 -p1 -b .security-scripts
-%patch4 -p1 -b .security-code
-%patch5 -p1 -b .nodoc
-%patch6 -p1 -b .gcc4
-%patch7 -p1 -b .bmptopnm
-%patch8 -p1 -b .CAN-2005-2471
-%patch9 -p1 -b .xwdfix
-%patch11 -p1 -b .multilib
-%patch13 -p1 -b .glibc
-%patch15 -p1
-%patch16 -p1 -b .ppmfadeusage
-%patch17 -p1 -b .fiasco-overflow
-%patch20 -p1 -b .noppmtompeg
-%patch21 -p1 -b .cmuwtopbmfix
-%patch22 -p1 -b .pamtojpeg2kfix
-%patch23 -p1 -b .manfix
-%patch24 -p1 -b .ppmtopict
-%patch25 -p1 -b .pnmtopclxl
-%patch27 -p1 -b .multipage-pam
-%patch28 -p1 -b .compare-same-images
-#%patch29 -p1 -b .man-corrections
-%patch29 -p1 -b .manual-pages
+%autosetup -p1
+rm -rf converter/other/jpeg2000/libjasper/
+
 
 %build
 [ ! -f "/tmp/netpbm" ] && rm -rf /tmp/netpbm
@@ -153,6 +129,8 @@ netpbm-doc.  You'll also need to install the netpbm-progs package.
 
 
 
+
+
 %ifnarch %{ix86}
 
 %endif
@@ -161,8 +139,9 @@ EOF
 TOP=`pwd`
 make \
 	CC=%{__cc} \
-	CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \
 	LDFLAGS="-L$TOP/pbm -L$TOP/pgm -L$TOP/pnm -L$TOP/ppm" \
+	CFLAGS="$RPM_OPT_FLAGS -fPIC -flax-vector-conversions -fno-strict-aliasing" \
+	CFLAGS_CONFIG="$RPM_OPT_FLAGS" \
 	LADD="-lm" \
 	JPEGINC_DIR=%{_includedir} \
 	PNGINC_DIR=%{_includedir} \
@@ -170,7 +149,7 @@ make \
 	JPEGLIB_DIR=%{_libdir} \
 	PNGLIB_DIR=%{_libdir} \
 	TIFFLIB_DIR=%{_libdir} \
-	LINUXSVGALIB=NONE \
+	LINUXSVGALIB="NONE" \
 	X11LIB=%{_libdir}/libX11.so \
 	XML2LIBS="NONE" \
 	JASPERLIB="" \
@@ -194,24 +173,22 @@ done
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT
-make package pkgdir=$RPM_BUILD_ROOT/usr LINUXSVGALIB="NONE" XML2LIBS="NONE"
+make package pkgdir=%{buildroot}/usr LINUXSVGALIB="NONE" XML2LIBS="NONE"
 
 # Ugly hack to have libs in correct dir on 64bit archs.
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
+mkdir -p %{buildroot}%{_libdir}
 if [ "%{_libdir}" != "/usr/lib" ]; then
-  mv $RPM_BUILD_ROOT/usr/lib/lib* $RPM_BUILD_ROOT%{_libdir}
+  mv %{buildroot}/usr/lib/lib* %{buildroot}%{_libdir}
 fi
 
-cp -af lib/libnetpbm.a $RPM_BUILD_ROOT%{_libdir}/libnetpbm.a
-cp -l $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so.?? $RPM_BUILD_ROOT%{_libdir}/libnetpbm.so
+cp -af lib/libnetpbm.a %{buildroot}%{_libdir}/libnetpbm.a
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}
-mv userguide/man $RPM_BUILD_ROOT%{_mandir}
+mkdir -p %{buildroot}%{_datadir}
+mv userguide/man %{buildroot}%{_mandir}
 
 # Get rid of the useless non-ascii character in pgmminkowski.1
-sed -i 's/\xa0//' $RPM_BUILD_ROOT%{_mandir}/man1/pgmminkowski.1
+sed -i 's/\xa0//' %{buildroot}%{_mandir}/man1/pgmminkowski.1
 
 # Don't ship man pages for non-existent binaries and bogus ones
 for i in hpcdtoppm \
@@ -219,53 +196,57 @@ for i in hpcdtoppm \
          directory error extendedopacity \
          pam pbm pgm pnm ppm index libnetpbm_dir \
          liberror ppmtotga; do
-        rm -f $RPM_BUILD_ROOT%{_mandir}/man1/${i}.1
+        rm -f %{buildroot}%{_mandir}/man1/${i}.1
 done
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/extendedopacity.5
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/netpbm
-mv $RPM_BUILD_ROOT/usr/misc/*.map $RPM_BUILD_ROOT%{_datadir}/netpbm/
-mv $RPM_BUILD_ROOT/usr/misc/rgb.txt $RPM_BUILD_ROOT%{_datadir}/netpbm/
-rm -rf $RPM_BUILD_ROOT/usr/README
-rm -rf $RPM_BUILD_ROOT/usr/VERSION
-rm -rf $RPM_BUILD_ROOT/usr/link
-rm -rf $RPM_BUILD_ROOT/usr/misc
-rm -rf $RPM_BUILD_ROOT/usr/man
-rm -rf $RPM_BUILD_ROOT/usr/pkginfo
-rm -rf $RPM_BUILD_ROOT/usr/config_template
+rm -f %{buildroot}%{_mandir}/man5/extendedopacity.5
+
+mkdir -p %{buildroot}%{_datadir}/netpbm
+mv %{buildroot}/usr/misc/*.map %{buildroot}%{_datadir}/netpbm/
+mv %{buildroot}/usr/misc/rgb.txt %{buildroot}%{_datadir}/netpbm/
+rm -rf %{buildroot}/usr/README
+rm -rf %{buildroot}/usr/VERSION
+rm -rf %{buildroot}/usr/link
+rm -rf %{buildroot}/usr/misc
+rm -rf %{buildroot}/usr/man
+rm -rf %{buildroot}/usr/pkginfo
+rm -rf %{buildroot}/usr/config_template
+rm -rf %{buildroot}/usr/pkgconfig_template
 
 # Don't ship the static library
-rm -f $RPM_BUILD_ROOT/%{_libdir}/lib*.a
+rm -f %{buildroot}%{_libdir}/lib*.a
 
 # remove/symlink/substitute obsolete utilities
-pushd $RPM_BUILD_ROOT%{_bindir}
+pushd %{buildroot}%{_bindir}
 rm -f pgmtopbm pnmcomp
 ln -s pamcomp pnmcomp
 echo -e '#!/bin/sh\npamditherbw $@ | pamtopnm\n' > pgmtopbm
 chmod 0755 pgmtopbm
 popd
 
+
 %check
 pushd test
-export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
-export PBM_TESTPREFIX=$RPM_BUILD_ROOT%{_bindir}
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+export PBM_TESTPREFIX=%{buildroot}%{_bindir}
+export PBM_BINPREFIX=%{buildroot}%{_bindir}
 ./Execute-Tests && exit 0
 popd
 
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 # clean builddir
 [ ! -f "/tmp/netpbm" ] && rm -rf /tmp/netpbm
 
-%post
-/sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root)
-%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/GPL_LICENSE.txt doc/HISTORY README
+%license doc/GPL_LICENSE.txt
+%doc doc/copyright_summary doc/COPYRIGHT.PATENT doc/HISTORY README
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -286,7 +267,12 @@ popd
 %defattr(-,root,root)
 %doc userguide/*
 
+
 %changelog
+* Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.86.16-1
+- new upstream release.
+- re-imported all patches from RawHide.
+
 * Sat Jul 19 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 10.61.02-2
 - rebuild with libpng-1.6.12
 

s/squashfs-tools/squashfs-tools-vl.spec

@@ -1,22 +1,25 @@
 Summary: squashfs utilities
 Summary(ja): squashfs ユーティリティ
 Name: squashfs-tools
-Version: 4.2
-Release: 2%{?_dist_release}
+Version: 4.4
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
 License: GPLv2+
-Group: System Environment/Base
-URL: http://squashfs.sf.net/
-Source0: squashfs%{version}.tar.gz
+URL: https://github.com/plougher/squashfs-tools
+Source0: https://github.com/plougher/squashfs-tools/archive/%{version}.tar.gz#/squashfs-tools-%{version}.tar.gz
+Patch0: squashfs-4.4-c570c61.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 BuildRequires: xz-devel
 BuildRequires: lzo-devel
 BuildRequires: libattr-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
+BuildRequires: lz4-devel
+BuildRequires: libzstd-devel
 
 %description
 Squashfs is a highly compressed read-only filesystem for Linux.  This package
@@ -26,32 +29,51 @@ contains the utilities for manipulating squashfs filesystems.
 Squashfs は Linux 用の高圧縮読み込み専用ファイルシステムです。このパッケージ
 には squashfs ファイルシステムを操作するためのユーティリティが含まれています。
 
+
+%debug_package
+
+
 %prep
-%setup -q -n squashfs%{version}
+%setup -q -n squashfs-tools-%{version}
+%patch0 -p1
+
 
 %build
 pushd squashfs-tools
-CFLAGS="%{optflags}" XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 %__make %{?_smp_mflags}
+CFLAGS="%{optflags}" \
+XZ_SUPPORT=1 \
+LZO_SUPPORT=1 \
+LZMA_XZ_SUPPORT=1 \
+LZ4_SUPPORT=1 \
+ZSTD_SUPPORT=1 \
+%__make %{?_smp_mflags}
 popd
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/sbin
 %__install -m 755 squashfs-tools/mksquashfs $RPM_BUILD_ROOT/sbin/mksquashfs
 %__install -m 755 squashfs-tools/unsquashfs $RPM_BUILD_ROOT/sbin/unsquashfs
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc README-%{version} README
-%doc DONATIONS PERFORMANCE.README COPYING ACKNOWLEDGEMENTS CHANGES
-%doc pseudo-file.example
+%license COPYING
+%doc README-%{version} README ACKNOWLEDGEMENTS CHANGES
+%doc RELEASE-READMEs/DONATIONS RELEASE-READMEs/PERFORMANCE.README
+%doc RELEASE-READMEs/pseudo-file.example
 /sbin/*
 
+
 %changelog
+* Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.4-1
+- new upstream release.
+
 * Sun Aug 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.2-2
 - rebuild with VineSeed environment
 

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

@@ -7,8 +7,8 @@
 Summary:        X.Org X11 X server
 Summary(ja):    X.Org X11 X サーバ
 Name:           xorg-x11-server
-Version:        1.20.8
-Release:        2%{?_dist_release}%{?with_systemd:.systemd}
+Version:        1.20.9
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -29,7 +29,6 @@ Source20:       http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-r
 Patch5002: xserver-1.12.1-ssh-isnt-local.patch
 
 # security patch
-Patch9000: CVE-2020-14347.patch
 
 ## Vine Patch
 # add elogind support
@@ -288,6 +287,9 @@ Group: programming
 Xserver source code needed to build VNC server (Xvnc)
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{pkgname}-%{version}
 #%setup -q -n %{pkgname}-%{gitdate}
@@ -295,7 +297,6 @@ Xserver source code needed to build VNC server (Xvnc)
 %patch5002 -p1 -b .ssh-isnt-local
 
 # security patch
-%patch9000 -p1 -b .CVE-2020-14347
 
 # Vine patch
 %patch10010 -p1 -b .nvidia
@@ -315,7 +316,6 @@ autoreconf -vif
 
 
 %build
-
 %define default_font_path "catalogue:/etc/X11/fontpath.d,built-ins"
 
 %if %{with_hw_servers}
@@ -407,9 +407,11 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete
 %endif
 }
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %if %{with_hw_servers}
 %pre Xorg
 {
@@ -440,6 +442,7 @@ rm -rf $RPM_BUILD_ROOT
 } &> /dev/null || :
 %endif
 
+
 %files common
 %defattr(-,root,root,-)
 %{_mandir}/man1/Xserver.1*
@@ -492,13 +495,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xorg.conf.d/*.conf
 %endif
 
-
 %files Xnest
 %defattr(-,root,root,-)
 %{_bindir}/Xnest
 %{_mandir}/man1/Xnest.1*
 
-
 %files Xdmx
 %defattr(-,root,root,-)
 %{_bindir}/Xdmx
@@ -518,20 +519,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/vdltodmx.1*
 %{_mandir}/man1/xdmxconfig.1*
 
-
 %files Xvfb
 %defattr(-,root,root,-)
 %{_bindir}/Xvfb
 %{_bindir}/xvfb-run
 %{_mandir}/man1/Xvfb.1*
 
-
 %files Xephyr
 %defattr(-,root,root,-)
 %{_bindir}/Xephyr
 %{_mandir}/man1/Xephyr.1*
 
-
 %if %{with_hw_servers}
 %files sdk
 %defattr(-,root,root,-)
@@ -547,6 +545,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Sep 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.9-1
+- new upstream release.
+- dropped Patch9000: fixed in upstream.
+
 * Fri Aug 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.8-2
 - added Patch9000 to fix CVE-2020-14347.