Received: by mail.netbsd.org (Postfix, from userid 605) id 369D884F04; Mon, 25 Apr 2022 16:17:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6CC9B84EEF for ; Mon, 25 Apr 2022 16:17:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id jlhB47pJMH9C for ; Mon, 25 Apr 2022 16:17:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7ED4884CFF for ; Mon, 25 Apr 2022 16:17:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 738E4FB1A; Mon, 25 Apr 2022 16:17:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_165090346879910" MIME-Version: 1.0 Date: Mon, 25 Apr 2022 16:17:48 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/net/socket++ To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20220425161748.738E4FB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_165090346879910 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Apr 25 16:17:48 UTC 2022 Modified Files: pkgsrc/net/socket++: distinfo pkgsrc/net/socket++/patches: patch-aa patch-af Added Files: pkgsrc/net/socket++/patches: patch-doc_socket++.texi Log Message: socket++: fix assorted bitrot To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/socket++/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/socket++/patches/patch-aa cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/socket++/patches/patch-af cvs rdiff -u -r0 -r1.1 pkgsrc/net/socket++/patches/patch-doc_socket++.texi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_165090346879910 Content-Disposition: inline Content-Length: 5056 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/socket++/distinfo diff -u pkgsrc/net/socket++/distinfo:1.8 pkgsrc/net/socket++/distinfo:1.9 --- pkgsrc/net/socket++/distinfo:1.8 Tue Oct 26 11:06:57 2021 +++ pkgsrc/net/socket++/distinfo Mon Apr 25 16:17:48 2022 @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.8 2021/10/26 11:06:57 nia Exp $ +$NetBSD: distinfo,v 1.9 2022/04/25 16:17:48 tnn Exp $ BLAKE2s (socket++-1.12.10.tar.gz) = d09b25892fbd45493a08daf416cee43f6ea349560ead28e9d3c213ce46f803bf SHA512 (socket++-1.12.10.tar.gz) = 297dfc7283e8fcfb717679fa2e8b02c51115e6bda1586badead35bc4a37d0defeef3b198bc14e64b59a74cbd3fe61b9496516205e7d5bfa6f5d65890d629db6c Size (socket++-1.12.10.tar.gz) = 62741 bytes -SHA1 (patch-aa) = 7d59c11daba6cd05c7e9bbff032dfb85532e06e4 +SHA1 (patch-aa) = 6fc10ecc5e4a78d452bd4264fea0b88628de360f SHA1 (patch-ab) = 2fa03c7ee83dca495db14887e3c179388f71c71a SHA1 (patch-ac) = a7e48aa5795fd4d78bc2d133e72c51417172b6f9 SHA1 (patch-ad) = 7f0ffbf79592b340a45f2c7868b7a6904a63c9f3 SHA1 (patch-ae) = df00fd55c4af18ec1aaed4a1a16432146e026aff -SHA1 (patch-af) = 5e298f495802fb7fb64785b083b1c8b51015749d +SHA1 (patch-af) = 11a301e5b4ce55e048dbafbf41465a3513d96bb1 SHA1 (patch-ag) = 403b04500cb267d70f4bb6254a1b479f181eda32 SHA1 (patch-configure.in) = f1e1f1466553f619254f477bf9343bdeb2aaeec1 +SHA1 (patch-doc_socket++.texi) = 53b6d2d01b99252ba19eddcd67516034ff8f4850 Index: pkgsrc/net/socket++/patches/patch-aa diff -u pkgsrc/net/socket++/patches/patch-aa:1.3 pkgsrc/net/socket++/patches/patch-aa:1.4 --- pkgsrc/net/socket++/patches/patch-aa:1.3 Tue Apr 7 18:05:08 2009 +++ pkgsrc/net/socket++/patches/patch-aa Mon Apr 25 16:17:48 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2009/04/07 18:05:08 hasso Exp $ +$NetBSD: patch-aa,v 1.4 2022/04/25 16:17:48 tnn Exp $ --- socket++/local.h.orig 2003-03-14 18:02:40.000000000 +0000 +++ socket++/local.h @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.3 2009/04/07 18:05 extern "C" char* inet_ntoa (in_addr ina); #if !defined (__linux__) -+#if !defined (__NetBSD__) && !defined (__DragonFly__) ++#if !defined (__NetBSD__) && !defined (__DragonFly__) && !defined(__sun) extern "C" int gethostname (char* hostname, int len); -#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) +#endif Index: pkgsrc/net/socket++/patches/patch-af diff -u pkgsrc/net/socket++/patches/patch-af:1.1 pkgsrc/net/socket++/patches/patch-af:1.2 --- pkgsrc/net/socket++/patches/patch-af:1.1 Fri May 12 07:44:26 2006 +++ pkgsrc/net/socket++/patches/patch-af Mon Apr 25 16:17:48 2022 @@ -1,13 +1,33 @@ -$NetBSD: patch-af,v 1.1 2006/05/12 07:44:26 joerg Exp $ +$NetBSD: patch-af,v 1.2 2022/04/25 16:17:48 tnn Exp $ ---- socket++/sockstream.cpp.orig 2006-05-12 07:23:32.000000000 +0000 +--- socket++/sockstream.cpp.orig 2003-03-14 18:26:07.000000000 +0000 +++ socket++/sockstream.cpp -@@ -245,7 +245,7 @@ bool sockerr::benign () const +@@ -71,6 +71,10 @@ + #if defined(__APPLE__) + #typedef int socklen_t; + #endif ++#if defined(__sun) ++#include ++#include ++#endif + + #ifndef WIN32 + EXTERN_C_BEGIN +@@ -200,7 +204,7 @@ bool sockerr::op () const + case EHOSTDOWN: + case EHOSTUNREACH: + case ENOTEMPTY: +-# if !defined(__linux__) // LN ++# if defined(EPROCLIM) + case EPROCLIM: + # endif + case EUSERS: +@@ -245,7 +249,7 @@ bool sockerr::benign () const case EWOULDBLOCK: // On FreeBSD (and probably on Linux too) // EAGAIN has the same value as EWOULDBLOCK -#if !defined(__linux__) && !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) // LN -+#if !defined(__linux__) && !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)) // LN ++#if !defined(__linux__) && !defined(__sun) && !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)) // LN case EAGAIN: #endif return true; Added files: Index: pkgsrc/net/socket++/patches/patch-doc_socket++.texi diff -u /dev/null pkgsrc/net/socket++/patches/patch-doc_socket++.texi:1.1 --- /dev/null Mon Apr 25 16:17:48 2022 +++ pkgsrc/net/socket++/patches/patch-doc_socket++.texi Mon Apr 25 16:17:48 2022 @@ -0,0 +1,23 @@ +$NetBSD: patch-doc_socket++.texi,v 1.1 2022/04/25 16:17:48 tnn Exp $ + +socket++.texi:2337: raising the section level of @subsection which is too low +socket++.texi:2452: raising the section level of @subsection which is too low + +--- doc/socket++.texi.orig 2002-11-25 12:31:56.000000000 +0000 ++++ doc/socket++.texi +@@ -2334,7 +2334,6 @@ an @code{echo} object is a smart pointer + + @end table + +-@subsection tsecho.C + @example + // echo server. Serves clients at port 4000. + #include +@@ -2449,7 +2448,6 @@ recipient previously established through + + @end table + +-@subsection tcsmtp.C + @example + // smtp client. + // The president sends a message to gs4t@@virginia.edu. --_----------=_165090346879910--