commit 9e20794f61b9b1a86893e3d141cef600ef7144d2
Author: Witold Filipczyk <[email protected]>
Date: Mon Oct 7 20:00:00 2013 +0200
- up to 2.8
ac_prog_cxx.patch | 8 +++---
links2-config-dirs.patch | 15 +++--------
links2-convert-old-bookmarks.patch | 32 +++++++++++------------
links2-cookies-save.patch | 53 +++++++++++++++++++-------------------
links2-links-g_if_glinks.patch | 14 +++++-----
links2.spec | 10 +++----
6 files changed, 62 insertions(+), 70 deletions(-)
---
diff --git a/links2.spec b/links2.spec
index 2be47b7..2bfd256 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.7
-Release: 2
+Version: 2.8
+Release: 1
Epoch: 1
License: GPL v2
Group: Applications/Networking
Source0: http://links.twibright.com/download/links-%{version}.tar.bz2
-# Source0-md5: d06aa6e14b2172d73188871a5357185a
+# Source0-md5: d5fb7c45ca41dad2b20f5c056498ea07
Source1: %{name}.desktop
Source2: %{name}.1.pl
Source3: %{name}.png
@@ -31,7 +31,7 @@ Patch4: %{name}-cookies-save.patch
Patch5: %{name}-config-dirs.patch
Patch6: %{name}-gzip_fallback.patch
Patch9: %{name}-segv.patch
-Patch10: %{name}-pl-update.patch
+#Patch10: %{name}-pl-update.patch
Patch17: ac_config_headers.patch
Patch18: ac_prog_cxx.patch
URL: http://links.twibright.com/
@@ -114,7 +114,7 @@ Links - це текстовий WWW броузер, на перший погля
%patch5 -p1
%patch6 -p1
%patch9 -p1
-%patch10 -p1
+#%patch10 -p1
%patch17 -p1
%patch18 -p1
diff --git a/ac_prog_cxx.patch b/ac_prog_cxx.patch
index 571bfa8..b794e16 100644
--- a/ac_prog_cxx.patch
+++ b/ac_prog_cxx.patch
@@ -4,8 +4,8 @@
dnl Checks for programs.
AC_PROG_CC
--#AC_PROG_CXX
+-dnl AC_PROG_CXX
+AC_PROG_CXX
- #AC_PROG_AWK
- #AM_PROG_LEX
- #AC_PROG_YACC
+ dnl AC_PROG_AWK
+ dnl AM_PROG_LEX
+ dnl AC_PROG_YACC
diff --git a/links2-config-dirs.patch b/links2-config-dirs.patch
index 7e8c952..126ce73 100644
--- a/links2-config-dirs.patch
+++ b/links2-config-dirs.patch
@@ -9,9 +9,9 @@
Per-user configfile, automatically created by
.B links.
.SH PLATFORMS
---- links-2.7/default.c.old 2013-04-06 20:36:00.496447136 +0200
-+++ links-2.7/default.c 2013-04-06 20:38:36.712196281 +0200
-@@ -666,16 +666,16 @@ skip_path_conv:;
+--- links-2.8/default.c 2013-08-26 01:08:07.000000000 +0200
++++ links-2.8/default.c.new 2013-10-07 19:37:27.079790294 +0200
+@@ -729,16 +729,16 @@
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)) {
@@ -31,12 +31,3 @@
EINTRLOOP(rs, stat(cast_const_char home_links, &st));
if (rs) {
#ifdef HAVE_MKDIR
-@@ -696,7 +696,7 @@ skip_path_conv:;
- first_failed:
- mem_free(home_links);
- home_links = stracpy(home);
-- add_to_strn(&home_links, cast_uchar "links");
-+ add_to_strn(&home_links, cast_uchar "links2");
- EINTRLOOP(rs, stat(cast_const_char home_links, &st));
- if (rs) {
- #ifdef HAVE_MKDIR
diff --git a/links2-convert-old-bookmarks.patch
b/links2-convert-old-bookmarks.patch
index 1859fb0..eb2f571 100644
--- a/links2-convert-old-bookmarks.patch
+++ b/links2-convert-old-bookmarks.patch
@@ -1,21 +1,21 @@
---- links-2.7/bookmarks.c.orig 2013-06-23 18:55:29.428859752 +0200
-+++ links-2.7/bookmarks.c 2013-06-23 19:03:09.398840448 +0200
-@@ -716,6 +716,18 @@
- if (!*bookmarks_file)
- snprintf(cast_char
bookmarks_file,MAX_STR_LEN,"%sbookmarks.html",links_home?links_home:(unsigned
char*)"");
-
+--- 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
+ }
+ /* try to create bookmarks.html based on old bookmarks (from links <=
0.97) */
+ if (access(bookmarks_file, R_OK) != 0) {
-+ char *prev;
-+ if ((prev = get_current_dir_name()) && chdir(links_home) == 0) {
-+ if (access("bookmarks", R_OK) == 0 && access("/usr/bin/perl", X_OK)
== 0) {
-+ system("/usr/bin/perl -lne '@l = split(q(\\|)); print qq(<dt><a
href=\"$l[1]\">$l[0]</a>)' bookmarks > bookmarks.html");
-+ }
-+ chdir(prev);
-+ free(prev);
-+ }
-+ }
++ char *prev;
+
++ if ((prev = get_current_dir_name()) && chdir(links_home) == 0) {
++ if (access("bookmarks", R_OK) == 0 &&
access("/usr/bin/perl", X_OK) == 0) {
++ system("/usr/bin/perl -lne '@l = split(q(\\|));
print qq(<dt><a href=\"$l[1]\">$l[0]</a>)' bookmarks > bookmarks.html");
++ }
++ chdir(prev);
++ free(prev);
++ }
++ }
+
bookmark_ld.codepage=utf8_table;
load_bookmarks(NULL);
- }
diff --git a/links2-cookies-save.patch b/links2-cookies-save.patch
index c191712..f90aaea 100644
--- a/links2-cookies-save.patch
+++ b/links2-cookies-save.patch
@@ -1,18 +1,18 @@
-diff -ru links-0.96/cookies.c links-0.96+cookies-save/cookies.c
---- links-0.96/cookies.c Mon Sep 3 07:19:37 2001
-+++ links-0.96+cookies-save/cookies.c Mon Sep 3 07:18:42 2001
-@@ -272,15 +272,99 @@
+--- links-2.8/cookies.c 2013-07-22 04:05:21.000000000 +0200
++++ links-2.8/cookies.c.new 2013-10-07 19:31:08.217264646 +0200
+@@ -249,15 +249,98 @@
void init_cookies(void)
{
- /* !!! FIXME: read cookies */
+-}
+ unsigned char in_buffer[MAX_STR_LEN];
+ unsigned char *cookfile, *p, *q;
+ FILE *fp;
+
+ /* must be called after init_home */
+ if (! links_home) return;
-+
++
+ cookfile = stracpy(links_home);
+ if (! cookfile) return;
+ add_to_strn(&cookfile, "cookies");
@@ -20,45 +20,45 @@ diff -ru links-0.96/cookies.c
links-0.96+cookies-save/cookies.c
+ fp = fopen(cookfile, "r");
+ mem_free(cookfile);
+ if (fp == NULL) return;
-+
++
+ while (fgets(in_buffer, MAX_STR_LEN, fp)) {
+ struct cookie *cookie;
-+
++
+ 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';
+ cookie->name = stracpy(q);
-+
++
+ q = p; p = strchr(p, ' ');
+ if (p == NULL) goto inv;
+ *p++ = '\0';
+ cookie->value = stracpy(q);
-+
++
+ q = p; p = strchr(p, ' ');
+ if (p == NULL) goto inv;
+ *p++ = '\0';
+ cookie->server = stracpy(q);
-+
++
+ q = p; p = strchr(p, ' ');
+ if (p == NULL) goto inv;
+ *p++ = '\0';
+ cookie->path = stracpy(q);
-+
++
+ q = p; p = strchr(p, ' ');
+ if (p == NULL) goto inv;
+ *p++ = '\0';
+ cookie->domain = stracpy(q);
-+
++
+ q = p; p = strchr(p, ' ');
+ if (p == NULL) goto inv;
+ *p++ = '\0';
+ cookie->expires = atoi(q);
-+
+
+ cookie->secure = atoi(p);
-+
++
+ /*cookie->id = cookie_id++;*/
+
+ accept_cookie(cookie);
@@ -70,8 +70,8 @@ diff -ru links-0.96/cookies.c
links-0.96+cookies-save/cookies.c
+ free(cookie);
+ }
+ fclose(fp);
- }
-
++}
++
void cleanup_cookies(void)
{
struct cookie *c;
@@ -80,8 +80,10 @@ diff -ru links-0.96/cookies.c
links-0.96+cookies-save/cookies.c
+
free_list(c_domains);
- /* !!! FIXME: save cookies */
-- foreach (c, cookies) free_cookie(c);
-+
+- foreach (c, all_cookies) free_cookie(c);
+- free_list(all_cookies);
+-}
+
+ cookfile = stracpy(links_home);
+ if (! cookfile) return;
+ add_to_strn(&cookfile, "cookies");
@@ -89,18 +91,17 @@ diff -ru links-0.96/cookies.c
links-0.96+cookies-save/cookies.c
+ fp = fopen(cookfile, "w");
+ mem_free(cookfile);
+ if (fp == NULL) return;
-+
-+ foreach (c, cookies) {
++
++ foreach (c, 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 *)"",
c->expires, c->secure);
++ c->domain?c->domain:(unsigned char *)"",
(int)c->expires, c->secure);
+
+ free_cookie(c);
+ }
+
+ fclose(fp);
-+
- free_list(cookies);
- }
-
++
++ free_list(all_cookies);
++}
diff --git a/links2-links-g_if_glinks.patch b/links2-links-g_if_glinks.patch
index 45ccc85..73ab7d2 100644
--- a/links2-links-g_if_glinks.patch
+++ b/links2-links-g_if_glinks.patch
@@ -10,11 +10,11 @@
#include "links.h"
int retval = RET_OK;
-@@ -298,6 +301,7 @@
- retval = RET_SYNTAX;
- goto ttt;
- }
-+ if (strncmp (basename(path_to_exe), "glinks", 6) == 0) ggr = 1;
- if (ggr_drv[0] || ggr_mode[0]) ggr = 1;
+@@ -290,6 +290,7 @@
+
+ static void fixup_g(void)
+ {
++ if (strncmp(basename(path_to_exe), "glinks", 6) == 0) ggr = 1;
+ if (ggr_drv[0] || ggr_mode[0] || force_g) ggr = 1;
if (dmp) ggr = 0;
- if (!ggr && !no_connect && (uh = bind_to_af_unix()) != -1) {
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/links2.git/commitdiff/9e20794f61b9b1a86893e3d141cef600ef7144d2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
