From owner-svn-ports-head@freebsd.org Thu Feb 8 07:07:44 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4B02AF08A36; Thu, 8 Feb 2018 07:07:44 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F0825770BF; Thu, 8 Feb 2018 07:07:43 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CDFD412AE2; Thu, 8 Feb 2018 07:07:43 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1877h6R026341; Thu, 8 Feb 2018 07:07:43 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1877hmT026337; Thu, 8 Feb 2018 07:07:43 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <201802080707.w1877hmT026337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Thu, 8 Feb 2018 07:07:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461199 - in head/security/xmlsec1: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/security/xmlsec1: . files X-SVN-Commit-Revision: 461199 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Feb 2018 07:07:44 -0000 Author: lwhsu Date: Thu Feb 8 07:07:43 2018 New Revision: 461199 URL: https://svnweb.freebsd.org/changeset/ports/461199 Log: - Update to 1.2.25 PR: 224282 Submitted by: Greg V Approved by: maintainer timeout Deleted: head/security/xmlsec1/files/patch-src-openssl-app.c head/security/xmlsec1/files/patch-src-openssl-openssl11_wrapper.h head/security/xmlsec1/files/patch-src_openssl_signatures.c Modified: head/security/xmlsec1/Makefile head/security/xmlsec1/distinfo head/security/xmlsec1/files/patch-Makefile.in head/security/xmlsec1/pkg-plist Modified: head/security/xmlsec1/Makefile ============================================================================== --- head/security/xmlsec1/Makefile Thu Feb 8 07:05:14 2018 (r461198) +++ head/security/xmlsec1/Makefile Thu Feb 8 07:07:43 2018 (r461199) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xmlsec1 -PORTVERSION= 1.2.23 -PORTREVISION= 1 +PORTVERSION= 1.2.25 CATEGORIES= security MASTER_SITES= http://www.aleksey.com/xmlsec/download/ \ ftp://ftp.aleksey.com/pub/xmlsec/releases/ \ @@ -20,26 +19,22 @@ LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error \ libltdl.so:devel/libltdl -USES= libtool localbase pathfix pkgconfig ssl +USES= libtool localbase pathfix pkgconfig ssl gmake USE_GNOME= libxml2 libxslt USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-openssl="${OPENSSLBASE}" \ - --with-gcrypt="${LOCALBASE}" + --with-gcrypt="${LOCALBASE}" \ + --enable-soap \ + --disable-docs-build MAKE_ENV= ABS_BUILDDIR=${WRKSRC} TMPFOLDER=${WRKSRC} INSTALL_TARGET= install-strip -PORTDOCS= api authors.html bugs.html c14n.html documentation.html \ - download.html faq.html favicon.ico images/bart.gif \ - images/libxml2-logo.png images/libxslt-logo.png \ - images/logo.gif images/openssl-logo.png \ - images/xmlsec-logo.gif index.html news.html related.html \ - xmldsig-verifier.html xmldsig.html xmlenc.html \ - xmlsec-man.html +PORTDOCS= * -OPTIONS_DEFINE= DOCS GNUTLS NSS +OPTIONS_DEFINE= GNUTLS NSS +OPTIONS_DEFAULT= NSS OPTIONS_SUB= yes -DOCS_MAKE_ENV= DOCS=docs GNUTLS_DESC= Enable GNUTLS support GNUTLS_CONFIGURE_ON= --with-gnutls="${LOCALBASE}" GNUTLS_CONFIGURE_OFF= --without-gnutls @@ -53,6 +48,15 @@ NSS_LIB_DEPENDS= libnss3.so:security/nss \ libnspr4.so:devel/nspr \ libplds4.so:devel/nspr \ libplc4.so:devel/nspr + +post-patch: + @${REINPLACE_CMD} -e 's/mozilla-nss/nss/' \ + -e 's/mozilla-nspr/nspr/' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's/(CP) -ru/(CP) -r/' \ + -e 's/(CP) -u/(CP)/' \ + ${WRKSRC}/docs/Makefile.am ${WRKSRC}/docs/Makefile.in \ + ${WRKSRC}/docs/api/Makefile.am ${WRKSRC}/docs/api/Makefile.in \ + ${WRKSRC}/man/Makefile.am ${WRKSRC}/man/Makefile.in post-patch-GNUTLS-on: # Don't rely on broken autodetection Modified: head/security/xmlsec1/distinfo ============================================================================== --- head/security/xmlsec1/distinfo Thu Feb 8 07:05:14 2018 (r461198) +++ head/security/xmlsec1/distinfo Thu Feb 8 07:07:43 2018 (r461199) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483094320 -SHA256 (xmlsec1-1.2.23.tar.gz) = 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f -SIZE (xmlsec1-1.2.23.tar.gz) = 1794694 +TIMESTAMP = 1513083917 +SHA256 (xmlsec1-1.2.25.tar.gz) = 967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2 +SIZE (xmlsec1-1.2.25.tar.gz) = 1839160 Modified: head/security/xmlsec1/files/patch-Makefile.in ============================================================================== --- head/security/xmlsec1/files/patch-Makefile.in Thu Feb 8 07:05:14 2018 (r461198) +++ head/security/xmlsec1/files/patch-Makefile.in Thu Feb 8 07:07:43 2018 (r461199) @@ -1,13 +1,6 @@ ---- Makefile.in.orig 2017-01-05 17:38:02.402682000 +0900 -+++ Makefile.in 2017-01-05 17:39:12.079701000 +0900 -@@ -468,13 +468,13 @@ - top_srcdir = @top_srcdir@ - NULL = - SAFE_VERSION = @XMLSEC_VERSION_SAFE@ --SUBDIRS = include src apps man docs -+SUBDIRS = include src apps man ${DOCS} - TEST_APP = apps/xmlsec1$(EXEEXT) - DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@ +--- Makefile.in.orig 2017-12-12 16:05:23.187628000 +0300 ++++ Makefile.in 2017-12-12 16:07:19.241092000 +0300 +@@ -480,7 +480,7 @@ bin_SCRIPTS = xmlsec1-config pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@ pkgconfigdir = $(prefix)/libdata/pkgconfig Modified: head/security/xmlsec1/pkg-plist ============================================================================== --- head/security/xmlsec1/pkg-plist Thu Feb 8 07:05:14 2018 (r461198) +++ head/security/xmlsec1/pkg-plist Thu Feb 8 07:07:43 2018 (r461199) @@ -56,20 +56,20 @@ lib/libxmlsec1-gcrypt.so.1 %%GNUTLS%%lib/libxmlsec1-gnutls.a %%GNUTLS%%lib/libxmlsec1-gnutls.so %%GNUTLS%%lib/libxmlsec1-gnutls.so.1 -%%GNUTLS%%lib/libxmlsec1-gnutls.so.1.2.23 +%%GNUTLS%%lib/libxmlsec1-gnutls.so.1.2.25 %%NSS%%lib/libxmlsec1-nss.a %%NSS%%lib/libxmlsec1-nss.so %%NSS%%lib/libxmlsec1-nss.so.1 -%%NSS%%lib/libxmlsec1-nss.so.1.2.23 -lib/libxmlsec1-gcrypt.so.1.2.23 +%%NSS%%lib/libxmlsec1-nss.so.1.2.25 +lib/libxmlsec1-gcrypt.so.1.2.25 lib/libxmlsec1-openssl.a lib/libxmlsec1-openssl.so lib/libxmlsec1-openssl.so.1 -lib/libxmlsec1-openssl.so.1.2.23 +lib/libxmlsec1-openssl.so.1.2.25 lib/libxmlsec1.a lib/libxmlsec1.so lib/libxmlsec1.so.1 -lib/libxmlsec1.so.1.2.23 +lib/libxmlsec1.so.1.2.25 libdata/pkgconfig/xmlsec1-gcrypt.pc %%GNUTLS%%libdata/pkgconfig/xmlsec1-gnutls.pc %%NSS%%libdata/pkgconfig/xmlsec1-nss.pc