Browse Source

updated 6 packages

apt-0.5.15lorg3.95-33.git522

initscripts-8.91.16-8

kernel-5.4.104-1

lsof-4.94.0-1

procmail-3.22-7

psmisc-23.4-1
Tomohiro "Tomo-p" KATO 3 years ago
parent
commit
c1b6bf1447

+ 4 - 3
a/apt/apt-vl.spec

@@ -13,7 +13,7 @@ Summary: Advanced front-end for rpm (APT - Advanced Package Tool)
 Summary(ja): RPM の高機能なフロントエンド (APT - アドバンスドパッケージツール)
 Name: apt
 Version: 0.5.15lorg3.95
-Release: 32.%{snapver}%{?_dist_release}
+Release: 33.%{snapver}%{?_dist_release}
 Group: admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -103,7 +103,6 @@ Patch221: add-rpm-legacy-layer.patch
 Patch230: apt-0.5.15lorg3.95-lua-5.2d.patch
 Patch231: apt-0.5.15lorg3.95-lua-5.3.patch
 Patch232: apt-0.5.15lorg3.95-lua-5.4.patch
-Patch233: list-extras-lua54.patch
 
 # rpm-4.12 patch
 Patch300: apt-0.5.15lorg3.95.git522-rpm-4.12.patch
@@ -234,7 +233,6 @@ This package contains the python binding for apt libraries.
 #%patch231 -p1
 # lua-5.4
 %patch232 -p1
-%patch233 -p1
 
 %patch300 -p1
 %patch310 -p1
@@ -443,6 +441,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Mar 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.15lorg3.95-33.git522
+- fixed C++-lua interface.
+
 * Tue Feb 23 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.5.15lorg3.95-32.git522
 - fixed genbasedir.
 

+ 12 - 1
i/initscripts/initscripts-vl.spec

@@ -5,7 +5,7 @@ Summary:      The inittab file and the /etc/rc.d scripts.
 Summary(ja):  inittab と /etc/rc.d 以下の起動スクリプト一式
 Name:         initscripts
 Version:      8.91.16
-Release:      6%{?_dist_release}
+Release:      8%{?_dist_release}
 Group:        system
 Vendor:       Project Vine
 Distribution: Vine Linux
@@ -62,6 +62,9 @@ deactivate most network interfaces.
 いられるスクリプト群もあります.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch0 -p1
@@ -444,6 +447,8 @@ rm -rf ${RPM_BUILD_ROOT}
 /sbin/service
 /sbin/ppp-watch
 %{_mandir}/man*/*
+# conflicts with ppp
+%exclude %{_mandir}/man8/ppp-watch.8*
 %dir %attr(775,root,root) /var/run/netreport
 %dir /etc/ppp
 /etc/ppp/ip-up
@@ -463,6 +468,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Mar 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-8
+- dropped ppp-watch.8.gz: conflicts with ppp.
+
+* Thu Mar 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-7
+- re-fixed to bring up bridge interfaces at boot.
+
 * Fri Feb 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-6
 - made to set MTU of physical devices in an network bridge.
 

+ 51 - 3
k/kernel/kernel-vl.spec

@@ -40,7 +40,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 # adding some text to the end of the version number.
 #
 %define sublevel 4
-%define patchlevel 93
+%define patchlevel 104
 %define kversion 5.%{sublevel}
 %define rpmversion 5.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -145,6 +145,44 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 #
 %define kernel_prereq  fileutils, %{kmod}, initscripts >= 8.80, %{mkinitrd} >= %{mkinitrd_version}, linux-firmware >= 20110601-1
 
+#
+# stop to remove %%{buildroot} before %%install
+#
+
+%global __spec_install_pre %{___build_pre}
+
+#
+# for compressing modules
+#
+%global zipmodules 1
+
+%if %{zipmodules}
+# for parallel xz processes, replace with 1 to go back to single process
+%global zcpu `nproc --all`
+%endif
+
+%define __remove_unwanted_dbginfo_install_post \
+  rm -rf $RPM_BUILD_ROOT/usr/lib/debug/usr/src; \
+%{nil}
+
+%define __module_compress_install_post \
+  if [ "%{zipmodules}" -eq "1" ]; then \
+    find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz; \
+  fi \
+%{nil}
+
+%if "%{buildup}" != "0"
+%define __spec_install_post \
+  %{?__debug_package:%{__debug_install_post}}\
+  %{__arch_install_post}\
+  %{__os_install_post}\
+  %{__remove_unwanted_dbginfo_install_post}\
+  %{__module_compress_install_post}
+%endif
+#
+# package info
+#
+
 Name: kernel
 Version: %{rpmversion}
 Release: %{release}
@@ -194,6 +232,7 @@ BuildRequires: pciutils-devel gettext ncurses-devel
 BuildRequires: libcap-devel
 %endif
 BuildRequires: zlib-devel binutils-devel
+BuildRequires: glibc-static
 
 Source0: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-%{kversion}.tar.xz
 Source10: COPYING.modules
@@ -476,6 +515,9 @@ manipulation of eBPF programs and maps.
 %endif
 
 
+#debug_package
+
+
 %prep
 %setup -q -n %{name}-%{version} -c
 cd linux-%{kversion}
@@ -700,6 +742,7 @@ BuildKernel() {
     cat modinfo |\
 		grep -v "^GPL" |
 		grep -v "^Dual BSD/GPL" |\
+		grep -v "^Dual MIT/GPL" |\
 		grep -v "^Dual MPL/GPL" |\
 		grep -v "^GPL and additional rights" |\
 		grep -v "^GPL v2" && exit 1 
@@ -1064,7 +1107,7 @@ fi
 %files 
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}
-%if %{image_install_path} != "boot"
+%if "%{image_install_path}" != "boot"
 /boot/System.map-%{KVERREL}
 /boot/config-%{KVERREL}
 %endif
@@ -1083,7 +1126,7 @@ fi
 %files pae
 %defattr(-,root,root)
 /%{image_install_path}/*-%{KVERREL}pae
-%if %{image_install_path} != "boot"
+%if "%{image_install_path}" != "boot"
 /boot/System.map-%{KVERREL}pae
 /boot/config-%{KVERREL}pae
 %endif
@@ -1160,6 +1203,11 @@ fi
 
 
 %changelog
+* Thu Mar 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.104-1
+- updated to 5.4.104.
+- fixed kernel config for i686.
+- compressed kernel modules.
+
 * Sat Jan 30 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.93-1
 - updated to 5.4.93.
 

+ 12 - 6
l/lsof/lsof-vl.spec

@@ -1,11 +1,12 @@
 Summary:		A utility which lists open files on a Linux/UNIX system
 Summary(ja):	開かれているファイルの一覧を表示するツール
 Name:			lsof
-Version:		4.93.2
+Version:		4.94.0
 Release:		1%{?_dist_release}
-Group:			Applications/System
+Group:			system
 Vendor:			Project Vine
 Distribution:	Vine Linux
+
 # Sendmail .. lib/snpf.c
 # LGPLv2+  .. lib/regex.c, regex.h
 License:		zlib and Sendmail and LGPLv2+
@@ -15,10 +16,9 @@ URL:			https://github.com/lsof-org/lsof
 #
 # The script can be found in SCM or downloaded from:
 # http://pkgs.fedoraproject.org/cgit/lsof.git/tree/upstream2downstream.sh
-%global lsofrh	lsof-%{version}-rh
+%global lsofrh	lsof_%{version}.linux-rh
 Source0:		%{lsofrh}.tar.xz
 Source1:		upstream2downstream.sh
-Patch0:			lsof-man-page-section.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	groff
@@ -35,16 +35,19 @@ Lsof は UNIX 特有の診断ツールです。その名前は LiSt Open Files 
 全てのファイルに関する情報を表示します。
 
 
+%debug_package
+
+
 %prep
 %setup -q -n %{lsofrh}
-%patch0 -p1 -b .man-page-section
+sed -i -e 's/ LSOF 8 Revision/ LSOF 1 Revision/' lsof.8
 
 
 %build
 ./Configure -n linux
 %make_build DEBUG="%{?optflags} -I/usr/include/tirpc" CFGL="%{?build_ldflags} -L./lib -llsof -ltirpc"
 # rebase to 4.93 introduced change in Lsof.8 with unhandled .so inclusion
-soelim -r Lsof.8 > lsof.1
+soelim -r lsof.8 > lsof.1
 
 
 %install
@@ -67,6 +70,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4.94.0-1
+- new upstream release.
+
 * Fri Mar 20 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4.93.2-1
 - new upstream release.
 

+ 1 - 1
p/procmail/procmail-vl.spec

@@ -2,7 +2,7 @@ Summary: The procmail mail processing program.
 Summary(ja): procmail メール処理プログラム
 Name: procmail
 Version: 3.22
-Release: 6%{?_dist_release}
+Release: 7%{?_dist_release}
 Group: internet
 Vendor: Project Vine
 Distribution: Vine Linux

+ 14 - 4
p/psmisc/psmisc-vl.spec

@@ -1,9 +1,9 @@
 Name: psmisc
-Summary:     Utilities for managing processes on your system.
+Summary: Utilities for managing processes on your system.
 Summary(ja): システムのプロセスを管理するユーティリティ
-Version: 23.2
+Version: 23.4
 Release: 1%{?_dist_release}
-Group: Applications/System
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -34,13 +34,18 @@ fuser コマンドは,指定したファイルやファイルシステムを
 プロセスの PID を特定します.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --prefix=%{_prefix}
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 # The rpm makeinstall macro breaks the build, so we do it the old way
@@ -53,7 +58,8 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/peekfd
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/peekfd.1*
 %endif
 
-%find_lang %name
+%find_lang %name --all-name --with-man
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,7 +85,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/peekfd.1*
 %endif
 
+
 %changelog
+* Thu Mar 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 23.4-1
+- updated to 23.4.
+
 * Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 23.2-1
 - updated to 23.2.