From 5f64c73372cad6328cf6b762b7963c4dfd761c2c Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 19 Dec 2006 14:30:06 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/e2fsprogs?expand=0&rev=2 --- e2fsprogs-strncat.patch | 11 +++++++++++ e2fsprogs.changes | 5 +++++ e2fsprogs.spec | 8 ++++++-- 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 e2fsprogs-strncat.patch diff --git a/e2fsprogs-strncat.patch b/e2fsprogs-strncat.patch new file mode 100644 index 0000000..3268213 --- /dev/null +++ b/e2fsprogs-strncat.patch @@ -0,0 +1,11 @@ +--- e2fsprogs-1.39/misc/e2image.c.xx 2006-12-19 11:14:32.000000000 +0100 ++++ e2fsprogs-1.39/misc/e2image.c 2006-12-19 11:16:26.000000000 +0100 +@@ -126,7 +126,7 @@ + hdr.magic_number = EXT2_ET_MAGIC_E2IMAGE; + strcpy(hdr.magic_descriptor, "Ext2 Image 1.0"); + gethostname(hdr.fs_hostname, sizeof(hdr.fs_hostname)); +- strncat(hdr.fs_device_name, device_name, sizeof(hdr.fs_device_name)); ++ strncat(hdr.fs_device_name, device_name, sizeof(hdr.fs_device_name)-1); + hdr.fs_device_name[sizeof(hdr.fs_device_name) - 1] = 0; + hdr.fs_blocksize = fs->blocksize; + diff --git a/e2fsprogs.changes b/e2fsprogs.changes index cc9eec6..a67fe46 100644 --- a/e2fsprogs.changes +++ b/e2fsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 19 11:24:12 CET 2006 - meissner@suse.de + +- fixed build + ------------------------------------------------------------------- Wed Nov 8 02:04:35 CET 2006 - ro@suse.de diff --git a/e2fsprogs.spec b/e2fsprogs.spec index a30347a..bd79773 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -12,14 +12,14 @@ Name: e2fsprogs BuildRequires: libvolume_id-devel -License: GNU General Public License (GPL) - all versions +License: GNU General Public License (GPL) Group: System/Filesystems Provides: e2fsbn ext2fs Obsoletes: ext2fs PreReq: %install_info_prereq Autoreqprov: on Version: 1.39 -Release: 16 +Release: 22 Summary: Utilities for the Second Extended File System URL: http://e2fsprogs.sourceforge.net Source: %{name}-%{version}.tar.bz2 @@ -27,6 +27,7 @@ Patch1: elf.diff Patch3: %{name}-1.35-libdir.diff Patch4: %{name}-1.33-fsckdevdisplay.diff Patch5: %{name}-1.33-codecleanup.diff +Patch14: e2fsprogs-strncat.patch Patch15: e2fsprogs-blkid.diff Patch16: e2fsprogs-codecleanup.diff Patch17: e2fsprogs-mdraid.patch @@ -109,6 +110,7 @@ Authors: %patch3 %patch4 %patch5 +%patch14 -p1 %patch15 %patch16 %patch17 @@ -290,6 +292,8 @@ rm -rf $RPM_BUILD_ROOT %postun -n libcom_err -p /sbin/ldconfig %changelog -n e2fsprogs +* Tue Dec 19 2006 - meissner@suse.de +- fixed build * Wed Nov 08 2006 - ro@suse.de - provide libcom_err-devel in libcom_err * Thu Oct 19 2006 - mkoenig@suse.de