cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to links 2.1pre12.

Browse Source
This commit is contained in:
fgsch 2003-09-23 06:35:33 +00:00
parent 34678ea2bf
commit e04ad54e3c
16 changed files with 80 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/links+/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.13 2003/06/12 13:47:44 brad Exp $
# $OpenBSD: Makefile,v 1.14 2003/09/23 06:35:33 fgsch Exp $
COMMENT= "graphics and text browser with javascript support"
VER= 2.1pre11
VER= 2.1pre12
DISTNAME= links-${VER}
PKGNAME= links+-${VER}
CATEGORIES= www

6
www/links+/distinfo
View File

@ -1,3 +1,3 @@
MD5 (links-2.1pre11.tar.gz) = 325859986e8a130d500b1407cba44383
RMD160 (links-2.1pre11.tar.gz) = 3d95971ae818d52884ae87de4c0c6f59bb59c2ab
SHA1 (links-2.1pre11.tar.gz) = d34d9c01f18146fcbee7e6d797afda19e3298f03
MD5 (links-2.1pre12.tar.gz) = 62548242a1df8a26d23730cdb1ee096e
RMD160 (links-2.1pre12.tar.gz) = a02b3c7db4ddfa1c5ca8af3b2b5541401d549f60
SHA1 (links-2.1pre12.tar.gz) = b3a316118528555b7c9b30ca1b9f40c316b9b5c3

16
www/links+/patches/patch-Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.3 2003/06/12 13:47:44 brad Exp $
--- Makefile.in.orig Thu May 22 14:53:02 2003
+++ Makefile.in Wed Jun 4 08:58:58 2003
$OpenBSD: patch-Makefile_in,v 1.4 2003/09/23 06:35:33 fgsch Exp $
--- Makefile.in.orig 2003-09-21 04:57:56.000000000 -0300
+++ Makefile.in 2003-09-23 02:55:51.000000000 -0300
@@ -99,7 +99,7 @@ https.o img.o imgcache.o ipret.o javascr
kbd.o language.o links_icon.o listedit.o lru.o mailto.o main.o menu.o \
memory.o md5.o md5hl.o ns.o objreq.o os_dep.o pmshell.o png.o pomocny.o \
sched.o select.o session.o svgalib.o terminal.o tiff.o types.o url.o \
-view.o view_gr.o win32.o x.o xbm.o
+view.o view_gr.o win32.o x.o xbm.o auth.o
kbd.o language.o links_icon.o listedit.o lru.o mailto.o main.o md5.o \
md5hl.o menu.o memory.o ns.o objreq.o os_dep.o pmshell.o png.o \
pomocny.o sched.o select.o session.o svgalib.o terminal.o tiff.o \
-types.o url.o view.o view_gr.o win32.o x.o xbm.o
+types.o url.o view.o view_gr.o win32.o x.o xbm.o auth.o
@ATHEOS_GR_TRUE@links_DEPENDENCIES = atheos.o
links_LDFLAGS =
CFLAGS = @CFLAGS@

10
www/links+/patches/patch-default_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-default_c,v 1.2 2003/06/12 13:47:44 brad Exp $
--- default.c.orig Thu May 22 12:56:20 2003
+++ default.c Wed Jun 4 08:57:14 2003
@@ -1053,6 +1053,7 @@ int aspect_on=1;
$OpenBSD: patch-default_c,v 1.3 2003/09/23 06:35:33 fgsch Exp $
--- default.c.orig 2003-09-01 17:22:54.000000000 -0300
+++ default.c 2003-09-23 02:55:15.000000000 -0300
@@ -1067,6 +1067,7 @@ int aspect_on=1;
unsigned char download_dir[MAX_STR_LEN] = "";
unsigned char default_anon_pass[MAX_STR_LEN] = "somebody@host.domain";
@ -9,7 +9,7 @@ $OpenBSD: patch-default_c,v 1.2 2003/06/12 13:47:44 brad Exp $
/* These are workarounds for some CGI script bugs */
struct http_bugs http_bugs = { 0, 1, 1, 0, 0, 1 };
@@ -1132,6 +1133,7 @@ struct option links_options[] = {
@@ -1147,6 +1148,7 @@ struct option links_options[] = {
{1, gen_cmd, cp_rd, cp_wr, 0, 0, &bookmarks_codepage, "bookmarks_codepage", "bookmarks-codepage"},
{1, gen_cmd, str_rd, str_wr, 0, MAX_STR_LEN, bookmarks_file, "bookmarks_file", "bookmarks-file"},
{1, gen_cmd, str_rd, str_wr, 0, MAX_STR_LEN, default_anon_pass, "ftp.anonymous_password", "ftp.anonymous-password"},

8
www/links+/patches/patch-ftp_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ftp_c,v 1.1 2002/12/28 21:49:14 fgsch Exp $
--- ftp.c.orig Tue May 7 07:13:18 2002
+++ ftp.c Sat Dec 28 17:20:00 2002
$OpenBSD: patch-ftp_c,v 1.2 2003/09/23 06:35:33 fgsch Exp $
--- ftp.c.orig 2003-09-01 16:40:44.000000000 -0300
+++ ftp.c 2003-09-23 02:58:09.000000000 -0300
@@ -19,6 +19,7 @@ struct ftp_connection_info {
int d;
int dpos;
@ -205,7 +205,7 @@ $OpenBSD: patch-ftp_c,v 1.1 2002/12/28 21:49:14 fgsch Exp $
+ add_chr_to_str(&s, &l, ',');
+ add_num_to_str(&s, &l, pc[5]);
+ }
if (c->from) {
if (c->from && c->no_cache < NC_IF_MOD) {
add_to_str(&s, &l, "\r\nREST ");
add_num_to_str(&s, &l, c->from);
@@ -314,6 +391,8 @@ void ftp_retr_file(struct connection *c,

10
www/links+/patches/patch-html_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-html_c,v 1.4 2003/04/07 19:30:21 fgsch Exp $
--- html.c.orig Tue Feb 11 18:55:00 2003
+++ html.c Fri Apr 4 00:16:18 2003
$OpenBSD: patch-html_c,v 1.5 2003/09/23 06:35:33 fgsch Exp $
--- html.c.orig 2003-08-29 14:05:17.000000000 -0300
+++ html.c 2003-09-23 02:55:15.000000000 -0300
@@ -799,6 +799,7 @@ void html_a(unsigned char *a)
format.target = stracpy(format.target_base);
}
@ -9,7 +9,7 @@ $OpenBSD: patch-html_c,v 1.4 2003/04/07 19:30:21 fgsch Exp $
memcpy(&format.fg, &format.clink, sizeof(struct rgb));
} else if (!ev) kill_html_stack_item(&html_top);
if ((al = get_attr_val(a, "name"))) {
@@ -1663,7 +1664,7 @@ void new_menu_item(unsigned char *name,
@@ -1670,7 +1671,7 @@ void new_menu_item(unsigned char *name,
item->rtext = data == -1 ? ">" : "";
item->hotkey = fullname ? "\000\001" : "\000\000"; /* dirty */
item->func = data == -1 ? MENU_FUNC do_select_submenu : MENU_FUNC selected_item;
@ -18,7 +18,7 @@ $OpenBSD: patch-html_c,v 1.4 2003/04/07 19:30:21 fgsch Exp $
item->in_m = data == -1 ? 1 : 0;
item->free_i = 0;
item++;
@@ -1723,14 +1724,14 @@ void menu_labels(struct menu_item *m, un
@@ -1730,14 +1731,14 @@ void menu_labels(struct menu_item *m, un
}
} else {
if ((bs = stracpy(m->hotkey[1] ? (unsigned char *)"" : base))) add_to_strn(&bs, m->text);

8
www/links+/patches/patch-http_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-http_c,v 1.2 2003/06/12 13:47:44 brad Exp $
--- http.c.orig Thu May 22 03:29:13 2003
+++ http.c Wed Jun 4 09:17:11 2003
$OpenBSD: patch-http_c,v 1.3 2003/09/23 06:35:33 fgsch Exp $
--- http.c.orig 2003-09-01 16:40:44.000000000 -0300
+++ http.c 2003-09-23 02:55:15.000000000 -0300
@@ -157,6 +157,7 @@ void http_send_header(struct connection
int l = 0;
unsigned char *post;
@ -23,7 +23,7 @@ $OpenBSD: patch-http_c,v 1.2 2003/06/12 13:47:44 brad Exp $
if (post) {
unsigned char *pd = strchr(post, '\n');
if (pd) {
@@ -590,6 +598,22 @@ void http_got_header(struct connection *
@@ -592,6 +600,22 @@ void http_got_header(struct connection *
e->redirect_get = h == 303;
}
}

8
www/links+/patches/patch-intl_english_lng
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-intl_english_lng,v 1.4 2003/06/12 13:47:44 brad Exp $
--- intl/english.lng.orig Thu May 22 14:26:01 2003
+++ intl/english.lng Wed Jun 4 08:57:14 2003
@@ -399,6 +399,7 @@ T_ASPECT_CORRECTION_ON, "Aspect correcti
$OpenBSD: patch-intl_english_lng,v 1.5 2003/09/23 06:35:33 fgsch Exp $
--- intl/english.lng.orig 2003-09-01 17:23:00.000000000 -0300
+++ intl/english.lng 2003-09-23 02:55:15.000000000 -0300
@@ -404,6 +404,7 @@ T_ASPECT_CORRECTION_ON, "Aspect correcti
T_KEYBOARD_CODEPAGE, "Keyboard codepage",
T_COPY_LINK_LOCATION, "Copy link location",
T_COPY_URL_LOCATION, "Copy current URL location",

8
www/links+/patches/patch-intl_spanish_lng
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-intl_spanish_lng,v 1.4 2003/06/12 13:47:44 brad Exp $
--- intl/spanish.lng.orig Thu May 22 03:29:33 2003
+++ intl/spanish.lng Wed Jun 4 08:57:14 2003
@@ -399,6 +399,7 @@ T_ASPECT_CORRECTION_ON, NULL,
$OpenBSD: patch-intl_spanish_lng,v 1.5 2003/09/23 06:35:33 fgsch Exp $
--- intl/spanish.lng.orig 2003-09-01 17:23:05.000000000 -0300
+++ intl/spanish.lng 2003-09-23 02:55:15.000000000 -0300
@@ -404,6 +404,7 @@ T_ASPECT_CORRECTION_ON, NULL,
T_KEYBOARD_CODEPAGE, NULL,
T_COPY_LINK_LOCATION, NULL,
T_COPY_URL_LOCATION, NULL,

10
www/links+/patches/patch-ipret_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ipret_c,v 1.3 2003/06/12 13:47:44 brad Exp $
--- ipret.c.orig Tue May 20 13:31:14 2003
+++ ipret.c Wed Jun 4 08:57:15 2003
@@ -3252,22 +3252,22 @@ void for3(js_context*context)
$OpenBSD: patch-ipret_c,v 1.4 2003/09/23 06:35:33 fgsch Exp $
--- ipret.c.orig 2003-08-29 14:05:17.000000000 -0300
+++ ipret.c 2003-09-23 02:55:15.000000000 -0300
@@ -3281,22 +3281,22 @@ void for3(js_context*context)
*/
debug("For3 vracim identifier\n");
if(!context->current->arg[6])
@ -30,7 +30,7 @@ $OpenBSD: patch-ipret_c,v 1.3 2003/06/12 13:47:44 brad Exp $
}
}
if(!context->current->arg[6])
@@ -3292,7 +3292,7 @@ nebo_skrtnem_sirkou: while(!context->cu
@@ -3321,7 +3321,7 @@ nebo_skrtnem_sirkou: while(!context->cu
{ context->current->arg[6]=((lns*)context->current->arg[6])->next;
goto nebo_skrtnem_sirkou;
}

8
www/links+/patches/patch-jsint_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-jsint_c,v 1.3 2003/06/12 13:47:44 brad Exp $
--- jsint.c.orig Thu May 22 12:56:20 2003
+++ jsint.c Wed Jun 4 08:57:15 2003
@@ -2805,7 +2805,7 @@ static void __js_upcall_goto_history_ok_
$OpenBSD: patch-jsint_c,v 1.4 2003/09/23 06:35:33 fgsch Exp $
--- jsint.c.orig 2003-09-01 16:40:44.000000000 -0300
+++ jsint.c 2003-09-23 02:55:15.000000000 -0300
@@ -2810,7 +2810,7 @@ static void __js_upcall_goto_history_ok_
if (a<jsid->n&&(fd->js)&&jsid->js_id==fd->js->ctx->js_id){js_downcall_vezmi_null(fd->js->ctx);return;} /* call downcall */

19
www/links+/patches/patch-links_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-links_h,v 1.7 2003/06/12 13:47:44 brad Exp $
--- links.h.orig Thu May 22 12:56:20 2003
+++ links.h Wed Jun 4 08:57:15 2003
$OpenBSD: patch-links_h,v 1.8 2003/09/23 06:35:33 fgsch Exp $
--- links.h.orig 2003-09-18 08:46:34.000000000 -0300
+++ links.h 2003-09-23 02:55:15.000000000 -0300
@@ -137,6 +137,8 @@ x #endif*/
#define longlong long
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-links_h,v 1.7 2003/06/12 13:47:44 brad Exp $
#include <termios.h>
#include "os_depx.h"
@@ -1027,6 +1029,7 @@ static inline int end_of_dir(unsigned ch
@@ -1028,6 +1030,7 @@ static inline int end_of_dir(unsigned ch
int parse_url(unsigned char *, int *, unsigned char **, int *, unsigned char **, int *, unsigned char **, int *, unsigned char **, int *, unsigned char **, int *, unsigned char **);
unsigned char *get_host_name(unsigned char *);
@ -18,7 +18,7 @@ $OpenBSD: patch-links_h,v 1.7 2003/06/12 13:47:44 brad Exp $
unsigned char *get_host_and_pass(unsigned char *);
unsigned char *get_user_name(unsigned char *);
unsigned char *get_pass(unsigned char *);
@@ -2986,7 +2989,8 @@ struct history {
@@ -3008,7 +3011,8 @@ struct history {
#define D_END 0
#define D_CHECKBOX 1
#define D_FIELD 2
@ -28,7 +28,7 @@ $OpenBSD: patch-links_h,v 1.7 2003/06/12 13:47:44 brad Exp $
#define B_ENTER 1
#define B_ESC 2
@@ -3844,6 +3848,7 @@ struct http_bugs {
@@ -3872,6 +3876,7 @@ struct http_bugs {
extern struct http_bugs http_bugs;
extern unsigned char default_anon_pass[];
@ -36,11 +36,10 @@ $OpenBSD: patch-links_h,v 1.7 2003/06/12 13:47:44 brad Exp $
/* listedit.c */
@@ -3914,5 +3919,30 @@ void save_bookmarks(void);
@@ -3943,4 +3948,29 @@ void save_bookmarks(void);
/* Launches bookmark manager */
void menu_bookmark_manager(struct terminal *, void *, struct session *);
+
+/* auth.h */
+
+struct http_auth_basic {
@ -65,5 +64,5 @@ $OpenBSD: patch-links_h,v 1.7 2003/06/12 13:47:44 brad Exp $
+void do_auth_dialog(struct session *ses);
+
+int need_auth;
+
#endif /* #ifndef _LINKS_H */

14
www/links+/patches/patch-md5_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-md5_c,v 1.1 2002/12/17 08:09:23 fgsch Exp $
--- md5.c.orig Thu May 9 20:12:59 2002
+++ md5.c Tue Dec 17 04:59:22 2002
$OpenBSD: patch-md5_c,v 1.2 2003/09/23 06:35:33 fgsch Exp $
--- md5.c.orig 2002-05-09 20:12:59.000000000 -0300
+++ md5.c 2003-09-23 02:55:15.000000000 -0300
@@ -18,6 +18,10 @@
/* This file is a part of the Links project, released under GPL.
*/
@ -12,11 +12,9 @@ $OpenBSD: patch-md5_c,v 1.1 2002/12/17 08:09:23 fgsch Exp $
#include "links.h"
#ifdef JS
@@ -252,5 +256,7 @@ void MD5Transform(u_int32_t buf[4], u_in
buf[2] += c;
buf[3] += d;
@@ -254,3 +258,5 @@ void MD5Transform(u_int32_t buf[4], u_in
}
+
+#endif
#endif
+
+#endif

14
www/links+/patches/patch-md5hl_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-md5hl_c,v 1.1 2002/12/17 08:09:23 fgsch Exp $
--- md5hl.c.orig Thu May 9 20:12:59 2002
+++ md5hl.c Tue Dec 17 04:59:08 2002
$OpenBSD: patch-md5hl_c,v 1.2 2003/09/23 06:35:33 fgsch Exp $
--- md5hl.c.orig 2002-05-09 20:12:59.000000000 -0300
+++ md5hl.c 2003-09-23 02:55:15.000000000 -0300
@@ -23,6 +23,10 @@
#include <stdlib.h>
*/
@ -12,11 +12,9 @@ $OpenBSD: patch-md5hl_c,v 1.1 2002/12/17 08:09:23 fgsch Exp $
#include "links.h"
#include "md5.h"
@@ -77,5 +81,7 @@ MD5Data (const unsigned char *data, unsi
MD5Update(&ctx,data,len);
return MD5End(&ctx, buf);
@@ -79,3 +83,5 @@ MD5Data (const unsigned char *data, unsi
}
+
+#endif
#endif
+
+#endif

12
www/links+/patches/patch-menu_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-menu_c,v 1.4 2003/06/12 13:47:44 brad Exp $
--- menu.c.orig Thu May 22 03:29:22 2003
+++ menu.c Wed Jun 4 08:57:15 2003
$OpenBSD: patch-menu_c,v 1.5 2003/09/23 06:35:33 fgsch Exp $
--- menu.c.orig 2003-09-01 17:22:57.000000000 -0300
+++ menu.c 2003-09-23 02:55:15.000000000 -0300
@@ -329,7 +329,7 @@ void flush_caches(struct terminal *term,
/* jde v historii o psteps polozek dozadu */
void go_backwards(struct terminal *term, void *psteps, struct session *ses)
@ -64,7 +64,7 @@ $OpenBSD: patch-menu_c,v 1.4 2003/06/12 13:47:44 brad Exp $
}
sel = *ptr;
if (sel < 0) sel = 0;
@@ -755,26 +755,68 @@ int dlg_http_options(struct dialog_data
@@ -751,26 +751,68 @@ int dlg_http_options(struct dialog_data
return 0;
}
@ -148,7 +148,7 @@ $OpenBSD: patch-menu_c,v 1.4 2003/06/12 13:47:44 brad Exp $
do_dialog(dlg->win->term, d, getml(d, NULL));
return 0;
}
@@ -1760,7 +1802,7 @@ void miscelaneous_options(struct termina
@@ -1845,7 +1887,7 @@ void miscelaneous_options(struct termina
void menu_set_language(struct terminal *term, void *pcp, struct session *ses)
{
@ -157,7 +157,7 @@ $OpenBSD: patch-menu_c,v 1.4 2003/06/12 13:47:44 brad Exp $
cls_redraw_all_terminals();
}
@@ -1772,7 +1814,7 @@ void menu_language_list(struct terminal
@@ -1857,7 +1899,7 @@ void menu_language_list(struct terminal
if (!(mi = new_menu(1))) return;
for (i = 0; i < n_languages(); i++) {
n = language_name(i);

10
www/links+/patches/patch-view_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-view_c,v 1.5 2003/06/12 13:47:44 brad Exp $
--- view.c.orig Thu May 22 12:56:21 2003
+++ view.c Wed Jun 4 08:57:15 2003
@@ -1677,7 +1677,7 @@ void back(struct session *ses, struct f_
$OpenBSD: patch-view_c,v 1.6 2003/09/23 06:35:33 fgsch Exp $
--- view.c.orig 2003-09-01 16:40:51.000000000 -0300
+++ view.c 2003-09-23 02:55:15.000000000 -0300
@@ -1692,7 +1692,7 @@ void back(struct session *ses, struct f_
void selected_item(struct terminal *term, void *pitem, struct session *ses)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-view_c,v 1.5 2003/06/12 13:47:44 brad Exp $
int old_item=item;
struct f_data_c *f = current_frame(ses);
struct link *l;
@@ -2522,7 +2522,7 @@ void send_event(struct session *ses, str
@@ -2537,7 +2537,7 @@ void send_event(struct session *ses, str
goto x;
}
if ((upcase(ev->x) == 'Q' && !ev->y) || ev->x == KBD_CTRL_C) {