diff -r 4de0581be621 -r 87e11e685b1f components/squid/squid.p5m --- a/components/squid/squid.p5m Wed Apr 13 10:10:46 2011 -0600 +++ b/components/squid/squid.p5m Wed Apr 13 09:58:06 2011 -0700 @@ -20,6 +20,8 @@ # # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. # + + default mangler.man.stability uncommitted> set name=pkg.fmri \ value=pkg:/web/proxy/squid@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.description \ @@ -29,6 +31,8 @@ value="org.opensolaris.category.2008:Web Services/Application and Web Servers" set name=info.source_url value=$(COMPONENT_ARCHIVE_URL) set name=info.upstream_url value=http://www.squid-cache.org/ +set name=opensolaris.arc_url \ + value=http://arc.opensolaris.org/caselog/LSARC/2009/130 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) dir path=etc dir path=etc/squid @@ -85,12 +89,16 @@ dir path=var/squid dir path=var/squid/cache dir path=var/squid/logs -file path=etc/squid/cachemgr.conf mode=0644 group=sys preserve=renamenew original_name=SUNWsquid:etc/squid/cachemgr.conf -file path=etc/squid/mime.conf mode=0644 group=sys preserve=renamenew original_name=SUNWsquid:etc/squid/mime.conf -file path=etc/squid/mime.conf.default -file path=etc/squid/msntauth.conf mode=0644 group=sys preserve=renamenew original_name=SUNWsquid:etc/squid/msntauth.conf +file path=etc/squid/cachemgr.conf group=sys mode=0644 \ + original_name=SUNWsquid:etc/squid/cachemgr.conf preserve=renamenew +file path=etc/squid/mime.conf group=sys mode=0644 \ + original_name=SUNWsquid:etc/squid/mime.conf preserve=renamenew +file path=etc/squid/mime.conf.default +file path=etc/squid/msntauth.conf group=sys mode=0644 \ + original_name=SUNWsquid:etc/squid/msntauth.conf preserve=renamenew file path=etc/squid/msntauth.conf.default -file path=etc/squid/squid.conf mode=0644 group=sys preserve=renamenew original_name=SUNWsquid:etc/squid/squid.conf +file path=etc/squid/squid.conf group=sys mode=0644 \ + original_name=SUNWsquid:etc/squid/squid.conf preserve=renamenew file path=etc/squid/squid.conf.default file http-squid.xml path=lib/svc/manifest/network/http-squid.xml file http-squid path=lib/svc/method/http-squid