kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update IPv6 patch.

Browse source
This commit is contained in:
Dmitry Sivachenko 2011-10-27 13:01:18 +00:00
parent 10c1edad64
commit 825f819ab3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=284439
3 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
www/links/Makefile
View file

@ -8,6 +8,7 @@
PORTNAME= links
DISTVERSION= 2.3
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES?= www
MASTER_SITES= http://links.twibright.com/download/
@ -59,9 +60,9 @@ CONFIGURE_ARGS+= --without-directfb
.if defined(WITH_IPV6)
USE_AUTOTOOLS+= autoconf
MASTER_SITES+= http://xpisar.wz.cz/links-ipv6/:ipv6
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} links-2.2-ipv6-2.diff:ipv6
EXTRA_PATCHES+= ${WRKDIR}/links-2.2-ipv6-2.diff
PATCH_SITES+= http://xpisar.wz.cz/links-ipv6/:ipv6
PATCHFILES+= links-2.3-ipv6.diff.gz:ipv6
PATCH_DIST_STRIP= -p1
.endif
.if !defined(WITHOUT_X11)
@ -89,15 +90,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-terminal.c.diff
MAN1= links.1
PLIST_FILES+= bin/links
.ifdef(WITH_IPV6)
post-extract:
#adjust the ipv6 patch for links 2.3*
@${CP} ${DISTDIR}/${DIST_SUBDIR}/links-2.2-ipv6-2.diff ${WRKDIR}
@${REINPLACE_CMD} -E -e 's!void (lookup_fn|end_real_lookup)!static &!' \
-e 's!^(\+\+\+|---) (a|b)/!\1 !' ${WRKDIR}/links-2.2-ipv6-2.diff
@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/extra-ipv6.diff
.endif
post-patch:
@${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/os_dep.h
#replace a deprecated indirect selection with png_jumpbuf()

4
www/links/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (links-2.3.tar.bz2) = 73751f5e11679cee62d8de7c6d72ee5b34b33af8adfe7c2763a16f40c872c96e
SIZE (links-2.3.tar.bz2) = 3831706
SHA256 (links-2.2-ipv6-2.diff) = d6d6745796f07ab8949ceec6592e82c32a170739027f99488ffd5f1d93a5e63c
SIZE (links-2.2-ipv6-2.diff) = 12524
SHA256 (links-2.3-ipv6.diff.gz) = 75762ca25e7910d7a8363baab050e59b632ecb91476880b272ad5ed42d0508a1
SIZE (links-2.3-ipv6.diff.gz) = 7643

19
www/links/files/extra-ipv6.diff
View file

@ -1,19 +0,0 @@
--- links-2.2-ipv6-2.diff.orig 2011-10-20 16:20:13.000000000 +0400
+++ links-2.2-ipv6-2.diff 2011-10-20 16:21:37.000000000 +0400
@@ -207,7 +207,7 @@
if (!*name) return -1;
for (n = name; *n; n++) if (*n != '.' && (*n < '0' || *n > '9')) goto nogethostbyaddr;
n = name;
-@@ -73,26 +73,34 @@ int do_real_lookup(unsigned char *name, ip__address *host)
+@@ -63,27 +63,35 @@ int do_real_lookup(unsigned char *name,
if (get_addr_byte(&n, ((unsigned char *)host + 3), 0)) goto skip_addr;
return 0;
skip_addr:
@@ -234,6 +234,7 @@
return 0;
}
+ #ifndef NO_ASYNC_LOOKUP
static void lookup_fn(unsigned char *name, int h)
{
- ip__address host;