net/libssh 0.4.2
authoryselkowitz <yselkowitz@e127d73d-b18e-4ae1-a744-a22e6a3ccd30>
Thu, 29 Apr 2010 03:35:08 +0000 (03:35 +0000)
committeryselkowitz <yselkowitz@e127d73d-b18e-4ae1-a744-a22e6a3ccd30>
Thu, 29 Apr 2010 03:35:08 +0000 (03:35 +0000)
git-svn-id: https://cygwin-ports.svn.sourceforge.net/svnroot/cygwin-ports/ports/trunk@9114 e127d73d-b18e-4ae1-a744-a22e6a3ccd30

README
libssh-0.2-1.cygport [deleted file]
libssh-0.2-1.src.patch [deleted file]
libssh-0.4.2-1.cygport [new file with mode: 0644]
libssh-common.hint [moved from setup.hint with 100% similarity]
libssh-devel.hint [moved from devel.hint with 91% similarity]
libssh.hint [new file with mode: 0644]
libssh4.hint [moved from runtime.hint with 89% similarity]

diff --git a/README b/README
index df79516c0a284ed7d1eef161de2c9e994d4bf5f5..41d89b0ba23ec40d5784f75ee4eaa2b067ab555c 100644 (file)
--- a/README
+++ b/README
@@ -9,75 +9,46 @@ remote files easily, without third-party programs others than libcrypto
 (from openssl).
 
 Runtime requirements:
-  cygwin-1.5.23-2
-  libgetaddrinfo0-1.6.3-1
-  openssl-0.9.8d-1
-  zlib-1.2.3-2
+  cygwin-1.7.5-1
+  libgcc1-4.3.4-3
+  libssp0-4.3.4-3
+  openssl-0.9.8n-1
 
 Build requirements:
 (besides corresponding -devel packages)
-  cygwin-1.5.23-2
-  autoconf2.5-2.61-1
-  automake1.9-1.9.6-2
-  binutils-20060817-1
-  cygport-0.2.8-1
-  gawk-3.1.5-4
-  gcc-core-3.4.4-1
-  libtool1.5-1.5.23a-2
-  make-3.81-1
-  sed-4.1.5-2
+  binutils-2.20.51-1
+  cmake-2.8.0-11
+  cygport-0.9.83-1
+  gcc4-core-4.3.4-3
+  make-3.81-2
 
 Canonical website:
-  http://0xbadc0de.be/wiki/doku.php?id=libssh:libssh
+  http://www.libssh.org/
 
 Canonical download:
-  http://0xbadc0de.be/libssh/
+  http://www.libssh.org/files/
 
 -------------------------------------------
 
 Build instructions:
-  unpack libssh-0.2-X-src.tar.bz2
+  unpack libssh-0.4.2-X-src.tar.bz2
     if you use setup to install this src package, it will be
         unpacked under /usr/src automatically
   cd /usr/src
-  cygport ./libssh-0.2-X.cygport all
+  cygport ./libssh-0.4.2-X.cygport all
 
 This will create:
-  /usr/src/libssh-0.2-X-src.tar.bz2
-  /usr/src/libssh-0.2-X.tar.bz2
-  /usr/src/libssh-devel-0.2-X.tar.bz2
-  /usr/src/libssh2-0.2-X.tar.bz2
+  /usr/src/libssh-0.4.2-X-src.tar.bz2
+  /usr/src/libssh-common-0.4.2-X.tar.bz2
+  /usr/src/libssh-devel-0.4.2-X.tar.bz2
+  /usr/src/libssh4-0.4.2-X.tar.bz2
 
 -------------------------------------------
 
-Files included in the main package:
-
-  /usr/share/doc/Cygwin/libssh-0.2.README
-  /usr/share/doc/libssh-0.2/AUTHORS
-  /usr/share/doc/libssh-0.2/COPYING
-  /usr/share/doc/libssh-0.2/INSTALL
-  /usr/share/doc/libssh-0.2/README
-
-(libssh2)
-  /usr/bin/cygssh-2.dll
-
-(libssh-devel)
-  /usr/include/libssh/crypto.h
-  /usr/include/libssh/libssh.h
-  /usr/include/libssh/server.h
-  /usr/include/libssh/sftp.h
-  /usr/lib/libssh.dll.a
-  /usr/lib/libssh.la
-
-------------------
-
 Port Notes:
 
------ version 0.2-1 -----
-Version bump.
-
------ version 0.11-1 -----
-Initial release for Cygwin.
+----- version 0.4.2-1 -----
+Initial release for Cygwin 1.7.
 
 
 Cygwin port maintained by:
diff --git a/libssh-0.2-1.cygport b/libssh-0.2-1.cygport
deleted file mode 100644 (file)
index cbc10b6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION="SSH implementation library"
-HOMEPAGE="http://0xbadc0de.be/wiki/doku.php?id=libssh:libssh"
-SRC_URI="http://0xbadc0de.be/libssh/${P}.tgz"
-
-USE_MANAGED_MOUNT=1
-
-CYGCONF_ARGS='--disable-static'
-
-PKG_NAMES="${PN} ${PN}2 ${PN}-devel"
-PKG_HINTS='setup runtime devel'
-PKG_CONTENTS[0]='usr/share/'
-PKG_CONTENTS[1]='usr/bin/*.dll'
-PKG_CONTENTS[2]='usr/include/ usr/lib/'
diff --git a/libssh-0.2-1.src.patch b/libssh-0.2-1.src.patch
deleted file mode 100644 (file)
index e4cf5f3..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
---- origsrc/libssh-0.2/Makefile.am     1969-12-31 18:00:00.000000000 -0600
-+++ src/libssh-0.2/Makefile.am 2007-01-12 00:06:15.531250000 -0600
-@@ -0,0 +1,13 @@
-+SUBDIRS = include libssh
-+
-+INCLUDES = -Wall -g -I$(top_builddir)/include -I$(top_srcdir)/include
-+
-+noinst_PROGRAMS = samplessh samplesshd
-+
-+samplessh_SOURCES = sample.c
-+
-+samplesshd_SOURCES = samplesshd.c
-+
-+LDADD = libssh/libssh.la
-+
-+EXTRA_DIST = doc
---- origsrc/libssh-0.2/configure.in    2006-12-29 09:03:59.000000000 -0600
-+++ src/libssh-0.2/configure.in        2007-01-12 00:09:47.468750000 -0600
-@@ -5,6 +5,7 @@
- AC_INIT(libssh, 0.2 , aris@0xbadc0de.be)
- AC_CONFIG_SRCDIR([sample.c])
- AC_CONFIG_HEADER([config.h])
-+AM_INIT_AUTOMAKE
- # LT Version numbers, remember to change them just *before* a release.
- #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
-@@ -32,16 +33,16 @@
- AC_MSG_CHECKING([version script options])
- case "$host" in
-       *-*-linux*)
--      LIBSSH_VERS="$LIBSSH_LDFLAGS -Wl,--version-script,libssh.vers"
-+      LIBSSH_VERS="$LIBSSH_LDFLAGS -Wl,--version-script,\$(srcdir)/libssh.vers"
-       ;;
-       *-*-gnu*)
--      LIBSSH_VERS="$LIBSSH_LDFLAGS -Wl,--version-script,libssh.vers"
-+      LIBSSH_VERS="$LIBSSH_LDFLAGS -Wl,--version-script,\$(srcdir)/libssh.vers"
-       ;;
- esac
- AC_ARG_WITH([versioned-symbol],
-       AC_HELP_STRING([--with-versioned-symbol],[Use versioned symbols]),
-       [if test "$withval" = "yes"; then
--         LIBSSH_VERS="$LIBSSH_LDFLAGS -Wl,--version-script,libssh.vers"
-+         LIBSSH_VERS="$LIBSSH_LDFLAGS -Wl,--version-script,\$(srcdir)/libssh.vers"
-        else
-          LIBSSH_VERS=""
-        fi], [ : ])
-@@ -79,7 +80,7 @@
- AC_CHECK_LIB([z], [deflateInit_])
- AC_SEARCH_LIBS([hstrerror],[nsl resolv])
--AC_SEARCH_LIBS([getaddrinfo],[nsl socket])
-+AC_SEARCH_LIBS([getaddrinfo],[nsl socket getaddrinfo])
- AC_SEARCH_LIBS([gethostbyname],[nsl resolv])
- # Checks for header files.
-@@ -123,5 +124,7 @@
- cfmakeraw select socket strchr strdup strerror strstr poll])
- AC_CONFIG_FILES([Makefile
-+                 include/Makefile
-+                 include/libssh/Makefile
-                  libssh/Makefile])
- AC_OUTPUT
---- origsrc/libssh-0.2/include/Makefile.am     1969-12-31 18:00:00.000000000 -0600
-+++ src/libssh-0.2/include/Makefile.am 2007-01-12 00:06:15.562500000 -0600
-@@ -0,0 +1 @@
-+SUBDIRS = libssh
---- origsrc/libssh-0.2/include/libssh/Makefile.am      1969-12-31 18:00:00.000000000 -0600
-+++ src/libssh-0.2/include/libssh/Makefile.am  2007-01-12 00:06:15.562500000 -0600
-@@ -0,0 +1,4 @@
-+pkginclude_HEADERS = crypto.h libssh.h server.h sftp.h
-+
-+noinst_HEADERS = priv.h ssh1.h ssh2.h
-+
---- origsrc/libssh-0.2/libssh/Makefile.am      1969-12-31 18:00:00.000000000 -0600
-+++ src/libssh-0.2/libssh/Makefile.am  2007-01-12 00:06:15.578125000 -0600
-@@ -0,0 +1,39 @@
-+INCLUDES = -Wall -I$(top_srcdir)/include
-+
-+lib_LTLIBRARIES = libssh.la
-+
-+libssh_la_SOURCES = \
-+      auth.c \
-+      auth1.c \
-+      base64.c \
-+      buffer.c \
-+      channels.c \
-+      channels1.c \
-+      client.c \
-+      connect.c \
-+      crc32.c \
-+      crypt.c \
-+      dh.c \
-+      error.c \
-+      gcrypt_missing.c \
-+      gzip.c \
-+      init.c \
-+      kex.c \
-+      keyfiles.c \
-+      keys.c \
-+      messages.c \
-+      misc.c \
-+      options.c \
-+      packet.c \
-+      server.c \
-+      session.c \
-+      sftp.c \
-+      sftpserver.c \
-+      string.c \
-+      wrapper.c
-+
-+libssh_la_LDFLAGS = -export-dynamic -no-undefined \
-+      -version-info $(LIBSSH_CURRENT):$(LIBSSH_REVISION):$(LIBSSH_AGE) \
-+      $(LIBSSH_LDFLAGS) $(LIBSSH_VERS)
-+
-+EXTRA_DIST = libssh.vers
---- origsrc/libssh-0.2/libssh/connect.c        2006-12-29 09:03:59.000000000 -0600
-+++ src/libssh-0.2/libssh/connect.c    2007-01-12 00:42:39.984375000 -0600
-@@ -32,6 +32,9 @@
- #include <sys/time.h>
- #include <netinet/in.h>
- #include <fcntl.h>
-+#ifdef __CYGWIN__
-+#include <getaddrinfo.h>
-+#endif
- #include "libssh/priv.h"
- #ifndef HAVE_SELECT
---- origsrc/libssh-0.2/libssh/crypt.c  2006-12-29 09:03:59.000000000 -0600
-+++ src/libssh-0.2/libssh/crypt.c      2007-01-12 00:35:31.328125000 -0600
-@@ -44,7 +44,7 @@
-     return ntohl(decrypted);
- }
-     
--int packet_decrypt(SSH_SESSION *session, void *data,u32 len){
-+int packet_decrypt(SSH_SESSION *session, void *data,unsigned int len){
-     struct crypto_struct *crypto=session->current_crypto->in_cipher;
-     char *out=malloc(len);
-     ssh_say(3,"Decrypting %d bytes data\n",len);
-@@ -61,7 +61,7 @@
-     return 0;
- }
-     
--unsigned char * packet_encrypt(SSH_SESSION *session,void *data,u32 len){
-+unsigned char * packet_encrypt(SSH_SESSION *session,void *data,unsigned int len){
-     struct crypto_struct *crypto;
-     HMACCTX ctx;
-     char *out;
---- origsrc/libssh-0.2/libssh/server.c 2006-12-29 09:03:59.000000000 -0600
-+++ src/libssh-0.2/libssh/server.c     2007-01-12 00:38:13.781250000 -0600
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <errno.h>
- #include <string.h>
---- origsrc/libssh-0.2/samplesshd.c    2006-12-29 09:03:59.000000000 -0600
-+++ src/libssh-0.2/samplesshd.c        2007-01-12 00:46:48.406250000 -0600
-@@ -44,8 +44,8 @@
-     int sftp=0;
-     int i;
-     ssh_options_getopt(options,&argc,argv);
--    ssh_options_set_dsa_server_key(options,"/etc/ssh/ssh_host_dsa_key");
--    ssh_options_set_rsa_server_key(options,"/etc/ssh/ssh_host_rsa_key");
-+    ssh_options_set_dsa_server_key(options,"/etc/ssh_host_dsa_key");
-+    ssh_options_set_rsa_server_key(options,"/etc/ssh_host_rsa_key");
-     ssh_bind=ssh_bind_new();
-     ssh_bind_set_options(ssh_bind,options);
-     if(ssh_bind_listen(ssh_bind)<0){
diff --git a/libssh-0.4.2-1.cygport b/libssh-0.4.2-1.cygport
new file mode 100644 (file)
index 0000000..57e534d
--- /dev/null
@@ -0,0 +1,10 @@
+inherit cmake
+
+DESCRIPTION="SSH implementation library"
+HOMEPAGE="http://www.libssh.org/"
+SRC_URI="http://www.libssh.org/files/${P}.tar.gz"
+
+PKG_NAMES="${PN} ${PN}4 ${PN}-common ${PN}-devel"
+libssh4_CONTENTS='usr/bin/cygssh-4.dll'
+libssh_common_CONTENTS='usr/share/doc/'
+libssh_devel_CONTENTS='usr/include/ usr/lib/'
similarity index 100%
rename from setup.hint
rename to libssh-common.hint
similarity index 91%
rename from devel.hint
rename to libssh-devel.hint
index 9c37256f8b502a4932498ea3dc23ae65335e679a..33409c0fb504dfb26ecba6aad05c838e6a6d2e75 100644 (file)
@@ -1,5 +1,5 @@
 category: Libs
-requires: libgetaddrinfo-devel openssl-devel zlib
+requires: libssh4 openssl-devel
 external-source: libssh
 sdesc: "SSH implementation library (development)"
 ldesc: "The ssh library was designed to be used by programmers needing a
diff --git a/libssh.hint b/libssh.hint
new file mode 100644 (file)
index 0000000..81f489b
--- /dev/null
@@ -0,0 +1,9 @@
+category: Libs
+sdesc: "SSH implementation library (documentation)"
+ldesc: "The ssh library was designed to be used by programmers needing a
+working SSH implementation by the mean of a library. The complete
+control of the client is made by the programmer. With libssh, you can
+remotely execute programs, transfer files, use a secure and transparent
+tunnel for your remote programs. With its Secure FTP implementation, you
+can play with remote files easily, without third-party programs others
+than libcrypto (from openssl)."
similarity index 89%
rename from runtime.hint
rename to libssh4.hint
index 573ec7a7b6b3b8a03c8858474b5aa511a37897c3..25719a053b56988de5e7e52efc69589546dd09a1 100644 (file)
@@ -1,5 +1,5 @@
-category: Libs
-requires: libgetaddrinfo0 openssl zlib
+category: Net
+requires: libgcc1 libssp0 openssl libssh-common
 external-source: libssh
 sdesc: "SSH implementation library (runtime)"
 ldesc: "The ssh library was designed to be used by programmers needing a
This page took 0.053679 seconds and 5 git commands to generate.