8
0

- restore process name after sv_setpv_mg() call [bsc#1091625]

OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_perl?expand=0&rev=68
This commit is contained in:
2018-07-17 09:37:04 +00:00
committed by Git OBS Bridge
parent 3c1fb6a579
commit 0ce156a570
3 changed files with 29 additions and 1 deletions

View File

@@ -0,0 +1,20 @@
Index: mod_perl-2.0.10/src/modules/perl/mod_perl.c
===================================================================
--- mod_perl-2.0.10.orig/src/modules/perl/mod_perl.c 2016-10-27 22:11:11.000000000 +0200
+++ mod_perl-2.0.10/src/modules/perl/mod_perl.c 2018-07-17 10:47:27.962807330 +0200
@@ -15,6 +15,7 @@
*/
#include "mod_perl.h"
+#include <sys/prctl.h>
/* make sure that mod_perl won't try to start itself, while it's
* already starting. If the flag's value is 1 * it's still starting,
@@ -281,6 +282,7 @@ PerlInterpreter *modperl_startup(server_
*/
PL_origalen = strlen(argv[0]) + 1;
sv_setpv_mg(get_sv("0",0), argv[0]);
+ prctl(PR_SET_NAME, (unsigned long)apr_filepath_name_get(argv[0]), 0, 0, 0);
perl_run(perl);

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 17 09:34:36 UTC 2018 - pgajdos@suse.com
- restore process name after sv_setpv_mg() call [bsc#1091625]
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 30 13:50:32 UTC 2016 - astieger@suse.com Fri Dec 30 13:50:32 UTC 2016 - astieger@suse.com

View File

@@ -1,7 +1,7 @@
# #
# spec file for package apache2-mod_perl # spec file for package apache2-mod_perl
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@ Group: Productivity/Networking/Web/Servers
Url: http://perl.apache.org/ Url: http://perl.apache.org/
Source0: http://apache.miloslavbrada.cz/perl/%{srcname}-%{version}.tar.gz Source0: http://apache.miloslavbrada.cz/perl/%{srcname}-%{version}.tar.gz
Patch1: avoid-broken-provides.diff Patch1: avoid-broken-provides.diff
# bsc#1091625, workaround, according to mls it should be solved in perl
Patch2: apache2-mod_perl-prctl-short-name.patch
BuildRequires: apache-rpm-macros BuildRequires: apache-rpm-macros
BuildRequires: apache2-devel BuildRequires: apache2-devel
BuildRequires: db-devel BuildRequires: db-devel
@@ -80,6 +82,7 @@ software depending on apache2-mod_perl.
%prep %prep
%setup -q -n %{srcname}-%{version} %setup -q -n %{srcname}-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline" perl Makefile.PL INSTALLDIRS=vendor MP_APXS=%{apache_apxs} MP_APR_CONFIG=%{_bindir}/apr-1-config MP_CCOPTS="%{apache_cflags} -fgnu89-inline"