Attachment 156803 Details for Bug 200227 – Patch

[patch] Patch

red5.patch (text/plain), 15.25 KB, created by Dmitry Marakasov on 2015-05-15 19:45:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-05-15 19:45:57 UTC

Size: 15.25 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 383387)
>+++ Makefile	(working copy)
>@@ -19,6 +19,7 @@
> RED5_HOME?=	${PREFIX}/${PORTNAME}
> 
> SUB_LIST+=	RED5_USER=${RED5_USER} RED5_HOME=${RED5_HOME}
>+PLIST_SUB=	RED5_USER=${RED5_USER} RED5_GRP=${RED5_GRP}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's/host=0.0.0.0/host=127.0.0.1/' ${WRKSRC}/conf/red5.properties
>@@ -44,8 +45,4 @@
> 	(cd ${WRKSRC}/webapps && ${COPYTREE_SHARE} \* ${STAGEDIR}${RED5_HOME}/webapps)
> 	(cd ${WRKSRC}/plugins && ${COPYTREE_SHARE} \* ${STAGEDIR}${RED5_HOME}/plugins)
> 
>-post-install:
>-	@${ECHO_CMD} '@exec ${CHOWN} -R ${RED5_USER}:${RED5_GRP} ${RED5_HOME}' \
>-		>> ${TMPPLIST}
>-
> .include <bsd.port.mk>
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 383387)
>+++ pkg-plist	(working copy)
>@@ -1,67 +1,27 @@
> @stopdaemon red5
>-@unexec cmp -s %D/red5/conf/access.properties %D/red5/conf/access.properties.sample && rm -f %D/red5/conf/access.properties || true 2>/dev/null
>-red5/conf/access.properties.sample
>-@exec [ -f %D/red5/conf/access.properties ] || cp -p %D/red5/conf/access.properties.sample %D/red5/conf/access.properties
>-@unexec cmp -s %D/red5/conf/build_standalone.properties %D/red5/conf/build_standalone.properties.sample && rm -f %D/red5/conf/build_standalone.properties || true 2>/dev/null
>-red5/conf/build_standalone.properties.sample
>-@exec [ -f %D/red5/conf/build_standalone.properties ] || cp -p %D/red5/conf/build_standalone.properties.sample %D/red5/conf/build_standalone.properties
>-@unexec cmp -s %D/red5/conf/catalina.policy %D/red5/conf/catalina.policy.sample && rm -f %D/red5/conf/catalina.policy || true 2>/dev/null
>-red5/conf/catalina.policy.sample
>-@exec [ -f %D/red5/conf/catalina.policy ] || cp -p %D/red5/conf/catalina.policy.sample %D/red5/conf/catalina.policy
>-@unexec cmp -s %D/red5/conf/context.xml %D/red5/conf/context.xml.sample && rm -f %D/red5/conf/context.xml || true 2>/dev/null
>-red5/conf/context.xml.sample
>-@exec [ -f %D/red5/conf/context.xml ] || cp -p %D/red5/conf/context.xml.sample %D/red5/conf/context.xml
>-@unexec cmp -s %D/red5/conf/ehcache.xml %D/red5/conf/ehcache.xml.sample && rm -f %D/red5/conf/ehcache.xml || true 2>/dev/null
>-red5/conf/ehcache.xml.sample
>-@exec [ -f %D/red5/conf/ehcache.xml ] || cp -p %D/red5/conf/ehcache.xml.sample %D/red5/conf/ehcache.xml
>-@unexec cmp -s %D/red5/conf/jee-container.xml %D/red5/conf/jee-container.xml.sample && rm -f %D/red5/conf/jee-container.xml || true 2>/dev/null
>-red5/conf/jee-container.xml.sample
>-@exec [ -f %D/red5/conf/jee-container.xml ] || cp -p %D/red5/conf/jee-container.xml.sample %D/red5/conf/jee-container.xml
>-@unexec cmp -s %D/red5/conf/keystore.jmx %D/red5/conf/keystore.jmx.sample && rm -f %D/red5/conf/keystore.jmx || true 2>/dev/null
>-red5/conf/keystore.jmx.sample
>-@exec [ -f %D/red5/conf/keystore.jmx ] || cp -p %D/red5/conf/keystore.jmx.sample %D/red5/conf/keystore.jmx
>-@unexec cmp -s %D/red5/conf/logback.xml %D/red5/conf/logback.xml.sample && rm -f %D/red5/conf/logback.xml || true 2>/dev/null
>-red5/conf/logback.xml.sample
>-@exec [ -f %D/red5/conf/logback.xml ] || cp -p %D/red5/conf/logback.xml.sample %D/red5/conf/logback.xml
>-@unexec cmp -s %D/red5/conf/no-jee-container.xml %D/red5/conf/no-jee-container.xml.sample && rm -f %D/red5/conf/no-jee-container.xml || true 2>/dev/null
>-red5/conf/no-jee-container.xml.sample
>-@exec [ -f %D/red5/conf/no-jee-container.xml ] || cp -p %D/red5/conf/no-jee-container.xml.sample %D/red5/conf/no-jee-container.xml
>-@unexec cmp -s %D/red5/conf/password.properties %D/red5/conf/password.properties.sample && rm -f %D/red5/conf/password.properties || true 2>/dev/null
>-red5/conf/password.properties.sample
>-@exec [ -f %D/red5/conf/password.properties ] || cp -p %D/red5/conf/password.properties.sample %D/red5/conf/password.properties
>-@unexec cmp -s %D/red5/conf/quartz.properties %D/red5/conf/quartz.properties.sample && rm -f %D/red5/conf/quartz.properties || true 2>/dev/null
>-red5/conf/quartz.properties.sample
>-@exec [ -f %D/red5/conf/quartz.properties ] || cp -p %D/red5/conf/quartz.properties.sample %D/red5/conf/quartz.properties
>-@unexec cmp -s %D/red5/conf/realm.properties %D/red5/conf/realm.properties.sample && rm -f %D/red5/conf/realm.properties || true 2>/dev/null
>-red5/conf/realm.properties.sample
>-@exec [ -f %D/red5/conf/realm.properties ] || cp -p %D/red5/conf/realm.properties.sample %D/red5/conf/realm.properties
>-@unexec cmp -s %D/red5/conf/red5-common.xml %D/red5/conf/red5-common.xml.sample && rm -f %D/red5/conf/red5-common.xml || true 2>/dev/null
>-red5/conf/red5-common.xml.sample
>-@exec [ -f %D/red5/conf/red5-common.xml ] || cp -p %D/red5/conf/red5-common.xml.sample %D/red5/conf/red5-common.xml
>-@unexec cmp -s %D/red5/conf/red5-core.xml %D/red5/conf/red5-core.xml.sample && rm -f %D/red5/conf/red5-core.xml || true 2>/dev/null
>-red5/conf/red5-core.xml.sample
>-@exec [ -f %D/red5/conf/red5-core.xml ] || cp -p %D/red5/conf/red5-core.xml.sample %D/red5/conf/red5-core.xml
>-@unexec cmp -s %D/red5/conf/red5.globals %D/red5/conf/red5.globals.sample && rm -f %D/red5/conf/red5.globals || true 2>/dev/null
>-red5/conf/red5.globals.sample
>-@exec [ -f %D/red5/conf/red5.globals ] || cp -p %D/red5/conf/red5.globals.sample %D/red5/conf/red5.globals
>-@unexec cmp -s %D/red5/conf/red5.policy %D/red5/conf/red5.policy.sample && rm -f %D/red5/conf/red5.policy || true 2>/dev/null
>-red5/conf/red5.policy.sample
>-@exec [ -f %D/red5/conf/red5.policy ] || cp -p %D/red5/conf/red5.policy.sample %D/red5/conf/red5.policy
>-@unexec cmp -s %D/red5/conf/red5.properties %D/red5/conf/red5.properties.sample && rm -f %D/red5/conf/red5.properties || true 2>/dev/null
>-red5/conf/red5.properties.sample
>-@exec [ -f %D/red5/conf/red5.properties ] || cp -p %D/red5/conf/red5.properties.sample %D/red5/conf/red5.properties
>-@unexec cmp -s %D/red5/conf/red5.xml %D/red5/conf/red5.xml.sample && rm -f %D/red5/conf/red5.xml || true 2>/dev/null
>-red5/conf/red5.xml.sample
>-@exec [ -f %D/red5/conf/red5.xml ] || cp -p %D/red5/conf/red5.xml.sample %D/red5/conf/red5.xml
>-@unexec cmp -s %D/red5/conf/tomcat-users.xml %D/red5/conf/tomcat-users.xml.sample && rm -f %D/red5/conf/tomcat-users.xml || true 2>/dev/null
>-red5/conf/tomcat-users.xml.sample
>-@exec [ -f %D/red5/conf/tomcat-users.xml ] || cp -p %D/red5/conf/tomcat-users.xml.sample %D/red5/conf/tomcat-users.xml
>-@unexec cmp -s %D/red5/conf/truststore.jmx %D/red5/conf/truststore.jmx.sample && rm -f %D/red5/conf/truststore.jmx || true 2>/dev/null
>-red5/conf/truststore.jmx.sample
>-@exec [ -f %D/red5/conf/truststore.jmx ] || cp -p %D/red5/conf/truststore.jmx.sample %D/red5/conf/truststore.jmx
>-@unexec cmp -s %D/red5/conf/web.xml %D/red5/conf/web.xml.sample && rm -f %D/red5/conf/web.xml || true 2>/dev/null
>-red5/conf/web.xml.sample
>-@exec [ -f %D/red5/conf/web.xml ] || cp -p %D/red5/conf/web.xml.sample %D/red5/conf/web.xml
>+@owner %%RED5_USER%%
>+@group %%RED5_GRP%%
>+@sample red5/conf/access.properties.sample
>+@sample red5/conf/build_standalone.properties.sample
>+@sample red5/conf/catalina.policy.sample
>+@sample red5/conf/context.xml.sample
>+@sample red5/conf/ehcache.xml.sample
>+@sample red5/conf/jee-container.xml.sample
>+@sample red5/conf/keystore.jmx.sample
>+@sample red5/conf/logback.xml.sample
>+@sample red5/conf/no-jee-container.xml.sample
>+@sample red5/conf/password.properties.sample
>+@sample red5/conf/quartz.properties.sample
>+@sample red5/conf/realm.properties.sample
>+@sample red5/conf/red5-common.xml.sample
>+@sample red5/conf/red5-core.xml.sample
>+@sample red5/conf/red5.globals.sample
>+@sample red5/conf/red5.policy.sample
>+@sample red5/conf/red5.properties.sample
>+@sample red5/conf/red5.xml.sample
>+@sample red5/conf/tomcat-users.xml.sample
>+@sample red5/conf/truststore.jmx.sample
>+@sample red5/conf/web.xml.sample
> red5/lib/bcprov-jdk15on-1.47.jar
> red5/lib/com.springsource.javax.xml.stream-1.0.1.jar
> red5/lib/com.springsource.net.sf.cglib-2.2.0.jar
>@@ -122,15 +82,9 @@
> red5/red5-server-1.0-bootstrap.jar
> red5/red5-server-1.0.jar
> red5/webapps/installer/AC_OETags.js
>-@unexec cmp -s %D/red5/webapps/installer/WEB-INF/red5-web.properties %D/red5/webapps/installer/WEB-INF/red5-web.properties.sample && rm -f %D/red5/webapps/installer/WEB-INF/red5-web.properties || true 2>/dev/null
>-red5/webapps/installer/WEB-INF/red5-web.properties.sample
>-@exec [ -f %D/red5/webapps/installer/WEB-INF/red5-web.properties ] || cp -p %D/red5/webapps/installer/WEB-INF/red5-web.properties.sample %D/red5/webapps/installer/WEB-INF/red5-web.properties
>-@unexec cmp -s %D/red5/webapps/installer/WEB-INF/red5-web.xml %D/red5/webapps/installer/WEB-INF/red5-web.xml.sample && rm -f %D/red5/webapps/installer/WEB-INF/red5-web.xml || true 2>/dev/null
>-red5/webapps/installer/WEB-INF/red5-web.xml.sample
>-@exec [ -f %D/red5/webapps/installer/WEB-INF/red5-web.xml ] || cp -p %D/red5/webapps/installer/WEB-INF/red5-web.xml.sample %D/red5/webapps/installer/WEB-INF/red5-web.xml
>-@unexec cmp -s %D/red5/webapps/installer/WEB-INF/web.xml %D/red5/webapps/installer/WEB-INF/web.xml.sample && rm -f %D/red5/webapps/installer/WEB-INF/web.xml || true 2>/dev/null
>-red5/webapps/installer/WEB-INF/web.xml.sample
>-@exec [ -f %D/red5/webapps/installer/WEB-INF/web.xml ] || cp -p %D/red5/webapps/installer/WEB-INF/web.xml.sample %D/red5/webapps/installer/WEB-INF/web.xml
>+@sample red5/webapps/installer/WEB-INF/red5-web.properties.sample
>+@sample red5/webapps/installer/WEB-INF/red5-web.xml.sample
>+@sample red5/webapps/installer/WEB-INF/web.xml.sample
> red5/webapps/installer/history/history.css
> red5/webapps/installer/history/history.js
> red5/webapps/installer/history/historyFrame.html
>@@ -137,27 +91,13 @@
> red5/webapps/installer/index.html
> red5/webapps/installer/installer.swf
> red5/webapps/installer/playerProductInstall.swf
>-@unexec cmp -s %D/red5/webapps/live/WEB-INF/red5-web.properties %D/red5/webapps/live/WEB-INF/red5-web.properties.sample && rm -f %D/red5/webapps/live/WEB-INF/red5-web.properties || true 2>/dev/null
>-red5/webapps/live/WEB-INF/red5-web.properties.sample
>-@exec [ -f %D/red5/webapps/live/WEB-INF/red5-web.properties ] || cp -p %D/red5/webapps/live/WEB-INF/red5-web.properties.sample %D/red5/webapps/live/WEB-INF/red5-web.properties
>-@unexec cmp -s %D/red5/webapps/live/WEB-INF/red5-web.xml %D/red5/webapps/live/WEB-INF/red5-web.xml.sample && rm -f %D/red5/webapps/live/WEB-INF/red5-web.xml || true 2>/dev/null
>-red5/webapps/live/WEB-INF/red5-web.xml.sample
>-@exec [ -f %D/red5/webapps/live/WEB-INF/red5-web.xml ] || cp -p %D/red5/webapps/live/WEB-INF/red5-web.xml.sample %D/red5/webapps/live/WEB-INF/red5-web.xml
>-@unexec cmp -s %D/red5/webapps/live/WEB-INF/web.xml %D/red5/webapps/live/WEB-INF/web.xml.sample && rm -f %D/red5/webapps/live/WEB-INF/web.xml || true 2>/dev/null
>-red5/webapps/live/WEB-INF/web.xml.sample
>-@exec [ -f %D/red5/webapps/live/WEB-INF/web.xml ] || cp -p %D/red5/webapps/live/WEB-INF/web.xml.sample %D/red5/webapps/live/WEB-INF/web.xml
>-@unexec cmp -s %D/red5/webapps/red5-default.xml %D/red5/webapps/red5-default.xml.sample && rm -f %D/red5/webapps/red5-default.xml || true 2>/dev/null
>-red5/webapps/red5-default.xml.sample
>-@exec [ -f %D/red5/webapps/red5-default.xml ] || cp -p %D/red5/webapps/red5-default.xml.sample %D/red5/webapps/red5-default.xml 
>-@unexec cmp -s %D/red5/webapps/root/WEB-INF/red5-web.properties %D/red5/webapps/root/WEB-INF/red5-web.properties.sample && rm -f %D/red5/webapps/root/WEB-INF/red5-web.properties || true 2>/dev/null
>-red5/webapps/root/WEB-INF/red5-web.properties.sample
>-@exec [ -f %D/red5/webapps/root/WEB-INF/red5-web.properties ] || cp -p %D/red5/webapps/root/WEB-INF/red5-web.properties.sample %D/red5/webapps/root/WEB-INF/red5-web.properties
>-@unexec cmp -s %D/red5/webapps/root/WEB-INF/red5-web.xml %D/red5/webapps/root/WEB-INF/red5-web.xml.sample && rm -f %D/red5/webapps/root/WEB-INF/red5-web.xml || true 2>/dev/null
>-red5/webapps/root/WEB-INF/red5-web.xml.sample
>-@exec [ -f %D/red5/webapps/root/WEB-INF/red5-web.xml ] || cp -p %D/red5/webapps/root/WEB-INF/red5-web.xml.sample %D/red5/webapps/root/WEB-INF/red5-web.xml
>-@unexec cmp -s %D/red5/webapps/root/WEB-INF/web.xml %D/red5/webapps/root/WEB-INF/web.xml.sample && rm -f %D/red5/webapps/root/WEB-INF/web.xml || true 2>/dev/null
>-red5/webapps/root/WEB-INF/web.xml.sample
>-@exec [ -f %D/red5/webapps/root/WEB-INF/web.xml ] || cp -p %D/red5/webapps/root/WEB-INF/web.xml.sample %D/red5/webapps/root/WEB-INF/web.xml
>+@sample red5/webapps/live/WEB-INF/red5-web.properties.sample
>+@sample red5/webapps/live/WEB-INF/red5-web.xml.sample
>+@sample red5/webapps/live/WEB-INF/web.xml.sample
>+@sample red5/webapps/red5-default.xml.sample
>+@sample red5/webapps/root/WEB-INF/red5-web.properties.sample
>+@sample red5/webapps/root/WEB-INF/red5-web.xml.sample
>+@sample red5/webapps/root/WEB-INF/web.xml.sample
> red5/webapps/root/biglogo.png
> red5/webapps/root/crossdomain.xml
> red5/webapps/root/demos/BallControl.html
>@@ -202,15 +142,9 @@
> red5/webapps/root/gc.jsp
> red5/webapps/root/index.html
> red5/webapps/root/logo.png
>-@unexec cmp -s %D/red5/webapps/vod/WEB-INF/red5-web.properties %D/red5/webapps/vod/WEB-INF/red5-web.properties.sample && rm -f %D/red5/webapps/vod/WEB-INF/red5-web.properties || true 2>/dev/null
>-red5/webapps/vod/WEB-INF/red5-web.properties.sample
>-@exec [ -f %D/red5/webapps/vod/WEB-INF/red5-web.properties ] || cp -p %D/red5/webapps/vod/WEB-INF/red5-web.properties.sample %D/red5/webapps/vod/WEB-INF/red5-web.properties
>-@unexec cmp -s %D/red5/webapps/vod/WEB-INF/red5-web.xml %D/red5/webapps/vod/WEB-INF/red5-web.xml.sample && rm -f %D/red5/webapps/vod/WEB-INF/red5-web.xml || true 2>/dev/null
>-red5/webapps/vod/WEB-INF/red5-web.xml.sample
>-@exec [ -f %D/red5/webapps/vod/WEB-INF/red5-web.xml ] || cp -p %D/red5/webapps/vod/WEB-INF/red5-web.xml.sample %D/red5/webapps/vod/WEB-INF/red5-web.xml
>-@unexec cmp -s %D/red5/webapps/vod/WEB-INF/web.xml %D/red5/webapps/vod/WEB-INF/web.xml.sample && rm -f %D/red5/webapps/vod/WEB-INF/web.xml || true 2>/dev/null
>-red5/webapps/vod/WEB-INF/web.xml.sample
>-@exec [ -f %D/red5/webapps/vod/WEB-INF/web.xml ] || cp -p %D/red5/webapps/vod/WEB-INF/web.xml.sample %D/red5/webapps/vod/WEB-INF/web.xml
>+@sample red5/webapps/vod/WEB-INF/red5-web.properties.sample
>+@sample red5/webapps/vod/WEB-INF/red5-web.xml.sample
>+@sample red5/webapps/vod/WEB-INF/web.xml.sample
> red5/webapps/vod/framework_4.5.1.21328.swf
> red5/webapps/vod/index.html
> red5/webapps/vod/miniplayer.swf
>@@ -219,21 +153,23 @@
> red5/webapps/vod/streams/red5.flv
> red5/webapps/vod/swfobject.js
> red5/webapps/vod/textLayout_2.0.0.232.swf
>-@dirrmtry red5/conf
>-@dirrmtry red5/lib
>-@dirrmtry red5/log
>-@dirrmtry red5/plugins
>-@dirrmtry red5/webapps/installer/history
>-@dirrmtry red5/webapps/installer/WEB-INF
>-@dirrmtry red5/webapps/installer
>-@dirrmtry red5/webapps/live/WEB-INF
>-@dirrmtry red5/webapps/live
>-@dirrmtry red5/webapps/root/demos/assets
>-@dirrmtry red5/webapps/root/demos
>-@dirrmtry red5/webapps/root/WEB-INF
>-@dirrmtry red5/webapps/root
>-@dirrmtry red5/webapps/vod/streams
>-@dirrmtry red5/webapps/vod/WEB-INF
>-@dirrmtry red5/webapps/vod
>-@dirrmtry red5/webapps
>-@dirrmtry red5
>+@dir red5/webapps/vod/streams
>+@dir red5/webapps/vod/WEB-INF
>+@dir red5/webapps/vod
>+@dir red5/webapps/root/demos/assets
>+@dir red5/webapps/root/demos
>+@dir red5/webapps/root/WEB-INF
>+@dir red5/webapps/root
>+@dir red5/webapps/live/WEB-INF
>+@dir red5/webapps/live
>+@dir red5/webapps/installer/history
>+@dir red5/webapps/installer/WEB-INF
>+@dir red5/webapps/installer
>+@dir red5/webapps
>+@dir red5/plugins
>+@dir red5/log
>+@dir red5/lib
>+@dir red5/conf
>+@dir red5
>+@owner
>+@group

Actions: View | Diff

Attachments on bug 200227: 156803