PERFORCE change 69113 for review
Sam Leffler
sam at FreeBSD.org
Sat Jan 15 22:18:28 PST 2005
http://perforce.freebsd.org/chv.cgi?CH=69113
Change 69113 by sam at sam_ebb on 2005/01/16 06:17:45
IFC rtld nonsensae
Affected files ...
.. //depot/projects/wifi/etc/rc.d/amd#2 integrate
.. //depot/projects/wifi/etc/rc.d/cron#2 integrate
.. //depot/projects/wifi/etc/rc.d/dhclient#4 integrate
.. //depot/projects/wifi/etc/rc.d/dmesg#2 integrate
.. //depot/projects/wifi/etc/rc.d/inetd#2 integrate
.. //depot/projects/wifi/etc/rc.d/isdnd#2 integrate
.. //depot/projects/wifi/etc/rc.d/jail#4 integrate
.. //depot/projects/wifi/etc/rc.d/ldconfig#2 integrate
.. //depot/projects/wifi/etc/rc.d/mountcritremote#2 integrate
.. //depot/projects/wifi/etc/rc.d/moused#3 integrate
.. //depot/projects/wifi/etc/rc.d/mrouted#2 integrate
.. //depot/projects/wifi/etc/rc.d/named#4 integrate
.. //depot/projects/wifi/etc/rc.d/ntpd#2 integrate
.. //depot/projects/wifi/etc/rc.d/pflog#2 integrate
.. //depot/projects/wifi/etc/rc.d/rarpd#2 integrate
.. //depot/projects/wifi/etc/rc.d/sendmail#2 integrate
.. //depot/projects/wifi/etc/rc.d/sshd#2 integrate
.. //depot/projects/wifi/etc/rc.d/watchdogd#2 integrate
.. //depot/projects/wifi/libexec/rtld-aout/shlib.c#2 integrate
.. //depot/projects/wifi/libexec/rtld-aout/shlib.h#2 integrate
.. //depot/projects/wifi/libexec/rtld-aout/support.c#2 integrate
.. //depot/projects/wifi/libexec/rtld-aout/support.h#2 integrate
Differences ...
==== //depot/projects/wifi/etc/rc.d/amd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: amd,v 1.10 2002/04/29 12:08:17 lukem Exp $
-# $FreeBSD: src/etc/rc.d/amd,v 1.14 2004/10/07 13:55:25 mtm Exp $
+# $FreeBSD: src/etc/rc.d/amd,v 1.15 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: amd
-# REQUIRE: rpcbind ypbind nfsclient
+# REQUIRE: rpcbind ypbind nfsclient cleanvar
# BEFORE: DAEMON
# KEYWORD: nojail
==== //depot/projects/wifi/etc/rc.d/cron#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/cron,v 1.6 2004/10/07 13:55:25 mtm Exp $
+# $FreeBSD: src/etc/rc.d/cron,v 1.7 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: cron
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN cleanvar
# BEFORE: securelevel
# KEYWORD: shutdown
==== //depot/projects/wifi/etc/rc.d/dhclient#4 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: dhclient,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dhclient,v 1.16 2004/05/20 14:16:04 mtm Exp $
+# $FreeBSD: src/etc/rc.d/dhclient,v 1.18 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: dhclient
-# REQUIRE: netif ipfw ipfilter mountcritlocal
+# REQUIRE: netif ipfw ipfilter mountcritlocal cleanvar
# BEFORE: NETWORKING
# KEYWORD: nojail
#
==== //depot/projects/wifi/etc/rc.d/dmesg#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: dmesg,v 1.8 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/dmesg,v 1.4 2004/10/07 13:55:25 mtm Exp $
+# $FreeBSD: src/etc/rc.d/dmesg,v 1.5 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: dmesg
-# REQUIRE: mountcritremote
+# REQUIRE: mountcritremote cleanvar
# BEFORE: DAEMON
# KEYWORD: Daemon nojail
==== //depot/projects/wifi/etc/rc.d/inetd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: inetd,v 1.6 2000/09/19 13:04:38 lukem Exp $
-# $FreeBSD: src/etc/rc.d/inetd,v 1.4 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/inetd,v 1.5 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: inetd
-# REQUIRE: DAEMON LOGIN
+# REQUIRE: DAEMON LOGIN cleanvar
# KEYWORD: shutdown
. /etc/rc.subr
==== //depot/projects/wifi/etc/rc.d/isdnd#2 (text+ko) ====
@@ -1,13 +1,13 @@
#!/bin/sh
#
# $NetBSD: isdnd,v 1.9 2002/04/10 23:37:13 martin Exp $
-# $FreeBSD: src/etc/rc.d/isdnd,v 1.19 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/isdnd,v 1.20 2005/01/16 03:12:03 obrien Exp $
#
# Mostly based on original script (/etc/rc.isdn) written by Hellmuth Michaelis
#
# PROVIDE: isdnd
-# REQUIRE: netif mountcritlocal
+# REQUIRE: netif mountcritlocal cleanvar
# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/wifi/etc/rc.d/jail#4 (text+ko) ====
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/jail,v 1.20 2004/12/14 14:36:35 rse Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.21 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: jail
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN cleanvar
# BEFORE: securelevel
# KEYWORD: nojail shutdown
==== //depot/projects/wifi/etc/rc.d/ldconfig#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/ldconfig,v 1.12 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ldconfig,v 1.13 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: ldconfig
-# REQUIRE: mountcritremote
+# REQUIRE: mountcritremote cleanvar
# BEFORE: DAEMON
. /etc/rc.subr
@@ -28,7 +28,9 @@
fi
done
echo 'ELF ldconfig path:' ${_LDC}
+ldconfig -r >/tmp/ldcon.`basename $0`.0before
${ldconfig} -elf ${_ins} ${_LDC}
+ldconfig -r >/tmp/ldcon.`basename $0`.1after
# Legacy aout support for i386 only
case `sysctl -n hw.machine_arch` in
==== //depot/projects/wifi/etc/rc.d/mountcritremote#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: mountcritremote,v 1.7 2002/04/29 12:29:53 lukem Exp $
-# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.10 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/mountcritremote,v 1.11 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: mountcritremote
-# REQUIRE: NETWORKING root mountcritlocal
+# REQUIRE: NETWORKING root mountcritlocal cleanvar
# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/wifi/etc/rc.d/moused#3 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: moused,v 1.1 2001/10/29 23:25:01 augustss Exp $
-# $FreeBSD: src/etc/rc.d/moused,v 1.8 2004/11/01 18:05:40 mtm Exp $
+# $FreeBSD: src/etc/rc.d/moused,v 1.9 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: moused
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON cleanvar
# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/wifi/etc/rc.d/mrouted#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: mrouted,v 1.6 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/mrouted,v 1.8 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/mrouted,v 1.9 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: mrouted
-# REQUIRE: netif routing
+# REQUIRE: netif routing cleanvar
# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/wifi/etc/rc.d/named#4 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: named,v 1.10 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/named,v 1.19 2004/12/20 18:34:10 peadar Exp $
+# $FreeBSD: src/etc/rc.d/named,v 1.20 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: named
-# REQUIRE: SERVERS
+# REQUIRE: SERVERS cleanvar
# BEFORE: DAEMON
# KEYWORD: shutdown
==== //depot/projects/wifi/etc/rc.d/ntpd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: ntpd,v 1.6 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/ntpd,v 1.10 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ntpd,v 1.11 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: ntpd
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON cleanvar
# BEFORE: LOGIN
# KEYWORD: nojail
==== //depot/projects/wifi/etc/rc.d/pflog#2 (text+ko) ====
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/pflog,v 1.4 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/pflog,v 1.5 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: pflog
-# REQUIRE: root mountcritlocal netif
+# REQUIRE: root mountcritlocal netif cleanvar
# BEFORE: DAEMON LOGIN
# KEYWORD: nojail
==== //depot/projects/wifi/etc/rc.d/rarpd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: rarpd,v 1.5 2002/03/22 04:33:59 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/rarpd,v 1.5 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/rarpd,v 1.6 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: rarpd
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON cleanvar
# BEFORE: LOGIN
# KEYWORD: nojail
==== //depot/projects/wifi/etc/rc.d/sendmail#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: sendmail,v 1.14 2002/02/12 01:26:36 lukem Exp $
-# $FreeBSD: src/etc/rc.d/sendmail,v 1.13 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/sendmail,v 1.14 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: mail
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN cleanvar
# we make mail start late, so that things like .forward's are not
# processed until the system is fully operational
==== //depot/projects/wifi/etc/rc.d/sshd#2 (text+ko) ====
@@ -1,11 +1,11 @@
#!/bin/sh
#
# $NetBSD: sshd,v 1.18 2002/04/29 08:23:34 lukem Exp $
-# $FreeBSD: src/etc/rc.d/sshd,v 1.7 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/sshd,v 1.8 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: sshd
-# REQUIRE: LOGIN
+# REQUIRE: LOGIN cleanvar
. /etc/rc.subr
==== //depot/projects/wifi/etc/rc.d/watchdogd#2 (text+ko) ====
@@ -24,11 +24,11 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/watchdogd,v 1.4 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/watchdogd,v 1.5 2005/01/16 03:12:03 obrien Exp $
#
# PROVIDE: watchdogd
-# REQUIRE: DAEMON
+# REQUIRE: DAEMON cleanvar
# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/wifi/libexec/rtld-aout/shlib.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.23 2002/09/17 01:48:53 peter Exp $
+ * $FreeBSD: src/libexec/rtld-aout/shlib.c,v 1.26 2005/01/14 12:22:57 delphij Exp $
*/
#include <sys/param.h>
@@ -62,14 +62,13 @@
char **search_dirs;
int n_search_dirs;
-char *standard_search_dirs[] = {
+const char *standard_search_dirs[] = {
STANDARD_SEARCH_DIRS
};
void
-add_search_dir(name)
- char *name;
+add_search_dir(const char *name)
{
int n;
@@ -269,7 +268,7 @@
int *minorp;
int do_dot_a;
{
- int namelen;
+ size_t namelen;
DIR *dd;
struct dirent *dp;
int best_dewey[MAXDEWEY];
==== //depot/projects/wifi/libexec/rtld-aout/shlib.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*-
- * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.5 1999/08/28 00:10:06 peter Exp $
+ * $FreeBSD: src/libexec/rtld-aout/shlib.h,v 1.8 2005/01/14 12:22:57 delphij Exp $
*/
/*
@@ -33,7 +33,7 @@
extern char **search_dirs;
extern int n_search_dirs;
-void add_search_dir __P((char *));
+void add_search_dir __P((const char *));
void add_search_path __P((char *));
void std_search_path __P((void));
int getdewey __P((int[], char *));
==== //depot/projects/wifi/libexec/rtld-aout/support.c#2 (text+ko) ====
==== //depot/projects/wifi/libexec/rtld-aout/support.h#2 (text+ko) ====
More information about the p4-projects
mailing list