1
0

- Drop unused patches:

* 0001-execve-path-warning.patch                                                                                                                                                           
  * config-guess-sub-update.patch                                                                                                                                                            
  * jsvc-libcap-relative.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-daemon?expand=0&rev=15
This commit is contained in:
Tomáš Chvátal 2015-03-24 13:54:45 +00:00 committed by Git OBS Bridge
parent e2a6c99380
commit 128ea55b93
4 changed files with 8 additions and 2379 deletions

View File

@ -1,32 +0,0 @@
From 0de57c78cbe1666fdf78ff6522b3b0ce18f12716 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Tue, 18 Jan 2011 14:46:21 +0100
Subject: [PATCH 1/3] execve path warning
---
src/native/unix/native/jsvc-unix.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/native/unix/native/jsvc-unix.c b/src/native/unix/native/jsvc-unix.c
index 1967f09..22967f1 100644
--- a/src/native/unix/native/jsvc-unix.c
+++ b/src/native/unix/native/jsvc-unix.c
@@ -1015,6 +1015,15 @@ int main(int argc, char *argv[])
char *tmp = NULL;
char *p1 = NULL;
char *p2 = NULL;
+
+ /* We don't want to use a form of exec() that searches the
+ PATH, so require that argv[0] be either an absolute or
+ relative path. Error out if this isn't the case. */
+ if (strchr(argv[0],'/') == NULL) {
+ log_error("JSVC re-exec requires execution with an absolute or relative path");
+ return(1);
+ }
+
/*
* There is no need to change LD_LIBRARY_PATH
--
1.7.6

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Mar 24 13:54:27 UTC 2015 - tchvatal@suse.com
- Drop unused patches:
* 0001-execve-path-warning.patch
* config-guess-sub-update.patch
* jsvc-libcap-relative.patch
-------------------------------------------------------------------
Wed Mar 18 09:45:58 UTC 2015 - tchvatal@suse.com

File diff suppressed because it is too large Load Diff

View File

@ -1,20 +0,0 @@
Index: commons-daemon-1.0.10-src/src/native/unix/native/jsvc-unix.c
===================================================================
--- commons-daemon-1.0.10-src.orig/src/native/unix/native/jsvc-unix.c 2012-07-18 16:00:46.791533454 +0200
+++ commons-daemon-1.0.10-src/src/native/unix/native/jsvc-unix.c 2012-07-18 16:02:14.303529317 +0200
@@ -247,12 +247,9 @@
static fd_cap_set_proc fp_cap_set_proc;
static const char *libcap_locs[] = {
- "/lib/libcap.so.2",
- "/lib/libcap.so.1",
- "/lib/libcap.so",
- "/usr/lib/libcap.so.2",
- "/usr/lib/libcap.so.1",
- "/usr/lib/libcap.so",
+ "libcap.so.2",
+ "libcap.so.1",
+ "libcap.so",
NULL
};