updated 7 packages

OpenIPMI-2.0.29-1

hplip-3.20.6-2

keepalived-2.1.5-1

net-snmp-5.9-1

php74-7.4.10-2

rsyslog-8.2008.0-1

zabbix-5.0.3-1

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

O/OpenIPMI/OpenIPMI-vl.spec

@@ -1,26 +1,32 @@
-# TODO: uses private copy of libedit, should be modified to use system one
+%bcond_with systemd
 %bcond_without python3
 
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+# TODO: uses private copy of libedit, should be modified to use system one
+
 Summary: IPMI (Intelligent Platform Management Interface) library and tools
 Summary(ja): IPMI (Intelligent Platform Management Interface) ライブラリおよびツール
 Name: OpenIPMI
-Version: 2.0.27
-Release: 1%{?_dist_release}
+Version: 2.0.29
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: admin-tools
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: LGPLv2+ and GPLv2+ or BSD
-Group: System Environment/Base
-URL: http://sourceforge.net/projects/openipmi/
-Source: http://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
+URL: https://sourceforge.net/projects/openipmi/
+Source: https://downloads.sourceforge.net/openipmi/%{name}-%{version}.tar.gz
 Source1: openipmi.sysconf
 Source2: openipmi.initscript
 Source3: openipmigui.desktop
 Source4: README.initscript
-#Patch3: 0003-Python3.patch
+Source5: openipmi-helper
+Source6: ipmi.service
+Patch1: 0001-man.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: desktop-file-utils
 BuildRequires: gdbm-devel
 BuildRequires: glib2-devel
-BuildRequires: libedit-devel
+BuildRequires: readline-devel
 BuildRequires: libxcrypt-devel
 BuildRequires: ncurses-devel
 BuildRequires: net-snmp-devel
@@ -30,50 +36,59 @@ BuildRequires: popt-devel
 BuildRequires: swig
 BuildRequires: tcl
 
+BuildRequires: python-rpm-macros
 %if %{with python3}
 BuildRequires: python3-devel
 BuildRequires: python3-rpm-macros
 BuildRequires: python3-tkinter
 %else
 BuildRequires: python-devel
-BuildRequires: python-rpm-macros
+BuildRequires: python2-rpm-macros
 BuildRequires: tkinter
 %endif
-
+%if %{with systemd}
+BuildRequires:   systemd
+%{?systemd_requires}
+%else
 Requires(post): chkconfig
 Requires(preun): chkconfig
+%endif
 
-Vendor: Project Vine
-Distribution: Vine Linux
+# Prevent bogus provides of private libs from perl
+%global __provides_exclude_from %{?__provides_exclude_from:%{__provides_exclude_
+from}|}^%{perl_vendorarch}/auto/.*\\.so$
 
 %description
 The Open IPMI project aims to develop an open code base to allow access to
 platform information using Intelligent Platform Management Interface (IPMI).
 This package contains the tools of the OpenIPMI project.
 
+
 %package libs
 Summary: The OpenIPMI runtime libraries
 Summary(ja): OpenIPMI ランタイムライブラリ
-Group: System Environment/Libraries
+Group: system
 
 %description libs
 The OpenIPMI-libs package contains the runtime libraries for shared binaries
 and applications.
 
+
 %package perl
 Summary: IPMI Perl language bindings
 Summary(ja): IPMI Perl 言語バインディング
-Group: Development/Libraries
+Group: programming
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description perl
 The OpenIPMI-perl package contains the Perl language bindings for OpenIPMI.
 
+
 %if %{with python3}
 %package -n python3-openipmi
-Group: Development/Libraries
 Summary: IPMI Python3 language bindings
 Summary(ja): IPMI Python3 言語バインディング
+Group: programming
 Requires: python3
 Obsoletes: %{name}-python < %{version}-%{release}
 Provides: %{name}-python = %{version}-%{release}
@@ -81,22 +96,23 @@ Provides: %{name}-python = %{version}-%{release}
 %description -n python3-openipmi
 The OpenIPMI-python3 package contains the Python3 language bindings for OpenIPMI.
 
+
 %else
 %package python
-Group: Development/Libraries
 Summary: IPMI Python language bindings
 Summary(ja): IPMI Python 言語バインディング
+Group: programming
 Requires: python
 
 %description python
 The OpenIPMI-python package contains the Python language bindings for OpenIPMI.
-
 %endif
 
+
 %package devel
 Summary: The development environment for the OpenIPMI project
 Summary(ja): OpenIPMI の開発キット
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -104,10 +120,11 @@ Requires: pkgconfig
 The OpenIPMI-devel package contains the development libraries and header files
 of the OpenIPMI project.
 
+
 %package gui
 Summary: IPMI graphical user interface tool
 Summary(ja): IPMI GUI ツール
-Group: System Environment/Base
+Group: admin-tools
 Requires: tix
 Requires: tkinter
 %if %{with python3}
@@ -121,84 +138,95 @@ The OpenIPMI-gui package contains the graphical user interface to monitor
 and control IPMI-enabled devices.
 
 
-%prep
-%setup -q
-#%patch3 -p1
-rm -rf ./libedit
-
-%build
-export EDIT_CFLAGS=`pkg-config --cflags libedit`
-export EDIT_LIBS=`pkg-config --libs libedit`
-
-export CFLAGS="-fPIC $RPM_OPT_FLAGS"
+%debug_package
 
-perl -pi -e 's|readline/readline\.h|editline/readline.h|' cmdlang/ipmish.c
-perl -pi -e 's|-lreadline|-ledit|' cmdlang/Makefile.am
-perl -pi -e 's|-lreadline|-ledit|' sample/Makefile.am
-%if %{with python3}
-perl -pi -e 's|python conftest|%{__python3} conftest|' configure.ac
-%endif
 
+%prep
+%autosetup -p1
 
-autoreconf -vif
 
+%build
 %configure \
   CFLAGS="-fPIC %{optflags} -z now -fno-strict-aliasing" \
   LDFLAGS="%{?__global_ldflags} -Wl,--as-needed" \
   --disable-dependency-tracking \
+  --disable-static \
 %if %{with python3}
   --with-python=%{__python3} \
   --with-pythoninstall=%{python3_sitearch} \
 %else
   --with-pythoninstall=%{python_sitearch} \
 %endif
-  --with-tkinter=yes \
   --with-tcl=no \
-  --with-glib12=no \
-  --disable-static
+  --with-tkinter=yes
 # get rid of rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make   # not %{?_smp_mflags} safe
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
 
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
+%if %{with systemd}
+install -d %{buildroot}{%{_unitdir},%{_libexecdir}}
+install -m 755 %{SOURCE5} %{buildroot}%{_libexecdir}/openipmi-helper
+install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/ipmi.service
+%else
 install -d ${RPM_BUILD_ROOT}%{_initrddir}
 install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_initrddir}/ipmi
+%endif
+install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
+install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
+install -d %{buildroot}%{_sysconfdir}/modprobe.d
+
+# add missing documentation
+echo ".so man1/openipmicmd.1" > %{buildroot}%{_mandir}/man1/ipmicmd.1
+echo ".so man1/openipmish.1" > %{buildroot}%{_mandir}/man1/ipmish.1
 
 desktop-file-install --vendor="fedora" --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE3}
 
 install -m 644 %SOURCE4 .
 
+
 %post
+%if %{with systemd}
+%systemd_post ipmi.service
+%else
 /sbin/chkconfig --add ipmi
+%endif
 
 %preun
-if [ $1 = 0 ]; then
+%if %{with systemd}
+%systemd_preun ipmi.service
+%else
+if [ $1 = 0 -o -x /bin/systemctl ]; then
    service ipmi stop >/dev/null 2>&1
    /sbin/chkconfig --del ipmi
 fi
+%endif
 
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart ipmi.service
+%else
 if [ "$1" -ge "1" ]; then
     service ipmi condrestart >/dev/null 2>&1 || :
 fi
+%endif
 
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root)
 %license COPYING COPYING.BSD COPYING.LIB
@@ -206,7 +234,12 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/ipmi/ipmisim1.emu
 %config(noreplace) %{_sysconfdir}/ipmi/lan.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/ipmi
+%if %{with systemd}
+%{_unitdir}/ipmi.service
+%{_libexecdir}/openipmi-helper
+%else
 %{_initrddir}/ipmi
+%endif
 %{_bindir}/ipmicmd
 %{_bindir}/ipmilan
 %{_bindir}/ipmish
@@ -219,6 +252,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/solterm
 %{_bindir}/openipmi_eventd
 %{_mandir}/man1/ipmi_*
+%{_mandir}/man1/ipmicmd.*
+%{_mandir}/man1/ipmish.*
 %{_mandir}/man1/openipmicmd*
 %{_mandir}/man1/openipmish*
 %{_mandir}/man1/rmcp_ping*
@@ -266,6 +301,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.29-1
+- updated to 2.0.29.
+- imported Source5-6 and Patch1 from rawhide.
+- added systemd support (disabled as default).
+
 * Mon May 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.27-1
 - updated to 2.0.27.
 - dropped Patch2 (fixed in upstream).

h/hplip/hplip-vl.spec

@@ -3,7 +3,7 @@ Summary:	HP printer drivers & utilities for Linux
 Summary(ja): 	HP プリンタの Linux 向けドライバとユーティリティ
 Name:		hplip
 Version:	3.20.6
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 Vendor:		Project Vine
 Distribution:	Vine Linux
 Packager:	kazutaka
@@ -15,7 +15,7 @@ URL:		https://developers.hp.com/hp-linux-imaging-and-printing
 Source0:	http://downloads.sourceforge.net/sourceforge/hplip/hplip-%{version}.tar.gz
 #Source1:	hpcups-update-ppds.sh
 Source2:	copy-deviceids.py
-Source3:	%{name}.appdata.xml
+Source3:	%{name}.metainfo.xml
 Source4:	hp-laserjet_cp_1025nw.ppd.gz
 Source5:	hp-laserjet_professional_p_1102w.ppd.gz
 Source1000:	hplip.desktop.vine
@@ -268,6 +268,11 @@ HP インクジェット及びレーザープリンタ複合機のスキャナ
 
 #---------------------------------------------------------------------
 
+%debug_package
+
+#---------------------------------------------------------------------
+
+
 %prep
 %setup -q
 
@@ -562,7 +567,7 @@ desktop-file-install                               \
         --add-category HardwareSettings                        \
         hplip.desktop
 
-appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml
 
 # install hp-uiscan desktop file
 sed -i 's/\/usr\/share\/icons\/Humanity\/devices\/48\/printer\.svg/hp_logo/' hp-uiscan.desktop
@@ -728,7 +733,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hp-toolbox
 %{_bindir}/hp-uiscan
 %{_datadir}/applications/*.desktop
-%{_datadir}/metainfo/hplip.appdata.xml
+%{_datadir}/metainfo/hplip.metainfo.xml
 # Files
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/hplip/check.py*
@@ -746,6 +751,12 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/sane.d/dll.d/hpaio
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.20.6-2
+- rebuilt with net-snmp-5.9.
+
+* Sun Aug 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.20.6-1
+- new upstream release.
+
 * Thu May 16 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.18.12-1
 - dropped R:gksu.
 - imported Patche36-47 from rawhide.

k/keepalived/keepalived-vl.spec

@@ -2,15 +2,14 @@
 
 Summary: HA monitor built upon LVS, VRRP and services poller
 Name: keepalived
-Version: 2.0.20
+Version: 2.1.5
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-License: GPL
-Group: Applications/System
-URL: http://www.keepalived.org/
-
+Group: network
 Vendor: Project Vine
 Distribution: Vine Linux
 
+License: GPL
+URL: http://www.keepalived.org/
 Source0: https://www.keepalived.org/software/keepalived-%{version}.tar.gz
 Source1: keepalived.service
 
@@ -44,6 +43,9 @@ failover. So in short keepalived is a userspace daemon for LVS cluster nodes
 healthchecks and LVS directors failover.
 
 
+%debug_package
+
+
 %prep
 %setup
 
@@ -92,7 +94,7 @@ rm -rf %{buildroot}%{_initrddir}/
 %if %{with systemd}
 %systemd_preun keepalived.service
 %else
-if [ $1 -eq 0 ]; then
+if [ $1 -eq 0 -o -x /bin/systemctl ]; then
     /sbin/service keepalived stop &>/dev/null || :
     /sbin/chkconfig --del keepalived
 fi
@@ -130,6 +132,9 @@ fi
 %{_mandir}/man8/keepalived.8*
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.1.5-1
+- new upstream release.
+
 * Sun Apr 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.20-1
 - new upstream release.
 - added systemd stuff (disabled as default).

n/net-snmp/net-snmp-vl.spec

@@ -1,18 +1,22 @@
+%bcond_with systemd
+%bcond_without python3
+%bcond_without gui
+
 # Arches on which we need to prevent arch conflicts on net-snmp-config.h
 %define multilib_arches %{ix86} ia64 ppc ppc64 x86_64
 
 Summary: A collection of SNMP protocol tools and libraries.
 Summary(ja): SNMP プロトコルツールとライブラリのコレクション
 Name: net-snmp
-Version: 5.8
-Release: 2%{?_dist_release}
-License: BSDish
-Group: System Environment/Daemons
-URL: http://net-snmp.sourceforge.net/
+Version: 5.9
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: servers,admin-tools
 Vendor: Project Vine
 Distribution: Vine Linux
 
-Source0: http://dl.sourceforge.net/net-snmp/net-snmp-%{version}.tar.gz
+License: BSD
+URL: http://www.net-snmp.org/
+Source0: https://downloads.sourceforge.net/project/net-snmp/net-snmp/5.9/net-snmp-%{version}.tar.gz
 Source1: net-snmp.redhat.conf
 Source2: net-snmpd.init
 Source3: net-snmptrapd.init
@@ -23,40 +27,67 @@ Source7: net-snmpd.sysconfig
 Source8: net-snmptrapd.sysconfig
 Source9: net-snmp-tmpfs.conf
 Source10:  net-snmpd.logrotate
-Patch1:     net-snmp-5.7.2-pie.patch
-Patch2:     net-snmp-5.8-dir-fix.patch
-Patch3:     net-snmp-5.8-multilib.patch
-Patch4:     net-snmp-5.8-test-debug.patch
-Patch5:     net-snmp-5.7.2-autoreconf.patch
-Patch6:     net-snmp-5.8-agentx-disconnect-crash.patch
-Patch7:     net-snmp-5.7.2-cert-path.patch
-Patch8:     net-snmp-5.8-cflags.patch
-Patch9:     net-snmp-5.8-Remove-U64-typedef.patch
-Patch10:    net-snmp-5.8-libnetsnmptrapd-against-MYSQL_LIBS.patch
-Patch11:    net-snmp-5.7.3-iterator-fix.patch
-Patch12:    net-snmp-5.8-autofs-skip.patch
+Source11:  snmpd.service
+Source12:  snmptrapd.service
+Source13:  IETF-MIB-LICENSE.txt
+
+Patch1:     net-snmp-5.9-pie.patch
+Patch2:     net-snmp-5.9-dir-fix.patch
+Patch3:     net-snmp-5.9-multilib.patch
+Patch4:     net-snmp-5.9-test-debug.patch
+Patch5:     net-snmp-5.7.2-cert-path.patch
+Patch6:     net-snmp-5.9-cflags.patch
+Patch7:     net-snmp-5.8-Remove-U64-typedef.patch
+Patch8:     net-snmp-5.9-libnetsnmptrapd-against-MYSQL_LIBS.patch
+Patch9:     net-snmp-5.7.3-iterator-fix.patch
+Patch10:    net-snmp-5.9-autofs-skip.patch
+Patch11:    net-snmp-5.9-python-ld-flags.patch
+Patch12:    net-snmp-5.9-usage-exit.patch
+Patch13:    net-snmp-5.9-coverity.patch
+Patch14:    net-snmp-5.9-proxy-getnext.patch
+Patch15:    net-snmp-5.9-dskTable-dynamic.patch
+Patch16:    net-snmp-5.8-expand-SNMPCONFPATH.patch
+Patch17:    net-snmp-5.8-duplicate-ipAddress.patch
+Patch18:    net-snmp-5.9-memory-reporting.patch
+Patch19:    net-snmp-5.8-man-page.patch
+Patch20:    net-snmp-5.8-ipAddress-faster-load.patch
+Patch21:    net-snmp-5.8-rpm-memory-leak.patch
+Patch22:    net-snmp-5.9-aes-config.patch
+Patch23:    net-snmp-5.9-available-memory.patch
 
 # Modern RPM API means at least EL6
 Patch101:   net-snmp-5.8-modern-rpm-api.patch
 
 #disable this patch due compatibility issues
-Patch102:   net-snmp-5.8-python3.patch
+Patch102:   net-snmp-5.9-python3.patch
 
 # Vine
 
-# @INC don't have "." in perl-5.26.
-Patch10000: 0001-perl-Including-.-in-INC.patch
-
+BuildRoot: %{_tmppath}/%{name}-root
+BuildRequires: openssl-devel, bzip2-devel, elfutils-devel
+BuildRequires: elfutils-libelf-devel, rpm-devel
+BuildRequires: perl, perl(ExtUtils::Embed), procps
+%if %{with python3}
+BuildRequires: python3-devel, python3-setuptools, python3-rpm-macros
+%endif
+BuildRequires: chrpath
+BuildRequires: libmariadb-devel
+# for netstat, needed by 'make test'
+BuildRequires: net-tools
+BuildRequires: lm-sensors-devel
+%if %{with systemd}
+BuildRequires: systemd
+%{?systemd_requires}
+%else
 Requires(pre): /sbin/chkconfig
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/service
+Requires(preun): /sbin/chkconfig
+Requires(preun): /sbin/service
+Requires(postun): /sbin/service
+%endif
+Requires: net-snmp-libs = %{version}-%{release}
 Obsoletes: cmu-snmp ucd-snmp
-BuildRoot: %{_tmppath}/%{name}-root
-BuildRequires: tcp_wrappers, openssl-devel, bzip2-devel, elfutils-libelf-devel
-BuildRequires: perl, grep, sed, findutils
-BuildRequires: libxcrypt-devel, libnsl2-devel
-BuildRequires: rpm-devel >= 4.0.4
-
-%{expand: %%define _includedir	%{_includedir}/%{name}}
-
 
 %description
 SNMP (Simple Network Management Protocol) is a protocol used for
@@ -82,10 +113,20 @@ mib ブラウザ. このパッケージは snmpd, snmptrapd デーモンやド
 おそらく, NET-SNMP ユーティリティを含んだ net-snmp-utils パッケージも
 インストールした方が良いでしょう。
 
+
+%package libs
+Summary: The NET-SNMP runtime client libraries
+Group: system
+
+%description libs
+The net-snmp-libs package contains the runtime client libraries for shared
+binaries and applications.
+
+
 %package utils
-Group: Applications/System
 Summary: Network management utilities using SNMP, from the NET-SNMP project.
 Summary(ja): SNMP を用いたネットワーク管理ユーティリティ
+Group: admin-tools
 Requires: net-snmp = %{version}
 Obsoletes: cmu-snmp-utils ucd-snmp-utils
 
@@ -102,11 +143,12 @@ net-snmp-utils パッケージは NET-SNMP ネットワーク管理プロジェ
 用いられる様々なユーティリティを含んでいます. net-snmp パッケージも
 インストールする必要があります.
 
+
 %package devel
-Group: Development/Libraries
 Summary: The development environment for the NET-SNMP project.
 Summary(ja): NET-SNMP 用の開発環境
-Requires: net-snmp = %{version}
+Group: programming
+Requires: net-snmp-libs = %{version}-%{release}
 Requires: elfutils-libelf-devel
 Requires: openssl-devel
 Obsoletes: cmu-snmp-devel ucd-snmp-devel
@@ -133,9 +175,9 @@ NET-SNMP プロジェクトのネットワーク管理ツールを用いるア
 
 
 %package perl
-Group: Development/Libraries
 Summary: The perl NET-SNMP module and the mib2c tool.
 Summary(ja): perl NET-SNMP モジュールおよび mib2c ツール
+Group: programming
 Requires: net-snmp = %{version}, perl-XML-Simple
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 BuildRequires: perl >= 5
@@ -154,8 +196,43 @@ perl から mib2c や SNMP を使用したいならば, net-snmp-perl パッケ
 インストールしてください.
 
 
+%if %{with python3}
+%package -n python3-net-snmp
+Summary:   The Python 'netsnmp' module for the Net-SNMP
+Summary(ja): Python用 'netsnmp' モジュール
+Group: programming
+%{?python_provide:%python_provide python3-net-snmp}
+Requires:  %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description -n python3-net-snmp
+The 'netsnmp' module provides a full featured, tri-lingual SNMP (SNMPv3, 
+SNMPv2c, SNMPv1) client API. The 'netsnmp' module internals rely on the
+Net-SNMP toolkit library.
+%endif
+
+
+%if %{with gui}
+%package gui
+Summary:  An interactive graphical MIB browser for SNMP
+Summary(ja): 対話型グラフィカルSNMP MIBブラウザー
+Group: admin-tools
+Requires: perl-Tk, net-snmp-perl%{?_isa} = %{version}-%{release}
+
+%description gui
+The net-snmp-gui package contains tkmib utility, which is a graphical user 
+interface for browsing the Message Information Bases (MIBs). It is also 
+capable of sending or retrieving the SNMP management information to/from 
+the remote agents interactively.
+
+Install the net-snmp-gui package, if you want to use this interactive utility.
+%endif
+
+%debug_package
+
+
 %prep
 %setup -q
+cp %{SOURCE13} .
 
 %ifnarch ia64
 %patch1 -p1 -b .pie
@@ -164,29 +241,35 @@ perl から mib2c や SNMP を使用したいならば, net-snmp-perl パッケ
 %patch2 -p1 -b .dir-fix
 %patch3 -p1 -b .multilib
 %patch4 -p1
-%patch5 -p1 -b .autoreconf
-%patch6 -p1 -b .agentx-disconnect-crash
-%patch7 -p1 -b .cert-path
-%patch8 -p1 -b .cflags
-%patch9 -p1 -b .u64-remove
-%patch10 -p1 -b .perlfix
-%patch11 -p1 -b .iterator-fix
-%patch12 -p1 -b .autofs-skip
+%patch5 -p1 -b .cert-path
+%patch6 -p1 -b .cflags
+%patch7 -p1 -b .u64-remove
+%patch8 -p1 -b .perlfix
+%patch9 -p1 -b .iterator-fix
+%patch10 -p1 -b .autofs-skip
+%patch11 -p1 -b .python-ld-flags
+%patch12 -p1 -b .usage-fix
+%patch13 -p1 -b .coverity
+%patch14 -p1 -b .proxy-getnext
+%patch15 -p1 -b .dskTable-dynamic
+%patch16 -p1 -b .expand-SNMPCONFPATH
+%patch17 -p1 -b .duplicate-ipAddress
+%patch18 -p1 -b .memory-reporting
+%patch19 -p1 -b .man-page
+%patch20 -p1 -b .ipAddress-faster-load
+%patch21 -p1 -b .rpm-memory-leak
+%patch22 -p1 -b .aes-config
+%patch23 -p1 -b .available-memory
 
 %patch101 -p1 -b .modern-rpm-api
 %patch102 -p1
 
-%patch10000 -p1
+# disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697
+rm testing/fulltests/default/T200*
 
-perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
 
 %build
-#perl -pi -e 's/changequote/dnl changequote/' ./configure.in
-#autoreconf -i
-#touch configure
-
-# First build the static library
-# XXX remove privacy support?
+autoreconf -vif
 
 MIBS="host agentx smux \
      ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \
@@ -194,42 +277,58 @@ MIBS="host agentx smux \
      ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \
      ip-mib/ipDefaultRouterTable/ipDefaultRouterTable \
      ip-mib/ipv6ScopeZoneIndexTable ip-mib/ipIfStatsTable \
-     sctp-mib rmon-mib etherlike-mib"
+     sctp-mib rmon-mib etherlike-mib ucd-snmp/lmsensorsMib"
 
 %configure \
-	--enable-static --enable-shared			\
-	--with-cflags="$RPM_OPT_FLAGS -D_RPM_4_4_COMPAT" \
-	--with-sys-location="Unknown"			\
-	--with-logfile="/var/log/snmpd.log"		\
-	--with-persistent-directory="/var/net-snmp"	\
-	--with-mib-modules="$MIBS"			\
-	--with-libwrap=%{_libdir}        		\
-	--sysconfdir=%{_sysconfdir}			\
-	--enable-ipv6					\
-	--enable-ucd-snmp-compatibility			\
-        --with-pic                                      \
-	--enable-embedded-perl                          \
-	--with-openssl					\
-	--with-mnttab="/etc/mtab"			\
-	--with-sys-contact="root@localhost"  <<EOF
-
-
+    --disable-static --enable-shared \
+    --enable-as-needed \
+    --enable-blumenthal-aes \
+    --enable-embedded-perl \
+    --enable-ipv6 \
+    --enable-local-smux \
+    --enable-mfd-rewrites \
+    --enable-ucd-snmp-compatibility \
+    --sysconfdir=%{_sysconfdir} \
+    --with-cflags="$RPM_OPT_FLAGS -fPIE" \
+    --with-ldflags="$RPM_LD_FLAGS -lm" \
+    --with-logfile="/var/log/snmpd.log" \
+    --with-mib-modules="$MIBS" \
+    --with-mysql \
+    --with-openssl \
+    --with-persistent-directory="/var/lib/net-snmp" \
+    --with-perl-modules="INSTALLDIRS=vendor" \
+    --with-pic \
+    --with-security-modules=tsm  \
+    --with-sys-location="Unknown" \
+%if %{with systemd}
+    --with-systemd \
+%endif
+    --with-temp-file-pattern=/run/net-snmp/snmp-tmp-XXXXXX \
+    --with-transports="DTLSUDP TLSTCP" \
+    --with-sys-contact="root@localhost" \
+    --without-pcre <<EOF
 EOF
 
-make
+# store original libtool file, we will need it later
+cp libtool libtool.orig
+# remove rpath from libtool
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-pushd perl
-# Use just built libs for perl module building, not the system libs.
-#perl Makefile.PL -NET-SNMP-IN-SOURCE=true PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor
-export NETSNMP_DONT_CHECK_VERSION=1
-perl Makefile.PL PREFIX=${RPM_BUILD_ROOT}/%{_prefix} INSTALLDIRS=vendor -NET-SNMP-CONFIG="sh ../../net-snmp-config" -NET-SNMP-IN-SOURCE=true
+# the package is not %%_smp_mflags safe
 make
+
+%if %{with python3}
+# compile python module
+pushd python
+%{__python3} setup.py --basedir="../" build
 popd
+%endif
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-%makeinstall  ucdincludedir=${RPM_BUILD_ROOT}%{_includedir}/ucd-snmp
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 # Determine which arch opensslconf.h is going to try to #include.
 basearch=%{_arch}
@@ -237,84 +336,106 @@ basearch=%{_arch}
 basearch=i386
 %endif
 
-mv ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config-${basearch}
-install -m 755 %SOURCE5 ${RPM_BUILD_ROOT}/%{_bindir}/net-snmp-config
-
 %ifarch %{multilib_arches}
 # Do an net-snmp-config.h switcheroo to avoid file conflicts on systems where you
 # can have both a 32- and 64-bit version of the library, and they each need
 # their own correct-but-different versions of net-snmp-config.h to be usable.
-mv ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config-${basearch}.h
-install -m644 %SOURCE4 ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp-config.h
+mv %{buildroot}/%{_bindir}/net-snmp-config %{buildroot}/%{_bindir}/net-snmp-config-${basearch}
+install -m 755 %SOURCE5 %{buildroot}/%{_bindir}/net-snmp-config
+mv %{buildroot}/%{_includedir}/net-snmp/net-snmp-config.h %{buildroot}/%{_includedir}/net-snmp/net-snmp-config-${basearch}.h
+install -m644 %SOURCE4 %{buildroot}/%{_includedir}/net-snmp/net-snmp-config.h
 %endif
 
-# remove .la files
-rm  ${RPM_BUILD_ROOT}%{_libdir}/*.la
+install -d %{buildroot}%{_sysconfdir}/snmp
+install -m 644 %SOURCE1 %{buildroot}%{_sysconfdir}/snmp/snmpd.conf
+install -m 644 %SOURCE6 %{buildroot}%{_sysconfdir}/snmp/snmptrapd.conf
 
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp
-install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmpd.conf
-install -m 644 %SOURCE6 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
+install -d %{buildroot}%{_sysconfdir}/sysconfig
+install -m 644 %SOURCE7 %{buildroot}%{_sysconfdir}/sysconfig/snmpd
+install -m 644 %SOURCE8 %{buildroot}%{_sysconfdir}/sysconfig/snmptrapd
 
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/snmpd
-install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/snmptrapd
-
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
-install -m 644 %SOURCE7 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/snmpd
-install -m 644 %SOURCE8 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/snmptrapd
-
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d
-install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/snmpd
+install -d %{buildroot}%{_sysconfdir}/logrotate.d
+install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/logrotate.d/snmpd
 
 # prepare /var/lib/net-snmp
-install -d ${RPM_BUILD_ROOT}%{_localstatedir}/lib/net-snmp
-install -d ${RPM_BUILD_ROOT}%{_localstatedir}/run/net-snmp
-
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/snmpinform
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/tkmib
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/snmpcheck
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/snmpconf.1*
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/tkmib.1*
-ln -s snmptrap ${RPM_BUILD_ROOT}/usr/bin/snmpinform
+install -d %{buildroot}%{_localstatedir}/lib/net-snmp
+install -d %{buildroot}%{_localstatedir}/lib/net-snmp/mib_indexes
+install -d %{buildroot}%{_localstatedir}/lib/net-snmp/cert_indexes
+install -d %{buildroot}%{_localstatedir}/run/net-snmp
+
+# remove things we don't want to distribute
+rm -f %{buildroot}%{_bindir}/snmpinform
+ln -s snmptrap %{buildroot}/usr/bin/snmpinform
+rm -f %{buildroot}%{_bindir}/snmpcheck
+rm -f %{buildroot}/%{_bindir}/fixproc
+rm -f %{buildroot}/%{_mandir}/man1/fixproc*
+rm -f %{buildroot}/%{_bindir}/ipf-mod.pl
+rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/libsnmp*
+
+# remove special perl files
+find %{buildroot} -name perllocal.pod \
+    -o -name .packlist \
+    -o -name "*.bs" \
+    -o -name Makefile.subs.pl \
+    | xargs -ri rm -f {}
+# remove docs that do not apply to Linux
+rm -f README.aix README.hpux11 README.osX README.Panasonic_AM3X.txt README.solaris README.win32
 
 # copy missing mib2c.conf files
-cp local/mib2c.*.conf ${RPM_BUILD_ROOT}%{_datadir}/snmp
+install -m 644 local/mib2c.*.conf %{buildroot}%{_datadir}/snmp
 
-pushd perl
-make PREFIX=${RPM_BUILD_ROOT}/%{_prefix} install_vendor
-eval $(perl '-V:installvendorarch')
+%if %{with python3}
+# install python module
+pushd python
+%{__python3} setup.py --basedir=.. install -O1 --skip-build --root %{buildroot} 
+popd
+%endif
 
-find $RPM_BUILD_ROOT%{_libdir} -name Makefile.subs.pl | xargs rm -f
-find $RPM_BUILD_ROOT%{_libdir} -name perllocal.pod | xargs rm -f
-find $RPM_BUILD_ROOT%{_libdir} -name .packlist | xargs rm -f
+find %{buildroot} -name '*.so' | xargs chmod 0755
 
-find $RPM_BUILD_ROOT/$installvendorarch -type f -print \
-        -o -type d -a \
-        -name NetSNMP -printf '%%%%dir %%p\n' \
-        -o -name SNMP -printf '%%%%dir %%p\n' | \
-        sed "s@$RPM_BUILD_ROOT@@g" > ../perl.lst
-popd
-find $RPM_BUILD_ROOT -name '*.so' | xargs chmod 0755
+# trim down massive ChangeLog
+dd bs=1024 count=250 if=ChangeLog of=ChangeLog.trimmed
+
+# convert files to UTF-8
+for file in README COPYING; do
+    iconv -f 8859_1 -t UTF-8 <$file >$file.utf8
+    mv $file.utf8 $file
+done
 
 # remove executable bit from documentation samples
 chmod 644 local/passtest local/ipf-mod.pl
 
-# dirty hack for #603243, until it's fixed properly upstream
-install -m 755 -d $RPM_BUILD_ROOT/usr/include/net-snmp/agent/util_funcs
-install -m 644  agent/mibgroup/util_funcs/*.h $RPM_BUILD_ROOT/usr/include/net-snmp/agent/util_funcs
+%if %{with systemd}
+# systemd stuff
+install -m 755 -d %{buildroot}/%{_tmpfilesdir}
+install -m 644 %SOURCE9 %{buildroot}/%{_tmpfilesdir}/net-snmp.conf
+install -m 755 -d %{buildroot}/%{_unitdir}
+install -m 644 %SOURCE11 %SOURCE12 %{buildroot}/%{_unitdir}/
+%else
+install -d %{buildroot}%{_sysconfdir}/rc.d/init.d
+install -m 755 %SOURCE2 %{buildroot}%{_sysconfdir}/rc.d/init.d/snmpd
+install -m 755 %SOURCE3 %{buildroot}%{_sysconfdir}/rc.d/init.d/snmptrapd
+%endif
 
-mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/
-install -m 644 %SOURCE9 $RPM_BUILD_ROOT/%{_sysconfdir}/tmpfiles.d/net-snmp.conf
+%if !%{with gui}
+rm -f %{buildroot}%{_bindir}/tkmib %{buildroot}%{_mandir}/man1/tkmib.1*
+%endif
 
 
 %post
-/sbin/ldconfig
+%if %{with systemd}
+%systemd_post snmpd.service snmptrapd.service
+%else
 /sbin/chkconfig --add snmpd 
 /sbin/chkconfig --add snmptrapd
-
+%endif
 
 %preun
-if [ $1 = 0 ]; then
+%if %{with systemd}
+%systemd_preun snmpd.service snmptrapd.service
+%else
+if [ $1 = 0 -o /bin/systemctl ]; then
    service snmpd stop >/dev/null 2>&1
    /sbin/chkconfig --del snmpd
    service snmptrapd stop >/dev/null 2>&1
@@ -322,14 +443,20 @@ if [ $1 = 0 ]; then
    # remove stale autogenerated file
    rm -f %{_datadir}/snmp/mibs/.index
 fi
-
+%endif
 
 %postun
-/sbin/ldconfig
+%if %{with systemd}
+%systemd_postun_with_restart snmpd.service snmptrapd.service
+%else
 if [ "$1" -ge "1" ]; then
     service snmpd condrestart >/dev/null 2>&1 || :
     service snmptrapd condrestart >/dev/null 2>&1 || :
 fi
+%endif
+
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
 %clean
@@ -339,61 +466,105 @@ rm -rf ${RPM_BUILD_ROOT}
 %files
 %defattr(-,root,root,-)
 %license COPYING
-%doc AGENT.txt ChangeLog EXAMPLE.conf FAQ NEWS PORTING README* TODO
-%doc local/passtest local/README.mib2c local/ipf-mod.pl
+%doc ChangeLog.trimmed EXAMPLE.conf FAQ NEWS TODO
+%doc README README.agent-mibs README.agentx README.krb5 README.snmpv3
+%doc local/passtest local/ipf-mod.pl
+%doc README.thread AGENT.txt PORTING local/README.mib2c
+%doc IETF-MIB-LICENSE.txt
 %dir %{_sysconfdir}/snmp
 %config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmpd
 %config(noreplace,missingok) %{_sysconfdir}/sysconfig/snmptrapd
 %config(noreplace,missingok) %{_sysconfdir}/snmp/snmpd.conf
 %config(noreplace,missingok) %{_sysconfdir}/snmp/snmptrapd.conf
+%if %{with systemd}
+%{_unitdir}/snmp*
+%config(noreplace) %{_tmpfilesdir}/net-snmp.conf
+%else
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/snmpd
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/snmptrapd
+%endif
 %config(noreplace) %{_sysconfdir}/logrotate.d/snmpd
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/net-snmp.conf
-%{_datadir}/snmp
-%{_libdir}/lib*.so.*
+%dir %{_datadir}/snmp
+%{_datadir}/snmp/snmpconf-data
+%dir %{_localstatedir}/run/net-snmp
+%{_bindir}/agentxtrap
+%{_bindir}/net-snmp-create-v3-user
+%{_bindir}/snmpconf
 %{_sbindir}/*
-%attr(0644,root,root)	%{_mandir}/man[58]/*
-
+%attr(0644,root,root) %{_mandir}/man1/agentxtrap.1*
+%attr(0644,root,root) %{_mandir}/man[58]/snmp*d*
+%attr(0644,root,root) %{_mandir}/man5/snmp_config.5.gz
+%attr(0644,root,root) %{_mandir}/man5/variables*
+%attr(0644,root,root) %{_mandir}/man1/net-snmp-create-v3-user*
+%attr(0644,root,root) %{_mandir}/man1/snmpconf.1.gz
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
+%dir %{_datadir}/snmp
+%dir %{_datadir}/snmp/mibs
+%{_datadir}/snmp/mibs/*
+%dir %{_localstatedir}/lib/net-snmp
+%dir %{_localstatedir}/lib/net-snmp/mib_indexes
+%dir %{_localstatedir}/lib/net-snmp/cert_indexes
 
 %files utils
 %defattr(-,root,root,-)
-%{_bindir}/agentxtrap
-%{_bindir}/fixproc
-%{_bindir}/ipf-mod.pl
 %{_bindir}/encode_keychange
-%{_bindir}/net-snmp-create-v3-user
-%{_bindir}/snmp*
-%{_bindir}/traptoemail
-%attr(0644,root,root)	%{_mandir}/man1/snmp*.1*
-%attr(0644,root,root)   %{_mandir}/man1/traptoemail*.1*
-%attr(0644,root,root)   %{_mandir}/man1/encode_keychange*.1*
-%attr(0644,root,root)   %{_mandir}/man1/fixproc*.1*
-%attr(0644,root,root)	%{_mandir}/man1/agentxtrap*.1*
-%attr(0644,root,root)	%{_mandir}/man1/net-snmp-create-v3-user*.1*
+%{_bindir}/snmp[^c-]*
+%attr(0644,root,root) %{_mandir}/man1/snmp[^-]*.1*
+%attr(0644,root,root) %{_mandir}/man1/encode_keychange*.1*
+%attr(0644,root,root) %{_mandir}/man5/snmp.conf.5.gz
+%attr(0644,root,root) %{_mandir}/man5/variables.5.gz
 
 %files devel
 %defattr(0644,root,root,0755)
 %{_libdir}/lib*.so
-%{_libdir}/lib*.a
+%{_libdir}/pkgconfig/*
 %{_includedir}/*
-#/usr/include/ucd-snmp
 %attr(0644,root,root)	%{_mandir}/man3/*.3.*
 %attr(0755,root,root)	%{_bindir}/net-snmp-config*
 %attr(0644,root,root)   %{_mandir}/man1/net-snmp-config*.1.*
 
-%files perl -f perl.lst
+%files perl
 %defattr(-,root,root)
-%{_bindir}/mib2c
 %{_bindir}/mib2c-update
+%{_bindir}/mib2c
+%{_bindir}/snmp-bridge-mib
 %{_bindir}/net-snmp-cert
 %{_bindir}/checkbandwidth
-%attr(0644,root,root)   %{_mandir}/man1/mib2c-update*.1*
-%attr(0644,root,root)	%{_mandir}/man1/mib2c.1*
-%attr(0644,root,root)   %{_mandir}/man3/*.3pm.*
+%dir %{_datadir}/snmp
+%{_datadir}/snmp/mib2c*
+%{_datadir}/snmp/*.pl
+%{_bindir}/traptoemail
+%attr(0644,root,root) %{_mandir}/man[15]/mib2c*
+%attr(0644,root,root) %{_mandir}/man3/*.3pm.*
+%attr(0644,root,root) %{_mandir}/man1/traptoemail*.1*
+%attr(0644,root,root) %{_mandir}/man1/snmp-bridge-mib.1*
+%{perl_vendorarch}/*SNMP*
+%{perl_vendorarch}/auto/*SNMP*
+%{perl_vendorarch}/auto/Bundle/*SNMP*
+%{perl_vendorarch}/Bundle/MakefileSubs.pm
+
+%if %{with python3}
+%files -n python3-net-snmp
+%doc README
+%{python3_sitearch}/*
+%endif
+
+%if %{with gui}
+%files gui
+%{_bindir}/tkmib
+%attr(0644,root,root) %{_mandir}/man1/tkmib.1*
+%endif
 
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.9-1
+- new upstream release.
+- re-imported all patches from rawhide.
+- added systemd support (disabled as default).
+
 * Fri May 17 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.8-2
 - rebuilt with perl-5.26.
 - added BR:libxcrypt-devel,libnsl2-devel.

p/php74/php74-vl.spec

@@ -56,7 +56,7 @@ Name: php%{majorver}
 Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
 Summary(ja): HTML 埋め込み型スクリプト言語 PHP
 Version: 7.4.10
-Release: 1%{_dist_release}%{?with_systemd:.systemd}
+Release: 2%{_dist_release}%{?with_systemd:.systemd}
 Group: programming
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -1056,6 +1056,9 @@ rm -f files.*
 
 #======================================================================
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.10-2
+- rebuilt with net-snmp-5.9.
+
 * Thu Sep 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.4.10-1
 - new upstream release.
 

r/rsyslog/rsyslog-vl.spec

@@ -6,9 +6,9 @@
 
 Summary:        Enhanced system logging and kernel message trapping daemon
 Name:           rsyslog
-Version:        8.2002.0
+Version:        8.2008.0
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
-Group:          System Environment/Daemons
+Group:          system
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -19,9 +19,7 @@ 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
+Source5:        rsyslog.service
 
 BuildRequires:  libestr-devel
 BuildRequires:  libfastjson-devel
@@ -44,95 +42,106 @@ Provides: syslog
 Conflicts: sysklogd, syslog-ng
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
+%description
+Rsyslog is an enhanced, multi-threaded syslog daemon. It supports MySQL,
+syslog/TCP, RFC 3195, permitted sender lists, filtering on any message part,
+and fine grain output format control. It is compatible with stock sysklogd
+and can be used as a drop-in replacement. Rsyslog is simple to set up, with
+advanced features suitable for enterprise-class, encryption-protected syslog
+relay chains.
+
 
 %package mysql
 Summary: MySQL support for rsyslog
-Group: System Environment/Daemons
+Group: system
 Requires: %name = %version-%release
 BuildRequires: libmariadb-devel
 
+%description mysql
+The rsyslog-mysql package contains a dynamic shared object that will add
+MySQL database support to rsyslog.
+
+
 %package pgsql
 Summary: PostgresSQL support for rsyslog
-Group: System Environment/Daemons
+Group: system
 Requires: %name = %version-%release
 BuildRequires: libpq-devel
 
+%description pgsql
+The rsyslog-pgsql package contains a dynamic shared object that will add
+PostgreSQL database support to rsyslog.
+
+
 %package elasticsearch
 Summary: ElasticSearch output module for rsyslog
+Group: system
 Requires: %name = %version-%release
 BuildRequires: curl-devel
 
+%description elasticsearch
+This module provides the capability for rsyslog to feed logs directly into
+Elasticsearch.
+
+
 %package gssapi
 Summary: GSSAPI authentication and encryption support for rsyslog
-Group: System Environment/Daemons
+Group: system
 Requires: %name = %version-%release
 BuildRequires: krb5-devel 
 
-%package relp
-Summary: RELP protocol support for rsyslog
-Group: System Environment/Daemons
-Requires: %name = %version-%release
-BuildRequires: librelp-devel >= 1.2.5
-
-%package gnutls
-Summary: TLS protocol support for rsyslog
-Group: System Environment/Daemons
-Requires: %name = %version-%release
-BuildRequires: gnutls-devel
-
-%package snmp
-Summary: SNMP protocol support for rsyslog
-Group: System Environment/Daemons
-Requires: %name = %version-%release
-BuildRequires: net-snmp-devel
-
-%description
-Rsyslog is an enhanced, multi-threaded syslog daemon. It supports MySQL,
-syslog/TCP, RFC 3195, permitted sender lists, filtering on any message part,
-and fine grain output format control. It is compatible with stock sysklogd
-and can be used as a drop-in replacement. Rsyslog is simple to set up, with
-advanced features suitable for enterprise-class, encryption-protected syslog
-relay chains.
-
-%description mysql
-The rsyslog-mysql package contains a dynamic shared object that will add
-MySQL database support to rsyslog.
-
-%description pgsql
-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 
 authentication.
 
+
+%package relp
+Summary: RELP protocol support for rsyslog
+Group: system
+Requires: %name = %version-%release
+BuildRequires: librelp-devel >= 1.2.5
+
 %description relp
 The rsyslog-relp package contains the rsyslog plugins that provide
 the ability to receive syslog messages via the reliable RELP
 protocol. 
 
+
+%package gnutls
+Summary: TLS protocol support for rsyslog
+Group: system
+Requires: %name = %version-%release
+BuildRequires: gnutls-devel
+
 %description gnutls
 The rsyslog-gnutls package contains the rsyslog plugins that provide the
 ability to receive syslog messages via upcoming syslog-transport-tls
 IETF standard protocol.
 
+
+%package snmp
+Summary: SNMP protocol support for rsyslog
+Group: system
+Requires: %name = %version-%release
+BuildRequires: net-snmp-devel
+
 %description snmp
 The rsyslog-snmp package contains the rsyslog plugin that provides the
 ability to send syslog messages as SNMPv1 and SNMPv2c traps.
 
+
+%debug_package
+
+
 %prep
 %setup -q
-%patch0 -p1
 
 #perl -pi -e 's|^extern char \*strdup.*$||' grammar/lexer.c
 
 autoreconf -vif
 
+
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fpie -DSYSLOGD_PIDNAME=\\\"syslogd.pid\\\""
 export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
@@ -156,6 +165,7 @@ export PYTHON=%{__python3}
 		--enable-unlimited-select
 make
 
+
 %install
 rm -rf %{buildroot}
 
@@ -172,8 +182,7 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/rsyslog
 install -p -m 644 %{SOURCE4} %{buildroot}%{_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
+install -Dpm644 %{SOURCE5} %{buildroot}%{_unitdir}/rsyslog.service
 %else
 install -d -m 755 %{buildroot}%{_initrddir}
 install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/rsyslog
@@ -182,9 +191,11 @@ install -p -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/rsyslog
 #get rid of *.la
 rm %{buildroot}/%{_libdir}/rsyslog/*.la
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post
 for n in /var/log/{messages,secure,maillog,spooler}
 do
@@ -291,7 +302,12 @@ fi
 %defattr(-,root,root)
 %{_libdir}/rsyslog/omsnmp.so
 
+
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2008.0-1
+- new upstream release.
+- dropped Patch0: merged into upstream.
+
 * Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.2002.0-1
 - new upstream release.
 - enabled elasticsearch support.

z/zabbix/zabbix-vl.spec

@@ -14,11 +14,13 @@
 
 %bcond_without agent
 
+%global php_pkgname php74
+
 Summary: The Enterprise-class Monitoring Solution for Everyone
 Name: zabbix
-Version: 5.0.2
+Version: 5.0.3
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-Group: Applications/Services
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: iwaim
@@ -71,6 +73,7 @@ The Enterprise-class Monitoring Solution for Everyone.
 %if %{with server}
 %package server-common
 Summary: common files for Zabbix Server
+Group: servers
 Requires: %{name} == %{version}-%{release}
 %if %{with systemd}
 %{?systemd_requires}
@@ -85,6 +88,7 @@ This package include common files for Zabbix Server.
 
 %package server-mysql
 Summary: Zabbix Server for MySQL/MariaDB
+Group: servers
 Provides: %{name}-server
 Requires: %{name}-server-common == %{version}-%{release}
 
@@ -94,6 +98,7 @@ Zabbix Server for MySQL/MariaDB
 
 %package server-postgresql
 Summary: Zabbix Server for PostgreSQL
+Group: servers
 Provides: %{name}-server
 Requires: %{name}-server-common == %{version}-%{release}
 
@@ -106,6 +111,7 @@ Zabbix Server for PostgreSQL
 %if %{with agent}
 %package agent
 Summary: Zabbix Agent
+Group: system
 Requires: %{name} == %{version}-%{release}
 %if %{with systemd}
 %{?systemd_requires}
@@ -123,6 +129,7 @@ Zabbix Agent
 %if %{with proxy}
 %package proxy-common
 Summary: common files for Zabbix Proxy
+Group: servers
 Requires: %{name} == %{version}-%{release}
 %if %{with systemd}
 %{?systemd_requires}
@@ -137,6 +144,7 @@ This package include common files for Zabbix Proxy
 
 %package proxy-mysql
 Summary: Zabbix Proxy for MySQL/MariaDB
+Group: servers
 Provides: %{name}-proxy
 Requires: %{name}-proxy-common == %{version}-%{release}
 
@@ -146,6 +154,7 @@ Zabbix Proxy for MySQL/MariaDB
 
 %package proxy-postgresql
 Summary: Zabbix Proxy for PostgreSQL
+Group: servers
 Provides: %{name}-proxy
 Requires: %{name}-proxy-common == %{version}-%{release}
 
@@ -158,8 +167,8 @@ Zabbix Proxy for PostgreSQL
 %if %{with frontend}
 %package frontend-php
 Summary: Zabbix web frontend with PHP
-Group: Applications/Internet
-Requires: php74
+Group: servers
+Requires: %{php_pkgname}
 Requires: TrueType-vlgothic
 
 %description frontend-php
@@ -168,9 +177,9 @@ Zabbix web frontend with PHP.
 
 %package frontend-php-mysql
 Summary: Zabbix web frontend with PHP and MySQL/MariaDB
-Group: Applications/Internet
+Group: servers
 Provides: %{name}-frontend-php == %{version}-%{release}
-Requires: php74-mysql
+Requires: %{php_pkgname}-mysql
 
 %description frontend-php-mysql
 Zabbix web frontend with PHP and MySQL/MariaDB.
@@ -178,9 +187,9 @@ Zabbix web frontend with PHP and MySQL/MariaDB.
 
 %package frontend-php-postgresql
 Summary: Zabbix web frontend with PHP and PostgreSQL
-Group: Applications/Internet
+Group: servers
 Provides: %{name}-frontend-php == %{version}-%{release}
-Requires: php74-pgsql
+Requires: %{php_pkgname}-pgsql
 
 %description frontend-php-postgresql
 Zabbix web frontend with PHP and PostgreSQL.
@@ -188,6 +197,9 @@ Zabbix web frontend with PHP and PostgreSQL.
 %endif
 
 
+%debug_package
+
+
 %prep
 %setup -q -T -a 0 -c -n zabbix-%{version}
 mv zabbix-%{version} zabbix_mysql
@@ -627,6 +639,9 @@ fi
 
 
 %changelog
+* Tue Sep 08 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.3-1
+- new upstream release.
+
 * Thu Jul 23 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.0.2-1
 - new upstream release.
 - dropped all patches: made to get the same effect by another method.