diff options
| author | drochner <drochner@pkgsrc.org> | 2009-12-20 11:24:13 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2009-12-20 11:24:13 +0000 |
| commit | 7e3e93964927f28ea24c6bc7b971add9801ac10c (patch) | |
| tree | 9f51c8957339c8a7d65924530da89b95f666d853 /sysutils | |
| parent | 430574edb52659372a7aca301e39cc807b24ef49 (diff) | |
| download | pkgsrc-7e3e93964927f28ea24c6bc7b971add9801ac10c.tar.gz | |
fix the "Check Integrity" function on NetBSD (which compares md5
hashes to files on a (not mounted) data CD/DVD): limit the buffer
size to 32k, otherwise physio()/MAXPHYS strikes
being here, add typecasts in some isspace(char) cases
bump PKGREVISION
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/brasero/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/brasero/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/brasero/patches/patch-ak | 53 |
3 files changed, 57 insertions, 2 deletions
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile index 1bb8a6216e0..b44305ff3a8 100644 --- a/sysutils/brasero/Makefile +++ b/sysutils/brasero/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2009/12/16 17:25:49 drochner Exp $ +# $NetBSD: Makefile,v 1.14 2009/12/20 11:24:13 drochner Exp $ # DISTNAME= brasero-2.28.3 +PKGREVISION= 1 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/brasero/2.28/} EXTRACT_SUFX= .tar.bz2 diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo index d59fbaae829..f70c07c3ce8 100644 --- a/sysutils/brasero/distinfo +++ b/sysutils/brasero/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.7 2009/12/16 17:25:49 drochner Exp $ +$NetBSD: distinfo,v 1.8 2009/12/20 11:24:13 drochner Exp $ SHA1 (brasero-2.28.3.tar.bz2) = 8aeb042bd23d5a31f1233d0f3064213e21e8a4db RMD160 (brasero-2.28.3.tar.bz2) = 71b679e581015399851172d72b4b13259634b1a1 Size (brasero-2.28.3.tar.bz2) = 4025939 bytes SHA1 (patch-ah) = da517a1ace02a62bbe95cbb5630cc6ce72fdf3fc SHA1 (patch-aj) = 31928e19cfcc2612bd0826f0a89a23eb7b378c7f +SHA1 (patch-ak) = 3db8ae8a44083aff6519f0be173b31f50d2ed3e6 SHA1 (patch-ba) = 1e314b690f72c767f553bcfb8360076f61b0a8b8 diff --git a/sysutils/brasero/patches/patch-ak b/sysutils/brasero/patches/patch-ak new file mode 100644 index 00000000000..6bb9447cb13 --- /dev/null +++ b/sysutils/brasero/patches/patch-ak @@ -0,0 +1,53 @@ +$NetBSD: patch-ak,v 1.1 2009/12/20 11:24:14 drochner Exp $ + +--- plugins/checksum/burn-checksum-files.c.orig 2009-12-14 15:12:39.000000000 +0000 ++++ plugins/checksum/burn-checksum-files.c +@@ -324,10 +324,10 @@ brasero_checksum_file_process_former_lin + + /* first skip the checksum string */ + i = 0; +- while (!isspace (line [i])) i ++; ++ while (!isspace ((int)(unsigned char)line [i])) i ++; + + /* skip white spaces */ +- while (isspace (line [i])) i ++; ++ while (isspace ((int)(unsigned char)line [i])) i ++; + + /* get the path string */ + path = g_strdup (line + i); +@@ -690,7 +690,7 @@ brasero_checksum_files_sum_on_disc_file + gchar **checksum_string, + GError **error) + { +- guchar buffer [64 * 2048]; ++ guchar buffer [16 * 2048]; + BraseroChecksumFilesPrivate *priv; + BraseroVolFileHandle *handle; + GChecksum *checksum; +@@ -706,7 +706,7 @@ brasero_checksum_files_sum_on_disc_file + + read_bytes = brasero_volume_file_read_direct (handle, + buffer, +- 64); ++ 16); + g_checksum_update (checksum, buffer, read_bytes); + + while (read_bytes == sizeof (buffer)) { +@@ -717,7 +717,7 @@ brasero_checksum_files_sum_on_disc_file + + read_bytes = brasero_volume_file_read_direct (handle, + buffer, +- 64); ++ 16); + g_checksum_update (checksum, buffer, read_bytes); + } + +@@ -944,7 +944,7 @@ brasero_checksum_files_check_files (Bras + goto end; + } + +- if (!isspace (c [0])) { ++ if (!isspace ((int)(unsigned char)c [0])) { + file_path [0] = '/'; + file_path [1] = c [0]; + break; |