diff options
| author | trevor <trevor@FreeBSD.org> | 2000-12-03 18:03:25 +0000 |
|---|---|---|
| committer | trevor <trevor@FreeBSD.org> | 2000-12-03 18:03:25 +0000 |
| commit | e1b41e540cba7877047bfa1c27f52862a8a0c3c3 (patch) | |
| tree | b8072fc318df14471c3f591bfede850f807adf02 | |
| parent | 6e4b874cadfef8a5fb4b4e741f0493ccf3f0b733 (diff) | |
| download | FreeBSD-ports-e1b41e540cba7877047bfa1c27f52862a8a0c3c3.zip FreeBSD-ports-e1b41e540cba7877047bfa1c27f52862a8a0c3c3.tar.gz | |
- when DEADJOE is a hard link, leave it alone
- un-forbid
- bump PORTREVISION
Submitted by: maintainer
| -rw-r--r-- | editors/joe-devel/Makefile | 4 | ||||
| -rw-r--r-- | editors/joe-devel/files/patch-ad | 6 | ||||
| -rw-r--r-- | editors/joe/Makefile | 4 | ||||
| -rw-r--r-- | editors/joe/files/patch-ad | 6 | ||||
| -rw-r--r-- | editors/joe2/Makefile | 4 | ||||
| -rw-r--r-- | editors/joe2/files/patch-ad | 6 |
6 files changed, 12 insertions, 18 deletions
diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile index 617c590..bda5ba0 100644 --- a/editors/joe-devel/Makefile +++ b/editors/joe-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= joe PORTVERSION= 2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= ftp://ftp.std.com/src/editors/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -15,8 +15,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= toasty@dragondata.com -FORBIDDEN= "follows hard link (not symlink) to DEADJOE--see http://www.securityfocus.com/archive/1/145305" - WRKSRC= ${WRKDIR}/joe ALL_TARGET= joe MAN1= joe.1 diff --git a/editors/joe-devel/files/patch-ad b/editors/joe-devel/files/patch-ad index 47b1bb2..38113e6 100644 --- a/editors/joe-devel/files/patch-ad +++ b/editors/joe-devel/files/patch-ad @@ -1,5 +1,5 @@ ---- b.c.orig Fri Jan 20 13:38:25 1995 -+++ b.c Fri Nov 24 00:24:52 2000 +--- b.c.orig Fri Jan 20 00:38:25 1995 ++++ b.c Sun Dec 3 09:58:21 2000 @@ -21,6 +21,9 @@ #include <pwd.h> #endif @@ -83,7 +83,7 @@ - FILE *f=fopen("DEADJOE","a"); + FILE *f; + struct stat sb; -+ if ((lstat("DEADJOE", &sb) == 0) && (sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) ++ if ((lstat("DEADJOE", &sb) == 0) && (((sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) || (sb.st_nlink > 1))) + { + printf("*** JOE was aborted "); + if (sig) printf("by signal %d, cannot save DEADJOE due to unsafe symlink\n",sig); diff --git a/editors/joe/Makefile b/editors/joe/Makefile index 617c590..bda5ba0 100644 --- a/editors/joe/Makefile +++ b/editors/joe/Makefile @@ -7,7 +7,7 @@ PORTNAME= joe PORTVERSION= 2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= ftp://ftp.std.com/src/editors/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -15,8 +15,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= toasty@dragondata.com -FORBIDDEN= "follows hard link (not symlink) to DEADJOE--see http://www.securityfocus.com/archive/1/145305" - WRKSRC= ${WRKDIR}/joe ALL_TARGET= joe MAN1= joe.1 diff --git a/editors/joe/files/patch-ad b/editors/joe/files/patch-ad index 47b1bb2..38113e6 100644 --- a/editors/joe/files/patch-ad +++ b/editors/joe/files/patch-ad @@ -1,5 +1,5 @@ ---- b.c.orig Fri Jan 20 13:38:25 1995 -+++ b.c Fri Nov 24 00:24:52 2000 +--- b.c.orig Fri Jan 20 00:38:25 1995 ++++ b.c Sun Dec 3 09:58:21 2000 @@ -21,6 +21,9 @@ #include <pwd.h> #endif @@ -83,7 +83,7 @@ - FILE *f=fopen("DEADJOE","a"); + FILE *f; + struct stat sb; -+ if ((lstat("DEADJOE", &sb) == 0) && (sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) ++ if ((lstat("DEADJOE", &sb) == 0) && (((sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) || (sb.st_nlink > 1))) + { + printf("*** JOE was aborted "); + if (sig) printf("by signal %d, cannot save DEADJOE due to unsafe symlink\n",sig); diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile index 617c590..bda5ba0 100644 --- a/editors/joe2/Makefile +++ b/editors/joe2/Makefile @@ -7,7 +7,7 @@ PORTNAME= joe PORTVERSION= 2.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= ftp://ftp.std.com/src/editors/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -15,8 +15,6 @@ EXTRACT_SUFX= .tar.Z MAINTAINER= toasty@dragondata.com -FORBIDDEN= "follows hard link (not symlink) to DEADJOE--see http://www.securityfocus.com/archive/1/145305" - WRKSRC= ${WRKDIR}/joe ALL_TARGET= joe MAN1= joe.1 diff --git a/editors/joe2/files/patch-ad b/editors/joe2/files/patch-ad index 47b1bb2..38113e6 100644 --- a/editors/joe2/files/patch-ad +++ b/editors/joe2/files/patch-ad @@ -1,5 +1,5 @@ ---- b.c.orig Fri Jan 20 13:38:25 1995 -+++ b.c Fri Nov 24 00:24:52 2000 +--- b.c.orig Fri Jan 20 00:38:25 1995 ++++ b.c Sun Dec 3 09:58:21 2000 @@ -21,6 +21,9 @@ #include <pwd.h> #endif @@ -83,7 +83,7 @@ - FILE *f=fopen("DEADJOE","a"); + FILE *f; + struct stat sb; -+ if ((lstat("DEADJOE", &sb) == 0) && (sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) ++ if ((lstat("DEADJOE", &sb) == 0) && (((sb.st_mode & S_IFLNK) && (sb.st_uid != getuid())) || (sb.st_nlink > 1))) + { + printf("*** JOE was aborted "); + if (sig) printf("by signal %d, cannot save DEADJOE due to unsafe symlink\n",sig); |
