cligen: Update to 7.6.0

The "const" patches are now upstream.

Signed-off-by: Philip Prindeville <[email protected]>

diff --git a/utils/cligen/Makefile b/utils/cligen/Makefile
index 1881a34156916cd57f781e45ffbab83ca6eb0b1c..148bb34b2ce90d40933615d0bc4f577ebbea798c 100644 (file)
--- a/utils/cligen/Makefile
+++ b/utils/cligen/Makefile
@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cligen
-PKG_VERSION:=7.5.0
+PKG_VERSION:=7.6.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/clicon/$(PKG_NAME)/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=e9baf98e41f53fd8b03b4bff622c25c9c86fc1fc3f99c4fb7b63eb8a4265dbd1
+PKG_HASH:=547e9df4017fa7bc1fd88abbd6680ab2383b8d14b272ee04cb950ad5da04889d
 
 PKG_MAINTAINER:=Olof Hagsand <[email protected]>, Philip Prindeville <[email protected]>
 PKG_LICENSE:=Apache-2.0

diff --git a/utils/cligen/patches/010-gcc15.patch b/utils/cligen/patches/010-gcc15.patch
deleted file mode 100644 (file)
index 613451d..0000000
--- a/utils/cligen/patches/010-gcc15.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/cligen_getline.c
-+++ b/cligen_getline.c
-@@ -41,12 +41,12 @@
- 
- /********************* exported variables ********************************/
- 
--int (*gl_in_hook)() = NULL;
--int (*gl_out_hook)() = NULL;
--int (*gl_tab_hook)() = NULL;
--int (*gl_qmark_hook)() = NULL;
--int (*gl_susp_hook)() = NULL;
--int (*gl_interrupt_hook)() = NULL;
-+int (*gl_in_hook)(void *, const char *) = NULL;
-+int (*gl_out_hook)(void *, const char *) = NULL;
-+int (*gl_tab_hook)(cligen_handle, int *) = NULL;
-+int (*gl_qmark_hook)(cligen_handle, const char *) = NULL;
-+int (*gl_susp_hook)(void *, char *, int, int *) = NULL;
-+int (*gl_interrupt_hook)(cligen_handle) = NULL;
- 
- /******************** internal interface *********************************/
- 
-@@ -55,7 +55,7 @@ static void     gl_init1(void);
- static void     gl_cleanup(void);       /* to undo gl_init1 */
- void            gl_char_init(void);     /* get ready for no echo input */
- void            gl_char_cleanup(void);  /* undo gl_char_init */
--static size_t   (*gl_strlen)(const char *) = (size_t(*)())strlen;
-+static size_t (*gl_strlen)(const char *) = strlen;
-                                         /* returns printable prompt width */
- 
- static int      gl_addchar(cligen_handle h, int c);     /* install specified char */
-@@ -1409,7 +1409,7 @@ gl_fixup(cligen_handle h,
- /******************* strlen stuff **************************************/
- 
- void
--gl_strwidth(size_t (*func)())
-+gl_strwidth(size_t (*func)(const char *))
- {
-     if (func != 0) {
-         gl_strlen = func;
---- a/cligen_getline.h
-+++ b/cligen_getline.h
-@@ -23,7 +23,7 @@
- /*
-  * Types
-  */
--typedef size_t (*gl_strwidth_proc)(char *);
-+typedef size_t (*gl_strwidth_proc)(const char *);
- 
- /*
-  * Prototypes