updated 6 packages

dhcp-4.1.ESV.R16.P1-1

golang-1.16.5-1

libX11-1.7.2-1

polkit-0.118-2

python-pillow-8.2.0-1

wireshark-3.4.6-1

d/dhcp/dhcp-vl.spec

@@ -1,8 +1,10 @@
+%bcond_with systemd
+
 # vendor string (e.g., Fedora, EL)
 %define vvendor Vine
 
-%define pversion 4.1.ESV.R16
-%define sversion 4.1-ESV-R16
+%define pversion 4.1.ESV.R16.P1
+%define sversion 4.1-ESV-R16-P1
 
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Summary(ja): DHCP (動的ホスト設定プロトコル) サーバおよびリレーエージェント
@@ -16,10 +18,13 @@ Name:     dhcp
 # --------------------------------------------------------------------------
 Epoch:    13
 Version:  %{pversion}
-Release:  1%{?_dist_release}
+Release:  1%{?_dist_release}%{?with_systemd:.systemd}
+Group:    daemons
+Vendor:   Project Vine
+Distribution: Vine Linux
+Packager: daisuke, iwamoto
 
 License:  ISC
-Group:    System Environment/Daemons
 URL:      https://isc.org/products/DHCP/
 
 Source0:  https://downloads.isc.org/isc/dhcp/%{sversion}/dhcp-%{sversion}.tar.gz
@@ -33,6 +38,10 @@ Source9:  dhcp.schema
 Source10: get-ldap-patch.sh
 Source11: dhcpd6.init
 
+Source101:  dhcpd.service
+Source111:  dhcpd6.service
+Source102:  dhcrelay.service
+
 Patch0:   0001-errwarn-message.patch
 Patch1:   0002-ldap-configuration.patch
 Patch3:   0003-options.patch
@@ -63,14 +72,15 @@ BuildRequires: libtool
 BuildRequires: openldap-devel
 BuildRequires: openssl-devel
 
+%if %{with systemd}
+BuildRequires: systemd-devel
+%{?systemd_requires}
+%else
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): initscripts
 Requires(postun): initscripts
-
-Packager: daisuke, iwamoto
-Vendor: Project Vine
-Distribution: Vine Linux
+%endif
 
 %description
 DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
@@ -84,11 +94,15 @@ To use DHCP on your network, install a DHCP service (or relay agent),
 and on clients run a DHCP client daemon.  The dhcp package provides
 the ISC DHCP service and relay agent.
 
+
 %package -n dhclient
 Summary: Provides the dhclient ISC DHCP client daemon and dhclient-script
 Summary(ja): DHCP クライアントデーモンと dhclient スクリプト
-Group: System Environment/Base
+Group: system
+%if %{with systemd}
+%else
 Requires: initscripts >= 6.75
+%endif
 #Obsoletes: dhcpcd <= 1.3.22pl1-7
 #Provides: dhcpcd = 1.3.22pl1-8
 Obsoletes: dhcpcd <= 1.3.22pl4-0vl3
@@ -104,15 +118,20 @@ To use DHCP on your network, install a DHCP service (or relay agent),
 and on clients run a DHCP client daemon.  The dhclient package
 provides the ISC DHCP client daemon.
 
+
 %package devel
 Summary: Development headers and libraries for interfacing to the DHCP server
 Summary(ja): DHCP サーバ用インタフェースライブラリとヘッダファイル
-Group: Development/Libraries
+Group: programming
 
 %description devel
 Header files and API documentation for using the ISC DHCP libraries.  The
 libdhcpctl and libomapi static libraries are also included in this package.
 
+
+%debug_package
+
+
 %prep
 %setup -q -n %{name}-%{sversion}
 
@@ -220,30 +239,33 @@ for page in server/dhcpd.conf.5 server/dhcpd.leases.5 server/dhcpd.8 ; do
                 -e 's|ETCDIR|%{_sysconfdir}/dhcp|g' $page
 done
 
-aclocal
-libtoolize --copy --force
-autoconf
-autoheader
-automake --foreign --add-missing --copy
+autoreconf -ivf
+
 
 %build
-CFLAGS="%{optflags} -fPIC" \
+CFLAGS="%{optflags} -fPIC -fno-strict-aliasing -fcommon" \
 %configure \
     --enable-dhcpv6 \
     --with-srv-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd.leases \
     --with-srv6-lease-file=%{_localstatedir}/lib/dhcpd/dhcpd6.leases \
     --with-cli-lease-file=%{_localstatedir}/lib/dhclient/dhclient.leases \
     --with-cli6-lease-file=%{_localstatedir}/lib/dhclient/dhclient6.leases \
-    --with-srv-pid-file=%{_localstatedir}/run/dhcpd.pid \
-    --with-srv6-pid-file=%{_localstatedir}/run/dhcpd6.pid \
+    --with-srv-pid-file=%{_localstatedir}/run/dhcp/dhcpd.pid \
+    --with-srv6-pid-file=%{_localstatedir}/run/dhcp/dhcpd6.pid \
     --with-cli-pid-file=%{_localstatedir}/run/dhclient.pid \
     --with-cli6-pid-file=%{_localstatedir}/run/dhclient6.pid \
-    --with-relay-pid-file=%{_localstatedir}/run/dhcrelay.pid \
+    --with-relay-pid-file=%{_localstatedir}/run/dhcp/dhcrelay.pid \
     --with-ldap \
     --with-ldapcrypto \
-    --enable-paranoia
+    --enable-log-pid \
+    --enable-paranoia --enable-early-chroot \
+%if %{with systemd}
+    --with-systemd
+%endif
+    %{nil}
 %{__make} %{?_smp_mflags}
 
+
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
@@ -257,11 +279,19 @@ CFLAGS="%{optflags} -fPIC" \
 %{__mv} %{buildroot}%{_sbindir}/dhclient %{buildroot}/sbin/dhclient
 %{__install} -p -m 0755 client/scripts/linux %{buildroot}/sbin/dhclient-script
 
+%if %{with systemd}
+%{__mkdir} -p %{buildroot}%{_unitdir}
+%{__install} -p -m 0644 %{SOURCE101} %{buildroot}%{_unitdir}/
+%{__install} -p -m 0644 %{SOURCE111} %{buildroot}%{_unitdir}/
+%{__install} -p -m 0644 %{SOURCE102} %{buildroot}%{_unitdir}/
+%else
 # Install init scripts
+%{__mkdir} -p %{buildroot}%{_localstatedir}/run/dhcp
 %{__mkdir} -p %{buildroot}%{_initrddir}
 %{__install} -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/dhcpd
 %{__install} -p -m 0755 %{SOURCE11} %{buildroot}%{_initrddir}/dhcpd6
 %{__install} -p -m 0755 %{SOURCE2} %{buildroot}%{_initrddir}/dhcrelay
+%endif
 
 # Start empty lease databases
 %{__mkdir} -p %{buildroot}%{_localstatedir}/lib/dhcpd/
@@ -324,18 +354,36 @@ EOF
 # remove perl module (depend perl(Win32API::Registry))
 %{__rm} -rf __fedora_contrib/ms2isc
 
+
 %clean
 %{__rm} -rf %{buildroot}
 
+
+%pre
+%global gid_uid 177
+getent group dhcpd >/dev/null || groupadd --force --gid %{gid_uid} --system dhcpd
+if ! getent passwd dhcpd >/dev/null ; then
+    if ! getent passwd %{gid_uid} >/dev/null ; then
+      useradd --system --uid %{gid_uid} --gid dhcpd --home / --shell /sbin/nologin --comment "DHCP server" dhcpd
+    else
+      useradd --system --gid dhcpd --home / --shell /sbin/nologin --comment "DHCP server" dhcpd
+    fi
+fi
+exit 0
+
 %post
 if [ -f /etc/dhcpd.conf -a ! -f /etc/dhcp/dhcpd.conf ]; then
     /bin/cp -a /etc/dhcpd.conf /etc/dhcp/dhcpd.conf >/dev/null 2>&1
     /bin/rm -f /etc/dhcpd.conf >/dev/null 2>&1
 fi
-	
+
+%if %{with systemd}
+%systemd_post dhcpd.service dhcpd6.service dhcrelay.service
+%else
 /sbin/chkconfig --add dhcpd
 /sbin/chkconfig --add dhcpd6
 /sbin/chkconfig --add dhcrelay || :
+%endif
 
 %post -n dhclient
 /bin/ls -1 /etc/dhclient* >/dev/null 2>&1
@@ -350,6 +398,9 @@ if [ $? = 0 ]; then
 fi || :
 
 %preun
+%if %{with systemd}
+%systemd_preun dhcpd.service dhcpd6.service dhcrelay.service
+%else
 if [ $1 = 0 -o -x /bin/systemctl ]; then
     /sbin/service dhcpd status >/dev/null 2>&1
     if [ $? = 3 ]; then
@@ -370,13 +421,19 @@ if [ $1 = 0 -o -x /bin/systemctl ]; then
     /sbin/chkconfig --del dhcpd6
     /sbin/chkconfig --del dhcrelay || :
 fi
+%endif
 
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart dhcpd.service dhcpd6.service dhcrelay.service
+%else
 if [ $1 -ge 1 ]; then
     /sbin/service dhcpd condrestart >/dev/null 2>&1
     /sbin/service dhcpd6 condrestart >/dev/null 2>&1
     /sbin/service dhcrelay condrestart >/dev/null 2>&1 || :
 fi
+%endif
+
 
 %files
 %defattr(-,root,root,-)
@@ -392,9 +449,14 @@ fi
 %config(noreplace) %{_sysconfdir}/dhcp/dhcpd.conf
 %config(noreplace) %{_sysconfdir}/dhcp/dhcpd6.conf
 %config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
+%if %{with systemd}
+%{_unitdir}/*.service
+%else
 %{_initrddir}/dhcpd
 %{_initrddir}/dhcpd6
 %{_initrddir}/dhcrelay
+%attr(0755,dhcpd,dhcpd) %dir %{_localstatedir}/run/dhcp
+%endif
 %{_bindir}/omshell
 %{_sbindir}/dhcpd
 %{_sbindir}/dhcrelay
@@ -432,7 +494,12 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/dhcpctl.3.gz
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
+
 %changelog
+* Thu Jun 10 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.ESV.R16.P1-1
+- new upstream release.
+- added systemd support (disabled as default).
+
 * Mon Apr 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.ESV.R16-1
 - new upstream release.
 

g/golang/golang-vl.spec

@@ -78,7 +78,7 @@
 Summary:        The Go Programming Language
 Summary(ja):    プログラミング言語 Go
 Name:           golang
-Version:        1.16.2
+Version:        1.16.5
 Release:        1%{?_dist_release}
 Group:          programming
 Vendor:         Project Vine
@@ -412,6 +412,9 @@ fi
 
 
 %changelog
+* Tue Jun 08 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.5-1
+- new upstream release.
+
 * Fri Mar 19 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.2-1
 - new upstream release.
 

lib/libX/libX11/libX11-vl.spec

@@ -3,7 +3,7 @@
 Summary:        X.Org X11 libX11 runtime library
 Summary(ja):    X.Org X11 libX11 ランタイムライブラリ
 Name:           libX11
-Version:        1.6.12
+Version:        1.7.2
 Release:        1%{?_dist_release}
 Group:          system
 Vendor:         Project Vine
@@ -54,7 +54,7 @@ X.Org X11 libX11 development package
 %package -n compat32-%{name}
 Summary: X.Org X11 libX11 runtime library
 Summary(ja): X.Org X11 libX11 ランタイムライブラリ
-Group: system
+Group: system,legacy
 
 %description -n compat32-%{name}
 X.Org X11 libX11 runtime library
@@ -63,7 +63,7 @@ X.Org X11 libX11 runtime library
 %package -n compat32-%{name}-devel
 Summary: X.Org X11 libX11 development package
 Summary(ja): X.Org X11 libX11 開発パッケージ
-Group: programming
+Group: programming,legacy
 Requires(pre): xorg-x11-filesystem
 Requires: %{name}-devel = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
@@ -85,6 +85,7 @@ X.Org X11 libX11 development package
 #%patch0 -p0 -b .datadir-locale-dir-fix
 %patch2 -p1 -b .dont-forward-keycode-0
 
+
 %build
 %configure \
 	--disable-dependency-tracking \
@@ -92,6 +93,7 @@ X.Org X11 libX11 development package
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -110,16 +112,11 @@ rm -rf $RPM_BUILD_ROOT/%{_docdir}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%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,-)
 %license COPYING
-%doc AUTHORS README ChangeLog NEWS 
+%doc AUTHORS README.md
 %dir %{_datadir}/X11
 %dir %{_datadir}/X11/locale
 %dir %{_datadir}/X11/locale/C
@@ -211,10 +208,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/locale/ru_RU.UTF-8/Compose
 %{_datadir}/X11/locale/ru_RU.UTF-8/XI18N_OBJS
 %{_datadir}/X11/locale/ru_RU.UTF-8/XLC_LOCALE
-%dir %{_datadir}/X11/locale/sr_CS.UTF-8
-%{_datadir}/X11/locale/sr_CS.UTF-8/Compose
-%{_datadir}/X11/locale/sr_CS.UTF-8/XI18N_OBJS
-%{_datadir}/X11/locale/sr_CS.UTF-8/XLC_LOCALE
+%dir %{_datadir}/X11/locale/sr_RS.UTF-8
+%{_datadir}/X11/locale/sr_RS.UTF-8/Compose
+%{_datadir}/X11/locale/sr_RS.UTF-8/XI18N_OBJS
+%{_datadir}/X11/locale/sr_RS.UTF-8/XLC_LOCALE
 %dir %{_datadir}/X11/locale/tatar-cyr
 %{_datadir}/X11/locale/tatar-cyr/Compose
 %{_datadir}/X11/locale/tatar-cyr/XI18N_OBJS
@@ -281,10 +278,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/locale/zh_TW/XLC_LOCALE
 %{_datadir}/X11/XErrorDB
 #%{_datadir}/X11/XKeysymDB
-%{_libdir}/libX11.so.6
-%{_libdir}/libX11.so.6.3.0
-%{_libdir}/libX11-xcb.so.1
-%{_libdir}/libX11-xcb.so.1.0.0
+%{_libdir}/libX11.so.6*
+%{_libdir}/libX11-xcb.so.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -314,10 +309,8 @@ rm -rf $RPM_BUILD_ROOT
 %if %{build_compat32}
 %files -n compat32-%{name}
 %defattr(-,root,root,-)
-%{_libdir}/libX11.so.6
-%{_libdir}/libX11.so.6.3.0
-%{_libdir}/libX11-xcb.so.1
-%{_libdir}/libX11-xcb.so.1.0.0
+%{_libdir}/libX11.so.6*
+%{_libdir}/libX11-xcb.so.1*
 
 %files -n compat32-%{name}-devel
 %defattr(-,root,root,-)
@@ -325,7 +318,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libX11-xcb.so
 %endif
 
+
 %changelog
+* Fri Jun 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.7.2-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
 * Fri Sep 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.6.12-1
 - new upstream release.
 

p/polkit/polkit-vl.spec

@@ -4,7 +4,7 @@ Summary: PolicyKit Authorization Framework
 Summary(ja): PolicyKit 認証フレームワーク
 Name: polkit
 Version: 0.118
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -13,6 +13,7 @@ License: LGPLv2+
 URL: https://www.freedesktop.org/wiki/Software/polkit
 Source0: https://www.freedesktop.org/software/%{name}/releases/%{name}-%{version}.tar.gz
 Patch0: polkit-0.115-elogind.patch
+Patch1000: CVE-2021-3560.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel
@@ -79,6 +80,7 @@ Development documentation for PolicyKit.
 %if !%{with systemd}
 %patch0 -p1
 %endif
+%patch1000 -p1
 
 
 %build
@@ -119,7 +121,6 @@ useradd -u 27 -g polkitd -r -d '/' -s /sbin/nologin -c "User for polkitd" polkit
 exit 0
 
 %post
-/sbin/ldconfig
 %if %{with systemd}
 %systemd_post polkit.service
 %endif
@@ -130,7 +131,6 @@ exit 0
 %endif
 
 %postun
-/sbin/ldconfig
 %if %{with systemd}
 %systemd_postun_with_restart polkit.service
 %endif
@@ -185,6 +185,10 @@ exit 0
 
 
 %changelog
+* Sat Jun 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.118-2
+- added Patch1000 to fix CVE-2021-3560.
+- dropped ldconfig scriptlets.
+
 * Wed Feb 24 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.118-1
 - new upstream release.
 

p/python-pillow/python-pillow-vl.spec

@@ -8,7 +8,7 @@
 %global with_docs 0
 
 Name:           python-%{srcname}
-Version:        8.1.2
+Version:        8.2.0
 Release:        1%{?_dist_release}
 Summary:        Python image processing library
 Group:          programming
@@ -208,6 +208,9 @@ popd
 
 
 %changelog
+* Wed Jun 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 8.2.0-1
+- new upstream release.
+
 * Wed Mar 10 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 8.1.2-1
 - new upstream release.
 

w/wireshark/wireshark-vl.spec

@@ -7,7 +7,7 @@
 Summary: 	Network traffic analyzer
 Summary(ja):	ネットワークトラフィック解析プログラム
 Name: 		wireshark
-Version:	3.4.5
+Version:	3.4.6
 Release: 	1%{_dist_release}
 Group: 		network,admin-tools
 Vendor:		Project Vine
@@ -287,6 +287,9 @@ fi
 
 
 %changelog
+* Fri Jun 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.6-1
+- new upstream release.
+
 * Sun May 02 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.4.5-1
 - new upstream release.
 - dropped Patch8: fixed in upstream.