Copy from Base:System/e2fsprogs based on submit request 26180 from user michal-m

Rev openSUSE:Factory/50 Md5 9d536b79b6f871ed112bc1ff4d7dce3c 2009-12-11 12:01:57 autobuild None

e2fsprogs-fdleak.patch

@@ -0,0 +1,14 @@
+diff --git a/misc/ismounted.c b/misc/ismounted.c
+index 6d4b878..50b4140 100644
+--- a/misc/ismounted.c
++++ b/misc/ismounted.c
+@@ -86,9 +86,6 @@ static errcode_t check_mntent_file(const char *mtab_file, const char *file,
+ 	char		buf[1024], *device = 0, *mnt_dir = 0, *cp;
+ 
+ 	*mount_flags = 0;
+-	if ((f = fopen(mtab_file, "r")) == NULL)
+-		return errno;
+-
+ 	if ((f = setmntent (mtab_file, "r")) == NULL)
+ 		return errno;
+ 	if (stat(file, &st_buf) == 0) {

e2fsprogs.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 28 23:04:36 UTC 2009 - crrodriguez@opensuse.org
+
+- libcom_err-devel shoudl require glibc-devel
+- Axe static libraries and see how it goes.. 
+
+-------------------------------------------------------------------
+Thu Oct  1 21:44:17 UTC 2009 - crrodriguez@opensuse.org
+
+- fix possible massive fdleak when fsck is invoked with options
+  -R -A -M -a -t noopts=nofail in boot.localfs [bnc#503008] 
+
 -------------------------------------------------------------------
 Thu Sep 10 15:16:55 CEST 2009 - coolo@novell.com
 

e2fsprogs.spec

@@ -19,7 +19,7 @@
 
 
 Name:           e2fsprogs
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          System/Filesystems
 Supplements:    filesystem(ext2) filesystem(ext3) filesystem(ext4)
 BuildRequires:  libblkid-devel libuuid-devel pkg-config
@@ -31,7 +31,7 @@ Obsoletes:      e2fsprogs-64bit
 %endif
 #
 Version:        1.41.9
-Release:        2
+Release:        3
 Summary:        Utilities for the Second Extended File System
 Url:            http://e2fsprogs.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
@@ -46,6 +46,7 @@ Patch8:         e2fsprogs-1.41.9-fixsuper.patch
 # libcom_err patches
 Patch34:        libcom_err-compile_et_permissions.patch
 Patch35:        libcom_err-readline.patch
+Patch36:        e2fsprogs-fdleak.patch
 # Do not suppress make commands
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -55,7 +56,7 @@ under Linux. Included in this package are: chattr, lsattr, mke2fs,
 mklost+found, tune2fs, e2fsck, resize2fs, and badblocks.
 
 %package devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Dummy development package
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
@@ -70,7 +71,7 @@ Requires:       libext2fs-devel = %version libblkid-devel libuuid-devel
 Dummy development package for backwards compatibility.
 
 %package -n libext2fs2
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Ext2fs libray
 Group:          System/Filesystems
 AutoReqProv:    on
@@ -79,7 +80,7 @@ AutoReqProv:    on
 The basic Ext2fs shared library.
 
 %package -n libext2fs-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Development files for libext2fs
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
@@ -89,7 +90,7 @@ Requires:       libext2fs2 = %version libcom_err-devel
 Development files for libext2fs.
 
 %package -n libcom_err2
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        E2fsprogs error reporting library
 Group:          System/Filesystems
 # bug437293
@@ -106,7 +107,7 @@ AutoReqProv:    on
 com_err is an error message display library.
 
 %package -n libcom_err-devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Development files for libcom_err
 Group:          Development/Libraries/C and C++
 AutoReqProv:    on
@@ -115,7 +116,7 @@ AutoReqProv:    on
 Obsoletes:      libcom_err-devel-64bit
 %endif
 #
-Requires:       libcom_err2 = %version
+Requires:       libcom_err2 = %version glibc-devel
 
 %description -n libcom_err-devel
 Development files for the com_err error message display library.
@@ -130,6 +131,7 @@ Development files for the com_err error message display library.
 %patch35 -p1
 cp %{SOURCE2} .
 cp %{S:6} po/de.po
+%patch36 -p1
 
 %build
 autoreconf --force --install
@@ -145,7 +147,7 @@ autoreconf --force --install
   --disable-uuidd \
   --disable-fsck \
   CFLAGS="$RPM_OPT_FLAGS"
-make V=1
+%{__make} %{?jobs:-j%jobs} V=1
 
 %install
 make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib}
@@ -155,6 +157,7 @@ rm -f $RPM_BUILD_ROOT/sbin/mkfs.ext4dev
 rm -f $RPM_BUILD_ROOT/sbin/fsck.ext4dev
 rm -f $RPM_BUILD_ROOT/usr/share/man/man8/mkfs.ext4dev.8*
 rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8*
+rm -v %{buildroot}%{_libdir}/*.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -167,17 +170,13 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
 
-%post -n libext2fs2
-/sbin/ldconfig
+%post -n libext2fs2 -p /sbin/ldconfig
 
-%postun -n libext2fs2
-/sbin/ldconfig
+%postun -n libext2fs2 -p /sbin/ldconfig
 
-%post -n libcom_err2
-/sbin/ldconfig
+%post -n libcom_err2 -p /sbin/ldconfig
 
-%postun -n libcom_err2
-/sbin/ldconfig
+%postun -n libcom_err2 -p /sbin/ldconfig
 
 %files -f %{name}.lang
 %defattr(-, root, root)
@@ -224,8 +223,6 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libext2fs-devel
 %defattr(-, root, root)
 %{_libdir}/libext2fs.so
-%{_libdir}/libext2fs.a
-%{_libdir}/libe2p.a
 %{_libdir}/libe2p.so
 /usr/include/ext2fs
 /usr/include/e2p
@@ -242,8 +239,6 @@ rm -rf $RPM_BUILD_ROOT
 %_bindir/compile_et
 %_bindir/mk_cmds
 %{_libdir}/libcom_err.so
-%{_libdir}/libcom_err.a
-%{_libdir}/libss.a
 %{_libdir}/libss.so
 %_libdir/pkgconfig/com_err.pc
 %_libdir/pkgconfig/ss.pc