Selaa lähdekoodia

updated 6 packages

btrfs-progs-6.9.2-1

e2fsprogs-1.47.1-1

kernel-6.6.39-1

lua-5.4.7-1

lzo-2.10-3

libseccomp-2.5.5-1
Tomohiro "Tomo-p" KATO 5 kuukautta sitten
vanhempi
commit
87bf6bb679

+ 42 - 25
b/btrfs-progs/btrfs-progs-vl.spec

@@ -1,35 +1,30 @@
+%bcond_with man
+
 Name:           btrfs-progs
-Version:        5.4.1
+Version:        6.9.2
 Release:        1%{?_dist_release}
 Summary:        Userspace programs for btrfs
 Summary(ja):    btrfs ファイルシステム用ユーザスペースプログラム集
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          System Environment/Base
 License:        GPLv2
-URL:            http://btrfs.wiki.kernel.org/index.php/Main_Page
+URL:            https://btrfs.readthedocs.io/en/latest/
 Source0:        https://www.kernel.org/pub/linux/kernel/people/kdave/%{name}/%{name}-v%{version}.tar.xz
 
-# Patches no longer applied, but kept for posterity
-# Still must reverse-engineer fixes in there and get upstream
-Patch0:         btrfs-progs-valgrind.patch
-Patch1:         btrfs-init-dev-list.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:  autoconf, automake
-BuildRequires:  e2fsprogs-devel, libuuid-devel, zlib-devel
+BuildRequires:  e2fsprogs-devel, libuuid-devel
 BuildRequires:  libacl-devel, libblkid-devel, lzo-devel
 BuildRequires:  libzstd-devel
+BuildRequires:  libgcrypt-devel
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(zlib)
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
-BuildRequires:  asciidoc, xmlto
-
-%define _sbindir /sbin
-%define _libdir /%{_lib}
-
-Vendor: Project Vine
-Distribution: Vine Linux
-
+%if %{with man}
+BuildRequires:  python3-sphinx
+%endif
 
 %description
 The btrfs-progs package provides all the userpsace programs needed to create,
@@ -39,10 +34,11 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
 btrfs-progs パッケージには、btrfs ファイルシステムを作成、チェック、
 変更、不整合の修正などを行うためのユーザスペースプログラムが収録されています。
 
+
 %package devel
 Summary:        btrfs filesystem-specific libraries and headers
 Summary(ja):    btrfs ファイルシステム固有のライブラリ・ヘッダ
-Group:          Development/Libraries
+Group:          programming
 Requires:       btrfs-progs = %{version}-%{release}
 
 %description devel
@@ -56,27 +52,35 @@ btrfs filesystem-specific programs.
  btrfs-progs-develにはbtrfs固有のプログラムを開発するために必要な
 ライブラリ・ヘッダファイルが収録されています。
 
+
+%debug_package
+
+
+%define _udevrulesdir /usr/lib/udev/rules.d
+
 %prep
 %setup -q -n %{name}-v%{version}
 
+
 %build
 ./autogen.sh
-%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+	--with-crypto=libgcrypt \
+	--disable-documentation \
+	--disable-python
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make mandir=%{_mandir} bindir=%{_sbindir} libdir=%{_libdir} incdir=%{_includedir}/btrfs install DESTDIR=$RPM_BUILD_ROOT
+install -Dpm0644 btrfs-completion %{buildroot}%{_datadir}/bash-completion/completions/btrfs
 # Nuke the static lib
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %license COPYING
-%{_libdir}/libbtrfs*.so.*
 %{_sbindir}/btrfs
 %{_sbindir}/btrfs-convert
 %{_sbindir}/btrfs-find-root
@@ -87,14 +91,27 @@ rm -rf %{buildroot}
 %{_sbindir}/btrfstune
 %{_sbindir}/fsck.btrfs
 %{_sbindir}/mkfs.btrfs
+%{_libdir}/libbtrfs*.so.*
+%{_udevrulesdir}/64-btrfs-dm.rules
+%{_udevrulesdir}/64-btrfs-zoned.rules
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/btrfs
+%if %{with man}
 %{_mandir}/man5/*.gz
 %{_mandir}/man8/*.gz
+%endif
 
 %files devel
 %{_includedir}/*
 %{_libdir}/libbtrfs*.so
+%{_libdir}/pkgconfig/libbtrfsutil.pc
+
 
 %changelog
+* Thu Jul 11 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 6.9.2-1
+- new upstream release.
+
 * Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.4.1-1
 - new upstream release.
 

+ 21 - 31
e/e2fsprogs/e2fsprogs-vl.spec

@@ -2,24 +2,22 @@
 
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define	_root_sbindir	/sbin
-%define	_root_libdir	/%{_lib}
 
 Summary:        Utilities for managing ext2/3/4 filesystem.
 Summary(ja):    ext2/3/4 ファイルシステム操作ユーティリティ
 Name:           e2fsprogs
-Version:        1.46.5
-Release:        2%{?_dist_release}%{?with_systemd:.systemd}
+Version:        1.47.1
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          admin-tools,system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
 License:        GPL
-URL:            http://e2fsprogs.sourceforge.net/
+URL:            https://e2fsprogs.sourceforge.net/
 Source0:        https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v%{version}/%{name}-%{version}.tar.xz
 Source1:        ext2_types-wrapper.h
 
 Patch0:	        0001-remove-local-PATH.patch
-Patch1000:      CVE-2022-1304.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
@@ -144,11 +142,10 @@ also want to install e2fsprogs.
 %setup -q -n e2fsprogs-%{version}
 
 %patch0 -p1
-%patch1000 -p1
 # Remove flawed tests
 rm -rf tests/m_rootdir_acl
 
-%global _udevdir /lib/udev/rules.d
+%global _udevdir /usr/lib/udev/rules.d
 
 
 %build
@@ -164,7 +161,7 @@ rm -rf $RPM_BUILD_ROOT
 export PATH=/sbin:$PATH
 
 make install install-libs DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" \
-	root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir}
+	root_sbindir=%{_root_sbindir}
 
 chmod 644 $RPM_BUILD_ROOT%{_libdir}/*.a
 
@@ -177,18 +174,11 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_includedir}/ext2fs/ext2_types.h
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-
 %files -f %{name}.lang
-%defattr(-,root,root)
+%license NOTICE
 %doc README RELEASE-NOTES
 %config(noreplace) %{_sysconfdir}/mke2fs.conf
+%{_udevdir}/64-ext4.rules
 
 %{_root_sbindir}/badblocks
 %{_root_sbindir}/debugfs
@@ -214,10 +204,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/e4defrag
 %{_sbindir}/mklost+found
 
-%{_root_libdir}/libcom_err.so.*
-%{_root_libdir}/libe2p.so.*
-%{_root_libdir}/libext2fs.so.*
-%{_root_libdir}/libss.so.*
+%{_libdir}/libcom_err.so.*
+%{_libdir}/libe2p.so.*
+%{_libdir}/libext2fs.so.*
+%{_libdir}/libss.so.*
 
 %{_bindir}/chattr
 %{_bindir}/lsattr
@@ -256,7 +246,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/tune2fs.8*
 
 %files devel
-%defattr(-,root,root)
 %{_infodir}/libext2fs.info*
 %{_bindir}/compile_et
 %{_bindir}/mk_cmds
@@ -289,30 +278,28 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/e2scrub.8*
 %{_mandir}/man8/e2scrub_all.8*
 %if %{with systemd}
-%{_libdir}/e2fsprogs/e2scrub_fail
+%{_libexecdir}/e2fsprogs/e2scrub_fail
 %{_unitdir}/e2scrub@.service
 %{_unitdir}/e2scrub_all.service
 %{_unitdir}/e2scrub_all.timer
 %{_unitdir}/e2scrub_fail@.service
 %{_unitdir}/e2scrub_reap.service
-%exclude %{_libdir}/e2fsprogs/e2scrub_all_cron
+%exclude %{_libexecdir}/e2fsprogs/e2scrub_all_cron
 %exclude %{_sysconfdir}/cron.d/e2scrub_all
 %else
-%{_libdir}/e2fsprogs/e2scrub_all_cron
+%{_libexecdir}/e2fsprogs/e2scrub_all_cron
 %{_sysconfdir}/cron.d/e2scrub_all
 %endif
 %{_udevdir}/96-e2scrub.rules
 
 %if %{build_compat32}
 %files -n compat32-%{name}
-%defattr(-,root,root)
-%{_root_libdir}/libcom_err.so.*
-%{_root_libdir}/libe2p.so.*
-%{_root_libdir}/libext2fs.so.*
-%{_root_libdir}/libss.so.*
+%{_libdir}/libcom_err.so.*
+%{_libdir}/libe2p.so.*
+%{_libdir}/libext2fs.so.*
+%{_libdir}/libss.so.*
 
 %files -n compat32-%{name}-devel
-%defattr(-,root,root)
 %{_libdir}/libcom_err.so
 %{_libdir}/libe2p.so
 %{_libdir}/libext2fs.so
@@ -322,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 11 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.47.1-1
+- new upstream release.
+
 * Fri May 06 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.46.5-2
 - imported Patch1000 from upstream to fix CVE-2022-1304.
 

+ 4 - 1
k/kernel/kernel-vl.spec

@@ -44,7 +44,7 @@
 #
 %define majorver 6
 %define sublevel 6
-%define patchlevel 38
+%define patchlevel 39
 %define kversion %{majorver}.%{sublevel}
 %define rpmversion %{majorver}.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -1192,6 +1192,9 @@ fi
 
 
 %changelog
+* Thu Jul 11 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.6.39-1
+- updated to 6.6.39.
+
 * Wed Jul 10 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.6.38-1
 - updated to 6.6.38.
 

+ 5 - 9
l/lua/lua-vl.spec

@@ -1,5 +1,5 @@
 # No tests yet for 5.3.5
-%global test_version 5.4.6
+%global test_version 5.4.7
 # If you are incrementing major_version, enable bootstrapping and adjust accordingly.
 # Version should be the latest prior build. If you don't do this, RPM will break and
 # everything will grind to a halt.
@@ -13,7 +13,7 @@
 Summary:        Lua is a powerful, light-weight programming language designed for extending applications.
 Summary(ja):    アプリケーション拡張向けに設計された強力かつ軽量なプログラミング言語
 Name:           lua
-Version:        5.4.6
+Version:        5.4.7
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -208,12 +208,7 @@ sed -i.orig -e '
 LD_LIBRARY_PATH=$RPM_BUILD_ROOT/%{_libdir} $RPM_BUILD_ROOT/%{_bindir}/lua -e"_U=true" all.lua
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license mit.txt
 %doc README doc/*.html doc/*.css doc/*.gif doc/*.png
@@ -235,7 +230,6 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/l*.h
 %{_includedir}/l*.hpp
 %{_libdir}/liblua.so
@@ -245,11 +239,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_fileattrsdir}/lua.attr
 
 %files static
-%defattr(-,root,root,-)
 %{_libdir}/*.a
 
 
 %changelog
+* Fri Jul 12 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.7-1
+- new upstream release.
+
 * Tue May 16 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.4.6-1
 - new upstream release.
 

+ 20 - 37
l/lzo/lzo-vl.spec

@@ -4,20 +4,19 @@ Name:           lzo
 Summary:        Data compression library with very fast (de)compression
 Summary(ja):    高速なデータ圧縮ライブラリ
 Version:        2.10
-Release:        2%{?_dist_release}
+Release:        3%{?_dist_release}
+Group:          system
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.oberhumer.com/opensource/lzo/
-
 Source0:        http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
 Patch0:         lzo-2.08-configure.patch
 Patch1:         lzo-2.08-rhbz1309225.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(zlib)
 
-Vendor: Project Vine
-Distribution: Vine Linux
 
 %description
 LZO is a portable lossless data compression library written in ANSI C.
@@ -29,7 +28,7 @@ while still decompressing at this very high speed.
 
 %package minilzo
 Summary:        Mini version of lzo for apps which don't need the full version
-Group:          System Environment/Libraries
+Group:          system
 
 %description minilzo
 A small (mini) version of lzo for embedding into applications which don't need
@@ -39,7 +38,7 @@ full blown lzo compression support.
 %package devel
 Summary:        Development files for the lzo library
 Summary(ja):    lzo ライブラリの開発ファイル
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       %{name}-minilzo = %{version}-%{release}
 Requires:       zlib-devel
@@ -53,7 +52,7 @@ This package contains development files needed for lzo.
 %package -n compat32-%{name}
 Summary:        Data compression library with very fast (de)compression
 Summary(ja):    高速なデータ圧縮ライブラリ
-Group:          System Environment/Libraries
+Group:          system,legacy
 
 %description -n compat32-%{name}
 LZO is a portable lossless data compression library written in ANSI C.
@@ -65,7 +64,7 @@ while still decompressing at this very high speed.
 
 %package -n compat32-%{name}-minilzo
 Summary:        Mini version of lzo for apps which don't need the full version
-Group:          System Environment/Libraries
+Group:          system,legacy
 Requires:       %{name}-minilzo = %{version}-%{release}
 
 %description -n compat32-%{name}-minilzo
@@ -76,7 +75,7 @@ full blown lzo compression support.
 %package -n compat32-%{name}-devel
 Summary:        Development files for the lzo library
 Summary(ja):    lzo ライブラリの開発ファイル
-Group:          Development/Libraries
+Group:          programming,legacy
 Requires:       compat32-%{name} = %{version}-%{release}
 Requires:       %{name}-minilzo = %{version}-%{release}
 Requires:       compat32-zlib-devel
@@ -87,6 +86,9 @@ It offers pretty fast compression and very fast decompression.
 This package contains development files needed for lzo.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch0 -p1 -z .configure
@@ -114,43 +116,23 @@ ln -s libminilzo.so.0 $RPM_BUILD_ROOT%{_libdir}/libminilzo.so
 install -p -m 644 minilzo/minilzo.h $RPM_BUILD_ROOT%{_includedir}/lzo
 rm -rf %{buildroot}%{_docdir}/lzo
 
+
+%ifarch x86_64
 %check
 make check test
+%endif
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%post minilzo -p /sbin/ldconfig
-
-%postun minilzo -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-
-%postun -n compat32-%{name} -p /sbin/ldconfig
-
-%post -n compat32-%{name}-minilzo -p /sbin/ldconfig
-
-%postun -n compat32-%{name}-minilzo -p /sbin/ldconfig
-
 %files
-%defattr(-,root,root,-)
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README THANKS
 %{_libdir}/liblzo2.so.*
 
 %files minilzo
-%defattr(-,root,root,-)
 %doc minilzo/README.LZO
 %{_libdir}/libminilzo.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc doc/LZOAPI.TXT doc/LZO.FAQ doc/LZO.TXT
 %{_includedir}/lzo
 %{_libdir}/lib*lzo*.so
@@ -159,20 +141,21 @@ rm -rf $RPM_BUILD_ROOT
 # compat32
 %if %{build_compat32}
 %files -n compat32-%{name}
-%defattr(-,root,root,-)
 %{_libdir}/liblzo2.so.*
 
 %files -n compat32-%{name}-minilzo
-%defattr(-,root,root,-)
 %{_libdir}/libminilzo.so.0
 
 %files -n compat32-%{name}-devel
-%defattr(-,root,root,-)
 %{_libdir}/lib*lzo*.so
 %{_libdir}/pkgconfig/lzo2.pc
 %endif
 
+
 %changelog
+* Thu Jul 11 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10-3
+- rebuilt with current environment.
+
 * Sun Mar 29 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10-2
 - rebuilt with current environment.
 

+ 6 - 1
lib/libs/libseccomp/libseccomp-vl.spec

@@ -2,7 +2,7 @@
 
 Summary: Enhanced seccomp library
 Name: libseccomp
-Version: 2.5.2
+Version: 2.5.5
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -71,10 +71,12 @@ make V=1 DESTDIR="%{buildroot}" install
 rm -f "%{buildroot}/%{_libdir}/libseccomp.la"
 
 
+%ifarch x86_64
 %if %{with tests}
 %check
 make V=1 check
 %endif
+%endif
 
 
 %files
@@ -100,6 +102,9 @@ make V=1 check
 
 
 %changelog
+* Thu Jul 11 2024 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.5.5-1
+- new upstream release.
+
 * Thu Nov  4 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 2.5.2-1
 - new upstream release.