Rev openSUSE:Factory/17 Md5 2025b57a014978224dc3e818cfb5a8c4 2007-11-28 22:03:08 unknown None

e2fsprogs-1.40.2-open_fix.patch

@@ -0,0 +1,13 @@
+Index: e2fsprogs-1.40.2/lib/ext2fs/ismounted.c
+===================================================================
+--- e2fsprogs-1.40.2.orig/lib/ext2fs/ismounted.c
++++ e2fsprogs-1.40.2/lib/ext2fs/ismounted.c
+@@ -147,7 +147,7 @@ static errcode_t check_mntent_file(const
+ is_root:
+ #define TEST_FILE "/.ismount-test-file"		
+ 		*mount_flags |= EXT2_MF_ISROOT;
+-		fd = open(TEST_FILE, O_RDWR|O_CREAT);
++		fd = open(TEST_FILE, O_RDWR|O_CREAT, S_IRUSR|S_IWUSR);
+ 		if (fd < 0) {
+ 			if (errno == EROFS)
+ 				*mount_flags |= EXT2_MF_READONLY;

e2fsprogs.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Nov 26 14:39:17 CET 2007 - mkoenig@suse.de
+
+- fix build: missing third argument to open
+- do not remove buildroot in install section
+
 -------------------------------------------------------------------
 Fri Jul 27 12:28:18 CEST 2007 - mkoenig@suse.de
 

e2fsprogs.spec

@@ -19,11 +19,11 @@ License:        GPL v2 or later
 Group:          System/Filesystems
 Supplements:    filesystem(ext2) filesystem(ext3)
 PreReq:         %install_info_prereq
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        1.40.2
-Release:        5
+Release:        30
 Summary:        Utilities for the Second Extended File System
-URL:            http://e2fsprogs.sourceforge.net
+Url:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
 Source1:        de.po
 Source2:        README.SUSE
@@ -46,6 +46,7 @@ Patch17:        e2fsprogs-strncat.patch
 Patch20:        e2fsprogs-blkid_probe_hfsplus.patch
 Patch21:        e2fsprogs-uninitialized.diff
 Patch22:        e2fsprogs-1.40-be_swap_fix.patch
+Patch23:        e2fsprogs-1.40.2-open_fix.patch
 # libcom_err patches
 Patch30:        libcom_err-no-static-buffer.patch
 Patch31:        libcom_err-no-init_error_table.patch
@@ -72,7 +73,7 @@ Authors:
 %package devel
 Summary:        Dummy development package
 Group:          Development/Libraries/C and C++
-Autoreqprov:    on
+AutoReqProv:    on
 Requires:       libext2fs-devel = %version libblkid-devel = %version libuuid-devel = %version
 
 %description devel
@@ -88,7 +89,7 @@ Authors:
 %package -n libext2fs2
 Summary:        Ext2fs libray
 Group:          System/Filesystems
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description -n libext2fs2
 The basic Ext2fs library.
@@ -103,7 +104,7 @@ Authors:
 %package -n libext2fs-devel
 Summary:        Development files for libext2fs
 Group:          System/Filesystems
-Autoreqprov:    on
+AutoReqProv:    on
 Requires:       libext2fs2 = %version libcom_err-devel
 
 %description -n libext2fs-devel
@@ -121,7 +122,7 @@ Summary:        E2fsprogs error reporting library
 Group:          System/Filesystems
 Provides:       libcom_err = %{version}
 Obsoletes:      libcom_err < %{version}
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description -n libcom_err2
 com_err is an error message display library.
@@ -136,7 +137,7 @@ Authors:
 %package -n libcom_err-devel
 Summary:        Development files for libcom_err
 Group:          System/Filesystems
-Autoreqprov:    on
+AutoReqProv:    on
 Requires:       libcom_err2 = %version
 
 %description -n libcom_err-devel
@@ -152,7 +153,7 @@ Authors:
 %package -n libblkid1
 Summary:        Filesystem detection library
 Group:          System/Filesystems
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description -n libblkid1
 Library for filesystem detection.
@@ -167,7 +168,7 @@ Authors:
 %package -n libblkid-devel
 Summary:        Development files for the filesystem detection library
 Group:          System/Filesystems
-Autoreqprov:    on
+AutoReqProv:    on
 Requires:       libblkid1 = %version libuuid-devel
 
 %description -n libblkid-devel
@@ -184,7 +185,7 @@ Authors:
 %package -n libuuid1
 Summary:        Library to generate UUIDs
 Group:          System/Filesystems
-Autoreqprov:    on
+AutoReqProv:    on
 
 %description -n libuuid1
 A library to generate universally unique IDs (UUIDs).
@@ -199,7 +200,7 @@ Authors:
 %package -n libuuid-devel
 Summary:        Development files for libuuid1
 Group:          System/Filesystems
-Autoreqprov:    on
+AutoReqProv:    on
 Requires:       libuuid1 = %version
 
 %description -n libuuid-devel
@@ -234,6 +235,7 @@ Authors:
 %patch20 -p1
 %patch21
 %patch22 -p1
+%patch23 -p1
 # libcom_err patches
 %patch30 -p1
 %patch31 -p1 
@@ -265,7 +267,6 @@ patch -p0 -i %{P:13}
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install install-libs DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} 
 %{find_lang} %{name}
 rm $RPM_BUILD_ROOT%{_libdir}/e2initrd_helper
@@ -420,6 +421,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/com_err.3.gz
 
 %changelog
+* Mon Nov 26 2007 - mkoenig@suse.de
+- fix build: missing third argument to open
+- do not remove buildroot in install section
 * Fri Jul 27 2007 - mkoenig@suse.de
 - fix typo in specfile
 * Thu Jul 26 2007 - mkoenig@suse.de