forked from pool/e2fsprogs
converted link to branch
Rev filesystems/2 Md5 e7467e62eede21041556f5a29f1e0948 2010-02-19 15:16:28 coolo None
This commit is contained in:
parent
5d9b694fb0
commit
3606116ed1
14
e2fsprogs-fdleak.patch
Normal file
14
e2fsprogs-fdleak.patch
Normal file
@ -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) {
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Dec 13 19:26:14 CET 2009 - jengelh@medozas.de
|
||||||
|
|
||||||
|
- add baselibs.conf as a source
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
Thu Sep 10 15:16:55 CEST 2009 - coolo@novell.com
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: e2fsprogs
|
Name: e2fsprogs
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4)
|
Supplements: filesystem(ext2) filesystem(ext3) filesystem(ext4)
|
||||||
BuildRequires: libblkid-devel libuuid-devel pkg-config
|
BuildRequires: libblkid-devel libuuid-devel pkg-config
|
||||||
@ -31,11 +31,12 @@ Obsoletes: e2fsprogs-64bit
|
|||||||
%endif
|
%endif
|
||||||
#
|
#
|
||||||
Version: 1.41.9
|
Version: 1.41.9
|
||||||
Release: 2
|
Release: 4
|
||||||
Summary: Utilities for the Second Extended File System
|
Summary: Utilities for the Second Extended File System
|
||||||
Url: http://e2fsprogs.sourceforge.net
|
Url: http://e2fsprogs.sourceforge.net
|
||||||
Source: %{name}-%{version}.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
Source2: README.SUSE
|
Source2: README.SUSE
|
||||||
|
Source3: baselibs.conf
|
||||||
Source6: %{name}-1.41.4.de.po
|
Source6: %{name}-1.41.4.de.po
|
||||||
#
|
#
|
||||||
# e2fsprogs patches
|
# e2fsprogs patches
|
||||||
@ -46,6 +47,7 @@ Patch8: e2fsprogs-1.41.9-fixsuper.patch
|
|||||||
# libcom_err patches
|
# libcom_err patches
|
||||||
Patch34: libcom_err-compile_et_permissions.patch
|
Patch34: libcom_err-compile_et_permissions.patch
|
||||||
Patch35: libcom_err-readline.patch
|
Patch35: libcom_err-readline.patch
|
||||||
|
Patch36: e2fsprogs-fdleak.patch
|
||||||
# Do not suppress make commands
|
# Do not suppress make commands
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
@ -55,7 +57,7 @@ under Linux. Included in this package are: chattr, lsattr, mke2fs,
|
|||||||
mklost+found, tune2fs, e2fsck, resize2fs, and badblocks.
|
mklost+found, tune2fs, e2fsck, resize2fs, and badblocks.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
Summary: Dummy development package
|
Summary: Dummy development package
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
@ -70,7 +72,7 @@ Requires: libext2fs-devel = %version libblkid-devel libuuid-devel
|
|||||||
Dummy development package for backwards compatibility.
|
Dummy development package for backwards compatibility.
|
||||||
|
|
||||||
%package -n libext2fs2
|
%package -n libext2fs2
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
Summary: Ext2fs libray
|
Summary: Ext2fs libray
|
||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
@ -79,7 +81,7 @@ AutoReqProv: on
|
|||||||
The basic Ext2fs shared library.
|
The basic Ext2fs shared library.
|
||||||
|
|
||||||
%package -n libext2fs-devel
|
%package -n libext2fs-devel
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
Summary: Development files for libext2fs
|
Summary: Development files for libext2fs
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
@ -89,7 +91,7 @@ Requires: libext2fs2 = %version libcom_err-devel
|
|||||||
Development files for libext2fs.
|
Development files for libext2fs.
|
||||||
|
|
||||||
%package -n libcom_err2
|
%package -n libcom_err2
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
Summary: E2fsprogs error reporting library
|
Summary: E2fsprogs error reporting library
|
||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
# bug437293
|
# bug437293
|
||||||
@ -106,7 +108,7 @@ AutoReqProv: on
|
|||||||
com_err is an error message display library.
|
com_err is an error message display library.
|
||||||
|
|
||||||
%package -n libcom_err-devel
|
%package -n libcom_err-devel
|
||||||
License: GPL v2 or later
|
License: GPLv2+
|
||||||
Summary: Development files for libcom_err
|
Summary: Development files for libcom_err
|
||||||
Group: Development/Libraries/C and C++
|
Group: Development/Libraries/C and C++
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
@ -115,7 +117,7 @@ AutoReqProv: on
|
|||||||
Obsoletes: libcom_err-devel-64bit
|
Obsoletes: libcom_err-devel-64bit
|
||||||
%endif
|
%endif
|
||||||
#
|
#
|
||||||
Requires: libcom_err2 = %version
|
Requires: libcom_err2 = %version glibc-devel
|
||||||
|
|
||||||
%description -n libcom_err-devel
|
%description -n libcom_err-devel
|
||||||
Development files for the com_err error message display library.
|
Development files for the com_err error message display library.
|
||||||
@ -130,6 +132,7 @@ Development files for the com_err error message display library.
|
|||||||
%patch35 -p1
|
%patch35 -p1
|
||||||
cp %{SOURCE2} .
|
cp %{SOURCE2} .
|
||||||
cp %{S:6} po/de.po
|
cp %{S:6} po/de.po
|
||||||
|
%patch36 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf --force --install
|
autoreconf --force --install
|
||||||
@ -145,7 +148,7 @@ autoreconf --force --install
|
|||||||
--disable-uuidd \
|
--disable-uuidd \
|
||||||
--disable-fsck \
|
--disable-fsck \
|
||||||
CFLAGS="$RPM_OPT_FLAGS"
|
CFLAGS="$RPM_OPT_FLAGS"
|
||||||
make V=1
|
%{__make} %{?jobs:-j%jobs} V=1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib}
|
make install install-libs DESTDIR=$RPM_BUILD_ROOT ELF_INSTALL_DIR=/%{_lib}
|
||||||
@ -155,6 +158,7 @@ rm -f $RPM_BUILD_ROOT/sbin/mkfs.ext4dev
|
|||||||
rm -f $RPM_BUILD_ROOT/sbin/fsck.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/mkfs.ext4dev.8*
|
||||||
rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8*
|
rm -f $RPM_BUILD_ROOT/usr/share/man/man8/fsck.ext4dev.8*
|
||||||
|
rm -v %{buildroot}%{_libdir}/*.a
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -167,17 +171,13 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
%install_info_delete --info-dir=%{_infodir} %{_infodir}/libext2fs.info.gz
|
||||||
|
|
||||||
%post -n libext2fs2
|
%post -n libext2fs2 -p /sbin/ldconfig
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
%postun -n libext2fs2
|
%postun -n libext2fs2 -p /sbin/ldconfig
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
%post -n libcom_err2
|
%post -n libcom_err2 -p /sbin/ldconfig
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
%postun -n libcom_err2
|
%postun -n libcom_err2 -p /sbin/ldconfig
|
||||||
/sbin/ldconfig
|
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
@ -224,8 +224,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%files -n libext2fs-devel
|
%files -n libext2fs-devel
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
%{_libdir}/libext2fs.so
|
%{_libdir}/libext2fs.so
|
||||||
%{_libdir}/libext2fs.a
|
|
||||||
%{_libdir}/libe2p.a
|
|
||||||
%{_libdir}/libe2p.so
|
%{_libdir}/libe2p.so
|
||||||
/usr/include/ext2fs
|
/usr/include/ext2fs
|
||||||
/usr/include/e2p
|
/usr/include/e2p
|
||||||
@ -242,8 +240,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%_bindir/compile_et
|
%_bindir/compile_et
|
||||||
%_bindir/mk_cmds
|
%_bindir/mk_cmds
|
||||||
%{_libdir}/libcom_err.so
|
%{_libdir}/libcom_err.so
|
||||||
%{_libdir}/libcom_err.a
|
|
||||||
%{_libdir}/libss.a
|
|
||||||
%{_libdir}/libss.so
|
%{_libdir}/libss.so
|
||||||
%_libdir/pkgconfig/com_err.pc
|
%_libdir/pkgconfig/com_err.pc
|
||||||
%_libdir/pkgconfig/ss.pc
|
%_libdir/pkgconfig/ss.pc
|
||||||
|
Loading…
Reference in New Issue
Block a user