From 09a92932b38e3c36a9251d475e1b0b27ba019d42 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Apr 19 2010 11:04:24 +0000 Subject: Backported fix for overflow in PCRE and several minor fixes --- diff --git a/.cvsignore b/.cvsignore index d16b9d5..34a6285 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -otp_src_R12B-5.tar.gz otp_doc_html_R12B-5.tar.gz otp_doc_man_R12B-5.tar.gz +otp_src_R12B-5.tar.gz diff --git a/erlang.spec b/erlang.spec index 4e37e51..5e775da 100644 --- a/erlang.spec +++ b/erlang.spec @@ -3,7 +3,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.7%{?dist} +Release: %{rel}.8%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -12,10 +12,13 @@ URL: http://www.erlang.org Source: http://www.erlang.org/download/otp_src_%{ver}-%{rel}.tar.gz Source1: http://www.erlang.org/download/otp_doc_html_%{ver}-%{rel}.tar.gz Source2: http://www.erlang.org/download/otp_doc_man_%{ver}-%{rel}.tar.gz -Patch0: otp-links.patch -Patch1: otp-install.patch -Patch2: otp-rpath.patch -Patch3: otp-sslrpath.patch +Patch1: otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch +Patch2: otp-R12B-5-0002-Fix-symlinking-of-epmd.patch +Patch3: otp-R12B-5-0003-Do-not-format-man-pages.patch +Patch4: otp-R12B-5-0004-Remove-rpath.patch +Patch5: otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch +Patch6: otp-R12B-5-0006-Fix-shared-libraries-installation.patch +Patch7: otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -24,13 +27,17 @@ BuildRequires: unixODBC-devel BuildRequires: tcl-devel BuildRequires: tk-devel BuildRequires: gd-devel +%if 0%{?rhel} +BuildRequires: java-1.4.2-gcj-compat-devel +%else BuildRequires: java-1.5.0-gcj-devel +%endif BuildRequires: flex BuildRequires: m4 Requires: tk -%description +%description Erlang is a general-purpose programming language and runtime environment. Erlang has built-in support for concurrency, distribution and fault tolerance. Erlang is used in several large telecommunication @@ -47,10 +54,14 @@ Documentation for Erlang. %prep %setup -q -n otp_src_%{ver}-%{rel} -%patch0 -p1 -b .links -%patch1 -p1 -b .install -%patch2 -p1 -b .rpath -#%patch3 -p1 -b .sslrpath +%patch1 -p1 -b .links +%patch2 -p1 -b .fyx_epmd_symlink +%patch3 -p1 -b .manpages +%patch4 -p1 -b .rpath_removal +%patch5 -p1 -b .missing_ssl_libraries +%patch6 -p1 -b .so_lib_install_fix +%patch7 -p1 -b .pcre_buffer_overflow + # enable dynamic linking for ssl sed -i 's|SSL_DYNAMIC_ONLY=no|SSL_DYNAMIC_ONLY=yes|' erts/configure @@ -62,12 +73,13 @@ sed -i 's|@RX_LD@|gcc -shared|' lib/common_test/c_src/Makefile.in sed -i 's|@RX_LDFLAGS@||' lib/common_test/c_src/Makefile.in - %build +# WARN: --enable-dynamic-ssl-lib needed for preventing strange messages about missing dependencies on EPEL +# see https://bugzilla.redhat.com/458646 and https://bugzilla.redhat.com/499525 %ifarch sparcv9 sparc64 -CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib %else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib %endif chmod -R u+w . make @@ -106,7 +118,7 @@ sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,st rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root) %doc AUTHORS EPLICENCE README %{_bindir}/* @@ -123,6 +135,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Apr 19 2010 Peter Lemenkov - R12B-5.8 +- Patches rebased +- Added patches 6,7 from trunk +- Use %%configure + * Tue Apr 21 2009 Debarshi Ray R12B-5.7 - Updated rpath patch. - Fixed configure to respect $RPM_OPT_FLAGS. diff --git a/import.log b/import.log new file mode 100644 index 0000000..37d6628 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +erlang-R12B-5_8_fc12:F-11:erlang-R12B-5.8.fc12.src.rpm:1271674987 diff --git a/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch b/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch new file mode 100644 index 0000000..8ba26f2 --- /dev/null +++ b/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch @@ -0,0 +1,27 @@ +From c99976fbfdef713f66b8235b8b5346b51efc7b76 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:31:43 +0400 +Subject: [PATCH 1/7] Do not create links instead of real files + +--- + Makefile.in | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e65bfc5..fb1f90d 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -675,10 +675,6 @@ install.Install: + # Install erlang base public files + # + install.bin: +- for file in $(ERL_BASE_PUB_FILES); do \ +- rm -f $(BINDIR)/$$file; \ +- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ +- done + + # + # Directories needed before we can install +-- +1.6.6.1 + diff --git a/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch b/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch new file mode 100644 index 0000000..131fde1 --- /dev/null +++ b/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch @@ -0,0 +1,25 @@ +From 27c1838e985581f07972c6d069f9b682ec9e07b5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:33:50 +0400 +Subject: [PATCH 2/7] Fix symlinking of epmd + +--- + erts/etc/unix/Install.src | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index 6568766..a6acfeb 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -87,7 +87,7 @@ if [ -h epmd ]; then + /bin/rm -f epmd + fi + +-ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd ++ln -s ../erts-%I_VSN%/bin/epmd epmd + + cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . + cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . +-- +1.6.6.1 + diff --git a/otp-R12B-5-0003-Do-not-format-man-pages.patch b/otp-R12B-5-0003-Do-not-format-man-pages.patch new file mode 100644 index 0000000..1d59d46 --- /dev/null +++ b/otp-R12B-5-0003-Do-not-format-man-pages.patch @@ -0,0 +1,34 @@ +From 5e704c7ad11d10904d136c5687b045f4f9ac8c96 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:35:14 +0400 +Subject: [PATCH 3/7] Do not format man-pages + +--- + erts/etc/unix/Install.src | 14 +------------- + 1 files changed, 1 insertions(+), 13 deletions(-) + +diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src +index a6acfeb..5f7caac 100644 +--- a/erts/etc/unix/Install.src ++++ b/erts/etc/unix/Install.src +@@ -136,16 +136,4 @@ if [ "X$TARGET" != "Xsunos5" -a -d $ERL_ROOT/usr/lib ]; then + (ranlib $library) > /dev/null 2>&1 + done + fi +- +- +-# +-# Fixing the man pages +-# +- +-if [ -d $ERL_ROOT/man ] +-then +- cd $ERL_ROOT +- ./misc/format_man_pages $ERL_ROOT +-fi +- +- ++exit 0 +-- +1.6.6.1 + diff --git a/otp-R12B-5-0004-Remove-rpath.patch b/otp-R12B-5-0004-Remove-rpath.patch new file mode 100644 index 0000000..0c7043b --- /dev/null +++ b/otp-R12B-5-0004-Remove-rpath.patch @@ -0,0 +1,65 @@ +From 03e261ee3152f3c45b23886e143c28bf2953f78d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:36:36 +0400 +Subject: [PATCH 4/7] Remove rpath + +--- + lib/crypto/c_src/Makefile.in | 2 +- + lib/crypto/priv/Makefile | 2 +- + lib/ssl/c_src/Makefile.in | 6 +++--- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in +index fb9ebae..eddcd0a 100644 +--- a/lib/crypto/c_src/Makefile.in ++++ b/lib/crypto/c_src/Makefile.in +@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) + HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) + endif + DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ +-LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ ++LD_R_FLAG= + ifeq ($(strip $(LD_R_FLAG)),) + LD_R_OPT = + else +diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile +index b8acdac..2c2989a 100644 +--- a/lib/crypto/priv/Makefile ++++ b/lib/crypto/priv/Makefile +@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o + # ---------------------------------------------------- + + $(SO_DRIVER): $(OBJS) +- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ ++ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ + -o $@ $^ -lcrypto + + $(DLL_DRIVER): $(OBJS) +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index 57b2929..6fc1140 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -104,7 +104,7 @@ else + SSL_MAKEFILE = + endif + +-CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ ++CC_R_FLAG= + ifeq ($(findstring @,$(CC_R_FLAG)),@) + # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; + # we try our best here instead... +@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),darwin) # darwin: no flag + CC_R_FLAG = + else + ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, +-CC_R_FLAG = -Wl,-rpath, ++CC_R_FLAG = + else # Default: -Wl,-R +-CC_R_FLAG = -Wl,-R ++CC_R_FLAG = + endif + endif + endif +-- +1.6.6.1 + diff --git a/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch b/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch new file mode 100644 index 0000000..9ae1e61 --- /dev/null +++ b/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch @@ -0,0 +1,25 @@ +From eb824c996de021797b6a4dcce233e5ddb54b8059 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:39:17 +0400 +Subject: [PATCH 5/7] Fix missing ssl-libraries in EPEL + +--- + lib/ssl/c_src/Makefile.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib/ssl/c_src/Makefile.in b/lib/ssl/c_src/Makefile.in +index 6fc1140..9bdc2ad 100644 +--- a/lib/ssl/c_src/Makefile.in ++++ b/lib/ssl/c_src/Makefile.in +@@ -40,7 +40,7 @@ VSN=$(SSL_VSN) + CC = @CC@ + LD = @LD@ + SHELL = /bin/sh +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lkeyutils -lselinux + PLAIN_CFLAGS = @CFLAGS@ + + # ---------------------------------------------------- +-- +1.6.6.1 + diff --git a/otp-R12B-5-0006-Fix-shared-libraries-installation.patch b/otp-R12B-5-0006-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..4db1dbf --- /dev/null +++ b/otp-R12B-5-0006-Fix-shared-libraries-installation.patch @@ -0,0 +1,41 @@ +From 43a522c155f9cdf60f741d10cee9b99402143437 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:44:40 +0400 +Subject: [PATCH 6/7] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so) were installed as data files previously. +--- + lib/asn1/c_src/Makefile.in | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile.in b/lib/asn1/c_src/Makefile.in +index e1aad44..73325bb 100644 +--- a/lib/asn1/c_src/Makefile.in ++++ b/lib/asn1/c_src/Makefile.in +@@ -131,7 +131,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/lib +- $(INSTALL_DATA) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SHARED_OBJ_FILES) $(RELSYSDIR)/priv/lib + $(INSTALL_DIR) $(RELSYSDIR)/c_src + $(INSTALL_DATA) $(C_FILES) $(RELSYSDIR)/c_src + +diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in +index 127f8b2..88c0876 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -219,7 +219,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +-- +1.6.6.1 + diff --git a/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch b/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..b6eb746 --- /dev/null +++ b/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From 4c90a8bb06e8bed4b62e15b78b461edb0e606df5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Mon, 19 Apr 2010 13:45:41 +0400 +Subject: [PATCH 7/7] Fix check for compile workspace overflow + +Patch from: +http://vcs.pcre.org/viewvc/code/trunk/pcre_compile.c?r1=504&r2=505&view=patch + +Test case: +N = 819, re:compile([lists:duplicate(N, $(), lists:duplicate(N, $))]). + +Compiling large regular expressions could overflow the workspace +buffer. Modify the test to check for a value smaller than the buffer +size. +--- + erts/emulator/pcre/pcre_compile.c | 9 +++++++-- + 1 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 5d2be9a..08ce2b0 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -91,6 +91,11 @@ is 4 there is plenty of room. */ + + #define COMPILE_WORK_SIZE (4096) + ++/* The overrun tests check for a slightly smaller size so that they detect the ++overrun before it actually does run off the end of the data block. */ ++ ++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100) ++ + + /* Table for handling escaped characters in the range '0'-'z'. Positive returns + are simple data values; negative values are for special things like \d and so +@@ -2444,7 +2449,7 @@ for (;; ptr++) + #ifdef DEBUG + if (code > cd->hwm) cd->hwm = code; /* High water info */ + #endif +- if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */ ++ if (code > cd->start_workspace + WORK_SIZE_CHECK) /* Check for overrun */ + { + *errorcodeptr = ERR52; + goto FAILED; +@@ -2493,7 +2498,7 @@ for (;; ptr++) + /* In the real compile phase, just check the workspace used by the forward + reference list. */ + +- else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE) ++ else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK) + { + *errorcodeptr = ERR52; + goto FAILED; +-- +1.6.6.1 + diff --git a/otp-install.patch b/otp-install.patch deleted file mode 100644 index 68066c7..0000000 --- a/otp-install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- otp_src_R9C-0/erts/etc/unix/Install.src.install 2003-10-17 12:52:14.000000000 +0200 -+++ otp_src_R9C-0/erts/etc/unix/Install.src 2003-10-17 14:26:49.000000000 +0200 -@@ -84,7 +84,7 @@ - /bin/rm -f epmd - fi - --ln -s $ERL_ROOT/erts-%I_VSN%/bin/epmd epmd -+ln -s ../erts-%I_VSN%/bin/epmd epmd - - cp -p $ERL_ROOT/erts-%I_VSN%/bin/run_erl . - cp -p $ERL_ROOT/erts-%I_VSN%/bin/to_erl . -@@ -145,16 +145,4 @@ - (ranlib $library) > /dev/null 2>&1 - done - fi -- -- --# --# Fixing the man pages --# -- --if [ -d $ERL_ROOT/man ] --then -- cd $ERL_ROOT -- ./misc/format_man_pages $ERL_ROOT --fi -- -- -+exit 0 diff --git a/otp-links.patch b/otp-links.patch deleted file mode 100644 index 6c8b227..0000000 --- a/otp-links.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- otp_src_R11B-0/Makefile.in.links 2006-05-12 16:43:44.000000000 +0200 -+++ otp_src_R11B-0/Makefile.in 2006-05-18 20:27:56.000000000 +0200 -@@ -545,10 +545,6 @@ - # Install erlang base public files - # - install.bin: -- for file in $(ERL_BASE_PUB_FILES); do \ -- rm -f $(BINDIR)/$$file; \ -- ${LN_S} $(ERLANG_BINDIR)/$$file $(BINDIR)/$$file; \ -- done - - # - # Directories needed before we can install diff --git a/otp-null.patch b/otp-null.patch deleted file mode 100644 index 7dcaec7..0000000 --- a/otp-null.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c ---- otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c.null 2008-02-23 13:46:52.000000000 +0100 -+++ otp_src_R12B-0/lib/orber/c_src/setsockaddr_in.c 2008-02-23 13:47:15.000000000 +0100 -@@ -17,6 +17,7 @@ - * $Id$ - * - */ -+#include - #include "inet.h" - - #ifdef HAVE_CONFIG_H diff --git a/otp-rpath.patch b/otp-rpath.patch deleted file mode 100644 index 5b1d459..0000000 --- a/otp-rpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -urNp otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in otp_src_R12B-5/lib/crypto/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/crypto/c_src/Makefile.in 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/c_src/Makefile.in 2009-04-21 18:51:34.000000000 +0530 -@@ -80,7 +80,7 @@ ifeq ($(HOST_OS),) - HOST_OS := $(shell $(ERL_TOP)/erts/autoconf/config.guess) - endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ --LD_R_FLAG=@DED_LD_FLAG_RUNTIME_LIBRARY_PATH@ -+LD_R_FLAG= - ifeq ($(strip $(LD_R_FLAG)),) - LD_R_OPT = - else -diff -urNp otp_src_R12B-5.orig/lib/crypto/priv/Makefile otp_src_R12B-5/lib/crypto/priv/Makefile ---- otp_src_R12B-5.orig/lib/crypto/priv/Makefile 2009-04-21 18:38:46.000000000 +0530 -+++ otp_src_R12B-5/lib/crypto/priv/Makefile 2009-04-21 18:52:56.000000000 +0530 -@@ -60,7 +60,7 @@ OBJS = $(OBJDIR)/crypto_drv.o - # ---------------------------------------------------- - - $(SO_DRIVER): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_DRIVER): $(OBJS) -diff -urNp otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in otp_src_R12B-5/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-5.orig/lib/ssl/c_src/Makefile.in 2009-04-21 18:38:47.000000000 +0530 -+++ otp_src_R12B-5/lib/ssl/c_src/Makefile.in 2009-04-21 19:58:29.000000000 +0530 -@@ -104,7 +104,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -113,9 +113,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/otp-sslrpath.patch b/otp-sslrpath.patch deleted file mode 100644 index d53909a..0000000 --- a/otp-sslrpath.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath otp_src_R12B-4/lib/ssl/c_src/Makefile.in ---- otp_src_R12B-4/lib/ssl/c_src/Makefile.in.sslrpath 2008-10-26 00:00:37.000000000 +0200 -+++ otp_src_R12B-4/lib/ssl/c_src/Makefile.in 2008-10-26 00:01:09.000000000 +0200 -@@ -102,7 +102,7 @@ else - SSL_MAKEFILE = - endif - --CC_R_FLAG=@CFLAG_RUNTIME_LIBRARY_PATH@ -+CC_R_FLAG= - ifeq ($(findstring @,$(CC_R_FLAG)),@) - # Old erts configure used which hasn't replaced @CFLAG_RUNTIME_LIBRARY_PATH@; - # we try our best here instead... -@@ -111,9 +111,9 @@ ifeq ($(findstring darwin,$(TARGET)),dar - CC_R_FLAG = - else - ifeq ($(findstring osf,$(TARGET)),osf) # osf1: -Wl,-rpath, --CC_R_FLAG = -Wl,-rpath, -+CC_R_FLAG = - else # Default: -Wl,-R --CC_R_FLAG = -Wl,-R -+CC_R_FLAG = - endif - endif - endif diff --git a/sources b/sources index 6f16b51..0b15f23 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz 6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz +3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz