PERFORCE change 113816 for review
Michael Bushkov
bushman at FreeBSD.org
Thu Feb 1 08:58:26 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=113816
Change 113816 by bushman at bushman_nss_ldap_cached on 2007/02/01 08:58:02
IFC
Affected files ...
.. //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.powerpc/ttys#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#7 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/include/objformat.h#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/Symbol.map#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getobjformat.3#3 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/getobjformat.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#8 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/Makefile#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/calendar.music#3 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/Makefile#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/gzexe#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/gzexe.1#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/gzip.1#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/gzip.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/unbzip2.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zdiff#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zdiff.1#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zforce#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zforce.1#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zgrep#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zgrep.1#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zmore#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zmore.1#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/znew#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/znew.1#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/gzip/zuncompress.c#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/objformat/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/objformat/objformat.1#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/objformat/objformat.c#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/objformat/objformat.sh#1 branch
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/Makefile#8 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/gstat/Makefile#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.c#7 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/sign/main.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/sign/stand.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/quotaon/quotaon.c#2 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/index.c#4 integrate
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/vnconfig/Makefile#2 delete
.. //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/vnconfig/vnconfig.c#2 delete
Differences ...
==== //depot/projects/soc2006/nss_ldap_cached/src/etc/etc.powerpc/ttys#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.3 2005/09/10 22:46:03 grehan Exp $
+# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.4 2007/01/26 06:22:34 marcel Exp $
# @(#)ttys 5.1 (Berkeley) 4/17/89
#
# This file specifies various information about terminals on the system.
@@ -32,12 +32,6 @@
# when going to single-user mode.
console none unknown off secure
#
-# ofw_console(4)
-#screen "/usr/libexec/getty Pc" cons25 on secure
-# zs(4)
-#ttyy0 "/usr/libexec/getty std.9600" cons25 on secure
-#ttyy1 "/usr/libexec/getty std.9600" cons25 off secure
-#
ttyv0 "/usr/libexec/getty Pc" cons25 on secure
# Virtual terminals
ttyv1 "/usr/libexec/getty Pc" cons25 on secure
@@ -50,10 +44,10 @@
#ttyv8 "/usr/X11R6/bin/xdm -nodaemon" xterm off secure
# Serial terminals
# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
-ttyd0 "/usr/libexec/getty std.9600" dialup off secure
-ttyd1 "/usr/libexec/getty std.9600" dialup off secure
-ttyd2 "/usr/libexec/getty std.9600" dialup off secure
-ttyd3 "/usr/libexec/getty std.9600" dialup off secure
+ttyu0 "/usr/libexec/getty std.9600" vt100 on secure
+ttyu1 "/usr/libexec/getty std.9600" dialup off secure
+ttyu2 "/usr/libexec/getty std.9600" dialup off secure
+ttyu3 "/usr/libexec/getty std.9600" dialup off secure
# Dumb console
dcons "/usr/libexec/getty std.9600" vt100 off secure
# Pseudo terminals
==== //depot/projects/soc2006/nss_ldap_cached/src/include/Makefile#7 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.266 2006/11/11 16:26:54 trhodes Exp $
+# $FreeBSD: src/include/Makefile,v 1.267 2007/01/25 22:38:04 peter Exp $
#
# Doing a "make install" builds /usr/include.
@@ -15,7 +15,7 @@
inttypes.h iso646.h kenv.h langinfo.h libgen.h limits.h link.h \
locale.h malloc.h malloc_np.h memory.h monetary.h mpool.h mqueue.h \
ndbm.h netconfig.h \
- netdb.h nl_types.h nlist.h nss.h nsswitch.h objformat.h paths.h \
+ netdb.h nl_types.h nlist.h nss.h nsswitch.h paths.h \
printf.h proc_service.h pthread.h \
pthread_np.h pwd.h ranlib.h readpassphrase.h regex.h regexp.h \
res_update.h resolv.h runetype.h search.h setjmp.h sgtty.h \
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.125 2006/03/13 01:14:56 deischen Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.126 2007/01/25 22:25:59 peter Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -14,7 +14,7 @@
getbootfile.c getbsize.c \
getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
gethostname.c getloadavg.c getlogin.c getmntinfo.c getnetgrent.c \
- getobjformat.c getosreldate.c getpagesize.c \
+ getosreldate.c getpagesize.c \
getpeereid.c getprogname.c getpwent.c getttyent.c \
getusershell.c getvfsbyname.c glob.c \
initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \
@@ -49,7 +49,7 @@
getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \
getdiskbyname.3 getdomainname.3 getfsent.3 \
getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \
- getmntinfo.3 getnetgrent.3 getobjformat.3 getosreldate.3 \
+ getmntinfo.3 getnetgrent.3 getosreldate.3 \
getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \
getttyent.3 getusershell.3 getvfsbyname.3 \
glob.3 initgroups.3 isgreater.3 ldexp.3 lockf.3 makecontext.3 \
==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/gen/Symbol.map#3 (text) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.1 2006/03/13 00:53:17 deischen Exp $
+# $FreeBSD: src/lib/libc/gen/Symbol.map,v 1.2 2007/01/25 22:36:36 peter Exp $
FBSD_1.0 {
__xuname;
@@ -175,7 +175,6 @@
getnetgrent;
endnetgrent;
innetgr;
- getobjformat;
getosreldate;
getpagesize;
getpeereid;
==== //depot/projects/soc2006/nss_ldap_cached/src/share/mk/bsd.own.mk#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.own.mk,v 1.59 2006/11/19 16:28:52 ru Exp $
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.60 2007/01/26 10:19:07 delphij Exp $
#
# The include file <bsd.own.mk> set common variables for owner,
# group, mode, and directories. Defaults are in brackets.
@@ -297,6 +297,7 @@
BIND_UTILS \
BLUETOOTH \
BOOT \
+ BZIP2 \
CALENDAR \
CDDL \
CPP \
@@ -435,6 +436,7 @@
# MK_* variable is set to "no".
#
.for var in \
+ BZIP2 \
GNU \
INET6 \
IPX \
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.3 (Berkeley) 1/7/94
-# $FreeBSD: src/usr.bin/Makefile,v 1.297 2006/11/26 14:36:33 ru Exp $
+# $FreeBSD: src/usr.bin/Makefile,v 1.299 2007/01/26 10:19:07 delphij Exp $
.include <bsd.own.mk>
@@ -75,6 +75,7 @@
getent \
getopt \
${_gprof} \
+ gzip \
head \
${_hesinfo} \
hexdump \
@@ -139,7 +140,6 @@
nohup \
${_nslookup} \
${_nsupdate} \
- objformat \
opieinfo \
opiekey \
opiepasswd \
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" SUCH DAMAGE.
.\"
.\" $Id: rfcomm_sppd.1,v 1.3 2003/09/07 18:15:55 max Exp $
-.\" $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1,v 1.9 2005/12/07 19:41:58 emax Exp $
+.\" $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.1,v 1.10 2007/01/25 20:54:59 emax Exp $
.\"
-.Dd April 26, 2003
+.Dd January 24, 2007
.Dt RFCOMM_SPPD 1
.Os
.Sh NAME
@@ -33,7 +33,7 @@
.Nd RFCOMM Serial Port Profile daemon
.Sh SYNOPSIS
.Nm
-.Op Fl bh
+.Op Fl bhS
.Fl a Ar address
.Fl c Ar channel
.Op Fl t Ar tty
@@ -41,7 +41,11 @@
The
.Nm
utility is a Serial Port Profile daemon.
-It opens RFCOMM connection to the specified
+It can operate in two modes: client and server.
+.Pp
+In client mode,
+.Nm
+opens RFCOMM connection to the specified
.Ar address
server and
.Ar channel .
@@ -54,8 +58,29 @@
.Fl t
option was specified.
.Pp
+If the
+.Fl S
+option is specified,
+.Nm
+will operate in server mode and act as RFCOMM server,
+listening on
+.Dv ANY
+address and advertising a virtual serial port
+via the
+.Xr sdpd 8
+daemon.
The
+.Fl t
+option must be specified;
+the server side of the virtual serial port is attached to the pseudo-terminal
+.Ar tty .
.Nm
+should be run as root in order to communicate with
+.Xr sdp 8
+in this case.
+.Pp
+The
+.Nm
utility opens both master and slave pseudo terminals.
This is done to ensure that RFCOMM connection stays open until
.Nm
@@ -71,17 +96,31 @@
The options are as follows:
.Bl -tag -width indent
.It Fl a Ar address
-This required option specifies the address of the remote RFCOMM server.
+In client mode,
+this required option specifies the address of the remote RFCOMM server.
+If this option is specified in server mode,
+.Nm
+will only accept connections from the
+.Tn Bluetooth
+device with address
+.Ar address .
The address can be specified as BD_ADDR or name.
-If name was specified then the
+If name was specified then
.Nm
utility will attempt to resolve the name via
.Xr bt_gethostbyname 3 .
.It Fl b
Detach from the controlling terminal, i.e., run in background.
.It Fl c Ar channel
-This option specifies RFCOMM channel to connect to.
-RFCOMM channel could either be a number between 1 and 30 or a service name.
+In both client and server mode,
+this required option specifies the RFCOMM channel to connect to or listen on.
+In server mode,
+the channel should be a number between 1 and 30.
+If not specified,
+.Nm
+will try to allocate RFCOMM channel number based on process ID.
+In client mode,
+the channel could either be a number between 1 and 30 or a service name.
Supported service names are:
.Cm DUN
(for DialUp Networking service),
@@ -97,11 +136,16 @@
Discovery Protocol from the server.
.It Fl h
Display usage message and exit.
+.It Fl S
+Server mode; see
+.Sx DESCRIPTION .
.It Fl t Ar tty
Slave pseudo tty name.
If not set stdin/stdout will be used.
This option is required if
.Fl b
+or
+.Fl S
option was specified.
.El
.Sh FILES
@@ -129,7 +173,8 @@
.Xr bluetooth 3 ,
.Xr ng_btsocket 4 ,
.Xr pty 4 ,
-.Xr rfcomm_pppd 8
+.Xr rfcomm_pppd 8 ,
+.Xr sdpd 8
.Sh AUTHORS
.An Maksim Yevmenkin Aq m_evmenkin at yahoo.com
.Sh BUGS
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: rfcomm_sppd.c,v 1.4 2003/09/07 18:15:55 max Exp $
- * $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c,v 1.8 2005/12/07 19:41:58 emax Exp $
+ * $FreeBSD: src/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c,v 1.9 2007/01/25 20:54:59 emax Exp $
*/
#include <sys/stat.h>
@@ -72,16 +72,17 @@
struct sockaddr_rfcomm ra;
bdaddr_t addr;
int n, background, channel, service,
- s, amaster, aslave, fd;
+ s, amaster, aslave, fd, doserver;
fd_set rfd;
char *tty = NULL, *ep = NULL, buf[SPPD_BUFFER_SIZE];
memcpy(&addr, NG_HCI_BDADDR_ANY, sizeof(addr));
background = channel = 0;
service = SDP_SERVICE_CLASS_SERIAL_PORT;
+ doserver = 0;
/* Parse command line options */
- while ((n = getopt(argc, argv, "a:bc:t:h")) != -1) {
+ while ((n = getopt(argc, argv, "a:bc:t:hS")) != -1) {
switch (n) {
case 'a': /* BDADDR */
if (!bt_aton(optarg, &addr)) {
@@ -134,6 +135,10 @@
tty = optarg;
break;
+ case 'S':
+ doserver = 1;
+ break;
+
case 'h':
default:
usage();
@@ -142,7 +147,7 @@
}
/* Check if we have everything we need */
- if (memcmp(&addr, NG_HCI_BDADDR_ANY, sizeof(addr)) == 0)
+ if (!doserver && memcmp(&addr, NG_HCI_BDADDR_ANY, sizeof(addr)) == 0)
usage();
/* NOT REACHED */
@@ -165,17 +170,9 @@
if (sigaction(SIGCHLD, &sa, NULL) < 0)
err(1, "Could not sigaction(SIGCHLD)");
- /* Check channel, if was not set then obtain it via SDP */
- if (channel == 0 && service != 0)
- if (rfcomm_channel_lookup(NULL, &addr,
- service, &channel, &n) != 0)
- errc(1, n, "Could not obtain RFCOMM channel");
- if (channel <= 0 || channel > 30)
- errx(1, "Invalid RFCOMM channel number %d", channel);
-
/* Open TTYs */
if (tty == NULL) {
- if (background)
+ if (background || doserver)
usage();
amaster = STDIN_FILENO;
@@ -187,24 +184,95 @@
fd = amaster;
}
+ /* Open RFCOMM connection */
+
+ if (doserver) {
+ struct sockaddr_rfcomm ma;
+ bdaddr_t bt_addr_any;
+ sdp_lan_profile_t lan;
+ void *ss;
+ uint32_t sdp_handle;
+ int acceptsock, aaddrlen;
+
+ if (channel == 0) {
+ /* XXX: should check if selected channel is unused */
+ channel = (getpid() % 30) + 1;
+ }
+ acceptsock = socket(PF_BLUETOOTH, SOCK_STREAM,
+ BLUETOOTH_PROTO_RFCOMM);
+ if (acceptsock < 0)
+ err(1, "Could not create socket");
+
+ memset(&ma, 0, sizeof(ma));
+ ma.rfcomm_len = sizeof(ma);
+ ma.rfcomm_family = AF_BLUETOOTH;
+ ma.rfcomm_channel = channel;
+
+ if (bind(acceptsock, (struct sockaddr *)&ma, sizeof(ma)) < 0)
+ err(1, "Could not bind socket -- channel %d in use?",
+ channel);
+ listen(acceptsock, 10);
+
+ ss = sdp_open_local(NULL);
+ if (ss == NULL)
+ errx(1, "Unable to create local SDP session");
+ if (sdp_error(ss) != 0)
+ errx(1, "Unable to open local SDP session. %s (%d)",
+ strerror(sdp_error(ss)), sdp_error(ss));
+ memset(&lan, 0, sizeof(lan));
+ lan.server_channel = channel;
+
+ memcpy(&bt_addr_any, NG_HCI_BDADDR_ANY, sizeof(bt_addr_any));
+ if (sdp_register_service(ss, service, &bt_addr_any,
+ (void *)&lan, sizeof(lan), &sdp_handle) != 0) {
+ errx(1, "Unable to register LAN service with "
+ "local SDP daemon. %s (%d)",
+ strerror(sdp_error(ss)), sdp_error(ss));
+ }
+
+ s = -1;
+ while (s < 0) {
+ aaddrlen = sizeof(ra);
+ s = accept(acceptsock, (struct sockaddr *)&ra,
+ &aaddrlen);
+ if (s < 0)
+ err(1, "Unable to accept()");
+ if (memcmp(&addr, NG_HCI_BDADDR_ANY, sizeof(addr)) &&
+ memcmp(&addr, &ra.rfcomm_bdaddr, sizeof(addr))) {
+ warnx("Connect from wrong client");
+ close(s);
+ s = -1;
+ }
+ }
+ sdp_unregister_service(ss, sdp_handle);
+ sdp_close(ss);
+ close(acceptsock);
+ } else {
+ /* Check channel, if was not set then obtain it via SDP */
+ if (channel == 0 && service != 0)
+ if (rfcomm_channel_lookup(NULL, &addr,
+ service, &channel, &n) != 0)
+ errc(1, n, "Could not obtain RFCOMM channel");
+ if (channel <= 0 || channel > 30)
+ errx(1, "Invalid RFCOMM channel number %d", channel);
- /* Open RFCOMM connection */
- memset(&ra, 0, sizeof(ra));
- ra.rfcomm_len = sizeof(ra);
- ra.rfcomm_family = AF_BLUETOOTH;
+ s = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
+ if (s < 0)
+ err(1, "Could not create socket");
- s = socket(PF_BLUETOOTH, SOCK_STREAM, BLUETOOTH_PROTO_RFCOMM);
- if (s < 0)
- err(1, "Could not create socket");
+ memset(&ra, 0, sizeof(ra));
+ ra.rfcomm_len = sizeof(ra);
+ ra.rfcomm_family = AF_BLUETOOTH;
- if (bind(s, (struct sockaddr *) &ra, sizeof(ra)) < 0)
- err(1, "Could not bind socket");
+ if (bind(s, (struct sockaddr *) &ra, sizeof(ra)) < 0)
+ err(1, "Could not bind socket");
- memcpy(&ra.rfcomm_bdaddr, &addr, sizeof(ra.rfcomm_bdaddr));
- ra.rfcomm_channel = channel;
+ memcpy(&ra.rfcomm_bdaddr, &addr, sizeof(ra.rfcomm_bdaddr));
+ ra.rfcomm_channel = channel;
- if (connect(s, (struct sockaddr *) &ra, sizeof(ra)) < 0)
- err(1, "Could not connect socket");
+ if (connect(s, (struct sockaddr *) &ra, sizeof(ra)) < 0)
+ err(1, "Could not connect socket");
+ }
/* Became daemon if required */
if (background) {
@@ -346,7 +414,7 @@
ttygid = -1;
(void) chown(tty, getuid(), ttygid);
- (void) chmod(tty, S_IRUSR|S_IWUSR|S_IWGRP);
+ (void) chmod(tty, S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP);
(void) revoke(tty);
if ((*aslave = open(tty, O_RDWR, 0)) < 0) {
@@ -433,12 +501,12 @@
fprintf(stdout,
"Usage: %s options\n" \
"Where options are:\n" \
-"\t-a address Address to connect to (required)\n" \
+"\t-a address Peer address (required in client mode)\n" \
"\t-b Run in background\n" \
-"\t-c channel RFCOMM channel to connect to\n" \
-"\t-t tty TTY name (required in background mode)\n" \
+"\t-c channel RFCOMM channel to connect to or listen on\n" \
+"\t-t tty TTY name (required in background or server mode)\n" \
+"\t-S Server mode\n" \
"\t-h Display this message\n", SPPD_IDENT);
-
exit(255);
} /* usage */
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/calendar/calendars/calendar.music#3 (text+ko) ====
@@ -1,7 +1,7 @@
/*
* Music
*
- * $FreeBSD: src/usr.bin/calendar/calendars/calendar.music,v 1.18 2006/12/29 06:39:35 ru Exp $
+ * $FreeBSD: src/usr.bin/calendar/calendars/calendar.music,v 1.19 2007/01/24 21:21:38 dougb Exp $
*/
#ifndef _calendar_music_
@@ -21,7 +21,7 @@
01/17 Led Zeppelin's first album is released, 1969
01/19 Janis Joplin is born in Port Arthur, Texas, 1943
01/22 Sam Cooke is born in Chicago, 1935
-01/24 Warren Zevon is born, 1947
+01/24 Warren Zevon is born in Chicago, 1947
01/25 Bob Dylan plays the second "Hurricane" benefit, in the Astrodome, 1978
01/27 Bobby "Blue" Bland (Robert Calvin Bland) is born in Tennessee, 1930
01/27 Wolfgang Amadeus Mozart is born in Salzburg, Austria, 1756
@@ -157,6 +157,7 @@
08/26 Jimi Hendrix's Electric Ladyland Studios opens in New York, 1970
09/04 Edvard Grieg dies in Bergen, Norway, 1907
09/07 Keith Moon (The Who) dies in London of a drug overdose, 1978
+09/07 Warren Zevon dies in Los Angeles of lung cancer (mesothelioma), 2003
09/08 Antonin Dvorak born in Nelahozeves, Bohemia, 1841
09/08 Richard Strauss dies in Garmisch-Partenkirchen, Germany, 1949
09/08 Ron "Pigpen" McKernan (Grateful Dead) is born in San Bruno, California, 1945
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.bin/objformat/Makefile#2 (text+ko) ====
@@ -1,5 +1,7 @@
-# $FreeBSD: src/usr.bin/objformat/Makefile,v 1.18 2002/09/17 01:49:00 peter Exp $
+# $FreeBSD: src/usr.bin/objformat/Makefile,v 1.20 2007/01/25 23:12:19 peter Exp $
-PROG= objformat
+SCRIPTS=objformat.sh
+NO_MAN=
.include <bsd.prog.mk>
+
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
# From: @(#)Makefile 5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.366 2006/11/27 16:55:14 ru Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.367 2007/01/28 08:53:48 phk Exp $
.include <bsd.own.mk>
@@ -179,7 +179,6 @@
${_usbdevs} \
vidcontrol \
vipw \
- vnconfig \
watch \
watchdogd \
wicontrol \
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/gstat/Makefile#2 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/usr.sbin/gstat/Makefile,v 1.7 2006/05/20 19:17:47 simon Exp $
+# $FreeBSD: src/usr.sbin/gstat/Makefile,v 1.8 2007/01/30 15:10:37 ru Exp $
PROG= gstat
MAN= gstat.8
WARNS?= 5
-DPADD= ${LIBGEOM} ${LIBDEVSTAT} ${LIBBSDXML} ${LIBCURSES} ${LIBEDIT}
-LDADD= -lgeom -ldevstat -lbsdxml -lcurses -ledit
+DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT} ${LIBCURSES}
+LDADD= -ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lcurses
.include <bsd.prog.mk>
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/mountd/mountd.c#7 (text+ko) ====
@@ -43,7 +43,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.91 2006/11/18 22:43:20 rodrigc Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/mountd/mountd.c,v 1.92 2007/01/26 13:26:43 rodrigc Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -1962,7 +1962,8 @@
if (cp == dirp) {
if (debug)
warnx("mnt unsucc");
- syslog(LOG_ERR, "can't export %s", dirp);
+ syslog(LOG_ERR, "can't export %s %s", dirp,
+ errmsg);
ret = 1;
goto error_exit;
}
@@ -1972,7 +1973,8 @@
if (statfs(dirp, &fsb1) != 0 || bcmp(&fsb1.f_fsid,
&fsb->f_fsid, sizeof(fsb1.f_fsid)) != 0) {
*cp = savedc;
- syslog(LOG_ERR, "can't export %s", dirp);
+ syslog(LOG_ERR, "can't export %s %s", dirp,
+ errmsg);
ret = 1;
goto error_exit;
}
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/sign/main.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/main.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/main.c,v 1.3 2007/01/30 15:09:30 ru Exp $");
#include <sys/types.h>
#include <sys/wait.h>
@@ -106,9 +106,9 @@
int i;
int type = TAG_ANY;
-/* #ifndef BSD4_4 */
+#ifndef BSD4_4
set_program_name(argv[0]);
-/* #endif */
+#endif
#ifdef CHECKER_ONLY
mode = CHECK;
#else
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/pkg_install/sign/stand.c#2 (text+ko) ====
@@ -1,9 +1,9 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/stand.c,v 1.2 2002/04/01 09:39:07 obrien Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/sign/stand.c,v 1.3 2007/01/30 15:09:30 ru Exp $");
#include "stand.h"
-#ifdef BSD4_4
+#ifndef BSD4_4
#include <string.h>
#include <stdio.h>
#include <errno.h>
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/quotaon/quotaon.c#2 (text+ko) ====
@@ -42,7 +42,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/quotaon/quotaon.c,v 1.10 2004/08/07 04:28:54 imp Exp $");
+__FBSDID("$FreeBSD: src/usr.sbin/quotaon/quotaon.c,v 1.11 2007/01/24 22:52:32 mpp Exp $");
/*
* Turn quota on/off for a filesystem.
@@ -177,8 +177,8 @@
return (1);
}
if (vflag)
- printf("%s: %s quotas turned on\n", fs->fs_file,
- qfextension[type]);
+ printf("%s: %s quotas turned on with data file %s\n",
+ fs->fs_file, qfextension[type], qfpathname);
return (0);
}
==== //depot/projects/soc2006/nss_ldap_cached/src/usr.sbin/sysinstall/index.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/sysinstall/index.c,v 1.111 2006/12/19 16:46:44 erwin Exp $
+ * $FreeBSD: src/usr.sbin/sysinstall/index.c,v 1.112 2007/01/31 19:13:08 erwin Exp $
*/
#include <fcntl.h>
@@ -103,6 +103,7 @@
"german", "Ported software for Germanic countries.",
"geography", "Geography-related software.",
"gnome", "Components of the Gnome Desktop environment.",
+ "gnustep", "Software for GNUstep desktop environment.",
"graphics", "Graphics libraries and utilities.",
"haskell", "Software related to the Haskell language.",
"hamradio", "Software for amateur radio.",
@@ -133,6 +134,7 @@
"perl5", "Utilities/modules for the PERL5 language.",
"plan9", "Software from the Plan9 operating system.",
"polish", "Ported software for the Polish market.",
+ "ports-mgmt", "Utilities for managing ports and packages.",
"portuguese", "Ported software for the Portuguese market.",
"print", "Utilities for dealing with printing.",
"python", "Software related to the Python language.",
More information about the p4-projects
mailing list