Date: Thu, 23 Jun 2011 10:28:53 +0200 From: Matthias Andree <mandree@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sbz@FreeBSD.org Subject: ports/158195: [PATCH] security/libssh2: fix Version in pkg-config .pc file Message-ID: <E1QZfHR-000MqH-LW@apollo.emma.line.org> Resent-Message-ID: <201106230840.p5N8e7NV082016@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158195 >Category: ports >Synopsis: [PATCH] security/libssh2: fix Version in pkg-config .pc file >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jun 23 08:40:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Matthias Andree >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: System: FreeBSD apollo.emma.line.org 8.2-STABLE FreeBSD 8.2-STABLE #3: Tue Jun 21 01:06:57 CEST 2011 >Description: Sofian, please approve of my committing this patch, or commit yourself. This fixes the Version in the pkg-config file, which is currently "-" rather than 1.2.8, breaking, for instance, the libpwmd build. This fix is taken from the upstream repo, see <http://git.libssh2.org/?p=libssh2.git;a=commitdiff;h=f0a37bdadc311b83fcb2ccafad4827016abe5d18;js=1>, and can probably be reverted for future releases. Added file(s): - files/patch-version Port maintainer (sbz@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- libssh2-1.2.8_1,2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/libssh2/Makefile,v retrieving revision 1.29 diff -u -u -r1.29 Makefile --- Makefile 13 Apr 2011 11:45:03 -0000 1.29 +++ Makefile 23 Jun 2011 08:23:50 -0000 @@ -7,6 +7,7 @@ PORTNAME= libssh2 PORTVERSION= 1.2.8 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= security devel MASTER_SITES= http://www.libssh2.org/download/ @@ -18,8 +19,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING USE_OPENSSL= yes +USE_AUTOTOOLS= autoconf GNU_CONFIGURE= yes USE_LDCONFIG= yes +PATCH_STRIP= -p1 OPTIONS= GCRYPT "Use libgcrypt instead of OpenSSL" off \ TRACE "Enable debug packet traces" off \ Index: files/patch-version =================================================================== RCS file: files/patch-version diff -N files/patch-version --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-version 23 Jun 2011 08:25:31 -0000 @@ -0,0 +1,60 @@ +From: Daniel Stenberg <daniel@haxx.se> +Date: Wed, 6 Apr 2011 10:03:11 +0000 (+0200) +Subject: configure: fix $VERSION +X-Git-Url: http://git.libssh2.org/?p=libssh2.git;a=commitdiff_plain;h=f0a37bdadc311b83fcb2ccafad4827016abe5d18;js=1 + +configure: fix $VERSION + +Stop using the $VERSION variable as it seems to be magically used by +autoconfig itself and thus gets set to the value set in AC_INIT() +without us wanting that. $LIBSSH2VER is now the libssh2 version as +detected. + +Reported by: Paul Howarth +Bug: http://www.libssh2.org/mail/libssh2-devel-archive-2011-04/0008.shtml +--- + +diff --git a/configure.ac b/configure.ac +index 9bdf3b9..46c6cfa 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -15,12 +15,14 @@ if test "x$SED" = "xsed-was-not-found-by-configure"; then + fi + + dnl figure out the libssh2 version +-VERSION=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h` ++LIBSSH2VER=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h` + AM_INIT_AUTOMAKE + AC_MSG_CHECKING([libssh2 version]) +-AC_MSG_RESULT($VERSION) ++AC_MSG_RESULT($LIBSSH2VER) + +-AB_VERSION=$VERSION ++AC_SUBST(LIBSSH2VER) ++ ++AB_VERSION=$LIBSSH2VER + + AB_INIT + +@@ -289,7 +291,7 @@ AC_OUTPUT + + AC_MSG_NOTICE([summary of build options: + +- version: ${VERSION} ++ version: ${LIBSSH2VER} + Host type: ${host} + Install prefix: ${prefix} + Compiler: ${CC} +diff --git a/libssh2.pc.in b/libssh2.pc.in +index 013e6bf..eaef88b 100644 +--- a/libssh2.pc.in ++++ b/libssh2.pc.in +@@ -10,7 +10,7 @@ includedir=@includedir@ + Name: libssh2 + URL: http://www.libssh2.org/ + Description: Library for SSH based connunication +-Version: @VERSION@ ++Version: @LIBSSH2VER@ + Libs: -L${libdir} -lssh2 @LDFLAGS@ @LIBS@ + Libs.private: @LIBS@ + Cflags: -I${includedir} --- libssh2-1.2.8_1,2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1QZfHR-000MqH-LW>