diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 34a6285..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -otp_doc_html_R12B-5.tar.gz -otp_doc_man_R12B-5.tar.gz -otp_src_R12B-5.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..44c640c --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2014-12-18: Retired orphaned package, because it was orphaned for more than six weeks. +Reference: https://fedorahosted.org/epel/ticket/7 + diff --git a/erlang.spec b/erlang.spec deleted file mode 100644 index fb2ec6a..0000000 --- a/erlang.spec +++ /dev/null @@ -1,318 +0,0 @@ -%define ver R12B -%define rel 5 - -Name: erlang -Version: %{ver} -Release: %{rel}.10%{?dist} -Summary: General-purpose programming language and runtime environment - -Group: Development/Languages -License: ERPL -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 -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 -BuildRequires: openssl-devel -BuildRequires: unixODBC-devel -BuildRequires: tcl-devel -BuildRequires: tk-devel -BuildRequires: gd-devel -%if 0%{?el4}%{?el5} -BuildRequires: java-1.4.2-gcj-compat-devel -%else -BuildRequires: java-1.5.0-gcj-devel -%endif -BuildRequires: flex -BuildRequires: m4 - -Requires: tk - -# Added virtual Provides for each erlang module -Provides: erlang-appmon = %{version}-%{release} -Provides: erlang-asn1 = %{version}-%{release} -Provides: erlang-common_test = %{version}-%{release} -Provides: erlang-compiler = %{version}-%{release} -Provides: erlang-cosEvent = %{version}-%{release} -Provides: erlang-cosEventDomain = %{version}-%{release} -Provides: erlang-cosFileTransfer = %{version}-%{release} -Provides: erlang-cosNotification = %{version}-%{release} -Provides: erlang-cosProperty = %{version}-%{release} -Provides: erlang-cosTime = %{version}-%{release} -Provides: erlang-cosTransactions = %{version}-%{release} -Provides: erlang-crypto = %{version}-%{release} -Provides: erlang-debugger = %{version}-%{release} -Provides: erlang-dialyzer = %{version}-%{release} -Provides: erlang-docbuilder = %{version}-%{release} -Provides: erlang-edoc = %{version}-%{release} -Provides: erlang-erts = %{version}-%{release} -Provides: erlang-et = %{version}-%{release} -Provides: erlang-eunit = %{version}-%{release} -Provides: erlang-gs = %{version}-%{release} -Provides: erlang-hipe = %{version}-%{release} -Provides: erlang-ic = %{version}-%{release} -Provides: erlang-inets = %{version}-%{release} -Provides: erlang-inviso = %{version}-%{release} -Provides: erlang-kernel = %{version}-%{release} -Provides: erlang-megaco = %{version}-%{release} -Provides: erlang-mnesia = %{version}-%{release} -Provides: erlang-observer = %{version}-%{release} -Provides: erlang-odbc = %{version}-%{release} -Provides: erlang-orber = %{version}-%{release} -Provides: erlang-os_mon = %{version}-%{release} -Provides: erlang-otp_mibs = %{version}-%{release} -Provides: erlang-parsetools = %{version}-%{release} -Provides: erlang-percept = %{version}-%{release} -Provides: erlang-pman = %{version}-%{release} -Provides: erlang-public_key = %{version}-%{release} -Provides: erlang-runtime_tools = %{version}-%{release} -Provides: erlang-sasl = %{version}-%{release} -Provides: erlang-snmp = %{version}-%{release} -Provides: erlang-ssh = %{version}-%{release} -Provides: erlang-ssl = %{version}-%{release} -Provides: erlang-stdlib = %{version}-%{release} -Provides: erlang-syntax_tools = %{version}-%{release} -Provides: erlang-test_server = %{version}-%{release} -Provides: erlang-toolbar = %{version}-%{release} -Provides: erlang-tools = %{version}-%{release} -Provides: erlang-tv = %{version}-%{release} -Provides: erlang-typer = %{version}-%{release} -Provides: erlang-webtool = %{version}-%{release} -Provides: erlang-xmerl = %{version}-%{release} - -%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 -systems from Ericsson. - - -%package doc -Summary: Erlang documentation -Group: Development/Languages - -%description doc -Documentation for Erlang. - - -%prep -%setup -q -n otp_src_%{ver}-%{rel} -%patch1 -p1 -b .links -%patch2 -p1 -b .fix_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 -sed -i 's|^LD.*=.*|LD = gcc -shared|' lib/common_test/c_src/Makefile -# fix for newer glibc version -sed -i 's|__GLIBC_MINOR__ <= 7|__GLIBC_MINOR__ <= 8|' erts/emulator/hipe/hipe_x86_signal.c -# use gcc -shared instead of ld -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 --enable-dynamic-ssl-lib -%else -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-dynamic-ssl-lib -%endif -chmod -R u+w . -make - - -%install -rm -rf $RPM_BUILD_ROOT -make INSTALL_PREFIX=$RPM_BUILD_ROOT install - -# clean up -find $RPM_BUILD_ROOT%{_libdir}/erlang -perm 0775 | xargs chmod 755 -find $RPM_BUILD_ROOT%{_libdir}/erlang -name Makefile | xargs chmod 644 -find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.o | xargs chmod 644 -find $RPM_BUILD_ROOT%{_libdir}/erlang -name \*.bat | xargs rm -f -find $RPM_BUILD_ROOT%{_libdir}/erlang -name index.txt.old | xargs rm -f - -# doc -mkdir -p erlang_doc -tar -C erlang_doc -zxf %{SOURCE1} -tar -C $RPM_BUILD_ROOT/%{_libdir}/erlang -zxf %{SOURCE2} - -# make links to binaries -mkdir -p $RPM_BUILD_ROOT/%{_bindir} -cd $RPM_BUILD_ROOT/%{_bindir} -for file in erl erlc escript dialyzer -do - ln -sf ../%{_lib}/erlang/bin/$file . -done - -# remove buildroot from installed files -cd $RPM_BUILD_ROOT/%{_libdir}/erlang -sed -i "s|$RPM_BUILD_ROOT||" erts*/bin/{erl,start} releases/RELEASES bin/{erl,start} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root) -%doc AUTHORS EPLICENCE README -%{_bindir}/* -%{_libdir}/erlang - - -%files doc -%defattr(-,root,root) -%doc erlang_doc/* - - -%post -%{_libdir}/erlang/Install -minimal %{_libdir}/erlang >/dev/null 2>/dev/null - - -%changelog -* Mon Jun 7 2010 Peter Lemenkov - R12B-5.10 -- Added missing virtual provides erlang-erts - -* Tue May 25 2010 Peter Lemenkov - R12B-5.9 -- Use java-1.4.2 only for EL-[45] -- Added virtual provides for each erlang module -- Small typo fix - -* 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. - -* Sun Mar 1 2009 Gerard Milmeister - R12B-5.6 -- new release R12B-5 -- link escript and dialyzer to %{_bindir} - -* Tue Feb 24 2009 Fedora Release Engineering - R12B-5.5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Feb 14 2009 Dennis Gilmore - R12B-4.5 -- fix sparc arches to compile - -* Fri Jan 16 2009 Tomas Mraz - R12B-4.4 -- rebuild with new openssl - -* Sat Oct 25 2008 Gerard Milmeister - R12B-4.1 -- new release R12B-4 - -* Fri Sep 5 2008 Gerard Milmeister - R12B-3.3 -- fixed sslrpath patch - -* Thu Jul 17 2008 Tom "spot" Callaway - R12B-3.2 -- fix license tag - -* Sun Jul 6 2008 Gerard Milmeister - R12B-3.1 -- new release R12B-3 - -* Thu Mar 27 2008 Gerard Milmeister - R12B-1.1 -- new release R12B-1 - -* Sat Feb 23 2008 Gerard Milmeister - R12B-0.3 -- disable strict aliasing optimization - -* Mon Feb 18 2008 Fedora Release Engineering - R12B-0.2 -- Autorebuild for GCC 4.3 - -* Sat Dec 8 2007 Gerard Milmeister - R12B-0.1 -- new release R12B-0 - -* Wed Dec 05 2007 Release Engineering - R11B-6 - - Rebuild for deps - -* Sun Aug 19 2007 Gerard Milmeister - R11B-5.3 -- fix some permissions - -* Sat Aug 18 2007 Gerard Milmeister - R11B-5.2 -- enable dynamic linking for ssl - -* Sat Aug 18 2007 Gerard Milmeister - R11B-5.1 -- new release R11B-5 - -* Sat Mar 24 2007 Thomas Fitzsimmons - R11B-2.4 -- Require java-1.5.0-gcj-devel for build. - -* Sun Dec 31 2006 Gerard Milmeister - R11B-2.3 -- remove buildroot from installed files - -* Sat Dec 30 2006 Gerard Milmeister - R11B-2.2 -- added patch for compiling with glibc 2.5 - -* Sat Dec 30 2006 Gerard Milmeister - R11B-2.1 -- new version R11B-2 - -* Mon Aug 28 2006 Gerard Milmeister - R11B-0.3 -- Rebuild for FE6 - -* Wed Jul 5 2006 Gerard Milmeister - R11B-0.2 -- add BR m4 - -* Thu May 18 2006 Gerard Milmeister - R11B-0.1 -- new version R11B-0 - -* Wed May 3 2006 Gerard Milmeister - R10B-10.3 -- added patch for run_erl by Knut-Håvard Aksnes - -* Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 -- new version R10B-10 - -* Thu Dec 29 2005 Gerard Milmeister - R10B-9.1 -- New Version R10B-9 - -* Sat Oct 29 2005 Gerard Milmeister - R10B-8.2 -- updated rpath patch - -* Sat Oct 29 2005 Gerard Milmeister - R10B-8.1 -- New Version R10B-8 - -* Sat Oct 1 2005 Gerard Milmeister - R10B-6.4 -- Added tk-devel and tcl-devel to buildreq -- Added tk to req - -* Tue Sep 6 2005 Gerard Milmeister - R10B-6.3 -- Remove perl BuildRequires - -* Tue Aug 30 2005 Gerard Milmeister - R10B-6.2 -- change /usr/lib to %%{_libdir} -- redirect output in %%post to /dev/null -- add unixODBC-devel to BuildRequires -- split doc off to erlang-doc package - -* Sat Jun 25 2005 Gerard Milmeister - R10B-6.1 -- New Version R10B-6 - -* Sun Feb 13 2005 Gerard Milmeister - R10B-3.1 -- New Version R10B-3 - -* Mon Dec 27 2004 Gerard Milmeister - 0:R10B-2-0.fdr.1 -- New Version R10B-2 - -* Wed Oct 6 2004 Gerard Milmeister - 0:R10B-0.fdr.1 -- New Version R10B - -* Thu Oct 16 2003 Gerard Milmeister - 0:R9B-1.fdr.1 -- First Fedora release 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 deleted file mode 100644 index 8ba26f2..0000000 --- a/otp-R12B-5-0001-Do-not-create-links-instead-of-real-files.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 deleted file mode 100644 index 131fde1..0000000 --- a/otp-R12B-5-0002-Fix-symlinking-of-epmd.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 1d59d46..0000000 --- a/otp-R12B-5-0003-Do-not-format-man-pages.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 0c7043b..0000000 --- a/otp-R12B-5-0004-Remove-rpath.patch +++ /dev/null @@ -1,65 +0,0 @@ -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 deleted file mode 100644 index 9ae1e61..0000000 --- a/otp-R12B-5-0005-Fix-missing-ssl-libraries-in-EPEL.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index 4db1dbf..0000000 --- a/otp-R12B-5-0006-Fix-shared-libraries-installation.patch +++ /dev/null @@ -1,41 +0,0 @@ -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 deleted file mode 100644 index b6eb746..0000000 --- a/otp-R12B-5-0007-Fix-check-for-compile-workspace-overflow.patch +++ /dev/null @@ -1,55 +0,0 @@ -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/sources b/sources deleted file mode 100644 index 0b15f23..0000000 --- a/sources +++ /dev/null @@ -1,3 +0,0 @@ -fb0c5454bbd865e881b6712295f6d41f otp_doc_html_R12B-5.tar.gz -6231cb172847040395cc34b20781aa3b otp_doc_man_R12B-5.tar.gz -3751ea3fea669d2b25c67eeb883734bb otp_src_R12B-5.tar.gz