From owner-svn-ports-head@FreeBSD.ORG Mon May 5 08:21:43 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AB21E571; Mon, 5 May 2014 08:21:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 975761D5A; Mon, 5 May 2014 08:21:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s458Lh2I058895; Mon, 5 May 2014 08:21:43 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s458LgbF058888; Mon, 5 May 2014 08:21:42 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201405050821.s458LgbF058888@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 5 May 2014 08:21:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352983 - in head/devel/ucommon: . files X-SVN-Group: ports-head 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.18 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: Mon, 05 May 2014 08:21:43 -0000 Author: gahr Date: Mon May 5 08:21:42 2014 New Revision: 352983 URL: http://svnweb.freebsd.org/changeset/ports/352983 QAT: https://qat.redports.org/buildarchive/r352983/ Log: - Update to 6.1.3 Changes from 6.1.2 to 6.1.3 - revised unixaddr buffer overflow issue Changes from 6.1.1 to 6.1.2 - updated contacts, fsf address, and copyright - revised cmake build - added setgroups Modified: head/devel/ucommon/Makefile head/devel/ucommon/distinfo head/devel/ucommon/files/patch-CMakeLists.txt head/devel/ucommon/pkg-plist Modified: head/devel/ucommon/Makefile ============================================================================== --- head/devel/ucommon/Makefile Mon May 5 08:05:13 2014 (r352982) +++ head/devel/ucommon/Makefile Mon May 5 08:21:42 2014 (r352983) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= ucommon -PORTVERSION= 6.1.1 +PORTVERSION= 6.1.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= commoncpp Modified: head/devel/ucommon/distinfo ============================================================================== --- head/devel/ucommon/distinfo Mon May 5 08:05:13 2014 (r352982) +++ head/devel/ucommon/distinfo Mon May 5 08:21:42 2014 (r352983) @@ -1,2 +1,2 @@ -SHA256 (ucommon-6.1.1.tar.gz) = a6dde609c2b9ec08343dce47d2e8895b3b7e54700bc31d715d98bb62f6c55b90 -SIZE (ucommon-6.1.1.tar.gz) = 829129 +SHA256 (ucommon-6.1.3.tar.gz) = 217867ebc89a97e69bec427ba7f09bd5cb50eef0588f83546550dd817dea43c8 +SIZE (ucommon-6.1.3.tar.gz) = 829685 Modified: head/devel/ucommon/files/patch-CMakeLists.txt ============================================================================== --- head/devel/ucommon/files/patch-CMakeLists.txt Mon May 5 08:05:13 2014 (r352982) +++ head/devel/ucommon/files/patch-CMakeLists.txt Mon May 5 08:21:42 2014 (r352983) @@ -1,26 +1,25 @@ ---- CMakeLists.txt 2013-07-28 05:32:06.000000000 -0500 -+++ CMakeLists.txt 2013-10-01 18:00:14.000000000 -0500 -@@ -30,7 +30,9 @@ +--- CMakeLists.txt.orig 2014-05-05 09:49:48.000000000 +0200 ++++ CMakeLists.txt 2014-05-05 09:58:30.000000000 +0200 +@@ -37,7 +37,9 @@ # when we override default install prefix, assume full path is used... set(INSTALL_INCLUDEDIR include) -set(INSTALL_BINDIR bin) -+if (NOT INSTALL_BINDIR) -+ set(INSTALL_BINDIR bin) -+endif () ++if(NOT INSTALL_BINDIR) ++ set(INSTALL_BINDIR bin) ++endif() if(WIN32) - set(INSTALL_MANDIR man) -@@ -50,7 +52,7 @@ - endif() - endif() - set(INSTALL_SBINDIR sbin) -- set(INSTALL_MANDIR share/man) + set(MODULE_FLAGS "-module -shared -no-undefined") +@@ -53,6 +55,7 @@ + set(MODULE_FLAGS "-module -shared -avoid-version") + set(SYSCONFDIR "/etc" CACHE PATH "config directory") + set(STATEDIR "/var" CACHE PATH "state directory") + set(INSTALL_MANDIR man) - set(INSTALL_LOCALE share/locale) - set(INSTALL_DOCDIR share/doc/${PROJECT_NAME}) - set(INSTALL_INFODIR share/info) -@@ -207,15 +209,17 @@ + endif() + + if(NOT INSTALL_SBINDIR) +@@ -227,13 +230,15 @@ if(UNIX OR MSYS OR MINGW OR CYGWIN) @@ -31,7 +30,7 @@ - check_library_exists(compat dlopen "" HAVE_COMPAT_LIB) - if(HAVE_COMPAT_LIB) - set (UCOMMON_LIBS ${UCOMMON_LIBS} compat) -+ if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") ++ if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + check_library_exists(dl dlopen "" HAVE_DL_LIB) + if (HAVE_DL_LIB) + set (UCOMMON_LIBS ${UCOMMON_LIBS} dl) @@ -41,47 +40,44 @@ + set (UCOMMON_LIBS ${UCOMMON_LIBS} compat) + endif() endif() -- endif() -+ endif () + endif() - check_library_exists(dld shl_load "" HAVE DLD_LIB) - if (HAVE_DLD_LIB) -@@ -309,7 +313,11 @@ +@@ -330,7 +335,11 @@ check_include_files(sys/event.h HAVE_SYS_EVENT_H) check_include_files(syslog.h HAVE_SYSLOG_H) check_include_files(openssl/ssl.h HAVE_OPENSSL) -+if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") -+ set (HAVE_OPENSSL_FIPS_H "") -+else () - check_include_files(openssl/fips.h HAVE_OPENSSL_FIPS_H) -+endif () +-check_include_files(openssl/fips.h HAVE_OPENSSL_FIPS_H) ++if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") ++ set(HAVE_OPENSSL_FIPS_H "") ++else() ++ check_include_files(openssl/fips.h HAVE_OPENSSL_FIPS_H) ++endif() check_include_files(libintl.h HAVE_LIBINTL_H) check_include_files(netinet/in.h HAVE_NETINET_IN_H) check_include_files(net/if.h HAVE_NET_IF_H) -@@ -411,11 +419,20 @@ +@@ -434,11 +443,19 @@ endforeach() foreach(lib ${UCOMMON_LIBS}) STRING(REGEX REPLACE "^[-]l" "" slib ${lib}) - set(PACKAGE_LIBS "${PACKAGE_LIBS} -l${slib}") + if(${lib} STREQUAL "-pthread") -+ set(PACKAGE_LIBS "${PACKAGE_LIBS} ${slib}") ++ set(PACKAGE_LIBS "${PACKAGE_LIBS} ${slib}" ) + else() -+ set(PACKAGE_LIBS "${PACKAGE_LIBS} -l${slib}") ++ set(PACKAGE_LIBS "${PACKAGE_LIBS} -l${slib}") + endif() -+ STRING(REGEX REPLACE "^[-]l" "" slib ${lib}) endforeach() foreach(lib ${SECURE_LIBS}) STRING(REGEX REPLACE "^[-]l" "" slib ${lib}) - set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} -l${slib}") -+ if(${lib} STREQUAL "-pthread") -+ set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} ${slib}") -+ else() -+ set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} -l${slib}") -+ endif() ++ if(${lib} STREQUAL "-pthread") ++ set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} ${slib}") ++ else() ++ set(ADDITIONAL_LIBS "${ADDITIONAL_LIBS} -l${slib}") ++ endif() endforeach() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config) -@@ -566,11 +583,11 @@ +@@ -594,11 +611,11 @@ endif() if(NOT WIN32) Modified: head/devel/ucommon/pkg-plist ============================================================================== --- head/devel/ucommon/pkg-plist Mon May 5 08:05:13 2014 (r352982) +++ head/devel/ucommon/pkg-plist Mon May 5 08:21:42 2014 (r352983) @@ -66,13 +66,13 @@ include/ucommon/vector.h include/ucommon/xml.h lib/libcommoncpp.so lib/libcommoncpp.so.6 -lib/libcommoncpp.so.6.1.1 +lib/libcommoncpp.so.6.0.7 lib/libucommon.so lib/libucommon.so.6 -lib/libucommon.so.6.1.1 +lib/libucommon.so.6.0.7 lib/libusecure.so lib/libusecure.so.6 -lib/libusecure.so.6.1.1 +lib/libusecure.so.6.0.7 libdata/pkgconfig/commoncpp.pc libdata/pkgconfig/ucommon.pc man/man1/args.1.gz