rpms/erlang/FC-4 otp-run_erl.patch,NONE,1.1 erlang.spec,1.7,1.8
Gérard Milmeister (gemi)
fedora-extras-commits at redhat.com
Wed May 3 22:01:05 UTC 2006
Author: gemi
Update of /cvs/extras/rpms/erlang/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1469/FC-4
Modified Files:
erlang.spec
Added Files:
otp-run_erl.patch
Log Message:
run_erl patch
otp-run_erl.patch:
--- NEW FILE otp-run_erl.patch ---
--- 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
Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- erlang.spec 13 Mar 2006 15:58:42 -0000 1.7
+++ erlang.spec 3 May 2006 22:01:04 -0000 1.8
@@ -1,6 +1,6 @@
Name: erlang
Version: R10B
-Release: 10.1%{?dist}
+Release: 10.3%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@@ -13,6 +13,7 @@
Patch1: otp-install.patch
Patch2: otp-rpath.patch
Patch3: otp-sslrpath.patch
+Patch5: otp-run_erl.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
@@ -46,6 +47,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch5 -p1
%build
@@ -99,6 +101,9 @@
%changelog
+* Wed May 3 2006 Gerard Milmeister <gemi at bluewin.ch> - R10B-10.3
+- added patch for run_erl by Knut-HÃ¥vard Aksnes
+
* Mon Mar 13 2006 Gerard Milmeister <gemi at bluewin.ch> - R10B-10.1
- new version R10B-10
More information about the fedora-extras-commits
mailing list