Browse Source

updated 5 packages

ModemManager-1.14.10-1

NetworkManager-1.28.0-1

libpcap-1.10.0-1

ppp-2.4.9-1

xl2tpd-1.3.16-1

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

+ 14 - 5
M/ModemManager/ModemManager-vl.spec

@@ -8,8 +8,9 @@
 Name: ModemManager
 Summary: Mobile broadband modem management service
 Summary(ja): モバイルブロードバンドモデム運用サービス
-Version: 1.14.0
+Version: 1.14.10
 Release: 1%{git_snapshot}%{?_dist_release}%{?with_systemd:.systemd}
+Group: network,system
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -20,7 +21,6 @@ Source: https://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
 Patch0: buildsys-hates-openpty.patch
 Patch1: ModemManager-1.8.2-elogind-1.patch
 
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: automake autoconf intltool libtool
@@ -48,7 +48,7 @@ interacting with these devices to client applications.
 %package        devel
 Summary:        Development tools for %{name}
 Summary(ja):    %{name} の開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name} = %{version}-%{release}
 Requires:       pkgconfig
 
@@ -59,7 +59,7 @@ Header files and libraries for building a extension library for the %{name}.
 %package	glib
 Summary:	Libraries for adding ModemManager support to applications that use glib.
 Summary(ja):    Glib を使用するアプリケーションに ModemManager サポートを追加するためのライブラリ
-Group: 		System Environment/Libraries
+Group: 		system
 Requires:	glib2 >= %{glib2_version}
 
 %description	glib
@@ -70,7 +70,7 @@ functionality from applications that use glib.
 %package        glib-devel
 Summary:        Development tools for %{name}-glib
 Summary(ja):    %{name}-glib の開発環境
-Group:          Development/Libraries
+Group:          programming
 Requires:       %{name}-glib = %{version}-%{release}
 Requires:       %{name}-devel = %{version}-%{release}
 Requires:       glib2-devel
@@ -80,6 +80,9 @@ Requires:       pkgconfig
 Header files and libraries for building a extension library for the %{name}-glib.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %patch0 -p1 -b .pty
@@ -201,6 +204,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 
 
 %changelog
+* Mon Feb 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.10-1
+- new upstream release.
+
+* Mon Aug  3 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.0-1
+- new upstream release.
+
 * Sun Sep 01 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.10.4-1
 - new upstream release.
 

+ 13 - 6
N/NetworkManager/NetworkManager-vl.spec

@@ -17,7 +17,7 @@
 %define gtk3_version	3.8.0
 %define wireless_tools_version 29
 %define libnl3_version 3.2.14
-%define ppp_version 2.4.8
+%define ppp_version 2.4.9
 %define mm_version 1.10.4
 
 %global systemd_units NetworkManager.service NetworkManager-wait-online.service NetworkManager-dispatcher.service
@@ -25,8 +25,9 @@
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Summary(ja): ネットワーク接続マネージャとユーザアプリケーション
-Version: 1.26.0
+Version: 1.28.0
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: network,system
 Vendor: Project Vine
 Distribution: Vine Linux
 
@@ -79,7 +80,7 @@ BuildRequires: pkgconfig(gudev-1.0)
 BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(jansson)
 BuildRequires: curl-devel
-BuildRequires: pygobject3
+BuildRequires: python3-pygobject
 BuildRequires: vala-tools, vala-devel
 BuildRequires: ppp
 BuildRequires: ModemManager-glib-devel >= %{mm_version}
@@ -144,7 +145,7 @@ NetworkManager functionality from applications that use glib.
 %package libnm
 Summary: Libraries for adding NetworkManager support to applications (new API).
 Summary(ja): NetworkManager サポートを追加するためのライブラリ (new API)
-Group: System Environment/Libraries
+Group: system
 Obsoletes: %{name}-glib < 1.15.0
 Requires: dbus
 Requires: dbus-glib
@@ -158,7 +159,7 @@ NetworkManager-glib.
 %package libnm-devel
 Summary: Header files for adding NetworkManager support to applications (new API).
 Summary(ja): NetworkManager サポートを追加するためのヘッダファイル (new API)
-Group: Development/Libraries
+Group: programming
 Obsoletes: %{name}-devel < 1.15.0
 Obsoletes: %{name}-glib-devel < 1.15.0
 #Requires: %{name}-devel = %{version}-%{release}
@@ -176,7 +177,7 @@ See also NetworkManager-glib-devel.
 %package tui
 Summary: NetworkManager curses-based UI
 Summary(ja): cursesベースのNetworkManagerユーザインタフェース
-Group: System Environment/Base
+Group: system,network,admin-tools
 Requires: %{name} = %{version}-%{release}
 Requires: %{name}-libnm%{?_isa} = %{version}-%{release}
 BuildRequires: newt-devel
@@ -187,6 +188,9 @@ NetworkManager, to allow performing some of the operations supported
 by nm-connection-editor and nm-applet in a non-graphical environment.
 
 
+%debug_package
+
+
 %prep
 %setup -q
 %if !%{with systemd}
@@ -487,6 +491,9 @@ done
 
 
 %changelog
+* Mon Feb 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.28.0-1
+- new upstream release.
+
 * Mon Aug 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.26.0-1
 - new upstream release.
 

+ 20 - 9
lib/libp/libpcap/libpcap-vl.spec

@@ -1,11 +1,14 @@
 Name: libpcap
 Summary: A system-independent interface for user-level packet capture.
 Summary(ja): ユーザレベルでパケットをキャプチャするインターフェイス
-Version: 1.9.1
-Release: 1%{?_dist_release}
 Epoch: 1
+Version: 1.10.0
+Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
-Group: System Environment/Libraries
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
 License: BSD
 URL: https://www.tcpdump.org/
@@ -24,10 +27,6 @@ BuildRequires: bison
 #BuildRequires: libnl-devel
 BuildRequires: git
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
-
 %description
 Libpcap provides a portable framework for low-level network
 monitoring. Libpcap can provide network statistics collection,
@@ -52,10 +51,11 @@ Libpcap は低レベルでネットワークをモニタするためのポータ
 ネットワークの低レベルのトラフィックを監視する必要がある場合,libpcap
 をインストールして下さい.
 
+
 %package devel
 Summary:  Development package for %{name}
 Summary(ja): %{name} の開発用ファイル
-Group:    Development/Libraries
+Group:    programming
 Requires: %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
@@ -66,6 +66,10 @@ with %{name}.
 %{name}-devel パッケージには,%{name} を使った開発に必要なファイルが
 含まれています.
 
+
+%debug_package
+
+
 %prep
 %autosetup -S git
 
@@ -82,13 +86,15 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 rm -f %{buildroot}%{_libdir}/libpcap.a
 
+
 %clean
 rm -rf %{buildroot}
 
+
 %post -p /sbin/ldconfig
- 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root)
 %license LICENSE
@@ -108,7 +114,12 @@ rm -rf %{buildroot}
 %{_mandir}/man5/*
 %{_mandir}/man7/*
 
+
 %changelog
+* Mon Feb 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:1.10.0-1
+- new upstream release.
+- updated Patch0001 and 0003.
+
 * Sat Oct 05 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1:1.9.1-1
 - new upstream release.
 

+ 46 - 37
p/ppp/ppp-vl.spec

@@ -1,14 +1,12 @@
+%bcond_with systemd
 %bcond_with ifupdown
 
-%define _tmpfilesdir %{_sysconfdir}/tmpfiles.d
-
 Summary: The PPP (Point-to-Point Protocol) daemon.
 Summary(ja): PPP (Point-to-Point Protocol) デーモン
 Name: ppp
-Version: 2.4.8
-Release: 1%{?_dist_release}
-Group: System Environment/Daemons
-
+Version: 2.4.9
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Group: system
 Vendor: Project Vine
 Distribution: Vine Linux
 Packager: daisuke
@@ -31,42 +29,35 @@ Source11: ifdown-ppp
 Source12: ppp-watch.tar.xz
 
 # Fedora-specific
-Patch0001:      0001-build-sys-use-gcc-as-our-compiler-of-choice.patch
-Patch0002:      ppp-2.4.8-build-sys-enable-PAM-support.patch
-Patch0003:      ppp-2.4.8-build-sys-utilize-compiler-flags-handed-to-us-by-rpm.patch
-Patch0004:      0004-doc-add-configuration-samples.patch
-Patch0005:      ppp-2.4.8-build-sys-don-t-hardcode-LIBDIR-but-set-it-according.patch
-Patch0006:      0006-scritps-use-change_resolv_conf-function.patch
-Patch0007:      0007-build-sys-don-t-strip-binaries-during-installation.patch
-Patch0008:      0008-build-sys-use-prefix-usr-instead-of-usr-local.patch
-Patch0009:      ppp-2.4.8-pppd-introduce-ipv6-accept-remote.patch
-Patch0010:      0010-build-sys-enable-CBCP.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.8-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
-Patch0019:      ppp-2.4.8-sys-linux-rework-get_first_ethernet.patch
-Patch0020:      0020-pppd-put-lock-files-in-var-lock-ppp.patch
-Patch0021:      ppp-2.4.8-build-sys-compile-pppol2tp-plugin-with-RPM_OPT_FLAGS.patch
-Patch0022:      ppp-2.4.8-build-sys-compile-pppol2tp-with-multilink-support.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.8-eaptls-mppe-1.102.patch
-
-Patch0032:      ppp-2.4.8-CVE-2020-8597.patch
-
+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 >= 0.8.3, eudev-libudev-devel, openssl-devel, pam-devel
+BuildRequires: glib2-devel, libpcap-devel, openssl-devel, pam-devel
+%if %{with systemd}
+BuildRequires: systemd-devel
+%else
+BuildRequires: eudev-libudev-devel
+%endif
+
 #Requires: glibc >= 2.0.6, /etc/pam.d/system-auth
 Requires: glibc >= 2.0.6, pam >= 1.0
 Requires(pre): shadow-utils
 
-
 %description
 The ppp package contains the PPP (Point-to-Point Protocol) daemon and
 documentation for PPP support.  The PPP protocol provides a method for
@@ -85,7 +76,7 @@ PPP を使う為のドキュメントが収められています.PPP プロト
 %package devel
 Summary: Headers for ppp plugin development
 SUmmary(ja): ppp プラグイン開発用ヘッダファイル
-Group: Development/Libraries
+Group: programming
 
 %description devel
 This package contains the header files for building plugins for ppp.
@@ -94,18 +85,24 @@ This package contains the header files for building plugins for ppp.
 このパッケージには ppp のプラグインを開発するためのヘッダファイルが
 含まれています。
 
+
+%debug_package
+
+
 %prep
 %setup  -q -n ppp-ppp-%{version}
 %autopatch -p1
 
 tar -xJf %{SOURCE12}
 
+
 %build
 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fPIC -Wall -fno-strict-aliasing"
 %configure
 make %{?_smp_mflags}
 make -C ppp-watch %{?_smp_mflags}
 
+
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
@@ -130,9 +127,11 @@ install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/ppp
 install -d %{buildroot}%{_sysconfdir}/logrotate.d
 install -m 644 -p %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/ppp
 
+%if %{with systemd}
 # install tmpfiles drop-in
 install -d %{buildroot}%{_tmpfilesdir}
 install -p %{SOURCE3} %{buildroot}%{_tmpfilesdir}/ppp.conf
+%endif
 
 # install scripts (previously owned by initscripts package)
 install -d %{buildroot}%{_sysconfdir}/ppp
@@ -159,6 +158,10 @@ rm -rf %{buildroot}
 %pre
 /usr/bin/getent group dip >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 40 dip >/dev/null 2>&1 || :
 
+%if %{with systemd}
+%post
+%tmpfiles_create ppp.conf
+%endif
 
 %files
 %defattr(-,root,root)
@@ -177,7 +180,9 @@ rm -rf %{buildroot}
 %config(noreplace) /etc/ppp/*
 %config(noreplace) /etc/pam.d/ppp
 %config(noreplace) /etc/logrotate.d/ppp
+%if %{with systemd}
 %{_tmpfilesdir}/ppp.conf
+%endif
 %ghost %dir %{_localstatedir}/run/ppp
 %ghost %dir %{_localstatedir}/lock/ppp
 %attr(700, root, root) %dir %{_localstatedir}/log/ppp
@@ -194,6 +199,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.9-1
+- new upstream release.
+- updated patches.
+
 * Thu Mar 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.8-1
 - new upstream release.
 - updated patches.

+ 7 - 1
x/xl2tpd/xl2tpd-vl.spec

@@ -4,7 +4,7 @@
 
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
-Version: 1.3.15
+Version: 1.3.16
 Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: network,servers,security
 Vendor: Project Vine
@@ -59,6 +59,9 @@ Xl2tpd is based on the 0.69 L2TP by Jeff McAdams <jeffm@iglou.com>
 It was de-facto maintained by Jacco de Leeuw <jacco2@dds.nl> in 2002 and 2003.
 
 
+%debug_package
+
+
 %prep
 %autosetup -p1 -n %{src_dir_name}
 
@@ -151,6 +154,9 @@ fi
 
 
 %changelog
+* Mon Feb 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.16-1
+- new upstream release.
+
 * Thu Aug 13 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.3.15-1
 - new upstream release.
 - added systemd support (disabled as default).