Browse Source

updated 4 packages

curl-7.73.0-1

php74-7.4.12-1

python3-3.8.6-2

samba-4.13.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12507 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
ec7adf6638
4 changed files with 42 additions and 13 deletions
  1. 22 8
      c/curl/curl-vl.spec
  2. 4 1
      p/php74/php74-vl.spec
  3. 10 1
      p/python3/python3-vl.spec
  4. 6 3
      s/samba/samba-vl.spec

+ 22 - 8
c/curl/curl-vl.spec

@@ -7,9 +7,9 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Name: curl 
 Name: curl 
-Version: 7.71.1
+Version: 7.73.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
-Group: Applications/Internet
+Group: internet
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 Packager: daisuke
 Packager: daisuke
@@ -22,7 +22,7 @@ Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
 Patch2:   0002-curl-7.65.3-h2-framing-layer-error.patch
 Patch2:   0002-curl-7.65.3-h2-framing-layer-error.patch
 
 
 # patch making libcurl multilib ready
 # patch making libcurl multilib ready
-Patch101: 0101-curl-7.71.1-multilib.patch
+Patch101: 0101-curl-7.73.0-multilib.patch
 
 
 # prevent configure script from discarding -g in CFLAGS (#496778)
 # prevent configure script from discarding -g in CFLAGS (#496778)
 Patch102: 0102-curl-7.36.0-debug.patch
 Patch102: 0102-curl-7.36.0-debug.patch
@@ -31,7 +31,7 @@ Patch102: 0102-curl-7.36.0-debug.patch
 Patch103: 0103-curl-7.59.0-python3.patch
 Patch103: 0103-curl-7.59.0-python3.patch
 
 
 # use localhost6 instead of ip6-localhost in the curl test-suite
 # use localhost6 instead of ip6-localhost in the curl test-suite
-Patch104: 0104-curl-7.19.7-localhost6.patch
+Patch104: 0104-curl-7.73.0-localhost6.patch
 
 
 # prevent valgrind from reporting false positives on x86_64
 # prevent valgrind from reporting false positives on x86_64
 Patch105: 0105-curl-7.63.0-lib1560-valgrind.patch
 Patch105: 0105-curl-7.63.0-lib1560-valgrind.patch
@@ -60,9 +60,10 @@ to work without user interaction or any kind of interactivity. cURL
 offers many useful capabilities, like proxy support, user
 offers many useful capabilities, like proxy support, user
 authentication, FTP upload, HTTP post, and file transfer resume.
 authentication, FTP upload, HTTP post, and file transfer resume.
 
 
+
 %package devel
 %package devel
 Summary: Files needed for building applications with libcurl.
 Summary: Files needed for building applications with libcurl.
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 Requires: openssl-devel libidn-devel zlib-devel
 Requires: openssl-devel libidn-devel zlib-devel
 
 
@@ -78,7 +79,7 @@ use cURL's capabilities internally.
 %package -n compat32-%{name}
 %package -n compat32-%{name}
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
-Group: System Environment/Libraries
+Group: system
 
 
 %description -n compat32-%{name}
 %description -n compat32-%{name}
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -87,9 +88,10 @@ to work without user interaction or any kind of interactivity. cURL
 offers many useful capabilities, like proxy support, user
 offers many useful capabilities, like proxy support, user
 authentication, FTP upload, HTTP post, and file transfer resume.
 authentication, FTP upload, HTTP post, and file transfer resume.
 
 
+
 %package -n compat32-%{name}-devel
 %package -n compat32-%{name}-devel
 Summary: Files needed for building applications with libcurl.
 Summary: Files needed for building applications with libcurl.
-Group: Development/Libraries
+Group: programming
 
 
 %description -n compat32-%{name}-devel
 %description -n compat32-%{name}-devel
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
 cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
@@ -98,6 +100,10 @@ package includes files needed for developing applications which can
 use cURL's capabilities internally.
 use cURL's capabilities internally.
 #'
 #'
 
 
+
+%debug_package
+
+
 %prep
 %prep
 %setup -q 
 %setup -q 
 
 
@@ -137,6 +143,7 @@ echo "582" >> tests/data/DISABLED
 # adapt test 323 for updated OpenSSL
 # adapt test 323 for updated OpenSSL
 sed -e 's/^35$/35,52/' -i tests/data/test323
 sed -e 's/^35$/35,52/' -i tests/data/test323
 
 
+
 %build
 %build
 %configure \
 %configure \
   --with-ssl=%{_prefix} \
   --with-ssl=%{_prefix} \
@@ -156,19 +163,21 @@ sed -e 's/^35$/35,52/' -i tests/data/test323
 
 
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
+
 %install
 %install
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 make DESTDIR=$RPM_BUILD_ROOT install
 
 
 rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
 rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
 
 
+
 %clean
 %clean
 rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 
 %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}
@@ -204,7 +213,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/*.so
 %endif
 %endif
 
 
+
 %changelog
 %changelog
+* Tue Nov 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.73.0-1
+- new upstream release.
+- updated Patch0101 and Patch0104.
+
 * Fri Jul 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.71.1-1
 * Fri Jul 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.71.1-1
 - new upstream release.
 - new upstream release.
 
 

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

@@ -55,7 +55,7 @@
 Name: php%{majorver}
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 7.4.11
+Version: 7.4.12
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
@@ -1056,6 +1056,9 @@ rm -f files.*
 
 
 #======================================================================
 #======================================================================
 %changelog
 %changelog
+* Thu Oct 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.12-1
+- new upstream release.
+
 * Fri Oct 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.11-1
 * Fri Oct 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.11-1
 - new upstream release.
 - new upstream release.
 
 

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

@@ -8,7 +8,7 @@ Summary: An interpreted, interactive, object-oriented programming language.
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Summary(ja): オブジェクト指向 Python3 インタプリタ
 Name: python3
 Name: python3
 Version: 3.8.6
 Version: 3.8.6
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: programming
 Group: programming
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -82,6 +82,9 @@ Patch274: 00274-fix-arch-names.patch
 # Ideally, we should talk to upstream and explain why we don't want this
 # Ideally, we should talk to upstream and explain why we don't want this
 Patch328: 00328-pyc-timestamp-invalidation-mode.patch
 Patch328: 00328-pyc-timestamp-invalidation-mode.patch
 
 
+# security
+Patch1000: CVE-2020-27619.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf
 BuildRequires: autoconf
 BuildRequires: bzip2-devel
 BuildRequires: bzip2-devel
@@ -208,6 +211,9 @@ rm Lib/ensurepip/_bundled/*.whl
 %patch274 -p1
 %patch274 -p1
 %patch328 -p1
 %patch328 -p1
 
 
+# security
+%patch1000 -p1
+
 # Remove files that should be generated by the build
 # Remove files that should be generated by the build
 # (This is after patching, so that we can use patches directly from upstream)
 # (This is after patching, so that we can use patches directly from upstream)
 rm configure pyconfig.h.in
 rm configure pyconfig.h.in
@@ -391,6 +397,9 @@ rm -fr $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Tue Nov 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.6-2
+- added Patch1000 to fix CVE-2020-27619.
+
 * Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.6-1
 * Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.6-1
 - new upstream release.
 - new upstream release.
 
 

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

@@ -1,9 +1,9 @@
 %bcond_with systemd
 %bcond_with systemd
 %bcond_without pidl
 %bcond_without pidl
 
 
-%define samba_version 4.13.0
+%define samba_version 4.13.1
 #define rc_number rc4
 #define rc_number rc4
-%define samba_release 2
+%define samba_release 1
 
 
 %define doc_version 4.13.0
 %define doc_version 4.13.0
 %define api_version 4.0
 %define api_version 4.0
@@ -453,7 +453,7 @@ Requires(preun): /sbin/chkconfig, /sbin/service
 the Samba suite.
 the Samba suite.
 
 
 %endif
 %endif
-
+## --------------------------------------------------------------------
 %debug_package
 %debug_package
 
 
 ## ====================================================================
 ## ====================================================================
@@ -1828,6 +1828,9 @@ fi
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Mon Nov 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13.1-1
+- new upstream release.
+
 * Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13.0-2
 * Fri Oct 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.13.0-2
 - fixed dependency.
 - fixed dependency.