From 928fb386f477423e84214fd740a45779a51073f4 Mon Sep 17 00:00:00 2001
From: Gérard Milmeister <gemi@fedoraproject.org>
Date: May 03 2006 22:01:07 +0000
Subject: run_erl patch


---

diff --git a/erlang.spec b/erlang.spec
index 1fcee65..1ad9a4c 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -1,6 +1,6 @@
 Name:           erlang
 Version:        R10B
-Release:        10.2%{?dist}
+Release:        10.3%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
@@ -14,6 +14,7 @@ Patch1:		otp-install.patch
 Patch2:		otp-rpath.patch
 Patch3:         otp-sslrpath.patch
 Patch4:		otp-glibc24.patch
+Patch5:		otp-run_erl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -48,6 +49,7 @@ Documentation for Erlang.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
@@ -101,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May  3 2006 Gerard Milmeister <gemi@bluewin.ch> - R10B-10.3
+- added patch for run_erl by Knut-Håvard Aksnes
+
 * Mon Mar 13 2006 Gerard Milmeister <gemi@bluewin.ch> - R10B-10.1
 - new version R10B-10
 
diff --git a/otp-run_erl.patch b/otp-run_erl.patch
new file mode 100644
index 0000000..7629a75
--- /dev/null
+++ b/otp-run_erl.patch
@@ -0,0 +1,46 @@
+--- otp_src_R10B-10/erts/etc/unix/run_erl.c.bak	2006-05-03 15:54:19.000000000 +0200
++++ otp_src_R10B-10/erts/etc/unix/run_erl.c	2006-05-03 15:57:36.000000000 +0200
+@@ -42,6 +42,8 @@
+ #include <dirent.h>
+ #include <termios.h>
+ #include <time.h>
++#include <pty.h>
++#include <utmp.h>
+ #if !defined(NO_SYSLOG)
+ #include <syslog.h>
+ #endif
+@@ -803,6 +805,7 @@
+ static int open_pty_master(char **ptyslave)
+ {
+   int mfd;
++  int sfd;
+   char *major, *minor;
+ 
+   static char majorchars[] = "pqrstuvwxyzabcdePQRSTUVWXYZABCDE";
+@@ -818,6 +821,15 @@
+   /* http://www.xcf.berkeley.edu/~ali/K0D/UNIX/PTY/code/upty.h.html */
+ 
+   {
++    static char ttyname[] = "                                   ";
++    if (0 == openpty(&mfd, &sfd, ttyname, NULL, NULL)) {
++      close(sfd);
++      *ptyslave = ttyname;
++      return mfd;
++    }
++  }
++
++  {
+     /* New style devpts or devfs /dev/pty/{m,s}{0,1....} */
+ 
+     static char ptyname[] = "/dev/pty/mX";
+--- otp_src_R10B-10/erts/etc/common/Makefile.in.orig	2006-05-03 17:08:53.000000000 +0200
++++ otp_src_R10B-10/erts/etc/common/Makefile.in	2006-05-03 17:10:18.000000000 +0200
+@@ -241,7 +241,7 @@
+ 	$(PURIFY) $(LD) $(LDFLAGS) $(ENTRY_LDFLAGS) -o $@ $(OBJDIR)/inet_gethost.o $(ENTRY_OBJ) $(LIBS) 
+ 
+ $(BINDIR)/run_erl: $(OBJDIR)/run_erl.o
+-	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o
++	$(LD) $(LDFLAGS) -lutil -o $@ $(OBJDIR)/run_erl.o
+ 
+ $(OBJDIR)/run_erl.o: ../unix/run_erl.c
+ 	$(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c