Browse Source

updated 7 packages

freetype2-2.10.4-1

iproute-5.10.0-1

kmod-28-1

libunwind-1.5.0-1

net-tools-2.10-1

screen-4.8.0-2

util-linux-2.36.2-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12534 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 1 year ago
parent
commit
c7e84a9674

+ 15 - 11
f/freetype2/freetype2-vl.spec

@@ -5,9 +5,9 @@
 Summary: FreeType 2 library
 Summary(ja): FreeType 2 ライブラリ
 Name: freetype2
-Version: 2.10.2
+Version: 2.10.4
 Release: 1%{?_dist_release}
-Group: System Environment/Libraries
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -66,7 +66,7 @@ FreeType 2 library.
 
 %package demos
 Summary: A collection of FreeType demos
-Group: System Environment/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Obsoletes: freetype-utils < 2.0
 Provides: freetype-utils = %{version}
@@ -78,10 +78,9 @@ A collection of FreeType demos.
 %package -n compat32-%{name}
 Summary: FreeType 2 library
 Summary(ja): FreeType 2 ライブラリ
-Group: System Environment/Libraries
+Group: system
 Requires:	%{name} = %{version}-%{release}
 
-
 %description -n compat32-%{name}
 The FreeType project is a team of volunteers who develop free,
 portable and high-quality software solutions for digital typography.
@@ -114,13 +113,12 @@ FreeType 2 library.
 %package devel
 Summary:	Development files for FreeType 2 library
 Summary(ja):	FreeType 2 ライブラリの開発ファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 Requires:	zlib-devel
 Requires:	bzip2-devel
 Requires:	libpng-devel
 
-
 %description devel
 The FreeType project is a team of volunteers who develop free,
 portable and high-quality software solutions for digital typography.
@@ -154,7 +152,7 @@ FreeType 2 library.
 %package -n compat32-%{name}-devel
 Summary:	FreeType 2 library
 Summary(ja):	FreeType 2 ライブラリ
-Group:		Development/Libraries
+Group:		programming
 Requires:	compat32-%{name} = %{version}-%{release}
 Requires:	%{name}-devel    = %{version}-%{release}
 Requires:	compat32-zlib-devel
@@ -192,13 +190,16 @@ FreeType 2 library.
 %package static
 Summary:	Static ilbrary for FreeType 2
 Summary(ja):	FreeType 2 のスタティックライブラリ
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 This package contains the static library for %{name}
 
 
+%debug_package
+
+
 %prep
 %setup -q -n freetype-%{version} -b 1 -a 2
 
@@ -266,13 +267,12 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 
 %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)
 %{_libdir}/*.so*
@@ -315,7 +315,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/*.so
 %endif
 
+
 %changelog
+* Thu Feb 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.4-1
+- new upstream release.
+
 * Mon May 18 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10.2-1
 - new upstream release.
 

+ 20 - 7
i/iproute/iproute-vl.spec

@@ -3,9 +3,9 @@
 Summary:        Advanced IP routing and network device configuration tools
 Summary(ja):    IP ルーティング,ネットワークデバイスの設定ツール
 Name:           iproute
-Version:        5.6.0
+Version:        5.10.0
 Release:        1%{?_dist_release}
-Group:          Applications/System
+Group:          system,network,admin-tools
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -15,7 +15,9 @@ Source:         https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{versi
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: bison flex
-BuildRequires: iptables-devel >= 1.4.10, libdb-devel
+BuildRequires: iptables-devel >= 1.4.10
+BuildRequires: libdb-devel
+BuildRequires: libpcap-devel
 BuildRequires: pkgconfig
 %if %{with tipc}
 BuildRequires: libmnl-devel
@@ -32,28 +34,31 @@ kernel.
  このiprouteパッケージには、進歩したカーネルのネットワーク技術を使うように
 設計されたネットワーキングユーティリティ(ip, rtmon等々)が収録されています。
 
+
 %package doc
 Summary: ip and tc documentation with examples
 Summary(ja): ip, tcのドキュメントとサンプル
-Group: Applications/System
+Group: documentation
 License: GPLv2+
 
 %description doc
 The iproute documentation contains howtos and examples of settings.
 
+
 %package devel
 Summary: Libraries, includes, etc. to develop iptables
 Summary(ja): iproute の開発用ライブラリ,ヘッダファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}
 
 %description devel
 Libraries, include files, etc you can use to develop iproute2.
 
+
 %package -n arpd
 Summary: arpd - userspace arp daemon
 Summary(ja): arpd - ユーザー空間のarpデーモン
-Group: Applications/System
+Group: network,system
 Requires: %{name} = %{version}
 
 %description -n arpd
@@ -62,9 +67,13 @@ disk  and  feeding it to the kernel on demand to avoid redundant broad
 casting due to limited size of the kernel ARP cache.
 
 
+%debug_package
+
+
 %prep
 %setup -q -n iproute2-%{version}
 
+
 %build
 export CFLAGS="%{optflags}"
 export LIBDIR=/%{_libdir}
@@ -72,6 +81,7 @@ export IPT_LIB_DIR=/%{_lib}/xtables
 ./configure
 make %{?_smp_mflags}
 
+
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -109,7 +119,7 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 %{_libdir}/tc/*
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
-%{_datadir}/bash-completion/completions/tc
+%{_datadir}/bash-completion/completions/*
 %{_mandir}/man7/*
 %{_mandir}/man8/*
 %exclude %{_mandir}/man8/arpd.8*
@@ -133,6 +143,9 @@ install -D -m644 lib/libnetlink.a %{buildroot}%{_libdir}/libnetlink.a
 
 
 %changelog
+* Thu Feb 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.10.0-1
+- new upstream release.
+
 * Sun Apr 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.6.0-1
 - new upstream release.
 - dropped Source1 and 2.

+ 13 - 9
k/kmod/kmod-vl.spec

@@ -1,9 +1,9 @@
 Name:		kmod
 Summary:	Linux kernel module management utilities
 Summary(ja):	Linux カーネルモジュール管理ユーティリティ
-Version:	27
-Release:        1%{?_dist_release}
-Group:		System Environment/Kernel
+Version:	28
+Release:	1%{?_dist_release}
+Group:		system
 Distribution:	Vine Linux
 Vendor:		Project Vine
 Packager:	daisuke
@@ -34,8 +34,8 @@ examples of loaded and unloaded modules.
 %package libs
 Summary:	Libraries to handle kernel module loading and unloading
 Summary(ja):	kernelモジュールのロード/アンロードを扱うライブラリ
+Group:		system
 License:	LGPLv2+
-Group:		System Environment/Libraries
 
 %description libs
 The kmod-libs package provides runtime libraries for any application that
@@ -45,7 +45,7 @@ wishes to load or unload Linux kernel modules from the running system.
 %package devel
 Summary:	Header files for kmod development
 Summary(ja):	kmodを使うアプリケーション開発のためのヘッダファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
 
 %description devel
@@ -53,6 +53,9 @@ The kmod-devel package provides header files used for development of
 applications that wish to load or unload Linux kernel modules.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 
@@ -97,11 +100,9 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
-%post libs
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
 
-%postun libs
-/sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 
 %files
@@ -135,6 +136,9 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
 
 
 %changelog
+* Thu Feb 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 28-1
+- updated to 28.
+
 * Tue Jul 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 27-1
 - updated to 27.
 

+ 37 - 11
lib/libu/libunwind/libunwind-vl.spec

@@ -1,35 +1,45 @@
 Summary: An unwinding library
 Name: libunwind
-Version: 1.2.1
+Version: 1.5.0
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: BSD
-Group: System Environment/Libraries
 URL: http://savannah.nongnu.org/projects/libunwind
 Source: http://download.savannah.nongnu.org/releases/libunwind/%{name}-%{version}.tar.gz
 
-Buildroot: %{_tmppath}/%{name}-%{version}-root
-
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
 ExclusiveArch: %{ix86} x86_64 ia64
+BuildRequires: zlib-devel
 
 %description
 Libunwind provides a C ABI to determine the call-chain of a program.
 
+
 %package devel
 Summary: Development package for libunwind
-Group: Development/Libraries
+Group: programming
 Requires: libunwind = %{version}-%{release}
 
 %description devel
 The libunwind-devel package includes the libraries and header files for
 libunwind.
 
+
+%debug_package
+
+
 %prep
 %setup -q
 
+
 %build
 %configure --enable-static --enable-shared --enable-setjmp=no
 %__make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
@@ -43,28 +53,44 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libunwind*.a
 mv -f $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace.a-save $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libunwind-ptrace*.so*
 
+
+%if 0%{?_with_check:1} || 0%{?_with_testsuite:1}
+%check
+echo ====================TESTING=========================
+make check || true
+echo ====================TESTING END=====================
+%else
+echo ====================TESTSUITE DISABLED=========================
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
-%doc COPYING README NEWS
-%{_libdir}/libunwind*.so.*
+%license COPYING
+%doc README* NEWS
+%{_libdir}/*.so.*
 
 %files devel
 %defattr(-,root,root)
-%{_libdir}/libunwind*.so
-%{_libdir}/libunwind-ptrace.a
-%{_libdir}/pkgconfig/libunwind*.pc
+%{_libdir}/*.so
+%{_libdir}/*.a
+%{_libdir}/pkgconfig/*.pc
 # <unwind.h> does not get installed for REMOTE_ONLY targets - check it.
 %{_includedir}/unwind.h
 %{_includedir}/libunwind*.h
 
+
 %changelog
+* Thu Feb 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.5.0-1
+- new upstream release.
+
 * Sun Feb 18 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.2.1-1
 - new upstream release.
 - dropped all patches.

+ 90 - 282
n/net-tools/net-tools-vl.spec

@@ -1,177 +1,50 @@
+%bcond_with systemd
+
 Summary: The basic tools for setting up networking.
 Summary(ja): ネットワークをセットアップするための基本的なツール
 Name: net-tools
-Version: 1.60
-Release: 17%{?_dist_release}
-License: GPL
-Group: System Environment/Base
+Version: 2.10
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: system,network,admin-tools
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Source0: http://www.tazenda.demon.co.uk/phil/net-tools/net-tools-%{version}.tar.bz2
-Source1: net-tools-%{version}-config.h
-Source2: net-tools-%{version}-config.make
+License: GPL
+URL: https://sourceforge.net/projects/net-tools/
+Source0: https://downloads.sourceforge.net/project/net-tools/net-tools-%{version}.tar.xz
+Source1: net-tools-config.h
+Source2: net-tools-config.make
 Source3: ether-wake.c
 Source4: ether-wake.8
 Source5: mii-diag.c
 Source6: mii-diag.8
 Source7: iptunnel.8
 Source8: ipmaddr.8
+Source9: arp-ethers.service
+
+# source for Vine
+Source100: net-tools-2.10-ja.po
+
+# adds <delay> option that allows netstat to cycle printing through statistics every delay seconds.
+Patch1: net-tools-cycle.patch
 
-Patch1: net-tools-1.57-bug22040.patch
-Patch2: net-tools-1.60-miiioctl.patch
-Patch3: net-tools-1.60-manydevs.patch
-Patch4: net-tools-1.60-virtualname.patch
-Patch5: net-tools-1.60-cycle.patch
-Patch6: net-tools-1.60-nameif.patch
-Patch7: net-tools-1.60-ipx.patch
-Patch8: net-tools-1.60-inet6-lookup.patch
-Patch9: net-tools-1.60-man.patch
-Patch10: net-tools-1.60-gcc33.patch
-Patch11: net-tools-1.60-trailingblank.patch
-Patch12: net-tools-1.60-interface.patch
-Patch14: net-tools-1.60-gcc34.patch
-Patch15: net-tools-1.60-overflow.patch
-Patch19: net-tools-1.60-siunits.patch
-Patch20: net-tools-1.60-trunc.patch
-Patch21: net-tools-1.60-return.patch
-Patch22: net-tools-1.60-parse.patch
-Patch23: net-tools-1.60-netmask.patch
-Patch24: net-tools-1.60-ulong.patch
-Patch25: net-tools-1.60-bcast.patch
-Patch26: net-tools-1.60-mii-tool-obsolete.patch
-Patch27: net-tools-1.60-netstat_ulong.patch
-Patch28: net-tools-1.60-note.patch
-Patch29: net-tools-1.60-num-ports.patch
-Patch30: net-tools-1.60-duplicate-tcp.patch
-Patch31: net-tools-1.60-statalias.patch
-Patch32: net-tools-1.60-isofix.patch
-Patch34: net-tools-1.60-ifconfig_ib.patch
-Patch35: net-tools-1.60-de.patch
-Patch37: net-tools-1.60-pie.patch
-Patch38: net-tools-1.60-ifaceopt.patch
-Patch39: net-tools-1.60-trim_iface.patch
-Patch40: net-tools-1.60-stdo.patch
-Patch41: net-tools-1.60-statistics.patch
-Patch42: net-tools-1.60-ifconfig.patch
-Patch43: net-tools-1.60-arp_overflow.patch
-Patch44: net-tools-1.60-hostname_man.patch
-Patch45: net-tools-1.60-interface_stack.patch
-Patch46: net-tools-1.60-selinux.patch
-Patch47: net-tools-1.60-netstat_stop_trim.patch
-Patch48: net-tools-1.60-netstat_inode.patch
-Patch49: net-tools-1.60-fgets.patch
-Patch50: net-tools-1.60-ifconfig_man.patch
-Patch51: net-tools-1.60-x25-proc.patch
-Patch52: net-tools-1.60-sctp.patch
-Patch53: net-tools-1.60-arp_man.patch
-Patch54: net-tools-1.60-ifconfig-long-iface-crasher.patch
-Patch55: net-tools-1.60-netdevice.patch
-Patch56: net-tools-1.60-skip.patch
-Patch57: net-tools-1.60-netstat-I-fix.patch
-Patch58: net-tools-1.60-nameif_strncpy.patch
-Patch59: net-tools-1.60-arp-unaligned-access.patch
-Patch60: net-tools-1.60-sctp-quiet.patch
-Patch61: net-tools-1.60-remove_node.patch
-Patch62: net-tools-1.60-netstat-interfaces-crash.patch
-Patch64: net-tools-1.60-ec_hw_null.patch
-Patch65: net-tools-1.60-statistics_buffer.patch
-Patch66: net-tools-1.60-sctp-addrs.patch
-Patch67: net-tools-1.60-i-option.patch
-Patch68: net-tools-1.60-a-option.patch
-Patch69: net-tools-1.60-clear-flag.patch
-Patch70: net-tools-1.60-metric-tunnel-man.patch
-Patch71: net-tools-1.60-netstat-probe.patch
-
-# scanf format length fix (non-exploitable)
-Patch72: net-tools-1.60-scanf-format.patch
-
-# netstat - avoid name resolution for listening or established sockets (-l) by return fast
-Patch73: net-tools-1.60-avoid-name-resolution.patch
-
-# netstat - --continuous should flush stdout
-Patch74: net-tools-1.60-continous-flush-stdout.patch
-
-# fix some errors so net-tools can be build with DEBUG defined
-Patch75: net-tools-1.60-debug-fix.patch
-
-# let the user know that ifconfig can correctly show only first 8 bytes of Infiniband hw address
-Patch76: net-tools-1.60-ib-warning.patch
-
-# notes in man pages, saying that these tools are obsolete
-Patch77: net-tools-1.60-man-obsolete.patch
-
-# Bug 322901  Sens negating error in man page translation (arp)
-Patch78: net-tools-1.60-man-RHEL-bugs.patch
-
-# handle raw "IP" masqinfo
-Patch79: net-tools-1.60-masqinfo-raw-ip.patch
-
-# touch up build system to respect normal toolchain env vars rather than requiring people to set random custom ones
-# add missing dependency on version.h to libdir target to fix parallel build failures
-# convert -idirafter to -I
-Patch80: net-tools-1.60-makefile-berlios.patch
-
-# slattach: use fchown() rather than chown() to avoid race between creation and permission changing
-Patch81: net-tools-1.60-slattach-fchown.patch
-
-# Bug 531702: make "hostname -s" display host name cut at the first dot (no matter if the host name resolves or not)
-Patch82: net-tools-1.60-hostname-short.patch
-
-# use <linux/mii.h> instead of "mii.h" and fix Bug #491358
-Patch83: net-tools-1.60-mii-refactor.patch
-
-# Bug 567272: ifconfig interface:0 del <IP> will remove the Aliased IP on IA64
-Patch84: net-tools-1.60-IA64.patch
-
-# interface: fix IPv6 parsing of interfaces with large indexes (> 255)
-Patch85: net-tools-1.60-large-indexes.patch
-
-# netstat -s (statistics.c) now uses unsigned long long (instead of int) to handle 64 bit integers (Bug #580054)
-Patch86: net-tools-1.60-statistics-doubleword.patch
-
-# fix memory leak in netstat when run with -c option (Bug #634539)
-Patch88: net-tools-1.60-netstat-leak.patch
-
-# Don't rely on eth0 being default network device name.
-# Since RHEL-6.1 network devices can have arbitrary names (#682368)
-Patch89: net-tools-1.60-arbitrary-device-names.patch
-
-# plipconfig man page and usage output fixes (#694766)
-Patch90: net-tools-1.60-plipconfig.patch
-
-# Add -A,--all-fqdns and -I,--all-ip-addresses options to hostname (#705110)
-Patch91: net-tools-1.60-allnames.patch
-
-# patch netstat to separate basename of -p only if it is absolute
-# path (in order to make argv[0]="sshd pty/0" display as sshd, and not as /0).
-# (#725348)
-Patch92: net-tools-1.60-netstat-p-basename.patch
-
-# Commit: 	https://sourceforge.net/p/net-tools/code/ci/e5f1be133570075e10dec3cbd3e379d2d1cb6f99/
-# BZ:		https://bugzilla.redhat.com/show_bug.cgi?id=1177980
-# Fixed in:	1.60
-Patch93: net-tools-1.60-ifconfig-EiB.patch
-
-# BZ:		https://bugzilla.redhat.com/show_bug.cgi?id=803880
-#Fixed in:	1.60
-Patch94: net-tools-inet-rresolve.patch
-
-# BZ:		https://bugzilla.redhat.com/show_bug.cgi?id=979318
-#Fixed in:	1.60
-Patch95: net-tools-1.60-netstat-inet6-manpage.patch
+# various man page fixes merged into one patch
+Patch2: net-tools-man.patch
 
-#BZ:		https://bugzilla.redhat.com/show_bug.cgi?id=1159286
-Patch96:	net-tools-1.60-hostname-aaaa.patch
+# linux-4.8
+Patch3: net-tools-linux48.patch
 
-# upstream 45d573: iptunnel: drop netinet/ip.h include
-Patch99:	net-tools-1.60-iphdr.patch
+# use all interfaces instead of default (#1003875)
+Patch20: ether-wake-interfaces.patch
 
-# source/patch for Vine
-Source100: net-tools-1.60-ja.po
-Patch100: net-tools-1.54-japo.patch
+Patch24: net-tools-correct-exit-code.patch
 
 BuildRoot: %{_tmppath}/%{name}-root
-Vendor: Project Vine
-Distribution: Vine Linux
+BuildRequires: bluez-libs-devel
+%if %{with systemd}
+%{?systemd_requires}
+%endif
+
 
 %description
 The net-tools package contains the basic tools needed for setting up
@@ -181,98 +54,15 @@ networking:  ethers, route and others.
 net-tools パッケージはネットワークをセットアップする基本的なツールを
 含んでいます: イーサーネット, ルーティングやその他
 
+
+%debug_package
+
+
 %prep
 %setup -q
-%patch1 -p1 -b .bug22040
-%patch2 -p1 -b .miiioctl
-%patch3 -p0 -b .manydevs
-%patch4 -p1 -b .virtualname
-%patch5 -p1 -b .cycle
-%patch6 -p1 -b .nameif
-%patch7 -p1 -b .ipx
-%patch8 -p1 -b .inet6-lookup
-%patch9 -p1 -b .man
-%patch10 -p1 -b .gcc33 %{?_rawbuild}
-%patch11 -p1 -b .trailingblank
-%patch12 -p1 -b .interface
-%patch14 -p1 -b .gcc34 %{?_rawbuild}
-%patch15 -p1 -b .overflow
-%patch19 -p1 -b .siunits
-%patch20 -p1 -b .trunc
-%patch21 -p1 -b .return
-%patch22 -p1 -b .parse
-%patch23 -p1 -b .netmask
-%patch24 -p1 -b .ulong
-%patch25 -p1 -b .bcast
-%patch26 -p1 -b .obsolete
-%patch27 -p1 -b .netstat_ulong
-%patch28 -p1 -b .note
-%patch29 -p1 -b .num-ports
-%patch30 -p1 -b .dup-tcp
-%patch31 -p1 -b .statalias
-%patch32 -p1 -b .isofix
-%patch34 -p1 -b .ifconfig_ib
-%patch35 -p1 
-%patch37 -p1 -b .pie
-%patch38 -p1 -b .ifaceopt
-%patch39 -p1 -b .trim-iface
-%patch40 -p1 -b .stdo
-%patch41 -p1 -b .statistics
-%patch42 -p1 -b .iface_drop
-%patch43 -p1 -b .overflow
-%patch44 -p1 -b .hostname_man
-%patch45 -p0 -b .stack
-%patch46 -p1 -b .selinux
-%patch47 -p1 -b .trim
-%patch48 -p1 -b .inode
-%patch49 -p1 -b .fgets
-%patch50 -p1 -b .inet_addr
-%patch51 -p1 -b .x25
-%patch52 -p1 -b .sctp
-%patch53 -p1
-%patch54 -p1 -b .long_iface
-%patch55 -p1 -b .netdevice %{?_rawbuild}
-%patch56 -p1 -b .skip
-%patch57 -p1
-%patch58 -p1 -b .strncpy
-%patch59 -p1 -b .arp-un-access
-%patch60 -p1 -b .quiet
-%patch61 -p1
-%patch62 -p1 -b .iface-crash
-%patch64 -p1 %{?_rawbuild}
-%patch65 -p1 -b .buffer
-%patch66 -p1 -b .sctp-addrs
-%patch67 -p1 -b .i-option
-%patch68 -p1 -b .a-option
-%patch69 -p1 -b .clear-flag
-%patch70 -p1 -b .metric-tunnel-man
-%patch71 -p1 -b .probe
-%patch72 -p1 -b .scanf-format
-%patch73 -p1 -b .avoid-name-resolution
-%patch74 -p1 -b .continous-flush-stdout
-%patch75 -p1 -b .debug-fix
-%patch76 -p1 -b .ib-warning
-%patch77 -p1 -b .man-obsolete
-%patch78 -p1 -b .man-RHEL-bugs
-%patch79 -p1 -b .masqinfo-raw-ip
-%patch80 -p1 -b .makefile-berlios
-%patch81 -p1 -b .slattach-fchown
-%patch82 -p1 -b .hostname-short
-%patch83 -p1 -b .mii-refactor
-%patch84 -p1 -b .IA64
-%patch85 -p1 -b .large-indexes
-%patch86 -p1 -b .doubleword
-%patch88 -p1 -b .netstat-leak
-%patch89 -p1 -b .arbitrary-device-names
-%patch90 -p1 -b .plipconfig
-%patch91 -p1 -b .allnames
-%patch92 -p1 -b .p-basename
-%patch93 -p1 -b .ifconfig-EiB
-%patch94 -p1 -b .inet-rresolve
-%patch95 -p1 -b .netstat-inet6-manpage
-%patch96 -p1 -b .net-tools-1.60-hostname-aaaa
-
-%patch99 -p1 -b .iphdr
+%patch1 -p1 -b .cycle
+%patch2 -p1 -b .man
+#patch3 -p1 -b .linux48
 
 cp %SOURCE1 ./config.h
 cp %SOURCE2 ./config.make
@@ -283,75 +73,93 @@ cp %SOURCE6 ./man/en_US
 cp %SOURCE7 ./man/en_US
 cp %SOURCE8 ./man/en_US
 
-%patch100 -p1 -b .nls
+%patch20 -p1 -b .interfaces
+%patch24 -p1 -b .exit-codes
+
+touch ./config.h
 cp %SOURCE100 po/ja.po
 
-iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/fr_FR/arp.8 && mv arp.tmp man/fr_FR/arp.8
-iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/fr_FR/ethers.5 && mv ethers.tmp man/fr_FR/ethers.5
-iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/fr_FR/hostname.1 && mv hostname.tmp man/fr_FR/hostname.1
-iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/fr_FR/ifconfig.8 && mv ifconfig.tmp man/fr_FR/ifconfig.8
-iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/fr_FR/netstat.8 && mv netstat.tmp man/fr_FR/netstat.8
-iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/fr_FR/plipconfig.8 && mv plipconfig.tmp man/fr_FR/plipconfig.8
-iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/fr_FR/rarp.8 && mv rarp.tmp man/fr_FR/rarp.8
-iconv -f iso-8859-1 -t utf-8 -o route.tmp man/fr_FR/route.8 && mv route.tmp man/fr_FR/route.8
-iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/fr_FR/slattach.8 && mv slattach.tmp man/fr_FR/slattach.8
-#portugal
-iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/pt_BR/arp.8 && mv arp.tmp man/pt_BR/arp.8
-iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/pt_BR/hostname.1 && mv hostname.tmp man/pt_BR/hostname.1
-iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/pt_BR/ifconfig.8 && mv ifconfig.tmp man/pt_BR/ifconfig.8
-iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/pt_BR/netstat.8 && mv netstat.tmp man/pt_BR/netstat.8
-iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/pt_BR/rarp.8 && mv rarp.tmp man/pt_BR/rarp.8
-iconv -f iso-8859-1 -t utf-8 -o route.tmp man/pt_BR/route.8 && mv route.tmp man/pt_BR/route.8
-#german
-iconv -f iso-8859-1 -t utf-8 -o arp.tmp man/de_DE/arp.8 && mv arp.tmp man/de_DE/arp.8
-iconv -f iso-8859-1 -t utf-8 -o ethers.tmp man/de_DE/ethers.5 && mv ethers.tmp man/de_DE/ethers.5
-iconv -f iso-8859-1 -t utf-8 -o hostname.tmp man/de_DE/hostname.1 && mv hostname.tmp man/de_DE/hostname.1
-iconv -f iso-8859-1 -t utf-8 -o ifconfig.tmp man/de_DE/ifconfig.8 && mv ifconfig.tmp man/de_DE/ifconfig.8
-iconv -f iso-8859-1 -t utf-8 -o netstat.tmp man/de_DE/netstat.8 && mv netstat.tmp man/de_DE/netstat.8
-iconv -f iso-8859-1 -t utf-8 -o plipconfig.tmp man/de_DE/plipconfig.8 && mv plipconfig.tmp man/de_DE/plipconfig.8
-iconv -f iso-8859-1 -t utf-8 -o rarp.tmp man/de_DE/rarp.8 && mv rarp.tmp man/de_DE/rarp.8
-iconv -f iso-8859-1 -t utf-8 -o route.tmp man/de_DE/route.8 && mv route.tmp man/de_DE/route.8
-iconv -f iso-8859-1 -t utf-8 -o slattach.tmp man/de_DE/slattach.8 && mv slattach.tmp man/de_DE/slattach.8
 
 %build
+export CFLAGS="${RPM_OPT_FLAGS} -fpie"
+export LDFLAGS="${RPM_LD_FLAGS} -pie -Wl,-z,now"
+
 make
-gcc $RPM_OPT_FLAGS -o ether-wake ether-wake.c
-gcc $RPM_OPT_FLAGS -o mii-diag mii-diag.c
+make ether-wake
+gcc ${RPM_OPT_FLAGS} ${RPM_LD_FLAGS} -o mii-diag mii-diag.c
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make BASEDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
+mv man/de_DE man/de
+mv man/fr_FR man/fr
+mv man/pt_BR man/pt
+
+make BASEDIR=%{buildroot} mandir=%{_mandir} install
 
 install -m 755 ether-wake %{buildroot}/sbin
 install -m 755 mii-diag %{buildroot}/sbin
 
+mv -f %{buildroot}/bin/{ifconfig,route} %{buildroot}/sbin/
+
 rm %{buildroot}/sbin/rarp
 rm %{buildroot}%{_mandir}/man8/rarp.8*
 rm %{buildroot}%{_mandir}/de*/man8/rarp.8*
 rm %{buildroot}%{_mandir}/fr*/man8/rarp.8*
 rm %{buildroot}%{_mandir}/pt*/man8/rarp.8*
 
+# otherwise %%find_lang finds them even they're empty
+rm -rf %{buildroot}%{_mandir}/de/man1
+rm -rf %{buildroot}%{_mandir}/fr/man1
+rm -rf %{buildroot}%{_mandir}/man1
+rm -rf %{buildroot}%{_mandir}/pt/man1
+rm -rf %{buildroot}%{_mandir}/pt/man5
+
 mkdir -p %{buildroot}%{_sysconfdir}
 touch %{buildroot}%{_sysconfdir}/ethers
 echo "# see man ethers for syntax" > %{buildroot}%{_sysconfdir}/ethers
 
+%if %{with systemd}
+# install systemd unit file
+install -D -p -m 644 %{SOURCE9} %{buildroot}%{_unitdir}/arp-ethers.service
+%endif
+
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%if %{with systemd}
+%post
+%systemd_post arp-ethers.service
+%endif
+
+
 %files -f %{name}.lang
 %defattr(-,root,root)
+%license COPYING
 /bin/*
 /sbin/*
-%{_mandir}/man[158]/*
-%lang(de_DE)	%{_mandir}/de_DE/man[158]/*
-%lang(fr_FR)	%{_mandir}/fr_FR/man[158]/*
-%lang(pt_BR)	%{_mandir}/pt_BR/man[158]/*
+%{_mandir}/man[58]/*
+%{_mandir}/de/man[58]/*
+%{_mandir}/fr/man[58]/*
+%{_mandir}/pt/man8/*
 %config(noreplace) %{_sysconfdir}/ethers
+%if %{with systemd}
+%attr(0644,root,root)   %{_unitdir}/arp-ethers.service
+%endif
+
 
 %changelog
+* Thu Feb 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.10-1
+- new upstream release.
+- updated Source100 (ja.po).
+- dropped Patch100.
+- added systemd support (disabled as default).
+
 * Thu Nov 29 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.60-17
 - replace all patches from CentOS 6 (included previous patches).
 - added Patch99 to build with new kernel-headers.

+ 15 - 6
s/screen/screen-vl.spec

@@ -2,9 +2,12 @@ Summary:        A screen manager that supports multiple logins on one terminal.
 Summary(ja):    スクリーンマネージャ - 一つの端末で多重ログイン
 Name:           screen
 Version:        4.8.0
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
+Group:          accessories
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
 License:        GPLv2+
-Group:          Applications/System
 Source0:        https://ftp.gnu.org/gnu/screen/screen-%{version}.tar.gz
 Source1:        screen.pam
 
@@ -14,6 +17,8 @@ Patch3:         screen-E3.patch
 Patch4:         screen-4.3.1-suppress_remap.patch
 Patch5:         screen-4.3.1-crypt.patch
 Patch6:         screen-4.8.0-expand-d_xtermosc.patch
+# security
+Patch1000:      99_CVE-2021-26937.patch
 
 Requires: ncurses
 Requires(post,preun): /sbin/install-info
@@ -21,9 +26,6 @@ BuildRequires: ncurses-devel, texinfo, perl
 BuildRequires: pam-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
-Vendor: Project Vine
-Distribution: Vine Linux
-
 %description
 The screen utility allows you to have multiple logins on just one
 terminal.  Screen is useful for users who telnet into a machine or
@@ -33,7 +35,6 @@ one login.
 Install the screen package if you need a screen manager that can
 support multiple logins on one terminal.
 
-
 %description -l ja
 一つの端末プログラムだけで多重のログインを可能にするスクリーン管理
 ユーティリティです。telnetで操作しているユーザやダムターミナルから
@@ -41,10 +42,14 @@ support multiple logins on one terminal.
 便利なプログラムです。
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %autosetup -p1
 
+
 %build
 autoreconf -vfi
 
@@ -68,6 +73,7 @@ rm -f doc/screen.info*
 # fails with %{?_smp_mflags}
 make CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -124,6 +130,9 @@ fi
 
 
 %changelog
+* Thu Feb 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.8.0-2
+- imported Patch1000 from debian.
+
 * Thu Feb 27 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.8.0-1
 - update to 4.8.0.
 - re-imported patches from rawhide.

+ 83 - 73
u/util-linux/util-linux-vl.spec

@@ -1,15 +1,5 @@
 %bcond_with systemd
 
-### Header
-Summary: A collection of basic system utilities
-Summary(ja): 基本システムユーティリティー集
-Name: util-linux
-Version: 2.35.1
-Release: 1%{?_dist_release}%{?with_systemd:.systemd}
-Group: System Environment/Base
-License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
-URL: http://en.wikipedia.org/wiki/Util-linux
-
 %define _unpackaged_files_terminate_build 1
 
 ### Features
@@ -28,6 +18,48 @@ URL: http://en.wikipedia.org/wiki/Util-linux
 %define _localstatedir /var/run
 %define compldir %{_datadir}/bash-completion/completions/
 
+### Header
+Summary: A collection of basic system utilities
+Summary(ja): 基本システムユーティリティー集
+Name: util-linux
+Version: 2.36.2
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: system,admin-tools
+Distribution: Vine Linux
+Vendor: Project Vine
+Packager: daisuke
+
+License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
+URL: http://en.wikipedia.org/wiki/Util-linux
+
+### Sources
+%global  shortver %(echo "%{version}" | perl -p -e 's/^([0-9]+\.[0-9]+).*$/\\1/')
+Source0: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v%{shortver}/%{name}-%{version}.tar.xz
+Source1: util-linux-login.pamd
+Source2: util-linux-remote.pamd
+Source3: util-linux-chsh-chfn.pamd
+Source4: util-linux-60-raw.rules
+Source12: util-linux-su.pamd
+Source13: util-linux-su-l.pamd
+Source14: util-linux-runuser.pamd
+Source15: util-linux-runuser-l.pamd
+
+Source5: util-linux-ng-login-noselinux.pamd
+Source6: util-linux-ng-remote-noselinux.pamd
+Source10: uuidd.init
+#Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
+
+### Ready for upstream?
+###
+# 151635 - makeing /var/log/lastlog
+Patch0: login-lastlog-create.patch
+# https://github.com/karelzak/util-linux/commit/57898c3a7ee8fc5933cddd4526bb3980bef85a02
+# The workaround is unnecessary on Fedora with kernel >= 5.8.
+Patch1: libmount-remove-read-mountinfo-workaround.patch
+# Add `/run/motd.d` to the hardcoded MOTD_FILE
+# https://github.com/coreos/console-login-helper-messages/issues/60
+Patch2: login-default-motd-file.patch
+
 ### Paths
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -39,10 +71,6 @@ BuildRequires: gettext
 %if %{with_selinux}
 BuildRequires: libselinux-devel
 %endif
-%if %{with systemd}
-BuildRequires: systemd-devel
-BuildRequires: systemd
-%endif
 BuildRequires: bison
 BuildRequires: ncurses-devel
 BuildRequires: pam-devel
@@ -50,31 +78,18 @@ BuildRequires: texinfo
 BuildRequires: zlib-devel
 BuildRequires: popt-devel
 BuildRequires: libutempter-devel
-BuildRequires: eudev-libudev-devel
 BuildRequires: libcap-ng-devel
 BuildRequires: libuser-devel
+%if %{with systemd}
+BuildRequires: systemd-devel
+BuildRequires: systemd
+%else
+BuildRequires: eudev-libudev-devel
+%endif
 
 # su/runuser patches need this
 BuildRequires: automake, autoconf, libtool
 
-### Sources
-%global  shortver %(echo "%{version}" | perl -p -e 's/^([0-9]+\.[0-9]+).*$/\\1/')
-Source0: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v%{shortver}/%{name}-%{version}.tar.xz
-Source1: util-linux-login.pamd
-Source2: util-linux-remote.pamd
-Source3: util-linux-chsh-chfn.pamd
-Source4: util-linux-60-raw.rules
-Source12: util-linux-su.pamd
-Source13: util-linux-su-l.pamd
-Source14: util-linux-runuser.pamd
-Source15: util-linux-runuser-l.pamd
-
-Source5: util-linux-ng-login-noselinux.pamd
-Source6: util-linux-ng-remote-noselinux.pamd
-Source10: uuidd.init
-#Source11: http://download.sourceforge.net/floppyutil/floppy-%{floppyver}.tar.bz2
-
-
 ### Obsoletes & Conflicts & Provides
 %ifarch alpha
 Conflicts: initscripts <= 4.58
@@ -94,7 +109,6 @@ Conflicts: kernel < 2.2.12-7
 # old versions of e2fsprogs contain fsck, uuidgen
 Conflicts: e2fsprogs < 1.41.8-5
 
-
 # old versions of util-linux have been splited to more sub-packages
 Obsoletes: mount < 2.11, losetup < 2.11
 Provides: mount = %{version}-%{release}, losetup = %{version}-%{release}
@@ -139,25 +153,6 @@ Requires: eudev
 Requires(post,preun): alternatives
 Provides: pager
 
-Distribution: Vine Linux
-Vendor: Project Vine
-Packager: daisuke
-
-### Ready for upstream?
-###
-# 151635 - makeing /var/log/lastlog
-Patch0: 2.28-login-lastlog-create.patch
-# https://github.com/karelzak/util-linux/issues/949
-Patch1: 0001-libfdisk-script-accept-sector-size-ignore-unknown-he.patch
-# https://github.com/karelzak/util-linux/issues/948
-Patch2: 0002-fstrim-do-not-use-Protect-setting-in-systemd-service.patch
-# https://github.com/ibm-s390-tools/s390-tools/issues/80
-Patch3: 0003-lsblk-fix-P-regression-from-v2.34.patch
-
-# https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/commit/?id=cd781c405be82540484da3bfe3d3f17a39b8eb5c
-Patch1000: hwclock-make-glibc-2.31-compatible.patch
-
-
 %description
 The util-linux-ng package contains a large variety of low-level system
 utilities that are necessary for a Linux system to function. Among
@@ -169,11 +164,12 @@ Util-linux パッケージは Linux システムが機能するために必要
 低レベルのシステムユーティリティを含んでいます。fdisk 設定ツールやログ
 インプログラムも含んでいます。 
 
+
 %if %{with bashcomp}
 %package -n bash-completion-util-linux
 Summary: bash-completions for util-linux
 Summary(ja): util-linux用のbash補完拡張
-Group: System Environment/Base
+Group: system
 License: GPLv2 and GPLv2+
 Requires: bash-completion
 
@@ -183,7 +179,7 @@ Requires: bash-completion
 
 %package -n libfdisk
 Summary: Partitioning library for fdisk-like programs.
-Group: Development/Libraries
+Group: system
 License: LGPLv2+
 
 %description -n libfdisk
@@ -192,7 +188,7 @@ This is library for fdisk-like programs, part of util-linux.
 
 %package -n libfdisk-devel
 Summary:  Partitioning library for fdisk-like programs.
-Group: Development/Libraries
+Group: programming
 License: LGPLv2+
 Requires: libfdisk = %{version}-%{release}
 Requires: pkgconfig
@@ -204,7 +200,7 @@ part of util-linux.
 
 %package -n libsmartcols
 Summary: Formatting library for ls-like programs.
-Group: Development/Libraries
+Group: system
 License: LGPLv2+
 
 %description -n libsmartcols
@@ -213,7 +209,7 @@ This is library for ls-like terminal programs, part of util-linux.
 
 %package -n libsmartcols-devel
 Summary: Formatting library for ls-like programs.
-Group: Development/Libraries
+Group: programming
 License: LGPLv2+
 Requires: libsmartcols = %{version}-%{release}
 Requires: pkgconfig
@@ -226,7 +222,7 @@ part of util-linux.
 %package -n libmount
 Summary: Device mounting library
 Summary(ja): デバイスマウントライブラリ
-Group: System Environment/Libraries
+Group: system
 License: LGPLv2+
 Requires: libblkid = %{version}-%{release}
 
@@ -237,7 +233,7 @@ This is the device mounting library, part of util-linux.
 %package -n libmount-devel
 Summary: Development files for device mounting library
 Summary(ja): デバイスマウントライブラリの開発用ファイル
-Group: Development/Libraries
+Group: programming
 License: LGPLv2+
 Requires: libmount = %{version}-%{release}
 Requires: pkgconfig
@@ -250,7 +246,7 @@ part of util-linux.
 %package -n libblkid
 Summary: Block device ID library
 Summary(ja): ブロックデバイス識別ライブラリ
-Group: System Environment/Libraries
+Group: system
 License: LGPLv2+
 
 %description -n libblkid
@@ -260,7 +256,7 @@ This is block device identification library, part of util-linux-ng.
 %package -n libblkid-devel
 Summary: Development files for block device ID library
 Summary(ja): ブロックデバイス識別ライブラリの開発用ファイル
-Group: Development/Libraries
+Group: programming
 License: LGPLv2+
 Provides: libblkid-static = %{version}-%{release}
 Requires: libblkid = %{version}-%{release}
@@ -274,7 +270,7 @@ part of util-linux-ng.
 %package -n libuuid
 Summary: Universally unique ID library
 Summary(ja): UUID ライブラリ
-Group: System Environment/Libraries
+Group: system
 License: BSD
 
 %description -n libuuid
@@ -292,7 +288,7 @@ See also the "uuid" package, which is a separate implementation.
 %package -n libuuid-devel
 Summary: Development files for universally unique ID library
 Summary(ja): UUID ライブラリの開発用ファイル
-Group: Development/Libraries
+Group: programming
 License: BSD
 Provides: libuuid-static = %{version}-%{release}
 Requires: libuuid = %{version}-%{release}
@@ -315,7 +311,7 @@ See also the "uuid-devel" package, which is a separate implementation.
 %package -n uuidd
 Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
 Summary(ja): 時系列 UUID の唯一性を保証するためのヘルパーデーモン
-Group: System Environment/Daemons
+Group: system
 Requires: libuuid = %{version}-%{release}
 License: GPLv2
 Requires(pre): shadow-utils
@@ -332,12 +328,11 @@ uniqueness of time-based UUID generation even at very high rates on
 SMP systems.
 
 
-
 # compat32
 %package -n compat32-libmount
 Summary: Device mounting library
 Summary(ja): デバイスマウントライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 License: LGPLv2+
 Requires: libmount = %{version}-%{release}
 
@@ -348,7 +343,7 @@ This is the device mounting library, part of util-linux.
 %package -n compat32-libmount-devel
 Summary: Development files for device mounting library
 Summary(ja): デバイスマウントライブラリの開発用ファイル
-Group: Development/Libraries
+Group: programming,legacy
 License: LGPLv2+
 Requires: libmount-devel = %{version}-%{release}
 Requires: compat32-libmount = %{version}-%{release}
@@ -362,7 +357,7 @@ part of util-linux.
 %package -n compat32-libblkid
 Summary: Block device ID library
 Summary(ja): ブロックデバイス識別ライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 License: LGPLv2+
 Requires: libblkid = %{version}-%{release}
 
@@ -373,7 +368,7 @@ This is block device identification library, part of util-linux-ng.
 %package -n compat32-libblkid-devel
 Summary: Development files for block device ID library
 Summary(ja): ブロックデバイス識別ライブラリの開発用ファイル
-Group: Development/Libraries
+Group: programming,legacy
 License: LGPLv2+
 Requires: libblkid-devel = %{version}-%{release}
 Requires: compat32-libblkid = %{version}-%{release}
@@ -388,7 +383,7 @@ part of util-linux-ng.
 %package -n compat32-libuuid
 Summary: Universally unique ID library
 Summary(ja): UUID ライブラリ
-Group: System Environment/Libraries
+Group: system,legacy
 Requires: libuuid = %{version}-%{release}
 License: BSD
 
@@ -406,7 +401,7 @@ across a network.
 %package -n compat32-libuuid-devel
 Summary: Development files for universally unique ID library
 Summary(ja): UUID ライブラリの開発用ファイル
-Group: Development/Libraries
+Group: programming,legacy
 License: BSD
 Requires: libuuid-devel = %{version}-%{release}
 Requires: compat32-libuuid = %{version}-%{release}
@@ -424,9 +419,13 @@ short lifetime, to reliably identifying very persistent objects
 across a network.
 
 
+%debug_package
+
+
 %prep
 %autosetup -p1
 
+
 %build
 unset LINGUAS || :
 
@@ -502,8 +501,10 @@ echo '.so man8/raw.8' > $RPM_BUILD_ROOT%{_mandir}/man8/rawdevices.8
 	popd
 }
 
+%if !%{with systemd}
 # Our own initscript for uuidd
 install -D -m 755 %{SOURCE10} ${RPM_BUILD_ROOT}/etc/rc.d/init.d/uuidd
+%endif
 # And a dirs uuidd needs that the makefiles don't create
 install -d ${RPM_BUILD_ROOT}/var/run/uuidd
 install -d ${RPM_BUILD_ROOT}/var/lib/libuuid
@@ -823,6 +824,7 @@ fi
 %{_bindir}/ipcmk
 %{_bindir}/ipcrm
 %{_bindir}/ipcs
+%{_bindir}/irqtop
 %{_bindir}/isosize
 %{_bindir}/kill
 %{_bindir}/last
@@ -831,6 +833,7 @@ fi
 %{_bindir}/look
 %{_bindir}/lscpu
 %{_bindir}/lsipc
+%{_bindir}/lsirq
 %{_bindir}/lslocks
 %{_bindir}/lslogins
 %{_bindir}/lsmem
@@ -887,6 +890,7 @@ fi
 %{_mandir}/man1/ipcmk.1*
 %{_mandir}/man1/ipcrm.1*
 %{_mandir}/man1/ipcs.1*
+%{_mandir}/man1/irqtop.1*
 %{_mandir}/man1/kill.1*
 %{_mandir}/man1/last.1*
 %{_mandir}/man1/lastb.1*
@@ -895,6 +899,7 @@ fi
 %{_mandir}/man1/look.1*
 %{_mandir}/man1/lscpu.1*
 %{_mandir}/man1/lsipc.1*
+%{_mandir}/man1/lsirq.1*
 %{_mandir}/man1/lslogins.1*
 %{_mandir}/man1/lsmem.1*
 %{_mandir}/man1/mesg.1*
@@ -1129,7 +1134,12 @@ fi
 %endif
 
 %changelog
-* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net>
+* Thu Feb 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.36.2-1
+- updated to 2.36.2.
+- dropped Patch1-1000: fixed in upstream.
+- imported Patch1 and 2 from rawhide.
+
+* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.35.1-1
 - updated to 2.35.1.
 - updated rawhide patches.
 - imported Patch1000 from upstream.