2 files changed, 0 insertions, 114 deletions
diff --git a/devel/libcli/files/patch-Makefile b/devel/libcli/files/patch-Makefile
deleted file mode 100644
index 36c660ce7ea2..000000000000
--- a/devel/libcli/files/patch-Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
---- Makefile.orig	2012-06-07 04:51:30 UTC
-+++ Makefile
-@@ -1,23 +1,21 @@
- UNAME = $(shell sh -c 'uname -s 2>/dev/null || echo not')
- DESTDIR =
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- 
- MAJOR = 1
- MINOR = 9
- REVISION = 6
- LIB = libcli.so
- 
--CC = gcc
--DEBUG = -g
--OPTIM = -O3
--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
-+CC ?= gcc
-+CFLAGS += -Wall -Wformat-security -Wno-format-zero-length -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)
-+LDFLAGS += -Wl,-soname,$(LIB).$(MAJOR)$(MINOR)
- LIBS = -lcrypt
- endif
- 
-@@ -26,8 +24,9 @@ all: $(LIB) clitest
- $(LIB): libcli.o
- 	$(CC) -o $(LIB).$(MAJOR).$(MINOR).$(REVISION) $^ $(LDFLAGS) $(LIBS)
- 	-rm -f $(LIB) $(LIB).$(MAJOR).$(MINOR)
--	ln -s $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR)
--	ln -s $(LIB).$(MAJOR).$(MINOR) $(LIB)
-+	ln -sf $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR)
-+	ln -sf $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR)$(MINOR)
-+	ln -sf $(LIB).$(MAJOR).$(MINOR) $(LIB)
- 
- %.o: %.c
- 	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
-@@ -48,8 +47,9 @@ install: $(LIB)
- 	install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include
- 	install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/lib
- 	cd $(DESTDIR)$(PREFIX)/lib && \
--	    ln -s $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR) && \
--	    ln -s $(LIB).$(MAJOR).$(MINOR) $(LIB)
-+	    ln -sf $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR) && \
-+	    ln -sf $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR)$(MINOR) && \
-+	    ln -sf $(LIB).$(MAJOR).$(MINOR) $(LIB)
- 
- rpm:
- 	mkdir libcli-$(MAJOR).$(MINOR).$(REVISION)
diff --git a/devel/libcli/files/patch-libcli.c b/devel/libcli/files/patch-libcli.c
deleted file mode 100644
index e7be459a4d91..000000000000
--- a/devel/libcli/files/patch-libcli.c
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/libcli.c b/libcli.c
-index de6e2e9..59dd42f 100644
---- libcli.c
-+++ libcli.c
-@@ -1017,7 +1017,7 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
- {
-     struct cli_command *c;
-     struct cli_command *n;
--    int num_words, i, k=0;
-+    int num_words, save_words, i, k=0;
-     char *words[CLI_MAX_LINE_WORDS] = {0};
-     int filter = 0;
- 
-@@ -1025,12 +1025,12 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
-     while (isspace(*command))
-         command++;
- 
--    num_words = cli_parse_line(command, words, sizeof(words)/sizeof(words[0]));
-+    save_words = num_words = cli_parse_line(command, words, sizeof(words)/sizeof(words[0]));
-     if (!command[0] || command[strlen(command)-1] == ' ')
-         num_words++;
- 
-     if (!num_words)
--        return 0;
-+        goto out;
- 
-     for (i = 0; i < num_words; i++)
-     {
-@@ -1043,7 +1043,7 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
-         unsigned len = 0;
- 
-         if (filter < num_words - 1) // filter already completed
--            return 0;
-+            goto out;
- 
-         if (filter == num_words - 1)
-             len = strlen(words[num_words-1]);
-@@ -1055,7 +1055,7 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
-         }
- 
-         completions[k] = NULL;
--        return k;
-+        goto out;
-     }
- 
-     for (c = cli->commands, i = 0; c && i < num_words && k < max_completions; c = n)
-@@ -1084,6 +1084,10 @@ static int cli_get_completions(struct cli_def *cli, const char *command, char **
-         completions[k++] = c->command;
-     }
- 
-+out:
-+    for (i = 0; i < save_words; i++)
-+        free(words[i]);
-+
-     return k;
- }
- 
--- 
-1.7.10
-