diff options
| author | Oliver Eikemeier <eik@FreeBSD.org> | 2004-04-29 14:36:39 +0000 |
|---|---|---|
| committer | Oliver Eikemeier <eik@FreeBSD.org> | 2004-04-29 14:36:39 +0000 |
| commit | b952baa926bdfbd68b41600254747951a8520e76 (patch) | |
| tree | b0f09cb987066505054635cc9e6bc92f817d045c /net/rsync | |
| parent | Update to 1.2.3 (diff) | |
Fixed the use of an uninitialized variable in map_uid() and map_gid()
<http://lists.samba.org/archive/rsync/2004-April/009334.html>
Added timelimit patches by default (--stop-at and --time-limit, see rsync -h)
Notes
Notes:
svn path=/head/; revision=107975
Diffstat (limited to 'net/rsync')
| -rw-r--r-- | net/rsync/Makefile | 5 | ||||
| -rw-r--r-- | net/rsync/files/patch-uidlist.c | 24 |
2 files changed, 29 insertions, 0 deletions
diff --git a/net/rsync/Makefile b/net/rsync/Makefile index f2f558a662e6..eedb34082479 100644 --- a/net/rsync/Makefile +++ b/net/rsync/Makefile @@ -8,6 +8,7 @@ PORTNAME= rsync PORTVERSION= 2.6.1 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= http://rsync.samba.org/ftp/%SUBDIR%/ \ ftp://rsync.samba.org/pub/%SUBDIR%/ \ @@ -42,6 +43,10 @@ CONFIGURE_ARGS+= --with-included-popt PORTDOCS= NEWS README csprotocol.txt tech_report.tex .endif +.if !defined(WITHOUT_TIMELIMIT) +EXTRA_PATCHES+= ${WRKSRC}/patches/time-limit.diff +.endif + .include <bsd.port.pre.mk> SED_SCRIPT+= -e 's,%%PREFIX%%,${PREFIX},g' \ diff --git a/net/rsync/files/patch-uidlist.c b/net/rsync/files/patch-uidlist.c new file mode 100644 index 000000000000..914398766d5c --- /dev/null +++ b/net/rsync/files/patch-uidlist.c @@ -0,0 +1,24 @@ +# +# Fixed the use of an uninitialized variable in map_uid() and map_gid(). +# <http://lists.samba.org/archive/rsync/2004-April/009334.html> +# +--- uidlist.c 20 Feb 2004 17:09:30 -0000 1.23 ++++ uidlist.c 28 Apr 2004 17:04:55 -0000 +@@ -81,7 +81,7 @@ static char *gid_to_name(gid_t gid) + static int map_uid(int id, char *name) + { + uid_t uid; +- if (uid != 0 && name_to_uid(name, &uid)) ++ if (id != 0 && name_to_uid(name, &uid)) + return uid; + return id; + } +@@ -89,7 +89,7 @@ static int map_uid(int id, char *name) + static int map_gid(int id, char *name) + { + gid_t gid; +- if (gid != 0 && name_to_gid(name, &gid)) ++ if (id != 0 && name_to_gid(name, &gid)) + return gid; + return id; + } |