commit dc672b1af772a36d56cf3accc39045085a3541a3
from: Thomas Adam <thomas@xteddy.org>
date: Thu Nov 16 00:58:43 2023 UTC

portable: remove sockaddr-linux code

Now that socket handling is being done in a portable way upstream,
there's no need to carry -portable specific code.

commit - b9c7eb9112c4b59cc88aff7c7eacaff9aaadba9e
commit + dc672b1af772a36d56cf3accc39045085a3541a3
blob - d276bbeed8924e730923148d8c6646565a149a8f (mode 644)
blob + /dev/null
--- compat/sockaddr-linux.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2022 Thomas Adam <thomas@xteddy.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <string.h>
-
-#include "got_sockaddr.h"
-
-/* These calls are found in lib/socketaddr.c, but are overriden here for
- * platform-specific reasons.
- */
-
-void
-got_sockaddr_inet_init(struct sockaddr_in *in, struct in_addr *ina)
-{
-	in->sin_family = AF_INET;
-	in->sin_addr.s_addr = ina->s_addr;
-}
-
-void
-got_sockaddr_inet6_init(struct sockaddr_in6 *in6, struct in6_addr *in6a,
-    uint32_t sin6_scope_id)
-{
-	in6->sin6_family = AF_INET6;
-	memcpy(&in6->sin6_addr, in6a, sizeof(in6->sin6_addr));
-	in6->sin6_scope_id = sin6_scope_id;
-}
blob - 9f86edc781239405e37fc72f6ccd09b4430730c6
blob + 20d8abe194e1f52fda57ad7ab149330c3df22c83
--- gotwebd/Makefile.am
+++ gotwebd/Makefile.am
@@ -71,11 +71,6 @@ gotwebd_SOURCES = config.c \
 		  parse.y \
 		  proc.c \
 		  sockets.c
-if HOST_LINUX
-nodist_gotwebd_SOURCES = $(top_srcdir)/compat/sockaddr-@PLATFORM@.c
-else
-nodist_gotwebd_SOURCES = $(top_srcdir)/lib/sockaddr.c
-endif
 
 gotwebd_DEPENDENCIES = $(top_builddir)/compat/libopenbsd-compat.a
 EXTRA_DIST = $(top_srcdir)/gotwebd/*.h \