Partial update to 4.5.51; still marked as broken till i fix some things.
This commit is contained in:
fgsch
parent
972c0543d0
commit
8b9f3dd813
@ -1,22 +1,24 @@
|
||||
# $OpenBSD: Makefile,v 1.9 2001/03/03 19:17:11 danh Exp $
|
||||
# $OpenBSD: Makefile,v 1.10 2001/03/05 06:36:08 fgsch Exp $
|
||||
|
||||
DISTNAME= mc-4.1.35
|
||||
DISTNAME= mc-4.5.51
|
||||
CATEGORIES= misc
|
||||
NEED_VERSION= 1.305
|
||||
MASTER_SITES= ${MASTER_SITE_GNU}
|
||||
MASTER_SITE_SUBDIR= mc
|
||||
NEED_VERSION= 1.355
|
||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||
MASTER_SITE_SUBDIR= stable/sources/mc
|
||||
|
||||
MAINTAINER= ports@openbsd.org
|
||||
|
||||
HOMEPAGE= http://www.gnome.org/mc/
|
||||
|
||||
LIB_DEPENDS= glib.1.2::devel/glib
|
||||
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
FAKE= No
|
||||
|
||||
CONFIGURE_STYLE= gnu
|
||||
|
||||
BROKEN= "security is bad; auditing on the way"
|
||||
#BROKEN= "final auditing. comming soon"
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (mc-4.1.35.tar.gz) = b563fdffb6b25b9f75bb019c2f9f70a2
|
||||
RMD160 (mc-4.1.35.tar.gz) = 87949478a70ad55e0a8043e79965fd975bc15ee4
|
||||
SHA1 (mc-4.1.35.tar.gz) = bb5e9b4a3589c850140b2d4a83dd65411cb6c93b
|
||||
MD5 (mc-4.5.51.tar.gz) = c604292554887e9e6baba0828081b963
|
||||
RMD160 (mc-4.5.51.tar.gz) = aaa8bf057b00e7a3401a14aa7b786fc45825b73b
|
||||
SHA1 (mc-4.5.51.tar.gz) = 24d5d90695266587a2e8190196b32c8f3a4b2406
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- vfs/tcputil.c.orig Mon May 25 07:16:04 1998
|
||||
+++ vfs/tcputil.c Tue Apr 25 14:15:27 2000
|
||||
@@ -240,7 +240,7 @@ void rpc_add_get_callback (int sock, voi
|
||||
sock_callbacks = new;
|
||||
}
|
||||
|
||||
-#if defined(IS_AIX) || defined(linux) || defined(SCO_FLAVOR) || defined(__QNX__)
|
||||
+#if defined(IS_AIX) || defined(linux) || defined(SCO_FLAVOR) || defined(__QNX__) || defined(__OpenBSD__)
|
||||
static void sig_pipe (int unused)
|
||||
#else
|
||||
static void sig_pipe (void)
|
||||
@ -1,19 +0,0 @@
|
||||
--- src/ext.c.orig Mon May 25 07:16:07 1998
|
||||
+++ src/ext.c Tue Apr 25 19:26:36 2000
|
||||
@@ -133,9 +133,16 @@ exec_extension (char *filename, char *da
|
||||
/* Note: this has to be done after the getlocalcopy call,
|
||||
* since it uses tmpnam as well
|
||||
*/
|
||||
+#ifdef __OpenBSD__
|
||||
+#define TEMPFILE "/tmp/mcXXXXXXXXXX"
|
||||
+ file_name = xmalloc (sizeof(TEMPFILE), TEMPFILE);
|
||||
+ strcpy (file_name, TEMPFILE);
|
||||
+ if ((cmd_file_fd = mkstemp (file_name)) == -1) {
|
||||
+#else
|
||||
file_name = strdup (tmpnam (NULL));
|
||||
|
||||
if ((cmd_file_fd = open (file_name, O_RDWR | O_CREAT | O_TRUNC | O_EXCL, 0600)) == -1){
|
||||
+#endif
|
||||
message (1, MSG_ERROR, _(" Can't create temporary command file \n %s "),
|
||||
unix_error_string (errno));
|
||||
return;
|
||||
@ -1,11 +0,0 @@
|
||||
--- vfs/mcserv.c.orig Mon Apr 24 13:39:16 2000
|
||||
+++ vfs/mcserv.c Mon Apr 24 13:39:59 2000
|
||||
@@ -912,7 +912,7 @@ do_auth (char *username, char *password)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
-#ifndef BSD
|
||||
+#if !defined(BSD) || defined(__OpenBSD__)
|
||||
if (setuid (this->pw_uid))
|
||||
#else
|
||||
if (setreuid (this->pw_uid, this->pw_uid))
|
||||
@ -1,57 +0,0 @@
|
||||
--- src/user.c.orig Mon May 25 07:16:07 1998
|
||||
+++ src/user.c Tue Apr 25 19:13:52 2000
|
||||
@@ -497,13 +497,24 @@ void execute_menu_command (char *s)
|
||||
int do_quote;
|
||||
char prompt [80] = "";
|
||||
int col;
|
||||
+#ifdef __OpenBSD__
|
||||
+ char *file_name;
|
||||
+#else
|
||||
char *file_name = tmpnam (0);
|
||||
+#endif
|
||||
|
||||
#ifdef OS2_NT
|
||||
/* OS/2 and NT requires the command to end in .cmd */
|
||||
file_name = copy_strings (file_name, ".cmd", NULL);
|
||||
#endif
|
||||
+#ifdef __OpenBSD__
|
||||
+#define TEMPFILE "/tmp/mcXXXXXXXXXX"
|
||||
+ file_name = xmalloc (sizeof(TEMPFILE), TEMPFILE);
|
||||
+ strcpy (file_name, TEMPFILE);
|
||||
+ if ((cmd_file_fd = mkstemp (file_name)) == -1) {
|
||||
+#else
|
||||
if ((cmd_file_fd = open (file_name, O_RDWR | O_CREAT | O_TRUNC | O_EXCL, 0600)) == -1){
|
||||
+#endif
|
||||
message (1, MSG_ERROR, _(" Can't create temporary command file \n %s "),
|
||||
unix_error_string (errno));
|
||||
return;
|
||||
@@ -513,6 +524,9 @@ void execute_menu_command (char *s)
|
||||
if (!commands){
|
||||
fclose (cmd_file);
|
||||
unlink (file_name);
|
||||
+#ifdef __OpenBSD__
|
||||
+ free (file_name);
|
||||
+#endif
|
||||
return;
|
||||
}
|
||||
commands++;
|
||||
@@ -536,6 +550,9 @@ void execute_menu_command (char *s)
|
||||
/* User canceled */
|
||||
fclose (cmd_file);
|
||||
unlink (file_name);
|
||||
+#ifdef __OpenBSD__
|
||||
+ free (file_name);
|
||||
+#endif
|
||||
return;
|
||||
}
|
||||
if (do_quote) {
|
||||
@@ -579,6 +596,9 @@ void execute_menu_command (char *s)
|
||||
chmod (file_name, S_IRWXU);
|
||||
execute (file_name);
|
||||
unlink (file_name);
|
||||
+#ifdef __OpenBSD__
|
||||
+ free (file_name);
|
||||
+#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@ -1,28 +0,0 @@
|
||||
--- vfs/vfs.c.orig Mon May 25 07:16:04 1998
|
||||
+++ vfs/vfs.c Thu Apr 27 11:20:45 2000
|
||||
@@ -1274,13 +1274,25 @@
|
||||
fdin = mc_open (filename, O_RDONLY);
|
||||
if (fdin == -1)
|
||||
return NULL;
|
||||
+#ifdef __OpenBSD__
|
||||
+#define TEMPFILE "/tmp/mcXXXXXXXXXX"
|
||||
+ tmp = xmalloc (sizeof(TEMPFILE), TEMPFILE);
|
||||
+ strcpy (tmp, TEMPFILE);
|
||||
+ fdout = mkstemp (tmp);
|
||||
+#else
|
||||
tmp = tmpnam(NULL);
|
||||
fdout = creat (tmp, 0600);
|
||||
+#endif
|
||||
if (fdout == -1) {
|
||||
mc_close (fdin);
|
||||
+#ifdef __OpenBSD__
|
||||
+ free (tmp);
|
||||
+#endif
|
||||
return NULL;
|
||||
}
|
||||
+#ifndef __OpenBSD__
|
||||
tmp = strdup (tmp);
|
||||
+#endif
|
||||
while ((i = mc_read (fdin, buffer, sizeof (buffer))) == sizeof (buffer)) {
|
||||
write (fdout, buffer, i);
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user