From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 26 Feb 2011 20:52:25 +0000 (+0100)
Subject: readline: Update to 6.2.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07490c27bfd4734e7964ba6d87e49d100085e50f;p=ipfire-3.x.git

readline: Update to 6.2.
---

diff --git a/pkgs/core/readline/patches/readline-6.1-shlib.patch b/pkgs/core/readline/patches/readline-6.2-shlib.patch
similarity index 61%
rename from pkgs/core/readline/patches/readline-6.1-shlib.patch
rename to pkgs/core/readline/patches/readline-6.2-shlib.patch
index 9273dffb6..914b2602c 100644
--- a/pkgs/core/readline/patches/readline-6.1-shlib.patch
+++ b/pkgs/core/readline/patches/readline-6.2-shlib.patch
@@ -1,18 +1,18 @@
-diff -up readline-6.1/shlib/Makefile.in.shlib readline-6.1/shlib/Makefile.in
---- readline-6.1/shlib/Makefile.in.shlib	2009-03-05 16:51:23.000000000 +0100
-+++ readline-6.1/shlib/Makefile.in	2010-01-12 15:05:32.000000000 +0100
+diff -up readline-6.2/shlib/Makefile.in.shlib readline-6.2/shlib/Makefile.in
+--- readline-6.2/shlib/Makefile.in.shlib	2010-12-28 21:56:21.000000000 +0100
++++ readline-6.2/shlib/Makefile.in	2011-02-14 17:34:38.821537496 +0100
 @@ -170,7 +170,7 @@ $(SHARED_READLINE):	$(SHARED_OBJ)
  
- $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so
+ $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so xfree.so
  	$(RM) $@
--	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so $(SHLIB_LIBS)
-+	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so
+-	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
++	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so
  
  # Since tilde.c is shared between readline and bash, make sure we compile 
  # it with the right flags when it's built as part of readline
-diff -up readline-6.1/support/shlib-install.shlib readline-6.1/support/shlib-install
---- readline-6.1/support/shlib-install.shlib	2009-10-28 14:30:18.000000000 +0100
-+++ readline-6.1/support/shlib-install	2010-01-12 15:05:32.000000000 +0100
+diff -up readline-6.2/support/shlib-install.shlib readline-6.2/support/shlib-install
+--- readline-6.2/support/shlib-install.shlib	2009-10-28 14:30:18.000000000 +0100
++++ readline-6.2/support/shlib-install	2011-02-14 17:33:07.611768164 +0100
 @@ -72,7 +72,7 @@ fi
  case "$host_os" in
  hpux*|darwin*|macosx*|linux*)
@@ -22,9 +22,9 @@ diff -up readline-6.1/support/shlib-install.shlib readline-6.1/support/shlib-ins
  	fi ;;
  cygwin*|mingw*)
  	IMPLIBNAME=`echo ${LIBNAME} \
-diff -up readline-6.1/support/shobj-conf.shlib readline-6.1/support/shobj-conf
---- readline-6.1/support/shobj-conf.shlib	2009-10-28 14:20:21.000000000 +0100
-+++ readline-6.1/support/shobj-conf	2010-01-12 15:07:27.000000000 +0100
+diff -up readline-6.2/support/shobj-conf.shlib readline-6.2/support/shobj-conf
+--- readline-6.2/support/shobj-conf.shlib	2009-10-28 14:20:21.000000000 +0100
++++ readline-6.2/support/shobj-conf	2011-02-14 17:33:07.612767986 +0100
 @@ -112,10 +112,11 @@ sunos5*|solaris2*)
  linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*-gentoo)
  	SHOBJ_CFLAGS=-fPIC
diff --git a/pkgs/core/readline/readline.nm b/pkgs/core/readline/readline.nm
index 53c98a736..0ca3125b0 100644
--- a/pkgs/core/readline/readline.nm
+++ b/pkgs/core/readline/readline.nm
@@ -25,8 +25,8 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = readline
-PKG_VER        = 6.1
-PKG_REL        = 1
+PKG_VER        = 6.2
+PKG_REL        = 2
 
 PKG_MAINTAINER =
 PKG_GROUP      = System/Libraries