[packages/links2] - updated to 2.22
witekfl
witekfl at pld-linux.org
Sat Mar 20 19:28:07 CET 2021
commit 1156294474ec86b1690cef18e875e75832996f8b
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date: Sat Mar 20 19:26:46 2021 +0100
- updated to 2.22
ac_config_headers.patch | 10 +++++-----
links2-config-dirs.patch | 23 +++++++++++------------
links2-convert-old-bookmarks.patch | 14 +++++++-------
links2-cookies-save.patch | 36 +++++++++++++++++-------------------
links2.spec | 8 ++++----
5 files changed, 44 insertions(+), 47 deletions(-)
---
diff --git a/links2.spec b/links2.spec
index 5533781..210f1f0 100644
--- a/links2.spec
+++ b/links2.spec
@@ -13,13 +13,13 @@ Summary(pt_BR.UTF-8): O links é um browser para modo texto, similar ao lynx
Summary(ru.UTF-8): Текстовый WWW броузер типа Lynx
Summary(uk.UTF-8): Текстовий WWW броузер типу Lynx
Name: links2
-Version: 2.14
-Release: 3
+Version: 2.22
+Release: 1
Epoch: 1
License: GPL v2
Group: Applications/Networking
Source0: http://links.twibright.com/download/links-%{version}.tar.bz2
-# Source0-md5: 0d11b388de22ba280008a36a409a34c6
+# Source0-md5: 55f745dea500aac52cede98bab8d96e2
Source1: %{name}.desktop
Source2: %{name}.1.pl
Source3: %{name}.png
@@ -117,7 +117,7 @@ Links - це текстовий WWW броузер, на перший погля
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch10 -p1
+#%%patch10 -p1
%patch17 -p1
%patch18 -p1
diff --git a/ac_config_headers.patch b/ac_config_headers.patch
index 448d82c..a1dee8c 100644
--- a/ac_config_headers.patch
+++ b/ac_config_headers.patch
@@ -1,8 +1,8 @@
---- links-2.7/configure.in.old 2013-04-06 20:22:33.003959516 +0200
-+++ links-2.7/configure.in 2013-04-06 20:22:48.727535993 +0200
-@@ -14,7 +14,7 @@ AUTOMAKE="./missing automake"
- AUTOHEADER="./missing autoheader"
- image_formats="GIF PNG XBM"
+--- links-2.22/configure.in.old 2021-03-20 19:16:29.597937288 +0100
++++ links-2.22/configure.in 2021-03-20 19:16:50.644602655 +0100
+@@ -18,7 +18,7 @@
+ export LDFLAGS
+ export LIBS
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
diff --git a/links2-config-dirs.patch b/links2-config-dirs.patch
index ab4575e..a4fa768 100644
--- a/links2-config-dirs.patch
+++ b/links2-config-dirs.patch
@@ -1,7 +1,7 @@
---- links-2.1pre16/links.1.orig 2005-01-22 21:51:55.000000000 +0100
-+++ links-2.1pre16/links.1 2005-01-28 20:47:50.217234704 +0100
+--- links-2.1pre16/links.1.orig 2005-01-22 21:51:55.000000000 +0100
++++ links-2.1pre16/links.1 2005-01-28 20:47:50.217234704 +0100
@@ -303,7 +303,7 @@
-
+
.SH FILES
.TP
-.IP "~/.links/links.cfg"
@@ -9,10 +9,9 @@
Per-user configfile, automatically created by
.B links.
.SH PLATFORMS
-
---- links-2.14/default.c.orig 2016-11-16 23:49:10.000000000 +0100
-+++ links-2.14/default.c 2017-07-08 17:18:34.278675496 +0200
-@@ -749,7 +749,7 @@ skip_path_conv:;
+--- links-2.22/default.c.old 2021-03-20 19:10:17.237960076 +0100
++++ links-2.22/default.c 2021-03-20 19:10:57.477957622 +0100
+@@ -797,7 +797,7 @@
while (home_links[0] && dir_sep(home_links[strlen(cast_const_char home_links) - 1])) home_links[strlen(cast_const_char home_links) - 1] = 0;
EINTRLOOP(rs, stat(cast_const_char home_links, &st));
if (!rs && S_ISDIR(st.st_mode)) {
@@ -21,10 +20,10 @@
} else {
fprintf(stderr, "CONFIG_DIR set to %s. But directory %s doesn't exist.\n\007", config_dir, home_links);
portable_sleep(3000);
-@@ -761,9 +761,9 @@ skip_path_conv:;
- } else {
- add_dot_links:
- #ifdef OPENVMS
+@@ -810,9 +810,9 @@
+ #if defined(DOS)
+ add_to_strn(&home_links, cast_uchar "links.cfg");
+ #elif defined(OPENVMS) || defined(HAIKU)
- add_to_strn(&home_links, cast_uchar "links");
+ add_to_strn(&home_links, cast_uchar "links2");
#else
@@ -33,7 +32,7 @@
#endif
}
EINTRLOOP(rs, stat(cast_const_char home_links, &st));
-@@ -792,7 +792,7 @@ skip_path_conv:;
+@@ -840,7 +840,7 @@
#ifdef DOS
add_to_strn(&home_links, cast_uchar "links.cfg");
#else
diff --git a/links2-convert-old-bookmarks.patch b/links2-convert-old-bookmarks.patch
index eb2f571..be88cce 100644
--- a/links2-convert-old-bookmarks.patch
+++ b/links2-convert-old-bookmarks.patch
@@ -1,8 +1,8 @@
---- links-2.8/bookmark.c 2013-09-01 19:13:47.000000000 +0200
-+++ links-2.8/bookmark.c.new 2013-10-07 19:23:03.763106002 +0200
-@@ -719,6 +719,18 @@
- safe_strncpy(e, cast_uchar "bookmarks.html", MAX_STR_LEN - (e - bookmarks_file));
- #endif
+--- links-2.22/bookmark.c.old 2021-03-20 18:44:34.524720442 +0100
++++ links-2.22/bookmark.c 2021-03-20 18:45:06.331385178 +0100
+@@ -785,6 +785,18 @@
+ msg_box(ses->term, getml(f, NULL), TEXT_(T_BOOKMARK_ERROR), AL_CENTER, TEXT_(T_UNABLE_TO_WRITE_TO_BOOKMARK_FILE), cast_uchar " ", f, cast_uchar ": ", get_err_msg(err, ses->term), MSG_BOX_END, NULL, 1, TEXT_(T_CANCEL), msg_box_null, B_ENTER | B_ESC);
+ }
}
+ /* try to create bookmarks.html based on old bookmarks (from links <= 0.97) */
+ if (access(bookmarks_file, R_OK) != 0) {
@@ -17,5 +17,5 @@
+ }
+ }
- bookmark_ld.codepage=utf8_table;
- load_bookmarks(NULL);
+ EINTRLOOP(rs, stat(cast_const_char bookmarks_file, &bookmarks_st));
+ if (rs)
diff --git a/links2-cookies-save.patch b/links2-cookies-save.patch
index 296c877..40fe0d9 100644
--- a/links2-cookies-save.patch
+++ b/links2-cookies-save.patch
@@ -1,15 +1,15 @@
---- links-2.12/cookies.c.orig 2016-01-09 16:48:22.619433626 +0100
-+++ links-2.12/cookies.c 2016-01-09 16:52:06.066090917 +0100
-@@ -250,15 +250,99 @@
+--- links-2.22/cookies.c.old 2019-04-07 20:17:57.000000000 +0200
++++ links-2.22/cookies.c 2021-03-20 18:58:47.864668687 +0100
+@@ -202,8 +202,28 @@
+
void free_cookies(void)
{
- struct cookie *c;
+ unsigned char *cookfile;
+ FILE *fp;
-+
- free_list(c_domains);
++ struct cookie *c;
++ struct list_head *lc;
+ free_list(struct c_domain, c_domains);
- /* !!! FIXME: save cookies */
-- foreach (c, all_cookies) free_cookie(c);
+
+ cookfile = stracpy(links_home);
+ if (! cookfile) return;
@@ -19,23 +19,23 @@
+ mem_free(cookfile);
+ if (fp == NULL) return;
+
-+ foreach (c, all_cookies) {
++ foreach (struct cookie, c, lc, all_cookies) {
+ if (c->expires && ! cookie_expired(c))
+ fprintf(fp, "%s %s %s %s %s %d %d\n", c->name, c->value,
-+ c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"",
-+ c->domain?c->domain:(unsigned char *)"", (int)c->expires, c->secure);
-+
-+ free_cookie(c);
++ c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"",
++ c->domain?c->domain:(unsigned char *)"", (int)c->expires, c->secure);
+ }
-+
+ fclose(fp);
+
- free_list(all_cookies);
- }
+ while (!list_empty(all_cookies)) {
+ struct cookie *c = list_struct(all_cookies.next, struct cookie);
+ del_from_list(c);
+@@ -213,6 +233,68 @@
void init_cookies(void)
{
- /* !!! FIXME: read cookies */
+-}
+ unsigned char in_buffer[MAX_STR_LEN];
+ unsigned char *cookfile, *p, *q;
+ FILE *fp;
@@ -56,7 +56,7 @@
+
+ if (!(cookie = mem_alloc(sizeof(struct cookie)))) return;
+ memset(cookie, 0, sizeof(struct cookie));
-+
+
+ q = in_buffer; p = strchr(in_buffer, ' ');
+ if (p == NULL) goto inv;
+ *p++ = '\0';
@@ -100,6 +100,4 @@
+ free(cookie);
+ }
+ fclose(fp);
- }
-
- void cleanup_cookies(void)
++}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/links2.git/commitdiff/1156294474ec86b1690cef18e875e75832996f8b
More information about the pld-cvs-commit
mailing list