[Gsrc-commit] /srv/bzr/gsrc/trunk r925: update fdisk to 1.3.0a

[Brandon Invergo]

------------------------------------------------------------
revno: 925
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-03 21:18:21 +0000
message:
  update fdisk to 1.3.0a
added:
  gnu/fdisk/files/
  gnu/fdisk/files/remove-ped_realloc.diff
modified:
  gnu/fdisk/Makefile
  gnu/fdisk/sha256sums

=== modified file 'gnu/fdisk/Makefile'
--- a/gnu/fdisk/Makefile        2010-08-30 14:48:19 +0000
+++ b/gnu/fdisk/Makefile        2012-09-03 21:18:21 +0000
@@ -1,5 +1,5 @@
 GARNAME = fdisk
-GARVERSION = 1.2.4
+GARVERSION = 1.3.0a
 
 MASTER_SITES = $(MASTER_GNU)
 MASTER_SUBDIR = fdisk/
@@ -7,10 +7,16 @@
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
 
-BUILDDEPS = parted gettext # libuuid
-# LIBDEPS = 
+PATCHFILES = remove-ped_realloc.diff
+PATCHOPTS = -p2
+
+BUILDDEPS =  gettext 
+LIBDEPS = libtool ncurses e2fsprogs parted libiconv
 
 HOME_URL = http://www.gnu.org/software/fdisk/
 DESCRIPTION = GNU fdisk, a command-line disk partitioning tool
 
 include ../../gar.lib/auto.mk
+
+CONFIGURE_OPTS = --with-libiconv-prefix=$(prefix)/lib --with-gnu-ext
+

=== added directory 'gnu/fdisk/files'
=== added file 'gnu/fdisk/files/remove-ped_realloc.diff'
--- a/gnu/fdisk/files/remove-ped_realloc.diff   1970-01-01 00:00:00 +0000
+++ b/gnu/fdisk/files/remove-ped_realloc.diff   2012-09-03 21:18:21 +0000
@@ -0,0 +1,65 @@
+diff -x config.log -x config.status -ru tmp/fdisk-1.3.0a/src/common.c 
work/fdisk-1.3.0a/src/common.c
+--- tmp/fdisk-1.3.0a/src/common.c      2011-09-18 16:07:18.000000000 +0000
++++ work/fdisk-1.3.0a/src/common.c     2012-09-03 21:14:53.694126260 +0000
+@@ -2534,40 +2534,30 @@
+ }
+ 
+ char*
+-partition_print_flags (PedPartition* part)
++partition_print_flags (PedPartition* const part)
+ {
+-        PedPartitionFlag        flag;
+-        int                     first_flag;
+-        const char*             name;
+-        char*                   res = ped_malloc(1);
+-        void*                   _res = res;
+-
+-        *res = '\0';
+-
+-        first_flag = 1;
+-        for (flag = ped_partition_flag_next (0); flag;
+-             flag = ped_partition_flag_next (flag)) {
+-                if (ped_partition_get_flag (part, flag)) {
+-                        if (first_flag)
+-                                first_flag = 0;
+-                        else {
+-                                _res = res;
+-                                ped_realloc (&_res, strlen (res)
+-                                                           + 1 + 2);
+-                                res = _res;
+-                                strncat (res, ", ", 2);
+-                        }
+-
+-                        name = _(ped_partition_flag_get_name (flag));
+-                        _res = res;
+-                        ped_realloc (&_res, strlen (res) + 1
+-                                                   + strlen (name));
+-                        res = _res;
+-                        strncat (res, name, 21);
+-                }
++  char *res = xstrdup ("");
++  if (!part)
++    return res;
++
++  PedPartitionFlag flag;
++  size_t res_buf_len = 1;
++  char const *sep = "";
++  for (flag = ped_partition_flag_next (0); flag;
++       flag = ped_partition_flag_next (flag))
++    {
++      if (ped_partition_get_flag (part, flag))
++        {
++          const char *name = _(ped_partition_flag_get_name (flag));
++          size_t new_len = res_buf_len + strlen (sep) + strlen (name);
++          res = xrealloc (res, new_len);
++          stpcpy (stpcpy (res + res_buf_len - 1, sep), name);
++          res_buf_len = new_len;
++          sep = ", ";
+         }
++    }
+ 
+-        return res;
++  return res;
+ }
+ 
+ 

=== modified file 'gnu/fdisk/sha256sums'
--- a/gnu/fdisk/sha256sums      2010-06-11 09:29:17 +0000
+++ b/gnu/fdisk/sha256sums      2012-09-03 21:18:21 +0000
@@ -1,2 +1,3 @@
-78fe4b1a7cab85de4e84fba412fba45c74de700693feaaa08807f179170975fc  
download/fdisk-1.2.4.tar.gz
-fed5553f0290424303d3ae34836ba8dba14311d210cdcc8e458e02bf91928deb  
download/fdisk-1.2.4.tar.gz.sig
+211ebf0896cbe4d29bdf1195ef7cef541a4c55f77ce98cce62b7c2019cea7593  
download/fdisk-1.3.0a.tar.gz
+b1dab7c959e0343779b7edc2bdb3d22327b772008c855ae997add0ca2e668253  
download/remove-ped_realloc.diff
+b0bb3d6f8b9ec437074e6cc798f83e8f7b397347378825ee9be1f1b6da4188a4  
download/fdisk-1.3.0a.tar.gz.sig