summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/commons-daemon/files')
-rw-r--r--dev-java/commons-daemon/files/1.0.1-as-needed.patch38
-rw-r--r--dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch11
-rw-r--r--dev-java/commons-daemon/files/1.0.1-execve-self.patch10
-rw-r--r--dev-java/commons-daemon/files/1.0.1-fbsd.patch13
4 files changed, 0 insertions, 72 deletions
diff --git a/dev-java/commons-daemon/files/1.0.1-as-needed.patch b/dev-java/commons-daemon/files/1.0.1-as-needed.patch
deleted file mode 100644
index 3f2bc5f1ac40..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-as-needed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- daemon-1.0.1/src/native/unix/support/apsupport.m4.orig 2006-05-07 15:28:22.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/support/apsupport.m4 2006-05-07 15:34:42.000000000 +0200
-@@ -35,7 +35,7 @@
- linux*)
- CFLAGS="$CFLAGS -DOS_LINUX -DDSO_DLFCN"
- supported_os="linux"
-- LDFLAGS="$LDFLAGS -ldl -lpthread"
-+ LIBS="$LIBS -ldl -lpthread"
- ;;
- cygwin)
- CFLAGS="$CFLAGS -DOS_CYGWIN -DDSO_DLFCN -DNO_SETSID"
-@@ -94,4 +94,5 @@
- AC_MSG_RESULT([ok])
- AC_SUBST(CFLAGS)
- AC_SUBST(LDFLAGS)
-+ AC_SUBST(LIBS)
- ])
---- daemon-1.0.1/src/native/unix/Makedefs.in.orig 2006-05-07 15:50:07.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/Makedefs.in 2004-02-27 09:40:46.000000000 +0100
-@@ -22,6 +22,7 @@
- JAR = @JAR@
- CFLAGS = @CFLAGS@
- LDFLAGS = @LDFLAGS@
-+LIBS = @LIBS@
- JAVACFLAGS = @JAVACFLAGS@
- RANLIB = @RANLIB@
- LDCMD = @LDCMD@
---- daemon-1.0.1/src/native/unix/native/Makefile.in.orig 2006-05-07 15:36:54.000000000 +0200
-+++ daemon-1.0.1/src/native/unix/native/Makefile.in 2006-05-07 15:37:44.000000000 +0200
-@@ -36,7 +36,7 @@
- $(RANLIB) libservice.a
-
- jsvc: jsvc-unix.o libservice.a
-- $(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a -o ../jsvc
-+ $(LDCMD) $(LDFLAGS) jsvc-unix.o libservice.a $(LIBS) -o ../jsvc
-
- clean:
- rm -f $(OBJS) ../jsvc jsvc-unix.o libservice.a
diff --git a/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch b/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch
deleted file mode 100644
index 5a9566b91676..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-capabilities-non-root.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemon-1.0.1/src/native/unix/native/jsvc-unix.c.orig 2007-01-20 12:08:52.000000000 +0100
-+++ daemon-1.0.1/src/native/unix/native/jsvc-unix.c 2007-01-20 12:12:35.000000000 +0100
-@@ -475,7 +475,7 @@
-
- #ifdef OS_LINUX
- /* setuid()/setgid() only apply the current thread so we must do it now */
-- if (linuxset_user_group(args->user,uid,gid)!=0)
-+ if (getuid()==0 && linuxset_user_group(args->user,uid,gid)!=0)
- return(4);
- #endif
- /* Initialize the Java VM */
diff --git a/dev-java/commons-daemon/files/1.0.1-execve-self.patch b/dev-java/commons-daemon/files/1.0.1-execve-self.patch
deleted file mode 100644
index 578d2e021e8f..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-execve-self.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- daemon-1.0.1/src/native/unix/native/jsvc-unix.c.orig 2007-01-20 12:08:52.000000000 +0100
-+++ daemon-1.0.1/src/native/unix/native/jsvc-unix.c 2007-01-20 13:15:43.000000000 +0100
-@@ -652,6 +652,7 @@
- log_debug("Invoking w/ LD_LIBRARY_PATH=%s",getenv("LD_LIBRARY_PATH"));
-
- argv[0]=args->procname;
-+ execve("/proc/self/exe",argv,environ);
- execve(old,argv,environ);
- log_error("Cannot execute JSVC executor process");
- return(1);
diff --git a/dev-java/commons-daemon/files/1.0.1-fbsd.patch b/dev-java/commons-daemon/files/1.0.1-fbsd.patch
deleted file mode 100644
index b7851899752d..000000000000
--- a/dev-java/commons-daemon/files/1.0.1-fbsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: daemon-1.0.1/src/native/unix/support/apsupport.m4
-===================================================================
---- daemon-1.0.1.orig/src/native/unix/support/apsupport.m4
-+++ daemon-1.0.1/src/native/unix/support/apsupport.m4
-@@ -49,7 +49,7 @@ AC_DEFUN(AP_SUPPORTED_HOST,[
- CFLAGS="$CFLAGS -DOS_SYSV -DDSO_DLFCN -Kthread"
- LDFLAGS="-Kthread $LDFLAGS -ldl"
- ;;
-- freebsd4.?)
-+ freebsd*)
- CFLAGS="$CFLAGS -DOS_FREEBSD -DDSO_DLFCN -D_THREAD_SAFE -pthread"
- LDFLAGS="-pthread $LDFLAGS"
- supported_os="freebsd"