From owner-p4-projects@FreeBSD.ORG Tue May 20 21:27:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC1A0106567B; Tue, 20 May 2008 21:27:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 54E601065674 for ; Tue, 20 May 2008 21:27:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 48D7C8FC1D for ; Tue, 20 May 2008 21:27:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4KLRaRK081656 for ; Tue, 20 May 2008 21:27:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4KLRZ7o081654 for perforce@freebsd.org; Tue, 20 May 2008 21:27:35 GMT (envelope-from jb@freebsd.org) Date: Tue, 20 May 2008 21:27:35 GMT Message-Id: <200805202127.m4KLRZ7o081654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 141933 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2008 21:27:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=141933 Change 141933 by jb@freebsd3 on 2008/05/20 21:27:07 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#75 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/config/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/Makefile#5 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/linux-users/Makefile#1 branch .. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/linux-users/article.sgml#1 branch .. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/remote-install/Makefile#1 branch .. //depot/projects/dtrace/doc/zh_CN.GB2312/articles/remote-install/article.sgml#1 branch .. //depot/projects/dtrace/doc/zh_TW.Big5/articles/Makefile#5 integrate .. //depot/projects/dtrace/doc/zh_TW.Big5/articles/remote-install/Makefile#1 branch .. //depot/projects/dtrace/doc/zh_TW.Big5/articles/remote-install/article.sgml#1 branch .. //depot/projects/dtrace/ports/GIDs#22 integrate .. //depot/projects/dtrace/ports/MOVED#88 integrate .. //depot/projects/dtrace/ports/Mk/bsd.ocaml.mk#3 integrate .. //depot/projects/dtrace/ports/UIDs#26 integrate .. //depot/projects/dtrace/ports/UPDATING#74 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_mtree.c#4 integrate .. //depot/projects/dtrace/src/lib/libgeom/geom_util.c#2 integrate .. //depot/projects/dtrace/src/lib/libgeom/libgeom.3#5 integrate .. //depot/projects/dtrace/src/sbin/swapon/Makefile#4 integrate .. //depot/projects/dtrace/src/sbin/swapon/swapon.8#4 integrate .. //depot/projects/dtrace/src/sbin/swapon/swapon.c#4 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#36 integrate .. //depot/projects/dtrace/src/share/man/man4/age.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/altq.4#12 integrate .. //depot/projects/dtrace/src/share/man/man4/man4.i386/acpi_sony.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/miibus.4#8 integrate .. //depot/projects/dtrace/src/share/man/man4/vlan.4#9 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#40 integrate .. //depot/projects/dtrace/src/sys/boot/forth/loader.conf#15 integrate .. //depot/projects/dtrace/src/sys/conf/NOTES#53 integrate .. //depot/projects/dtrace/src/sys/conf/files#91 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_ibm.c#8 integrate .. //depot/projects/dtrace/src/sys/dev/acpi_support/acpi_sony.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/age/if_age.c#1 branch .. //depot/projects/dtrace/src/sys/dev/age/if_agereg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/age/if_agevar.h#1 branch .. //depot/projects/dtrace/src/sys/dev/em/if_em.c#21 integrate .. //depot/projects/dtrace/src/sys/dev/mii/atphy.c#1 branch .. //depot/projects/dtrace/src/sys/dev/mii/atphyreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/mii/miidevs#17 integrate .. //depot/projects/dtrace/src/sys/dev/usb/usb.c#8 integrate .. //depot/projects/dtrace/src/sys/geom/geom_subr.c#10 integrate .. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#39 integrate .. //depot/projects/dtrace/src/sys/modules/Makefile#44 integrate .. //depot/projects/dtrace/src/sys/modules/age/Makefile#1 branch .. //depot/projects/dtrace/src/sys/modules/mii/Makefile#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_cc_functions.c#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#13 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_input.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_os_bsd.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#16 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.h#6 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_structs.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_timer.c#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#15 integrate .. //depot/projects/dtrace/src/sys/netinet/sctp_var.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.c#18 integrate .. //depot/projects/dtrace/src/sys/netinet/sctputil.h#8 integrate .. //depot/projects/dtrace/src/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_lookup.c#12 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#22 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.h#7 integrate .. //depot/projects/dtrace/src/sys/vm/vnode_pager.c#13 integrate .. //depot/projects/dtrace/src/tools/tools/net80211/wlanwatch/wlanwatch.c#7 integrate .. //depot/projects/dtrace/src/usr.bin/sockstat/sockstat.1#5 integrate .. //depot/projects/dtrace/src/usr.bin/sockstat/sockstat.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/tar/bsdtar.c#11 integrate .. //depot/projects/dtrace/src/usr.bin/tar/write.c#11 integrate .. //depot/projects/dtrace/src/usr.sbin/acpi/iasl/iasl.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/devices.c#10 integrate .. //depot/projects/dtrace/src/usr.sbin/wlandebug/wlandebug.8#2 integrate .. //depot/projects/dtrace/src/usr.sbin/wlandebug/wlandebug.c#3 integrate .. //depot/projects/dtrace/www/de/docs/books.sgml#14 integrate .. //depot/projects/dtrace/www/de/share/sgml/news.xml#22 integrate .. //depot/projects/dtrace/www/en/docs/books.sgml#17 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#75 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -403,7 +403,7 @@ Could be started manually with: - &prompt.root; /usr/local/etc/rc.d/utility.sh start + &prompt.root; /usr/local/etc/rc.d/utility start While not all third party software requires the line in rc.conf, almost every day a new port will ==== //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/config/chapter.sgml#4 (text+ko) ==== @@ -1,9 +1,9 @@ @@ -385,7 +385,7 @@ Гараар ингэж эхлүүлж болно: - &prompt.root; /usr/local/etc/rc.d/utility.sh start + &prompt.root; /usr/local/etc/rc.d/utility start Бүх гуравдагч програм хангамжууд rc.conf-д мөр байхыг шаарддаггүй боловч бараг л өдөр болгон шинэ порт ==== //depot/projects/dtrace/doc/zh_CN.GB2312/articles/Makefile#5 (text+ko) ==== @@ -2,12 +2,14 @@ # The FreeBSD Simplified Chinese Project # Original Revision: 1.52 # -# $FreeBSD: doc/zh_CN.GB2312/articles/Makefile,v 1.4 2006/07/09 05:02:22 delphij Exp $ +# $FreeBSD: doc/zh_CN.GB2312/articles/Makefile,v 1.6 2008/05/19 10:03:09 loader Exp $ SUBDIR = SUBDIR+= contributing SUBDIR+= cvs-freebsd +SUBDIR+= linux-users SUBDIR+= nanobsd +SUBDIR+= remote-install DOC_PREFIX?= ${.CURDIR}/../.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" ==== //depot/projects/dtrace/doc/zh_TW.Big5/articles/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: doc/zh_TW.Big5/articles/Makefile,v 1.5 2006/07/09 14:03:00 vanilla Exp $ +# $FreeBSD: doc/zh_TW.Big5/articles/Makefile,v 1.6 2008/05/19 06:50:08 chinsan Exp $ SUBDIR = SUBDIR+= contributing @@ -9,6 +9,7 @@ SUBDIR+= nanobsd SUBDIR+= pr-guidelines SUBDIR+= problem-reports +SUBDIR+= remote-install DOC_PREFIX?= ${.CURDIR}/../.. .include "${DOC_PREFIX}/share/mk/doc.project.mk" ==== //depot/projects/dtrace/ports/GIDs#22 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.58 2008/05/01 00:54:22 beech Exp $ +# $FreeBSD: ports/GIDs,v 1.60 2008/05/19 23:01:48 flz Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -129,3 +129,4 @@ bacula:*:910: iserv:*:911: _relayd:*:913: +bitlbee:*:914: ==== //depot/projects/dtrace/ports/MOVED#88 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1596 2008/05/17 19:17:42 miwi Exp $ +# $FreeBSD: ports/MOVED,v 1.1597 2008/05/19 23:21:30 lwhsu Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -3477,3 +3477,4 @@ x11-servers/xorg-printserver||2008-05-15|Has expired, software is obsolete www/mod_evasive20|www/mod_evasive|2008-05-17|No reason to have the 20 in the name, so remove it. multimedia/smplayer-qt4||2008-05-17|Functionality is now included in smplayer. +devel/php-Net_Gearman|devel/pear-Net_Gearman|2008-05-19|Now it is a pear module ==== //depot/projects/dtrace/ports/Mk/bsd.ocaml.mk#3 (text+ko) ==== @@ -1,7 +1,7 @@ # ex:ts=4 # # $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $ -# $FreeBSD: ports/Mk/bsd.ocaml.mk,v 1.2 2008/04/19 17:46:02 miwi Exp $ +# $FreeBSD: ports/Mk/bsd.ocaml.mk,v 1.3 2008/05/19 07:05:35 stas Exp $ # # bsd.ocaml.mk - Support for the Objective Caml language packages # @@ -20,6 +20,8 @@ # USE_OCAML_LDCONFIG - Set if your port installs shared libraries # into ocaml site-lib dir. OCaml ld.conf file # will be automatically processed. +# USE_OCAMLFIND_PLIST - Add contents of findlib target directories +# automatically. # USE_OCAML_WASH - Set if your port wants to automatically # purge shared Ocaml dirs on uninstall. It's # useful when installing to non-standard PREFIX @@ -122,6 +124,10 @@ . if !target(ocaml-findlib) ocaml-findlib: . for DIR in ${OCAML_PKGDIRS} +. if defined(USE_OCAMLFIND_PLIST) + @${FIND} ${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \ + 's,^${PREFIX}/,,' >> ${TMPPLIST} +. endif @${ECHO_CMD} "@unexec rmdir %D/${OCAML_SITELIBDIR}/${DIR} 2>/dev/null || true" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \ >> ${TMPPLIST} ==== //depot/projects/dtrace/ports/UIDs#26 (text+ko) ==== @@ -1,143 +1,144 @@ -$FreeBSD: ports/UIDs,v 1.68 2008/05/01 00:54:22 beech Exp $ +# $FreeBSD: ports/UIDs,v 1.71 2008/05/20 12:04:15 flz Exp $ # Please keep this file sorted by UID! -smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin -bind:*:53:53:Bind Sandbox:/:/usr/sbin/nologin -majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent -rdfdb:*:55:55:rdfDB Daemon:/var/db/rdfdb:/bin/sh -spamd:*:58:58:SpamAssassin user:/var/spool/spamd:/usr/sbin/nologin -unbound:*:59:59:unbound dns resolver:/nonexistent:/usr/sbin/nologin -cyrus:*:60:60:the cyrus mail server:/nonexistent:/nonexistent -gnats:*:61:1:GNATS database owner:/usr/local/share/gnats/gnats-db:/bin/sh -proxy:*:62:62:Packet Filter pseudo-user:/nonexistent:/nonexistent -uucp:*:66:66:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico -xten:*:67:67:X-10 daemon:/usr/local/xten:/nonexistent -pop:*:68:6:Post Office Owner (popper):/nonexistent:/usr/sbin/nologin -wnn:*:69:7:Wnn:/nonexistent:/nonexistent -pgsql:*:70:70:PostgreSQL pseudo-user:/usr/local/pgsql:/bin/sh -oracle:*:71:71:Oracle:/usr/local/oracle7:/usr/sbin/nologin -ircd:*:72:72:IRC daemon:/nonexistent:/nonexistent -ircservices:*:73:73:IRC services:/nonexistent:/nonexistent -simscan:*:74:74:Simscan User:/nonexistent:/usr/sbin/nologin -ifmail:*:75:66:Ifmail user:/nonexistent:/nonexistent -hybserv:*:76:76:HybServ Daemon:/nonexistent:/usr/sbin/nologin -virtuoso:*:79:79:Virtuoso Universal Server:/usr/local/virtuoso:/bin/sh -www:*:80:80:World Wide Web Owner:/nonexistent:/usr/sbin/nologin -alias:*:81:81:QMail user:/var/qmail/alias:/nonexistent -qmaild:*:82:81:QMail user:/var/qmail:/nonexistent -qmaill:*:83:81:QMail user:/var/qmail:/nonexistent -qmailp:*:84:81:QMail user:/var/qmail:/nonexistent -qmailq:*:85:82:QMail user:/var/qmail:/nonexistent -qmailr:*:86:82:QMail user:/var/qmail:/nonexistent -qmails:*:87:82:QMail user:/var/qmail:/nonexistent -mysql:*:88:88:MySQL Daemon:/var/db/mysql:/usr/sbin/nologin -vpopmail:*:89:89:VPop Mail User:/usr/local/vpopmail:/nonexistent -firebird:*:90:90:Firebird Database Administrator:/var/db/firebird:/bin/sh -mailman:*:91:91:Mailman User:/usr/local/mailman:/usr/sbin/nologin -gdm:*:92:92:GDM Sandbox:/:/usr/sbin/nologin -jabber:*:93:93:Jabber Daemon:/nonexistent:/nonexistent -p4admin:*:94:94:Perforce admin:/usr/local/perforce:/usr/sbin/nologin -interch:*:95:95:Interchange user:/usr/local/interchange:/usr/sbin/nologin -squeuer:*:96:96:SQueuer Owner:/nonexistent:/bin/sh -mud:*:97:97:MUD Owner:/nonexistent:/bin/sh -msql:*:98:98:mSQL-2 pseudo-user:/var/db/msqldb:/bin/sh -rscsi:*:99:99:Remote SCSI:/usr/local/rscsi:/usr/local/sbin/rscsi -squid:*:100:100:squid caching-proxy pseudo user:/usr/local/squid:/usr/sbin/nologin -quagga:*:101:101:Quagga route daemon pseudo user:/usr/local/etc/quagga:/usr/sbin/nologin -ganglia:*:102:102:Ganglia User:/nonexistent:/usr/sbin/nologin -sgeadmin:*:103:103:Sun Grid Engine Admin:/nonexistent:/usr/sbin/nologin -slimserv:*:104:104:Slim Devices SlimServer pseudo-user:/nonexistent:/usr/sbin/nologin -dnetc:*:105:105:distributed.net client and proxy pseudo-user:/nonexistent:/usr/sbin/nologin -clamav:*:106:106:Clamav Antivirus:/nonexistent:/usr/sbin/nologin -cacti:*:107:107:Cacti Sandbox:/nonexistent:/usr/sbin/nologin -webkit:*:108:108:WebKit Default User:/usr/local/www/webkit:/bin/sh -quickml:*:109:109:quickml Server:/nonexistent:/usr/sbin/nologin -vscan:*:110:110:Scanning Virus Account:/var/amavis:/bin/sh -fido:*:111:111:Fido System:/usr/local/fido:/bin/sh -dcc:*:112:112:Distributed Checksum Clearinghouse:/nonexistent:/usr/sbin/nologin -amavis:*:113:113:Amavis-stats Account:/nonexistent:/usr/sbin/nologin -dhis:*:114:114:DHIS Daemon:/nonexistent:/usr/sbin/nologin -_symon:*:115:115:Symon Account:/var/empty:/usr/sbin/nologin -hplip:*:116:116:HPLIP Server:/nonexistent:/usr/sbin/nologin -smokeping:*:117:117:SmokePing Daemon:/nonexistent:/usr/sbin/nologin -ircproxyd:*:118:118:Night Light IRC Proxy:/nonexistent:/usr/sbin/nologin -mythtv:*:119:119:MythTV pseudo-user:/home/mythtv:/bin/sh -pdns_recursor:*:120:120:pdns_recursor pseudo-user:/nonexistent:/usr/sbin/nologin -otrs:*:121:121:OTRS Administrator:/usr/local/otrs:/bin/csh -zabbix:*:122:122:Zabbix NMS:/nonexistent:/usr/sbin/nologin -_ntp:*:123:123:NTP Daemon:/var/empty:/usr/sbin/nologin -fetchmail:*:124:124:Fetchmail mail-retrieval daemon:/nonexistent:/usr/sbin/nologin -postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/usr/sbin/nologin -navcron:*:127:127:Network Administration Visualized:/usr/local/nav:/usr/sbin/nologin -vchat:*:128:128:VChat Conferencing System:/nonexistent:/usr/sbin/nologin -_bgpd:*:130:130:BGP Daemon:/var/empty:/usr/sbin/nologin -_ospfd:*:131:131:OSPF Daemon:/var/empty:/usr/sbin/nologin -_spamd:*:132:132:Spam Daemon:/var/empty:/usr/sbin/nologin -freeradius:*:133:133:FreeRADIUS Daemon:/nonexistent:/usr/sbin/nologin -undernet:*:134:134:Undernet ircu Daemon:/nonexistant:/usr/sbin/nologin -cricket:*:141:80:Cricket Monitoring User:/usr/local/cricket:/usr/sbin/nologin -dovecot:*:143:143:Dovecot User:/var/empty:/usr/sbin/nologin -rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin -sfs:*:171:171:Self-Certifying File System:/nonexistent:/usr/sbin/nologin -agk:*:172:172:AquaGateKeeper:/nonexistent:/nonexistent -polipo:*:173:173:polipo web cache:/nonexistent:/usr/sbin/nologin -flowtools:*:174:174:Flow-tools collector pseudo-user:/nonexistent:/usr/sbin/nologin -nagios:*:181:181:Nagios pseudo-user:/var/spool/nagios:/usr/sbin/nologin -moinmoin:*:192:192:MoinMoin User:/nonexistent:/usr/sbin/nologin -cups:*:193:193:Cups Owner:/nonexistent:/usr/sbin/nologin -sympa:*:200:200:Sympa Owner:/nonexistent:/usr/sbin/nologin -privoxy:*:201:201:Privoxy proxy user:/nonexistent:/usr/sbin/nologin -dspam:*:202:202:Dspam:/nonexistent:/usr/sbin/nologin -shoutcast:*:210:210:Shoutcast sandbox:/nonexistent:/bin/sh -bs:*:220:220:Big Sister:/usr/local/bigsister:/bin/sh -postgrey:*:225:225:Postgrey Owner:/nonexistent:/usr/sbin/nologin -aprsd:*:240:240:aprsd:/nonexistent:/bin/sh -tnc:*:241:241:aprsd:/nonexistent:/bin/sh -fcron:*:247:247:fcron pseudo-user:/nonexistent:/usr/sbin/nologin -_tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh -_dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/usr/sbin/nologin -_trans-proxy-tor:*:258:258:dns-proxy-tor user:/nonexistent:/usr/sbin/nologin -meta1s:*:260:260:MeTA1 SMTPS:/nonexistent:/usr/sbin/nologin -meta1q:*:261:261:MeTA1 QMGR:/nonexistent:/usr/sbin/nologin -meta1c:*:262:262:MeTA1 SMTPC:/nonexistent:/usr/sbin/nologin -meta1m:*:263:263:MeTA1 misc:/nonexistent:/usr/sbin/nologin -meta1:*:264:264: X other:/nonexistent:/usr/sbin/nologin -hacluster:*:275:275:Heartbeat cluster user:/nonexistent:/usr/sbin/nologin -mrtg:*:279:279:MRTG daemon:/nonexistent:/usr/sbin/nologin -hobbit:*:280:280:Hobbit Monitor:/nonexistent:/usr/sbin/nologin -prelude:*:281:281:Prelude user:/nonexistent:/usr/sbin/nologin -_sphinx:*:312:312:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin -dkfilter:*:325:325:DK Filter Owner:/nonexistent:/usr/sbin/nologin -_pma:*:336:80:phpMyAdmin Owner:/nonexistent:/sbin/nologin -wildfire:*:340:340:Wildfire Daemon:/nonexistent:/usr/sbin/nologin -stunnel:*:341:341:Stunnel Daemon:/nonexistent:/usr/sbin/nologin -openfire:*:342:342:Openfire IM Daemon:/nonexistent:/usr/sbin/nologin -_iodined:*:353:353:Iodine Daemon:/nonexistent:/usr/sbin/nologin -ldap:*:389:389:OpenLDAP Server:/nonexistent:/usr/sbin/nologin -tiarra:*:398:398:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin -drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/usr/sbin/nologin -courier:*:465:465:Courier Mail Server:/nonexistent:/usr/sbin/nologin -_bbstored:*:505:505:BoxBackup Store Daemon:/nonexistent:/bin/sh -nullmail:*:522:522:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh -dkimproxy:*:525:525:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin -ejabberd:*:544:544:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh -qtss:*:554:554:Darwin Streaming Server:/nonexistent:/usr/sbin/nologin -ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh -messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin -avahi:*:558:558:Avahi Daemon User:/nonexistent:/usr/sbin/nologin -tacacs:*:559:559:TACACS+ Daemon User:/nonexistent:/usr/sbin/nologin -distcc:*:561:561:Distcc user:/nonexistent:/usr/sbin/nologin -polkit:*:562:562:PolicyKit User:/nonexistent:/usr/sbin/nologin -pulse:*:563:563:PulseAudio System User:/nonexistent:/usr/sbin/nologin -_xsi:*:600:600:XMLSysInfo User:/nonexistent:/usr/sbin/nologin -_pla:*:636:80:phpLDAPAdmin Owner:/nonexistent:/usr/sbin/nologin -bnetd:*:700:700:Bnetd user:/nonexistent:/usr/sbin/nologin -bopm:*:717:717:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh -openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin -puppet:*:814:814:Puppet Daemon:/nonexistent:/sbin/nologin -openacs:*:820:820:OpenACS Daemon User:/nonexistent:/usr/sbin/nologin -dotlrn:*:821:821:.LRN Daemon User:/nonexistent:/usr/sbin/nologin -netdisco:*:840:840:netdisco daemon:/nonexistent:/usr/sbin/nologin -bacula:*:910:910:Bacula Daemon:/var/db/bacula:/usr/sbin/nologin -iserv:*:911:911:Iserv Daemon:/nonexistent:/usr/sbin/nologin -_sj3:*:912:912:SJ3 Daemon:/nonexistent:/usr/sbin/nologin -_relayd:*:913:913:Relay Daemon:/var/empty:/usr/sbin/nologin +smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin +bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin +majordom:*:54:54::0:0:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent +rdfdb:*:55:55::0:0:rdfDB Daemon:/var/db/rdfdb:/bin/sh +spamd:*:58:58::0:0:SpamAssassin user:/var/spool/spamd:/usr/sbin/nologin +unbound:*:59:59::0:0:unbound dns resolver:/nonexistent:/usr/sbin/nologin +cyrus:*:60:60::0:0:the cyrus mail server:/nonexistent:/nonexistent +gnats:*:61:1::0:0:GNATS database owner:/usr/local/share/gnats/gnats-db:/bin/sh +proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/nonexistent +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico +xten:*:67:67::0:0:X-10 daemon:/usr/local/xten:/nonexistent +pop:*:68:6::0:0:Post Office Owner (popper):/nonexistent:/usr/sbin/nologin +wnn:*:69:7::0:0:Wnn:/nonexistent:/nonexistent +pgsql:*:70:70::0:0:PostgreSQL pseudo-user:/usr/local/pgsql:/bin/sh +oracle:*:71:71::0:0:Oracle:/usr/local/oracle7:/usr/sbin/nologin +ircd:*:72:72::0:0:IRC daemon:/nonexistent:/nonexistent +ircservices:*:73:73::0:0:IRC services:/nonexistent:/nonexistent +simscan:*:74:74::0:0:Simscan User:/nonexistent:/usr/sbin/nologin +ifmail:*:75:66::0:0:Ifmail user:/nonexistent:/nonexistent +hybserv:*:76:76::0:0:HybServ Daemon:/nonexistent:/usr/sbin/nologin +virtuoso:*:79:79::0:0:Virtuoso Universal Server:/usr/local/virtuoso:/bin/sh +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +alias:*:81:81::0:0:QMail user:/var/qmail/alias:/nonexistent +qmaild:*:82:81::0:0:QMail user:/var/qmail:/nonexistent +qmaill:*:83:81::0:0:QMail user:/var/qmail:/nonexistent +qmailp:*:84:81::0:0:QMail user:/var/qmail:/nonexistent +qmailq:*:85:82::0:0:QMail user:/var/qmail:/nonexistent +qmailr:*:86:82::0:0:QMail user:/var/qmail:/nonexistent +qmails:*:87:82::0:0:QMail user:/var/qmail:/nonexistent +mysql:*:88:88::0:0:MySQL Daemon:/var/db/mysql:/usr/sbin/nologin +vpopmail:*:89:89::0:0:VPop Mail User:/usr/local/vpopmail:/nonexistent +firebird:*:90:90::0:0:Firebird Database Administrator:/var/db/firebird:/bin/sh +mailman:*:91:91::0:0:Mailman User:/usr/local/mailman:/usr/sbin/nologin +gdm:*:92:92::0:0:GDM Sandbox:/:/usr/sbin/nologin +jabber:*:93:93::0:0:Jabber Daemon:/nonexistent:/nonexistent +p4admin:*:94:94::0:0:Perforce admin:/usr/local/perforce:/usr/sbin/nologin +interch:*:95:95::0:0:Interchange user:/usr/local/interchange:/usr/sbin/nologin +squeuer:*:96:96::0:0:SQueuer Owner:/nonexistent:/bin/sh +mud:*:97:97::0:0:MUD Owner:/nonexistent:/bin/sh +msql:*:98:98::0:0:mSQL-2 pseudo-user:/var/db/msqldb:/bin/sh +rscsi:*:99:99::0:0:Remote SCSI:/usr/local/rscsi:/usr/local/sbin/rscsi +squid:*:100:100::0:0:squid caching-proxy pseudo user:/usr/local/squid:/usr/sbin/nologin +quagga:*:101:101::0:0:Quagga route daemon pseudo user:/usr/local/etc/quagga:/usr/sbin/nologin +ganglia:*:102:102::0:0:Ganglia User:/nonexistent:/usr/sbin/nologin +sgeadmin:*:103:103::0:0:Sun Grid Engine Admin:/nonexistent:/usr/sbin/nologin +slimserv:*:104:104::0:0:Slim Devices SlimServer pseudo-user:/nonexistent:/usr/sbin/nologin +dnetc:*:105:105::0:0:distributed.net client and proxy pseudo-user:/nonexistent:/usr/sbin/nologin +clamav:*:106:106::0:0:Clamav Antivirus:/nonexistent:/usr/sbin/nologin +cacti:*:107:107::0:0:Cacti Sandbox:/nonexistent:/usr/sbin/nologin +webkit:*:108:108::0:0:WebKit Default User:/usr/local/www/webkit:/bin/sh +quickml:*:109:109::0:0:quickml Server:/nonexistent:/usr/sbin/nologin +vscan:*:110:110::0:0:Scanning Virus Account:/var/amavis:/bin/sh +fido:*:111:111::0:0:Fido System:/usr/local/fido:/bin/sh +dcc:*:112:112::0:0:Distributed Checksum Clearinghouse:/nonexistent:/usr/sbin/nologin +amavis:*:113:113::0:0:Amavis-stats Account:/nonexistent:/usr/sbin/nologin +dhis:*:114:114::0:0:DHIS Daemon:/nonexistent:/usr/sbin/nologin +_symon:*:115:115::0:0:Symon Account:/var/empty:/usr/sbin/nologin +hplip:*:116:116::0:0:HPLIP Server:/nonexistent:/usr/sbin/nologin +smokeping:*:117:117::0:0:SmokePing Daemon:/nonexistent:/usr/sbin/nologin +ircproxyd:*:118:118::0:0:Night Light IRC Proxy:/nonexistent:/usr/sbin/nologin +mythtv:*:119:119::0:0:MythTV pseudo-user:/home/mythtv:/bin/sh +pdns_recursor:*:120:120::0:0:pdns_recursor pseudo-user:/nonexistent:/usr/sbin/nologin +otrs:*:121:121::0:0:OTRS Administrator:/usr/local/otrs:/bin/csh +zabbix:*:122:122::0:0:Zabbix NMS:/nonexistent:/usr/sbin/nologin +_ntp:*:123:123::0:0:NTP Daemon:/var/empty:/usr/sbin/nologin +fetchmail:*:124:124::0:0:Fetchmail mail-retrieval daemon:/nonexistent:/usr/sbin/nologin +postfix:*:125:125::0:0:Postfix Mail System:/var/spool/postfix:/usr/sbin/nologin +navcron:*:127:127::0:0:Network Administration Visualized:/usr/local/nav:/usr/sbin/nologin +vchat:*:128:128::0:0:VChat Conferencing System:/nonexistent:/usr/sbin/nologin +_bgpd:*:130:130::0:0:BGP Daemon:/var/empty:/usr/sbin/nologin +_ospfd:*:131:131::0:0:OSPF Daemon:/var/empty:/usr/sbin/nologin +_spamd:*:132:132::0:0:Spam Daemon:/var/empty:/usr/sbin/nologin +freeradius:*:133:133::0:0:FreeRADIUS Daemon:/nonexistent:/usr/sbin/nologin +undernet:*:134:134::0:0:Undernet ircu Daemon:/nonexistant:/usr/sbin/nologin +cricket:*:141:80::0:0:Cricket Monitoring User:/usr/local/cricket:/usr/sbin/nologin +dovecot:*:143:143::0:0:Dovecot User:/var/empty:/usr/sbin/nologin +rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin +sfs:*:171:171::0:0:Self-Certifying File System:/nonexistent:/usr/sbin/nologin +agk:*:172:172::0:0:AquaGateKeeper:/nonexistent:/nonexistent +polipo:*:173:173::0:0:polipo web cache:/nonexistent:/usr/sbin/nologin +flowtools:*:174:174::0:0:Flow-tools collector pseudo-user:/nonexistent:/usr/sbin/nologin +nagios:*:181:181::0:0:Nagios pseudo-user:/var/spool/nagios:/usr/sbin/nologin +moinmoin:*:192:192::0:0:MoinMoin User:/nonexistent:/usr/sbin/nologin +cups:*:193:193::0:0:Cups Owner:/nonexistent:/usr/sbin/nologin +sympa:*:200:200::0:0:Sympa Owner:/nonexistent:/usr/sbin/nologin +privoxy:*:201:201::0:0:Privoxy proxy user:/nonexistent:/usr/sbin/nologin +dspam:*:202:202::0:0:Dspam:/nonexistent:/usr/sbin/nologin +shoutcast:*:210:210::0:0:Shoutcast sandbox:/nonexistent:/bin/sh +bs:*:220:220::0:0:Big Sister:/usr/local/bigsister:/bin/sh +postgrey:*:225:225::0:0:Postgrey Owner:/nonexistent:/usr/sbin/nologin +aprsd:*:240:240::0:0:aprsd:/nonexistent:/bin/sh +tnc:*:241:241::0:0:aprsd:/nonexistent:/bin/sh +fcron:*:247:247::0:0:fcron pseudo-user:/nonexistent:/usr/sbin/nologin +_tor:*:256:256::0:0:Tor anonymising router:/var/db/tor:/bin/sh +_dns-proxy-tor:*:257:257::0:0:dns-proxy-tor user:/nonexistent:/usr/sbin/nologin +_trans-proxy-tor:*:258:258::0:0:dns-proxy-tor user:/nonexistent:/usr/sbin/nologin +meta1s:*:260:260::0:0:MeTA1 SMTPS:/nonexistent:/usr/sbin/nologin +meta1q:*:261:261::0:0:MeTA1 QMGR:/nonexistent:/usr/sbin/nologin +meta1c:*:262:262::0:0:MeTA1 SMTPC:/nonexistent:/usr/sbin/nologin +meta1m:*:263:263::0:0:MeTA1 misc:/nonexistent:/usr/sbin/nologin +meta1:*:264:264::0:0: X other:/nonexistent:/usr/sbin/nologin +hacluster:*:275:275::0:0:Heartbeat cluster user:/nonexistent:/usr/sbin/nologin +mrtg:*:279:279::0:0:MRTG daemon:/nonexistent:/usr/sbin/nologin +hobbit:*:280:280::0:0:Hobbit Monitor:/nonexistent:/usr/sbin/nologin +prelude:*:281:281::0:0:Prelude user:/nonexistent:/usr/sbin/nologin +_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin +dkfilter:*:325:325::0:0:DK Filter Owner:/nonexistent:/usr/sbin/nologin +_pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/sbin/nologin +wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin +stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin +openfire:*:342:342::0:0:Openfire IM Daemon:/nonexistent:/usr/sbin/nologin +_iodined:*:353:353::0:0:Iodine Daemon:/nonexistent:/usr/sbin/nologin +ldap:*:389:389::0:0:OpenLDAP Server:/nonexistent:/usr/sbin/nologin +tiarra:*:398:398::0:0:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin +drweb:*:426:426::0:0:Dr.Web Mail Scanner:/nonexistent:/usr/sbin/nologin +courier:*:465:465::0:0:Courier Mail Server:/nonexistent:/usr/sbin/nologin +_bbstored:*:505:505::0:0:BoxBackup Store Daemon:/nonexistent:/bin/sh +nullmail:*:522:522::0:0:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh +dkimproxy:*:525:525::0:0:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin +ejabberd:*:544:544::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh +qtss:*:554:554::0:0:Darwin Streaming Server:/nonexistent:/usr/sbin/nologin +ircdru:*:555:555::0:0:Russian hybrid IRC server:/nonexistent:/bin/sh +messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin +avahi:*:558:558::0:0:Avahi Daemon User:/nonexistent:/usr/sbin/nologin +tacacs:*:559:559::0:0:TACACS+ Daemon User:/nonexistent:/usr/sbin/nologin +distcc:*:561:561::0:0:Distcc user:/nonexistent:/usr/sbin/nologin +polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin +pulse:*:563:563::0:0:PulseAudio System User:/nonexistent:/usr/sbin/nologin +_xsi:*:600:600::0:0:XMLSysInfo User:/nonexistent:/usr/sbin/nologin +_pla:*:636:80::0:0:phpLDAPAdmin Owner:/nonexistent:/usr/sbin/nologin +bnetd:*:700:700::0:0:Bnetd user:/nonexistent:/usr/sbin/nologin +bopm:*:717:717::0:0:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh +openxpki:*:777:777::0:0:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin +puppet:*:814:814::0:0:Puppet Daemon:/nonexistent:/sbin/nologin +openacs:*:820:820::0:0:OpenACS Daemon User:/nonexistent:/usr/sbin/nologin +dotlrn:*:821:821::0:0:.LRN Daemon User:/nonexistent:/usr/sbin/nologin +netdisco:*:840:840::0:0:netdisco daemon:/nonexistent:/usr/sbin/nologin +bacula:*:910:910::0:0:Bacula Daemon:/var/db/bacula:/usr/sbin/nologin +iserv:*:911:911::0:0:Iserv Daemon:/nonexistent:/usr/sbin/nologin +_sj3:*:912:912::0:0:SJ3 Daemon:/nonexistent:/usr/sbin/nologin +_relayd:*:913:913::0:0:Relay Daemon:/var/empty:/usr/sbin/nologin +bitlbee:*:914:914::0:0:Bitlbee pseudo-user:/nonexistent:/sbin/nologin ==== //depot/projects/dtrace/ports/UPDATING#74 (text+ko) ==== @@ -6,6 +6,22 @@ time you update your ports collection, before attempting any port upgrades. +20080519: + AFFECTS: users of www/nginx and www/nginx-devel + AUTHOR: osa@FreeBSD.org + + Nginx version lines have been changed: 0.5 -> 0.6 for stable and + 0.6 -> 0.7 for development version. Make sure your configuration + files are compatible with the new viersion. + +20080519: + AFFECTS: users of irc/bitlbee + AUTHOR: brix@FreeBSD.org + + The default installation is now configured for running bitlbee as + user 'bitlbee'. Make sure any existing configuration files are + readable by that user. + 20080517: AFFECTS: users of multimedia/smplayer-* AUTHOR: miwi@FreeBSD.org @@ -48,8 +64,8 @@ AFFECTS: users of audio/ampache AUTHOR: jadawin@FreeBSD.org - Ampache 3.4 uses a different config parser. Unfortunately the new parser - is unable to read old config files. You must run php + Ampache 3.4 uses a different config parser. Unfortunately the new parser + is unable to read old config files. You must run php ${WWWDIR}/bin/migrate_config.inc from the command line. 20080508: @@ -134,7 +150,7 @@ 20080405: AFFECTS: users of sysutils/tracker AUTHOR: ahze@FreeBSD.org - + The sysutils/tracker port is now a meta port and tracker is now split into separate ports to allow non-GNOME users to install tracker without pulling in GNOME components. To upgrade please use the directions below. @@ -6437,4 +6453,4 @@ 2) Update all p5-* modules. portupgrade -f p5-\* -$FreeBSD: ports/UPDATING,v 1.631 2008/05/17 19:17:42 miwi Exp $ +$FreeBSD: ports/UPDATING,v 1.634 2008/05/20 09:57:45 osa Exp $ ==== //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_mtree.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.4 2008/03/15 11:02:47 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.5 2008/05/19 18:06:48 cperciva Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -596,6 +596,7 @@ archive_set_error(&a->archive, ENOMEM, "Can't allocate memory"); } + return (ARCHIVE_FATAL); } *buff = mtree->buff; ==== //depot/projects/dtrace/src/lib/libgeom/geom_util.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.1 2007/05/06 01:17:46 pjd Exp $"); +__FBSDID("$FreeBSD: src/lib/libgeom/geom_util.c,v 1.2 2008/05/20 11:45:05 pjd Exp $"); #include #include @@ -46,7 +46,7 @@ * Open the given provider and at least check if this is a block device. */ int -g_open(const char *name, int write) +g_open(const char *name, int dowrite) { char path[MAXPATHLEN]; int fd; @@ -56,7 +56,7 @@ else snprintf(path, sizeof(path), "%s%s", _PATH_DEV, name); - fd = open(path, write ? O_RDWR : O_RDONLY); + fd = open(path, dowrite ? O_RDWR : O_RDONLY); if (fd == -1) return (-1); /* Let try to get sectorsize, which will prove it is a GEOM provider. */ @@ -183,7 +183,7 @@ * Find provider name by the given ID. */ int -g_open_by_ident(const char *ident, int write, char *name, size_t size) +g_open_by_ident(const char *ident, int dowrite, char *name, size_t size) { char lident[DISK_IDENT_SIZE]; struct gmesh mesh; @@ -204,7 +204,7 @@ LIST_FOREACH(mp, &mesh.lg_class, lg_class) { LIST_FOREACH(gp, &mp->lg_geom, lg_geom) { LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { - fd = g_open(pp->lg_name, write); + fd = g_open(pp->lg_name, dowrite); if (fd == -1) continue; if (g_get_ident(fd, lident, ==== //depot/projects/dtrace/src/lib/libgeom/libgeom.3#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.8 2007/05/06 01:17:46 pjd Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.9 2008/05/20 11:45:05 pjd Exp $ .\" .Dd May 6, 2007 .Dt LIBGEOM 3 @@ -92,7 +92,7 @@ .Fn gctl_dump "struct gctl_req *req" "FILE *f" .Ss "Utility Functions" .Ft int -.Fn g_open "const char *name" "int write" +.Fn g_open "const char *name" "int dowrite" .Ft int .Fn g_close "int fd" .Ft off_t @@ -108,7 +108,7 @@ .Ft int .Fn g_get_name "const char *ident" "char *name" "size_t size" .Ft int -.Fn g_open_by_ident "const char *ident" "int write" "char *name" "size_t size" +.Fn g_open_by_ident "const char *ident" "int dowrite" "char *name" "size_t size" .Sh DESCRIPTION The .Nm geom @@ -271,7 +271,7 @@ function opens the given provider and returns file descriptor number, which can be used with other functions. The -.Fa write +.Fa dowrite argument indicates if operations that modify the provider (like .Fn g_flush or ==== //depot/projects/dtrace/src/sbin/swapon/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/sbin/swapon/Makefile,v 1.8 2002/12/28 23:39:47 dillon Exp $ +# $FreeBSD: src/sbin/swapon/Makefile,v 1.9 2008/05/20 12:24:31 pjd Exp $ PROG= swapon MAN= swapon.8 @@ -8,4 +8,7 @@ MLINKS= swapon.8 swapoff.8 MLINKS+=swapon.8 swapctl.8 +DPADD= ${LIBUTIL} +LDADD= -lutil + .include ==== //depot/projects/dtrace/src/sbin/swapon/swapon.8#4 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)swapon.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.29 2005/02/10 09:19:34 ru Exp $ +.\" $FreeBSD: src/sbin/swapon/swapon.8,v 1.30 2008/05/20 12:24:31 pjd Exp $ .\" -.Dd December 28, 2002 +.Dd April 29, 2008 .Dt SWAPON 8 .Os .Sh NAME @@ -38,7 +38,7 @@ .Nm swapon Fl a | Ar .Nm swapoff Fl a | Ar .Nm swapctl -.Op Fl AhklsU +.Op Fl AghklmsU .Oo .Fl a Ar | @@ -130,9 +130,13 @@ utility has the following options for listing swap: .Bl -tag -width indent .It Fl h -Output values in megabytes. +Output values in human-readable form. +.It Fl g +Output values in gigabytes. .It Fl k Output values in kilobytes. +.It Fl m +Output values in megabytes. .It Fl l List the devices making up system swap. .It Fl s ==== //depot/projects/dtrace/src/sbin/swapon/swapon.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.22 2005/02/10 09:19:34 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/swapon/swapon.c,v 1.23 2008/05/20 12:24:31 pjd Exp $"); #include #include @@ -54,6 +54,7 @@ #include #include #include +#include static void usage(void); static int swap_on_off(char *name, int ignoreebusy); @@ -79,7 +80,7 @@ orig_prog = which_prog; doall = 0; - while ((ch = getopt(argc, argv, "AadlhksU")) != -1) { + while ((ch = getopt(argc, argv, "AadghklmsU")) != -1) { switch(ch) { case 'A': if (which_prog == SWAPCTL) { @@ -101,17 +102,23 @@ else usage(); break; - case 's': - sflag = 1; + case 'g': + hflag = 'G'; + break; + case 'h': + hflag = 'H'; + break; + case 'k': + hflag = 'K'; break; case 'l': lflag = 1; break; - case 'h': + case 'm': hflag = 'M'; break; - case 'k': - hflag = 'K'; + case 's': + sflag = 1; break; case 'U': if (which_prog == SWAPCTL) { @@ -199,13 +206,29 @@ fprintf(stderr, "-a | file ...\n"); break; case SWAPCTL: - fprintf(stderr, "[-AhklsU] [-a file ... | -d file ...]\n"); + fprintf(stderr, "[-AghklmsU] [-a file ... | -d file ...]\n"); break; } exit(1); } static void +sizetobuf(char *buf, size_t bufsize, int hflag, long long val, int hlen, + long blocksize) +{ + + if (hflag == 'H') { + char tmp[16]; + + humanize_number(tmp, 5, (int64_t)val, "", HN_AUTOSCALE, + HN_B | HN_NOSPACE | HN_DECIMAL); + snprintf(buf, bufsize, "%*s", hlen, tmp); + } else { + snprintf(buf, bufsize, "%*lld", hlen, val / blocksize); + } +} + +static void swaplist(int lflag, int sflag, int hflag) { size_t mibsize, size; @@ -216,19 +239,33 @@ long long used = 0; long long tmp_total; long long tmp_used; + char buf[32]; pagesize = getpagesize(); switch(hflag) { + case 'G': + blocksize = 1024 * 1024 * 1024; + strlcpy(buf, "1GB-blocks", sizeof(buf)); + hlen = 10; + break; + case 'H': + blocksize = -1; + strlcpy(buf, "Bytes", sizeof(buf)); + hlen = 10; + break; case 'K': blocksize = 1024; + strlcpy(buf, "1kB-blocks", sizeof(buf)); hlen = 10; break; case 'M': blocksize = 1024 * 1024; + strlcpy(buf, "1MB-blocks", sizeof(buf)); hlen = 10; break; default: getbsize(&hlen, &blocksize); + snprintf(buf, sizeof(buf), "%ld-blocks", blocksize); break; } @@ -237,8 +274,6 @@ err(1, "sysctlnametomib()"); if (lflag) { - char buf[32]; - snprintf(buf, sizeof(buf), "%ld-blocks", blocksize); printf("%-13s %*s %*s\n", "Device:", hlen, buf, @@ -253,24 +288,28 @@ if (xsw.xsw_version != XSWDEV_VERSION) errx(1, "xswdev version mismatch"); - tmp_total = (long long)xsw.xsw_nblks * pagesize / blocksize; - tmp_used = (long long)xsw.xsw_used * pagesize / blocksize; + tmp_total = (long long)xsw.xsw_nblks * pagesize; + tmp_used = (long long)xsw.xsw_used * pagesize; total += tmp_total; used += tmp_used; if (lflag) { - printf("/dev/%-8s %*lld %*lld\n", - devname(xsw.xsw_dev, S_IFCHR), - hlen, tmp_total, - hlen, tmp_used); + sizetobuf(buf, sizeof(buf), hflag, tmp_total, hlen, + blocksize); + printf("/dev/%-8s %s ", devname(xsw.xsw_dev, S_IFCHR), + buf); + sizetobuf(buf, sizeof(buf), hflag, tmp_used, hlen, + blocksize); + printf("%s\n", buf); } } if (errno != ENOENT) err(1, "sysctl()"); if (sflag) { - printf("Total: %*lld %*lld\n", - hlen, total, - hlen, used); + sizetobuf(buf, sizeof(buf), hflag, total, hlen, blocksize); + printf("Total: %s ", buf); + sizetobuf(buf, sizeof(buf), hflag, used, hlen, blocksize); + printf("%s\n", buf); } } ==== //depot/projects/dtrace/src/share/man/man4/Makefile#36 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.416 2008/04/29 21:36:17 sam Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.417 2008/05/19 02:21:00 yongari Exp $ MAN= aac.4 \ acpi.4 \ @@ -8,6 +8,7 @@ acpi_video.4 \ adv.4 \ adw.4 \ + age.4 \ agp.4 \ aha.4 \ ahb.4 \ ==== //depot/projects/dtrace/src/share/man/man4/altq.4#12 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.33 2008/04/20 19:20:39 sam Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.34 2008/05/19 02:06:39 yongari Exp $ .\" -.Dd June 12, 2007 +.Dd May 19, 2008 .Dt ALTQ 4 .Os .Sh NAME @@ -115,6 +115,7 @@ are required to use a certain network card with .Nm . They have been applied to the following hardware drivers: +.Xr age 4 , .Xr an 4 , .Xr ath 4 , >>> TRUNCATED FOR MAIL (1000 lines) <<<