updated 4 packages

dhcp-4.1.ESV.R16-1

libssh-0.9.4-1

orc-0.4.31-1

rpcbind-1.2.5-2

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

d/dhcp/dhcp-vl.spec

@@ -1,8 +1,8 @@
 # vendor string (e.g., Fedora, EL)
 %define vvendor Vine
 
-%define pversion 4.1.ESV.R15.P1
-%define sversion 4.1-ESV-R15-P1
+%define pversion 4.1.ESV.R16
+%define sversion 4.1-ESV-R16
 
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Summary(ja): DHCP (動的ホスト設定プロトコル) サーバおよびリレーエージェント
@@ -20,9 +20,9 @@ Release:  1%{?_dist_release}
 
 License:  ISC
 Group:    System Environment/Daemons
-URL:      http://isc.org/products/DHCP/
+URL:      https://isc.org/products/DHCP/
 
-Source0:  ftp://ftp.isc.org/isc/%{name}/%{name}-%{sversion}.tar.gz
+Source0:  https://downloads.isc.org/isc/dhcp/%{sversion}/dhcp-%{sversion}.tar.gz
 Source1:  dhcpd.init
 Source2:  dhcrelay.init
 Source5:  README.ldap
@@ -350,7 +350,7 @@ if [ $? = 0 ]; then
 fi || :
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 = 0 -o -x /bin/systemctl ]; then
     /sbin/service dhcpd status >/dev/null 2>&1
     if [ $? = 3 ]; then
         /sbin/service dhcpd stop >/dev/null 2>&1
@@ -433,6 +433,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Mon Apr 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.ESV.R16-1
+- new upstream release.
+
 * Sun Nov 11 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.ESV.R15.P1-1
 - new upstream release.
 - dropped Patch10.

lib/libs/libssh/libssh-vl.spec

@@ -2,14 +2,15 @@
 
 Summary:        A library implementing the SSH2 protocol
 Summary(ja):    SSH2プロトコルを実装するためのライブラリ
-
 Name:           libssh
-Version:        0.9.3
+Version:        0.9.4
 Release:        1%{?_dist_release}
-
 Group:          System Environment/Libraries
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        LGPLv2+
-URL:            http://www.libssh.org/
+URL:            https://www.libssh.org/
 %global         shortver %(echo %{version} | sed -e 's/\\.[0-9]*$//')
 Source0:        https://www.libssh.org/files/%{shortver}/%{name}-%{version}.tar.xz
 
@@ -17,13 +18,11 @@ Source0:        https://www.libssh.org/files/%{shortver}/%{name}-%{version}.tar.
 # Nothing so far.
 # Patch100:		libssh-0.4.8-pkgconfig.patch
 
-Vendor: Project Vine
-Distribution: Vine Linux
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires:  openssl-devel
-BuildRequires:  zlib-devel   
+BuildRequires:  zlib-devel
 BuildRequires:  cmake
 
 %description
@@ -106,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.4-1
+- new upstream release.
+
 * Sun Feb 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.9.3-1
 - new upstream release.
 - dropped Patch0: fixed in upstream.

o/orc/orc-vl.spec

@@ -3,20 +3,21 @@
 Name:		orc
 Summary:	The Oil Run-time Compiler
 Summary(ja):	Oil ランタイムコンパイラ
-Version:	0.4.28
+Version:	0.4.31
 Release:	1%{?_dist_release}
-
 Group:		System Environment/Libraries
+Vendor:		Project Vine
+Distribution: 	Vine Linux
+
 License:	BSD
 URL:		http://code.entropywave.com/orc/
 Source0:	http://gstreamer.freedesktop.org/src/orc/orc-%{version}.tar.xz
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gtk-doc, libtool
-
-Vendor:		Project Vine
-Distribution: 	Vine Linux
-
+BuildRequires:	meson
+BuildRequires:	libtool
+BuildRequires:	gtk-doc
+BuildRequires:	glib2-devel
 
 %description
 Orc is a library and set of tools for compiling and executing
@@ -25,6 +26,7 @@ is a generic assembly language that represents many of the features
 available in SIMD architectures, including saturated addition and
 subtraction, and many arithmetic operations.
 
+
 %package doc
 Summary:	Documentation for Orc
 Summary(ja):	Orc のドキュメント
@@ -35,6 +37,7 @@ BuildArch:	noarch
 %description doc
 Documentation for Orc.
 
+
 %package devel
 Summary:	Development files and static libraries for Orc
 Summary(ja):	Orc の開発用ファイル及び静的ライブラリ
@@ -47,6 +50,7 @@ Requires:	pkgconfig
 This package contains the files needed to build packages that depend
 on orc.
 
+
 %package compiler
 Summary:	Orc compiler
 Summary(ja):	Orc コンパイラ
@@ -57,6 +61,7 @@ Requires:	pkgconfig
 %description compiler
 The Orc compiler, to produce optimized code.
 
+
 %package -n compat32-%{name}
 Summary:	The Oil Run-time Compiler
 Summary(ja):	Oil ランタイムコンパイラ
@@ -70,6 +75,7 @@ is a generic assembly language that represents many of the features
 available in SIMD architectures, including saturated addition and
 subtraction, and many arithmetic operations.
 
+
 %package -n compat32-%{name}-devel
 Summary:	Development files and static libraries for Orc
 Summary(ja):	Orc の開発用ファイル及び静的ライブラリ
@@ -84,44 +90,41 @@ on orc.
 
 %prep
 %setup -q 
-autoreconf -vif
 
 
 %build
 export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2/-O1/g'`
 export CXXFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2/-O1/g'`
-%configure --disable-static --enable-gtk-doc
-
-make %{?_smp_mflags}
+%meson
+%meson_build
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="install -p"
+%meson_install
 
 # Remove unneeded files.
-find %{buildroot}/%{_libdir} -name \*.a -or -name \*.la -delete
-rm -rf %{buildroot}/%{_libdir}/orc
+find %{buildroot}%{_libdir} -name "*.a" -delete
 
-touch -r stamp-h1 %{buildroot}%{_includedir}/%{name}-0.4/orc/orc-stdint.h   
 
 %clean
 rm -rf %{buildroot}
 
+
 %check
-make check || true
+%meson_test
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
-
 %post -n compat32-%{name} -p /sbin/ldconfig
-
 %postun -n compat32-%{name} -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%license COPYING
+%doc README
 %{_bindir}/orc-bugreport
 %{_libdir}/liborc-*.so.*
 
@@ -134,7 +137,7 @@ make check || true
 %doc examples/*.c
 %{_includedir}/%{name}-0.4/
 %{_libdir}/liborc-*.so
-%{_libdir}/pkgconfig/orc-0.4.pc
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/aclocal/orc.m4
 
 %files compiler
@@ -152,6 +155,9 @@ make check || true
 %endif
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.31-1
+- new upstream release.
+
 * Thu Feb 22 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.28-1
 - new upstream release.
 

r/rpcbind/rpcbind-vl.spec

@@ -1,21 +1,32 @@
+%bcond_with systemd
+
 %{!?_initddir:%define _initddir /etc/rc.d/init.d}
+%global rpcbind_user_group rpc
 
 %define _unpackaged_files_terminate_build 1
 
 Name:           rpcbind
 Version:        1.2.5
-Release:		1%{?_dist_release}
+Release:		2%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        Universal Addresses to RPC Program Number Mapper
 Group:          System Environment/Daemons
-License:        GPL
-URL:            http://nfsv4.bullopensource.org
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        BSD
+URL:            http://nfsv4.bullopensource.org
 Source0:        http://downloads.sourceforge.net/rpcbind/%{name}-%{version}.tar.bz2
-Source1: rpcbind.init
-Source2: %{name}.sysconfig
+Source1:        rpcbind.init
+Source2:        %{name}.sysconfig
 
-Patch001: rpcbind-1.2.5-rpcinfo-bufoverflow.patch
+Patch001:       rpcbind-1.2.5-rpcinfo-bufoverflow.patch
+
+Patch100:       rpcbind-0.2.3-systemd-envfile.patch
+Patch101:       rpcbind-0.2.3-systemd-tmpfiles.patch
+Patch102:       rpcbind-0.2.4-runstatdir.patch
+Patch103:       rpcbind-0.2.4-systemd-service.patch
+Patch104:       rpcbind-0.2.4-systemd-rundir.patch
 
 Requires: glibc-common setup
 Conflicts: man-pages < 2.43-12
@@ -28,26 +39,46 @@ BuildRequires: tcp_wrappers
 Requires(pre): /usr/sbin/groupadd  /usr/sbin/groupdel
 Requires(pre): /usr/sbin/useradd  /usr/sbin/userdel
 Requires(pre): coreutils
+Requires(pre): shadow-utils
+%if %{with systemd}
+%global rpcbind_state_dir /run/rpcbind
+BuildRequires: systemd
+BuildRequires: systemd-devel
+%{?systemd_requires}
+Requires(postun): coreutils
+%else
+%global rpcbind_state_dir %{_sharedstatedir}/rpcbind
 Requires(post): /sbin/chkconfig
-Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+%endif
 
 #Provides: portmap = %{version}-%{release}
 Provides: portmap = 4.0-66%{_dist_release}
 Obsoletes: portmap <= 4.0-65.3
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 The rpcbind utility is a server that converts RPC program numbers into
 universal addresses.  It must be running on the host to be able to make
 RPC calls on a server on that machine.
 
+
 %prep
 %setup -q
 # 1637562 - rpcinfo: Fix stack buffer overflow
 %patch001 -p1
 
+%if %{with systemd}
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%endif
+
+
 %build
 %ifarch s390 s390x
 PIE="-fPIE"
@@ -56,18 +87,17 @@ PIE="-fpie"
 %endif
 export PIE
 
-RPCBUSR=rpc
-RPCBDIR=/var/lib/rpcbind
 CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`"
 
 autoreconf -fisv
 %configure CFLAGS="$CFLAGS" LDFLAGS="-pie" \
     --enable-warmstarts \
-    --with-statedir="$RPCBDIR" \
-    --with-rpcuser="$RPCBUSR" \
+    --with-statedir="%rpcbind_state_dir" \
+    --with-rpcuser="%rpcbind_user_group" \
     --with-nss-modules="files altfiles" \
-    --enable-libwrap \
+%if !%{with systemd}
     --with-systemdsystemunitdir=no \
+%endif
     --enable-debug
 
 make all
@@ -77,21 +107,33 @@ make all
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/sbin
 mkdir -p %{buildroot}/usr/sbin
-mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 mkdir -p %{buildroot}%{_mandir}/man8
-mkdir -p %{buildroot}/var/lib/rpcbind
+mkdir -p %{buildroot}%{rpcbind_state_dir}
+%if %{with systemd}
+mkdir -p %{buildroot}%{_unitdir}
+mkdir -p %{buildroot}%{_tmpfilesdir}
+%else
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+install -m 755 %{SOURCE1} %{buildroot}%{_initddir}/rpcbind
+%endif
+
 make DESTDIR=$RPM_BUILD_ROOT install
 
-install -m 755 %{SOURCE1} %{buildroot}%{_initddir}/rpcbind
 install -m 644 %{SOURCE2} %{buildroot}/etc/sysconfig/rpcbind
 
 mv %{buildroot}%{_sbindir}/rpcbind %{buildroot}/sbin/
 mv %{buildroot}%{_bindir}/rpcinfo %{buildroot}%{_sbindir}/
 
+%if %{with systemd}
+sed -i -e 's|/usr/sbin/|/sbin/|' %{buildroot}%{_unitdir}/rpcbind.service
+%endif
+
+
 %clean
 rm -rf %{buildroot}
 
+
 %pre
 
 # Check the validity of the rpc uid and gid.
@@ -109,34 +151,58 @@ if [ -z "$rpcid" -o "$rpcid" != "32" ]; then
 	/usr/sbin/useradd -o -l -c "Rpcbind Daemon" -d /var/lib/rpcbind -g 32 \
     	-M -s /sbin/nologin -u 32 rpc > /dev/null 2>&1
 fi
+
 %post 
+%if %{with systemd}
+%systemd_post rpcbind.service rpcbind.socket
+%else
 /sbin/chkconfig --add %{name}
+%endif
 
 %preun
-if [ $1 -eq 0 ]; then
+%if %{with systemd}
+%systemd_preun rpcbind.service rpcbind.socket
+%else
+if [ $1 -eq 0 -o -x /bin/systemctl ]; then
     service rpcbind stop > /dev/null 2>&1
     /sbin/chkconfig --del %{name}
 	/usr/sbin/userdel  rpc 2>/dev/null || :
 	/usr/sbin/groupdel rpc 2>/dev/null || :
 	rm -rf /var/lib/rpcbind
 fi
+%endif
+
 %postun
-if [ "$1" -ge "1" ]; then
+%if %{with systemd}
+%systemd_postun_with_restart rpcbind.service rpcbind.socket
+%else
+if [ "$1" -ge "1" -a ! -x /bin/systemctl ]; then
     service rpcbind condrestart > /dev/null 2>&1
 fi
+%endif
 
 %files
 %defattr(-,root,root)
+%license COPYING
 %doc AUTHORS ChangeLog README
 /sbin/rpcbind
 %{_sbindir}/rpcinfo
 %{_mandir}/man8/*
-%config %{_initddir}/rpcbind
 %config(noreplace) /etc/sysconfig/rpcbind
+%if %{with systemd}
+%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}.socket
+%{_tmpfilesdir}/%{name}.conf
+%else
+%config %{_initddir}/rpcbind
+%endif
+%attr(0700, %{rpcbind_user_group}, %{rpcbind_user_group}) %dir %{rpcbind_state_dir}
 
-%dir %attr(700,rpc,rpc) /var/lib/rpcbind
 
 %changelog
+* Tue Apr 14 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.5-2
+- added systemd support (disabled as default).
+
 * Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.2.5-1
 - updated to 1.2.5.
 - added Patch001.