SHA256
1
0
forked from pool/util-linux
OBS User unknown
2008-11-21 14:54:57 +00:00
committed by Git OBS Bridge
parent 5a4ecd0772
commit 912377e896
6 changed files with 584 additions and 2 deletions

View File

@@ -30,7 +30,7 @@ License: BSD 3-Clause; GPL v2 or later
Group: System/Base
AutoReqProv: on
Version: 2.14.1
Release: 6
Release: 7
Requires: %name-lang = %{version}
Summary: A collection of basic system utilities
Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/%name-ng-%version.tar.bz2
@@ -57,6 +57,7 @@ Source26: README.raw
Source28: mkzimage_cmdline.8
Source29: mkzimage_cmdline.c
Source30: README.largedisk
Source31: addnote.c
##
## util-linux patches
##
@@ -80,6 +81,9 @@ Patch13: util-linux-2.14.1-disk-utils_mkfs.minix_file_size_detection.patc
Patch14: util-linux-2.14.1-fdisk_missing_include.patch
Patch15: util-linux-2.14.1-fdisk_cylinder.patch
Patch16: util-linux-2.14.1-mount_loop_ro_fix.patch
Patch17: util-linux-2.14.1-mount_race.patch
Patch18: util-linux-2.14.1-mount_skip_sync.patch
Patch19: util-linux-2.14.1-hwclock_adjust_and_hctosys.patch
# crypto patch
Patch20: util-linux-mount_losetup_crypto.patch
##
@@ -132,6 +136,9 @@ Authors:
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
cp %{SOURCE7} %{SOURCE8} .
#
@@ -222,6 +229,7 @@ autoreconf -fi
make
gcc $RPM_OPT_FLAGS -o nologin nologin.c
gcc $RPM_OPT_FLAGS -o mkzimage_cmdline %{S:29}
gcc $RPM_OPT_FLAGS -o chrp-addnote %{SOURCE31}
%check
cd ../time-%{time_ver}
@@ -272,6 +280,7 @@ install -m 755 nologin $RPM_BUILD_ROOT/sbin
%ifnarch ppc ppc64
install -m 755 mkzimage_cmdline $RPM_BUILD_ROOT/usr/bin
install -m 644 %{S:28} $RPM_BUILD_ROOT%{_mandir}/man8
install -m 755 chrp-addnote $RPM_BUILD_ROOT/usr/bin
%endif
install -m 644 nologin.8 $RPM_BUILD_ROOT%{_mandir}/man8
# setctsid install
@@ -284,7 +293,7 @@ install -m 644 $RPM_SOURCE_DIR/etc.raw $RPM_BUILD_ROOT/etc/raw
install -m 755 $RPM_SOURCE_DIR/raw.init $RPM_BUILD_ROOT/etc/init.d/raw
ln -sf ../../etc/init.d/raw $RPM_BUILD_ROOT/usr/sbin/rcraw
# Stupid hack so we don't have a tcsh dependency
#chmod 644 $RPM_BUILD_ROOT/usr/share/misc/getopt/*
chmod 644 $RPM_BUILD_ROOT/usr/share/getopt/getopt*.tcsh
# Following files we don't want to package, so remove them
rm -f $RPM_BUILD_ROOT/usr/bin/pg
rm -f $RPM_BUILD_ROOT/usr/share/man/man1/pg.1*
@@ -431,6 +440,7 @@ fi
/usr/bin/mcookie
/usr/bin/mesg
%ifnarch ppc ppc64
/usr/bin/chrp-addnote
/usr/bin/mkzimage_cmdline
%endif
/usr/bin/namei
@@ -599,6 +609,14 @@ fi
#%endif
%changelog
* Thu Nov 20 2008 mkoenig@suse.de
- mount: enhance mount/umount mtab locking and lock the whole
read mtab/syscall/write mtab process to avoid mtab corruption
with highly concurrent mount/umount calls [bnc#444966]
- add arch/powerpc/boot/addnote.c from kernel 2.6.27
as /usr/bin/chrp-addnote [bnc#443859]
- umount: skip sync() in umount -a if no umount happened [bnc#447036]
- hwclock: allow --adjust and --hctosys simultaneously [bnc#441106]
* Fri Nov 07 2008 mkoenig@suse.de
- fdisk: support +cylinder notation [bnc#441871]
- check for EACCES when using ro fallback when loop mounting