summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorTrevor Johnson <trevor@FreeBSD.org>2000-12-03 18:03:25 +0000
committerTrevor Johnson <trevor@FreeBSD.org>2000-12-03 18:03:25 +0000
commit738eda67e3143a5b7d93b8ddf15edb9a3370b00a (patch)
tree4ce69e13a30150300ce91353be2fbc6dfc008bbe /editors
parentUncomment IPv6 enabling (diff)
- when DEADJOE is a hard link, leave it alone
- un-forbid - bump PORTREVISION Submitted by: maintainer
Diffstat (limited to 'editors')
-rw-r--r--editors/joe-devel/Makefile4
-rw-r--r--editors/joe-devel/files/patch-ad6
-rw-r--r--editors/joe/Makefile4
-rw-r--r--editors/joe/files/patch-ad6
-rw-r--r--editors/joe2/Makefile4
-rw-r--r--editors/joe2/files/patch-ad6
6 files changed, 12 insertions, 18 deletions
diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile
index 617c590fea45..bda5ba0dfd74 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 47b1bb2131a0..38113e698cfc 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 617c590fea45..bda5ba0dfd74 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 47b1bb2131a0..38113e698cfc 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 617c590fea45..bda5ba0dfd74 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 47b1bb2131a0..38113e698cfc 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);