Explorar o código

updated 2 packages

initscripts-8.91.16-4

kmod-27-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12432 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop %!s(int64=4) %!d(string=hai) anos
pai
achega
0c82df6b0d
Modificáronse 2 ficheiros con 38 adicións e 21 borrados
  1. 15 10
      i/initscripts/initscripts-vl.spec
  2. 23 11
      k/kmod/kmod-vl.spec

+ 15 - 10
i/initscripts/initscripts-vl.spec

@@ -5,14 +5,19 @@ Summary:      The inittab file and the /etc/rc.d scripts.
 Summary(ja):  inittab と /etc/rc.d 以下の起動スクリプト一式
 Summary(ja):  inittab と /etc/rc.d 以下の起動スクリプト一式
 Name:         initscripts
 Name:         initscripts
 Version:      8.91.16
 Version:      8.91.16
-Release:      3%{?_dist_release}
-License:      GPL
+Release:      4%{?_dist_release}
 Group:        System Environment/Base
 Group:        System Environment/Base
-Url:          http://trac.vinelinux.org/browser/projects/initscripts
+Vendor:       Project Vine
+Distribution: Vine Linux
+Packager:     daisuke
 
 
+License:      GPL
+Url:          http://trac.vinelinux.org/browser/projects/initscripts
 # generated from svn
 # generated from svn
 Source:       %{name}-vine-%{version}.tar.bz2
 Source:       %{name}-vine-%{version}.tar.bz2
 Patch0:       initscripts-network-fix.patch
 Patch0:       initscripts-network-fix.patch
+Patch1:       initscripts-sysctl-fix.patch
+Patch2:       initscripts-network-bridge-fix.patch
 
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
@@ -45,10 +50,6 @@ Requires(pre): shadow-utils
 Requires(post): gawk, coreutils, sed, chkconfig
 Requires(post): gawk, coreutils, sed, chkconfig
 Requires(preun): chkconfig, alternatives
 Requires(preun): chkconfig, alternatives
 
 
-Vendor:       Project Vine
-Distribution: Vine Linux
-Packager:     daisuke
-
 %description
 %description
 The initscripts package contains the basic system scripts used to boot
 The initscripts package contains the basic system scripts used to boot
 your Vine Linux system, change run levels, and shut the system down
 your Vine Linux system, change run levels, and shut the system down
@@ -64,6 +65,9 @@ deactivate most network interfaces.
 %prep
 %prep
 %setup -q
 %setup -q
 %patch0 -p1
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
 
 
 %build
 %build
 export CFLAGS="%{optflags} -DPORT_MAX_8250=19"
 export CFLAGS="%{optflags} -DPORT_MAX_8250=19"
@@ -97,7 +101,6 @@ mv -f %{buildroot}/sbin/ifdown %{buildroot}/sbin/ifdown.initscripts
 %pre
 %pre
 /usr/sbin/groupadd -g 22 -r -f utmp
 /usr/sbin/groupadd -g 22 -r -f utmp
 
 
-
 %post
 %post
 touch /var/log/wtmp
 touch /var/log/wtmp
 touch /var/run/utmp
 touch /var/run/utmp
@@ -137,7 +140,6 @@ sed -e 's/^LC_ALL=/#LC_ALL=/' \
 mv -f $tmpfile /etc/sysconfig/i18n
 mv -f $tmpfile /etc/sysconfig/i18n
 chmod 755 /etc/sysconfig/i18n
 chmod 755 /etc/sysconfig/i18n
 
 
-
 # use VJE-delta if installed
 # use VJE-delta if installed
 if [ -f /etc/vje30/vje.cfg ]; then
 if [ -f /etc/vje30/vje.cfg ]; then
   newime=`mktemp /etc/sysconfig/ime.XXXXXX`
   newime=`mktemp /etc/sysconfig/ime.XXXXXX`
@@ -158,7 +160,6 @@ if [ -f /usr/lib/wnn7/ja_JP/jserverrc ]; then
   rm -f $newime
   rm -f $newime
 fi
 fi
 
 
-
 %preun
 %preun
 if [ $1 = 0 ]; then
 if [ $1 = 0 ]; then
   /sbin/chkconfig --del random
   /sbin/chkconfig --del random
@@ -457,6 +458,10 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 
 
 %changelog
 %changelog
+* Tue Jul 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-4
+- added "--system" to sysctl.
+- fixed to bring up bridge interfaces at boot.
+
 * Fri Apr 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-3
 * Fri Apr 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-3
 - fixed hotplug for networking.
 - fixed hotplug for networking.
 
 

+ 23 - 11
k/kmod/kmod-vl.spec

@@ -1,14 +1,16 @@
 Name:		kmod
 Name:		kmod
-Version:	25
-Release:        1%{?_dist_release}
 Summary:	Linux kernel module management utilities
 Summary:	Linux kernel module management utilities
 Summary(ja):	Linux カーネルモジュール管理ユーティリティ
 Summary(ja):	Linux カーネルモジュール管理ユーティリティ
-
+Version:	27
+Release:        1%{?_dist_release}
 Group:		System Environment/Kernel
 Group:		System Environment/Kernel
+Distribution:	Vine Linux
+Vendor:		Project Vine
+Packager:	daisuke
+
 License:	GPLv2+
 License:	GPLv2+
 URL:		http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
 URL:		http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary
-Source0:	ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz
-Exclusiveos:	Linux
+Source0:	https://mirrors.edge.kernel.org/pub/linux/utils/kernel/kmod/%{name}-%{version}.tar.xz
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:	chrpath
 BuildRequires:	chrpath
@@ -22,16 +24,13 @@ Provides:	modutils = 4.0-1
 Obsoletes:      modutils < 4.0-1
 Obsoletes:      modutils < 4.0-1
 Provides:	/sbin/modprobe
 Provides:	/sbin/modprobe
 
 
-Distribution: Vine Linux
-Vendor: Project Vine
-Packager: daisuke
-
 %description
 %description
 The kmod package provides various programs needed for automatic
 The kmod package provides various programs needed for automatic
 loading and unloading of modules under 2.6, 3.x, and later kernels, as well
 loading and unloading of modules under 2.6, 3.x, and later kernels, as well
 as other module management programs. Device drivers and filesystems are two
 as other module management programs. Device drivers and filesystems are two
 examples of loaded and unloaded modules.
 examples of loaded and unloaded modules.
 
 
+
 %package libs
 %package libs
 Summary:	Libraries to handle kernel module loading and unloading
 Summary:	Libraries to handle kernel module loading and unloading
 Summary(ja):	kernelモジュールのロード/アンロードを扱うライブラリ
 Summary(ja):	kernelモジュールのロード/アンロードを扱うライブラリ
@@ -42,6 +41,7 @@ Group:		System Environment/Libraries
 The kmod-libs package provides runtime libraries for any application that
 The kmod-libs package provides runtime libraries for any application that
 wishes to load or unload Linux kernel modules from the running system.
 wishes to load or unload Linux kernel modules from the running system.
 
 
+
 %package devel
 %package devel
 Summary:	Header files for kmod development
 Summary:	Header files for kmod development
 Summary(ja):	kmodを使うアプリケーション開発のためのヘッダファイル
 Summary(ja):	kmodを使うアプリケーション開発のためのヘッダファイル
@@ -52,9 +52,11 @@ Requires:	%{name} = %{version}-%{release}
 The kmod-devel package provides header files used for development of
 The kmod-devel package provides header files used for development of
 applications that wish to load or unload Linux kernel modules.
 applications that wish to load or unload Linux kernel modules.
 
 
+
 %prep
 %prep
 %setup -q
 %setup -q
 
 
+
 %build
 %build
 export V=1
 export V=1
 %configure \
 %configure \
@@ -64,6 +66,7 @@ export V=1
   --with-xz
   --with-xz
 make %{?_smp_mflags}
 make %{?_smp_mflags}
 
 
+
 %install
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
@@ -89,15 +92,18 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/depmod.d
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
 
 
+
 %clean
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
+
 %post libs
 %post libs
 /sbin/ldconfig
 /sbin/ldconfig
 
 
 %postun libs
 %postun libs
 /sbin/ldconfig
 /sbin/ldconfig
 
 
+
 %files
 %files
 %defattr(-,root,root,-)
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/depmod.d
 %dir %{_sysconfdir}/depmod.d
@@ -114,7 +120,9 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
 %attr(0644,root,root) %{_mandir}/man8/*.8*
 %attr(0644,root,root) %{_mandir}/man8/*.8*
 %doc NEWS README TODO
 %doc NEWS README TODO
 %license COPYING
 %license COPYING
-%exclude %{_datadir}/bash-completion/completions/kmod
+%dir %{_datadir}/bash-completion/completions
+%dir %{_datadir}/bash-completion
+%{_datadir}/bash-completion/completions/kmod
 
 
 %files libs
 %files libs
 /%{_lib}/libkmod.so.*
 /%{_lib}/libkmod.so.*
@@ -125,9 +133,13 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d
 %{_libdir}/libkmod.so
 %{_libdir}/libkmod.so
 /%{_lib}/libkmod.so
 /%{_lib}/libkmod.so
 
 
+
 %changelog
 %changelog
+* Tue Jul 28 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 27-1
+- updated to 27.
+
 * Fri Feb 08 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 25-1
 * Fri Feb 08 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 25-1
-- updated to 23.
+- updated to 25.
 
 
 * Sat Jul 23 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 23-1
 * Sat Jul 23 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 23-1
 - update to 23
 - update to 23