updated 14 packages

acpica-tools-20190509-1

ethtool-5.4-1

flac-1.3.3-1

iproute-5.6.0-1

libcap-ng-0.7.10-1

libestr-0.1.11-2

libfastjson-0.99.8-4

libproxy-0.4.15-2

libpwquality-1.4.2-1

libunistring-0.9.10-2

mdadm-4.1-1

python-six-1.14.0-1

rsyslog-8.2002.0-1

speexdsp-1.2-0.16.rc3

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12372 ec354946-7b23-47d6-9f5a-488ba84defc7

a/acpica-tools/acpica-tools-vl.spec

@@ -1,9 +1,9 @@
 Name:           acpica-tools
-Version:        20180105
+Version:        20190509
 Release:        1%{?_dist_release}
 Summary:        ACPICA tools for the development and debug of ACPI tables
-
 Group:          Development/Languages
+
 License:        GPLv2
 URL:            https://www.acpica.org/
 
@@ -18,10 +18,12 @@ Source7:        acpihelp.1
 Source8:        acpinames.1
 Source9:        acpisrc.1
 Source10:       acpixtract.1
-Source11:       badcode.asl.result
-Source12:       grammar.asl.result
-Source13:       run-misc-tests.sh
-Source14:       COPYING
+Source11:       acpiexamples.1
+Source12:       badcode.asl.result
+Source13:       grammar.asl.result
+Source14:       converterSample.asl.result
+Source15:       run-misc-tests.sh
+Source16:       COPYING
 
 Patch0:         big-endian.patch
 Patch1:         unaligned.patch
@@ -29,13 +31,18 @@ Patch2:         OPT_LDFLAGS.patch
 Patch3:         int-format.patch
 Patch4:         f23-harden.patch
 Patch5:         template.patch
-Patch6:         free.patch
-Patch7:         ppc64le.patch
-Patch8:         arm7hl.patch
-Patch9:         big-endian-v2.patch
-Patch10:        simple-64bit.patch
-Patch11:        be-tpm2.patch
-Patch12:        mips-be-fix.patch
+Patch6:         ppc64le.patch
+Patch7:         arm7hl.patch
+Patch8:         big-endian-v2.patch
+Patch9:         simple-64bit.patch
+Patch10:        mips-be-fix.patch
+Patch11:        cve-2017-13693.patch
+Patch12:        cve-2017-13694.patch
+Patch13:        cve-2017-13695.patch
+Patch14:        str-trunc-warn.patch
+Patch15:        ptr-cast.patch
+Patch16:        aslcodegen.patch
+Patch17:        facp.patch
 
 BuildRequires:  bison patchutils flex
 
@@ -83,7 +90,6 @@ This version of the tools is being released under GPLv2 license.
 
 %prep
 %setup -q -n acpica-unix2-%{version}
-%setup -q -T -D -a 1 -n acpica-unix2-%{version}
 gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 
 %patch0 -p1 -b .big-endian
@@ -91,14 +97,21 @@ gzip -dc %{SOURCE1} | tar -x --strip-components=1 -f -
 %patch2 -p1 -b .OPT_LDFLAGS
 %patch3 -p1 -b .int-format
 %patch4 -p1 -b .f23-harden
-%patch5 -p1 -b .template
-%patch6 -p1 -b .free
-%patch7 -p1 -b .ppc64le
-%patch8 -p1 -b .arm7hl
-%patch9 -p1 -b .big-endian-v2
-%patch10 -p1 -b .simple-64bit
-%patch11 -p1 -b .be-tpm2
-%patch12 -p1 -b .mips-be-fix
+# do not preserve a backup for this patch; it alters the results
+# of the template test case and forces it to fail
+%patch5 -p1
+%patch6 -p1 -b .ppc64le
+%patch7 -p1 -b .arm7hl
+%patch8 -p1 -b .big-endian-v2
+%patch9 -p1 -b .simple-64bit
+%patch10 -p1 -b .mips-be-fix
+%patch11 -p1 -b .cve-2017-13693
+%patch12 -p1 -b .cve-2017-13694
+%patch13 -p1 -b .cve-2017-13695
+%patch14 -p1 -b .str-trunc-warn
+%patch15 -p1 -b .ptr-cast
+%patch16 -p1 -b .aslcodegen
+%patch17 -p1 -b .facp
 
 cp -p %{SOURCE2} README.Fedora
 cp -p %{SOURCE3} iasl.1
@@ -109,11 +122,13 @@ cp -p %{SOURCE7} acpihelp.1
 cp -p %{SOURCE8} acpinames.1
 cp -p %{SOURCE9} acpisrc.1
 cp -p %{SOURCE10} acpixtract.1
-cp -p %{SOURCE11} badcode.asl.result
-cp -p %{SOURCE12} grammar.asl.result
-cp -p %{SOURCE13} tests/run-misc-tests.sh
+cp -p %{SOURCE11} acpiexamples.1
+cp -p %{SOURCE12} badcode.asl.result
+cp -p %{SOURCE13} grammar.asl.result
+cp -p %{SOURCE14} converterSample.asl.result
+cp -p %{SOURCE15} tests/run-misc-tests.sh
 chmod a+x tests/run-misc-tests.sh
-cp -p %{SOURCE14} COPYING
+cp -p %{SOURCE16} COPYING
 
 # spurious executable permissions on text files in upstream
 chmod a-x changes.txt
@@ -121,23 +136,49 @@ chmod a-x source/compiler/new_table.txt
 
 
 %build
-make OPT_CFLAGS="%{optflags}"
-
+CWARNINGFLAGS="\
+    -std=c99\
+    -Wall\
+    -Wbad-function-cast\
+    -Wdeclaration-after-statement\
+    -Werror\
+    -Wformat=2\
+    -Wmissing-declarations\
+    -Wmissing-prototypes\
+    -Wstrict-aliasing=0\
+    -Wstrict-prototypes\
+    -Wswitch-default\
+    -Wpointer-arith\
+    -Wundef\
+    -Waddress\
+    -Waggregate-return\
+    -Winit-self\
+    -Winline\
+    -Wmissing-declarations\
+    -Wmissing-field-initializers\
+    -Wnested-externs\
+    -Wold-style-definition\
+    -Wno-format-nonliteral\
+    -Wredundant-decls\
+    -Wempty-body\
+    -Woverride-init\
+    -Wlogical-op\
+    -Wmissing-parameter-type\
+    -Wold-style-declaration\
+    -Wtype-limits"
+
+export OPT_CFLAGS="%{optflags} $CWARNINGFLAGS"
+make %{_smp_mflags}
 
 %install
 # Install the binaries
 mkdir -p %{buildroot}%{_bindir}
 install -pD generate/unix/bin*/* %{buildroot}%{_bindir}/
-mv %{buildroot}%{_bindir}/acpidump %{buildroot}%{_bindir}/acpidump-acpica
-mv %{buildroot}%{_bindir}/acpixtract %{buildroot}%{_bindir}/acpixtract-acpica
 
 # Install the man pages
 mkdir -p %{buildroot}%{_mandir}/man1
-install -pDm 0644 -p -D *.1 %{buildroot}%{_mandir}/man1/
-mv %{buildroot}%{_mandir}/man1/acpixtract.1 \
-   %{buildroot}%{_mandir}/man1/acpixtract-acpica.1
-mv %{buildroot}%{_mandir}/man1/acpidump.1 \
-   %{buildroot}%{_mandir}/man1/acpidump-acpica.1
+install -pDm 0644 *.1 %{buildroot}%{_mandir}/man1/
+
 
 %check
 cd tests
@@ -162,37 +203,39 @@ fi
 cd ..
 
 
-%post
-alternatives --install %{_bindir}/acpixtract acpixtract \
-                       %{_bindir}/acpixtract-acpica 120 \
-               --slave %{_mandir}/man1/acpixtract.1.gz acpixtract.1.gz \
-                       %{_mandir}/man1/acpixtract-acpica.1.gz
-
-alternatives --install %{_bindir}/acpidump acpidump \
-                       %{_bindir}/acpidump-acpica 120 \
-               --slave %{_mandir}/man1/acpidump.1.gz acpidump.1.gz \
-                       %{_mandir}/man1/acpidump-acpica.1.gz
-
+%pre
+if [ -e %{_bindir}/acpixtract-acpica ]
+then
+    alternatives --remove acpixtract %{_bindir}/acpixtract-acpica
+fi
+if [ -e %{_bindir}/acpidump-acpica ]
+then
+    alternatives --remove acpidump %{_bindir}/acpidump-acpica
+fi
 
 %postun
-if [ ! -e %{_bindir}/acpixtract-acpica ]
+if [ -e %{_bindir}/acpixtract-acpica ]
 then
     alternatives --remove acpixtract %{_bindir}/acpixtract-acpica
 fi
-if [ ! -e %{_bindir}/acpidump-acpica ]
+if [ -e %{_bindir}/acpidump-acpica ]
 then
     alternatives --remove acpidump %{_bindir}/acpidump-acpica
 fi
 
 
 %files
+%license COPYING
 %doc changes.txt source/compiler/new_table.txt
-%doc README.Fedora COPYING
+%doc README.Fedora
 %{_bindir}/*
 %{_mandir}/*/*
 
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20190509-1
+- new upstream release.
+
 * Tue Feb 20 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 20180105-1
 - new upstream release.
 - dropped Patch0-6.

e/ethtool/ethtool-vl.spec

@@ -3,22 +3,19 @@
 
 Summary:      A tool for setting ethernet parameters
 Summary(ja):  Ethernet コントローラ設定ツール
-
 Name:         ethtool
 Epoch:	      1
-Version:      4.15
+Version:      5.4
 Release:      1%{?_dist_release}
-
 Group:        Applications/System
-License:      GPL
-URL:          https://www.kernel.org/pub/software/network/ethtool/
-
-Source:       %{name}-%{version}.tar.xz
-BuildRoot:    %{_tmppath}/%{name}-%{version}-root
-
 Vendor:       Project Vine
 Distribution: Vine Linux
 Packager:     shaolin, daisuke
+BuildRoot:    %{_tmppath}/%{name}-%{version}-root
+
+License:      GPL
+URL:          https://www.kernel.org/pub/software/network/ethtool/
+Source:       https://mirrors.edge.kernel.org/pub/software/network/ethtool/%{name}-%{version}.tar.xz
 
 
 %description
@@ -61,12 +58,19 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 %{_sbindir}/ethtool
 /usr/sbin/ethtool
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/ethtool
 %{_mandir}/man8/ethtool.8*
-%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
+%license COPYING
+%doc AUTHORS INSTALL NEWS README ChangeLog
 
 
 %changelog
-* Fri Feb 23 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.15-1
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:5.4-1
+- new upstream release.
+
+* Fri Feb 23 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:4.15-1
 - new upstream release.
 
 * Wed Apr 10 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1:3.8-1

f/flac/flac-vl.spec

@@ -1,28 +1,26 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-Name:		flac
-Summary:	FLAC - Free Lossless Audio Codec
-Summary(ja):	FLAC - フリーの可逆音声圧縮コーデック
-Version:	1.3.2
-Release:	1%{?_dist_release}
+Name:           flac
+Summary:        FLAC - Free Lossless Audio Codec
+Summary(ja):    FLAC - フリーの可逆音声圧縮コーデック
+Version:        1.3.3
+Release:        1%{?_dist_release}
+Group:          Applications/Multimedia
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-Group:		Applications/Multimedia
 License:        BSD and GPLv2+
-URL:		http://flac.sourceforge.net/
+URL:            https://xiph.org/flac/
+Source:         https://github.com/xiph/flac/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
-Source:		http://prdownloads.sourceforge.net/flac/%{name}-%{version}%{?extraver:-%extraver}.tar.xz
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libogg-devel
-BuildRequires: automake autoconf libtool gettext-devel
+BuildRequires:  libogg-devel
+BuildRequires:  automake autoconf libtool gettext-devel
 %ifarch %ix86
 # 2.0 supports symbol visibility
-BuildRequires:	nasm >= 2.0
+BuildRequires:  nasm >= 2.0
 %endif
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-
 %description
 FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC is
 similar to MP3, but lossless.
@@ -111,6 +109,7 @@ will use the Free Lossless Audio Codec (FLAC).
 
 %setup -q -n %{name}-%{srcver}
 
+
 %build
 ./autogen.sh -V
 
@@ -124,16 +123,20 @@ will use the Free Lossless Audio Codec (FLAC).
 
 make %{?_smp_mflags}
 
+
 %install
 %__rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
+rm -rf ./htmldoc
+mv -f %{buildroot}%{_docdir}/flac ./htmldoc
+
 # remove unneeded files
 %{_bindir}/find %{buildroot} -name "*.la" -exec %__rm -f "{}" \;
-%{_bindir}/find doc/ -name "Makefile*" -exec %__rm -f "{}" \;
+
 
 %check
-make -C test check &> /dev/null
+make check
 
 %clean
 %__rm -rf %{buildroot}
@@ -147,14 +150,16 @@ make -C test check &> /dev/null
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING.* README
+%license COPYING.*
+%doc AUTHORS README
 %{_bindir}/*
 %{_libdir}/*.so.*
 %{_mandir}/*/*
 
 %files devel
 %defattr(-,root,root)
-%doc doc/html COPYING.*
+%license COPYING.*
+%doc doc/html
 %{_includedir}/*
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
@@ -164,17 +169,20 @@ make -C test check &> /dev/null
 %if %{build_compat32}
 %files -n compat32-%{name}
 %defattr(-,root,root)
-%doc AUTHORS COPYING.* README
+%license COPYING.*
+%doc AUTHORS README
 %{_libdir}/*.so.*
 
 %files -n compat32-%{name}-devel
 %defattr(-,root,root,-)
 %{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
 %endif
 
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.3-1
+- new upstream release.
+
 * Thu Feb 22 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.2-1
 - new upstream release.
 

i/iproute/iproute-vl.spec

@@ -1,51 +1,22 @@
 %bcond_without tipc
-%bcond_with texdoc
-%define cbq_version v0.7.3
-
-Summary: Advanced IP routing and network device configuration tools
-Summary(ja): IP ルーティング,ネットワークデバイスの設定ツール
-Name: iproute
-Version: 4.14.1
-Release: 2%{?_dist_release}
-Group: Applications/System
-Source: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
-URL: http://kernel.org/pub/linux/utils/net/%{name}2/
-Source1: cbq-0000.example
-Source2: avpkt
-
-Vendor: Project Vine
-Distribution: Vine Linux
 
-# http://www.spinics.net/lists/netdev/msg325114.html
-Patch1:             iproute2-3.19.0-docs.patch
+Summary:        Advanced IP routing and network device configuration tools
+Summary(ja):    IP ルーティング,ネットワークデバイスの設定ツール
+Name:           iproute
+Version:        5.6.0
+Release:        1%{?_dist_release}
+Group:          Applications/System
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
-# VINE
-Patch100: iproute2-3.14.0-platex.patch
+License:        GPLv2+ and Public Domain
+URL:            https://wiki.linuxfoundation.org/networking/iproute2
+Source:         https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
 
-License: GPLv2+ and Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison flex
 BuildRequires: iptables-devel >= 1.4.10, libdb-devel
 BuildRequires: pkgconfig
-%if %{with texdoc}
-BuildRequires: texlive-collection-fontsrecommended
-BuildRequires: texlive-collection-latexrecommended
-BuildRequires: texlive-collection-langafrican
-BuildRequires: texlive-collection-langarabic
-BuildRequires: texlive-collection-langchinese
-BuildRequires: texlive-collection-langczechslovak
-BuildRequires: texlive-collection-langenglish
-BuildRequires: texlive-collection-langeuropean
-BuildRequires: texlive-collection-langfrench
-BuildRequires: texlive-collection-langindic
-BuildRequires: texlive-collection-langitalian
-BuildRequires: texlive-collection-langkorean
-BuildRequires: texlive-collection-langpolish
-BuildRequires: texlive-collection-langportuguese
-BuildRequires: texlive-collection-langspanish
-BuildRequires: texlive-collection-langother
-BuildRequires: linuxdoc-tools psutils
-%endif
 %if %{with tipc}
 BuildRequires: libmnl-devel
 %endif
@@ -53,14 +24,13 @@ BuildRequires: libmnl-devel
 Requires: iptables >= 1.4.10
 
 %description
-The iproute package contains networking utilities (ip and rtmon, for
-example) which are designed to use the advanced networking
-capabilities of the Linux 2.4.x and 2.6.x kernel.
+The iproute package contains networking utilities (ip and rtmon, for example)
+which are designed to use the advanced networking capabilities of the Linux
+kernel.
 
 %description -l ja
-このiprouteパッケージには、カーネル 2.4.x または 2.6.x の進歩した
-ネットワーク技術を使うように設計された、ネットワーキングユーティリ
-ティ(ip, rtmon等々)が収録されています。
+　このiprouteパッケージには、進歩したカーネルのネットワーク技術を使うように
+設計されたネットワーキングユーティリティ(ip, rtmon等々)が収録されています。
 
 %package doc
 Summary: ip and tc documentation with examples
@@ -80,13 +50,20 @@ Requires: %{name} = %{version}
 %description devel
 Libraries, include files, etc you can use to develop iproute2.
 
+%package -n arpd
+Summary: arpd - userspace arp daemon
+Summary(ja): arpd - ユーザー空間のarpデーモン
+Group: Applications/System
+Requires: %{name} = %{version}
+
+%description -n arpd
+ The arpd daemon collects gratuitous ARP information, saving it on local
+disk  and  feeding it to the kernel on demand to avoid redundant broad
+casting due to limited size of the kernel ARP cache.
+
 
 %prep
 %setup -q -n iproute2-%{version}
-%if %{with texdoc}
-%patch1 -p1 -b .doc
-%patch100 -p1 -b .platex
-%endif
 
 %build
 export CFLAGS="%{optflags}"
@@ -94,89 +71,26 @@ export LIBDIR=/%{_libdir}
 export IPT_LIB_DIR=/%{_lib}/xtables
 ./configure
 make %{?_smp_mflags}
-%if %{with texdoc}
-#make -C doc
-%endif
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
-mkdir -p \
-    %{buildroot}%{_includedir} \
-    %{buildroot}/sbin \
-    %{buildroot}%{_sbindir} \
-    %{buildroot}%{_mandir}/man3 \
-    %{buildroot}%{_mandir}/man7 \
-    %{buildroot}%{_mandir}/man8 \
-    %{buildroot}%{_libdir}/tc \
-    %{buildroot}%{_sysconfdir}/iproute2/{rt_protos.d,rt_tables.d} \
-    %{buildroot}%{_sysconfdir}/sysconfig/cbq
-
-for binary in \
-    ip/ifcfg \
-    ip/ip \
-    ip/rtmon \
-    tc/tc
-    do install -m755 ${binary} %{buildroot}/sbin/
-done
-
-install -m755 examples/cbq.init-%{cbq_version} %{buildroot}/sbin/cbq
-
-for binary in \
-    bridge/bridge \
-    genl/genl \
-    ip/routef \
-    ip/routel \
-    ip/rtpr \
-%if %{with tipc}
-    tipc/tipc \
-%endif
-    misc/arpd \
-    misc/ifstat \
-    misc/lnstat \
-    misc/nstat \
-    misc/rtacct \
-    misc/ss
-    do install -m755 ${binary} %{buildroot}%{_sbindir}
+export DESTDIR='%{buildroot}'
+export SBINDIR='%{_sbindir}'
+export MANDIR='%{_mandir}'
+export LIBDIR='%{_libdir}'
+export CONFDIR='%{_sysconfdir}/iproute2'
+export DOCDIR='%{_docdir}'
+make install
+
+mkdir -p %{buildroot}/sbin
+for f in ifcfg ip rtmon tc; do
+  mv -f %{buildroot}%{_sbindir}/$f %{buildroot}/sbin/
 done
 
-cd %{buildroot}%{_sbindir}
-    ln -s lnstat ctstat
-    ln -s lnstat rtstat
-cd -
-
-# Libs
-install -m644 netem/*.dist %{buildroot}%{_libdir}/tc
-install -m755 tc/m_xt.so %{buildroot}%{_libdir}/tc
-cd %{buildroot}%{_libdir}/tc
-    ln -s m_xt.so m_ipt.so
-cd -
-
 # libnetlink
-install -m644 include/libnetlink.h %{buildroot}%{_includedir}
-install -m644 lib/libnetlink.a %{buildroot}%{_libdir}
-
-# Manpages
-iconv -f latin1 -t utf8 man/man8/ss.8 > man/man8/ss.8.utf8 &&
-    mv man/man8/ss.8.utf8 man/man8/ss.8
-install -m644 man/man3/*.3 %{buildroot}%{_mandir}/man3
-install -m644 man/man7/*.7 %{buildroot}%{_mandir}/man7
-install -m644 man/man8/*.8 %{buildroot}%{_mandir}/man8
-
-# Config files
-for f in `find etc/iproute2/ -maxdepth 1 -type f`;
-    do install -m644 $f %{buildroot}%{_sysconfdir}/iproute2
-done
-
-install -m644 etc/iproute2/rt_protos.d/* %{buildroot}%{_sysconfdir}/iproute2/rt_protos.d/
-
-install -m644 etc/iproute2/rt_tables.d/* %{buildroot}%{_sysconfdir}/iproute2/rt_tables.d/
-
-for config in \
-    %{SOURCE1} \
-    %{SOURCE2}
-    do install -m644 ${config} %{buildroot}%{_sysconfdir}/sysconfig/cbq
-done
+install -D -m644 include/libnetlink.h %{buildroot}%{_includedir}/libnetlink.h
+install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 
 
 %clean
@@ -184,44 +98,48 @@ done
 
 
 %files
+%license COPYING
+%doc README
 %dir %{_sysconfdir}/iproute2
-%dir %{_sysconfdir}/iproute2/rt_protos.d
-%dir %{_sysconfdir}/iproute2/rt_tables.d
-%doc COPYING
-%doc README README.decnet README.iproute2+tc README.distribution README.lnstat
-%{_mandir}/man7/*
-%{_mandir}/man8/*
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/bpf_pinning
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/ematch_map
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/group
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/nl_protos
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_dsfield
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_protos
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_realms
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_scopes
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_tables
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_protos.d/*
-%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/rt_tables.d/*
+%attr(644,root,root) %config(noreplace) %{_sysconfdir}/iproute2/*
 /sbin/*
 %{_sbindir}/*
+%exclude %{_sbindir}/arpd
 %dir %{_libdir}/tc/
 %{_libdir}/tc/*
-%dir %{_sysconfdir}/sysconfig/cbq
-%config(noreplace) %{_sysconfdir}/sysconfig/cbq/*
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/tc
+%{_mandir}/man7/*
+%{_mandir}/man8/*
+%exclude %{_mandir}/man8/arpd.8*
 
 %files doc
-%doc COPYING
+%license COPYING
 %doc doc/*
 %doc examples
 
 %files devel
-%doc COPYING
+%license COPYING
 %{_mandir}/man3/*
 %{_libdir}/libnetlink.a
 %{_includedir}/libnetlink.h
+%{_includedir}/iproute2/bpf_elf.h
+
+%files -n arpd
+%license COPYING
+%{_sbindir}/arpd
+%{_mandir}/man8/arpd.8*
 
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.6.0-1
+- new upstream release.
+- dropped Source1 and 2.
+- dropped Patch1 and 100.
+- added a new subpackage "arpd".
+- modified %%description.
+
 * Sat Feb 24 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.14.1-2
 - rebuilt with iptables-1.6.
 

lib/libc/libcap-ng/libcap-ng-vl.spec

@@ -1,83 +1,84 @@
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define _unpackaged_files_terminate_build 1
 
-Summary: An alternate posix capabilities library
-Name: libcap-ng
-Version: 0.7.9
-Release: 1%{?_dist_release}
-License: LGPLv2+
-Group: System Environment/Libraries
-URL: http://people.redhat.com/sgrubb/libcap-ng/
-Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kernel-headers >= 2.6.11 
-BuildRequires: libattr-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        An alternate posix capabilities library
+Name:           libcap-ng
+Version:        0.7.10
+Release:        1%{?_dist_release}
+Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        LGPLv2+
+URL:            http://people.redhat.com/sgrubb/libcap-ng/
+Source0:        http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  kernel-headers >= 2.6.11 
+BuildRequires:  libattr-devel
+
 
 %description
 Libcap-ng is a library that makes using posix capabilities easier
 
-%package devel
-Summary: Header files for libcap-ng library
-License: LGPLv2+
-Group: Development/Libraries
-Requires: kernel-headers >= 2.6.11
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+%package        devel
+Summary:        Header files for libcap-ng library
+License:        LGPLv2+
+Group:          Development/Libraries
+Requires:       kernel-headers >= 2.6.11
+Requires:       %{name} = %{version}-%{release}
+Requires:       pkgconfig
 
-%description devel
+%description    devel
 The libcap-ng-devel package contains the files needed for developing
 applications that need to use the libcap-ng library.
 
-%package python
-Summary: Python bindings for libcap-ng library
-License: LGPLv2+
-Group: Development/Libraries
-BuildRequires: python-devel swig
-BuildRequires: python-rpm-macros
-Requires: %{name} = %{version}-%{release}
+%package        python
+Summary:        Python bindings for libcap-ng library
+License:        LGPLv2+
+Group:          Development/Libraries
+BuildRequires:  python-devel swig
+BuildRequires:  python-rpm-macros
+Requires:       %{name} = %{version}-%{release}
 
-%description python
+%description    python
 The libcap-ng-python package contains the bindings so that libcap-ng
 and can be used by python applications.
 
-%package python3
-Summary: Python3 bindings for libcap-ng library
-License: LGPLv2+
-Group: Development/Libraries
-BuildRequires: python3-devel swig
-BuildRequires: python3-rpm-macros
-Requires: %{name} = %{version}-%{release}
+%package        python3
+Summary:        Python3 bindings for libcap-ng library
+License:        LGPLv2+
+Group:          Development/Libraries
+BuildRequires:  python3-devel swig
+BuildRequires:  python3-rpm-macros
+Requires:       %{name} = %{version}-%{release}
 
-%description python3
+%description    python3
 The libcap-ng-python3 package contains the bindings so that libcap-ng
 and can be used by python3 applications.
 
-%package utils
-Summary: Utilities for analysing and setting file capabilities
-License: GPLv2+
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+%package        utils
+Summary:        Utilities for analysing and setting file capabilities
+License:        GPLv2+
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
 
-%description utils
+%description    utils
 The libcap-ng-utils package contains applications to analyse the
 posix capabilities of all the program running on a system. It also
 lets you set the file system based capabilities.
 
-%package -n compat32-%{name}
-Summary: An alternate posix capabilities library
-Requires: %{name} = %{version}-%{release}
+%package -n     compat32-%{name}
+Summary:        An alternate posix capabilities library
+Requires:       %{name} = %{version}-%{release}
 
 %description -n compat32-%{name}
 Libcap-ng is a library that makes using posix capabilities easier
 
-%package -n compat32-%{name}-devel
-Summary: Header files for libcap-ng library
-License: LGPLv2+
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
+%package -n     compat32-%{name}-devel
+Summary:        Header files for libcap-ng library
+License:        LGPLv2+
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
 
 %description -n compat32-%{name}-devel
 The libcap-ng-devel package contains the files needed for developing
@@ -125,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING.LIB
+%license COPYING.LIB
 %attr(0755,root,root) /%{_lib}/libcap-ng.so.*
 
 %files devel
@@ -164,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7.10-1
+- new upstream release.
+
 * Tue Feb 27 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.7.9-1
 - new upstream release.
 - added compat32-* packages.

lib/libe/libestr/libestr-vl.spec

@@ -1,17 +1,15 @@
 Name:           libestr
 Summary:        String handling essentials library
 Version:        0.1.11
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
+Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
 
 License:        LGPLv2+
-Group:          System Environment/Libraries
 URL:            http://libestr.adiscon.com/
 Source0:        http://libestr.adiscon.com/files/download/libestr-%{version}.tar.gz
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
-
 %description
 This package compiles the string handling essentials library 
 used by the Rsyslog daemon.
@@ -42,7 +40,8 @@ rm -f %{buildroot}/%{_libdir}/*.{a,la}
 %postun -p /sbin/ldconfig
 
 %files
-%doc README COPYING AUTHORS ChangeLog
+%license COPYING
+%doc README AUTHORS ChangeLog
 %{_libdir}/lib*.so.*
 
 %files devel
@@ -51,6 +50,9 @@ rm -f %{buildroot}/%{_libdir}/*.{a,la}
 %{_libdir}/pkgconfig/libestr.pc
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.1.11-2
+- rebuilt with current environment.
+
 * Wed Nov 07 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.1.11-1
 - new upstream release.
 

lib/libf/libfastjson/libfastjson-vl.spec

@@ -1,16 +1,14 @@
-Name:		libfastjson
-Version:	0.99.8
-Release:	3%{?_dist_release}
-Summary:	A JSON implementation in C
-License:	MIT
-URL:		https://github.com/rsyslog/libfastjson
-Source0:	http://download.rsyslog.com/libfastjson/libfastjson-%{version}.tar.gz
-
-Vendor:		Project Vine
-Distribution: Vine Linux
-Packager:	tomop
-
-BuildRequires: autoconf automake libtool
+Name:           libfastjson
+Version:        0.99.8
+Release:        4%{?_dist_release}
+Summary:        A JSON implementation in C
+Vendor:         Project Vine
+Distribution:   Vine Linux
+License:        MIT
+URL:            https://github.com/rsyslog/libfastjson
+Source0:        https://download.rsyslog.com/libfastjson/libfastjson-%{version}.tar.gz
+
+BuildRequires:  autoconf automake libtool
 
 %description
 LIBFASTJSON implements a reference counting object
@@ -19,12 +17,12 @@ objects in C, output them as JSON formatted strings
 and parse JSON formatted strings back into the
 C representation of JSON objects.
 
-%package	devel
-Summary:	Development files for libfastjson
-Group:		Development/Libraries
-Requires:	%{name}%{?_isa} = %{version}-%{release}
+%package        devel
+Summary:        Development files for libfastjson
+Group:          Development/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description	devel
+%description    devel
 This package contains libraries and header files for
 developing applications that use libfastjson.
 
@@ -65,6 +63,9 @@ make V=1 check
 %{_libdir}/pkgconfig/libfastjson.pc
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.99.8-4
+- rebuilt with current environment.
+
 * Sun Feb 25 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 0.99.8-3
 - initisl build for Vine Linux.
 

lib/libp/libproxy/libproxy-vl.spec

@@ -5,7 +5,7 @@
 Summary:        A library handling all the details of proxy configuration
 Name:           libproxy
 Version:        0.4.15
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
@@ -34,13 +34,12 @@ BuildRequires:  GConf2-devel
 BuildRequires:  mozjs >= 38
 %endif
 # NetworkManager
-BuildRequires:  NetworkManager-devel
+BuildRequires:  NetworkManager-libnm-devel
 BuildRequires:  dbus-devel
 BuildRequires:  glib2
 # webkit (gtk)
 BuildRequires:  webkitgtk4-devel
 # kde
-BuildRequires:	kdelibs-devel
 BuildRequires:  libXmu-devel
 BuildRequires:  libX11-devel
 
@@ -175,7 +174,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files 
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%license COPYING
+%doc AUTHORS README
 %{_libdir}/*.so.*
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/%{version}
@@ -223,6 +223,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.15-2
+- rebuilt with current environment.
+
 * Mon Jan 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.15-1
 - updated to 0.4.15.
 - enabled python3 support.

lib/libp/libpwquality/libpwquality-vl.spec

@@ -1,13 +1,14 @@
 Summary: A library for password generation and password quality checking
 Name: libpwquality
-Version: 1.4.0
+Version: 1.4.2
 Release: 1%{?_dist_release}
+Group: System Environment/Base
+Vendor: Project Vine
+Distribution: Vine Linux
 # The package is BSD licensed with option to relicense as GPLv2+
 # - this option is redundant as the BSD license allows that anyway.
 License: BSD or GPLv2+
-Group: System Environment/Base
 Source0: https://github.com/libpwquality/libpwquality/releases/download/libpwquality-%{version}/libpwquality-%{version}.tar.bz2
-Patch1: libpwquality-1.4.0-covscan.patch
 
 %global _moduledir /%{_lib}/security
 %global _secconfdir %{_sysconfdir}/security
@@ -27,9 +28,6 @@ URL: https://fedorahosted.org/libpwquality/
 # we don't want to provide private python extension libs
 %define __provides_exclude_from ^(%{python_sitearch}|%{python3_sitearch})/.*\.so$.
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 This is a library for password quality checks and generation
 of random passwords that pass the checks.
@@ -71,7 +69,6 @@ pronounceable passwords from Python applications.
 
 %prep
 %setup -q
-%patch1 -p1 -b .covscan
 
 rm -rf %{py3dir}
 cp -a . %{py3dir}
@@ -152,6 +149,10 @@ mkdir $RPM_BUILD_ROOT%{_secconfdir}/pwquality.conf.d
 %{python3_sitearch}/*.egg-info
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.2-1
+- new upstream release.
+- dropped Patch1: fixed in upstream.
+
 * Wed Nov 28 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.0-1
 - new upstream release.
 - added python3 support.

lib/libu/libunistring/libunistring-vl.spec

@@ -5,17 +5,17 @@ Name:		libunistring
 Summary:	library for manipulating Unicode strings
 Summary(ja):	Unicode 文字列を処理するライブラリ
 Version:	0.9.10
-Release:	1%{?_dist_release}
-License:	GPLv3+
-Group:		System Environment/Libraries
-URL:		http://www.gnu.org/software/libunistring/
-Source0:	http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
+Release:	2%{?_dist_release}
 Vendor:		Project Vine
+Group:		System Environment/Libraries
 Distribution:	Vine Linux
 Packager:	yasumichi
 
+License:	GPLv3+
+URL:		https://www.gnu.org/software/libunistring/
+Source0:	https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+
 # Dependency
 BuildRequires:	texinfo
 BuildRequires:	texlive
@@ -98,7 +98,8 @@ Development files and documentation for libunistring
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog HACKING NEWS README THANKS
+%license COPYING
+%doc AUTHORS ChangeLog HACKING NEWS README THANKS
 %{_libdir}/*.so.*
 
 %files devel
@@ -118,6 +119,9 @@ Development files and documentation for libunistring
 %endif
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.10-2
+- rebuilt with current environment.
+
 * Thu Nov 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.10-1
 - updated to 0.9.10.
 

m/mdadm/mdadm-vl.spec

@@ -1,36 +1,49 @@
-%define _tmpfilesdir %{_sysconfdir}/tmpfiles.d
+%bcond_with systemd
 %define _udevrulesdir /lib/udev/rules.d
 
-Summary:     Utilities for Linux md devices (software RAID arrays)
-Summary(ja): Linux の MD デバイス(ソフトウエアRAIDアレイ)用のユーティリティ
-Name:        mdadm
-Version:     4.0
-Release:     1%{?_dist_release}
-Source:      https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
-Source1:     mdmonitor.init
-Source2:     raid-check
-Source3:     mdadm.rules
-Source4:     mdadm-raid-check-sysconfig
-Source5:     mdadm-cron
-Source6:     mdmonitor.service
-Source7:     mdadm.conf
-Source8:     mdadm_event.conf
-Patch93:     add-Wimplicit-fallthrough-0-in-Makefile.patch
-Patch94:     forced-type-conversion-to-avoid-truncation.patch
-Patch95:     replace-snprintf-with-strncpy-at-some-places.patch
-Patch96:     specify-enough-length-when-write-to-buffer.patch
-Patch97:     mdadm-3.3-udev.patch
-Patch98:     mdadm-2.5.2-static.patch
-URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
-License:     GPL
-Group:       System Environment/Base
-BuildRoot:   %{_tmppath}/%{name}-%{version}-root
-Obsoletes:   mdctl,raidtools
-Requires:    smtpdaemon
-BuildRequires: glibc-static
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Summary:        Utilities for Linux md devices (software RAID arrays)
+Summary(ja):    Linux の MD デバイス(ソフトウエアRAIDアレイ)用のユーティリティ
+Name:           mdadm
+Version:        4.1
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          System Environment/Base
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+
+License:        GPL
+URL:            http://www.kernel.org/pub/linux/utils/raid/mdadm/
+Source:         https://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz
+Source1:        mdmonitor.init
+Source2:        raid-check
+Source3:        mdadm.rules
+Source4:        mdadm-raid-check-sysconfig
+Source5:        mdadm-cron
+
+Source103:      mdadm.rules.systemd
+Source104:      mdmonitor.service
+Source105:      mdadm.conf
+Source106:      mdadm_event.conf
+Source107:      raid-check.timer
+Source108:      raid-check.service
+
+Patch97:        mdadm-3.3-udev.patch
+Patch98:        mdadm-2.5.2-static.patch
+
+Obsoletes:      mdctl,raidtools
+Requires:       postfix
+BuildRequires:  glibc-static
+
+%if %{with systemd}
+Requires(post): systemd coreutils
+Requires(preun): systemd
+Requires(postun): systemd coreutils
+%else
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+%endif
 
 %description 
 mdadm is used to create, manage, and monitor Linux MD (software RAID)
@@ -39,58 +52,70 @@ package.  However, mdadm is a single program, and it can perform
 almost all functions without a configuration file, though a configuration
 file can be used to help with some common tasks.
 
+
 %prep
 %setup -q
+%autopatch -p1
 
-# Fedora customization patches
-%patch93 -p1 -b .fallthrough
-%patch94 -p1 -b .forced
-%patch95 -p1 -b .replace
-%patch96 -p1 -b .buffer
-%patch97 -p1 -b .udev
-%patch98 -p1 -b .static
+sed -i -e 's/ -Werror / /' Makefile
 
 %build
 make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon
 
+
 %install
 rm -rf %{buildroot}
 
-#make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=%{_sbindir} SYSTEMD_DIR=%{_unitdir} install install-systemd
+%if %{with systemd}
+make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin SYSTEMD_DIR=%{_unitdir} install install-systemd
+%else
 make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=/sbin install
+%endif
 install -Dp -m 755 %{SOURCE2} %{buildroot}%{_sbindir}/raid-check
-install -Dp -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/65-md-incremental.rules
 install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/raid-check
-install -Dp -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/cron.d/raid-check
+
+%if %{with systemd}
+install -Dp -m 644 %{SOURCE103} %{buildroot}%{_udevrulesdir}/65-md-incremental.rules
+# systemd
+mkdir -p %{buildroot}%{_unitdir}
+install -m644 %{SOURCE104} %{buildroot}%{_unitdir}
+install -m644 %{SOURCE107} %{buildroot}%{_unitdir}
+install -m644 %{SOURCE108} %{buildroot}%{_unitdir}
 
 # tmpfile
 mkdir -p %{buildroot}%{_tmpfilesdir}
-install -m 0644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/%{name}.conf
-
-mkdir -p %{buildroot}%{_localstatedir}/run/
-install -d -m 0710 %{buildroot}%{_localstatedir}/run/%{name}/
+install -m 0644 %{SOURCE105} %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -d -m 0710 %{buildroot}/run/%{name}/
 
+# abrt
+#mkdir -p %{buildroot}/etc/libreport/events.d
+#install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d
+%else
 # initscript
 mkdir -p %{buildroot}%{_initdir}
 install -m755 %{SOURCE1} %{buildroot}%{_initdir}/mdmonitor
-
-# systemd
-#mkdir -p %{buildroot}%{_unitdir}
-#install -m644 %{SOURCE6} %{buildroot}%{_unitdir}
-
-# abrt
-#mkdir -p %{buildroot}/etc/libreport/events.d
-#install -m644 %{SOURCE8} %{buildroot}/etc/libreport/events.d
+install -Dp -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/cron.d/raid-check
+install -Dp -m 644 %{SOURCE3} %{buildroot}%{_udevrulesdir}/65-md-incremental.rules
+mkdir -p %{buildroot}%{_localstatedir}/run/mdadm
+%endif
 
 
 %clean
 rm -rf %{buildroot}
 
+
 %post
+%if %{with systemd}
+%systemd_post mdmonitor.service raid-check.{service,timer}
+%else
 /sbin/chkconfig --add mdmonitor
+%endif
 
 %preun
-if [ "$1" = 0 ]; then
+%if %{with systemd}
+%systemd_preun mdmonitor.service raid-check.timer
+%else
+if [ "$1" = 0 -o -x /bin/systemctl ]; then
 	service mdmonitor stop > /dev/null 2>&1 ||:
 	/sbin/chkconfig --del mdmonitor
 fi
@@ -98,26 +123,44 @@ if [ -e %{_initrddir}/mdmpd ]; then
 	service mdmpd stop > /dev/null 2>&1 ||:
 	/sbin/chkconfig --del mdmpd
 fi
+%endif
 
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart mdmonitor.service
+%else
 if [ "$1" -ge "1" ]; then
 	service mdmonitor condrestart > /dev/null 2>&1
 fi
+%endif
+
 
 %files
 %defattr(-,root,root)
-%doc TODO ChangeLog mdadm.conf-example COPYING misc/*
+%license COPYING
+%doc mdadm.conf-example misc/*
 /sbin/*
 %{_sbindir}/*
+%if %{with systemd}
+%{_unitdir}/*
+/lib/systemd/system-shutdown/*
+%config(noreplace) %{_tmpfilesdir}/%{name}.conf
+%else
 %{_initdir}/*
+%config(noreplace) %{_sysconfdir}/cron.d/*
+%dir %{_localstatedir}/run/%{name}/
+%endif
 %{_mandir}/man*/md*
 %{_udevrulesdir}/*
 %config(noreplace) %{_sysconfdir}/sysconfig/*
-%config(noreplace) %{_sysconfdir}/cron.d/*
-%dir %{_localstatedir}/run/%{name}/
-%config(noreplace) %{_tmpfilesdir}/%{name}.conf
+
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1-1
+- new upstream release.
+- added systemd support (disabled as default).
+- dropped Patch93-96.
+
 * Sat Feb 24 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0-1
 - new upstream release.
 

p/python-six/python-six-vl.spec

@@ -2,19 +2,19 @@
 
 # Basic Information
 Name:		python-six
-Version:	1.11.0
+Version:	1.14.0
 Release:	1%{?_dist_release}
-License:	MIT
 # /usr/share/doc/rpm-4.11.2/GROUPS_for_vine.txt を参照して Group を修正してください。
 Group:		Development/Libraries
-URL:		http://pypi.python.org/pypi/six/
-Source0:	https://pypi.python.org/packages/source/s/%{pkgname}/%{pkgname}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Packager:	yasumichi
 
+License:	MIT
+URL:		https://pypi.python.org/pypi/six/
+Source0:	https://pypi.python.org/packages/source/s/%{pkgname}/%{pkgname}-%{version}.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+
 Summary:	Python 2 and 3 compatibility utilities
 Summary(ja):	Python 2 および 3 の互換ユーテリティ
 
@@ -75,7 +75,6 @@ list: http://mail.python.org/mailman/listinfo/python-porting
 %py_build
 %py3_build
 
-%{__python} setup.py build
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -89,18 +88,23 @@ list: http://mail.python.org/mailman/listinfo/python-porting
 
 %files
 %defattr(-,root,root)
-%doc LICENSE README*
+%license LICENSE
+%doc README*
 %{python_sitelib}/six-%{version}-py*.egg-info
 %{python_sitelib}/six.py*
 
 %files -n python3-six
 %defattr(-,root,root)
-%doc LICENSE README*
+%license LICENSE
+%doc README*
 %{python3_sitelib}/six-%{version}-py*.egg-info
 %{python3_sitelib}/six.py*
 %{python3_sitelib}/__pycache__/six.*
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.0-1
+- new upstream release.
+
 * Wed Jan 31 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.11.0-1
 - new upstream release.
 - added a subpackage for python3.

r/rsyslog/rsyslog-vl.spec

@@ -1,41 +1,49 @@
+%bcond_with systemd
 %global _exec_prefix %{nil}
 %global _libdir %{_exec_prefix}/%{_lib}
 %define rsyslog_statedir %{_sharedstatedir}/rsyslog
 %define rsyslog_pkidir %{_sysconfdir}/pki/rsyslog
 
-Summary: Enhanced system logging and kernel message trapping daemon
-Name: rsyslog
-Version: 8.1910.0
-Release: 1%{?_dist_release}
-License: GPLv3+
-Group: System Environment/Daemons
-URL: http://www.rsyslog.com/
-Source0: https://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
-Source1: rsyslog.init
-Source2: rsyslog.conf
-Source3: rsyslog.sysconfig
-Source4: rsyslog.log
-
-BuildRequires: curl-devel
-BuildRequires: libestr-devel
-BuildRequires: libfastjson-devel
-BuildRequires: liblogging-stdlog-devel
-BuildRequires: librelp-devel
-BuildRequires: libuuid-devel
-BuildRequires: python-docutils
-BuildRequires: zlib-devel
-Requires: logrotate >= 3.5.2
-Requires: bash >= 2.0
+Summary:        Enhanced system logging and kernel message trapping daemon
+Name:           rsyslog
+Version:        8.2002.0
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
+Group:          System Environment/Daemons
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv3+
+URL:            https://www.rsyslog.com/
+Source0:        https://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
+Source1:        rsyslog.init
+Source2:        rsyslog.conf
+Source3:        rsyslog.sysconfig
+Source4:        rsyslog.log
+
+# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
+Patch0:         rsyslog-8.34.0-sd-service.patch
+
+BuildRequires:  libestr-devel
+BuildRequires:  libfastjson-devel
+BuildRequires:  libuuid-devel
+BuildRequires:  python3-rpm-macros
+BuildRequires:  python3-docutils
+BuildRequires:  zlib-devel
+Requires:       logrotate >= 3.5.2
+Requires:       bash >= 2.0
+%if %{with systemd}
+BuildRequires: systemd-devel >= 204-8
+%{?systemd_requires}
+%else
 Requires(post): /sbin/chkconfig coreutils
 Requires(preun): /sbin/chkconfig /sbin/service
 Requires(postun): /sbin/service
+%endif
+
 Provides: syslog
 Conflicts: sysklogd, syslog-ng
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
 
 %package mysql
 Summary: MySQL support for rsyslog
@@ -49,6 +57,11 @@ Group: System Environment/Daemons
 Requires: %name = %version-%release
 BuildRequires: libpq-devel
 
+%package elasticsearch
+Summary: ElasticSearch output module for rsyslog
+Requires: %name = %version-%release
+BuildRequires: curl-devel
+
 %package gssapi
 Summary: GSSAPI authentication and encryption support for rsyslog
 Group: System Environment/Daemons
@@ -89,6 +102,10 @@ MySQL database support to rsyslog.
 The rsyslog-pgsql package contains a dynamic shared object that will add
 PostgreSQL database support to rsyslog.
 
+%description elasticsearch
+This module provides the capability for rsyslog to feed logs directly into
+Elasticsearch.
+
 %description gssapi
 The rsyslog-gssapi package contains the rsyslog plugins which support GSSAPI 
 authentication and secure connections. GSSAPI is commonly used for Kerberos 
@@ -110,18 +127,22 @@ ability to send syslog messages as SNMPv1 and SNMPv2c traps.
 
 %prep
 %setup -q
+%patch0 -p1
 
-perl -pi -e 's|^extern char \*strdup.*$||' grammar/lexer.c
+#perl -pi -e 's|^extern char \*strdup.*$||' grammar/lexer.c
 
-autoreconf --install
+autoreconf -vif
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fpie -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
 export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
-%configure	--disable-static \
+export PYTHON=%{__python3}
+%configure	\
+		--disable-static \
 		--disable-testbench \
 		--enable-mysql \
 		--enable-pgsql \
+		--enable-elasticsearch \
 		--enable-gssapi-krb5 \
 		--enable-imfile \
 		--enable-imptcp \
@@ -136,43 +157,61 @@ export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+make install DESTDIR=%{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
+install -d -m 755 %{buildroot}%{_sysconfdir}/logrotate.d
+install -d -m 755 %{buildroot}%{_sysconfdir}/rsyslog.d
+install -d -m 700 %{buildroot}%{rsyslog_statedir}
+install -d -m 700 %{buildroot}%{rsyslog_pkidir}
 
-install -d -m 755 $RPM_BUILD_ROOT%{_initrddir}
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
-install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.d
-install -d -m 700 $RPM_BUILD_ROOT%{rsyslog_statedir}
-install -d -m 700 $RPM_BUILD_ROOT%{rsyslog_pkidir}
+install -p -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/rsyslog.conf
+install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/rsyslog
+install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/logrotate.d/syslog
 
-install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/rsyslog
-install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rsyslog.conf
-install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/rsyslog
-install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/syslog
+%if %{with systemd}
+# get rid of socket activation by default
+sed -i '/^Alias/s/^/;/;/^Requires=syslog.socket/s/^/;/' %{buildroot}%{_unitdir}/rsyslog.service
+%else
+install -d -m 755 %{buildroot}%{_initrddir}
+install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/rsyslog
+%endif
 
 #get rid of *.la
-rm $RPM_BUILD_ROOT/%{_libdir}/rsyslog/*.la
+rm %{buildroot}/%{_libdir}/rsyslog/*.la
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post
-/sbin/chkconfig --add rsyslog
 for n in /var/log/{messages,secure,maillog,spooler}
 do
 	[ -f $n ] && continue
 	umask 066 && touch $n
 done
+%if %{with systemd}
+%systemd_post rsyslog.service
+%else
+/sbin/chkconfig --add rsyslog
+%endif
 
 %preun
-if [ $1 = 0 ]; then
+%if %{with systemd}
+%systemd_preun rsyslog.service
+%else
+if [ $1 = 0 -o -x /bin/systemctl ]; then
 	service rsyslog stop >/dev/null 2>&1 ||:
 	/sbin/chkconfig --del rsyslog
 fi
+%endif
 
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart rsyslog.service
+%else
+%endif
 if [ "$1" -ge "1" ]; then
 	service rsyslog condrestart > /dev/null 2>&1 ||:
 fi
@@ -211,9 +250,13 @@ fi
 %dir %{_sysconfdir}/rsyslog.d
 %dir %{rsyslog_statedir}
 %dir %{rsyslog_pkidir}
-%{_initrddir}/rsyslog
 %{_sbindir}/rsyslogd
 %{_mandir}/*/*
+%if %{with systemd}
+%{_unitdir}/rsyslog.service
+%else
+%{_initrddir}/rsyslog
+%endif
 
 %files mysql
 %defattr(-,root,root)
@@ -225,6 +268,10 @@ fi
 %doc plugins/ompgsql/createDB.sql
 %{_libdir}/rsyslog/ompgsql.so
 
+%files elasticsearch
+%defattr(-,root,root)
+%{_libdir}/rsyslog/omelasticsearch.so
+
 %files gssapi
 %defattr(-,root,root)
 %{_libdir}/rsyslog/lmgssutil.so
@@ -245,6 +292,11 @@ fi
 %{_libdir}/rsyslog/omsnmp.so
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2002.0-1
+- new upstream release.
+- enabled elasticsearch support.
+- added systemd support (disabled as default).
+
 * Fri Oct 04 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.1910.0-1
 - new upstream release.
 

s/speexdsp/speexdsp-vl.spec

@@ -3,10 +3,12 @@
 Name:           speexdsp
 Version:        1.2
 %global rc_ver  rc3
-Release:        0.15.%{rc_ver}%{?dist}
+Release:        0.16.%{rc_ver}%{?_dist_release}
 Summary:        A voice compression format (DSP)
-
 Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        BSD
 URL:            http://www.speex.org/
 Source0:        http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.tar.gz
@@ -15,8 +17,6 @@ Source0:        http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_
 # upstream ML thread http://lists.xiph.org/pipermail/speex-dev/2014-May/008488.html
 Patch0:         speexdsp-fixbuilds-774c87d.patch
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
 
 BuildRequires: libtool autoconf automake
 # speexdsp was split from speex in 1.2rc2. As speexdsp does not depend on
@@ -79,9 +79,6 @@ speech. This package contains development files for %{name}
 %build
 autoreconf -vif
 %configure \
-%ifarch aarch64
-	--disable-neon \
-%endif
 	--disable-static
 
 make %{?_smp_mflags} V=1
@@ -97,7 +94,8 @@ find %{buildroot} -type f -name "*.la" -delete
 
 
 %files
-%doc AUTHORS COPYING TODO ChangeLog README NEWS doc/manual.pdf
+%license COPYING
+%doc AUTHORS TODO ChangeLog README NEWS doc/manual.pdf
 %doc %{_docdir}/speexdsp/manual.pdf
 %{_libdir}/libspeexdsp.so.*
 
@@ -116,6 +114,9 @@ find %{buildroot} -type f -name "*.la" -delete
 %endif
 
 %changelog
+* Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2-0.16.rc3
+- rebuilt with current environment.
+
 * Sun Feb 25 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2-0.15.rc3
 - added compat32 packages.