Fix conflict with package supplied setproctitle() and our native one.
This commit is contained in:
@@ -1,19 +1,18 @@
|
||||
*** config/os-freebsd2.h.dist Mon Nov 9 21:59:55 1998
|
||||
--- config/os-freebsd2.h Fri Dec 31 15:49:02 1999
|
||||
***************
|
||||
*** 116,121 ****
|
||||
--- 116,122 ----
|
||||
*/
|
||||
#define HAVE_FCHOWN /* Have fchown() */
|
||||
#define HAVE_FCHMOD /* Have fchmod() */
|
||||
+ #define HAVE_PATHS_H /* Have paths.h */
|
||||
#define HAVE_SELECT /* Have select() */
|
||||
#define HAVE_SAVED_IDS /* Have POSIX style saved [ug]id's */
|
||||
#define POSIX_SIGNALS /* Have POSIX signals */
|
||||
***************
|
||||
*** 131,133 ****
|
||||
--- 132,135 ----
|
||||
* that which appears in "include/paths.h".
|
||||
*/
|
||||
#define _PATH_REMSH "/usr/bin/rsh" /**/
|
||||
+ #define _PATH_OLDRDIST "/usr/bin/rdist" /* Enable compat */
|
||||
--- config/os-freebsd2.h.orig Mon Nov 9 19:59:55 1998
|
||||
+++ config/os-freebsd2.h Fri Nov 3 02:40:25 2000
|
||||
@@ -116,8 +116,10 @@
|
||||
*/
|
||||
#define HAVE_FCHOWN /* Have fchown() */
|
||||
#define HAVE_FCHMOD /* Have fchmod() */
|
||||
+#define HAVE_PATHS_H /* Have paths.h */
|
||||
#define HAVE_SELECT /* Have select() */
|
||||
#define HAVE_SAVED_IDS /* Have POSIX style saved [ug]id's */
|
||||
+#define HAVE_SETPROCTITLE /* has a native setproctitle() */
|
||||
#define POSIX_SIGNALS /* Have POSIX signals */
|
||||
|
||||
/*
|
||||
@@ -131,3 +133,4 @@
|
||||
* that which appears in "include/paths.h".
|
||||
*/
|
||||
#define _PATH_REMSH "/usr/bin/rsh" /**/
|
||||
+#define _PATH_OLDRDIST "/usr/bin/rdist" /* Enable compat */
|
||||
|
||||
12
net/rdist6/files/patch-defs.h
Normal file
12
net/rdist6/files/patch-defs.h
Normal file
@@ -0,0 +1,12 @@
|
||||
--- include/defs.h.orig Mon Nov 9 20:23:54 1998
|
||||
+++ include/defs.h Fri Nov 3 02:39:45 2000
|
||||
@@ -379,7 +379,9 @@
|
||||
extern void error(char *, ...);
|
||||
extern void fatalerr(char *, ...);
|
||||
extern void message(int, char *, ...);
|
||||
+#ifndef HAVE_SETPROCTITLE
|
||||
extern void setproctitle(char *fmt, ...);
|
||||
+#endif
|
||||
#else
|
||||
extern void debugmsg();
|
||||
extern void error();
|
||||
19
net/rdist6/files/patch-setargs.c
Normal file
19
net/rdist6/files/patch-setargs.c
Normal file
@@ -0,0 +1,19 @@
|
||||
--- src/setargs.c.orig Mon Nov 9 20:15:56 1998
|
||||
+++ src/setargs.c Fri Nov 3 02:41:25 2000
|
||||
@@ -89,6 +89,8 @@
|
||||
LastArgv = argv[argc-1] + strlen(argv[argc-1]);
|
||||
}
|
||||
|
||||
+#ifndef HAVE_SETPROCTITLE
|
||||
+
|
||||
/*
|
||||
* Set process title
|
||||
*/
|
||||
@@ -165,5 +167,7 @@
|
||||
_setproctitle(buf);
|
||||
}
|
||||
#endif /* !ARG_TYPE */
|
||||
+
|
||||
+#endif /* !HAVE_SETPROCTITLE */
|
||||
|
||||
#endif /* SETARGS */
|
||||
Reference in New Issue
Block a user