diff options
| -rw-r--r-- | roundcubemail-1.1.1-no_swf.patch | 6 | ||||
| -rw-r--r-- | roundcubemail-dev.spec | 632 | ||||
| -rw-r--r-- | roundcubemail.spec | 51 |
3 files changed, 29 insertions, 660 deletions
diff --git a/roundcubemail-1.1.1-no_swf.patch b/roundcubemail-1.1.1-no_swf.patch deleted file mode 100644 index d771198..0000000 --- a/roundcubemail-1.1.1-no_swf.patch +++ /dev/null @@ -1,6 +0,0 @@ ---- roundcubemail-1.1.1/program/js/tinymce/plugins/media/plugin.min.js.orig 2015-03-20 13:50:23.729118071 +0100 -+++ roundcubemail-1.1.1/program/js/tinymce/plugins/media/plugin.min.js 2015-03-20 13:50:53.125224054 +0100 -@@ -1 +1 @@ --tinymce.PluginManager.add("media",function(a,b){function c(a){return a=a.toLowerCase(),-1!=a.indexOf(".mp3")?"audio/mpeg":-1!=a.indexOf(".wav")?"audio/wav":-1!=a.indexOf(".mp4")?"video/mp4":-1!=a.indexOf(".webm")?"video/webm":-1!=a.indexOf(".ogg")?"video/ogg":-1!=a.indexOf(".swf")?"application/x-shockwave-flash":""}function d(b){var c=a.settings.media_scripts;if(c)for(var d=0;d<c.length;d++)if(-1!==b.indexOf(c[d].filter))return c[d]}function e(){function b(a){var b,c,f,g;b=d.find("#width")[0],c=d.find("#height")[0],f=b.value(),g=c.value(),d.find("#constrain")[0].checked()&&e&&j&&f&&g&&(a.control==b?(g=Math.round(f/e*g),isNaN(g)||c.value(g)):(f=Math.round(g/j*f),isNaN(f)||b.value(f))),e=f,j=g}function c(){k=h(this.value()),this.parent().parent().fromJSON(k)}var d,e,j,k,l=[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source",onchange:function(a){tinymce.each(a.meta,function(a,b){d.find("#"+b).value(a)})}}];a.settings.media_alt_source!==!1&&l.push({name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"}),a.settings.media_poster!==!1&&l.push({name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"}),a.settings.media_dimensions!==!1&&l.push({type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:b,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:b,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}),k=i(a.selection.getNode()),e=k.width,j=k.height;var n={id:"mcemediasource",type:"textbox",flex:1,name:"embed",value:f(),multiline:!0,label:"Source"};n[m]=c,d=a.windowManager.open({title:"Insert/edit video",data:k,bodyType:"tabpanel",body:[{title:"General",type:"form",onShowTab:function(){k=h(this.next().find("#embed").value()),this.fromJSON(k)},items:l},{title:"Embed",type:"panel",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,onShowTab:function(){this.find("#embed").value(g(this.parent().toJSON()))},items:[{type:"label",text:"Paste your embed code below:",forId:"mcemediasource"},n]}],onSubmit:function(){var b,c,d,e;for(b=a.dom.select("img[data-mce-object]"),a.insertContent(g(this.toJSON())),c=a.dom.select("img[data-mce-object]"),d=0;d<b.length;d++)for(e=c.length-1;e>=0;e--)b[d]==c[e]&&c.splice(e,1);a.selection.select(c[0]),a.nodeChanged()}})}function f(){var b=a.selection.getNode();return b.getAttribute("data-mce-object")?a.selection.getContent():void 0}function g(e){var f="";if(!e.source1&&(tinymce.extend(e,h(e.embed)),!e.source1))return"";if(e.source2||(e.source2=""),e.poster||(e.poster=""),e.source1=a.convertURL(e.source1,"source"),e.source2=a.convertURL(e.source2,"source"),e.source1mime=c(e.source1),e.source2mime=c(e.source2),e.poster=a.convertURL(e.poster,"poster"),e.flashPlayerUrl=a.convertURL(b+"/moxieplayer.swf","movie"),tinymce.each(l,function(a){var b,c,d;if(b=a.regex.exec(e.source1)){for(d=a.url,c=0;b[c];c++)d=d.replace("$"+c,function(){return b[c]});e.source1=d,e.type=a.type,e.width=e.width||a.w,e.height=e.height||a.h}}),e.embed)f=k(e.embed,e,!0);else{var g=d(e.source1);g&&(e.type="script",e.width=g.width,e.height=g.height),e.width=e.width||300,e.height=e.height||150,tinymce.each(e,function(b,c){e[c]=a.dom.encode(b)}),"iframe"==e.type?f+='<iframe src="'+e.source1+'" width="'+e.width+'" height="'+e.height+'"></iframe>':"application/x-shockwave-flash"==e.source1mime?(f+='<object data="'+e.source1+'" width="'+e.width+'" height="'+e.height+'" type="application/x-shockwave-flash">',e.poster&&(f+='<img src="'+e.poster+'" width="'+e.width+'" height="'+e.height+'" />'),f+="</object>"):-1!=e.source1mime.indexOf("audio")?a.settings.audio_template_callback?f=a.settings.audio_template_callback(e):f+='<audio controls="controls" src="'+e.source1+'">'+(e.source2?'\n<source src="'+e.source2+'"'+(e.source2mime?' type="'+e.source2mime+'"':"")+" />\n":"")+"</audio>":"script"==e.type?f+='<script src="'+e.source1+'"></script>':f=a.settings.video_template_callback?a.settings.video_template_callback(e):'<video width="'+e.width+'" height="'+e.height+'"'+(e.poster?' poster="'+e.poster+'"':"")+' controls="controls">\n<source src="'+e.source1+'"'+(e.source1mime?' type="'+e.source1mime+'"':"")+" />\n"+(e.source2?'<source src="'+e.source2+'"'+(e.source2mime?' type="'+e.source2mime+'"':"")+" />\n":"")+"</video>"}return f}function h(a){var b={};return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",start:function(a,c){if(b.source1||"param"!=a||(b.source1=c.map.movie),("iframe"==a||"object"==a||"embed"==a||"video"==a||"audio"==a)&&(b.type||(b.type=a),b=tinymce.extend(c.map,b)),"script"==a){var e=d(c.map.src);if(!e)return;b={type:"script",source1:c.map.src,width:e.width,height:e.height}}"source"==a&&(b.source1?b.source2||(b.source2=c.map.src):b.source1=c.map.src),"img"!=a||b.poster||(b.poster=c.map.src)}}).parse(a),b.source1=b.source1||b.src||b.data,b.source2=b.source2||"",b.poster=b.poster||"",b}function i(b){return b.getAttribute("data-mce-object")?h(a.serializer.serialize(b,{selection:!0})):{}}function j(b){if(a.settings.media_filter_html===!1)return b;var c=new tinymce.html.Writer;return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!1,special:"script,noscript",comment:function(a){c.comment(a)},cdata:function(a){c.cdata(a)},text:function(a,b){c.text(a,b)},start:function(a,b,d){if("script"!=a&&"noscript"!=a){for(var e=0;e<b.length;e++)if(0===b[e].name.indexOf("on"))return;c.start(a,b,d)}},end:function(a){"script"!=a&&"noscript"!=a&&c.end(a)}},new tinymce.html.Schema({})).parse(b),c.getContent()}function k(a,b,c){function d(a,b){var c,d,e,f;for(c in b)if(e=""+b[c],a.map[c])for(d=a.length;d--;)f=a[d],f.name==c&&(e?(a.map[c]=e,f.value=e):(delete a.map[c],a.splice(d,1)));else e&&(a.push({name:c,value:e}),a.map[c]=e)}var e,f=new tinymce.html.Writer,g=0;return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",comment:function(a){f.comment(a)},cdata:function(a){f.cdata(a)},text:function(a,b){f.text(a,b)},start:function(a,h,i){switch(a){case"video":case"object":case"embed":case"img":case"iframe":d(h,{width:b.width,height:b.height})}if(c)switch(a){case"video":d(h,{poster:b.poster,src:""}),b.source2&&d(h,{src:""});break;case"iframe":d(h,{src:b.source1});break;case"source":if(g++,2>=g&&(d(h,{src:b["source"+g],type:b["source"+g+"mime"]}),!b["source"+g]))return;break;case"img":if(!b.poster)return;e=!0}f.start(a,h,i)},end:function(a){if("video"==a&&c)for(var h=1;2>=h;h++)if(b["source"+h]){var i=[];i.map={},h>g&&(d(i,{src:b["source"+h],type:b["source"+h+"mime"]}),f.start("source",i,!0))}if(b.poster&&"object"==a&&c&&!e){var j=[];j.map={},d(j,{src:b.poster,width:b.width,height:b.height}),f.start("img",j,!0)}f.end(a)}},new tinymce.html.Schema({})).parse(a),f.getContent()}var l=[{regex:/youtu\.be\/([\w\-.]+)/,type:"iframe",w:425,h:350,url:"//www.youtube.com/embed/$1"},{regex:/youtube\.com(.+)v=([^&]+)/,type:"iframe",w:425,h:350,url:"//www.youtube.com/embed/$2"},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc"},{regex:/vimeo\.com\/(.*)\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$2?title=0&byline=0"},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'//maps.google.com/maps/ms?msid=$2&output=embed"'}],m=tinymce.Env.ie&&tinymce.Env.ie<=8?"onChange":"onInput";a.on("ResolveName",function(a){var b;1==a.target.nodeType&&(b=a.target.getAttribute("data-mce-object"))&&(a.name=b)}),a.on("preInit",function(){var b=a.schema.getSpecialElements();tinymce.each("video audio iframe object".split(" "),function(a){b[a]=new RegExp("</"+a+"[^>]*>","gi")});var c=a.schema.getBoolAttrs();tinymce.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(a){c[a]={}}),a.parser.addNodeFilter("iframe,video,audio,object,embed,script",function(b,c){for(var e,f,g,h,i,j,k,l,m=b.length;m--;)if(f=b[m],f.parent&&("script"!=f.name||(l=d(f.attr("src"))))){for(g=new tinymce.html.Node("img",1),g.shortEnded=!0,l&&(l.width&&f.attr("width",l.width.toString()),l.height&&f.attr("height",l.height.toString())),j=f.attributes,e=j.length;e--;)h=j[e].name,i=j[e].value,"width"!==h&&"height"!==h&&"style"!==h&&(("data"==h||"src"==h)&&(i=a.convertURL(i,h)),g.attr("data-mce-p-"+h,i));k=f.firstChild&&f.firstChild.value,k&&(g.attr("data-mce-html",escape(k)),g.firstChild=null),g.attr({width:f.attr("width")||"300",height:f.attr("height")||("audio"==c?"30":"150"),style:f.attr("style"),src:tinymce.Env.transparentSrc,"data-mce-object":c,"class":"mce-object mce-object-"+c}),f.replace(g)}}),a.serializer.addAttributeFilter("data-mce-object",function(a,b){for(var c,d,e,f,g,h,i,k=a.length;k--;)if(c=a[k],c.parent){for(i=c.attr(b),d=new tinymce.html.Node(i,1),"audio"!=i&&"script"!=i&&d.attr({width:c.attr("width"),height:c.attr("height")}),d.attr({style:c.attr("style")}),f=c.attributes,e=f.length;e--;){var l=f[e].name;0===l.indexOf("data-mce-p-")&&d.attr(l.substr(11),f[e].value)}"script"==i&&d.attr("type","text/javascript"),g=c.attr("data-mce-html"),g&&(h=new tinymce.html.Node("#text",3),h.raw=!0,h.value=j(unescape(g)),d.append(h)),c.replace(d)}})}),a.on("ObjectSelected",function(a){var b=a.target.getAttribute("data-mce-object");("audio"==b||"script"==b)&&a.preventDefault()}),a.on("objectResized",function(a){var b,c=a.target;c.getAttribute("data-mce-object")&&(b=c.getAttribute("data-mce-html"),b&&(b=unescape(b),c.setAttribute("data-mce-html",escape(k(b,{width:a.width,height:a.height})))))}),a.addButton("media",{tooltip:"Insert/edit video",onclick:e,stateSelector:["img[data-mce-object=video]","img[data-mce-object=iframe]"]}),a.addMenuItem("media",{icon:"media",text:"Insert/edit video",onclick:e,context:"insert",prependToContext:!0})}); -\ Pas de fin de ligne à la fin du fichier -+tinymce.PluginManager.add("media",function(a,b){function c(a){return a=a.toLowerCase(),-1!=a.indexOf(".mp3")?"audio/mpeg":-1!=a.indexOf(".wav")?"audio/wav":-1!=a.indexOf(".mp4")?"video/mp4":-1!=a.indexOf(".webm")?"video/webm":-1!=a.indexOf(".ogg")?"video/ogg":-1!=a.indexOf(".swf")?"application/x-shockwave-flash":""}function d(b){var c=a.settings.media_scripts;if(c)for(var d=0;d<c.length;d++)if(-1!==b.indexOf(c[d].filter))return c[d]}function e(){function b(a){var b,c,f,g;b=d.find("#width")[0],c=d.find("#height")[0],f=b.value(),g=c.value(),d.find("#constrain")[0].checked()&&e&&j&&f&&g&&(a.control==b?(g=Math.round(f/e*g),isNaN(g)||c.value(g)):(f=Math.round(g/j*f),isNaN(f)||b.value(f))),e=f,j=g}function c(){k=h(this.value()),this.parent().parent().fromJSON(k)}var d,e,j,k,l=[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source",onchange:function(a){tinymce.each(a.meta,function(a,b){d.find("#"+b).value(a)})}}];a.settings.media_alt_source!==!1&&l.push({name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"}),a.settings.media_poster!==!1&&l.push({name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"}),a.settings.media_dimensions!==!1&&l.push({type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:5,size:3,onchange:b,ariaLabel:"Width"},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:5,size:3,onchange:b,ariaLabel:"Height"},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}),k=i(a.selection.getNode()),e=k.width,j=k.height;var n={id:"mcemediasource",type:"textbox",flex:1,name:"embed",value:f(),multiline:!0,label:"Source"};n[m]=c,d=a.windowManager.open({title:"Insert/edit video",data:k,bodyType:"tabpanel",body:[{title:"General",type:"form",onShowTab:function(){k=h(this.next().find("#embed").value()),this.fromJSON(k)},items:l},{title:"Embed",type:"panel",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,onShowTab:function(){this.find("#embed").value(g(this.parent().toJSON()))},items:[{type:"label",text:"Paste your embed code below:",forId:"mcemediasource"},n]}],onSubmit:function(){var b,c,d,e;for(b=a.dom.select("img[data-mce-object]"),a.insertContent(g(this.toJSON())),c=a.dom.select("img[data-mce-object]"),d=0;d<b.length;d++)for(e=c.length-1;e>=0;e--)b[d]==c[e]&&c.splice(e,1);a.selection.select(c[0]),a.nodeChanged()}})}function f(){var b=a.selection.getNode();return b.getAttribute("data-mce-object")?a.selection.getContent():void 0}function g(e){var f="";if(!e.source1&&(tinymce.extend(e,h(e.embed)),!e.source1))return"";if(e.source2||(e.source2=""),e.poster||(e.poster=""),e.source1=a.convertURL(e.source1,"source"),e.source2=a.convertURL(e.source2,"source"),e.source1mime=c(e.source1),e.source2mime=c(e.source2),e.poster=a.convertURL(e.poster,"poster"),e.flashPlayerUrl=false,tinymce.each(l,function(a){var b,c,d;if(b=a.regex.exec(e.source1)){for(d=a.url,c=0;b[c];c++)d=d.replace("$"+c,function(){return b[c]});e.source1=d,e.type=a.type,e.width=e.width||a.w,e.height=e.height||a.h}}),e.embed)f=k(e.embed,e,!0);else{var g=d(e.source1);g&&(e.type="script",e.width=g.width,e.height=g.height),e.width=e.width||300,e.height=e.height||150,tinymce.each(e,function(b,c){e[c]=a.dom.encode(b)}),"iframe"==e.type?f+='<iframe src="'+e.source1+'" width="'+e.width+'" height="'+e.height+'"></iframe>':"application/x-shockwave-flash"==e.source1mime?(f+='<object data="'+e.source1+'" width="'+e.width+'" height="'+e.height+'" type="application/x-shockwave-flash">',e.poster&&(f+='<img src="'+e.poster+'" width="'+e.width+'" height="'+e.height+'" />'),f+="</object>"):-1!=e.source1mime.indexOf("audio")?a.settings.audio_template_callback?f=a.settings.audio_template_callback(e):f+='<audio controls="controls" src="'+e.source1+'">'+(e.source2?'\n<source src="'+e.source2+'"'+(e.source2mime?' type="'+e.source2mime+'"':"")+" />\n":"")+"</audio>":"script"==e.type?f+='<script src="'+e.source1+'"></script>':f=a.settings.video_template_callback?a.settings.video_template_callback(e):'<video width="'+e.width+'" height="'+e.height+'"'+(e.poster?' poster="'+e.poster+'"':"")+' controls="controls">\n<source src="'+e.source1+'"'+(e.source1mime?' type="'+e.source1mime+'"':"")+" />\n"+(e.source2?'<source src="'+e.source2+'"'+(e.source2mime?' type="'+e.source2mime+'"':"")+" />\n":"")+"</video>"}return f}function h(a){var b={};return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",start:function(a,c){if(b.source1||"param"!=a||(b.source1=c.map.movie),("iframe"==a||"object"==a||"embed"==a||"video"==a||"audio"==a)&&(b.type||(b.type=a),b=tinymce.extend(c.map,b)),"script"==a){var e=d(c.map.src);if(!e)return;b={type:"script",source1:c.map.src,width:e.width,height:e.height}}"source"==a&&(b.source1?b.source2||(b.source2=c.map.src):b.source1=c.map.src),"img"!=a||b.poster||(b.poster=c.map.src)}}).parse(a),b.source1=b.source1||b.src||b.data,b.source2=b.source2||"",b.poster=b.poster||"",b}function i(b){return b.getAttribute("data-mce-object")?h(a.serializer.serialize(b,{selection:!0})):{}}function j(b){if(a.settings.media_filter_html===!1)return b;var c=new tinymce.html.Writer;return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!1,special:"script,noscript",comment:function(a){c.comment(a)},cdata:function(a){c.cdata(a)},text:function(a,b){c.text(a,b)},start:function(a,b,d){if("script"!=a&&"noscript"!=a){for(var e=0;e<b.length;e++)if(0===b[e].name.indexOf("on"))return;c.start(a,b,d)}},end:function(a){"script"!=a&&"noscript"!=a&&c.end(a)}},new tinymce.html.Schema({})).parse(b),c.getContent()}function k(a,b,c){function d(a,b){var c,d,e,f;for(c in b)if(e=""+b[c],a.map[c])for(d=a.length;d--;)f=a[d],f.name==c&&(e?(a.map[c]=e,f.value=e):(delete a.map[c],a.splice(d,1)));else e&&(a.push({name:c,value:e}),a.map[c]=e)}var e,f=new tinymce.html.Writer,g=0;return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",comment:function(a){f.comment(a)},cdata:function(a){f.cdata(a)},text:function(a,b){f.text(a,b)},start:function(a,h,i){switch(a){case"video":case"object":case"embed":case"img":case"iframe":d(h,{width:b.width,height:b.height})}if(c)switch(a){case"video":d(h,{poster:b.poster,src:""}),b.source2&&d(h,{src:""});break;case"iframe":d(h,{src:b.source1});break;case"source":if(g++,2>=g&&(d(h,{src:b["source"+g],type:b["source"+g+"mime"]}),!b["source"+g]))return;break;case"img":if(!b.poster)return;e=!0}f.start(a,h,i)},end:function(a){if("video"==a&&c)for(var h=1;2>=h;h++)if(b["source"+h]){var i=[];i.map={},h>g&&(d(i,{src:b["source"+h],type:b["source"+h+"mime"]}),f.start("source",i,!0))}if(b.poster&&"object"==a&&c&&!e){var j=[];j.map={},d(j,{src:b.poster,width:b.width,height:b.height}),f.start("img",j,!0)}f.end(a)}},new tinymce.html.Schema({})).parse(a),f.getContent()}var l=[{regex:/youtu\.be\/([\w\-.]+)/,type:"iframe",w:425,h:350,url:"//www.youtube.com/embed/$1"},{regex:/youtube\.com(.+)v=([^&]+)/,type:"iframe",w:425,h:350,url:"//www.youtube.com/embed/$2"},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc"},{regex:/vimeo\.com\/(.*)\/([0-9]+)/,type:"iframe",w:425,h:350,url:"//player.vimeo.com/video/$2?title=0&byline=0"},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'//maps.google.com/maps/ms?msid=$2&output=embed"'}],m=tinymce.Env.ie&&tinymce.Env.ie<=8?"onChange":"onInput";a.on("ResolveName",function(a){var b;1==a.target.nodeType&&(b=a.target.getAttribute("data-mce-object"))&&(a.name=b)}),a.on("preInit",function(){var b=a.schema.getSpecialElements();tinymce.each("video audio iframe object".split(" "),function(a){b[a]=new RegExp("</"+a+"[^>]*>","gi")});var c=a.schema.getBoolAttrs();tinymce.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(a){c[a]={}}),a.parser.addNodeFilter("iframe,video,audio,object,embed,script",function(b,c){for(var e,f,g,h,i,j,k,l,m=b.length;m--;)if(f=b[m],f.parent&&("script"!=f.name||(l=d(f.attr("src"))))){for(g=new tinymce.html.Node("img",1),g.shortEnded=!0,l&&(l.width&&f.attr("width",l.width.toString()),l.height&&f.attr("height",l.height.toString())),j=f.attributes,e=j.length;e--;)h=j[e].name,i=j[e].value,"width"!==h&&"height"!==h&&"style"!==h&&(("data"==h||"src"==h)&&(i=a.convertURL(i,h)),g.attr("data-mce-p-"+h,i));k=f.firstChild&&f.firstChild.value,k&&(g.attr("data-mce-html",escape(k)),g.firstChild=null),g.attr({width:f.attr("width")||"300",height:f.attr("height")||("audio"==c?"30":"150"),style:f.attr("style"),src:tinymce.Env.transparentSrc,"data-mce-object":c,"class":"mce-object mce-object-"+c}),f.replace(g)}}),a.serializer.addAttributeFilter("data-mce-object",function(a,b){for(var c,d,e,f,g,h,i,k=a.length;k--;)if(c=a[k],c.parent){for(i=c.attr(b),d=new tinymce.html.Node(i,1),"audio"!=i&&"script"!=i&&d.attr({width:c.attr("width"),height:c.attr("height")}),d.attr({style:c.attr("style")}),f=c.attributes,e=f.length;e--;){var l=f[e].name;0===l.indexOf("data-mce-p-")&&d.attr(l.substr(11),f[e].value)}"script"==i&&d.attr("type","text/javascript"),g=c.attr("data-mce-html"),g&&(h=new tinymce.html.Node("#text",3),h.raw=!0,h.value=j(unescape(g)),d.append(h)),c.replace(d)}})}),a.on("ObjectSelected",function(a){var b=a.target.getAttribute("data-mce-object");("audio"==b||"script"==b)&&a.preventDefault()}),a.on("objectResized",function(a){var b,c=a.target;c.getAttribute("data-mce-object")&&(b=c.getAttribute("data-mce-html"),b&&(b=unescape(b),c.setAttribute("data-mce-html",escape(k(b,{width:a.width,height:a.height})))))}),a.addButton("media",{tooltip:"Insert/edit video",onclick:e,stateSelector:["img[data-mce-object=video]","img[data-mce-object=iframe]"]}),a.addMenuItem("media",{icon:"media",text:"Insert/edit video",onclick:e,context:"insert",prependToContext:!0})}); diff --git a/roundcubemail-dev.spec b/roundcubemail-dev.spec deleted file mode 100644 index 5142ac1..0000000 --- a/roundcubemail-dev.spec +++ /dev/null @@ -1,632 +0,0 @@ -# remirepo spec file for roundcubemail, from: - -# Fedora spec file for roundcubemail -# -# License: MIT -# http://opensource.org/licenses/MIT -# -# Please preserve changelog entries -# - -%if 0%{?fedora} >= 21 -# support for apache / nginx / php-fpm -%global with_phpfpm 1 -%else -%global with_phpfpm 0 -%endif -%global prever rc - -%global roundcubedir %{_datadir}/roundcubemail -%global _logdir /var/log -Name: roundcubemail -Version: 1.2 -Release: 0.2.%{prever}%{?dist} -Summary: Round Cube Webmail is a browser-based multilingual IMAP client - -Group: Applications/System -# Since 0.8 beta, the main code has been GPLv3+ with exceptions and -# skins CC-BY-SA. -# Plugins are a mix of GPLv3+ and GPLv2. The Enigma plugin contains a -# copy of php-Pear-Crypt-GPG (not yet packaged for Fedora), which is -# LGPLv2+. The jqueryui plugin contains the entire jQuery UI framework -# for the use of roundcube plugins: it is licensed as MIT or GPLv2. -# The program/js/tiny_mce directory contains an entire copy of TinyMCE -# which is LGPLv2+. -# https://github.com/pear/Crypt_GPG -# http://jqueryui.com/ -# http://www.tinymce.com/ -License: GPLv3+ with exceptions and GPLv3+ and GPLv2 and LGPLv2+ and CC-BY-SA and (MIT or GPLv2) -URL: http://www.roundcube.net -Source0: https://github.com/roundcube/roundcubemail/releases/download/%{version}%{?prever:-%{prever}}/roundcubemail-%{version}%{?prever:-%{prever}}.tar.gz - -Source1: roundcubemail.httpd -Source3: roundcubemail.nginx -Source2: roundcubemail.logrotate -Source4: roundcubemail-README.rpm -# Elegantly handle removal of moxieplayer Flash binary in tinymce -# media plugin (see "Drop precompiled flash" in %%prep) -Patch0: roundcubemail-1.2-no_swf.patch - -# Non-upstreamable: Adjusts config path to Fedora policy -Patch1: roundcubemail-1.1.0-confpath.patch - -# add .log prefix to all log file names -# see https://github.com/roundcube/roundcubemail/pull/313 -Patch2: roundcubemail-pr313.patch - -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) -%if %{with_phpfpm} -Requires: webserver -Requires: nginx-filesystem -Requires: httpd-filesystem -Requires: php(httpd) -%else -Requires: httpd -Requires: mod_php -%endif -Requires: php-curl -Requires: php-date -Requires: php-dom -Requires: php-fileinfo -Requires: php-gd -Requires: php-hash -Requires: php-iconv -Requires: php-intl -Requires: php-json -Requires: php-ldap -Requires: php-mbstring -Requires: php-openssl -Requires: php-pcre -Requires: php-posix -Requires: php-pdo -Requires: php-pspell -Requires: php-session -Requires: php-simplexml -Requires: php-sockets -Requires: php-spl -Requires: php-xml -# From composer.json-dist, require -# "php": ">=5.3.7", -# "roundcube/plugin-installer": "~0.1.6", -# "pear-pear.php.net/net_socket": "~1.0.12", -# "pear-pear.php.net/auth_sasl": "~1.0.6", -# "pear-pear.php.net/net_idna2": "~0.1.1", -# "pear-pear.php.net/mail_mime": "~1.10.0", -# "pear-pear.php.net/net_smtp": "~1.7.1", -# "pear-pear.php.net/crypt_gpg": "~1.4.0", -# "roundcube/net_sieve": "~1.5.0" -# not available and doesn't make sense roundcube/plugin-installer -Requires: php-pear(Net_Socket) >= 1.0.12 -Requires: php-pear(Auth_SASL) >= 1.0.6 -Requires: php-pear(Net_IDNA2) >= 0.1.1 -Requires: php-pear(Mail_Mime) >= 1.10.0 -Requires: php-pear(Net_SMTP) >= 1.7.1 -Requires: php-pear(Crypt_GPG) >= 1.4.0 -Requires: php-composer(roundcube/net_sieve) >= 1.5.0 -# From composer.json-dist, suggest -# "pear-pear.php.net/net_ldap2": "~2.2.0 required for connecting to LDAP address books", -# "kolab/Net_LDAP3": "dev-master required for connecting to LDAP address books" -Requires: php-pear(Net_LDAP2) >= 2.2.0 -Requires: php-composer(kolab/Net_LDAP3) -# mailcap for /etc/mime.types -Requires: mailcap - -# Optional deps -# Spell check -#Suggests: php-enchant -# Caching -#Suggests: php-apc -#Suggests: php-memcache -# EXIF images -Requires: php-exif -# Upload progress (shock!) -#Suggests: php-uploadprogress -# ZIP download plugin -Requires: php-zip - -# Gearman support -#Optional: php-gearman -# PAM password support -#Optional: php-pam - - -%description -RoundCube Webmail is a browser-based multilingual IMAP client -with an application-like user interface. It provides full -functionality you expect from an e-mail client, including MIME -support, address book, folder manipulation, message searching -and spell checking. RoundCube Webmail is written in PHP and -requires a database: MySQL, PostgreSQL and SQLite are known to -work. The user interface is fully skinnable using XHTML and -CSS 2. - - -%prep -%setup -q -n roundcubemail-%{version}%{?prever:-%{prever}} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 - -# fix permissions and remove any .htaccess files -find . -type f -print | xargs chmod a-x -find . -name \.htaccess -print | xargs rm -f - -# Fix shebang -chmod +x bin/*sh -sed -e '/^#!/s:/usr/bin/env php:/usr/bin/php:' \ - -i bin/*sh - -# ??? - Jon, this could do with a comment; fixing carriage returns? (adamw) -sed -i 's/\r//' SQL/mssql.initial.sql - -# Drop precompiled flash -find . -type f -name '*.swf' -exec rm {} \; -print - -# drop file from patch -find . -type f -name '*.orig' -exec rm {} \; -print - -# Wipe bbcode plugin from bundled TinyMCE to make doubleplus sure we cannot -# be vulnerable to CVE-2012-4230, unaddressed upstream -echo "CVE-2012-4230: removing tinymce bbcode plugin, check path if this fails." -test -d program/js/*mce/plugins/bbcode && rm -rf program/js/*mce/plugins/bbcode || exit 1 - -# Create simple autoloader for PEAR -mkdir vendor -cat << EOF | tee vendor/autoload.php -<?php -spl_autoload_register( - function (\$class) { - if (strpos(\$class, '.') === false) { - \$file = str_replace('_', '/', \$class).'.php'; - if (\$path = stream_resolve_include_path(\$file)) { - require_once(\$path); - } - } - } -); -EOF - - -%build -# Nothing - - -%install -rm -rf %{buildroot} -install -d %{buildroot}%{roundcubedir} -cp -pr * %{buildroot}%{roundcubedir} - -# Apache with mod_php or php-fpm -install -Dpm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf - -%if %{with_phpfpm} -# Nginx with php-fpm -install -Dpm 0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/nginx/default.d/%{name}.conf -%endif - -mkdir -p %{buildroot}%{_sysconfdir}/roundcubemail -mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d -cp -pr %SOURCE2 %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail - -%if 0%{?rhel} == 5 || 0%{?rhel} == 6 -: Remove "su" option from logrotate configuration file - requires logrotate 3.8+ -sed -e '/su /d' -i %{buildroot}%{_sysconfdir}/logrotate.d/roundcubemail -%endif - -# Log files -mkdir -p %{buildroot}/var/log/roundcubemail -# Temp files -mkdir -p %{buildroot}/var/lib/roundcubemail - -cp -pr %SOURCE4 README.rpm - -# create empty files for ghost to not remove OLD config (0.9.x) -touch %{buildroot}%{_sysconfdir}/roundcubemail/db.inc.php -touch %{buildroot}%{_sysconfdir}/roundcubemail/main.inc.php -# create empty files for ghost for the NEW config -touch %{buildroot}%{_sysconfdir}/roundcubemail/config.inc.php - -# keep any other config files too -mv %{buildroot}%{roundcubedir}/config/* %{buildroot}%{_sysconfdir}/roundcubemail/ - -# clean up the buildroot -rm -r %{buildroot}%{roundcubedir}/{config,logs,temp} -rm -r %{buildroot}%{roundcubedir}/{CHANGELOG,INSTALL,LICENSE,README.md,UPGRADING} -rm %{buildroot}%{roundcubedir}/composer.json-dist - - -%pre -# Drop some old config options to ensure new defaults are used -if [ -f %{_sysconfdir}/%{name}/main.inc.php ]; then - sed -e "/'temp_dir'/d" \ - -e "/'mime_types'/d" \ - -e "/'log_dir'/d" \ - -i %{_sysconfdir}/%{name}/main.inc.php -fi - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} -%license LICENSE -%doc CHANGELOG INSTALL README.md UPGRADING README.rpm -%doc composer.json-dist -%{roundcubedir} -%dir %{_sysconfdir}/%{name} -# OLD config files from previous version -%ghost %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/db.inc.php -%ghost %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/main.inc.php -# NEW config file -%ghost %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/config.inc.php -# Default upstream values, overwritten on update -%attr(0640,root,apache) %{_sysconfdir}/%{name}/mimetypes.php -%attr(0640,root,apache) %{_sysconfdir}/%{name}/defaults.inc.php -%attr(0640,root,apache) %{_sysconfdir}/%{name}/config.inc.php.sample -%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf -%if %{with_phpfpm} -%config(noreplace) %{_sysconfdir}/nginx/default.d/%{name}.conf -%endif -%attr(0770,root,apache) %dir /var/log/roundcubemail -%attr(0770,root,apache) %dir /var/lib/roundcubemail -%config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail - - -%changelog -* Thu Apr 21 2016 Remi Collet <remi@fedoraproject.org> - 1.2-0.2.rc -- update to 1.2-rc -- sources from github -- raise dependency on Net_LDAP2 >= 2.2.0 -- add dependency on Net_Socket >= 1.0.12 - -* Mon Dec 28 2015 Remi Collet <remi@fedoraproject.org> - 1.2-0.1.beta -- update to 1.2-beta -- raise dependency to Mail_Mime ~1.10.0 -- add dependency on roundcube/net_sieve ~1.5.0 -- add dependency on Crypt_GPG ~1.4.0 - -* Mon Dec 28 2015 Remi Collet <remi@fedoraproject.org> - 1.1.4-2 -- add .log suffix to all log files, and rotate all #1269164 -- more secure permissions on /var/log and /var/lib #1269155 - -* Sun Dec 27 2015 Remi Collet <remi@fedoraproject.org> - 1.1.4-1 -- update to 1.1.4 -- raise dependency on Net_SMTP 1.7.1 - -* Tue Sep 15 2015 Remi Collet <remi@fedoraproject.org> - 1.1.3-1 -- update to 1.1.3 -- raise dependencies on Mail_Mime 1.9.0, Net_Sieve 1.3.4, - Net_SMTP 1.6.3 -- drop dependency on Mail_mimeDecode - -* Tue Aug 11 2015 Remi Collet <remi@fedoraproject.org> - 1.1.2-2 -- Remove "su" option from logrotate configuration file (requires - logrotate >= 3.8.0) to avoid daily logrotate errors with old RHEL - -* Fri Jun 5 2015 Remi Collet <remi@fedoraproject.org> - 1.1.2-1 -- update to 1.1.2 - -* Wed Mar 25 2015 Robert Scheck <robert@fedoraproject.org> - 1.1.1-2 -- switch run-time requirement from php-mcrypt to php-openssl - -* Fri Mar 20 2015 Remi Collet <remi@fedoraproject.org> - 1.1.1-1 -- update to 1.1.1 - -* Sun Feb 22 2015 Remi Collet <remi@fedoraproject.org> - 1.1.0-2 -- add optional dependencies for LDAP management on - Net_LDAP2 and Net_LDAP3 - -* Mon Feb 16 2015 Remi Collet <remi@fedoraproject.org> - 1.1.0-1 -- update to 1.1.0 - -* Sun Jan 25 2015 Remi Collet <remi@fedoraproject.org> - 1.0.5-1 -- Update to 1.0.5 (security update) - -* Sun Dec 21 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-3 -- provide Nginx configuration - -* Sat Dec 20 2014 Adam Williamson <awilliam@redhat.com> - 1.0.4-2 -- drop tinymce bbcode plugin for safety (CVE-2012-4230) - -* Fri Dec 19 2014 Remi Collet <remi@fedoraproject.org> - 1.0.4-1 -- Update to 1.0.4 (service release, security) - -* Tue Sep 30 2014 Remi Collet <remi@fedoraproject.org> - 1.0.3-1 -- Update to 1.0.3 (service release) - -* Tue Jul 22 2014 Remi Collet <remi@fedoraproject.org> - 1.0.2-1 -- Update to 1.0.2 (service release) -- pull README change from rawhide - -* Mon Jul 21 2014 Adam Williamson <awilliam@redhat.com> - 1.0.2-1 -- Update to 1.0.2 - -* Mon May 12 2014 Remi Collet <remi@fedoraproject.org> - 1.0.1-1 -- Update to 1.0.1 (service release) - -* Thu May 8 2014 Remi Collet <remi@fedoraproject.org> - 1.0.0-2 -- cleanup some config option from previous version -- requires mailcap for /etc/mime.types - -* Thu May 8 2014 Remi Collet <remi@fedoraproject.org> - 1.0.0-1 -- Update to 1.0.0 -- provide the installer - -* Tue Oct 22 2013 Remi Collet <remi@fedoraproject.org> - 0.9.5-1 -- backport 0.9.5 for remi repo - -* Tue Oct 22 2013 Jon Ciesla <limburgher@gmail.com> - 0.9.5-1 -- Fix for CVE-2013-6172, BZ 1021735, 1021965. - -* Mon Sep 09 2013 Jon Ciesla <limburgher@gmail.com> - 0.9.4-1 -- 0.9.4 -- Change httpd dep to webserver, BZ 1005696. - -* Sat Aug 24 2013 Remi Collet <remi@fedoraproject.org> - 0.9.3-2 -- sync with rawhide for remi repo - -* Fri Aug 23 2013 Adam Williamson <awilliam@redhat.com> - 0.9.3-2 -- patch tinymce to cope elegantly with Flash binary being removed - -* Fri Aug 23 2013 Remi Collet <remi@fedoraproject.org> - 0.9.3-1 -- backport 0.9.3 for remi repo in sync with rawhide - -* Fri Aug 23 2013 Jon Ciesla <limburgher@gmail.com> - 0.9.3-1 -- Fix two XSS vulnerabilities: -- http://trac.roundcube.net/ticket/1489251 - -* Fri Aug 16 2013 Jon Ciesla <limburgher@gmail.com> - 0.9.2-3 -- Drop precompiled flash. - -* Tue Jun 18 2013 Remi Collet <remi@fedoraproject.org> - 0.9.1-1 -- backport 0.9.2 for remi repo in sync with rawhide - -* Mon Jun 17 2013 Adam Williamson <awilliam@redhat.com> - 0.9.2-1 -- latest upstream -- correct License field, add comment on complex licensing case - -* Sat May 4 2013 Remi Collet <remi@fedoraproject.org> - 0.9.0-1 -- backport 0.9.0 for remi repo in sync with rawhide - -* Wed May 01 2013 Adam Williamson <awilliam@redhat.com> - 0.9.0-1 -- latest upstream -- drop MDB2 dependencies, add php-pdo dependency (upstream now using - pdo not MDB2) -- drop the update.sh script as it requires the installer framework we - don't ship -- update the Fedora README for changes to sqlite and update process -- drop strict.patch, upstream actually merged it years ago, just in - a slightly different format, and we kept dumbly diffing it -- drop references to obsolete patches (all merged upstream long ago) - -* Thu Mar 28 2013 Remi Collet <remi@fedoraproject.org> - 0.8.6-1 -- backport 0.8.6 for remi repo - -* Thu Mar 28 2013 Jon Ciesla <limburgher@gmail.com> - 0.8.6-1 -- Latest upstream, fixes local file inclusion via web UI -- modification of certain config options. - -* Fri Feb 08 2013 Remi Collet <remi@fedoraproject.org> - 0.8.5-1 -- Latest upstream, CVE-2012-6121, backport for remi repo - -* Fri Feb 08 2013 Jon Ciesla <limburgher@gmail.com> - 0.8.5-1 -- Latest upstream, CVE-2012-6121. - -* Mon Jan 21 2013 Remi Collet <remi@fedoraproject.org> - 0.8.4-3 -- fix configuration for httpd 2.4 (missing in backport) - -* Mon Dec 03 2012 Remi Collet <remi@fedoraproject.org> - 0.8.4-2 -- improved Requires - -* Mon Nov 19 2012 Jon Ciesla <limburgher@gmail.com> - 0.8.4-1 -- Latest upstream. - -* Fri Nov 16 2012 Remi Collet <remi@fedoraproject.org> - 0.8.4-1 -- new upstream release 0.8.4 - -* Mon Oct 29 2012 Remi Collet <remi@fedoraproject.org> - 0.8.2-3 -- fix configuration for httpd 2.4 (#871123) - -* Sun Oct 28 2012 Remi Collet <remi@fedoraproject.org> - 0.8.2-2 -- add fix for latest MDB2 (#870933) - -* Wed Oct 10 2012 Jon Ciesla <limburgher@gmail.com> - 0.8.2-1 -- Latest upstream. - -* Thu Aug 30 2012 Adam Williamson <awilliam@redhat.com> - 0.8.1-2 -- correct stray parenthesis in strict patch - -* Mon Aug 20 2012 Jon Ciesla <limburgher@gmail.com> - 0.8.1-1 -- Latest upstream. -- Updated strict patch. -- XSS patch upstreamed. - -* Mon Aug 20 2012 Jon Ciesla <limburgher@gmail.com> - 0.7.3-1 -- 0.7.3, patch for XSS in signature issue, BZ 849616, 849617. - -* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Mar 12 2012 Jon Ciesla <limburgher@gmail.com> - 0.7.2-2 -- Rediffed strict patch. - -* Mon Mar 12 2012 Adam Williamson <awilliam@redhat.com> - 0.7.2-1 -- new upstream release 0.7.2 - -* Thu Feb 16 2012 Jon Ciesla <limburgher@gmail.com> - 0.7.1-2 -- Fix logrotate, BZ 789552. -- Modify error logging for strict, BZ 789576. - -* Wed Feb 1 2012 Adam Williamson <awilliam@redhat.com> - 0.7.1-1 -- new upstream release - -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Dec 14 2011 Adam Williamson <awilliam@redhat.com> - 0.7-1 -- new upstream release -- drop all patches except confpath.patch: - + html2text.patch and all CVE fixes were merged upstream - + pg-mdb2.patch no longer necessary as all currently supported - Fedora releases have a php-pear-MDB2-Driver-pgsql package new - enough to work with this option - -* Fri Oct 07 2011 Jon Ciesla <limb@jcomserv.net> = 0.6-1 -- New upstream. - -* Tue Sep 06 2011 Jon Ciesla <limb@jcomserv.net> = 0.5.4-1 -- New upstream, fixes multiple security issues. - -* Tue Jul 05 2011 Jon Ciesla <limb@jcomserv.net> = 0.5.3-1 -- New upstream. - -* Tue May 17 2011 Jon Ciesla <limb@jcomserv.net> = 0.5.2-1 -- New upstream. - -* Thu Feb 10 2011 Jon Ciesla <limb@jcomserv.net> = 0.5.1-1 -- New upstream. - -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Mon Oct 18 2010 Jon Ciesla <limb@jcomserv.net> = 0.4.2-1 -- New upstream. - -* Mon Oct 04 2010 Jon Ciesla <limb@jcomserv.net> = 0.4.1-1 -- New upstream. - -* Mon Feb 01 2010 Jon Ciesla <limb@jcomserv.net> = 0.3.1-2 -- Patch to fix CVE-2010-0464, BZ 560143. - -* Mon Nov 30 2009 Jon Ciesla <limb@jcomserv.net> = 0.3.1-1 -- New upstream. - -* Thu Oct 22 2009 Jon Ciesla <limb@jcomserv.net> = 0.3-2 -- Macro fix, BZ530037. - -* Wed Sep 23 2009 Jon Ciesla <limb@jcomserv.net> = 0.3-1 -- New upstream. - -* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jul 15 2009 Jon Ciesla <limb@jcomserv.net> = 0.2.2-2 -- Incorporated Chris Eveleigh's config changes to fix mimetype bug, BZ 511857. - -* Wed Jul 01 2009 Jon Ciesla <limb@jcomserv.net> = 0.2.2-1 -- New upstream. - -* Fri Apr 10 2009 Jon Ciesla <limb@jcomserv.net> = 0.2.1-1 -- New upstream. - -* Mon Mar 30 2009 Jon Ciesla <limb@jcomserv.net> = 0.2-9.stable -- Patch for PG until php-pear-MDB2 hits 1.5.0 stable. BZ 489505. - -* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-8.stable -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Feb 04 2009 Jon Ciesla <limb@jcomserv.net> = 0.2-7.stable -- Patch for CVE-2009-0413, BZ 484052. - -* Mon Jan 05 2009 Jon Ciesla <limb@jcomserv.net> = 0.2-6.stable -- New upstream. -- Dropped two most recent patches, applied upstream. - -* Wed Dec 17 2008 Jon Ciesla <limb@jcomserv.net> = 0.2-5.beta -- Security fix, BZ 476830. - -* Fri Dec 12 2008 Jon Ciesla <limb@jcomserv.net> = 0.2-4.beta -- Security fix, BZ 476223. - -* Thu Oct 09 2008 Jon Ciesla <limb@jcomserv.net> = 0.2-3.beta -- New upstream. - -* Mon Jun 16 2008 Jon Ciesla <limb@jcomserv.net> = 0.2-2.alpha -- osx files removed upstream. - -* Mon Jun 16 2008 Jon Ciesla <limb@jcomserv.net> = 0.2-1.alpha -- Fixed php-xml, php-mbstring Requires. BZ 451652. -- Removing osx files, will be pulled from next upstream release. - -* Fri Jun 13 2008 Jon Ciesla <limb@jcomserv.net> = 0.2-0.alpha -- Update to 0.2-alpha, security fixes for BZ 423271. -- mysql update and pear patches applied upstream. -- Patched config paths. - -* Fri Apr 18 2008 Jon Ciesla <limb@jcomserv.net> = 0.1.1-5 -- Added php-pecl-Fileinfo Reqires. BZ 442728. - -* Wed Apr 16 2008 Jon Ciesla <limb@jcomserv.net> = 0.1.1-4 -- Added mcrypt, MDB2 Requires. BZ 442728. - -* Thu Apr 10 2008 Jon Ciesla <limb@jcomserv.net> = 0.1.1-3 -- Patch to fix PEAR path issue, drop symlinks. - -* Thu Apr 10 2008 Jon Ciesla <limb@jcomserv.net> = 0.1.1-2 -- Drop %%pre script that was breaking pear packages. - -* Wed Apr 09 2008 Jon Ciesla <limb@jcomserv.net> = 0.1.1-1 -- New upstream release. -- Added patch to fix mysql update. - -* Tue Mar 18 2008 Jon Ciesla <limb@jcomserv.net> = 0.1-1 -- Updgrade to 0.1 final, -dep. -- Added new mimeDecode dep. - -* Mon Feb 04 2008 Jon Ciesla <limb@jcomserv.net> = 0.1-0.10rc2.1 -- Changed to upstream -dep tarball, GPL-compliant. - -* Fri Feb 01 2008 Jon Ciesla <limb@jcomserv.net> = 0.1-0.9rc2.1 -- re-removed PEAR components that slipped back in after rc1. - -* Fri Oct 26 2007 Jon Ciesla <limb@jcomserv.net> = 0.1-0.8rc2 -- Upgrade to 0.1-rc2 - -* Thu Aug 16 2007 Jon Ciesla <limb@jcomserv.net> = 0.1-0.7rc1.1 -- License tag correction. - -* Tue Jul 03 2007 Jon Ciesla <limb@jcomserv.net> = 0.1-0.6rc1.1 -- New upstream release, all GPL, all current languages included. - -* Mon May 14 2007 Jon Ciesla <limb@jcomserv.net> = 0.1-0.5.beta2.2 -- Fixed source timestamps, added Russian langpack. -- Added logpath fix to main.inc.php -- Fixed logrotate filename. - -* Fri May 11 2007 Jon Ciesla <limb@jcomserv.net> = 0.1-0.4.beta2.2 -- Cleanup/elegantization of spec, .conf. - -* Thu May 10 2007 Jon Ciesla <limb@jcomserv.net> = 0.1-0.3.beta2.2 -- Fixed bad chars in script. - -* Thu May 10 2007 Jon Ciesla <limb@jcomserv.net> = 0.1-0.2.beta2.2 -- Added all langpacks. - -* Thu May 10 2007 Jon Ciesla <limb@jcomserv.net> = 0.1-0.1.beta2.2 -- Versioning fix. - -* Wed May 09 2007 Jon Ciesla <limb@jcomserv.net> = 0.1-beta2.3 -- Fixed generation of DES. -- Cleanup re patch. - -* Mon May 07 2007 Jon Ciesla <limb@jcomserv.net> - 0.1-beta2.2.3 -- Removed duplicate docs. -- Moved SQL to doc. -- Fixed perms on log dir, sysconfdir. -- Fixed Requires. -- Fixed config. -- Fixed changelog spacing. - -* Fri May 04 2007 Jon Ciesla <limb@jcomserv.net> - 0.1-beta2.2.2 -- Created new source tarball with PEAR code removed. Added script for creation. - -* Tue Feb 13 2007 Jon Ciesla <limb@jcomserv.net> - 0.1-beta2.2.1 -- Excluded Portions from PEAR, included as dependancies -- Fixed log/temp issues, including logrotate - -* Tue Jan 30 2007 Jon Ciesla <limb@jcomserv.net> - 0.1-beta2.2 -- Initial packaging. diff --git a/roundcubemail.spec b/roundcubemail.spec index 838b25f..5142ac1 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -14,12 +14,13 @@ %else %global with_phpfpm 0 %endif +%global prever rc %global roundcubedir %{_datadir}/roundcubemail %global _logdir /var/log Name: roundcubemail -Version: 1.1.5 -Release: 1%{?dist} +Version: 1.2 +Release: 0.2.%{prever}%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client Group: Applications/System @@ -36,14 +37,15 @@ Group: Applications/System # http://www.tinymce.com/ License: GPLv3+ with exceptions and GPLv3+ and GPLv2 and LGPLv2+ and CC-BY-SA and (MIT or GPLv2) URL: http://www.roundcube.net -Source0: https://github.com/roundcube/roundcubemail/releases/download/%{version}/roundcubemail-%{version}.tar.gz +Source0: https://github.com/roundcube/roundcubemail/releases/download/%{version}%{?prever:-%{prever}}/roundcubemail-%{version}%{?prever:-%{prever}}.tar.gz + Source1: roundcubemail.httpd Source3: roundcubemail.nginx Source2: roundcubemail.logrotate Source4: roundcubemail-README.rpm # Elegantly handle removal of moxieplayer Flash binary in tinymce # media plugin (see "Drop precompiled flash" in %%prep) -Patch0: roundcubemail-1.1.1-no_swf.patch +Patch0: roundcubemail-1.2-no_swf.patch # Non-upstreamable: Adjusts config path to Fedora policy Patch1: roundcubemail-1.1.0-confpath.patch @@ -90,24 +92,22 @@ Requires: php-xml # "pear-pear.php.net/net_socket": "~1.0.12", # "pear-pear.php.net/auth_sasl": "~1.0.6", # "pear-pear.php.net/net_idna2": "~0.1.1", -# "pear-pear.php.net/net_sieve": "~1.3.4", -# "pear-pear.php.net/mail_mime": "~1.9.0", +# "pear-pear.php.net/mail_mime": "~1.10.0", # "pear-pear.php.net/net_smtp": "~1.7.1", -# "patchwork/utf8": "~1.2.3" -# not available and optional patchwork/utf8 +# "pear-pear.php.net/crypt_gpg": "~1.4.0", +# "roundcube/net_sieve": "~1.5.0" # not available and doesn't make sense roundcube/plugin-installer Requires: php-pear(Net_Socket) >= 1.0.12 Requires: php-pear(Auth_SASL) >= 1.0.6 -Requires: php-pear(Mail_Mime) >= 1.9.0 -Requires: php-pear(Net_SMTP) >= 1.7.1 -Requires: php-pear(Net_Sieve) >= 1.3.4 Requires: php-pear(Net_IDNA2) >= 0.1.1 -# From composer.json, require-dev -# "pear-pear.php.net/crypt_gpg": "*", -# "phpunit/phpunit": "*" -# not available (but only for dev) php-pear(Crypt_GPG) >= 1.2.0 -# From composer.json, suggest -Requires: php-pear(Net_LDAP2) >= 2.0.12 +Requires: php-pear(Mail_Mime) >= 1.10.0 +Requires: php-pear(Net_SMTP) >= 1.7.1 +Requires: php-pear(Crypt_GPG) >= 1.4.0 +Requires: php-composer(roundcube/net_sieve) >= 1.5.0 +# From composer.json-dist, suggest +# "pear-pear.php.net/net_ldap2": "~2.2.0 required for connecting to LDAP address books", +# "kolab/Net_LDAP3": "dev-master required for connecting to LDAP address books" +Requires: php-pear(Net_LDAP2) >= 2.2.0 Requires: php-composer(kolab/Net_LDAP3) # mailcap for /etc/mime.types Requires: mailcap @@ -143,7 +143,7 @@ CSS 2. %prep -%setup -q -n roundcubemail-%{version} +%setup -q -n roundcubemail-%{version}%{?prever:-%{prever}} %patch0 -p1 %patch1 -p1 %patch2 -p1 @@ -161,10 +161,10 @@ sed -e '/^#!/s:/usr/bin/env php:/usr/bin/php:' \ sed -i 's/\r//' SQL/mssql.initial.sql # Drop precompiled flash -find . -type f -name '*.swf' | xargs rm -f +find . -type f -name '*.swf' -exec rm {} \; -print # drop file from patch -find . -type f -name '*.orig' | xargs rm -f +find . -type f -name '*.orig' -exec rm {} \; -print # Wipe bbcode plugin from bundled TinyMCE to make doubleplus sure we cannot # be vulnerable to CVE-2012-4230, unaddressed upstream @@ -277,11 +277,18 @@ rm -rf %{buildroot} %changelog -* Thu Apr 21 2016 Remi Collet <remi@fedoraproject.org> - 1.1.5-1 -- update to 1.1.5 +* Thu Apr 21 2016 Remi Collet <remi@fedoraproject.org> - 1.2-0.2.rc +- update to 1.2-rc - sources from github +- raise dependency on Net_LDAP2 >= 2.2.0 - add dependency on Net_Socket >= 1.0.12 +* Mon Dec 28 2015 Remi Collet <remi@fedoraproject.org> - 1.2-0.1.beta +- update to 1.2-beta +- raise dependency to Mail_Mime ~1.10.0 +- add dependency on roundcube/net_sieve ~1.5.0 +- add dependency on Crypt_GPG ~1.4.0 + * Mon Dec 28 2015 Remi Collet <remi@fedoraproject.org> - 1.1.4-2 - add .log suffix to all log files, and rotate all #1269164 - more secure permissions on /var/log and /var/lib #1269155 |