OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 26-Jun-2007 08:19:32
Branch: HEAD Handle: 2007062607193200
Modified files:
openpkg-src/libssh2 libssh2.patch libssh2.spec
Log:
upgrading package: libssh2 0.14 -> 0.15
Summary:
Revision Changes Path
1.10 +0 -42 openpkg-src/libssh2/libssh2.patch
1.16 +5 -3 openpkg-src/libssh2/libssh2.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libssh2/libssh2.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 libssh2.patch
--- openpkg-src/libssh2/libssh2.patch 25 Feb 2007 08:40:14 -0000 1.9
+++ openpkg-src/libssh2/libssh2.patch 26 Jun 2007 06:19:32 -0000 1.10
@@ -1,15 +1,3 @@
-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@
- [EMAIL PROTECTED]@
- DISTLIB=libssh2-$(VERSION)
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
@@ -33,36 +21,6 @@
$inc = "-I$inc";
print "Net::SSH2: using library $lib and include path $inc.\n";
-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: [EMAIL PROTECTED]@
-+all: libssh2.a
-
- [EMAIL PROTECTED]@: $(OBJECTS)
- $(LDCC) -o [EMAIL PROTECTED]@ $(SHLIB_LDFLAGS) $(OBJECTS) $(LIBS)
$(LDFLAGS)
-@@ -62,7 +62,7 @@
- ar q libssh2.a $(OBJECTS)
- @RANLIB@ libssh2.a
- install: all
-- $(INSTALL) [EMAIL PROTECTED]@ $(DESTDIR)$(libdir)
-+ $(INSTALL) libssh2.a $(DESTDIR)$(libdir)
- clean:
- rm -f *~ libssh2.a [EMAIL PROTECTED]@ *.o
-
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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libssh2/libssh2.spec
============================================================================
$ cvs diff -u -r1.15 -r1.16 libssh2.spec
--- openpkg-src/libssh2/libssh2.spec 25 Feb 2007 08:40:14 -0000 1.15
+++ openpkg-src/libssh2/libssh2.spec 26 Jun 2007 06:19:32 -0000 1.16
@@ -23,7 +23,7 @@
##
# package version
-%define V_libssh2 0.14
+%define V_libssh2 0.15
%define V_libssh 0.2
%define V_net_ssh2 0.10
@@ -38,7 +38,7 @@
Group: SSH
License: BSD-style
Version: %{V_libssh2}
-Release: 20070225
+Release: 20070626
# package options
%option with_perl no
@@ -100,8 +100,10 @@
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--with-openssl=%{l_prefix} \
- --with-libz=%{l_prefix}
+ --with-libz=%{l_prefix} \
+ --disable-shared
%{l_make} %{l_mflags -O}
) || exit $?
( cd libssh-%{V_libssh}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
