7041863 move snort to userland (preserve etc files)
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Fri, 13 May 2011 10:23:04 -0700
changeset 240 1df7f3690cca
parent 239 f5dbfc736a65
child 241 28e3e664e431
7041863 move snort to userland (preserve etc files) 7044034 move lftp to userland (preserve etc files) 7026996 move tomcat to userland (add original_name)
components/lftp/lftp.p5m
components/snort/snort.p5m
components/tomcat/tomcat-examples.p5m
components/tomcat/tomcat.p5m
--- a/components/lftp/lftp.p5m	Thu May 12 13:33:56 2011 -0700
+++ b/components/lftp/lftp.p5m	Fri May 13 10:23:04 2011 -0700
@@ -69,7 +69,8 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man4
-file path=etc/lftp.conf
+file path=etc/lftp.conf mode=0644 preserve=renamenew \
+    original_name=SUNWlftp:etc/lftp.conf
 file path=usr/bin/lftp
 file path=usr/bin/lftpget
 file path=usr/share/lftp/convert-mozilla-cookies
--- a/components/snort/snort.p5m	Thu May 12 13:33:56 2011 -0700
+++ b/components/snort/snort.p5m	Fri May 13 10:23:04 2011 -0700
@@ -55,13 +55,17 @@
 dir path=usr/share/man
 dir path=usr/share/man/man1m
 file path=etc/attribute_table.dtd
-file path=etc/classification.config
+file path=etc/classification.config mode=0644 preserve=renamenew \
+    original_name=SUNWsnort:etc/classification.config
 file path=etc/gen-msg.map
-file path=etc/reference.config
+file path=etc/reference.config mode=0644 preserve=renamenew \
+    original_name=SUNWsnort:etc/reference.config
 file Solaris/auth_attr path=etc/security/auth_attr.d/snort
 file Solaris/exec_attr path=etc/security/exec_attr.d/snort
-file path=etc/snort.conf
-file path=etc/threshold.conf
+file path=etc/snort.conf mode=0644 preserve=renamenew \
+    original_name=SUNWsnort:etc/snort.conf
+file path=etc/threshold.conf mode=0644 preserve=renamenew \
+    original_name=SUNWsnort:etc/threshold.conf
 file path=etc/unicode.map
 file Solaris/snort.xml path=lib/svc/manifest/network/snort.xml
 file Solaris/snortd path=lib/svc/method/snortd
--- a/components/tomcat/tomcat-examples.p5m	Thu May 12 13:33:56 2011 -0700
+++ b/components/tomcat/tomcat-examples.p5m	Fri May 13 10:23:04 2011 -0700
@@ -105,7 +105,8 @@
 file path=var/tomcat6/webapps/ROOT.example/tomcat-power.gif
 file path=var/tomcat6/webapps/ROOT.example/tomcat.gif
 file path=var/tomcat6/webapps/ROOT.example/tomcat.svg
-file path=var/tomcat6/webapps/ROOT/index.htm mode=0644 preserve=renamenew
+file path=var/tomcat6/webapps/ROOT/index.htm mode=0644 preserve=renamenew \
+    original_name=SUNWtcat-examples:var/tomcat6/webapps/ROOT/index.htm
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.class
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/CookieExample.java
 file path=var/tomcat6/webapps/examples/WEB-INF/classes/HelloWorldExample.class
--- a/components/tomcat/tomcat.p5m	Thu May 12 13:33:56 2011 -0700
+++ b/components/tomcat/tomcat.p5m	Fri May 13 10:23:04 2011 -0700
@@ -225,15 +225,23 @@
 file path=usr/tomcat6/lib/tomcat-i18n-fr.jar
 file path=usr/tomcat6/lib/tomcat-i18n-ja.jar
 file path=var/tomcat6/conf/CONF.tar.gz
-file path=var/tomcat6/conf/catalina.policy mode=0644 preserve=renamenew
-file path=var/tomcat6/conf/catalina.properties mode=0644 preserve=renamenew
-file path=var/tomcat6/conf/context.xml mode=0644 preserve=renamenew
-file path=var/tomcat6/conf/logging.properties mode=0644 preserve=renamenew
-file path=var/tomcat6/conf/server.xml mode=0644 preserve=renamenew
+file path=var/tomcat6/conf/catalina.policy mode=0644 preserve=renamenew \
+    original_name=SUNWtcat:var/tomcat6/conf/catalina.policy
+file path=var/tomcat6/conf/catalina.properties mode=0644 preserve=renamenew \
+    original_name=SUNWtcat:var/tomcat6/conf/catalina.properties
+file path=var/tomcat6/conf/context.xml mode=0644 preserve=renamenew \
+    original_name=SUNWtcat:var/tomcat6/conf/context.xml
+file path=var/tomcat6/conf/logging.properties mode=0644 preserve=renamenew \
+    original_name=SUNWtcat:var/tomcat6/conf/logging.properties
+file path=var/tomcat6/conf/server.xml mode=0644 preserve=renamenew \
+    original_name=SUNWtcat:var/tomcat6/conf/server.xml
 file path=var/tomcat6/conf/tomcat-users.xml group=webservd mode=0600 \
-    owner=webservd preserve=renamenew
-file path=var/tomcat6/conf/web.xml mode=0644 preserve=renamenew
-file path=var/tomcat6/webapps/ROOT/index.jsp mode=0644 preserve=renamenew
+    owner=webservd preserve=renamenew \
+    original_name=SUNWtcat:var/tomcat6/conf/tomcat-users.xml
+file path=var/tomcat6/conf/web.xml mode=0644 preserve=renamenew \
+    original_name=SUNWtcat:var/tomcat6/conf/web.xml
+file path=var/tomcat6/webapps/ROOT/index.jsp mode=0644 preserve=renamenew \
+    original_name=SUNWtcat:var/tomcat6/webapps/ROOT/index.jsp
 file path=var/tomcat6/webapps/host-manager/META-INF/context.xml
 file path=var/tomcat6/webapps/host-manager/WEB-INF/web.xml
 file path=var/tomcat6/webapps/host-manager/images/add.gif