Browse Source

updated 5 packages

bzip2-1.0.8-2

php74-7.4.33-5

php81-8.1.29-1

php82-8.2.20-1

zlib-1.2.13-2
Tomohiro "Tomo-p" KATO 8 months ago
parent
commit
d233f388ea
5 changed files with 89 additions and 33 deletions
  1. 23 21
      b/bzip2/bzip2-vl.spec
  2. 8 2
      p/php74/php74-vl.spec
  3. 16 4
      p/php81/php81-vl.spec
  4. 28 4
      p/php82/php82-vl.spec
  5. 14 2
      z/zlib/zlib-vl.spec

+ 23 - 21
b/bzip2/bzip2-vl.spec

@@ -4,10 +4,13 @@ Summary:     A file compression utility.
 Summary(ja): ファイル圧縮ユーティリティ
 Name: bzip2
 Version: 1.0.8
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: BSD
-Group: Applications/Archiving
-URL: http://www.bzip.org/
+Group: accesories
+URL: https://sourceware.org/bzip2
 Source0: https://sourceware.org/pub/bzip2/%{name}-%{version}.tar.gz
 Source1: bzip2.pc
 Patch0: bzip2-saneso.patch
@@ -23,11 +26,9 @@ Patch10: bzip2-1.0.2.diff.bz2
 # none
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-
 BuildRequires: texinfo
 
-Vendor: Project Vine
-Distribution: Vine Linux
+%global __provides_exclude_from ^%{_libdir}/pkgconfig/.*$
 
 %description
 Bzip2 is a freely available, patent-free, high quality data compressor.
@@ -44,18 +45,20 @@ Install bzip2 if you need a compression utility.
 %package devel
 Summary: Header files and libraries for developing apps which will use bzip2.
 Summary(ja): bzip2 を使うプログラム開発に必要なヘッダファイルとライブラリ
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
+Provides: pkgconfig(bzip2) = %{version}
 
 %description devel
 Header files and a static library of bzip2 functions, for developing apps
 which will use the library.
 
+
 ## to build compat32 for x86_64 architecture support
 %package -n compat32-%{name}
 Summary: A file compression utility.
 Summary(ja): ファイル圧縮ユーティリティ
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -69,10 +72,11 @@ and compression capability.
 
 Install bzip2 if you need a compression utility.
 
+
 %package -n compat32-%{name}-devel
 Summary: Header files and libraries for developing apps which will use bzip2.
 Summary(ja): bzip2 を使うプログラム開発に必要なヘッダファイルとライブラリ
-Group: Development/Libraries
+Group: programming,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 
@@ -80,6 +84,10 @@ Requires: %{name}-devel = %{version}-%{release}
 Header files and a static library of bzip2 functions, for developing apps
 which will use the library.
 
+
+%debug_package
+
+
 %prep
 %setup -q 
 %patch0 -p1
@@ -91,6 +99,7 @@ which will use the library.
 cp -a %{SOURCE1} .
 sed -i "s|^libdir=|libdir=%{_libdir}|" bzip2.pc
 
+
 %build
 make -f Makefile-libbz2_so \
 	CC="%{__cc}" \
@@ -109,6 +118,7 @@ make \
 	LDFLAGS="" \
 	%{?_smp_mflags} all
 
+
 %install
 rm -rf %{buildroot}
 
@@ -138,21 +148,10 @@ ln -s bzgrep.1 %{buildroot}%{_mandir}/man1/bzegrep.1
 ln -s bzgrep.1 %{buildroot}%{_mandir}/man1/bzfgrep.1
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-
-%postun -n compat32-%{name} -p /sbin/ldconfig
-
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
-%license COPYING
+%license LICENSE
 %doc CHANGES README
 %{_bindir}/*
 %{_mandir}/*/*
@@ -177,6 +176,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sun Jun 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.8-2
+- dropped ldconfig scriptlets.
+
 * Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.8-1
 - new upstream release.
 - dropped Patch0-3 and 1000.

+ 8 - 2
p/php74/php74-vl.spec

@@ -38,7 +38,7 @@ Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
 Version: 7.4.33
-Release: 4%{_dist_release}%{?with_systemd:.systemd}
+Release: 5%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -71,6 +71,7 @@ Patch33: php-5.2.4-phpincludedir.patch
 #Patch100: php55-htmlspecialchars-compat53.patch
 
 # security fix
+# https://rpms.remirepo.net/SRPMS/repoview/php74-php.html
 Patch200: php-bug81740.patch
 Patch201: php-bug81744.patch
 Patch202: php-bug81746.patch
@@ -78,6 +79,8 @@ Patch203: php-cve-2023-0662.patch
 Patch204: php-cve-2023-3247.patch
 Patch205: php-cve-2023-3823.patch
 Patch206: php-cve-2023-3824.patch
+Patch207: php-cve-2024-2756.patch
+Patch208: php-cve-2024-3096.patch
 
 #bugfix
 #Patch2000: fix319823.patch
@@ -116,7 +119,7 @@ BuildRequires: perl
 BuildRequires: pkgconfig
 BuildRequires: postfix
 BuildRequires: sqlite3-devel
-BuildRequires: zlib-devel
+BuildRequires: zlib-ng-compat-devel
 BuildRequires: libicu-devel >= 3.6
 BuildRequires: libXpm-devel
 BuildRequires: libzip-devel
@@ -943,6 +946,9 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Fri Apr 12 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.33-5
+- imported security patches from remi.
+
 * Wed Nov 01 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.33-4
 - rebuilt with icu-74.
 

+ 16 - 4
p/php81/php81-vl.spec

@@ -37,8 +37,8 @@
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 8.1.25
-Release: 2%{_dist_release}%{?with_systemd:.systemd}
+Version: 8.1.29
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -106,7 +106,7 @@ BuildRequires: perl
 BuildRequires: pkgconfig
 BuildRequires: postfix
 BuildRequires: sqlite3-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 BuildRequires: libicu-devel >= 3.6
 BuildRequires: libXpm-devel
 BuildRequires: libzip-devel
@@ -347,7 +347,7 @@ BuildRequires: libelf-devel
 BuildRequires: net-snmp-devel >= 5.1.1
 BuildRequires: popt-devel
 BuildRequires: rpm-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 Requires: %{name} = %{version}-%{release}
 Provides: php-snmp = %{version}-%{release}
 
@@ -899,6 +899,18 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Sun Jun 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.1.29-1
+- new upstream release.
+
+* Fri Apr 12 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.1.28-1
+- new upstream release.
+
+* Fri Dec 22 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.1.27-1
+- new upstream release.
+
+* Fri Nov 24 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.1.26-1
+- new upstream release.
+
 * Wed Nov 01 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.1.25-2
 - rebuilt with icu-74.
 

+ 28 - 4
p/php82/php82-vl.spec

@@ -37,8 +37,8 @@
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 8.2.12
-Release: 2%{_dist_release}%{?with_systemd:.systemd}
+Version: 8.2.20
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -106,7 +106,7 @@ BuildRequires: perl
 BuildRequires: pkgconfig
 BuildRequires: postfix
 BuildRequires: sqlite3-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 BuildRequires: libicu-devel >= 3.6
 BuildRequires: libXpm-devel
 BuildRequires: libzip-devel
@@ -347,7 +347,7 @@ BuildRequires: libelf-devel
 BuildRequires: net-snmp-devel >= 5.1.1
 BuildRequires: popt-devel
 BuildRequires: rpm-devel
-BuildRequires: zlib-devel
+BuildRequires: pkgconfig(zlib)
 Requires: %{name} = %{version}-%{release}
 Provides: php-snmp = %{version}-%{release}
 
@@ -899,6 +899,30 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Mon Jun 10 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.20-1
+- new upstream release.
+
+* Fri May 10 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.19-1
+- new upstream release.
+
+* Fri Apr 12 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.18-1
+- new upstream release.
+
+* Fri Mar 15 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.17-1
+- new upstream release.
+
+* Fri Feb 16 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.16-1
+- new upstream release.
+
+* Fri Jan 19 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.15-1
+- new upstream release.
+
+* Fri Dec 22 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.14-1
+- new upstream release.
+
+* Fri Nov 24 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.13-1
+- new upstream release.
+
 * Wed Nov 01 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2.12-2
 - rebuilt with icu-74.
 

+ 14 - 2
z/zlib/zlib-vl.spec

@@ -3,7 +3,7 @@ Summary: The zlib compression and decompression library.
 Summary(ja): zlib 圧縮/展開ライブラリ
 Name: zlib
 Version: 1.2.13
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -60,7 +60,7 @@ Summary: Header files and libraries for developing apps which will use zlib.
 Summary(ja): zlib を使ったプログラム開発に必要なヘッダファイル/ライブラリ
 Group: programming
 Requires: %{name} = %{version}-%{release}
-Provides: pkgconfig(zlib) = %{version}
+#Provides: pkgconfig(zlib) = %{version}
 
 %description devel
 The zlib-devel package contains the header files and libraries needed
@@ -189,13 +189,21 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.so
 %{_libdir}/libz.so.*
 
+%exclude %{_libdir}/pkgconfig/zlib.pc
+%exclude %{_includedir}/*
+%exclude %{_mandir}/man3/zlib.3*
+%exclude %{_libdir}/*.a
+
 %files devel
 %defattr(-,root,root)
+%if 0
 %doc ChangeLog doc/algorithm.txt
 %{_libdir}/pkgconfig/zlib.pc
 %{_includedir}/*
 %{_mandir}/man3/zlib.3*
+%endif
 
+%if 0
 %files static
 %defattr(-,root,root)
 %{_libdir}/*.a
@@ -210,9 +218,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/zlib.pc
 %endif
+%endif
 
 
 %changelog
+* Sun Jun 09 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.13-2
+- fixed conflicts with zlib-ng.
+
 * Sat Oct 29 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.13-1
 - new upstream release.
 - dropped unnecessary patches.