Browse Source

Juergen Sawinski <george@mpimf-heidelberg.mpg.de>:

rsync update and recode fix


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1911 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
rocklinux
Juergen "George" Sawinski 21 years ago
parent
commit
df1647370a
3 changed files with 81 additions and 2 deletions
  1. +4
    -0
      Documentation/Developers/CHANGELOG-RENE
  2. +75
    -0
      package/base/recode/recode-3.6.patch
  3. +2
    -2
      package/base/rsync/rsync.desc

+ 4
- 0
Documentation/Developers/CHANGELOG-RENE

@ -1,4 +1,8 @@
*) 2003-12-04 (2.0.0-rc3 - 2.0.0-rc4)
- Juergen Sawinski: fixed recode and updated rsync
*) 2003-12-03 (2.0.0-rc3 - 2.0.0-rc4)
- finalized qcad

+ 75
- 0
package/base/recode/recode-3.6.patch

@ -0,0 +1,75 @@
http://pybliographer.org/help/recode states:
Pybliographer uses GNU Recode in order to convert between different character
sets, especially LaTeX and HTML. The latest version of GNU Recode (3.6)
contains a bug that makes it unsuitable for Pybliographer (but not for
standalone use). This bug is pending since a long time.
--- recode-3.6.orig/src/libiconv.c
+++ recode-3.6/src/libiconv.c
@@ -1,5 +1,5 @@
/* Conversion of files between different charsets and surfaces.
- Copyright © 1999, 2000 Free Software Foundation, Inc.
+ Copyright © 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by François Pinard <pinard@iro.umontreal.ca>, 1999,
and Bruno Haible <haible@clisp.cons.org>, 2000.
@@ -195,12 +195,17 @@
memcpy() doesn't do here, because the regions might overlap.
memmove() isn't worth it, because we rarely have to move more
than 12 bytes. */
- if (input > input_buffer && input_left > 0)
+ cursor = input_buffer;
+ if (input_left > 0)
{
- cursor = input_buffer;
- do
- *cursor++ = *input++;
- while (--input_left > 0);
+ if (input > input_buffer)
+ {
+ do
+ *cursor++ = *input++;
+ while (--input_left > 0);
+ }
+ else
+ cursor += input_left;
}
}
--- recode-3.6.orig/src/request.c
+++ recode-3.6/src/request.c
@@ -1073,7 +1073,7 @@
if (task->output.cursor + 4 >= task->output.limit)
{
RECODE_OUTER outer = task->request->outer;
- size_t old_size = task->output.limit - task->output.buffer;
+ size_t old_size = task->output.cursor - task->output.buffer;
size_t new_size = task->output.cursor + 4 - task->output.buffer;
/* FIXME: Rethink about how the error should be reported. */
--- recode-3.6.orig/src/task.c
+++ recode-3.6/src/task.c
@@ -1198,6 +1198,8 @@
else
success = transform_mere_copy (subtask);
+ task->output = subtask->output;
+
if (subtask->input.name && *subtask->input.name)
fclose (subtask->input.file);
if (subtask->output.name && *subtask->output.name)
--- recode-3.6.orig/src/hash.h
+++ recode-3.6/src/hash.h
@@ -21,6 +21,11 @@
/* Make sure USE_OBSTACK is defined to 1 if you want the allocator to use
obstacks instead of malloc, and recompile `hash.c' with same setting. */
+#define hash_lookup recode_hash_lookup
+#define hash_delete recode_hash_delete
+#define hash_free recode_hash_free
+#define hash_insert recode_hash_insert
+
#ifndef PARAMS
# if PROTOTYPES || __STDC__
# define PARAMS(Args) Args

+ 2
- 2
package/base/rsync/rsync.desc

@ -41,8 +41,8 @@
[L] GPL
[S] Stable
[V] 2.5.6
[V] 2.5.7
[P] X -----5---9 264.000
[D] 2209651007 rsync-2.5.6.tar.gz http://rsync.samba.org/ftp/rsync/
[D] 2849368700 rsync-2.5.7.tar.gz http://rsync.samba.org/ftp/rsync/

Loading…
Cancel
Save