Attachment 911653 Details for Bug 1112536 – possible patch

[patch] possible patch

0001-Update-to-0.4.21.patch (text/plain), 6.86 KB, created by Wim Taymans on 2014-06-24 07:24:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wim Taymans

Created: 2014-06-24 07:24:47 UTC

Size: 6.86 KB

patch

obsolete

>From ec5fc50abf6fa28ff5d15a94b3434e1deedb715f Mon Sep 17 00:00:00 2001
>From: Wim Taymans <wtaymans@redhat.com>
>Date: Mon, 23 Jun 2014 10:29:33 +0200
>Subject: [PATCH] Update to 0.4.21.
>
>- Update download link
>---
> .gitignore                                         |  1 +
> 0001-Use-a-subdirectory-for-temporary-files.patch  | 15 +++++-----
> ...d-compiler-option-for-ENABLE_USER_CODEMEM.patch | 33 +++++++++++-----------
> orc.spec                                           | 10 +++++--
> sources                                            |  2 +-
> 5 files changed, 34 insertions(+), 27 deletions(-)
>
>diff --git a/.gitignore b/.gitignore
>index ee3bad6..2aaceb4 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -10,3 +10,4 @@ orc-0.4.7.tar.gz
> /orc-0.4.16.tar.gz
> /orc-0.4.17.tar.gz
> /orc-0.4.18.tar.gz
>+/orc-0.4.21.tar.xz
>diff --git a/0001-Use-a-subdirectory-for-temporary-files.patch b/0001-Use-a-subdirectory-for-temporary-files.patch
>index f8fc235..1f31ee6 100644
>--- a/0001-Use-a-subdirectory-for-temporary-files.patch
>+++ b/0001-Use-a-subdirectory-for-temporary-files.patch
>@@ -1,4 +1,4 @@
>-From 048ecb97881ad2763c34458eb705fedf09dcc5ff Mon Sep 17 00:00:00 2001
>+From 61c9c81b5fee8814b7930ca90daa7f5f5a03f144 Mon Sep 17 00:00:00 2001
> From: Fabian Deutsch <fabian.deutsch@gmx.de>
> Date: Tue, 4 Oct 2011 13:28:38 +0200
> Subject: [PATCH 1/2] Use a subdirectory for temporary files.
>@@ -7,14 +7,14 @@ This allows the a better integration with selinux, as the rule can use the path
> 
> Signed-off-by: Fabian Deutsch <fabian.deutsch@gmx.de>
> ---
>- orc/orccodemem.c |   19 ++++++++++++++++++-
>- 1 files changed, 18 insertions(+), 1 deletions(-)
>+ orc/orccodemem.c | 19 ++++++++++++++++++-
>+ 1 file changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/orc/orccodemem.c b/orc/orccodemem.c
>-index f470be5..295a880 100644
>+index 7bb78d2..b9aae31 100644
> --- a/orc/orccodemem.c
> +++ b/orc/orccodemem.c
>-@@ -193,11 +193,27 @@ orc_code_chunk_free (OrcCodeChunk *chunk)
>+@@ -193,12 +193,28 @@ orc_code_chunk_free (OrcCodeChunk *chunk)
>  #ifdef HAVE_CODEMEM_MMAP
>  int
>  orc_code_region_allocate_codemem_dual_map (OrcCodeRegion *region,
>@@ -24,6 +24,7 @@ index f470be5..295a880 100644
>    int fd;
>    int n;
>    char *filename;
>+   mode_t mask;
> +  char *dir;
> +  struct stat stat_p;
> +
>@@ -43,7 +44,7 @@ index f470be5..295a880 100644
>  
>    filename = malloc (strlen ("/orcexec..") +
>        strlen (dir) + 6 + 1);
>-@@ -211,6 +227,7 @@ orc_code_region_allocate_codemem_dual_map (OrcCodeRegion *region,
>+@@ -214,6 +230,7 @@ orc_code_region_allocate_codemem_dual_map (OrcCodeRegion *region,
>    if (force_unlink || !_orc_compiler_flag_debug) {
>      unlink (filename);
>    }
>@@ -52,5 +53,5 @@ index f470be5..295a880 100644
>  
>    n = ftruncate (fd, SIZE);
> -- 
>-1.7.7.6
>+1.9.3
> 
>diff --git a/0002-Add-compiler-option-for-ENABLE_USER_CODEMEM.patch b/0002-Add-compiler-option-for-ENABLE_USER_CODEMEM.patch
>index c6b1487..752d0ee 100644
>--- a/0002-Add-compiler-option-for-ENABLE_USER_CODEMEM.patch
>+++ b/0002-Add-compiler-option-for-ENABLE_USER_CODEMEM.patch
>@@ -1,4 +1,4 @@
>-From bded311d32daa2339055341a7f1c1782ff39d047 Mon Sep 17 00:00:00 2001
>+From fbf32b042437ddc81e22cc13d406fef631ee8222 Mon Sep 17 00:00:00 2001
> From: Fabian Deutsch <fabian.deutsch@gmx.de>
> Date: Sun, 1 Jan 2012 21:41:04 +0100
> Subject: [PATCH 2/2] Add compiler option for ENABLE_USER_CODEMEM.
>@@ -7,16 +7,16 @@ This option disbales non-user-dependent path checking at compile time. If enable
> 
> Signed-off-by: Fabian Deutsch <fabian.deutsch@gmx.de>
> ---
>- configure.ac     |    4 ++++
>- orc/Makefile.am  |    3 +++
>- orc/orccodemem.c |    2 ++
>- 3 files changed, 9 insertions(+), 0 deletions(-)
>+ configure.ac     | 5 +++++
>+ orc/Makefile.am  | 3 +++
>+ orc/orccodemem.c | 2 ++
>+ 3 files changed, 10 insertions(+)
> 
> diff --git a/configure.ac b/configure.ac
>-index 00e1916..4daee88 100644
>+index 1534b73..3f2a778 100644
> --- a/configure.ac
> +++ b/configure.ac
>-@@ -176,6 +176,10 @@ AM_CONDITIONAL(ENABLE_BACKEND_ARM, test "x$ENABLE_BACKEND_ARM" = "xyes")
>+@@ -191,6 +191,11 @@ AM_CONDITIONAL(ENABLE_BACKEND_ARM, test "x$ENABLE_BACKEND_ARM" = "xyes")
>  AM_CONDITIONAL(ENABLE_BACKEND_C64X, test "x$ENABLE_BACKEND_C64X" = "xyes")
>  AM_CONDITIONAL(ENABLE_BACKEND_MIPS, test "x$ENABLE_BACKEND_MIPS" = "xyes")
>  
>@@ -24,15 +24,16 @@ index 00e1916..4daee88 100644
> +  AC_HELP_STRING([--enable-user-codemem],[Force codemem allocation to be user dependent (default is no)]),
> +    [], [enable_user_codemem=no])
> +AM_CONDITIONAL(ENABLE_USER_CODEMEM, test "x$enable_user_codemem" = "xyes")
>- 
>- AC_DEFINE(ORC_EXPORTS, 1, [Defined for compiling internal code])
>- 
>++
>+ dnl Check for -Bsymbolic-functions linker flag used to avoid
>+ dnl intra-library PLT jumps, if available.
>+ AC_ARG_ENABLE(Bsymbolic,
> diff --git a/orc/Makefile.am b/orc/Makefile.am
>-index 26263e0..887d36b 100644
>+index 82973e6..4c6e1c0 100644
> --- a/orc/Makefile.am
> +++ b/orc/Makefile.am
>-@@ -9,6 +9,9 @@ liborc_@ORC_MAJORMINOR@_la_LDFLAGS = \
>- 	-no-undefined -export-symbols-regex 'orc_'
>+@@ -7,6 +7,9 @@ liborc_@ORC_MAJORMINOR@_la_LIBADD = $(LIBM) $(LIBRT) $(PTHREAD_LIBS)
>+ liborc_@ORC_MAJORMINOR@_la_LDFLAGS = $(ORC_LDFLAGS)
>  liborc_@ORC_MAJORMINOR@_la_CFLAGS = $(ORC_CFLAGS) \
>  	-DORC_ENABLE_UNSTABLE_API
> +if ENABLE_USER_CODEMEM
>@@ -42,10 +43,10 @@ index 26263e0..887d36b 100644
>  liborc_@ORC_MAJORMINOR@_la_SOURCES = \
>  	orc.c \
> diff --git a/orc/orccodemem.c b/orc/orccodemem.c
>-index 295a880..4a91e3e 100644
>+index b9aae31..d3d7550 100644
> --- a/orc/orccodemem.c
> +++ b/orc/orccodemem.c
>-@@ -280,12 +280,14 @@ orc_code_region_allocate_codemem (OrcCodeRegion *region)
>+@@ -283,12 +283,14 @@ orc_code_region_allocate_codemem (OrcCodeRegion *region)
>  {
>    const char *tmpdir;
>  
>@@ -61,5 +62,5 @@ index 295a880..4a91e3e 100644
>    tmpdir = getenv ("XDG_RUNTIME_DIR");
>    if (tmpdir && orc_code_region_allocate_codemem_dual_map (region,
> -- 
>-1.7.7.6
>+1.9.3
> 
>diff --git a/orc.spec b/orc.spec
>index 479843b..8cc7054 100644
>--- a/orc.spec
>+++ b/orc.spec
>@@ -1,12 +1,12 @@
> Name:		orc
>-Version:	0.4.18
>-Release:	2%{?dist}
>+Version:	0.4.21
>+Release:	1%{?dist}
> Summary:	The Oil Run-time Compiler
> 
> Group:		System Environment/Libraries
> License:	BSD
> URL:		http://cgit.freedesktop.org/gstreamer/orc/
>-Source0:	http://code.entropywave.com/download/orc/orc-%{version}.tar.gz
>+Source0:        http://gstreamer.freedesktop.org/src/orc/orc-%{version}.tar.xz
> BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
> 
> BuildRequires:	gtk-doc, libtool
>@@ -120,6 +120,10 @@ make check
> 
> 
> %changelog
>+* Mon Jun 23 2014 Wim Taymans <wtaymans@redhat.com> - 0.4.21-1
>+- Update to 0.4.21.
>+- Update download link
>+
> * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.18-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index 51fe5b9..97ca78a 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-1a2552e8d127526c48d644fe6437b377  orc-0.4.18.tar.gz
>+6c17d4570f4b54ac18ee9fd7760dc915  orc-0.4.21.tar.xz
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1112536: 911653