From 7186b2379451a021662e45db8731845504f5398c Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 13 Feb 2013 15:41:19 +0100 Subject: [PATCH] update to the latest upstream pre-release - drop applied patches - drop lynx-2.8.6-backgrcolor.patch (#908449) --- .gitignore | 1 + lynx-2.8.6-backgrcolor.patch | 15 - lynx-2.8.7-bm-del.patch | 13 - lynx-2.8.7-bz679266.patch | 574 ------------------ lynx-2.8.7-ipv6arg.patch | 57 -- lynx-2.8.7-locale.patch | 13 - lynx-2.8.7-man-typo.patch | 39 -- ...uild-fixes.patch => lynx-2.8.8-build.patch | 112 ++-- lynx-2.8.8-locale.patch | 25 + ....6-redhat.patch => lynx-2.8.8-redhat.patch | 48 +- lynx-CVE-2008-4690.patch | 26 +- lynx.spec | 45 +- lynx2.8.8dev.15.tar.bz2.asc | 8 + sources | 2 +- 14 files changed, 169 insertions(+), 809 deletions(-) delete mode 100644 lynx-2.8.6-backgrcolor.patch delete mode 100644 lynx-2.8.7-bm-del.patch delete mode 100644 lynx-2.8.7-bz679266.patch delete mode 100644 lynx-2.8.7-ipv6arg.patch delete mode 100644 lynx-2.8.7-locale.patch delete mode 100644 lynx-2.8.7-man-typo.patch rename lynx-build-fixes.patch => lynx-2.8.8-build.patch (60%) create mode 100644 lynx-2.8.8-locale.patch rename lynx-2.8.6-redhat.patch => lynx-2.8.8-redhat.patch (79%) create mode 100644 lynx2.8.8dev.15.tar.bz2.asc diff --git a/.gitignore b/.gitignore index 5b66137..0c260d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ lynx2.8.7.tar.bz2 +/lynx2.8.8dev.15.tar.bz2 diff --git a/lynx-2.8.6-backgrcolor.patch b/lynx-2.8.6-backgrcolor.patch deleted file mode 100644 index e294fa2..0000000 --- a/lynx-2.8.6-backgrcolor.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/samples/lynx.lss b/samples/lynx.lss -index 2d02eb1..a46d163 100644 ---- a/samples/lynx.lss -+++ b/samples/lynx.lss -@@ -5,8 +5,8 @@ - # - # If you really want the terminal's default colors, and if lynx is built using - # ncurses' default-color support, remove these two lines: --normal: normal: lightgray:black --default: normal: white:black -+#normal: normal: lightgray:black -+#default: normal: white:black - - # Normal type styles correspond to HTML tags. - # diff --git a/lynx-2.8.7-bm-del.patch b/lynx-2.8.7-bm-del.patch deleted file mode 100644 index 7d1bfa5..0000000 --- a/lynx-2.8.7-bm-del.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/LYBookmark.c b/src/LYBookmark.c -index 6d3a9ca..deaab00 100644 ---- a/src/LYBookmark.c -+++ b/src/LYBookmark.c -@@ -496,7 +496,7 @@ void remove_bookmark_link(int cur, - */ - if (stat(filename_buffer, &stat_buf) == 0) { - regular = (BOOLEAN) (S_ISREG(stat_buf.st_mode) && stat_buf.st_nlink == 1); -- mode = ((stat_buf.st_mode & 0777) | 0600); /* make it writable */ -+ mode = ((stat_buf.st_mode & HIDE_CHMOD) | 0600); /* make it writable */ - (void) chmod(newfile, mode); - if ((nfp = LYReopenTemp(newfile)) == NULL) { - (void) LYCloseInput(fp); diff --git a/lynx-2.8.7-bz679266.patch b/lynx-2.8.7-bz679266.patch deleted file mode 100644 index 6dd04bf..0000000 --- a/lynx-2.8.7-bz679266.patch +++ /dev/null @@ -1,574 +0,0 @@ -From 287b5ccf870c56ae0baabf501a7dc26bec337fd0 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Fri, 27 May 2011 13:36:56 +0200 -Subject: [PATCH] import the contents of lynx2.8.8dev.8d - -... from ftp://invisible-island.net/temp/lynx2.8.8dev.8d.patch.gz ---- - WWW/Library/Implementation/hdr_HTMLDTD.h | 13 ++++---- - WWW/Library/Implementation/src0_HTMLDTD.h | 2 + - WWW/Library/Implementation/src0_HTMLDTD.txt | 22 +++++++------ - WWW/Library/Implementation/src1_HTMLDTD.h | 2 + - WWW/Library/Implementation/src1_HTMLDTD.txt | 26 ++++++++------- - src/GridText.c | 3 ++ - src/HTForms.h | 4 ++ - src/HTML.c | 12 +++++-- - src/HTML.h | 1 + - src/LYForms.c | 44 +++++++++++++------------- - src/LYMainLoop.c | 10 +++--- - src/structdump.h | 3 +- - 12 files changed, 82 insertions(+), 60 deletions(-) - -diff --git a/WWW/Library/Implementation/hdr_HTMLDTD.h b/WWW/Library/Implementation/hdr_HTMLDTD.h -index f6cb0b5..562e7da 100644 ---- a/WWW/Library/Implementation/hdr_HTMLDTD.h -+++ b/WWW/Library/Implementation/hdr_HTMLDTD.h -@@ -310,12 +310,13 @@ extern "C" { - #define HTML_BUTTON_NAME 7 - #define HTML_BUTTON_ONBLUR 8 - #define HTML_BUTTON_ONFOCUS 9 --#define HTML_BUTTON_STYLE 10 --#define HTML_BUTTON_TABINDEX 11 --#define HTML_BUTTON_TITLE 12 --#define HTML_BUTTON_TYPE 13 --#define HTML_BUTTON_VALUE 14 --#define HTML_BUTTON_ATTRIBUTES 15 -+#define HTML_BUTTON_READONLY 10 -+#define HTML_BUTTON_STYLE 11 -+#define HTML_BUTTON_TABINDEX 12 -+#define HTML_BUTTON_TITLE 13 -+#define HTML_BUTTON_TYPE 14 -+#define HTML_BUTTON_VALUE 15 -+#define HTML_BUTTON_ATTRIBUTES 16 - - #define HTML_CAPTION_ACCESSKEY 0 - #define HTML_CAPTION_ALIGN 1 -diff --git a/WWW/Library/Implementation/src0_HTMLDTD.h b/WWW/Library/Implementation/src0_HTMLDTD.h -index 845ed59..0f647f2 100644 ---- a/WWW/Library/Implementation/src0_HTMLDTD.h -+++ b/WWW/Library/Implementation/src0_HTMLDTD.h -@@ -394,6 +394,7 @@ static const attr BUTTON_attr_list[] = { - { "NAME" T(N) }, - { "ONBLUR" T(N) }, - { "ONFOCUS" T(N) }, -+ { "READONLY" T(N) }, - { "TABINDEX" T(N) }, - { "TYPE" T(N) }, - { "VALUE" T(N) }, -@@ -1383,6 +1384,7 @@ static const attr BUTTON_attr[] = { /* BUTTON attributes */ - { "NAME" T(N) }, - { "ONBLUR" T(N) }, - { "ONFOCUS" T(N) }, -+ { "READONLY" T(N) }, - { "STYLE" T(N) }, - { "TABINDEX" T(N) }, - { "TITLE" T(N) }, -diff --git a/WWW/Library/Implementation/src0_HTMLDTD.txt b/WWW/Library/Implementation/src0_HTMLDTD.txt -index ceece92..923623d 100644 ---- a/WWW/Library/Implementation/src0_HTMLDTD.txt -+++ b/WWW/Library/Implementation/src0_HTMLDTD.txt -@@ -119,16 +119,17 @@ - 1:0:CLEAR - 2:0:NOWRAP - 15:BUTTON -- 9 attributes: -+ 10 attributes: - 0:0:ACCESSKEY - 1:0:CLEAR - 2:0:DISABLED - 3:0:NAME - 4:0:ONBLUR - 5:0:ONFOCUS -- 6:0:TABINDEX -- 7:0:TYPE -- 8:0:VALUE -+ 6:0:READONLY -+ 7:0:TABINDEX -+ 8:0:TYPE -+ 9:0:VALUE - 16:CAPTION - 2 attributes: - 0:0:ACCESSKEY -@@ -1065,7 +1066,7 @@ - flags: endO - 21:BUTTON - justify -- 15 attributes: -+ 16 attributes: - 0:0:ACCESSKEY - 1:4:CLASS - 2:0:CLEAR -@@ -1076,11 +1077,12 @@ - 7:0:NAME - 8:0:ONBLUR - 9:0:ONFOCUS -- 10:0:STYLE -- 11:0:TABINDEX -- 12:0:TITLE -- 13:0:TYPE -- 14:0:VALUE -+ 10:0:READONLY -+ 11:0:STYLE -+ 12:0:TABINDEX -+ 13:0:TITLE -+ 14:0:TYPE -+ 15:0:VALUE - 4 attr_types - core - events -diff --git a/WWW/Library/Implementation/src1_HTMLDTD.h b/WWW/Library/Implementation/src1_HTMLDTD.h -index c2bc87f..c4bd365 100644 ---- a/WWW/Library/Implementation/src1_HTMLDTD.h -+++ b/WWW/Library/Implementation/src1_HTMLDTD.h -@@ -394,6 +394,7 @@ static const attr BUTTON_attr_list[] = { - { "NAME" T(N) }, - { "ONBLUR" T(N) }, - { "ONFOCUS" T(N) }, -+ { "READONLY" T(N) }, - { "TABINDEX" T(N) }, - { "TYPE" T(N) }, - { "VALUE" T(N) }, -@@ -1383,6 +1384,7 @@ static const attr BUTTON_attr[] = { /* BUTTON attributes */ - { "NAME" T(N) }, - { "ONBLUR" T(N) }, - { "ONFOCUS" T(N) }, -+ { "READONLY" T(N) }, - { "STYLE" T(N) }, - { "TABINDEX" T(N) }, - { "TITLE" T(N) }, -diff --git a/WWW/Library/Implementation/src1_HTMLDTD.txt b/WWW/Library/Implementation/src1_HTMLDTD.txt -index 1342171..aef07fb 100644 ---- a/WWW/Library/Implementation/src1_HTMLDTD.txt -+++ b/WWW/Library/Implementation/src1_HTMLDTD.txt -@@ -119,16 +119,17 @@ - 1:0:CLEAR - 2:0:NOWRAP - 15:BUTTON -- 9 attributes: -+ 10 attributes: - 0:0:ACCESSKEY - 1:0:CLEAR - 2:0:DISABLED - 3:0:NAME -- 4:0:ONBLUR -- 5:0:ONFOCUS -- 6:0:TABINDEX -- 7:0:TYPE -- 8:0:VALUE -+ 4:0:READONLY -+ 5:0:ONBLUR -+ 6:0:ONFOCUS -+ 7:0:TABINDEX -+ 8:0:TYPE -+ 9:0:VALUE - 16:CAPTION - 2 attributes: - 0:0:ACCESSKEY -@@ -1065,7 +1066,7 @@ - flags: endO - 21:BUTTON - justify -- 15 attributes: -+ 16 attributes: - 0:0:ACCESSKEY - 1:4:CLASS - 2:0:CLEAR -@@ -1076,11 +1077,12 @@ - 7:0:NAME - 8:0:ONBLUR - 9:0:ONFOCUS -- 10:0:STYLE -- 11:0:TABINDEX -- 12:0:TITLE -- 13:0:TYPE -- 14:0:VALUE -+ 10:0:READONLY -+ 11:0:STYLE -+ 12:0:TABINDEX -+ 13:0:TITLE -+ 14:0:TYPE -+ 15:0:VALUE - 4 attr_types - core - events -diff --git a/src/GridText.c b/src/GridText.c -index 19d634f..e275619 100644 ---- a/src/GridText.c -+++ b/src/GridText.c -@@ -9732,6 +9732,7 @@ int HText_beginInput(HText *text, BOOL underline, - f->select_list = 0; - f->number = HTFormNumber; - f->disabled = HTFormDisabled || I->disabled; -+ f->readonly = I->readonly; - f->no_cache = NO; - - HTFormFields++; -@@ -12311,6 +12312,7 @@ static void insert_new_textarea_anchor(TextAnchor **curr_anchor, HTLine **exit_h - f->maxlength = anchor->input_field->maxlength; - f->no_cache = anchor->input_field->no_cache; - f->disabled = anchor->input_field->disabled; -+ f->readonly = anchor->input_field->readonly; - f->value_cs = current_char_set; /* use current setting - kw */ - - /* Init all the fields in the new HTLine (but see the #if). */ -@@ -13128,6 +13130,7 @@ int HText_InsertFile(LinkInfo * form_link) - f->maxlength = anchor_ptr->input_field->maxlength; - f->no_cache = anchor_ptr->input_field->no_cache; - f->disabled = anchor_ptr->input_field->disabled; -+ f->readonly = anchor_ptr->input_field->readonly; - f->value_cs = (file_cs >= 0) ? file_cs : current_char_set; - - /* Init all the fields in the new HTLine (but see the #if). */ -diff --git a/src/HTForms.h b/src/HTForms.h -index ec99405..17ee994 100644 ---- a/src/HTForms.h -+++ b/src/HTForms.h -@@ -35,6 +35,7 @@ extern "C" { - int checked; - const char *iclass; - int disabled; -+ int readonly; - const char *error; - const char *height; - const char *id; -@@ -91,11 +92,14 @@ extern "C" { - char *orig_submit_value; /* original submit value */ - int size_l; /* The length of the option list */ - int disabled; /* If YES, can't change values */ -+ int readonly; /* If YES, can't change values */ - int name_cs; - int value_cs; - char *accept_cs; - } FormInfo; - -+#define FormIsReadonly(form) ((form)->disabled || (form)->readonly) -+ - /* - * As structure for info associated with a form. There is some redundancy - * here, this shouldn't waste too much memory since the total number of forms -diff --git a/src/HTML.c b/src/HTML.c -index 2ed4a7b..08f7c7d 100644 ---- a/src/HTML.c -+++ b/src/HTML.c -@@ -4431,6 +4431,9 @@ static int HTML_start_element(HTStructured * me, int element_number, - } - } - -+ if (present && present[HTML_BUTTON_READONLY]) -+ I.readonly = YES; -+ - if (present && present[HTML_BUTTON_DISABLED]) - I.disabled = YES; - -@@ -4788,7 +4791,7 @@ static int HTML_start_element(HTStructured * me, int element_number, - I.value = ImageSrc; - } - if (present && present[HTML_INPUT_READONLY]) -- I.disabled = YES; -+ I.readonly = YES; - if (present && present[HTML_INPUT_CHECKED]) - I.checked = YES; - if (present && present[HTML_INPUT_SIZE] && -@@ -5039,10 +5042,11 @@ static int HTML_start_element(HTStructured * me, int element_number, - * Lynx treats disabled and readonly textarea's the same - - * unmodifiable in either case. - */ -- me->textarea_disabled = NO; -+ me->textarea_readonly = NO; - if (present && present[HTML_TEXTAREA_READONLY]) -- me->textarea_disabled = YES; -+ me->textarea_readonly = YES; - -+ me->textarea_disabled = NO; - if (present && present[HTML_TEXTAREA_DISABLED]) - me->textarea_disabled = YES; - -@@ -6850,6 +6854,7 @@ static int HTML_end_element(HTStructured * me, int element_number, - I.accept_cs = me->textarea_accept_cs; - me->textarea_accept_cs = NULL; - I.disabled = me->textarea_disabled; -+ I.readonly = me->textarea_readonly; - I.id = me->textarea_id; - - /* -@@ -7720,7 +7725,6 @@ HTStructured *HTML_new(HTParentAnchor *anchor, - me->textarea_accept_cs = NULL; - me->textarea_cols = 0; - me->textarea_rows = 4; -- me->textarea_disabled = NO; - me->textarea_id = NULL; - - HTChunkInit(&me->math, 128); -diff --git a/src/HTML.h b/src/HTML.h -index 695ed9f..d074235 100644 ---- a/src/HTML.h -+++ b/src/HTML.h -@@ -101,6 +101,7 @@ extern "C" { - int textarea_cols; - int textarea_rows; - int textarea_disabled; -+ int textarea_readonly; - char *textarea_id; - HTChunk math; /* Grow by 128 */ - HTChunk style_block; /* Grow by 128 */ -diff --git a/src/LYForms.c b/src/LYForms.c -index d6ea2fe..b7961c2 100644 ---- a/src/LYForms.c -+++ b/src/LYForms.c -@@ -88,7 +88,7 @@ int change_form_link_ex(int cur, - - switch (form->type) { - case F_CHECKBOX_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - break; - LYSetHilite(cur, form->num_value ? unchecked_box : checked_box); - form->num_value = !form->num_value; -@@ -101,7 +101,7 @@ int change_form_link_ex(int cur, - break; - } - -- if (form->disabled == YES) { -+ if (FormIsReadonly(form)) { - int dummy; - - dummy = LYhandlePopupList(form->num_value, -@@ -110,7 +110,7 @@ int change_form_link_ex(int cur, - (const char **) my_data, - form->size, - form->size_l, -- form->disabled, -+ FormIsReadonly(form), - FALSE); - #if CTRL_W_HACK != DO_NOTHING - if (!enable_scrollback) -@@ -127,7 +127,7 @@ int change_form_link_ex(int cur, - (const char **) my_data, - form->size, - form->size_l, -- form->disabled, -+ FormIsReadonly(form), - FALSE); - { - OptionType *opt_ptr = form->select_list; -@@ -156,7 +156,7 @@ int change_form_link_ex(int cur, - break; - - case F_RADIO_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - break; - /* - * Radio buttons must have one and only one down at a time! -@@ -210,7 +210,7 @@ int change_form_link_ex(int cur, - break; - - case F_RESET_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - break; - HText_ResetForm(form); - *refresh_screen = TRUE; -@@ -223,7 +223,7 @@ int change_form_link_ex(int cur, - } - if (!immediate_submit) - c = form_getstr(cur, use_last_tfpos, FALSE); -- if (form->disabled == YES && -+ if (FormIsReadonly(form) && - (c == '\r' || c == '\n' || immediate_submit)) { - if (peek_mouse_link() >= 0) - c = LAC_TO_LKC0(LYK_ACTIVATE); -@@ -307,7 +307,7 @@ int change_form_link_ex(int cur, - - case F_SUBMIT_TYPE: - case F_IMAGE_SUBMIT_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - break; - if (form->no_cache && - form->submit_method != URL_MAIL_METHOD) { -@@ -407,7 +407,7 @@ static int form_getstr(int cur, - * much of the tail as fits. - FM - */ - value += (strlen(form->value) - max_length); -- if (!form->disabled && -+ if (!FormIsReadonly(form) && - !(form->submit_method == URL_MAIL_METHOD && no_mail)) { - /* - * If we can edit it, report that we are using the tail. - FM -@@ -702,13 +702,13 @@ static int form_getstr(int cur, - if (c == YES) { - return (ch); - } else { -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - _statusline(ARROWS_OR_TAB_TO_MOVE); - else - _statusline(ENTER_TEXT_ARROWS_OR_TAB); - } - } -- if (form->disabled == YES) { -+ if (FormIsReadonly(form)) { - /* - * Allow actions that don't modify the contents even in - * disabled form fields, so the user can scroll through the -@@ -857,7 +857,7 @@ void show_formlink_statusline(const FormInfo * form, - { - switch (form->type) { - case F_PASSWORD_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - statusline(FORM_LINK_PASSWORD_UNM_MSG); - else - #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION -@@ -868,25 +868,25 @@ void show_formlink_statusline(const FormInfo * form, - statusline(FORM_LINK_PASSWORD_MESSAGE); - break; - case F_OPTION_LIST_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - statusline(FORM_LINK_OPTION_LIST_UNM_MSG); - else - statusline(FORM_LINK_OPTION_LIST_MESSAGE); - break; - case F_CHECKBOX_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - statusline(FORM_LINK_CHECKBOX_UNM_MSG); - else - statusline(FORM_LINK_CHECKBOX_MESSAGE); - break; - case F_RADIO_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - statusline(FORM_LINK_RADIO_UNM_MSG); - else - statusline(FORM_LINK_RADIO_MESSAGE); - break; - case F_TEXT_SUBMIT_TYPE: -- if (form->disabled == YES) { -+ if (FormIsReadonly(form)) { - statusline(FORM_LINK_TEXT_SUBMIT_UNM_MSG); - } else if (form->submit_method == - URL_MAIL_METHOD) { -@@ -934,7 +934,7 @@ void show_formlink_statusline(const FormInfo * form, - break; - case F_SUBMIT_TYPE: - case F_IMAGE_SUBMIT_TYPE: -- if (form->disabled == YES) { -+ if (FormIsReadonly(form)) { - statusline(FORM_LINK_SUBMIT_DIS_MSG); - } else if (form->submit_method == - URL_MAIL_METHOD) { -@@ -977,25 +977,25 @@ void show_formlink_statusline(const FormInfo * form, - } - break; - case F_RESET_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - statusline(FORM_LINK_RESET_DIS_MSG); - else - statusline(FORM_LINK_RESET_MESSAGE); - break; - case F_BUTTON_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - statusline(FORM_LINK_BUTTON_DIS_MSG); - else - statusline(FORM_LINK_BUTTON_MESSAGE); - break; - case F_FILE_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - statusline(FORM_LINK_FILE_UNM_MSG); - else - statusline(FORM_LINK_FILE_MESSAGE); - break; - case F_TEXT_TYPE: -- if (form->disabled == YES) -+ if (FormIsReadonly(form)) - statusline(FORM_LINK_TEXT_UNM_MSG); - else - #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION -@@ -1006,7 +1006,7 @@ void show_formlink_statusline(const FormInfo * form, - statusline(FORM_LINK_TEXT_MESSAGE); - break; - case F_TEXTAREA_TYPE: -- if (form->disabled == YES) { -+ if (FormIsReadonly(form)) { - statusline(FORM_LINK_TEXT_UNM_MSG); - } else { - char *submit_str = NULL; -diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c -index b8a0fa9..55d5c50 100644 ---- a/src/LYMainLoop.c -+++ b/src/LYMainLoop.c -@@ -1183,7 +1183,7 @@ static int handle_LYK_ACTIVATE(int *c, - if (user_mode == NOVICE_MODE && - textinput_activated && - (real_cmd == LYK_ACTIVATE || real_cmd == LYK_SUBMIT)) { -- form_noviceline(links[curdoc.link].l_form->disabled); -+ form_noviceline(FormIsReadonly(links[curdoc.link].l_form)); - } - } - -@@ -2522,7 +2522,7 @@ static void handle_LYK_DWIMHELP(const char **cshelpfile) - */ - if (curdoc.link >= 0 && curdoc.link < nlinks && - links[curdoc.link].type == WWW_FORM_LINK_TYPE && -- !links[curdoc.link].l_form->disabled && -+ !FormIsReadonly(links[curdoc.link].l_form) && - F_TEXTLIKE(links[curdoc.link].l_form->type)) { - *cshelpfile = LYLineeditHelpURL(); - } -@@ -2989,7 +2989,7 @@ static BOOLEAN handle_LYK_HEAD(int *cmd) - strncmp(curdoc.address, "http", 4))) { - HTUserMsg(LINK_NOT_HTTP_URL); - } else if (links[curdoc.link].type == WWW_FORM_LINK_TYPE && -- links[curdoc.link].l_form->disabled) { -+ FormIsReadonly(links[curdoc.link].l_form)) { - HTUserMsg(FORM_ACTION_DISABLED); - } else if (links[curdoc.link].type == WWW_FORM_LINK_TYPE && - links[curdoc.link].l_form->submit_action != 0 && -@@ -6539,7 +6539,7 @@ int mainloop(void) - * Replace novice lines if in NOVICE_MODE. - */ - if (user_mode == NOVICE_MODE) { -- form_noviceline(links[curdoc.link].l_form->disabled); -+ form_noviceline(FormIsReadonly(links[curdoc.link].l_form)); - } - real_c = change_form_link(curdoc.link, - &newdoc, &refresh_screen, -@@ -6569,7 +6569,7 @@ int mainloop(void) - #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION - } else if (LinkIsTextarea(curdoc.link) - && textfields_need_activation -- && !links[curdoc.link].l_form->disabled -+ && !FormIsReadonly(links[curdoc.link].l_form) - && peek_mouse_link() < 0 && - (((LKC_TO_LAC(keymap, real_c) == LYK_NEXT_LINK || - #ifdef TEXTAREA_AUTOGROW -diff --git a/src/structdump.h b/src/structdump.h -index f9be55a..a084486 100644 ---- a/src/structdump.h -+++ b/src/structdump.h -@@ -109,6 +109,7 @@ CTRACE((tfp, "\n" \ - "orig_submit_value=|%s|\n" \ - " size_l=%d\n" \ - " disabled=%d\n" \ -+ " readonly=%d\n" \ - " name_cs=%d\n" \ - " value_cs=%d\n" \ - " accept_cs=|%s|\n" \ -@@ -120,7 +121,7 @@ CTRACE((tfp, "\n" \ - (F)->hrange, (F)->lrange, (F)->select_list, (F)->submit_action, \ - (F)->submit_method, (F)->submit_enctype, (F)->submit_title, \ - (F)->no_cache, (F)->cp_submit_value, (F)->orig_submit_value, \ -- (F)->size_l, (F)->disabled, (F)->name_cs, (F)->value_cs, \ -+ (F)->size_l, (F)->disabled, (F)->readonly, (F)->name_cs, (F)->value_cs, \ - (F)->accept_cs)); \ - } else { \ - CTRACE((tfp, "\n" \ --- -1.7.4.4 - diff --git a/lynx-2.8.7-ipv6arg.patch b/lynx-2.8.7-ipv6arg.patch deleted file mode 100644 index 129e247..0000000 --- a/lynx-2.8.7-ipv6arg.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/src/LYUtils.c b/src/LYUtils.c -index dd0a3dc..62a0591 100644 ---- a/src/LYUtils.c -+++ b/src/LYUtils.c -@@ -2283,9 +2283,10 @@ UrlTypes is_url(char *filename) - return (result); - - /* -- * Can't be a URL if it lacks a colon. -+ * Can't be a URL if it lacks a colon and if it starts with '[' it's -+ * probably IPv6 adress. - */ -- if (NULL == strchr(cp, ':')) -+ if (NULL == strchr(cp, ':') || cp[0] == '[') - return (result); - - /* -@@ -4549,6 +4550,8 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString, - #ifdef INET6 - struct addrinfo hints, *res; - int error; -+ char *begin; -+ char *end = NULL; - #endif /* INET6 */ - - /* -@@ -4593,7 +4596,7 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString, - * field after filling in the host field. - FM - */ - if ((StrColon = strrchr(Str, ':')) != NULL && -- isdigit(UCH(StrColon[1]))) { -+ isdigit(UCH(StrColon[1])) && strchr(StrColon, ']') == NULL) { - if (StrColon == Str) { - goto cleanup; - } -@@ -4614,10 +4617,20 @@ BOOLEAN LYExpandHostForURL(char **AllocatedString, - fprintf(stdout, "%s '%s'%s\r\n", WWW_FIND_MESSAGE, host, FIRST_SEGMENT); - } - #ifdef INET6 -+ begin = host; -+ if (host[0] == '[' && ((end = strrchr(host, ']')))) { -+ /* -+ * cut '[' and ']' from the IPv6 address, e.g. [::1] -+ */ -+ begin = host + 1; -+ *end = '\0'; -+ } - memset(&hints, 0, sizeof(hints)); - hints.ai_family = PF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; -- error = getaddrinfo(host, "80", &hints, &res); -+ error = getaddrinfo(begin, "80", &hints, &res); -+ if (end) -+ *end = ']'; - - if (!error && res) - #else diff --git a/lynx-2.8.7-locale.patch b/lynx-2.8.7-locale.patch deleted file mode 100644 index 9edcb68..0000000 --- a/lynx-2.8.7-locale.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/LYMain.c b/src/LYMain.c -index b3a00cc..126a30f 100644 ---- a/src/LYMain.c -+++ b/src/LYMain.c -@@ -57,7 +57,7 @@ - #include - #endif - --#if defined(LOCALE) && !defined(HAVE_LIBINTL_H) -+#if defined(LOCALE) - #undef gettext /* Solaris locale.h prototypes gettext() */ - #include - #ifndef HAVE_GETTEXT diff --git a/lynx-2.8.7-man-typo.patch b/lynx-2.8.7-man-typo.patch deleted file mode 100644 index 895b9f3..0000000 --- a/lynx-2.8.7-man-typo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 37ebbbb71163b0153cb10bfa0247f32ad20c31c3 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Fri, 7 Sep 2012 13:48:12 +0200 -Subject: [PATCH] rhbz#854574 - fix typo in the man page - ---- - lynx.hlp | 2 +- - lynx.man | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lynx.hlp b/lynx.hlp -index 583155b..0207297 100644 ---- a/lynx.hlp -+++ b/lynx.hlp -@@ -93,7 +93,7 @@ - -base prepend a request URL comment and BASE tag to text/html outputs - for -source dumps. - -- -bibp=URL -+ -bibhost=URL - specify a local bibp server (default http://bibhost/). - - -blink forces high intensity background colors for color mode, if -diff --git a/lynx.man b/lynx.man -index 5f62bf5..415c83d 100644 ---- a/lynx.man -+++ b/lynx.man -@@ -129,7 +129,7 @@ this switch. - prepend a request URL comment and BASE tag to text/html - outputs for \fB\-source\fR dumps. - .TP --.B \-bibp\fR=\fIURL -+.B \-bibhost\fR=\fIURL - specify a local bibp server (default http://bibhost/). - .TP - .B \-blink --- -1.7.1 - diff --git a/lynx-build-fixes.patch b/lynx-2.8.8-build.patch similarity index 60% rename from lynx-build-fixes.patch rename to lynx-2.8.8-build.patch index 18a5765..4d4ad71 100644 --- a/lynx-build-fixes.patch +++ b/lynx-2.8.8-build.patch @@ -1,17 +1,27 @@ +From 1d1198847124798b7467d33b2aee2d8cdffc6a24 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Wed, 13 Feb 2013 15:25:00 +0100 +Subject: [PATCH] prepare upstream sources for parallel make + +--- + makefile.in | 46 ++++++++++++++++++++++------------------------ + src/makefile.in | 10 ++++------ + 2 files changed, 26 insertions(+), 30 deletions(-) + diff --git a/makefile.in b/makefile.in -index d84837e..b245f38 100644 +index 671ae0f..feb9a24 100644 --- a/makefile.in +++ b/makefile.in -@@ -96,8 +96,6 @@ COMPRESS_EXT=@COMPRESS_EXT@ +@@ -101,8 +101,6 @@ COMPRESS_EXT=@COMPRESS_EXT@ # Path of scripts directory scripts_dir=$(srcdir)/scripts --MAKE_RECUR = $(MAKE) DESTDIR="$(DESTDIR)" CC="$(CC)" +-MAKE_RECUR = $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" - + @LYNXCFG_MAKE@CFG2HTML = alphatoc.html body.html cattoc.html + # !!!!!!!!!!! SUN resolv LIBRARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - # To include resolv in the LIBS="" list for SUN 3, 4 or Solaris OS, - # point RESOLVLIB to that library. You need this if you get the message -@@ -189,13 +187,13 @@ SRC_CFLAGS = \ +@@ -199,19 +197,19 @@ binary_PROG = $(actual_PROG)$x all lynx$x: cfg_defs.h LYHelp.h @MSG_DIR_MAKE@ $(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c @@ -25,12 +35,22 @@ index d84837e..b245f38 100644 lint: - cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@ - cd $(SRC_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(SRC_CFLAGS) $@ +- cd $(CHR_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $@ + $(MAKE) -C $(WWW_DIR) LINT="$(LINT)" $(WWW_CFLAGS) $@ + $(MAKE) -C $(SRC_DIR) LINT="$(LINT)" $(SRC_CFLAGS) $@ ++ $(MAKE) -C $(CHR_DIR) LINT="$(LINT)" $@ - help: - @echo -@@ -212,27 +210,27 @@ help: + tags: +- cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS) $@ +- cd $(SRC_DIR) && $(MAKE_RECUR) $(SRC_CFLAGS) $@ +- cd $(CHR_DIR) && $(MAKE_RECUR) $@ ++ $(MAKE) -C $(WWW_DIR) $(WWW_CFLAGS) $@ ++ $(MAKE) -C $(SRC_DIR) $(SRC_CFLAGS) $@ ++ $(MAKE) -C $(CHR_DIR) $@ + + etags: + $(ETAGS) *.[ch] */*.[ch] */*/*.[ch] */*/*/*.[ch] +@@ -231,27 +229,27 @@ help: clean: rm -f WWW/Library/*/*.[aoib] rm -f WWW/Library/*/.created @@ -42,7 +62,7 @@ index d84837e..b245f38 100644 -@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@ +@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) $@ rm -f *.b $(SRC_DIR)/lynx$x *.leaks cfg_defs.h LYHelp.h lint.* - @LYNXCFG_MAKE@ -rm -f alphatoc.html body.html cattoc.html tmp007 + @LYNXCFG_MAKE@ -rm -f $(CFG2HTML) rm -f help_files.sed rm -f core *.core @@ -60,88 +80,98 @@ index d84837e..b245f38 100644 - -cd $(SRC_DIR) && $(MAKE_RECUR) $@ - -cd $(CHR_DIR) && $(MAKE_RECUR) $@ -@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) $@ -+ $(MAKE) -C $(WWW_DIR) $@ -+ $(MAKE) -C $(SRC_DIR) $@ -+ $(MAKE) -C $(CHR_DIR) $@ ++ -$(MAKE) -C $(WWW_DIR) $@ ++ -$(MAKE) -C $(SRC_DIR) $@ ++ -$(MAKE) -C $(CHR_DIR) $@ +@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) $@ @MSG_DIR_MAKE@ -rmdir $(PO_DIR) -rm -f *~ *.bak *.sav tags TAGS -rm -f $(WWW_DIR)/makefile $(SRC_DIR)/makefile $(CHR_DIR)/makefile -@@ -301,7 +299,7 @@ install-full: install install-help install-doc +@@ -320,7 +318,7 @@ install-full: install install-help install-doc @echo Full installation complete. install-bin: $(BINDIR) lynx$x -@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) install +@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) install @ECHO_CC@$(SHELL) -c \ - 'if test -f $(BINDIR)/lynx$x ; then \ - mv -f $(BINDIR)/lynx$x $(BINDIR)/lynx.old; fi' -@@ -361,7 +359,7 @@ install-help : help_files.sed $(HELPDIR) - - (cd $(HELPDIR) && WD=`pwd` && HEAD=`echo $$WD|sed -e 's!/lynx_help$$!!'` && test $$WD != $$HEAD && rm -fr *) - test -d $(HELPDIR)/keystrokes || mkdir $(HELPDIR)/keystrokes + 'if test -f $(BINDIR)/$(binary_PROG) ; then \ + mv -f $(BINDIR)/$(binary_PROG) $(BINDIR)/lynx.old; fi' +@@ -354,7 +352,7 @@ LYNXHELP_URL='$(LYNX_URL)/lynx_help/' + + @LYNXCFG_MAKE@$(CFG2HTML) : @LYNXCFG_MAKE@ @echo 'Making htmlized lynx.cfg' -@LYNXCFG_MAKE@ cd $(SRC_DIR) && $(MAKE_RECUR) LYReadCFG.i +@LYNXCFG_MAKE@ $(MAKE) -C $(SRC_DIR) LYReadCFG.i - @LYNXCFG_MAKE@ @-rm -f alphatoc.html body.html cattoc.html + @LYNXCFG_MAKE@ @-rm -f $(CFG2HTML) @LYNXCFG_MAKE@ sed -n -e '/Config_Type *Config_Table/,/{0, *0, *0}/ p' $(SRC_DIR)/LYReadCFG.i | \ @LYNXCFG_MAKE@ sed -e 's/ *{ *"\([^"]*\)".*/\1/' | \ -@@ -426,7 +424,7 @@ install-lss : $(SYSCONFDIR) +@@ -452,7 +450,7 @@ install-lss : $(SYSCONFDIR) @$(SHELL) $(scripts_dir)/install-lss.sh "$(INSTALL_DATA)" $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss uninstall :: -@MSG_DIR_MAKE@ cd $(PO_DIR) && $(MAKE_RECUR) uninstall +@MSG_DIR_MAKE@ $(MAKE) -C $(PO_DIR) uninstall - -rm -f $(BINDIR)/lynx$x - -rm -f $(MANDIR)/lynx.1 + -rm -f $(BINDIR)/$(binary_PROG) + -rm -f $(MANDIR)/$(actual_PROG).1 -rm -f $(SYSCONFDIR)/lynx.cfg -@@ -443,7 +441,7 @@ uninstall-doc :: +@@ -485,7 +483,7 @@ uninstall-doc :: update-po: rsync -Lrtvz translationproject.org::tp/latest/lynx/ $(PO_SRCDIR) - test -f $(PO_SRCDIR)/makefile && cd $(PO_SRCDIR) && $(MAKE_RECUR) $@ + test -f $(PO_SRCDIR)/makefile && $(MAKE) -C $(PO_SRCDIR) $@ - $(BINDIR) \ - $(MANDIR) \ + preinstall : + @ echo '' diff --git a/src/makefile.in b/src/makefile.in -index 4183bf0..d9c1587 100644 +index a18b653..589df1a 100644 --- a/src/makefile.in +++ b/src/makefile.in -@@ -110,7 +110,7 @@ message: +@@ -35,8 +35,6 @@ BUILD_CFLAGS = @BUILD_CFLAGS@ + BUILD_CPPFLAGS = @BUILD_CPPFLAGS@ @DEFS@ + BUILD_EXEEXT = @BUILD_EXEEXT@ + +-MAKE_RECUR = $(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" +- + YACC = @YACC@ + WINDRES = @WINDRES@ + +@@ -116,7 +114,7 @@ message: @echo "Compiling Lynx sources" do_chartrans_stuff: -- -cd chrtrans && $(MAKE) \ -+ $(MAKE) -C chrtrans \ +- -cd chrtrans && $(MAKE_RECUR) \ ++ -$(MAKE) -C chrtrans \ SITE_DEFS="$(SITE_DEFS)" \ BUILD_CFLAGS="$(BUILD_CFLAGS)" \ BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \ -@@ -123,7 +123,7 @@ lint: +@@ -129,7 +127,7 @@ lint: clean: rm -f lynx$x core *.core *.leaks *.i *$o *.bak tags TAGS test_* -- cd chrtrans && $(MAKE) clean +- cd chrtrans && $(MAKE_RECUR) clean + $(MAKE) -C chrtrans clean tags: - ctags *.[ch] -@@ -194,8 +194,8 @@ TABLES= \ - $(CHRTR)utf8_uni.h \ + $(CTAGS) *.[ch] +@@ -207,7 +205,7 @@ TABLES= \ $(CHRTR)viscii_uni.h --$(TABLES): -- -cd chrtrans && $(MAKE) tables -+$(TABLES): chrtrans/makeuctb$(BUILD_EXEEXT) -+ $(MAKE) -C chrtrans tables + $(TABLES): +- -cd chrtrans && $(MAKE_RECUR) tables ++ -$(MAKE) -C chrtrans tables UCdomap$o : UCdomap.c \ chrtrans/UCkd.h \ -@@ -204,7 +204,7 @@ UCdomap$o : UCdomap.c \ +@@ -216,7 +214,7 @@ UCdomap$o : UCdomap.c \ UCdomap.h $(CMN)UCMap.h $(TABLES) $(top_srcdir)/userdefs.h chrtrans/makeuctb$(BUILD_EXEEXT): -- cd chrtrans; make makeuctb$(BUILD_EXEEXT) +- cd chrtrans && $(MAKE_RECUR) makeuctb$(BUILD_EXEEXT) + $(MAKE) -C chrtrans makeuctb$(BUILD_EXEEXT) UCAux$o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h LYCookie$o : $(top_srcdir)/userdefs.h +-- +1.7.1 + diff --git a/lynx-2.8.8-locale.patch b/lynx-2.8.8-locale.patch new file mode 100644 index 0000000..d049171 --- /dev/null +++ b/lynx-2.8.8-locale.patch @@ -0,0 +1,25 @@ +From d8a64ed1d63710ad764fbf3b1fb28d08204f9e72 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Wed, 13 Feb 2013 15:28:36 +0100 +Subject: [PATCH] avoid build failure caused by mistakenly excluded + +--- + src/LYMain.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/LYMain.c b/src/LYMain.c +index 9528be2..aaddb7b 100644 +--- a/src/LYMain.c ++++ b/src/LYMain.c +@@ -58,7 +58,7 @@ + #include + #endif + +-#if defined(LOCALE) && (!defined(HAVE_LIBINTL_H) || !defined(LC_ALL)) ++#if defined(LOCALE) + #undef gettext /* Solaris locale.h prototypes gettext() */ + #include + #ifndef HAVE_GETTEXT +-- +1.7.1 + diff --git a/lynx-2.8.6-redhat.patch b/lynx-2.8.8-redhat.patch similarity index 79% rename from lynx-2.8.6-redhat.patch rename to lynx-2.8.8-redhat.patch index 84ef5ce..5291ac6 100644 --- a/lynx-2.8.6-redhat.patch +++ b/lynx-2.8.8-redhat.patch @@ -1,13 +1,19 @@ - lynx.cfg | 13 ++++++++++--- +From 8c053103d8253f5868807853cb7b921e5cb07214 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Wed, 13 Feb 2013 15:17:08 +0100 +Subject: [PATCH] lynx-2.8.6-redhat.patch rebased for 2.8.8 + +--- + lynx.cfg | 14 +++++++++++--- userdefs.h | 16 ++++++++-------- - 2 files changed, 18 insertions(+), 11 deletions(-) + 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/lynx.cfg b/lynx.cfg -index bbb74da..8759699 100644 +index ee2aad3..f732558 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -1,8 +1,11 @@ - # $LynxId: lynx.cfg,v 1.180 2009/06/07 17:02:21 tom Exp $ + # $LynxId: lynx.cfg,v 1.222 2012/11/14 01:18:19 tom Exp $ # lynx.cfg file. -# The default placement for this file is /usr/local/lib/lynx.cfg (Unix) +# The default placement for this file is /etc/lynx.cfg (Red Hat Linux, Fedora) @@ -17,9 +23,9 @@ index bbb74da..8759699 100644 +# Linux update, overwriting your changes). Instead, edit /etc/lynx-site.cfg. +# # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$ - #PRCS LYNX_VERSION "2.8.7rel.2" + #PRCS LYNX_VERSION "2.8.8dev.15" # -@@ -93,7 +96,7 @@ +@@ -90,7 +93,7 @@ # # Normally we expect you will connect to a remote site, e.g., the Lynx starting # site: @@ -28,35 +34,36 @@ index bbb74da..8759699 100644 # # As an alternative, you may want to use a local URL. A good choice for this is # the user's home directory: -@@ -442,7 +445,7 @@ DEFAULT_INDEX_FILE:http://www.google.com/ - # Lynx (case insensitive). - # Find RFC 1345 at http://www.ics.uci.edu/pub/ietf/uri/rfc1345.txt . +@@ -436,7 +439,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ + # Find RFC 1345 at + .url http://tools.ietf.org/html/rfc1345 # -#CHARACTER_SET:iso-8859-1 +CHARACTER_SET:utf-8 .h2 LOCALE_CHARSET # LOCALE_CHARSET overrides CHARACTER_SET if true, using the current locale to -@@ -1857,6 +1860,9 @@ LOCALE_CHARSET:TRUE +@@ -1817,6 +1820,10 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ .ex #DOWNLOADER:Save OS/390 binary file: iconv -f IBM-1047 -t ISO8859-1 %s >%s:FALSE +# Added by Red Hat: +DOWNLOADER:View with less:less %s:TRUE + - ++ .h1 Interaction -@@ -3472,6 +3478,7 @@ COLOR:6:brightred:black - #ENABLE_LYNXRC:vi_keys:ON - #ENABLE_LYNXRC:visited_links:ON + .h2 NO_DOT_FILES +@@ -3397,6 +3404,7 @@ COLOR:6:brightred:black + #ENABLE_LYNXRC:VI_KEYS:ON + #ENABLE_LYNXRC:VISITED_LINKS:ON .fi +INCLUDE:/etc/lynx-site.cfg .h1 External Programs # Any of the compiled-in pathnames of external programs can be overridden diff --git a/userdefs.h b/userdefs.h -index 88f50b4..304b4ee 100644 +index 066e01b..45a1642 100644 --- a/userdefs.h +++ b/userdefs.h @@ -105,7 +105,7 @@ @@ -88,7 +95,7 @@ index 88f50b4..304b4ee 100644 #define PERSONAL_MAILCAP ".mailcap" /************************** -@@ -289,7 +289,7 @@ +@@ -295,7 +295,7 @@ #ifdef DOSPATH #define LYNX_CFG_FILE "./lynx.cfg" #else @@ -97,7 +104,7 @@ index 88f50b4..304b4ee 100644 #endif /* DOSPATH */ #endif /* LYNX_CFG_FILE */ #endif /* HAVE_CONFIG_H */ -@@ -333,7 +333,7 @@ +@@ -339,7 +339,7 @@ * use any default viewers for image types. Note that open is used as * the default for NeXT, instead of the XLOADIMAGE_COMMAND definition. */ @@ -106,7 +113,7 @@ index 88f50b4..304b4ee 100644 /************************** * For UNIX systems, SYSTEM_MAIL and SYSTEM_MAIL_FLAGS are set by the -@@ -354,7 +354,7 @@ +@@ -360,7 +360,7 @@ * the "TMPDIR" (unix), or "TEMP" or "TMP" (Windows,DOS,OS/2) * variable. */ @@ -115,7 +122,7 @@ index 88f50b4..304b4ee 100644 /******************************** * Comment this line out to disable code that implements command logging -@@ -1156,7 +1156,7 @@ +@@ -1162,7 +1162,7 @@ * OSU server distribution. */ #ifndef HAVE_CONFIG_H @@ -124,3 +131,6 @@ index 88f50b4..304b4ee 100644 #endif /********************************* +-- +1.7.1 + diff --git a/lynx-CVE-2008-4690.patch b/lynx-CVE-2008-4690.patch index 57867a3..15353da 100644 --- a/lynx-CVE-2008-4690.patch +++ b/lynx-CVE-2008-4690.patch @@ -1,13 +1,22 @@ +From c60c227ab9a36246730d7454e33d40d2c66c88b3 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Wed, 13 Feb 2013 15:26:22 +0100 +Subject: [PATCH] fix CVE-2008-4690 + +prompt user before executing command via a lynxcgi link even in advanced mode, +as the actual URL may not be shown but hidden behind an HTTP redirect and set +TRUSTED_LYNXCGI:none in lynx.cfg to disable all lynxcgi URLs by default +--- CHANGES | 7 +++++++ lynx.cfg | 2 +- src/LYCgi.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES -index 7b131be..3a89866 100644 +index 360be68..8eca013 100644 --- a/CHANGES +++ b/CHANGES -@@ -248,6 +248,13 @@ Changes since Lynx 2.8 release +@@ -721,6 +721,13 @@ Changes since Lynx 2.8 release * update win32 makefiles/build scripts to add LYmktime, parsdate modules -TD * update config.guess (2008-04-14), config.sub (2008-06-16) @@ -22,23 +31,23 @@ index 7b131be..3a89866 100644 * remove rw.po, since the translation project no longer supplies it -TD * implement "readonly" attribute for TEXTAREA and TEXT fields -TD diff --git a/lynx.cfg b/lynx.cfg -index 8759699..e048634 100644 +index ee2aad3..144050d 100644 --- a/lynx.cfg +++ b/lynx.cfg -@@ -1081,7 +1081,7 @@ LOCALE_CHARSET:TRUE +@@ -1061,7 +1061,7 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/ # # The default TRUSTED_LYNXCGI rule is "none". # -#TRUSTED_LYNXCGI:none +TRUSTED_LYNXCGI:none - .h2 LYNXCGI_ENVIRONMENT + # Unix: diff --git a/src/LYCgi.c b/src/LYCgi.c -index cfaf18f..aceed8d 100644 +index 832bb89..0ae8a7e 100644 --- a/src/LYCgi.c +++ b/src/LYCgi.c -@@ -167,7 +167,7 @@ static BOOL can_exec_cgi(const char *linktext, const char *linkargs) +@@ -164,7 +164,7 @@ static BOOL can_exec_cgi(const char *linktext, const char *linkargs) if (!exec_ok(HTLoadedDocumentURL(), linktext, CGI_PATH)) { /* exec_ok gives out msg. */ result = FALSE; @@ -47,3 +56,6 @@ index cfaf18f..aceed8d 100644 StrAllocCopy(command, linktext); if (non_empty(linkargs)) { HTSprintf(&command, " %s", linkargs); +-- +1.7.1 + diff --git a/lynx.spec b/lynx.spec index 9ce115f..6ad925a 100644 --- a/lynx.spec +++ b/lynx.spec @@ -1,43 +1,28 @@ +%global devrel 15 + Summary: A text-based Web browser Name: lynx -Version: 2.8.7 -Release: 12%{?dist} +Version: 2.8.8 +Release: 0.1.dev%{devrel}%{?dist} License: GPLv2 Group: Applications/Internet -Source: http://lynx.isc.org/lynx%{version}/lynx%{version}.tar.bz2 +Source: http://lynx.isc.org/current/lynx%{version}dev.%{devrel}.tar.bz2 URL: http://lynx.isc.org/ # RH specific tweaks - directory layout, utf-8 by default, misc. configuration -# and home page -Patch0: lynx-2.8.6-redhat.patch - -# tweaks colors -Patch1: lynx-2.8.6-backgrcolor.patch +Patch0: lynx-2.8.8-redhat.patch # patch preparing upstream sources for rpmbuild, in particular for parallel make -Patch2: lynx-build-fixes.patch +Patch1: lynx-2.8.8-build.patch # prompt user before executing command via a lynxcgi link even in advanced mode, # as the actual URL may not be shown but hidden behind an HTTP redirect and set # TRUSTED_LYNXCGI:none in lynx.cfg to disable all lynxcgi URLs by default # [CVE-2008-4690] -Patch3: lynx-CVE-2008-4690.patch - -# make it possible to delete a bookmark when ~/lynx_bookmarks.html is writable -# by group (#486070) -Patch4: lynx-2.8.7-bm-del.patch +Patch2: lynx-CVE-2008-4690.patch # avoid build failure caused by mistakenly excluded -Patch5: lynx-2.8.7-locale.patch - -# bz #425879 -Patch6: lynx-2.8.7-ipv6arg.patch - -# include read-only text fields on form submission (#679266) -Patch8: lynx-2.8.7-bz679266.patch - -# fix typo in the man page (#854574) -Patch9: lynx-2.8.7-man-typo.patch +Patch3: lynx-2.8.8-locale.patch Provides: webclient Provides: text-www-browser @@ -63,17 +48,12 @@ advantage Lynx has over graphical browsers is speed; Lynx starts and exits quickly and swiftly displays web pages. %prep -%setup -q -n lynx2-8-7 +%setup -q -n lynx2-8-8 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch8 -p1 -%patch9 -p1 perl -pi -e "s,^HELPFILE:.*,HELPFILE:file://localhost/usr/share/doc/lynx-%{version}/lynx_help/lynx_help_main.html,g" lynx.cfg perl -pi -e "s,^DEFAULT_INDEX_FILE:.*,DEFAULT_INDEX_FILE:http://www.google.com/,g" lynx.cfg @@ -160,6 +140,11 @@ EOF %config(noreplace,missingok) %{_sysconfdir}/lynx-site.cfg %changelog +* Wed Feb 13 2013 Kamil Dudka - 2.8.8-0.1.dev15 +- update to the latest upstream pre-release +- drop applied patches +- drop lynx-2.8.6-backgrcolor.patch (#908449) + * Tue Sep 11 2012 Kamil Dudka - 2.8.7-12 - set STARTFILE to a local file when building for RHEL diff --git a/lynx2.8.8dev.15.tar.bz2.asc b/lynx2.8.8dev.15.tar.bz2.asc new file mode 100644 index 0000000..06caea4 --- /dev/null +++ b/lynx2.8.8dev.15.tar.bz2.asc @@ -0,0 +1,8 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (FreeBSD) +Comment: See http://lynx.isc.org/signatures.html for info + +iEYEABECAAYFAlCpfTgACgkQXd+Pt2iOMaZCfQCaAzw/4dnuOKhXkLrawVwEAoXP +AOoAoKBdxibuBfNyDI6XKa5TS1gn7MaH +=48Ft +-----END PGP SIGNATURE----- diff --git a/sources b/sources index ab3a5e2..d9e5ab3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb936aef812e4e463ab86cbbe14d4db9 lynx2.8.7.tar.bz2 +3dbf5699cc987598139634350a514592 lynx2.8.8dev.15.tar.bz2