OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 14-Jul-2009 20:38:31
Branch: HEAD Handle: 2009071419383100
Modified files:
openpkg-src/libssh2 libssh2.patch libssh2.spec
Log:
modifying package: libssh2-1.1 20090404 -> 20090714
Summary:
Revision Changes Path
1.12 +3 -25 openpkg-src/libssh2/libssh2.patch
1.27 +17 -14 openpkg-src/libssh2/libssh2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libssh2/libssh2.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 libssh2.patch
--- openpkg-src/libssh2/libssh2.patch 26 Aug 2007 09:01:53 -0000 1.11
+++ openpkg-src/libssh2/libssh2.patch 14 Jul 2009 18:38:31 -0000 1.12
@@ -1,6 +1,6 @@
-Index: libssh-0.2/include/libssh/priv.h
---- libssh-0.2/include/libssh/priv.h.orig 2006-12-29 16:03:59 +0100
-+++ libssh-0.2/include/libssh/priv.h 2007-01-09 17:44:24 +0100
+Index: libssh-0.3.1/include/libssh/priv.h
+--- libssh-0.3.1/include/libssh/priv.h.orig 2006-12-29 16:03:59 +0100
++++ libssh-0.3.1/include/libssh/priv.h 2007-01-09 17:44:24 +0100
@@ -549,4 +549,8 @@
} ;
#endif
@@ -10,25 +10,3 @@
+#include <netinet/in.h>
+
#endif /* _LIBSSH_PRIV_H */
-Index: libssh-0.2/libssh/misc.c
---- libssh-0.2/libssh/misc.c.orig 2006-12-29 16:03:59 +0100
-+++ libssh-0.2/libssh/misc.c 2007-01-09 17:44:56 +0100
-@@ -27,6 +27,7 @@
- #include <pwd.h>
- #include <sys/types.h>
- #include <netdb.h>
-+#include "libssh/priv.h"
- #include "libssh/libssh.h"
-
- /* if the program was executed suid root, don't trust the user ! */
-Index: libssh-0.2/libssh/server.c
---- libssh-0.2/libssh/server.c.orig 2006-12-29 16:03:59 +0100
-+++ libssh-0.2/libssh/server.c 2007-01-09 17:43:13 +0100
-@@ -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>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libssh2/libssh2.spec
============================================================================
$ cvs diff -u -r1.26 -r1.27 libssh2.spec
--- openpkg-src/libssh2/libssh2.spec 30 Jun 2009 20:20:54 -0000 1.26
+++ openpkg-src/libssh2/libssh2.spec 14 Jul 2009 18:38:31 -0000 1.27
@@ -23,7 +23,7 @@
# package version
%define V_libssh2 1.1
-%define V_libssh 0.2
+%define V_libssh 0.3.1
# package information
Name: libssh2
@@ -36,20 +36,20 @@
Group: SSH
License: BSD-style
Version: %{V_libssh2}
-Release: 20090404
+Release: 20090714
# package options
%option with_perl no
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/libssh2/libssh2-%{V_libssh2}.tar.gz
-Source1: http://0xbadc0de.be/libssh/libssh-%{V_libssh}.tgz
+Source1: http://www.libssh.org/files/libssh-%{V_libssh}.tar.gz
Patch0: libssh2.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130, make
+BuildPreReq: OpenPKG, openpkg >= 20040130, make, cmake, gcc, gcc::with_cxx
= yes
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: openssl, zlib
PreReq: openssl, zlib
@@ -69,8 +69,8 @@
}
prog libssh2:libssh = {
version = %{V_libssh}
- url = http://0xbadc0de.be/wiki/libssh:libssh
- regex = libssh-(__VER__)\.tgz
+ url = http://www.libssh.org/files/
+ regex = libssh-(__VER__)\.tar\.gz
}
%prep
@@ -93,13 +93,16 @@
%{l_make} %{l_mflags -O}
) || exit $?
( cd libssh-%{V_libssh}
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O} %{l_cppflags}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
- ./configure \
- --prefix=%{l_prefix} \
- --disable-shared
+ mkdir build
+ cd build
+ cmake \
+ -DCMAKE_C_COMPILER=%{l_cc} \
+ -DCMAKE_CXX_COMPILER=%{l_cxx} \
+ -DCMAKE_INSTALL_PREFIX=%{l_prefix} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_STATIC_LIB=ON \
+ -DWITH_LIBZ=OFF \
+ ..
%{l_make} %{l_mflags}
) || exit $?
@@ -108,7 +111,7 @@
( cd libssh2-%{V_libssh2}
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
- ( cd libssh-%{V_libssh}
+ ( cd libssh-%{V_libssh}/build
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
) || exit $?
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
