Skip to contentSkip to conversation

links: bump to version 2.8

PATCH New Gustavo Zacarias 2 participants 2 messages Dec 28, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 links: bump to version 2.8

Also add hash file.

---
 package/links/0001-no-largefile.patch        | 26 ++++++++++++++++++++++++++
 package/links/links-0001-no-largefile.patch  | 22 ----------------------
 package/links/links-0002-CVE-2013-6050.patch | 17 -----------------
 package/links/links.hash                     |  2 ++
 package/links/links.mk                       |  2 +-
 5 files changed, 29 insertions(+), 40 deletions(-)
 create mode 100644 package/links/0001-no-largefile.patch
 delete mode 100644 package/links/links-0001-no-largefile.patch
 delete mode 100644 package/links/links-0002-CVE-2013-6050.patch
 create mode 100644 package/links/links.hash
package/links/0001-no-largefile.patch new file +26 -0
new file mode 100644
index 0000000..782a25a
@@ -0,0 +1,26 @@
+Make links buildable without LFS support.
+Author/status: unknown.
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura links-2.8/com-defs.h links-2.8.nonlfs/com-defs.h
+--- links-2.8/com-defs.h	2013-07-31 20:45:30.000000000 -0300
++++ links-2.8.nonlfs/com-defs.h	2014-12-28 08:42:47.352237462 -0300
+@@ -5,6 +5,9 @@
+ #define __EXTENSIONS__
+ #endif
+ 
++#include <features.h>
++/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
+ #ifndef _LARGEFILE_SOURCE
+ #define _LARGEFILE_SOURCE	1
+ #endif
+@@ -20,6 +23,7 @@
+ #ifndef _FILE_OFFSET_BITS
+ #define _FILE_OFFSET_BITS	64
+ #endif
++#endif /* UCLIBC !LFS */
+ 
+ #if defined(vax) && !defined(__vax)
+ #define __vax	vax
package/links/links-0001-no-largefile.patch deleted +0 -22
deleted file mode 100644
index f3143cb..0000000
@@ -1,22 +0,0 @@
-Index: links-1.01pre1-no-ssl/links.h
-===================================================================
---- links-1.01pre1-no-ssl.orig/links.h	2010-06-21 00:39:10.000000000 +0200
-+++ links-1.01pre1-no-ssl/links.h	2010-06-21 00:39:52.000000000 +0200
-@@ -2,6 +2,9 @@
- #define __EXTENSIONS__
- #endif
- 
-+#include <features.h>
-+/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
- #ifndef _LARGEFILE_SOURCE
- #define _LARGEFILE_SOURCE	1
- #endif
-@@ -9,6 +12,7 @@
- #ifndef _FILE_OFFSET_BITS
- #define _FILE_OFFSET_BITS	64
- #endif
-+#endif
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
package/links/links-0002-CVE-2013-6050.patch deleted +0 -17
deleted file mode 100644
index d85c250..0000000
@@ -1,17 +0,0 @@
-Description: Fix integer overflow in graphics mode (CVE-2013-6050)
-Author: Mikulas Patocka <[email protected]>
-Bug-CVE: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-6050
-
-Index: links-2.7/html_tbl.c
-===================================================================
---- links-2.7.orig/html_tbl.c   2013-11-22 01:57:29.000000000 +0100
-+++ links-2.7/html_tbl.c        2013-11-22 01:58:30.000000000 +0100
-@@ -1550,6 +1550,8 @@ static void add_to_rect_sets(struct rect
- static void add_to_cell_sets(struct table_cell ****s, int **nn, int *n, struct rect *r, struct table_cell *c)
- {
- 	int i, j;
-+	if (r->y1 < 0 || r->y2 < 0)
-+		fatal_exit("add_to_cell_sets: integer overflow: %d, %d", r->y1, r->y2);
- 	for (i = r->y1 >> RECT_BOUND_BITS; i <= (r->y2 - 1) >> RECT_BOUND_BITS; i++) {
- 		if (i >= *n) {
- 			struct table_cell ***ns;
package/links/links.hash new file +2 -0
new file mode 100644
index 0000000..a6e79b3
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	5070a759af7f107ca4f9572833b8f086cd9f7c21ef5e1fce8482a2883a743c7a	links-2.8.tar.gz
package/links/links.mk +1 -1
index c7f3671..2ad56f9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LINKS_VERSION = 2.7
+LINKS_VERSION = 2.8
 LINKS_SITE = http://links.twibright.com/download
 LINKS_DEPENDENCIES = host-pkgconf
 LINKS_LICENSE = GPLv2+
Signature · 1 line
2.0.5
#1 lore raw

PATCH 1/2 links: bump to version 2.8

Dear Gustavo Zacarias,

Quoted 14 lines · Gustavo Zacarias

Also add hash file.

---
 package/links/0001-no-largefile.patch        | 26 ++++++++++++++++++++++++++
 package/links/links-0001-no-largefile.patch  | 22 ----------------------
 package/links/links-0002-CVE-2013-6050.patch | 17 -----------------
 package/links/links.hash                     |  2 ++
 package/links/links.mk                       |  2 +-
 5 files changed, 29 insertions(+), 40 deletions(-)
 create mode 100644 package/links/0001-no-largefile.patch
 delete mode 100644 package/links/links-0001-no-largefile.patch
 delete mode 100644 package/links/links-0002-CVE-2013-6050.patch
 create mode 100644 package/links/links.hash

Thanks, applied after doing a test build (and therefore checking the hash). Could you try to submit the largefile patch upstream?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com