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: 28-Nov-2009 22:59:49
Branch: HEAD Handle: 2009112821594900
Modified files:
openpkg-src/libssh2 libssh2.patch libssh2.spec
Log:
upgrading package: libssh2 1.2.1 -> 1.2.2
Summary:
Revision Changes Path
1.16 +21 -5 openpkg-src/libssh2/libssh2.patch
1.33 +5 -3 openpkg-src/libssh2/libssh2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libssh2/libssh2.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 libssh2.patch
--- openpkg-src/libssh2/libssh2.patch 14 Sep 2009 20:06:02 -0000 1.15
+++ openpkg-src/libssh2/libssh2.patch 28 Nov 2009 21:59:49 -0000 1.16
@@ -1,8 +1,23 @@
-Index: libssh-0.3.4/include/libssh/priv.h
---- libssh-0.3.4/include/libssh/priv.h.orig 2006-12-29 16:03:59 +0100
-+++ libssh-0.3.4/include/libssh/priv.h 2007-01-09 17:44:24 +0100
-@@ -549,4 +549,8 @@
- } ;
+Index: libssh-0.3.91/cmake/Modules/DefineCompilerFlags.cmake
+--- libssh-0.3.91/cmake/Modules/DefineCompilerFlags.cmake.orig
2009-10-29 20:22:21 +0100
++++ libssh-0.3.91/cmake/Modules/DefineCompilerFlags.cmake 2009-11-28
22:55:02 +0100
+@@ -13,11 +13,6 @@
+ add_definitions(-fPIC)
+ endif (WITH_FPIC)
+
+- check_c_compiler_flag("-fstack-protector" WITH_STACK_PROTECTOR)
+- if (WITH_STACK_PROTECTOR)
+- add_definitions(-fstack-protector)
+- endif (WITH_STACK_PROTECTOR)
+-
+ check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
+ if (WITH_FORTIFY_SOURCE)
+ add_definitions(-D_FORTIFY_SOURCE=2)
+Index: libssh-0.3.91/include/libssh/priv.h
+--- libssh-0.3.91/include/libssh/priv.h.orig 2009-10-29 20:22:21 +0100
++++ libssh-0.3.91/include/libssh/priv.h 2009-11-28 22:55:02 +0100
+@@ -245,5 +245,9 @@
+ }
#endif
+#include <sys/types.h>
@@ -10,3 +25,4 @@
+#include <netinet/in.h>
+
#endif /* _LIBSSH_PRIV_H */
+ /* vim: set ts=2 sw=2 et cindent: */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libssh2/libssh2.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 libssh2.spec
--- openpkg-src/libssh2/libssh2.spec 29 Sep 2009 21:16:24 -0000 1.32
+++ openpkg-src/libssh2/libssh2.spec 28 Nov 2009 21:59:49 -0000 1.33
@@ -22,8 +22,8 @@
##
# package version
-%define V_libssh2 1.2.1
-%define V_libssh 0.3.4
+%define V_libssh2 1.2.2
+%define V_libssh 0.3.91
# package information
Name: libssh2
@@ -36,7 +36,7 @@
Group: SSH
License: BSD-style
Version: %{V_libssh2}
-Release: 20090929
+Release: 20091128
# package options
%option with_perl no
@@ -102,6 +102,8 @@
-DCMAKE_BUILD_TYPE=Release \
-DWITH_STATIC_LIB=ON \
-DWITH_LIBZ=OFF \
+ -DWITH_SFTP=OFF \
+ -DWITH_SERVER=OFF \
..
%{l_make} %{l_mflags}
) || exit $?
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
