Attachment #217699 for bug #249043

Lines 1-7 Link Here

(-)pichi/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/net/pichi/Makefile 540491 2020-06-26 11:15:18Z fernape $	1	# $FreeBSD: head/net/pichi/Makefile 540491 2020-06-26 11:15:18Z fernape $
2		2
3	PORTNAME= pichi	3	PORTNAME= pichi
4	DISTVERSION= 1.3.0	4	DISTVERSION= 1.3.1
5	CATEGORIES= net	5	CATEGORIES= net
6		6
7	MAINTAINER= pichi@elude.in	7	MAINTAINER= pichi@elude.in

Lines 1-3 Link Here

(-)pichi/distinfo (-3 / +2 lines)
1	TIMESTAMP = 1554899633	1	SHA256 (pichi-router-pichi-1.3.1_GH0.tar.gz) = be1dc4d501387ef3524697ac804bec3ceb235a0c323ef8901532f04b0fab5cac
2	SHA256 (pichi-router-pichi-1.3.0_GH0.tar.gz) = f5686a1e7c98d9c9eca88d88af53b85648ceeff9aa33bf2b1d95a09462d74d1c	2	SIZE (pichi-router-pichi-1.3.1_GH0.tar.gz) = 2068432
3	SIZE (pichi-router-pichi-1.3.0_GH0.tar.gz) = 2066723




--- include/pichi/config.hpp.in.orig	1970-01-01 00:00:00 UTC
+++ include/pichi/config.hpp.in
@@ -42,6 +42,15 @@
 #pragma warning(pop)
 #endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
 
+#ifdef __clang__
+#if !__has_feature(c_atomic)
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc11-extensions"
+#include <boost/smart_ptr/detail/sp_counted_base_clang.hpp>
+#pragma clang diagnostic pop
+#endif // !__has_feature(c_atomic)
+#endif // __clang__
+
 #cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
 
 #ifdef CMAKE_INSTALL_PREFIX




--- server/main.cpp.orig	1970-01-01 00:00:00 UTC
+++ server/main.cpp
@@ -1,10 +1,11 @@
+#include <pichi/config.hpp>
+// Include config.hpp first
 #include <boost/filesystem/operations.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/program_options.hpp>
 #include <fstream>
 #include <iostream>
 #include <memory>
-#include <pichi/config.hpp>
 #include <stdio.h>
 #ifdef HAS_UNISTD_H
 #include <errno.h>




--- test/endpoint.cpp.orig	1970-01-01 00:00:00 UTC
+++ test/endpoint.cpp
@@ -132,7 +132,8 @@ BOOST_AUTO_TEST_CASE(serialize_Domain)
 #ifndef HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
       <uint8_t, 13>
 #endif // HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
-      {0x03, 0x09, 'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't', 0x01, 0xbb};
+      {0x03_u8, 0x09_u8, 0x6c_u8, 0x6f_u8, 0x63_u8, 0x61_u8, 0x6c_u8,
+       0x68_u8, 0x6f_u8, 0x73_u8, 0x74_u8, 0x01_u8, 0xbb_u8};
 
   auto fact = array<uint8_t, 13>{};
   auto len = serializeEndpoint(makeEndpoint(host, port), fact);

Lines 1-9 Link Here

(-)pichi/files/patch-test_method.cpp (-9 lines)
1	--- test/method.cpp.orig 1970-01-01 00:00:00 UTC
2	+++ test/method.cpp
3	@@ -1,5 +1,6 @@
4	#define BOOST_TEST_MODULE pichi method test
5
6	+#include "utils.hpp"
7	#include <boost/test/unit_test.hpp>
8	#include <pichi/common.hpp>
9	#include <pichi/crypto/method.hpp>

Lines 1-11 Link Here

(-)pichi/files/patch-test_utils.hpp (-11 lines)
1	--- test/utils.hpp.orig 1970-01-01 00:00:00 UTC
2	+++ test/utils.hpp
3	@@ -1,6 +1,8 @@
4	#ifndef PICHI_TEST_UTILS_HPP
5	#define PICHI_TEST_UTILS_HPP
6
7	+#include <pichi/config.hpp>
8	+// Include config.hpp first
9	#include <boost/asio/error.hpp>
10	#include <boost/beast/http/error.hpp>
11	#include <pichi/api/vos.hpp>

Lines 37-43 Link Here

(-)pichi/pkg-plist (-1 / +1 lines)
37	%%DEVEL%%include/pichi/net/spawn.hpp	37	%%DEVEL%%include/pichi/net/spawn.hpp
38	%%DEVEL%%include/pichi/net/ssaead.hpp	38	%%DEVEL%%include/pichi/net/ssaead.hpp
39	%%DEVEL%%include/pichi/net/ssstream.hpp	39	%%DEVEL%%include/pichi/net/ssstream.hpp
		40	%%DEVEL%%include/pichi/net/stream.hpp
40	%%DEVEL%%include/pichi/net/tunnel.hpp	41	%%DEVEL%%include/pichi/net/tunnel.hpp
41	%%DEVEL%%include/pichi/test/socket.hpp
42	%%DEVEL%%include/pichi/uri.hpp	42	%%DEVEL%%include/pichi/uri.hpp
43	%%DEVEL%%include/pichi.h	43	%%DEVEL%%include/pichi.h

Return to bug 249043

Lines 1-18 Link Here

(-)pichi/files/patch-include_pichi_config.hpp.in (-18 lines)
1	--- include/pichi/config.hpp.in.orig 1970-01-01 00:00:00 UTC
2	+++ include/pichi/config.hpp.in
3	@@ -42,6 +42,15 @@
4	#pragma warning(pop)
5	#endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER
6
7	+#ifdef __clang__
8	+#if !__has_feature(c_atomic)
9	+#pragma clang diagnostic push
10	+#pragma clang diagnostic ignored "-Wc11-extensions"
11	+#include <boost/smart_ptr/detail/sp_counted_base_clang.hpp>
12	+#pragma clang diagnostic pop
13	+#endif // !__has_feature(c_atomic)
14	+#endif // __clang__
15	+
16	#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
17
18	#ifdef CMAKE_INSTALL_PREFIX

Lines 1-15 Link Here

(-)pichi/files/patch-server_main.cpp (-15 lines)
1	--- server/main.cpp.orig 1970-01-01 00:00:00 UTC
2	+++ server/main.cpp
3	@@ -1,10 +1,11 @@
4	+#include <pichi/config.hpp>
5	+// Include config.hpp first
6	#include <boost/filesystem/operations.hpp>
7	#include <boost/filesystem/path.hpp>
8	#include <boost/program_options.hpp>
9	#include <fstream>
10	#include <iostream>
11	#include <memory>
12	-#include <pichi/config.hpp>
13	#include <stdio.h>
14	#ifdef HAS_UNISTD_H
15	#include <errno.h>

Lines 1-12 Link Here

(-)pichi/files/patch-test_endpoint.cpp (-12 lines)
1	--- test/endpoint.cpp.orig 1970-01-01 00:00:00 UTC
2	+++ test/endpoint.cpp
3	@@ -132,7 +132,8 @@ BOOST_AUTO_TEST_CASE(serialize_Domain)
4	#ifndef HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
5	<uint8_t, 13>
6	#endif // HAS_CLASS_TEMPLATE_ARGUMENT_DEDUCTION
7	- {0x03, 0x09, 'l', 'o', 'c', 'a', 'l', 'h', 'o', 's', 't', 0x01, 0xbb};
8	+ {0x03_u8, 0x09_u8, 0x6c_u8, 0x6f_u8, 0x63_u8, 0x61_u8, 0x6c_u8,
9	+ 0x68_u8, 0x6f_u8, 0x73_u8, 0x74_u8, 0x01_u8, 0xbb_u8};
10
11	auto fact = array<uint8_t, 13>{};
12	auto len = serializeEndpoint(makeEndpoint(host, port), fact);