diff --git a/source/texk/web2c/luatexdir/font/mapfile.h b/source/texk/web2c/luatexdir/font/mapfile.h
index 928a0e9190455ccaad911f101456c07d9a689a90..ad752af744fca19a12efb48b595385ce018d4226 100644
--- a/source/texk/web2c/luatexdir/font/mapfile.h
+++ b/source/texk/web2c/luatexdir/font/mapfile.h
@@ -110,7 +110,7 @@ void fm_free(void);
 ff_entry *check_ff_exist(char *, boolean);
 void pdfmapfile(int);
 void pdfmapline(int);
-void pdf_init_map_file(char *map_name);
+void pdf_init_map_file(const char *map_name);
 fm_entry *new_fm_entry(void);
 void delete_fm_entry(fm_entry *);
 int avl_do_entry(fm_entry *, int);
diff --git a/source/texk/web2c/luatexdir/font/mapfile.w b/source/texk/web2c/luatexdir/font/mapfile.w
index 9460dac5a9f30111098cdb6f6158539100b57bc7..f47c5b50487b84037cfd4fae3dd132ca1437fcb4 100644
--- a/source/texk/web2c/luatexdir/font/mapfile.w
+++ b/source/texk/web2c/luatexdir/font/mapfile.w
@@ -613,13 +613,13 @@ void pdfmapline(int t)
     free(s);
 }
 
-void pdf_init_map_file(char *map_name)
+void pdf_init_map_file(const char *map_name)
 {
     assert(mitem == NULL);
     mitem = xtalloc(1, mapitem);
     mitem->mode = FM_DUPIGNORE;
     mitem->type = MAPFILE;
-    mitem->line = map_name;
+    mitem->line = xstrdup(map_name);
 }
 
 /**********************************************************************/
diff --git a/source/texk/web2c/luatexdir/font/writettf.w b/source/texk/web2c/luatexdir/font/writettf.w
index 2a13b889979cd3d546f6d8ebf11df6bdc7c70346..4a016cbe403620efa7c44e4b6b9f214ccee57783 100644
--- a/source/texk/web2c/luatexdir/font/writettf.w
+++ b/source/texk/web2c/luatexdir/font/writettf.w
@@ -539,10 +539,10 @@ static void ttf_copy_encoding(void)
     int i, *q;
     void **aa;
     char **glyph_names;
-    long *charcodes;
-    static char buf[SMALL_BUF_SIZE];
+    /*long *charcodes;*/
+    /*static char buf[SMALL_BUF_SIZE];*/
     struct avl_traverser t;
-    ttfenc_entry *e = ttfenc_tab;
+    /*ttfenc_entry *e = ttfenc_tab;*/
 
     assert(fd_cur->tx_tree != NULL);    /* this must be set in |create_fontdictionary| */
 
diff --git a/source/texk/web2c/luatexdir/lua/lepdflib.cc b/source/texk/web2c/luatexdir/lua/lepdflib.cc
index 0bc34909f9ef6e1b5ed83bba7761096f7513bf53..a16bf3bd46109d4a26e8e10778ae822109d4baf4 100644
--- a/source/texk/web2c/luatexdir/lua/lepdflib.cc
+++ b/source/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -1665,7 +1665,7 @@ static int m_Object_initCmd(lua_State * L)
     if (uin->pd != NULL && uin->pd->pc != uin->pc)
         pdfdoc_changed_error(L);
     s = luaL_checkstring(L, 2);
-    *((Object *) uin->d) = Object(objCmd, CHARP_CAST s);
+    *((Object *) uin->d) = Object(objCmd, s);
     return 0;
 }
 
diff --git a/source/texk/web2c/luatexdir/luasocket/src/lua_preload.c b/source/texk/web2c/luatexdir/luasocket/src/lua_preload.c
index b30f9a805fed4cebc02d90794a688f32a5c042df..e9433dfdb12ab2266ae4329bdec32509be1b202b 100644
--- a/source/texk/web2c/luatexdir/luasocket/src/lua_preload.c
+++ b/source/texk/web2c/luatexdir/luasocket/src/lua_preload.c
@@ -3,6 +3,18 @@
 #include "lua.h"
 #include "lauxlib.h"
 
+int luatex_mbox_lua_open(lua_State*);
+int luatex_headers_lua_open(lua_State*);
+int luatex_socket_lua_open(lua_State*);
+int luatex_ltn12_lua_open(lua_State*);
+int luatex_mime_lua_open(lua_State*);
+int luatex_url_lua_open(lua_State*);
+int luatex_tp_lua_open(lua_State*);
+int luatex_smtp_lua_open(lua_State*);
+int luatex_http_lua_open(lua_State*);
+int luatex_ftp_lua_open(lua_State*);
+
+
 #include "ftp_lua.c"
 #include "headers_lua.c" 
 #include "http_lua.c"
diff --git a/source/texk/web2c/luatexdir/luatex.c b/source/texk/web2c/luatexdir/luatex.c
index 5e9e61b919efb93f5c9310a251eff740596d008b..1c8694987a445ee73489d678a379a0c52887889e 100644
--- a/source/texk/web2c/luatexdir/luatex.c
+++ b/source/texk/web2c/luatexdir/luatex.c
@@ -198,7 +198,7 @@ void init_start_time(void) {
             just use its abstract interface.
         */
         char *source_date_epoch = kpse_var_value("SOURCE_DATE_EPOCH");
-        if (source_date_epoch && source_date_epoch != '\0' ) {
+        if (source_date_epoch) {
             errno = 0;
             epoch = strtoull(source_date_epoch, &endptr, 10);
             if (*endptr != '\0' || errno != 0) {
diff --git a/source/texk/web2c/luatexdir/luatex_svnversion.h b/source/texk/web2c/luatexdir/luatex_svnversion.h
index 3b575dee5fe5a58eae7525a5673fa6d815609df6..6aa47910557901ade695e6826dd7283827579c85 100644
--- a/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 6587
+#define luatex_svn_revision 6602
diff --git a/source/texk/web2c/mplibdir/mpmathdecimal.w b/source/texk/web2c/mplibdir/mpmathdecimal.w
index 6503b8320fe79f2caa0b6a3d02d331685e093bb5..c07e6ede8e0e86c8234a420d85d8efd9fb6d87ad 100644
--- a/source/texk/web2c/mplibdir/mpmathdecimal.w
+++ b/source/texk/web2c/mplibdir/mpmathdecimal.w
@@ -582,7 +582,6 @@ void mp_decimal_set_precision (MP mp) {
 }
 
 void mp_free_decimal_math (MP mp) {
-  int i;
   free_number (((math_data *)mp->math)->three_sixty_deg_t);
   free_number (((math_data *)mp->math)->one_eighty_deg_t);
   free_number (((math_data *)mp->math)->fraction_one_t);