[Buildroot] [PATCH 1/5] autoconf: bump to version 2.68

[Buildroot] [PATCH 1/5] autoconf: bump to version 2.68

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 ...toconf-2.65-fix-m4-detection-test-on-dash.patch |   36 --------------------
 ...ch => autoconf-dont-add-dirty-to-version.patch} |    0
 package/autoconf/autoconf.mk                       |    4 +-
 3 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
 rename package/autoconf/{autoconf-2.65-dont-add-dirty-to-version.patch => autoconf-dont-add-dirty-to-version.patch} (100%)

diff --git a/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch b/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
deleted file mode 100644
index 35f99b2..0000000
--- a/package/autoconf/autoconf-2.65-fix-m4-detection-test-on-dash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Patch taken upstream at
-http://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=7f75858f577f11a844781764f30cd42cfe8a5669,
-with the following modifications:
-
- * Changes to NEWS file removed to avoid conflicts
-
- * Changes also made manually to the generated configure
-   script. Otherwise, host-autoconf is needed to compile
-   host-autoconf !
-
-Index: autoconf-2.65.old/configure
-===================================================================
---- autoconf-2.65.old.orig/configure	2009-12-15 16:11:05.175566911 +0100
-+++ autoconf-2.65.old/configure	2009-12-15 16:11:37.739562146 +0100
-@@ -2380,7 +2380,7 @@
-       ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
-       ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
-       test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
--      && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-+      && test -z "`$as_echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-       && test -f conftest.m4f \
-       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
-       rm -f conftest.m4f
-Index: autoconf-2.65.old/m4/m4.m4
-===================================================================
---- autoconf-2.65.old.orig/m4/m4.m4	2009-12-15 16:11:05.207566124 +0100
-+++ autoconf-2.65.old/m4/m4.m4	2009-12-15 16:11:18.595562030 +0100
-@@ -29,7 +29,7 @@
-       ac_snippet=change'quote(<,>)in''dir(<if''def>,mac,bug)'
-       ac_snippet=${ac_snippet}pat'subst(a,\(b\)\|\(a\),\1)d'nl
-       test -z "`$ac_path_M4 -F conftest.m4f </dev/null 2>&1`" \
--      && test -z "`echo $ac_snippet | $ac_path_M4 --trace=mac 2>&1`" \
-+      && test -z "`AS_ECHO([$ac_snippet]) | $ac_path_M4 --trace=mac 2>&1`" \
-       && test -f conftest.m4f \
-       && ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:
-       rm -f conftest.m4f],
diff --git a/package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch b/package/autoconf/autoconf-dont-add-dirty-to-version.patch
similarity index 100%
rename from package/autoconf/autoconf-2.65-dont-add-dirty-to-version.patch
rename to package/autoconf/autoconf-dont-add-dirty-to-version.patch
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 7c42bf9..4e7f3fc 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -3,8 +3,8 @@
 # autoconf
 #
 #############################################################
-AUTOCONF_VERSION = 2.65
-AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2
+
+AUTOCONF_VERSION = 2.68
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
 AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
-- 
1.7.3.4

[Buildroot] [PATCH 2/5] automake: bump to version 1.11.5

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/automake/automake.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 7f35f3f..522e22c 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -3,8 +3,8 @@
 # automake
 #
 #############################################################
-AUTOMAKE_VERSION = 1.11.1
-AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.bz2
+
+AUTOMAKE_VERSION = 1.11.5
 AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake
 
 AUTOMAKE_DEPENDENCIES = host-autoconf autoconf microperl
-- 
1.7.3.4

[Buildroot] [PATCH 3/5] rrdtool: fix breakage with newer autotools

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/rrdtool/rrdtool-automake-compat.patch      |   18 ++++++++++++++++++
 ...ool-configure-dont-hardcode-include-dirs.patch} |    0
 2 files changed, 18 insertions(+), 0 deletions(-)
 create mode 100644 package/rrdtool/rrdtool-automake-compat.patch
 rename package/rrdtool/{rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch => rrdtool-configure-dont-hardcode-include-dirs.patch} (100%)

diff --git a/package/rrdtool/rrdtool-automake-compat.patch b/package/rrdtool/rrdtool-automake-compat.patch
new file mode 100644
index 0000000..92b753d
--- /dev/null
+++ b/package/rrdtool/rrdtool-automake-compat.patch
@@ -0,0 +1,18 @@
+Make it compatible with newer autoconf/automake.
+Patch from OpenWRT.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/bindings/tcl/Makefile.am
++++ b/bindings/tcl/Makefile.am
+@@ -26,8 +26,8 @@ tclpkgdir = @TCL_PACKAGE_DIR@
+ tclpkg_DATA = pkgIndex.tcl
+ tclpkg_SCRIPTS = ifOctets.tcl
+ else
+-pkglib_DATA = pkgIndex.tcl
+-pkglib_SCRIPTS = ifOctets.tcl
++pkgdata_DATA = pkgIndex.tcl
++pkgdata_SCRIPTS = ifOctets.tcl
+ endif
+ 
+ # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
diff --git a/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch b/package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch
similarity index 100%
rename from package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch
rename to package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch
-- 
1.7.3.4

[Buildroot] [PATCH 4/5] imagemagick: security bump to version 6.7.6-9

[Gustavo Zacarias]

Fixes CVE-2012-1610, CVE-2012-17987, CVE-2012-0260, CVE-2012-0259,
CVE-2012-0247 and CVE-2012-0248.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/imagemagick/imagemagick-zlib-fix.patch |  227 ------------------------
 package/imagemagick/imagemagick.mk             |    6 +-
 2 files changed, 3 insertions(+), 230 deletions(-)
 delete mode 100644 package/imagemagick/imagemagick-zlib-fix.patch

diff --git a/package/imagemagick/imagemagick-zlib-fix.patch b/package/imagemagick/imagemagick-zlib-fix.patch
deleted file mode 100644
index 1a147af..0000000
--- a/package/imagemagick/imagemagick-zlib-fix.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-[PATCH] Fix build with recent versions of zlib
-
-From upstream:
-r6633 + r6636 @ https://www.imagemagick.org/subversion/ImageMagick
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- magick/blob.c |   68 ++++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 40 insertions(+), 28 deletions(-)
-
-Index: ImageMagick-6.7.2-10/magick/blob.c
-===================================================================
---- ImageMagick-6.7.2-10.orig/magick/blob.c
-+++ ImageMagick-6.7.2-10/magick/blob.c
-@@ -120,8 +120,20 @@
-   StreamType
-     type;
- 
--  FILE
--    *file;
-+  union {
-+    FILE
-+      *file;
-+
-+#if defined(MAGICKCORE_ZLIB_DELEGATE)
-+    gzFile
-+      gzfile;
-+#endif
-+
-+#if defined(MAGICKCORE_BZLIB_DELEGATE)
-+    BZFILE
-+      *bzfile;
-+#endif
-+  };
- 
-   struct stat
-     properties;
-@@ -505,14 +517,14 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      (void) gzerror(image->blob->file,&status);
-+      (void) gzerror(image->blob->gzfile,&status);
- #endif
-       break;
-     }
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      (void) BZ2_bzerror((BZFILE *) image->blob->file,&status);
-+      (void) BZ2_bzerror(image->blob->bzfile,&status);
- #endif
-       break;
-     }
-@@ -546,14 +558,14 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      status=gzclose(image->blob->file);
-+      status=gzclose(image->blob->gzfile);
- #endif
-       break;
-     }
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      BZ2_bzclose((BZFILE *) image->blob->file);
-+      BZ2_bzclose(image->blob->bzfile);
- #endif
-       break;
-     }
-@@ -843,7 +855,7 @@
-         status;
- 
-       status=0;
--      (void) BZ2_bzerror((BZFILE *) image->blob->file,&status);
-+      (void) BZ2_bzerror(image->blob->bzfile,&status);
-       image->blob->eof=status == BZ_UNEXPECTED_EOF ? MagickTrue : MagickFalse;
- #endif
-       break;
-@@ -2486,8 +2498,8 @@
-                 ((int) magick[2] == 0x08))
-               {
-                 (void) fclose(image->blob->file);
--                image->blob->file=(FILE *) gzopen(filename,type);
--                if (image->blob->file != (FILE *) NULL)
-+                image->blob->gzfile=gzopen(filename,type);
-+                if (image->blob->gzfile != (gzFile) NULL)
-                   image->blob->type=ZipStream;
-                }
- #endif
-@@ -2495,8 +2507,8 @@
-             if (strncmp((char *) magick,"BZh",3) == 0)
-               {
-                 (void) fclose(image->blob->file);
--                image->blob->file=(FILE *) BZ2_bzopen(filename,type);
--                if (image->blob->file != (FILE *) NULL)
-+                image->blob->bzfile=BZ2_bzopen(filename,type);
-+                if (image->blob->bzfile != (BZFILE *) NULL)
-                   image->blob->type=BZipStream;
-               }
- #endif
-@@ -2555,8 +2567,8 @@
-           {
-             if (mode == WriteBinaryBlobMode)
-               type="wb";
--            image->blob->file=(FILE *) gzopen(filename,type);
--            if (image->blob->file != (FILE *) NULL)
-+            image->blob->gzfile=gzopen(filename,type);
-+            if (image->blob->gzfile != (gzFile) NULL)
-               image->blob->type=ZipStream;
-           }
-         else
-@@ -2564,8 +2576,8 @@
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
-           if (LocaleCompare(extension,".bz2") == 0)
-             {
--              image->blob->file=(FILE *) BZ2_bzopen(filename,type);
--              if (image->blob->file != (FILE *) NULL)
-+              image->blob->bzfile=BZ2_bzopen(filename,type);
-+              if (image->blob->bzfile != (BZFILE *) NULL)
-                 image->blob->type=BZipStream;
-             }
-           else
-@@ -2771,12 +2783,12 @@
-       {
-         default:
-         {
--          count=(ssize_t) gzread(image->blob->file,q,(unsigned int) length);
-+          count=(ssize_t) gzread(image->blob->gzfile,q,(unsigned int) length);
-           break;
-         }
-         case 2:
-         {
--          c=gzgetc(image->blob->file);
-+          c=gzgetc(image->blob->gzfile);
-           if (c == EOF)
-             break;
-           *q++=(unsigned char) c;
-@@ -2784,7 +2796,7 @@
-         }
-         case 1:
-         {
--          c=gzgetc(image->blob->file);
-+          c=gzgetc(image->blob->gzfile);
-           if (c == EOF)
-             break;
-           *q++=(unsigned char) c;
-@@ -2799,7 +2811,7 @@
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      count=(ssize_t) BZ2_bzread((BZFILE *) image->blob->file,q,(int) length);
-+      count=(ssize_t) BZ2_bzread(image->blob->bzfile,q,(int) length);
- #endif
-       break;
-     }
-@@ -3527,7 +3539,7 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      if (gzseek(image->blob->file,(off_t) offset,whence) < 0)
-+      if (gzseek(image->blob->gzfile,(off_t) offset,whence) < 0)
-         return(-1);
- #endif
-       image->blob->offset=TellBlob(image);
-@@ -3791,14 +3803,14 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      status=gzflush(image->blob->file,Z_SYNC_FLUSH);
-+      status=gzflush(image->blob->gzfile,Z_SYNC_FLUSH);
- #endif
-       break;
-     }
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      status=BZ2_bzflush((BZFILE *) image->blob->file);
-+      status=BZ2_bzflush(image->blob->bzfile);
- #endif
-       break;
-     }
-@@ -3865,7 +3877,7 @@
-     case ZipStream:
-     {
- #if defined(MAGICKCORE_ZLIB_DELEGATE)
--      offset=(MagickOffsetType) gztell(image->blob->file);
-+      offset=(MagickOffsetType) gztell(image->blob->gzfile);
- #endif
-       break;
-     }
-@@ -4014,20 +4026,20 @@
-       {
-         default:
-         {
--          count=(ssize_t) gzwrite(image->blob->file,(void *) data,
-+          count=(ssize_t) gzwrite(image->blob->gzfile,(void *) data,
-             (unsigned int) length);
-           break;
-         }
-         case 2:
-         {
--          c=gzputc(image->blob->file,(int) *p++);
-+          c=gzputc(image->blob->gzfile,(int) *p++);
-           if (c == EOF)
-             break;
-           count++;
-         }
-         case 1:
-         {
--          c=gzputc(image->blob->file,(int) *p++);
-+          c=gzputc(image->blob->gzfile,(int) *p++);
-           if (c == EOF)
-             break;
-           count++;
-@@ -4041,8 +4053,8 @@
-     case BZipStream:
-     {
- #if defined(MAGICKCORE_BZLIB_DELEGATE)
--      count=(ssize_t) BZ2_bzwrite((BZFILE *) image->blob->file,(void *) data,
--        (int) length);
-+      count=(ssize_t) BZ2_bzwrite(image->blob->bzfile,(void *) data,(int)
-+        length);
- #endif
-       break;
-     }
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 602b7a5..32eb371 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -4,10 +4,10 @@
 #
 #############################################################
 
-IMAGEMAGICK_MAJOR = 6.7.2
-IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-10
+IMAGEMAGICK_MAJOR = 6.7.6
+IMAGEMAGICK_VERSION = $(IMAGEMAGICK_MAJOR)-9
 IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.bz2
-IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick/legacy
+IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick
 IMAGEMAGICK_INSTALL_STAGING = YES
 IMAGEMAGICK_AUTORECONF = YES
 
-- 
1.7.3.4

[Buildroot] [PATCH 5/5] openocd: fix breakage with newer autotools

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/openocd/openocd-0006-automake-compat.patch |   40 ++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100644 package/openocd/openocd-0006-automake-compat.patch

diff --git a/package/openocd/openocd-0006-automake-compat.patch b/package/openocd/openocd-0006-automake-compat.patch
new file mode 100644
index 0000000..cdc6c92
--- /dev/null
+++ b/package/openocd/openocd-0006-automake-compat.patch
@@ -0,0 +1,40 @@
+Backport from openocd commit 737a52d7b22b1774acc5d20f9bd25000a70ac116
+Fix for automake 1.11.2+
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura openocd-0.5.0/src/jtag/drivers/Makefile.am openocd-0.5.0.automake/src/jtag/drivers/Makefile.am
+--- openocd-0.5.0/src/jtag/drivers/Makefile.am	2011-08-09 02:34:19.000000000 -0300
++++ openocd-0.5.0.automake/src/jtag/drivers/Makefile.am	2012-05-01 13:57:01.007561480 -0300
+@@ -5,7 +5,8 @@
+ libocdjtagdrivers_la_SOURCES = \
+ 	$(DRIVERFILES)
+ 
+-nobase_dist_pkglib_DATA =
++ocddatadir = $(pkglibdir)
++nobase_dist_ocddata_DATA =
+ 
+ ULINK_FIRMWARE = $(srcdir)/OpenULINK
+ 
+@@ -64,7 +65,7 @@
+ endif
+ if ULINK
+ DRIVERFILES += ulink.c
+-nobase_dist_pkglib_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
++nobase_dist_ocddata_DATA += $(ULINK_FIRMWARE)/ulink_firmware.hex
+ endif
+ if VSLLINK
+ DRIVERFILES += vsllink.c
+diff -Nura openocd-0.5.0/src/target/Makefile.am openocd-0.5.0.automake/src/target/Makefile.am
+--- openocd-0.5.0/src/target/Makefile.am	2011-08-09 02:34:19.000000000 -0300
++++ openocd-0.5.0.automake/src/target/Makefile.am	2012-05-01 13:57:01.934567076 -0300
+@@ -165,7 +165,7 @@
+ 	avr32_mem.h \
+ 	avr32_regs.h
+ 
+-nobase_dist_pkglib_DATA =
+-nobase_dist_pkglib_DATA += ecos/at91eb40a.elf
++ocddatadir = $(pkglibdir)
++nobase_dist_ocddata_DATA = ecos/at91eb40a.elf
+ 
+ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-- 
1.7.3.4

[Buildroot] [PATCH 1/5] autoconf: bump to version 2.68

[Peter Korsgaard]

>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Committed series, thanks.

-- 
Bye, Peter Korsgaard