Date: Sat, 29 Dec 2012 14:24:23 GMT From: Andrea Venturoli <ml@netfence.it> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174808: [maintainer update] net/Sockets 2.9.7 Message-ID: <201212291424.qBTEONHg080514@red.freebsd.org> Resent-Message-ID: <201212291430.qBTEU0nM004755@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174808 >Category: ports >Synopsis: [maintainer update] net/Sockets 2.9.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Dec 29 14:30:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Andrea Venturoli >Release: >Organization: NetFence >Environment: >Description: Upgrade for Sockets to 2.9.7. Notice Portscouts finds 2.9.8, but that's not officially released (yet). >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 309620) +++ Makefile (working copy) @@ -6,7 +6,7 @@ # PORTNAME= Sockets -PORTVERSION= 2.3.9.2 +PORTVERSION= 2.3.9.7 CATEGORIES= net MASTER_SITES= http://www.alhem.net/Sockets/ \ http://www.netfence.it/Sockets/ Index: distinfo =================================================================== --- distinfo (revision 309620) +++ distinfo (working copy) @@ -1,2 +1,2 @@ -SHA256 (Sockets-2.3.9.2.tar.gz) = 810ab9b6a7316bfa7994c0d5e9bd8c556e9edcb8da35a1778ea11bd16471fba8 -SIZE (Sockets-2.3.9.2.tar.gz) = 191131 +SHA256 (Sockets-2.3.9.7.tar.gz) = dc6411eb53933c0aba639b3ace98b34b674a97aad6b8613f02e5e0aa2af92b24 +SIZE (Sockets-2.3.9.7.tar.gz) = 203023 Index: files/patch-HttpRequest.cpp =================================================================== --- files/patch-HttpRequest.cpp (revision 0) +++ files/patch-HttpRequest.cpp (working copy) @@ -0,0 +1,11 @@ +--- HttpRequest.cpp.orig 2011-07-17 10:06:09.000000000 +0200 ++++ HttpRequest.cpp 2012-12-29 14:17:14.000000000 +0100 +@@ -44,6 +44,8 @@ + namespace SOCKETS_NAMESPACE { + #endif + ++extern char**environ; ++ + #ifdef _DEBUG + #define DEB(x) x; fflush(stderr); + #else Index: files/patch-Makefile =================================================================== --- files/patch-Makefile (revision 309620) +++ files/patch-Makefile (working copy) @@ -21,8 +21,8 @@ install_shared: install shared @mkdir -p $(DESTDIR)/$(PREFIX)/lib/pkgconfig -- cp $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib -- cp -a pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig +- install -m 0644 $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib +- install -m 0644 pkgconfig/*pc $(DESTDIR)/$(PREFIX)/lib/pkgconfig + @${BSD_INSTALL_DATA} $(SHAREDLIBNAME) $(DESTDIR)/$(PREFIX)/lib + @${BSD_INSTALL_DATA} pkgconfig/*pc $(DESTDIR)/$(PREFIX)/libdata/pkgconfig rm -f $(DESTDIR)/$(PREFIX)/lib/lib$(NAME).so Index: files/patch-Sockets-config.cpp =================================================================== --- files/patch-Sockets-config.cpp (revision 0) +++ files/patch-Sockets-config.cpp (working copy) @@ -0,0 +1,58 @@ +--- 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) + { Index: pkg-plist =================================================================== --- pkg-plist (revision 309620) +++ pkg-plist (working copy) @@ -28,11 +28,13 @@ 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 @@ -48,6 +50,7 @@ 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 @@ -68,6 +71,6 @@ lib/libSockets.a lib/libSockets.so lib/libSockets.so.2 -lib/libSockets.so.2.3.9.2 +lib/libSockets.so.2.3.9.7 @dirrm include/Sockets @dirrmtry lib/pkgconfig >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212291424.qBTEONHg080514>