From bf74f495c3da7b24ff1c580f0653f1664ea5fd32 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 21 Dec 2013 13:38:32 +0100
Subject: fix musl compile, update to latest git version

---
 package/libcli/Makefile               |  8 ++++----
 package/libcli/patches/patch-Makefile | 30 ++++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/package/libcli/Makefile b/package/libcli/Makefile
index 9b105cca8..d4fe39ca3 100755
--- a/package/libcli/Makefile
+++ b/package/libcli/Makefile
@@ -4,13 +4,13 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libcli
-PKG_VERSION:=		1.9.4
+PKG_VERSION:=		1.9.7
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		b917617d21b90db214971efe64a33416
+PKG_MD5SUM:=		1b07b09e2840f910defde66afa28fbe7
 PKG_DESCR:=		Cisco-like command-line interface library
 PKG_SECTION:=		libs
-PKG_URL:=		http://code.google.com/p/libcli
-PKG_SITES:=		http://libcli.googlecode.com/files/
+PKG_URL:=		http://sites.dparrish.com/libcli
+PKG_SITES:=		https://github.com/dparrish/libcli
 PKG_OPTS:=		dev
 
 include ${TOPDIR}/mk/package.mk
diff --git a/package/libcli/patches/patch-Makefile b/package/libcli/patches/patch-Makefile
index 03c26c349..8ec1b0f04 100644
--- a/package/libcli/patches/patch-Makefile
+++ b/package/libcli/patches/patch-Makefile
@@ -1,21 +1,35 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- libcli-1.9.4.orig/Makefile	2008-10-09 04:38:01.000000000 +0200
-+++ libcli-1.9.4/Makefile	2009-05-29 17:42:04.310095050 +0200
-@@ -1,15 +1,12 @@
+--- libcli-1.9.7.orig/Makefile	2013-12-21 13:33:31.000000000 +0100
++++ libcli-1.9.7/Makefile	2013-12-21 13:37:09.000000000 +0100
+@@ -1,6 +1,5 @@
+-UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
  DESTDIR =
 -PREFIX = /usr/local
 +PREFIX = /usr
  
  MAJOR = 1
  MINOR = 9
- REVISION = 3
+@@ -8,21 +7,15 @@ REVISION = 7
  LIB = libcli.so
+ LIB_STATIC = libcli.a
  
 -CC = gcc
+-AR = ar
++CC ?= gcc
++AR ?= ar
+ ARFLAGS = rcs
 -DEBUG = -g
 -OPTIM = -O3
--CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length
-+CFLAGS += -Wall -Wformat-security -Wno-format-zero-length
- LDFLAGS += -shared -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
+-CFLAGS += $(DEBUG) $(OPTIM) -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
++CFLAGS += -Wall -std=c99 -pedantic -Wformat-security -Wno-format-zero-length -Werror -Wwrite-strings -Wformat -fdiagnostics-show-option -Wextra -Wsign-compare -Wcast-align -Wno-unused-parameter
+ LDFLAGS += -shared
  LIBPATH += -L.
+ 
+-ifeq ($(UNAME),Darwin)
+-LDFLAGS += -Wl,-install_name,$(LIB).$(MAJOR).$(MINOR)
+-else
+ LDFLAGS += -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
  LIBS = -lcrypt
+-endif
+ 
+ all: $(LIB) $(LIB_STATIC) clitest
+ 
-- 
cgit v1.2.3