From 7e14c2a628468b238253a90ce18573197a0a3e20 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 3 Dec 2014 20:59:29 +0000
Subject: bc: update to 1.06.95

---
 abs/core/bc/PKGBUILD                            | 44 ++++++++++++++++---------
 abs/core/bc/bc-1.06-info-dir-entry.patch        | 11 -------
 abs/core/bc/bc-1.06.95-void_uninitialized.patch | 14 ++++++++
 abs/core/bc/build-fix.patch                     | 13 --------
 4 files changed, 42 insertions(+), 40 deletions(-)
 delete mode 100644 abs/core/bc/bc-1.06-info-dir-entry.patch
 create mode 100644 abs/core/bc/bc-1.06.95-void_uninitialized.patch
 delete mode 100644 abs/core/bc/build-fix.patch

diff --git a/abs/core/bc/PKGBUILD b/abs/core/bc/PKGBUILD
index 1ecefa1..faf854f 100644
--- a/abs/core/bc/PKGBUILD
+++ b/abs/core/bc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 58247 2009-11-06 14:41:31Z eric $
+# $Id$
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=bc
-pkgver=1.06
-pkgrel=7
+pkgver=1.06.95
+pkgrel=1
 pkgdesc="An arbitrary precision calculator language"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/bc/"
@@ -12,20 +12,32 @@ depends=('readline')
 replaces=('bc-readline')
 conflicts=('bc-readline')
 install=bc.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	build-fix.patch bc-1.06-info-dir-entry.patch)
-md5sums=('d44b5dddebd8a7a7309aea6c36fda117' 'fc7ecbd9e55ef04c6d3a495692626116'\
-         'b6fe9869830aca0d34badf810fe0cfb3')
-sha1sums=('c8f258a7355b40a485007c40865480349c157292' '3af67c59e2232b9329ff0c1cf49d1a8a1cf87cd7'\
-         'c15c2a301ba80cf4d3c03a6e164f4e57fa86e4a2')
+source=(ftp://alpha.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+        bc-1.06.95-void_uninitialized.patch)
+md5sums=('5126a721b73f97d715bb72c13c889035'
+         'SKIP'
+         'fe85d42dd4151801e9b8c2d2c4d990bf')
+
+prepare() {
+  cd "${pkgname}-${pkgver}"
+
+  # https://bugs.gentoo.org/show_bug.cgi?id=349339
+  patch -Np0 -i ${srcdir}/bc-1.06.95-void_uninitialized.patch
+}
 
 build() {
-  CFLAGS="$CFLAGS -O3"
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/build-fix.patch" || return 1
-  patch -p1 -i "${srcdir}/bc-1.06-info-dir-entry.patch" || return 1
+  cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr --mandir=/usr/share/man \
-    --infodir=/usr/share/info --with-readline || return 1
-  make LEX="flex -I" || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+    --infodir=/usr/share/info --with-readline
+  make
+}
+
+check () {
+  cd "${pkgname}-${pkgver}"
+  echo "quit" | ./bc/bc -l Test/checklib.b # 10 failures
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/abs/core/bc/bc-1.06-info-dir-entry.patch b/abs/core/bc/bc-1.06-info-dir-entry.patch
deleted file mode 100644
index 8c1344c..0000000
--- a/abs/core/bc/bc-1.06-info-dir-entry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bc-1.06/doc/bc.info.info-dir-entry	2000-10-03 20:36:31.000000000 +0200
-+++ bc-1.06/doc/bc.info	2003-01-06 14:07:40.000000000 +0100
-@@ -1,5 +1,8 @@
- This is bc.info, produced by makeinfo version 4.0 from bc.texi.
- 
-+START-INFO-DIR-ENTRY
-+* bc: (bc).                   Arbritrary precision calculator language.
-+END-INFO-DIR-ENTRY
- 
- File: bc.info,  Node: Top,  Next: Introduction,  Prev: (dir),  Up: (dir)
- 
diff --git a/abs/core/bc/bc-1.06.95-void_uninitialized.patch b/abs/core/bc/bc-1.06.95-void_uninitialized.patch
new file mode 100644
index 0000000..c60290c
--- /dev/null
+++ b/abs/core/bc/bc-1.06.95-void_uninitialized.patch
@@ -0,0 +1,14 @@
+http://www.pixelbeat.org/programming/oss_bug_flow.html
+https://bugs.gentoo.org/349339
+
+--- bc/storage.c
++++ bc/storage.c
+@@ -99,6 +99,7 @@
+     {
+       f = &functions[indx];
+       f->f_defined = FALSE;
++      f->f_void = FALSE;
+       f->f_body = (char *) bc_malloc (BC_START_SIZE);
+       f->f_body_size = BC_START_SIZE;
+       f->f_code_size = 0;
+
diff --git a/abs/core/bc/build-fix.patch b/abs/core/bc/build-fix.patch
deleted file mode 100644
index 98a4082..0000000
--- a/abs/core/bc/build-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -wbBur bc-1.06/bc/scan.l bc-1.06.my/bc/scan.l
---- bc-1.06/bc/scan.l   2000-09-13 22:25:47 +0400
-+++ bc-1.06.my/bc/scan.l    2006-12-25 12:39:34 +0300
-@@ -143,7 +143,9 @@
-
- /* Definitions for readline access. */
- extern FILE *rl_instream;
-+#if 0
- _PROTOTYPE(char *readline, (char *));
-+#endif
-
- /* rl_input puts upto MAX characters into BUF with the number put in
-    BUF placed in *RESULT.  If the yy input file is the same as
-- 
cgit v0.12

