Date: Tue, 8 Apr 2014 23:59:36 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/188384: [patch] Fix broken port devel/poco-ssl Message-ID: <201404082359.s38NxaB5075840@cgiserv.freebsd.org> Resent-Message-ID: <201404090000.s39000ej004741@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 188384
>Category: ports
>Synopsis: [patch] Fix broken port devel/poco-ssl
>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: Wed Apr 09 00:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Joseph Benden
>Release: FreeBSD 11
>Organization:
>Environment:
FreeBSD freebsd-11 11.0-CURRENT FreeBSD 11.0-CURRENT #2 r263915: Sat Mar 29 16:29:15 MST 2014 root@freebsd-11:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
This patch fixes the build process of devel/poco-ssl (or known as all). Tested build in Poudriere.
Steps needed:
1. Remove the existing two patches inside the files directory.
2. Apply patch. (in shar)
3. Copy two other files into files directory. (in shar)
4. Done.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# latest-poco.patch.txt
# files/patch-configure.in
# files/patch-poco-1.4.6p3.patch
#
echo x - latest-poco.patch.txt
sed 's/^X//' >latest-poco.patch.txt << '3aa767971f72c96bdb733596f1c1692b'
XIndex: Makefile
X===================================================================
X--- Makefile (revision 350634)
X+++ Makefile (working copy)
X@@ -2,10 +2,10 @@
X # $FreeBSD$
X
X PORTNAME= poco
X-PORTVERSION= 1.4.3
X-PORTREVISION= 2
X+PORTVERSION= 1.4.6p3
X+PORTREVISION= 1
X CATEGORIES= devel net
X-MASTER_SITES= SF/${PORTNAME}/sources/${PORTNAME}-${PORTVERSION}
X+MASTER_SITES= https://codeload.github.com/pocoproject/${PORTNAME}/legacy.tar.gz/${PORTNAME}-${PORTVERSION}-release?dummy=/
X PKGNAMESUFFIX= -ssl
X DISTNAME= poco-${PORTVERSION}p1-all
X
X@@ -12,8 +12,6 @@
X MAINTAINER= wes@FreeBSD.org
X COMMENT= C++ Portable Components library with NetSSL and Database libraries
X
X-BROKEN= Fails to build
X-
X CONFLICTS= poco-[0-9]*
X
X OPTIONS_DEFINE= TEST SAMPLES MYSQL SQLITE
X@@ -27,9 +25,13 @@
X
X OPTIONS_DEFAULT= MYSQL IODBC SQLITE
X
X-CONFIGURE_ARGS= --config=FreeBSD
X+BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
X+LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \
X+ libexpat.so:${PORTSDIR}/textproc/expat2
X+CONFIGURE_ARGS= --unbundled
X+WRKSRC= ${WRKDIR}/pocoproject-poco-8d5a60d
X+export ODBCLIBDIR=/usr/local/lib
X
X-NO_STAGE= yes
X .include <bsd.port.options.mk>
X
X .if ! ${PORT_OPTIONS:MTEST}
XIndex: distinfo
X===================================================================
X--- distinfo (revision 349476)
X+++ distinfo (working copy)
X@@ -1,2 +1,2 @@
X-SHA256 (poco-1.4.3p1-all.tar.bz2) = 8a3fd41234a8015e5c46470baa90140c7726cd7dc70d8300c655f08d71fdc35a
X-SIZE (poco-1.4.3p1-all.tar.bz2) = 3005394
X+SHA256 (poco-1.4.6p3p1-all.tar.bz2) = 90ee09d00e111ac97de6ab8d1c168acbc43bb1becc6bc354984df79890ed4a5c
X+SIZE (poco-1.4.6p3p1-all.tar.bz2) = 4402391
XIndex: pkg-plist
X===================================================================
X--- pkg-plist (revision 349476)
X+++ pkg-plist (working copy)
X@@ -344,7 +344,6 @@
X include/Poco/UUID.h
X include/Poco/UUIDGenerator.h
X include/Poco/ValidArgs.h
X-include/Poco/._Version.h
X include/Poco/SAX/XMLReader.h
X include/Poco/SAX/AttributesImpl.h
X include/Poco/SAX/ContentHandler.h
X@@ -639,46 +638,54 @@
X include/Poco/Zip/ZipOperation.h
X include/Poco/Zip/ZipStream.h
X include/Poco/Zip/Add.h
X+include/Poco/DirectoryWatcher.h
X+include/Poco/ObjectPool.h
X+include/Poco/Optional.h
X+include/Poco/Crypto/DigestEngine.h
X+lib/libPocoDataODBC.so
X+lib/libPocoDataODBC.so.16
X+lib/libPocoDataODBCd.so
X+lib/libPocoDataODBCd.so.16
X lib/libPocoCrypto.so
X-lib/libPocoCrypto.so.12
X+lib/libPocoCrypto.so.16
X lib/libPocoCryptod.so
X-lib/libPocoCryptod.so.12
X+lib/libPocoCryptod.so.16
X lib/libPocoData.so
X-lib/libPocoData.so.12
X+lib/libPocoData.so.16
X lib/libPocoDataMySQL.so
X-lib/libPocoDataMySQL.so.12
X+lib/libPocoDataMySQL.so.16
X lib/libPocoDataMySQLd.so
X-lib/libPocoDataMySQLd.so.12
X+lib/libPocoDataMySQLd.so.16
X lib/libPocoDataSQLite.so
X-lib/libPocoDataSQLite.so.12
X+lib/libPocoDataSQLite.so.16
X lib/libPocoDataSQLited.so
X-lib/libPocoDataSQLited.so.12
X+lib/libPocoDataSQLited.so.16
X lib/libPocoDatad.so
X-lib/libPocoDatad.so.12
X+lib/libPocoDatad.so.16
X lib/libPocoFoundation.so
X-lib/libPocoFoundation.so.12
X+lib/libPocoFoundation.so.16
X lib/libPocoFoundationd.so
X-lib/libPocoFoundationd.so.12
X+lib/libPocoFoundationd.so.16
X lib/libPocoNet.so
X-lib/libPocoNet.so.12
X+lib/libPocoNet.so.16
X lib/libPocoNetSSL.so
X-lib/libPocoNetSSL.so.12
X+lib/libPocoNetSSL.so.16
X lib/libPocoNetSSLd.so
X-lib/libPocoNetSSLd.so.12
X+lib/libPocoNetSSLd.so.16
X lib/libPocoNetd.so
X-lib/libPocoNetd.so.12
X+lib/libPocoNetd.so.16
X lib/libPocoUtil.so
X-lib/libPocoUtil.so.12
X+lib/libPocoUtil.so.16
X lib/libPocoUtild.so
X-lib/libPocoUtild.so.12
X+lib/libPocoUtild.so.16
X lib/libPocoXML.so
X-lib/libPocoXML.so.12
X+lib/libPocoXML.so.16
X lib/libPocoXMLd.so
X-lib/libPocoXMLd.so.12
X+lib/libPocoXMLd.so.16
X lib/libPocoZip.so
X-lib/libPocoZip.so.12
X+lib/libPocoZip.so.16
X lib/libPocoZipd.so
X-lib/libPocoZipd.so.12
X+lib/libPocoZipd.so.16
X @dirrmtry include/Poco/DOM
X @dirrmtry include/Poco/SAX
X @dirrmtry include/Poco/XML
3aa767971f72c96bdb733596f1c1692b
echo x - files/patch-configure.in
sed 's/^X//' >files/patch-configure.in << 'e9ecf9b358f69d79bd97757060ab928f'
X--- configure 2014-04-02 01:13:57.000000000 -0700
X+++ configure 2014-04-08 10:04:41.000000000 -0700
X@@ -1,4 +1,4 @@
X-#! /bin/sh
X+#! /usr/bin/env bash
X #
X # configure
X #
X@@ -170,8 +170,11 @@
X showhelp
X exit 0
X ;;
X+ --build=*)
X+ ;;
X
X *)
X+ echo $1 option not found.
X showhelp
X exit 1
X ;;
e9ecf9b358f69d79bd97757060ab928f
echo x - files/patch-poco-1.4.6p3.patch
sed 's/^X//' >files/patch-poco-1.4.6p3.patch << '94891411bc8c3c0da5465807d4b33c2a'
Xdiff -ur Crypto/samples/genrsakey/Makefile Crypto/samples/genrsakey/Makefile
X--- Crypto/samples/genrsakey/Makefile 2014-04-02 01:13:57.000000000 -0700
X+++ Crypto/samples/genrsakey/Makefile 2014-04-08 08:40:51.000000000 -0700
X@@ -8,7 +8,7 @@
X
X include $(POCO_BASE)/build/rules/global
X
X-SYSLIBS += -lssl -lcrypto -lz -ldl
X+SYSLIBS += -lssl -lcrypto -lz
X
X objects = genrsakey
X
Xdiff -ur Crypto/testsuite/Makefile Crypto/testsuite/Makefile
X--- Crypto/testsuite/Makefile 2014-04-02 01:13:57.000000000 -0700
X+++ Crypto/testsuite/Makefile 2014-04-08 08:30:03.000000000 -0700
X@@ -8,7 +8,7 @@
X
X include $(POCO_BASE)/build/rules/global
X
X-SYSLIBS += -lssl -lcrypto -lz -ldl
X+SYSLIBS += -lssl -lcrypto -lz
X
X objects = CryptoTestSuite Driver \
X CryptoTest RSATest DigestEngineTest
Xdiff -ur Data/MySQL/testsuite/Makefile Data/MySQL/testsuite/Makefile
X--- Data/MySQL/testsuite/Makefile 2014-04-02 01:13:57.000000000 -0700
X+++ Data/MySQL/testsuite/Makefile 2014-04-08 08:36:05.000000000 -0700
X@@ -9,7 +9,7 @@
X include $(POCO_BASE)/build/rules/global
X
X INCLUDE += -I./../include -I/usr/local/include/mysql -I/usr/include/mysql -I/usr/mysql/include/mysql -I/usr/local/mysql/include
X-SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient -lz -lpthread -ldl
X+SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient -lz -lpthread
X
X objects = MySQLTestSuite Driver \
X MySQLTest SQLExecutor
Xdiff -ur Data/ODBC/testsuite/Makefile Data/ODBC/testsuite/Makefile
X--- Data/ODBC/testsuite/Makefile 2014-04-02 01:13:57.000000000 -0700
X+++ Data/ODBC/testsuite/Makefile 2014-04-08 08:34:14.000000000 -0700
X@@ -20,7 +20,7 @@
X # Note: #
X # Do not change linking order or move this line up, these libs have to be linked in this order. #
X ##################################################################################################
X-SYSLIBS += -lltdl -ldl
X+SYSLIBS +=
X
X objects = ODBCTestSuite Driver \
X ODBCDB2Test ODBCMySQLTest ODBCOracleTest ODBCPostgreSQLTest \
Xdiff -ur Foundation/Makefile Foundation/Makefile
X--- Foundation/Makefile 2014-04-02 01:13:57.000000000 -0700
X+++ Foundation/Makefile 2014-04-08 07:38:07.000000000 -0700
X@@ -44,6 +44,7 @@
X
X ifdef POCO_UNBUNDLED
X SYSLIBS += -lpcre -lz
X+ objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables
X else
X objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
X endif
Xdiff -ur Foundation/src/pcre_internal.h Foundation/src/pcre_internal.h
X--- Foundation/src/pcre_internal.h 2014-04-02 01:13:57.000000000 -0700
X+++ Foundation/src/pcre_internal.h 2014-04-08 07:38:07.000000000 -0700
X@@ -1109,6 +1109,16 @@
X } ucp_type_table;
X
X
X+/* renamed to avoid clashes with system pcre */
X+#define _pcre_utf8_table1 _poco__pcre_utf8_table1
X+#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size
X+#define _pcre_utf8_table2 _poco__pcre_utf8_table2
X+#define _pcre_utf8_table3 _poco__pcre_utf8_table3
X+#define _pcre_utf8_table4 _poco__pcre_utf8_table4
X+#define _pcre_utt _poco__pcre_utt
X+#define _pcre_utt_size _poco__pcre_utt_size
X+#define _pcre_utt_names _poco__pcre_utt_names
X+#define _pcre_OP_lengths _poco__pcre_OP_lengths
X /* Internal shared data tables. These are tables that are used by more than one
X of the exported public functions. They have to be "external" in the C sense,
X but are not part of the PCRE public API. The data for these tables is in the
X@@ -1153,6 +1163,11 @@
X pcre_int32 other_case;
X } ucd_record;
X
X+/* renamed to avoid clashes with system pcre */
X+#define _pcre_ucd_records _poco__pcre_ucd_records
X+#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1
X+#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2
X+#define _pcre_ucp_gentype _poco__pcre_ucp_gentype
X extern const ucd_record _pcre_ucd_records[];
X extern const uschar _pcre_ucd_stage1[];
X extern const pcre_uint16 _pcre_ucd_stage2[];
Xdiff -ur Net/src/DNS.cpp Net/src/DNS.cpp
X--- Net/src/DNS.cpp 2014-04-02 01:13:57.000000000 -0700
X+++ Net/src/DNS.cpp 2014-04-07 16:47:14.000000000 -0700
X@@ -275,7 +275,7 @@
X throw DNSException("Temporary DNS error while resolving", arg);
X case EAI_FAIL:
X throw DNSException("Non recoverable DNS error while resolving", arg);
X-#if !defined(_WIN32) // EAI_NODATA and EAI_NONAME have the same value
X+#if !defined(_WIN32) && defined(EAI_NODATA) // EAI_NODATA and EAI_NONAME have the same value
X case EAI_NODATA:
X throw NoAddressFoundException(arg);
X #endif
Xdiff -ur NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile
X--- NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile 2014-04-02 01:13:57.000000000 -0700
X+++ NetSSL_OpenSSL/samples/HTTPSTimeServer/Makefile 2014-04-08 08:42:03.000000000 -0700
X@@ -8,7 +8,7 @@
X
X include $(POCO_BASE)/build/rules/global
X
X-SYSLIBS += -lssl -lcrypto -lz -ldl
X+SYSLIBS += -lssl -lcrypto -lz
X
X objects = HTTPSTimeServer
X
Xdiff -ur NetSSL_OpenSSL/samples/Mail/Makefile NetSSL_OpenSSL/samples/Mail/Makefile
X--- NetSSL_OpenSSL/samples/Mail/Makefile 2014-04-02 01:13:57.000000000 -0700
X+++ NetSSL_OpenSSL/samples/Mail/Makefile 2014-04-08 08:43:27.000000000 -0700
X@@ -8,7 +8,7 @@
X
X include $(POCO_BASE)/build/rules/global
X
X-SYSLIBS += -lssl -lcrypto -lz -ldl
X+SYSLIBS += -lssl -lcrypto -lz
X
X objects = Mail
X
Xdiff -ur NetSSL_OpenSSL/samples/download/Makefile NetSSL_OpenSSL/samples/download/Makefile
X--- NetSSL_OpenSSL/samples/download/Makefile 2014-04-02 01:13:57.000000000 -0700
X+++ NetSSL_OpenSSL/samples/download/Makefile 2014-04-08 08:43:04.000000000 -0700
X@@ -8,7 +8,7 @@
X
X include $(POCO_BASE)/build/rules/global
X
X-SYSLIBS += -lssl -lcrypto -lz -ldl
X+SYSLIBS += -lssl -lcrypto -lz
X
X objects = download
X
Xdiff -ur NetSSL_OpenSSL/testsuite/Makefile NetSSL_OpenSSL/testsuite/Makefile
X--- NetSSL_OpenSSL/testsuite/Makefile 2014-04-02 01:13:57.000000000 -0700
X+++ NetSSL_OpenSSL/testsuite/Makefile 2014-04-08 08:31:13.000000000 -0700
X@@ -8,7 +8,7 @@
X
X include $(POCO_BASE)/build/rules/global
X
X-SYSLIBS += -lssl -lcrypto -lz -ldl
X+SYSLIBS += -lssl -lcrypto -lz
X
X objects = NetSSLTestSuite Driver \
X HTTPSClientSessionTest HTTPSClientTestSuite HTTPSServerTest HTTPSServerTestSuite \
Xdiff -ur build/config/FreeBSD build/config/FreeBSD
X--- build/config/FreeBSD 2014-04-02 01:13:57.000000000 -0700
X+++ build/config/FreeBSD 2014-04-07 16:38:39.000000000 -0700
X@@ -15,8 +15,8 @@
X #
X # Define Tools
X #
X-CC = gcc
X-CXX = g++
X+CC = cc
X+CXX = c++
X LINK = $(CXX)
X LIB = ar -cr
X RANLIB = ranlib
X@@ -38,13 +38,13 @@
X #
X # Compiler and Linker Flags
X #
X-CFLAGS =
X+CFLAGS = -I/usr/local/include
X CFLAGS32 =
X CFLAGS64 =
X-CXXFLAGS =
X+CXXFLAGS = -I/usr/local/include
X CXXFLAGS32 =
X CXXFLAGS64 =
X-LINKFLAGS =
X+LINKFLAGS = -L/usr/local/lib
X LINKFLAGS32 =
X LINKFLAGS64 =
X STATICOPT_CC =
X@@ -68,4 +68,4 @@
X #
X # System Specific Libraries
X #
X-SYSLIBS = -lpthread
X+SYSLIBS = -lpthread -L/usr/local/lib
94891411bc8c3c0da5465807d4b33c2a
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404082359.s38NxaB5075840>