Browse Source

updated 4 packages

gvfs-1.39.4-1

nfs-utils-2.4.1-1

nginx-1.16.1-3

php73-7.3.11-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12285 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
8110f0536f
4 changed files with 56 additions and 13 deletions
  1. 18 4
      g/gvfs/gvfs-vl.spec
  2. 22 5
      n/nfs-utils/nfs-utils-vl.spec
  3. 12 3
      n/nginx/nginx-vl.spec
  4. 4 1
      p/php73/php73-vl.spec

+ 18 - 4
g/gvfs/gvfs-vl.spec

@@ -1,12 +1,21 @@
 Summary: Backends for the gio framework in GLib
 Summary(ja): GLib の GIO フレームワークのバックエンド
 Name: gvfs
-Version: 1.39.3
+Version: 1.39.4
 Release: 1%{?_dist_release}
 License: LGPLv2+
 Group: System Environment/Libraries
-URL: http://www.gtk.org
-Source: http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.28/%{name}-%{version}.tar.xz
+URL: https://wiki.gnome.org/Projects/gvfs
+%define shortver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
+Source: https://ftp.gnome.org/pub/GNOME/sources/gvfs/%{shortver}/%{name}-%{version}.tar.xz
+
+Patch1: CVE-2019-3827.patch
+Patch2: CVE-2019-12448.patch
+Patch3: CVE-2019-12447-1.patch
+Patch4: CVE-2019-12447-2.patch
+Patch5: CVE-2019-12449.patch
+Patch6: CVE-2019-12795-1.patch
+Patch7: CVE-2019-12795-2.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: meson
@@ -29,6 +38,7 @@ BuildRequires: libmtp-devel
 BuildRequires: gnome-online-accounts-devel
 BuildRequires: gcr-devel
 BuildRequires: elogind-devel
+BuildRequires: gsettings-desktop-schemas-devel
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -158,7 +168,7 @@ This package provides seamless integration with Google Drive.
 
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 %meson \
@@ -332,6 +342,10 @@ killall -USR1 gvfsd >&/dev/null || :
 
 
 %changelog
+* Fri Oct 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.39.4-1
+- new upstream release.
+- imported Patch1-7 from upstream.
+
 * Sat Dec 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.39.3-1
 - new upstream release.
 - dropped Patch1.

+ 22 - 5
n/nfs-utils/nfs-utils-vl.spec

@@ -3,8 +3,8 @@
 Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
 Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
 Name: nfs-utils
-Version: 2.3.3
-Release: 3%{?_dist_release}
+Version: 2.4.1
+Release: 1%{?_dist_release}
 
 %define enablegss 1
 
@@ -18,19 +18,20 @@ URL: https://sourceforge.net/projects/nfs/
 Vendor: Project Vine
 Distribution: Vine Linux
 
-Source0: %{name}-%{version}.tar.xz
+Source0: https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
 
 Source10: nfs.init
 Source11: nfslock.init
 Source12: rpcidmapd.init
 Source13: rpcgssd.init
 #Source14: rpcsvcgssd.init
+Source15: nfsdcld.init
 
 Source21: id_resolver.conf
 Source22: lockd.conf
 Source23: nfs.sysconfig
 
-Patch001: nfs-utils.2.3.4-rc1.patch
+Patch001: nfs-utils.2.4.2-rc1.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@@ -63,6 +64,7 @@ BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
 BuildRequires: automake, libtool, glibc-headers, device-mapper-devel
 BuildRequires: krb5-devel, tcp_wrappers, libmount-devel
 BuildRequires: sqlite3-devel
+BuildRequires: rpcgen
 #if %{enablegss}
 #BuildRequires: libgssglue-devel
 #BuildRequires: librpcsecgss >= 0.17
@@ -178,6 +180,7 @@ install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_initdir}/rpcidmapd
 %if %{enablegss}
 install -m 755 %{SOURCE13} $RPM_BUILD_ROOT%{_initdir}/rpcgssd
 %endif
+install -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_initdir}/nfsdcld
 
 install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d
 install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf
@@ -250,6 +253,7 @@ fi
 %if %{enablegss}
 /sbin/chkconfig --add rpcgssd
 %endif
+/sbin/chkconfig --add nfsdcld
 # Make sure statd used the correct uid/gid.
 if [ -f /var/lock/subsys/rpc.statd ]; then
     /etc/rc.d/init.d/nfslock stop > /dev/null
@@ -267,12 +271,14 @@ if [ "$1" = "0" ]; then
 %endif    
     /etc/rc.d/init.d/rpcidmapd condstop > /dev/null
     /etc/rc.d/init.d/nfslock condstop > /dev/null
+    /etc/rc.d/init.d/nfsdcld condstop > /dev/null
     /sbin/chkconfig --del rpcidmapd
 %if %{enablegss}
     /sbin/chkconfig --del rpcgssd
 %endif
     /sbin/chkconfig --del nfs
     /sbin/chkconfig --del nfslock
+    /sbin/chkconfig --del nfsdcld
     /usr/sbin/userdel rpcuser 2>/dev/null || :
     /usr/sbin/groupdel rpcuser 2>/dev/null || :
     /usr/sbin/userdel nfsnobody 2>/dev/null || :
@@ -297,6 +303,9 @@ if [ "$1" -ge 1 ]; then
     if [ -f /etc/rc.d/init.d/nfslock ]; then
 	/etc/rc.d/init.d/nfslock condrestart > /dev/null
     fi
+    if [ -f /etc/rc.d/init.d/nfsdcld ]; then
+	/etc/rc.d/init.d/nfsdcld condrestart > /dev/null
+    fi
 fi
 
 %post -n libnfsidmap -p /sbin/ldconfig
@@ -317,6 +326,7 @@ fi
 %doc linux-nfs/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README
 %doc linux-nfs/THANKS linux-nfs/TODO
 %config %{_initdir}/nfs
+%config %{_initdir}/nfsdcld
 %config %{_initdir}/rpcidmapd
 %if %{enablegss}
 %config %{_initdir}/rpcgssd
@@ -338,6 +348,7 @@ fi
 %config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/statd/state
 /sbin/rpc.statd
 #/sbin/osd_login
+/sbin/nfsdcld
 /sbin/nfsdcltrack
 %{_sbindir}/exportfs
 %{_sbindir}/nfsstat
@@ -365,7 +376,8 @@ fi
 /sbin/umount.nfs4
 
 %files -n libnfsidmap
-%doc support/nfsidmap/AUTHORS support/nfsidmap/README support/nfsidmap/COPYING
+%license support/nfsidmap/COPYING
+%doc support/nfsidmap/AUTHORS support/nfsidmap/README
 %config(noreplace) %{_sysconfdir}/idmapd.conf
 %{_libdir}/libnfsidmap.so.*
 %{_libdir}/libnfsidmap/*.so
@@ -380,6 +392,11 @@ fi
 
 
 %changelog
+* Fri Oct 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.1-1
+- new upstream release.
+- updated Patch100.
+- added an initscript for nfsdcld.
+
 * Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.4-3
 - rebuilt with libtirpc-1.1.4.
 - imported Patch001 from rawhide.

+ 12 - 3
n/nginx/nginx-vl.spec

@@ -35,7 +35,7 @@ Summary(ja):    堅牢・軽量・高性能な HTTP およびリバースプロ
 Name:           nginx
 Version:        %{nginx_version}
 # do not reset or decrease.
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
 
 Group:          System Environment/Daemons   
 # BSD License (two clause)
@@ -95,6 +95,7 @@ Source2030: https://github.com/leev/ngx_http_geoip2_module/archive/%{geoip2_vers
 %global with_modsecurity 1
 %global modsecurity_version 1.0.0
 Source2040: https://github.com/SpiderLabs/ModSecurity-nginx/releases/download/v%{modsecurity_version}/modsecurity-nginx-v%{modsecurity_version}.tar.gz
+Patch2040: modsecurity-nginx-master.patch
 %endif
 
 # removes -Werror in upstream build scripts.  -Werror conflicts with
@@ -324,6 +325,11 @@ pushd passenger-%{passenger_version}
 popd
 %endif
 
+%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
@@ -653,13 +659,16 @@ fi
 %if %{with modsecurity}
 %files modsecurity
 %defattr(-,root,root,-)
-%license modsecurity-%{mod_securiy_version}/LICENSE
-%doc modsecurity-%{mod_securiy_version}/README.md
+%license modsecurity-nginx-v%{modsecurity_version}/LICENSE
+%doc modsecurity-nginx-v%{modsecurity_version}/README.md
 %{nginx_modulesdir}/ngx_http_modsecurity_module.so
 %config(noreplace) %{nginx_modconfdir}/modsecurity.conf
 %endif
 
 %changelog
+* Thu Oct 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.1-3
+- added Patch2040.
+
 * Wed Oct 23 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.1-2
 - added ModSecurity module.
 

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

@@ -50,7 +50,7 @@
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 7.3.10
+Version: 7.3.11
 Release: 1%{_dist_release}
 Conflicts: php5 < 5.6.11
 
@@ -1008,6 +1008,9 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Thu Oct 24 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.3.11-1
+- new upstream release.
+
 * Sun Oct 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.3.10-1
 - new upstream release.
 - built with icu65.