updated 3 packages

curl-7.71.1-1

php74-7.4.8-1

squid-4.12-1

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

c/curl/curl-vl.spec

@@ -7,7 +7,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Name: curl 
-Version: 7.70.0
+Version: 7.71.1
 Release: 1%{?_dist_release}
 Group: Applications/Internet
 Vendor: Project Vine
@@ -15,14 +15,14 @@ Distribution: Vine Linux
 Packager: daisuke
 
 License: MIT
-URL: http://curl.haxx.se/
+URL: https://curl.haxx.se/
-Source: http://curl.haxx.se/download/%{name}-%{version}.tar.xz
+Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
 
 # avoid reporting spurious error in the HTTP2 framing layer (#1690971)
 Patch2:   0002-curl-7.65.3-h2-framing-layer-error.patch
 
 # patch making libcurl multilib ready
-Patch101: 0101-curl-7.32.0-multilib.patch
+Patch101: 0101-curl-7.71.1-multilib.patch
 
 # prevent configure script from discarding -g in CFLAGS (#496778)
 Patch102: 0102-curl-7.36.0-debug.patch
@@ -205,6 +205,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri Jul 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.71.1-1
+- new upstream release.
+
 * Tue Jun 09 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.70.0-1
 - new upstream release.
 

p/php74/php74-vl.spec

@@ -10,7 +10,11 @@
 %global ap_suffix 7
 %global _name php%{majorver}
 
+# from main/php.h
+#     #define PHP_API_VERSION 20190902
 %global php_extension_api 20190902
+# from Zend/zend_extensions.h
+#     #define ZEND_EXTENSION_API_NO	320190902
 %global zend_extension_api 320190902
 
 %global srcname php-%{version}
@@ -51,7 +55,7 @@
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 7.4.7
+Version: 7.4.8
 Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Conflicts: php5 < 5.6.11
 
@@ -645,11 +649,10 @@ sed -i \
   %{buildroot}%{php_confdir}/php.ini
 
 # fix path in phar
-
+#perl -pi -e 's|^#!/.+/build-cgi/sapi/cli/php$|#!/usr/bin/%{_name}|' %{buildroot}%{_bindir}/phar.phar
-perl -pi -e 's|^#!/.+/build-cgi/sapi/cli/php$|#!/usr/bin/%{_name}|' %{buildroot}%{_bindir}/phar.phar
+#mv %{buildroot}%{_bindir}/phar.phar %{buildroot}%{_bindir}/phar%{majorver}.phar
-mv %{buildroot}%{_bindir}/phar.phar %{buildroot}%{_bindir}/phar%{majorver}.phar
+#mv %{buildroot}%{_mandir}/man1/phar.1 %{buildroot}%{_mandir}/man1/phar%{majorver}.1
-mv %{buildroot}%{_mandir}/man1/phar.1 %{buildroot}%{_mandir}/man1/phar%{majorver}.1
+#rm %{buildroot}%{_mandir}/man1/phar.phar.1
-rm %{buildroot}%{_mandir}/man1/phar.phar.1
 
 %if %{with_pear}
 # http://pear.php.net/bugs/bug.php?id=6154
@@ -813,6 +816,7 @@ rm -f %{buildroot}%{_bindir}/{pear,peardev,pecl,phar}
   --slave   %{_mandir}/man1/php.1.gz php.1.gz %{_mandir}/man1/%{_name}.1.gz \
   --slave   %{_mandir}/man1/php-cgi.1.gz php-cgi.1.gz %{_mandir}/man1/php-cgi%{majorver}.1.gz \
   --slave   %{_mandir}/man1/phar.1.gz phar.1.gz %{_mandir}/man1/phar%{majorver}.1.gz \
+  --slave   %{_mandir}/man1/phar.phar.1.gz phar.phar.1.gz %{_mandir}/man1/phar%{majorver}.phar.1.gz \
   --slave   %{_mandir}/man1/phpdbg.1.gz phpdbg.1.gz %{_mandir}/man1/phpdbg%{majorver}.1.gz
 
 # fix broken symlink if it's there
@@ -969,10 +973,12 @@ rm -f files.*
 %{_mandir}/man1/%{_name}.1*
 %{_mandir}/man1/php-cgi%{majorver}.1*
 %{_mandir}/man1/phar%{majorver}.1*
+%{_mandir}/man1/phar%{majorver}.phar.1*
 %{_mandir}/man1/phpdbg%{majorver}.1*
 %config(noreplace) %{php_confdir}/php.ini
 %{_bindir}/%{_name}
 %{_bindir}/%{_name}-cgi
+%{_bindir}/phar%{majorver}
 %{_bindir}/phar%{majorver}.phar
 %{_bindir}/phpdbg%{majorver}
 %dir %{php_confdir}
@@ -1051,6 +1057,9 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Fri Jul 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.8-1
+- new upstream release.
+
 * Thu Jun 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.7-1
 - new upstream release.
 

s/squid/squid-vl.spec

@@ -2,7 +2,7 @@
 
 %define         base_name       squid
 %define         pkg_epoch       7
-%define         pkg_version     4.11
+%define         pkg_version     4.12
 %define         pkg_release     1%{?_dist_release}%{?with_systemd:.systemd}
 %define         uid             23
 %define         gid             23
@@ -316,7 +316,11 @@ fi
 %{_mandir}/man1/*
 %{_sysconfdir}/%{base_name}/%{base_name}.conf.documented
 
+
 %changelog
+* Fri Jul 10 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.12-1
+- new upstream release.
+
 * Thu Apr 30 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.11-1
 - new upstream release.
 - added systemd support (disabled as default).