Browse Source

updated 13 packages

acpid-2.0.32-1

at-3.1.23-1

autofs-5.1.6-1

dracut-050-3

fcgi-2.4.2-1

fcgiwrap-1.1.0.git20200404-2

firefox-68.6.1-1

initscripts-8.91.16-3

iptables-1.8.4-2

lxc-4.0.0-1

libnftnl-1.1.6-1

smp_utils-0.99-1

util-linux-2.35.1-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12364 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 4 years ago
parent
commit
984cdcd8c5

+ 66 - 29
a/acpid/acpid-vl.spec

@@ -1,31 +1,44 @@
+%bcond_with systemd
+
+
 Summary: ACPI Event Daemon
 Summary: ACPI Event Daemon
 Summary(ja): ACPI イベントデーモン
 Summary(ja): ACPI イベントデーモン
 Name: acpid
 Name: acpid
-Version: 2.0.30
-Release: 1%{?_dist_release}
-License: GPL
+Version: 2.0.32
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: System Environment/Daemons
 Group: System Environment/Daemons
-URL: http://tedfelix.com/linux/acpid-netlink.html
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
 
 
-Source: http://tedfelix.com/linux/acpid-%{version}.tar.xz
+License: GPL
+URL: https://sourceforge.net/projects/acpid2/
+Source: https://downloads.sourceforge.net/project/acpid2/acpid-%{version}.tar.xz
 Source1: acpid.init
 Source1: acpid.init
 Source2: acpid.video.conf
 Source2: acpid.video.conf
 Source3: acpid.power.conf
 Source3: acpid.power.conf
 Source4: acpid.power.sh
 Source4: acpid.power.sh
 Source6: acpid.sysconfig
 Source6: acpid.sysconfig
+Source7: acpid.service
+Source8: acpid.socket
 
 
 # https://sourceforge.net/p/acpid2/tickets/14/
 # https://sourceforge.net/p/acpid2/tickets/14/
-Patch0: acpid-2.0.28-kacpimon-dynamic-connections.patch
+Patch0: acpid-2.0.32-kacpimon-dynamic-connections.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
+%if %{with systemd}
+BuildRequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+Requires: systemd
+%else
 Requires(post): chkconfig
 Requires(post): chkconfig
 Requires(preun): chkconfig, initscripts
 Requires(preun): chkconfig, initscripts
+%endif
 
 
 ExclusiveArch: x86_64 %{ix86}
 ExclusiveArch: x86_64 %{ix86}
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
 
 
 %description
 %description
 acpid is a daemon that dispatches ACPI events to user-space programs.
 acpid is a daemon that dispatches ACPI events to user-space programs.
@@ -42,35 +55,44 @@ acpidはACPIイベントをユーザスペースのプログラムへ素早く
 
 
 %build
 %build
 %configure
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} CFLAGS="%{optflags} %{?harden}"
 
 
 
 
 %install
 %install
-rm -rf ${RPM_BUILD_ROOT}
-mkdir -p ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}
+make install DESTDIR=%{buildroot}
+
+mkdir -p %{buildroot}%{_sysconfdir}/acpi/events
+mkdir -p %{buildroot}%{_sysconfdir}/acpi/actions
+mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+chmod 755 %{buildroot}%{_sysconfdir}/acpi/events
 
 
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/events
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/actions
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
-mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
-chmod 755 ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/events
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/acpi/events/video
+install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/acpi/events/power
+install -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/acpi/actions/power.sh
 
 
-install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/events/video
-install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/events/power
-install -m 755 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/acpi/actions/power.sh
+install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/acpid
 
 
-install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/acpid
-install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/acpid
+%if %{with systemd}
+mkdir -p %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE7} %{SOURCE8} %{buildroot}%{_unitdir}
+%else
+mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
+install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/acpid
+%endif
 
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+rm -rf %{buildroot}%{_docdir}/%{name}
 
 
 
 
 %clean
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 
 
 %post
 %post
+%if %{with systemd}
+%systemd_post %{name}.socket %{name}.service
+%else
 # only run on install, not upgrade 
 # only run on install, not upgrade 
 if [ "$1" = "1" ]; then
 if [ "$1" = "1" ]; then
 	/sbin/chkconfig --add acpid
 	/sbin/chkconfig --add acpid
@@ -78,21 +100,28 @@ fi
 if [ -e /var/log/acpid ]; then
 if [ -e /var/log/acpid ]; then
     touch /var/log/acpid
     touch /var/log/acpid
 fi
 fi
-
+%endif
 
 
 %postun
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart %{name}.socket %{name}.service
+%else
 if [ "$1" -ge "1" ]; then
 if [ "$1" -ge "1" ]; then
 	/sbin/service acpid condrestart >/dev/null 2>&1
 	/sbin/service acpid condrestart >/dev/null 2>&1
 fi
 fi
-
+%endif
 
 
 %preun
 %preun
+%if %{with systemd}
+%systemd_preun %{name}.socket %{name}.service
+%else
 # only run if this is the last instance to be removed
 # only run if this is the last instance to be removed
 if [ "$1" = "0" ]; then
 if [ "$1" = "0" ]; then
 	/sbin/service acpid stop > /dev/null 2>&1
 	/sbin/service acpid stop > /dev/null 2>&1
 	/sbin/chkconfig --del acpid
 	/sbin/chkconfig --del acpid
 	rm -f /var/run/acpid.socket
 	rm -f /var/run/acpid.socket
 fi
 fi
+%endif
 
 
 
 
 %files
 %files
@@ -109,13 +138,21 @@ fi
 %{_bindir}/acpi_listen
 %{_bindir}/acpi_listen
 %{_sbindir}/acpid
 %{_sbindir}/acpid
 %{_sbindir}/kacpimon
 %{_sbindir}/kacpimon
-%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid
 %{_mandir}/man8/acpid.8*
 %{_mandir}/man8/acpid.8*
 %{_mandir}/man8/acpi_listen.8*
 %{_mandir}/man8/acpi_listen.8*
 %{_mandir}/man8/kacpimon.8*
 %{_mandir}/man8/kacpimon.8*
-
+%if %{with systemd}
+%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}.socket
+%else
+%attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/acpid
+%endif
 
 
 %changelog
 %changelog
+* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.32-1
+- new upstream release.
+- updated Patch0.
+
 * Sat Feb 09 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.30-1
 * Sat Feb 09 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.30-1
 - new upstream release.
 - new upstream release.
 - updated Source4 to support elogind.
 - updated Source4 to support elogind.

+ 76 - 43
a/at/at-vl.spec

@@ -1,48 +1,66 @@
+%bcond_with systemd
 %bcond_without pam
 %bcond_without pam
 
 
-Summary: Job spooling tools.
-Summary(ja): ジョブスプーリングツール
-Name: at
-Version: 3.1.14
-Release: 1%{?_dist_release}
-License: GPLv2+ and ISC
-Group: System Environment/Daemons
-URL: http://ftp.debian.org/debian/pool/main/a/at
-
-Source: http://ftp.debian.org/debian/pool/main/a/at/at_%{version}.orig.tar.gz
-Source1: pam_atd
-Source2: atd.init
-Source3: atd.sysconf
-
-Patch1:  at-3.1.14-makefile.patch
-Patch2:  at-3.1.12-opt_V.patch
-Patch3:  at-3.1.12-shell.patch
-Patch4:  at-3.1.13-nitpicks.patch
-Patch5:  at-3.1.13-pam.patch
-Patch6:  at-3.1.13-selinux.patch
-Patch7:  at-3.1.12-nowrap.patch
-Patch8:  at-3.1.12-fix_no_export.patch 
-Patch9:  at-3.1.13-mailwithhostname.patch
-Patch10: at-3.1.13-usePOSIXtimers.patch
-#Patch11: at-3.1.13-help.patch
+Summary:        Job spooling tools.
+Summary(ja):    ジョブスプーリングツール
+Name:           at
+Version:        3.1.23
+Release:        1%{?_dist_release}
+License:        GPLv3+ and GPLv2+ and ISC and MIT and Public Domain
+URL:            http://ftp.debian.org/debian/pool/main/a/at
+
+Source:         http://ftp.debian.org/debian/pool/main/a/at/at_%{version}.orig.tar.gz
+Source1:        pam_atd
+Source2:        atd.init
+Source3:        atd.sysconf
+Source5:        atd.systemd
+
+Patch0:         at-aarch64.patch
+Patch1:         at-3.1.18-make.patch
+Patch2:         at-3.1.20-pam.patch
+Patch4:         at-3.1.14-opt_V.patch
+Patch5:         at-3.1.20-shell.patch
+Patch6:         at-3.1.18-nitpicks.patch
+Patch8:         at-3.1.14-fix_no_export.patch 
+Patch9:         at-3.1.14-mailwithhostname.patch
+Patch10:        at-3.1.14-usePOSIXtimers.patch
+Patch12:        at-3.1.20-aborted-jobs.patch
+Patch13:        at-3.1.18-noabort.patch
+Patch14:        at-3.1.16-fclose-error.patch
+Patch15:        at-3.1.16-clear-nonjobs.patch
+Patch16:        at-3.1.18-utc-dst.patch
+Patch17:        at-3.1.20-lock-locks.patch
+Patch18:        at-3.1.23-document-n.patch
+Patch19:        at-3.1.20-log-jobs.patch
 
 
 # http://mantis.vinelinux.org/view.php?id=2483
 # http://mantis.vinelinux.org/view.php?id=2483
-Patch20: at-3.1.13-usePOSIXtimers-fix.patch
+Patch20:        at-3.1.23-usePOSIXtimers-fix.patch
 
 
 BuildRequires: fileutils 
 BuildRequires: fileutils 
-BuildRequires: chkconfig
 BuildRequires: flex
 BuildRequires: flex
 BuildRequires: bison
 BuildRequires: bison
 BuildRequires: autoconf
 BuildRequires: autoconf
 
 
+%if %{with systemd}
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
+BuildRequires: chkconfig
+Requires(post): chkconfig
+Requires(preun): chkconfig
+Requires(postun): chkconfig
+%endif
+
 %if %{with pam}
 %if %{with pam}
 BuildRequires: pam-devel
 BuildRequires: pam-devel
 %endif
 %endif
 Conflicts: crontabs <= 1.5
 Conflicts: crontabs <= 1.5
 # No, I'm not kidding
 # No, I'm not kidding
-BuildRequires: smtpdaemon
+BuildRequires: postfix
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
 
+
 %description
 %description
 At and batch read commands from standard input or from a specified
 At and batch read commands from standard input or from a specified
 file. At allows you to specify that a command will be run at a
 file. At allows you to specify that a command will be run at a
@@ -69,25 +87,13 @@ batch はシステムの負荷レベルが特定のレベルを下回るとコ
 %prep
 %prep
 %setup -q
 %setup -q
 cp %{SOURCE1} .
 cp %{SOURCE1} .
-%patch1 -p1 -b .make
-%patch2 -p1 -b .opt_V
-%patch3 -p1 -b .shell
-%patch4 -p1 -b .nit
-%patch5 -p1 -b .pam
-%patch6 -p1 -b .selinux
-%patch7 -p1 -b .nowrap
-%patch8 -p1 -b .export
-%patch9 -p1 -b .mail
-%patch10 -p1 -b .posix
-#%patch11 -p1 -b .help
-
-%patch20 -p1 -b .posix-fix
-
-%build
+%autopatch -p1
 # patch10 touches configure.in
 # patch10 touches configure.in
 autoconf
 autoconf
 # for patch11
 # for patch11
 rm -f lex.yy.* y.tab.*
 rm -f lex.yy.* y.tab.*
+
+%build
 %configure --with-atspool=%{_localstatedir}/spool/at/spool \
 %configure --with-atspool=%{_localstatedir}/spool/at/spool \
            --with-jobdir=%{_localstatedir}/spool/at \
            --with-jobdir=%{_localstatedir}/spool/at \
            --with-daemon_username=root  \
            --with-daemon_username=root  \
@@ -132,8 +138,14 @@ cp $RPM_BUILD_ROOT/%{_prefix}/doc/at/* docs/
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
 mkdir -p %{buildroot}%{_sysconfdir}/pam.d
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/atd
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/atd
 
 
+%if %{with systemd}
+# install systemd initscript
+mkdir -p %{buildroot}/%{_unitdir}/
+install -m 644 %{SOURCE5} %{buildroot}/%{_unitdir}/atd.service
+%else
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/atd
 install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/rc.d/init.d/atd
+%endif
 
 
 mkdir -p %{buildroot}/etc/sysconfig
 mkdir -p %{buildroot}/etc/sysconfig
 install -m 755 %{SOURCE3} %{buildroot}/etc/sysconfig/atd
 install -m 755 %{SOURCE3} %{buildroot}/etc/sysconfig/atd
@@ -148,25 +160,41 @@ rm -rf %{buildroot}
 touch %{_localstatedir}/spool/at/.SEQ
 touch %{_localstatedir}/spool/at/.SEQ
 chmod 600 %{_localstatedir}/spool/at/.SEQ
 chmod 600 %{_localstatedir}/spool/at/.SEQ
 chown daemon.daemon %{_localstatedir}/spool/at/.SEQ
 chown daemon.daemon %{_localstatedir}/spool/at/.SEQ
+%if %{with systemd}
+%systemd_post atd.service
+%else
 # must be in chkconfig on
 # must be in chkconfig on
 /sbin/chkconfig --add atd
 /sbin/chkconfig --add atd
+%endif
 
 
 %preun
 %preun
+%if %{with systemd}
+%systemd_preun atd.service
+%else
 if [ "$1" = 0 ] ; then
 if [ "$1" = 0 ] ; then
   /sbin/service atd stop
   /sbin/service atd stop
   /sbin/chkconfig --del atd
   /sbin/chkconfig --del atd
 fi
 fi
+%endif
 
 
 %postun
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart atd.service
+%else
 if [ "$1" -ge "1" ]; then
 if [ "$1" -ge "1" ]; then
   /sbin/service atd condrestart
   /sbin/service atd condrestart
 fi
 fi
+%endif
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
 %doc docs/*
 %doc docs/*
 %config %{_sysconfdir}/at.deny
 %config %{_sysconfdir}/at.deny
+%if %{with systemd}
+%attr(0644,root,root)		%{_unitdir}/atd.service
+%else
 %attr(0700,root,root)		%{_sysconfdir}/rc.d/init.d/atd
 %attr(0700,root,root)		%{_sysconfdir}/rc.d/init.d/atd
+%endif
 %attr(0700,root,root)		%{_sysconfdir}/sysconfig/atd
 %attr(0700,root,root)		%{_sysconfdir}/sysconfig/atd
 %attr(0700,daemon,daemon)	%dir %{_localstatedir}/spool/at
 %attr(0700,daemon,daemon)	%dir %{_localstatedir}/spool/at
 %attr(0600,daemon,daemon)	%verify(not md5 size mtime) %ghost %{_localstatedir}/spool/at/.SEQ
 %attr(0600,daemon,daemon)	%verify(not md5 size mtime) %ghost %{_localstatedir}/spool/at/.SEQ
@@ -181,6 +209,11 @@ fi
 %attr(4755,root,root) %{_bindir}/at
 %attr(4755,root,root) %{_bindir}/at
 
 
 %changelog
 %changelog
+* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1.23-1
+- new upstream release.
+- imported Patch12-19 from rawhide.
+- updated Patch20.
+
 * Sun Jun 15 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1.14-1
 * Sun Jun 15 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.1.14-1
 - new upstream release.
 - new upstream release.
 - updated Patch1.
 - updated Patch1.

+ 73 - 20
a/autofs/autofs-vl.spec

@@ -1,20 +1,16 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Summary: A tool for automatically mounting and unmounting filesystems.
 Summary(ja): 自動的にファイルシステムをマウント/アンマウントするツール
 Summary(ja): 自動的にファイルシステムをマウント/アンマウントするツール
 Name: autofs
 Name: autofs
-Version: 5.1.1
+Version: 5.1.6
 Release: 1%{?_dist_release}
 Release: 1%{?_dist_release}
 Epoch: 1
 Epoch: 1
-License: GPL
 Group: System Environment/Daemons
 Group: System Environment/Daemons
 Vendor: Project Vine
 Vendor: Project Vine
 Distribution: Vine Linux
 Distribution: Vine Linux
 Packager: daisuke, kenta, shaolin
 Packager: daisuke, kenta, shaolin
 
 
-Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.xz
-# upstream patches
-#Patch1: autofs-5.0.8-fix-undefined-authtype_requires_creds-err-if-ldap-en.patch
-#Patch2: autofs-5.0.8-fix-master-map-type-check.patch
-#Patch3: autofs-5.0.8-fix-task-manager-not-getting-signaled.patch
+License: GPL
+Source: https://www.kernel.org/pub/linux/daemons/autofs/v5/autofs-%{version}.tar.xz
 
 
 ## Vine Patch(es)
 ## Vine Patch(es)
 Patch100: autofs-3.1.7-initdir.patch
 Patch100: autofs-3.1.7-initdir.patch
@@ -23,13 +19,24 @@ Patch102: autofs-5.0.8-fix-initscript-vine.patch
 
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: openldap-devel
 BuildRequires: openldap-devel
-BuildRequires: bind-devel, libxml2-devel, openssl-devel
+BuildRequires: libxml2-devel, openssl-devel
 BuildRequires: util-linux-ng, nfs-utils, e2fsprogs
 BuildRequires: util-linux-ng, nfs-utils, e2fsprogs
 BuildRequires: flex, bison
 BuildRequires: flex, bison
+BuildRequires: libtirpc-devel libnsl2-devel
+BuildRequires: rpcgen
+%if %{with systemd}
+BuildRequires: systemd-units
+BuildRequires: systemd-devel
+Requires(post): systemd-sysv
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+%else
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(preun): /sbin/service
 Requires(postun): /sbin/chkconfig
 Requires(postun): /sbin/chkconfig
 Requires(postun): /sbin/service
 Requires(postun): /sbin/service
+%endif
 Requires: kernel >= 2.6.17
 Requires: kernel >= 2.6.17
 Requires: bash, sed, gawk, coreutils, grep, module-init-tools, procps
 Requires: bash, sed, gawk, coreutils, grep, module-init-tools, procps
 Provides: autofs-ldap
 Provides: autofs-ldap
@@ -61,23 +68,32 @@ automount デーモンは,ファイルシステムを使う時に自動的に
 %prep
 %prep
 %setup -q
 %setup -q
 echo %{version}-%{release} > .version
 echo %{version}-%{release} > .version
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
 
 
+%if !%{with systemd}
 ## Vine Patch(es)
 ## Vine Patch(es)
 if [ "%{_initdir}" = "/etc/rc.d/init.d" ]; then
 if [ "%{_initdir}" = "/etc/rc.d/init.d" ]; then
     patch -p1 -b --suffix .initdir < %{PATCH100}
     patch -p1 -b --suffix .initdir < %{PATCH100}
 fi
 fi
 %patch101 -p1 -b .lsb
 %patch101 -p1 -b .lsb
 %patch102 -p1 -b .lsb
 %patch102 -p1 -b .lsb
+%endif
+
+echo %{version}-%{release} > .version
+%if %{with systemd}
+  %define systemd_configure_arg --with-systemd
+%endif
+%define unitdir %{?_unitdir:/lib/systemd/system}
 
 
 %build
 %build
 CFLAGS="$RPM_OPT_FLAGS -ggdb"; export CFLAGS
 CFLAGS="$RPM_OPT_FLAGS -ggdb"; export CFLAGS
-%configure --without-hesiod --without-sasl \
-           --disable-mount-locking --enable-ignore-busy
-make initdir=/etc/rc.d/init.d STRIP=:
-make -C redhat
+%configure \
+           --without-sasl \
+           --disable-mount-locking \
+           --enable-ignore-busy \
+           --enable-forced-shutdown \
+           --without-hesiod \
+           --with-libtirpc %{?systemd_configure_arg:}
+make initdir=/etc/rc.d/init.d DONTSTRIP=1
 
 
 %install
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -86,39 +102,72 @@ mkdir -p -m755 $RPM_BUILD_ROOT%{_libdir}/autofs
 mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/{man5,man8}
 mkdir -p -m755 $RPM_BUILD_ROOT%{_mandir}/{man5,man8}
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p -m755 $RPM_BUILD_ROOT%{_sbindir}
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
 mkdir -p -m755 $RPM_BUILD_ROOT/etc/sysconfig
+mkdir -p -m755 $RPM_BUILD_ROOT/etc/auto.master.d
 
 
-make install mandir=%{_mandir} initdir=/etc/rc.d/init.d INSTALLROOT=$RPM_BUILD_ROOT
+make install mandir=%{_mandir} initdir=/etc/rc.d/init.d systemddir=%{unitdir} INSTALLROOT=$RPM_BUILD_ROOT
 make -C redhat
 make -C redhat
 install -m 755 -d $RPM_BUILD_ROOT/misc
 install -m 755 -d $RPM_BUILD_ROOT/misc
+install -m 644 redhat/autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs
+
+%if %{with systemd}
+# Configure can get this wrong when the unit files appear under /lib and /usr/lib
+find $RPM_BUILD_ROOT -type f -name autofs.service -exec rm -f {} \;
+install -m 644 redhat/autofs.service $RPM_BUILD_ROOT%{unitdir}/autofs.service
+%define init_file_name %{unitdir}/autofs.service
+%else
 install -m 755 redhat/autofs.init $RPM_BUILD_ROOT/etc/rc.d/init.d/autofs
 install -m 755 redhat/autofs.init $RPM_BUILD_ROOT/etc/rc.d/init.d/autofs
+%define init_file_name /etc/rc.d/init.d/autofs
+%endif
+
+install -m 644 redhat/autofs.conf $RPM_BUILD_ROOT/etc/autofs.conf
 install -m 644 redhat/autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs
 install -m 644 redhat/autofs.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/autofs
 
 
+install -m 644 samples/auto.master $RPM_BUILD_ROOT/etc/auto.master
+install -m 644 samples/auto.misc $RPM_BUILD_ROOT/etc/auto.misc
+install -m 755 samples/auto.net $RPM_BUILD_ROOT/etc/auto.net
+install -m 755 samples/auto.smb $RPM_BUILD_ROOT/etc/auto.smb
+install -m 600 samples/autofs_ldap_auth.conf $RPM_BUILD_ROOT/etc/autofs_ldap_auth.conf
+
 %clean
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
 
 
 
 %post
 %post
-/sbin/chkconfig --add autofs
-
+%if %{with systemd}
+%systemd_post %{name}.service
+%else
+if [ $1 -eq 1 ]; then
+    /sbin/chkconfig --add autofs
+fi
+%endif
 
 
 %postun
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart %{name}.service
+%else
 if [ $1 -ge 1 ] ; then
 if [ $1 -ge 1 ] ; then
 	/sbin/service autofs condrestart > /dev/null 2>&1 || :
 	/sbin/service autofs condrestart > /dev/null 2>&1 || :
 fi
 fi
+%endif
 
 
 %preun
 %preun
+%if %{with systemd}
+%systemd_preun %{name}.service
+%else
 if [ "$1" = 0 ] ; then
 if [ "$1" = 0 ] ; then
 	/sbin/service autofs stop > /dev/null 2>&1
 	/sbin/service autofs stop > /dev/null 2>&1
 	chkconfig --del autofs
 	chkconfig --del autofs
 fi
 fi
+%endif
 
 
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc CHANGELOG COPYING COPYRIGHT CREDITS patches/*
+%license COPYING COPYRIGHT
+%doc CHANGELOG CREDITS patches/*
 %doc samples/*
 %doc samples/*
 %doc README README.*
 %doc README README.*
-%config %{_initdir}/autofs
+%config %{init_file_name}
 %config(noreplace) /etc/autofs.conf
 %config(noreplace) /etc/autofs.conf
 %config(noreplace,missingok) /etc/auto.master
 %config(noreplace,missingok) /etc/auto.master
 %config(noreplace,missingok) /etc/auto.misc
 %config(noreplace,missingok) /etc/auto.misc
@@ -131,9 +180,13 @@ fi
 %dir %{_libdir}/autofs
 %dir %{_libdir}/autofs
 %{_libdir}/autofs/*.so
 %{_libdir}/autofs/*.so
 %{_mandir}/*/*
 %{_mandir}/*/*
+%dir /etc/auto.master.d
 
 
 
 
 %changelog
 %changelog
+* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 5.1.6-1
+- updated to 5.1.6
+
 * Sun May 15 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 5.1.1-1
 * Sun May 15 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> - 5.1.1-1
 - update to 5.1.1
 - update to 5.1.1
 
 

+ 35 - 1274
d/dracut/dracut-vl.spec

@@ -9,25 +9,22 @@
 # Variables must be defined
 # Variables must be defined
 %define with_nbd                0
 %define with_nbd                0
 
 
-%define dist_free_release 2
+%define dist_free_release 3
 
 
 Name: dracut
 Name: dracut
-Version: 049
+Version: 050
 Release: %{dist_free_release}%{?_dist_release}
 Release: %{dist_free_release}%{?_dist_release}
 
 
 Summary: Initramfs generator using udev
 Summary: Initramfs generator using udev
 Group: System Environment/Base
 Group: System Environment/Base
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: tomop
 
 
 # The entire source code is GPLv2+
 # The entire source code is GPLv2+
 # except install/* which is LGPLv2+
 # except install/* which is LGPLv2+
 License: GPLv2+ and LGPLv2+
 License: GPLv2+ and LGPLv2+
-
 URL: https://dracut.wiki.kernel.org/
 URL: https://dracut.wiki.kernel.org/
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
-
 # Source can be generated by
 # Source can be generated by
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%%{version};sf=tgz
 # http://git.kernel.org/?p=boot/dracut/dracut.git;a=snapshot;h=%%{version};sf=tgz
 Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
 Source0: http://www.kernel.org/pub/linux/utils/boot/dracut/dracut-%{version}.tar.xz
@@ -55,16 +52,9 @@ Patch21: 0021.patch
 Patch22: 0022.patch
 Patch22: 0022.patch
 Patch23: 0023.patch
 Patch23: 0023.patch
 Patch24: 0024.patch
 Patch24: 0024.patch
+Patch25: 0025.patch
 
 
-# https://github.com/dracutdevs/dracut/pull/541
-# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1676357
-# dracut-install crash during kernel scriptlets
-Patch100: 541.patch
-
-# https://github.com/dracutdevs/dracut/pull/578
-# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1719057
-# installer boot fails if network is required during initramfs
-Patch101: 578.patch
+Patch1000: dracut-050-resolve-symlink.patch
 
 
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 Source1: https://www.gnu.org/licenses/lgpl-2.1.txt
 
 
@@ -73,6 +63,7 @@ Source1000: dracut-warpclock.tar.gz
 Source2000: vine.conf
 Source2000: vine.conf
 Source2001: vine-module-setup.sh
 Source2001: vine-module-setup.sh
 Source2002: vine-usb-pre-udev.sh
 Source2002: vine-usb-pre-udev.sh
+Source2003: ChangeLog.fedora
 
 
 BuildRequires: bash git
 BuildRequires: bash git
 BuildRequires: kmod-devel >= 15
 BuildRequires: kmod-devel >= 15
@@ -260,8 +251,11 @@ This package contains tools to assemble the local initrd and host configuration.
 
 
 %prep
 %prep
 %autosetup -n %{name}-%{version} -S git_am
 %autosetup -n %{name}-%{version} -S git_am
+
 cp %{SOURCE1} .
 cp %{SOURCE1} .
 
 
+cp %{SOURCE2003} .
+
 %build
 %build
 %configure \
 %configure \
 %if %{defined _unitdir}
 %if %{defined _unitdir}
@@ -301,6 +295,9 @@ rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00systemd-bootchart
 # we do not support dash in the initramfs
 # we do not support dash in the initramfs
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00dash
 
 
+# we do not support mksh in the initramfs
+rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/00mksh
+
 # remove gentoo specific modules
 # remove gentoo specific modules
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
 rm -fr -- $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/50gensplash
 
 
@@ -341,15 +338,18 @@ echo 'dracut_rescue_image="yes"' > $RPM_BUILD_ROOT%{dracutlibdir}/dracut.conf.d/
 > $RPM_BUILD_ROOT/etc/system-fips
 > $RPM_BUILD_ROOT/etc/system-fips
 %endif
 %endif
 
 
-pushd $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/
-tar xvf %{SOURCE1000}
-popd
+#pushd $RPM_BUILD_ROOT/%{dracutlibdir}/modules.d/
+#tar xvf %{SOURCE1000}
+#popd
 
 
 # make to load EHCI driver at first
 # make to load EHCI driver at first
 mkdir -p %{buildroot}%{dracutlibdir}/modules.d/70ehci_first
 mkdir -p %{buildroot}%{dracutlibdir}/modules.d/70ehci_first
 install -m755 %{SOURCE2001} %{buildroot}%{dracutlibdir}/modules.d/70ehci_first/module-setup.sh
 install -m755 %{SOURCE2001} %{buildroot}%{dracutlibdir}/modules.d/70ehci_first/module-setup.sh
 install -m755 %{SOURCE2002} %{buildroot}%{dracutlibdir}/modules.d/70ehci_first/usb-pre-udev.sh
 install -m755 %{SOURCE2002} %{buildroot}%{dracutlibdir}/modules.d/70ehci_first/usb-pre-udev.sh
 
 
+# fix path to rngd
+sed -i -e 's|/usr/sbin/|/sbin/|' \
+	%{buildroot}%{dracutlibdir}/modules.d/06rngd/rngd.service
 
 
 %clean
 %clean
 rm -rf -- $RPM_BUILD_ROOT
 rm -rf -- $RPM_BUILD_ROOT
@@ -357,10 +357,11 @@ rm -rf -- $RPM_BUILD_ROOT
 %files
 %files
 %defattr(-,root,root,0755)
 %defattr(-,root,root,0755)
 %if %{with doc}
 %if %{with doc}
-%doc README HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg
+%doc README* HACKING TODO AUTHORS NEWS dracut.html dracut.png dracut.svg
 %endif
 %endif
 %{!?_licensedir:%global license %%doc}
 %{!?_licensedir:%global license %%doc}
 %license COPYING lgpl-2.1.txt
 %license COPYING lgpl-2.1.txt
+%doc ChangeLog.fedora
 %{_bindir}/dracut
 %{_bindir}/dracut
 %{_datadir}/bash-completion/completions/dracut
 %{_datadir}/bash-completion/completions/dracut
 %{_datadir}/bash-completion/completions/lsinitrd
 %{_datadir}/bash-completion/completions/lsinitrd
@@ -412,6 +413,7 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/03rescue
 %{dracutlibdir}/modules.d/03rescue
 %{dracutlibdir}/modules.d/04watchdog
 %{dracutlibdir}/modules.d/04watchdog
 %{dracutlibdir}/modules.d/05busybox
 %{dracutlibdir}/modules.d/05busybox
+%{dracutlibdir}/modules.d/06rngd
 %{dracutlibdir}/modules.d/10i18n
 %{dracutlibdir}/modules.d/10i18n
 %{dracutlibdir}/modules.d/30convertfs
 %{dracutlibdir}/modules.d/30convertfs
 %{dracutlibdir}/modules.d/45url-lib
 %{dracutlibdir}/modules.d/45url-lib
@@ -430,8 +432,10 @@ rm -rf -- $RPM_BUILD_ROOT
 %{dracutlibdir}/modules.d/90lvm
 %{dracutlibdir}/modules.d/90lvm
 %{dracutlibdir}/modules.d/90mdraid
 %{dracutlibdir}/modules.d/90mdraid
 %{dracutlibdir}/modules.d/90multipath
 %{dracutlibdir}/modules.d/90multipath
+%{dracutlibdir}/modules.d/90nvdimm
 %{dracutlibdir}/modules.d/90qemu
 %{dracutlibdir}/modules.d/90qemu
 %{dracutlibdir}/modules.d/90stratis
 %{dracutlibdir}/modules.d/90stratis
+%{dracutlibdir}/modules.d/90ppcmac
 %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-gpg
 %{dracutlibdir}/modules.d/91crypt-loop
 %{dracutlibdir}/modules.d/91crypt-loop
 %{dracutlibdir}/modules.d/95debug
 %{dracutlibdir}/modules.d/95debug
@@ -574,6 +578,16 @@ rm -rf -- $RPM_BUILD_ROOT
 %{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
 %{_sysconfdir}/kernel/postinst.d/51-dracut-rescue-postinst.sh
 
 
 %changelog
 %changelog
+* Fri Apr 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 050-3
+- added support for recursive symlink of /sbin/init.
+
+* Thu Apr 02 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 050-2
+- fixed path to rngd.
+- truncated %%changelog: old logs are moved to ChangeLog.fedora.
+
+* Wed Apr 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 050-1
+- new upstream release.
+
 * Fri Sep 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 049-2
 * Fri Sep 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 049-2
 - imported Patch100 and 101 from rawhide.
 - imported Patch100 and 101 from rawhide.
 - added R:xz-lzma-compat.
 - added R:xz-lzma-compat.
@@ -589,1256 +603,3 @@ rm -rf -- $RPM_BUILD_ROOT
 
 
 * Tue Sep 12 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 046-8
 * Tue Sep 12 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> - 046-8
 - initial build for Vine Linux.
 - initial build for Vine Linux.
-
-* Thu Aug 24 2017 Harald Hoyer <harald@redhat.com> - 046-7
-- git snapshot
-
-* Fri Aug 11 2017 Harald Hoyer <harald@redhat.com> - 046-2
-- add support for dist-tag less build
-
-* Fri Aug 11 2017 Harald Hoyer <harald@redhat.com> - 046-1
-- version 046
-
-* Mon Aug  7 2017 Peter Robinson <pbrobinson@fedoraproject.org> 045-21.git20170515
-- Add upstream patches to fix a number of ARM devices with generic initrd
-
-* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 045-20.git20170515
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 045-19.git20170515
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon May 15 2017 Harald Hoyer <harald@redhat.com> - 045-18.git20170515
-- git snapshot
-
-* Wed Apr 12 2017 Peter Robinson <pbrobinson@fedoraproject.org> 044-178
-- Add upstream patches needed for ARMv7/aarch64 fixes
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 044-177
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Dec 08 2016 Harald Hoyer <harald@redhat.com> - 044-176
-- git snapshot
-
-* Fri Aug 19 2016 Harald Hoyer <harald@redhat.com> - 044-117
-- git snapshot
-
-* Thu Aug 18 2016 Harald Hoyer <harald@redhat.com> - 044-109
-- git snapshot
-
-* Fri Aug 05 2016 Adam Williamson <awilliam@redhat.com> - 044-76
-- backport a single commit to fix RHBZ #1358416 (anaconda network init)
-
-* Tue Jun 07 2016 Harald Hoyer <harald@redhat.com> - 044-75
-- fix for systemd >= 230
-- git snapshot
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 044-18.git20160108
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jan  8 2016 Harald Hoyer <harald@redhat.com> - 044-17.git20160108
-- include more HID driver
-- include machine info file
-- fix network carrier detection
-- fix nbd
-- do not copy over lldpad state
-- restorecon the final initramfs image
-
-* Tue Dec  1 2015 Harald Hoyer <harald@redhat.com> - 044-6.git20151201
-- fix for readonly /run on shutdown
-- fix for the dmsquash-live module
-Resolves: rhbz#1286866
-
-* Wed Nov 25 2015 Harald Hoyer <harald@redhat.com> - 044-4.git20151127
-- fixes for the dmsquash-live module
-- remove udev watch for raid members
-- mode 0755 for the livenet generator
-Resolves: rhbz#1285903
-
-* Wed Nov 25 2015 Harald Hoyer <harald@redhat.com> - 044-1
-- version 044
-
-* Mon Nov 16 2015 Harald Hoyer <harald@redhat.com> - 043-174.git20151116
-- git snapshot
-
-* Mon Nov 16 2015 Harald Hoyer <harald@redhat.com> - 043-173.git20151116
-- git snapshot
-
-* Fri Nov 13 2015 Harald Hoyer <harald@redhat.com> - 043-172.git20151113
-- git snapshot
-
-* Tue Aug 11 2015 Harald Hoyer <harald@redhat.com> 043-60.git20150811
-- fixed checkiso timeout
-- fixed log output although quiet is set
-- fixed qemu detection
-- cleanup compressor handling
-
-* Wed Jul 22 2015 Harald Hoyer <harald@redhat.com> 043-40.git20150710.2
-- require "xz" to handle the kernel modules
-
-* Fri Jul 10 2015 Harald Hoyer <harald@redhat.com> 043-40.git20150710
-- git snapshot
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 043-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon Jun 15 2015 Harald Hoyer <harald@redhat.com> 043-1
-- version 043, now with the complete tarball
-
-* Thu Jun 11 2015 Harald Hoyer <harald@redhat.com> 042-1
-- version 042, the answer to life, the universe and everything
-
-* Thu Feb 19 2015 Harald Hoyer <harald@redhat.com> 041-10.git20150219
-- git snapshot
-
-* Sat Jan 31 2015 Harald Hoyer <harald@redhat.com> 041-1
-- version 041
-
-* Thu Jan 08 2015 Harald Hoyer <harald@redhat.com> 040-83.git20150108
-- git snapshot
-
-* Fri Dec 19 2014 Harald Hoyer <harald@redhat.com> 040-78.git20141219
-- git snapshot
-
-* Mon Dec 08 2014 Harald Hoyer <harald@redhat.com> 040-30.git20141208
-- fixed dracut-shutdown
-
-* Thu Dec 04 2014 Harald Hoyer <harald@redhat.com> 040-29.git20141204
-- git snapshot
-
-* Tue Sep 30 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 038-36.git20140815
-- Allow media check to be cancelled (rhbz 1147941)
-
-* Fri Sep 26 2014 Josh Boyer <jwboyer@fedoraproject.org> - 038-35.git20140815
-- Enable early-microcode by default (rhbz 1083716)
-- Fix changelog date
-
-* Tue Aug 19 2014 Harald Hoyer <harald@redhat.com> - 038-34.git20140815
-- git snapshot
-
-* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 038-31.git20140815
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Fri Aug 15 2014 Harald Hoyer <harald@redhat.com> 038-30.git20140815
-- git snapshot
-
-* Thu Jul 24 2014 Harald Hoyer <harald@redhat.com> 038-14.git20140724
-- fixed lvm modules issues
-Resolves: rhbz#1118890
-- fixed vlan issues
-- fixed prelink for FIPS
-- new rd.route parameter
-- more ARM modules
-
-* Fri Jul 11 2014 Tom Callaway <spot@fedoraproject.org> - 038-2
-- fix license handling
-
-* Mon Jun 30 2014 Harald Hoyer <harald@redhat.com> 038-1
-- version 038
-
-* Sat Jun 28 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 037-14.git20140628
-- Pull most bugfixy commits from current git
-Resolves: rhbz#1112061
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 037-13.git20140402
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri May 23 2014 Peter Robinson <pbrobinson@fedoraproject.org> 037-12.git20140402
-- Fix achi/mmc/sdhci selection for non host based initrd
-
-* Thu Apr 17 2014 Adam Williamson <awilliam@redhat.com> - 037-11.git20140402
-- revert broken upstream change that causes RHBZ#1084766
-
-* Wed Apr 02 2014 Harald Hoyer <harald@redhat.com> 037-10.git20140402
-- fixed fstab.sys with systemd
-- DHCPv6 fixes
-- dm-cache module now included
-- FCoE fixes
-
-* Thu Mar 20 2014 Harald Hoyer <harald@redhat.com> 037-3.git20140320
-- fixed dracut-initramfs-restore with microcode
-
-* Thu Mar 20 2014 Harald Hoyer <harald@redhat.com> 037-1
-- version 037
-
-* Thu Feb 06 2014 Harald Hoyer <harald@redhat.com> 036-16.git20140206
-- version 036
-- parse dns information on "ip=" command line arg
-- preserve ownership of files, if root creates the initramfs
-- parse ibft nameserver settings
-- do not run dhcp twice on an interface
-- try to not reload systemd
-
-* Wed Dec 18 2013 Harald Hoyer <harald@redhat.com> 034-74.git20131218
-- do not systemctl daemon-reload
-- do iscsistart for iscsi_firmware even without network
-
-* Mon Dec 16 2013 Harald Hoyer <harald@redhat.com> 034-70.git20131216
-- fixed systemd password waiting
-- split out fcoe uefi
-- fixed lvm thin tools check
-
-* Thu Dec 05 2013 Harald Hoyer <harald@redhat.com> 034-62.git20131205
-- fixed PATH shortener
-- also install /etc/system-fips in the initramfs
-- nbd, do not fail in hostonly mode
-- add ohci-pci to the list of hardcoded modules
-- lvm: do not run pvscan for lvmetad
-- network fixes
-- skip crypt swaps with password files
-- fixed i18n
-
-* Wed Oct 30 2013 Harald Hoyer <harald@redhat.com> 034-24.git20131030
-- fixed booting with rd.iscsi.firmware and without root=
-- fips: include crct10dif_generic
-- fixed missing modules in hostonly, which have no modalias
-- moved dracut to /usr/sbin
-
-* Mon Oct 21 2013 Harald Hoyer <harald@redhat.com> 034-19.git20131021
-- Fixed LVM with thin provisioning
-Resolves: rhbz#1013767
-Resolves: rhbz#1021083
-
-* Fri Oct 18 2013 Harald Hoyer <harald@redhat.com> 034-18.git20131018
-- Fixed LVM with thin provisioning
-Resolves: rhbz#1013767
-- fixed swap detection in host only mode
-
-* Fri Oct 11 2013 Kyle McMartin <kyle@fedoraproject.org> 034-8.git20131008
-- Force mmc_block and usb_storage into ARM initramfs.
-Resolves: rhbz#1015234
-
-* Tue Oct 08 2013 Harald Hoyer <harald@redhat.com> 034-7.git20131008
-- lvm: install thin utils for non-hostonly
-- do not bail out, if kernel modules dir is missing
-- dmsquash-live: add /dev/mapper/live-base
-Resolves: rhbz#1016726
-
-* Tue Oct 08 2013 Harald Hoyer <harald@redhat.com> 034-1
-- version 034
-- add option to turn on/off prelinking
-    --prelink, --noprelink
-    do_prelink=[yes|no]
-- add ACPI table overriding
-- do not log to syslog/kmsg/journal for UID != 0
-- lvm/mdraid: Fix LVM on MD activation
-- bcache module removed (now in bcache-tools upstream)
-- mdadm: also install configs from /etc/mdadm.conf.d
-- fixes for mdadm-3.2.6+
-- fcoe: add FCoE UEFI boot device support
-- rootfs-block: add support for the rootfallback= kernel cmdline option
-
-* Fri Sep 13 2013 Harald Hoyer <harald@redhat.com> 033-3.git20130913
-- do not dhcp members of team, bond, etc.
-- harden against weird ppc kernel driver
-Resolves: rhbz#1007891
-
-* Thu Sep 12 2013 Harald Hoyer <harald@redhat.com> 033-1
-- do not cache the kernel cmdline
-Resolves: rhbz#989944
-- fixed iso-scan
-Resolves: rhbz#1005487
-- support blkid with bcache
-Resolves: rhbz#1003207
-- ifup with dhcp, if no ip= params specified
-Resolves: rhbz#989944
-- silently try to umount rpc_pipefs
-Resolves: rhbz#999996
-
-* Wed Sep 04 2013 Harald Hoyer <harald@redhat.com> 032-23.git20130904
-- fixed curl error with zero size kickstart file
-Resolves: rhbz#989133
-- fixed systemd-cat failure, when systemd is installed
-  but not actually running
-Resolves: rhbz#1002021
-- do not fail on empty dracut module directories
-Resolves: rhbz#1003153
-
-* Tue Aug 20 2013 Harald Hoyer <harald@redhat.com> 032-1
-- fix for kdump in FIPS mode
-Resolves: rhbz#920931
-- fixed iBFT booting
-Resolves: rhbz#989944
-- fixed FIPS mode initramfs creation
-Resolves: rhbz#990250
-- shutdown: fixed killall_proc_mountpoint()
-Resolves: rhbz#996549
-- disable lvmetad in the initramfs
-Resolves: rhbz#996627
-- require dhclient
-
-* Mon Aug 12 2013 Harald Hoyer <harald@redhat.com> 031-29.git20130812
-- added missing "then" in initqueue
-
-* Mon Aug 12 2013 Harald Hoyer <harald@redhat.com> 031-28.git20130812
-- fixed typo in hostonly device recognition
-
-* Fri Aug 09 2013 Harald Hoyer <harald@redhat.com> 031-24.git20130809
-- fixed logging to journal
-
-* Fri Aug 09 2013 Harald Hoyer <harald@redhat.com> 031-23.git20130809
-- fixed lsinitrd
-
-* Fri Aug 09 2013 Harald Hoyer <harald@redhat.com> 031-22.git20130809
-- lsinitrd.sh: add old cpio signature
-- dracut.sh: call find with -print0 and cpio with --null
-- dracut.asc: small corrections
-- systemd/dracut-initqueue.sh: continue to boot if finished failed
-- dracut.sh/dracut-functions.sh: handle root on non-block device
-- dracut-functions.sh: removed non dracut-install shell functions
-- dracut-functions.sh: inst_multiple == dracut_install
-- 51-dracut-rescue.install: fixed rescue image creation
-- dracut.sh: do not strip in FIPS mode
-Resolves: rhbz#990250
-- dracut.sh: check the value of --kver
-- crypt: Fix typo--/etc/crypttab not /etc/cryptab
-- network/net-lib.sh: fix ibft interface configuration
-- iscsi/module-setup.sh: install some modules regardless of hostonly
-- multipath: need_shutdown if multipath devices exist
-Resolves: rhbz#994913
-- omit drivers fix
-
-* Thu Aug 01 2013 Harald Hoyer <harald@redhat.com> 031-7.git20130801
-- also install vt102 terminfo
-
-* Wed Jul 31 2013 Harald Hoyer <harald@redhat.com> 031-6.git20130731
-- cmssetup: fixed port for zfcp.conf
-- lvm: call lvchange with --yes to boot from snapshots
-
-* Wed Jul 31 2013 Harald Hoyer <harald@redhat.com> 031-4.git20130731
-- remove action_on_fail kernel command line parameter
-
-* Wed Jul 31 2013 Harald Hoyer <harald@redhat.com> 031-3.git20130731
-- do not include adjtime and localtime in the initramfs
-- write out vlan configs
-
-* Wed Jul 31 2013 Harald Hoyer <harald@redhat.com> 031-1
-- do not include the resume dracut module in hostonly mode,
-  if no swap is present
-- don't warn twice about omitted modules
-- use systemd-cat for logging on systemd systems, if logfile is unset
-- fixed PARTUUID parsing
-- support kernel module signing keys
-- do not install the usrmount dracut module in hostonly mode,
-  if /sbin/init does not live in /usr
-- add debian udev rule files
-- add support for bcache
-- network: handle bootif style interfaces
-  e.g. ip=77-77-6f-6f-64-73:dhcp
-- add support for kmod static devnodes
-- add vlan support for iBFT
-
-* Wed Jul 24 2013 Kyle McMartin <kyle@redhat.com> 030-2
-- Add ehci-tegra.ko to initramfs to allow rawhide tegra based platforms
-  to boot off USB disks.
-
-* Wed Jul 17 2013 Harald Hoyer <harald@redhat.com> 030-1
-- support new persistent network interface names
-- fix findmnt calls, prevents hang on stale NFS mounts
-- add systemd.slice and slice.target units
-- major shell cleanup
-- support root=PARTLABEL= and root=PARTUUID=
-- terminfo: only install l/linux v/vt100 and v/vt220
-- unset all LC_* and LANG, 10% faster
-- fixed dependency loop for dracut-cmdline.service
-- do not wait_for_dev for the root devices
-- do not wait_for_dev for devices, if dracut-initqueue is not needed
-- support early microcode loading with --early-microcode
-- dmraid, let dmraid setup its own partitions
-- sosreport renamed to rdsosreport
-
-* Fri Jun 14 2013 Harald Hoyer <harald@redhat.com> 029-1
-- wait for IPv6 auto configuration
-Resolves: rhbz#973719
-- i18n: make the default font configurable
-- systemd/dracut-pre-pivot.service: also execute for cleanup hooks or rd.break
-- add dracut-shutdown.service.8 manpage
-- lvm: redirect error message of lvs to /dev/null
-Resolves: rhbz#921235
-
-* Wed Jun 12 2013 Harald Hoyer <harald@redhat.com> 028-1
-- lvm: fixed "thin" recognition
-Resolves: rhbz#921235
-- install libs also from one dir above
-  fixes booting power6 generated initramfs on power7
-- setup correct system time and time zone in initrd
-- cms fixups
-Resolves: rhbz#970982 rhbz#971025 rhbz#825199
-- iso-scan/filename fixes
-Resolves: rhbz#972337
-- add udev rules for persistent network naming
-Resolves: rhbz#972662
-
-* Tue Jun 04 2013 Dennis Gilmore <dennis@ausil.us> 027-82.git20130531
-- add patch to include  panel-tfp410 module on arm systems
-
-* Fri May 31 2013 Harald Hoyer <harald@redhat.com> 027-81.git20130531
-- fix btrfs mount flags for /usr
-- degrade message about missing tools for stripping
-Resolves: rhbz#958519
-- set environment vars DRACUT_SYSTEMD, NEWROOT in service file
-Resolves: rhbz#963159
-- don't add volatile swap partitions to host_devs
-- add libssl.so.10 to make kdump work with fips mode
-- readd selinux dracut module for kdump
-- url-lib/url-lib.sh: turn off curl globbing
-Resolves: rhbz#907497
-- include btrfs-zero-log in the initramfs
-Resolves: rhbz#963257
-- proper NAME the network interfaces
-Resolves: rhbz#965842
-- install default font latarcyrheb-sun16
-Resolves: rhbz#927564
-- optionally install /etc/pcmcia/config.opts
-Resolves: rhbz#920076
-- fix ONBOOT for slaves, set TYPE=Bond for bonding
-Resolves: rhbz#919001
-- add nvme kernel module
-Resolves: rhbz#910734
-- add xfs_metadump
-- selinux: load_policy script fix
-- add hid-hyperv and hv-vmbus kernel modules
-- add parameter rd.live.squashimg
-Resolves: rhbz#789036 rhbz#782108
-- wait for all required interfaces if "rd.neednet=1"
-Resolves: rhbz#801829
-- lvm: add tools for thin provisioning
-Resolves: rhbz#921235
-- ifcfg/write-ifcfg.sh: fixed ifcfg file generation
-- do not wait for mpath* devices
-Resolves: rhbz#969068
-
-* Wed May 22 2013 Adam Williamson <awilliam@redhat.com> 027-46.git20130430
-- don't specify "p" as a separator for dmraid
-Resolves: rhbz#966162
-
-* Tue Apr 30 2013 Harald Hoyer <harald@redhat.com> 027-45.git20130430
-- fixed fips mode more
-Resolves: rhbz#956521
-
-* Thu Apr 25 2013 Harald Hoyer <harald@redhat.com> 027-39.git20130425
-- fix shutdown, if /dev/console is not writeable
-- fixed fips mode
-Resolves: rhbz#956521
-
-* Thu Apr 18 2013 Harald Hoyer <harald@redhat.com> 027-36.git20130418
-- fix initramfs creation on noexec tmpdir
-Resolves: rhbz#953426
-- more options for lsinitrd
-- bash completion for lsinitrd
-- do not output debug information on initramfs creation, if rd.debug is
-  on the kernel command line
-- drop requirement on 'file', lsinitrd can find the magic on its own
-
-* Mon Apr 15 2013 Harald Hoyer <harald@redhat.com> 027-26.git20130415
-- do not call plymouth with full path
-- include systemd-random-seed-load.service
-- fix ca-bundle.crt for ssl curl
-Resolves: rhbz#950770
-- add support for "iso-scan/filename" kernel parameter
-
-* Wed Apr 10 2013 Harald Hoyer <harald@redhat.com> 027-19.git20130410
-- also handle UUID= entries in crypttab in host-only mode
-Resolves:rhbz#919752
-
-* Tue Apr 09 2013 Harald Hoyer <harald@redhat.com> 027-17.git20130409
-- only include needed /etc/crypttab entries
-Resolves:rhbz#919752
-- add support for bridge over team and vlan
-- support multiple bonding interfaces
-- add "action_on_fail=" kernel command line parameter
-- add support for bridge over a vlan tagged interface
-
-* Fri Apr 05 2013 Harald Hoyer <harald@redhat.com> 027-10.git20130405
-- fix crypto password timeout on the dracut side
-
-* Tue Mar 26 2013 Harald Hoyer <harald@redhat.com> 027-1
-- version 027
-
-* Wed Mar 20 2013 Harald Hoyer <harald@redhat.com> 026-72.git20130320
-- fix rescue image naming
-Resolves: rhbz#923439
-- turn off host-only mode if essential system filesystems not mounted
-- turn off host-only mode if udev database is not accessible
-
-* Tue Mar 19 2013 Harald Hoyer <harald@redhat.com> 026-62.git20130319
-- fix dracut service ordering
-Resolves: rhbz#922991
-
-* Mon Mar 18 2013 Harald Hoyer <harald@redhat.com> 026-56.git20130318
-- don't fail hard on kernel modules install
-Resolves: rhbz#922565
-
-* Mon Mar 18 2013 Harald Hoyer <harald@redhat.com> 026-55.git20130318
-- install all host filesystem drivers
-Resolves: rhbz#922565
-
-* Sat Mar 16 2013 Harald Hoyer <harald@redhat.com> 026-54.git20130316
-- fix for squashfs
-Resolves: rhbz#922248
-- documentation fixes
-- sosreport, mkdir /run/initramfs
-
-* Fri Mar 15 2013 Harald Hoyer <harald@redhat.com> 026-48.git20130315
-- use new initrd.target from systemd
-- fixed rescue generation
-
-* Wed Mar 13 2013 Harald Hoyer <harald@redhat.com> 026-33.git20130313
-- add module-load.d modules to the initramfs
-- add sysctl.d to the initramfs
-- optimize plymouth module for systemd mode
-- add new dracut parameter "--regenerate-all"
-- add new dracut parameter "--noimageifnotneeded"
-- shutdown: mount move /run /sys /dev /proc out of /oldroot
-  before pre-shutdown
-- add bash completion for dracut
-
-* Wed Mar 13 2013 Harald Hoyer <harald@redhat.com> 026-19.git20130313
-- fix switch-root and local-fs.target problem
-- add norescue and nohostonly subpackages
-
-* Mon Mar 11 2013 Harald Hoyer <harald@redhat.com> 026-15.git20130311
-- update to recent git
-
-* Fri Mar 08 2013 Harald Hoyer <harald@redhat.com> 026-1
-- version 026
-
-* Mon Feb 11 2013 Harald Hoyer <harald@redhat.com> 025-35.git20130211
-- update to recent git
-
-* Wed Jan 23 2013 Harald Hoyer <harald@redhat.com> 025-1
-- version 025
-
-* Tue Aug 21 2012 Harald Hoyer <harald@redhat.com> 023-13.git20120821
-- reintroduce rd.neednet, which reenables anaconda networking
-- fix some dracut-install corner cases
-- fix FIPS for /boot not on extra partition
-
-* Wed Aug 01 2012 Dennis Gilmore <dennis@ausil.us> - 023-2
-- add patch to include omap_hsmmc for arm
-
-* Wed Aug 01 2012 Harald Hoyer <harald@redhat.com> 023-1
-- version 023
-
-* Mon Jul 30 2012 Harald Hoyer <harald@redhat.com> 022-99.git20120730
-- removed install of missing finished-ask-password.sh
-
-* Mon Jul 30 2012 Harald Hoyer <harald@redhat.com> 022-97.git20120730
-- moved crypt setup to systemd units
-
-* Fri Jul 27 2012 Harald Hoyer <harald@redhat.com> 022-63.git20120727
-- fixed dracut-install bug if /var/tmp contains a symlink
-- fixed some partx issues
-
-* Mon Jul 23 2012 Harald Hoyer <harald@redhat.com> 022-5.git20120723
-- dracut.8: added more documentation about executing dracut
-
-* Fri Jul 20 2012 Harald Hoyer <harald@redhat.com> 022-2.git20120720
-- fixed some race condition for resume from hibernation
-
-* Fri Jul 20 2012 Harald Hoyer <harald@redhat.com> 022-1
-- version 022
-- host-only kernel modules fix
-
-* Fri Jul 20 2012 Harald Hoyer <harald@redhat.com> 021-1
-- version 21
-- systemd in the initramfs reenabled
-- new option "--kver"
-
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 020-97.git20120717
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Tue Jul 17 2012 Harald Hoyer <harald@redhat.com> 020-96.git20120717
-- disabled systemd in the initramfs, until it works correctly
-
-* Wed Jul 11 2012 Harald Hoyer <harald@redhat.com> 020-84.git20120711
-- add back "--force" to switch-root, otherwise systemd umounts /run
-
-* Wed Jul 11 2012 Harald Hoyer <harald@redhat.com> 020-83.git20120711
-- more systemd journal fixes
-- nfs module fix
-- install also /lib/modprobe.d/*
-- fixed dracut-shutdown service
-- safeguards for dracut-install
-- for --include also copy symlinks
-
-* Tue Jul 10 2012 Harald Hoyer <harald@redhat.com> 020-72.git20120710
-- stop journal rather than restart
-- copy over dracut services to /run/systemd/system
-
-* Tue Jul 10 2012 Harald Hoyer <harald@redhat.com> 020-70.git20120710
-- more systemd unit fixups
-- restart systemd-journald in switch-root post
-- fixed dracut-install loader ldd error message
-
-* Mon Jul 09 2012 Harald Hoyer <harald@redhat.com> 020-64.git20120709
-- fixed plymouth install
-- fixed resume
-- fixed dhcp
-- no dracut systemd services installed in the system
-
-* Mon Jul 09 2012 Harald Hoyer <harald@redhat.com> 020-57.git20120709
-- more fixups for systemd-udevd unit renaming
-
-* Mon Jul 09 2012 Harald Hoyer <harald@redhat.com> 020-55.git20120709
-- require systemd >= 186
-- more fixups for systemd-udevd unit renaming
-
-* Mon Jul 09 2012 Harald Hoyer <harald@redhat.com> 020-52.git20120709
-- fixed prefix in 01-dist.conf
-
-* Fri Jul 06 2012 Harald Hoyer <harald@redhat.com> 020-51.git20120706
-- cope with systemd-udevd unit renaming
-- fixed network renaming
-- removed dash module
-
-* Mon Jul 02 2012 Harald Hoyer <harald@redhat.com> 020-22.git20120702
-- fixed kernel modules install
-
-* Mon Jul 02 2012 Harald Hoyer <harald@redhat.com> 020-21.git20120702
-- moved /usr/bin/dracut-install to /usr/lib
-- more speedups
-
-* Fri Jun 29 2012 Harald Hoyer <harald@redhat.com> 020-1
-- version 020
-- new /usr/bin/dracut-install tool
-- major speedup of the image creation
-
-* Mon Jun 25 2012 Harald Hoyer <harald@redhat.com> 019-92.git20120625
-- support vlan tagged binding
-- speedup initramfs emergency service
-- speedup image creation
-- fix installkernel() return codes
-Resolves: rhbz#833256
-- add qemu and qemu-net modules to add qemu drivers even in host-only
-- speedup btrfs and xfs fsck (nop)
-- no more mknod in the initramfs (fixes plymouth on s390)
-
-* Thu Jun 21 2012 Harald Hoyer <harald@redhat.com> 019-62.git20120621
-- do not require pkg-config for systemd
-- i18n fixes
-- less systemd services in the initramfs
-
-* Thu Jun 21 2012 Harald Hoyer <harald@redhat.com> 019-57.git20120620
-- systemd is now the default init in the initramfs
-
-* Mon Jun 18 2012 Harald Hoyer <harald@redhat.com> 019-40.git20120618
-- new upstream version
-
-* Mon Jun 11 2012 Harald Hoyer <harald@redhat.com> 019-16.git20120611
-- new upstream version
-
-* Tue Jun 05 2012 Dennis Gilmore <dennis@ausil.us> 019-2
-- include omapdrm with the arm modules
-
-* Mon Jun 04 2012 Harald Hoyer <harald@redhat.com> 019-1
-- version 019-1
-
-* Tue May 22 2012 Harald Hoyer <harald@redhat.com> 018-74.git20120522
-- new upstream version
-
-* Thu May 17 2012 Dennis Gilmore <dennis@ausil.us> 018-53.git20120509
-- add patch to pull in arm storage modules
-
-* Wed May 09 2012 Harald Hoyer <harald@redhat.com> 018-52.git20120509
-- new upstream version
-
-* Fri May 04 2012 Harald Hoyer <harald@redhat.com> 018-40.git20120504
-- new upstream version
-
-* Wed Apr 25 2012 Harald Hoyer <harald@redhat.com> 018-37.git20120425.1
-- fixup for multipath and iscsi host-only detection
-
-* Wed Apr 25 2012 Harald Hoyer <harald@redhat.com> 018-37.git20120425
-- fixed udevd location
-
-* Tue Apr 24 2012 Harald Hoyer <harald@redhat.com> 018-33.git20120424
-- new upstream version
-
-* Thu Apr 19 2012 Harald Hoyer <harald@redhat.com> 018-25.git20120419
-- fixed network for non-network root (like installer media)
-
-* Wed Apr 18 2012 Harald Hoyer <harald@redhat.com> 018-22.git20120418
-- new upstream version
-
-* Mon Apr 16 2012 Harald Hoyer <harald@redhat.com> 018-12.git20120416
-- new upstream version, which fixes various anaconda loader issues
-
-* Thu Apr 05 2012 Harald Hoyer <harald@redhat.com> 018-1
-- version 018
-
-* Thu Mar 22 2012 Harald Hoyer <harald@redhat.com> 017-62.git20120322
-- fixed /run prefix copying
-
-* Wed Mar 21 2012 Harald Hoyer <harald@redhat.com> 017-59.git20120321
-- new upstream version, which fixes various anaconda loader issues
-
-* Mon Mar 12 2012 Harald Hoyer <harald@redhat.com> 017-43.git20120312
-- live image: fixed image uncompression
-- live updates for livenet
-
-* Thu Mar 08 2012 Harald Hoyer <harald@redhat.com> 017-40.git20120308
-- add s390 ctcm network kernel module
-
-* Thu Mar 08 2012 Harald Hoyer <harald@redhat.com> 017-39.git20120308
-- kill dhclient silently
-- cleanup and fix network config writeout to /run/initramfs/state
-Resolves: rhbz#799989
-- various cleanups
-
-* Fri Mar 02 2012 Harald Hoyer <harald@redhat.com> 017-22.git20120302
-- nfs path fixes for live image over nfs
-  root=live:nfs://10.10.10.10:/srv/all/install.img ip=dhcp rd.neednet
-
-* Thu Mar 01 2012 Harald Hoyer <harald@redhat.com> 017-19.git20120301
-- fixed include of some kernel modules
-
-* Wed Feb 29 2012 Harald Hoyer <harald@redhat.com> 017-17.git20120229
-- update to latest git
-- fixes for convertfs (/usr-move)
-
-* Fri Feb 24 2012 Harald Hoyer <harald@redhat.com> 017-1
-- version 017
-
-* Fri Feb 17 2012 Harald Hoyer <harald@redhat.com> 016-9.git20120217
-- update to latest git
-
-* Wed Feb 15 2012 Harald Hoyer <harald@redhat.com> 016-1
-- version 016
-
-* Mon Feb 13 2012 Harald Hoyer <harald@redhat.com> 015-9.git20120213
-- update to latest git
-
-* Sun Feb 12 2012 Kay Sievers <kay@redhat.com> - 015-9.git20120210
-- fix dependency loop in systemd service files
-
-* Fri Feb 10 2012 Harald Hoyer <harald@redhat.com> 015-8.git20120210
-- update to latest git
-
-* Thu Feb 09 2012 Harald Hoyer <harald@redhat.com> 015-7.git20120209
-- update to latest git
-
-* Thu Feb 09 2012 Harald Hoyer <harald@redhat.com> 015-4.git20120209
-- update to latest git
-
-* Wed Feb 08 2012 Harald Hoyer <harald@redhat.com> 015-3.git20120208
-- update to latest git
-
-* Tue Feb 07 2012 Harald Hoyer <harald@redhat.com> 015-1
-- version 015
-
-* Thu Feb 02 2012 Harald Hoyer <harald@redhat.com> 014-81.git20120202
-- update to latest git
-
-* Thu Feb 02 2012 Harald Hoyer <harald@redhat.com> 014-80.git20120202
-- update to latest git
-
-* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-77.git20120126.1
-- rebuild for rawhide
-
-* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-77.git20120126
-- update to latest git
-
-* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-76.git20120126
-- update to latest git
-
-* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-75.git20120126
-- update to latest git
-
-* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-74.git20120126
-- update to latest git
-
-* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-73.git20120126
-- update to latest git
-
-* Thu Jan 26 2012 Harald Hoyer <harald@redhat.com> 014-72.git20120126
-- update to latest git
-
-* Mon Jan 23 2012 Harald Hoyer <harald@redhat.com> 014-65.git20120123
-- update to latest git
-
-* Mon Jan 23 2012 Harald Hoyer <harald@redhat.com> 014-61.git20120123
-- update to latest git
-
-* Tue Jan 17 2012 Harald Hoyer <harald@redhat.com> 014-38.git20120117
-- update to latest git
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 014-10.git20111215
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Dec 15 2011 Harald Hoyer <harald@redhat.com> 014-9.git20111215
-- update to latest git
-- lots of patch changes
-
-* Fri Oct 21 2011 Harald Hoyer <harald@redhat.com> 013-100.git20111021
-- update to latest git
-
-* Thu Oct 20 2011 Harald Hoyer <harald@redhat.com> 013-93.git20111020
-- update to latest git
-
-* Wed Oct 19 2011 Harald Hoyer <harald@redhat.com> 013-85.git20111019
-- update to latest git
-
-* Tue Oct 04 2011 Harald Hoyer <harald@redhat.com> 013-15
-- fixed mdraid container handling
-Resolves: rhbz#743240
-
-* Thu Sep 22 2011 Harald Hoyer <harald@redhat.com> 013-13
-- fixed mdraid issues
-- fixed btrfsck
-Resolves: rhbz#735602
-
-* Wed Sep 21 2011 Harald Hoyer <harald@redhat.com> 013-12
-- removed patch backup files
-- reintroduced /dev/live
-
-* Tue Sep 20 2011 Harald Hoyer <harald@redhat.com> 013-11
-- move mounting of securitfs to a seperate module
-Resolves: rhbz#737140
-
-* Tue Sep 20 2011 Harald Hoyer <harald@redhat.com> 013-10
-- mount securitfs with the correct source
-Resolves: rhbz#737140
-
-* Tue Sep 20 2011 Harald Hoyer <harald@redhat.com> 013-9
-- do not carry over initramfs udev rules
-Resolves: rhbz#734096
-
-* Fri Sep 02 2011 Harald Hoyer <harald@redhat.com> 013-8
-- hopefully fixed one part of a loop/udev and loop/mount race
-Resolves: rhbz#735199
-
-* Wed Aug 31 2011 Harald Hoyer <harald@redhat.com> 013-7
-- add /lib/udev/input_id to the initramfs
-- fix hmac install
-
-* Tue Aug 30 2011 Harald Hoyer <harald@redhat.com> 013-6
-- fixed environment passing to real init
-Resolves: rhbz#733674
-- fixed lvm on md
-
-* Mon Aug 29 2011 Harald Hoyer <harald@redhat.com> 013-5
-- fixed rhel/fedora version checks
-
-* Wed Aug 17 2011 Harald Hoyer <harald@redhat.com> 013-4
-- fixed crash with livenet installed
-
-* Wed Aug 17 2011 Harald Hoyer <harald@redhat.com> 013-3
-- fixed live iso mounting
-Resolves: rhbz#730579
-
-* Fri Aug 12 2011 Harald Hoyer <harald@redhat.com> 013-1
-- fixed symlink creation for lorax
-
-* Wed Aug 10 2011 Harald Hoyer <harald@redhat.com> 011-41.git20110810
-- fixed getargs() for empty args
-
-* Wed Aug 10 2011 Harald Hoyer <harald@redhat.com> 011-40.git20110810
-- fixed symbolic link creation in the initramfs
-Resolves: rhbz#728863
-
-* Wed Jul 20 2011 Harald Hoyer <harald@redhat.com> 011-15.git20110720
-- "eject" is optional now
-- refined shutdown procedure
-
-* Mon Jul 18 2011 Harald Hoyer <harald@redhat.com> 011-1
-- version 011
-
-* Fri May 20 2011 Harald Hoyer <harald@redhat.com> 011-0.1%{?rdist}
-- git snapshot of pre-version 011
-
-* Fri Apr 01 2011 Harald Hoyer <harald@redhat.com> 010-1
-- version 010
-
-* Thu Mar 31 2011 Harald Hoyer <harald@redhat.com> 009-5
-- fixed PATH and kmsg logging
-
-* Thu Mar 31 2011 Harald Hoyer <harald@redhat.com> 009-4
-- fixed dmsquash rule generation
-- fixed fips boot arg parsing
-- fixed plymouth pid generation
-
-* Wed Mar 30 2011 Harald Hoyer <harald@redhat.com> 009-3
-- fixed dhcp
-- added /lib/firmware/updates to firmware directories 
-- fixed LiveCD /dev/.initramfs fallback
-- fixed cdrom polling
-- dropped net-tools dependency
-
-* Tue Mar 29 2011 Harald Hoyer <harald@redhat.com> 009-2
-- fixed empty output file argument handling:
-  "dracut '' <kernel version>" 
-
-* Mon Mar 28 2011 Harald Hoyer <harald@redhat.com> 009-1
-- version 009
-
-* Thu Mar 17 2011 Harald Hoyer <harald@redhat.com> 009-0.1
-- version 009 prerelease
-
-* Tue Feb 22 2011 Harald Hoyer <harald@redhat.com> 008-7
-- fixed lvm version parsing
-
-* Tue Feb 22 2011 Harald Hoyer <harald@redhat.com> 008-6
-- fixed lvm version parsing
-
-* Mon Feb 21 2011 Harald Hoyer <harald@redhat.com> 008-5
-- fixed i18n unicode setting
-- set cdrom in kernel polling
-
-* Fri Feb 18 2011 Harald Hoyer <harald@redhat.com> 008-4
-- readded dist tag
-
-* Fri Feb 18 2011 Harald Hoyer <harald@redhat.com> 008-3
-- fixed i18n
-- turned off selinux by default
-
-* Wed Feb 09 2011 Harald Hoyer <harald@redhat.com> 008-2
-- do not write dracut.log to /tmp under any circumstances
-- touch /dev/.systemd/plymouth after plymouth started
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 008-1.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Wed Feb 02 2011 Harald Hoyer <harald@redhat.com> 008-1
-- version 008-1
-
-* Mon Jan 17 2011 Harald Hoyer <harald@redhat.com> 008-0.11
-- removed "mount" requirement
-
-* Thu Nov 18 2010 Harald Hoyer <harald@redhat.com> - 008-0.10
-- dracut-008 pre git snapshot
-- fixes /dev/dri permissions
-Resolves: rhbz#626559
-
-* Fri Nov 12 2010 Harald Hoyer <harald@redhat.com> 008-0.9
-- dracut-008 pre git snapshot
-- fixes /dev/.udev permissions
-Resolves: rhbz#651594
-
-* Wed Nov  3 2010 Harald Hoyer <harald@redhat.com> - 008-0.8
-- fixed fsck -a option
-
-* Fri Oct 29 2010 Harald Hoyer <harald@redhat.com> 008-0.7
-- added fsck to initramfs
-
-* Fri Oct 29 2010 Harald Hoyer <harald@redhat.com> 008-0.6
-- fixed rpm macros
-
-* Fri Oct 29 2010 Harald Hoyer <harald@redhat.com> 008-0.5
-- dracut-008 pre git snapshot
-
-* Mon Aug 09 2010 Harald Hoyer <harald@redhat.com> 007-1
-- version 007
-
-* Thu Jun 17 2010 Harald Hoyer <harald@redhat.com> 006-1
-- version 006
-
-* Fri Jun 11 2010 Harald Hoyer <harald@redhat.com>
-- Remove requirements, which are not really needed
-Resolves: rhbz#598509
-- fixed copy of network config to /dev/.initramfs/ (patch 146)
-Resolves: rhbz#594649
-- more password beauty (patch 142)
-Resolves: rhbz#561092
-- support multiple iSCSI disks (patch 143)
-Resolves: rbhz#580190
-- fixed selinux=0 (patch 130)
-Resolves: rhbz#593080
-- add support for booting LVM snapshot root volume (patch 145)
-Resolves: rbhz#602723
-- remove hardware field from BOOTIF= (patch 148)
-Resolves: rhbz#599593
-- add aes kernel modules and fix crypt handling (patch 137, patch 140 and patch 147)
-Resolves: rhbz#600170
-
-* Thu May 27 2010 Harald Hoyer <harald@redhat.com> 
-- fixed Requirements
-- fixed autoip6 
-Resolves: rhbz#538388
-- fixed multipath
-Resolves: rhbz#595719
-
-* Thu May 06 2010 Harald Hoyer <harald@redhat.com> 
-- only display short password messages
-Resolves: rhbz#561092
-
-* Thu May 06 2010 Harald Hoyer <harald@redhat.com>
-- fixed dracut manpages 
-Resolves: rhbz#589109
-- use ccw-init and ccw rules from s390utils
-Resolves: rhbz#533494
-- fixed fcoe
-Resolves: rhbz#486244
-- various other bugfixes seen in Fedora
-
-* Tue Apr 20 2010 Harald Hoyer <harald@redhat.com> 
-- fixed network with multiple nics
-- fixed nfsidmap paths
-- do not run blkid on non active container raids
-- fixed cdrom polling mechanism
-- update to latest git
-
-* Thu Apr 15 2010 Harald Hoyer <harald@redhat.com>
-- fixed dracut manpages
-- dmraid parse different error messages
-- add cdrom polling mechanism for slow cdroms
-- add module btrfs
-- teach dmsquash live-root to use rootflags
-- trigger udev with action=add
-- fixed add_drivers handling 
-- add sr_mod
-- use pigz instead of gzip, if available
-
-* Thu Mar 25 2010 Harald Hoyer <harald@redhat.com> 
-- removed firmware requirements (rhbz#572634)
-- add /etc/dracut.conf.d
-- Resolves: rhbz#572634
-
-* Fri Mar 19 2010 Harald Hoyer <harald@redhat.com> 
-- version 005
-
-* Fri Mar 19 2010 Harald Hoyer <harald@redhat.com> 
-- fixed rpmlint errors (rhbz#570547)
-- removed firmware package from dracut-kernel (rhbz#572634)
-- add dcb support to dracut's FCoE support (rhbz#563794)
-- force install some modules in hostonly mode (rhbz#573094)
-- various other bugfixes
-- Resolves: rhbz#570547, rhbz#572634, rhbz#563794, rhbz#573094
-
-* Thu Feb 18 2010 Harald Hoyer <harald@redhat.com> 004-15
-- fixed "selinux=0" booting (rhbz#566376)
-- fixed internal IFS handling
-- Resolves: rhbz#566376
-
-* Fri Jan 29 2010 Harald Hoyer <harald@redhat.com> 004-5
-- fixed firmware.sh bug (#559975 #559597)
-
-* Tue Jan 26 2010 Harald Hoyer <harald@redhat.com> 004-4
-- add multipath check
-
-* Tue Jan 26 2010 Harald Hoyer <harald@redhat.com> 004-3
-- fix selinux handling if .autorelabel is present
-- Resolves: rhbz#557744
-
-* Wed Jan 20 2010 Harald Hoyer <harald@redhat.com> 004-2
-- fix emergency_shell argument parsing
-- Related: rhbz#543948
-
-* Fri Jan 15 2010 Harald Hoyer <harald@redhat.com> 004-1
-- version 004
-- Resolves: rhbz#529339 rhbz#533494 rhbz#548550 
-- Resolves: rhbz#548555 rhbz#553195
-
-* Wed Jan 13 2010 Harald Hoyer <harald@redhat.com> 003-3
-- add Obsoletes of mkinitrd/nash/libbdevid-python
-- Related: rhbz#543948
-
-* Wed Jan 13 2010 Warren Togami <wtogami@redhat.com> 003-2
-- nbd is Fedora only
-
-* Fri Nov 27 2009 Harald Hoyer <harald@redhat.com> 003-1
-- version 003
-
-* Mon Nov 23 2009 Harald Hoyer <harald@redhat.com> 002-26
-- add WITH_SWITCH_ROOT make flag
-- add fips requirement conditional
-- add more device mapper modules (bug #539656)
-
-* Fri Nov 20 2009 Dennis Gregorovic <dgregor@redhat.com> - 002-25.1
-- nss changes for Alpha 3
-
-* Thu Nov 19 2009 Harald Hoyer <harald@redhat.com> 002-25
-- add more requirements for dracut-fips (bug #539257)
-
-* Tue Nov 17 2009 Harald Hoyer <harald@redhat.com> 002-24
-- put fips module in a subpackage (bug #537619)
-
-* Tue Nov 17 2009 Harald Hoyer <harald@redhat.com> 002-23
-- install xdr utils for multipath (bug #463458)
-
-* Thu Nov 12 2009 Harald Hoyer <harald@redhat.com> 002-22
-- add module 90multipath
-- add module 01fips
-- renamed module 95ccw to 95znet (bug #533833)
-- crypt: ignore devices in /etc/crypttab (root is not in there)
-- dasd: only install /etc/dasd.conf in hostonly mode (bug #533833)
-- zfcp: only install /etc/zfcp.conf in hostonly mode (bug #533833)
-- kernel-modules: add scsi_dh scsi_dh_rdac scsi_dh_emc (bug #527750)
-- dasd: use dasdconf.sh from s390utils (bug #533833)
-
-* Fri Nov 06 2009 Harald Hoyer <harald@redhat.com> 002-21
-- fix rd_DASD argument handling (bug #531720)
-- Resolves: rhbz#531720
-
-* Wed Nov 04 2009 Harald Hoyer <harald@redhat.com> 002-20
-- fix rd_DASD argument handling (bug #531720)
-- Resolves: rhbz#531720
-
-* Tue Nov 03 2009 Harald Hoyer <harald@redhat.com> 002-19
-- changed rd_DASD to rd_DASD_MOD (bug #531720)
-- Resolves: rhbz#531720
-
-* Tue Oct 27 2009 Harald Hoyer <harald@redhat.com> 002-18
-- renamed lvm/device-mapper udev rules according to upstream changes
-- fixed dracut search path issue
-
-* Mon Oct 26 2009 Harald Hoyer <harald@redhat.com> 002-17
-- load dm_mod module (bug #530540)
-
-* Fri Oct 09 2009 Jesse Keating <jkeating@redhat.com> - 002-16
-- Upgrade plymouth to Requires(pre) to make it show up before kernel
-
-* Thu Oct 08 2009 Harald Hoyer <harald@redhat.com> 002-15
-- s390 ccw: s/layer1/layer2/g
-
-* Thu Oct 08 2009 Harald Hoyer <harald@redhat.com> 002-14
-- add multinic support
-- add s390 zfcp support
-- add s390 network support
-
-* Wed Oct 07 2009 Harald Hoyer <harald@redhat.com> 002-13
-- fixed init=<command> handling
-- kill loginit if "rdinitdebug" specified
-- run dmsquash-live-root after udev has settled (bug #527514)
-
-* Tue Oct 06 2009 Harald Hoyer <harald@redhat.com> 002-12
-- add missing loginit helper
-- corrected dracut manpage
-
-* Thu Oct 01 2009 Harald Hoyer <harald@redhat.com> 002-11
-- fixed dracut-gencmdline for root=UUID or LABEL
-
-* Thu Oct 01 2009 Harald Hoyer <harald@redhat.com> 002-10
-- do not destroy assembled raid arrays if mdadm.conf present
-- mount /dev/shm 
-- let udevd not resolve group and user names
-- preserve timestamps of tools on initramfs generation
-- generate symlinks for binaries correctly
-- moved network from udev to initqueue
-- mount nfs3 with nfsvers=3 option and retry with nfsvers=2
-- fixed nbd initqueue-finished
-- improved debug output: specifying "rdinitdebug" now logs
-  to dmesg, console and /init.log
-- stop udev before killing it
-- add ghost /var/log/dracut.log
-- dmsquash: use info() and die() rather than echo
-- strip kernel modules which have no x bit set
-- redirect stdin, stdout, stderr all RW to /dev/console
-  so the user can use "less" to view /init.log and dmesg
-
-* Tue Sep 29 2009 Harald Hoyer <harald@redhat.com> 002-9
-- make install of new dm/lvm udev rules optionally
-- correct dasd module typo
-
-* Fri Sep 25 2009 Warren Togami <wtogami@redhat.com> 002-8
-- revert back to dracut-002-5 tarball 845dd502
-  lvm2 was reverted to pre-udev
-
-* Wed Sep 23 2009 Harald Hoyer <harald@redhat.com> 002-7
-- build with the correct tarball
-
-* Wed Sep 23 2009 Harald Hoyer <harald@redhat.com> 002-6
-- add new device mapper udev rules and dmeventd 
-  bug 525319, 525015
-
-* Wed Sep 23 2009 Warren Togami <wtogami@redaht.com> 002-5
-- Revert back to -3, Add umount back to initrd
-  This makes no functional difference to LiveCD.  See Bug #525319
-
-* Mon Sep 21 2009 Warren Togami <wtogami@redhat.com> 002-4
-- Fix LiveCD boot regression
-
-* Mon Sep 21 2009 Harald Hoyer <harald@redhat.com> 002-3
-- bail out if selinux policy could not be loaded and 
-  selinux=0 not specified on kernel command line 
-  (bug #524113)
-- set finished criteria for dmsquash live images
-
-* Fri Sep 18 2009 Harald Hoyer <harald@redhat.com> 002-2
-- do not cleanup dmraids
-- copy over lvm.conf
-
-* Thu Sep 17 2009 Harald Hoyer <harald@redhat.com> 002-1
-- version 002
-- set correct PATH
-- workaround for broken mdmon implementation
-
-* Wed Sep 16 2009 Harald Hoyer <harald@redhat.com> 001-12
-- removed lvm/mdraid/dmraid lock files
-- add missing ifname= files
-
-* Wed Sep 16 2009 Harald Hoyer <harald@redhat.com> 001-11
-- generate dracut-version during rpm build time
-
-* Tue Sep 15 2009 Harald Hoyer <harald@redhat.com> 001-10
-- add ifname= argument for persistent netdev names
-- new /initqueue-finished to check if the main loop can be left
-- copy mdadm.conf if --mdadmconf set or mdadmconf in dracut.conf
-
-* Wed Sep 09 2009 Harald Hoyer <harald@redhat.com> 001-9
-- added Requires: plymouth-scripts
-
-* Wed Sep 09 2009 Harald Hoyer <harald@redhat.com> 001-8
-- plymouth: use plymouth-populate-initrd
-- add add_drivers for dracut and dracut.conf
-- do not mount /proc and /selinux manually in selinux-load-policy
-
-* Wed Sep 09 2009 Harald Hoyer <harald@redhat.com> 001-7
-- add scsi_wait_scan to be sure everything was scanned
-
-* Tue Sep 08 2009 Harald Hoyer <harald@redhat.com> 001-6
-- fixed several problems with md raid containers
-- fixed selinux policy loading
-
-* Tue Sep 08 2009 Harald Hoyer <harald@redhat.com> 001-5
-- patch does not honor file modes, fixed them manually
-
-* Mon Sep 07 2009 Harald Hoyer <harald@redhat.com> 001-4
-- fixed mdraid for IMSM
-
-* Mon Sep 07 2009 Harald Hoyer <harald@redhat.com> 001-3
-- fixed bug, which prevents installing 61-persistent-storage.rules (bug #520109)
-
-* Thu Sep 03 2009 Harald Hoyer <harald@redhat.com> 001-2
-- fixed missing grep for md
-- reorder cleanup
-
-* Wed Sep 02 2009 Harald Hoyer <harald@redhat.com> 001-1
-- version 001
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
-
-* Fri Aug 14 2009 Harald Hoyer <harald@redhat.com> 0.9-1
-- version 0.9
-
-* Thu Aug 06 2009 Harald Hoyer <harald@redhat.com> 0.8-1
-- version 0.8 
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
-
-* Fri Jul 24 2009 Harald Hoyer <harald@redhat.com> 0.7-1
-- version 0.7
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
-
-* Wed Jul 22 2009 Harald Hoyer <harald@redhat.com> 0.6-1
-- version 0.6
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
-
-* Fri Jul 17 2009 Harald Hoyer <harald@redhat.com> 0.5-1
-- version 0.5
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
-
-* Sat Jul 04 2009 Harald Hoyer <harald@redhat.com> 0.4-1
-- version 0.4
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
-
-* Thu Jul 02 2009 Harald Hoyer <harald@redhat.com> 0.3-1
-- version 0.3
-- see http://dracut.git.sourceforge.net/git/gitweb.cgi?p=dracut/dracut;a=blob_plain;f=NEWS
-
-* Wed Jul 01 2009 Harald Hoyer <harald@redhat.com> 0.2-1
-- version 0.2
-
-* Fri Jun 19 2009 Harald Hoyer <harald@redhat.com> 0.1-1
-- first release
-
-* Thu Dec 18 2008 Jeremy Katz <katzj@redhat.com> - 0.0-1
-- Initial build

+ 14 - 9
f/fcgi/fcgi-vl.spec

@@ -1,22 +1,21 @@
-%define snap -SNAP-0910052249
+#define snap -SNAP-0910052249
 
 
 Summary:        FastCGI development kit
 Summary:        FastCGI development kit
 Summary(ja):    FastCGI 開発キット
 Summary(ja):    FastCGI 開発キット
 Name:           fcgi
 Name:           fcgi
-Version:        2.4.1
-Release:        3%{?_dist_release}
+Version:        2.4.2
+Release:        1%{?_dist_release}
 
 
 Group:          Development/Languages
 Group:          Development/Languages
 License:        BSD
 License:        BSD
-URL:            http://www.fastcgi.com/#TheDevKit
-Source0:        http://fastcgi.com/dist/fcgi-%{version}%{?snap}.tar.gz
+URL:            https://github.com/FastCGI-Archives/fcgi2
+Source0:        https://github.com/FastCGI-Archives/fcgi2/archive/%{version}.tar.gz#/fcgi-%{version}%{?snap}.tar.gz
 Source1:        fcgi-autogen.sh
 Source1:        fcgi-autogen.sh
 Patch0:         fcgi-2.4.0-autotools.patch
 Patch0:         fcgi-2.4.0-autotools.patch
 # Patch0 created with Source1 after patching Patch1 and Patch2
 # Patch0 created with Source1 after patching Patch1 and Patch2
 #Patch1:         fcgi-2.4.0-configure.in.patch
 #Patch1:         fcgi-2.4.0-configure.in.patch
 #Patch2:         fcgi-2.4.0-Makefile.am-CPPFLAGS.patch
 #Patch2:         fcgi-2.4.0-Makefile.am-CPPFLAGS.patch
 Patch3:         fcgi-2.4.0-gcc44_fixes.patch
 Patch3:         fcgi-2.4.0-gcc44_fixes.patch
-Patch4:         fcgi-2.4.1-poll.patch
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
@@ -56,16 +55,16 @@ The %{name}-perl package contains the perl bindings for fcgi.
 
 
 
 
 %prep
 %prep
-%setup -q -n "%{name}-%{version}%{snap}"
+%setup -q -n "fcgi2-%{version}%{?snap}"
 #%patch0 -p1
 #%patch0 -p1
 %patch3 -p1
 %patch3 -p1
-%patch4 -p1
 
 
 # remove DOS End Of Line Encoding
 # remove DOS End Of Line Encoding
 sed -i 's/\r//' doc/fastcgi-prog-guide/ch2c.htm
 sed -i 's/\r//' doc/fastcgi-prog-guide/ch2c.htm
 # fix file permissions
 # fix file permissions
 chmod a-x include/fcgios.h libfcgi/os_unix.c
 chmod a-x include/fcgios.h libfcgi/os_unix.c
 
 
+autoreconf -ivf
 
 
 %build
 %build
 %configure
 %configure
@@ -105,7 +104,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfcgi++.so.*
 %{_libdir}/libfcgi++.so.*
 %{_mandir}/man1/*
 %{_mandir}/man1/*
 %defattr(0644,root,root,0755)
 %defattr(0644,root,root,0755)
-%doc LICENSE.TERMS README
+%license LICENSE.TERMS
+%doc README
 
 
 
 
 %files devel
 %files devel
@@ -113,12 +113,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 %{_includedir}/*
 %{_libdir}/libfcgi.so
 %{_libdir}/libfcgi.so
 %{_libdir}/libfcgi++.so
 %{_libdir}/libfcgi++.so
+%{_libdir}/pkgconfig/*
 %{_mandir}/man3/*
 %{_mandir}/man3/*
 %defattr(0644,root,root,0755)
 %defattr(0644,root,root,0755)
 %doc doc/
 %doc doc/
 
 
 
 
 %changelog
 %changelog
+* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.2-1
+- new upstream release.
+- dropped Patch4: fixed in upstream.
+
 * Thu Sep 01 2016 Toshiaki Ara <ara_t@384.jp> 2.4.1-3
 * Thu Sep 01 2016 Toshiaki Ara <ara_t@384.jp> 2.4.1-3
 - rebuild with gcc-5.4.0
 - rebuild with gcc-5.4.0
 
 

+ 92 - 19
f/fcgiwrap/fcgiwrap-vl.spec

@@ -1,25 +1,44 @@
-Summary: A simple FastCGI server for CGI applications.
-Summary(ja): CGIアプリケーションを動作させるためのシンプルなFastCGIサーバ
-Name: fcgiwrap
-Version: 1.1.0
-Release: 1%{?_dist_release}
-License: GPL+
-Group: System Environment/Daemons
-Source0: %{name}-%{version}.tar.gz
-Source1: fcgiwrap_params
-Source2: fcgiwrap.init
-Source3: fcgiwrap.sysconfig
-URL: http://nginx.localdomain.pl/wiki/FcgiWrap
+%bcond_with systemd
+
+%global orig_version 1.1.0
+%global git_date     20200404
+
+Summary:        A simple FastCGI server for CGI applications.
+Summary(ja):    CGIアプリケーションを動作させるためのシンプルなFastCGIサーバ
+Name:           fcgiwrap
+Version:        %{orig_version}.git%{git_date}
+Release:        2%{?_dist_release}%{?with_systemd:.systemd}
+Group:          System Environment/Daemons
+Vendor:         Project Vine
+Distribution:   Vine Linux
+License:        GPL+
+URL:            https://github.com/gnosek/fcgiwrap
+Source0:        %{name}-%{orig_version}.tar.gz
+Source1:        fcgiwrap_params
+Source2:        fcgiwrap.init
+Source3:        fcgiwrap.sysconfig
+Source4:        %{name}@.service
+Source5:        %{name}@.socket
+Source6:        fcgiwrap.sysconfig.systemd
+Patch0:         fcgiwrap-HEAD.patch
+# https://github.com/gnosek/fcgiwrap/pull/39
+Patch1:         %{name}-1.1.0-use_pkg-config_libsystemd.patch
+# https://github.com/gnosek/fcgiwrap/pull/43
+Patch2:         %{name}-1.1.0-declare_cgi_error_noreturn.patch
+# https://github.com/gnosek/fcgiwrap/pull/44
+Patch3:         %{name}-1.1.0-fix_kill_param_sequence.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: spawn-fcgi
 BuildRequires: fcgi-devel
 BuildRequires: fcgi-devel
+%if %{with systemd}
+BuildRequires:  systemd-devel
+%{?systemd_requires}
+%else
+Requires: spawn-fcgi
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(preun): /sbin/service
-
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
+%endif
 
 
 %description
 %description
  fcgiwrap is a simple server for running CGI applications over FastCGI.
  fcgiwrap is a simple server for running CGI applications over FastCGI.
@@ -41,54 +60,108 @@ Requires: nginx
 
 
 
 
 %prep
 %prep
-%setup -q
+%setup -q -n fcgiwrap-%{orig_version}
+%patch0 -p1
+%if %{with systemd}
+%patch1 -p1
+%endif
+%patch2 -p1
+%patch3 -p1
+
 autoreconf -i
 autoreconf -i
 
 
 %build
 %build
+%if %{with systemd}
+%configure --prefix="" --with-systemd
+%else
 %configure
 %configure
+%endif
+
 make
 make
 
 
 %install
 %install
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 make DESTDIR=%{buildroot} install
 
 
-mv %{buildroot}%{_prefix}%{_prefix}/* %{buildroot}%{_prefix}/
+if [ -d %{buildroot}%{_prefix}%{_prefix} ]; then
+  mv %{buildroot}%{_prefix}%{_prefix}/* %{buildroot}%{_prefix}/
+fi
 mkdir -p %{buildroot}%{_sysconfdir}/{nginx,sysconfig}
 mkdir -p %{buildroot}%{_sysconfdir}/{nginx,sysconfig}
 mkdir -p %{buildroot}%{_initdir}/
 mkdir -p %{buildroot}%{_initdir}/
 install -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/nginx/
 install -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/nginx/
+
+%if %{with systemd}
+# Remove the default systemd files 
+rm -f %{buildroot}%{_unitdir}/fcgiwrap.service
+rm -f %{buildroot}%{_unitdir}/fcgiwrap.socket
+
+# Install our own systemd config files
+install -Dm 644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}@.service
+install -Dm 644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}@.socket
+install -m644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/fcgiwrap
+%else
 install -m755 %{SOURCE2} %{buildroot}%{_initdir}/fcgiwrap
 install -m755 %{SOURCE2} %{buildroot}%{_initdir}/fcgiwrap
 install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/fcgiwrap
 install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/fcgiwrap
+%endif
 
 
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
 %post
 %post
+%if %{with systemd}
+%systemd_post %{name}@.service
+%systemd_post %{name}@.socket
+%else
 /sbin/chkconfig --add fcgiwrap
 /sbin/chkconfig --add fcgiwrap
+%endif
 
 
 %preun
 %preun
+%if %{with systemd}
+%systemd_preun %{name}@.service
+%systemd_preun %{name}@.socket
+%else
 if [ $1 -eq 0 ]; then
 if [ $1 -eq 0 ]; then
   /sbin/service fcgiwrap stop > /dev/null 2>&1
   /sbin/service fcgiwrap stop > /dev/null 2>&1
   /sbin/chkconfig --del fcgiwrap
   /sbin/chkconfig --del fcgiwrap
 fi
 fi
+%endif
 
 
 %postun
 %postun
+%if %{with systemd}
+%systemd_postun_with_restart %{name}@.service
+%systemd_postun_with_restart %{name}@.socket
+%else
 if [ $1 -ge 1 ]; then
 if [ $1 -ge 1 ]; then
   /sbin/service fcgiwrap condrestart 2>&1 >/dev/null
   /sbin/service fcgiwrap condrestart 2>&1 >/dev/null
 fi
 fi
+%endif
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
+%license COPYING
 %doc README.rst
 %doc README.rst
 %{_sbindir}/fcgiwrap
 %{_sbindir}/fcgiwrap
 %{_mandir}/man8/fcgiwrap.8*
 %{_mandir}/man8/fcgiwrap.8*
 %config(noreplace) %{_sysconfdir}/sysconfig/fcgiwrap
 %config(noreplace) %{_sysconfdir}/sysconfig/fcgiwrap
+%if %{with systemd}
+%{_unitdir}/%{name}@.service
+%{_unitdir}/%{name}@.socket
+%else
 %attr(0755,root,root) %{_initdir}/fcgiwrap
 %attr(0755,root,root) %{_initdir}/fcgiwrap
+%endif
 
 
 %files nginx
 %files nginx
 %defattr(-,root,root)
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/nginx/fcgiwrap_params
 %config(noreplace) %{_sysconfdir}/nginx/fcgiwrap_params
 
 
 %changelog
 %changelog
+* Sun Apr 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0.git20200404-2
+- fixed %%changelog.
+
+* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0.git20200404-1
+- updated to git HEAD.
+- added systemd stuff (disabled as default).
+
 * Sun Jan 12 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0-1
 * Sun Jan 12 2014 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.0-1
 - new upstream release.
 - new upstream release.
 
 

+ 4 - 1
f/firefox/firefox-vl.spec

@@ -3,7 +3,7 @@
 # do not include minor version number in MOZILLA_FIVE_HOME
 # do not include minor version number in MOZILLA_FIVE_HOME
 %global ffmajor 68.6
 %global ffmajor 68.6
 %global geckomajor 68.6
 %global geckomajor 68.6
-%global ffminor 0
+%global ffminor 1
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
 %define ffdir %{_libdir}/firefox
 %define tarballdir firefox-%{ffversion}
 %define tarballdir firefox-%{ffversion}
@@ -525,6 +525,9 @@ fi
 #---------------------------------------------------------------------
 #---------------------------------------------------------------------
 
 
 %changelog
 %changelog
+* Sun Apr 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.6.1-1
+- updated to 68.6.1.
+
 * Thu Mar 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.6.0-1
 * Thu Mar 26 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 68.6.0-1
 - updated to 68.6.0.
 - updated to 68.6.0.
 
 

+ 6 - 1
i/initscripts/initscripts-vl.spec

@@ -5,13 +5,14 @@ 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:      2%{?_dist_release}
+Release:      3%{?_dist_release}
 License:      GPL
 License:      GPL
 Group:        System Environment/Base
 Group:        System Environment/Base
 Url:          http://trac.vinelinux.org/browser/projects/initscripts
 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
 
 
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
@@ -62,6 +63,7 @@ deactivate most network interfaces.
 
 
 %prep
 %prep
 %setup -q
 %setup -q
+%patch0 -p1
 
 
 %build
 %build
 export CFLAGS="%{optflags} -DPORT_MAX_8250=19"
 export CFLAGS="%{optflags} -DPORT_MAX_8250=19"
@@ -455,6 +457,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 
 
 %changelog
 %changelog
+* Fri Apr 03 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-3
+- fixed hotplug for networking.
+
 * Wed Apr 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-2
 * Wed Apr 01 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 8.91.16-2
 - made ifup/ifdown selectable in alternatives.
 - made ifup/ifdown selectable in alternatives.
 
 

+ 87 - 13
i/iptables/iptables-vl.spec

@@ -1,15 +1,22 @@
+%bcond_with systemd
+
 Summary: Packet filtering tool
 Summary: Packet filtering tool
 Summary(ja): パケットフィルタリングツール
 Summary(ja): パケットフィルタリングツール
 Name: iptables
 Name: iptables
-Version: 1.8.3
-Release: 1%{?_dist_release}
-License: GPL
+Version: 1.8.4
+Release: 2%{?_dist_release}%{?with_systemd:.systemd}
 Group: System Environment/Base
 Group: System Environment/Base
+Vendor: Project Vine
+Distribution: Vine Linux
+Packager: daisuke
+License: GPL
 URL: http://www.netfilter.org/
 URL: http://www.netfilter.org/
 Source0: ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
 Source0: ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source1: iptables.init
 Source2: iptables-config
 Source2: iptables-config
-# Patch5: iptables-1.4.3.1-cloexec.patch
+Source3: iptables.service
+Source4: sysconfig_iptables
+Source5: sysconfig_ip6tables
 
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: bison flex perl
 BuildRequires: bison flex perl
@@ -20,12 +27,14 @@ BuildRequires: libnfnetlink-devel
 BuildRequires: libnftnl-devel
 BuildRequires: libnftnl-devel
 BuildRequires: libpcap-devel
 BuildRequires: libpcap-devel
 Conflicts : kernel < 2.4.20
 Conflicts : kernel < 2.4.20
+%if %{with systemd}
+%{?systemd_requires}
+%else
 Requires(post): chkconfig
 Requires(post): chkconfig
 Requires(preun): chkconfig
 Requires(preun): chkconfig
+%endif
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: daisuke
+%global script_path %{_libexecdir}/iptables
 
 
 %description
 %description
 The iptables utility controls the network packet filtering code in the
 The iptables utility controls the network packet filtering code in the
@@ -111,43 +120,94 @@ install -m 644 include/ip*tables.h %{buildroot}%{_includedir}/
 install -d -m 755 %{buildroot}%{_includedir}/libipulog/
 install -d -m 755 %{buildroot}%{_includedir}/libipulog/
 install -m 644 include/libipulog/*.h %{buildroot}%{_includedir}/libipulog/
 install -m 644 include/libipulog/*.h %{buildroot}%{_includedir}/libipulog/
 
 
+install -d -m 755 %{buildroot}/etc/sysconfig
+install -c -m 755 %{SOURCE2} %{buildroot}/etc/sysconfig/iptables-config
+sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE2} > ip6tables-config
+install -c -m 755 ip6tables-config %{buildroot}/etc/sysconfig/ip6tables-config
+
+%if %{with systemd}
+# install systemd service files
+install -d -m 755 %{buildroot}/%{_unitdir}
+install -c -m 644 %{SOURCE3} %{buildroot}/%{_unitdir}
+sed -e 's;iptables;ip6tables;g' -e 's;IPv4;IPv6;g' -e 's;/usr/libexec/ip6tables;/usr/libexec/iptables;g' < %{SOURCE3} > ip6tables.service
+install -c -m 644 ip6tables.service %{buildroot}/%{_unitdir}
+
+# install init scripts and configuration files
+install -d -m 755 %{buildroot}%{script_path}
+install -c -m 755 %{SOURCE1} %{buildroot}%{script_path}/iptables.init
+sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE1} > ip6tables.init
+install -c -m 755 ip6tables.init %{buildroot}%{script_path}/ip6tables.init
+install -c -m 600 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/iptables
+install -c -m 600 %{SOURCE5} %{buildroot}%{_sysconfdir}/sysconfig/ip6tables
+%else
 # install init scripts and configuration files
 # install init scripts and configuration files
 install -d -m 755 %{buildroot}/etc/rc.d/init.d
 install -d -m 755 %{buildroot}/etc/rc.d/init.d
 install -c -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/iptables
 install -c -m 755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/iptables
 sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE1} > ip6tables.init
 sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE1} > ip6tables.init
 install -c -m 755 ip6tables.init %{buildroot}/etc/rc.d/init.d/ip6tables
 install -c -m 755 ip6tables.init %{buildroot}/etc/rc.d/init.d/ip6tables
-install -d -m 755 %{buildroot}/etc/sysconfig
-install -c -m 755 %{SOURCE2} %{buildroot}/etc/sysconfig/iptables-config
-sed -e 's;iptables;ip6tables;g' -e 's;IPTABLES;IP6TABLES;g' < %{SOURCE2} > ip6tables-config
-install -c -m 755 ip6tables-config %{buildroot}/etc/sysconfig/ip6tables-config
+%endif
+
 
 
 %clean
 %clean
 rm -rf %{buildroot}
 rm -rf %{buildroot}
 
 
 %post
 %post
 /sbin/ldconfig
 /sbin/ldconfig
+%if %{with systemd}
+%systemd_post iptables.service
+%else
 /sbin/chkconfig --add iptables
 /sbin/chkconfig --add iptables
-
-%postun -p /sbin/ldconfig
+%endif
 
 
 %preun
 %preun
+%if %{with systemd}
+%systemd_preun iptables.service
+%else
 if [ "$1" = 0 ]; then
 if [ "$1" = 0 ]; then
 	/sbin/chkconfig --del iptables
 	/sbin/chkconfig --del iptables
 fi
 fi
+%endif
+
+%postun
+%if %{with systemd}
+%systemd_postun iptables.service
+%else
+/sbin/ldconfig
+%endif
 
 
 %post ipv6
 %post ipv6
+%if %{with systemd}
+%systemd_post ip6tables.service
+%else
 /sbin/chkconfig --add ip6tables
 /sbin/chkconfig --add ip6tables
+%endif
 
 
 %preun ipv6
 %preun ipv6
+%if %{with systemd}
+%systemd_preun ip6tables.service
+%else
 if [ "$1" = 0 ]; then
 if [ "$1" = 0 ]; then
 	/sbin/chkconfig --del ip6tables
 	/sbin/chkconfig --del ip6tables
 fi
 fi
+%endif
+
+%if %{with systemd}
+%postun ipv6
+%systemd_postun ip6tables.service
+%endif
 
 
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
 %license COPYING
 %license COPYING
 %doc INSTALL INCOMPATIBILITIES
 %doc INSTALL INCOMPATIBILITIES
+%if %{with systemd}
+%{_unitdir}/iptables.service
+%dir %{script_path}
+%{script_path}/iptables.init
+%config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables
+%else
 %attr(0755,root,root) /etc/rc.d/init.d/iptables
 %attr(0755,root,root) /etc/rc.d/init.d/iptables
+%endif
 %config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables-config
 %config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables-config
 %config(noreplace) %attr(0600,root,root) /etc/ethertypes
 %config(noreplace) %attr(0600,root,root) /etc/ethertypes
 /sbin/arptables*
 /sbin/arptables*
@@ -171,7 +231,14 @@ fi
 
 
 %files ipv6
 %files ipv6
 %defattr(-,root,root)
 %defattr(-,root,root)
+%if %{with systemd}
+%{_unitdir}/ip6tables.service
+%dir %{script_path}
+%{script_path}/ip6tables.init
+%config(noreplace) %attr(0600,root,root) /etc/sysconfig/ip6tables
+%else
 %attr(0755,root,root) /etc/rc.d/init.d/ip6tables
 %attr(0755,root,root) /etc/rc.d/init.d/ip6tables
+%endif
 %config(noreplace) %attr(0600,root,root) /etc/sysconfig/ip6tables-config
 %config(noreplace) %attr(0600,root,root) /etc/sysconfig/ip6tables-config
 /sbin/ip6tables*
 /sbin/ip6tables*
 /bin/iptables-xml
 /bin/iptables-xml
@@ -196,6 +263,13 @@ fi
 %{_libdir}/pkgconfig/xtables.pc
 %{_libdir}/pkgconfig/xtables.pc
 
 
 %changelog
 %changelog
+* Sun Apr 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.4-2
+- added --wait option to ip{,6}tables.init.
+
+* Sun Apr 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.4-1
+- new upstream release.
+- added systemd stuff (disabled as default).
+
 * Mon Sep 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.3-1
 * Mon Sep 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.8.3-1
 - new upstream release.
 - new upstream release.
 
 

+ 19 - 8
l/lxc/lxc-vl.spec

@@ -1,6 +1,9 @@
+%bcond_with systemd
 %bcond_with lua
 %bcond_with lua
 %global with_python3 0
 %global with_python3 0
+%if %{with systemd}
 %global with_systemd 0
 %global with_systemd 0
+%endif
 
 
 %global luaver 5.1
 %global luaver 5.1
 %global lualibdir %{_libdir}/lua/%{luaver}
 %global lualibdir %{_libdir}/lua/%{luaver}
@@ -9,8 +12,8 @@
 %define _unpackaged_files_terminate_build 1
 %define _unpackaged_files_terminate_build 1
 
 
 Name:           lxc
 Name:           lxc
-Version:        3.0.4
-Release:        1%{?_dist_release}
+Version:        4.0.0
+Release:        1%{?_dist_release}%{?with_systemd:.systemd}
 Summary:        Linux Resource Containers
 Summary:        Linux Resource Containers
 Summary(ja):    Linux リソースコンテナ
 Summary(ja):    Linux リソースコンテナ
 Group:          Applications/System
 Group:          Applications/System
@@ -20,16 +23,16 @@ Vendor:         Project Vine
 Distribution:   Vine Linux
 Distribution:   Vine Linux
 
 
 Source0:        https://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
 Source0:        https://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz
-Source10:	lxc-vinelinux
-Source11:	vinelinux.common.conf
-Source12:	vinelinux.userns.conf
+Source10:       lxc-vinelinux
+Source11:       vinelinux.common.conf
+Source12:       vinelinux.userns.conf
 
 
 Patch0:         0001-fix-initscript.patch
 Patch0:         0001-fix-initscript.patch
 Patch100:       0002-fix-launching-dnsmasq.patch
 Patch100:       0002-fix-launching-dnsmasq.patch
 
 
 BuildRequires:  docbook-utils
 BuildRequires:  docbook-utils
-Buildrequires:  docbook2X
-Buildrequires:  doxygen
+BuildRequires:  docbook2X
+BuildRequires:  doxygen
 BuildRequires:  glibc-static
 BuildRequires:  glibc-static
 BuildRequires:  kernel-headers
 BuildRequires:  kernel-headers
 BuildRequires:  libcap-static
 BuildRequires:  libcap-static
@@ -50,7 +53,9 @@ BuildRequires:  systemd
 Requires:       lua-%{name}%{?_isa} = %{version}-%{release}
 Requires:       lua-%{name}%{?_isa} = %{version}-%{release}
 Requires:       lua-alt-getopt
 Requires:       lua-alt-getopt
 %endif
 %endif
+%if !0%{?with_systemd}
 Requires:       libcgroup
 Requires:       libcgroup
+%endif
 Obsoletes:      lxc-extra < 3.0.0
 Obsoletes:      lxc-extra < 3.0.0
 Obsoletes:      lxc-lua < 3.0.0
 Obsoletes:      lxc-lua < 3.0.0
 Obsoletes:      python3-lxc < 3.0.0
 Obsoletes:      python3-lxc < 3.0.0
@@ -179,8 +184,9 @@ This package contains documentation for %{name}.
 
 
 %prep
 %prep
 %setup -q -n %{name}-%{version}
 %setup -q -n %{name}-%{version}
+%if !0%{?with_systemd}
 %patch0 -p1
 %patch0 -p1
-#%patch1 -p1
+%endif
 %patch100 -p1
 %patch100 -p1
 
 
 
 
@@ -279,6 +285,7 @@ fi
 %license COPYING
 %license COPYING
 %doc README*
 %doc README*
 %{_bindir}/%{name}-*
 %{_bindir}/%{name}-*
+%{_bindir}/run-coccinelle.sh
 %{_mandir}/man1/%{name}*
 %{_mandir}/man1/%{name}*
 %{_mandir}/*/man1/%{name}*
 %{_mandir}/*/man1/%{name}*
 # in lxc-libs:
 # in lxc-libs:
@@ -378,6 +385,10 @@ fi
 
 
 
 
 %changelog
 %changelog
+* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0.0-1
+- updated to 4.0.0.
+- updated lxc-vinelinux.
+
 * Mon Mar 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.4-1
 * Mon Mar 16 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 3.0.4-1
 - updated to 3.0.4.
 - updated to 3.0.4.
 - disabled cgmanager.
 - disabled cgmanager.

+ 4 - 1
lib/libn/libnftnl/libnftnl-vl.spec

@@ -1,7 +1,7 @@
 #global snapdate 20140903
 #global snapdate 20140903
 
 
 Name:           libnftnl
 Name:           libnftnl
-Version:        1.1.4
+Version:        1.1.6
 Release:        1%{?_dist_release}
 Release:        1%{?_dist_release}
 Summary:        Library for low-level interaction with nftables Netlink's API over libmnl
 Summary:        Library for low-level interaction with nftables Netlink's API over libmnl
 
 
@@ -72,6 +72,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_includedir}/libnftnl
 %{_includedir}/libnftnl
 
 
 %changelog
 %changelog
+* Sun Apr 05 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.6-1
+- new upstream release.
+
 * Mon Sep 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.4-1
 * Mon Sep 02 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.1.4-1
 - new upstream release.
 - new upstream release.
 
 

+ 51 - 26
s/smp_utils/smp_utils-vl.spec

@@ -1,27 +1,18 @@
-%define name    smp_utils
-%define version 0.94
-%define release 1
-
 Summary:        Utilities for SAS management protocol (SMP)
 Summary:        Utilities for SAS management protocol (SMP)
-Name:           %{name}
-Version:        %{version}
-Release:        3%{?_dist_release}
-
-License:        FreeBSD
+Name:           smp_utils
+Version:        0.99
+Release:        1%{?_dist_release}
 Group:          Applications/System
 Group:          Applications/System
-URL:            http://sg.danny.cz/sg/smp_utils.html
+Vendor:         Project Vine
+Distribution:   Vine Linux
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 
+License:        BSD
+URL:            http://sg.danny.cz/sg/smp_utils.html
 Source0:        http://sg.danny.cz/sg/p/%{name}-%{version}.tgz
 Source0:        http://sg.danny.cz/sg/p/%{name}-%{version}.tgz
 
 
-# Patch for Vine Linux
-# remove install option (-o root, -g root)
-Patch0:		smp_utils-0.94-Makefile-vine.patch
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-Packager:       Douglas Gilbert <dgilbert at interlog dot com>
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 
-Vendor: Project Vine
-Distribution: Vine Linux
 
 
 %description
 %description
 This is a package of utilities. Each utility sends a Serial Attached
 This is a package of utilities. Each utility sends a Serial Attached
@@ -36,35 +27,69 @@ systems.
 Warning: Some of these tools access the internals of your system
 Warning: Some of these tools access the internals of your system
 and the incorrect usage of them may render your system inoperable.
 and the incorrect usage of them may render your system inoperable.
 
 
-%prep
 
 
+%package libs
+Summary: Shared library for %{name}
+
+%description libs
+This package contains the shared library for %{name}.
+
+
+%package devel
+Summary: Development library and header files for the smp_utils library
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
+
+%description devel
+This package contains the %{name} library and its header files for
+developing applications.
+
+
+%prep
 %setup -q
 %setup -q
-%patch0 -p1 -b .vine
+
 
 
 %build
 %build
+%configure --disable-static
+
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?smp_mflags} CFLAGS="%{optflags} -DSMP_UTILS_LINUX"
 
 
-make \
-     CFLAGS="%{optflags} -DSMP_UTILS_LINUX"
 
 
 %install
 %install
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
 
 make install \
 make install \
         PREFIX=%{_prefix} \
         PREFIX=%{_prefix} \
-        INSTDIR=%{buildroot}/%{_bindir} \
-        MANDIR=%{buildroot}/%{_mandir} \
-        INCLUDEDIR=%{buildroot}/%{_includedir}
+        DESTDIR=%{buildroot}
+rm -f %{buildroot}%{_libdir}/*.la
+
 
 
 %clean
 %clean
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 [ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
 
 
+
 %files
 %files
 %defattr(-,root,root)
 %defattr(-,root,root)
-%doc ChangeLog COPYING COVERAGE CREDITS INSTALL README
+%license COPYING
+%doc ChangeLog COVERAGE CREDITS INSTALL README
 %attr(0755,root,root) %{_bindir}/*
 %attr(0755,root,root) %{_bindir}/*
 %{_mandir}/man8/*
 %{_mandir}/man8/*
 
 
+%files libs
+%doc COPYING
+%{_libdir}/*.so.*
+
+%files devel
+%{_includedir}/scsi/*.h
+%{_libdir}/*.so
+
+
 %changelog
 %changelog
+* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.99-1
+- new upstream release.
+
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.94-3
 * Sat Dec 28 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.94-3
 - rebuild with VineSeed environment
 - rebuild with VineSeed environment
 
 

+ 63 - 8
u/util-linux/util-linux-vl.spec

@@ -1,11 +1,13 @@
+%bcond_with systemd
+
 ### Header
 ### Header
 Summary: A collection of basic system utilities
 Summary: A collection of basic system utilities
 Summary(ja): 基本システムユーティリティー集
 Summary(ja): 基本システムユーティリティー集
 Name: util-linux
 Name: util-linux
-Version: 2.34
-Release: 1%{?_dist_release}
-License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
+Version: 2.35.1
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
 Group: System Environment/Base
 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
 URL: http://en.wikipedia.org/wiki/Util-linux
 
 
 %define _unpackaged_files_terminate_build 1
 %define _unpackaged_files_terminate_build 1
@@ -37,6 +39,10 @@ BuildRequires: gettext
 %if %{with_selinux}
 %if %{with_selinux}
 BuildRequires: libselinux-devel
 BuildRequires: libselinux-devel
 %endif
 %endif
+%if %{with systemd}
+BuildRequires: systemd-devel
+BuildRequires: systemd
+%endif
 BuildRequires: bison
 BuildRequires: bison
 BuildRequires: ncurses-devel
 BuildRequires: ncurses-devel
 BuildRequires: pam-devel
 BuildRequires: pam-devel
@@ -52,7 +58,8 @@ BuildRequires: libuser-devel
 BuildRequires: automake, autoconf, libtool
 BuildRequires: automake, autoconf, libtool
 
 
 ### Sources
 ### Sources
-Source0: https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v%{version}/%{name}-%{version}.tar.xz
+%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
 Source1: util-linux-login.pamd
 Source2: util-linux-remote.pamd
 Source2: util-linux-remote.pamd
 Source3: util-linux-chsh-chfn.pamd
 Source3: util-linux-chsh-chfn.pamd
@@ -123,8 +130,10 @@ Requires: libmount = %{version}-%{release}
 %if %{with_audit}
 %if %{with_audit}
 Requires: audit-libs >= 1.0.6
 Requires: audit-libs >= 1.0.6
 %endif
 %endif
+%if !%{with systemd}
 Requires: elogind
 Requires: elogind
 Requires: eudev
 Requires: eudev
+%endif
 
 
 # Vine
 # Vine
 Requires(post,preun): alternatives
 Requires(post,preun): alternatives
@@ -138,11 +147,16 @@ Packager: daisuke
 ###
 ###
 # 151635 - makeing /var/log/lastlog
 # 151635 - makeing /var/log/lastlog
 Patch0: 2.28-login-lastlog-create.patch
 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
 
 
-# 1751290 - regression: lsblk not showing PKNAME in f31+
-Patch1: lsblk-force-to-print-PKNAME-for-partition.patch
-# https://github.com/systemd/systemd/issues/10872
-Patch2: libmount-improve-mountinfo-reliability.patch
 
 
 %description
 %description
 The util-linux-ng package contains a large variety of low-level system
 The util-linux-ng package contains a large variety of low-level system
@@ -305,6 +319,12 @@ Group: System Environment/Daemons
 Requires: libuuid = %{version}-%{release}
 Requires: libuuid = %{version}-%{release}
 License: GPLv2
 License: GPLv2
 Requires(pre): shadow-utils
 Requires(pre): shadow-utils
+%if %{with systemd}
+Requires: systemd
+Requires(pre): shadow-utils
+Requires(post): systemd-units
+Requires(preun): systemd-units
+%endif
 
 
 %description -n uuidd
 %description -n uuidd
 The uuidd package contains a userspace daemon (uuidd) which guarantees
 The uuidd package contains a userspace daemon (uuidd) which guarantees
@@ -445,6 +465,10 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS"
 %endif
 %endif
 %if %{mtab_symlink}
 %if %{mtab_symlink}
         --enable-libmount-mount \
         --enable-libmount-mount \
+%endif
+%if %{with systemd}
+	-with-systemdsystemunitdir=%{_unitdir} \
+	--with-systemd \
 %endif
 %endif
 	--with-fsprobe=builtin \
 	--with-fsprobe=builtin \
 	--with-utempter \
 	--with-utempter \
@@ -680,13 +704,29 @@ useradd -r -g uuidd -d /var/lib/libuuid -s /sbin/nologin \
 exit 0
 exit 0
 
 
 %post -n uuidd
 %post -n uuidd
+%if %{with systemd}
+%systemd_post uuidd.service
+if [ $1 -eq 1 ]; then
+	/bin/systemctl start uuidd.service > /dev/null 2>&1 || :
+fi
+%else
 /sbin/chkconfig --add uuidd
 /sbin/chkconfig --add uuidd
+%endif
 
 
 %preun -n uuidd
 %preun -n uuidd
+%if %{with systemd}
+%systemd_preun uuidd.service
+%else
 if [ "$1" = 0 ]; then
 if [ "$1" = 0 ]; then
 	/sbin/service uuidd stop > /dev/null 2>&1 || :
 	/sbin/service uuidd stop > /dev/null 2>&1 || :
 	/sbin/chkconfig --del uuidd
 	/sbin/chkconfig --del uuidd
 fi
 fi
+%endif
+
+%if %{with systemd}
+%postun -n uuidd
+%systemd_postun_with_restart uuidd.service
+%endif
 
 
 
 
 %files -f %{name}.files
 %files -f %{name}.files
@@ -718,6 +758,10 @@ fi
 %ghost %attr(0644,root,root)	%verify(not md5 size mtime)	/var/log/lastlog
 %ghost %attr(0644,root,root)	%verify(not md5 size mtime)	/var/log/lastlog
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab
 
 
+%if %{with systemd}
+%{_unitdir}/fstrim.*
+%endif
+
 /bin/dmesg
 /bin/dmesg
 /bin/findmnt
 /bin/findmnt
 /bin/kill
 /bin/kill
@@ -801,6 +845,7 @@ fi
 %{_bindir}/rev
 %{_bindir}/rev
 %{_bindir}/script
 %{_bindir}/script
 %{_bindir}/scriptreplay
 %{_bindir}/scriptreplay
+%{_bindir}/scriptlive
 %{_bindir}/setarch
 %{_bindir}/setarch
 %{_bindir}/setpriv
 %{_bindir}/setpriv
 %{_bindir}/setsid
 %{_bindir}/setsid
@@ -865,6 +910,7 @@ fi
 %{_mandir}/man1/runuser.1*
 %{_mandir}/man1/runuser.1*
 %{_mandir}/man1/script.1*
 %{_mandir}/man1/script.1*
 %{_mandir}/man1/scriptreplay.1*
 %{_mandir}/man1/scriptreplay.1*
+%{_mandir}/man1/scriptlive.1*
 %{_mandir}/man1/setsid.1*
 %{_mandir}/man1/setsid.1*
 %{_mandir}/man1/setpriv.1*
 %{_mandir}/man1/setpriv.1*
 %{_mandir}/man1/setterm.1*
 %{_mandir}/man1/setterm.1*
@@ -961,7 +1007,11 @@ fi
 
 
 %files -n uuidd
 %files -n uuidd
 %defattr(-,root,root)
 %defattr(-,root,root)
+%if %{with systemd}
+%{_unitdir}/uuidd.*
+%else
 /etc/rc.d/init.d/uuidd
 /etc/rc.d/init.d/uuidd
+%endif
 %{_mandir}/man8/uuidd.8*
 %{_mandir}/man8/uuidd.8*
 %attr(-, uuidd, uuidd) %{_sbindir}/uuidd
 %attr(-, uuidd, uuidd) %{_sbindir}/uuidd
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
 %dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
@@ -1079,6 +1129,11 @@ fi
 %endif
 %endif
 
 
 %changelog
 %changelog
+* Sat Apr 04 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net>
+- updated to 2.35.1.
+- updated rawhide patches.
+- imported Patch1000 from upstream.
+
 * Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.34-1
 * Sun Oct 27 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.34-1
 - updated to 2.34.
 - updated to 2.34.