From 731a8f8e34cc6dcb57b1e6216f799228c37dd783 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sun, 8 Feb 2015 12:22:19 +0100 Subject: [PATCH] Update to 1.1.0. --- .gitignore | 1 + lxc-1.0.4-fix-init.patch | 22 ------------------- lxc-1.1.0-fix-init.patch | 46 ++++++++++++++++++++++++++++++++++++++++ lxc.spec | 30 +++++++++++++++++++++----- sources | 2 +- 5 files changed, 73 insertions(+), 28 deletions(-) delete mode 100644 lxc-1.0.4-fix-init.patch create mode 100644 lxc-1.1.0-fix-init.patch diff --git a/.gitignore b/.gitignore index 3b8f0f3..b7328fb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ lxc-0.7.2.tar.gz /lxc-1.0.4.tar.gz /lxc-1.0.5.tar.gz /lxc-e75a5c5c76c649435bd9171d5ea457fe727f5388.tar.gz +/lxc-1.1.0.tar.gz diff --git a/lxc-1.0.4-fix-init.patch b/lxc-1.0.4-fix-init.patch deleted file mode 100644 index 340ff76..0000000 --- a/lxc-1.0.4-fix-init.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up lxc-1.0.4/config/init/sysvinit/lxc.in.orig lxc-1.0.4/config/init/sysvinit/lxc.in ---- lxc-1.0.4/config/init/sysvinit/lxc.in.orig 2014-07-05 17:47:14.143145522 +0200 -+++ lxc-1.0.4/config/init/sysvinit/lxc.in 2014-07-05 18:01:40.053721615 +0200 -@@ -2,13 +2,15 @@ - # - # lxc Start/Stop LXC autoboot containers - # --# chkconfig: 345 99 01 -+# chkconfig: - 99 01 - # description: Starts/Stops all LXC containers configured for autostart. - # - ### BEGIN INIT INFO - # Provides: lxc --# Default-Start: 3 4 5 --# Default-Stop: 0 1 6 -+# Required-Start: $local_fs $network -+# Required-Stop: $local_fs $network -+# Default-Start: -+# Default-Stop: - # Short-Description: Bring up/down LXC autostart containers - # Description: Bring up/down LXC autostart containers - ### END INIT INFO diff --git a/lxc-1.1.0-fix-init.patch b/lxc-1.1.0-fix-init.patch new file mode 100644 index 0000000..1739c48 --- /dev/null +++ b/lxc-1.1.0-fix-init.patch @@ -0,0 +1,46 @@ +diff --git a/config/init/sysvinit/lxc-containers.in b/config/init/sysvinit/lxc-containers.in +index bc93322..06ca8f4 100644 +--- a/config/init/sysvinit/lxc-containers.in ++++ b/config/init/sysvinit/lxc-containers.in +@@ -2,13 +2,15 @@ + # + # lxc Start/Stop LXC autoboot containers + # +-# chkconfig: 345 99 01 ++# chkconfig: - 99 01 + # description: Starts/Stops all LXC containers configured for autostart. + # + ### BEGIN INIT INFO + # Provides: lxc +-# Default-Start: 2 3 4 5 +-# Default-Stop: 0 1 6 ++# Required-Start: $local_fs $network ++# Required-Stop: $local_fs $network ++# Default-Start: ++# Default-Stop: + # Short-Description: Bring up/down LXC autostart containers + # Description: Bring up/down LXC autostart containers + ### END INIT INFO +diff --git a/config/init/sysvinit/lxc-net.in b/config/init/sysvinit/lxc-net.in +index f6892c1..362469c 100644 +--- a/config/init/sysvinit/lxc-net.in ++++ b/config/init/sysvinit/lxc-net.in +@@ -2,13 +2,15 @@ + # + # lxc-net Start/Stop LXC Networking + # +-# chkconfig: 345 98 01 ++# chkconfig: - 98 01 + # description: Starts/Stops LXC Network Bridge + # + ### BEGIN INIT INFO + # Provides: lxc-net +-# Default-Start: 2 3 4 5 +-# Default-Stop: 1 ++# Required-Start: $local_fs $network ++# Required-Stop: $local_fs $network ++# Default-Start: ++# Default-Stop: + # Short-Description: Bring up/down LXC Network Bridge + # Description: Bring up/down LXC Network Bridge + ### END INIT INFO diff --git a/lxc.spec b/lxc.spec index c39ee8e..82b0b6c 100644 --- a/lxc.spec +++ b/lxc.spec @@ -12,22 +12,26 @@ %endif %endif -%if 0%{?fedora} > 19 +%if 0%{?fedora} >= 22 +%global luaver 5.3 +%else +%if 0%{?fedora} >= 20 %global luaver 5.2 %else %global luaver 5.1 %endif +%endif %global lualibdir %{_libdir}/lua/%{luaver} %global luapkgdir %{_datadir}/lua/%{luaver} # for pre-releases -%global prerel alpha1 -%global commit e75a5c5c76c649435bd9171d5ea457fe727f5388 +#global prerel +%global commit 62ed104940747d135ffd71f513e51bf3d912d1d9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: lxc Version: 1.1.0 -Release: %{?prerel:0.}3%{?prerel:.%{prerel}}%{?dist} +Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist} Summary: Linux Resource Containers Group: Applications/System License: LGPLv2+ and GPLv2 @@ -37,7 +41,7 @@ Source0: https://github.com/lxc/lxc/archive/%{commit}/%{name}-%{commit}.t %else Source0: http://linuxcontainers.org/downloads/%{name}-%{version}.tar.gz %endif -Patch0: lxc-1.0.4-fix-init.patch +Patch0: lxc-1.1.0-fix-init.patch BuildRequires: docbook-utils Buildrequires: docbook2X Buildrequires: doxygen @@ -231,17 +235,22 @@ make check %post libs /sbin/ldconfig %if 0%{?with_systemd} +%systemd_post %{name}-net.service %systemd_post %{name}.service %else +/sbin/chkconfig --add %{name}-net /sbin/chkconfig --add %{name} %endif # with_systemd %preun libs %if 0%{?with_systemd} +%systemd_preun %{name}-net.service %systemd_preun %{name}.service %else if [ $1 -eq 0 ]; then + /sbin/service %{name}-net stop > /dev/null 2>&1 + /sbin/chkconfig --del %{name}-net /sbin/service %{name} stop > /dev/null 2>&1 /sbin/chkconfig --del %{name} fi @@ -251,9 +260,11 @@ fi %postun libs /sbin/ldconfig %if 0%{?with_systemd} +%systemd_postun %{name}-net.service %systemd_postun %{name}.service %else if [ $1 -ge 1 ]; then + /sbin/service %{name}-net condrestart > /dev/null 2>&1 || : /sbin/service %{name} condrestart > /dev/null 2>&1 || : fi %endif # with_systemd @@ -291,6 +302,9 @@ fi %dir %{_datadir}/%{name}/config %{_datadir}/%{name}/hooks %{_datadir}/%{name}/%{name}-patch.py* +%{_datadir}/%{name}/selinux +# fixme: should be in libexecdir? +%{_datadir}/%{name}/%{name}-restore-net %{_libdir}/liblxc.so.* %{_libdir}/%{name} %{_libexecdir}/%{name} @@ -300,6 +314,7 @@ fi %{_sharedstatedir}/%{name} %dir %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}/default.conf +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_mandir}/man1/%{name}-autostart* %{_mandir}/*/man1/%{name}-autostart* %{_mandir}/man1/%{name}-user-nic* @@ -314,8 +329,10 @@ fi %{_pkgdocdir}/README %if 0%{?with_systemd} %{_unitdir}/%{name}.service +%{_unitdir}/%{name}-net.service %else %{_sysconfdir}/rc.d/init.d/%{name} +%{_sysconfdir}/rc.d/init.d/%{name}-net %endif # with_systemd %dir %{_localstatedir}/cache/%{name} @@ -362,6 +379,9 @@ fi %changelog +* Sun Feb 8 2015 Thomas Moschny - 1.1.0-1 +- Update to 1.1.0. + * Sat Aug 30 2014 Thomas Moschny - 1.1.0-0.3.alpha1 - Add missing dependency on lua-alt-getopt (rhbz#1131707). diff --git a/sources b/sources index c4eed80..7ad6b30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e62a6f6a452a868ad0d7d4e7870a234 lxc-e75a5c5c76c649435bd9171d5ea457fe727f5388.tar.gz +ab1cbabf859abc15165050c854979c5c lxc-1.1.0.tar.gz