New upstream version 4.1.3.

- Remove patch which is now upstream.
- Add examples directory to documentation.
This commit is contained in:
Richard W.M. Jones 2013-08-09 11:59:42 +01:00
parent 2f66d09178
commit b37e55ad4a
3 changed files with 9 additions and 55 deletions

View File

@ -1,47 +0,0 @@
From 417439cbbd3fff062a6aedce78dbaf49f6bd7e75 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 5 Aug 2013 21:18:59 +0100
Subject: [PATCH] Copy sticky & setgid bits from directory to base.img, and
into appliance.
These bits are copied from the original directory mode (from the RPM)
to the base.img, and from there into the appliance.
S_ISGID 0002000 set-group-ID bit (see below)
S_ISVTX 0001000 sticky bit (see below)
These bits have special significance for some directories (eg. /tmp).
---
helper/ext2.c | 2 +-
src/supermin.ml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/helper/ext2.c b/helper/ext2.c
index 438713a..2d75fb2 100644
--- a/helper/ext2.c
+++ b/helper/ext2.c
@@ -132,7 +132,7 @@ ext2_mkdir (ext2_ino_t dir_ino, const char *dirname, const char *basename,
{
errcode_t err;
- mode = LINUX_S_IFDIR | (mode & 0777);
+ mode = LINUX_S_IFDIR | (mode & 03777);
/* Does the directory exist? This is legitimate: we just skip
* this case.
diff --git a/src/supermin.ml b/src/supermin.ml
index 251c13e..995f9d8 100644
--- a/src/supermin.ml
+++ b/src/supermin.ml
@@ -379,7 +379,7 @@ let () =
*)
List.iter (
fun (path, { ft_dir = is_dir; ft_mode = mode }, _) ->
- if is_dir then chmod (rootdir // path) (mode land 0o777 lor 0o700)
+ if is_dir then chmod (rootdir // path) (mode land 0o3777 lor 0o700)
) (List.rev baseimgfiles);
(* Construct the 'base.img' initramfs. Feed in the list of filenames
--
1.8.3.1

View File

@ -1 +1 @@
8235a2d7e270adad81dded2fac1d365f supermin-4.1.2.tar.gz
95f3981d1c9a20fcdc52b55e9b53c718 supermin-4.1.3.tar.gz

View File

@ -1,7 +1,7 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 4.1.2
Release: 2%{?dist}
Version: 4.1.3
Release: 1%{?dist}
License: GPLv2+
%if 0%{?rhel} >= 7
@ -11,8 +11,6 @@ ExclusiveArch: x86_64
URL: http://people.redhat.com/~rjones/supermin/
Source0: http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
Patch0: 0001-Copy-sticky-setgid-bits-from-directory-to-base.img-a.patch
BuildRequires: /usr/bin/pod2man
BuildRequires: yum >= 3.2
BuildRequires: /usr/sbin/mke2fs
@ -63,8 +61,6 @@ Obsoletes: febootstrap-supermin-helper <= 3.21-1
%prep
%setup -q
%patch0 -p1
%build
%configure --disable-network-tests
@ -87,7 +83,7 @@ make check
%files
%doc COPYING README
%doc COPYING README examples/build-basic-vm.sh
%{_bindir}/supermin
%{_mandir}/man8/supermin.8*
@ -99,6 +95,11 @@ make check
%changelog
* Fri Aug 9 2013 Richard W.M. Jones <rjones@redhat.com> - 4.1.3-1
- New upstream version 4.1.3.
- Remove patch which is now upstream.
- Add examples directory to documentation.
* Tue Aug 6 2013 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-2
- Include upstream patch to get correct directory setgid/sticky bits in
the appliance.