diff --git a/erlang.spec b/erlang.spec index 71e535e..c59a8ce 100644 --- a/erlang.spec +++ b/erlang.spec @@ -5,7 +5,7 @@ Name: erlang Version: %{ver} -Release: %{rel}.8%{?dist} +Release: %{rel}.9%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -24,11 +24,13 @@ Patch1: otp-0001-Do-not-format-man-pages.patch # Fedora-specific Patch2: otp-0002-Remove-rpath.patch # Upstreamed -Patch6: otp-0006-Fix-shared-libraries-installation.patch +Patch4: otp-0004-Fix-shared-libraries-installation.patch # Fedora-specific -Patch7: otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +Patch5: otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch # Upstreamed -Patch8: otp-0008-Fix-check-for-compile-workspace-overflow.patch +Patch6: otp-0006-Fix-check-for-compile-workspace-overflow.patch +# Install accidentally forgotten emacs files (see rhbz #585349) (already fixed upstream) +Patch7: otp-0007-Install-missing-emacs-files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -650,9 +652,10 @@ Provides support for XML 1.0. %setup -q -n otp_src_%{ver}%{rel} %patch1 -p1 -b .do_not_format_manpages %patch2 -p1 -b .rpath -%patch6 -p1 -b .fix_shared_lib_install -%patch7 -p1 -b .dlopen_opengl_libs -%patch8 -p1 -b .pcre_overflow +%patch4 -p1 -b .fix_shared_lib_install +%patch5 -p1 -b .dlopen_opengl_libs +%patch6 -p1 -b .pcre_overflow +%patch7 -p1 -b .missing_emacs_files # remove shipped zlib sources rm -f erts/emulator/zlib/*.[ch] @@ -1714,6 +1717,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 28 2010 Peter Lemenkov - R13B-04.9 +- Added missing files, necessary for emacs (see rhbz #585349) +- Patches rebased + * Tue Apr 27 2010 Peter Lemenkov - R13B-04.8 - Added missing BuildRequires libxslt (for building docs) - Removed %%post script completely (resolves rhbz #586428) diff --git a/import.log b/import.log index fddac5f..f7d7db5 100644 --- a/import.log +++ b/import.log @@ -6,3 +6,4 @@ erlang-R13B-04_5_fc12:HEAD:erlang-R13B-04.5.fc12.src.rpm:1272270707 erlang-R13B-04_6_fc12:HEAD:erlang-R13B-04.6.fc12.src.rpm:1272303399 erlang-R13B-04_7_fc12:HEAD:erlang-R13B-04.7.fc12.src.rpm:1272369808 erlang-R13B-04_8_fc12:HEAD:erlang-R13B-04.8.fc12.src.rpm:1272437605 +erlang-R13B-04_9_fc12:HEAD:erlang-R13B-04.9.fc12.src.rpm:1272454729 diff --git a/otp-0001-Do-not-format-man-pages.patch b/otp-0001-Do-not-format-man-pages.patch index 5f9594f..632408b 100644 --- a/otp-0001-Do-not-format-man-pages.patch +++ b/otp-0001-Do-not-format-man-pages.patch @@ -1,7 +1,7 @@ From 80fd602b5cd9f4aaa7b6bd95e174708e27601db5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:45:28 +0300 -Subject: [PATCH 1/9] Do not format man-pages +Subject: [PATCH 1/7] Do not format man-pages Signed-off-by: Peter Lemenkov --- diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 0293073..1da9a67 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -1,7 +1,7 @@ From 2e10f728feb56ea96b2832999a8c34f1f19646bc Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 25 Feb 2010 16:57:43 +0300 -Subject: [PATCH 2/9] Remove rpath +Subject: [PATCH 2/7] Remove rpath Signed-off-by: Peter Lemenkov --- diff --git a/otp-0004-Fix-shared-libraries-installation.patch b/otp-0004-Fix-shared-libraries-installation.patch new file mode 100644 index 0000000..f828169 --- /dev/null +++ b/otp-0004-Fix-shared-libraries-installation.patch @@ -0,0 +1,58 @@ +From edaced375235a006c87a3e15b8b17e9bc6dbb923 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Thu, 15 Apr 2010 13:31:36 +0400 +Subject: [PATCH 4/7] Fix shared libraries installation + +Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, +megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files +previously. + +Signed-off-by: Peter Lemenkov +--- + lib/asn1/c_src/Makefile | 2 +- + lib/megaco/src/flex/Makefile.in | 2 +- + lib/wx/c_src/Makefile.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile +index 906c513..9e9cb18 100644 +--- a/lib/asn1/c_src/Makefile ++++ b/lib/asn1/c_src/Makefile +@@ -124,7 +124,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 6ce9b34..5af651d 100644 +--- a/lib/megaco/src/flex/Makefile.in ++++ b/lib/megaco/src/flex/Makefile.in +@@ -280,7 +280,7 @@ release_spec: opt + $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin + ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) + $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex +- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib ++ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib + endif + + +diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in +index 5a0b4ce..8710641 100644 +--- a/lib/wx/c_src/Makefile.in ++++ b/lib/wx/c_src/Makefile.in +@@ -167,7 +167,7 @@ release_spec: opt + $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) + $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ + $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ +- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) ++ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) + + release_docs_spec: + +-- +1.6.6.1 + diff --git a/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch new file mode 100644 index 0000000..4f55214 --- /dev/null +++ b/otp-0005-Fix-for-dlopening-libGL-and-libGLU.patch @@ -0,0 +1,35 @@ +From 3475d4f155dc4bc2919e371e614fee81f01e87d5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Fri, 16 Apr 2010 21:13:47 +0400 +Subject: [PATCH 5/7] Fix for dlopening libGL and libGLU + +Signed-off-by: Peter Lemenkov +--- + lib/wx/c_src/wxe_gl.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp +index 63dd68f..36bf15f 100644 +--- a/lib/wx/c_src/wxe_gl.cpp ++++ b/lib/wx/c_src/wxe_gl.cpp +@@ -81,7 +81,7 @@ int initOpenGL() + WCHAR * DLName = wxT("opengl32.dll"); + HMODULE LIBhandle = LoadLibrary(DLName); + #else +- char * DLName = (char *) "libGL.so"; ++ char * DLName = (char *) "libGL.so.1"; + void * LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +@@ -132,7 +132,7 @@ int initOpenGL() + DLName = wxT("glu32.dll"); + LIBhandle = LoadLibrary(DLName); + #else +- DLName = (char *) "libGLU.so"; ++ DLName = (char *) "libGLU.so.1"; + LIBhandle = dlopen(DLName, RTLD_LAZY); + #endif + // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); +-- +1.6.6.1 + diff --git a/otp-0006-Fix-check-for-compile-workspace-overflow.patch b/otp-0006-Fix-check-for-compile-workspace-overflow.patch new file mode 100644 index 0000000..37363de --- /dev/null +++ b/otp-0006-Fix-check-for-compile-workspace-overflow.patch @@ -0,0 +1,55 @@ +From 400034faee44b65a5e33014e7ce4edcfcfba870f Mon Sep 17 00:00:00 2001 +From: Michael Santos +Date: Thu, 18 Mar 2010 20:08:10 -0400 +Subject: [PATCH 6/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 2974336..9508c5a 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -92,6 +92,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 +@@ -2445,7 +2450,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; +@@ -2494,7 +2499,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-0006-Fix-shared-libraries-installation.patch b/otp-0006-Fix-shared-libraries-installation.patch deleted file mode 100644 index 2df3cb4..0000000 --- a/otp-0006-Fix-shared-libraries-installation.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0c963550412174a4c4fe64aa7f70189998abef41 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Thu, 15 Apr 2010 13:31:36 +0400 -Subject: [PATCH 6/9] Fix shared libraries installation - -Several shared libraries (asn1_erl_drv.so, megaco_flex_scanner_drv_mt.so, -megaco_flex_scanner_drv.so, wxe_driver.so) were installed as data files -previously. - -Signed-off-by: Peter Lemenkov ---- - lib/asn1/c_src/Makefile | 2 +- - lib/megaco/src/flex/Makefile.in | 2 +- - lib/wx/c_src/Makefile.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 906c513..9e9cb18 100644 ---- a/lib/asn1/c_src/Makefile -+++ b/lib/asn1/c_src/Makefile -@@ -124,7 +124,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 6ce9b34..5af651d 100644 ---- a/lib/megaco/src/flex/Makefile.in -+++ b/lib/megaco/src/flex/Makefile.in -@@ -280,7 +280,7 @@ release_spec: opt - $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin - ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true) - $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) $(RELSYSDIR)/src/flex -- $(INSTALL_DATA) $(SOLIBS) $(RELSYSDIR)/priv/lib -+ $(INSTALL_PROGRAM) $(SOLIBS) $(RELSYSDIR)/priv/lib - endif - - -diff --git a/lib/wx/c_src/Makefile.in b/lib/wx/c_src/Makefile.in -index 5a0b4ce..8710641 100644 ---- a/lib/wx/c_src/Makefile.in -+++ b/lib/wx/c_src/Makefile.in -@@ -167,7 +167,7 @@ release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/$(SYS_TYPE) - $(INSTALL_DATA) ../priv/erlang-logo32.png $(RELSYSDIR)/priv/ - $(INSTALL_DATA) ../priv/erlang-logo64.png $(RELSYSDIR)/priv/ -- $(INSTALL_DATA) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) -+ $(INSTALL_PROGRAM) $(TARGET_DIR)/$(TARGET_API)$(SO_EXT) $(RELSYSDIR)/priv/$(SYS_TYPE) - - release_docs_spec: - --- -1.6.6.1 - diff --git a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch b/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch deleted file mode 100644 index 5e78c4a..0000000 --- a/otp-0007-Fix-for-dlopening-libGL-and-libGLU.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6ffccff36e0d94cba0412cf3a29769b4a19d3be3 Mon Sep 17 00:00:00 2001 -From: Peter Lemenkov -Date: Fri, 16 Apr 2010 21:13:47 +0400 -Subject: [PATCH 7/9] Fix for dlopening libGL and libGLU - -Signed-off-by: Peter Lemenkov ---- - lib/wx/c_src/wxe_gl.cpp | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp -index 63dd68f..36bf15f 100644 ---- a/lib/wx/c_src/wxe_gl.cpp -+++ b/lib/wx/c_src/wxe_gl.cpp -@@ -81,7 +81,7 @@ int initOpenGL() - WCHAR * DLName = wxT("opengl32.dll"); - HMODULE LIBhandle = LoadLibrary(DLName); - #else -- char * DLName = (char *) "libGL.so"; -+ char * DLName = (char *) "libGL.so.1"; - void * LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); -@@ -132,7 +132,7 @@ int initOpenGL() - DLName = wxT("glu32.dll"); - LIBhandle = LoadLibrary(DLName); - #else -- DLName = (char *) "libGLU.so"; -+ DLName = (char *) "libGLU.so.1"; - LIBhandle = dlopen(DLName, RTLD_LAZY); - #endif - // fprintf(stderr, "Loading GL: %s\r\n", (const char*)DLName); --- -1.6.6.1 - diff --git a/otp-0007-Install-missing-emacs-files.patch b/otp-0007-Install-missing-emacs-files.patch new file mode 100644 index 0000000..389c517 --- /dev/null +++ b/otp-0007-Install-missing-emacs-files.patch @@ -0,0 +1,28 @@ +From 09e0f9ec22f680c759feea2e90913128ce2a249d Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Wed, 28 Apr 2010 14:35:59 +0400 +Subject: [PATCH 7/7] Install missing emacs files + +Signed-off-by: Peter Lemenkov +--- + lib/tools/emacs/Makefile | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/lib/tools/emacs/Makefile b/lib/tools/emacs/Makefile +index 7249263..17978de 100644 +--- a/lib/tools/emacs/Makefile ++++ b/lib/tools/emacs/Makefile +@@ -38,7 +38,10 @@ MAN_FILES= \ + + EMACS_FILES= \ + erlang-start \ ++ erlang-skels-old \ ++ erlang-skels \ + erlang-eunit \ ++ erlang_appwiz \ + erlang + + README_FILES= README +-- +1.6.6.1 + diff --git a/otp-0008-Fix-check-for-compile-workspace-overflow.patch b/otp-0008-Fix-check-for-compile-workspace-overflow.patch deleted file mode 100644 index 2e34451..0000000 --- a/otp-0008-Fix-check-for-compile-workspace-overflow.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d496ce48940411976617b66a5c941c78313cb78c Mon Sep 17 00:00:00 2001 -From: Michael Santos -Date: Thu, 18 Mar 2010 20:08:10 -0400 -Subject: [PATCH 8/9] 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 2974336..9508c5a 100644 ---- a/erts/emulator/pcre/pcre_compile.c -+++ b/erts/emulator/pcre/pcre_compile.c -@@ -92,6 +92,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 -@@ -2445,7 +2450,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; -@@ -2494,7 +2499,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 -