Browse Source

updated 10 packages

ModemManager-1.20.6-1

NetworkManager-1.42.6-1

libpcap-1.10.4-1

libtdb-1.4.8-1

postfix-3.8.0-1

ppp-2.5.0-1

rust-1.69.0-1

samba-4.18.2-1

screen-4.9.0-1

tcpdump-4.99.4-1
Tomohiro "Tomo-p" KATO 11 months ago
parent
commit
ec2d77e1d4

+ 40 - 56
M/ModemManager/ModemManager-vl.spec

@@ -8,7 +8,7 @@
 Name: ModemManager
 Summary: Mobile broadband modem management service
 Summary(ja): モバイルブロードバンドモデム運用サービス
-Version: 1.14.10
+Version: 1.20.6
 Release: 1%{git_snapshot}%{?_dist_release}%{?with_systemd:.systemd}
 Group: network,system
 Vendor: Project Vine
@@ -16,28 +16,24 @@ Distribution: Vine Linux
 
 License: GPLv2+
 URL: https://www.freedesktop.org/wiki/Software/ModemManager/
-Source: https://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
-
-Patch0: buildsys-hates-openpty.patch
-Patch1: ModemManager-1.8.2-elogind-1.patch
+Source: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/%{version}/ModemManager-%{version}.tar.bz2
+#https://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
-BuildRequires: automake autoconf intltool libtool
+BuildRequires: meson
 BuildRequires: gobject-introspection-devel
-BuildRequires: vala-devel
-BuildRequires: vala-tools
+BuildRequires: vala
+BuildRequires: vala-libs
 BuildRequires: polkit-devel
-BuildRequires: gtk-doc
+BuildRequires: dbus-devel
 # for xsltproc
 BuildRequires: libxslt
 %if %{with systemd}
 BuildRequires: systemd-devel 
 %{?systemd_requires}
-%else
-BuildRequires: libgudev-devel 
-BuildRequires: elogind-devel 
 %endif
+BuildRequires: libgudev-devel
 Requires: dbus-glib
 
 %description
@@ -85,48 +81,48 @@ Header files and libraries for building a extension library for the %{name}-glib
 
 %prep
 %setup -q
-%patch0 -p1 -b .pty
-%if !%{with systemd}
-%patch1 -p1 -b .elogind
-%endif
 
 
 %build
-autoreconf -vif
-#pppddir=`ls -1d %{_libdir}/pppd/2*`
-%configure \
-	--disable-static \
-	--enable-gtk-doc=yes \
-	--enable-vala=yes \
-	--enable-more-warnings=yes \
-	--with-udev-base-dir=/lib/udev \
-	--without-mbim \
-	--without-qmi \
-	--with-dist-version=%{version}-%{release} \
+%meson \
+	-Ddist_version='"%{version}-%{release}"' \
+	-Dvapi=true \
+	-Dudevdir=/lib/udev \
+	-Dpolkit=permissive \
+	-Dbash_completion=false \
+	-Dgtk_doc=false \
+	-Dmbim=false \
+	-Dqmi=false \
+	-Dqrtr=false \
+	-Dplugin_fibocom=disabled \
+	-Dplugin_foxconn=disabled \
+	-Dplugin_qcom_soc=disabled \
 %if %{with systemd}
-	--with-systemdsystemunitdir=%{_unitdir}
+	-Dsystemd_journal=true \
+	-Dsystemd_suspend_resume=true \
+	-Dsystemdsystemunitdir=%{_unitdir} \
 %else
-	--with-elogind-suspend-resume=yes
+	-Dsystemd_journal=false \
+	-Dsystemd_suspend_resume=false \
+	-Dsystemdsystemunitdir="no" \
 %endif
+	%{nil}
 
+%meson_build
 
-make %{?_smp_mflags}
-
-%check
-make check
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%meson_install
+%find_lang %{name}
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
+cp -a cli/mmcli-completion %{buildroot}%{_datadir}/bash-completion/completions/mmcli
 
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
-#rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.*/*.so
 
-%find_lang %{name}
+%check
+
 
-%post
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 %if %{with systemd}
+%post
 %systemd_post ModemManager.service
 %endif
 
@@ -135,22 +131,11 @@ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 %systemd_preun ModemManager.service
 %endif
 
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ]; then
-  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
-  gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
-fi
 %if %{with systemd}
+%postun
 %systemd_postun ModemManager.service
 %endif
 
-%posttrans
-gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
-
-%post   glib -p /sbin/ldconfig
-%postun glib -p /sbin/ldconfig
-
 
 %files -f %{name}.lang
 %defattr(-,root, root,-)
@@ -181,9 +166,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/ModemManager/*.h
-%dir %{_datadir}/gtk-doc/html/%{name}
 %{_datadir}/gir-1.0/ModemManager-1.0.gir
-%{_datadir}/gtk-doc/html/%{name}/*
 %{_libdir}/pkgconfig/%{name}.pc
 
 %files glib
@@ -199,11 +182,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %dir %{_datadir}/vala
 %dir %{_datadir}/vala/vapi
 %{_datadir}/vala/vapi/libmm-glib.*
-%dir %{_datadir}/gtk-doc/html/libmm-glib
-%{_datadir}/gtk-doc/html/libmm-glib/*
 
 
 %changelog
+* Fri Apr 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.6-1
+- new upstream release.
+
 * Mon Feb 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.10-1
 - new upstream release.
 

+ 11 - 8
N/NetworkManager/NetworkManager-vl.spec

@@ -17,15 +17,15 @@
 %define gtk3_version	3.8.0
 %define wireless_tools_version 29
 %define libnl3_version 3.2.14
-%define ppp_version 2.4.9
-%define mm_version 1.10.4
+%define ppp_version 2.5.0
+%define mm_version 1.20.6
 
 %global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: 1.32.10
+Version: 1.42.6
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: network,system
 Vendor: Project Vine
@@ -36,8 +36,8 @@ URL: https://www.gnome.org/projects/NetworkManager/
 %global shortver %(echo "%{version}" | sed -e 's/\.[0-9]*$//')
 Source: https://download.gnome.org/sources/NetworkManager/%{shortver}/%{name}-%{version}.tar.xz
 Source2: nm-system-settings.conf
-
 Source1000: NetworkManager.init
+Patch1: ppp-2.5.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -193,8 +193,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 
 %prep
 %setup -q
-%if !%{with systemd}
-%endif
+%autopatch -p1
 
 
 %build
@@ -356,7 +355,7 @@ done
 %files
 %defattr(-,root,root,0755)
 %license COPYING
-%doc NEWS AUTHORS README CONTRIBUTING TODO
+%doc NEWS AUTHORS README* CONTRIBUTING* TODO
 %{dbus_sys_dir}/*
 %{_sbindir}/%{name}
 %dir %{_sysconfdir}/%{name}/
@@ -398,10 +397,10 @@ done
 %{_libexecdir}/nm-daemon-helper
 %{_libexecdir}/nm-dhcp-helper
 %{_libexecdir}/nm-dispatcher
-%{_libexecdir}/nm-iface-helper
 %{_libexecdir}/nm-ifdown
 %{_libexecdir}/nm-ifup
 %{_libexecdir}/nm-initrd-generator
+%{_libexecdir}/nm-priv-helper
 %dir %{_libdir}/pppd
 %dir %{_libdir}/pppd/%{ppp_version}
 %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
@@ -414,6 +413,7 @@ done
 %dir %{_localstatedir}/lib/NetworkManager
 %{_datadir}/bash-completion/completions/nmcli
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service
 %{_datadir}/polkit-1/actions/*.policy
 %{udev_scriptdir}/rules.d/*.rules
 %doc %{_docdir}/NetworkManager/examples/server.conf
@@ -484,6 +484,9 @@ done
 
 
 %changelog
+* Fri Apr 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.42.6-1
+- new upstream release.
+
 * Fri Aug 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.32.10-1
 - new upstream release.
 

+ 4 - 1
lib/libp/libpcap/libpcap-vl.spec

@@ -2,7 +2,7 @@ Name: libpcap
 Summary: A system-independent interface for user-level packet capture.
 Summary(ja): ユーザレベルでパケットをキャプチャするインターフェイス
 Epoch: 1
-Version: 1.10.1
+Version: 1.10.4
 Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
@@ -112,6 +112,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Apr 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:1.10.4-1
+- new upstream release.
+
 * Sat Oct 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:1.10.1-1
 - new upstream release.
 - dropped ldconfig scriptlets.

+ 5 - 2
lib/libt/libtdb/libtdb-vl.spec

@@ -5,8 +5,8 @@
 Summary: The tdb library
 Summary(ja): TDB ライブラリ
 Name: libtdb
-Version: 1.4.7
-Release: 2%{?_dist_release}
+Version: 1.4.8
+Release: 1%{?_dist_release}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -160,6 +160,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Apr 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.8-1
+- new upstream release.
+
 * Fri Oct 28 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.4.7-2
 - rebuilt with python-3.11.
 

+ 8 - 2
p/postfix/postfix-vl.spec

@@ -31,8 +31,8 @@
 Summary:        Postfix Mail Transport Agent
 Summary(ja):    Postfix メールトランスポートエージェント
 Name:           postfix
-Version:        3.7.3
-Release:        3%{?_dist_release}%{?with_systemd:.systemd}
+Version:        3.8.0
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -583,6 +583,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 19 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.8.0-1
+- new upstream release.
+
+* Mon Jan 23 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7.4-1
+- new upstream release.
+
 * Sun Nov 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7.3-3
 - rebuilt with openldap-2.6.3.
 

+ 22 - 30
p/ppp/ppp-vl.spec

@@ -4,8 +4,8 @@
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Summary(ja): PPP (Point-to-Point Protocol) デーモン
 Name: ppp
-Version: 2.4.9
-Release: 2%{?_dist_release}%{?with_systemd:.systemd}
+Version: 2.5.0
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
@@ -30,22 +30,6 @@ Source12: ppp-watch.tar.xz
 Source100: ppp@.service
 
 # Fedora-specific
-Patch0002:     ppp-2.4.9-config.patch
-Patch0004:     0004-doc-add-configuration-samples.patch
-Patch0005:     ppp-2.4.9-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
-Patch0006:     0006-scritps-use-change_resolv_conf-function.patch
-Patch0011:     0011-build-sys-don-t-put-connect-errors-log-to-etc-ppp.patch
-Patch0012:     ppp-2.4.8-pppd-we-don-t-want-to-accidentally-leak-fds.patch
-Patch0013:     ppp-2.4.9-everywhere-O_CLOEXEC-harder.patch
-Patch0014:     0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
-Patch0015:     0015-pppd-move-pppd-database-to-var-run-ppp.patch
-Patch0016:     0016-rp-pppoe-add-manpage-for-pppoe-discovery.patch
-Patch0018:     0018-scritps-fix-ip-up.local-sample.patch
-Patch0020:     0020-pppd-put-lock-files-in-var-lock-ppp.patch
-Patch0023:     0023-build-sys-install-rp-pppoe-plugin-files-with-standar.patch
-Patch0024:     0024-build-sys-install-pppoatm-plugin-files-with-standard.patch
-Patch0025:     ppp-2.4.8-pppd-install-pppd-binary-using-standard-perms-755.patch
-Patch0026:     ppp-2.4.9-configure-cflags-allow-commas.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: glib2-devel, libpcap-devel, openssl-devel, pam-devel
@@ -98,27 +82,28 @@ tar -xJf %{SOURCE12}
 
 
 %build
+autoreconf -fi
 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing"
-%configure
+%configure \
+	--enable-cbcp \
+	--with-pam \
+%if %{with systemd}
+	--enable-systemd \
+%endif
+	%{nil}
+
 make %{?_smp_mflags}
-make -C ppp-watch %{?_smp_mflags}
+make %{?_smp_mflags} -C ppp-watch LDFLAGS="%{?build_ldflags} -pie"
 
 
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-
-%ifarch x86_64
-make INSTROOT=%{buildroot} install install-etcppp LIBDIR=$RPM_BUILD_ROOT%{_libdir}/pppd/%{version}
-%else
-make INSTROOT=%{buildroot} install install-etcppp
-%endif
-
+%make_install
 find scripts -type f | xargs chmod a-x
-
 make ROOT=%{buildroot} -C ppp-watch install
 
 # create log files dir
-mv -f %{buildroot}/usr/var %{buildroot}/
+install -d %{buildroot}%{_localstatedir}/log/ppp
 
 # install pam config
 install -d %{buildroot}%{_sysconfdir}/pam.d
@@ -148,6 +133,8 @@ install -p %{SOURCE9} %{buildroot}%{_sysconfdir}/ppp/ipv6-up
 install -d %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/
 install -p %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ppp
 install -p %{SOURCE11} %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifdown-ppp
+# ghosts
+mkdir -p %{buildroot}%{_rundir}/ppp
 %endif
 
 
@@ -184,6 +171,7 @@ rm -rf %{buildroot}
 %if %{with systemd}
 %{_unitdir}/ppp@.service
 %{_tmpfilesdir}/ppp.conf
+%ghost %dir %{_rundir}/ppp
 %endif
 %ghost %dir %{_localstatedir}/run/ppp
 %ghost %dir %{_localstatedir}/lock/ppp
@@ -196,11 +184,15 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/pppd
 %doc PLUGINS
+%{_includedir}/pppd
+%{_libdir}/pkgconfig/pppd.pc
 
 
 %changelog
+* Fri Apr 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.5.0-1
+- new upstream release.
+
 * Sat Oct 09 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.9-2
 - rebuilt with openssl-3.0.0.
 

+ 31 - 22
r/rust/rust-vl.spec

@@ -9,7 +9,7 @@
 # Some sub-packages are versioned independently of the rust compiler and runtime itself.
 # Also beware that if any of these are not changed in a version bump, then the release
 # number should still increase, not be reset to 1!
-%global rustc_version 1.65.0
+%global rustc_version 1.69.0
 %global cargo_version %{rustc_version}
 %global rustfmt_version %{rustc_version}
 %global rls_version %{rustc_version}
@@ -25,8 +25,8 @@
 # To bootstrap from scratch, set the channel and date from src/stage0.txt
 # e.g. 1.10.0 wants rustc: 1.9.0-2016-05-24
 # or nightly wants some beta-YYYY-MM-DD
-%global bootstrap_rust 1.64.0
-%global bootstrap_cargo 1.64.0
+%global bootstrap_rust 1.68.2
+%global bootstrap_cargo 1.68.2
 %global bootstrap_channel %{bootstrap_rust}
 
 # Only the specified arches will use bootstrap binaries.
@@ -184,6 +184,7 @@ Provides:       rustc = %{version}-%{release}
 Provides:       rustc%{?_isa} = %{version}-%{release}
 
 Obsoletes:      rust-rls < %{version}-%{release}
+Obsoletes:      rust-analysis < %{version}-%{release}
 
 %if ! %{with miri}
 Obsoletes:      rust-miri < %{version}-%{release}
@@ -361,16 +362,6 @@ This package includes source files for the Rust standard library.  It may be
 useful as a reference for code completion tools in various editors.
 
 
-%package analysis
-Summary:        Compiler analysis data for the Rust standard library
-Group:          programming
-Requires:       rust-std-static = %{rustc_version}-%{release}
-
-%description analysis
-This package contains analysis data files produced with rustc's -Zsave-analysis
-feature for the Rust standard library.
-
-
 %if %{with miri}
 %package miri
 Summary:        An interpreter for Rust's mid-level intermediate representation
@@ -535,7 +526,7 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=clang -C link-arg=-fuse-ld=lld"
   %{enable_debuginfo} \
   --set rust.codegen-units-std=1 \
   --enable-extended \
-  --tools=analysis,cargo,clippy,rustfmt,rust-analyzer,src \
+  --tools=cargo,clippy,rustfmt,rust-analyzer,src \
   --enable-vendor \
   --enable-verbose-tests \
   --release-channel=%{channel} \
@@ -702,11 +693,7 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %{_docdir}/%{name}/html/*.html
 %{_docdir}/%{name}/html/*.css
 %{_docdir}/%{name}/html/*.js
-%{_docdir}/%{name}/html/*.png
-%{_docdir}/%{name}/html/*.svg
-%{_docdir}/%{name}/html/*.woff2
-%license %{_docdir}/%{name}/html/*.txt
-%license %{_docdir}/%{name}/html/*.md
+%{_docdir}/%{name}/html/robots.txt
 
 %files -n cargo
 %license src/tools/cargo/LICENSE-APACHE src/tools/cargo/LICENSE-MIT src/tools/cargo/LICENSE-THIRD-PARTY
@@ -743,9 +730,6 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 %dir %{rustlibdir}
 %{rustlibdir}/src
 
-%files analysis
-%{rustlibdir}/%{rust_triple}/analysis/
-
 %files analyzer
 %{_bindir}/rust-analyzer
 %{_libexecdir}/rust-analyzer-proc-macro-srv
@@ -758,6 +742,31 @@ export RUSTFLAGS="$RUSTFLAGS -C linker=ld.lld -C link-arg=-fuse-ld=lld"
 
 
 %changelog
+* Thu Apr 20 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.69.0-1
+- new upstream release.
+- dropped rust-analysis.
+
+* Wed Mar 29 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.68.2-1
+- new upstream release.
+
+* Tue Mar 28 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.68.1-1
+- new upstream release.
+
+* Fri Mar 10 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.68.0-1
+- new upstream release.
+
+* Fri Feb 10 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.67.1-1
+- new upstream release.
+
+* Fri Jan 27 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.67.0-1
+- new upstream release.
+
+* Wed Jan 11 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.66.1-1
+- new upstream release.
+
+* Fri Dec 16 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.66.0-1
+- new upstream release.
+
 * Fri Nov 04 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1.65.0-1
 - new upstream release.
 

+ 13 - 2
s/samba/samba-vl.spec

@@ -2,11 +2,11 @@
 %bcond_with tracker
 %bcond_without pidl
 
-%define samba_version 4.17.3
+%define samba_version 4.18.2
 #define rc_number rc4
 %define samba_release 1
 
-%define doc_version 4.17.0-1
+%define doc_version 4.18.0
 %define api_version 4.0
 %define libwbc_soname 0
 %define libwbc_sover 0.15
@@ -1211,6 +1211,7 @@ fi
 %{_libdir}/samba/libsmbldaphelper-samba4.so
 %{_libdir}/samba/libsmbpasswdparser-samba4.so
 %{_libdir}/samba/libsocket-blocking-samba4.so
+%{_libdir}/samba/libstable-sort-samba4.so
 %{_libdir}/samba/libsys-rw-samba4.so
 %{_libdir}/samba/libtalloc-report-printf-samba4.so
 %{_libdir}/samba/libtalloc-report-samba4.so
@@ -1510,6 +1511,7 @@ fi
 %{samba_includedir}/domain_credentials.h
 %{samba_includedir}/gen_ndr/atsvc.h
 %{samba_includedir}/gen_ndr/auth.h
+%{samba_includedir}/gen_ndr/claims.h
 %{samba_includedir}/gen_ndr/dcerpc.h
 %{samba_includedir}/gen_ndr/krb5pac.h
 %{samba_includedir}/gen_ndr/lsa.h
@@ -1823,6 +1825,15 @@ fi
 
 
 %changelog
+* Fri Apr 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.18.2-1
+- new upstream release.
+
+* Fri Jan 27 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.17.5-1
+- new upstream release.
+
+* Fri Dec 16 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.17.4-1
+- new upstream release.
+
 * Wed Nov 16 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.17.3-1
 - new upstream release.
 

+ 13 - 10
s/screen/screen-vl.spec

@@ -1,8 +1,8 @@
 Summary:        A screen manager that supports multiple logins on one terminal.
 Summary(ja):    スクリーンマネージャ - 一つの端末で多重ログイン
 Name:           screen
-Version:        4.8.0
-Release:        2%{?_dist_release}
+Version:        4.9.0
+Release:        1%{?_dist_release}
 Group:          accessories
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -16,9 +16,9 @@ Patch2:         screen-4.3.1-screenrc.patch
 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
+Patch6:         screen-4.9.0-braille.patch
 # security
-Patch1000:      99_CVE-2021-26937.patch
+Patch1000:      CVE-2023-24626.patch
 
 Requires: ncurses
 Requires(post,preun): /sbin/install-info
@@ -53,6 +53,7 @@ support multiple logins on one terminal.
 %build
 autoreconf -vfi
 
+
 %configure \
 	--enable-pam \
 	--enable-locate \
@@ -99,21 +100,17 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/screen
 # Remove files from the buildroot which we don't want packaged
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/install-info %{_infodir}/screen.info.* %{_infodir}/dir --entry="* screen: (screen).             Terminal multiplexer."
 
+%post
 if [ -d /tmp/screens ]; then
     # we're not setuid root anymore
     chmod 777 /tmp/screens
 fi
 
-%preun
-if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_infodir}/screen.info.* %{_infodir}/dir --entry="* screen: (screen).             Terminal multiplexer."
-fi
 
 %files
 %defattr(-,root,root)
@@ -130,6 +127,12 @@ fi
 
 
 %changelog
+* Fri Apr 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.9.0-1
+- update to 4.9.0.
+- dropped Patch6 and 1000: fixed in upstream.
+- imported Patch6 from rawhide.
+- imported Patch1000 from upstream.
+
 * Thu Feb 18 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.8.0-2
 - imported Patch1000 from debian.
 

+ 9 - 9
t/tcpdump/tcpdump-vl.spec

@@ -1,5 +1,6 @@
-%define	tcpdump_ver	4.99.1
-%define	libpcap_ver	1.10.1
+%define	tcpdump_ver	4.99.4
+%define	libpcap_ver	1.10.4
+%define tcpslice_dir	tcpslice-1.6
 
 %{!?_licensedir:%global license %%doc}
 
@@ -9,7 +10,6 @@ Name: tcpdump
 Epoch: 1
 Version: %{tcpdump_ver}
 %define	tcpdump_dir	tcpdump-%{tcpdump_ver}
-%define tcpslice_dir	tcpslice
 Release: 1%{?_dist_release}
 Group: system,network
 Vendor: Project Vine
@@ -21,17 +21,14 @@ License: BSD
 URL: https://www.tcpdump.org/
 
 Source0: https://www.tcpdump.org/release/tcpdump-%{tcpdump_ver}.tar.gz
-Source1: ftp://ftp.ee.lbl.gov/tcpslice-1.3.tar.gz
+Source1: https://github.com/the-tcpdump-group/tcpslice/archive/refs/tags/%{tcpslice_dir}.tar.gz
 
 Patch0002:      0002-Use-getnameinfo-instead-of-gethostbyaddr.patch
 Patch0003:      0003-Drop-root-priviledges-before-opening-first-savefile-.patch
 Patch0007:      0007-Introduce-nn-option.patch
 Patch0009:      0009-Change-n-flag-to-nn-in-TESTonce.patch
 
-%define tcpslice_dir tcpslice-1.3
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: glibc-kernheaders >= 2.2.0
 BuildRequires: openssl-devel
 BuildRequires: libpcap-devel >= %{libpcap_ver}
 BuildRequires: autoconf, automake
@@ -67,7 +64,7 @@ tcpdump はネットワークのトラフィックをモニタする、コマン
 %build
 export CFLAGS="$RPM_OPT_FLAGS $(getconf LFS_CFLAGS) -fno-strict-aliasing"
 
-pushd %{tcpslice_dir}
+pushd tcpslice-%{tcpslice_dir}
 # update config.{guess,sub}
 automake -a -f 2> /dev/null || :
 %configure
@@ -84,7 +81,7 @@ mkdir -p %{buildroot}%{_libdir}
 mkdir -p %{buildroot}%{_mandir}/man{3,8}
 mkdir -p %{buildroot}%{_sbindir}
 
-pushd %{tcpslice_dir}
+pushd tcpslice-%{tcpslice_dir}
 install -m755 tcpslice ${RPM_BUILD_ROOT}%{_sbindir}
 install -m644 tcpslice.1 ${RPM_BUILD_ROOT}%{_mandir}/man8/tcpslice.8
 popd
@@ -119,6 +116,9 @@ exit 0
 
 
 %changelog
+* Fri Apr 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1:4.99.4-1
+- new upstream release.
+
 * Sat Oct 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 1:4.99.1-1
 - new upstream release.
 - built with openssl-3.0.0.