Move ports and protocols files back to data directory in Haiku package.

These files are required for netresolv functionality, and there is no
real use in modifying them as settings files. Restore the previous
behavior, the files are stored in data and part of the Haiku package.

This means there is no need for a fresh install from image to get the
files anymore.

Fixes #12156.

build/jam/images/definitions/minimum

@@ -271,11 +271,7 @@ SEARCH on $(driverSettingsFiles)
 AddFilesToHaikuImage home config settings kernel drivers
 	: $(driverSettingsFiles) ;
 
-local networkSettingsFiles =
-	<network-settings>ports
-	<network-settings>protocols
-	<network-settings>services
-;
+local networkSettingsFiles = <network-settings>services ;
 SEARCH on $(networkSettingsFiles)
 	= [ FDirName $(HAIKU_TOP) data settings network ] ;
 AddFilesToHaikuImage system settings network : $(networkSettingsFiles) ;

build/jam/packages/Haiku

@@ -298,6 +298,11 @@ CopyDirectoryToPackage data
 	: [ FDirName $(HAIKU_TOP) data system data licenses ]
 	: licenses ;
 
+# netresolv support files
+CopyDirectoryToPackage data
+	: [ FDirName $(HAIKU_TOP) data system data network ]
+	: network ;
+
 # Copy documentation as per DiskUsage's license requirement.
 CopyDirectoryToPackage documentation
 	: [ FDirName $(HAIKU_TOP) docs apps diskusage ]

build/jam/packages/HaikuBootstrap

@@ -253,6 +253,11 @@ CopyDirectoryToPackage data
 	: [ FDirName $(HAIKU_TOP) data system data licenses ]
 	: licenses ;
 
+# netresolv support files
+CopyDirectoryToPackage data
+	: [ FDirName $(HAIKU_TOP) data system data network ]
+	: network ;
+
 # Copy documentation as per DiskUsage's license requirement.
 CopyDirectoryToPackage documentation
 	: [ FDirName $(HAIKU_TOP) docs apps diskusage ]

src/kits/network/netresolv/irs/getprotoent_r.c

@@ -60,7 +60,7 @@ setprotoent_r(int f, struct protoent_data *pd)
 {
 	if (pd->fp == NULL) {
 		char buffer[256];
-		find_directory(B_SYSTEM_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer));
+		find_directory(B_SYSTEM_DATA_DIRECTORY, 0, false, buffer, sizeof(buffer));
 		strlcat(buffer, "/network/protocols", sizeof(buffer));
 
 		pd->fp = fopen(buffer, "re");

src/kits/network/netresolv/irs/getservent_r.c

@@ -84,7 +84,7 @@ _servent_open(struct servent_data *sd)
 	}
 #endif
 
-	find_directory(B_SYSTEM_SETTINGS_DIRECTORY, 0, false, buffer, sizeof(buffer));
+	find_directory(B_SYSTEM_DATA_DIRECTORY, 0, false, buffer, sizeof(buffer));
 	strlcat(buffer, "/network/ports", sizeof(buffer));
 
 	sd->plainfile = fopen(buffer, "re");