chiark / gitweb /
busybox: Fix -Werror=implicit-function-declaration
authorFredrik Fornwall <fredrik@fornwall.net>
Thu, 6 Jul 2017 22:30:54 +0000 (00:30 +0200)
committerFredrik Fornwall <fredrik@fornwall.net>
Thu, 6 Jul 2017 22:30:54 +0000 (00:30 +0200)
packages/busybox/coreutils-date.c.patch [new file with mode: 0644]
packages/busybox/networking-hostname.c.patch [new file with mode: 0644]

diff --git a/packages/busybox/coreutils-date.c.patch b/packages/busybox/coreutils-date.c.patch
new file mode 100644 (file)
index 0000000..057512e
--- /dev/null
@@ -0,0 +1,18 @@
+diff -u -r ../busybox-1.26.2/coreutils/date.c ./coreutils/date.c
+--- ../busybox-1.26.2/coreutils/date.c 2016-12-10 17:46:36.000000000 +0000
++++ ./coreutils/date.c 2017-07-06 22:15:17.528119028 +0000
+@@ -293,9 +293,14 @@
+               maybe_set_utc(opt);
+               /* if setting time, set it */
++#ifdef __ANDROID__
++              /* stime(2) is not available on Android and is not allowed anyway. */
++              bb_error_msg("can't set date: Operation not permitted");
++#else
+               if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) {
+                       bb_perror_msg("can't set date");
+               }
++#endif
+       }
+       /* Display output */
diff --git a/packages/busybox/networking-hostname.c.patch b/packages/busybox/networking-hostname.c.patch
new file mode 100644 (file)
index 0000000..f6958d8
--- /dev/null
@@ -0,0 +1,22 @@
+diff -u -r ../busybox-1.26.2/networking/hostname.c ./networking/hostname.c
+--- ../busybox-1.26.2/networking/hostname.c    2016-12-10 18:46:36.000000000 +0100
++++ ./networking/hostname.c    2017-07-07 00:19:07.993535998 +0200
+@@ -58,11 +58,18 @@
+               }
+               if (ENABLE_FEATURE_CLEAN_UP)
+                       config_close(parser);
++#ifdef __ANDROID__
++      } else {
++              /* sethostname() is not available on Android pre android-23 and not allowed anyway. */
++              bb_error_msg_and_die("can't set hostname: Operation not permitted");
++      }
++#else
+       } else if (sethostname(s, strlen(s))) {
+ //            if (errno == EPERM)
+ //                    bb_error_msg_and_die(bb_msg_perm_denied_are_you_root);
+               bb_perror_msg_and_die("sethostname");
+       }
++#endif
+ }
+ /* Manpage circa 2009: