diff --git a/src/kits/network/Jamfile b/src/kits/network/Jamfile index 046a9c7f27..f05d77a72d 100644 --- a/src/kits/network/Jamfile +++ b/src/kits/network/Jamfile @@ -1,37 +1,3 @@ SubDir HAIKU_TOP src kits network ; -UsePrivateHeaders libroot net shared ; -UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; - -local services = [ FGristFiles services ] ; -SEARCH on $(services) = [ FDirName $(SUBDIR) netresolv defaults ] ; - -SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ; - -local architectureObject ; -for architectureObject in [ MultiArchSubDirSetup ] { - on $(architectureObject) { - local architecture = $(TARGET_PACKAGING_ARCH) ; - - UsePrivateSystemHeaders ; - - local libnetwork = [ MultiArchDefaultGristFiles libnetwork.so ] ; - SharedLibrary $(libnetwork) : - init.cpp - interfaces.cpp - gethostbyname.c - getifaddrs.cpp - socket.cpp - r5_compatibility.cpp - : - netresolv.o - [ MultiArchDefaultGristFiles libutil.a libbsd.so ] - [ TargetLibsupc++ ] - ; - - AddFileDataAttribute $(libnetwork) : services : string : $(services) ; - } -} - -SubInclude HAIKU_TOP src kits network netresolv ; SubInclude HAIKU_TOP src kits network libnetapi ; diff --git a/src/system/Jamfile b/src/system/Jamfile index ac215689e0..fc6b181ac3 100644 --- a/src/system/Jamfile +++ b/src/system/Jamfile @@ -4,4 +4,5 @@ SubInclude HAIKU_TOP src system boot ; SubInclude HAIKU_TOP src system kernel ; SubInclude HAIKU_TOP src system glue ; SubInclude HAIKU_TOP src system libroot ; +SubInclude HAIKU_TOP src system libnetwork ; SubInclude HAIKU_TOP src system runtime_loader ; diff --git a/src/system/libnetwork/Jamfile b/src/system/libnetwork/Jamfile new file mode 100644 index 0000000000..74ec200afd --- /dev/null +++ b/src/system/libnetwork/Jamfile @@ -0,0 +1,36 @@ +SubDir HAIKU_TOP src system libnetwork ; + +UsePrivateHeaders libroot net shared ; +UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ; + +local services = [ FGristFiles services ] ; +SEARCH on $(services) = [ FDirName $(SUBDIR) netresolv defaults ] ; + +SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ; + +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + local architecture = $(TARGET_PACKAGING_ARCH) ; + + UsePrivateSystemHeaders ; + + local libnetwork = [ MultiArchDefaultGristFiles libnetwork.so ] ; + SharedLibrary $(libnetwork) : + init.cpp + interfaces.cpp + gethostbyname.c + getifaddrs.cpp + socket.cpp + r5_compatibility.cpp + : + netresolv.o + [ MultiArchDefaultGristFiles libutil.a libbsd.so ] + [ TargetLibsupc++ ] + ; + + AddFileDataAttribute $(libnetwork) : services : string : $(services) ; + } +} + +SubInclude HAIKU_TOP src system libnetwork netresolv ; diff --git a/src/kits/network/gethostbyname.c b/src/system/libnetwork/gethostbyname.c similarity index 100% rename from src/kits/network/gethostbyname.c rename to src/system/libnetwork/gethostbyname.c diff --git a/src/kits/network/getifaddrs.cpp b/src/system/libnetwork/getifaddrs.cpp similarity index 100% rename from src/kits/network/getifaddrs.cpp rename to src/system/libnetwork/getifaddrs.cpp diff --git a/src/kits/network/init.cpp b/src/system/libnetwork/init.cpp similarity index 100% rename from src/kits/network/init.cpp rename to src/system/libnetwork/init.cpp diff --git a/src/kits/network/interfaces.cpp b/src/system/libnetwork/interfaces.cpp similarity index 100% rename from src/kits/network/interfaces.cpp rename to src/system/libnetwork/interfaces.cpp diff --git a/src/kits/network/netresolv/COPYRIGHT b/src/system/libnetwork/netresolv/COPYRIGHT similarity index 100% rename from src/kits/network/netresolv/COPYRIGHT rename to src/system/libnetwork/netresolv/COPYRIGHT diff --git a/src/kits/network/netresolv/Jamfile b/src/system/libnetwork/netresolv/Jamfile similarity index 97% rename from src/kits/network/netresolv/Jamfile rename to src/system/libnetwork/netresolv/Jamfile index 96fcdad0ca..4c016437b2 100644 --- a/src/kits/network/netresolv/Jamfile +++ b/src/system/libnetwork/netresolv/Jamfile @@ -1,4 +1,4 @@ -SubDir HAIKU_TOP src kits network netresolv ; +SubDir HAIKU_TOP src system libnetwork netresolv ; local architectureObject ; for architectureObject in [ MultiArchSubDirSetup ] { diff --git a/src/kits/network/netresolv/config.h b/src/system/libnetwork/netresolv/config.h similarity index 100% rename from src/kits/network/netresolv/config.h rename to src/system/libnetwork/netresolv/config.h diff --git a/src/kits/network/netresolv/defaults/services b/src/system/libnetwork/netresolv/defaults/services similarity index 100% rename from src/kits/network/netresolv/defaults/services rename to src/system/libnetwork/netresolv/defaults/services diff --git a/src/kits/network/netresolv/dst/dst_api.c b/src/system/libnetwork/netresolv/dst/dst_api.c similarity index 100% rename from src/kits/network/netresolv/dst/dst_api.c rename to src/system/libnetwork/netresolv/dst/dst_api.c diff --git a/src/kits/network/netresolv/dst/dst_internal.h b/src/system/libnetwork/netresolv/dst/dst_internal.h similarity index 100% rename from src/kits/network/netresolv/dst/dst_internal.h rename to src/system/libnetwork/netresolv/dst/dst_internal.h diff --git a/src/kits/network/netresolv/dst/hmac_link.c b/src/system/libnetwork/netresolv/dst/hmac_link.c similarity index 100% rename from src/kits/network/netresolv/dst/hmac_link.c rename to src/system/libnetwork/netresolv/dst/hmac_link.c diff --git a/src/kits/network/netresolv/dst/md5.h b/src/system/libnetwork/netresolv/dst/md5.h similarity index 100% rename from src/kits/network/netresolv/dst/md5.h rename to src/system/libnetwork/netresolv/dst/md5.h diff --git a/src/kits/network/netresolv/dst/md5_dgst.c b/src/system/libnetwork/netresolv/dst/md5_dgst.c similarity index 100% rename from src/kits/network/netresolv/dst/md5_dgst.c rename to src/system/libnetwork/netresolv/dst/md5_dgst.c diff --git a/src/kits/network/netresolv/dst/md5_locl.h b/src/system/libnetwork/netresolv/dst/md5_locl.h similarity index 100% rename from src/kits/network/netresolv/dst/md5_locl.h rename to src/system/libnetwork/netresolv/dst/md5_locl.h diff --git a/src/kits/network/netresolv/dst/support.c b/src/system/libnetwork/netresolv/dst/support.c similarity index 100% rename from src/kits/network/netresolv/dst/support.c rename to src/system/libnetwork/netresolv/dst/support.c diff --git a/src/kits/network/netresolv/include/fd_setsize.h b/src/system/libnetwork/netresolv/include/fd_setsize.h similarity index 100% rename from src/kits/network/netresolv/include/fd_setsize.h rename to src/system/libnetwork/netresolv/include/fd_setsize.h diff --git a/src/kits/network/netresolv/include/hesiod.h b/src/system/libnetwork/netresolv/include/hesiod.h similarity index 100% rename from src/kits/network/netresolv/include/hesiod.h rename to src/system/libnetwork/netresolv/include/hesiod.h diff --git a/src/kits/network/netresolv/include/irp.h b/src/system/libnetwork/netresolv/include/irp.h similarity index 100% rename from src/kits/network/netresolv/include/irp.h rename to src/system/libnetwork/netresolv/include/irp.h diff --git a/src/kits/network/netresolv/include/irs.h b/src/system/libnetwork/netresolv/include/irs.h similarity index 100% rename from src/kits/network/netresolv/include/irs.h rename to src/system/libnetwork/netresolv/include/irs.h diff --git a/src/kits/network/netresolv/include/isc/assertions.h b/src/system/libnetwork/netresolv/include/isc/assertions.h similarity index 100% rename from src/kits/network/netresolv/include/isc/assertions.h rename to src/system/libnetwork/netresolv/include/isc/assertions.h diff --git a/src/kits/network/netresolv/include/isc/ctl.h b/src/system/libnetwork/netresolv/include/isc/ctl.h similarity index 100% rename from src/kits/network/netresolv/include/isc/ctl.h rename to src/system/libnetwork/netresolv/include/isc/ctl.h diff --git a/src/kits/network/netresolv/include/isc/dst.h b/src/system/libnetwork/netresolv/include/isc/dst.h similarity index 100% rename from src/kits/network/netresolv/include/isc/dst.h rename to src/system/libnetwork/netresolv/include/isc/dst.h diff --git a/src/kits/network/netresolv/include/isc/eventlib.h b/src/system/libnetwork/netresolv/include/isc/eventlib.h similarity index 100% rename from src/kits/network/netresolv/include/isc/eventlib.h rename to src/system/libnetwork/netresolv/include/isc/eventlib.h diff --git a/src/kits/network/netresolv/include/isc/heap.h b/src/system/libnetwork/netresolv/include/isc/heap.h similarity index 100% rename from src/kits/network/netresolv/include/isc/heap.h rename to src/system/libnetwork/netresolv/include/isc/heap.h diff --git a/src/kits/network/netresolv/include/isc/irpmarshall.h b/src/system/libnetwork/netresolv/include/isc/irpmarshall.h similarity index 100% rename from src/kits/network/netresolv/include/isc/irpmarshall.h rename to src/system/libnetwork/netresolv/include/isc/irpmarshall.h diff --git a/src/kits/network/netresolv/include/isc/list.h b/src/system/libnetwork/netresolv/include/isc/list.h similarity index 100% rename from src/kits/network/netresolv/include/isc/list.h rename to src/system/libnetwork/netresolv/include/isc/list.h diff --git a/src/kits/network/netresolv/include/isc/logging.h b/src/system/libnetwork/netresolv/include/isc/logging.h similarity index 100% rename from src/kits/network/netresolv/include/isc/logging.h rename to src/system/libnetwork/netresolv/include/isc/logging.h diff --git a/src/kits/network/netresolv/include/isc/memcluster.h b/src/system/libnetwork/netresolv/include/isc/memcluster.h similarity index 100% rename from src/kits/network/netresolv/include/isc/memcluster.h rename to src/system/libnetwork/netresolv/include/isc/memcluster.h diff --git a/src/kits/network/netresolv/include/isc/misc.h b/src/system/libnetwork/netresolv/include/isc/misc.h similarity index 100% rename from src/kits/network/netresolv/include/isc/misc.h rename to src/system/libnetwork/netresolv/include/isc/misc.h diff --git a/src/kits/network/netresolv/include/isc/platform.h b/src/system/libnetwork/netresolv/include/isc/platform.h similarity index 100% rename from src/kits/network/netresolv/include/isc/platform.h rename to src/system/libnetwork/netresolv/include/isc/platform.h diff --git a/src/kits/network/netresolv/include/isc/platform.h.in b/src/system/libnetwork/netresolv/include/isc/platform.h.in similarity index 100% rename from src/kits/network/netresolv/include/isc/platform.h.in rename to src/system/libnetwork/netresolv/include/isc/platform.h.in diff --git a/src/kits/network/netresolv/include/isc/tree.h b/src/system/libnetwork/netresolv/include/isc/tree.h similarity index 100% rename from src/kits/network/netresolv/include/isc/tree.h rename to src/system/libnetwork/netresolv/include/isc/tree.h diff --git a/src/kits/network/netresolv/include/netgroup.h b/src/system/libnetwork/netresolv/include/netgroup.h similarity index 100% rename from src/kits/network/netresolv/include/netgroup.h rename to src/system/libnetwork/netresolv/include/netgroup.h diff --git a/src/kits/network/netresolv/include/nsswitch.h b/src/system/libnetwork/netresolv/include/nsswitch.h similarity index 100% rename from src/kits/network/netresolv/include/nsswitch.h rename to src/system/libnetwork/netresolv/include/nsswitch.h diff --git a/src/kits/network/netresolv/include/res_update.h b/src/system/libnetwork/netresolv/include/res_update.h similarity index 100% rename from src/kits/network/netresolv/include/res_update.h rename to src/system/libnetwork/netresolv/include/res_update.h diff --git a/src/kits/network/netresolv/include/resolv_mt.h b/src/system/libnetwork/netresolv/include/resolv_mt.h similarity index 100% rename from src/kits/network/netresolv/include/resolv_mt.h rename to src/system/libnetwork/netresolv/include/resolv_mt.h diff --git a/src/kits/network/netresolv/include/sys/bitypes.h b/src/system/libnetwork/netresolv/include/sys/bitypes.h similarity index 100% rename from src/kits/network/netresolv/include/sys/bitypes.h rename to src/system/libnetwork/netresolv/include/sys/bitypes.h diff --git a/src/kits/network/netresolv/include/utmp.h b/src/system/libnetwork/netresolv/include/utmp.h similarity index 100% rename from src/kits/network/netresolv/include/utmp.h rename to src/system/libnetwork/netresolv/include/utmp.h diff --git a/src/kits/network/netresolv/inet/inet_addr.c b/src/system/libnetwork/netresolv/inet/inet_addr.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_addr.c rename to src/system/libnetwork/netresolv/inet/inet_addr.c diff --git a/src/kits/network/netresolv/inet/inet_cidr_ntop.c b/src/system/libnetwork/netresolv/inet/inet_cidr_ntop.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_cidr_ntop.c rename to src/system/libnetwork/netresolv/inet/inet_cidr_ntop.c diff --git a/src/kits/network/netresolv/inet/inet_cidr_pton.c b/src/system/libnetwork/netresolv/inet/inet_cidr_pton.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_cidr_pton.c rename to src/system/libnetwork/netresolv/inet/inet_cidr_pton.c diff --git a/src/kits/network/netresolv/inet/inet_lnaof.c b/src/system/libnetwork/netresolv/inet/inet_lnaof.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_lnaof.c rename to src/system/libnetwork/netresolv/inet/inet_lnaof.c diff --git a/src/kits/network/netresolv/inet/inet_makeaddr.c b/src/system/libnetwork/netresolv/inet/inet_makeaddr.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_makeaddr.c rename to src/system/libnetwork/netresolv/inet/inet_makeaddr.c diff --git a/src/kits/network/netresolv/inet/inet_net_ntop.c b/src/system/libnetwork/netresolv/inet/inet_net_ntop.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_net_ntop.c rename to src/system/libnetwork/netresolv/inet/inet_net_ntop.c diff --git a/src/kits/network/netresolv/inet/inet_net_pton.c b/src/system/libnetwork/netresolv/inet/inet_net_pton.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_net_pton.c rename to src/system/libnetwork/netresolv/inet/inet_net_pton.c diff --git a/src/kits/network/netresolv/inet/inet_neta.c b/src/system/libnetwork/netresolv/inet/inet_neta.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_neta.c rename to src/system/libnetwork/netresolv/inet/inet_neta.c diff --git a/src/kits/network/netresolv/inet/inet_netof.c b/src/system/libnetwork/netresolv/inet/inet_netof.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_netof.c rename to src/system/libnetwork/netresolv/inet/inet_netof.c diff --git a/src/kits/network/netresolv/inet/inet_network.c b/src/system/libnetwork/netresolv/inet/inet_network.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_network.c rename to src/system/libnetwork/netresolv/inet/inet_network.c diff --git a/src/kits/network/netresolv/inet/inet_ntoa.c b/src/system/libnetwork/netresolv/inet/inet_ntoa.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_ntoa.c rename to src/system/libnetwork/netresolv/inet/inet_ntoa.c diff --git a/src/kits/network/netresolv/inet/inet_ntop.c b/src/system/libnetwork/netresolv/inet/inet_ntop.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_ntop.c rename to src/system/libnetwork/netresolv/inet/inet_ntop.c diff --git a/src/kits/network/netresolv/inet/inet_pton.c b/src/system/libnetwork/netresolv/inet/inet_pton.c similarity index 100% rename from src/kits/network/netresolv/inet/inet_pton.c rename to src/system/libnetwork/netresolv/inet/inet_pton.c diff --git a/src/kits/network/netresolv/inet/nsap_addr.c b/src/system/libnetwork/netresolv/inet/nsap_addr.c similarity index 100% rename from src/kits/network/netresolv/inet/nsap_addr.c rename to src/system/libnetwork/netresolv/inet/nsap_addr.c diff --git a/src/kits/network/netresolv/irs/base64.c b/src/system/libnetwork/netresolv/irs/base64.c similarity index 100% rename from src/kits/network/netresolv/irs/base64.c rename to src/system/libnetwork/netresolv/irs/base64.c diff --git a/src/kits/network/netresolv/irs/getaddrinfo.c b/src/system/libnetwork/netresolv/irs/getaddrinfo.c similarity index 100% rename from src/kits/network/netresolv/irs/getaddrinfo.c rename to src/system/libnetwork/netresolv/irs/getaddrinfo.c diff --git a/src/kits/network/netresolv/irs/gethnamaddr.c b/src/system/libnetwork/netresolv/irs/gethnamaddr.c similarity index 100% rename from src/kits/network/netresolv/irs/gethnamaddr.c rename to src/system/libnetwork/netresolv/irs/gethnamaddr.c diff --git a/src/kits/network/netresolv/irs/getnameinfo.c b/src/system/libnetwork/netresolv/irs/getnameinfo.c similarity index 100% rename from src/kits/network/netresolv/irs/getnameinfo.c rename to src/system/libnetwork/netresolv/irs/getnameinfo.c diff --git a/src/kits/network/netresolv/irs/getnetent.c b/src/system/libnetwork/netresolv/irs/getnetent.c similarity index 100% rename from src/kits/network/netresolv/irs/getnetent.c rename to src/system/libnetwork/netresolv/irs/getnetent.c diff --git a/src/kits/network/netresolv/irs/getnetnamadr.c b/src/system/libnetwork/netresolv/irs/getnetnamadr.c similarity index 100% rename from src/kits/network/netresolv/irs/getnetnamadr.c rename to src/system/libnetwork/netresolv/irs/getnetnamadr.c diff --git a/src/kits/network/netresolv/irs/getprotobyname.c b/src/system/libnetwork/netresolv/irs/getprotobyname.c similarity index 100% rename from src/kits/network/netresolv/irs/getprotobyname.c rename to src/system/libnetwork/netresolv/irs/getprotobyname.c diff --git a/src/kits/network/netresolv/irs/getprotobyname_r.c b/src/system/libnetwork/netresolv/irs/getprotobyname_r.c similarity index 100% rename from src/kits/network/netresolv/irs/getprotobyname_r.c rename to src/system/libnetwork/netresolv/irs/getprotobyname_r.c diff --git a/src/kits/network/netresolv/irs/getprotobynumber.c b/src/system/libnetwork/netresolv/irs/getprotobynumber.c similarity index 100% rename from src/kits/network/netresolv/irs/getprotobynumber.c rename to src/system/libnetwork/netresolv/irs/getprotobynumber.c diff --git a/src/kits/network/netresolv/irs/getprotobynumber_r.c b/src/system/libnetwork/netresolv/irs/getprotobynumber_r.c similarity index 100% rename from src/kits/network/netresolv/irs/getprotobynumber_r.c rename to src/system/libnetwork/netresolv/irs/getprotobynumber_r.c diff --git a/src/kits/network/netresolv/irs/getprotoent.c b/src/system/libnetwork/netresolv/irs/getprotoent.c similarity index 100% rename from src/kits/network/netresolv/irs/getprotoent.c rename to src/system/libnetwork/netresolv/irs/getprotoent.c diff --git a/src/kits/network/netresolv/irs/getprotoent_r.c b/src/system/libnetwork/netresolv/irs/getprotoent_r.c similarity index 100% rename from src/kits/network/netresolv/irs/getprotoent_r.c rename to src/system/libnetwork/netresolv/irs/getprotoent_r.c diff --git a/src/kits/network/netresolv/irs/getservbyname.c b/src/system/libnetwork/netresolv/irs/getservbyname.c similarity index 100% rename from src/kits/network/netresolv/irs/getservbyname.c rename to src/system/libnetwork/netresolv/irs/getservbyname.c diff --git a/src/kits/network/netresolv/irs/getservbyname_r.c b/src/system/libnetwork/netresolv/irs/getservbyname_r.c similarity index 100% rename from src/kits/network/netresolv/irs/getservbyname_r.c rename to src/system/libnetwork/netresolv/irs/getservbyname_r.c diff --git a/src/kits/network/netresolv/irs/getservbyport.c b/src/system/libnetwork/netresolv/irs/getservbyport.c similarity index 100% rename from src/kits/network/netresolv/irs/getservbyport.c rename to src/system/libnetwork/netresolv/irs/getservbyport.c diff --git a/src/kits/network/netresolv/irs/getservbyport_r.c b/src/system/libnetwork/netresolv/irs/getservbyport_r.c similarity index 100% rename from src/kits/network/netresolv/irs/getservbyport_r.c rename to src/system/libnetwork/netresolv/irs/getservbyport_r.c diff --git a/src/kits/network/netresolv/irs/getservent.c b/src/system/libnetwork/netresolv/irs/getservent.c similarity index 100% rename from src/kits/network/netresolv/irs/getservent.c rename to src/system/libnetwork/netresolv/irs/getservent.c diff --git a/src/kits/network/netresolv/irs/getservent_r.c b/src/system/libnetwork/netresolv/irs/getservent_r.c similarity index 100% rename from src/kits/network/netresolv/irs/getservent_r.c rename to src/system/libnetwork/netresolv/irs/getservent_r.c diff --git a/src/kits/network/netresolv/irs/hesiod.c b/src/system/libnetwork/netresolv/irs/hesiod.c similarity index 100% rename from src/kits/network/netresolv/irs/hesiod.c rename to src/system/libnetwork/netresolv/irs/hesiod.c diff --git a/src/kits/network/netresolv/irs/lcl_sv.cpp b/src/system/libnetwork/netresolv/irs/lcl_sv.cpp similarity index 100% rename from src/kits/network/netresolv/irs/lcl_sv.cpp rename to src/system/libnetwork/netresolv/irs/lcl_sv.cpp diff --git a/src/kits/network/netresolv/irs/nsdispatch.c b/src/system/libnetwork/netresolv/irs/nsdispatch.c similarity index 100% rename from src/kits/network/netresolv/irs/nsdispatch.c rename to src/system/libnetwork/netresolv/irs/nsdispatch.c diff --git a/src/kits/network/netresolv/irs/nslexer.l b/src/system/libnetwork/netresolv/irs/nslexer.l similarity index 100% rename from src/kits/network/netresolv/irs/nslexer.l rename to src/system/libnetwork/netresolv/irs/nslexer.l diff --git a/src/kits/network/netresolv/irs/nsparser.y b/src/system/libnetwork/netresolv/irs/nsparser.y similarity index 100% rename from src/kits/network/netresolv/irs/nsparser.y rename to src/system/libnetwork/netresolv/irs/nsparser.y diff --git a/src/kits/network/netresolv/irs/protoent.h b/src/system/libnetwork/netresolv/irs/protoent.h similarity index 100% rename from src/kits/network/netresolv/irs/protoent.h rename to src/system/libnetwork/netresolv/irs/protoent.h diff --git a/src/kits/network/netresolv/irs/servent.h b/src/system/libnetwork/netresolv/irs/servent.h similarity index 100% rename from src/kits/network/netresolv/irs/servent.h rename to src/system/libnetwork/netresolv/irs/servent.h diff --git a/src/kits/network/netresolv/irs/sethostent.c b/src/system/libnetwork/netresolv/irs/sethostent.c similarity index 100% rename from src/kits/network/netresolv/irs/sethostent.c rename to src/system/libnetwork/netresolv/irs/sethostent.c diff --git a/src/kits/network/netresolv/irs/vars6.c b/src/system/libnetwork/netresolv/irs/vars6.c similarity index 100% rename from src/kits/network/netresolv/irs/vars6.c rename to src/system/libnetwork/netresolv/irs/vars6.c diff --git a/src/kits/network/netresolv/isc/assertions.c b/src/system/libnetwork/netresolv/isc/assertions.c similarity index 100% rename from src/kits/network/netresolv/isc/assertions.c rename to src/system/libnetwork/netresolv/isc/assertions.c diff --git a/src/kits/network/netresolv/isc/assertions.mdoc b/src/system/libnetwork/netresolv/isc/assertions.mdoc similarity index 100% rename from src/kits/network/netresolv/isc/assertions.mdoc rename to src/system/libnetwork/netresolv/isc/assertions.mdoc diff --git a/src/kits/network/netresolv/isc/bitncmp.c b/src/system/libnetwork/netresolv/isc/bitncmp.c similarity index 100% rename from src/kits/network/netresolv/isc/bitncmp.c rename to src/system/libnetwork/netresolv/isc/bitncmp.c diff --git a/src/kits/network/netresolv/isc/bitncmp.mdoc b/src/system/libnetwork/netresolv/isc/bitncmp.mdoc similarity index 100% rename from src/kits/network/netresolv/isc/bitncmp.mdoc rename to src/system/libnetwork/netresolv/isc/bitncmp.mdoc diff --git a/src/kits/network/netresolv/isc/ctl_clnt.c b/src/system/libnetwork/netresolv/isc/ctl_clnt.c similarity index 100% rename from src/kits/network/netresolv/isc/ctl_clnt.c rename to src/system/libnetwork/netresolv/isc/ctl_clnt.c diff --git a/src/kits/network/netresolv/isc/ctl_p.c b/src/system/libnetwork/netresolv/isc/ctl_p.c similarity index 100% rename from src/kits/network/netresolv/isc/ctl_p.c rename to src/system/libnetwork/netresolv/isc/ctl_p.c diff --git a/src/kits/network/netresolv/isc/ctl_p.h b/src/system/libnetwork/netresolv/isc/ctl_p.h similarity index 100% rename from src/kits/network/netresolv/isc/ctl_p.h rename to src/system/libnetwork/netresolv/isc/ctl_p.h diff --git a/src/kits/network/netresolv/isc/ctl_srvr.c b/src/system/libnetwork/netresolv/isc/ctl_srvr.c similarity index 100% rename from src/kits/network/netresolv/isc/ctl_srvr.c rename to src/system/libnetwork/netresolv/isc/ctl_srvr.c diff --git a/src/kits/network/netresolv/isc/ev_connects.c b/src/system/libnetwork/netresolv/isc/ev_connects.c similarity index 100% rename from src/kits/network/netresolv/isc/ev_connects.c rename to src/system/libnetwork/netresolv/isc/ev_connects.c diff --git a/src/kits/network/netresolv/isc/ev_files.c b/src/system/libnetwork/netresolv/isc/ev_files.c similarity index 100% rename from src/kits/network/netresolv/isc/ev_files.c rename to src/system/libnetwork/netresolv/isc/ev_files.c diff --git a/src/kits/network/netresolv/isc/ev_streams.c b/src/system/libnetwork/netresolv/isc/ev_streams.c similarity index 100% rename from src/kits/network/netresolv/isc/ev_streams.c rename to src/system/libnetwork/netresolv/isc/ev_streams.c diff --git a/src/kits/network/netresolv/isc/ev_timers.c b/src/system/libnetwork/netresolv/isc/ev_timers.c similarity index 100% rename from src/kits/network/netresolv/isc/ev_timers.c rename to src/system/libnetwork/netresolv/isc/ev_timers.c diff --git a/src/kits/network/netresolv/isc/ev_waits.c b/src/system/libnetwork/netresolv/isc/ev_waits.c similarity index 100% rename from src/kits/network/netresolv/isc/ev_waits.c rename to src/system/libnetwork/netresolv/isc/ev_waits.c diff --git a/src/kits/network/netresolv/isc/eventlib.c b/src/system/libnetwork/netresolv/isc/eventlib.c similarity index 100% rename from src/kits/network/netresolv/isc/eventlib.c rename to src/system/libnetwork/netresolv/isc/eventlib.c diff --git a/src/kits/network/netresolv/isc/eventlib.mdoc b/src/system/libnetwork/netresolv/isc/eventlib.mdoc similarity index 100% rename from src/kits/network/netresolv/isc/eventlib.mdoc rename to src/system/libnetwork/netresolv/isc/eventlib.mdoc diff --git a/src/kits/network/netresolv/isc/eventlib_p.h b/src/system/libnetwork/netresolv/isc/eventlib_p.h similarity index 100% rename from src/kits/network/netresolv/isc/eventlib_p.h rename to src/system/libnetwork/netresolv/isc/eventlib_p.h diff --git a/src/kits/network/netresolv/isc/heap.c b/src/system/libnetwork/netresolv/isc/heap.c similarity index 100% rename from src/kits/network/netresolv/isc/heap.c rename to src/system/libnetwork/netresolv/isc/heap.c diff --git a/src/kits/network/netresolv/isc/heap.mdoc b/src/system/libnetwork/netresolv/isc/heap.mdoc similarity index 100% rename from src/kits/network/netresolv/isc/heap.mdoc rename to src/system/libnetwork/netresolv/isc/heap.mdoc diff --git a/src/kits/network/netresolv/isc/hex.c b/src/system/libnetwork/netresolv/isc/hex.c similarity index 100% rename from src/kits/network/netresolv/isc/hex.c rename to src/system/libnetwork/netresolv/isc/hex.c diff --git a/src/kits/network/netresolv/isc/logging.c b/src/system/libnetwork/netresolv/isc/logging.c similarity index 100% rename from src/kits/network/netresolv/isc/logging.c rename to src/system/libnetwork/netresolv/isc/logging.c diff --git a/src/kits/network/netresolv/isc/logging.mdoc b/src/system/libnetwork/netresolv/isc/logging.mdoc similarity index 100% rename from src/kits/network/netresolv/isc/logging.mdoc rename to src/system/libnetwork/netresolv/isc/logging.mdoc diff --git a/src/kits/network/netresolv/isc/logging_p.h b/src/system/libnetwork/netresolv/isc/logging_p.h similarity index 100% rename from src/kits/network/netresolv/isc/logging_p.h rename to src/system/libnetwork/netresolv/isc/logging_p.h diff --git a/src/kits/network/netresolv/isc/memcluster.c b/src/system/libnetwork/netresolv/isc/memcluster.c similarity index 100% rename from src/kits/network/netresolv/isc/memcluster.c rename to src/system/libnetwork/netresolv/isc/memcluster.c diff --git a/src/kits/network/netresolv/isc/memcluster.mdoc b/src/system/libnetwork/netresolv/isc/memcluster.mdoc similarity index 100% rename from src/kits/network/netresolv/isc/memcluster.mdoc rename to src/system/libnetwork/netresolv/isc/memcluster.mdoc diff --git a/src/kits/network/netresolv/isc/movefile.c b/src/system/libnetwork/netresolv/isc/movefile.c similarity index 100% rename from src/kits/network/netresolv/isc/movefile.c rename to src/system/libnetwork/netresolv/isc/movefile.c diff --git a/src/kits/network/netresolv/isc/tree.c b/src/system/libnetwork/netresolv/isc/tree.c similarity index 100% rename from src/kits/network/netresolv/isc/tree.c rename to src/system/libnetwork/netresolv/isc/tree.c diff --git a/src/kits/network/netresolv/isc/tree.mdoc b/src/system/libnetwork/netresolv/isc/tree.mdoc similarity index 100% rename from src/kits/network/netresolv/isc/tree.mdoc rename to src/system/libnetwork/netresolv/isc/tree.mdoc diff --git a/src/kits/network/netresolv/nameser/ns_name.c b/src/system/libnetwork/netresolv/nameser/ns_name.c similarity index 100% rename from src/kits/network/netresolv/nameser/ns_name.c rename to src/system/libnetwork/netresolv/nameser/ns_name.c diff --git a/src/kits/network/netresolv/nameser/ns_netint.c b/src/system/libnetwork/netresolv/nameser/ns_netint.c similarity index 100% rename from src/kits/network/netresolv/nameser/ns_netint.c rename to src/system/libnetwork/netresolv/nameser/ns_netint.c diff --git a/src/kits/network/netresolv/nameser/ns_parse.c b/src/system/libnetwork/netresolv/nameser/ns_parse.c similarity index 100% rename from src/kits/network/netresolv/nameser/ns_parse.c rename to src/system/libnetwork/netresolv/nameser/ns_parse.c diff --git a/src/kits/network/netresolv/nameser/ns_print.c b/src/system/libnetwork/netresolv/nameser/ns_print.c similarity index 100% rename from src/kits/network/netresolv/nameser/ns_print.c rename to src/system/libnetwork/netresolv/nameser/ns_print.c diff --git a/src/kits/network/netresolv/nameser/ns_samedomain.c b/src/system/libnetwork/netresolv/nameser/ns_samedomain.c similarity index 100% rename from src/kits/network/netresolv/nameser/ns_samedomain.c rename to src/system/libnetwork/netresolv/nameser/ns_samedomain.c diff --git a/src/kits/network/netresolv/nameser/ns_ttl.c b/src/system/libnetwork/netresolv/nameser/ns_ttl.c similarity index 100% rename from src/kits/network/netresolv/nameser/ns_ttl.c rename to src/system/libnetwork/netresolv/nameser/ns_ttl.c diff --git a/src/kits/network/netresolv/port_after.h b/src/system/libnetwork/netresolv/port_after.h similarity index 100% rename from src/kits/network/netresolv/port_after.h rename to src/system/libnetwork/netresolv/port_after.h diff --git a/src/kits/network/netresolv/port_before.h b/src/system/libnetwork/netresolv/port_before.h similarity index 100% rename from src/kits/network/netresolv/port_before.h rename to src/system/libnetwork/netresolv/port_before.h diff --git a/src/kits/network/netresolv/resolv/h_errno.c b/src/system/libnetwork/netresolv/resolv/h_errno.c similarity index 100% rename from src/kits/network/netresolv/resolv/h_errno.c rename to src/system/libnetwork/netresolv/resolv/h_errno.c diff --git a/src/kits/network/netresolv/resolv/herror.c b/src/system/libnetwork/netresolv/resolv/herror.c similarity index 100% rename from src/kits/network/netresolv/resolv/herror.c rename to src/system/libnetwork/netresolv/resolv/herror.c diff --git a/src/kits/network/netresolv/resolv/mtctxres.c b/src/system/libnetwork/netresolv/resolv/mtctxres.c similarity index 100% rename from src/kits/network/netresolv/resolv/mtctxres.c rename to src/system/libnetwork/netresolv/resolv/mtctxres.c diff --git a/src/kits/network/netresolv/resolv/res_comp.c b/src/system/libnetwork/netresolv/resolv/res_comp.c similarity index 100% rename from src/kits/network/netresolv/resolv/res_comp.c rename to src/system/libnetwork/netresolv/resolv/res_comp.c diff --git a/src/kits/network/netresolv/resolv/res_data.c b/src/system/libnetwork/netresolv/resolv/res_data.c similarity index 100% rename from src/kits/network/netresolv/resolv/res_data.c rename to src/system/libnetwork/netresolv/resolv/res_data.c diff --git a/src/kits/network/netresolv/resolv/res_debug.c b/src/system/libnetwork/netresolv/resolv/res_debug.c similarity index 100% rename from src/kits/network/netresolv/resolv/res_debug.c rename to src/system/libnetwork/netresolv/resolv/res_debug.c diff --git a/src/kits/network/netresolv/resolv/res_debug.h b/src/system/libnetwork/netresolv/resolv/res_debug.h similarity index 100% rename from src/kits/network/netresolv/resolv/res_debug.h rename to src/system/libnetwork/netresolv/resolv/res_debug.h diff --git a/src/kits/network/netresolv/resolv/res_init.c b/src/system/libnetwork/netresolv/resolv/res_init.c similarity index 100% rename from src/kits/network/netresolv/resolv/res_init.c rename to src/system/libnetwork/netresolv/resolv/res_init.c diff --git a/src/kits/network/netresolv/resolv/res_mkquery.c b/src/system/libnetwork/netresolv/resolv/res_mkquery.c similarity index 100% rename from src/kits/network/netresolv/resolv/res_mkquery.c rename to src/system/libnetwork/netresolv/resolv/res_mkquery.c diff --git a/src/kits/network/netresolv/resolv/res_private.h b/src/system/libnetwork/netresolv/resolv/res_private.h similarity index 100% rename from src/kits/network/netresolv/resolv/res_private.h rename to src/system/libnetwork/netresolv/resolv/res_private.h diff --git a/src/kits/network/netresolv/resolv/res_query.c b/src/system/libnetwork/netresolv/resolv/res_query.c similarity index 100% rename from src/kits/network/netresolv/resolv/res_query.c rename to src/system/libnetwork/netresolv/resolv/res_query.c diff --git a/src/kits/network/netresolv/resolv/res_send.c b/src/system/libnetwork/netresolv/resolv/res_send.c similarity index 100% rename from src/kits/network/netresolv/resolv/res_send.c rename to src/system/libnetwork/netresolv/resolv/res_send.c diff --git a/src/kits/network/netresolv/resolv/res_state.c b/src/system/libnetwork/netresolv/resolv/res_state.c similarity index 100% rename from src/kits/network/netresolv/resolv/res_state.c rename to src/system/libnetwork/netresolv/resolv/res_state.c diff --git a/src/kits/network/r5_compatibility.cpp b/src/system/libnetwork/r5_compatibility.cpp similarity index 100% rename from src/kits/network/r5_compatibility.cpp rename to src/system/libnetwork/r5_compatibility.cpp diff --git a/src/kits/network/socket.cpp b/src/system/libnetwork/socket.cpp similarity index 100% rename from src/kits/network/socket.cpp rename to src/system/libnetwork/socket.cpp