libfontenc: Changes to 'upstream-unstable'
autogen.sh | 4 +++-
configure.ac | 3 +--
src/Makefile.am | 2 +-
src/encparse.c | 2 +-
src/fontenc.c | 5 ++++-
5 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 3acba630d8b57084f7e92c15732408711ed5137a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Apr 25 20:52:11 2013 -0700
libfontenc 1.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 953a81f..62a9593 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libfontenc], [1.1.1],
+AC_INIT([libfontenc], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libfontenc])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 624508365ec3279bc74ce523d024533e062629e1
Author: Nickolai Zeldovich <nickolai@csail.mit.edu>
Date: Sun Mar 3 23:57:34 2013 -0500
libfontenc: setCode(): fix realloc invocation
This patch fixes two bugs in the realloc invocation in setCode(), which
most likely cause memory corruption when realloc is triggered:
1. Pass *enc to realloc (which is the dynamically-allocated buffer),
instead of enc (which stores a pointer to the dynamically-allocated
buffer).
2. Allocate enough memory for (*encsize) shorts, instead of (*encsize)
bytes; see the call to malloc just above the realloc call.
Signed-off-by: Nickolai Zeldovich <nickolai@csail.mit.edu>
Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/encparse.c b/src/encparse.c
index cbcac80..ee18b3f 100644
--- a/src/encparse.c
+++ b/src/encparse.c
@@ -426,7 +426,7 @@ setCode(unsigned from, unsigned to, unsigned row_size,
}
} else if(*encsize <= index) {
*encsize = 0x10000;
- if((newenc = realloc(enc, *encsize))==NULL)
+ if((newenc = realloc(*enc, (*encsize) * sizeof(unsigned short)))==NULL)
return 1;
*enc = newenc;
}
commit f5d1208172e965fdd7fae8927bd3e29b3cc3a975
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jan 19 08:23:09 2013 -0800
Replace deprecated Automake INCLUDES variable with AM_CPPFLAGS
Excerpt https://lists.gnu.org/archive/html/automake/2012-12/msg00038.html
- Support for the long-deprecated INCLUDES variable will be removed
altogether in Automake 1.14. The AM_CPPFLAGS variable should be
used instead.
This variable was deprecated in Automake releases prior to 1.10, which is
the current minimum level required to build X.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 96d0a38..e37043b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,7 @@ AM_CFLAGS = \
FONTENCDIR=@ENCODINGSDIR@
FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTENCDIR)/encodings.dir\"
-INCLUDES = -I$(top_srcdir)/include $(FONTENCDEFS)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(FONTENCDEFS)
libfontenc_la_LIBADD = @FONTENC_LIBS@
commit 0c3518df24192f18f15ce91c2868560a5973a3dc
Author: Colin Walters <walters@verbum.org>
Date: Wed Jan 4 17:37:06 2012 -0500
autogen.sh: Implement GNOME Build API
http://people.gnome.org/~walters/docs/build-api.txt
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/autogen.sh b/autogen.sh
index 904cd67..fc34bd5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,6 @@ cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$NOCONFIGURE"; then
+ $srcdir/configure "$@"
+fi
commit edd325236d39b6ad130c82d90b04dcc3b153d8b2
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Jan 15 14:28:48 2013 -0500
configure: Remove AM_MAINTAINER_MODE
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 37089c2..953a81f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,6 @@ AC_CONFIG_HEADERS([config.h])
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
commit 7de846ed190b2564b0642de79918dd3804083b4e
Author: James Cloos <cloos@jhcloos.com>
Date: Tue Apr 24 16:01:35 2012 -0400
Fix ISO-8859-7 → ISO-10646 mapping.
ISO-8859-7 code point 0xD2 is unassigned.
ISO-10646 code point U+03A2, to which 0xD2 was mapping, also is unassigned.
Reported by Norm Pierce.
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/src/fontenc.c b/src/fontenc.c
index bb8ff12..4cfa1e5 100644
--- a/src/fontenc.c
+++ b/src/fontenc.c
@@ -279,6 +279,8 @@ iso8859_7_to_unicode(unsigned isocode, void *client_data)
return 0x02BC;
else if(isocode==0xAF)
return 0x2015;
+ else if(isocode==0xD2) /* unassigned */
+ return 0;
else if(isocode>=0xB4)
return isocode-0xA0+0x0370;
else
commit f7682533fa6de77d8bd6fa6480a0f5188e0e56d7
Author: James Cloos <cloos@jhcloos.com>
Date: Tue Apr 24 15:55:59 2012 -0400
Fix ISO-8859-6 → ISO-10646 mapping.
ISO-8859-6 code point 0xC0 is unassigned.
ISO-10646 code point U+0620, to which 0xC0 was mapping, has since been
assigned an unrelated character.
Reported by Norm Pierce.
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/src/fontenc.c b/src/fontenc.c
index fb56ff1..bb8ff12 100644
--- a/src/fontenc.c
+++ b/src/fontenc.c
@@ -250,7 +250,8 @@ iso8859_6_to_unicode(unsigned isocode, void *client_data)
if(isocode<=0xA0 || isocode==0xA4 || isocode==0xAD)
return isocode;
else if(isocode==0xAC || isocode==0xBB ||
- (isocode>=0xBF && isocode<=0xDA) ||
+ isocode==0xBF ||
+ (isocode>=0xC1 && isocode<=0xDA) ||
(isocode>=0xE0 && isocode<=0xEF) ||
(isocode>=0xF0 && isocode<=0xF2))
return isocode-0xA0+0x0600;
Reply to: