updated 4 packages

asciidoc-9.1.0-1

aspell-0.60.8-1

symlinks-1.7-5

xinetd-2.3.15-2

a/asciidoc/asciidoc-vl.spec

@@ -1,55 +1,145 @@
 Summary: Text based document generation
 Summary(ja): テキストベースのドキュメント生成
 Name: asciidoc
-Version: 8.6.9
+Version: 9.1.0
 Release: 1%{?_dist_release}
-License: GPLv2+
-Group: Applications/Text
-URL: http://asciidoc.org/
+Group: office
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke, kenta
 
-Source0: http://downloads.sourceforge.net/project/asciidoc/asciidoc/%{version}/%{name}-%{version}.tar.gz
+License: GPLv2+
+URL: https://asciidoc.org/
+Source0: https://github.com/asciidoc-py/asciidoc-py/releases/download/%{version}/%{name}-%{version}.tar.gz
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python
-Requires: python
+BuildRequires: python3
+BuildRequires: symlinks
+Requires: python3
 Requires: docbook-style-xsl
 Requires: libxslt
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke, kenta
+Requires: graphviz
+Requires: source-highlight
 
 %description
 AsciiDoc is a text document format for writing short documents,
 articles, books and UNIX man pages. AsciiDoc files can be translated
 to HTML and DocBook markups using the asciidoc(1) command.
 
+
+%package doc
+Summary:  Additional documentation and examples for asciidoc
+Group: documentation
+Requires: %{name} = %{version}-%{release}
+
+%description doc
+%{summary}.
+
+
+%package latex
+Summary:  Support for asciidoc latex output
+Group: publishing
+Requires: %{name} = %{version}-%{release}
+Requires: texlive
+
+%description latex
+%{summary}.
+
+
 %prep
 %setup -q
+# Convert files to utf-8
+for file in README.asciidoc doc/*.dict website/*.dict; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
+
+# Remove music files
+rm -rf %{buildroot}{%{_sysconfdir}/asciidoc/filters/music,%{_sysconfdir}/asciidoc/filters/music/*.conf,%{_sysconfdir}/asciidoc/filters/music/*.py}
+
+# Fix python shebang
+grep -rl '#!/usr/bin/env python' | xargs -r \
+    sed -i -e '1s@#!/usr/bin/env python3\?$@#!%{__python3}@'
+
 
 %build
+autoreconf -v
 %configure
+%make_build
+
 
 %install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install docs DESTDIR=%{buildroot}
+
+install -dm 755 %{buildroot}%{_datadir}/asciidoc/
+# Real conf data goes to sysconfdir, rest to datadir; symlinks so asciidoc works
+for d in dblatex docbook-xsl images javascripts stylesheets; do
+    mv -v %{buildroot}%{_sysconfdir}/asciidoc/$d \
+          %{buildroot}%{_datadir}/asciidoc/
+    # Absolute symlink into buildroot is intentional, see below
+    ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_sysconfdir}/%{name}/
+
+    # Let's symlink stuff for documentation as well so we don't duplicate things
+    rm -rf %{buildroot}%{_docdir}/%{name}/$d
+    # Absolute symlink into buildroot is intentional, see below
+    ln -s %{buildroot}%{_datadir}/%{name}/$d %{buildroot}%{_docdir}/%{name}/
+done
 
 # Python API
-install -Dpm 644 asciidocapi.py %{buildroot}%{python_sitelib}/asciidocapi.py
+mkdir -p %{buildroot}%{python3_sitelib}/
+sed '1d' asciidocapi.py > %{buildroot}%{python3_sitelib}/asciidocapi.py
+chmod -x %{buildroot}%{python3_sitelib}/asciidocapi.py
+touch -r asciidocapi.py %{buildroot}%{python3_sitelib}/asciidocapi.py
+
+# Make it easier to %%exclude these with both rpm < and >= 4.7
+for file in %{buildroot}{%{_bindir},%{_sysconfdir}/asciidoc/filters/*}/*.py ; do
+    touch ${file}{c,o}
+done
+
+# Clean up no needed doc files
+rm -f %{buildroot}%{_pkgdocdir}/INSTALL.txt
+rm -f %{buildroot}%{_mandir}/man1/testasciidoc.1*
+rm -f %{buildroot}%{_bindir}/*.py[co]
+rm -f %{buildroot}%{_sysconfdir}/asciidoc/filters/*/*.py[co]
+
+# Absolute symlinks were used above to be able to detect dangling ones. Make
+# them relative now (sane for being installed) and remove dangling symlinks.
+for l in $(find %{buildroot} -type l); do symlinks -cdov $l; done
 
-%clean
-rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,0755)
+%license COPYRIGHT
+%doc BUGS.txt CHANGELOG.txt README*
 %config(noreplace) %{_sysconfdir}/asciidoc
 %{_bindir}/*
 %{_mandir}/man1/*
-%{python_sitelib}/asciidocapi.py*
-%doc BUGS CHANGELOG COPYING COPYRIGHT README
+%{python3_sitelib}/asciidocapi.py*
+%{_datadir}/asciidoc/
+%exclude %{_sysconfdir}/asciidoc/filters/latex
+%exclude %{_sysconfdir}/asciidoc/filters/music
+%exclude %{_pkgdocdir}/website
+%exclude %{_pkgdocdir}/doc
+%exclude %{_pkgdocdir}/{dblatex,docbook-xsl,images,javascripts,stylesheets}
+
+%files doc
+%{_pkgdocdir}/website
+%{_pkgdocdir}/doc
+%{_pkgdocdir}/{dblatex,docbook-xsl,images,javascripts,stylesheets}
+%exclude %{_docdir}/%{name}/{COPYRIGHT,README.asciidoc}
+
+%files latex
+%dir %{_sysconfdir}/asciidoc/filters/latex
+%{_sysconfdir}/asciidoc/filters/latex/*.py
+%config(noreplace) %{_sysconfdir}/asciidoc/filters/latex/*.conf
+
 
 %changelog
+* Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 9.1.0-1
+- new upstream release.
+
 * Tue Jan  6 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 8.6.9-1
 - new upstream version
 - moved to Applications/Text Group

a/aspell/aspell-vl.spec

@@ -1,29 +1,24 @@
 %define _noVersionedDependencies        1
 
-%define ver 0.60.6.1
-%define rel 2
-
 Summary:         A spelling checker.
 Summary(ja):     スペルチェッカ
 Name:            aspell
-Version:         %{ver}
-Release:         %{rel}%{?_dist_release}
-License:         LGPL
-Group:           Applications/Text
-URL:             http://aspell.net/
+Version:         0.60.8
+Release:         1%{?_dist_release}
+Group:           office
 Vendor:          Project Vine
 Distribution:    Vine Linux
 
-Source0:         ftp://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz
+License:         LGPL
+URL:             http://aspell.net/
+Source0:         https://ftp.gnu.org/gnu/aspell/aspell-%{version}.tar.gz
 Source10:        %{name}-install.sh
 Source11:        %{name}-remove.sh
 Source12:        %{name}-init.el
 Source100:       aspell.conf
-Patch1003:       aspell-0.60.3-install_info.patch
-Patch1005:       aspell-0.60.5-fileconflict.patch
-Patch1007:       aspell-0.60.5-pspell_conf.patch
-Patch1008:       aspell-0.60.6-zero.patch
-Patch1009:       aspell-0.60.6-mp.patch
+Patch1005:       aspell-0.60.7-fileconflict.patch
+Patch1007:       aspell-0.60.7-pspell_conf.patch
+Patch1009:       aspell-0.60.7-mp.patch
 
 BuildRequires:   gcc-c++ gettext ncurses-devel pkgconfig
 BuildRequires:   chrpath
@@ -47,7 +42,7 @@ than one Aspell process is open at once.
 
 %package	devel
 Summary: Static libraries and header files for Aspell development.
-Group: Development/Libraries
+Group: programming
 Requires: aspell = %{version}-%{release}
 Obsoletes: pspell-devel
 
@@ -58,7 +53,7 @@ static libraries and header files needed for Aspell development.
 
 %package        el
 Summary: Emacs lisp for aspell
-Group: Applications/Editors/Emacs
+Group: accesories
 Requires: aspell = %{version}-%{release}
 Requires: emacsen-common
 
@@ -67,18 +62,22 @@ Aspell is a spelling checker. The aspell-el package includes the
 elisp for using aspell within emacsen.
 
 
+%debug_package
+
+
 %prep
 %setup -q
-%patch1003 -p1 -b .iinfo
 %patch1005 -p1 -b .fc
 %patch1007 -p1 -b .mlib
-%patch1008 -p1 -b .zero
 %patch1009 -p1 -b .ai
-iconv -f windows-1252 -t utf-8 manual/aspell.info -o manual/aspell.info.aux
+
+iconv -f iso-8859-2 -t utf-8 < manual/aspell.info > manual/aspell.info.aux
 mv manual/aspell.info.aux manual/aspell.info
 
+
 %build
 %configure --disable-rpath
+sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
 make %{?_smp_mflags}
 cp scripts/aspell-import examples/aspell-import
 chmod 644 examples/aspell-import
@@ -124,19 +123,19 @@ install -m 644 %{SOURCE12} %{buildroot}/usr/share/emacs/site-lisp/%{name}
 
 %_removeemacsenscript  %{name} %{SOURCE11}
 
-rm -f $RPM_BUILD_ROOT/usr/share/doc/aspell/manual.aux
+rm -f $RPM_BUILD_ROOT%{_docdir}/aspell/manual.aux
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
 %find_lang %{name}
-   
+
+
 %post
-/sbin/ldconfig
 # info
 if [ "$1" = 0 ] ; then
 %{_syssbindir}/install-info %{_infodir}/aspell.info.gz %{_infodir}/dir
 fi
 
 %post devel
-/sbin/ldconfig
 # info
 if [ "$1" = 0 ] ; then
 %{_syssbindir}/install-info %{_infodir}/aspell-dev.info.gz %{_infodir}/dir
@@ -152,10 +151,6 @@ fi
 %_addemacsenlist %{name}
 
 %_emacsenPackageInstall %{name}
-       
-
-%postun
-/sbin/ldconfig
 
 %preun
 if [ $1 = 0 ]; then
@@ -180,9 +175,11 @@ fi
 %clean
 rm -rf %{buildroot}
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/aspell.conf
+%license COPYING
 %doc README TODO COPYING examples/aspell-import examples/aspell-import.1
 %dir %{_libdir}/aspell-0.60
 %{_bindir}/a*
@@ -215,6 +212,12 @@ rm -rf %{buildroot}
 %{_prefix}/lib/emacsen-common/packages/remove/%{name}
 
 %changelog
+* Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.60.8-1
+- new upstream release.
+- dropped Patch1003 and 1008.
+- updated Patch1005, 1007 and 1009.
+- dropped ldconfig scriptlets.
+
 * Fri Jul  1 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.60.6.1-2
 - rebuilt with new toolchain.
 

s/symlinks/symlinks-vl.spec

@@ -0,0 +1,255 @@
+Summary: A utility which maintains a system's symbolic links
+Name: symlinks
+Version: 1.7
+Release: 5%{?_dist_release}
+Group: system
+License: Copyright only
+URL: http://ibiblio.org/pub/Linux/utils/file/
+# Upstream maintainer provided tarball, ibiblio no longer allowing uploads
+Source0: http://ibiblio.org/pub/Linux/utils/file/%{name}-%{version}.tar.gz
+# Taken from http://packages.debian.org/changelogs/pool/main/s/symlinks/symlinks_1.2-4.2/symlinks.copyright
+Source1: symlinks-LICENSE.txt
+
+BuildRequires: make
+BuildRequires: gcc
+
+%description
+The symlinks utility performs maintenance on symbolic links.  Symlinks
+checks for symlink problems, including dangling symlinks which point
+to nonexistent files.  Symlinks can also automatically convert
+absolute symlinks to relative symlinks.
+
+Install the symlinks package if you need a program for maintaining
+symlinks on your system.
+
+
+%debug_package
+
+
+%prep
+%setup -q
+cp %{SOURCE1} .
+
+
+%build
+make CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) %{build_ldflags}" %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -m 755 symlinks $RPM_BUILD_ROOT%{_bindir}
+install -m 644 symlinks.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
+
+%files
+%doc symlinks-LICENSE.txt
+%{_bindir}/symlinks
+%{_mandir}/man1/symlinks.1*
+
+
+%changelog
+* Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.7-5
+- initial build for Vine Linux.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jan  8 2020 Tim Waugh <twaugh@redhta.com> - 1.7-1
+- 1.7, fixes #1786376.
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jul 23 2018 Tim Waugh <twaugh@redhat.com> - 1.4-21
+- Build requires gcc (bug #1606459).
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun 14 2018 Than Ngo <than@redhat.com> - 1.4-19
+- fixed upstream URL reference
+
+* Wed May 09 2018 Tim Waugh <twaugh@redhat.com> - 1.4-18
+- Fix partial build flags injection (bug #1573111).
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Feb 21 2015 Till Maas <opensource@till.name> - 1.4-11
+- Rebuilt for Fedora 23 Change
+  https://fedoraproject.org/wiki/Changes/Harden_all_packages_with_position-independent_code
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Fri May 20 2011 Tim Waugh <twaugh@redhat.com> 1.4-4
+- Applied patches from Jiri Popelka:
+  - Fix off-by-one error in call to readlink.
+  - Fix possible buffer overrun found by coverity.
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Nov 13 2009 Tim Waugh <twaugh@redhat.com> 1.4-2
+- 1.4.  All patches now upstream.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-34
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.2-32
+- fix license tag
+
+* Mon Feb 11 2008 Tim Waugh <twaugh@redhat.com> 1.2-31
+- Rebuild for GCC 4.3.
+
+* Wed Aug 29 2007 Tim Waugh <twaugh@redhat.com> 1.2-30
+- Rebuilt.
+
+* Fri Feb 23 2007 Tim Waugh <twaugh@redhat.com> 1.2-29
+- Use smp_mflags (bug #226445).
+- Better default attributes (bug #226445).
+- Make setup macro quiet (bug #226445).
+- Clean build root in %%install section (bug #226445).
+
+* Wed Feb  7 2007 Tim Waugh <twaugh@redhat.com> 1.2-28
+- Fixed build root (bug #226445).
+
+* Tue Feb  6 2007 Tim Waugh <twaugh@redhat.com> 1.2-27
+- Fixed summary (bug #226445).
+- Added token URL tag (bug #226445).
+
+* Tue Jan 30 2007 Florian La Roche <laroche@redhat.com> - 1.2-26
+- do not strip away debuginfo
+
+* Thu Jan 18 2007 Tim Waugh <twaugh@redhat.com> - 1.2-25
+- Build with LFS support (bug #206407).
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.2-24.2.2
+- rebuild
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 1.2-24.2.1
+- bump again for double-long bug on ppc(64)
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.2-24.2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Wed Mar  2 2005 Tim Waugh <twaugh@redhat.com> 1.2-24
+- Rebuild for new GCC.
+
+* Wed Feb  9 2005 Tim Waugh <twaugh@redhat.com> 1.2-23
+- s/Copyright:/License:/.
+
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Oct 16 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- add patch from #89655
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Wed Dec 11 2002 Tim Powers <timp@redhat.com> 1.2-17
+- rebuild on all arches
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
+- Bump release + rebuild.
+
+* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
+- automatic rebuild
+
+* Tue Jun 13 2000 Preston Brown <pbrown@redhat.com>
+- FHS paths
+
+* Tue May 30 2000 Preston Brown <pbrown@redhat.com>
+- fix up help output (#10236)
+
+* Thu Feb 10 2000 Preston Brown <pbrown@redhat.com>
+- do not link statically
+
+* Mon Feb 07 2000 Preston Brown <pbrown@redhat.com>
+- rebuild to gzip man page
+
+* Mon Oct 04 1999 Cristian Gafton <gafton@redhat.com>
+- rebuild against the latest glibc in the sparc tree
+
+* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
+- auto rebuild in the new build environment (release 5)
+
+* Wed Feb 24 1999 Preston Brown <pbrown@redhat.com>
+- Injected new description and group.
+
+* Fri Dec 18 1998 Preston Brown <pbrown@redhat.com>
+- bumped spec number for initial rh 6.0 build
+
+* Mon Apr 27 1998 Prospector System <bugs@redhat.com>
+- translations modified for de, fr, tr
+
+* Mon Oct 20 1997 Otto Hammersmith <otto@redhat.com>
+- changed build root to /var/tmp, not /var/lib
+- updated to version 1.2
+
+* Wed Jul 09 1997 Erik Troan <ewt@redhat.com>
+- built against glibc
+- build-rooted

x/xinetd/xinetd-vl.spec

@@ -1,13 +1,21 @@
+%bcond_with systemd
+
 %define _use_internal_dependency_generator 0
 %define __find_requires %{SOURCE99}
 
 Summary: A secure replacement for inetd.
 Name: xinetd
 Version: 2.3.15
-Release: 1%{?_dist_release}
-License: Distributable (BSD-like)
-Group: System Environment/Daemons
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Group: servers
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: xinetd
+URL: https://github.com/xinetd-org/xinetd
+# https://github.com/xinetd-org/xinetd/archive/xinetd-2-3-15.tar.gz
 Source: http://www.xinetd.org/xinetd-%{version}.tar.gz
+
 Source1: xinetd.init
 Source2: xinetd.conf
 Source3: xinetd-inetdconvert
@@ -21,15 +29,69 @@ Source10: xinetd-chargen
 Source11: xinetd-uchargen
 Source12: xinetd.sysconf
 Source13: xinetd-services
+Source50: xinetd.service
 Source99: filter-requires-xinetd.sh
-Patch0: xinetd-2.3.11-pie.patch
-Patch1: xinetd-2.3.13-libwrap.patch
+Patch0: xinetd-2.3.15-pie.patch
+Patch4: xinetd-2.3.14-bind-ipv6.patch
+Patch6: xinetd-2.3.14-man-section.patch
+Patch8: xinetd-2.3.14-ident-bind.patch
+Patch9: xinetd-2.3.14-readable-debuginfo.patch
+# Patch for clean reconfiguration using newer versions of autotools
+Patch10: xinetd-2.3.14-autoconf.patch
+# Completely rewritten socket handling code (it uses poll() instead
+# of select() function)
+Patch11: xinetd-2.3.14-poll.patch
+# New configuration option (limit for files opened by child process)
+Patch12: xinetd-2.3.14-file-limit.patch
+# When using tcpmux, xinetd ended up with sigsegv
+# (detection of NULL pointer in pollfd structure was missing)
+Patch13: xinetd-2.3.14-tcpmux.patch
+# When service is destroyed, destroy also its
+# file descriptor in array given to poll function
+Patch14: xinetd-2.3.14-clean-pfd.patch
+# xinetd confuses ipv6 and ipv4 port parsing
+# - furtunately, they have the same format, so everything
+#   works even without this patch
+Patch15: xinetd-2.3.14-ipv6confusion.patch
+# This fixes bug #593904 - online reconfiguration caused log message
+# flood when turning off UDP service
+Patch16: xinetd-2.3.14-udp-reconfig.patch
+Patch18: xinetd-2.3.14-rpc-specific-port.patch
+Patch19: xinetd-2.3.14-signal-log-hang.patch
+Patch20: xinetd-2.3.14-fix-type-punned-ptr.patch
+# Fix leaking file descriptors and pfd_array wasting
+# This fixes #702670
+Patch21: xinetd-2.3.14-leaking-fds.patch
+# Fix memory corruption when loading a large number of services
+# This fixes #720390
+Patch22: xinetd-2.3.14-many-services.patch
+# Remove realloc of fds that was causing memory corruption
+Patch23: xinetd-2.3.14-realloc-remove.patch
+# Fix leaking descriptor when starting a service fails
+Patch24: xinetd-2.3.14-leaking-fds-2a.patch
+# Fix #770858 - Instances limit in xinetd can be easily bypassed
+Patch25: xinetd-2.3.14-instances.patch
+# Fix #809272 - Service disabled due to bind failure
+Patch26: xinetd-2.3.14-retry-svc-activate-in-cps-restart.patch
+Patch27: xinetd-2.3.15-bad-port-check.patch
+# Fix #977873 - Use full path to server when checking selinux context
+Patch28: xinetd-2.3.15-context-exepath.patch
+Patch29: xinetd-2.3.15-creds.patch
+# Fix #1033528 - xinetd segfaults when connecting to tcpmux service
+Patch30: xinetd-2.3.15-tcpmux-nameinargs-disable-service.patch
+Patch31: xinetd-2.3.15-udp-wait.patch
+Patch32: xinetd-2.3.15-remove-deprecated-flask.h.patch
 
-Requires(pre): chkconfig initscripts
-Requires: initscripts setup fileutils
-BuildRequires: tcp_wrappers
-URL: http://www.xinetd.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+
+#BuildRequires: tcp_wrappers
+%if %{with systemd}
+%{?systemd_requires}
+%else
+Requires: initscripts setup fileutils
+Requires(pre): chkconfig initscripts
+%endif
+
 Provides: inetd
 
 %description
@@ -42,24 +104,27 @@ services to specific IP addresses on your host machine. Each service
 has its own specific configuration file for Xinetd; the files are
 located in the /etc/xinetd.d directory.
 
+
+%debug_package
+
+
 %prep
-%setup -q  
-#%patch0 -p0 -b .pie
-#%patch1 -p1 -b .libwrap
-#%patch2 -p1 -b .tcp_rpc
+%setup -q
+%autopatch -p1
+aclocal
+autoconf
+
 
 %build
-libtoolize --copy --force
-%configure --with-loadavg --with-inet6 --with-libwrap
-make
+%configure --with-loadavg --with-inet6
+# --with-libwrap
+make CFLAGS="$CFLAGS -fpie $(pkg-config --cflags libtirpc)" LDFLAGS="$LDFLAGS $(pkg-config --libs libtirpc) -Wl,-z,relro,-z,now"
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 mkdir -p $RPM_BUILD_ROOT/%{_mandir}
 %makeinstall DAEMONDIR=$RPM_BUILD_ROOT/usr/sbin MANDIR=$RPM_BUILD_ROOT/%{_mandir}
 mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d/
-install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/xinetd
 install -m 644 %SOURCE2 $RPM_BUILD_ROOT/etc/xinetd.conf
 install -m 755 %SOURCE3 $RPM_BUILD_ROOT/usr/sbin/inetdconvert
 install -m 644 %SOURCE4 $RPM_BUILD_ROOT/etc/xinetd.d/time
@@ -79,41 +144,69 @@ rm -f $RPM_BUILD_ROOT/usr/sbin/xconv.pl
 rm -f $RPM_BUILD_ROOT/%{_mandir}/*.3
 
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
+
+%if %{with systemd}
+install -Dpm644 %{SOURCE50} $RPM_BUILD_ROOT%{_unitdir}/xinetd.service
+%else
+mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/rc.d/init.d/xinetd
 install -m 644 %SOURCE12 $RPM_BUILD_ROOT/etc/sysconfig/xinetd
+%endif
 
-%clean
-rm -rf $RPM_BUILD_ROOT
 
 %post
+%if %{with systemd}
+%systemd_post xinetd.service
+%else
 if [ $1 = 1 ]; then
     /sbin/chkconfig --add xinetd 
 fi
+%endif
 
 %preun
-if [ $1 = 0 ]; then
+%if %{with systemd}
+%systemd_preun xinetd.service
+%else
+if [ $1 = 0 -o -x /bin/systemctl]; then
     /sbin/service xinetd stop > /dev/null 2>&1
     /sbin/chkconfig --del xinetd 
 fi
+%endif
 
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart xinetd.service
+%else
 if [ $1 -ge 1 ]; then
     /sbin/service xinetd condrestart >/dev/null 2>&1
 fi
+%endif
 
 
 %files
 %defattr(-,root,root)
-%doc INSTALL CHANGELOG COPYRIGHT README xinetd/sample.conf 
-
+%license COPYRIGHT
+%doc CHANGELOG README xinetd/sample.conf 
 %config(noreplace) /etc/xinetd.conf
-%config(noreplace) /etc/sysconfig/xinetd
 %{_sbindir}/xinetd
 %{_sbindir}/inetdconvert
 %{_mandir}/*/*
-%config /etc/rc.d/init.d/xinetd
 %config(noreplace) /etc/xinetd.d/*
+%if %{with systemd}
+%{_unitdir}/xinetd.service
+%else
+%config(noreplace) /etc/sysconfig/xinetd
+%config /etc/rc.d/init.d/xinetd
+%endif
+
 
 %changelog
+* Mon Mar 22 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.15-2
+- updated Patch0.
+- imported Patch4-32 from rawhide.
+- added systemd support (disabled as default).
+- dropped dependence on libwrap.
+
 * Sat Apr 06 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.3.15-1
 - new upstream release
 - deleted Patch2 (upstream merged)