Index: head/GIDs
===================================================================
--- head/GIDs	(revision 399687)
+++ head/GIDs	(revision 399688)
@@ -1,332 +1,333 @@
 # $FreeBSD$
 # Please keep this file sorted by GID!
 # Please pick an empty slot when available and also consider base values from
 # /usr/src/etc/group
 daemon:*:1:
 operator:*:5:amanda
 mail:*:6:postfix,clamav
 ftp:*:14:
 smmsp:*:25:
 video:*:44:
 bind:*:53:
 rdfdb:*:55:
 spamd:*:58:
 unbound:*:59:
 cyrus:*:60:
 proxy:*:62:
 authpf:*:63:
 uucp:*:66:
 xten:*:67:
 dialer:*:68:aprsd
 network:*:69:
 pgsql:*:70:
 ircd:*:72:
 ircservices:*:73:
 simscan:*:74:
 hybserv:*:76:
 audit:*:77:
 virtuoso:*:79:
 www:*:80:
 qnofiles:*:81:
 qmail:*:82:
 mysql:*:88:
 vchkpw:*:89:
 firebird:*:90:
 mailman:*:91:
 gdm:*:92:
 jabber:*:93:
 p4admin:*:94:
 interch:*:95:
 squeuer:*:96:
 mud:*:97:
 msql:*:98:
 rscsi:*:99:
 squid:*:100:
 quagga:*:101:
 ganglia:*:102:
 sgeadmin:*:103:
 slimserv:*:104:
 dnetc:*:105:
 clamav:*:106:
 cacti:*:107:
 webkit:*:108:
 quickml:*:109:
 vscan:*:110:
 fido:*:111:
 dcc:*:112:
 amavis:*:113:
 dhis:*:114:
 _symon:*:115:
 smokeping:*:117:
 ircproxyd:*:118:
 mythtv:*:119:
 pdns:*:120:
 otrs:*:121:
 zabbix:*:122:
 _ntp:*:123:
 fetchmail:*:124:
 postfix:*:125:
 maildrop:*:126:
 nav:*:127:
 sd-agent:*:128:
 vlock:*:129:
 _bgpd:*:130:
 _ospfd:*:131:
 _spamd:*:132:
 freeradius:*:133:
 undernet:*:134:
 rabbitmq:*:135:
 dhcpd:*:136:
 mpd:*:137:
 wolfpack:*:138:
 shellinabox:*:139:
 amanda:*:140:
 ladvd:*:142:
 dovecot:*:143:
 dovenull:*:144:
 webcamd:*:145:
 ventrilo:*:146:
 kdm:*:147:
 ipv6mon:*:148:
 avenger:*:149:
 cbsd:*:150:
 rbldns:*:153:
 trircd:*:154:
 xorp:*:155:
 monetdb:*:156:
 barman:*:157:
 pootle:*:158:
 nocat:*:159:
 sfs:*:171:
 agk:*:172:
 polipo:*:173:
 flowtools:*:174:
 twms:*:175:
 gdnsd:*:179:
 rt:*:180:
 nagios:*:181:
 noc:*:182:
 icinga:*:183:
 dnscache:*:184:
 tinydns:*:185:
 dnslog:*:186:
 swift:*:187:
 netxms:*:188:
 leofs:*:189:
 moinmoin:*:192:
 cups:*:193:
 saned:*:194:
 radns:*:195:
 mcserver:*:199:
 sympa:*:200:
 privoxy:*:201:
 dspam:*:202:
 yate:*:204:
 gnugk:*:205:
 gini:*:206:
 _mixminion:*:207:
 shoutcast:*:210:
 git:*:211:
 hg:*:212:
 drizzle:*:213:
 opendnssec:*:215:
 nsd:*:216:
 bs:*:220:
 rtpproxy:*:222:
 postgrey:*:225:
 sqlgrey:*:226:
 kismet:*:229:
 aprsd:*:240:
 tnc:*:241:
 prosody:*:242:
 fcron:*:247:
 _adsuck:*:253:
 _tor:*:256:
 _smtpd:*:257:
 meta1s:*:260:
 meta1q:*:261:
 meta1c:*:262:meta1s
 meta1m:*:263:meta1s,meta1q
 meta1:*:264:
 haclient:*:275:
 frontbase:*:276:
 mrtg:*:279:
 xymon:*:280:
 prelude:*:281:
 spread:*:282:
 devmon:*:283:
 vnstat:*:284:
 exaddos:*:285:exaddos
 rancid:*:286:
 backuppc:*:300:
 _sphinx:*:312:
 dkfilter:*:325:
 smfs:*:326:
 orthanc:*:330:
 daapd:*:337:
 murmur:*:338:
 wildfire:*:340:
 stunnel:*:341:
 openfire:*:342:
 _sabnzbd:*:350:
 _iodined:*:353:
 httptunnel:*:361:
 ldap:*:389:
 tiarra:*:398:
 uhub:*:411:
 drweb:*:426:
+varnish:*:429:
 quasselcore:*:442:
 callweaver:*:444:
 ecartis:*:450:
 courier:*:465:
 condor:*:466:
 netmon:*:467:
 slurm:*:468:
 consul:*:469:
 serf:*:470:
 vault:*:471:
 _bbstored:*:505:
 radmind:*:506:
 skkserv:*:507:
 pwhois:*:512:
 nullmail:*:522:
 freevo:*:523:
 dkimproxy:*:525:
 pgbouncer:*:534:
 redis:*:535:
 _flowd:*:542:
 ejabberd:*:543:
 knot:*:553:
 qtss:*:554:
 ircdru:*:555:
 messagebus:*:556:
 pulse-rt:*:557:
 avahi:*:558:
 tacacs:*:559:
 haldaemon:*:560:
 distcc:*:561:
 polkit:*:562:
 pulse:*:563:
 pulse-access:*:564:
 polkitd:*:565:
 assp:*:587:
 avahi-autoipd:*:588:
 _xsi:*:600:
 _tss:*:601:
 _pkcs11:*:602:
 freeswitch:*:610:
 caldavd:*:639:
 monkeysphere:*:641:
 aox:*:666:
 riak:*:667:
 bnetd:*:700:
 fastnetmon:*:701:
 bopm:*:717:
 openxpki:*:777:
 zetacoin:*:780:
 foreman_proxy:*:812:
 puppet:*:814:
 btsync:*:817:
 jenkins:*:818:
 rundeck:*:819:
 openacs:*:820:
 dotlrn:*:821:
 polw:*:825:
 statsd:*:826:
 netdisco:*:840:
 tcpcryptd:*:841:
 munin:*:842:
 dahdi:*:843:asterisk
 subsonic:*:844:
 sogod:*:846:
 fossy:*:901:www
 scanlogd:*:902:
 _ocserv:*:903:
 influxd:*:907:
 riemann:*:908:
 proxy65:*:909:
 bacula:*:910:
 iserv:*:911:
 _sj3:*:912:
 _relayd:*:913:
 bitlbee:*:914:
 logcheck:*:915:
 ssmtp:*:916:
 prayer:*:917:
 nefu:*:918:
 couchdb:*:919:
 vboxusers:*:920:
 transmission:*:921:
 mongodb:*:922:
 liquidsoap:*:923:
 postpals:*:924:
 mfs:*:925:
 minbif:*:926:
 kumofs:*:927:
 nslcd:*:928:
 activemq:*:929:
 ifgraph:*:930:
 asterisk:*:931:
 sancp:*:932:
 dlna:*:933:
 torrus:*:934:www
 erlyvideo:*:935:
 crtmpserver:*:936:
 get_iplayer:*:937:
 vdr:*:938:
 noip:*:939:
 _tcpproxy:*:940:
 cego:*:941:
 teamspeak:*:942:
 dnetfold:*:943:
 bbs:*:944:
 dbxml:*:945:
 mediatomb:*:946:
 gnokii:*:947:
 dnrd:*:948:
 _lldpd:*:949:
 conquest:*:950:
 openerpd:*:951:
 bitten-slave:*:952:
 _neubot:*:953:
 hadoop:*:955:
 pandora:*:956:
 razorback:*:957:
 gnunet:*:958:
 c_icap:*:959:
 trytond:*:960:
 gearmand:*:961:
 zookeeper:*:962:
 fluentd:*:963:
 git_daemon:*:964:
 elasticsearch:*:965:
 ossec:*:966:
 kippo:*:969:
 colord:*:970:
 shibd:*:971:
 plex:*:972:
 boinc:*:973:
 radicale:*:974:
 unifi:*:975:
 minetest:*:976:
 ums:*:979:
 hbase:*:980:
 uvncrep:*:981:
 bro:*:982:
 syncthing:*:983:
 tvheadend:*:984:
 puppetdb:*:985:
 kamailio:*:986:
 spark:*:987:
 emby:*:989:
 oozie:*:990:
 sguil:*:991:
 hive:*:992:
 kannel:*:993:
 rcynic:*:994:
 rpkirtr:*:995:
 tarantool:*:996:
 bareos:*:997:
 ebnetd:*:999:
 nogroup:*:65533:
 nobody:*:65534:
Index: head/UIDs
===================================================================
--- head/UIDs	(revision 399687)
+++ head/UIDs	(revision 399688)
@@ -1,342 +1,344 @@
 # $FreeBSD$
 # Please keep this file sorted by UID!
 # Please pick an empty slot when available and also consider base values from
 # /usr/src/etc/master.passwd
 operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
 ftp:*:14:14::0:0:Anonymous FTP:/var/ftp:/nonexistent
 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
 auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/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:GNOME Display Manager:/usr/local/etc/gdm/home:/usr/sbin/nologin
 jabber:*:93:93::0:0:Jabber Daemon:/nonexistent:/nonexistent
 p4admin:*:94:94::0:0:Perforce admin:/nonexistent:/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:/var/squid:/usr/sbin/nologin
 quagga:*:101:101::0:0:Quagga route daemon pseudo user:/var/empty:/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/maiad:/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:/nonexistent:/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:/bin/sh
 _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
 sd-agent:*:128:128::0:0:ServerDensity Agent:/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:/nonexistent:/usr/sbin/nologin
 rabbitmq:*:135:135::0:0:RabbitMQ:/var/db/rabbitmq:/usr/sbin/nologin
 dhcpd:*:136:136::0:0:ISC DHCP daemon:/nonexistent:/usr/sbin/nologin
 mpd:*:137:137::0:0:MusicPD pseudo-user:/var/mpd:/usr/sbin/nologin
 wolfpack:*:138:138::0:0:Wolfpack Empire Server:/usr/local/share/wolfpack:/usr/sbin/nologin
 shellinabox:*:139:139::0:0:Shell In A Box:/nonexistent:/usr/sbin/nologin
 amanda:*:140:140::0:0:Amanda Daemon:/var/db/amanda:/usr/sbin/nologin
 cricket:*:141:80::0:0:Cricket Monitoring User:/usr/local/cricket:/usr/sbin/nologin
 ladvd:*:142:142::0:0:Ladvd User:/var/empty:/usr/sbin/nologin
 dovecot:*:143:143::0:0:Dovecot User:/var/empty:/usr/sbin/nologin
 dovenull:*:144:144::0:0:Dovecot login User:/var/empty:/usr/sbin/nologin
 webcamd:*:145:145::0:0:Webcamd user:/var/empty:/usr/sbin/nologin
 ventrilo:*:146:146::0:0:& server:/usr/local/ventrilo-server:/usr/sbin/nologin
 kdm:*:147:147::0:0:KDE Display Manager:/nonexistent:/usr/sbin/nologin
 ipv6mon:*:148:148::0:0:IPv6 Address Monitoring Daemon:/nonexistent:/usr/sbin/nologin
 avenger:*:149:149::0:0:Mail Avenger:/var/spool/avenger:/usr/sbin/nologin
 cbsd:*:150:150::0:0:Cbsd user:/nonexistent:/bin/sh
 pop3vscan:*:151:6::0:0:POP3VScan Daemon:/var/spool/pop3vscan:/usr/sbin/nologin
 iog:*:152:80::0:0:iog Monitoring Owner:/usr/local/iog:/usr/sbin/nologin
 rbldns:*:153:153::0:0:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin
 trircd:*:154:154::0:0:& user:/usr/local/etc/tr-ircd:/usr/sbin/nologin
 monetdb:*:156:156::0:0:MonetDB user:/usr/local/monetdb5:/bin/sh
 barman:*:157:157::0:0:Barman user:/var/barman:/bin/sh
 pootle:*:158:158::0:0:Pootle User:/var/db/pootle:/usr/sbin/nologin
 nocat:*:159:159::0:0:NoCat Daemon:/libexec/nocat:/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
 twms:*:175:175::0:0:tWMS pseudo-user:/nonexistent:/usr/sbin/nologin
 gdnsd:*:179:179::0:0:gDNSd pseudo-user:/nonexistent:/usr/sbin/nologin
 nagios:*:181:181::0:0:Nagios pseudo-user:/var/spool/nagios:/usr/sbin/nologin
 noc:*:182:182::0:0:NOC pseudo-user:/usr/local/noc:/bin/sh
 icinga:*:183:183::0:0:Icinga pseudo-user:/var/spool/icinga:/usr/sbin/nologin
 dnscache:*:184:184::0:0:dnscache pseudo-user:/nonexistent:/usr/sbin/nologin
 tinydns:*:185:185::0:0:tinydns pseudo-user:/nonexistent:/usr/sbin/nologin
 dnslog:*:186:186::0:0:dnslog pseudo-user:/nonexistent:/usr/sbin/nologin
 swift:*:187:187::0:0:Swift daemon pseudo-user:/nonexistent:/usr/sbin/nologin
 netxms:*:188:188::0:0:netxms pseudo-user:/nonexistent:/usr/sbin/nologin
 leofs:*:189:189::0:0:LeoFS daemons pseudo-user:/var/db/leofs:/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
 saned:*:194:194::0:0:SANE Scanner Daemon:/nonexistent:/bin/sh
 radns:*:195:195::0:0:radns user:/nonexistent:/usr/sbin/nologin
 mcserver:*:199:199::0:0:Minecraft Server:/nonexistent:/bin/sh
 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
 yate:*:204:204::0:0:Yate:/nonexistent:/usr/sbin/nologin
 gnugk:*:205:205::0:0:GNU GateKeeper pseudo-user:/nonexistent:/usr/sbin/nologin
 gini:*:206:206::0:0:& streaming server:/var/log/gini:/usr/sbin/nologin
 _mixminion:*:207:207::0:0:Mixminion server:/nonexistent:/usr/sbin/nologin
 shoutcast:*:210:210::0:0:Shoutcast sandbox:/nonexistent:/bin/sh
 git:*:211:211::0:0:gitosis user:/usr/local/git:/bin/sh
 hg:*:212:212::0:0:mercurial-server user:/usr/local/hg:/bin/sh
 drizzle:*:213:213::0:0:Drizzle daemon:/var/db/drizzle:/usr/sbin/nologin
 opendnssec:*:215:215::0:0:Opendnssec Pseudo User:/nonexistent:/usr/sbin/nologin
 nsd:*:216:216::0:0:NSD DNS Server:/nonexistent:/usr/sbin/nologin
 bs:*:220:220::0:0:Big Sister:/usr/local/bigsister:/bin/sh
 rtpproxy:*:222:222::0:0:& user:/nonexistent:/sbin/nologin
 postgrey:*:225:225::0:0:Postgrey Owner:/nonexistent:/usr/sbin/nologin
 sqlgrey:*:226:226::0:0:SQLgrey Owner:/nonexistent:/usr/sbin/nologin
 aprsd:*:240:240::0:0:aprsd:/nonexistent:/bin/sh
 tnc:*:241:241::0:0:aprsd:/nonexistent:/bin/sh
 prosody:*:242:242::0:0:Prosody Jabber Server:/nonexistent:/usr/sbin/nologin
 fcron:*:247:247::0:0:fcron pseudo-user:/nonexistent:/usr/sbin/nologin
 _adsuck:*:253:253::0:0:Adsuck ad blocking user:/nonexistent:/usr/sbin/nologin
 _tor:*:256:256::0:0:Tor anonymizing router:/var/db/tor:/usr/sbin/nologin
 _smtpd:*:257:257::0:0:OpenSMTPD:/var/empty:/usr/sbin/nologin
 _smtpq:*:258:257::0:0:OpenSMTPD queue user:/var/empty:/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:MeTA1 other:/nonexistent:/usr/sbin/nologin
 hacluster:*:275:275::0:0:Heartbeat cluster user:/nonexistent:/usr/sbin/nologin
 frontbase:*:276:276::0:0:FrontBase Daemon:/usr/local/FrontBase/Databases:/bin/sh
 mrtg:*:279:279::0:0:MRTG daemon:/nonexistent:/usr/sbin/nologin
 xymon:*:280:280::0:0:Xymon Monitor:/nonexistent:/usr/sbin/nologin
 prelude:*:281:281::0:0:Prelude user:/nonexistent:/usr/sbin/nologin
 spread:*:282:282::0:0:Spread user:/nonexistent:/usr/sbin/nologin
 devmon:*:283:283::0:0:devmon monitor:/nonexistent:/usr/sbin/nologin
 vnstat:*:284:284::0:0:vnStat Network Monitor:/nonexistent:/usr/sbin/nologin
 exaddos:*:285:285::0:0:exaddos daemon user:/nonexistent:/usr/sbin/nologin
 rancid:*:286:286::0:0:RANCID daemon user:/usr/local/var/rancid:/bin/sh
 backuppc:*:300:300::0:0:BackupPC pseudo-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
 smfs:*:326:326::0:0:SMFSAV Owner:/nonexistent:/usr/sbin/nologin
 orthanc:*:330:330::0:0:Orthanc Daemon:/nonexistent:/usr/sbin/nologin
 _pma:*:336:80::0:0:phpMyAdmin Owner:/nonexistent:/usr/sbin/nologin
 daapd:*:337:337::0:0:daapd User:/nonexistent:/usr/sbin/nologin
 murmur:*:338:338::0:0:& User:/nonexistent:/usr/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
 _sabnzbd:*:350:350::0:0:sabnzb Daemon:/nonexistent:/usr/sbin/nologin
 _iodined:*:353:353::0:0:Iodine Daemon:/nonexistent:/usr/sbin/nologin
 httptunnel:*:361:361::0:0:httptunnel 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
 uhub:*:411:411::0:0:uHub ADC Daemon:/nonexistent:/usr/sbin/nologin
 drweb:*:426:426::0:0:Dr.Web Mail Scanner:/nonexistent:/usr/sbin/nologin
+varnish:*:429:429::0:0:Varnish Cache User:/nonexistent:/usr/sbin/nologin
+varnishlog:*:430:429::0:0:Varnish Log User:/nonexistent:/usr/sbin/nologin
 quasselcore:*:442:442::0:0:Quassel IRC User:/nonexistent:/usr/sbin/nologin
 callweaver:*:444:444::0:0:Callweaver account:/var/lib/callweaver:/usr/sbin/nologin
 ecartis:*:450:450::0:0:Ecartis Listserver:/usr/local/ecartis:/usr/sbin/nologin
 courier:*:465:465::0:0:Courier Mail Server:/nonexistent:/usr/sbin/nologin
 condor:*:466:466::0:0:& user:/home/condor:/usr/sbin/nologin
 netmon:*:467:467::0:0:Network monitor account:/var/netmon:/usr/sbin/nologin
 slurm:*:468:468::0:0:SLURM Daemon:/home/slurm:/usr/sbin/nologin
 consul:*:469:469::0:0:Consul Daemon:/var/tmp/consul:/usr/sbin/nologin
 serf:*:470:470::0:0:Serf Daemon:/nonexistent:/usr/sbin/nologin
 vault:*:471:471::0:0:Vault Daemon:/nonexistent:/usr/sbin/nologin
 _bbstored:*:505:505::0:0:Box Backup Store Daemon:/nonexistent:/usr/sbin/nologin
 radmind:*:506:506::0:0:radmind User:/var/radmind:/usr/sbin/nologin
 skkserv:*:507:507::0:0:skkserv User:/nonexistent:/usr/sbin/nologin
 pwhois:*:512:512::0:0:pwhoisd User:/nonexistent:/usr/sbin/nologin
 nullmail:*:522:522::0:0:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh
 freevo:*:523:523::0:0:Freevo User:/var/db/freevo:/bin/sh
 dkimproxy:*:525:525::0:0:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin
 pgbouncer:*:534:534::0:0:Pgbouncer Daemon:/nonexistent:/usr/sbin/nologin
 redis:*:535:535::0:0:Redis Daemon:/nonexistent:/usr/sbin/nologin
 _flowd:*:542:542::0:0:flowd privilege separation user:/var/empty:/usr/sbin/nologin
 ejabberd:*:543:543::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh
 knot:*:553:553::0:0:Knot DNS Server:/nonexistent:/usr/sbin/nologin
 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
 haldaemon:*:560:560::0:0:HAL 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
 polkitd:*:565:565::0:0:Polkit Daemon User:/var/empty:/usr/sbin/nologin
 assp:*:587:587::0:0:ASSP Anti-Spam Proxy:/var/db/assp:/usr/sbin/nologin
 avahi-autoipd:*:588:588::0:0:Avahi Autoipd Daemon user:/nonexistent:/usr/sbin/nologin
 _xsi:*:600:600::0:0:XMLSysInfo User:/nonexistent:/usr/sbin/nologin
 _tss:*:601:601:daemon:0:0:TrouSerS user:/var/empty:/usr/sbin/nologin
 _pkcs11:*:602:602:daemon:0:0:opencryptoki user:/var/empty:/usr/sbin/nologin
 freeswitch:*:610:610::0:0:Freeswitch user:/nonexistent:/usr/sbin/nologin
 _pla:*:636:80::0:0:phpLDAPAdmin Owner:/nonexistent:/usr/sbin/nologin
 caldavd:*:639:639::0:0:Caldavd user:/var/db/caldavd:/usr/sbin/nologin
 monkeysphere:*:641:641::0:0:Monkeysphere User:/var/monkeysphere:/usr/local/bin/bash
 aox:*:666:666::0:0:Archiveopteryx user:/nonexistent:/usr/sbin/nologin
 riak:*:667:667::0:0:Riak user:/usr/local/lib/riak:/bin/sh
 riakcs:*:668:667::0:0:Riak CS user:/usr/local/lib/riak-cs:/bin/sh
 stanchion:*:669:667::0:0:Stanchion user:/usr/local/lib/stanchion:/bin/sh
 bnetd:*:700:700::0:0:Bnetd user:/nonexistent:/usr/sbin/nologin
 fastnetmon:*:701:701::0:0:FastNetMon user:/nonexistent:/usr/sbin/nologin
 bopm:*:717:717::0:0:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh
 _dnscrypt-wrapper:*:718:65534::0:0:dnscrypt-wrapper user:/var/empty:/usr/sbin/nologin
 openxpki:*:777:777::0:0:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin
 zetacoin:*:780:780::0:0:ZetaCoin Daemon:/nonexistent:/usr/sbin/nologin
 foreman_proxy:*:812:812::0:0:Foreman Smart Proxy:/usr/local/share/foreman-proxy:/usr/sbin/nologin
 puppet:*:814:814::0:0:Puppet Daemon:/nonexistent:/usr/sbin/nologin
 btsync:*:817:817::0:0:BitTorrent Sync Daemon:/nonexistent:/usr/sbin/nologin
 jenkins:*:818:818::0:0:Jenkins CI:/usr/local/jenkins:/bin/sh
 rundeck:*:819:819::0:0:Rundeck:/usr/local/rundeck:/bin/sh
 openacs:*:820:820::0:0:OpenACS Daemon User:/nonexistent:/usr/sbin/nologin
 dotlrn:*:821:821::0:0:.LRN Daemon User:/nonexistent:/usr/sbin/nologin
 polw:*:825:825::0:0:Policyd-weight Cache Owner:/nonexistent:/sbin/nologin
 statsd:*:826:826::0:0:Statsd Daemon:/nonexistent:/sbin/nologin
 netdisco:*:840:840::0:0:netdisco daemon:/nonexistent:/usr/sbin/nologin
 tcpcryptd:*:841:841::0:0:tcpcrypt daemon:/nonexistent:/usr/sbin/nologin
 munin:*:842:842::0:0:Munin:/var/munin:/usr/sbin/nologin
 subsonic:*:844:844::0:0:Subsonic standalone-server:/nonexistent:/usr/sbin/nologin
 sogod:*:846:846::0:0:SOGo groupware:/nonexistent:/usr/sbin/nologin
 fossy:*:901:901::0:0:FOSSology user:/usr/local/share/fossology:/usr/local/bin/bash
 scanlogd:*:902:902::0:0:scanlogd user:/nonexistent:/usr/sbin/nologin
 _ocserv:*:903:903::0:0:ocserv user:/nonexistent:/usr/sbin/nologin
 influxd:*:907:907::0:0:InfluxDB Daemon:/var/empty:/usr/sbin/nologin
 riemann:*:908:908::0:0:Riemann User:/var/empty:/usr/sbin/nologin
 proxy65:*:909:909::0:0:Proxy65 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:/var/db/bitlbee:/usr/sbin/nologin
 logcheck:*:915:915::0:0:Logcheck system account:/var/lib/logcheck:/usr/local/bin/bash
 _prayer:*:917:917::0:0:Prayer Account:/nonexistent:/usr/sbin/nologin
 nefu:*:918:918::0:0:Nefu daemon:/var/db/nefu:/usr/sbin/nologin
 couchdb:*:919:919::0:0:CouchDB Account:/var/empty:/usr/sbin/nologin
 vboxusers:*:920:920::0:0:Virtualbox user:/nonexistent:/usr/sbin/nologin
 transmission:*:921:921::0:0:Transmission Daemon User:/usr/local/etc/transmission/home:/usr/sbin/nologin
 mongodb:*:922:922::0:0:MongoDB pseudo-user:/var/db/mongodb:/usr/sbin/nologin
 liquidsoap:*:923:923::0:0:Liquidsoap User:/nonexistent:/usr/sbin/nologin
 postpals:*:924:924::0:0:postpals user:/nonexistent:/usr/sbin/nologin
 mfs:*:925:925::0:0:MooseFS User:/nonexistent:/usr/sbin/nologin
 minbif:*:926:926::0:0:Minbif Daemon User:/nonexistent:/usr/sbin/nologin
 kumofs:*:927:927::0:0:kumofs daemon:/nonexistent:/usr/sbin/nologin
 nslcd:*:928:928::0:0:nslcd daemon:/nonexistent:/usr/sbin/nologin
 activemq:*:929:929::0:0:ActiveMQ Daemon:/nonexistent:/usr/sbin/nologin
 ifgraph:*:930:930::0:0:ifGraph:/nonexistent:/usr/sbin/nologin
 asterisk:*:931:931::0:0:Asterisk User:/nonexistent:/usr/sbin/nologin
 sancp:*:932:932::0:0:SANCP Daemon:/var/log/sancp:/usr/sbin/nologin
 dlna:*:933:933::0:0:DLNA Daemon:/nonexistent:/usr/sbin/nologin
 torrus:*:934:934::0:0:torrus daemon:/nonexistent:/usr/sbin/nologin
 erlyvideo:*:935:935::0:0:erlyvideo user:/nonexistent:/usr/sbin/nologin
 crtmpserver:*:936:936::0:0:crtmpserver user:/nonexistent:/usr/sbin/nologin
 get_iplayer:*:937:937::0:0:get_iplayer user:/nonexistent:/usr/sbin/nologin
 vdr:*:938:938::0:0:vdr user:/nonexistent:/usr/sbin/nologin
 noip:*:939:939::0:0:noip user:/nonexistent:/usr/sbin/nologin
 _tcpproxy:*:940:940::0:0:tcpproxy user:/nonexistent:/usr/sbin/nologin
 cego:*:941:941::0:0:cego user:/usr/local/cego:/usr/sbin/nologin
 teamspeak:*:942:942::0:0:TeamSpeak user:/nonexistent:/usr/sbin/nologin
 dnetfold:*:943:943::0:0:& user:/nonexistent:/usr/sbin/nologin
 bbs:*:944:944::0:0:& user:/nonexistent:/usr/sbin/nologin
 dbxml:*:945:945::0:0:& user:/nonexistent:/usr/sbin/nologin
 mediatomb:*:946:946::0:0:Mediatomb UPnP AV MediaServer:/nonexistent:/usr/sbin/nologin
 mapred:*:947:955::0:0:Hadoop MapReduce user:/nonexistent:/usr/sbin/nologin
 dnrd:*:948:948::0:0:& user:/nonexistent:/usr/sbin/nologin
 _lldpd:*:949:949::0:0:lldpd user:/nonexistent:/usr/sbin/nologin
 openerpd:*:951:951::0:0:Openerpd user:/nonexistent:/usr/sbin/nologin
 bitten-slave:*:952:952:daemon:0:0:Bitten slave user:/var/lib/bitten-slave:/usr/sbin/nologin
 _neubot:*:953:953::0:0:neubot daemon:/nonexistent:/usr/sbin/nologin
 oops:*:954:65534::0:0:oops user:/nonexistent:/usr/sbin/nologin
 hdfs:*:955:955::0:0:Hadoop HDFS user:/nonexistent:/usr/sbin/nologin
 pandora:*:956:956::0:0:Pandora FMS user:/usr/local/etc/pandora/home:/usr/sbin/nologin
 razorback:*:957:957::0:0:Razorback user:/var/run/razorback:/usr/sbin/nologin
 gnunet:*:958:958::0:0:GNUnet daemon:/var/lib/gnunet:/usr/sbin/nologin
 c_icap:*:959:959::0:0:c-icap daemon:/var/empty:/usr/sbin/nologin
 trytond:*:960:960::0:0:trytond daemon:/var/empty:/usr/sbin/nologin
 gearmand:*:961:961::0:0:gearmand daemon:/var/empty:/usr/sbin/nologin
 zookeeper:*:962:962::0:0:zookeeper user:/nonexistent:/usr/sbin/nologin
 fluentd:*:963:963::0:0:fluentd user:/nonexistent:/usr/sbin/nologin
 git_daemon:*:964:964::0:0:git daemon:/nonexistent:/usr/sbin/nologin
 elasticsearch:*:965:965::0:0:elasticsearch user:/nonexistent:/usr/sbin/nologin
 ossec:*:966:966::0:0:OSSEC user:/usr/local/ossec-hids:/usr/sbin/nologin
 ossecm:*:967:966::0:0:OSSEC mail user:/usr/local/ossec-hids:/usr/sbin/nologin
 ossecr:*:968:966::0:0:OSSEC rem user:/usr/local/ossec-hids:/usr/sbin/nologin
 kippo:*:969:969::0:0:kippo user:/nonexistent:/usr/sbin/nologin
 colord:*:970:970::0:0:colord color management daemon:/nonexistent:/usr/sbin/nologin
 shibd:*:971:971::0:0:Shibboleth SAML daemon:/nonexistent:/usr/sbin/nologin
 plex:*:972:972::0:0:Plex Media Server:/nonexistent:/usr/sbin/nologin
 boinc:*:973:973::0:0:BOINC user:/var/db/boinc:/bin/sh
 radicale:*:974:974::0:0:Radicale daemon:/nonexistent:/usr/sbin/nologin
 unifi:*:975:975::0:0:Unifi Wireless Controller:/nonexistent:/usr/sbin/nologin
 minetest:*:976:976::0:0:& server:/nonexistent:/usr/sbin/nologin
 tests:*:977:65534::0:0:Unprivileged user for tests:/nonexistent:/usr/sbin/nologin
 _dnscrypt-proxy:*:978:65534::0:0:dnscrypt-proxy user:/var/empty:/usr/sbin/nologin
 ums:*:979:979::0:0:Universal Media Server:/nonexistent:/usr/sbin/nologin
 hbase:*:980:980::0:0:HBase user:/nonexistent:/usr/sbin/nologin
 uvncrep:*:981:981::0:0:UltraVNC Repeater daemon:/nonexistent:/usr/sbin/nologin
 bro:*:982:982::0:0:Bro Network Security Monitor:/nonexistent:/usr/sbin/nologin
 syncthing:*:983:983::0:0:Syncthing Daemon:/var/tmp/syncthing:/usr/sbin/nologin
 tvheadend:*:984:984::0:0:TV Headend:/usr/local/etc/tvheadend:/bin/sh
 puppetdb:*:985:985::0:0:PuppetDB Daemon pseudo-user:/nonexistent:/usr/sbin/nologin
 kamailio:*:986:986::0:0:kamailio daemon:/nonexistent:/usr/sbin/nologin
 spark:*:987:987::0:0:Apache Spark user:/nonexistent:/usr/sbin/nologin
 toxdht:*:988:65534::0:0:Tox DHT bootstrap user:/nonexistent:/usr/sbin/nologin
 emby:*:989:989::0:0:Emby:/nonexistent:/usr/sbin/nologin
 oozie:*:990:990::0:0:Apache Oozie user:/nonexistent:/usr/sbin/nologin
 sguil:*:991:991::0:0:Sguil:/nonexistent:/usr/sbin/nologin
 hive:*:992:992::0:0:Apache Hive user:/nonexistent:/usr/sbin/nologin
 kannel:*:993:993::0:0:Kannel User:/nonexistent:/usr/sbin/nologin
 rcynic:*:994:994::0:0:RPKI validation system:/nonexistent:/usr/sbin/nologin
 rpkirtr:*:995:995::0:0:RPKI router server:/nonexistent:/usr/sbin/nologin
 tarantool:*:996:996::0:0:Tarantool Daemon:/nonexistent:/usr/sbin/nologin
 bareos:*:997:997::0:0:Bareos Daemon:/var/db/bareos:/usr/sbin/nologin
 ebnetd:*:999:999::0:0:EBNETD:/nonexistent:/usr/sbin/nologin
 nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
Index: head/www/varnish4/Makefile
===================================================================
--- head/www/varnish4/Makefile	(revision 399687)
+++ head/www/varnish4/Makefile	(revision 399688)
@@ -1,53 +1,56 @@
 # $FreeBSD$
 
 PORTNAME=	varnish
-PORTVERSION=	4.0.3
-PORTREVISION=	7
+PORTVERSION=	4.1.0
+PORTREVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://repo.varnish-cache.org/source/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	High-performance HTTP accelerator
 
 LICENSE=	BSD2CLAUSE
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libedit.so.0:${PORTSDIR}/devel/libedit
 
 CONFLICTS=	varnish-2.* varnish-3.*
 
 USES=		autoreconf cpe gmake libtool pkgconfig python:2,build readline shebangfix
 SHEBANG_FILES=	lib/libvcc/vmodtool.py
 CPE_VENDOR=	varnish-cache
 CFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX} --enable-tests
 CONFIGURE_ENV=	RST2MAN=true
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
+
+USERS=		varnish varnishlog
+GROUPS=		varnish
 
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 SUB_FILES=	pkg-message
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
 BAD_TESTS+=	r00832
 EXTRA_PATCHES+=	${FILESDIR}/no-inet6.patch
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile.am
 .if defined(BAD_TESTS)
 	${RM} -f ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
 .endif
 
 regression-test check test: build
 	${MAKE_CMD} TESTS_PARALLELISM=1 -C ${WRKSRC} check
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "arm"
 BROKEN=		Does not configure on arm
 .endif
 
 .include <bsd.port.post.mk>
Index: head/www/varnish4/distinfo
===================================================================
--- head/www/varnish4/distinfo	(revision 399687)
+++ head/www/varnish4/distinfo	(revision 399688)
@@ -1,2 +1,2 @@
-SHA256 (varnish-4.0.3.tar.gz) = 94b9a174097f47db2286acd2c35f235e49a2b7a9ddfdbd6eb7aa4da9ae8f8206
-SIZE (varnish-4.0.3.tar.gz) = 1866760
+SHA256 (varnish-4.1.0.tar.gz) = 4a6ea08e30b62fbf25f884a65f0d8af42e9cc9d25bf70f45ae4417c4f1c99017
+SIZE (varnish-4.1.0.tar.gz) = 1990932
Index: head/www/varnish4/files/varnishd.in
===================================================================
--- head/www/varnish4/files/varnishd.in	(revision 399687)
+++ head/www/varnish4/files/varnishd.in	(revision 399688)
@@ -1,84 +1,75 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: varnishd
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable varnishd:
 #
 # varnishd_enable="YES"
 #
 # Configuration variables and their default values:
 #
 # varnishd_pidfile - full path to the PID file.
 #	default: "/var/run/varnishd.pid"
 #
 # varnishd_listen - address and port at which varnishd will listen for
 #	client requests.
 #	default: ":80"
 #
 # varnishd_admin - address and port at which varnishd will listen for
 #	administrative commands.
 #	default: "localhost:81"
 #
 # varnishd_backend - address of the backend server.
 #	default: "localhost:8080"
 #
 # varnishd_config - name of the varnishd config file.
 #	default: unset.
 #
 # varnishd_hash - hash algorithm
 #       default: "classic,16383"
 #
 # varnishd_storage - storage method and parameters.
 #	default: "file,/tmp,100M"
 #
-# varnishd_user - unprivileged user for the child process.
-#	default: "www"
+# varnishd_jailuser - unprivileged user for the child process.
+#	default: "varnish"
 #
-# varnishd_group - unprivileged group for the child process.
-#	default: "www"
-#
 # varnishd_flags - complete command line arguments.
-#	default if varnishd_config is unset: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
-#	default if varnishd_config is set: "-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"
+#	default if varnishd_config is unset: "-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"
+#	default if varnishd_config is set: "-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"
 #
 # See varnishd(1) for a detailed overview of command-line options.
 #
 
 . /etc/rc.subr
 
 name=varnishd
 rcvar=varnishd_enable
 
 load_rc_config ${name}
 
 : ${varnishd_enable:=NO}
 : ${varnishd_pidfile=/var/run/${name}.pid}
 : ${varnishd_listen=:80}
 : ${varnishd_admin=localhost:81}
 : ${varnishd_backend=localhost:8080}
 : ${varnishd_storage=file,/tmp,100M}
 : ${varnishd_hash=classic,16383}
-: ${varnishd_user=www}
-: ${varnishd_group=www}
+: ${varnishd_jailuser=varnish}
 
 command="%%PREFIX%%/sbin/${name}"
 pidfile="${varnishd_pidfile}"
 
 if [ -n "${varnishd_config}" ] ; then
-	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
+	: ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"}
 else
-	: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
+	: ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"}
 fi
-
-# If we leave these set, rc.subr will su to them before starting
-# varnishd, which is not what we want.
-unset varnishd_user
-unset varnishd_group
 
 run_rc_command "$1"
Index: head/www/varnish4/files/varnishlog.in
===================================================================
--- head/www/varnish4/files/varnishlog.in	(revision 399687)
+++ head/www/varnish4/files/varnishlog.in	(revision 399688)
@@ -1,73 +1,82 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: varnishlog
 # REQUIRE: DAEMON varnishd
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable varnishlog:
 #
 # varnishlog_enable="YES"
 #
 # Configuration variables and their default values:
 #
 # varnishlog_pidfile - full path to the PID file.
 #	default: "/var/run/varnishlog.pid"
 #
 # varnishlog_file - full path to the log file.
 #	default: "/var/log/varnish.log"
 #
 # varnishlog_flags - command line arguments.
 #	default: "-D -P ${varnishlog_pidfile} -a -w ${varnishlog_file}"
 #
 # Add the following line to /etc/newsyslog.conf to rotate the log file
 # once a day:
 #
 # /var/log/varnish.log 640 7 * @T00 JB /var/run/varnishlog.pid
 #
 # See varnishlog(1) for a detailed overview of command-line options.
 #
 
 . /etc/rc.subr
 
 name=varnishlog
 rcvar=varnishlog_enable
 
 load_rc_config ${name}
 : ${varnishlog_enable:=NO}
 : ${varnishlog_pidfile=/var/run/${name}.pid}
 : ${varnishlog_file=/var/log/varnish.log}
 : ${varnishlog_flags="-P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
+: ${varnishlog_user=varnishlog}
 
 command="%%PREFIX%%/bin/${name}"
 pidfile=${varnishlog_pidfile}
 start_precmd=precmd
 
 precmd()
 {
+	if [ ! -e ${pidfile} ]; then
+		install -o ${varnishlog_user} -g varnish /dev/null ${pidfile};
+	fi
+
+	if [ ! -e ${varnishlog_file} ]; then
+		install -o ${varnishlog_user} -g varnish /dev/null ${varnishlog_file};
+	fi
+
 	waitcount=0
 	vsm=%%PREFIX%%/varnish/$(hostname)/_.vsm
 	
         # wait no longer than 5s for  _.vsm file to arrive from varnishd
 	while :
 	do
 		if [ -f ${vsm} ] ; then
 			break
 		else
 			case "${waitcount}" in
 				5)	echo "${name}: Failed to start. Missing ${vsm} ?"
 					break
 					;;
 				*)	echo "${name}: waiting for ${vsm}"
 					waitcount=$((waitcount+1))
 					sleep 1
 					;;
 			esac
 		fi
 	done
 }
 
 run_rc_command "$1"
Index: head/www/varnish4/files/varnishncsa.in
===================================================================
--- head/www/varnish4/files/varnishncsa.in	(revision 399687)
+++ head/www/varnish4/files/varnishncsa.in	(revision 399688)
@@ -1,78 +1,87 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: varnishncsa
 # REQUIRE: DAEMON varnishd
 # KEYWORD: shutdown
 
 #
 # Add the following line to /etc/rc.conf to enable varnishncsa:
 #
 # varnishncsa_enable="YES"
 #
 # Configuration variables and their default values:
 #
 # varnishncsa_pidfile - full path to the PID file.
 #	default: "/var/run/varnishncsa.pid"
 #
 # varnishncsa_file - full path to the log file.
 #	default: "/var/log/varnishncsa.log"
 #
 # varnishncsa_flags - command line arguments.
 #	default: "-D -P ${varnishncsa_pidfile} -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -P \"$varnishncsa_logformat\""
 #
 # varnishncsa_logformat - log file format.
 #       default: "" (uses varnishncsa's default format)
 #       example: "%h %l %u %t %r %s %b %{Referer}i %{User-agent}i"
 #
 # Add the following line to /etc/newsyslog.conf to rotate the log file
 # once a day:
 #
 # /var/log/varnishncsa.log 640 7 * @T00 JB /var/run/varnishncsa.pid
 #
 # See varnishncsa(1) for a detailed overview of command-line options.
 #
 
 . /etc/rc.subr
 
 name=varnishncsa
 rcvar=varnishncsa_enable
 
 load_rc_config ${name}
 
 : ${varnishncsa_enable:=NO}
 : ${varnishncsa_pidfile=/var/run/${name}.pid}
 : ${varnishncsa_file=/var/log/${name}.log}
 : ${varnishncsa_flags="-P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
+: ${varnishncsa_user=varnishlog}
 
 command="%%PREFIX%%/bin/${name}"
 pidfile=${varnishncsa_pidfile}
 start_precmd=precmd
 
 precmd()
 {
+	if [ ! -e ${pidfile} ]; then
+		install -o ${varnishncsa_user} -g varnish /dev/null ${pidfile};
+	fi
+
+	if [ ! -e ${varnishncsa_file} ]; then
+		install -o ${varnishncsa_user} -g varnish /dev/null ${varnishncsa_file};
+	fi
+
 	waitcount=0
 	vsm=%%PREFIX%%/varnish/$(hostname)/_.vsm
 	
         # wait no longer than 5s for  _.vsm file to arrive from varnishd
 	while :
 	do
 		if [ -f ${vsm} ] ; then
 			break
 		else
 			case "${waitcount}" in
 				5)	echo "${name}: Failed to start. Missing ${vsm} ?"
 					break
 					;;
 				*)	echo "${name}: waiting for ${vsm}"
 					waitcount=$((waitcount+1))
 					sleep 1
 					;;
 			esac
 		fi
 	done
 }
 
 run_rc_command "$1"
Index: head/www/varnish4/pkg-plist
===================================================================
--- head/www/varnish4/pkg-plist	(revision 399687)
+++ head/www/varnish4/pkg-plist	(revision 399688)
@@ -1,91 +1,100 @@
 bin/varnishadm
 bin/varnishhist
 bin/varnishlog
 bin/varnishncsa
 bin/varnishstat
 bin/varnishtest
 bin/varnishtop
 include/varnish/cache/cache.h
 include/varnish/cache/cache_backend.h
+include/varnish/cache/cache_director.h
+include/varnish/cache/cache_filter.h
 include/varnish/common/common.h
 include/varnish/common/params.h
 include/varnish/miniobj.h
 include/varnish/tbl/acct_fields_bereq.h
 include/varnish/tbl/acct_fields_req.h
 include/varnish/tbl/backend_poll.h
 include/varnish/tbl/ban_vars.h
 include/varnish/tbl/bo_flags.h
 include/varnish/tbl/body_status.h
 include/varnish/tbl/debug_bits.h
 include/varnish/tbl/feature_bits.h
 include/varnish/tbl/http_headers.h
 include/varnish/tbl/http_response.h
 include/varnish/tbl/locks.h
+include/varnish/tbl/obj_attr.h
+include/varnish/tbl/params.h
 include/varnish/tbl/req_body.h
+include/varnish/tbl/req_flags.h
+include/varnish/tbl/sess_attr.h
 include/varnish/tbl/sess_close.h
 include/varnish/tbl/steps.h
 include/varnish/tbl/symbol_kind.h
 include/varnish/tbl/vcc_types.h
 include/varnish/tbl/vcl_returns.h
 include/varnish/tbl/vrt_stv_var.h
 include/varnish/tbl/vsc_all.h
 include/varnish/tbl/vsc_f_main.h
 include/varnish/tbl/vsc_fields.h
 include/varnish/tbl/vsc_levels.h
 include/varnish/tbl/vsc_types.h
 include/varnish/tbl/vsl_tags.h
 include/varnish/tbl/vsl_tags_http.h
 include/varnish/vapi/vapi_options.h
 include/varnish/vapi/voptget.h
 include/varnish/vapi/vsc.h
 include/varnish/vapi/vsc_int.h
 include/varnish/vapi/vsl.h
 include/varnish/vapi/vsl_int.h
 include/varnish/vapi/vsm.h
 include/varnish/vapi/vsm_int.h
+include/varnish/waiter/waiter.h
 include/varnish/vas.h
 include/varnish/vav.h
 include/varnish/vbm.h
 include/varnish/vcl.h
 include/varnish/vcli.h
 include/varnish/vcs.h
 include/varnish/vdef.h
 include/varnish/vmod_abi.h
+include/varnish/vtcp.h
+include/varnish/vtim.h
 include/varnish/vqueue.h
 include/varnish/vre.h
 include/varnish/vrt.h
 include/varnish/vrt_obj.h
 include/varnish/vsa.h
 include/varnish/vsb.h
 include/varnish/vsha256.h
 lib/libvarnishapi.so
 lib/libvarnishapi.so.1
-lib/libvarnishapi.so.1.0.0
+lib/libvarnishapi.so.1.0.4
 lib/varnish/libvarnish.so
 lib/varnish/libvarnishcompat.so
 lib/varnish/libvcc.so
 lib/varnish/libvgz.so
 lib/varnish/vmods/libvmod_directors.so
 lib/varnish/vmods/libvmod_std.so
 libdata/pkgconfig/varnishapi.pc
 man/man1/varnishadm.1.gz
 man/man1/varnishd.1.gz
 man/man1/varnishhist.1.gz
 man/man1/varnishlog.1.gz
 man/man1/varnishncsa.1.gz
 man/man1/varnishstat.1.gz
 man/man1/varnishtest.1.gz
 man/man1/varnishtop.1.gz
 man/man3/vmod_directors.3.gz
 man/man3/vmod_std.3.gz
 man/man7/varnish-cli.7.gz
 man/man7/varnish-counters.7.gz
 man/man7/vcl.7.gz
 man/man7/vsl-query.7.gz
 man/man7/vsl.7.gz
 sbin/varnishd
 share/aclocal/varnish.m4
 %%PORTDOCS%%%%DOCSDIR%%/builtin.vcl
 %%PORTDOCS%%%%DOCSDIR%%/example.vcl
 %%DATADIR%%/vmodtool.py
 @dir varnish