diff options
| author | Thomas Woerner <twoerner@fedoraproject.org> | 2005-11-10 18:06:18 +0000 |
|---|---|---|
| committer | Thomas Woerner <twoerner@fedoraproject.org> | 2005-11-10 18:06:18 +0000 |
| commit | 5d6ad21282889f59b9bcb3557e7ba10ac79a4693 (patch) | |
| tree | f11420b73c980330b1ff3befcf1f20c26b032c39 | |
| parent | bd87502d9bb3313f00c44a5cba1b60b1e30530c7 (diff) | |
| download | e2fsprogs-5d6ad21282889f59b9bcb3557e7ba10ac79a4693.tar.gz e2fsprogs-5d6ad21282889f59b9bcb3557e7ba10ac79a4693.tar.xz e2fsprogs-5d6ad21282889f59b9bcb3557e7ba10ac79a4693.zip | |
- fixed file conflicts between 32bit and 64bit packages (#168815)
- fixed mklost+found crashes with buffer overflow (#157773)
Thanks to Arjan van de Ven for the patch
| -rw-r--r-- | e2fsprogs-1.38-no_pottcdate.patch | 12 | ||||
| -rw-r--r-- | e2fsprogs.spec | 13 |
2 files changed, 24 insertions, 1 deletions
diff --git a/e2fsprogs-1.38-no_pottcdate.patch b/e2fsprogs-1.38-no_pottcdate.patch new file mode 100644 index 0000000..ed67720 --- /dev/null +++ b/e2fsprogs-1.38-no_pottcdate.patch @@ -0,0 +1,12 @@ +--- e2fsprogs-1.38/po/Makefile.in.in.pottcdate 2005-06-29 19:42:20.000000000 +0200 ++++ e2fsprogs-1.38/po/Makefile.in.in 2005-11-10 17:35:39.000000000 +0100 +@@ -120,7 +120,8 @@ + mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ + fi; \ + else \ +- mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ ++ sed -f remove-potcdate.sed < $(DOMAIN).po > $(srcdir)/$(DOMAIN).pot && \ ++ rm -f $(DOMAIN).po; \ + fi; \ + } + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 9461976..c2f0fe3 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -4,7 +4,7 @@ Summary: Utilities for managing the second extended (ext2) filesystem. Name: e2fsprogs Version: 1.38 -Release: 2 +Release: 2.1 License: GPL Group: System Environment/Base Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz @@ -24,6 +24,8 @@ Patch28: e2fsprogs-1.37-blkid-nomagicvfat.patch Patch29: e2fsprogs-1.38-close-on-error.patch Patch30: e2fsprogs-1.38-resize-inode.patch Patch31: e2fsprogs-1.38-man_no_ext2resize.patch +Patch32: e2fsprogs-1.38-no_pottcdate.patch +Patch33: e2fsprogs-1.38-lost+found.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-root Requires: e2fsprogs-libs = %{version}-%{release} @@ -107,6 +109,10 @@ popd # drop ext2resize, ext2prepare and e2fsadm from man page of ext2online %patch31 -p1 -b .man_no_ext2resize +# drop timestamp from mo files +%patch32 -p1 -b .pottcdate +# fixed buffer overflow in mklost+found +%patch33 -p1 -b .lost+found %build %configure --enable-elf-shlibs --enable-nls --disable-e2initrd-helper @@ -283,6 +289,11 @@ exit 0 %{_mandir}/man3/uuid_unparse.3* %changelog +* Thu Nov 10 2005 Thomas Woerner <twoerner@redhat.com> 1.38-2.1 +- fixed file conflicts between 32bit and 64bit packages (#168815) +- fixed mklost+found crashes with buffer overflow (#157773) + Thanks to Arjan van de Ven for the patch + * Wed Nov 9 2005 Thomas Woerner <twoerner@redhat.com> 1.38-2 - splitted up libs from main package, into a new e2fsprogs-libs package - fixed requires and prereqs |