Browse Source

updated 9 packages

libevent-2.1.11-1

memcached-1.6.5-1

netatalk-3.1.12-2

nfs-utils-2.4.3-1

nsd-4.3.0-3

perl-Event-Lib-1.03-5

tmux-3.0a-1

unbound-1.10.0-2

zabbix-4.0.19-2

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

+ 10 - 8
lib/libe/libevent/libevent-vl.spec

@@ -3,20 +3,18 @@
 Summary:        Abstract asynchronous event notification library
 Summary(ja):	非同期イベント通知ライブラリ
 Name:           libevent
-Version:        2.1.8
-Release:        2%{?_dist_release}
+Version:        2.1.11
+Release:        1%{?_dist_release}
 Group:          System Environment/Libraries
-License:        BSD
-URL:            https://libevent.org/
-Source0:        https://github.com/libevent/libevent/releases/download/release-%{version}-stable/libevent-%{version}-stable.tar.gz
-
 Vendor:         Project Vine
 Distribution:   Vine Linux
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
-BuildRequires:	openssl-devel
+License:        BSD
+URL:            https://libevent.org/
+Source0:        https://github.com/libevent/libevent/releases/download/release-%{version}-stable/libevent-%{version}-stable.tar.gz
 
+BuildRequires:	openssl-devel
 
 %description
 The libevent API provides a mechanism to execute a callback function
@@ -26,6 +24,7 @@ loop found in event driven network servers. An application just needs
 to call event_dispatch() and can then add or remove events dynamically
 without having to change the event loop.
 
+
 %package devel
 Summary: Header files, libraries and development documentation for %{name}
 Group: Development/Libraries
@@ -100,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.11-1
+- new upstream release.
+
 * Fri Nov 09 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.8-2
 - added a subpackage 'compat32-libevent'.
 

+ 93 - 28
m/memcached/memcached-vl.spec

@@ -1,30 +1,41 @@
-%define memcached_version 1.5.12
+%bcond_with systemd
 
 Summary: a high-performance, distributed memory object caching system
 Summary(ja): ハイパフォーマンスな分散メモリオブジェクトキャッシングシステム
 Name: memcached
-Version: %{memcached_version}
-Release: 1%{?_dist_release}
-Source0: http://www.danga.com/memcached/dist/%{name}-%{memcached_version}.tar.gz
+Version: 1.6.5
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: Applications/Databases
+Vendor: Project Vine
+Distribution: Vine Linux
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
+License: modified BSD style License
+Url: https://memcached.org/
+Source0: http://www.memcached.org/files/memcached-%{version}.tar.gz
+Source1: memcached.sysconfig
 # Patches
+Patch1: memcached-unit.patch
 
-
-License: modified BSD style License
-Url: http://www.danga.com/memcached/
-Group: Applications/Databases
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libevent-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
+BuildRequires: openssl-devel
+Requires(pre): shadow-utils
+%if %{with systemd}
+BuildRequires: systemd
+%{?systemd_requires}
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(preun): initscripts
+Requires(postun): initscripts
+%endif
 
 %description
 memcached is a high-performance, distributed memory object caching system, 
 generic in nature, but intended for use in speeding up dynamic web 
 applications by alleviating database load.
 
+
 %package devel
 Summary:	Files needed for development using memcached protocol
 Summary(ja):	memcached プロトコルを使用した開発に必要なファイル
@@ -35,63 +46,117 @@ Requires:	%{name} = %{version}-%{release}
 Install memcached-devel if you are developing C/C++ applications that require access to the
 memcached binary include files.
 
+
 %prep
 %setup -q
+%patch1 -p1 -b .unit
 
+%if !%{with systemd}
 perl -pi -e 's|/var/run/memcached\.pid|/var/run/memcached/memcached.pid|' scripts/memcached.sysv
+%endif
+
 
 %build
-%configure
+%configure --enable-tls
 %__make %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_initdir}
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 mkdir -p %{buildroot}%{_localstatedir}/run/memcached
 
-%makeinstall
+make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
+# remove memcached-debug
+rm -f %{buildroot}/%{_bindir}/memcached-debug
 
-rm -f %{buildroot}%{_bindir}/memcached-debug
+# Perl script for monitoring memcached
+install -Dp -m0755 scripts/memcached-tool %{buildroot}%{_bindir}/memcached-tool
+install -Dp -m0644 scripts/memcached-tool.1 \
+        %{buildroot}%{_mandir}/man1/memcached-tool.1
 
+%if %{with systemd}
+# Unit file
+install -Dp -m0644 scripts/memcached.service \
+        %{buildroot}%{_unitdir}/memcached.service
+%else
+mkdir -p %{buildroot}%{_initdir}
 install -m755 scripts/memcached.sysv %{buildroot}%{_initdir}/memcached
-install -m755 scripts/memcached-tool %{buildroot}%{_bindir}/
+%endif
+# Default configs
+install -Dp -m0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/sysconfig/%{name}
 
-cat <<EOF > %{buildroot}%{_sysconfdir}/sysconfig/memcached
-PORT=11211
-USER=nobody
-MAXCONN=1024
-CACHESIZE=64
-OPTIONS=""
-EOF
 
 %clean
 rm -rf %{buildroot}
 
+
 %triggerprein -- memcached < 1.5.0
   /sbin/update-alternatives --remove memcached %{_bindir}/memcached.memcached ||:
   /sbin/update-alternatives --remove memcached %{_bindir}/memcached.repcached ||:
 rm -f %{_bindir}/memcached
 
+%pre
+getent group memcached >/dev/null || groupadd -r memcached
+getent passwd memcached >/dev/null || \
+useradd -r -g memcached -d %{_sysconfdir}/memcached -s /sbin/nologin \
+-c "memcached service" memcached
+exit 0
+
 %post
-/sbin/service memcached condrestart ||:
+%if %{with systemd}
+%systemd_post memcached.service
+%else
+/sbin/chkconfig --add %{name}
+%endif
+
+%preun
+%if %{with systemd}
+%systemd_preun memcached.service
+%else
+if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
+  /sbin/service %{name} stop >/dev/null 2>&1
+  /sbin/chkconfig --del %{name} 
+fi
+%endif
+
+%postun
+%if %{with systemd}
+%systemd_postun_with_restart memcached.service
+%else
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
+  /sbin/service %{name} condrestart ||:
+fi
+%endif
+
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS* COPYING ChangeLog ChangeLog* NEWS README*
+%license COPYING
+%doc AUTHORS* ChangeLog ChangeLog* NEWS README*
 %doc doc/CONTRIBUTORS doc/*.txt
 %config(noreplace) %{_sysconfdir}/sysconfig/memcached
-%{_initdir}/memcached
 %{_bindir}/memcached
 %{_bindir}/memcached-tool
 %{_mandir}/man1/memcached.1*
+%{_mandir}/man1/memcached-tool.1*
+%if %{with systemd}
+%{_unitdir}/memcached.service
+%else
+%{_initdir}/memcached
 %dir %{_localstatedir}/run/memcached
+%endif
 
 %files devel
 %defattr(-,root,root,0755)
 %{_includedir}/memcached/*
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.5-1
+- new upstream release.
+- built with libevent-2.1.11.
+- added systemd support (disabled as default).
+
 * Sun Nov 04 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.12-1
 - new upstream release.
 - built with libevent-2.1.8.

+ 124 - 56
n/netatalk/netatalk-vl.spec

@@ -1,37 +1,56 @@
-%define	_sysconfdir	/etc
+%bcond_with systemd
+%global tracker_api 2.0
 
 ################################################# BASIC PACKAGE INFORMATION
-Summary:       AFP fileserver for Macintosh clients
-Summary(ja):   Macintoshクライアント向けのAFPファイルサーバー
-Name:          netatalk
-Version:       3.1.12
-Release:       1%{_dist_release}
-License:       GPLv2+
-Group:         System Environment/Daemons
-URL:           http://netatalk.sourceforge.net/
-
-Source0:       %{name}-%{version}.tar.bz2
-
-Source1:       netatalk.pam-system-auth
-Patch0:        netatalk-3.0.1-basedir.patch
+Summary:        AFP fileserver for Macintosh clients
+Summary(ja):    Macintoshクライアント向けのAFPファイルサーバー
+Name:           netatalk
+Version:        3.1.12
+Release:        2%{_dist_release}%{?with_systemd:.systemd}
+Group:          System Environment/Daemons
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       shaolin, tomop
+
+License:        GPLv2+
+URL:            http://netatalk.sourceforge.net/
+Source0:        %{name}-%{version}.tar.bz2
+Source1:        netatalk.pam-system-auth
+Source2:        netatalk.conf
+Patch0:         netatalk-3.0.1-basedir.patch
+Patch1:         netatalk-systemd-execstartpre.patch
+# https://github.com/Netatalk/Netatalk/pull/110
+Patch2:         netatalk-fix-incorrect-fsf-address.patch
+# https://github.com/Netatalk/Netatalk/pull/113
+Patch3:         netatalk-afpstats-python3-compat.patch
+# https://github.com/Netatalk/Netatalk/pull/125
+Patch4:         netatalk-invalid_dircache_entries.patch
 
 ############################################################## REQUIREMENTS
-Requires(post): /sbin/chkconfig /sbin/ldconfig
+BuildRequires:  cracklib openssl-devel pam quota libtool automake
+BuildRequires:  autoconf libdb-devel pam-devel tcp_wrappers libgcrypt-devel
+BuildRequires:  avahi-devel libacl-devel openldap-devel
+BuildRequires:  dbus-devel dbus-glib-devel glib2-devel systemtap-sdt-devel
+BuildRequires:  libevent-devel libtdb-devel libmysqlclient-devel
+BuildRequires:  python3-rpm-macros
+BuildRequires:  tracker-devel
+
+Requires:       dbus-python3
+Requires:       dconf
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+%if %{with systemd}
+BuildRequires:  systemd
+%{?systemd_requires}
+%else
+Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
-Requires(postun): /sbin/service /sbin/ldconfig
-BuildRequires: cracklib openssl-devel pam quota libtool automake
-BuildRequires: autoconf libdb-devel pam-devel tcp_wrappers libgcrypt-devel
-BuildRequires: avahi-devel libacl-devel openldap-devel
-BuildRequires: dbus-devel dbus-glib-devel glib2-devel systemtap-sdt-devel
-BuildRequires: libevent-devel libtdb-devel libmysqlclient-devel
+Requires(postun): /sbin/service
+%endif
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
-Vendor:        Project Vine
-Distribution:  Vine Linux
-Packager:      shaolin, tomop
-
 %description
 Netatalk is a freely-available Open Source AFP fileserver. A *NIX/*BSD
 system running Netatalk is capable of serving many Macintosh clients
@@ -54,23 +73,35 @@ This package contains the header files for Netatalk.
 
 %prep
 %setup -q
+%autopatch -p1
 
-%patch0 -p1 -b .basedir
+rm -frv libevent/
 
 ln -s ./NEWS ChangeLog
 
+# Avoid re-running the autotools
+touch -r aclocal.m4 configure configure.ac macros/gssapi-check.m4
+
+# fix permissions
+find include \( -name '*.h' -a -executable \) -exec chmod -x {} \;
+
+# Don't call systemctl daemon-reload during the build
+sed -i 's\-systemctl daemon-reload\\g' distrib/initscripts/Makefile.in
+
 %build
 
-export CFLAGS="$RPM_OPT_FLAGS"
 %ifnarch x86_64
-# XXX : enable for x86_64 when glibc bug 149284 is fixed!
-export CFLAGS="$CFLAGS -fPIE"
-export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack"
-#"export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen"
-#Also in case of i686, nodlopen causes the problem.
+export CFLAGS=$(echo '%{optflags}' -fPIE | sed -e 's|-O2|-O0|')
+%else
+export CFLAGS="%{optflags} -fPIE"
 %endif
+export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack"
 
 %configure \
+        --disable-silent-rules \
+        --disable-static \
+        --enable-shared \
+        --localstatedir=%{_localstatedir}/lib \
         --with-pkgconfdir=%{_sysconfdir}/netatalk \
         --with-cracklib \
         --with-pam \
@@ -80,12 +111,20 @@ export LDFLAGS="-pie -Wl,-z,relro,-z,now,-z,noexecstack"
         --enable-krbV-uam \
         --enable-overwrite \
         --with-gnu-ld \
+%if %{with systemd}
+        --with-lockfile=/run/lock/netatalk/netatalk \
+        --with-init-style=redhat-systemd \
+        --with-init-dir=%{_unitdir} \
+%else
         --with-init-style=redhat-sysv \
+%endif
         --with-libgcrypt \
         --without-libevent \
         --without-tdb \
         --with-pam-confdir=%{_sysconfdir}/pam.d \
-        --with-dbus-sysconf-dir=%{_sysconfdir}/dbus-1/system.d
+        --with-dbus-sysconf-dir=%{_sysconfdir}/dbus-1/system.d \
+        -with-spotlight \
+        --with-tracker-pkgconfig-version=%{tracker_api}
 
 make %{?_smp_mflags} all
 
@@ -95,6 +134,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 
+# install our tmpfiles config
+install -Dpm644 %{SOURCE2} %{buildroot}%{_tmpfilesdir}/netatalk.conf
+
 # install example config files in doc
 mkdir config.example
 cp -fp config/afp.conf config.example
@@ -109,48 +151,70 @@ rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
 find $RPM_BUILD_ROOT -name \*.a -exec rm {} \;
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
 
+# Fix python shebang
+sed -i 's\^#!/usr/bin/env python$\#!%{__python3}\' %{buildroot}/usr/bin/afpstats
+
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+
 %post
-if [ -e /etc/netatalk/afp_signature.conf -a ! -e /var/netatalk/afp_signature.conf ]; then
-        mv -f /etc/netatalk/afp_signature.conf /var/netatalk/
+if [ -e /var/netatalk/afp_signature.conf -a ! -e /var/lib/netatalk/afp_signature.conf ]; then
+    mv -f /var/netatalk/afp_signature.conf /var/lib/netatalk/
+fi
+if [ -e /etc/netatalk/afp_signature.conf -a ! -e /var/lib/netatalk/afp_signature.conf ]; then
+    mv -f /etc/netatalk/afp_signature.conf /var/lib/netatalk/
 fi
-if [ -e /etc/netatalk/afp_voluuid.conf -a ! -e /var/netatalk/afp_voluuid.conf ]; then
-        mv -f /etc/netatalk/afp_voluuid.conf /var/netatalk/
+if [ -e /var/netatalk/afp_voluuid.conf -a ! -e /var/lib/netatalk/afp_voluuid.conf ]; then
+    mv -f /var/netatalk/afp_voluuid.conf /var/lib/netatalk/
 fi
+if [ -e /etc/netatalk/afp_voluuid.conf -a ! -e /var/lib/netatalk/afp_voluuid.conf ]; then
+    mv -f /etc/netatalk/afp_voluuid.conf /var/lib/netatalk/
+fi
+
+%if %{with systemd}
+%systemd_post %{name}.service
+%else
 /sbin/chkconfig --add netatalk
+%endif
 /sbin/ldconfig
 
 %preun
-if [ "$1" = "0" ] ; then
-  # check for existence due to renaming initscript
-  if [ -x  %{_initrddir}/netatalk ] ; then
-    /sbin/service netatalk stop > /dev/null 2>&1
-    /sbin/chkconfig --del netatalk
-  fi
+%if %{with systemd}
+%systemd_preun %{name}.service
+%else
+if [ "$1" = "0" -o -x /bin/systemctl ] ; then
+    # check for existence due to renaming initscript
+    if [ -x  %{_initrddir}/netatalk ] ; then
+        /sbin/service netatalk stop > /dev/null 2>&1
+        /sbin/chkconfig --del netatalk
+    fi
 fi
+%endif
 
 %postun
-if [ "$1" -ge "1" ]; then
-        # Package upgrade, not uninstall
-        if [ -e /etc/netatalk/afp_signature.conf -a ! -e /var/netatalk/afp_signature.conf ]; then
-                mv -f /etc/netatalk/afp_signature.conf /var/netatalk/
-        fi
-        if [ -e /etc/netatalk/afp_voluuid.conf -a ! -e /var/netatalk/afp_voluuid.conf ]; then
-                mv -f /etc/netatalk/afp_voluuid.conf /var/netatalk/
-        fi
-  /sbin/service netatalk condrestart > /dev/null 2>&1 || :
+%if %{with systemd}
+%systemd_postun_with_restart %{name}.service
+%else
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
+    /sbin/service netatalk condrestart > /dev/null 2>&1 || :
 fi
+%endif
 /sbin/ldconfig
 
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
 
 %files
 %defattr(-,root,root)
 %license COPYING COPYRIGHT
 %doc NEWS
 %doc config.example
+%if %{with systemd}
+%{_unitdir}/netatalk.service
+%{_tmpfilesdir}/netatalk.conf
+%else
 %attr(755,root,root) %{_initrddir}/netatalk
+%endif
 %dir %{_sysconfdir}/netatalk
 %config(noreplace) %{_sysconfdir}/netatalk/afp.conf
 %config(noreplace) %{_sysconfdir}/netatalk/extmap.conf
@@ -167,7 +231,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/*.so.*
 %dir %{_libdir}/netatalk
 %{_libdir}/netatalk/*.so
-%{_localstatedir}/netatalk
+%{_localstatedir}/lib/netatalk
 
 %files devel
 %defattr(-,root,root)
@@ -179,6 +243,10 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.12-2
+- rebuilt with libevent-2.1.11.
+- added systemd support (disabled as default).
+
 * Mon Jan 07 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.12-1
 - new upstream release.
 

+ 149 - 62
n/nfs-utils/nfs-utils-vl.spec

@@ -1,41 +1,47 @@
-%define _unpackaged_files_terminate_build 1
-
-Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
-Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
-Name: nfs-utils
-Version: 2.4.1
-Release: 1%{?_dist_release}
+%bcond_with systemd
 
+%define _unpackaged_files_terminate_build 1
 %define enablegss 1
-
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
-License: MIT and GPLv2 and GPLv2+ and BSD
+Summary: NFS utilities and supporting clients and daemons for the kernel NFS server
+Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
+Name: nfs-utils
+Version: 2.4.3
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: System Environment/Daemons
-URL: https://sourceforge.net/projects/nfs/
-
 Vendor: Project Vine
 Distribution: Vine Linux
 
+License: MIT and GPLv2 and GPLv2+ and BSD
+URL: https://sourceforge.net/projects/nfs/
 Source0: https://mirrors.edge.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
 
+#Source3: 24-nfs-server.conf
+Source1: id_resolver.conf
+Source2: lockd.conf
+Source4: nfsconvert.py
+Source5: nfsconvert.sh
+Source6: nfs-convert.service
+
 Source10: nfs.init
 Source11: nfslock.init
 Source12: rpcidmapd.init
 Source13: rpcgssd.init
 #Source14: rpcsvcgssd.init
 Source15: nfsdcld.init
-
-Source21: id_resolver.conf
-Source22: lockd.conf
 Source23: nfs.sysconfig
 
-Patch001: nfs-utils.2.4.2-rc1.patch
+Patch001: nfs-utils.2.4.4-rc2.patch
 
 Patch100: nfs-utils-1.2.1-statdpath-man.patch
 Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
-Patch103: nfs-utils-1.2.5-idmap-errmsg.patch
+Patch102: nfs-utils-1.2.5-idmap-errmsg.patch
+Patch103: nfs-utils-2.3.1-systemd-gssproxy-restart.patch
+Patch104: nfs-utils-2.3.3-man-tcpwrappers.patch
+Patch105: nfs-utils-2.3.3-nfsconf-usegssproxy.patch
+Patch106: nfs-utils-2.4.2-systemd-svcgssd.patch
 
 Provides: exportfs    = %{version}-%{release}
 Provides: nfsstat     = %{version}-%{release}
@@ -62,15 +68,26 @@ BuildRequires: libevent-devel libcap-devel
 BuildRequires: libnfsidmap-devel libtirpc-devel libblkid-devel
 BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
 BuildRequires: automake, libtool, glibc-headers, device-mapper-devel
-BuildRequires: krb5-devel, tcp_wrappers, libmount-devel
+BuildRequires: krb5-devel, libmount-devel
 BuildRequires: sqlite3-devel
+BuildRequires: libxml2-devel
+BuildRequires: libuuid-devel
 BuildRequires: rpcgen
 #if %{enablegss}
 #BuildRequires: libgssglue-devel
 #BuildRequires: librpcsecgss >= 0.17
 #endif
 Requires(pre): shadow-utils >= 4.0.3-25
+%if %{with systemd}
+BuildRequires: systemd
+Requires(pre): util-linux
+Requires(pre): coreutils
+Requires(preun): coreutils
+%{?systemd_requires}
+%else
 Requires(pre): /sbin/chkconfig /sbin/nologin
+Requires(preun): /sbin/chkconfig
+%endif
 Requires: libnfsidmap libevent
 Requires: libtirpc >= 0.2.3 libblkid libcap libmount
 #if %{enablegss}
@@ -130,24 +147,21 @@ developing programs which use the libnfsidmap library.
 
 
 %prep
-%autosetup -p1
+%setup -q
+%if %{with systemd}
+%autopatch -p1
+%else
+%patch001 -p1
+%endif
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
 
 
 %build
-
-%ifarch s390 s390x
-PIE="-fPIE"
-%else
-PIE="-fpie"
-%endif
-export PIE
-
 sh -x autogen.sh
 
-CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE -D_FILE_OFFSET_BITS=64`"
+CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS -fpie -D_FILE_OFFSET_BITS=64`"
 %configure \
     CFLAGS="$CFLAGS" \
     CPPFLAGS="$DEFINES" \
@@ -156,55 +170,77 @@ CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE -D_FILE_OFFSET_BITS=64`"
     --enable-ipv6 \
     --with-statdpath=/var/lib/nfs/statd \
     --enable-libmount-mount \
-	--with-pluginpath=%{_libdir}/libnfsidmap
+    --with-pluginpath=%{_libdir}/libnfsidmap \
+	--without-tcp-wrappers \
+%if %{with systemd}
+    --with-systemd=%{_unitdir} \
+%endif
+	--enable-junction
 
 make %{?_smp_mflags} all
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{/sbin,/usr/sbin}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}{/sbin,/usr/sbin}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8}
-mkdir -p $RPM_BUILD_ROOT%{_initdir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
-make DESTDIR=$RPM_BUILD_ROOT install
-install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT%{_sbindir}
-install -m 644 utils/mount/nfsmount.conf  $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 644 nfs.conf  $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 644 support/nfsidmap/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install -m 755 %{SOURCE10} $RPM_BUILD_ROOT%{_initdir}/nfs
-install -m 755 %{SOURCE11} $RPM_BUILD_ROOT%{_initdir}/nfslock
-install -m 755 %{SOURCE12} $RPM_BUILD_ROOT%{_initdir}/rpcidmapd
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_sysconfdir}/request-key.d
+mkdir -p %{buildroot}%{_sysconfdir}/modprobe.d
+%if %{with systemd}
+mkdir -p %{buildroot}%{_unitdir}
+mkdir -p %{buildroot}/lib/systemd/system-generators
+%else
+mkdir -p %{buildroot}%{_initdir}
+%endif
+
+make DESTDIR=%{buildroot} install
+
+install -s -m 755 tools/rpcdebug/rpcdebug %{buildroot}%{_sbindir}
+install -m 644 utils/mount/nfsmount.conf  %{buildroot}%{_sysconfdir}
+install -m 644 nfs.conf  %{buildroot}%{_sysconfdir}
+install -m 644 support/nfsidmap/idmapd.conf %{buildroot}%{_sysconfdir}
+install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/request-key.d
+
+%if %{with systemd}
+install -m 755 %{SOURCE4} %{buildroot}%{_sbindir}/nfsconvert
+mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/nfs-utils/
+install -m 755 %{SOURCE5} %{buildroot}/%{_libexecdir}/nfs-utils/nfsconvert.sh
+install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}
+%else
+install -m 755 %{SOURCE10} %{buildroot}%{_initdir}/nfs
+install -m 755 %{SOURCE11} %{buildroot}%{_initdir}/nfslock
+install -m 755 %{SOURCE12} %{buildroot}%{_initdir}/rpcidmapd
+install -m 755 %{SOURCE15} %{buildroot}%{_initdir}/nfsdcld
+install -m 644 %{SOURCE23} %{buildroot}%{_sysconfdir}/sysconfig/nfs
 %if %{enablegss}
-install -m 755 %{SOURCE13} $RPM_BUILD_ROOT%{_initdir}/rpcgssd
+install -m 755 %{SOURCE13} %{buildroot}%{_initdir}/rpcgssd
+%endif
 %endif
-install -m 755 %{SOURCE15} $RPM_BUILD_ROOT%{_initdir}/nfsdcld
 
-install -m 644 %{SOURCE21} $RPM_BUILD_ROOT%{_sysconfdir}/request-key.d
-install -m 644 %{SOURCE22} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/lockd.conf
-install -m 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/nfs
+mkdir -p %{buildroot}/run/sysconfig
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/modprobe.d/lockd.conf
+
+rm -f %{buildroot}%{_libdir}/*.{a,la}
+rm -f %{buildroot}%{_libdir}/libnfsidmap/*.{a,la}
 
-mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/rpc_pipefs
+mkdir -p %{buildroot}/var/lib/nfs/rpc_pipefs
 
-touch $RPM_BUILD_ROOT/var/lib/nfs/rmtab
-mv $RPM_BUILD_ROOT/usr/sbin/rpc.statd $RPM_BUILD_ROOT/sbin
+touch %{buildroot}/var/lib/nfs/rmtab
+mv %{buildroot}/usr/sbin/rpc.statd %{buildroot}/sbin
 
-mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm
-mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm.bak
-mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/exports.d
+mkdir -p %{buildroot}/var/lib/nfs/statd/sm
+mkdir -p %{buildroot}/var/lib/nfs/statd/sm.bak
+mkdir -p %{buildroot}/var/lib/nfs/v4recovery
+mkdir -p %{buildroot}%{_sysconfdir}/exports.d
 
 # temporarily remove nfs.5 man page until util-linux gets upgraded...
-rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/nfs.5*
+#rm -f %{buildroot}/%{_mandir}/man5/nfs.5*
 
-rm -f %{buildroot}%{_libdir}/*.{a,la}
-rm -f %{buildroot}%{_libdir}/libnfsidmap/*.{a,la}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %pre
@@ -247,6 +283,19 @@ fi
 
 
 %post
+%if %{with systemd}
+if [ $1 -eq 1 ] ; then
+	# Initial installation
+	/bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
+	/bin/systemctl start nfs-client.target  >/dev/null 2>&1 || :
+fi
+
+# Enable nfs-convert so if an old configuration
+# exists a conversion will occur
+/bin/systemctl enable nfs-convert  >/dev/null 2>&1 || :
+
+%systemd_post nfs-server
+%else
 /sbin/chkconfig --add nfs
 /sbin/chkconfig --add nfslock
 /sbin/chkconfig --add rpcidmapd
@@ -262,9 +311,19 @@ if [ -f /var/lock/subsys/rpc.statd ]; then
 else
 	chown -R rpcuser:rpcuser /var/lib/nfs/statd
 fi
+%endif
 
 %preun
-if [ "$1" = "0" ]; then
+%if %{with systemd}
+if [ $1 -eq 0 ]; then
+	%systemd_preun nfs-client.target
+	%systemd_preun nfs-server.service
+
+    rm -rf /var/lib/nfs/statd
+    rm -rf /var/lib/nfs/v4recovery
+fi
+%else
+if [ "$1" = "0" -o -x /bin/systemctl ]; then
     /etc/rc.d/init.d/nfs condstop > /dev/null
 %if %{enablegss}
     /etc/rc.d/init.d/rpcgssd condstop > /dev/null
@@ -286,9 +345,16 @@ if [ "$1" = "0" ]; then
     rm -rf /var/lib/nfs/statd
     rm -rf /var/lib/nfs/v4recovery
 fi
+%endif
 
 %postun
-if [ "$1" -ge 1 ]; then
+%if %{with systemd}
+%systemd_postun_with_restart  nfs-client.target
+%systemd_postun_with_restart  nfs-server
+
+/bin/systemctl --system daemon-reload >/dev/null 2>&1 || :
+%else
+if [ "$1" -ge 1 -a ! -x /bin/systemctl ]; then
     if [ -f /etc/rc.d/init.d/rpcidmapd ]; then
 	/etc/rc.d/init.d/rpcidmapd condrestart > /dev/null
     fi
@@ -307,31 +373,46 @@ if [ "$1" -ge 1 ]; then
 	/etc/rc.d/init.d/nfsdcld condrestart > /dev/null
     fi
 fi
+%endif
 
 %post -n libnfsidmap -p /sbin/ldconfig
 
 %postun -n libnfsidmap -p /sbin/ldconfig
 
 %triggerpostun -- nfs-server
+%if !%{with systemd}
 /sbin/chkconfig --add nfs
+%endif
 
 %triggerpostun -- knfsd
+%if !%{with systemd}
 /sbin/chkconfig --add nfs
+%endif
 
 %triggerpostun -- knfsd-clients
+%if !%{with systemd}
 /sbin/chkconfig --add nfslock
+%endif
 
 %files
 %defattr(-,root,root)
 %doc linux-nfs/ChangeLog linux-nfs/KNOWNBUGS linux-nfs/NEW linux-nfs/README
 %doc linux-nfs/THANKS linux-nfs/TODO
+%if %{with systemd}
+/usr/lib/systemd/system-generators/*
+%{_unitdir}/*
+%{_sbindir}/nfsconvert
+%attr(755,root,root) %{_libexecdir}/nfs-utils/nfsconvert.sh
+%else
 %config %{_initdir}/nfs
 %config %{_initdir}/nfsdcld
 %config %{_initdir}/rpcidmapd
+%config %{_initdir}/nfslock
 %if %{enablegss}
 %config %{_initdir}/rpcgssd
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/nfs
+%endif
 %config(noreplace) %{_sysconfdir}/nfsmount.conf
 %config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf
 %config(noreplace) %{_sysconfdir}/modprobe.d/lockd.conf
@@ -348,7 +429,6 @@ fi
 %config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/statd/state
 /sbin/rpc.statd
 #/sbin/osd_login
-/sbin/nfsdcld
 /sbin/nfsdcltrack
 %{_sbindir}/exportfs
 %{_sbindir}/nfsstat
@@ -367,8 +447,10 @@ fi
 %{_sbindir}/nfsidmap
 %{_sbindir}/blkmapd
 %{_sbindir}/nfsconf
+%{_sbindir}/nfsref
+%{_sbindir}/nfsdcld
+%{_sbindir}/clddb-tool
 %{_mandir}/*/*
-%config %{_initdir}/nfslock
 
 %attr(4755,root,root)   /sbin/mount.nfs
 /sbin/mount.nfs4
@@ -392,6 +474,11 @@ fi
 
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.3-1
+- new upstream release.
+- updated patches.
+- added systemd support (disabled as default).
+
 * Fri Oct 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.1-1
 - new upstream release.
 - updated Patch100.

+ 5 - 2
n/nsd/nsd-vl.spec

@@ -4,7 +4,7 @@ Summary: Fast and lean authoritative DNS Name Server
 Summary(ja): 高速で最小限のAuthoritative専用DNSネームサーバ
 Name: nsd
 Version: 4.3.0
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Release: 3%{?_dist_release}%{?with_systemd:.systemd}
 Group: System Environment/Daemons
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -172,12 +172,15 @@ fi
 %systemd_postun_with_restart nsd.service
 %systemd_postun nsd-keygen.service
 %else
-if [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
   /sbin/service %{name} condrestart 
 fi
 %endif
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.3.0-3
+- rebuilt with libevent-2.1.11.
+
 * Tue Apr 07 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.3.0-2
 - fixed nsd-keygen.service.
 - updated nsd.conf.

+ 9 - 6
p/perl-Event-Lib/perl-Event-Lib-vl.spec

@@ -1,16 +1,15 @@
 Name:           perl-Event-Lib
 Version:        1.03
-Release:        4%{?_dist_release}
+Release:        5%{?_dist_release}
 Summary:        Perl wrapper around libevent
-
 Group:          Development/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Event-Lib/
 Source0:        http://search.cpan.org/CPAN/authors/id/V/VP/VPARSEVAL/Event-Lib-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Vendor:         Project Vine
-Distribution:   Vine Linux
 
 #https://rt.cpan.org/Public/Bug/Display.html?id=80644
 Patch0:         https://rt.cpan.org/Ticket/Attachment/1136922/598341/lib-event.patch
@@ -26,6 +25,7 @@ BuildRequires:  libevent-devel
 BuildRequires:  libxcrypt-devel
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
+
 %description
 This module is a Perl wrapper around libevent(3) as available from
 http://monkey.org/~provos/libevent/.  It allows to execute a function
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.03-5
+- built with libevent-2.1.11.
+
 * Thu May 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.03-4
 - rebuilt with perl-5.26.
 - added BR:libxcrypt-devel.

+ 8 - 9
t/tmux/tmux-vl.spec

@@ -1,12 +1,11 @@
-%define ver 2.9a
-%define rel 1
-
 Name:           tmux
-Version:        %{ver}
-Release:        %{rel}%{?_dist_release}
+Version:        3.0a
+Release:        1%{?_dist_release}
 Summary:        A terminal multiplexer
-
 Group:          Applications/System
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 # Most of the source is ISC licensed; some of the files in compat/ are 2 and
 # 3 clause BSD licensed.
 License:        ISC and BSD
@@ -16,9 +15,6 @@ Source0:        https://github.com/tmux/tmux/releases/download/%{version}/tmux-%
 BuildRequires:  ncurses-devel
 BuildRequires:  libevent-devel
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 tmux is a "terminal multiplexer."  It enables a number of terminals (or
 windows) to be accessed and controlled from a single terminal.  tmux is
@@ -51,6 +47,9 @@ fi
 %{_mandir}/man1/tmux.1.*
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0a-1
+- new upstream release.
+
 * Fri Aug 30 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.9a-1
 - new upstream release.
 

+ 108 - 22
u/unbound/unbound-vl.spec

@@ -1,6 +1,7 @@
+%bcond_with systemd
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
-%global with_munin 1
+%global with_munin 0
 %{?!enable_gost:      %global enable_gost      1}
 
 # not ready yet
@@ -10,8 +11,13 @@
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
-Version: 1.9.6
-Release: 1%{?_dist_release}
+Version: 1.10.0
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Group: System Environment/Daemons
+Distribution: Vine Linux
+Vendor: Project Vine
+Packager: iwaim, daisuke
+
 License: BSD
 Url: http://www.unbound.net/
 Source: https://nlnetlabs.nl/downloads/unbound/%{name}-%{version}.tar.gz
@@ -26,8 +32,13 @@ Source9: example.com.key
 Source10: example.com.conf
 Source11: block-example.com.conf
 
+Source100: unbound.service
+Source101: unbound-keygen.service
+Source102: unbound-anchor.service
+Source103: unbound-anchor.timer
+Source104: tmpfiles-unbound.conf
+Source105: unbound.sysconfig
 
-Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex
 BuildRequires: libevent-devel
@@ -43,16 +54,19 @@ BuildRequires: openssl-devel
 # Required for SVN versions
 #BuildRequires: bison
 
-
+%if %{with systemd}
+%global piddir /run/%{name}
+BuildRequires: systemd
+%{?systemd_requires}
+%else
+%global piddir %{_localstatedir}/run/%{name}
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
+%endif
 Requires(pre): shadow-utils
 
-Distribution: Vine Linux
-Vendor: Project Vine
-Packager: iwaim, daisuke
 
 %description
 Unbound is a validating, recursive, and caching DNS(SEC) resolver.
@@ -116,14 +130,18 @@ Requires: openssl >= 0.9.8g-12
 %description -n compat32-%{name}-libs
 Contains libraries used by the unbound server and client applications
 
+
 %prep
 %setup -q
 
+
 %build
 %configure  --with-libevent --with-pthreads --with-ssl \
             --disable-rpath --enable-debug --disable-static \
+            --enable-relro-now --enable-pie \
+            --enable-subnet --enable-ipsecmod \
             --with-conf-file=%{_sysconfdir}/%{name}/unbound.conf \
-            --with-pidfile=%{_localstatedir}/run/%{name}/%{name}.pid \
+            --with-pidfile=%{piddir}/%{name}.pid \
 %if %{with_python}
             --with-pythonmodule --with-pyunbound \
 %endif
@@ -136,14 +154,29 @@ Contains libraries used by the unbound server and client applications
 
 %{__make} %{?_smp_mflags}
 
+
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 install -d 0755 %{buildroot}%{_initrddir}
+
+%if %{with systemd}
+install -d -m 0755 %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
+install -p -m 0644 %{SOURCE100} %{buildroot}%{_unitdir}/unbound.service
+install -p -m 0644 %{SOURCE101} %{buildroot}%{_unitdir}/unbound-keygen.service
+install -p -m 0644 %{SOURCE103} %{buildroot}%{_unitdir}/unbound-anchor.timer
+install -p -m 0644 %{SOURCE102} %{buildroot}%{_unitdir}/unbound-anchor.service
+install -p -m 0644 %{SOURCE105} %{buildroot}%{_sysconfdir}/sysconfig/unbound
+# Install tmpfiles.d config
+install -d -m 0755 %{buildroot}%{_tmpfilesdir} %{buildroot}%{_sharedstatedir}/unbound
+install -m 0644 %{SOURCE104} %{buildroot}%{_tmpfilesdir}/unbound.conf
+%else
 install -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/unbound
-install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/unbound
 install -d 0755 %{buildroot}%{_sysconfdir}/cron.d
 install -p -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.d/unbound-anchor
+%endif
+
+install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/unbound
 
 echo "include: %{_sysconfdir}/unbound/conf.d/*.conf" >> %{buildroot}%{_sysconfdir}/unbound/unbound.conf
 
@@ -185,11 +218,19 @@ install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/unbound/local.d/
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+
 %files 
 %defattr(-,root,root,-)
 %license doc/LICENSE
 %doc doc/README doc/CREDITS doc/FEATURES
+%if %{with systemd}
+%attr(0644,root,root) %{_tmpfilesdir}/unbound.conf
+%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}-keygen.service
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+%else
 %attr(0755,root,root) %{_initrddir}/%{name}
+%endif
 %attr(0755,root,root) %dir %{_sysconfdir}/%{name}
 %attr(0755,unbound,unbound) %dir %{_localstatedir}/run/%{name}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/unbound.conf
@@ -229,11 +270,16 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/unbound-anchor
 %{_libdir}/libunbound.so.*
 %{_sysconfdir}/%{name}/icannbundle.pem
-%attr(0644,root,root) %{_sysconfdir}/cron.d/unbound-anchor
 %dir %attr(0755,unbound,unbound) %{_sharedstatedir}/%{name}
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/dlv.isc.org.key
 %attr(0644,unbound,unbound) %config(noreplace) %{_sharedstatedir}/%{name}/root.key
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/root.key
+%if %{with systemd}
+%{_unitdir}/unbound-anchor.timer
+%{_unitdir}/unbound-anchor.service
+%else
+%attr(0644,root,root) %{_sysconfdir}/cron.d/unbound-anchor
+%endif
 
 %if %{build_compat32}
 %files -n compat32-%{name}-libs
@@ -241,6 +287,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/libunbound.so.*
 %endif
 
+
 %pre libs
 getent group unbound >/dev/null || groupadd -r unbound
 getent passwd unbound >/dev/null || \
@@ -248,31 +295,62 @@ useradd -r -g unbound -d %{_sysconfdir}/unbound -s /sbin/nologin \
 -c "Unbound DNS resolver" unbound
 exit 0
 
+%post libs
+/sbin/ldconfig
+/sbin/runuser  --command="%{_sbindir}/unbound-anchor -a %{_sharedstatedir}/unbound/root.key -c %{_sysconfdir}/unbound/icannbundle.pem"  --shell /bin/sh unbound ||:
+%if %{with systemd}
+%systemd_post unbound-anchor.timer
+# start the timer only if installing the package to prevent starting it, if it was stopped on purpose
+if [ "$1" -eq 1 ]; then
+    # the Unit is in presets, but would be started after reboot
+    /bin/systemctl start unbound-anchor.timer >/dev/null 2>&1 || :
+fi
+%endif
+
+%if %{with systemd}
+%preun libs
+%systemd_preun unbound-anchor.timer
+%endif
+
+%postun libs
+/sbin/ldconfig
+%if %{with systemd}
+%systemd_postun_with_restart unbound-anchor.timer
+%endif
+
 %post
+%if %{with systemd}
+%systemd_post unbound.service
+%systemd_post unbound-keygen.service
+%else
 /sbin/chkconfig --add %{name}
+%endif
 # dnssec-conf used to contain our DLV key, but now we include it via unbound
 # If unbound had previously been configured with dnssec-configure, we need
 # to migrate the location of the DLV key file (to keep DLV enabled, and because
 # unbound won't start with a bad location for a DLV key file.
 sed -i "s:/etc/pki/dnssec-keys[/]*dlv:/etc/unbound:" %{_sysconfdir}/unbound/unbound.conf
 
-%post libs
-/sbin/ldconfig
-/sbin/runuser  --command="%{_sbindir}/unbound-anchor -a %{_sharedstatedir}/unbound/root.key -c %{_sysconfdir}/unbound/icannbundle.pem"  --shell /bin/sh unbound ||:
-
 %preun
-if [ "$1" -eq 0 ]; then
-        /sbin/service %{name} stop >/dev/null 2>&1
-        /sbin/chkconfig --del %{name} 
+%if %{with systemd}
+%systemd_preun unbound.service
+%systemd_preun unbound-keygen.service
+%else
+if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
+  /sbin/service %{name} stop >/dev/null 2>&1
+  /sbin/chkconfig --del %{name} 
 fi
+%endif
 
 %postun 
-if [ "$1" -ge "1" ]; then
+%if %{with systemd}
+%systemd_postun_with_restart unbound.service
+%systemd_postun unbound-keygen.service
+%else
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
   /sbin/service %{name} condrestart >/dev/null 2>&1 || :
 fi
-
-%postun libs
-/sbin/ldconfig
+%endif
 
 %post -n compat32-%{name}-libs
 /sbin/ldconfig
@@ -281,6 +359,14 @@ fi
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.0-2
+- rebuilt with libevent-2.1.11.
+
+* Sat Apr 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.0-1
+- updated to 1.10.0.
+- added systemd support (disabled as default).
+- disabled munin.
+
 * Mon Dec 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.9.6-1
 - updated to 1.9.6.
 

+ 10 - 7
z/zabbix/zabbix-vl.spec

@@ -17,7 +17,7 @@
 Summary: The Enterprise-class Monitoring Solution for Everyone
 Name: zabbix
 Version: 4.0.19
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: Applications/Services
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -457,7 +457,7 @@ fi
 %systemd_preun zabbix-agent.service
 %if %{with systemd}
 %else
-if [ "$1" -eq 0 ]; then
+if [ "$1" -eq 0 -o -x /bin/systemctl ]; then
         /sbin/service zabbix_agentd stop >/dev/null 2>&1
         /sbin/chkconfig --del zabbix_agentd
 fi
@@ -469,7 +469,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-server-mysql.service
 %else
-if [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
         /sbin/service zabbix_server condrestart >/dev/null 2>&1 || :
 fi
 %endif
@@ -478,7 +478,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-server-pgsql.service
 %else
-if [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
         /sbin/service zabbix_server condrestart >/dev/null 2>&1 || :
 fi
 %endif
@@ -489,7 +489,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-proxy-mysql.service
 %else
-if [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
         /sbin/service zabbix_proxy condrestart >/dev/null 2>&1 || :
 fi
 %endif
@@ -498,7 +498,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-proxy-pgsql.service
 %else
-if [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
         /sbin/service zabbix_proxy condrestart >/dev/null 2>&1 || :
 fi
 %endif
@@ -507,7 +507,7 @@ fi
 %if %{with systemd}
 %systemd_postun_with_restart zabbix-agent.service
 %else
-if [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
         /sbin/service zabbix_agentd condrestart >/dev/null 2>&1 || :
 fi
 %endif
@@ -619,6 +619,9 @@ fi
 %endif
 
 %changelog
+* Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.19-2
+- rebuilt with libevent-2.1.11.
+
 * Mon Apr 06 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.19-1
 - new upstream release.
 - dropped Patch3: fixed in upstream.