updated 6 packages

ca-certificates-2021.2.48-1

kernel-5.4.107-1

logwatch-7.5.5-1

libcgroup-0.42.2-2

php-ext-memcached-3.1.5.git20210320-1

php-ext-phpredis-5.3.3-1

c/ca-certificates/ca-certificates-vl.spec

@@ -5,10 +5,10 @@
 
 # latest nss release.
 # reference: https://hg.mozilla.org/projects/nss
-%define nss_version 3_62
+%define nss_version 3_63
 
 # NSS_BUILTINS_LIBRARY_VERSION from https://hg.mozilla.org/projects/nss/file/NSS_%{nss_version}_RTM/lib/ckfw/builtins/nssckbi.h
-%define ckbi_version 2.46
+%define ckbi_version 2.48
 
 %define java_version 1.8.0
 
@@ -17,29 +17,32 @@ Summary(ja): Mozilla の CA ルート証明書バンドル
 Name: ca-certificates
 Version: %{year}.%{ckbi_version}
 Release: 1%{?_dist_release}
+Group: system,security
+Vendor: Project Vine
+Distribution: Vine Linux.
+
 License: MPL2
-Group: System Environment/Base
 # see also: https://nss-crypto.org/
 URL: http://www.mozilla.org/
 Source0: https://hg.mozilla.org/projects/nss/raw-file/NSS_%{nss_version}_RTM/lib/ckfw/builtins/certdata.txt
 Source1: blacklist.txt
 Source2: generate-cacerts.pl
 Source3: certdata2pem.py
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: perl, java-%{java_version}-openjdk-headless, python, rcs
 BuildArch: noarch
 
-Vendor: Project Vine
-Distribution: Vine Linux.
-
 %description
 This package contains the set of CA certificates chosen by the
 Mozilla Foundation for use with the Internet PKI.
 
+
 %prep
 rm -rf %{name}
 mkdir %{name} %{name}/certs %{name}/java
 
+
 %build
 pushd %{name}/certs
  cp %{SOURCE0} %{SOURCE1} .
@@ -92,6 +95,7 @@ pushd %{name}/java
  touch -r %{SOURCE0} cacerts
 popd
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -111,9 +115,11 @@ install -p -m 644 %{name}/java/cacerts $RPM_BUILD_ROOT%{pkidir}/java/
 mkdir -p -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/ssl
 ln -s ../pki/tls/certs $RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %dir %{pkidir}/java
@@ -125,7 +131,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/ssl
 %{_sysconfdir}/ssl/certs
 
+
 %changelog
+* Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2021.2.48-1
+- updated to 2.48.
+
 * Thu Feb 25 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2021.2.46-1
 - updated to 2.46.
 

k/kernel/kernel-vl.spec

@@ -39,7 +39,7 @@
 # adding some text to the end of the version number.
 #
 %define sublevel 4
-%define patchlevel 106
+%define patchlevel 107
 %define kversion 5.%{sublevel}
 %define rpmversion 5.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -515,6 +515,9 @@ This package contains the bpftool, which allows inspection and simple
 manipulation of eBPF programs and maps.
 %endif
 
+%global _build_id_links none
+%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*\/usr\/src\/kernels/.*|XXX' -o ignored-debuginfo.list}\
+%{nil}
 
 #debug_package
 
@@ -577,7 +580,7 @@ cp -fv %{all_arch_configs} .
 # now run oldconfig over all the config files
 for i in *.config
 do 
-	mv $i .config 
+	mv $i .config
 	Arch=`head -1 .config | cut -b 3-`
 	make ARCH=$Arch olddefconfig
 	echo "# $Arch" > configs/$i
@@ -645,6 +648,8 @@ BuildKernel() {
     rm -f .newoptions
     
     make -s ARCH=$Arch olddefconfig > /dev/null
+    # This ensures build-ids are unique to allow parallel debuginfo
+    perl -p -i -e "s/^CONFIG_BUILD_SALT.*/CONFIG_BUILD_SALT=\"%{KVERREL}\"/" .config
 
     make -s ARCH=$Arch %{?_smp_mflags} %{make_target}
     make -s ARCH=$Arch %{?_smp_mflags} modules || exit 1
@@ -1204,6 +1209,10 @@ fi
 
 
 %changelog
+* Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.107-1
+- updated to 5.4.107.
+- resolved conflicts with other versions of kernel-devel.
+
 * Sat Mar 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.106-1
 - updated to 5.4.106.
 

l/logwatch/logwatch-vl.spec

@@ -1,8 +1,8 @@
 Summary: A log file analysis program
 Summary(ja): ログファイル分析プログラム
 Name: logwatch
-Version: 7.5.4
-Release: 0%{?_dist_release}
+Version: 7.5.5
+Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -14,7 +14,7 @@ Patch0: 0001-Added-support-for-UNCHECKED-ENCRYPTED.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch: noarch
-Requires: coreutils, grep, mailx
+Requires: coreutils, grep, mailutils
 Requires: perl(Date::Manip)
 
 %description
@@ -161,7 +161,11 @@ rm -rf %{buildroot}
 %{_sysconfdir}/cron.daily/0logwatch
 %doc %{_mandir}/man*/*
 
+
 %changelog
+* Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.5.5-1
+- new upstream release.
+
 * Tue Sep 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.5.4-1
 - new upstream release.
 

lib/libc/libcgroup/libcgroup-vl.spec

@@ -1,3 +1,5 @@
+%bcond_with systemd
+
 %define soversion 1.0.42
 %define soversion_major 1
 
@@ -5,22 +7,24 @@ Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Summary(ja): CGROUPS を管理・監視するためのツールおよびライブラリ
 Version: 0.42.2
-Release: 1%{?_dist_release}
-
-License: LGPLv2+
-Group: System Environment/Libraries
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
+License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: https://github.com/%{name}/%{name}/archive/v%{version}/%{name}-v%{version}.tar.gz
+Source1: cgconfig.conf.sysvinit
+Source2: cgconfig.sysconfig
+Source100: cgconfig.service
+Source101: cgconfig.conf.systemd
 
 Patch1: libcgroup-0.37-chmod.patch
 Patch2: libcgroup-0.40.rc1-coverity.patch
 Patch3: libcgroup-0.40.rc1-fread.patch
 Patch4: libcgroup-0.40.rc1-templates-fix.patch
 
-Patch1000: 0001-modify-configurations.patch
 Patch1001: 0002-fix-initscripts.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -29,27 +33,33 @@ BuildRequires: byacc
 BuildRequires: flex
 BuildRequires: coreutils
 Requires(pre): shadow-utils
+%if %{with systemd}
+%{?systemd_requires}
+%else
 Requires(post): chkconfig, /sbin/service
 Requires(preun): /sbin/chkconfig
+%endif
 
 %description
 Control groups infrastructure. The tools and library help manipulate, control,
 administrate and monitor control groups and the associated controllers.
 
+
 %package pam
 Summary: A Pluggable Authentication Module for libcgroup
 Summary(ja): Libcgroup の PAM モジュール
-Group: System Environment/Base
+Group: system
 Requires: libcgroup = %{version}-%{release}
 
 %description pam
 Linux-PAM module, which allows administrators to classify the user's login
 processes to pre-configured control group.
 
+
 %package devel
 Summary: Development files for libcgroup
 Summary(ja): libcgroup の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: libcgroup = %{version}-%{release}
 
 %description devel
@@ -57,67 +67,91 @@ It provides API to create/delete and modify cgroup nodes. It will also in the
 future allow creation of persistent configuration for control groups and
 provide scripts to manage that configuration.
 
+
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version}
 %autopatch -p1
-
 autoreconf -vif
 
+
 %build
-%configure --bindir=/bin --sbindir=/sbin --libdir=%{_libdir} --enable-initscript-install --enable-pam-module-dir=/%{_lib}/security
+%configure \
+	--bindir=/bin --sbindir=/sbin --libdir=%{_libdir} \
+	--enable-pam-module-dir=/%{_lib}/security \
+%if !%{with systemd}
+	--enable-initscript-install \
+%endif
+	%{nil}
 
 make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} install
 
 # install config files
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
-cp samples/cgred.conf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgred.conf
-cp samples/cgconfig.sysconfig $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgconfig
-cp samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.conf
-cp samples/cgrules.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgrules.conf
-cp samples/cgsnapshot_blacklist.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgsnapshot_blacklist.conf
+mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig
+cp samples/cgred.conf %{buildroot}/%{_sysconfdir}/sysconfig/cgred.conf
+cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/sysconfig/cgconfig
+cp samples/cgrules.conf %{buildroot}/%{_sysconfdir}/cgrules.conf
+cp samples/cgsnapshot_blacklist.conf %{buildroot}/%{_sysconfdir}/cgsnapshot_blacklist.conf
+
+%if %{with systemd}
+install -Dpm644 %{SOURCE100} %{buildroot}/%{_unitdir}/cgconfig.service
+cp %{SOURCE101} %{buildroot}/%{_sysconfdir}/cgconfig.conf
+%else
+cp %{SOURCE1} %{buildroot}/%{_sysconfdir}/cgconfig.conf
+%endif
 
 # sanitize pam module, we need only pam_cgroup.so
-mv -f $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so
-rm -f $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.la $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so.*
+mv -f %{buildroot}/%{_lib}/security/pam_cgroup.so.*.*.* %{buildroot}/%{_lib}/security/pam_cgroup.so
+rm -f %{buildroot}/%{_lib}/security/pam_cgroup.la %{buildroot}/%{_lib}/security/pam_cgroup.so.*
 
 # move the libraries  to /
-mkdir -p $RPM_BUILD_ROOT/%{_lib}
-mv -f $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_lib}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so.%{soversion_major}
-ln -sf libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_lib}/libcgroup.so.%{soversion_major}
-ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{a,la}
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libcgroupfortesting.*
-rm -f $RPM_BUILD_ROOT/%{_lib}/security/*.a
+mkdir -p %{buildroot}/%{_lib}
+mv -f %{buildroot}/%{_libdir}/libcgroup.so.%{soversion} %{buildroot}/%{_lib}
+rm -f %{buildroot}/%{_libdir}/libcgroup.so.%{soversion_major}
+ln -sf libcgroup.so.%{soversion} %{buildroot}/%{_lib}/libcgroup.so.%{soversion_major}
+ln -sf ../../%{_lib}/libcgroup.so.%{soversion} %{buildroot}/%{_libdir}/libcgroup.so
+rm -f %{buildroot}/%{_libdir}/*.{a,la}
+rm -f %{buildroot}/%{_libdir}/libcgroupfortesting.*
+rm -f %{buildroot}/%{_lib}/security/*.a
 
 # pre-create /cgroup directory
-mkdir $RPM_BUILD_ROOT/cgroup
+mkdir %{buildroot}/cgroup
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %pre
 getent group cgred >/dev/null || groupadd -r cgred
 
 %post 
-/sbin/ldconfig
+%if %{with systemd}
+%systemd_post cgconfig.service
+%else
 /sbin/chkconfig --add cgred
 /sbin/chkconfig --add cgconfig
+%endif
 
 %preun
-if [ $1 = 0 ]; then
+%if %{with systemd}
+%systemd_preun cgconfig.service
+%else
+if [ $1 = 0 -o -x /bin/systemctl ]; then
     /sbin/service cgred stop > /dev/null 2>&1 || :
     /sbin/service cgconfig stop > /dev/null 2>&1 || :
     /sbin/chkconfig --del cgconfig
     /sbin/chkconfig --del cgred
 fi
+%endif
+
+%if %{with systemd}
+%postun
+%systemd_postun_with_restart cgconfig.service
+%endif
 
-%postun -p /sbin/ldconfig
 
 %files 
 %defattr(-,root,root,-)
@@ -142,11 +176,14 @@ fi
 %attr(0644, root, root) %{_mandir}/man1/*
 %attr(0644, root, root) %{_mandir}/man5/*
 %attr(0644, root, root) %{_mandir}/man8/*
+%if %{with systemd}
+%{_unitdir}/cgconfig.service
+%else
 %attr(0755,root,root) %{_initrddir}/cgconfig
 %attr(0755,root,root) %{_initrddir}/cgred
+%endif
 %license COPYING
 %doc README_daemon
-%attr(0755,root,root) %dir /cgroup
 
 %files pam
 %defattr(-,root,root,-)
@@ -161,7 +198,13 @@ fi
 /%{_libdir}/pkgconfig/libcgroup.pc
 %license COPYING
 
+
 %changelog
+* Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.42.2-2
+- dropped ldconfig scriptlets.
+- updated Patch1001: made LSB free.
+- added systemd support (disabled as default).
+
 * Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.42.2-1
 - new upstream release.
 - dropped Patch1-15.

p/php-ext-memcached/php-ext-memcached-vl.spec

@@ -4,8 +4,8 @@
 %define build_targets 74 80
 %define extname memcached
 
-%global gitdate 20201219
-%global githash bfb0a66809d43080219ab5381235f848c91eff7e
+%global gitdate 20210320
+%global githash 19a02bb5bfaeb520b857a2d64172f7d2a9615fb3
 
 %define srcdir php-%{extname}-%{?githash:%{githash}}%{!?githash:%{version}}
 
@@ -25,7 +25,6 @@ Source: https://github.com/php-memcached-dev/php-memcached/archive/%{githash}.ta
 %else
 Source: https://github.com/php-memcached-dev/php-memcached/archive/v3.1.5.tar.gz#/php-%{extname}-%{version}.tar.gz
 %endif
-Patch0: sess_prefix.patch
 BuildRequires: libmemcached-devel
 BuildRequires: zlib-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -96,8 +95,6 @@ done
 
 
 %install
-rm -rf %{buildroot}
-
 cat > memcached.ini <<EOF
 ; Enable memcached extension module
 extension=memcached.so
@@ -136,15 +133,17 @@ done
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
 %files -n php74-ext-%{extname} -f files.php74
 %files -n php80-ext-%{extname} -f files.php80
 
 
 %changelog
-* Sat Dec 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 
+* Sat Mar 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1.5.20210320
+- moved to git HEAD.
+- dropped Patch0: fixed in upstream.
+
+* Sat Dec 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1.5.20201219
+- moved to git HEAD.
 - added php80 support.
 - dropped php73 support.
 

p/php-ext-phpredis/php-ext-phpredis-vl.spec

@@ -3,7 +3,7 @@
 Summary: A redis extension for PHP
 Summary(ja): PHP用redis拡張
 Name: php-ext-phpredis
-Version: 5.3.2
+Version: 5.3.3
 Release: 1%{_dist_release}
 Group: programming
 Vendor: Project Vine
@@ -157,6 +157,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Mar 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.3.3-1
+- new upstream release.
+
 * Sat Dec 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.3.2-1
 - new upstream release.
 - added php80 support.