rpms/erlang/EL-5 otp-ssl_missing_libs.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 erlang.spec, 1.18, 1.19 otp-run_erl.patch, 1.1, 1.2 sources, 1.7, 1.8 otp-glibc25.patch, 1.1, NONE

Peter Lemenkov (peter) fedora-extras-commits at redhat.com
Thu Mar 27 19:01:14 UTC 2008


Author: peter

Update of /cvs/extras/rpms/erlang/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31589/EL-5

Modified Files:
	.cvsignore erlang.spec otp-run_erl.patch sources 
Added Files:
	otp-ssl_missing_libs.patch 
Removed Files:
	otp-glibc25.patch 
Log Message:
Ver. R12B-1

otp-ssl_missing_libs.patch:

--- NEW FILE otp-ssl_missing_libs.patch ---
--- lib/ssl/c_src/Makefile.in	2008-03-27 13:43:04.000000000 +0300
+++ lib/ssl/c_src/Makefile.in	2008-03-27 14:03:27.000000000 +0300
@@ -38,7 +38,7 @@
 CC = @CC@
 LD = @LD@
 SHELL = /bin/sh
-LIBS = @LIBS@
+LIBS = @LIBS@ -lkeyutils -lselinux
 PLAIN_CFLAGS = @CFLAGS@
 
 # ----------------------------------------------------


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/erlang/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Dec 2006 22:24:45 -0000	1.7
+++ .cvsignore	27 Mar 2008 19:00:29 -0000	1.8
@@ -1,3 +1,3 @@
-otp_src_R11B-2.tar.gz
-otp_doc_html_R11B-2.tar.gz
-otp_doc_man_R11B-2.tar.gz
+otp_doc_html_R12B-1.tar.gz
+otp_doc_man_R12B-1.tar.gz
+otp_src_R12B-1.tar.gz


Index: erlang.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang/EL-5/erlang.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- erlang.spec	31 Dec 2006 10:18:43 -0000	1.18
+++ erlang.spec	27 Mar 2008 19:00:29 -0000	1.19
@@ -1,20 +1,20 @@
 Name:           erlang
-Version:        R11B
-Release:        2.3%{?dist}
+Version:        R12B
+Release:        1.0%{?dist}
 Summary:        General-purpose programming language and runtime environment
 
 Group:          Development/Languages
 License:        Erlang Public License
 URL:            http://www.erlang.org
-Source:         http://www.erlang.org/download/otp_src_R11B-2.tar.gz
-Source1:	http://www.erlang.org/download/otp_doc_html_R11B-2.tar.gz
-Source2:	http://www.erlang.org/download/otp_doc_man_R11B-2.tar.gz
+Source:         http://www.erlang.org/download/otp_src_R12B-1.tar.gz
+Source1:	http://www.erlang.org/download/otp_doc_html_R12B-1.tar.gz
+Source2:	http://www.erlang.org/download/otp_doc_man_R12B-1.tar.gz
 Patch0:		otp-links.patch
 Patch1:		otp-install.patch
 Patch2:		otp-rpath.patch
 Patch3:         otp-sslrpath.patch
-Patch4:         otp-glibc25.patch
 Patch5:		otp-run_erl.patch
+Patch6:		otp-ssl_missing_libs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ncurses-devel
@@ -44,13 +44,13 @@
 
 
 %prep
-%setup -q -n otp_src_R11B-2
+%setup -q -n otp_src_R12B-1
 %patch0 -p1 -b .links
 %patch1 -p1 -b .install
 %patch2 -p1 -b .rpath
 %patch3 -p1 -b .sslrpath
-%patch4 -p1 -b .glibc25
-%patch5 -p1 -b .run_erl
+%patch5 -p0 -b .run_erl
+%patch6 -p0 -b .keyutils
 
 
 %build
@@ -108,6 +108,9 @@
 
 
 %changelog
+* Wed Mar 26 2008 Peter Lemenkov <lemenkov at gmail.com> - R12B-1.0
+- Ver. R12B-1
+
 * Sun Dec 31 2006 Gerard Milmeister <gemi at bluewin.ch> - R11B-2.3
 - remove buildroot from installed files
 

otp-run_erl.patch:

Index: otp-run_erl.patch
===================================================================
RCS file: /cvs/extras/rpms/erlang/EL-5/otp-run_erl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- otp-run_erl.patch	3 May 2006 22:01:07 -0000	1.1
+++ otp-run_erl.patch	27 Mar 2008 19:00:29 -0000	1.2
@@ -1,46 +1,11 @@
---- 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 @@
+--- erts/etc/common/Makefile.in.orig	2008-03-27 13:11:52.000000000 +0300
++++ erts/etc/common/Makefile.in	2008-03-27 13:13:23.000000000 +0300
+@@ -298,7 +298,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
+-	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS)
++	$(LD) $(LDFLAGS) -o $@ $(OBJDIR)/run_erl.o $(LIBS) -lutil
  
  $(OBJDIR)/run_erl.o: ../unix/run_erl.c
  	$(CC) $(CFLAGS) -o $@ -c ../unix/run_erl.c


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/erlang/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Dec 2006 22:24:45 -0000	1.7
+++ sources	27 Mar 2008 19:00:29 -0000	1.8
@@ -1,3 +1,3 @@
-7d7cca1d2f392a8a317cb4c0bd904726  otp_src_R11B-2.tar.gz
-e2c45ced77ec63b9b1dd95c8f5396f7d  otp_doc_html_R11B-2.tar.gz
-c81023f591c1bace836de3aa874f3c2a  otp_doc_man_R11B-2.tar.gz
+3dd8aee17fcbd3e5fda7313208fce6ac  otp_doc_html_R12B-1.tar.gz
+96da62bcfb40e5d3ec2945bb2b050024  otp_doc_man_R12B-1.tar.gz
+6de3630b446e9c2150edfe01e383c917  otp_src_R12B-1.tar.gz


--- otp-glibc25.patch DELETED ---




More information about the fedora-extras-commits mailing list