updated 6 packages

authconfig-7.0.1-2

nmap-7.80-1

php74-7.4.5-1

procps-3.3.16-1

rubygem-json-2.3.0-2

wget-1.20.3-1

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

a/authconfig/authconfig-vl.spec

@@ -2,7 +2,7 @@ Summary: Command line tool for setting up authentication from network services
 Summary(ja): ネットワークサービスからの認証を設定するためのコマンドラインツール
 Name: authconfig
 Version: 7.0.1
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
@@ -17,7 +17,7 @@ Source: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
 Patch1: authconfig-6.2.6-gdm-nolastlog.patch
 Patch2: authconfig-7.0.1-nss-update.patch
 
-# remove selinux staff
+# remove selinux stuff
 Patch100: authconfig-7.0.1-noselinux.patch
 
 # elogind patch
@@ -110,6 +110,9 @@ fi
 %attr(700,root,root) %dir %{_localstatedir}/lib/%{name}
 
 %changelog
+* Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0.1-2
+- updated Patch100.
+
 * Sun Dec 16 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.0.1-1
 - new upstream release.
 - switched to python3.

n/nmap/nmap-vl.spec

@@ -3,13 +3,15 @@
 Summary: Network exploration tool and security scanner
 Summary(ja): 多機能なポートスキャナー
 Name: nmap
-Version: 7.70
+Version: 7.80
 Release: 1%{?_dist_release}
+Group: Applications/System
+Vendor: Project Vine
+Distribution: Vine Linux
 
 License: GPL
-Group: Applications/System
-URL: http://www.insecure.org/nmap/
-Source0: http://www.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
+URL: https://nmap.org/
+Source0: https://nmap.org/dist/%{name}-%{version}.tar.bz2
 #Source1: zenmap.desktop
 
 # Patches from Fedora rawhide
@@ -23,7 +25,6 @@ Patch2: nmap-4.52-noms.patch
 Patch5: ncat_reg_stdin.diff
 Patch6: nmap-6.25-displayerror.patch
 
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libpcap-devel
 BuildRequires: pcre-devel 
@@ -111,8 +112,9 @@ rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc COPYING CHANGELOG
-%doc docs/README docs/nmap.usage.txt docs/nmap.dtd
+%license COPYING
+%doc CHANGELOG README*
+%doc docs/nmap.usage.txt docs/nmap.dtd
 %{_bindir}/nmap
 %{_bindir}/ncat
 %{_bindir}/ndiff
@@ -140,6 +142,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xnmap.1*
 
 %changelog
+* Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.80-1
+- new upstream release.
+
 * Sat Nov 17 2018 Toshiaki Ara <ara_t@384.jp> 7.70-1
 - update to 7.70
 - add Patches from Fedora rawhide

p/php74/php74-vl.spec

@@ -1,3 +1,4 @@
+%bcond_with systemd
 %bcond_with debug
 %bcond_without apache2
 
@@ -50,8 +51,8 @@
 Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
-Version: 7.4.4
-Release: 1%{_dist_release}
+Version: 7.4.5
+Release: 1%{_dist_release}%{?with_systemd:.systemd}
 Conflicts: php5 < 5.6.11
 
 Vendor: Project Vine
@@ -76,6 +77,7 @@ Source27: default-pool.conf.in
 Source28: php-fpm.logrotate
 Source29: php_params
 Source31: macros.pear.ver
+Source32: php-fpm.service
 
 Patch33: php-5.2.4-phpincludedir.patch
 
@@ -107,6 +109,7 @@ BuildRequires: gcc-c++
 BuildRequires: %{gd_name}-devel
 BuildRequires: gdbm-devel
 BuildRequires: gmp-devel
+BuildRequires: libacl-devel
 BuildRequires: libedit-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
@@ -131,6 +134,16 @@ BuildRequires: libzip-devel
 %if %{?_dist_release} != "vl4"
 BuildRequires: krb5-devel
 %endif
+%if %{with systemd}
+BuildRequires: systemd-devel
+BuildRequires:  systemd-units
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
+Requires(post): chkconfig
+Requires(preun): chkconfig
+%endif
 
 %if %{?_dist_release} != "vl6"
 BuildRequires: www-common
@@ -457,6 +470,9 @@ Conflicts: php5-opcache < 5.6.11
 in shared memory, thereby removing the need for PHP to load and parse scripts
 on each request.
 
+#======================================================================
+
+%debug_package
 
 #======================================================================
 %prep
@@ -569,11 +585,18 @@ popd
 # Build /usr/sbin/php-fpm
 pushd build-fpm
 build \
-  --enable-fpm
+  --enable-fpm \
+  --with-fpm-acl \
+%if %{with systemd}
+  --with-fpm-systemd \
+%endif
+  %{nil}
 popd
 
-sed -e 's/@WWWUSER@/%{fpm_user}/' -e 's/@WWWGROUP@/%{fpm_group}/' \
-    -e 's/@majorver@/%{majorver}/'< %{SOURCE27} > default-pool.conf
+sed \
+	-e 's/@WWWUSER@/%{fpm_user}/' \
+	-e 's/@WWWGROUP@/%{fpm_group}/' \
+	-e 's/@majorver@/%{majorver}/' < %{SOURCE27} > default-pool.conf
 
 #----------------------------------------------------------------------
 # Build Apache2 module
@@ -661,8 +684,6 @@ mv %{buildroot}%{_bindir}/php-cgi%{majorver} %{buildroot}%{_bindir}/%{_name}-cgi
 %{__install} -d %{buildroot}%{_mandir}/man8
 %{__install} -d %{buildroot}%{_sysconfdir}/logrotate.d
 %{__install} -m 755 build-fpm/sapi/fpm/php-fpm %{buildroot}%{_sbindir}/%{_name}-fpm
-%{__install} -m 755 %{SOURCE25} %{buildroot}%{_initdir}/%{_name}-fpm
-sed -i -e 's/@majorver@/%{majorver}/g' %{buildroot}%{_initdir}/%{_name}-fpm
 %{__install} -m 644 build-fpm/sapi/fpm/php-fpm.8 %{buildroot}%{_mandir}/man8/%{_name}-fpm.8
 %{__install} -m 644 %{SOURCE26} %{buildroot}%{php_confdir}/php-fpm.conf
 sed -i -e 's/@majorver@/%{majorver}/g' %{buildroot}%{php_confdir}/php-fpm.conf
@@ -671,6 +692,17 @@ sed -i -e 's/@majorver@/%{majorver}/g' %{buildroot}%{php_confdir}/php-fpm.conf
 sed -i \
   -e 's/@majorver@/%{majorver}/g' \
   %{buildroot}%{_sysconfdir}/logrotate.d/%{_name}-fpm
+%if %{with systemd}
+mkdir -p %{buildroot}%{_unitdir}
+%{__install} -m 644 %{SOURCE32} \
+	%{buildroot}%{_unitdir}/%{_name}-fpm.service
+sed -i \
+	-e 's/@majorver@/%{majorver}/g' \
+	%{buildroot}%{_unitdir}/%{_name}-fpm.service
+%else
+%{__install} -m 755 %{SOURCE25} %{buildroot}%{_initdir}/%{_name}-fpm
+sed -i -e 's/@majorver@/%{majorver}/g' %{buildroot}%{_initdir}/%{_name}-fpm
+%endif
 
 
 # Install the Apache2 module, CGI SAPI, config fragment
@@ -800,22 +832,38 @@ fi
 /sbin/update-alternatives \
   --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/%{_name}-fpm %{majorver} \
   --slave   %{_mandir}/man8/php-fpm.8.gz php-fpm.8.gz %{_mandir}/man8/%{_name}-fpm.8.gz
-
 # fix broken symlink if it's there
 if [ ! -f %{_sbindir}/php-fpm ] ; then
     /sbin/update-alternatives --auto php-fpm
 fi
+
+%if %{with systemd}
+%systemd_post %{_name}-fpm.service
+%else
 /sbin/chkconfig --add %{_name}-fpm
+%endif
 
 %triggerun fpm -- php5-fpm < 5.6.11
 /sbin/chkconfig --del php-fpm 2>/dev/null ||:
 
 %preun fpm
-if [ "$1" = 0 ]; then
+%if %{with systemd}
+%systemd_preun %{_name}-fpm.service
+%else
+if [ "$1" = 0 -o -x /bin/systemctl ]; then
+  /sbin/service %{_name}-fpm stop >/dev/null 2>&1 ||:
   /sbin/chkconfig --del %{_name}-fpm
+fi
+%endif
+if [ "$1" = 0 ]; then
   /sbin/update-alternatives --remove php-fpm %{_sbindir}/php%{majorver}-fpm
 fi
 
+%postun fpm
+%if %{with systemd}
+%systemd_postun_with_restart %{_name}-fpm.service
+%endif
+
 %post nginx
 /sbin/update-alternatives \
   --install %{_sysconfdir}/nginx/php_params \
@@ -914,7 +962,7 @@ rm -f files.*
 %files
 %defattr(-,root,root)
 %license LICENSE
-%doc CODING_STANDARDS CREDITS EXTENSIONS INSTALL NEWS README*
+%doc CODING_STANDARDS* EXTENSIONS NEWS README*
 %doc Zend/ZEND_* TSRM_LICENSE
 %doc php.ini-{development,production}
 %doc php.gif
@@ -972,7 +1020,11 @@ rm -f files.*
 %files fpm
 %defattr(-,root,root)
 %{_sbindir}/%{_name}-fpm
+%if %{with systemd}
+%{_unitdir}/%{_name}-fpm.service
+%else
 %{_initdir}/%{_name}-fpm
+%endif
 %{_mandir}/man8/%{_name}-fpm.8*
 %dir %{php_confdir}/fpm.d
 %config(noreplace) %{php_confdir}/php-fpm.conf
@@ -999,6 +1051,11 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.5-1
+- new upstream release.
+- added systemd support (disabled as default).
+- activated %%debug_package.
+
 * Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.4-1
 - new upstream release.
 

p/procps/procps-vl.spec

@@ -1,15 +1,21 @@
+%bcond_with systemd
+
 %define origname procps-ng
 
 Summary: System and process monitoring utilities.
 Summary(ja): システムやプロセスのモニタリングユーティリティ
 Name: procps
-Version: 3.3.15
-Release: 1%{?_dist_release}
-License: GPL
+Version: 3.3.16
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: Applications/System
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+
+License: GPL
 Url: https://gitlab.com/procps-ng/procps
 # alternative: http://sourceforge.net/projects/procps-ng/
-Source: %{origname}-%{version}.tar.xz
+Source: https://downloads.sourceforge.net/project/procps-ng/Production/%{origname}-%{version}.tar.xz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires(post): /sbin/ldconfig, /bin/rm
 Requires(postun): /sbin/ldconfig
@@ -19,10 +25,11 @@ Obsoletes: procps-X11, pgrep
 Source10: procps-ng-3.3.10-ja.po
 
 BuildRequires: ncurses-devel
-
-Vendor:       Project Vine
-Distribution: Vine Linux
-Packager: daisuke
+%if %{with systemd}
+BuildRequires: systemd-devel
+%else
+BuildRequires: elogind-devel
+%endif
 
 %description
 The procps package contains a set of system utilities that provide
@@ -87,11 +94,18 @@ autoreconf --verbose --force --install
             --enable-skill \
             --enable-sigwinch \
             --disable-libselinux \
-            --with-elogind \
-            --without-systemd
+%if %{with systemd}
+            --with-systemd
+%else
+            --without-systemd \
+            --with-elogind
+%endif
 
 make CFLAGS="%{optflags}"
 
+sed -i -e 's|/procps-ng-.*-dirty/|/|' po/Makefile
+sed -i -e 's|^procps-ng-.*-dirty/||' po/POTFILES.in
+
 make -C po update-po
 make -C po ja.gmo
 
@@ -121,7 +135,8 @@ rm -rf %{buildroot}
 
 %files -f procps-ng.lang
 %defattr(-,root,root,-)
-%doc AUTHORS Documentation/BUGS COPYING COPYING.LIB Documentation/FAQ NEWS README top/README.top Documentation/TODO
+%license COPYING COPYING.LIB
+%doc AUTHORS NEWS README*
 %{_libdir}/libprocps.so.*
 %{_bindir}/*
 %{_sysbindir}/*
@@ -140,6 +155,10 @@ rm -rf %{buildroot}
 %{_includedir}/proc
 
 %changelog
+* Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3.16-1
+- new upstream release.
+- added systemd support (disabled as default).
+
 * Mon Dec 17 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.3.15-1
 - new upstream release.
 - enabled elogind.

r/rubygem-json/rubygem-json-vl.spec

@@ -4,7 +4,7 @@ Summary:        This is a JSON implementation as a Ruby extension in C
 Summary(ja):    C言語で書かれたRuby用JSON拡張機能
 Name:           rubygem-%{gem_name}
 Version:        2.3.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          Development/Libraries
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -37,7 +37,7 @@ cp %{SOURCE0} ./
 %gem_install -d %{buildroot}%{gem_current_dir}
 
 rm -f %{buildroot}%{gem_cache}
-rm -f %{buildroot}%{gem_extdir_mri}/{gem.build_complete,gem_make.out,mkmf.log}
+rm -f %{buildroot}%{gem_extdir_mri}/{gem_make.out,mkmf.log}
 
 
 %clean
@@ -53,5 +53,8 @@ rm -f %{buildroot}%{gem_extdir_mri}/{gem.build_complete,gem_make.out,mkmf.log}
 
 
 %changelog
+* Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.0-2
+- added a missing file.
+
 * Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.0-1
 - initial build for Vine Linux.

w/wget/wget-vl.spec

@@ -1,11 +1,14 @@
 Summary: A utility for retrieving files using the HTTP or FTP protocols.
 Summary(ja): HTTP/FTP プロトコルによるファイル取得ユーティリティ
 Name: wget
-Version: 1.20
+Version: 1.20.3
 Release: 1%{?_dist_release}
-License: GPL
 Group: Applications/Internet
-Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Vendor: Project Vine
+Distribution: Vine Linux
+
+License: GPL
+Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 Patch0:  0001-wget-1.20-path.patch
 
 ## Vine Patch(es)
@@ -25,9 +28,6 @@ BuildRequires: texinfo
 %endif
 %{?nosrc:NoSource: 0}
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 GNU Wget is a file retrieval utility which can use either the HTTP or
 FTP protocols.  Wget features include the ability to work in the
@@ -109,6 +109,9 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 %{_infodir}/*
 
 %changelog
+* Thu Apr 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.3-1
+- new upstream release.
+
 * Mon Dec 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20-1
 - new upstream release.
 - updated Patch0 and 110.