OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/parted?expand=0&rev=39

fix-array-overflow.patch

@@ -0,0 +1,83 @@
+From 8bd3645d7c184ac6a4076414b469ece15fbcccde Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@redhat.com>
+Date: Mon, 14 Jan 2008 20:01:39 +0100
+Subject: [PATCH] Avoid new error detected by very latest gcc.
+
+* libparted/fs/fat/traverse.c (fat_dir_entry_get_name): Don't reference
+->extension[3] via a pointer into the prior ->name[8] struct member.
+gcc detected the reference beyond end of name[8].
+Declare first parameter to be "const".
+* libparted/fs/fat/traverse.c: Update prototype.
+---
+ libparted/fs/fat/traverse.c |   18 ++++++++++--------
+ libparted/fs/fat/traverse.h |    4 ++--
+ 2 files changed, 12 insertions(+), 10 deletions(-)
+
+diff --git a/libparted/fs/fat/traverse.c b/libparted/fs/fat/traverse.c
+index 3d2e2b5..367f511 100644
+--- a/libparted/fs/fat/traverse.c
++++ b/libparted/fs/fat/traverse.c
+@@ -1,6 +1,6 @@
+ /*
+     libparted
+-    Copyright (C) 1998, 1999, 2000, 2005, 2007 Free Software Foundation, Inc.
++    Copyright (C) 1998-2000, 2005, 2007-2008 Free Software Foundation, Inc.
+ 
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+@@ -340,22 +340,24 @@ fat_dir_entry_has_first_cluster (FatDirEntry* dir_entry, PedFileSystem* fs)
+     decrypts silly DOS names to FILENAME.EXT
+ */
+ void
+-fat_dir_entry_get_name (FatDirEntry*dir_entry, char *result) {
++fat_dir_entry_get_name (const FatDirEntry *dir_entry, char *result) {
+ 	int     i;
+-	char   *src;
++	const char *src;
++	const char *ext;
+ 
+ 	src = dir_entry->name;
+ 
+-	for (i=0; i<8; i++) {
++	for (i=0; i < sizeof dir_entry->name; i++) {
+ 		if (src[i] == ' ' || src[i] == 0) break;
+ 		*result++ = src[i];
+ 	}
+ 
+-	if (src[8] != ' ' && src[8] != 0) {
++	ext = (const char *) dir_entry->extension;
++	if (ext[0] != ' ' && ext[0] != 0) {
+ 		*result++ = '.';
+-		for (i=8; i<11; i++) {
+-			if (src[i] == ' ' || src[i] == 0) break;
+-			*result++ = src[i];
++		for (i=0; i < sizeof dir_entry->extension; i++) {
++			if (ext[i] == ' ' || ext[i] == 0) break;
++			*result++ = ext[i];
+ 		}
+ 	}
+ 
+diff --git a/libparted/fs/fat/traverse.h b/libparted/fs/fat/traverse.h
+index 21e4c27..17e4580 100644
+--- a/libparted/fs/fat/traverse.h
++++ b/libparted/fs/fat/traverse.h
+@@ -1,6 +1,6 @@
+ /*
+     libparted
+-    Copyright (C) 1998, 1999, 2000, 2007 Free Software Foundation, Inc.
++    Copyright (C) 1998, 1999, 2000, 2007-2008 Free Software Foundation, Inc.
+ 
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+@@ -65,7 +65,7 @@ extern int fat_dir_entry_is_null_term (const FatDirEntry* dir_entry);
+ extern int fat_dir_entry_is_file (FatDirEntry* dir_entry);
+ extern int fat_dir_entry_is_system_file (FatDirEntry* dir_entry);
+ extern int fat_dir_entry_is_directory (FatDirEntry* dir_entry);
+-extern void fat_dir_entry_get_name (FatDirEntry* dir_entry, char* result);
++extern void fat_dir_entry_get_name (const FatDirEntry* dir_entry, char* result);
+ extern int fat_dir_entry_is_active (FatDirEntry* dir_entry);
+ extern int fat_dir_entry_has_first_cluster (FatDirEntry* dir_entry,
+ 					    PedFileSystem* fs);
+-- 
+1.6.3
+

fix-make-install-failure.patch

@@ -0,0 +1,41 @@
+From 9654bcfbdbeb2dede3a19084d31b41224d3a03f1 Mon Sep 17 00:00:00 2001
+From: Jim Meyering <meyering@redhat.com>
+Date: Tue, 23 Dec 2008 10:20:20 +0100
+Subject: [PATCH] avoid "make install" failure with latest GNU make
+
+* doc/C/Makefile.am (dist_man8_MANS): Use per-section variable
+names, as recommended by automake.
+(man_MANS): Remove redundant definition.
+---
+ doc/C/Makefile.am |    6 ++----
+ 1 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
+index 447eb74..7d62b7b 100644
+--- a/doc/C/Makefile.am
++++ b/doc/C/Makefile.am
+@@ -1,11 +1,9 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-dist_man_MANS = \
++dist_man8_MANS = \
+ 	parted.8 \
+ 	partprobe.8
+ 
+-man_MANS = $(dist_man_MANS)
+-
+ .PHONY: updatepo
+ # Update the POT in srcdir
+ # Make sure the update does not only consist in a new POT-Creation-Date
+@@ -13,7 +11,7 @@ man_MANS = $(dist_man_MANS)
+ updatepo:
+ 	cd $(srcdir); \
+ 	test -w . || exit 0; \
+-	for name in $(dist_man_MANS); do \
++	for name in $(dist_man8_MANS); do \
+ 		echo $$name; \
+ 		cp po/$$name.pot po/$$name.new.pot; \
+ 		po4a-updatepo -f man -m $$name -p po/$$name.new.pot; \
+-- 
+1.6.3
+

parted.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Jun 17 15:43:33 CEST 2009 - puzel@suse.cz
+
+- add fix-make-install-failure.patch (fix build) 
+- add fix-array-overflow.patch (fixes warning)
+- split -lang subpackage
+
 -------------------------------------------------------------------
 Tue Apr  7 02:55:54 CEST 2009 - crrodriguez@suse.de
 

parted.spec

@@ -26,7 +26,7 @@ License:        GPL v2 or later
 Group:          System/Filesystems
 Summary:        GNU partitioner
 Version:        1.8.8
-Release:        105
+Release:        106
 Source0:        %{name}-%{version}.tar.bz2
 Patch:          always-resize-part.dif
 Patch1:         parted-type.patch
@@ -56,6 +56,10 @@ Patch65:        dont-require-dvh-partition-name.patch
 Patch66:        do-not-automatically-correct-GPT.patch
 #PATCH-FEATURE-OPENSUSE fix-dm-partition-name.patch bnc471440,447591 petr.uzel@suse.cz
 Patch67:        fix-dm-partition-name.patch
+#PATCH-FIX-UPSTREAM fix-make-install-failure.patch -- fix installation failure with latest automake
+Patch68:        fix-make-install-failure.patch
+#PATCH-FIX-UPSTREAM fix-array-overflow.patch -- fix array access overflow
+Patch69:        fix-array-overflow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.gnu.org/software/parted/
 PreReq:         %install_info_prereq
@@ -101,6 +105,7 @@ Authors:
     Ben Collins <vincent.stelhe@free.fr>
     Matt Domsch <Matt_Domsch@dell.com>
 
+%lang_package
 %prep
 %setup -q
 %patch
@@ -130,6 +135,8 @@ Authors:
 %patch65 -p1
 %patch66 -p1
 %patch67 -p1
+%patch68 -p1
+%patch69 -p1
 
 %build
 AUTOPOINT=true autoreconf --force --install
@@ -156,7 +163,7 @@ rm -rf "$RPM_BUILD_ROOT"
 /sbin/ldconfig
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
-%files -f %{name}.lang
+%files
 %defattr(-,root,root)
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
 %{_sbindir}/*
@@ -171,7 +178,13 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_libdir}/pkgconfig/libparted.pc
 %{_libdir}/*.so
 
+%files lang -f %{name}.lang
+
 %changelog
+* Wed Jun 17 2009 puzel@suse.cz
+- add fix-make-install-failure.patch (fix build)
+- add fix-array-overflow.patch (fixes warning)
+- split -lang subpackage
 * Tue Apr 07 2009 crrodriguez@suse.de
 - remove static libraries
 * Tue Mar 10 2009 puzel@suse.cz