head 1.17; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_E1_MP_2_STABLE:1.7.2.2 OPENPKG_E1_FP:1.7.2.2 OPENPKG_2_STABLE_MP:1.7 OPENPKG_2_STABLE_20061018:1.7.2.2 OPENPKG_2_STABLE:1.7.0.2; locks; strict; comment @# @; 1.17 date 2009.12.12.11.34.20; author rse; state Exp; branches; next 1.16; commitid 8s2HExIEJQHMR4fu; 1.16 date 2009.11.28.21.59.49; author rse; state Exp; branches; next 1.15; commitid XDmHikgRuTHgMkdu; 1.15 date 2009.09.14.20.06.02; author rse; state Exp; branches; next 1.14; commitid QgzsYue9NbsHyG3u; 1.14 date 2009.08.18.18.58.31; author rse; state Exp; branches; next 1.13; commitid q3YVBvB8ovul3d0u; 1.13 date 2009.08.05.17.16.31; author rse; state Exp; branches; next 1.12; commitid YPF0X9vVgh5gUwYt; 1.12 date 2009.07.14.18.38.31; author rse; state Exp; branches; next 1.11; commitid 9iaBTvlKCsCe4IVt; 1.11 date 2007.08.26.09.01.53; author rse; state Exp; branches; next 1.10; commitid fD251qtjf0AwZevs; 1.10 date 2007.06.26.06.19.32; author rse; state Exp; branches; next 1.9; commitid KzrRfx44Q2Oo3ons; 1.9 date 2007.02.25.08.40.14; author rse; state Exp; branches; next 1.8; commitid N66mlxREL3nOIQ7s; 1.8 date 2007.01.09.18.32.45; author rse; state Exp; branches; next 1.7; commitid CmKLnmWoCmsKvR1s; 1.7 date 2006.09.26.14.59.40; author cs; state Exp; branches 1.7.2.1; next 1.6; commitid 3BhK0rrIwMKTHlOr; 1.6 date 2006.06.24.19.55.05; author rse; state Exp; branches; next 1.5; commitid FMPqviT5uIXzmiCr; 1.5 date 2006.05.08.06.39.18; author rse; state Exp; branches; next 1.4; commitid j79bRTlvGpsftbwr; 1.4 date 2006.03.18.17.56.45; author rse; state Exp; branches; next 1.3; commitid Et9vwwPkMW0iRGpr; 1.3 date 2006.03.02.07.45.03; author rse; state Exp; branches; next 1.2; commitid lryARra4RCOjZznr; 1.2 date 2006.01.22.17.19.53; author rse; state Exp; branches; next 1.1; commitid P01l7TZARDQfqCir; 1.1 date 2005.11.21.20.56.48; author rse; state Exp; branches; next ; commitid TbihFHBb1n6eCFar; 1.7.2.1 date 2006.09.26.14.59.40; author rse; state dead; branches; next 1.7.2.2; commitid iZxwRSmmWscPXUQr; 1.7.2.2 date 2006.10.16.14.52.06; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.17 log @modifying package: libssh2-1.2.2 20091128 -> 20091212 @ text @Index: libssh-0.4.0/cmake/Modules/DefineCompilerFlags.cmake --- libssh-0.4.0/cmake/Modules/DefineCompilerFlags.cmake.orig 2009-10-29 20:22:21 +0100 +++ libssh-0.4.0/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.4.0/include/libssh/priv.h --- libssh-0.4.0/include/libssh/priv.h.orig 2009-10-29 20:22:21 +0100 +++ libssh-0.4.0/include/libssh/priv.h 2009-11-28 22:55:02 +0100 @@@@ -245,5 +245,9 @@@@ } #endif +#include +#include +#include + #endif /* _LIBSSH_PRIV_H */ /* vim: set ts=2 sw=2 et cindent: */ @ 1.16 log @upgrading package: libssh2 1.2.1 -> 1.2.2 @ text @d1 3 a3 3 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 d16 3 a18 3 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 @ 1.15 log @modifying package: libssh2-1.2 20090818 -> 20090914 @ text @d1 20 a20 5 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 @@@@ } ; d28 1 @ 1.14 log @modifying package: libssh2-1.2 20090811 -> 20090818 @ text @d1 3 a3 3 Index: libssh-0.3.3/include/libssh/priv.h --- libssh-0.3.3/include/libssh/priv.h.orig 2006-12-29 16:03:59 +0100 +++ libssh-0.3.3/include/libssh/priv.h 2007-01-09 17:44:24 +0100 @ 1.13 log @modifying package: libssh2-1.1 20090714 -> 20090805 @ text @d1 3 a3 3 Index: libssh-0.3.2/include/libssh/priv.h --- libssh-0.3.2/include/libssh/priv.h.orig 2006-12-29 16:03:59 +0100 +++ libssh-0.3.2/include/libssh/priv.h 2007-01-09 17:44:24 +0100 @ 1.12 log @modifying package: libssh2-1.1 20090404 -> 20090714 @ text @d1 3 a3 3 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 @ 1.11 log @remove Perl binding as it now lives in the new perl-ssh package @ text @d1 3 a3 3 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 a12 22 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 #include #include +#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 #include #include +#include #include #include #include @ 1.10 log @upgrading package: libssh2 0.14 -> 0.15 @ text @a0 23 Index: Net-SSH2-0.10/Makefile.PL --- Net-SSH2-0.10/Makefile.PL.orig 2005-11-19 19:03:08 +0100 +++ Net-SSH2-0.10/Makefile.PL 2006-06-24 21:50:09 +0200 @@@@ -10,8 +10,8 @@@@ my @@define = $win32 ? (DEFINE => '-DLIBSSH2_WIN32') : (); # override library and include directory here if desired -my $lib = ''; -my $inc = ''; +my $lib = '../src'; +my $inc = '../include'; # try to find libSSH2 if we're not given a location unless($lib and $inc) { @@@@ -39,7 +39,7 @@@@ die "Quitting since I can't find $missing"; } -$lib = "-L$lib -lssh2"; +$lib = "-L$lib -lssh2 -lcrypto -lz -lm"; $inc = "-I$inc"; print "Net::SSH2: using library $lib and include path $inc.\n"; @ 1.9 log @modifying package: libssh2-0.14 20070109 -> 20070225 @ text @a0 12 Index: libssh2-0.14/Makefile.in --- libssh2-0.14/Makefile.in.orig 2006-04-07 22:40:24 +0200 +++ libssh2-0.14/Makefile.in 2006-06-24 21:52:17 +0200 @@@@ -8,7 +8,7 @@@@ CC = @@CC@@ CFLAGS = -c @@CFLAGS@@ -Iinclude/ -Wall -LIBS = -lssh2 -Lsrc/ +LIBS = @@LDFLAGS@@ -Lsrc -lssh2 -lcrypto -lz -lm INSTALL = @@INSTALL@@ VERSION=@@PACKAGE_VERSION@@ DISTLIB=libssh2-$(VERSION) a23 30 Index: libssh2-0.14/src/Makefile.in --- libssh2-0.14/src/Makefile.in.orig 2006-04-07 22:40:35 +0200 +++ libssh2-0.14/src/Makefile.in 2006-06-24 21:52:34 +0200 @@@@ -8,7 +8,7 @@@@ CC = @@CC@@ LDCC = @@LDCC@@ -CFLAGS = -c @@CFLAGS@@ -Wall -I../include/ -fPIC +CFLAGS = -c @@CFLAGS@@ -I../include/ LDFLAGS = @@LDFLAGS@@ SHLIB_LDFLAGS = @@SHLIB_LDFLAGS@@ LIBS = @@LIBS@@ @@@@ -53,7 +53,7 @@@@ userauth.o: userauth.c $(CC) -o userauth.o userauth.c $(CFLAGS) $(LIBS) -all: libssh2.@@SHLIB_SUFFIX_NAME@@ +all: libssh2.a libssh2.@@SHLIB_SUFFIX_NAME@@: $(OBJECTS) $(LDCC) -o libssh2.@@SHLIB_SUFFIX_NAME@@ $(SHLIB_LDFLAGS) $(OBJECTS) $(LIBS) $(LDFLAGS) @@@@ -62,7 +62,7 @@@@ ar q libssh2.a $(OBJECTS) @@RANLIB@@ libssh2.a install: all - $(INSTALL) libssh2.@@SHLIB_SUFFIX_NAME@@ $(DESTDIR)$(libdir) + $(INSTALL) libssh2.a $(DESTDIR)$(libdir) clean: rm -f *~ libssh2.a libssh2.@@SHLIB_SUFFIX_NAME@@ *.o @ 1.8 log @add the alternative libssh to this package, too @ text @d13 3 a15 3 Index: Net-SSH2-0.09/Makefile.PL --- Net-SSH2-0.09/Makefile.PL.orig 2005-11-19 19:03:08 +0100 +++ Net-SSH2-0.09/Makefile.PL 2006-06-24 21:50:09 +0200 @ 1.7 log @modifying package: libssh2-0.14 20060924 -> 20060926 @ text @d1 3 a3 3 Index: Makefile.in --- Makefile.in.orig 2006-04-07 22:40:24 +0200 +++ Makefile.in 2006-06-24 21:52:17 +0200 d36 3 a38 3 Index: src/Makefile.in --- src/Makefile.in.orig 2006-04-07 22:40:35 +0200 +++ src/Makefile.in 2006-06-24 21:52:34 +0200 d66 34 @ 1.7.2.1 log @file libssh2.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:52:06 +0000 @ text @d1 65 @ 1.7.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 65 Index: Makefile.in --- Makefile.in.orig 2006-04-07 22:40:24 +0200 +++ Makefile.in 2006-06-24 21:52:17 +0200 @@@@ -8,7 +8,7 @@@@ CC = @@CC@@ CFLAGS = -c @@CFLAGS@@ -Iinclude/ -Wall -LIBS = -lssh2 -Lsrc/ +LIBS = @@LDFLAGS@@ -Lsrc -lssh2 -lcrypto -lz -lm INSTALL = @@INSTALL@@ VERSION=@@PACKAGE_VERSION@@ DISTLIB=libssh2-$(VERSION) Index: Net-SSH2-0.09/Makefile.PL --- Net-SSH2-0.09/Makefile.PL.orig 2005-11-19 19:03:08 +0100 +++ Net-SSH2-0.09/Makefile.PL 2006-06-24 21:50:09 +0200 @@@@ -10,8 +10,8 @@@@ my @@define = $win32 ? (DEFINE => '-DLIBSSH2_WIN32') : (); # override library and include directory here if desired -my $lib = ''; -my $inc = ''; +my $lib = '../src'; +my $inc = '../include'; # try to find libSSH2 if we're not given a location unless($lib and $inc) { @@@@ -39,7 +39,7 @@@@ die "Quitting since I can't find $missing"; } -$lib = "-L$lib -lssh2"; +$lib = "-L$lib -lssh2 -lcrypto -lz -lm"; $inc = "-I$inc"; print "Net::SSH2: using library $lib and include path $inc.\n"; Index: src/Makefile.in --- src/Makefile.in.orig 2006-04-07 22:40:35 +0200 +++ src/Makefile.in 2006-06-24 21:52:34 +0200 @@@@ -8,7 +8,7 @@@@ CC = @@CC@@ LDCC = @@LDCC@@ -CFLAGS = -c @@CFLAGS@@ -Wall -I../include/ -fPIC +CFLAGS = -c @@CFLAGS@@ -I../include/ LDFLAGS = @@LDFLAGS@@ SHLIB_LDFLAGS = @@SHLIB_LDFLAGS@@ LIBS = @@LIBS@@ @@@@ -53,7 +53,7 @@@@ userauth.o: userauth.c $(CC) -o userauth.o userauth.c $(CFLAGS) $(LIBS) -all: libssh2.@@SHLIB_SUFFIX_NAME@@ +all: libssh2.a libssh2.@@SHLIB_SUFFIX_NAME@@: $(OBJECTS) $(LDCC) -o libssh2.@@SHLIB_SUFFIX_NAME@@ $(SHLIB_LDFLAGS) $(OBJECTS) $(LIBS) $(LDFLAGS) @@@@ -62,7 +62,7 @@@@ ar q libssh2.a $(OBJECTS) @@RANLIB@@ libssh2.a install: all - $(INSTALL) libssh2.@@SHLIB_SUFFIX_NAME@@ $(DESTDIR)$(libdir) + $(INSTALL) libssh2.a $(DESTDIR)$(libdir) clean: rm -f *~ libssh2.a libssh2.@@SHLIB_SUFFIX_NAME@@ *.o @ 1.6 log @upgrading package: libssh2 0.13 -> 0.14 @ text @d13 3 a15 3 Index: Net-SSH2-0.08/Makefile.PL --- Net-SSH2-0.08/Makefile.PL.orig 2005-11-19 19:03:08 +0100 +++ Net-SSH2-0.08/Makefile.PL 2006-06-24 21:50:09 +0200 @ 1.5 log @modifying package: libssh2-0.13 20060318 -> 20060508 @ text @d2 2 a3 2 --- Makefile.in.orig 2006-02-24 00:04:38 +0100 +++ Makefile.in 2006-03-02 08:24:28 +0100 d7 1 a7 1 CFLAGS = -c @@CFLAGS@@ -Iinclude/ -Wall -g d15 1 a15 1 +++ Net-SSH2-0.08/Makefile.PL 2006-03-02 08:24:28 +0100 d37 2 a38 2 --- src/Makefile.in.orig 2006-02-24 00:10:25 +0100 +++ src/Makefile.in 2006-03-02 08:25:16 +0100 d43 1 a43 1 -CFLAGS = -c @@CFLAGS@@ -Wall -g -I../include/ -fPIC @ 1.4 log @modifying package: libssh2-0.13 20060302 -> 20060318 @ text @d13 3 a15 3 Index: Net-SSH2-0.07/Makefile.PL --- Net-SSH2-0.07/Makefile.PL.orig 2005-11-19 19:03:08 +0100 +++ Net-SSH2-0.07/Makefile.PL 2006-03-02 08:24:28 +0100 @ 1.3 log @upgrading package: libssh2 0.12 -> 0.13 @ text @d13 3 a15 3 Index: Net-SSH2-0.06/Makefile.PL --- Net-SSH2-0.06/Makefile.PL.orig 2005-11-19 19:03:08 +0100 +++ Net-SSH2-0.06/Makefile.PL 2006-03-02 08:24:28 +0100 @ 1.2 log @modifying package: libssh2-0.12 20051121 -> 20060122 @ text @d2 2 a3 2 --- Makefile.in.orig 2005-07-13 01:46:56 +0200 +++ Makefile.in 2005-11-21 12:32:49 +0100 d14 4 a17 4 --- Net-SSH2-0.06/Makefile.PL.orig 2005-11-08 06:08:56 +0100 +++ Net-SSH2-0.06/Makefile.PL 2005-11-21 12:33:13 +0100 @@@@ -6,8 +6,8 @@@@ use Config; d27 1 a27 1 @@@@ -35,7 +35,7 @@@@ d37 3 a39 4 --- src/Makefile.in.orig 2005-07-12 23:46:08 +0200 +++ src/Makefile.in 2005-11-21 12:32:49 +0100 @@@@ -7,7 +7,7 @@@@ incldir = @@prefix@@/include d42 1 d46 1 d48 1 a48 2 INSTALL = @@INSTALL@@ @@@@ -51,7 +51,7 @@@@ d56 2 a57 2 $(CC) -o libssh2.@@SHLIB_SUFFIX_NAME@@ $(SHLIB_LDFLAGS) $(OBJECTS) $(LIBS) $(LDFLAGS) @@SHLIB_LDFLAGS@@ @@@@ -60,7 +60,7 @@@@ @ 1.1 log @new package: libssh2 0.12 (SSH2 Protocol Client Library) @ text @d13 3 a15 3 Index: Net-SSH2-0.05/Makefile.PL --- Net-SSH2-0.05/Makefile.PL.orig 2005-11-08 06:08:56 +0100 +++ Net-SSH2-0.05/Makefile.PL 2005-11-21 12:33:13 +0100 @