[arch-commits] Commit in texinfo/trunk (PKGBUILD texinfo-4.13a-data_types.patch)
Allan McRae
allan at archlinux.org
Mon Dec 12 08:28:31 UTC 2011
Date: Monday, December 12, 2011 @ 03:28:31
Author: allan
Revision: 144958
upgpkg: texinfo 4.13a-7
fix -fstack-protector issue (FS#27539)
Added:
texinfo/trunk/texinfo-4.13a-data_types.patch
Modified:
texinfo/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 9 ++++++---
texinfo-4.13a-data_types.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-12-12 08:01:15 UTC (rev 144957)
+++ PKGBUILD 2011-12-12 08:28:31 UTC (rev 144958)
@@ -4,7 +4,7 @@
pkgname=texinfo
pkgver=4.13a
-pkgrel=6
+pkgrel=7
pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/texinfo/"
@@ -12,12 +12,15 @@
groups=('base')
depends=('ncurses' 'findutils' 'gzip')
install=texinfo.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig})
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
+ texinfo-4.13a-data_types.patch)
md5sums=('71ba711519209b5fb583fed2b3d86fcb'
- 'db2ca82c831684cd7cef181234017c46')
+ 'db2ca82c831684cd7cef181234017c46'
+ 'd8574782ff7def1e2dc5c291dbeaec18')
build() {
cd ${srcdir}/${pkgname}-4.13
+ patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch
./configure --prefix=/usr
make
}
Added: texinfo-4.13a-data_types.patch
===================================================================
--- texinfo-4.13a-data_types.patch (rev 0)
+++ texinfo-4.13a-data_types.patch 2011-12-12 08:28:31 UTC (rev 144958)
@@ -0,0 +1,32 @@
+diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
+--- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200
++++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200
+@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
+ const char *carried_over_ptr;
+ size_t carried_over_len, carried_over_count;
+ const char *cur_ptr = mbi_cur_ptr (iter);
+- int cur_len = mb_len (mbi_cur (iter));
++ size_t cur_len = mb_len (mbi_cur (iter));
+ int replen;
+ int delim = 0;
+ int rc;
+@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
+ mbi_advance (iter))
+ {
+ const char *cur_ptr = mbi_cur_ptr (iter);
+- int cur_len = mb_len (mbi_cur (iter));
++ size_t cur_len = mb_len (mbi_cur (iter));
+
+ if (cur_len == 1)
+ {
+@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
+ mbi_advance (iter))
+ {
+ const char *cur_ptr = mbi_cur_ptr (iter);
+- int cur_len = mb_len (mbi_cur (iter));
+- int replen;
++ size_t cur_len = mb_len (mbi_cur (iter));
++ size_t replen;
+
+ if (cur_ptr >= endp)
+ break;
More information about the arch-commits
mailing list