13 Commits 2fa2a00b34 ... a914a15fcb

Author SHA1 Message Date
  Tomohiro "Tomo-p" KATO a914a15fcb kernel-5.10.148-1 2 years ago
  Tomohiro "Tomo-p" KATO 12e4680d8d mariadb-connector-odbc-3.1.15-1 2 years ago
  Tomohiro "Tomo-p" KATO 7d1be99611 libmariadb-3.3.1-1 2 years ago
  Tomohiro "Tomo-p" KATO 78994c78c4 libpq-15.0-1 2 years ago
  Tomohiro "Tomo-p" KATO 757817363a dhcp-4.1.ESV.R16.P2-1 2 years ago
  Tomohiro "Tomo-p" KATO ac0356e968 postgresql-15.0-1 2 years ago
  Tomohiro "Tomo-p" KATO f12ab3569c unbound-1.17.0-1 2 years ago
  Tomohiro "Tomo-p" KATO bd8af5f629 dbus-1.14.4-1 2 years ago
  Tomohiro "Tomo-p" KATO 85fbb02b7b dbus-1.12.20-1 2 years ago
  Tomohiro "Tomo-p" KATO 288817e9f7 nodejs-16.18.0-1 2 years ago
  Tomohiro "Tomo-p" KATO ac329e572c postfix-3.7.3-1 2 years ago
  Tomohiro "Tomo-p" KATO 2bdcaa53f2 openssl111-1.1.1r-1 2 years ago
  Tomohiro "Tomo-p" KATO 37592523f6 openssl-3.0.6-1 2 years ago

+ 250 - 65
d/dbus/dbus-vl.spec

@@ -1,27 +1,36 @@
+%bcond_with systemd
+
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 
 %define _unpackaged_files_terminate_build 1
 %define _unpackaged_files_terminate_build 1
-%bcond_with systemd
 
 
 %define gettext_package dbus
 %define gettext_package dbus
 %define expat_version           2.0.1
 %define expat_version           2.0.1
 %define dbus_user_uid           81
 %define dbus_user_uid           81
 
 
+%global _localstatedir %{_var}
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
-%define _localstatedir %{_var}
+%{!?_unitdir:%global _unitdir /lib/systemd/system}
+%{!?_userunitdir:%global _userunitdir /usr/lib/systemd/user}
 
 
 Summary: D-BUS message bus
 Summary: D-BUS message bus
 Summary(ja): D-BUS メッセージバスシステム
 Summary(ja): D-BUS メッセージバスシステム
 Name: dbus
 Name: dbus
-Version: 1.12.12
-Release: 1%{?_dist_release}
-URL: http://www.freedesktop.org/software/dbus/
-License: AFL/GPLv2
-Group: System Environment/Libraries
+Version: 1.14.4
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
 
 
-Source0: %{name}-%{version}.tar.gz
+License: AFL/GPLv2
+URL: https://www.freedesktop.org/software/dbus/
+Source0: https://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.xz
 Source1: 00-start-message-bus.sh
 Source1: 00-start-message-bus.sh
 Source2: dbus.init
 Source2: dbus.init
+Source3: dbus.service
+Source4: dbus.user.service
+Source5: dbus.socket
+Source6: dbus.user.socket
 
 
 # from fedora package
 # from fedora package
 
 
@@ -29,9 +38,10 @@ Source2: dbus.init
 Patch1000: dbus-enable-elogind.patch
 Patch1000: dbus-enable-elogind.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires(post): chkconfig >= 1.3.34
-Requires(preun): chkconfig >= 1.3.34
-Requires(pre): shadow-utils
+
+# default daemon
+Requires: %{name}-daemon = %{version}-%{release}
+
 BuildRequires: autoconf-archive
 BuildRequires: autoconf-archive
 BuildRequires: libtool
 BuildRequires: libtool
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: expat-devel >= %{expat_version}
@@ -43,9 +53,11 @@ BuildRequires: libxslt
 BuildRequires: gettext
 BuildRequires: gettext
 BuildRequires: libX11-devel
 BuildRequires: libX11-devel
 BuildRequires: libSM-devel
 BuildRequires: libSM-devel
-
-Vendor: Project Vine
-Distribution: Vine Linux
+%if %{with systemd}
+BuildRequires: systemd-devel
+%else
+BuildRequires: elogind-devel
+%endif
 
 
 %description
 %description
 D-BUS is a system for sending messages between applications. It is
 D-BUS is a system for sending messages between applications. It is
@@ -57,29 +69,86 @@ D-BUS はアプリケーション間でメッセージを送受信するため
 システム全体のメッセージバスサービスとしても利用されますが、同様に
 システム全体のメッセージバスサービスとしても利用されますが、同様に
 ユーザ毎のログインセッションにおけるメッセージ基盤としても利用されます。
 ユーザ毎のログインセッションにおけるメッセージ基盤としても利用されます。
 
 
+
+%package common
+Summary:        D-BUS message bus configuration
+Group:          system
+BuildArch:      noarch
+%if %{with systemd}
+%{?systemd_requires}
+Requires:       systemd
+%endif
+
+%description common
+The %{name}-common package provides the configuration and setup files for D-Bus
+implementations to provide a System and User Message Bus.
+
+
+%package daemon
+Summary:        D-BUS message bus
+Group:          system
+%{?systemd_requires}
+Requires:       dbus-common = %{version}-%{release}
+Requires:       dbus-libs%{?_isa} = %{version}-%{release}
+Requires:       dbus-tools = %{version}-%{release}
+Requires(pre):  shadow-utils
+%if %{with systemd}
+%{?systemd_requires}
+Requires:       systemd
+%else
+Requires(post): chkconfig >= 1.3.34
+Requires(preun): chkconfig >= 1.3.34
+%endif
+
+%description daemon
+D-BUS is a system for sending messages between applications. It is
+used both for the system-wide message bus service, and as a
+per-user-login-session messaging facility.
+
+
+%package libs
+Summary: Libraries for accessing D-BUS
+Group: system
+
+%description libs
+This package contains lowlevel libraries for accessing D-BUS.
+
+
+%package tools
+Summary:        D-BUS Tools and Utilities
+Group:          admin-tools
+Requires:       dbus-libs%{?_isa} = %{version}-%{release}
+
+%description tools
+Tools and utilities to interact with a running D-Bus Message Bus, provided by
+the reference implementation.
+
+
 %package devel
 %package devel
 Summary: Libraries and headers for D-BUS
 Summary: Libraries and headers for D-BUS
 Summary(ja): D-BUS 用のライブラリとヘッダファイル
 Summary(ja): D-BUS 用のライブラリとヘッダファイル
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Group: programming
+Requires: %{name}-libs = %{version}-%{release}
 Requires: xml-common
 Requires: xml-common
 
 
 %description devel
 %description devel
 Headers and static libraries for D-BUS.
 Headers and static libraries for D-BUS.
 
 
+
 %package x11
 %package x11
 Summary: X11-requiring add-ons for D-BUS
 Summary: X11-requiring add-ons for D-BUS
 Summary(ja): X11 を利用する D-BUS 用ツール
 Summary(ja): X11 を利用する D-BUS 用ツール
-Group: Applications/System
+Group: admin-tools
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 
 
 %description x11
 %description x11
 D-BUS contains some tools that require Xlib to be installed, those are
 D-BUS contains some tools that require Xlib to be installed, those are
 in this separate package so server systems need not install X.
 in this separate package so server systems need not install X.
 
 
+
 %package doc
 %package doc
 Summary: Developer documentation for D-BUS
 Summary: Developer documentation for D-BUS
-Group: Documentation
+Group: documentation
 Requires: %{name} = %{version}-%{release}
 Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 BuildArch: noarch
 
 
@@ -87,11 +156,12 @@ BuildArch: noarch
 This package contains developer documentation for D-Bus along with
 This package contains developer documentation for D-Bus along with
 other supporting documentation such as the introspect dtd file.
 other supporting documentation such as the introspect dtd file.
 
 
+
 # compat32
 # compat32
 %package -n compat32-%{name}
 %package -n compat32-%{name}
 Summary: D-BUS message bus
 Summary: D-BUS message bus
 Summary(ja): D-BUS メッセージバスシステム
 Summary(ja): D-BUS メッセージバスシステム
-Group: System Environment/Libraries
+Group: system,legacy
 
 
 %description -n compat32-%{name}
 %description -n compat32-%{name}
 D-BUS is a system for sending messages between applications. It is
 D-BUS is a system for sending messages between applications. It is
@@ -103,18 +173,27 @@ D-BUS はアプリケーション間でメッセージを送受信するため
 システム全体のメッセージバスサービスとしても利用されますが、同様に
 システム全体のメッセージバスサービスとしても利用されますが、同様に
 ユーザ毎のログインセッションにおけるメッセージ基盤としても利用されます。
 ユーザ毎のログインセッションにおけるメッセージ基盤としても利用されます。
 
 
+
 %package -n compat32-%{name}-devel
 %package -n compat32-%{name}-devel
 Summary: Libraries and headers for D-BUS
 Summary: Libraries and headers for D-BUS
 Summary(ja): D-BUS 用のライブラリとヘッダファイル
 Summary(ja): D-BUS 用のライブラリとヘッダファイル
-Group: Development/Libraries
+Group: programming,legacy
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: compat32-%{name} = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 
 
 %description -n compat32-%{name}-devel
 %description -n compat32-%{name}-devel
 Headers and static libraries for D-BUS.
 Headers and static libraries for D-BUS.
 
 
+
+%debug_package
+
+
 %prep
 %prep
-%autosetup -p1
+%setup
+%if ! %{with systemd}
+%patch1000 -p1 -b .elogind
+%endif
+
 
 
 %build
 %build
 # Avoid rpath.
 # Avoid rpath.
@@ -122,18 +201,30 @@ if test -f autogen.sh; then env NOCONFIGURE=1 ./autogen.sh; else autoreconf --ve
 rbose --force --install; fi
 rbose --force --install; fi
 
 
 COMMON_ARGS="--enable-selinux=no \
 COMMON_ARGS="--enable-selinux=no \
+%if %{with systemd}
+		SYSTEMCTL=/bin/systemctl \
+		--enable-systemd \
+		--with-init-scripts=redhat \
+		--with-systemdsystemunitdir=%{_unitdir} \
+		--with-systemduserunitdir=%{_userunitdir} \
+		--enable-user-session \
+		--with-system-pid-file=/run/messagebus.pid \
+		--with-system-socket=/run/dbus/system_bus_socket
+%else
 		--enable-elogind \
 		--enable-elogind \
-		--disable-libaudit \
 		--with-system-pid-file=%{_localstatedir}/run/messagebus.pid \
 		--with-system-pid-file=%{_localstatedir}/run/messagebus.pid \
+%endif
+		--disable-libaudit \
 		--with-dbus-user=dbus \
 		--with-dbus-user=dbus \
 		--libdir=/%{_lib} --bindir=/bin \
 		--libdir=/%{_lib} --bindir=/bin \
-		--libexecdir=/%{_lib}/dbus-1 \
+		--libexecdir=/lib/dbus-1 \
 		--docdir=%{_pkgdocdir} \
 		--docdir=%{_pkgdocdir} \
 		--sysconfdir=%{_sysconfdir} --exec-prefix=/"
 		--sysconfdir=%{_sysconfdir} --exec-prefix=/"
 
 
 %configure $COMMON_ARGS --disable-tests --disable-verbose-mode --disable-asserts --enable-doxygen-docs --enable-xml-docs
 %configure $COMMON_ARGS --disable-tests --disable-verbose-mode --disable-asserts --enable-doxygen-docs --enable-xml-docs
 make V=1 %{?_smp_mflags}
 make V=1 %{?_smp_mflags}
 
 
+
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
@@ -151,6 +242,8 @@ install --directory %{buildroot}%{_sysconfdir}/dbus-1/system.d
 install --directory %{buildroot}%{_datadir}/dbus-1/interfaces
 install --directory %{buildroot}%{_datadir}/dbus-1/interfaces
 
 
 %if %{with systemd}
 %if %{with systemd}
+%__make install-data DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+
 # Make sure that when somebody asks for D-Bus under the name of the
 # Make sure that when somebody asks for D-Bus under the name of the
 # old SysV script, that he ends up with the standard dbus.service name
 # old SysV script, that he ends up with the standard dbus.service name
 # now.
 # now.
@@ -158,9 +251,13 @@ ln -s dbus.service %{buildroot}%{_unitdir}/messagebus.service
 
 
 ## %find_lang %{gettext_package}
 ## %find_lang %{gettext_package}
 # Delete the old legacy sysv init script
 # Delete the old legacy sysv init script
-rm -rf %{buildroot}%{_initrddir}
+#rm -rf %{buildroot}%{_initrddir}
 %else
 %else
 rm -rf %{buildroot}%{_sysconfdir}/systemd
 rm -rf %{buildroot}%{_sysconfdir}/systemd
+rm -rf %{buildroot}/lib/systemd
+rm -rf %{buildroot}%{_prefix}/lib/systemd
+rm -rf %{buildroot}%{_prefix}/lib/sysuserd.d
+rm -rf %{buildroot}%{_prefix}/lib/tmpfiles.d
 install -Dm755 %{SOURCE2} %{buildroot}%{_initrddir}/messagebus
 install -Dm755 %{SOURCE2} %{buildroot}%{_initrddir}/messagebus
 %endif
 %endif
 
 
@@ -186,7 +283,7 @@ ret=0
 i=0
 i=0
 tmpdir=\$(mktemp --directory --tmpdir dbus-run-installed-tests.XXXXXX)
 tmpdir=\$(mktemp --directory --tmpdir dbus-run-installed-tests.XXXXXX)
 
 
-for t in /%{_lib}/dbus-1/installed-tests/dbus/test-*; do
+for t in /lib/dbus-1/installed-tests/dbus/test-*; do
     i=\$(( \$i + 1 ))
     i=\$(( \$i + 1 ))
     echo "# \$i - \$t ..."
     echo "# \$i - \$t ..."
     echo "x" > "\$tmpdir/result"
     echo "x" > "\$tmpdir/result"
@@ -211,7 +308,7 @@ echo "1..\$i"
 exit \$ret
 exit \$ret
 EOF
 EOF
 
 
-install -pm 755 -t %{buildroot}/%{_lib}/dbus-1 dbus-run-installed-tests
+install -pm 755 -t %{buildroot}/lib/dbus-1 dbus-run-installed-tests
 
 
 ## vine stuff
 ## vine stuff
 
 
@@ -221,83 +318,156 @@ mv -f \
   %{buildroot}/%{_lib}/cmake/DBus1/DBus1ConfigVersion.cmake \
   %{buildroot}/%{_lib}/cmake/DBus1/DBus1ConfigVersion.cmake \
   %{buildroot}%{_libdir}/cmake/DBus1/
   %{buildroot}%{_libdir}/cmake/DBus1/
 
 
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mv -f $RPM_BUILD_ROOT/bin/dbus-launch $RPM_BUILD_ROOT/%{_bindir}/
+mkdir -p %{buildroot}/%{_bindir}
+mv -f %{buildroot}/bin/dbus-launch %{buildroot}/%{_bindir}/
 
 
 mkdir -p %{buildroot}/%{_libdir}/dbus-1.0
 mkdir -p %{buildroot}/%{_libdir}/dbus-1.0
 mv %{buildroot}/%{_lib}/dbus-1.0/include %{buildroot}/%{_libdir}/dbus-1.0/
 mv %{buildroot}/%{_lib}/dbus-1.0/include %{buildroot}/%{_libdir}/dbus-1.0/
 
 
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
+mkdir -p %{buildroot}/%{_libdir}/pkgconfig
 #change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64]
 #change the arch-deps.h include directory to /usr/lib[64] instead of /lib[64]
-sed -e 's@-I${libdir}@-I${prefix}/%{_lib}@' $RPM_BUILD_ROOT/%{_lib}/pkgconfig/dbus-1.pc > $RPM_BUILD_ROOT/%{_libdir}/pkgconfig/dbus-1.pc
-rm -f $RPM_BUILD_ROOT/%{_lib}/pkgconfig/dbus-1.pc
+sed -e 's@-I${libdir}@-I${prefix}/%{_lib}@' %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc > %{buildroot}/%{_libdir}/pkgconfig/dbus-1.pc
+rm -f %{buildroot}/%{_lib}/pkgconfig/dbus-1.pc
+
+rm -f %{buildroot}/lib/dbus-1/dbus-run-installed-tests
+
+%if %{with systemd}
+rm -rf %{buildroot}/var/run/dbus
+install -m644 %{SOURCE3} %{buildroot}%{_unitdir}/dbus.service
+install -m644 %{SOURCE4} %{buildroot}%{_userunitdir}/dbus.service
+install -m644 %{SOURCE5} %{buildroot}%{_unitdir}/dbus.socket
+install -m644 %{SOURCE6} %{buildroot}%{_userunitdir}/dbus.socket
+%endif
 
 
-rm -f $RPM_BUILD_ROOT/%{_lib}/dbus-1/dbus-run-installed-tests
 
 
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
-%pre
+
+%pre daemon
 # Add the "dbus" user
 # Add the "dbus" user
 /usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} \
 /usr/sbin/useradd -c 'System message bus' -u %{dbus_user_uid} \
 	-s /sbin/nologin -r -d '/' dbus 2> /dev/null || :
 	-s /sbin/nologin -r -d '/' dbus 2> /dev/null || :
 
 
-%post
-/sbin/ldconfig
+%post daemon
+%if %{with systemd}
+%systemd_post dbus.service
+%systemd_user_post dbus.service
+%else
 /sbin/chkconfig --add messagebus
 /sbin/chkconfig --add messagebus
 /sbin/chkconfig messagebus resetpriorities
 /sbin/chkconfig messagebus resetpriorities
+%endif
 
 
-%preun
+%preun daemon
+%if %{with systemd}
+%systemd_preun dbus.service
+%systemd_user_preun dbus.service
+%else
 if [ $1 = 0 ]; then
 if [ $1 = 0 ]; then
     service messagebus stop > /dev/null 2>&1
     service messagebus stop > /dev/null 2>&1
     /sbin/chkconfig --del messagebus
     /sbin/chkconfig --del messagebus
 fi
 fi
+if [ -x /sbin/systemctl ]; then
+    /sbin/chkconfig --del messagebus
+fi
+%endif
 
 
-%postun
-/sbin/ldconfig
+%postun daemon
+%if %{with systemd}
+%systemd_postun dbus.service
+%systemd_user_postun dbus.service
+%endif
+
+%if !%{with systemd}
+%triggerpostun daemon -- dbus-daemon < 1.12.16-2
+/sbin/chkconfig --add messagebus
+/sbin/chkconfig messagebus resetpriorities
+%endif
 
 
-%post -n compat32-%{name} -p /sbin/ldconfig
+%if %{with systemd}
+%post common
+%systemd_post dbus.socket
+%systemd_user_post dbus.socket
+
+%preun common
+%systemd_preun dbus.socket
+%systemd_user_preun dbus.socket
+
+%postun common
+%systemd_postun dbus.socket
+%systemd_user_postun dbus.socket
+%endif
 
 
-%postun -n compat32-%{name} -p /sbin/ldconfig
 
 
 %files
 %files
+# dummy package
+
+%files common
+%dir %{_sysconfdir}/dbus-1
+%dir %{_sysconfdir}/dbus-1/session.d
+%dir %{_sysconfdir}/dbus-1/system.d
+%config %{_sysconfdir}/dbus-1/session.conf
+%config %{_sysconfdir}/dbus-1/system.conf
+%dir %{_datadir}/dbus-1
+%dir %{_datadir}/dbus-1/session.d
+%dir %{_datadir}/dbus-1/system.d
+%{_datadir}/dbus-1/session.conf
+%{_datadir}/dbus-1/system.conf
+%{_datadir}/dbus-1/services
+%{_datadir}/dbus-1/system-services
+%{_datadir}/dbus-1/interfaces
+%if %{with systemd}
+%{_sysusersdir}/dbus.conf
+%{_unitdir}/dbus.socket
+%{_userunitdir}/dbus.socket
+%endif
+
+%files daemon
 %defattr(-,root,root)
 %defattr(-,root,root)
 %{!?_licensedir:%global license %%doc}
 %{!?_licensedir:%global license %%doc}
 %license COPYING
 %license COPYING
 %doc AUTHORS ChangeLog NEWS README
 %doc AUTHORS ChangeLog NEWS README
-%dir %{_sysconfdir}/dbus-1
 %config %{_sysconfdir}/dbus-1/*.conf
 %config %{_sysconfdir}/dbus-1/*.conf
 %ghost %dir /run/%{name}
 %ghost %dir /run/%{name}
-%{_sysconfdir}/rc.d/init.d/*
-%dir %{_sysconfdir}/dbus-1/system.d
-%dir %{_sysconfdir}/dbus-1/session.d
-%dir %{_localstatedir}/run/dbus
 %dir %{_localstatedir}/lib/dbus/
 %dir %{_localstatedir}/lib/dbus/
 /bin/dbus-daemon
 /bin/dbus-daemon
-/bin/dbus-send
 /bin/dbus-cleanup-sockets
 /bin/dbus-cleanup-sockets
-/bin/dbus-monitor
 /bin/dbus-run-session
 /bin/dbus-run-session
 /bin/dbus-test-tool
 /bin/dbus-test-tool
-/bin/dbus-update-activation-environment
-/bin/dbus-uuidgen
-/%{_lib}/*dbus-1*.so.*
-%{_mandir}/man*/dbus-cleanup-sockets.1.gz
 %{_mandir}/man*/dbus-daemon.1.gz
 %{_mandir}/man*/dbus-daemon.1.gz
-%{_mandir}/man*/dbus-monitor.1.gz
+%{_mandir}/man*/dbus-cleanup-sockets.1.gz
 %{_mandir}/man*/dbus-run-session.1.gz
 %{_mandir}/man*/dbus-run-session.1.gz
-%{_mandir}/man*/dbus-send.1.gz
 %{_mandir}/man1/dbus-test-tool.1.gz
 %{_mandir}/man1/dbus-test-tool.1.gz
+%dir /lib/dbus-1
+%attr(4750,root,dbus) /lib/dbus-1/dbus-daemon-launch-helper
+%if %{with systemd}
+%{_tmpfilesdir}/dbus.conf
+%{_unitdir}/dbus.service
+%{_unitdir}/messagebus.service
+%{_unitdir}/multi-user.target.wants/dbus.service
+%{_unitdir}/sockets.target.wants/dbus.socket
+%{_userunitdir}/dbus.service
+%{_userunitdir}/sockets.target.wants/dbus.socket
+%else
+%dir %{_localstatedir}/run/dbus
+%{_sysconfdir}/rc.d/init.d/*
+%endif
+
+%files tools
+%license COPYING
+/bin/dbus-send
+/bin/dbus-monitor
+/bin/dbus-update-activation-environment
+/bin/dbus-uuidgen
+%{_mandir}/man*/dbus-send.1.gz
+%{_mandir}/man*/dbus-monitor.1.gz
 %{_mandir}/man1/dbus-update-activation-environment.1.gz
 %{_mandir}/man1/dbus-update-activation-environment.1.gz
 %{_mandir}/man*/dbus-uuidgen.1.gz
 %{_mandir}/man*/dbus-uuidgen.1.gz
-%dir %{_datadir}/dbus-1
-%{_datadir}/dbus-1/session.conf
-%{_datadir}/dbus-1/system.conf
-%{_datadir}/dbus-1/services
-%{_datadir}/dbus-1/system-services
-%{_datadir}/dbus-1/interfaces
-%dir /%{_lib}/dbus-1
-%attr(4750,root,dbus) /%{_lib}/dbus-1/dbus-daemon-launch-helper
+
+%files libs
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+/%{_lib}/*dbus-1*.so.*
 
 
 %files devel
 %files devel
 %defattr(-,root,root)
 %defattr(-,root,root)
@@ -321,10 +491,6 @@ fi
 %defattr(-,root,root)
 %defattr(-,root,root)
 %{_pkgdocdir}/*
 %{_pkgdocdir}/*
 %{_datadir}/gtk-doc
 %{_datadir}/gtk-doc
-%exclude %{_pkgdocdir}/AUTHORS
-%exclude %{_pkgdocdir}/ChangeLog
-%exclude %{_pkgdocdir}/NEWS
-%exclude %{_pkgdocdir}/README
 
 
 # compat32
 # compat32
 %if %{build_compat32}
 %if %{build_compat32}
@@ -337,7 +503,26 @@ fi
 %{_libdir}/dbus-1.0/include
 %{_libdir}/dbus-1.0/include
 %endif
 %endif
 
 
+
 %changelog
 %changelog
+* Thu Oct 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.4-1
+- new upstream release.
+- dropped ldconfig scriptlets.
+
+* Wed Jul 22 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.20-1
+- new upstream release.
+- moved dbus-daemon-launch-helper from /lib64/dbus-1 to /lib/dbus-1.
+
+* Fri Jun 12 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.18-1
+- new upstream release.
+
+* Wed Apr 15 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.16-2
+- added subpackages: common, daemon, libs and tools.
+
+* Wed Sep 18 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.16-1
+- new upstream release.
+- built for systemd.
+
 * Sun Dec 16 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.12-1
 * Sun Dec 16 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.12.12-1
 - new upstream release.
 - new upstream release.
 - added elogind support.
 - added elogind support.

+ 6 - 3
d/dhcp/dhcp-vl.spec

@@ -3,8 +3,8 @@
 # vendor string (e.g., Fedora, EL)
 # vendor string (e.g., Fedora, EL)
 %define vvendor Vine
 %define vvendor Vine
 
 
-%define pversion 4.1.ESV.R16.P1
-%define sversion 4.1-ESV-R16-P1
+%define pversion 4.1.ESV.R16.P2
+%define sversion 4.1-ESV-R16-P2
 
 
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Summary:  DHCP (Dynamic Host Configuration Protocol) server and relay agent
 Summary(ja): DHCP (動的ホスト設定プロトコル) サーバおよびリレーエージェント
 Summary(ja): DHCP (動的ホスト設定プロトコル) サーバおよびリレーエージェント
@@ -18,7 +18,7 @@ Name:     dhcp
 # --------------------------------------------------------------------------
 # --------------------------------------------------------------------------
 Epoch:    13
 Epoch:    13
 Version:  %{pversion}
 Version:  %{pversion}
-Release:  2%{?_dist_release}%{?with_systemd:.systemd}
+Release:  1%{?_dist_release}%{?with_systemd:.systemd}
 Group:    daemons
 Group:    daemons
 Vendor:   Project Vine
 Vendor:   Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -496,6 +496,9 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 14 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.ESV.R16.P2-1
+- new upstream release.
+
 * Sat Oct 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.ESV.R16.P1-2
 * Sat Oct 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.1.ESV.R16.P1-2
 - rebuilt with openssl-3.0.0.
 - rebuilt with openssl-3.0.0.
 
 

+ 4 - 1
k/kernel/kernel-vl.spec

@@ -40,7 +40,7 @@
 # adding some text to the end of the version number.
 # adding some text to the end of the version number.
 #
 #
 %define sublevel 10
 %define sublevel 10
-%define patchlevel 146
+%define patchlevel 148
 %define kversion 5.%{sublevel}
 %define kversion 5.%{sublevel}
 %define rpmversion 5.%{sublevel}.%{patchlevel}
 %define rpmversion 5.%{sublevel}.%{patchlevel}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
 %define release 1%{?_dist_release}%{?with_systemd:.systemd}
@@ -1206,6 +1206,9 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Oct 15 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.10.148-1
+- updated to 5.10.148.
+
 * Wed Sep 28 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.10.146-1
 * Wed Sep 28 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 5.10.146-1
 - updated to 5.10.146.
 - updated to 5.10.146.
 
 

+ 5 - 2
lib/libm/libmariadb/libmariadb-vl.spec

@@ -1,7 +1,7 @@
 Name:           libmariadb
 Name:           libmariadb
 Summary:        The MariaDB Native Client library (C driver)
 Summary:        The MariaDB Native Client library (C driver)
 Epoch:          1
 Epoch:          1
-Version:        3.2.4
+Version:        3.3.1
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Group:          system
 Group:          system
 Vendor:         Project Vine
 Vendor:         Project Vine
@@ -66,7 +66,7 @@ and require this package, so the /etc/my.cnf file is present.
 %autopatch -p1
 %autopatch -p1
 
 
 # Remove unsused parts
 # Remove unsused parts
-rm -r win zlib win-iconv
+rm -r win win-iconv
 
 
 
 
 %build
 %build
@@ -194,6 +194,9 @@ end
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 14 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.3.1-1
+- new upstream release.
+
 * Tue Oct 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.2.4-1
 * Tue Oct 05 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.2.4-1
 - new upstream release.
 - new upstream release.
 
 

+ 5 - 4
lib/libp/libpq/libpq-vl.spec

@@ -7,15 +7,15 @@
 %define nls 1
 %define nls 1
 %define pam 1
 %define pam 1
 
 
-%define pgver 14
 %define pq_soname 5
 %define pq_soname 5
 %define ecpg_soname 6
 %define ecpg_soname 6
 
 
 Summary: The shared libraries required for any PostgreSQL clients.
 Summary: The shared libraries required for any PostgreSQL clients.
 Summary(ja): PostgreSQL クライアントに必要な共有ライブラリ
 Summary(ja): PostgreSQL クライアントに必要な共有ライブラリ
 Name: libpq
 Name: libpq
-Version: %{pgver}.1
+Version: 15.0
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
+%define pgver %(echo %{version} | cut -d. -f1)
 Group: system
 Group: system
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -25,8 +25,6 @@ URL: https://www.postgresql.org/
 Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
 Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
 Source5: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.sha256
 Source5: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2.sha256
 Source6: README.rpm-dist
 Source6: README.rpm-dist
-Patch2: postgresql-8.3.3-nls.patch
-Patch3: postgresql-7.4-ecpg-patch
 
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 
@@ -235,6 +233,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 14 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 15.0-1
+- new upstream release.
+
 * Fri Nov 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.1-1
 * Fri Nov 12 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.1-1
 - new upstream release.
 - new upstream release.
 
 

+ 10 - 4
m/mariadb-connector-odbc/mariadb-connector-odbc-vl.spec

@@ -9,8 +9,8 @@
 
 
 
 
 Name:           mariadb-connector-odbc
 Name:           mariadb-connector-odbc
-Version:        3.1.11
-Release:        3%{?with_debug:.debug}%{?_dist_release}
+Version:        3.1.15
+Release:        1%{?with_debug:.debug}%{?_dist_release}
 Summary:        The MariaDB Native Client library (ODBC driver)
 Summary:        The MariaDB Native Client library (ODBC driver)
 Group:          system
 Group:          system
 Vendor:         Project Vine
 Vendor:         Project Vine
@@ -19,7 +19,8 @@ Distribution:   Vine Linux
 License:        LGPLv2+
 License:        LGPLv2+
 # Online documentation can be found at: https://mariadb.com/kb/en/library/mariadb-connector-odbc/
 # Online documentation can be found at: https://mariadb.com/kb/en/library/mariadb-connector-odbc/
 URL:            https://mariadb.org/en/
 URL:            https://mariadb.org/en/
-Source:         https://downloads.mariadb.org/f/connector-odbc-%{version}/%{name}-%{version}-ga-src.tar.gz
+Source:         https://archive.mariadb.org/connector-odbc-%{version}/%{name}-%{version}-src.tar.gz
+
 Patch1:         libraries_include_path.patch
 Patch1:         libraries_include_path.patch
 
 
 BuildRequires:  cmake unixODBC-devel gcc-c++
 BuildRequires:  cmake unixODBC-devel gcc-c++
@@ -38,7 +39,7 @@ and it supports both Unicode and ANSI modes.
 
 
 
 
 %prep
 %prep
-%setup -q -n %{name}-%{version}-ga-src
+%setup -q -n %{name}-%{version}-src
 %patch1 -p1
 %patch1 -p1
 
 
 
 
@@ -76,9 +77,14 @@ rm -rf %{buildroot}%{_defaultlicensedir}/%{name}
 %doc     README
 %doc     README
 # This is unixODBC plugin. It resides directly in %%{_libdir} to be consistent with the rest of unixODBC plugins. Since it is plugin, it doesn´t need to be versioned.
 # This is unixODBC plugin. It resides directly in %%{_libdir} to be consistent with the rest of unixODBC plugins. Since it is plugin, it doesn´t need to be versioned.
 %{_libdir}/libmaodbc.so
 %{_libdir}/libmaodbc.so
+# Pkgconfig
+%{_libdir}/pkgconfig/libmaodbc.pc
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 14 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.15-1
+- new upstream release.
+
 * Sat Mar 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.11-3
 * Sat Mar 13 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 3.1.11-3
 - initial build for Vine Linux.
 - initial build for Vine Linux.
 
 

+ 4 - 1
n/nodejs/nodejs-vl.spec

@@ -14,7 +14,7 @@
 %define _unpackaged_files_terminate_build 1
 %define _unpackaged_files_terminate_build 1
 
 
 Name:           nodejs
 Name:           nodejs
-Version:        16.17.1
+Version:        16.18.0
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        JavaScript runtime
 Summary:        JavaScript runtime
 Summary(ja):    JavaScript ランタイム
 Summary(ja):    JavaScript ランタイム
@@ -299,6 +299,9 @@ cp -p common.gypi %{buildroot}%{_datadir}/node
 
 
 
 
 %changelog
 %changelog
+* Thu Oct 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 16.18.0-1
+- updated to 16.18.0.
+
 * Sat Sep 24 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 16.17.1-1
 * Sat Sep 24 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 16.17.1-1
 - updated to 16.17.1.
 - updated to 16.17.1.
 
 

+ 4 - 1
o/openssl/openssl-vl.spec

@@ -9,7 +9,7 @@
 
 
 Summary: Secure Sockets Layer Toolkit
 Summary: Secure Sockets Layer Toolkit
 Name: openssl
 Name: openssl
-Version: 3.0.5
+Version: 3.0.6
 Release: 1%{_dist_release}
 Release: 1%{_dist_release}
 Group: system,security
 Group: system,security
 Vendor: Project Vine
 Vendor: Project Vine
@@ -419,6 +419,9 @@ install -m644 %{SOURCE9} \
 
 
 
 
 %changelog
 %changelog
+* Wed Oct 12 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.6-1
+- new upstream release.
+
 * Wed Jul 06 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.5-1
 * Wed Jul 06 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.5-1
 - new upstream release.
 - new upstream release.
 
 

+ 4 - 1
o/openssl111/openssl111-vl.spec

@@ -11,7 +11,7 @@
 
 
 Summary: Secure Sockets Layer Toolkit
 Summary: Secure Sockets Layer Toolkit
 Name: openssl111
 Name: openssl111
-Version: 1.1.1q
+Version: 1.1.1r
 Release: 1%{_dist_release}
 Release: 1%{_dist_release}
 Group: system,security
 Group: system,security
 Vendor: Project Vine
 Vendor: Project Vine
@@ -511,6 +511,9 @@ rm -rf %{buildroot}%{_sysconfdir}/pki/CA
 
 
 
 
 %changelog
 %changelog
+* Wed Oct 12 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.1r-1
+- new upstream release.
+
 * Wed Jul 06 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.1q-1
 * Wed Jul 06 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.1q-1
 - new upstream release.
 - new upstream release.
 
 

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

@@ -31,7 +31,7 @@
 Summary:        Postfix Mail Transport Agent
 Summary:        Postfix Mail Transport Agent
 Summary(ja):    Postfix メールトランスポートエージェント
 Summary(ja):    Postfix メールトランスポートエージェント
 Name:           postfix
 Name:           postfix
-Version:        3.7.2
+Version:        3.7.3
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Group:          servers
 Group:          servers
 Vendor:         Project Vine
 Vendor:         Project Vine
@@ -40,7 +40,8 @@ Packager:       daisuke
 
 
 URL:            http://www.postfix.org/
 URL:            http://www.postfix.org/
 License:        Distributable - IBM PUBLIC LICENSE VERSION 1.0 - SECURE MAILER
 License:        Distributable - IBM PUBLIC LICENSE VERSION 1.0 - SECURE MAILER
-Source0:        http://mirror.postfix.jp/postfix-release/official/%{name}-%{version}.tar.gz
+#Source0:        http://mirror.postfix.jp/postfix-release/official/%{name}-%{version}.tar.gz
+Source0:        http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/%{name}-%{version}.tar.gz
 Source1:        postfix.aliases
 Source1:        postfix.aliases
 Source2:        postfix.cron
 Source2:        postfix.cron
 Source3:        postfix.init
 Source3:        postfix.init
@@ -582,6 +583,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Wed Oct 12 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7.3-1
+- new upstream release.
+
 * Fri Apr 29 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7.2-1
 * Fri Apr 29 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.7.2-1
 - new upstream release.
 - new upstream release.
 
 

+ 9 - 3
p/postgresql/postgresql-vl.spec

@@ -15,7 +15,7 @@
 Summary: PostgreSQL client programs
 Summary: PostgreSQL client programs
 Summary(ja): PostgreSQL のクライアントプログラム群
 Summary(ja): PostgreSQL のクライアントプログラム群
 Name: postgresql
 Name: postgresql
-Version: 14.5
+Version: 15.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: office
 Group: office
 Vendor: Project Vine
 Vendor: Project Vine
@@ -51,8 +51,7 @@ Source6: README.rpm-dist
 Source15: postgresql-bashprofile
 Source15: postgresql-bashprofile
 Source1000: postgresql.service
 Source1000: postgresql.service
 Source1001: postgresql.tmpfiles.d
 Source1001: postgresql.tmpfiles.d
-Patch2: postgresql-8.3.3-nls.patch
-Patch3: postgresql-7.4-ecpg-patch
+Patch1: 0001-Fix-build-with-LLVM-15-or-above.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: perl build-essential
 BuildRequires: perl build-essential
@@ -367,6 +366,7 @@ system, including regression tests and benchmarks.
 
 
 %prep
 %prep
 %setup -q -n postgresql-%{version}
 %setup -q -n postgresql-%{version}
+%autopatch -p1
 
 
 
 
 %build
 %build
@@ -656,6 +656,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postgresql/auth_delay.so
 %{_libdir}/postgresql/auth_delay.so
 %{_libdir}/postgresql/auto_explain.so
 %{_libdir}/postgresql/auto_explain.so
 %{_libdir}/postgresql/autoinc.so
 %{_libdir}/postgresql/autoinc.so
+%{_libdir}/postgresql/basebackup_to_shell.so
+%{_libdir}/postgresql/basic_archive.so
 %{_libdir}/postgresql/bloom.so
 %{_libdir}/postgresql/bloom.so
 %{_libdir}/postgresql/btree_gin.so
 %{_libdir}/postgresql/btree_gin.so
 %{_libdir}/postgresql/btree_gist.so
 %{_libdir}/postgresql/btree_gist.so
@@ -682,6 +684,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/postgresql/pg_surgery.so
 %{_libdir}/postgresql/pg_surgery.so
 %{_libdir}/postgresql/pg_trgm.so
 %{_libdir}/postgresql/pg_trgm.so
 %{_libdir}/postgresql/pg_visibility.so
 %{_libdir}/postgresql/pg_visibility.so
+%{_libdir}/postgresql/pg_walinspect.so
 %{_libdir}/postgresql/pgcrypto.so
 %{_libdir}/postgresql/pgcrypto.so
 %{_libdir}/postgresql/pgoutput.so
 %{_libdir}/postgresql/pgoutput.so
 %{_libdir}/postgresql/pgrowlocks.so
 %{_libdir}/postgresql/pgrowlocks.so
@@ -840,6 +843,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %changelog
 %changelog
+* Fri Oct 14 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 15.0-1
+- new upstream release.
+
 * Mon Aug 15 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.5-1
 * Mon Aug 15 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 14.5-1
 - new upstream release.
 - new upstream release.
 
 

+ 4 - 1
u/unbound/unbound-vl.spec

@@ -11,7 +11,7 @@
 
 
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Name: unbound
-Version: 1.16.3
+Version: 1.17.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: servers
 Group: servers
 Distribution: Vine Linux
 Distribution: Vine Linux
@@ -362,6 +362,9 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Thu Oct 13 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.17.0-1
+- updated to 1.17.0.
+
 * Wed Sep 21 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.3-1
 * Wed Sep 21 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.16.3-1
 - updated to 1.16.3.
 - updated to 1.16.3.