Apply post-1.19.3 patches, bump version to 1.19.4

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/Makefile b/Makefile
index 9648c9c208324783912ef68465c648e09419a788..da0b04cc447d7270d97e74a79539d0804e061c37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 1
 PATCHLEVEL = 19
-SUBLEVEL = 3
+SUBLEVEL = 4
 EXTRAVERSION =
 NAME = Unnamed
 

diff --git a/loginutils/getty.c b/loginutils/getty.c
index 62456651b1f5a253d5cc9740f32d085e27c73d7d..4c8dd91a24d0c86477eab1259727b66230c4ed6f 100644 (file)
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -271,7 +271,9 @@ static void termios_init(int speed)
 #ifdef CMSPAR
                | CMSPAR  /* mark or space parity */
 #endif
+#ifdef CBAUD
                | CBAUD   /* (output) baud rate */
+#endif
 #ifdef CBAUDEX
                | CBAUDEX /* (output) baud rate */
 #endif

diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index 410b6fbe4425744d6211580aea8ecf18a3c1d5c3..c0910ffedffbac700a85fbfb43e94ce9c7d7744c 100644 (file)
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -13,6 +13,7 @@
 //config:config MODINFO
 //config:      bool "modinfo"
 //config:      default y
+//config:      select PLATFORM_LINUX
 //config:      help
 //config:        Show information about a Linux Kernel module
 

diff --git a/networking/wget.c b/networking/wget.c
index 6443705fde70f312de3703395a0aad23b421ef32..fbb8a2e1264b3a8a0418e1b6a3d7e2a87cf7dd30 100644 (file)
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -552,6 +552,7 @@ static void download_one_url(const char *url)
        FILE *dfp;                      /* socket to ftp server (data)      */
        char *proxy = NULL;
        char *fname_out_alloc;
+       char *redirected_path = NULL;
        struct host_info server;
        struct host_info target;
 
@@ -794,8 +795,8 @@ However, in real world it was observed that some web servers
                                        bb_error_msg_and_die("too many redirections");
                                fclose(sfp);
                                if (str[0] == '/') {
-                                       free(target.allocated);
-                                       target.path = target.allocated = xstrdup(str+1);
+                                       free(redirected_path);
+                                       target.path = redirected_path = xstrdup(str+1);
                                        /* lsa stays the same: it's on the same server */
                                } else {
                                        parse_url(str, &target);
@@ -850,6 +851,7 @@ However, in real world it was observed that some web servers
        free(server.allocated);
        free(target.allocated);
        free(fname_out_alloc);
+       free(redirected_path);
 }
 
 int wget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 7cabb1df66c0aac197a7e5b2dad1349bb0f78db5..e0a527e733524049970fc33f0b72d538595baacf 100644 (file)
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -610,7 +610,7 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
                                int seqlen;
                                char seqbuf[sizeof(int)*3 + 2];
 
-                               seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf-1));
+                               seqlen = open_read_close("mdev.seq", seqbuf, sizeof(seqbuf) - 1);
                                if (seqlen < 0) {
                                        seq = NULL;
                                        break;