Browse Source

updated 5 packages

flatpak-1.10.2-1

gnutls-3.7.1-1

tcp_wrappers-7.6-41

time-1.9-1

vine-rpm-macros-6-1
Tomohiro "Tomo-p" KATO 1 year ago
parent
commit
7c97094984

+ 5 - 10
f/flatpak/flatpak-vl.spec

@@ -4,7 +4,7 @@
 %global ostree_version 2020.8
 
 Name:           flatpak
-Version:        1.10.1
+Version:        1.10.2
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        Application deployment framework for desktop apps
 Group:          system
@@ -154,9 +154,6 @@ This package contains installed tests for %{name}.
 
 %install
 %make_install
-rm -rf ./rpmdoc
-cp -rf %{buildroot}%{_docdir}/%{name} ./rpmdoc
-rm -rf %{buildroot}%{_docdir}/%{name}
 
 # The system repo is not installed by the flatpak build system.
 install -d %{buildroot}%{_localstatedir}/lib/flatpak
@@ -194,23 +191,18 @@ if [ $1 -gt 1 ] ; then
         systemctl --no-reload preset flatpak-add-fedora-repos.service >/dev/null 2>&1 || :
 fi
 
-
 %preun
 %systemd_preun flatpak-add-fedora-repos.service
 
-
 %postun
 %systemd_postun_with_restart flatpak-add-fedora-repos.service
 %endif
 %endif
 
 
-%ldconfig_scriptlets libs
-
-
 %files -f %{name}.lang
 %license COPYING
-%doc rpmdoc/*
+%doc %{_pkgdocdir}/*
 %doc NEWS README.md
 %{_bindir}/flatpak
 %{_bindir}/flatpak-bisect
@@ -280,6 +272,9 @@ fi
 
 
 %changelog
+* Sat Mar 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.10.2-1
+- new upstream release.
+
 * Fri Feb 26 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.10.1-1
 - new upstream release.
 

+ 9 - 17
g/gnutls/gnutls-vl.spec

@@ -6,9 +6,9 @@
 Summary:	GNU TLS Library
 Summary(ja):	GNU TLS ライブラリ
 Name:		gnutls
-Version:	3.7.0
+Version:	3.7.1
 Release:	1%{?_dist_release}
-Group:		system
+Group:		system,security
 Vendor:		Project Vine
 Distribution:	Vine Linux
 
@@ -135,7 +135,7 @@ This package contains the C++ interface for the GnuTLS library.
 %package -n compat32-%{name}
 Summary:	GNU TLS Library
 Summary(ja):	GNU TLS ライブラリ
-Group:		system
+Group:		system,legacy
 Requires:	%{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
@@ -148,7 +148,7 @@ the proposed standards by the IETF's TLS working group.
 %package -n compat32-%{name}-devel
 Summary:	Development files for the GnuTLS package.
 Summary(ja):	GnuTLS の開発用ファイル
-Group:		programming
+Group:		programming,legacy
 Requires:	compat32-%{name} = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	compat32-libgcrypt-devel, compat32-zlib-devel
@@ -166,7 +166,7 @@ library.
 
 %package -n compat32-%{name}-guile
 Summary: Guile bindings for the GNUTLS library
-Group: system
+Group: system,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-guile = %{version}-%{release}
 
@@ -239,9 +239,6 @@ make check %{?_smp_mflags}
 rm -rf %{buildroot}
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %post devel
 if [ -f %{_infodir}/gnutls.info.gz ]; then
     /sbin/install-info %{_infodir}/gnutls.info.gz %{_infodir}/dir || :
@@ -252,15 +249,6 @@ if [ $1 = 0 -a -f %{_infodir}/gnutls.info.gz ]; then
    /sbin/install-info --delete %{_infodir}/gnutls.info.gz %{_infodir}/dir || :
 fi
 
-%post guile -p /sbin/ldconfig
-%postun guile -p /sbin/ldconfig
-
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
-
-%post -n compat32-%{name}-guile -p /sbin/ldconfig
-%postun -n compat32-%{name}-guile -p /sbin/ldconfig
-
 
 %files -f gnutls.lang
 %defattr(-,root,root,-)
@@ -324,6 +312,10 @@ fi
 
 
 %changelog
+* Sat Mar 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7.1-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Tue Feb 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7.0-1
 - new upstream release.
 

+ 53 - 26
t/tcp_wrappers/tcp_wrappers-vl.spec

@@ -1,3 +1,5 @@
+%bcond_without devel
+
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define LIB_MAJOR 0
 %define LIB_MINOR 7
@@ -7,10 +9,13 @@ Summary:     A security tool which acts as a wrapper for TCP daemons.
 Summary(ja): TCP デーモンのラッパとして働くセキュリティツール
 Name: tcp_wrappers
 Version: 7.6
-Release: 40%{?_dist_release}
+Release: 41%{?_dist_release}
+Group: servers,security
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: BSD
-Group: System Environment/Daemons
-Source: ftp://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz
+Source: ftp://ftp.porcupine.org/pub/security/tcp_wrappers_%{version}-ipv6.4.tar.gz
 Patch0: tcpw7.2-config.patch
 Patch1: tcpw7.2-setenv.patch
 Patch2: tcpw7.6-netgroup.patch
@@ -19,29 +24,31 @@ Patch4: tcp_wrappers-7.6-bug17795.patch
 Patch5: tcp_wrappers-7.6-bug17847.patch
 Patch6: tcp_wrappers-7.6-fixgethostbyname.patch
 Patch7: tcp_wrappers-7.6-docu.patch
-Patch8: tcp_wrappers-7.6-casesens.patch
+Patch8: tcp_wrappers-7.6-man.patch
 Patch9: tcp_wrappers.usagi-ipv6.patch
-Patch10: tcp_wrappers.ume-ipv6.patch
 Patch11: tcp_wrappers-7.6-shared.patch
 Patch12: tcp_wrappers-7.6-sig.patch
-Patch13: tcp_wrappers-7.6-strerror.patch
 Patch14: tcp_wrappers-7.6-ldflags.patch
 Patch15: tcp_wrappers-7.6-fix_sig-bug141110.patch
 Patch16: tcp_wrappers-7.6-162412.patch
 Patch17: tcp_wrappers-7.6-220015.patch
-Patch18: tcp_wrappers-7.6-restore_sigalarm.patch
 Patch19: tcp_wrappers-7.6-siglongjmp.patch
 Patch20: tcp_wrappers-7.6-sigchld.patch
 Patch21: tcp_wrappers-7.6-196326.patch
 Patch22: tcp_wrappers_7.6-249430.patch
-Patch23: tcp_wrappers-7.6-aclexec.patch
-Patch24: tcp_wrappers-7.6-fix-multidef.patch
+Patch23: tcp_wrappers-7.6-inetdconf.patch
+Patch24: tcp_wrappers-7.6-bug698464.patch
+Patch26: tcp_wrappers-7.6-xgets.patch
+Patch27: tcp_wrappers-7.6-initgroups.patch
+Patch28: tcp_wrappers-7.6-warnings.patch
+Patch29: tcp_wrappers-7.6-uchart_fix.patch
+Patch30: tcp_wrappers-7.6-altformat.patch
+Patch31: tcp_wrappers-7.6-aclexec.patch
 
 # required by sin_scope_id in ipv6 patch
-BuildRequires: glibc-devel >= 2.2		
+BuildRequires: glibc-devel >= 2.2
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-
 %description
 The tcp_wrappers package provides small daemon programs which can
 monitor and filter incoming requests for systat, finger, FTP, telnet,
@@ -65,7 +72,7 @@ systat, finger, FTP, telnet, rlogin, rsh, exec, tftp, talk, その他
 %package -n compat32-%{name}
 Summary:     A security tool which acts as a wrapper for TCP daemons.
 Summary(ja): TCP デーモンのラッパとして働くセキュリティツール
-Group: System Environment/Daemons
+Group: system,security,legacy
 
 %description -n compat32-%{name}
 The tcp_wrappers package provides small daemon programs which can
@@ -76,8 +83,11 @@ Install the tcp_wrappers program if you need a security tool for
 filtering incoming network services requests.
 
 
+%debug_package
+
+
 %prep
-%setup -q -n tcp_wrappers_7.6
+%setup -q -n %{name}_%{version}-ipv6.4
 %patch0 -p1 -b .config
 %patch1 -p1 -b .setenv
 %patch2 -p1 -b .netgroup
@@ -88,31 +98,37 @@ filtering incoming network services requests.
 %patch7 -p1 -b .docu
 %patch8 -p1 -b .man
 %patch9 -p1 -b .usagi-ipv6
-%patch10 -p1 -b .ume-ipv6
 %patch11 -p1 -b .shared
 %patch12 -p1 -b .sig
-%patch13 -p1 -b .strerror
-%patch14 -p1 -b .cflags
+%patch14 -p1 -b .ldflags
 %patch15 -p1 -b .fix_sig
 %patch16 -p1 -b .162412
 %patch17 -p1 -b .220015
-%patch18 -p1 -b .restore_sigalarm
 %patch19 -p1 -b .siglongjmp
 %patch20 -p1 -b .sigchld
 %patch21 -p1 -b .196326
 %patch22 -p1 -b .249430
-%patch23 -p1 -b .aclexec
-%patch24 -p1 -b .multidef
+%patch23 -p1 -b .inetdconf
+%patch24 -p1 -b .698464
+%patch26 -p1 -b .xgets
+%patch27 -p1 -b .initgroups
+%patch29 -p1 -b .uchart_fix
+%patch30 -p1 -b .altformat
+%patch28 -p1 -b .warnings
+%patch31 -p1 -b .aclexec
 
 # Disable static library creation by default.
 %define with_static 0
 
+
 %build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR -DACLEXEC" \
-     LDFLAGS="-pie" MAJOR=%{LIB_MAJOR} MINOR=%{LIB_MINOR} REL=%{LIB_REL} linux
+make \
+  RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -DPIC -D_REENTRANT -DHAVE_STRERROR -DACLEXEC" \
+  LDFLAGS="$RPM_LD_FLAGS" \
+  MAJOR=%{LIB_MAJOR} MINOR=%{LIB_MINOR} REL=%{LIB_REL} linux %{?_smp_mflags}
+
 
 %install
-[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 mkdir -p ${RPM_BUILD_ROOT}%{_includedir}
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{3,5,8}
@@ -144,24 +160,30 @@ install -m755 try-from ${RPM_BUILD_ROOT}%{_sbindir}
 install -m755 tcpdchk $RPM_BUILD_ROOT%{_sbindir}
 install -m755 tcpdmatch $RPM_BUILD_ROOT%{_sbindir}
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%if !%{with devel}
+rm -f %{buildroot}%{_includedir}/*
+%if %{with_static}
+rm -f %{buildroot}%{_libdir}/*.a
+%endif
+rm -f %{buildroot}%{_libdir}/*.so
+%endif
 
-%post -n compat32-%{name} -p /sbin/ldconfig
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root)
 %doc BLURB CHANGES README* DISCLAIMER Banners.Makefile
 %{_mandir}/man[358]/*
+%if %{with devel}
 %{_includedir}/*
 %if %{with_static}
 %{_libdir}/*.a
 %endif
 %{_libdir}/*.so
+%endif
 %{_libdir}/*.so.*
 %{_sbindir}/*
 
@@ -173,9 +195,14 @@ install -m755 tcpdmatch $RPM_BUILD_ROOT%{_sbindir}
 %endif
 %{_libdir}/*.so
 %{_libdir}/*.so.*
+
 %endif
 
 %changelog
+* Sat Mar 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.6-41
+- switched tarball to ipv6 version.
+- replaced all patches to rawhide's.
+
 * Mon Jul  7 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.6-40
 - rebuilt with current environment.
 

+ 47 - 17
t/time/time-vl.spec

@@ -1,24 +1,33 @@
 Name: time
 Summary: A GNU utility for monitoring a program's use of system resources.
 Summary(ja): プログラムのシステムリソース使用をモニタする GNU ユーティリティ
-Version: 1.7
-Release: 24%{?_dist_release}
+Version: 1.9
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Group: Applications/System
-License: GPLv2+
+License: GPLv3+ and GFDL
 URL: http://www.gnu.org/software/time/
-
-Source0: ftp://prep.ai.mit.edu/pub/gnu/%{name}/%{name}-%{version}.tar.gz
-Patch0: time-1.7-destdir.patch
-Patch1: time-1.7-verbose.patch
+Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+# Fix measuring time when a clock experiences a jump, bug #1004416,
+# <http://lists.gnu.org/archive/html/bug-gnu-utils/2013-09/msg00003.html>
+Patch0:     time-1.8-Prefer-clock_gettime-CLOCK_MONOTONIC.patch
+# Fix info directory entry
+Patch1:     time-1.9-Improve-info-directory-index-entry-description.patch
+# Clarify RSS size as kibibytes in a documentation, proposed to an upstream,
+# <https://lists.gnu.org/archive/html/bug-time/2020-07/msg00000.html>
+Patch2:     time-1.9-Use-kibibytes-instead-of-kilobytes-in-a-documentatio.patch
+# Do not leak a file descriptor of the --output argument to a command,
+# proposed to an upstream,
+# <https://lists.gnu.org/archive/html/bug-time/2020-11/msg00001.html>
+Patch3:     time-1.9-Close-outfp-before-exec.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: texinfo
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 The GNU time utility runs another program, collects information about
 the resources used by that program while it is running, and displays
@@ -29,22 +38,35 @@ GNU time ユーティリティは,他のプログラムを実行し,その
 実行される際にシステムリソースをどの程度使用したかの情報を表示します.
 
 
+%debug_package
+
+
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%autopatch -p1
+# Set time stamp stored in an info page to the latest patch
+touch -d "$(sed -n -e '/^Date: /{s/^[^:]*: //;p}' %{PATCH2})" doc/time.texi
+# Correct version VERSION flag for doc/time.texi
+# <https://lists.gnu.org/archive/html/bug-time/2021-01/msg00000.html>
+printf '%{version}\n' > .tarball-version
+autoreconf -fi
+
 
 %build
-echo "ac_cv_func_wait3=\${ac_cv_func_wait3='yes'}" >> config.cache
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=$RPM_BUILD_ROOT
+# Remove info index, it's updated by file triggers
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
+
+%check
+%{make_build} check
 
-%clean
-rm -rf %{buildroot}
 
 %post
 /sbin/install-info %{_infodir}/time.info.gz %{_infodir}/dir \
@@ -56,13 +78,21 @@ if [ "$1" = 0 ]; then
     --entry="* time: (time).        GNU time Utility" || :
 fi
 
+
 %files
 %defattr(-,root,root)
-%doc NEWS README COPYING
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README
 %{_bindir}/time
 %{_infodir}/time.info*
 
+
 %changelog
+* Sat Mar 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9-1
+- new upstream release.
+- dropped all patches.
+- imported Patch0-3 from rawhide.
+
 * Wed Jan 15 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7-24
 - rebuild with VineSeed environment
 

+ 4 - 1
v/vine-rpm-macros/vine-rpm-macros-vl.spec

@@ -1,7 +1,7 @@
 Summary:        rpm macros for Vine Linux
 Summary(ja):    Vine Linux用rpmマクロ
 Name:           vine-rpm-macros
-Version:        5
+Version:        6
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -69,6 +69,9 @@ install -Dpm644 %{SOURCE1} %{buildroot}/usr/lib/rpm/macros.d/macros.vine
 
 
 %changelog
+* Sat Mar 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6-1
+- added %%_docdir_fmt.
+
 * Tue Mar 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5-1
 - imported some macros from redhat-rpm-config.