diff options
author | Masafumi Max NAKANE <max@FreeBSD.org> | 2002-08-08 04:53:19 +0000 |
---|---|---|
committer | Masafumi Max NAKANE <max@FreeBSD.org> | 2002-08-08 04:53:19 +0000 |
commit | 96dff61bf0cc33e1c4eadae3002ab84b13bd6e40 (patch) | |
tree | 55788a74d9ab34f7d0e85e95c17e6fdc3703ef9a | |
parent | Mark as broken. Version is not available anymore. Update to qt3 and 0.7.7 (diff) |
Add back files/patch-af which should never be removed. This patch takes care of two remote buffer overflows in server/misc.c. This patch was accidentally removed when the port was upgraded.
Since this fixes a security problem, bump the port revision.
Pointed-Out by: TOGAWA Satoshi <toga@puyo.org>
Notes
Notes:
svn path=/head/; revision=64197
-rw-r--r-- | japanese/Canna/Makefile | 2 | ||||
-rw-r--r-- | japanese/Canna/files/patch-af | 22 | ||||
-rw-r--r-- | japanese/canna-lib/Makefile | 2 | ||||
-rw-r--r-- | japanese/canna-lib/files/patch-af | 22 | ||||
-rw-r--r-- | japanese/canna-server/Makefile | 2 | ||||
-rw-r--r-- | japanese/canna-server/files/patch-af | 22 |
6 files changed, 69 insertions, 3 deletions
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile index 64c14842d49b..15fc3bca1d0e 100644 --- a/japanese/Canna/Makefile +++ b/japanese/Canna/Makefile @@ -8,7 +8,7 @@ PORTNAME= Canna PORTVERSION= 3.5b2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \ ftp://ftp.biglobe.ne.jp/pub/tool/Canna/Canna35/ \ diff --git a/japanese/Canna/files/patch-af b/japanese/Canna/files/patch-af new file mode 100644 index 000000000000..360e5d011617 --- /dev/null +++ b/japanese/Canna/files/patch-af @@ -0,0 +1,22 @@ +--- server/misc.c.orig Wed Nov 27 16:30:30 1996 ++++ server/misc.c Thu Aug 8 13:44:03 2002 +@@ -649,12 +649,19 @@ + + if (client->username && client->username[0]) { + if (client->groupname && client->groupname[0]) { ++ if (strlen(DDUSER) + strlen(client->username) + ++ strlen(DDGROUP) + strlen(client->groupname) + ++ strlen(DDPATH) + 4 >= 256) ++ return ( -1 ); + sprintf(dichome, "%s/%s:%s/%s:%s", + DDUSER, client->username, + DDGROUP, client->groupname, + DDPATH); + } + else { ++ if (strlen(DDUSER) + strlen(client->username) + ++ strlen(DDPATH) + 2 >= 256) ++ return ( -1 ); + sprintf(dichome, "%s/%s:%s", + DDUSER, client->username, + DDPATH); diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile index 64c14842d49b..15fc3bca1d0e 100644 --- a/japanese/canna-lib/Makefile +++ b/japanese/canna-lib/Makefile @@ -8,7 +8,7 @@ PORTNAME= Canna PORTVERSION= 3.5b2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \ ftp://ftp.biglobe.ne.jp/pub/tool/Canna/Canna35/ \ diff --git a/japanese/canna-lib/files/patch-af b/japanese/canna-lib/files/patch-af new file mode 100644 index 000000000000..360e5d011617 --- /dev/null +++ b/japanese/canna-lib/files/patch-af @@ -0,0 +1,22 @@ +--- server/misc.c.orig Wed Nov 27 16:30:30 1996 ++++ server/misc.c Thu Aug 8 13:44:03 2002 +@@ -649,12 +649,19 @@ + + if (client->username && client->username[0]) { + if (client->groupname && client->groupname[0]) { ++ if (strlen(DDUSER) + strlen(client->username) + ++ strlen(DDGROUP) + strlen(client->groupname) + ++ strlen(DDPATH) + 4 >= 256) ++ return ( -1 ); + sprintf(dichome, "%s/%s:%s/%s:%s", + DDUSER, client->username, + DDGROUP, client->groupname, + DDPATH); + } + else { ++ if (strlen(DDUSER) + strlen(client->username) + ++ strlen(DDPATH) + 2 >= 256) ++ return ( -1 ); + sprintf(dichome, "%s/%s:%s", + DDUSER, client->username, + DDPATH); diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile index 64c14842d49b..15fc3bca1d0e 100644 --- a/japanese/canna-server/Makefile +++ b/japanese/canna-server/Makefile @@ -8,7 +8,7 @@ PORTNAME= Canna PORTVERSION= 3.5b2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= japanese MASTER_SITES= ftp://ftp.tokyonet.ad.jp/pub/misc/Canna/Canna35/ \ ftp://ftp.biglobe.ne.jp/pub/tool/Canna/Canna35/ \ diff --git a/japanese/canna-server/files/patch-af b/japanese/canna-server/files/patch-af new file mode 100644 index 000000000000..360e5d011617 --- /dev/null +++ b/japanese/canna-server/files/patch-af @@ -0,0 +1,22 @@ +--- server/misc.c.orig Wed Nov 27 16:30:30 1996 ++++ server/misc.c Thu Aug 8 13:44:03 2002 +@@ -649,12 +649,19 @@ + + if (client->username && client->username[0]) { + if (client->groupname && client->groupname[0]) { ++ if (strlen(DDUSER) + strlen(client->username) + ++ strlen(DDGROUP) + strlen(client->groupname) + ++ strlen(DDPATH) + 4 >= 256) ++ return ( -1 ); + sprintf(dichome, "%s/%s:%s/%s:%s", + DDUSER, client->username, + DDGROUP, client->groupname, + DDPATH); + } + else { ++ if (strlen(DDUSER) + strlen(client->username) + ++ strlen(DDPATH) + 2 >= 256) ++ return ( -1 ); + sprintf(dichome, "%s/%s:%s", + DDUSER, client->username, + DDPATH); |