main/alpine-baselayout: misc fixes

- suggest the setup-alpine command in motd

- fix sysctl location and contents
  put sysctl to /etc/sysctl.d with 00 prefix so later sysctl.d files can
  override it if needed.

  also remove ip_forward, it default to zero in kernel, and is controlled
  by iptables init.d or quagga.

- mkmntdirs: add missing header
  string.h is needed for strcmp definition

- profile: remove LANG. ref #4428

(cherry picked from commit ee65d272cda3aee4ac47ac67433ee7853d35702a)

3 files changed, 15 insertions, 10 deletions

diff --git a/main/alpine-baselayout/APKBUILD b/main/alpine-baselayout/APKBUILD
index 26abe98691..dfb7d1ea82 100644
--- a/main/alpine-baselayout/APKBUILD
+++ b/main/alpine-baselayout/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alpine-baselayout
-pkgver=2.3.1
-pkgrel=6
+pkgver=2.3.2
+pkgrel=0
 pkgdesc="Alpine base dir structure and init scripts"
 url="http://git.alpinelinux.org/cgit/aports/tree/main/alpine-baselayout"
 arch="all"
@@ -71,6 +71,7 @@ package() {
                 etc/periodic/hourly \
                 etc/periodic/monthly \
                 etc/periodic/weekly \
+                etc/sysctl.d \
                 home \
                 lib/firmware \
                 lib/mdev \
@@ -129,11 +130,15 @@ The Alpine Wiki contains a large amount of how-to guides and general
 information about administrating Alpine systems.
 See <http://wiki.alpinelinux.org>.
 
+You can setup the system with the command: setup-alpine
+
 You may change this message by editing /etc/motd.
 
 EOF
         cat > "$pkgdir"/etc/sysctl.conf <<EOF
-net.ipv4.ip_forward = 0
+# content of this file will override /etc/sysctl.d/*
+EOF
+        cat > "$pkgdir"/etc/sysctl.d/00-alpine.conf <<EOF
 net.ipv4.tcp_syncookies = 1
 net.ipv4.conf.default.rp_filter = 1
 net.ipv4.conf.all.rp_filter = 1
@@ -161,7 +166,7 @@ EOF
         ln -s /proc/mounts "$pkgdir"/etc/mtab
 
 }
-md5sums="686863b10c1cfdf07322ea0ecc977da5  mkmntdirs.c
+md5sums="db115e3302157a836a746bfd1d3f39be  mkmntdirs.c
 6e67923e98287d5133b565acd44cb506  crontab
 d7da26e76752b2e31c66b63f40a73397  color_prompt
 6945faabb2a18cee73c0a6d78b499084  aliases.conf
@@ -171,10 +176,10 @@ f9e3eac60200d41dd5569eeabb4eddff  i386.conf
 67ee12ef936978ec0e7d295eaba1e420  group
 d93ca19f6867a1a3918fa782d9b7c512  inittab
 d05579984e737021401d8c40153c5b5d  passwd
-dcb55fbc491316cdb3874f3ddae8f566  profile
+2939a40b911cac04c85263072c663973  profile
 394f8cd9fbf549f1d1b9a5bba680fc92  protocols
 5278bea4f45f4e289f72897b84dcb909  services"
-sha256sums="9c5f25b07bfc28fff4232b5fd64fce45dd10ddd0f4a59741f2ca74ff99e4db3e  mkmntdirs.c
+sha256sums="44ca046e8188a4c9d32577470c1cbb864fe20889a3c4e6309d1d665c4c13a852  mkmntdirs.c
 575d810a9fae5f2f0671c9b2c0ce973e46c7207fbe5cb8d1b0d1836a6a0470e3  crontab
 a00b56dbd437d3f2c32ced50974daa3cfc84a8dd1cbaf75cf307be20b398fc75  color_prompt
 3e2daa0326fc4d73921cd693dff47b211d0ba3d92ad62fca072c259600695693  aliases.conf
@@ -184,10 +189,10 @@ a00b56dbd437d3f2c32ced50974daa3cfc84a8dd1cbaf75cf307be20b398fc75  color_prompt
 591fce261465cd838bcfddc9a4e560cc4f0c1d603921c200c350b935213b9ca1  group
 8a54b20451ba9469b5260f76faa90fbde96915bf33e7f03f88bdbaf813400485  inittab
 348e451c8d4d2d9807d78114d100942f1c5481fd52550c821922b84a16f02d42  passwd
-8165abfa26a1754c317228e78142f4a89dd72a669951d269f0b68d7a92faf1e8  profile
+8ef550a4efc4bed1630b47c48aefbf1c63ae6e8d9c1246be92135465965712d2  profile
 a6695dbd53b87c7b41dfdafd40b1c8ba34fed2f0fa8eaaa296ad17c0b154603e  protocols
 e96af627f7774e8c87b0de843556a355fea6150c4d64fa4e2ff2c5fd610e7a79  services"
-sha512sums="670fce7a9d5c492289b7dca06077a5109672fbec2accf21bfb3531651f0434939ff07e71c61949df2c0bfe3c2f178a503f0086867b84e3874abd5c90233149b7  mkmntdirs.c
+sha512sums="94a75cbd309e7b7d3b1bbbddb6f361335336d804c2a331b9963de7cee38633217bcd533b4b29a4333ba477c6a13fe9a160c822108027a03a84b334bc76bf8ebd  mkmntdirs.c
 6e169c0975a1ad1ad871a863e8ee83f053de9ad0b58d94952efa4c28a8c221445d9e9732ad8b52832a50919c2f39aa965a929b3d5b3f9e62f169e2b2e0813d82  crontab
 7fcb5df98b0f19e609cb9444b2e6ca5ee97f5f308eb407436acdd0115781623fd89768a9285e9816e36778e565b6f27055f2a586a58f19d6d880de5446d263c4  color_prompt
 8d55acb0457eec4008ba09c3de92fed6893b72d062edd5dcd74016e9c6c4dfeba7e86620e59d21a7adce11377ec793812c90e9d9771a804097fa64cff646666c  aliases.conf
@@ -197,6 +202,6 @@ b407351a5a64b00100753a13a91f4b1cb51017ae918a91fd37f3a6e76e3b6f562be643e74f969a88
 214d7b26bfdefbe08d150974d1e1635ee4b8ca68a04a22eacf2e465f3a191421fb453ad93f14a1c70f98b628a509d623e005f912270e7552513daa1e50bb1859  group
 bdb6fe1f3e07466d9badf9a18b1f3fc9585f0a4cb69c00f1fa6d8b1e9903a3c497edefbfd345e324961013999e5692d2ed68ae7defaf1c6e57cc7916f206fd75  inittab
 3b9be283e171516dd45ee29775a1149ba20d5672bef422a698ed944ce66697e5a80dec21a9a20c079cca895890dbfa73ccbb8000a55504d95ced4e7436d8e16b  passwd
-9e197ec99c97ec2b03b97546d632a865d6e7abe5742ac48bcb458a505ce38abd1010ef93ea8a752251578ea993708324e1d36ccf77ee3e7cde7e8db98cc42d67  profile
+c4088a7148c0f161809852d248d2c2272d9c72be3f968c2e2ba40806f508238496eda0f8f2a42aa092773a56800b1dae9f843a42d93f1bb16ba5f58c111d531b  profile
 f1548a2b5a107479446f15905f0f2fbf8762815b2215188d49d905c803786d35de6d98005dc0828fb2486b04aaa356f1216a964befddf1e72cb169656e23b6ac  protocols
 cecfc06b1f455d65b0c54a5651e601298b455771333e39d0109eeffd7ebd8d81b7738738eb647e6d3076230b6f3707782b83662ea3764ec33dc5e0b3453d3965  services"
diff --git a/main/alpine-baselayout/mkmntdirs.c b/main/alpine-baselayout/mkmntdirs.c
index 6e3a3ef21d..b3704a07f7 100644
--- a/main/alpine-baselayout/mkmntdirs.c
+++ b/main/alpine-baselayout/mkmntdirs.c
@@ -14,6 +14,7 @@
 #include <err.h>
 #include <mntent.h>
 #include <stdio.h>
+#include <string.h>
 
 
 #ifdef DEBUG
diff --git a/main/alpine-baselayout/profile b/main/alpine-baselayout/profile
index 5144f7d9ae..bb99d2915b 100644
--- a/main/alpine-baselayout/profile
+++ b/main/alpine-baselayout/profile
@@ -1,5 +1,4 @@
 export CHARSET=UTF-8
-export LANG=en.utf8
 export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 export PAGER=less
 export PS1='\h:\w\$ '