[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] /srv/bzr/gsrc/trunk r928: update fdisk to 2.0.0a1
From: |
Brandon Invergo |
Subject: |
[Gsrc-commit] /srv/bzr/gsrc/trunk r928: update fdisk to 2.0.0a1 |
Date: |
Tue, 04 Sep 2012 00:02:34 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 928
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Tue 2012-09-04 00:02:34 +0200
message:
update fdisk to 2.0.0a1
removed:
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 2012-09-03 21:18:21 +0000
+++ b/gnu/fdisk/Makefile 2012-09-03 22:02:34 +0000
@@ -1,5 +1,5 @@
-GARNAME = fdisk
-GARVERSION = 1.3.0a
+GARNAME = gnufdisk
+GARVERSION = 2.0.0a1
MASTER_SITES = $(MASTER_GNU)
MASTER_SUBDIR = fdisk/
@@ -7,9 +7,6 @@
DISTFILES = $(DISTNAME).tar.gz
SIGFILES = $(DISTNAME).tar.gz.sig
-PATCHFILES = remove-ped_realloc.diff
-PATCHOPTS = -p2
-
BUILDDEPS = gettext
LIBDEPS = libtool ncurses e2fsprogs parted libiconv
@@ -18,5 +15,3 @@
include ../../gar.lib/auto.mk
-CONFIGURE_OPTS = --with-libiconv-prefix=$(prefix)/lib --with-gnu-ext
-
=== removed directory 'gnu/fdisk/files'
=== removed file 'gnu/fdisk/files/remove-ped_realloc.diff'
--- a/gnu/fdisk/files/remove-ped_realloc.diff 2012-09-03 21:21:29 +0000
+++ b/gnu/fdisk/files/remove-ped_realloc.diff 1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-diff -x config.log -x config.status -ru tmp/fdisk-1.3.0a/src/common.c
work/fdisk-1.3.0a/src/common.c
---- work/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 2012-09-03 21:35:07 +0000
+++ b/gnu/fdisk/sha256sums 2012-09-03 22:02:34 +0000
@@ -1,3 +1,2 @@
-211ebf0896cbe4d29bdf1195ef7cef541a4c55f77ce98cce62b7c2019cea7593
download/fdisk-1.3.0a.tar.gz
-bde843a25e297eef640cd621ae798f262a9d5617805d2d304d0f856805c219bb
download/remove-ped_realloc.diff
-b0bb3d6f8b9ec437074e6cc798f83e8f7b397347378825ee9be1f1b6da4188a4
download/fdisk-1.3.0a.tar.gz.sig
+c963d84dff11c41210fff994742e9f90a72dfdcb0481bcc4b530223ed3511fb5
download/gnufdisk-2.0.0a1.tar.gz
+974a2a21436a5e6161985a12f60d6c6275d52910cd112b9478ae36ef28b6128e
download/gnufdisk-2.0.0a1.tar.gz.sig
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] /srv/bzr/gsrc/trunk r928: update fdisk to 2.0.0a1,
Brandon Invergo <=