Attachment #130803 for bug #174808

View | Details | Raw Unified | Return to bug 174808
Collapse All | Expand All

Lines 6-12 Link Here

(-)Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= Sockets	8	PORTNAME= Sockets
9	PORTVERSION= 2.3.9.2	9	PORTVERSION= 2.3.9.7
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= http://www.alhem.net/Sockets/ \	11	MASTER_SITES= http://www.alhem.net/Sockets/ \
12	http://www.netfence.it/Sockets/	12	http://www.netfence.it/Sockets/

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (Sockets-2.3.9.2.tar.gz) = 810ab9b6a7316bfa7994c0d5e9bd8c556e9edcb8da35a1778ea11bd16471fba8	1	SHA256 (Sockets-2.3.9.7.tar.gz) = dc6411eb53933c0aba639b3ace98b34b674a97aad6b8613f02e5e0aa2af92b24
2	SIZE (Sockets-2.3.9.2.tar.gz) = 191131	2	SIZE (Sockets-2.3.9.7.tar.gz) = 203023

Line 0 Link Here

(-)files/patch-HttpRequest.cpp (+11 lines)
	1	--- HttpRequest.cpp.orig 2011-07-17 10:06:09.000000000 +0200
	2	+++ HttpRequest.cpp 2012-12-29 14:17:14.000000000 +0100
	3	@@ -44,6 +44,8 @@
	4	namespace SOCKETS_NAMESPACE {
	5	#endif
	6
	7	+extern char**environ;
	8	+
	9	#ifdef _DEBUG
	10	#define DEB(x) x; fflush(stderr);
	11	#else

Lines 21-28 Link Here

(-)files/patch-Makefile (-2 / +2 lines)
21		21
22	install_shared: install shared	22	install_shared: install shared
23	@mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig	23	@mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig
24	- cp $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib	24	- install -m 0644 $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
25	- cp -a pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig	25	- install -m 0644 pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig
26	+ @${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib	26	+ @${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib
27	+ @${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig	27	+ @${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig
28	rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so	28	rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so




--- Sockets-config.cpp.orig	2012-12-29 14:24:51.000000000 +0100
+++ Sockets-config.cpp	2012-12-29 14:25:16.000000000 +0100
@@ -29,7 +29,7 @@
 
 // ------------------------------------------------------------------
 static	bool any_set = false;
-static	std::map<std::string, std::string> mmap;
+static	std::map<std::string, std::string> sockets_mmap;
 
 // ------------------------------------------------------------------
 void show_info()
@@ -110,24 +110,24 @@
 */
 void setup_configuration()
 {
-	mmap["openssl"] =     "HAVE_OPENSSL";
-	mmap["ipv6"] =        "ENABLE_IPV6";
-	mmap["sctp"] =        "USE_SCTP";
-	mmap["no_addrinfo"] = "NO_GETADDRINFO";
-	mmap["pool"] =        "ENABLE_POOL";
-	mmap["socks4"] =      "ENABLE_SOCKS4";
-	mmap["resolver"] =    "ENABLE_RESOLVER";
-	mmap["reconnect"] =   "ENABLE_RECONNECT";
-	mmap["detach"] =      "ENABLE_DETACH";
-	mmap["exceptions"] =  "ENABLE_EXCEPTIONS";
-	mmap["xml2"] =        "ENABLE_XML";
+	sockets_mmap["openssl"] =     "HAVE_OPENSSL";
+	sockets_mmap["ipv6"] =        "ENABLE_IPV6";
+	sockets_mmap["sctp"] =        "USE_SCTP";
+	sockets_mmap["no_addrinfo"] = "NO_GETADDRINFO";
+	sockets_mmap["pool"] =        "ENABLE_POOL";
+	sockets_mmap["socks4"] =      "ENABLE_SOCKS4";
+	sockets_mmap["resolver"] =    "ENABLE_RESOLVER";
+	sockets_mmap["reconnect"] =   "ENABLE_RECONNECT";
+	sockets_mmap["detach"] =      "ENABLE_DETACH";
+	sockets_mmap["exceptions"] =  "ENABLE_EXCEPTIONS";
+	sockets_mmap["xml2"] =        "ENABLE_XML";
 }
 
 // ------------------------------------------------------------------
 void set(const char *param, bool enable)
 {
-	std::map<std::string, std::string>::iterator it = mmap.find(param);
-	if (it == mmap.end())
+	std::map<std::string, std::string>::iterator it = sockets_mmap.find(param);
+	if (it == sockets_mmap.end())
 	{
 		fprintf(stderr, "Option '%s' not found, aborting\n", param);
 		exit(-1);
@@ -195,7 +195,7 @@
 		{
 			int i = (*slask == '#') ? 8 : 10;
 			std::string def(&slask[i]);
-			for (std::map<std::string, std::string>::iterator it = mmap.begin(); it != mmap.end(); it++)
+			for (std::map<std::string, std::string>::iterator it = sockets_mmap.begin(); it != sockets_mmap.end(); it++)
 			{
 				if (def == it -> second)
 				{




include/Sockets/IFile.h
include/Sockets/IFileUpload.h
include/Sockets/IHttpServer.h
include/Sockets/IModel.h
include/Sockets/IMutex.h
include/Sockets/ISocketHandler.h
include/Sockets/IStream.h
include/Sockets/Ipv4Address.h
include/Sockets/Ipv6Address.h
include/Sockets/Json.h
include/Sockets/ListenSocket.h
include/Sockets/Lock.h
include/Sockets/MemFile.h

include/Sockets/SocketAddress.h
include/Sockets/SocketHandler.h
include/Sockets/SocketHandlerEp.h
include/Sockets/SocketHandlerThread.h
include/Sockets/SocketStream.h
include/Sockets/StdLog.h
include/Sockets/StdoutLog.h

lib/libSockets.a
lib/libSockets.so
lib/libSockets.so.2
lib/libSockets.so.2.3.9.7
@dirrm include/Sockets
@dirrmtry lib/pkgconfig

Return to bug 174808

Line 0 Link Here

(-)files/patch-Sockets-config.cpp (+58 lines)
	1	--- Sockets-config.cpp.orig 2012-12-29 14:24:51.000000000 +0100
	2	+++ Sockets-config.cpp 2012-12-29 14:25:16.000000000 +0100
	3	@@ -29,7 +29,7 @@
	4
	5	// ------------------------------------------------------------------
	6	static bool any_set = false;
	7	-static std::map<std::string, std::string> mmap;
	8	+static std::map<std::string, std::string> sockets_mmap;
	9
	10	// ------------------------------------------------------------------
	11	void show_info()
	12	@@ -110,24 +110,24 @@
	13	*/
	14	void setup_configuration()
	15	{
	16	- mmap["openssl"] = "HAVE_OPENSSL";
	17	- mmap["ipv6"] = "ENABLE_IPV6";
	18	- mmap["sctp"] = "USE_SCTP";
	19	- mmap["no_addrinfo"] = "NO_GETADDRINFO";
	20	- mmap["pool"] = "ENABLE_POOL";
	21	- mmap["socks4"] = "ENABLE_SOCKS4";
	22	- mmap["resolver"] = "ENABLE_RESOLVER";
	23	- mmap["reconnect"] = "ENABLE_RECONNECT";
	24	- mmap["detach"] = "ENABLE_DETACH";
	25	- mmap["exceptions"] = "ENABLE_EXCEPTIONS";
	26	- mmap["xml2"] = "ENABLE_XML";
	27	+ sockets_mmap["openssl"] = "HAVE_OPENSSL";
	28	+ sockets_mmap["ipv6"] = "ENABLE_IPV6";
	29	+ sockets_mmap["sctp"] = "USE_SCTP";
	30	+ sockets_mmap["no_addrinfo"] = "NO_GETADDRINFO";
	31	+ sockets_mmap["pool"] = "ENABLE_POOL";
	32	+ sockets_mmap["socks4"] = "ENABLE_SOCKS4";
	33	+ sockets_mmap["resolver"] = "ENABLE_RESOLVER";
	34	+ sockets_mmap["reconnect"] = "ENABLE_RECONNECT";
	35	+ sockets_mmap["detach"] = "ENABLE_DETACH";
	36	+ sockets_mmap["exceptions"] = "ENABLE_EXCEPTIONS";
	37	+ sockets_mmap["xml2"] = "ENABLE_XML";
	38	}
	39
	40	// ------------------------------------------------------------------
	41	void set(const char *param, bool enable)
	42	{
	43	- std::map<std::string, std::string>::iterator it = mmap.find(param);
	44	- if (it == mmap.end())
	45	+ std::map<std::string, std::string>::iterator it = sockets_mmap.find(param);
	46	+ if (it == sockets_mmap.end())
	47	{
	48	fprintf(stderr, "Option '%s' not found, aborting\n", param);
	49	exit(-1);
	50	@@ -195,7 +195,7 @@
	51	{
	52	int i = (*slask == '#') ? 8 : 10;
	53	std::string def(&slask[i]);
	54	- for (std::map<std::string, std::string>::iterator it = mmap.begin(); it != mmap.end(); it++)
	55	+ for (std::map<std::string, std::string>::iterator it = sockets_mmap.begin(); it != sockets_mmap.end(); it++)
	56	{
	57	if (def == it -> second)
	58	{

Lines 28-38 Link Here

(-)pkg-plist (-1 / +4 lines)
28	include/Sockets/IFile.h	28	include/Sockets/IFile.h
29	include/Sockets/IFileUpload.h	29	include/Sockets/IFileUpload.h
30	include/Sockets/IHttpServer.h	30	include/Sockets/IHttpServer.h
		31	include/Sockets/IModel.h
31	include/Sockets/IMutex.h	32	include/Sockets/IMutex.h
32	include/Sockets/ISocketHandler.h	33	include/Sockets/ISocketHandler.h
33	include/Sockets/IStream.h	34	include/Sockets/IStream.h
34	include/Sockets/Ipv4Address.h	35	include/Sockets/Ipv4Address.h
35	include/Sockets/Ipv6Address.h	36	include/Sockets/Ipv6Address.h
		37	include/Sockets/Json.h
36	include/Sockets/ListenSocket.h	38	include/Sockets/ListenSocket.h
37	include/Sockets/Lock.h	39	include/Sockets/Lock.h
38	include/Sockets/MemFile.h	40	include/Sockets/MemFile.h
Lines 48-53 Link Here
48	include/Sockets/SocketAddress.h	50	include/Sockets/SocketAddress.h
49	include/Sockets/SocketHandler.h	51	include/Sockets/SocketHandler.h
50	include/Sockets/SocketHandlerEp.h	52	include/Sockets/SocketHandlerEp.h
		53	include/Sockets/SocketHandlerThread.h
51	include/Sockets/SocketStream.h	54	include/Sockets/SocketStream.h
52	include/Sockets/StdLog.h	55	include/Sockets/StdLog.h
53	include/Sockets/StdoutLog.h	56	include/Sockets/StdoutLog.h
Lines 68-73 Link Here
68	lib/libSockets.a	71	lib/libSockets.a
69	lib/libSockets.so	72	lib/libSockets.so
70	lib/libSockets.so.2	73	lib/libSockets.so.2
71	lib/libSockets.so.2.3.9.2	74	lib/libSockets.so.2.3.9.7
72	@dirrm include/Sockets	75	@dirrm include/Sockets
73	@dirrmtry lib/pkgconfig	76	@dirrmtry lib/pkgconfig