diff options
| author | Alexander Logvinov <avl@FreeBSD.org> | 2010-12-30 03:13:02 +0000 |
|---|---|---|
| committer | Alexander Logvinov <avl@FreeBSD.org> | 2010-12-30 03:13:02 +0000 |
| commit | a9019a45d2c70c73b1c688fdec2e2f8d170a31ab (patch) | |
| tree | add6cbb99bd38e2e0cb193757bb1967cfbb4ac49 /security | |
| parent | 591498d02c724cd28905abcc9feb6ac3ad621392 (diff) | |
Notes
Diffstat (limited to 'security')
| -rw-r--r-- | security/libssh/Makefile | 9 | ||||
| -rw-r--r-- | security/libssh/distinfo | 4 | ||||
| -rw-r--r-- | security/libssh/files/patch-libssh_socket.c | 14 | ||||
| -rw-r--r-- | security/libssh/pkg-plist | 2 |
4 files changed, 7 insertions, 22 deletions
diff --git a/security/libssh/Makefile b/security/libssh/Makefile index 998eadc8c3be..d7f55af40898 100644 --- a/security/libssh/Makefile +++ b/security/libssh/Makefile @@ -6,10 +6,9 @@ # PORTNAME= libssh -PORTVERSION= 0.4.6 -PORTREVISION= 1 +PORTVERSION= 0.4.7 CATEGORIES= security devel -MASTER_SITES= http://www.libssh.org/files/ \ +MASTER_SITES= http://www.libssh.org/files/0.4/ \ LOCAL/avl MAINTAINER= avl@FreeBSD.org @@ -27,9 +26,9 @@ INSTALL_WRKSRC?= ${BUILD_WRKSRC} CMAKE_ARGS+= -DWITH_STATIC_LIB:BOOL=ON USE_LDCONFIG= yes -LICENSE= GPLv2 BSD +LICENSE= LGPL21 BSD LICENSE_COMB= multi -LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING +LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING LICENSE_FILE_BSD= ${WRKSRC}/BSD .include <bsd.port.options.mk> diff --git a/security/libssh/distinfo b/security/libssh/distinfo index d6ba04a23c46..449cbcca4875 100644 --- a/security/libssh/distinfo +++ b/security/libssh/distinfo @@ -1,2 +1,2 @@ -SHA256 (libssh-0.4.6.tar.gz) = 17ef7bacb3c6c53e67c12767266e4826c6a594452a1a6fd13394f14a67f26988 -SIZE (libssh-0.4.6.tar.gz) = 276843 +SHA256 (libssh-0.4.7.tar.gz) = eb7b1ac40ff687b83660991099ff256b83fb03c62caec0798f0e23c6bd39be07 +SIZE (libssh-0.4.7.tar.gz) = 277238 diff --git a/security/libssh/files/patch-libssh_socket.c b/security/libssh/files/patch-libssh_socket.c deleted file mode 100644 index 5eebace16b0b..000000000000 --- a/security/libssh/files/patch-libssh_socket.c +++ /dev/null @@ -1,14 +0,0 @@ ---- libssh/socket.c.orig 2010-09-06 03:29:26.000000000 +1000 -+++ libssh/socket.c 2010-12-05 14:25:26.000000000 +0900 -@@ -265,7 +265,10 @@ - if (s->fd == SSH_INVALID_SOCKET) - return; - FD_SET(s->fd,set); -- if (s->fd >= 0 && s->fd != SSH_INVALID_SOCKET) { -+ -+ if (s->fd >= 0 && -+ s->fd >= *max_fd && -+ s->fd != SSH_INVALID_SOCKET) { - *max_fd = s->fd + 1; - } - } diff --git a/security/libssh/pkg-plist b/security/libssh/pkg-plist index 8ad2032358d5..20ed0ab44c8d 100644 --- a/security/libssh/pkg-plist +++ b/security/libssh/pkg-plist @@ -7,5 +7,5 @@ include/libssh/ssh2.h lib/libssh.a lib/libssh.so lib/libssh.so.4 -lib/libssh.so.4.1.3 +lib/libssh.so.4.1.4 @dirrm include/libssh |