فهرست منبع

updated 6 packages

alsa-lib-1.2.3.2-1

alsa-oss-1.1.8-1

alsa-plugins-1.2.2-1

libproxy-0.4.15-4

python3-3.8.6-1

samba-4.13.0-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12505 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 3 سال پیش
والد
کامیت
3987150233
6فایلهای تغییر یافته به همراه90 افزوده شده و 48 حذف شده
  1. 21 9
      a/alsa-lib/alsa-lib-vl.spec
  2. 22 5
      a/alsa-oss/alsa-oss-vl.spec
  3. 24 26
      a/alsa-plugins/alsa-plugins-vl.spec
  4. 10 4
      lib/libp/libproxy/libproxy-vl.spec
  5. 4 1
      p/python3/python3-vl.spec
  6. 9 3
      s/samba/samba-vl.spec

+ 21 - 9
a/alsa-lib/alsa-lib-vl.spec

@@ -2,21 +2,19 @@
 Summary: Advanced Linux Sound Architecture (ALSA) Library
 Summary: Advanced Linux Sound Architecture (ALSA) Library
 Summary(ja): Advanced Linux Sound Architecture (ALSA) ライブラリ
 Summary(ja): Advanced Linux Sound Architecture (ALSA) ライブラリ
 Name: alsa-lib
 Name: alsa-lib
-Version: 1.2.2
+Version: 1.2.3.2
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: System Environment/Libraries
+Group: system
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 Packager: shaolin
 Packager: shaolin
 
 
 License: LGPLv2+
 License: LGPLv2+
-#Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{version}.tar.bz2
 URL: https://www.alsa-project.org/wiki/Main_Page
 URL: https://www.alsa-project.org/wiki/Main_Page
 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{version}.tar.bz2
 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{version}.tar.bz2
 Source10: asound.conf
 Source10: asound.conf
 Source11: modprobe-dist-alsa.conf
 Source11: modprobe-dist-alsa.conf
 Source12: modprobe-dist-oss.conf
 Source12: modprobe-dist-oss.conf
-Patch0:   alsa-lib-1.0.24-config.patch
 Patch1:   alsa-lib-1.0.14-glibc-open.patch
 Patch1:   alsa-lib-1.0.14-glibc-open.patch
 
 
 %{?nosrc:NoSource:     0}
 %{?nosrc:NoSource:     0}
@@ -85,7 +83,7 @@ Advanced Linux Sound Architecture (ALSA) - ライブラリ
 %package -n compat32-%{name}
 %package -n compat32-%{name}
 Summary: Advanced Linux Sound Architecture (ALSA) Library
 Summary: Advanced Linux Sound Architecture (ALSA) Library
 Summary(ja): Advanced Linux Sound Architecture (ALSA) ライブラリ
 Summary(ja): Advanced Linux Sound Architecture (ALSA) ライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires: alsa-lib = %{version}
 Requires: alsa-lib = %{version}
 
 
 %description -n compat32-%{name}
 %description -n compat32-%{name}
@@ -148,7 +146,7 @@ Advanced Linux Sound Architecture (ALSA) - ライブラリ
 %package devel
 %package devel
 Summary: Development files for alsa-lib
 Summary: Development files for alsa-lib
 Summary(ja): alsa-lib の開発用ファイル
 Summary(ja): alsa-lib の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: alsa-lib = %{version}
 Requires: alsa-lib = %{version}
 
 
 %description devel
 %description devel
@@ -161,7 +159,7 @@ alsa-lib-develパッケージは静的ライブラリとヘッダファイルを
 %package -n compat32-%{name}-devel
 %package -n compat32-%{name}-devel
 Summary: Development files for alsa-lib
 Summary: Development files for alsa-lib
 Summary(ja): alsa-lib の開発用ファイル
 Summary(ja): alsa-lib の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name}-devel    = %{version}
 Requires: %{name}-devel    = %{version}
 Requires: compat32-%{name} = %{version}
 Requires: compat32-%{name} = %{version}
 
 
@@ -172,11 +170,14 @@ alsa-lib-devel package includes thje static libraries and  header files.
 alsa-lib-develパッケージは静的ライブラリとヘッダファイルを含んでいます。
 alsa-lib-develパッケージは静的ライブラリとヘッダファイルを含んでいます。
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .config
 %patch1 -p1 -b .glibc-open
 %patch1 -p1 -b .glibc-open
 
 
+
 %build
 %build
 autoreconf -vif
 autoreconf -vif
 %configure \
 %configure \
@@ -195,6 +196,7 @@ make %{?_smp_mflags} V=1
  make doc
  make doc
 %endif
 %endif
 
 
+
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 make install DESTDIR=$RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -224,13 +226,19 @@ find %{buildroot} -name '*.la' -delete
 mkdir -p %{buildroot}/%{_sysconfdir}/alsa/conf.d
 mkdir -p %{buildroot}/%{_sysconfdir}/alsa/conf.d
 mkdir -p %{buildroot}/%{_datadir}/alsa/alsa.conf.d
 mkdir -p %{buildroot}/%{_datadir}/alsa/alsa.conf.d
 
 
+sed -e '/ipc_perm {/i\\tipc_gid {\n\t\t@func refer\n\t\tname defaults.pcm.ipc_gid\n\t}' \
+  %{buildroot}/%{_datadir}/alsa/pcm/dsnoop.conf \
+  %{buildroot}/%{_datadir}/alsa/pcm/dmix.conf
+
+
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
-%post -p /sbin/ldconfig
 
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
+
 %files
 %files
 %defattr(-, root, root)
 %defattr(-, root, root)
 %{!?_licensedir:%global license %%doc}
 %{!?_licensedir:%global license %%doc}
@@ -274,6 +282,10 @@ rm -rf %{buildroot}
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.3.2-1
+- new upstream release.
+- dropped Patch0: made to get same effect with sed.
+
 * Fri Apr 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.2-1
 * Fri Apr 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.2-1
 - new upstream release.
 - new upstream release.
 
 

+ 22 - 5
a/alsa-oss/alsa-oss-vl.spec

@@ -1,9 +1,12 @@
 Summary:	Advanced Linux Sound Architecture (ALSA) wrapper for OSS
 Summary:	Advanced Linux Sound Architecture (ALSA) wrapper for OSS
 Name:		alsa-oss
 Name:		alsa-oss
-Version:	1.0.28
+Version:	1.1.8
 Release:	1%{?_dist_release}
 Release:	1%{?_dist_release}
+Group:		multimedia
+Vendor:		Project Vine
+Distribution:	Vine Linux
+
 License:	GPLv2+
 License:	GPLv2+
-Group:		Applications/Multimedia
 URL:		http://www.alsa-project.org/
 URL:		http://www.alsa-project.org/
 Source:		ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2
 Source:		ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-%{version}.tar.bz2
 Patch:		%{name}-1.0.12-aoss.patch
 Patch:		%{name}-1.0.12-aoss.patch
@@ -20,24 +23,31 @@ This package contains the compatibility library and wrapper script for
 running legacy OSS applications through ALSA. Unlike the kernel
 running legacy OSS applications through ALSA. Unlike the kernel
 driver, this has the advantage of supporting DMIX software mixing.
 driver, this has the advantage of supporting DMIX software mixing.
 
 
+
 %package libs
 %package libs
 Summary:	ALSA/OSS wrapper libraries
 Summary:	ALSA/OSS wrapper libraries
-Group:		System Environment/Libraries
+Group:		system
 Requires:	%{name} = %{version}-%{release}
 Requires:	%{name} = %{version}-%{release}
 %description libs
 %description libs
 System libraries for alsa-oss.
 System libraries for alsa-oss.
 
 
+
 %package devel
 %package devel
 Summary:	Headers for ALSA wrapper for OSS
 Summary:	Headers for ALSA wrapper for OSS
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}, %{name}-libs = %{version}-%{release}
 Requires:	%{name} = %{version}-%{release}, %{name}-libs = %{version}-%{release}
 %description devel
 %description devel
 Header files for alsa-oss.
 Header files for alsa-oss.
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %setup -q
 %setup -q
 %patch1 -p1
 %patch1 -p1
 
 
+
 %build
 %build
 %ifarch x86_64
 %ifarch x86_64
 autoreconf -f -i
 autoreconf -f -i
@@ -49,20 +59,24 @@ autoreconf -f -i
 	--disable-static
 	--disable-static
 %{__make} %{?_smp_mflags}
 %{__make} %{?_smp_mflags}
 
 
+
 %install
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
+
 %clean
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 %{__rm} -rf $RPM_BUILD_ROOT
 
 
+
 %post libs -p /sbin/ldconfig
 %post libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
-%doc COPYING
+%license COPYING
 %{_bindir}/aoss
 %{_bindir}/aoss
 
 
 %files libs
 %files libs
@@ -79,6 +93,9 @@ autoreconf -f -i
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.1.8-1
+- new upstream release.
+
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.28-1
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 1.0.28-1
 - new upstream release
 - new upstream release
 
 

+ 24 - 26
a/alsa-plugins/alsa-plugins-vl.spec

@@ -1,15 +1,14 @@
+Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 Name:           alsa-plugins
 Name:           alsa-plugins
-Version:        1.1.9
+Version:        1.2.2
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
-Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
-# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
-License:        GPLv2+ and LGPLv2+
-Group:          System Environment/Libraries
-
+Group:          system
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
-URL:            http://www.alsa-project.org/
+# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
+License:        GPLv2+ and LGPLv2+
+URL:            https://www.alsa-project.org/
 #Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
 #Source0:        ftp://ftp.alsa-project.org/pub/plugins/%{name}-%{version}.tar.bz2
 Source0:        https://github.com/alsa-project/alsa-plugins/archive/v%{version}.tar.gz#/alsa-plugins-%{version}.tar.gz
 Source0:        https://github.com/alsa-project/alsa-plugins/archive/v%{version}.tar.gz#/alsa-plugins-%{version}.tar.gz
 Source1:        50-jack.conf
 Source1:        50-jack.conf
@@ -35,7 +34,7 @@ This package includes plugins for ALSA.
 
 
 %package jack
 %package jack
 Summary:        Jack PCM output plugin for ALSA
 Summary:        Jack PCM output plugin for ALSA
-Group:          System Environment/Libraries
+Group:          system
 License:        LGPLv2+
 License:        LGPLv2+
 Requires:       alsa-lib
 Requires:       alsa-lib
 Requires:       jack-audio-connection-kit
 Requires:       jack-audio-connection-kit
@@ -53,7 +52,7 @@ This plugin provides the PCM type "jack"
 
 
 %package oss
 %package oss
 Summary:        Oss PCM output plugin for ALSA
 Summary:        Oss PCM output plugin for ALSA
-Group:          System Environment/Libraries
+Group:          system
 License:        LGPLv2+ 
 License:        LGPLv2+ 
 Requires:       alsa-lib
 Requires:       alsa-lib
 %description oss
 %description oss
@@ -65,7 +64,7 @@ This plugin provides the PCM type "oss".
 
 
 %package pulseaudio
 %package pulseaudio
 Summary:        Alsa to PulseAudio backend
 Summary:        Alsa to PulseAudio backend
-Group:          System Environment/Libraries
+Group:          system
 License:        LGPLv2+
 License:        LGPLv2+
 BuildRequires:  pulseaudio-lib-devel
 BuildRequires:  pulseaudio-lib-devel
 Requires:       alsa-lib
 Requires:       alsa-lib
@@ -79,7 +78,7 @@ one for mixer control.
 
 
 %package samplerate
 %package samplerate
 Summary:        External rate converter plugin for ALSA
 Summary:        External rate converter plugin for ALSA
-Group:          System Environment/Libraries
+Group:          system
 License:        GPLv2+
 License:        GPLv2+
 Requires:       alsa-lib
 Requires:       alsa-lib
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsamplerate-devel
@@ -90,7 +89,7 @@ Castro Lopo.
 
 
 %package upmix
 %package upmix
 Summary:        Upmixer channel expander plugin for ALSA
 Summary:        Upmixer channel expander plugin for ALSA
-Group:          System Environment/Libraries
+Group:          system
 License:        LGPLv2+
 License:        LGPLv2+
 Requires:       alsa-lib
 Requires:       alsa-lib
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsamplerate-devel
@@ -102,7 +101,7 @@ by the slave PCM or explicitly via channel option.
 
 
 %package vdownmix
 %package vdownmix
 Summary:        Downmixer to stereo plugin for ALSA
 Summary:        Downmixer to stereo plugin for ALSA
-Group:          System Environment/Libraries
+Group:          system
 License:        LGPLv2+
 License:        LGPLv2+
 Requires:       alsa-lib
 Requires:       alsa-lib
 BuildRequires:  libsamplerate-devel
 BuildRequires:  libsamplerate-devel
@@ -115,7 +114,7 @@ surround".
 
 
 %package usbstream
 %package usbstream
 Summary:        USB stream plugin for ALSA
 Summary:        USB stream plugin for ALSA
-Group:          System Environment/Libraries
+Group:          system
 License:        LGPLv2+
 License:        LGPLv2+
 Requires:       alsa-lib
 Requires:       alsa-lib
 %description usbstream
 %description usbstream
@@ -125,16 +124,17 @@ stream to USB specific stream.
 
 
 %package arcamav
 %package arcamav
 Summary:        Arcam AV amplifier plugin for ALSA
 Summary:        Arcam AV amplifier plugin for ALSA
-Group:          System Environment/Libraries
+Group:          system
 License:        LGPLv2+
 License:        LGPLv2+
 Requires:       alsa-lib
 Requires:       alsa-lib
 %description arcamav
 %description arcamav
 This plugin exposes the controls for an Arcam AV amplifier
 This plugin exposes the controls for an Arcam AV amplifier
 (see: http://www.arcam.co.uk/) as an ALSA mixer device.
 (see: http://www.arcam.co.uk/) as an ALSA mixer device.
 
 
+
 %package speex
 %package speex
 Summary:        Rate Converter Plugin Using Speex Resampler
 Summary:        Rate Converter Plugin Using Speex Resampler
-Group:          System Environment/Libraries
+Group:          system
 License:        LGPLv2+
 License:        LGPLv2+
 Requires:       alsa-lib
 Requires:       alsa-lib
 Requires:       speex
 Requires:       speex
@@ -145,9 +145,10 @@ The rate plugin is an external rate converter using the Speex resampler
 (aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides
 (aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides
 pre-processing of a mono stream like denoise using libspeex DSP API.
 pre-processing of a mono stream like denoise using libspeex DSP API.
 
 
+
 %package maemo
 %package maemo
 Summary:        Maemo plugin for ALSA
 Summary:        Maemo plugin for ALSA
-Group:          System Environment/Libraries
+Group:          system
 License:        LGPLv2+
 License:        LGPLv2+
 Requires:       alsa-lib
 Requires:       alsa-lib
 BuildRequires:  dbus-devel
 BuildRequires:  dbus-devel
@@ -156,6 +157,9 @@ This plugin converts the ALSA API over PCM task nodes protocol. In this way,
 ALSA native applications can run over DSP Gateway and use DSP PCM task nodes.
 ALSA native applications can run over DSP Gateway and use DSP PCM task nodes.
 
 
 
 
+%debug_package
+
+
 %prep
 %prep
 %setup -q -n %{name}-%{version}
 %setup -q -n %{name}-%{version}
 
 
@@ -188,8 +192,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %post -p /sbin/ldconfig
 %post -p /sbin/ldconfig
-
-
 %postun -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 
 
 
@@ -201,7 +203,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-jack.conf
 %config(noreplace) %{_datadir}/alsa/alsa.conf.d/50-jack.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_jack.so
 %{_libdir}/alsa-lib/libasound_module_pcm_jack.so
 
 
-
 %files oss
 %files oss
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING COPYING.GPL
 %license COPYING COPYING.GPL
@@ -212,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_ctl_oss.so
 %{_libdir}/alsa-lib/libasound_module_ctl_oss.so
 %{_libdir}/alsa-lib/libasound_module_pcm_oss.so
 %{_libdir}/alsa-lib/libasound_module_pcm_oss.so
 
 
-
 %files pulseaudio
 %files pulseaudio
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING COPYING.GPL
 %license COPYING COPYING.GPL
@@ -225,7 +225,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so
 %{_libdir}/alsa-lib/libasound_module_ctl_pulse.so
 %{_libdir}/alsa-lib/libasound_module_conf_pulse.so
 %{_libdir}/alsa-lib/libasound_module_conf_pulse.so
 
 
-
 %files samplerate
 %files samplerate
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING COPYING.GPL
 %license COPYING COPYING.GPL
@@ -238,7 +237,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_medium.so
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_medium.so
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_order.so
 %{_libdir}/alsa-lib/libasound_module_rate_samplerate_order.so
 
 
-
 %files upmix
 %files upmix
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING COPYING.GPL
 %license COPYING COPYING.GPL
@@ -248,7 +246,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/alsa/alsa.conf.d/60-upmix.conf
 %config(noreplace) %{_datadir}/alsa/alsa.conf.d/60-upmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so
 %{_libdir}/alsa-lib/libasound_module_pcm_upmix.so
 
 
-
 %files vdownmix
 %files vdownmix
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING COPYING.GPL
 %license COPYING COPYING.GPL
@@ -258,7 +255,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/alsa/alsa.conf.d/97-vdownmix.conf
 %config(noreplace) %{_datadir}/alsa/alsa.conf.d/97-vdownmix.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 %{_libdir}/alsa-lib/libasound_module_pcm_vdownmix.so
 
 
-
 %files usbstream
 %files usbstream
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING COPYING.GPL
 %license COPYING COPYING.GPL
@@ -266,7 +262,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_datadir}/alsa/alsa.conf.d/98-usb-stream.conf
 %config(noreplace) %{_datadir}/alsa/alsa.conf.d/98-usb-stream.conf
 %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so
 %{_libdir}/alsa-lib/libasound_module_pcm_usb_stream.so
 
 
-
 %files arcamav
 %files arcamav
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %license COPYING COPYING.GPL
 %license COPYING COPYING.GPL
@@ -301,6 +296,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.2-1
+- new upstream release.
+
 * Fri Oct 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.9-1
 * Fri Oct 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.9-1
 - new upstream release.
 - new upstream release.
 
 

+ 10 - 4
lib/libp/libproxy/libproxy-vl.spec

@@ -5,7 +5,7 @@
 Summary:        A library handling all the details of proxy configuration
 Summary:        A library handling all the details of proxy configuration
 Name:           libproxy
 Name:           libproxy
 Version:        0.4.15
 Version:        0.4.15
-Release:        3%{?_dist_release}
+Release:        4%{?_dist_release}
 Group:          system
 Group:          system
 Vendor:         Project Vine
 Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
@@ -15,6 +15,8 @@ URL:            http://libproxy.github.io/libproxy
 Source0:        https://github.com/libproxy/libproxy/releases/download/%{version}/libproxy-%{version}.tar.xz
 Source0:        https://github.com/libproxy/libproxy/releases/download/%{version}/libproxy-%{version}.tar.xz
 Patch0:         libproxy-0.4.15-python38.patch
 Patch0:         libproxy-0.4.15-python38.patch
 Patch1000:      CVE-2020-25219.patch
 Patch1000:      CVE-2020-25219.patch
+# CVE-2020-26154
+Patch1001:      libproxy-0.4.15-fix-pac-buffer-overflow.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -153,17 +155,18 @@ developing applications that use %{name}.
 
 
 
 
 %prep
 %prep
-%setup -q
-%patch0 -p1
-%patch1000 -p1
+%autosetup -p1
 #sed -i "s|mozjs185>=1.8.5|mozjs185|" libproxy/cmake/modules/pacrunner_mozjs.cmk
 #sed -i "s|mozjs185>=1.8.5|mozjs185|" libproxy/cmake/modules/pacrunner_mozjs.cmk
 
 
+
 %build
 %build
+export CXXFLAGS="-std=c++14 $RPM_OPT_FLAGS"
 %cmake \
 %cmake \
 	-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
 	-DLIBEXEC_INSTALL_DIR=%{_libexecdir} \
 	-DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
 	-DMODULE_INSTALL_DIR=%{_libdir}/%{name}/%{version}/modules \
 	-DWITH_PERL=OFF \
 	-DWITH_PERL=OFF \
 	-DWITH_WEBKIT3=ON \
 	-DWITH_WEBKIT3=ON \
+	-DWITH_GNOME3=ON \
 	-DWITH_KDE=ON \
 	-DWITH_KDE=ON \
    .
    .
 make VERBOSE=1 %{?_smp_mflags}
 make VERBOSE=1 %{?_smp_mflags}
@@ -234,6 +237,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Sat Oct 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.15-4
+- imported Patch1001 to fix CVE-2020-26154 from rawhide.
+
 * Tue Sep 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.15-3
 * 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 Patch1000 to fix CVE-2020-25219 from debian.
 - imported Patch0 to support python-3.8 from upstream.
 - imported Patch0 to support python-3.8 from upstream.

+ 4 - 1
p/python3/python3-vl.spec

@@ -7,7 +7,7 @@
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Name: python3
 Name: python3
-Version: 3.8.5
+Version: 3.8.6
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Group: programming
 Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
@@ -391,6 +391,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.6-1
+- new upstream release.
+
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.5-1
 * Sat Aug 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.5-1
 - new upstream release.
 - new upstream release.
 
 

+ 9 - 3
s/samba/samba-vl.spec

@@ -3,7 +3,7 @@
 
 
 %define samba_version 4.13.0
 %define samba_version 4.13.0
 #define rc_number rc4
 #define rc_number rc4
-%define samba_release 1
+%define samba_release 2
 
 
 %define doc_version 4.13.0
 %define doc_version 4.13.0
 %define api_version 4.0
 %define api_version 4.0
@@ -416,7 +416,7 @@ Summary: Samba libraries
 Summary(ja): Samba ライブラリ
 Summary(ja): Samba ライブラリ
 Group: system
 Group: system
 %if %with_libwbclient
 %if %with_libwbclient
-Requires: libwbclient
+Requires: compat32-libwbclient
 %endif
 %endif
 
 
 %description -n compat32-samba-libs
 %description -n compat32-samba-libs
@@ -1098,6 +1098,7 @@ fi
 %files libs
 %files libs
 %defattr(-,root,root)
 %defattr(-,root,root)
 %{_libdir}/libdcerpc-binding.so.*
 %{_libdir}/libdcerpc-binding.so.*
+%{_libdir}/libdcerpc-server-core.so.*
 %{_libdir}/libdcerpc.so.*
 %{_libdir}/libdcerpc.so.*
 %{_libdir}/libndr-krb5pac.so.*
 %{_libdir}/libndr-krb5pac.so.*
 %{_libdir}/libndr-nbt.so.*
 %{_libdir}/libndr-nbt.so.*
@@ -1300,7 +1301,6 @@ fi
 # dc
 # dc
 %{_libdir}/libdcerpc-samr.so.*
 %{_libdir}/libdcerpc-samr.so.*
 %{_libdir}/libdcerpc-server.so.*
 %{_libdir}/libdcerpc-server.so.*
-%{_libdir}/libdcerpc-server-core.so.*
 %{_libdir}/libsamba-policy.*.so.*
 %{_libdir}/libsamba-policy.*.so.*
 %{_libdir}/samba/libHDB-SAMBA4-samba4.so
 %{_libdir}/samba/libHDB-SAMBA4-samba4.so
 %{_libdir}/samba/libdnsserver-common-samba4.so
 %{_libdir}/samba/libdnsserver-common-samba4.so
@@ -1687,6 +1687,7 @@ fi
 %defattr(-,root,root)
 %defattr(-,root,root)
 %{_libdir}/libdcerpc-binding.so.*
 %{_libdir}/libdcerpc-binding.so.*
 %{_libdir}/libdcerpc.so.*
 %{_libdir}/libdcerpc.so.*
+%{_libdir}/libdcerpc-server-core.so.*
 %{_libdir}/libsamba-errors.so*
 %{_libdir}/libsamba-errors.so*
 %{_libdir}/libndr-krb5pac.so.*
 %{_libdir}/libndr-krb5pac.so.*
 %{_libdir}/libndr-nbt.so.*
 %{_libdir}/libndr-nbt.so.*
@@ -1743,6 +1744,7 @@ fi
 %{_libdir}/samba/libgenrand-samba4.so
 %{_libdir}/samba/libgenrand-samba4.so
 %{_libdir}/samba/libgensec-samba4.so
 %{_libdir}/samba/libgensec-samba4.so
 %{_libdir}/samba/libgpext-samba4.so
 %{_libdir}/samba/libgpext-samba4.so
+%{_libdir}/samba/libgpo-samba4.so
 %{_libdir}/samba/libgse-samba4.so
 %{_libdir}/samba/libgse-samba4.so
 %{_libdir}/samba/libgssapi-samba4.so.*
 %{_libdir}/samba/libgssapi-samba4.so.*
 %{_libdir}/samba/libhcrypto-samba4.so.*
 %{_libdir}/samba/libhcrypto-samba4.so.*
@@ -1798,6 +1800,7 @@ fi
 %{_libdir}/samba/libsmbpasswdparser-samba4.so
 %{_libdir}/samba/libsmbpasswdparser-samba4.so
 %{_libdir}/samba/libsocket-blocking-samba4.so
 %{_libdir}/samba/libsocket-blocking-samba4.so
 %{_libdir}/samba/libsys-rw-samba4.so
 %{_libdir}/samba/libsys-rw-samba4.so
+%{_libdir}/samba/libtalloc-report-printf-samba4.so
 %{_libdir}/samba/libtalloc-report-samba4.so
 %{_libdir}/samba/libtalloc-report-samba4.so
 %{_libdir}/samba/libtalloc.so*
 %{_libdir}/samba/libtalloc.so*
 %{_libdir}/samba/libtdb-wrap-samba4.so
 %{_libdir}/samba/libtdb-wrap-samba4.so
@@ -1825,6 +1828,9 @@ fi
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13.0-2
+- fixed dependency.
+
 * Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13.0-1
 * Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13.0-1
 - new upstream release.
 - new upstream release.