From 0b497a0ad52ec9d01c8a894289115aba4b02794a Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Fri, 29 Jul 2005 16:52:06 +0000 Subject: [PATCH] - Update to 2.6.6 --- net/rsync/Makefile | 2 +- net/rsync/distinfo | 4 ++-- net/rsync/files/patch-infcodes.c | 21 --------------------- 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 net/rsync/files/patch-infcodes.c diff --git a/net/rsync/Makefile b/net/rsync/Makefile index 338871a9c416..e502936f5acf 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -6,7 +6,7 @@ # PORTNAME= rsync -PORTVERSION= 2.6.5 +PORTVERSION= 2.6.6 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \ ftp://ftp.samba.org//pub/%SUBDIR%/ \ diff --git a/net/rsync/distinfo b/net/rsync/distinfo index 683b1d7f2448..20cc52d614b4 100644 --- a/net/rsync/distinfo +++ b/net/rsync/distinfo @@ -1,2 +1,2 @@ -MD5 (rsync-2.6.5.tar.gz) = 3691cdf1540d0649ba679edce6bae8fc -SIZE (rsync-2.6.5.tar.gz) = 643388 +MD5 (rsync-2.6.6.tar.gz) = 30c4e2849cbeae93f55548453865c2f2 +SIZE (rsync-2.6.6.tar.gz) = 690066 diff --git a/net/rsync/files/patch-infcodes.c b/net/rsync/files/patch-infcodes.c deleted file mode 100644 index 0dd0d99f67d7..000000000000 --- a/net/rsync/files/patch-infcodes.c +++ /dev/null @@ -1,21 +0,0 @@ ---- zlib/infcodes.c.orig Tue Mar 12 02:14:58 2002 -+++ zlib/infcodes.c Sun Apr 21 21:19:46 2002 -@@ -197,8 +197,18 @@ - c->mode = COPY; - case COPY: /* o: copying bytes in window, waiting for space */ - f = q - c->sub.copy.dist; -+#ifdef __FreeBSD__ -+ { -+ /* Work-around for a FreeBSD gcc bug. */ -+ volatile inflate_blocks_statef *s1 = s; -+ -+ while (f < s1->window) /* modulo window size-"while" instead */ -+ f += s1->end - s1->window; /* of "if" handles invalid distances */ -+ } -+#else - while (f < s->window) /* modulo window size-"while" instead */ - f += s->end - s->window; /* of "if" handles invalid distances */ -+#endif - while (c->len) - { - NEEDOUT