Browse Source

updated 14 packages

chkconfig-1.3.61-3

diffutils-3.7-1

findutils-4.7.0-1

libmpc-1.1.0-1

libuser-0.62-1

libutempter-1.1.6-2

mpfr-4.0.2-1

mpfr3-3.1.6-1

psmisc-23.2-1

sed-4.8-1

shadow-utils-4.8-1

tcsh-6.22.02-1

texinfo-6.7-1

usermode-1.109-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12335 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 2 years ago
parent
commit
a712ae6942

+ 8 - 2
c/chkconfig/chkconfig-vl.spec

@@ -2,9 +2,12 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy.
 Summary(ja): /etc/rc.d の階層をメンテナンスするためのシステムツール
 Name: chkconfig
 Version: 1.3.61
-Release: 2%{?_dist_release}
-License: GPL
+Release: 3%{?_dist_release}
 Group: System Environment/Base
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPL
 Source: %{name}-%{version}.tar.bz2
 Source2: chkconfig.8
 Source3: ntsysv.8
@@ -130,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.61-3
+- rebuilt with current environment.
+
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.3.61-2
 - rebuild with VineSeed environment
 

+ 15 - 19
d/diffutils/diffutils-vl.spec

@@ -1,22 +1,23 @@
 Summary: A GNU collection of diff utilities.
 Summary(ja): GNU diff ユーティリティ集
 Name: diffutils
-Version: 3.3
+Version: 3.7
 Release: 1%{?_dist_release}
 Group: Applications/Text
-URL: http://www.gnu.org/software/diffutils/diffutils.html
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPLv3+
+URL: https://www.gnu.org/software/diffutils/diffutils.html
 
-Source: ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
+Source: https://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
 Patch1: diffutils-cmp-s-empty.patch
-Patch2: diffutils-mkdir_p.patch
-Patch3: diffutils-FILE....patch
 Patch4: diffutils-i18n.patch
-Patch5: diffutils-format-security.patch
 
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: coreutils
 
 %description
@@ -52,20 +53,10 @@ sdiff コマンドは2つのファイルを対話的にマージするのに使
 # For 'cmp -s', compare file sizes only if both non-zero (bug #563618).
 %patch1 -p1 -b .cmp-s-empty
 
-# Work around @mkdir_p@ build issue.
-%patch2 -p1 -b .mkdir_p
-
-# Fix --help output and man page (bug #1079076).
-%patch3 -p1 -b .FILE...
-
 %patch4 -p1 -b .i18n
 
-# Applied upstream gnulib patch to avoid -Wformat-security warning
-# (bug #1037038).
-%patch5 -p1 -b .format-security
-
 # Run autoreconf for aarch64 support (bug #925256).
-autoreconf
+autoreconf -ivf
 
 %build
 %configure
@@ -92,13 +83,18 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING NEWS README
+%license COPYING
+%doc NEWS README
 %{_bindir}/*
 %{_mandir}/*/*
 %{_infodir}/diffutils.info*gz
 
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7-1
+- new upstream release.
+- dropped Patch2, 3 and 5.
+
 * Sun Jun 15 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3-1
 - new upstream release.
 - replaced patches.

+ 79 - 25
f/findutils/findutils-vl.spec

@@ -1,18 +1,39 @@
 Summary: The GNU versions of find utilities (find and xargs).
 Summary(ja):  find ユーティリティの GNU バージョン (find および xargs).
 Name: findutils
-Version: 4.5.10
-Release: 2%{?_dist_release}
-License: GPL
+Version: 4.7.0
+Release: 1%{?_dist_release}
 Group: System Environment/Base
-Source0: ftp://ftp.gnu.org/gnu/findutils/findutils-%{version}.tar.gz
-Source1: updatedb.cron
-Patch0: findutils-4.5.10-gets.patch
+
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPL
+Source0: https://ftp.gnu.org/gnu/findutils/findutils-%{version}.tar.xz
+
+# do not build locate
+Patch1:  findutils-4.5.15-no-locate.patch
+
+# add -xautofs option to not descend into directories on autofs file systems
+Patch2:  findutils-4.4.2-xautofs.patch
+
+# eliminate compile-time warnings
+Patch3:  findutils-4.5.13-warnings.patch
+
+# test-lock: disable the rwlock test
+Patch4:  findutils-4.6.0-test-lock.patch
+
+# implement the -noleaf option of find (#1252549)
+Patch5:  findutils-4.6.0-leaf-opt.patch
+
+# make upstream test-suite work with root privileges (#1799064)
+Patch6:  findutils-4.7.0-root-tests.patch
+
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
-Buildroot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool, automake, autoconf
-BuildRequires: dejagnu, gettext, texinfo
+BuildRequires: dejagnu, gettext, texinfo, git
 
 %description
 The findutils package contains programs which will help you locate
@@ -26,31 +47,60 @@ You should install findutils because it includes tools that are very
 useful for finding things on your system.
 
 %prep
-%setup -q
-%patch0 -p1
+%autosetup -N -S git
+
+# drop the source code of locate
+git rm -q -r locate
+git commit -q -m "drop the source code of locate"
+
+# remove ignored files from git and mark them as ignored
+tee -a .gitignore << EOF
+*~
+Makefile.in
+/aclocal.m4
+/autom4te.cache
+/build
+/configure
+/doc/find.info*
+/doc/stamp-vti
+/doc/version.texi
+EOF
+git rm -q -r --cached .
+git add --all .
+git commit -m "remove ignored files from git"
+
+# apply all patches
+%autopatch
+
+# needed because of findutils-4.5.15-no-locate.patch
+autoreconf -fiv
+git add --all .
+git commit -q -m "after invocation of autoreconf"
+
 
 %build
+mkdir build
+cd build
+%global _configure ../configure
 %configure
 
-%__make %{?_smp_mflags}
+make %{?_smp_mflags}
+
+
+%check
+make %{?_smp_mflags} check -C build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=${RPM_BUILD_ROOT}
+%make_install -C build
 
-%find_lang %{name}
+rm -f %{buildroot}%{_infodir}/dir
 
 # move find to /bin
-mkdir -p $RPM_BUILD_ROOT/bin
-mv $RPM_BUILD_ROOT%{_bindir}/find $RPM_BUILD_ROOT/bin/
-ln -sf ../../bin/find $RPM_BUILD_ROOT%{_bindir}
+mkdir -p %{buildroot}/bin
+mv %{buildroot}%{_bindir}/find %{buildroot}/bin/
+ln -sf ../../bin/find %{buildroot}%{_bindir}
 
-# remove unpackaged files
-rm -f $RPM_BUILD_ROOT%{_bindir}/{locate,updatedb}
-rm -f $RPM_BUILD_ROOT%{_libexecdir}/*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{locate,updatedb}*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man5/locatedb*
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+%find_lang %{name}
 
 
 %post
@@ -68,10 +118,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README THANKS 
+%license COPYING
+%doc AUTHORS NEWS README THANKS TODO
 /bin/find
 %{_bindir}/find
-%{_bindir}/oldfind
 %{_bindir}/xargs
 %{_mandir}/man1/find.1*
 %{_mandir}/man1/xargs.1*
@@ -79,6 +129,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_infodir}/find-maint.info*
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.7.0-1
+- new upstream release.
+- updated patches.
+
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.5.10-2
 - rebuild with VineSeed environment
 - add Patch0 (findutils-4.5.10-gets.patch)

+ 17 - 9
lib/libm/libmpc/libmpc-vl.spec

@@ -1,11 +1,15 @@
 Summary: C library for multiple precision complex arithmetic
 Name: libmpc
-Version: 1.0.3
+Version: 1.1.0
 Release: 1%{?_dist_release}
-License: LGPLv3+
 Group: System Environment/Libraries
+
+Vendor: Project Vine 
+Distribution: Vine Linux
+
+License: LGPLv3+
 URL: http://www.multiprecision.org/
-Source0: mpc-%{version}.tar.gz
+Source0: https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gmp-devel >= 4.3.2
 BuildRequires: mpfr-devel >= 2.4.2
@@ -44,14 +48,14 @@ make %{?_smp_mflags}
 make check
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libmpc.{l,}a
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+rm -f %{buildroot}/%{_libdir}/libmpc.{l,}a
+rm -f %{buildroot}/%{_infodir}/dir
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -70,7 +74,8 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc README NEWS COPYING.LESSER
+%license COPYING.LESSER
+%doc README NEWS
 %{_libdir}/libmpc.so.*
 
 %files devel
@@ -80,6 +85,9 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0-1
+- new upstream release.
+
 * Fri May 20 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.3-1
 - updated to 1.0.3
 

+ 12 - 3
lib/libu/libuser/libuser-vl.spec

@@ -3,13 +3,17 @@
 
 
 Name: libuser
-Version: 0.60
+Version: 0.62
 Release: 1%{?_dist_release}
 Summary: A user and group account administration library.
 Summary(ja): ユーザアカウントとグループアカウントを管理するライブラリ
 Group: System Environment/Base
+
+Distribution: Vine Linux
+Vendor: Project Vine
+
 License: LGPL
-URL: https://fedorahosted.org/libuser/
+URL: https://pagure.io/libuser
 Source: libuser-%{version}.tar.xz
 Patch0: libuser-selinux.patch
 BuildRoot: %{_tmppath}/%{name}-root
@@ -47,6 +51,7 @@ files useful for developing applications with libuser.
 %patch0 -p1 -b .selinux
 %endif
 
+
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC" ; export CFLAGS
 %configure \
@@ -86,7 +91,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python}/site-packages/*.la
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING NEWS README TODO docs/*.txt python/modules.txt
+%license COPYING
+%doc AUTHORS NEWS README TODO docs/*.txt python/modules.txt
 %config(noreplace) %{_sysconfdir}/libuser.conf
 
 %attr(0755,root,root) %{_bindir}/*
@@ -112,6 +118,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python}/site-packages/*.la
 %{_mandir}/man1/*
 
 %changelog
+* Tue Mar 17 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.62-1
+- new upstream release.
+
 * Sat May 03 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.60-1
 - new upstream release
 

+ 16 - 4
lib/libu/libutempter/libutempter-vl.spec

@@ -3,12 +3,14 @@
 Name: libutempter
 Summary: A privileged helper for utmp/wtmp updates
 Version: 1.1.6
-Release: 1%{?_dist_release}
-
+Release: 2%{?_dist_release}
 Group: System Environment/Libraries
+
+Distribution: Vine Linux
+Vendor: Project Vine
+
 License: LGPLv2
 URL: ftp://ftp.altlinux.org/pub/people/ldv/utempter
-
 Source0: ftp://ftp.altlinux.org/pub/people/ldv/utempter/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -107,18 +109,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%license COPYING
+%doc README
 %{_libdir}/libutempter.so.*
 %dir %attr(755,root,utempter) %{_libexecdir}/utempter
 %attr(2711,root,utmp) %{_libexecdir}/utempter/utempter
 # FIXME: If a symlink is needed for compat here, uncomment the code in the
 # install section and this as well:
 #%{_sbindir}/utempter
+%{_mandir}/man3/utempter.3*
 
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/utempter.h
 %{_libdir}/libutempter.so
+%{_mandir}/man3/libutempter.3*
+%{_mandir}/man3/utempter_add_record.3*
+%{_mandir}/man3/utempter_remove_added_record.3*
+%{_mandir}/man3/utempter_remove_record.3*
+%{_mandir}/man3/utempter_set_helper.3*
 
 %if %{build_compat32}
 %files -n compat32-%{name}
@@ -131,6 +140,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.6-2
+- rebuilt with current environment.
+
 * Sun Aug 24 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.1.6-1
 - update to 1.1.6
 

+ 32 - 19
m/mpfr/mpfr-vl.spec

@@ -1,14 +1,19 @@
 Summary: A C library for multiple-precision floating-point computations
 Name: mpfr
-Version: 3.1.4
+Version: 4.0.2
 Release: 1%{?_dist_release}
-URL: http://www.mpfr.org/
-Source0: http://www.mpfr.org/mpfr-current/mpfr-%{version}.tar.xz
-License: LGPLv3+
 Group: System Environment/Libraries
 Vendor: Project Vine 
-Distribution: Vine Linux 
-Packager: inagaki, Takemikaduchi, kenta
+Distribution: Vine Linux
+Packager: inagaki, kenta
+License: LGPLv3+
+URL: https://www.mpfr.org/
+
+Source0: https://www.mpfr.org/mpfr-%{version}/mpfr-%{version}.tar.xz
+# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13499&view=revision
+# https://www.mpfr.org/mpfr-4.0.2/patch01
+Patch0: rev13499.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gmp-devel
 Requires: gmp >= 4.2.3
@@ -37,28 +42,31 @@ you'll need to install the mpfr-devel package.  You'll also need to
 install the mpfr package.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
+%configure --disable-assert --disable-static
+
+# Get rid of undesirable hardcoded rpaths; workaround libtool reordering
+# -Wl,--as-needed after all the libraries.
+sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+    -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
+    -e 's|CC="\(g..\)"|CC="\1 -Wl,--as-needed"|' \
+    -i libtool
 
-%configure --disable-assert
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-pushd $RPM_BUILD_ROOT%{_infodir}
-#iconv  -f iso-8859-1 -t utf-8 mpfr.info >mpfr.info.aux
-iconv  -f iso-8859-1 -t euc-jp mpfr.info >mpfr.info.aux
-mv mpfr.info.aux mpfr.info
-popd
-rm -f $RPM_BUILD_ROOT%{_libdir}/libmpfr.la
-rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-rm -f $RPM_BUILD_ROOT%{_libdir}/libmpfr.a
-cd ..
+%make_install
+rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_infodir}/dir
 
+#these go into licenses, not doc
+rm -f %{buildroot}%{_datadir}/doc/COPYING{,.LESSER}
 
 %check
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 make %{?_smp_mflags} check
 
 %post -p /sbin/ldconfig
@@ -78,17 +86,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING COPYING.LESSER NEWS README
+%license COPYING COPYING.LESSER
+%doc NEWS README
 %{_libdir}/libmpfr.so.*
 %{_datadir}/doc/mpfr
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libmpfr.so
+%{_libdir}/pkgconfig/*
 %{_includedir}/*.h
 %{_infodir}/mpfr.info*
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.2-1
+- new upstream release.
+
 * Sat May 07 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
 - update to 3.1.4
 

+ 113 - 0
m/mpfr3/mpfr3-vl.spec

@@ -0,0 +1,113 @@
+Summary: A C library for multiple-precision floating-point computations
+Name: mpfr3
+Version: 3.1.6
+Release: 1%{?_dist_release}
+Group: System Environment/Libraries
+Vendor: Project Vine 
+Distribution: Vine Linux 
+Packager: inagaki, kenta
+License: LGPLv3+
+URL: https://www.mpfr.org/
+Source0: https://www.mpfr.org/mpfr-%{version}/mpfr-%{version}.tar.xz
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: gmp-devel
+Requires: gmp >= 4.2.3
+Obsoletes: mpfr < %{version}
+
+%description
+The MPFR library is a C library for multiple-precision floating-point
+computations with "correct rounding". The MPFR is efficient and 
+also has a well-defined semantics. It copies the good ideas from the 
+ANSI/IEEE-754 standard for double-precision floating-point arithmetic 
+(53-bit mantissa). MPFR is based on the GMP multiple-precision library.
+
+%prep
+%setup -q -n mpfr-%{version}
+
+%build
+
+%configure --disable-assert
+make %{?_smp_mflags}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+pushd $RPM_BUILD_ROOT%{_infodir}
+#iconv  -f iso-8859-1 -t utf-8 mpfr.info >mpfr.info.aux
+iconv  -f iso-8859-1 -t euc-jp mpfr.info >mpfr.info.aux
+mv mpfr.info.aux mpfr.info
+popd
+rm -f $RPM_BUILD_ROOT%{_libdir}/libmpfr.la
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT%{_libdir}/libmpfr.a
+cd ..
+
+rm -f \
+	%{buildroot}%{_libdir}/libmpfr.so \
+	%{buildroot}%{_includedir}/*.h \
+	%{buildroot}%{_infodir}/mpfr.info*
+rm -rf \
+	%{buildroot}%{_datadir}/doc/mpfr
+
+
+%check
+make %{?_smp_mflags} check
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%license COPYING COPYING.LESSER
+%doc NEWS README
+%{_libdir}/libmpfr.so.*
+
+
+%changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1.6-1
+- updated to 3.1.6.
+- built for compatibility.
+
+* Sat May 07 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.4-1
+- update to 3.1.4
+
+* Sun Dec 13 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-2
+- rebuild with VineSeed environment
+
+* Mon Nov 04 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.1.2-1
+- update to 3.1.2
+
+* Sun Oct 30 2011 NAKAMURA Kenta <kenta@vinelinux.org> 3.1.0-1
+- new upstream release
+
+* Tue Apr 19 2011 NAKAMURA Kenta <kenta@vinelinux.org> 2.4.2-2
+- rebuild for Vine 6
+
+* Sun Apr 18 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.2-1
+- new upstream release
+- add Requires: gmp-devel (devel package)
+
+* Sat Nov 28 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.1-1
+- new upstream release
+
+* Mon May 19 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.3.1-1
+- new upstream release
+- applied new versioning policy
+
+* Thu Dec 13 2007 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.3.0-1vl1
+- initial build for Vine Linux
+
+* Thu Sep 20 2007 Ivana Varekova <varekova@redhat.com> 2.3.0-1
+- update to 2.3.0
+- fix license flag
+
+* Mon Aug 20 2007 Ivana Varekova <varekova@redhat.com> 2.2.1-2
+- spec file cleanup (#253440)
+
+* Tue Jan 16 2007 Ivana Varekova <varekova@redhat.com> 2.2.1-1
+- started
+

+ 13 - 6
p/psmisc/psmisc-vl.spec

@@ -1,14 +1,15 @@
 Name: psmisc
 Summary:     Utilities for managing processes on your system.
 Summary(ja): システムのプロセスを管理するユーティリティ
-Version: 22.21
+Version: 23.2
 Release: 1%{?_dist_release}
-
 Group: Applications/System
-License: GPLv2+
-URL: http://sourceforge.net/projects/psmisc
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source: ftp://ftp.sf.net/pub/sourceforge/psmisc/psmisc-%{version}.tar.gz
+License: GPLv2+
+URL: https://sourceforge.net/projects/psmisc
+Source: https://downloads.sourceforge.net/project/psmisc/psmisc/psmisc-%{version}.tar.xz
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gettext
@@ -60,14 +61,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING README
+%license COPYING
+%doc AUTHORS ChangeLog README
 %{_syssbindir}/fuser
 %{_bindir}/killall
+%{_bindir}/pslog
 %{_bindir}/pstree
 %{_bindir}/pstree.x11
 %{_bindir}/prtstat
 %{_mandir}/man1/fuser.1*
 %{_mandir}/man1/killall.1*
+%{_mandir}/man1/pslog.1*
 %{_mandir}/man1/pstree.1*
 %{_mandir}/man1/prtstat.1*
 %ifarch %ix86 x86_64 ppc ppc64
@@ -76,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 23.2-1
+- updated to 23.2.
+
 * Fri May 23 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 22.21-1
 - update to 22.21
 

+ 13 - 5
s/sed/sed-vl.spec

@@ -5,14 +5,17 @@
 Summary: A GNU stream text editor.
 Summary(ja): GNU ストリームテキストエディタ
 Name: sed
-Version: 4.2.2
-Release: 2%{?_dist_release}
+Version: 4.8
+Release: 1%{?_dist_release}
+Group: Applications/Text
+
+Vendor: Project Vine
+Distribution: Vine Linux
 
 License: GPLv2+
-Group: Applications/Text
 URL: http://www.gnu.org/software/sed/
 
-Source0: ftp://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.bz2
+Source0: https://ftp.gnu.org/pub/gnu/sed/sed-%{version}.tar.xz
 #Patch0: sed-4.2.1-dummyparam.diff
 #Patch1: sed-4.2.1-multibyte.patch
 
@@ -46,6 +49,7 @@ export LANG=C
 %configure --without-included-regex
 make %{_smp_mflags}
 
+%check
 echo ====================TESTING=========================
 make check
 echo ====================TESTING END=====================
@@ -71,12 +75,16 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc BUGS NEWS THANKS README AUTHORS
+%license COPYING
+%doc NEWS THANKS README AUTHORS
 %{_bindir}/sed
 %{_infodir}/*.info*
 %{_mandir}/man*/*
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 4.8-1
+- new upstream release.
+
 * Sun Jul 20 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 4.2.2-2
 - rebuild with VineSeed environment
 

+ 147 - 86
s/shadow-utils/shadow-utils-vl.spec

@@ -3,36 +3,71 @@
 Summary: Utilities for managing accounts and shadow password files.
 Summary(ja): シャドウパスワードファイルとアカウントを管理するユーティリティ
 Name: shadow-utils
-Version: 4.1.5.1
-Release: 1%{?_dist_release}
 Epoch: 2
-URL: http://pkg-shadow.alioth.debian.org/
-License: BSD
+Version: 4.8
+Release: 1%{?_dist_release}
 Group: System Environment/Base
 
-Source0: http://pkg-shadow.alioth.debian.org/shadow-%{version}.tar.bz2
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: BSD and GPLv2+
+URL: http://pkg-shadow.alioth.debian.org/
+
+Source0: http://pkg-shadow.alioth.debian.org/shadow-%{version}.tar.xz
 Source1: shadow-4.0.17-login.defs
 Source2: shadow-utils.useradd
-Patch0: shadow-4.1.5-redhat.patch
-Patch1: shadow-4.1.5.1-goodname.patch
+
+# Misc small changes - most probably non-upstreamable
+Patch0: shadow-4.6-redhat.patch
+# Be more lenient with acceptable user/group names - non upstreamable
+Patch1: shadow-4.8-goodname.patch
+# Docfix for newusers - could be upstreamed
 Patch2: shadow-4.1.5.1-info-parent-dir.patch
-Patch3: shadow-4.1.5-uflg.patch
-Patch6: shadow-4.1.5.1-selinux.patch
-Patch7: shadow-4.1.5-2ndskip.patch
-Patch8: shadow-4.1.5.1-backup-mode.patch
-Patch9: shadow-4.1.5.1-merge-group.patch
-Patch10: shadow-4.1.5.1-orig-context.patch
+# Misc SElinux related changes - upstreamability unknown
+Patch6: shadow-4.8-selinux.patch
+# Syslog message change - could be upstreamed
 Patch11: shadow-4.1.5.1-logmsg.patch
-Patch12: shadow-4.1.5.1-errmsg.patch
-Patch13: shadow-4.1.5.1-audit-owner.patch
+# SElinux related - upstreamability unknown
 Patch14: shadow-4.1.5.1-default-range.patch
-Patch15: shadow-4.1.5.1-manfix.patch
-Patch16: shadow-4.1.5.1-crypt-null.patch
+# Misc manual page changes - only some of them could be upstreamed
+Patch15: shadow-4.8-manfix.patch
+# Userdel usage message change - could be upstreamed
 Patch17: shadow-4.1.5.1-userdel-helpfix.patch
-Patch18: shadow-4.1.5.1-group-alloc.patch
-
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-#BuildRequires: autoconf, automake, libtool, gettext
+# Date parsing improvement - could be upstreamed
+Patch19: shadow-4.2.1-date-parsing.patch
+# Additional error message - could be upstreamed
+Patch21: shadow-4.6-move-home.patch
+# Audit message changes - upstreamability unknown
+Patch22: shadow-4.8-audit-update.patch
+# Changes related to password unlocking - could be upstreamed
+Patch23: shadow-4.5-usermod-unlock.patch
+# Additional SElinux related changes - upstreamability unknown
+Patch28: shadow-4.8-selinux-perms.patch
+# Handle NULL return from *time funcs - could be upstreamed
+Patch29: shadow-4.2.1-null-tm.patch
+# SElinux related - upstreamability unknown
+Patch31: shadow-4.6-getenforce.patch
+# Handle include of crypt.h - could be upstreamed
+Patch32: shadow-4.8-crypt_h.patch
+# Handle /etc/passwd corruption - could be upstreamed
+Patch33: shadow-4.8-long-entry.patch
+# Limit uid/gid allocation to non-zero - could be upstreamed
+Patch38: shadow-4.6-sysugid-min-limit.patch
+# Ignore LOGIN_PLAIN_PROMPT in login.defs - upstreamability unknown
+Patch40: shadow-4.8-ignore-login-prompt.patch
+# Make the missing shell check into warning - could be upstreamed
+Patch41: shadow-4.8-invalid-shell-check.patch
+# Generate /var/spool/mail/$USER with the proper SELinux user identity - already  upstreamed
+Patch42: shadow-4.8-useradd-selinux-mail.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRequires: gcc
+BuildRequires: audit-libs-devel >= 1.6.5
+BuildRequires: libacl-devel, libattr-devel
+BuildRequires: bison, flex, docbook-style-xsl, docbook-dtds
+BuildRequires: autoconf, automake, libtool, gettext-devel
+BuildRequires: /usr/bin/xsltproc, /usr/bin/itstool
 Obsoletes: adduser
 
 %description
@@ -66,27 +101,39 @@ pwconvコマンドはパスワードをシャドウパスワードフォーマ
 %patch0 -p1 -b .redhat
 %patch1 -p1 -b .goodname
 %patch2 -p1 -b .info-parent-dir
-%patch3 -p1 -b .uflg
 %if %{WITH_SELINUX}
 %patch6 -p1 -b .selinux
 %endif
-%patch7 -p1 -b .2ndskip
-%patch8 -p1 -b .backup-mode
-%patch9 -p1 -b .merge-group
-%patch10 -p1 -b .orig-context
 %patch11 -p1 -b .logmsg
-%patch12 -p1 -b .errmsg
-%patch13 -p1 -b .audit-owner
 %patch14 -p1 -b .default-range
 %patch15 -p1 -b .manfix
-%patch16 -p1 -b .crypt-null
 %patch17 -p1 -b .userdel
-%patch18 -p1 -b .group-alloc
+%patch19 -p1 -b .date-parsing
+%patch21 -p1 -b .move-home
+%patch22 -p1 -b .audit-update
+%patch23 -p1 -b .unlock
+%patch28 -p1 -b .selinux-perms
+%patch29 -p1 -b .null-tm
+%if %{WITH_SELINUX}
+%patch31 -p1 -b .getenforce
+%endif
+%patch32 -p1 -b .crypt_h
+%patch33 -p1 -b .long-entry
+%patch38 -p1 -b .sysugid-min-limit
+%patch40 -p1 -b .login-prompt
+%patch41 -p1 -b .invalid-shell
+%if %{WITH_SELINUX}
+%patch42 -p1 -b .useradd-selinux-mail
+%endif
 
-#autoreconf -f -i
+iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
+cp -f doc/HOWTO.utf8 doc/HOWTO
+
+# Force regeneration of getdate.c
+rm libmisc/getdate.c
 
-%build
 
+%build
 export CFLAGS="$RPM_OPT_FLAGS -fpie"
 export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 
@@ -102,70 +149,70 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 	--without-libpam \
 	--disable-shared \
 	--with-group-name-max-length=32
-make 
+make %{_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT gnulocaledir=$RPM_BUILD_ROOT/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs
-install -d -m 755 $RPM_BUILD_ROOT/etc/default
-install -c -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/etc/login.defs
-install -c -m 0600 %{SOURCE2} $RPM_BUILD_ROOT/etc/default/useradd
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} gnulocaledir=%{buildroot}/%{_datadir}/locale MKINSTALLDIRS=`pwd`/mkinstalldirs
+install -d -m 755 %{buildroot}/etc/default
+install -c -m 0644 %{SOURCE1} %{buildroot}/etc/login.defs
+install -c -m 0600 %{SOURCE2} %{buildroot}/etc/default/useradd
 
 
-ln -s useradd $RPM_BUILD_ROOT%{_sbindir}/adduser
-ln -s useradd.8 $RPM_BUILD_ROOT/%{_mandir}/man8/adduser.8
-for subdir in $RPM_BUILD_ROOT/%{_mandir}/{??,??_??,??_??.*}/man* ; do
+ln -s useradd %{buildroot}%{_sbindir}/adduser
+ln -s useradd.8 %{buildroot}/%{_mandir}/man8/adduser.8
+for subdir in %{buildroot}/%{_mandir}/{??,??_??,??_??.*}/man* ; do
 	test -d $subdir && test -e $subdir/useradd.8 && echo ".so man8/useradd.8" > $subdir/adduser.8
 done
 
 # Remove binaries we don't use.
-rm $RPM_BUILD_ROOT/%{_bindir}/chfn
-rm $RPM_BUILD_ROOT/%{_bindir}/chsh
-rm $RPM_BUILD_ROOT/%{_bindir}/expiry
-rm $RPM_BUILD_ROOT/%{_bindir}/groups
-rm $RPM_BUILD_ROOT/%{_bindir}/login
-rm $RPM_BUILD_ROOT/%{_bindir}/passwd
-rm $RPM_BUILD_ROOT/%{_bindir}/su
-rm $RPM_BUILD_ROOT/%{_sysconfdir}/login.access
-rm $RPM_BUILD_ROOT/%{_sysconfdir}/limits
-rm $RPM_BUILD_ROOT/%{_sbindir}/logoutd
-rm $RPM_BUILD_ROOT/%{_sbindir}/nologin
-rm $RPM_BUILD_ROOT/%{_sbindir}/chgpasswd
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/chfn.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/chfn.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/chsh.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/chsh.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/expiry.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/expiry.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/groups.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/groups.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/login.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/login.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man1/su.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man1/su.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/limits.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/limits.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/login.access.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/login.access.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/passwd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/porttime.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/porttime.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man5/suauth.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man5/suauth.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/logoutd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/logoutd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/nologin.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/nologin.*
-rm $RPM_BUILD_ROOT/%{_mandir}/man8/chgpasswd.*
-rm $RPM_BUILD_ROOT/%{_mandir}/*/man8/chgpasswd.*
+rm %{buildroot}/%{_bindir}/chfn
+rm %{buildroot}/%{_bindir}/chsh
+rm %{buildroot}/%{_bindir}/expiry
+rm %{buildroot}/%{_bindir}/groups
+rm %{buildroot}/%{_bindir}/login
+rm %{buildroot}/%{_bindir}/passwd
+rm %{buildroot}/%{_bindir}/su
+rm %{buildroot}/%{_sysconfdir}/login.access
+rm %{buildroot}/%{_sysconfdir}/limits
+rm %{buildroot}/%{_sbindir}/logoutd
+rm %{buildroot}/%{_sbindir}/nologin
+rm %{buildroot}/%{_sbindir}/chgpasswd
+rm %{buildroot}/%{_mandir}/man1/chfn.*
+rm %{buildroot}/%{_mandir}/*/man1/chfn.*
+rm %{buildroot}/%{_mandir}/man1/chsh.*
+rm %{buildroot}/%{_mandir}/*/man1/chsh.*
+rm %{buildroot}/%{_mandir}/man1/expiry.*
+rm %{buildroot}/%{_mandir}/*/man1/expiry.*
+rm %{buildroot}/%{_mandir}/man1/groups.*
+rm %{buildroot}/%{_mandir}/*/man1/groups.*
+rm %{buildroot}/%{_mandir}/man1/login.*
+rm %{buildroot}/%{_mandir}/*/man1/login.*
+rm %{buildroot}/%{_mandir}/man1/passwd.*
+rm %{buildroot}/%{_mandir}/*/man1/passwd.*
+rm %{buildroot}/%{_mandir}/man1/su.*
+rm %{buildroot}/%{_mandir}/*/man1/su.*
+rm %{buildroot}/%{_mandir}/man5/limits.*
+rm %{buildroot}/%{_mandir}/*/man5/limits.*
+rm %{buildroot}/%{_mandir}/man5/login.access.*
+rm %{buildroot}/%{_mandir}/*/man5/login.access.*
+rm %{buildroot}/%{_mandir}/man5/passwd.*
+rm %{buildroot}/%{_mandir}/*/man5/passwd.*
+rm %{buildroot}/%{_mandir}/man5/porttime.*
+rm %{buildroot}/%{_mandir}/*/man5/porttime.*
+rm %{buildroot}/%{_mandir}/man5/suauth.*
+rm %{buildroot}/%{_mandir}/*/man5/suauth.*
+rm %{buildroot}/%{_mandir}/man8/logoutd.*
+rm %{buildroot}/%{_mandir}/*/man8/logoutd.*
+rm %{buildroot}/%{_mandir}/man8/nologin.*
+rm %{buildroot}/%{_mandir}/*/man8/nologin.*
+rm %{buildroot}/%{_mandir}/man8/chgpasswd.*
+rm %{buildroot}/%{_mandir}/*/man8/chgpasswd.*
 
 %find_lang shadow
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files -f shadow.lang
 %defattr(-,root,root)
@@ -179,6 +226,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/gpasswd
 %{_bindir}/lastlog
 %{_bindir}/newgrp
+%attr(0755,root,root) %caps(cap_setgid=ep) %{_bindir}/newgidmap
+%attr(0755,root,root) %caps(cap_setuid=ep) %{_bindir}/newuidmap
 %{_sbindir}/adduser
 %{_sbindir}/user*
 %{_sbindir}/group*
@@ -197,6 +246,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man1/sg.1*
 %{_mandir}/man1/newgrp.1*
 %{_mandir}/*/man1/newgrp.1*
+%{_mandir}/man1/newgidmap.1*
+%{_mandir}/*/man1/newgidmap.1*
+%{_mandir}/man1/newuidmap.1*
+%{_mandir}/*/man1/newuidmap.1*
 %{_mandir}/man3/shadow.3*
 %{_mandir}/*/man3/shadow.3*
 %{_mandir}/man3/getspnam.3*
@@ -209,6 +262,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man5/gshadow.5*
 %{_mandir}/man5/faillog.5*
 %{_mandir}/*/man5/faillog.5*
+%{_mandir}/man5/subgid.5*
+%{_mandir}/*/man5/subgid.5*
+%{_mandir}/man5/subuid.5*
+%{_mandir}/*/man5/subuid.5*
 %{_mandir}/man8/adduser.8*
 %{_mandir}/*/man8/adduser.8*
 %{_mandir}/man8/group*.8*
@@ -235,6 +292,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/man8/vigr.8*
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2:4.8-1
+- updated to 4.8.
+- updated patches.
+
 * Wed Jul 09 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 2:4.1.5.1-1
 - update to 4.1.5.1
 
@@ -258,7 +319,7 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Aug 15 2008 Shu KONNO <owa@bg.wakwak.com> 2:4.0.16-1vl5
 - applied new versioning policy, spec in utf-8
 
-* Tue Aug 14 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 2:4.0.16-0vl3
+* Mon Aug 14 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 2:4.0.16-0vl3
 - update Patch0 to fix <BTS:0499>
   - select smaller gid value for system account
 
@@ -431,7 +492,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Nov 06 1997 Cristian Gafton <gafton@redhat.com>
 - added forgot lastlog command to the spec file
 
-* Mon Oct 26 1997 Cristian Gafton <gafton@redhat.com>
+* Sun Oct 26 1997 Cristian Gafton <gafton@redhat.com>
 - obsoletes adduser
 
 * Thu Oct 23 1997 Cristian Gafton <gafton@redhat.com>

+ 46 - 44
t/tcsh/tcsh-vl.spec

@@ -3,37 +3,33 @@
 Summary: An enhanced version of csh, the C shell
 Summary(ja): csh, Cシェルの進化バージョン
 Name: tcsh
-Version: 6.18.01
+Version: 6.22.02
 Release: 1%{?_dist_release}
 License: BSD
 URL: http://www.tcsh.org/
 Group: System Environment/Shells
 
-Source: ftp://ftp.astron.com/pub/tcsh/%{name}-%{version}.tar.gz
-Patch1: tcsh-6.15.00-closem.patch
-Patch2: tcsh-6.14.00-tinfo.patch
-Patch3: tcsh-6.14.00-unprintable.patch
-Patch4: tcsh-6.15.00-hist-sub.patch
-Patch8: tcsh-6.14.00-syntax.patch
-Patch9: tcsh-6.13.00-memoryuse.patch
-Patch11: tcsh-6.14.00-order.patch
-# Proposed upstream - http://github.com/tcsh-org/tcsh/pull/1
-Patch28: tcsh-6.17.00-manpage-spelling.patch
-# Proposed upstream - http://github.com/tcsh-org/tcsh/pull/2
-Patch31: tcsh-6.18.00-history-file-locking.patch
-Patch33: tcsh-6.18.00-history-merge.patch
-Patch34: tcsh-6.18.01-repeated-words-man.patch
-# Proposed upstream - http://mx.gw.com/pipermail/tcsh-bugs/2013-April/000833.html
-Patch35: tcsh-6.18.01-elf-interpreter.patch
-Patch36: tcsh-6.18.01-posix-exit-status-value.patch
-Patch37: tcsh-6.18.01-reverse-history-handling-in-loops.patch
+Source: https://astron.com/pub/tcsh/%{name}-%{version}.tar.gz
+# NOTE: 'autosetup' macro (below) uses 'git' for applying the patches:
+#       ->> All the patches should be provided in 'git format-patch' format.
+#       ->> Auxiliary repository will be created during 'fedpkg prep', you
+#           can see all the applied patches there via 'git log'.
+
+# Upstream patches -- official upstream patches released by upstream since the
+# ----------------    last rebase that are necessary for any reason:
+Patch001: tcsh-6.22.02-avoid-gcc-to-fail.patch
+
+
+# Downstream patches -- these should be always included when doing rebase:
+# ------------------
+Patch100: tcsh-6.20.00-manpage-memoryuse.patch
 
 Provides: csh = %{version}
 Requires(post): grep
 Requires(postun): coreutils, grep
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: autoconf, automake, ncurses-devel, gettext-devel
+BuildRequires: autoconf, automake, ncurses-devel, gettext-devel, git
 
 %description
 Tcsh is an enhanced but completely compatible version of csh, the C
@@ -51,29 +47,26 @@ tcsh は、バークレイ版 UNIX の C シェル csh と完全に互換性が
 tcsh には、コマンド行編集機能や、プログラム可能な単語の補完機能、
 スペル訂正、履歴、ジョブ制御、C 言語風の文法等が含まれます。
 
+
 %prep
-%setup -q
-%patch1 -p1 -b .closem
-%patch2 -p1 -b .tinfo
-%patch3 -p1 -b .unprintable
-%patch4 -p1 -b .hist-sub
-%patch8 -p1 -b .syntax
-%patch9 -p1 -b .memoryuse
-%patch11 -p1 -b .order
-%patch28 -p1 -b .manpage-spelling
-%patch31 -p1 -b .history-file-locking
-%patch33 -p1 -b .history-merge
-%patch34 -p1 -b .repeated-words-man
-%patch35 -p1 -b .elf-interpreter
-%patch36 -p1 -b .posix-exit-status-value
-%patch37 -p1 -b .reverse-history-handling-in-loops
-
-for i in Fixes WishList; do
- iconv -f iso-8859-1 -t utf-8 "$i" > "${i}_" && \
- touch -r "$i" "${i}_" && \
- mv "${i}_" "$i"
+%autosetup -N -S git
+
+# NOTE: If more files needs to be converted, add them here:
+for file in Fixes; do
+  iconv -f iso-8859-1 -t utf-8 "$file" > "${file}.converted" && \
+  touch -r "$file" "${file}.converted" && \
+  mv "${file}.converted" "$file"
 done
 
+# Also, rename the Copyright so we comply with more generally accepted name:
+mv Copyright COPYING
+
+# Amend the converted files to the initial commit, and patch the source code:
+git add --all --force
+git commit --all --amend --no-edit > /dev/null
+%autopatch -p1
+
+
 %build
 # For tcsh-6.14.00-tinfo.patch
 autoreconf
@@ -81,6 +74,7 @@ autoreconf
 make %{?_smp_mflags} all
 make %{?_smp_mflags} -C nls catalogs
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 ${RPM_BUILD_ROOT}%{_bindir}
@@ -111,6 +105,11 @@ ru russian
 uk ukrainian
 _EOF
 
+
+%check
+%make_build check
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -140,6 +139,9 @@ fi
 %{_mandir}/man1/*.1*
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.22.02
+- new upstream release.
+
 * Sun Jul 20 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 6.18.01-1
 - update to 6.18.01
 
@@ -229,7 +231,7 @@ fi
     (#186037)
 - added japanese description
 
-* Thu Apr 02 2004 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 6.12-0vl5
+* Fri Apr 02 2004 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 6.12-0vl5
 - added patch from fedora 
   * Tue Feb 10 2004 Nalin Dahyabhai <nalin@redhat.com> 6.12-7
   - remove declaration of setpgrp() which conflicts with libc's (#115185)
@@ -265,7 +267,7 @@ fi
 * Mon Jan 21 2002 KOBAYASHI R. Taizo <tkoba@vinelinux.org> 6.11-0vl1
 - update
 
-* Thu Dec 28 2001 Satoshi MACHINO <machino@vinelinux.org> 6.10.02-0vl2
+* Fri Dec 28 2001 Satoshi MACHINO <machino@vinelinux.org> 6.10.02-0vl2
 - fixed check locale
 	- merged some patches from RHL-7.2
 
@@ -282,7 +284,7 @@ fi
 * Thu Nov 30 2000 Nalin Dahyabhai <nalin@redhat.com>
 - update to 6.10.00 to fix here-script vulnerability
 
-* Wed Sep 18 2000 Adrian Havill <havill@redhat.com>
+* Mon Sep 18 2000 Adrian Havill <havill@redhat.com>
 - fix catalog locale dirname for Japanese
 
 * Thu Jun 15 2000 Jeff Johnson <jbj@redhat.com>
@@ -326,7 +328,7 @@ fi
 * Mon Apr 27 1998 Prospector System <bugs@redhat.com>
 - translations modified for de, fr, tr
 
-* Thu Oct 21 1997 Cristian Gafton <gafton@redhat.com>
+* Tue Oct 21 1997 Cristian Gafton <gafton@redhat.com>
 - updated to 6.07; added BuildRoot
 - cleaned up the spec file; fixed source url
 

+ 64 - 49
t/texinfo/texinfo-vl.spec

@@ -1,3 +1,5 @@
+%bcond_without  test
+
 %define      extraver	a
 
 %define      _infodir	/usr/share/info
@@ -6,26 +8,30 @@ Summary:     Tools needed to create Texinfo format documentation files.
 Summary(ja): Texinfo ドキュメントを作成する為に使うツール群
 
 Name:        texinfo
-Version:     4.13a
-Release:     2%{?_dist_release}
-License:     GPLv3+
+Version:     6.7
+Release:     1%{?_dist_release}
 Group:       Applications/Publishing
-URL:         http://www.gnu.org/software/texinfo/
 
-#Source0:     ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}%{?extraver:%extraver}.tar.bz2
-Source0:     ftp://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.lzma
+Vendor:      Project Vine
+Distribution: Vine Linux
+Packager:    daisuke
+
+License:     GPLv3+
+URL:         https://www.gnu.org/software/texinfo/
+Source0:     https://ftp.gnu.org/gnu/texinfo/texinfo-%{version}.tar.xz
 Source1:     info-dir
+
 Patch0: texinfo-4.12-zlib.patch
-Patch1: texinfo-4.13a-data_types.patch
-# Patch2: is already upstream
-Patch2: texinfo-4.13a-mosdo-crash.patch
-Patch3: texinfo-4.13a-powerpc.patch
-# Patch4: accepted by upstream, bz579263
-Patch4: texinfo-4.13a-help-index-segfault.patch
-# Patch5: already upstream, bz641534
-Patch5: texinfo-4.13a-texi2dvi-regexp.patch
-# Patch6: already upstream, bz651314
-Patch6: texinfo-4.13a-makeinfo-sectioning.patch
+# Patch1: this is needed just for koji/mock, all tests pass fine in local build
+Patch1: texinfo-6.0-disable-failing-info-test.patch
+# Patch2: rhbz#1348671, because of OSTree
+Patch2: texinfo-6.1-install-info-use-create-tmp-then-rename-pattern.patch
+# Patch3: we need to fix template fix-info-dir generates
+Patch3: info-6.5-sync-fix-info-dir.patch
+# Patch4: rhbz#1592433, bug in fix-info-dir --delete
+Patch4: texinfo-6.5-fix-info-dir.patch
+# Patch5: fixes issues detected by static analysis
+Patch5: texinfo-6.5-covscan-fixes.patch
 
 Requires(post): install-info
 Requires(preun): install-info
@@ -33,17 +39,15 @@ Prefix:      %{_prefix}
 Buildroot:   %{_tmppath}/%{name}-%{version}-root
 BuildRequires: autoconf libtool ncurses-devel zlib-devel help2man
 
+# Texinfo perl packages are not installed in default perl library dirs
+%global __provides_exclude ^perl\\(.*Texinfo.*\\)$
+%global __requires_exclude ^perl\\(.*Texinfo.*\\)$
 
 # Redifine this to "dir" in the info directory isn't compressed
 
 %define __spec_install_post /usr/lib/rpm/brp-strip \; /usr/lib/rpm/brp-strip-comment-note \; rm -f
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
-
 %description
 Texinfo is a documentation system that can produce both online
 information and printed output from a single source file. The GNU
@@ -101,55 +105,54 @@ info file installer.
 info ファイルのインストーラーです.
 
 %prep
-%setup -q -n %{name}-4.13
-%patch0 -p1 -b .zlib
-%patch1 -p1 -b .data_types
-%patch2 -p1 -b .mosdo-crash
-%patch3 -p1 -b .powerpc
-%patch4 -p1 -b .help-index-segfault
-%patch5 -p1 -b .texi2dvi-regexp
-%patch6 -p1 -b .makeinfo-sectioning
-
+%autosetup -p1
 
 %build
 
-%configure --mandir=%{_mandir} --infodir=%{_infodir}
+%configure \
+	--mandir=%{_mandir} \
+	--infodir=%{_infodir} \
+	--enable-perl-xs=no
 make %{?_smp_mflags}
 
 make -C util LIBS=%{_libdir}/libz.a
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}/{etc,sbin}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/{etc,sbin}
 
 %makeinstall
 
-( cd ${RPM_BUILD_ROOT}
+( cd %{buildroot}
   gzip -n -9f .%{_infodir}/*info*
   gzip -n -9f .%{_mandir}/*/*
   install -m644 ${RPM_SOURCE_DIR}/info-dir ./etc/info-dir
-  ln -sf /etc/info-dir ${RPM_BUILD_ROOT}%{_infodir}/dir
-  for i in makeinfo texindex info install-info ; do
-    strip .%{_bindir}/$i
-  done
+  ln -sf /etc/info-dir %{buildroot}%{_infodir}/dir
   mv -f .%{_bindir}/install-info ./sbin
 )
 
 %find_lang %name
+%find_lang %{name}_document
+
 
+%if %{with test}
+%check
+export ALL_TESTS=yes
+%make_build check
+%endif
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
 
 %post
-/sbin/install-info %{_infodir}/texinfo.gz %{_infodir}/dir
+/sbin/install-info %{_infodir}/texinfo.info.gz %{_infodir}/dir
 
 
 %preun
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/texinfo.gz %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/texinfo.info.gz %{_infodir}/dir
 fi
 
 
@@ -163,41 +166,50 @@ if [ $1 = 0 ]; then
 fi
 
 
-%files -f %{name}.lang
+%files -f %{name}.lang -f %{name}_document.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog INSTALL INTRODUCTION NEWS README TODO
+%license COPYING
+%doc AUTHORS ChangeLog NEWS README TODO
 %{_bindir}/makeinfo
 %{_bindir}/pdftexi2dvi
-%{_bindir}/texindex
+%{_bindir}/pod2texi
+%{_bindir}/texi2any
 %{_bindir}/texi2dvi
 %{_bindir}/texi2pdf
+%{_bindir}/texindex
 %{_datadir}/texinfo
 %{_infodir}/texinfo*
+#dir %{_libdir}/texinfo
+#{_libdir}/texinfo/*
 %{_mandir}/man1/makeinfo.1*
 %{_mandir}/man1/pdftexi2dvi.1*
-%{_mandir}/man1/texindex.1*
+%{_mandir}/man1/pod2texi.1.gz
+%{_mandir}/man1/texi2any.1.gz
 %{_mandir}/man1/texi2dvi.1*
 %{_mandir}/man1/texi2pdf.1*
+%{_mandir}/man1/texindex.1*
 %{_mandir}/man5/texinfo.5*
-
+   
 
 %files -n info
 %defattr(-,root,root)
 #%config(missingok) /etc/X11/applnk/Utilities/info.desktop
 #%config(noreplace) %verify(not md5 size mtime) /etc/info-dir
 #%config(noreplace) %{_infodir}/dir
+%license COPYING
 %doc info/README
 %{_bindir}/info
-%{_bindir}/infokey
-%{_infodir}/info.info*
+#{_bindir}/infokey
+#{_infodir}/info.info*
 %{_infodir}/info-stnd.info*
 %{_mandir}/man1/info.1*
-%{_mandir}/man1/infokey.1*
+#{_mandir}/man1/infokey.1*
 %{_mandir}/man5/info.5*
 
 
 %files -n install-info
 %defattr(-,root,root)
+%license COPYING
 %config(noreplace) %verify(not md5 size mtime) /etc/info-dir
 %config(noreplace) %{_infodir}/dir
 %{_syssbindir}/install-info
@@ -205,6 +217,9 @@ fi
 
 
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 6.7-1
+- new upstream release.
+
 * Sun Jul 13 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.13a-2
 - rebuild with VineSeed environment
 

+ 7 - 1
u/usermode/usermode-vl.spec

@@ -5,7 +5,7 @@ Summary: Tools for certain user account management tasks.
 Summary(ja): ユーザアカウント管理用ツール
 Name: usermode
 Version: 1.109
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPLv2+
 Group: Applications/System
 URL: https://fedorahosted.org/usermode/
@@ -14,6 +14,7 @@ Source: https://fedorahosted.org/releases/u/s/usermode/usermode-%{version}.tar.x
 ## Vine Source(s)/Patch(es)
 Source10: usermode-1.107-ja.po
 Patch10: usermode-1.37-halt-p.patch
+Patch1000: usermode-major.patch
 
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -70,6 +71,7 @@ cp -f po/ja.po po/ja.po.orig
 cp -f %{SOURCE10} po/ja.po
 
 %patch10 -p1 -b .halt-p
+%patch1000 -p1
 
 %build
 intltoolize --force --copy
@@ -142,6 +144,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/*
       
 %changelog
+* Wed Mar 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.109-2
+- rebuilt with current environment.
+- added Patch1000.
+
 * Wed Jul 02 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 1.109-1
 - update to 1.109