- update to 1.9.5

Submitted by:	Erik Karulf erik@karulf.com (by mail)
This commit is contained in:
Baptiste Daroussin 2011-05-04 04:55:26 +00:00
parent 1d278fbaaf
commit 7c175cbd61
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=273613
5 changed files with 22 additions and 44 deletions

View file

@ -6,10 +6,9 @@
#
PORTNAME= libcli
PORTVERSION= 1.9.4
PORTREVISION= 1
PORTVERSION= 1.9.5
CATEGORIES= devel
MASTER_SITES= GOOGLE_CODE
MASTER_SITES= http://cloud.github.com/downloads/dparrish/libcli/
MAINTAINER= bapt@FreeBSD.org
COMMENT= Emulates a cisco style command-line interface
@ -20,7 +19,7 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
PLIST_FILES= lib/libcli.so \
lib/libcli.so.1.9.4 \
lib/libcli.so.1.9.5 \
lib/libcli.so.1.9 \
lib/libcli.so.19 \
include/libcli.h

View file

@ -1,2 +1,2 @@
SHA256 (libcli-1.9.4.tar.gz) = c1e56ff2e55a879b7c89b5808aea76063512d9a24cffd601aa3d9a84cd6a7928
SIZE (libcli-1.9.4.tar.gz) = 27960
SHA256 (libcli-1.9.5.tar.gz) = e2d78ead4c3cd040ca83127f21a3a3416997425c9037bbc086ff2635202df3fb
SIZE (libcli-1.9.5.tar.gz) = 28350

View file

@ -1,38 +1,37 @@
--- ./Makefile.orig 2008-10-09 04:38:01.000000000 +0200
+++ ./Makefile 2011-05-02 23:43:52.002280937 +0200
@@ -3,14 +3,12 @@
MAJOR = 1
MINOR = 9
-REVISION = 3
+REVISION = 4
--- ./Makefile.orig 2011-05-04 04:52:15.000000000 +0200
+++ ./Makefile 2011-05-04 06:51:14.794591784 +0200
@@ -8,16 +8,14 @@
LIB = libcli.so
CC = gcc
-DEBUG = -g
-OPTIM = -O3
-CFLAGS += $(DEBUG) $(OPTIM) -Wall -Wformat-security -Wno-format-zero-length
-LDFLAGS += -shared -Wl,-soname,$(LIB).$(MAJOR).$(MINOR)
+CFLAGS += -Wall -Wformat-security -Wno-format-zero-length
+LDFLAGS += -shared -Wl,-soname,$(LIB).$(MAJOR)$(MINOR)
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
@@ -18,9 +16,10 @@
@@ -26,8 +24,9 @@
$(LIB): libcli.o
$(CC) -o $(LIB).$(MAJOR).$(MINOR).$(REVISION) $^ $(LDFLAGS) $(LIBS)
- -rm -f $(LIB) $(LIB).$(MAJOR).$(MINOR)
-rm -f $(LIB) $(LIB).$(MAJOR).$(MINOR)
- ln -s $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR)
- ln -s $(LIB).$(MAJOR).$(MINOR) $(LIB)
+ -rm -f $(LIB) $(LIB).$(MAJOR).$(MINOR) $(LIB).$(MAJOR)$(MINOR)
+ ln -sf $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR)$(MINOR)
+ ln -sf $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR).$(MINOR)
+ ln -sf $(LIB).$(MAJOR)$(MINOR) $(LIB)
+ ln -sf $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(LIB).$(MAJOR)$(MINOR)
+ ln -sf $(LIB).$(MAJOR).$(MINOR) $(LIB)
%.o: %.c
$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
@@ -41,8 +40,9 @@
@@ -48,8 +47,9 @@
install -m 0644 libcli.h $(DESTDIR)$(PREFIX)/include
install -m 0755 $(LIB).$(MAJOR).$(MINOR).$(REVISION) $(DESTDIR)$(PREFIX)/lib
cd $(DESTDIR)$(PREFIX)/lib && \
@ -40,7 +39,7 @@
- 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)
+ ln -sf $(LIB).$(MAJOR).$(MINOR) $(LIB)
rpm:
mkdir libcli-$(MAJOR).$(MINOR).$(REVISION)

View file

@ -1,10 +0,0 @@
--- ./clitest.c.orig 2008-10-09 04:38:01.000000000 +0200
+++ ./clitest.c 2011-05-02 23:42:29.730543145 +0200
@@ -4,6 +4,7 @@
#include <winsock2.h>
#include <windows.h>
#else
+#include <netinet/in.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#endif

View file

@ -1,10 +0,0 @@
--- ./libcli.c.orig 2008-10-09 04:38:01.000000000 +0200
+++ ./libcli.c 2011-05-02 23:42:29.732543394 +0200
@@ -9,7 +9,6 @@
#include <stdarg.h>
#include <stdlib.h>
#include <memory.h>
-#include <malloc.h>
#include <string.h>
#include <ctype.h>
#include <unistd.h>